diff options
Diffstat (limited to 'pkgs')
2804 files changed, 68362 insertions, 52769 deletions
diff --git a/pkgs/README.md b/pkgs/README.md index a478ac120f17c..5cc7024758162 100644 --- a/pkgs/README.md +++ b/pkgs/README.md @@ -29,7 +29,7 @@ We welcome new contributors of new packages to Nixpkgs, arguably the greatest so Before adding a new package, please consider the following questions: * Is the package ready for general use? We don't want to include projects that are too immature or are going to be abandoned immediately. In case of doubt, check with upstream. -* Does the project have a clear license statement? Remember that softwares are unfree by default (all rights reserved), and merely providing access to the source code does not imply its redistribution. In case of doubt, ask upstream. +* Does the project have a clear license statement? Remember that software is unfree by default (all rights reserved), and merely providing access to the source code does not imply its redistribution. In case of doubt, ask upstream. * How realistic is it that it will be used by other people? It's good that nixpkgs caters to various niches, but if it's a niche of 5 people it's probably too small. * Are you willing to maintain the package? You should care enough about the package to be willing to keep it up and running for at least one complete Nixpkgs' release life-cycle. diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index 2c8a44f62162e..ab9b2ebcd9619 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -58,14 +58,14 @@ }: stdenv.mkDerivation rec { pname = "ardour"; - version = "7.4"; + version = "7.5"; # We can't use `fetchFromGitea` here, as attempting to fetch release archives from git.ardour.org # result in an empty archive. See https://tracker.ardour.org/view.php?id=7328 for more info. src = fetchgit { url = "git://git.ardour.org/ardour/ardour.git"; rev = version; - hash = "sha256-CUGhJi3ji0F6v41Y08sQvo7oKITOJ96ojdJL+FyCxmw="; + hash = "sha256-cmYt6fGYuuVs6YhAXaO9AG6TrYLDVUaE1/iC67rt76I="; }; bundledContent = fetchzip { diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix index 5eb94f8445e02..5f750a885d155 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "bitwig-studio"; - version = "3.3.7"; + version = "3.3.11"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb"; - sha256 = "13jr45kzv0xjhhqk30qpq793349qyx8jpas4kl6i6bk3xfrd3fbz"; + sha256 = "sha256-cF8gVPjM0KUcKOW09uFccp4/lzbUmZcBkVOwr/A/8Yw="; }; nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; @@ -36,11 +36,8 @@ stdenv.mkDerivation rec { cp -r opt/bitwig-studio $out/libexec ln -s $out/libexec/bitwig-studio $out/bin/bitwig-studio cp -r usr/share $out/share - substitute usr/share/applications/bitwig-studio.desktop \ - $out/share/applications/bitwig-studio.desktop \ - --replace /usr/bin/bitwig-studio $out/bin/bitwig-studio - runHook postInstall + runHook postInstall ''; postFixup = '' @@ -60,7 +57,6 @@ stdenv.mkDerivation rec { --prefix PATH : "${lib.makeBinPath [ ffmpeg ]}" \ --suffix PATH : "${lib.makeBinPath [ xdg-utils ]}" done - ''; meta = with lib; { diff --git a/pkgs/applications/audio/castopod/default.nix b/pkgs/applications/audio/castopod/default.nix new file mode 100644 index 0000000000000..9d9f83e2ecce4 --- /dev/null +++ b/pkgs/applications/audio/castopod/default.nix @@ -0,0 +1,53 @@ +{ stdenv +, fetchurl +, ffmpeg-headless +, lib +, nixosTests +, stateDirectory ? "/var/lib/castopod" +}: +stdenv.mkDerivation { + pname = "castopod"; + version = "1.6.4"; + + src = fetchurl { + url = "https://code.castopod.org/adaures/castopod/uploads/ce56d4f149242f12bedd20f9a2b0916d/castopod-1.6.4.tar.gz"; + sha256 = "080jj91yxbn3xsbs0sywzwa2f5in9bp9qi2zwqcfqpaxlq9ga62v"; + }; + + dontBuild = true; + dontFixup = true; + + postPatch = '' + # not configurable at runtime unfortunately: + substituteInPlace app/Config/Paths.php \ + --replace "__DIR__ . '/../../writable'" "'${stateDirectory}/writable'" + + # configuration file must be writable, place it to ${stateDirectory} + substituteInPlace modules/Install/Controllers/InstallController.php \ + --replace "ROOTPATH" "'${stateDirectory}/'" + substituteInPlace public/index.php spark \ + --replace "DotEnv(ROOTPATH)" "DotEnv('${stateDirectory}')" + + # ffmpeg is required for Video Clips feature + substituteInPlace modules/MediaClipper/VideoClipper.php \ + --replace "ffmpeg" "${ffmpeg-headless}/bin/ffmpeg" + substituteInPlace modules/Admin/Controllers/VideoClipsController.php \ + --replace "which ffmpeg" "echo ${ffmpeg-headless}/bin/ffmpeg" + ''; + + installPhase = '' + mkdir -p $out/share/castopod + cp -r . $out/share/castopod + ''; + + passthru.tests.castopod = nixosTests.castopod; + passthru.updateScript = ./update.sh; + + meta = with lib; { + description = "An open-source hosting platform made for podcasters who want to engage and interact with their audience"; + homepage = "https://castopod.org"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ alexoundos misuzu ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/audio/castopod/update.sh b/pkgs/applications/audio/castopod/update.sh new file mode 100755 index 0000000000000..742788dc8ddfd --- /dev/null +++ b/pkgs/applications/audio/castopod/update.sh @@ -0,0 +1,89 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p curl jq +set -euo pipefail + +nixpkgs="$(git rev-parse --show-toplevel)" +castopod_nix="$nixpkgs/pkgs/applications/audio/castopod/default.nix" + +# https://www.meetup.com/api/guide/#p02-querying-section +query=' +query allReleases($fullPath: ID!, $first: Int, $last: Int, $before: String, $after: String, $sort: ReleaseSort) { + project(fullPath: $fullPath) { + id + releases( + first: $first + last: $last + before: $before + after: $after + sort: $sort + ) { + nodes { + ...Release + __typename + } + __typename + } + __typename + } +} + +fragment Release on Release { + id + name + tagName + releasedAt + createdAt + upcomingRelease + historicalRelease + assets { + links { + nodes { + id + name + url + directAssetUrl + linkType + __typename + } + __typename + } + __typename + } + __typename +} +' +variables='{ + "fullPath": "adaures/castopod", + "first": 1, + "sort": "RELEASED_AT_DESC" +}' + +post=$(cat <<EOF +{"query": "$(echo $query)", "variables": $(echo $variables)} +EOF +) + +json="$(curl -s -X POST https://code.castopod.org/api/graphql \ + -H 'Content-Type: application/json' \ + -d "$post")" + +echo "$json" +TAG=$(echo $json | jq -r '.data.project.releases.nodes[].tagName') +ASSET_URL=$(echo $json | jq -r '.data.project.releases.nodes[].assets.links.nodes[].url' | grep .tar.gz$) + +CURRENT_VERSION=$(nix eval -f "$nixpkgs" --raw castopod.version) +VERSION=${TAG:1} + +if [[ "$CURRENT_VERSION" == "$VERSION" ]]; then + echo "castopod is up-to-date: ${CURRENT_VERSION}" + exit 0 +fi + +SHA256=$(nix-prefetch-url "$ASSET_URL") + +URL=$(echo $ASSET_URL | sed -e 's/[\/&]/\\&/g') + +sed -e "s/version =.*;/version = \"$VERSION\";/g" \ + -e "s/url =.*;/url = \"$URL\";/g" \ + -e "s/sha256 =.*;/sha256 = \"$SHA256\";/g" \ + -i "$castopod_nix" diff --git a/pkgs/applications/audio/exaile/default.nix b/pkgs/applications/audio/exaile/default.nix index c6000c86c6397..77054b2d91441 100644 --- a/pkgs/applications/audio/exaile/default.nix +++ b/pkgs/applications/audio/exaile/default.nix @@ -8,28 +8,26 @@ , notificationSupport ? true , scalableIconSupport ? true , translationSupport ? true -, bpmCounterSupport ? false , ipythonSupport ? false +, cdMetadataSupport ? false , lastfmSupport ? false , lyricsManiaSupport ? false -, lyricsWikiSupport ? false , multimediaKeySupport ? false , musicBrainzSupport ? false , podcastSupport ? false , streamripperSupport ? false , wikipediaSupport ? false -, fetchpatch }: stdenv.mkDerivation rec { pname = "exaile"; - version = "4.1.2"; + version = "4.1.3"; src = fetchFromGitHub { owner = "exaile"; repo = pname; rev = version; - sha256 = "sha256-GZyCuPy57NhGwgbLMrRKW5xmc1Udon7WtsrD4upviuQ="; + sha256 = "sha256-9SK0nvGdz2j6qp1JTmSuLezxX/kB93CZReSfAnfKZzg="; }; nativeBuildInputs = [ @@ -49,6 +47,9 @@ stdenv.mkDerivation rec { gstreamer gst-plugins-base gst-plugins-good + gst-plugins-bad + gst-plugins-ugly + gst-libav ]) ++ (with python3.pkgs; [ bsddb3 dbus-python @@ -59,13 +60,12 @@ stdenv.mkDerivation rec { ]) ++ lib.optional deviceDetectionSupport udisks ++ lib.optional notificationSupport libnotify ++ lib.optional scalableIconSupport librsvg - ++ lib.optional bpmCounterSupport gst_all_1.gst-plugins-bad ++ lib.optional ipythonSupport python3.pkgs.ipython + ++ lib.optional cdMetadataSupport python3.pkgs.discid ++ lib.optional lastfmSupport python3.pkgs.pylast - ++ lib.optional (lyricsManiaSupport || lyricsWikiSupport) python3.pkgs.lxml - ++ lib.optional lyricsWikiSupport python3.pkgs.beautifulsoup4 + ++ lib.optional lyricsManiaSupport python3.pkgs.lxml ++ lib.optional multimediaKeySupport keybinder3 - ++ lib.optional musicBrainzSupport python3.pkgs.musicbrainzngs + ++ lib.optional (musicBrainzSupport || cdMetadataSupport) python3.pkgs.musicbrainzngs ++ lib.optional podcastSupport python3.pkgs.feedparser ++ lib.optional wikipediaSupport webkitgtk; diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index 06a8c5daf9d2a..837f482b737ef 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , cmake , nixosTests , alsa-lib @@ -14,30 +13,15 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.69"; + version = "1.71"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "sha256-tm0yTh46UKnsjH9hv3cMW0YL2x3OTRL+14x4c7w124U="; + hash = "sha256-c2gFq+TgTMI+Eld0z8hryLew3XkrQ7XAfq2s+zdEkBQ="; }; - patches = [ - # Adapt CMake script to be Darwin-compatible - # https://github.com/8bitbubsy/ft2-clone/pull/30 - (fetchpatch { - name = "0001-ft2-clone-Make-CMake-script-macOS-compatible.patch"; - url = "https://github.com/8bitbubsy/ft2-clone/pull/30/commits/0033a567abf7ddbdb2bc59c7f730d22f986010aa.patch"; - hash = "sha256-fhA+T6RI+Qmhr7mbG9lEA7esWskgK8+DkWzol0J2lUo="; - }) - (fetchpatch { - name = "0002-ft2-clone-Fix-__MACOSX_CORE__-typo.patch"; - url = "https://github.com/8bitbubsy/ft2-clone/pull/30/commits/fe50aff9233130150a6631875611c7db67a2d705.patch"; - hash = "sha256-X4AVuJ0iRlpH1N/YzjdVk5+yv7eiDNoZkk0mhOizgOg="; - }) - ]; - nativeBuildInputs = [ cmake ]; buildInputs = [ SDL2 ] ++ lib.optional stdenv.isLinux alsa-lib @@ -63,4 +47,3 @@ stdenv.mkDerivation rec { platforms = platforms.littleEndian; }; } - diff --git a/pkgs/applications/audio/furnace/default.nix b/pkgs/applications/audio/furnace/default.nix index bfb09c6de8ecc..71cc796a621d7 100644 --- a/pkgs/applications/audio/furnace/default.nix +++ b/pkgs/applications/audio/furnace/default.nix @@ -28,14 +28,14 @@ stdenv.mkDerivation rec { pname = "furnace"; - version = "0.6pre16"; + version = "0.6"; src = fetchFromGitHub { owner = "tildearrow"; repo = "furnace"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-n66Bv8xB/0KMJYoMILxsaKoaX+E0OFGI3QGqhxKTFUQ="; + hash = "sha256-8we7vKyGWjM9Rx0MJjSKLJcKBHiHt5vjuy17HHx/pP8="; }; postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' diff --git a/pkgs/applications/audio/g4music/default.nix b/pkgs/applications/audio/g4music/default.nix index 6cefefcb1d290..9063a8351a188 100644 --- a/pkgs/applications/audio/g4music/default.nix +++ b/pkgs/applications/audio/g4music/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromGitLab , desktop-file-utils +, gitUpdater , gobject-introspection , gst_all_1 , gtk4 @@ -14,14 +15,14 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "g4music"; - version = "3.2"; + version = "3.3"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "neithern"; repo = "g4music"; rev = "v${finalAttrs.version}"; - hash = "sha256-BlHOYD4sOmJPNMzM5QA97Ah1N9tIat0Y6qxN6c5pmsw="; + hash = "sha256-sajA8+G1frQA0p+8RK84hvh2P36JaarmSZx/sxMoFqo="; }; nativeBuildInputs = [ @@ -44,6 +45,10 @@ stdenv.mkDerivation (finalAttrs: { gstreamer ]); + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; + meta = with lib; { description = "A beautiful, fast, fluent, light weight music player written in GTK4"; homepage = "https://gitlab.gnome.org/neithern/g4music"; diff --git a/pkgs/applications/audio/giada/default.nix b/pkgs/applications/audio/giada/default.nix index d2ccb6d474729..b277175ec102c 100644 --- a/pkgs/applications/audio/giada/default.nix +++ b/pkgs/applications/audio/giada/default.nix @@ -41,7 +41,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_BUILD_TYPE=Release" ]; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/helvum/default.nix b/pkgs/applications/audio/helvum/default.nix index 1ff9f667d5ffb..6e3de0f14bb75 100644 --- a/pkgs/applications/audio/helvum/default.nix +++ b/pkgs/applications/audio/helvum/default.nix @@ -5,6 +5,7 @@ , fetchFromGitLab , glib , gtk4 +, libadwaita , meson , ninja , pipewire @@ -17,20 +18,20 @@ stdenv.mkDerivation rec { pname = "helvum"; - version = "0.4.1"; + version = "0.5.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "pipewire"; repo = pname; rev = version; - hash = "sha256-nBU8dk22tzVf60yznTYJBYRKG+ctwWl1epU90R0zXr0="; + hash = "sha256-9vlzLPpyZ9qtCEbCDvYhWDcV+8T63ukdos1l2U6fD+E="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-kzu8dzKob9KxKEP3ElUYCCTdyvbzi+jSXTaaaaPMhYg="; + hash = "sha256-Xebm3XlsO6kBoMnxJsOk/3SO7avVoaGqi2CVWBRzr88="; }; nativeBuildInputs = [ @@ -49,6 +50,7 @@ stdenv.mkDerivation rec { desktop-file-utils glib gtk4 + libadwaita pipewire ]; diff --git a/pkgs/applications/audio/hydrogen/default.nix b/pkgs/applications/audio/hydrogen/default.nix index 93924839d5c54..0bea741e19d81 100644 --- a/pkgs/applications/audio/hydrogen/default.nix +++ b/pkgs/applications/audio/hydrogen/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "hydrogen"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "hydrogen-music"; repo = pname; rev = version; - sha256 = "sha256-09zN6OVqVohk153gqXy6C0uHcBhZX2JJL4d6f4BU4Lg="; + sha256 = "sha256-A9mLiPh7ZMWJ11PcVP07IxZ8WdV2HkkKLix77egbC0M="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; diff --git a/pkgs/applications/audio/infamousPlugins/default.nix b/pkgs/applications/audio/infamousPlugins/default.nix index 03ef83bd6fa9f..4597add4132d3 100644 --- a/pkgs/applications/audio/infamousPlugins/default.nix +++ b/pkgs/applications/audio/infamousPlugins/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , pkg-config , cairomm , cmake @@ -17,28 +16,15 @@ stdenv.mkDerivation rec { pname = "infamousPlugins"; - version = "0.3.0"; + version = "0.3.2"; src = fetchFromGitHub { owner = "ssj71"; repo = "infamousPlugins"; rev = "v${version}"; - sha256 = "1r72agk5nxf5k0mghcc2j90z43j5d9i7rqjmf49jfyqnd443isip"; + sha256 = "sha256-AhW4hLmCxz7yHMdxM6kOvtCXk1jEg/XtyPgt4yk1xqs="; }; - patches = [ - (fetchpatch { - url = "https://github.com/ssj71/infamousPlugins/commit/06dd967b4736ea886dc1dc07f882cb1563961582.patch"; - sha256 = "08xwh6px13y1gykaw103nhvjms7vgbgkcm0avh9f5d2d7aadq0l2"; - }) - - # glibx-2.36 upstream fix: https://github.com/ssj71/infamousPlugins/pull/52 - (fetchpatch { - name = "glibc-2.36.patch"; - url = "https://github.com/ssj71/infamousPlugins/commit/eb4fd9af25362fdd006549c471f4cf0427816dd5.patch"; - hash = "sha256-kBB2meQYVoVSTHIG77M8Fmeve87JBIUjpWCP6oiOkKI="; - }) - ]; nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ cairomm lv2 libpthreadstubs libXdmcp libXft ntk pcre fftwFloat zita-resampler ]; diff --git a/pkgs/applications/audio/librespot/default.nix b/pkgs/applications/audio/librespot/default.nix index f477b811d70f5..2617030829a54 100644 --- a/pkgs/applications/audio/librespot/default.nix +++ b/pkgs/applications/audio/librespot/default.nix @@ -1,11 +1,13 @@ { lib , rustPlatform , fetchFromGitHub +, makeWrapper , pkg-config , stdenv , openssl -, withALSA ? true +, withALSA ? stdenv.isLinux , alsa-lib +, alsa-plugins , withPortAudio ? false , portaudio , withPulseAudio ? false @@ -26,7 +28,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-tbDlWP0sUIa0W9HhdYNOvo9cGeqFemclhA7quh7f/Rw="; - nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ + nativeBuildInputs = [ pkg-config makeWrapper ] ++ lib.optionals stdenv.isDarwin [ rustPlatform.bindgenHook ]; @@ -41,6 +43,11 @@ rustPlatform.buildRustPackage rec { ++ lib.optional withPortAudio "portaudio-backend" ++ lib.optional withPulseAudio "pulseaudio-backend"; + postFixup = lib.optionalString withALSA '' + wrapProgram "$out/bin/librespot" \ + --set ALSA_PLUGIN_DIR '${alsa-plugins}/lib/alsa-lib' + ''; + meta = with lib; { description = "Open Source Spotify client library and playback daemon"; homepage = "https://github.com/librespot-org/librespot"; diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/applications/audio/lsp-plugins/default.nix index e459e10b6db90..5ff07f2fa611a 100644 --- a/pkgs/applications/audio/lsp-plugins/default.nix +++ b/pkgs/applications/audio/lsp-plugins/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "lsp-plugins"; - version = "1.2.10"; + version = "1.2.11"; src = fetchurl { url = "https://github.com/sadko4u/${pname}/releases/download/${version}/${pname}-src-${version}.tar.gz"; - sha256 = "sha256-2Yf+4TYGWF/AMI1kNvVOx9g6CSIoeZKY63qC/zJNilc="; + sha256 = "sha256-9zLs1J7rZkMaVQxOwihjCsKSLyb9q64pTZLVg/UVf2o="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/applications/audio/miniaudicle/default.nix b/pkgs/applications/audio/miniaudicle/default.nix index 19054da5841cd..f477e3ffa1f2f 100644 --- a/pkgs/applications/audio/miniaudicle/default.nix +++ b/pkgs/applications/audio/miniaudicle/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , qmake , wrapQtAppsHook -, qscintilla-qt6 +, qt6Packages , bison , flex , which @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ alsa-lib libsndfile - qscintilla-qt6 + qt6Packages.qscintilla ] ++ lib.optional (audioBackend == "pulse") libpulseaudio ++ lib.optional (audioBackend == "jack") libjack2; diff --git a/pkgs/applications/audio/mmlgui/default.nix b/pkgs/applications/audio/mmlgui/default.nix index deafd47a8374b..4959a567c417e 100644 --- a/pkgs/applications/audio/mmlgui/default.nix +++ b/pkgs/applications/audio/mmlgui/default.nix @@ -15,14 +15,14 @@ stdenv.mkDerivation rec { pname = "mmlgui"; - version = "unstable-2023-06-12"; + version = "unstable-2023-09-20"; src = fetchFromGitHub { owner = "superctr"; repo = "mmlgui"; - rev = "d680f576aba769b0d63300fbed57a0e9e54dfa4b"; + rev = "a941dbcb34d2e1d56ac4489fbec5f893e9b8fb6d"; fetchSubmodules = true; - hash = "sha256-BqwayGQBIa0ru22Xci8vHNYPFr9scZSdrUOlDtGBnno="; + hash = "sha256-d5DznY0WRJpiUEtUQ8Yihc0Ej8+k5cYTqrzUSp/1wg4="; }; postPatch = '' diff --git a/pkgs/applications/audio/mympd/default.nix b/pkgs/applications/audio/mympd/default.nix index cf8cf47a35f7b..935c277597fc8 100644 --- a/pkgs/applications/audio/mympd/default.nix +++ b/pkgs/applications/audio/mympd/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mympd"; - version = "12.0.1"; + version = "12.0.2"; src = fetchFromGitHub { owner = "jcorporation"; repo = "myMPD"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-tkkaBIWoQS28FsCSN5CKw2ZQ3cbYa34PVZCUGaaqaQo="; + sha256 = "sha256-7jE3erxrCPN2deI7EV0gDH1gy2XdwC1YdU2mo2xMI6Q="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/ocenaudio/default.nix b/pkgs/applications/audio/ocenaudio/default.nix index 3618a1b17bc72..5723a1fd10f2f 100644 --- a/pkgs/applications/audio/ocenaudio/default.nix +++ b/pkgs/applications/audio/ocenaudio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "ocenaudio"; - version = "3.12.6"; + version = "3.12.7"; src = fetchurl { url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}"; - sha256 = "sha256-kQR0FaZbcdKf1yKHwTA525qzyFldSESQq6NRSZipUQw="; + sha256 = "sha256-+D/JvC0emKdxzd0l2n1QZ0geosrMpdpaxru5z61kqxA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/open-stage-control/default.nix b/pkgs/applications/audio/open-stage-control/default.nix index 87f1e1512954b..91e043a59346b 100644 --- a/pkgs/applications/audio/open-stage-control/default.nix +++ b/pkgs/applications/audio/open-stage-control/default.nix @@ -2,13 +2,13 @@ buildNpmPackage rec { pname = "open-stage-control"; - version = "1.25.3"; + version = "1.25.5"; src = fetchFromGitHub { owner = "jean-emmanuel"; repo = "open-stage-control"; rev = "v${version}"; - hash = "sha256-drv+QNBmUjvlRul8PlFK4ZBIDw6BV4kJXVw287H6WT4="; + hash = "sha256-N0bL/kgw5tIVcD4fGYrahdola/w9ouct0+AUqw+dUOg="; }; # Remove some Electron stuff from package.json @@ -16,7 +16,7 @@ buildNpmPackage rec { sed -i -e '/"electron"\|"electron-installer-debian"/d' package.json ''; - npmDepsHash = "sha256-M+6+zrxy8VpJQS0dG/xORMbflKEq8wO2DEOjGrA6OUw="; + npmDepsHash = "sha256-unjoBWVwmUqxAU3mDC37sXzoh7aEOdny4Asa70+sZnk="; nativeBuildInputs = [ copyDesktopItems diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index b32f2f48f3a2a..c3d36d3b38368 100644 --- a/pkgs/applications/audio/plexamp/default.nix +++ b/pkgs/applications/audio/plexamp/default.nix @@ -7,7 +7,7 @@ let src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; name="${pname}-${version}.AppImage"; - sha512 = "CrSXmRVatVSkMyB1QaNSL/tK60rQvT9JraRtYYLl0Fau3M1LJXK9yqvt77AjwIwIvi2Dm5SROG+c4rA1XtI4Yg=="; + hash = "sha512-CrSXmRVatVSkMyB1QaNSL/tK60rQvT9JraRtYYLl0Fau3M1LJXK9yqvt77AjwIwIvi2Dm5SROG+c4rA1XtI4Yg=="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/audio/sfizz/default.nix b/pkgs/applications/audio/sfizz/default.nix index 05957bf38f2b4..4f203a77dc86a 100644 --- a/pkgs/applications/audio/sfizz/default.nix +++ b/pkgs/applications/audio/sfizz/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { --replace '/usr/bin/zenity' '${gnome.zenity}/bin/zenity' ''; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DSFIZZ_TESTS=ON" ]; + cmakeFlags = [ "-DSFIZZ_TESTS=ON" ]; doCheck = true; diff --git a/pkgs/applications/audio/spotify-player/default.nix b/pkgs/applications/audio/spotify-player/default.nix index 4bf9380e35686..aa13693541e1a 100644 --- a/pkgs/applications/audio/spotify-player/default.nix +++ b/pkgs/applications/audio/spotify-player/default.nix @@ -33,16 +33,16 @@ assert lib.assertOneOf "withAudioBackend" withAudioBackend [ "" "alsa" "pulseaud rustPlatform.buildRustPackage rec { pname = "spotify-player"; - version = "0.15.0"; + version = "0.15.2"; src = fetchFromGitHub { owner = "aome510"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-5+YBlXHpAzGgw6MqgnMSggCASS++A/WWomftX8Jxe7g="; + hash = "sha256-yYn8xuJE0mILF7poiTbHCmFswP/xG+BbL+AASrLpbAs="; }; - cargoHash = "sha256-PIYaJC3rVbPjc2CASzMGWAzUdrBwFnKqhrZO6nywdN8="; + cargoHash = "sha256-/q7xrsuRym5oDCGJRpBTdBach2CAbhCCC3cPFzCT4PU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/audio/spotify-qt/default.nix b/pkgs/applications/audio/spotify-qt/default.nix index 65a921ed5bf2b..d302643eb47df 100644 --- a/pkgs/applications/audio/spotify-qt/default.nix +++ b/pkgs/applications/audio/spotify-qt/default.nix @@ -22,7 +22,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake ]; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_INSTALL_PREFIX=" ]; + cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX=" ]; installFlags = [ "DESTDIR=$(out)" ]; diff --git a/pkgs/applications/audio/spotify/linux.nix b/pkgs/applications/audio/spotify/linux.nix index 117d2325ce361..239d032682458 100644 --- a/pkgs/applications/audio/spotify/linux.nix +++ b/pkgs/applications/audio/spotify/linux.nix @@ -14,14 +14,14 @@ let # If an update breaks things, one of those might have valuable info: # https://aur.archlinux.org/packages/spotify/ # https://community.spotify.com/t5/Desktop-Linux - version = "1.2.11.916.geb595a67"; + version = "1.2.13.661.ga588f749"; # To get the latest stable revision: # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated' # To get general information: # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.' # More examples of api usage: # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py - rev = "67"; + rev = "68"; deps = [ alsa-lib @@ -84,7 +84,7 @@ stdenv.mkDerivation { # https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334 src = fetchurl { url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap"; - sha512 = "3d5a9fda88a076a22bb6d0b6b586334865f03a4e852ca8e022468e3dd3520a81dea314721e26e54ba9309603e08f66588f005ee8970e73eccbf805ff70e89dca"; + hash = "sha512-THGSRx0sGOVEB6bOHWHiy1G0Acq0hUa94tG/v+i5DA+CluI58pqj8gYQ61k/ACLJXTUyM8SA92C8DK1Go18X8w=="; }; nativeBuildInputs = [ wrapGAppsHook makeShellWrapper squashfsTools ]; diff --git a/pkgs/applications/audio/sublime-music/default.nix b/pkgs/applications/audio/sublime-music/default.nix index 441ff9615498f..a2f6b17a87462 100644 --- a/pkgs/applications/audio/sublime-music/default.nix +++ b/pkgs/applications/audio/sublime-music/default.nix @@ -44,7 +44,7 @@ in python.pkgs.buildPythonApplication rec { pname = "sublime-music"; version = "0.12.0"; - format = "flit"; + format = "pyproject"; src = fetchFromGitHub { owner = "sublime-music"; @@ -54,6 +54,7 @@ python.pkgs.buildPythonApplication rec { }; nativeBuildInputs = [ + python.pkgs.flit-core gobject-introspection wrapGAppsHook ]; diff --git a/pkgs/applications/audio/tauon/default.nix b/pkgs/applications/audio/tauon/default.nix index 18e0cfe257f80..52ddd5302191e 100644 --- a/pkgs/applications/audio/tauon/default.nix +++ b/pkgs/applications/audio/tauon/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tauon"; - version = "7.6.6"; + version = "7.6.7"; src = fetchFromGitHub { owner = "Taiko2k"; repo = "TauonMusicBox"; rev = "v${finalAttrs.version}"; - hash = "sha256-yt5sMvYau43WwVerQlaOrvzJ4HnBOEVQqbql9UH8jnM="; + hash = "sha256-d25JM2LUQw6KYPojc+Pn40IwCYWLE9un0YAMIBC1NVg="; }; postUnpack = '' diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 63ecd18e4641b..459cbd6388b4b 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "yoshimi"; - version = "2.3.0.2"; + version = "2.3.0.3"; src = fetchFromGitHub { owner = "Yoshimi"; repo = pname; rev = version; - hash = "sha256-zFwfKy8CVecGhgr48T+eDNHfMdctfrNGenc/XJctyw8="; + hash = "sha256-IsmhLUGqoa4Le86LE9SHFiXeiIKgwNfLaPFYXxnC9BM="; }; sourceRoot = "${src.name}/src"; diff --git a/pkgs/applications/backup/ludusavi/default.nix b/pkgs/applications/backup/ludusavi/default.nix index efe99f845531f..f6abbf346c6da 100644 --- a/pkgs/applications/backup/ludusavi/default.nix +++ b/pkgs/applications/backup/ludusavi/default.nix @@ -12,22 +12,23 @@ , libXcursor , libXrandr , libXi +, vulkan-loader , gnome , libsForQt5 }: rustPlatform.buildRustPackage rec { pname = "ludusavi"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "mtkennerly"; repo = pname; rev = "v${version}"; - hash = "sha256-6wwBXgR0jutkM3L7Ihi4qryuOeBRItQTyKn2lNcvfdQ="; + hash = "sha256-eEuaDMfFxWcNM9+5TvZZXLgbDuGbyIAIuzEMVWbvYbg="; }; - cargoSha256 = "sha256-9ksstWNqc2Rq5fdb4/LLHGMUXQgri9BAo2LlkFl3Irg="; + cargoSha256 = "sha256-ENo562Y6K238NNEtgYoPw6EXjbcuxPuXiftIp/bGYYU="; nativeBuildInputs = [ cmake @@ -67,6 +68,7 @@ rustPlatform.buildRustPackage rec { libXcursor libXrandr libXi + vulkan-loader ]; in '' diff --git a/pkgs/applications/blockchains/aeon/default.nix b/pkgs/applications/blockchains/aeon/default.nix index 13928c856b99c..7928a63b82643 100644 --- a/pkgs/applications/blockchains/aeon/default.nix +++ b/pkgs/applications/blockchains/aeon/default.nix @@ -26,7 +26,6 @@ stdenv.mkDerivation { ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DBUILD_GUI_DEPS=ON" "-DReadline_ROOT_DIR=${readline.dev}" ]; diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index afb8547afc172..abeea41cfd4a9 100644 --- a/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/pkgs/applications/blockchains/btcpayserver/default.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "btcpayserver"; - version = "1.11.4"; + version = "1.11.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-PJhc+Kv/iZ73DkM9KXzujTsIc071wqn/NKhuUPs/7dA="; + sha256 = "sha256-PORzTbvB9HriilaBCsC6R323RFvsI55WgSojJJ6uoIs="; }; projectFile = "BTCPayServer/BTCPayServer.csproj"; diff --git a/pkgs/applications/blockchains/btcpayserver/deps.nix b/pkgs/applications/blockchains/btcpayserver/deps.nix index 392a7e15e4513..6cc22d122fbc4 100644 --- a/pkgs/applications/blockchains/btcpayserver/deps.nix +++ b/pkgs/applications/blockchains/btcpayserver/deps.nix @@ -11,7 +11,6 @@ (fetchNuGet { pname = "BTCPayServer.Lightning.All"; version = "1.4.31"; sha256 = "1yxg2651m649ha99rzjv7pnphx42bxzf5sc86czj6ng4rpp8rnkb"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Charge"; version = "1.3.20"; sha256 = "0nk82hkgs67mxfxkgbav8yxxd79m0xyqaan7vay00gg33pjqdjvj"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; version = "1.3.28"; sha256 = "05jkdds1g0xfvf8spakwbyndz8an2kadwybg6dwz6q5rlk0aj7m8"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.16"; sha256 = "1g37736b4k0ncpyy2qycbk4l85fqvgwac3k98nbdj0dvhfghp1dn"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.21"; sha256 = "042xwfsxd30zgwiz0w14ynb755w5sldkplxgw1fkw68lrz66x5s4"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Eclair"; version = "1.3.20"; sha256 = "093w82mcxxxbvx66j0sp3lsfm2bkbi3igm80iz9zdghy85845kc9"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.LNBank"; version = "1.3.26"; sha256 = "1kfl88psjbsh88l98kc6dyxqjghnzyffi070v2ifkdjcdgdbawfs"; }) @@ -38,7 +37,7 @@ (fetchNuGet { pname = "HtmlSanitizer"; version = "5.0.372"; sha256 = "1gllp58vdbql2ybwf05i2178x7p4g8zyyk64317d1pyss5217g7r"; }) (fetchNuGet { pname = "Humanizer.Core"; version = "2.8.26"; sha256 = "1v8xd12yms4qq1md4vh6faxicmqrvahqdd7sdkyzrphab9v44nsm"; }) (fetchNuGet { pname = "libsodium"; version = "1.0.18"; sha256 = "15qzl5k31yaaapqlijr336lh4lzz1qqxlimgxy8fdyig8jdmgszn"; }) - (fetchNuGet { pname = "LNURL"; version = "0.0.30"; sha256 = "1sph5vkl0794aky21inp8b9dz2v2clxxx6whfg2g71c0cxrxa3r5"; }) + (fetchNuGet { pname = "LNURL"; version = "0.0.34"; sha256 = "1sbkqsln7wq5fsbw63wdha8kqwxgd95j0iblv4kxa1shyg3c5d9x"; }) (fetchNuGet { pname = "MailKit"; version = "3.3.0"; sha256 = "18l0jkrc4d553kiw4vdjzzpafpvsgjs1n19kjbi8isnhzidmsl4j"; }) (fetchNuGet { pname = "Microsoft.AspNet.SignalR.Client"; version = "2.4.3"; sha256 = "1whxcmxydcxjkw84sqk5idd406v3ia0xj2m4ia4b6wqbvkdqn7rf"; }) (fetchNuGet { pname = "Microsoft.AspNet.WebApi.Client"; version = "5.2.9"; sha256 = "1sy1q36bm9fz3gi780w4jgysw3dwaz2f3a5gcn6jxw1gkmdasb08"; }) @@ -164,6 +163,7 @@ (fetchNuGet { pname = "NBXplorer.Client"; version = "4.2.5"; sha256 = "0kycvnxgqrkxig8k6mp1897sqbq2xarc8429vnjh79644nakdas4"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; }) (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.1"; sha256 = "1r1hvj5gjl466bya2bfl5aaj8rbwyf5x1msg710wf3k2llbci1xa"; }) (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.2"; sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; }) (fetchNuGet { pname = "NicolasDorier.CommandLine"; version = "2.0.0"; sha256 = "0gywvl0gqs3crlzwgwzcqf0qsrbhk3dxjycpimxqvs1ihg4dhb1f"; }) diff --git a/pkgs/applications/blockchains/dcrctl/default.nix b/pkgs/applications/blockchains/dcrctl/default.nix index 31e56254ee786..97f9b7767db7b 100644 --- a/pkgs/applications/blockchains/dcrctl/default.nix +++ b/pkgs/applications/blockchains/dcrctl/default.nix @@ -19,6 +19,6 @@ buildGoModule rec { homepage = "https://decred.org"; description = "A secure Decred wallet daemon written in Go (golang)"; license = with lib.licenses; [ isc ]; - maintainers = with lib.maintainers; [ aaronjheng ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/applications/blockchains/dcrwallet/default.nix b/pkgs/applications/blockchains/dcrwallet/default.nix index d66147ca52bff..da1755f14b5bc 100644 --- a/pkgs/applications/blockchains/dcrwallet/default.nix +++ b/pkgs/applications/blockchains/dcrwallet/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dcrwallet"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "decred"; repo = "dcrwallet"; rev = "release-v${version}"; - hash = "sha256-ffY5IvSGu4Q7EdJpfdsIKxxjkm6FD0DR9ItnaO90SBc="; + hash = "sha256-Pz25jExqbvy8fgiZy9vaYuVp8kuE6deGLlBEjxTnYGQ="; }; - vendorHash = "sha256-dduHuMa5UPf73lfirTHSrYnOUbc2IyULpstZPGUJzuc="; + vendorHash = "sha256-lvN7OcDoEzb9LyH9C5q8pd0BOnF2VKuh4O82U+tQ6fI="; subPackages = [ "." ]; diff --git a/pkgs/applications/blockchains/erigon/default.nix b/pkgs/applications/blockchains/erigon/default.nix index a68e230c24462..7fc27555bcfed 100644 --- a/pkgs/applications/blockchains/erigon/default.nix +++ b/pkgs/applications/blockchains/erigon/default.nix @@ -2,7 +2,7 @@ let pname = "erigon"; - version = "2.48.1"; + version = "2.50.0"; in buildGoModule { inherit pname version; @@ -11,11 +11,11 @@ buildGoModule { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - hash = "sha256-ApVsrK1Di6d3WBj/VIUcYJBceFDTeNfsXYPRfbytvZg="; + hash = "sha256-gZ01nmxzXRK8YRwnl5qGkU6dqBYKPUkNZmbClwgsuL0="; fetchSubmodules = true; }; - vendorHash = "sha256-bsPeEAhvuT5GIpYMoyPyh0BHMDKyKjBiVnYLjtF4Mkc="; + vendorHash = "sha256-4s5dXTfYlgzYQ2h30F6kxEF626iKYFRoZlNXeFDbn8s="; proxyVendor = true; # Build errors in mdbx when format hardening is enabled: diff --git a/pkgs/applications/blockchains/framesh/default.nix b/pkgs/applications/blockchains/framesh/default.nix index 28a25d8d5c891..68eaf2a1adff8 100644 --- a/pkgs/applications/blockchains/framesh/default.nix +++ b/pkgs/applications/blockchains/framesh/default.nix @@ -1,11 +1,11 @@ -{ lib, fetchurl, appimageTools }: +{ lib, fetchurl, appimageTools, makeWrapper }: let pname = "framesh"; - version = "0.6.7"; + version = "0.6.8"; src = fetchurl { url = "https://github.com/floating/frame/releases/download/v${version}/Frame-${version}.AppImage"; - sha256 = "sha256-yPNgrC9ZQcl1gCStMXMbZvk15jZylM2NgKM9H3XcJVQ="; + hash = "sha256-qTbT1g+9hypBUxRMZ/Eat5OGb1y6yJlxQ6iJzfQH8G4="; }; appimageContents = appimageTools.extractType2 { @@ -20,6 +20,11 @@ appimageTools.wrapType2 { install -m 444 -D ${appimageContents}/frame.desktop $out/share/applications/frame.desktop install -m 444 -D ${appimageContents}/frame.png \ $out/share/icons/hicolor/512x512/apps/frame.png + + source "${makeWrapper}/nix-support/setup-hook" + wrapProgram "$out/bin/${pname}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}" + substituteInPlace $out/share/applications/frame.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' ''; diff --git a/pkgs/applications/blockchains/fulcrum/default.nix b/pkgs/applications/blockchains/fulcrum/default.nix index c26efb5d4e602..584d6927d73af 100644 --- a/pkgs/applications/blockchains/fulcrum/default.nix +++ b/pkgs/applications/blockchains/fulcrum/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "fulcrum"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "cculianu"; repo = "Fulcrum"; rev = "v${version}"; - sha256 = "sha256-guvOs/HsSuj5QOMTzmKxMaC8iUyTkVgEpp8pQ63aIIQ="; + sha256 = "sha256-iHVrJySNdbZ9RXP7QgsDy2o2U/EISAp1/9NFpcEOGeI="; }; nativeBuildInputs = [ pkg-config qmake ]; diff --git a/pkgs/applications/blockchains/go-ethereum/default.nix b/pkgs/applications/blockchains/go-ethereum/default.nix index 49817edd170d4..96e493131dd8b 100644 --- a/pkgs/applications/blockchains/go-ethereum/default.nix +++ b/pkgs/applications/blockchains/go-ethereum/default.nix @@ -9,16 +9,16 @@ let in buildGoModule rec { pname = "go-ethereum"; - version = "1.12.2"; + version = "1.13.0"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iCLOrf6/f0f7sD0YjmBtlcOcZRDIp9IZkBadTKj1Qjw="; + sha256 = "sha256-tomzF0jM1tcxnnBHLfNWcR1XGECxU8Q/SQAWQBRAFW8="; }; - vendorHash = "sha256-ChmQjhz4dQdwcY/269Hi5XAn8/+0z/AF7Kd9PJ8WqHg="; + vendorHash = "sha256-VX2S7yjdcconPd8wisV+Cl6FVuEUGU7smIBKfTxpUVY="; doCheck = false; diff --git a/pkgs/applications/blockchains/haven-cli/default.nix b/pkgs/applications/blockchains/haven-cli/default.nix index 2bc3a683ef50b..066bbde363ac4 100644 --- a/pkgs/applications/blockchains/haven-cli/default.nix +++ b/pkgs/applications/blockchains/haven-cli/default.nix @@ -45,7 +45,6 @@ stdenv.mkDerivation rec { ++ lib.optionals trezorSupport [ libusb1 protobuf python3 ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DUSE_DEVICE_TREZOR=ON" "-DBUILD_GUI_DEPS=ON" "-DReadline_ROOT_DIR=${readline.dev}" diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 6587932d3645f..fffa95566bf4a 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,14 +2,13 @@ let pname = "ledger-live-desktop"; - version = "2.66.0"; + version = "2.69.0"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-Du2bvtlNjxtkJ31RCKZmGtWxOEIjohbmEC5o3VvFGlY="; + hash = "sha256-9eELWlOzUd3xwAoob5XCj16JihOt6SHZe0Ybxb9dtQI="; }; - appimageContents = appimageTools.extractType2 { inherit pname version src; }; @@ -23,6 +22,7 @@ appimageTools.wrapType2 rec { install -m 444 -D ${appimageContents}/ledger-live-desktop.png $out/share/icons/hicolor/1024x1024/apps/ledger-live-desktop.png ${imagemagick}/bin/convert ${appimageContents}/ledger-live-desktop.png -resize 512x512 ledger-live-desktop_512.png install -m 444 -D ledger-live-desktop_512.png $out/share/icons/hicolor/512x512/apps/ledger-live-desktop.png + substituteInPlace $out/share/applications/ledger-live-desktop.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' ''; diff --git a/pkgs/applications/blockchains/monero-cli/default.nix b/pkgs/applications/blockchains/monero-cli/default.nix index 4d07a964af184..0dc220ac66dc5 100644 --- a/pkgs/applications/blockchains/monero-cli/default.nix +++ b/pkgs/applications/blockchains/monero-cli/default.nix @@ -58,7 +58,6 @@ stdenv.mkDerivation rec { ++ lib.optionals trezorSupport [ libusb1 protobuf python3 ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DUSE_DEVICE_TREZOR=ON" "-DBUILD_GUI_DEPS=ON" "-DReadline_ROOT_DIR=${readline.dev}" diff --git a/pkgs/applications/blockchains/nbxplorer/default.nix b/pkgs/applications/blockchains/nbxplorer/default.nix index 6bd443e428b50..6de7cf7578c4d 100644 --- a/pkgs/applications/blockchains/nbxplorer/default.nix +++ b/pkgs/applications/blockchains/nbxplorer/default.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "nbxplorer"; - version = "2.3.65"; + version = "2.3.66"; src = fetchFromGitHub { owner = "dgarage"; repo = "NBXplorer"; rev = "v${version}"; - sha256 = "sha256-7m9gf+enOtE5VWuBNLFf11ofLGBRAYWvmkrekUVQQaQ="; + sha256 = "sha256-DcSY2hnzJexsrRw4k57uOBfDkveEvXccN8GDUR/QmKw="; }; projectFile = "NBXplorer/NBXplorer.csproj"; diff --git a/pkgs/applications/blockchains/nbxplorer/deps.nix b/pkgs/applications/blockchains/nbxplorer/deps.nix index e9b1de7ed900d..cd30980105059 100644 --- a/pkgs/applications/blockchains/nbxplorer/deps.nix +++ b/pkgs/applications/blockchains/nbxplorer/deps.nix @@ -34,8 +34,8 @@ (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.0.1"; sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.3.0"; sha256 = "1gxyzxam8163vk1kb6xzxjj4iwspjsz9zhgn1w9rjzciphaz0ig7"; }) - (fetchNuGet { pname = "NBitcoin"; version = "7.0.24"; sha256 = "0yc6cgwp2xr2dzjsrkawyh43whixv66nvvq6rh1pi6gi14iaqmfa"; }) - (fetchNuGet { pname = "NBitcoin.Altcoins"; version = "3.0.18"; sha256 = "054i15qan5154iy8m13jmhnz1w5rs208i1xhlfnivwiq2v1c2qby"; }) + (fetchNuGet { pname = "NBitcoin"; version = "7.0.27"; sha256 = "0s2i6bjbiz5jlgydn4hja0b42s0yzw0cal0pv2a57hfcd948zc1f"; }) + (fetchNuGet { pname = "NBitcoin.Altcoins"; version = "3.0.19"; sha256 = "16bv3314flq6ildsjzxzw4ih2wbryvkjpkcwkvf2lh2smqhnvr11"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "10.0.3"; sha256 = "06vy67bkshclpz69kps4vgzc9h2cgg41c8vlqmdbwclfky7c4haq"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) diff --git a/pkgs/applications/blockchains/optimism/default.nix b/pkgs/applications/blockchains/optimism/default.nix index 60520c069bd6f..5ff7f80e3c3af 100644 --- a/pkgs/applications/blockchains/optimism/default.nix +++ b/pkgs/applications/blockchains/optimism/default.nix @@ -6,19 +6,19 @@ buildGoModule rec { pname = "optimism"; - version = "1.1.1"; + version = "1.1.4"; src = fetchFromGitHub { owner = "ethereum-optimism"; repo = "optimism"; rev = "op-node/v${version}"; - hash = "sha256-COTpmjDH1u2dJA0nKPBG1Aocpyyo8NdtowwjHDTbEKI="; + hash = "sha256-UDNqD3gA27qqaJYbpgOWoL0AeLb7OZRCRJcGNKRq67g="; fetchSubmodules = true; }; subPackages = [ "op-node/cmd" "op-proposer/cmd" "op-batcher/cmd" ]; - vendorHash = "sha256-yAUeCX05dCVEvIzp0cXB/qYVtu3gQfgFi1CNZZKllOU="; + vendorHash = "sha256-OGOdU6X3dcAu4BDpG62bK8LaMo+NuzFOUSjdPNhRGZM="; buildInputs = [ libpcap diff --git a/pkgs/applications/blockchains/optimism/geth.nix b/pkgs/applications/blockchains/optimism/geth.nix index a6820e2e501ef..0bc975e588022 100644 --- a/pkgs/applications/blockchains/optimism/geth.nix +++ b/pkgs/applications/blockchains/optimism/geth.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "op-geth"; - version = "1.101200.0"; + version = "1.101200.1"; src = fetchFromGitHub { owner = "ethereum-optimism"; repo = "op-geth"; rev = "v${version}"; - hash = "sha256-KUq2BSl+9FU7xX0BLWlOEolIgx0VFDXBK6o1YIo9QDQ="; + hash = "sha256-xF/KaN/O0Hn3W2a11ivdgLVr5gR14dW5807r1snQ9xw="; fetchSubmodules = true; }; @@ -33,7 +33,7 @@ buildGoModule rec { "cmd/utils" ]; - vendorHash = "sha256-oGMvazo3X9tOmy/o4xUYRlHsQBR0teBj3kF0TlI7mdg="; + vendorHash = "sha256-5G0wPQaP2MofQQO1AiFa1BF8zarRnYyNYscbZ4Ku44o="; # Fix for usb-related segmentation faults on darwin propagatedBuildInputs = diff --git a/pkgs/applications/blockchains/oxen/default.nix b/pkgs/applications/blockchains/oxen/default.nix index a8948d7df5a11..5c8cbbbbcdd5d 100644 --- a/pkgs/applications/blockchains/oxen/default.nix +++ b/pkgs/applications/blockchains/oxen/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { # Required for static linking, the only supported install path lbzmqsrc = fetchurl { url = "https://github.com/zeromq/libzmq/releases/download/v4.3.3/zeromq-4.3.3.tar.gz"; - sha512 = "4c18d784085179c5b1fcb753a93813095a12c8d34970f2e1bfca6499be6c9d67769c71c68b7ca54ff181b20390043170e89733c22f76ff1ea46494814f7095b1"; + hash = "sha512-TBjXhAhRecWx/LdTqTgTCVoSyNNJcPLhv8pkmb5snWd2nHHGi3ylT/GBsgOQBDFw6Jczwi92/x6kZJSBT3CVsQ=="; }; postPatch = '' @@ -47,7 +47,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals trezorSupport [ libusb1 protobuf python3 ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" # "-DUSE_DEVICE_TREZOR=ON" # "-DBUILD_GUI_DEPS=ON" "-DReadline_ROOT_DIR=${readline.dev}" diff --git a/pkgs/applications/blockchains/polkadot/Cargo.lock b/pkgs/applications/blockchains/polkadot/Cargo.lock index 3930b50220fc6..2ebbe1296fb14 100644 --- a/pkgs/applications/blockchains/polkadot/Cargo.lock +++ b/pkgs/applications/blockchains/polkadot/Cargo.lock @@ -18,7 +18,16 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" dependencies = [ - "gimli", + "gimli 0.27.3", +] + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli 0.28.0", ] [[package]] @@ -39,7 +48,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", ] [[package]] @@ -48,11 +57,21 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", "rand_core 0.6.4", ] [[package]] +name = "aead" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" +dependencies = [ + "crypto-common", + "generic-array 0.14.7", +] + +[[package]] name = "aes" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -76,17 +95,14 @@ dependencies = [ ] [[package]] -name = "aes-gcm" -version = "0.8.0" +name = "aes" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5278b5fabbb9bd46e24aa69b2fdea62c99088e0a950a9be40e3e0101298f88da" +checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" dependencies = [ - "aead 0.3.2", - "aes 0.6.0", - "cipher 0.2.5", - "ctr 0.6.0", - "ghash 0.3.1", - "subtle", + "cfg-if", + "cipher 0.4.4", + "cpufeatures", ] [[package]] @@ -104,6 +120,20 @@ dependencies = [ ] [[package]] +name = "aes-gcm" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "209b47e8954a928e1d72e86eca7000ebb6655fe1436d33eefc2201cad027e237" +dependencies = [ + "aead 0.5.2", + "aes 0.8.3", + "cipher 0.4.4", + "ctr 0.9.2", + "ghash 0.5.0", + "subtle", +] + +[[package]] name = "aes-soft" version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -129,37 +159,58 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.10", "once_cell", "version_check", ] [[package]] name = "ahash" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf6ccdb167abbf410dcb915cabd428929d7f6a04980b54a11f26a39f1c7f7107" +checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" dependencies = [ "cfg-if", - "getrandom 0.2.8", + "getrandom 0.2.10", "once_cell", "version_check", ] [[package]] name = "aho-corasick" -version = "0.7.18" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" dependencies = [ "memchr", ] [[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[package]] name = "always-assert" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbf688625d06217d5b1bb0ea9d9c44a1635fd0ee3534466388d18203174f4d11" +checksum = "4436e0292ab1bb631b42973c61205e704475fe8126af845c8d923c0996328127" + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] [[package]] name = "anes" @@ -178,30 +229,29 @@ dependencies = [ [[package]] name = "anstream" -version = "0.3.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", - "is-terminal", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" +checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" [[package]] name = "anstyle-parse" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" dependencies = [ "utf8parse", ] @@ -217,9 +267,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "1.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" dependencies = [ "anstyle", "windows-sys 0.48.0", @@ -227,24 +277,38 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.69" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "approx" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "072df7202e63b127ab55acfe16ce97013d5b97bf160489336d3f1840fd78e99e" +checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" dependencies = [ "num-traits", ] [[package]] +name = "aquamarine" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df752953c49ce90719c7bf1fc587bc8227aed04732ea0c0f85e5397d7fdbd1a1" +dependencies = [ + "include_dir", + "itertools 0.10.5", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] name = "arbitrary" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29d47fbf90d5149a107494b15a7dc8d69b351be2db3bb9691740e88ec17fd880" +checksum = "e2d098ff73c1ca148721f37baad5ea6a465a13f9573aba8641fbbbae8164a54e" [[package]] name = "arc-swap" @@ -253,6 +317,261 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" [[package]] +name = "ark-algebra-test-templates" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "400bd3a79c741b1832f1416d4373ae077ef82ca14a8b4cee1248a2f11c8b9172" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-serialize", + "ark-std", + "hex", + "num-bigint", + "num-integer", + "num-traits", + "serde", + "serde_derive", + "serde_json", + "sha2 0.10.7", +] + +[[package]] +name = "ark-bls12-377" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb00293ba84f51ce3bd026bd0de55899c4e68f0a39a5728cebae3a73ffdc0a4f" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-std", +] + +[[package]] +name = "ark-bls12-381" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c775f0d12169cba7aae4caeb547bb6a50781c7449a8aa53793827c9ec4abf488" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-serialize", + "ark-std", +] + +[[package]] +name = "ark-bw6-761" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e0605daf0cc5aa2034b78d008aaf159f56901d92a52ee4f6ecdfdac4f426700" +dependencies = [ + "ark-bls12-377", + "ark-ec", + "ark-ff", + "ark-std", +] + +[[package]] +name = "ark-ec" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "defd9a439d56ac24968cca0571f598a61bc8c55f71d50a89cda591cb750670ba" +dependencies = [ + "ark-ff", + "ark-poly", + "ark-serialize", + "ark-std", + "derivative", + "hashbrown 0.13.2", + "itertools 0.10.5", + "num-traits", + "zeroize", +] + +[[package]] +name = "ark-ed-on-bls12-377" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b10d901b9ac4b38f9c32beacedfadcdd64e46f8d7f8e88c1ae1060022cf6f6c6" +dependencies = [ + "ark-bls12-377", + "ark-ec", + "ark-ff", + "ark-std", +] + +[[package]] +name = "ark-ed-on-bls12-381-bandersnatch" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9cde0f2aa063a2a5c28d39b47761aa102bda7c13c84fc118a61b87c7b2f785c" +dependencies = [ + "ark-bls12-381", + "ark-ec", + "ark-ff", + "ark-std", +] + +[[package]] +name = "ark-ff" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec847af850f44ad29048935519032c33da8aa03340876d351dfab5660d2966ba" +dependencies = [ + "ark-ff-asm", + "ark-ff-macros", + "ark-serialize", + "ark-std", + "derivative", + "digest 0.10.7", + "itertools 0.10.5", + "num-bigint", + "num-traits", + "paste", + "rustc_version 0.4.0", + "zeroize", +] + +[[package]] +name = "ark-ff-asm" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ed4aa4fe255d0bc6d79373f7e31d2ea147bcf486cba1be5ba7ea85abdb92348" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-ff-macros" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565" +dependencies = [ + "num-bigint", + "num-traits", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-poly" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d320bfc44ee185d899ccbadfa8bc31aab923ce1558716e1997a1e74057fe86bf" +dependencies = [ + "ark-ff", + "ark-serialize", + "ark-std", + "derivative", + "hashbrown 0.13.2", +] + +[[package]] +name = "ark-r1cs-std" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de1d1472e5cb020cb3405ce2567c91c8d43f21b674aef37b0202f5c3304761db" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-relations", + "ark-std", + "derivative", + "num-bigint", + "num-integer", + "num-traits", + "tracing", +] + +[[package]] +name = "ark-relations" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00796b6efc05a3f48225e59cb6a2cda78881e7c390872d5786aaf112f31fb4f0" +dependencies = [ + "ark-ff", + "ark-std", + "tracing", + "tracing-subscriber 0.2.25", +] + +[[package]] +name = "ark-scale" +version = "0.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49b08346a3e38e2be792ef53ee168623c9244d968ff00cd70fb9932f6fe36393" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-serialize", + "ark-std", + "parity-scale-codec", +] + +[[package]] +name = "ark-secret-scalar" +version = "0.0.2" +source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-serialize", + "ark-std", + "ark-transcript", + "digest 0.10.7", + "rand_core 0.6.4", + "zeroize", +] + +[[package]] +name = "ark-serialize" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5" +dependencies = [ + "ark-serialize-derive", + "ark-std", + "digest 0.10.7", + "num-bigint", +] + +[[package]] +name = "ark-serialize-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae3281bc6d0fd7e549af32b52511e1302185bd688fd3359fa36423346ff682ea" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-std" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" +dependencies = [ + "num-traits", + "rand 0.8.5", +] + +[[package]] +name = "ark-transcript" +version = "0.0.2" +source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1" +dependencies = [ + "ark-ff", + "ark-serialize", + "ark-std", + "digest 0.10.7", + "rand_core 0.6.4", + "sha3", +] + +[[package]] name = "array-bytes" version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -260,9 +579,18 @@ checksum = "d9b1c5a481ec30a5abd8dfbd94ab5cf1bb4e9a66be7f1b3b322f2f1170c200fd" [[package]] name = "arrayref" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" + +[[package]] +name = "arrayvec" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9" +dependencies = [ + "nodrop", +] [[package]] name = "arrayvec" @@ -272,9 +600,9 @@ checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" [[package]] name = "arrayvec" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "asn1-rs" @@ -289,14 +617,14 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time 0.3.17", + "time 0.3.27", ] [[package]] name = "asn1-rs" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf6690c370453db30743b373a60ba498fc0d6d83b11f4abfd87a84a075db5dd4" +checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0" dependencies = [ "asn1-rs-derive 0.4.0", "asn1-rs-impl", @@ -305,7 +633,7 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time 0.3.17", + "time 0.3.27", ] [[package]] @@ -345,13 +673,14 @@ dependencies = [ [[package]] name = "assert_cmd" -version = "2.0.4" +version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ae1ddd39efd67689deb1979d80bad3bf7f2b09c6e6117c8d1f2443b5e2f83e" +checksum = "88903cb14723e4d4003335bb7f8a14f27691649105346a0f0957466c096adfe6" dependencies = [ + "anstyle", "bstr", "doc-comment", - "predicates", + "predicates 3.0.3", "predicates-core", "predicates-tree", "wait-timeout", @@ -364,45 +693,444 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" [[package]] +name = "asset-hub-kusama-integration-tests" +version = "1.0.0" +dependencies = [ + "assert_matches", + "asset-hub-kusama-runtime", + "frame-support", + "frame-system", + "integration-tests-common", + "pallet-asset-conversion", + "pallet-assets", + "pallet-balances", + "pallet-xcm", + "parachains-common", + "parity-scale-codec", + "polkadot-core-primitives", + "polkadot-parachain-primitives", + "polkadot-runtime", + "polkadot-runtime-parachains", + "sp-runtime", + "staging-xcm", + "xcm-emulator", +] + +[[package]] +name = "asset-hub-kusama-runtime" +version = "0.9.420" +dependencies = [ + "asset-test-utils", + "assets-common", + "cumulus-pallet-aura-ext", + "cumulus-pallet-dmp-queue", + "cumulus-pallet-parachain-system", + "cumulus-pallet-session-benchmarking", + "cumulus-pallet-xcm", + "cumulus-pallet-xcmp-queue", + "cumulus-primitives-core", + "cumulus-primitives-utility", + "frame-benchmarking", + "frame-executive", + "frame-support", + "frame-system", + "frame-system-benchmarking", + "frame-system-rpc-runtime-api", + "frame-try-runtime", + "hex-literal 0.4.1", + "kusama-runtime-constants", + "log", + "pallet-asset-conversion", + "pallet-asset-conversion-tx-payment", + "pallet-assets", + "pallet-aura", + "pallet-authorship", + "pallet-balances", + "pallet-collator-selection", + "pallet-multisig", + "pallet-nft-fractionalization", + "pallet-nfts", + "pallet-nfts-runtime-api", + "pallet-proxy", + "pallet-session", + "pallet-state-trie-migration", + "pallet-timestamp", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "pallet-uniques", + "pallet-utility", + "pallet-xcm", + "pallet-xcm-benchmarks", + "parachain-info", + "parachains-common", + "parity-scale-codec", + "polkadot-core-primitives", + "polkadot-parachain-primitives", + "polkadot-runtime-common", + "primitive-types", + "scale-info", + "smallvec", + "sp-api", + "sp-block-builder", + "sp-consensus-aura", + "sp-core", + "sp-inherents", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-std", + "sp-storage", + "sp-transaction-pool", + "sp-version", + "sp-weights", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "substrate-wasm-builder", +] + +[[package]] +name = "asset-hub-polkadot-integration-tests" +version = "1.0.0" +dependencies = [ + "asset-hub-kusama-runtime", + "frame-support", + "frame-system", + "integration-tests-common", + "pallet-asset-conversion", + "pallet-assets", + "pallet-balances", + "pallet-xcm", + "parachains-common", + "parity-scale-codec", + "polkadot-core-primitives", + "polkadot-parachain-primitives", + "polkadot-runtime", + "polkadot-runtime-parachains", + "sp-runtime", + "staging-xcm", + "xcm-emulator", +] + +[[package]] +name = "asset-hub-polkadot-runtime" +version = "0.9.420" +dependencies = [ + "asset-test-utils", + "assets-common", + "cumulus-pallet-aura-ext", + "cumulus-pallet-dmp-queue", + "cumulus-pallet-parachain-system", + "cumulus-pallet-session-benchmarking", + "cumulus-pallet-xcm", + "cumulus-pallet-xcmp-queue", + "cumulus-primitives-core", + "cumulus-primitives-utility", + "frame-benchmarking", + "frame-executive", + "frame-support", + "frame-system", + "frame-system-benchmarking", + "frame-system-rpc-runtime-api", + "frame-try-runtime", + "hex-literal 0.4.1", + "log", + "pallet-asset-tx-payment", + "pallet-assets", + "pallet-aura", + "pallet-authorship", + "pallet-balances", + "pallet-collator-selection", + "pallet-multisig", + "pallet-nfts", + "pallet-nfts-runtime-api", + "pallet-proxy", + "pallet-session", + "pallet-timestamp", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "pallet-uniques", + "pallet-utility", + "pallet-xcm", + "pallet-xcm-benchmarks", + "parachain-info", + "parachains-common", + "parity-scale-codec", + "polkadot-core-primitives", + "polkadot-parachain-primitives", + "polkadot-runtime-common", + "polkadot-runtime-constants", + "scale-info", + "smallvec", + "sp-api", + "sp-block-builder", + "sp-consensus-aura", + "sp-core", + "sp-inherents", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-std", + "sp-storage", + "sp-transaction-pool", + "sp-version", + "sp-weights", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "substrate-wasm-builder", +] + +[[package]] +name = "asset-hub-westend-integration-tests" +version = "1.0.0" +dependencies = [ + "assert_matches", + "asset-hub-westend-runtime", + "frame-support", + "frame-system", + "integration-tests-common", + "pallet-asset-conversion", + "pallet-assets", + "pallet-balances", + "pallet-xcm", + "parachains-common", + "parity-scale-codec", + "polkadot-core-primitives", + "polkadot-parachain-primitives", + "polkadot-runtime", + "polkadot-runtime-parachains", + "sp-runtime", + "staging-xcm", + "xcm-emulator", +] + +[[package]] +name = "asset-hub-westend-runtime" +version = "0.9.420" +dependencies = [ + "asset-test-utils", + "assets-common", + "cumulus-pallet-aura-ext", + "cumulus-pallet-dmp-queue", + "cumulus-pallet-parachain-system", + "cumulus-pallet-session-benchmarking", + "cumulus-pallet-xcm", + "cumulus-pallet-xcmp-queue", + "cumulus-primitives-core", + "cumulus-primitives-utility", + "frame-benchmarking", + "frame-executive", + "frame-support", + "frame-system", + "frame-system-benchmarking", + "frame-system-rpc-runtime-api", + "frame-try-runtime", + "hex-literal 0.4.1", + "log", + "pallet-asset-conversion", + "pallet-asset-conversion-tx-payment", + "pallet-assets", + "pallet-aura", + "pallet-authorship", + "pallet-balances", + "pallet-collator-selection", + "pallet-multisig", + "pallet-nft-fractionalization", + "pallet-nfts", + "pallet-nfts-runtime-api", + "pallet-proxy", + "pallet-session", + "pallet-timestamp", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "pallet-uniques", + "pallet-utility", + "pallet-xcm", + "pallet-xcm-benchmarks", + "parachain-info", + "parachains-common", + "parity-scale-codec", + "polkadot-core-primitives", + "polkadot-parachain-primitives", + "polkadot-runtime-common", + "primitive-types", + "scale-info", + "smallvec", + "sp-api", + "sp-block-builder", + "sp-consensus-aura", + "sp-core", + "sp-inherents", + "sp-io", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-std", + "sp-storage", + "sp-transaction-pool", + "sp-version", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "substrate-wasm-builder", + "westend-runtime-constants", +] + +[[package]] +name = "asset-test-utils" +version = "1.0.0" +dependencies = [ + "assets-common", + "cumulus-pallet-dmp-queue", + "cumulus-pallet-parachain-system", + "cumulus-pallet-xcmp-queue", + "cumulus-primitives-core", + "cumulus-primitives-parachain-inherent", + "cumulus-test-relay-sproof-builder", + "frame-support", + "frame-system", + "hex-literal 0.4.1", + "pallet-assets", + "pallet-balances", + "pallet-collator-selection", + "pallet-session", + "pallet-xcm", + "parachain-info", + "parachains-common", + "parachains-runtimes-test-utils", + "parity-scale-codec", + "polkadot-parachain-primitives", + "sp-consensus-aura", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "staging-xcm", + "staging-xcm-executor", + "substrate-wasm-builder", +] + +[[package]] +name = "assets-common" +version = "0.1.0" +dependencies = [ + "cumulus-primitives-core", + "frame-support", + "impl-trait-for-tuples", + "log", + "pallet-asset-conversion", + "pallet-asset-tx-payment", + "pallet-xcm", + "parachains-common", + "parity-scale-codec", + "scale-info", + "sp-api", + "sp-runtime", + "sp-std", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "substrate-wasm-builder", +] + +[[package]] name = "async-channel" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ - "concurrent-queue 2.1.0", + "concurrent-queue", "event-listener", "futures-core", ] [[package]] -name = "async-io" +name = "async-executor" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" +dependencies = [ + "async-lock", + "async-task", + "concurrent-queue", + "fastrand 1.9.0", + "futures-lite", + "slab", +] + +[[package]] +name = "async-fs" version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a811e6a479f2439f0c04038796b5cfb3d2ad56c230e0f2d3f7b04d68cfee607b" +checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" dependencies = [ - "concurrent-queue 1.2.2", + "async-lock", + "autocfg", + "blocking", + "futures-lite", +] + +[[package]] +name = "async-io" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +dependencies = [ + "async-lock", + "autocfg", + "cfg-if", + "concurrent-queue", "futures-lite", - "libc", "log", - "once_cell", "parking", "polling", + "rustix 0.37.23", "slab", - "socket2", + "socket2 0.4.9", "waker-fn", - "winapi", ] [[package]] name = "async-lock" -version = "2.4.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6a8ea61bf9947a1007c5cada31e647dbc77b103c679858150003ba697ea798b" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ "event-listener", ] [[package]] +name = "async-net" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4051e67316bc7eff608fe723df5d32ed639946adcd69e07df41fd42a7b411f1f" +dependencies = [ + "async-io", + "autocfg", + "blocking", + "futures-lite", +] + +[[package]] +name = "async-process" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9" +dependencies = [ + "async-io", + "async-lock", + "autocfg", + "blocking", + "cfg-if", + "event-listener", + "futures-lite", + "rustix 0.37.23", + "signal-hook", + "windows-sys 0.48.0", +] + +[[package]] name = "async-recursion" version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -410,38 +1138,72 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.31", ] [[package]] +name = "async-stream" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" +dependencies = [ + "async-stream-impl", + "futures-core", + "pin-project-lite 0.2.12", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.31", +] + +[[package]] +name = "async-task" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" + +[[package]] name = "async-trait" -version = "0.1.68" +version = "0.1.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.31", ] [[package]] name = "asynchronous-codec" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06a0daa378f5fd10634e44b0a29b2a87b890657658e072a30d6f26e57ddee182" +checksum = "4057f2c32adbb2fc158e22fb38433c8e9bbf76b75a4732c7c0cbaf695fb65568" dependencies = [ "bytes", "futures-sink", "futures-util", "memchr", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.12", ] [[package]] +name = "atomic-take" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8ab6b55fe97976e46f91ddbed8d147d966475dc29b2032757ba47e02376fbc3" + +[[package]] name = "atomic-waker" -version = "1.0.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a" +checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" [[package]] name = "atty" @@ -462,24 +1224,46 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.67" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ - "addr2line", + "addr2line 0.21.0", "cc", "cfg-if", "libc", - "miniz_oxide 0.6.2", - "object", + "miniz_oxide", + "object 0.32.0", "rustc-demangle", ] [[package]] +name = "bandersnatch_vrfs" +version = "0.0.1" +source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1" +dependencies = [ + "ark-bls12-381", + "ark-ec", + "ark-ed-on-bls12-381-bandersnatch", + "ark-ff", + "ark-scale", + "ark-serialize", + "ark-std", + "dleq_vrf", + "fflonk", + "merlin 3.0.0", + "rand_chacha 0.3.1", + "rand_core 0.6.4", + "ring 0.1.0", + "sha2 0.10.7", + "zeroize", +] + +[[package]] name = "base-x" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" +checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" [[package]] name = "base16ct" @@ -495,27 +1279,36 @@ checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" [[package]] name = "base64" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.0" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" [[package]] name = "base64ct" -version = "1.5.2" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea2b2456fd614d856680dcd9fcc660a51a820fa09daef2e49772b56a193c8474" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + +[[package]] +name = "basic-toml" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bfc506e7a2370ec239e1d072507b2a80c833083699d3c6fa176fbb4de8448c6" +dependencies = [ + "serde", +] [[package]] name = "beef" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bed554bd50246729a1ec158d08aa3235d1b69d94ad120ebe187e28894787e736" +checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1" dependencies = [ "serde", ] @@ -523,10 +1316,13 @@ dependencies = [ [[package]] name = "binary-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ + "array-bytes", + "env_logger 0.9.3", "hash-db", "log", + "sp-core", + "sp-runtime", ] [[package]] @@ -544,28 +1340,49 @@ version = "0.65.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cexpr", "clang-sys", "lazy_static", "lazycell", "peeking_take_while", - "prettyplease", + "prettyplease 0.2.12", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "syn 2.0.16", + "syn 2.0.31", ] [[package]] +name = "bip39" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93f2635620bf0b9d4576eb7bb9a38a55df78bd1205d26fa994b25911a69f212f" +dependencies = [ + "bitcoin_hashes", +] + +[[package]] +name = "bitcoin_hashes" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90064b8dee6815a6470d60bad07bbbaee885c0e12d04177138fa3291a01b7bc4" + +[[package]] name = "bitflags" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] +name = "bitflags" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" + +[[package]] name = "bitvec" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -583,7 +1400,17 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", +] + +[[package]] +name = "blake2-rfc" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400" +dependencies = [ + "arrayvec 0.4.12", + "constant_time_eq 0.1.5", ] [[package]] @@ -593,33 +1420,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c2f0dc9a68c6317d884f97cc36cf5a3d20ba14ce404227df55e1af708ab04bc" dependencies = [ "arrayref", - "arrayvec 0.7.2", - "constant_time_eq 0.2.4", + "arrayvec 0.7.4", + "constant_time_eq 0.2.6", ] [[package]] name = "blake2s_simd" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db539cc2b5f6003621f1cd9ef92d7ded8ea5232c7de0f9faa2de251cd98730d4" +checksum = "6637f448b9e61dfadbdcbae9a885fadee1f3eaffb1f8d3c1965d3ade8bdfd44f" dependencies = [ "arrayref", - "arrayvec 0.7.2", - "constant_time_eq 0.1.5", + "arrayvec 0.7.4", + "constant_time_eq 0.2.6", ] [[package]] name = "blake3" -version = "1.3.1" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08e53fc5a564bb15bfe6fae56bd71522205f1f91893f9c0116edad6496c183f" +checksum = "199c42ab6972d92c9f8995f086273d25c42fc0f7b2a1fcefba465c1352d25ba5" dependencies = [ "arrayref", - "arrayvec 0.7.2", + "arrayvec 0.7.4", "cc", "cfg-if", - "constant_time_eq 0.1.5", - "digest 0.10.6", + "constant_time_eq 0.3.0", + "digest 0.10.7", ] [[package]] @@ -640,16 +1467,16 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", ] [[package]] name = "block-buffer" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", ] [[package]] @@ -678,6 +1505,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" [[package]] +name = "blocking" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" +dependencies = [ + "async-channel", + "async-lock", + "async-task", + "atomic-waker", + "fastrand 1.9.0", + "futures-lite", + "log", +] + +[[package]] name = "bounded-collections" version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -699,20 +1541,611 @@ dependencies = [ ] [[package]] +name = "bp-asset-hub-kusama" +version = "0.1.0" +dependencies = [ + "bp-xcm-bridge-hub-router", + "frame-support", + "parity-scale-codec", + "scale-info", +] + +[[package]] +name = "bp-asset-hub-polkadot" +version = "0.1.0" +dependencies = [ + "bp-xcm-bridge-hub-router", + "frame-support", + "parity-scale-codec", + "scale-info", + "sp-runtime", +] + +[[package]] +name = "bp-bridge-hub-cumulus" +version = "0.1.0" +dependencies = [ + "bp-messages", + "bp-polkadot-core", + "bp-runtime", + "frame-support", + "frame-system", + "polkadot-primitives", + "sp-api", + "sp-std", +] + +[[package]] +name = "bp-bridge-hub-kusama" +version = "0.1.0" +dependencies = [ + "bp-bridge-hub-cumulus", + "bp-messages", + "bp-runtime", + "frame-support", + "sp-api", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "bp-bridge-hub-polkadot" +version = "0.1.0" +dependencies = [ + "bp-bridge-hub-cumulus", + "bp-messages", + "bp-runtime", + "frame-support", + "sp-api", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "bp-bridge-hub-rococo" +version = "0.1.0" +dependencies = [ + "bp-bridge-hub-cumulus", + "bp-messages", + "bp-runtime", + "frame-support", + "sp-api", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "bp-bridge-hub-wococo" +version = "0.1.0" +dependencies = [ + "bp-bridge-hub-cumulus", + "bp-messages", + "bp-runtime", + "frame-support", + "sp-api", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "bp-header-chain" +version = "0.1.0" +dependencies = [ + "bp-runtime", + "bp-test-utils", + "finality-grandpa", + "frame-support", + "hex", + "hex-literal 0.4.1", + "parity-scale-codec", + "scale-info", + "serde", + "sp-consensus-grandpa", + "sp-core", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "bp-kusama" +version = "0.1.0" +dependencies = [ + "bp-header-chain", + "bp-polkadot-core", + "bp-runtime", + "frame-support", + "sp-api", + "sp-std", +] + +[[package]] +name = "bp-messages" +version = "0.1.0" +dependencies = [ + "bp-header-chain", + "bp-runtime", + "frame-support", + "hex", + "hex-literal 0.4.1", + "parity-scale-codec", + "scale-info", + "serde", + "sp-core", + "sp-std", +] + +[[package]] +name = "bp-parachains" +version = "0.1.0" +dependencies = [ + "bp-header-chain", + "bp-polkadot-core", + "bp-runtime", + "frame-support", + "impl-trait-for-tuples", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "bp-polkadot" +version = "0.1.0" +dependencies = [ + "bp-header-chain", + "bp-polkadot-core", + "bp-runtime", + "frame-support", + "sp-api", + "sp-std", +] + +[[package]] +name = "bp-polkadot-core" +version = "0.1.0" +dependencies = [ + "bp-messages", + "bp-runtime", + "frame-support", + "frame-system", + "hex", + "parity-scale-codec", + "parity-util-mem", + "scale-info", + "serde", + "sp-core", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "bp-relayers" +version = "0.1.0" +dependencies = [ + "bp-messages", + "bp-runtime", + "frame-support", + "hex", + "hex-literal 0.4.1", + "parity-scale-codec", + "scale-info", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "bp-rococo" +version = "0.1.0" +dependencies = [ + "bp-header-chain", + "bp-polkadot-core", + "bp-runtime", + "frame-support", + "sp-api", + "sp-std", +] + +[[package]] +name = "bp-runtime" +version = "0.1.0" +dependencies = [ + "frame-support", + "frame-system", + "hash-db", + "hex-literal 0.4.1", + "impl-trait-for-tuples", + "log", + "num-traits", + "parity-scale-codec", + "scale-info", + "serde", + "sp-core", + "sp-io", + "sp-runtime", + "sp-state-machine", + "sp-std", + "sp-trie", + "trie-db", +] + +[[package]] +name = "bp-test-utils" +version = "0.1.0" +dependencies = [ + "bp-header-chain", + "bp-parachains", + "bp-polkadot-core", + "bp-runtime", + "ed25519-dalek 1.0.1", + "finality-grandpa", + "parity-scale-codec", + "sp-application-crypto", + "sp-consensus-grandpa", + "sp-core", + "sp-runtime", + "sp-std", + "sp-trie", +] + +[[package]] +name = "bp-wococo" +version = "0.1.0" +dependencies = [ + "bp-header-chain", + "bp-polkadot-core", + "bp-rococo", + "bp-runtime", + "frame-support", + "sp-api", + "sp-std", +] + +[[package]] +name = "bp-xcm-bridge-hub-router" +version = "0.1.0" +dependencies = [ + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-runtime", +] + +[[package]] +name = "bridge-hub-kusama-runtime" +version = "0.1.0" +dependencies = [ + "bridge-hub-test-utils", + "cumulus-pallet-aura-ext", + "cumulus-pallet-dmp-queue", + "cumulus-pallet-parachain-system", + "cumulus-pallet-session-benchmarking", + "cumulus-pallet-xcm", + "cumulus-pallet-xcmp-queue", + "cumulus-primitives-core", + "cumulus-primitives-utility", + "frame-benchmarking", + "frame-executive", + "frame-support", + "frame-system", + "frame-system-benchmarking", + "frame-system-rpc-runtime-api", + "frame-try-runtime", + "hex-literal 0.4.1", + "kusama-runtime-constants", + "log", + "pallet-aura", + "pallet-authorship", + "pallet-balances", + "pallet-collator-selection", + "pallet-multisig", + "pallet-session", + "pallet-timestamp", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "pallet-utility", + "pallet-xcm", + "pallet-xcm-benchmarks", + "parachain-info", + "parachains-common", + "parity-scale-codec", + "polkadot-core-primitives", + "polkadot-parachain-primitives", + "polkadot-runtime-common", + "scale-info", + "serde", + "smallvec", + "sp-api", + "sp-block-builder", + "sp-consensus-aura", + "sp-core", + "sp-inherents", + "sp-io", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-std", + "sp-storage", + "sp-transaction-pool", + "sp-version", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "substrate-wasm-builder", +] + +[[package]] +name = "bridge-hub-polkadot-runtime" +version = "0.1.0" +dependencies = [ + "bridge-hub-test-utils", + "cumulus-pallet-aura-ext", + "cumulus-pallet-dmp-queue", + "cumulus-pallet-parachain-system", + "cumulus-pallet-session-benchmarking", + "cumulus-pallet-xcm", + "cumulus-pallet-xcmp-queue", + "cumulus-primitives-core", + "cumulus-primitives-utility", + "frame-benchmarking", + "frame-executive", + "frame-support", + "frame-system", + "frame-system-benchmarking", + "frame-system-rpc-runtime-api", + "frame-try-runtime", + "hex-literal 0.4.1", + "log", + "pallet-aura", + "pallet-authorship", + "pallet-balances", + "pallet-collator-selection", + "pallet-multisig", + "pallet-session", + "pallet-timestamp", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "pallet-utility", + "pallet-xcm", + "pallet-xcm-benchmarks", + "parachain-info", + "parachains-common", + "parity-scale-codec", + "polkadot-core-primitives", + "polkadot-parachain-primitives", + "polkadot-runtime-common", + "polkadot-runtime-constants", + "scale-info", + "serde", + "smallvec", + "sp-api", + "sp-block-builder", + "sp-consensus-aura", + "sp-core", + "sp-inherents", + "sp-io", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-std", + "sp-storage", + "sp-transaction-pool", + "sp-version", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "substrate-wasm-builder", +] + +[[package]] +name = "bridge-hub-rococo-integration-tests" +version = "1.0.0" +dependencies = [ + "bp-messages", + "cumulus-pallet-dmp-queue", + "cumulus-pallet-xcmp-queue", + "frame-support", + "integration-tests-common", + "pallet-bridge-messages", + "pallet-xcm", + "parachains-common", + "parity-scale-codec", + "polkadot-core-primitives", + "polkadot-parachain-primitives", + "polkadot-runtime", + "polkadot-runtime-parachains", + "staging-xcm", + "xcm-emulator", +] + +[[package]] +name = "bridge-hub-rococo-runtime" +version = "0.1.0" +dependencies = [ + "bp-bridge-hub-rococo", + "bp-bridge-hub-wococo", + "bp-header-chain", + "bp-messages", + "bp-parachains", + "bp-polkadot-core", + "bp-relayers", + "bp-rococo", + "bp-runtime", + "bp-wococo", + "bridge-hub-test-utils", + "bridge-runtime-common", + "cumulus-pallet-aura-ext", + "cumulus-pallet-dmp-queue", + "cumulus-pallet-parachain-system", + "cumulus-pallet-session-benchmarking", + "cumulus-pallet-xcm", + "cumulus-pallet-xcmp-queue", + "cumulus-primitives-core", + "cumulus-primitives-utility", + "frame-benchmarking", + "frame-executive", + "frame-support", + "frame-system", + "frame-system-benchmarking", + "frame-system-rpc-runtime-api", + "frame-try-runtime", + "hex-literal 0.4.1", + "log", + "pallet-aura", + "pallet-authorship", + "pallet-balances", + "pallet-bridge-grandpa", + "pallet-bridge-messages", + "pallet-bridge-parachains", + "pallet-bridge-relayers", + "pallet-collator-selection", + "pallet-multisig", + "pallet-session", + "pallet-timestamp", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "pallet-utility", + "pallet-xcm", + "pallet-xcm-benchmarks", + "parachain-info", + "parachains-common", + "parity-scale-codec", + "polkadot-core-primitives", + "polkadot-parachain-primitives", + "polkadot-runtime-common", + "rococo-runtime-constants", + "scale-info", + "serde", + "smallvec", + "sp-api", + "sp-block-builder", + "sp-consensus-aura", + "sp-core", + "sp-inherents", + "sp-io", + "sp-keyring", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-std", + "sp-storage", + "sp-transaction-pool", + "sp-version", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "static_assertions", + "substrate-wasm-builder", +] + +[[package]] +name = "bridge-hub-test-utils" +version = "0.1.0" +dependencies = [ + "assert_matches", + "asset-test-utils", + "bp-bridge-hub-rococo", + "bp-bridge-hub-wococo", + "bp-header-chain", + "bp-messages", + "bp-parachains", + "bp-polkadot-core", + "bp-relayers", + "bp-runtime", + "bp-test-utils", + "bridge-runtime-common", + "cumulus-pallet-dmp-queue", + "cumulus-pallet-parachain-system", + "cumulus-pallet-xcmp-queue", + "frame-benchmarking", + "frame-executive", + "frame-support", + "frame-system", + "log", + "pallet-balances", + "pallet-bridge-grandpa", + "pallet-bridge-messages", + "pallet-bridge-parachains", + "pallet-bridge-relayers", + "pallet-collator-selection", + "pallet-session", + "pallet-utility", + "pallet-xcm", + "pallet-xcm-benchmarks", + "parachain-info", + "parachains-common", + "parachains-runtimes-test-utils", + "parity-scale-codec", + "sp-core", + "sp-io", + "sp-keyring", + "sp-runtime", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", +] + +[[package]] +name = "bridge-runtime-common" +version = "0.1.0" +dependencies = [ + "bp-header-chain", + "bp-messages", + "bp-parachains", + "bp-polkadot-core", + "bp-relayers", + "bp-runtime", + "bp-test-utils", + "bp-xcm-bridge-hub-router", + "frame-support", + "frame-system", + "hash-db", + "log", + "pallet-balances", + "pallet-bridge-grandpa", + "pallet-bridge-messages", + "pallet-bridge-parachains", + "pallet-bridge-relayers", + "pallet-transaction-payment", + "pallet-utility", + "parity-scale-codec", + "scale-info", + "sp-api", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "sp-trie", + "staging-xcm", + "staging-xcm-builder", + "static_assertions", +] + +[[package]] name = "bs58" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" [[package]] +name = "bs58" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896" +dependencies = [ + "tinyvec", +] + +[[package]] name = "bstr" -version = "0.2.17" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" +checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" dependencies = [ - "lazy_static", "memchr", - "regex-automata", + "regex-automata 0.3.6", + "serde", ] [[package]] @@ -726,9 +2159,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "byte-slice-cast" @@ -744,9 +2177,9 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" [[package]] name = "bytemuck" -version = "1.13.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c041d3eab048880cb0b86b256447da3f18859a163c3b8d8893f4e6368abe6393" +checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" [[package]] name = "byteorder" @@ -772,25 +2205,19 @@ dependencies = [ ] [[package]] -name = "cache-padded" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba" - -[[package]] name = "camino" -version = "1.1.2" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77df041dc383319cc661b428b6961a005db4d6808d5e12536931b1ca9556055" +checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" dependencies = [ "serde", ] [[package]] name = "cargo-platform" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27" +checksum = "2cfa25e60aea747ec7e1124f238816749faa93759c6ff5b31f1ccdda137f4479" dependencies = [ "serde", ] @@ -803,7 +2230,7 @@ checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a" dependencies = [ "camino", "cargo-platform", - "semver 1.0.16", + "semver 1.0.18", "serde", "serde_json", "thiserror", @@ -817,11 +2244,12 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", + "libc", ] [[package]] @@ -846,9 +2274,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.1" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8790cf1286da485c72cf5fc7aeba308438800036ec67d89425924c4807268c9" +checksum = "b40ccee03b5175c18cde8f37e7d2a33bcef6f8ec8f7cc0d81090d1bb380949c9" dependencies = [ "smallvec", ] @@ -878,36 +2306,63 @@ dependencies = [ ] [[package]] +name = "chacha20" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" +dependencies = [ + "cfg-if", + "cipher 0.4.4", + "cpufeatures", +] + +[[package]] name = "chacha20poly1305" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5" dependencies = [ "aead 0.4.3", - "chacha20", + "chacha20 0.8.2", "cipher 0.3.0", - "poly1305", + "poly1305 0.7.2", "zeroize", ] [[package]] +name = "chain-spec-builder" +version = "2.0.0" +dependencies = [ + "ansi_term", + "clap 4.4.2", + "node-cli", + "rand 0.8.5", + "sc-chain-spec", + "sc-keystore", + "sp-core", + "sp-keystore", +] + +[[package]] name = "chrono" -version = "0.4.19" +version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" +checksum = "f56b4c72906975ca04becb8a30e102dfecddd0c06181e3e95ddc444be28881f8" dependencies = [ - "libc", - "num-integer", + "android-tzdata", + "iana-time-zone", + "js-sys", "num-traits", - "time 0.1.44", - "winapi", + "time 0.1.45", + "wasm-bindgen", + "windows-targets 0.48.5", ] [[package]] name = "ciborium" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c137568cc60b904a7724001b35ce2630fd00d5d84805fbb608ab89509d788f" +checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" dependencies = [ "ciborium-io", "ciborium-ll", @@ -916,15 +2371,15 @@ dependencies = [ [[package]] name = "ciborium-io" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "346de753af073cc87b52b2083a506b38ac176a44cfb05497b622e27be899b369" +checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" [[package]] name = "ciborium-ll" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213030a2b5a4e0c0892b6652260cf6ccac84827b83a85a534e178e3906c4cf1b" +checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" dependencies = [ "ciborium-io", "half", @@ -949,7 +2404,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", ] [[package]] @@ -958,7 +2413,17 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", +] + +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", ] [[package]] @@ -972,9 +2437,9 @@ dependencies = [ [[package]] name = "clang-sys" -version = "1.3.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa66045b9cb23c2e9c1520732030608b02ee07e5cfaa5a521ec15ded7fa24c90" +checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" dependencies = [ "glob", "libc", @@ -983,15 +2448,15 @@ 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", - "clap_derive 3.2.18", + "bitflags 1.3.2", + "clap_derive 3.2.25", "clap_lex 0.2.4", - "indexmap", + "indexmap 1.9.3", "once_cell", "strsim", "termcolor", @@ -1000,33 +2465,40 @@ dependencies = [ [[package]] name = "clap" -version = "4.2.5" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a1f23fa97e1d1641371b51f35535cb26959b8e27ab50d167a8b996b5bada819" +checksum = "6a13b88d2c62ff462f88e4a121f17a82c1af05693a2f192b5c38d14de73c19f6" dependencies = [ "clap_builder", - "clap_derive 4.2.0", - "once_cell", + "clap_derive 4.4.2", ] [[package]] name = "clap_builder" -version = "4.2.5" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fdc5d93c358224b4d6867ef1356d740de2303e9892edc06c5340daeccd96bab" +checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08" dependencies = [ "anstream", "anstyle", - "bitflags", - "clap_lex 0.4.1", + "clap_lex 0.5.1", "strsim", ] [[package]] +name = "clap_complete" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "586a385f7ef2f8b4d86bddaa0c094794e7ccbfe5ffef1f434fe928143fc783a5" +dependencies = [ + "clap 4.4.2", +] + +[[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", "proc-macro-error", @@ -1037,14 +2509,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.2.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" +checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.31", ] [[package]] @@ -1058,15 +2530,15 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" +checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" [[package]] name = "coarsetime" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "454038500439e141804c655b4cd1bc6a70bcb95cd2bc9463af5661b6956f0e46" +checksum = "a90d114103adbc625300f346d4d09dfb4ab1c4a8df6868435dd903392ecf4354" dependencies = [ "libc", "once_cell", @@ -1085,10 +2557,105 @@ dependencies = [ ] [[package]] +name = "collectives-polkadot-integration-tests" +version = "0.1.0" +dependencies = [ + "collectives-polkadot-runtime", + "cumulus-pallet-parachain-system", + "cumulus-pallet-xcmp-queue", + "frame-support", + "integration-tests-common", + "pallet-assets", + "pallet-core-fellowship", + "pallet-salary", + "pallet-xcm", + "parachains-common", + "parity-scale-codec", + "polkadot-core-primitives", + "polkadot-parachain-primitives", + "polkadot-runtime", + "polkadot-runtime-parachains", + "sp-core", + "sp-runtime", + "staging-xcm", + "xcm-emulator", +] + +[[package]] +name = "collectives-polkadot-runtime" +version = "1.0.0" +dependencies = [ + "cumulus-pallet-aura-ext", + "cumulus-pallet-dmp-queue", + "cumulus-pallet-parachain-system", + "cumulus-pallet-session-benchmarking", + "cumulus-pallet-xcm", + "cumulus-pallet-xcmp-queue", + "cumulus-primitives-core", + "cumulus-primitives-utility", + "frame-benchmarking", + "frame-executive", + "frame-support", + "frame-system", + "frame-system-benchmarking", + "frame-system-rpc-runtime-api", + "frame-try-runtime", + "hex-literal 0.4.1", + "log", + "pallet-alliance", + "pallet-aura", + "pallet-authorship", + "pallet-balances", + "pallet-collator-selection", + "pallet-collective", + "pallet-core-fellowship", + "pallet-multisig", + "pallet-preimage", + "pallet-proxy", + "pallet-ranked-collective", + "pallet-referenda", + "pallet-salary", + "pallet-scheduler", + "pallet-session", + "pallet-timestamp", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "pallet-utility", + "pallet-xcm", + "parachain-info", + "parachains-common", + "parity-scale-codec", + "polkadot-core-primitives", + "polkadot-parachain-primitives", + "polkadot-runtime-common", + "polkadot-runtime-constants", + "scale-info", + "smallvec", + "sp-api", + "sp-arithmetic", + "sp-block-builder", + "sp-consensus-aura", + "sp-core", + "sp-inherents", + "sp-io", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-std", + "sp-storage", + "sp-transaction-pool", + "sp-version", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "substrate-wasm-builder", +] + +[[package]] name = "color-eyre" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ebf286c900a6d5867aeff75cfee3192857bb7f24b547d4f0df2ed6baa812c90" +checksum = "5a667583cca8c4f8436db8de46ea8233c42a7d9ae424a82d338f2e4675229204" dependencies = [ "backtrace", "eyre", @@ -1098,6 +2665,27 @@ dependencies = [ ] [[package]] +name = "color-print" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2a5e6504ed8648554968650feecea00557a3476bc040d0ffc33080e66b646d0" +dependencies = [ + "color-print-proc-macro", +] + +[[package]] +name = "color-print-proc-macro" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d51beaa537d73d2d1ff34ee70bc095f170420ab2ec5d687ecd3ec2b0d092514b" +dependencies = [ + "nom", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] name = "colorchoice" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1105,9 +2693,9 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "comfy-table" -version = "7.0.0" +version = "7.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9e1f7e5d046697d34b593bdba8ee31f4649366e452a2ccabb3baf3511e503d1" +checksum = "9ab77dbd8adecaf3f0db40581631b995f312a8a5ae3aa9993188bb8f23d83a5b" dependencies = [ "strum", "strum_macros", @@ -1115,6 +2703,20 @@ dependencies = [ ] [[package]] +name = "common" +version = "0.1.0" +source = "git+https://github.com/w3f/ring-proof?rev=0e948f3#0e948f3c28cbacecdd3020403c4841c0eb339213" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-poly", + "ark-serialize", + "ark-std", + "fflonk", + "merlin 3.0.0", +] + +[[package]] name = "common-path" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1122,40 +2724,53 @@ checksum = "2382f75942f4b3be3690fe4f86365e9c853c1587d6ee58212cebf6e2a9ccd101" [[package]] name = "concurrent-queue" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30ed07550be01594c6026cff2a1d7fe9c8f683caa798e12b68694ac9e88286a3" -dependencies = [ - "cache-padded", -] - -[[package]] -name = "concurrent-queue" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e" +checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" dependencies = [ "crossbeam-utils", ] [[package]] name = "console" -version = "0.15.5" +version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" +checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" dependencies = [ "encode_unicode", "lazy_static", "libc", "unicode-width", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] name = "const-oid" -version = "0.9.2" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" + +[[package]] +name = "const-random" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "368a7a772ead6ce7e1de82bfb04c485f3db8ec744f72925af5735e29a22cc18e" +dependencies = [ + "const-random-macro", + "proc-macro-hack", +] + +[[package]] +name = "const-random-macro" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520fbf3c07483f94e3e3ca9d0cfd913d7718ef2483d2cfd91c0d9e91474ab913" +checksum = "9d7d6ab3c3a2282db210df5f02c4dab6e0a7057af0fb7ebd4070f30fe05c0ddb" +dependencies = [ + "getrandom 0.2.10", + "once_cell", + "proc-macro-hack", + "tiny-keccak", +] [[package]] name = "constant_time_eq" @@ -1165,9 +2780,84 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] name = "constant_time_eq" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3ad85c1f65dc7b37604eb0e89748faf0b9653065f2a8ef69f96a687ec1e9279" +checksum = "21a53c0a4d288377e7415b53dcfc3c04da5cdc2cc95c8d5ac178b58f0b861ad6" + +[[package]] +name = "constant_time_eq" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" + +[[package]] +name = "constcat" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f272d0c4cf831b4fa80ee529c7707f76585986e910e1fbce1d7921970bc1a241" + +[[package]] +name = "contracts-rococo-runtime" +version = "0.2.0" +dependencies = [ + "cumulus-pallet-aura-ext", + "cumulus-pallet-dmp-queue", + "cumulus-pallet-parachain-system", + "cumulus-pallet-session-benchmarking", + "cumulus-pallet-xcm", + "cumulus-pallet-xcmp-queue", + "cumulus-primitives-core", + "cumulus-primitives-utility", + "frame-benchmarking", + "frame-executive", + "frame-support", + "frame-system", + "frame-system-benchmarking", + "frame-system-rpc-runtime-api", + "frame-try-runtime", + "hex-literal 0.4.1", + "kusama-runtime-constants", + "log", + "pallet-aura", + "pallet-authorship", + "pallet-balances", + "pallet-collator-selection", + "pallet-contracts", + "pallet-contracts-primitives", + "pallet-insecure-randomness-collective-flip", + "pallet-multisig", + "pallet-session", + "pallet-sudo", + "pallet-timestamp", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "pallet-utility", + "pallet-xcm", + "parachain-info", + "parachains-common", + "parity-scale-codec", + "polkadot-core-primitives", + "polkadot-parachain-primitives", + "polkadot-runtime-common", + "scale-info", + "smallvec", + "sp-api", + "sp-block-builder", + "sp-consensus-aura", + "sp-core", + "sp-inherents", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-std", + "sp-storage", + "sp-transaction-pool", + "sp-version", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "substrate-wasm-builder", +] [[package]] name = "convert_case" @@ -1177,9 +2867,9 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" [[package]] name = "core-foundation" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6888e10551bb93e424d8df1d07f1a8b4fceb0001a3a4b048bfc47554946f47b3" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" dependencies = [ "core-foundation-sys", "libc", @@ -1187,9 +2877,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "core2" @@ -1202,9 +2892,18 @@ dependencies = [ [[package]] name = "cpp_demangle" -version = "0.3.4" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eeaa953eaad386a53111e47172c2fedba671e5684c8dd601a5f474f4f118710f" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "cpp_demangle" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "931ab2a3e6330a07900b8e7ca4e106cdcbb93f2b9a52df55e54ee53d8305b55d" +checksum = "7e8227005286ec39567949b33df9896bcadfa6051bccca2488129f108ca23119" dependencies = [ "cfg-if", ] @@ -1221,20 +2920,14 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.1" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" dependencies = [ "libc", ] [[package]] -name = "cpuid-bool" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba" - -[[package]] name = "cranelift-bforest" version = "0.95.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1255,7 +2948,7 @@ dependencies = [ "cranelift-codegen-shared", "cranelift-entity", "cranelift-isle", - "gimli", + "gimli 0.27.3", "hashbrown 0.13.2", "log", "regalloc2", @@ -1325,7 +3018,7 @@ dependencies = [ "cranelift-codegen", "cranelift-entity", "cranelift-frontend", - "itertools", + "itertools 0.10.5", "log", "smallvec", "wasmparser", @@ -1334,18 +3027,18 @@ dependencies = [ [[package]] name = "crc" -version = "3.0.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53757d12b596c16c78b83458d732a5d1a17ab3f53f2f7412f6fb57cc8a140ab3" +checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" dependencies = [ "crc-catalog", ] [[package]] name = "crc-catalog" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d0165d2900ae6778e36e80bbc4da3b5eefccee9ba939761f9c2882a5d9af3ff" +checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484" [[package]] name = "crc32fast" @@ -1366,17 +3059,49 @@ dependencies = [ "atty", "cast", "ciborium", - "clap 3.2.23", + "clap 3.2.25", "criterion-plot", - "itertools", + "futures", + "itertools 0.10.5", "lazy_static", "num-traits", "oorandom", + "plotters", + "rayon", + "regex", + "serde", + "serde_derive", + "serde_json", + "tinytemplate", + "tokio", + "walkdir", +] + +[[package]] +name = "criterion" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" +dependencies = [ + "anes", + "cast", + "ciborium", + "clap 4.4.2", + "criterion-plot", + "futures", + "is-terminal", + "itertools 0.10.5", + "num-traits", + "once_cell", + "oorandom", + "plotters", + "rayon", "regex", "serde", "serde_derive", "serde_json", "tinytemplate", + "tokio", "walkdir", ] @@ -1387,14 +3112,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" dependencies = [ "cast", - "itertools", + "itertools 0.10.5", ] [[package]] name = "crossbeam-channel" -version = "0.5.5" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c02a4d71819009c192cf4872265391563fd6a84c81ff2c0f2a7026ca4c1d85c" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ "cfg-if", "crossbeam-utils", @@ -1402,9 +3127,9 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ "cfg-if", "crossbeam-epoch", @@ -1413,22 +3138,22 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.5" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ + "autocfg", "cfg-if", "crossbeam-utils", - "lazy_static", - "memoffset 0.6.4", + "memoffset 0.9.0", "scopeguard", ] [[package]] name = "crossbeam-queue" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f25d8400f4a7a5778f0e4e52384a48cbd9b5c495d110786187fc750075277a2" +checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" dependencies = [ "cfg-if", "crossbeam-utils", @@ -1436,9 +3161,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.14" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if", ] @@ -1455,7 +3180,7 @@ version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", "rand_core 0.6.4", "subtle", "zeroize", @@ -1467,7 +3192,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf4c2f4e1afd912bc40bfd6fed5d9dc1f288e0ba01bfcc835cc5bc3eb13efe15" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", "rand_core 0.6.4", "subtle", "zeroize", @@ -1479,7 +3204,8 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", + "rand_core 0.6.4", "typenum", ] @@ -1489,56 +3215,805 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", "subtle", ] [[package]] name = "crypto-mac" -version = "0.10.1" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a" +checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", "subtle", ] [[package]] -name = "crypto-mac" -version = "0.11.1" +name = "ctr" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" +checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" dependencies = [ - "generic-array 0.14.6", - "subtle", + "cipher 0.3.0", ] [[package]] -name = "ctor" -version = "0.1.26" +name = "ctr" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" +checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" +dependencies = [ + "cipher 0.4.4", +] + +[[package]] +name = "cumulus-client-cli" +version = "0.1.0" +dependencies = [ + "clap 4.4.2", + "parity-scale-codec", + "sc-chain-spec", + "sc-cli", + "sc-client-api", + "sc-service", + "sp-core", + "sp-runtime", + "url", +] + +[[package]] +name = "cumulus-client-collator" +version = "0.1.0" +dependencies = [ + "async-trait", + "cumulus-client-consensus-common", + "cumulus-client-network", + "cumulus-primitives-core", + "cumulus-test-client", + "cumulus-test-relay-sproof-builder", + "cumulus-test-runtime", + "futures", + "parity-scale-codec", + "parking_lot 0.12.1", + "polkadot-node-primitives", + "polkadot-node-subsystem", + "polkadot-node-subsystem-test-helpers", + "polkadot-overseer", + "polkadot-primitives", + "sc-client-api", + "sp-api", + "sp-consensus", + "sp-core", + "sp-maybe-compressed-blob", + "sp-runtime", + "sp-state-machine", + "sp-tracing", + "tracing", +] + +[[package]] +name = "cumulus-client-consensus-aura" +version = "0.1.0" +dependencies = [ + "async-trait", + "cumulus-client-collator", + "cumulus-client-consensus-common", + "cumulus-client-consensus-proposer", + "cumulus-primitives-aura", + "cumulus-primitives-core", + "cumulus-primitives-parachain-inherent", + "cumulus-relay-chain-interface", + "futures", + "parity-scale-codec", + "polkadot-node-primitives", + "polkadot-node-subsystem", + "polkadot-overseer", + "polkadot-primitives", + "sc-client-api", + "sc-consensus", + "sc-consensus-aura", + "sc-consensus-babe", + "sc-consensus-slots", + "sc-telemetry", + "schnellru", + "sp-api", + "sp-application-crypto", + "sp-block-builder", + "sp-blockchain", + "sp-consensus", + "sp-consensus-aura", + "sp-core", + "sp-inherents", + "sp-keystore", + "sp-runtime", + "sp-state-machine", + "sp-timestamp", + "substrate-prometheus-endpoint", + "tracing", +] + +[[package]] +name = "cumulus-client-consensus-common" +version = "0.1.0" +dependencies = [ + "async-trait", + "cumulus-client-pov-recovery", + "cumulus-primitives-core", + "cumulus-relay-chain-interface", + "cumulus-test-client", + "cumulus-test-relay-sproof-builder", + "dyn-clone", + "futures", + "futures-timer", + "log", + "parity-scale-codec", + "polkadot-primitives", + "sc-client-api", + "sc-consensus", + "sc-consensus-babe", + "schnellru", + "sp-blockchain", + "sp-consensus", + "sp-consensus-slots", + "sp-core", + "sp-runtime", + "sp-timestamp", + "sp-tracing", + "sp-trie", + "substrate-prometheus-endpoint", + "tracing", +] + +[[package]] +name = "cumulus-client-consensus-proposer" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "cumulus-primitives-parachain-inherent", + "sp-consensus", + "sp-inherents", + "sp-runtime", + "sp-state-machine", + "thiserror", +] + +[[package]] +name = "cumulus-client-consensus-relay-chain" +version = "0.1.0" +dependencies = [ + "async-trait", + "cumulus-client-consensus-common", + "cumulus-primitives-core", + "cumulus-relay-chain-interface", + "futures", + "parking_lot 0.12.1", + "sc-consensus", + "sp-api", + "sp-block-builder", + "sp-blockchain", + "sp-consensus", + "sp-core", + "sp-inherents", + "sp-runtime", + "substrate-prometheus-endpoint", + "tracing", +] + +[[package]] +name = "cumulus-client-network" +version = "0.1.0" +dependencies = [ + "async-trait", + "cumulus-primitives-core", + "cumulus-relay-chain-inprocess-interface", + "cumulus-relay-chain-interface", + "cumulus-test-service", + "futures", + "futures-timer", + "parity-scale-codec", + "parking_lot 0.12.1", + "polkadot-node-primitives", + "polkadot-parachain-primitives", + "polkadot-primitives", + "polkadot-test-client", + "portpicker", + "sc-cli", + "sc-client-api", + "sp-blockchain", + "sp-consensus", + "sp-core", + "sp-keyring", + "sp-keystore", + "sp-runtime", + "sp-state-machine", + "substrate-test-utils", + "tokio", + "tracing", + "url", +] + +[[package]] +name = "cumulus-client-pov-recovery" +version = "0.1.0" dependencies = [ + "async-trait", + "cumulus-primitives-core", + "cumulus-relay-chain-interface", + "cumulus-test-service", + "futures", + "futures-timer", + "parity-scale-codec", + "polkadot-node-primitives", + "polkadot-node-subsystem", + "polkadot-overseer", + "polkadot-primitives", + "portpicker", + "rand 0.8.5", + "sc-cli", + "sc-client-api", + "sc-consensus", + "sp-consensus", + "sp-maybe-compressed-blob", + "sp-runtime", + "substrate-test-utils", + "tokio", + "tracing", +] + +[[package]] +name = "cumulus-client-service" +version = "0.1.0" +dependencies = [ + "cumulus-client-cli", + "cumulus-client-collator", + "cumulus-client-consensus-common", + "cumulus-client-network", + "cumulus-client-pov-recovery", + "cumulus-primitives-core", + "cumulus-relay-chain-inprocess-interface", + "cumulus-relay-chain-interface", + "cumulus-relay-chain-minimal-node", + "futures", + "polkadot-primitives", + "sc-client-api", + "sc-consensus", + "sc-network", + "sc-network-sync", + "sc-network-transactions", + "sc-rpc", + "sc-service", + "sc-sysinfo", + "sc-telemetry", + "sc-transaction-pool", + "sc-utils", + "sp-api", + "sp-blockchain", + "sp-consensus", + "sp-core", + "sp-runtime", + "sp-transaction-pool", +] + +[[package]] +name = "cumulus-pallet-aura-ext" +version = "0.1.0" +dependencies = [ + "cumulus-pallet-parachain-system", + "frame-support", + "frame-system", + "pallet-aura", + "pallet-timestamp", + "parity-scale-codec", + "scale-info", + "sp-application-crypto", + "sp-consensus-aura", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "cumulus-pallet-dmp-queue" +version = "0.1.0" +dependencies = [ + "cumulus-primitives-core", + "frame-support", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "sp-version", + "staging-xcm", +] + +[[package]] +name = "cumulus-pallet-parachain-system" +version = "0.1.0" +dependencies = [ + "assert_matches", + "bytes", + "cumulus-pallet-parachain-system-proc-macro", + "cumulus-primitives-core", + "cumulus-primitives-parachain-inherent", + "cumulus-test-client", + "cumulus-test-relay-sproof-builder", + "environmental", + "frame-support", + "frame-system", + "hex-literal 0.4.1", + "impl-trait-for-tuples", + "lazy_static", + "log", + "parity-scale-codec", + "polkadot-parachain-primitives", + "sc-client-api", + "scale-info", + "sp-core", + "sp-externalities", + "sp-inherents", + "sp-io", + "sp-keyring", + "sp-runtime", + "sp-state-machine", + "sp-std", + "sp-tracing", + "sp-trie", + "sp-version", + "staging-xcm", + "trie-db", +] + +[[package]] +name = "cumulus-pallet-parachain-system-proc-macro" +version = "0.1.0" +dependencies = [ + "proc-macro-crate", + "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.31", ] [[package]] -name = "ctr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb4a30d54f7443bf3d6191dcd486aca19e67cb3c49fa7a06a319966346707e7f" +name = "cumulus-pallet-session-benchmarking" +version = "3.0.0" dependencies = [ - "cipher 0.2.5", + "frame-benchmarking", + "frame-support", + "frame-system", + "pallet-session", + "parity-scale-codec", + "sp-runtime", + "sp-std", ] [[package]] -name = "ctr" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" +name = "cumulus-pallet-solo-to-para" +version = "0.1.0" dependencies = [ - "cipher 0.3.0", + "cumulus-pallet-parachain-system", + "frame-support", + "frame-system", + "pallet-sudo", + "parity-scale-codec", + "polkadot-primitives", + "scale-info", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "cumulus-pallet-xcm" +version = "0.1.0" +dependencies = [ + "cumulus-primitives-core", + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-io", + "sp-runtime", + "sp-std", + "staging-xcm", +] + +[[package]] +name = "cumulus-pallet-xcmp-queue" +version = "0.1.0" +dependencies = [ + "cumulus-pallet-parachain-system", + "cumulus-primitives-core", + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "pallet-balances", + "parity-scale-codec", + "polkadot-runtime-common", + "rand_chacha 0.3.1", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", +] + +[[package]] +name = "cumulus-ping" +version = "0.1.0" +dependencies = [ + "cumulus-pallet-xcm", + "cumulus-primitives-core", + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-runtime", + "sp-std", + "staging-xcm", +] + +[[package]] +name = "cumulus-primitives-aura" +version = "0.1.0" +dependencies = [ + "parity-scale-codec", + "polkadot-core-primitives", + "polkadot-primitives", + "sp-api", + "sp-consensus-aura", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "cumulus-primitives-core" +version = "0.1.0" +dependencies = [ + "parity-scale-codec", + "polkadot-core-primitives", + "polkadot-parachain-primitives", + "polkadot-primitives", + "scale-info", + "sp-api", + "sp-runtime", + "sp-std", + "sp-trie", + "staging-xcm", +] + +[[package]] +name = "cumulus-primitives-parachain-inherent" +version = "0.1.0" +dependencies = [ + "async-trait", + "cumulus-primitives-core", + "cumulus-relay-chain-interface", + "cumulus-test-relay-sproof-builder", + "parity-scale-codec", + "sc-client-api", + "scale-info", + "sp-api", + "sp-core", + "sp-inherents", + "sp-runtime", + "sp-state-machine", + "sp-std", + "sp-storage", + "sp-trie", + "tracing", +] + +[[package]] +name = "cumulus-primitives-timestamp" +version = "0.1.0" +dependencies = [ + "cumulus-primitives-core", + "futures", + "parity-scale-codec", + "sp-inherents", + "sp-std", + "sp-timestamp", +] + +[[package]] +name = "cumulus-primitives-utility" +version = "0.1.0" +dependencies = [ + "cumulus-primitives-core", + "frame-support", + "log", + "parity-scale-codec", + "polkadot-runtime-common", + "sp-io", + "sp-runtime", + "sp-std", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", +] + +[[package]] +name = "cumulus-relay-chain-inprocess-interface" +version = "0.1.0" +dependencies = [ + "async-trait", + "cumulus-primitives-core", + "cumulus-relay-chain-interface", + "cumulus-test-service", + "futures", + "futures-timer", + "polkadot-cli", + "polkadot-primitives", + "polkadot-service", + "polkadot-test-client", + "prioritized-metered-channel", + "sc-cli", + "sc-client-api", + "sc-sysinfo", + "sc-telemetry", + "sc-tracing", + "sp-api", + "sp-consensus", + "sp-core", + "sp-keyring", + "sp-runtime", + "sp-state-machine", +] + +[[package]] +name = "cumulus-relay-chain-interface" +version = "0.1.0" +dependencies = [ + "async-trait", + "cumulus-primitives-core", + "futures", + "jsonrpsee-core", + "parity-scale-codec", + "polkadot-overseer", + "sc-client-api", + "sp-api", + "sp-blockchain", + "sp-state-machine", + "thiserror", +] + +[[package]] +name = "cumulus-relay-chain-minimal-node" +version = "0.1.0" +dependencies = [ + "array-bytes", + "async-trait", + "cumulus-primitives-core", + "cumulus-relay-chain-interface", + "cumulus-relay-chain-rpc-interface", + "futures", + "polkadot-availability-recovery", + "polkadot-collator-protocol", + "polkadot-core-primitives", + "polkadot-network-bridge", + "polkadot-node-collation-generation", + "polkadot-node-core-runtime-api", + "polkadot-node-network-protocol", + "polkadot-node-subsystem-util", + "polkadot-overseer", + "polkadot-primitives", + "sc-authority-discovery", + "sc-network", + "sc-network-common", + "sc-service", + "sc-tracing", + "sc-utils", + "schnellru", + "sp-api", + "sp-consensus", + "sp-consensus-babe", + "sp-runtime", + "tracing", +] + +[[package]] +name = "cumulus-relay-chain-rpc-interface" +version = "0.1.0" +dependencies = [ + "async-trait", + "cumulus-primitives-core", + "cumulus-relay-chain-interface", + "either", + "futures", + "futures-timer", + "jsonrpsee", + "parity-scale-codec", + "pin-project", + "polkadot-overseer", + "rand 0.8.5", + "sc-client-api", + "sc-rpc-api", + "sc-service", + "schnellru", + "serde", + "serde_json", + "smoldot", + "smoldot-light", + "sp-api", + "sp-authority-discovery", + "sp-consensus-babe", + "sp-core", + "sp-runtime", + "sp-state-machine", + "sp-storage", + "thiserror", + "tokio", + "tokio-util", + "tracing", + "url", +] + +[[package]] +name = "cumulus-test-client" +version = "0.1.0" +dependencies = [ + "cumulus-primitives-core", + "cumulus-primitives-parachain-inherent", + "cumulus-test-relay-sproof-builder", + "cumulus-test-runtime", + "cumulus-test-service", + "frame-system", + "pallet-balances", + "pallet-transaction-payment", + "parity-scale-codec", + "polkadot-parachain-primitives", + "polkadot-primitives", + "sc-block-builder", + "sc-consensus", + "sc-executor", + "sc-executor-common", + "sc-service", + "sp-api", + "sp-blockchain", + "sp-core", + "sp-inherents", + "sp-io", + "sp-keyring", + "sp-runtime", + "sp-timestamp", + "substrate-test-client", +] + +[[package]] +name = "cumulus-test-relay-sproof-builder" +version = "0.1.0" +dependencies = [ + "cumulus-primitives-core", + "parity-scale-codec", + "polkadot-primitives", + "sp-runtime", + "sp-state-machine", + "sp-std", + "sp-trie", +] + +[[package]] +name = "cumulus-test-relay-validation-worker-provider" +version = "0.1.0" +dependencies = [ + "polkadot-node-core-pvf", + "toml 0.7.6", +] + +[[package]] +name = "cumulus-test-runtime" +version = "0.1.0" +dependencies = [ + "cumulus-pallet-parachain-system", + "cumulus-primitives-core", + "frame-executive", + "frame-support", + "frame-system", + "frame-system-rpc-runtime-api", + "pallet-balances", + "pallet-glutton", + "pallet-sudo", + "pallet-timestamp", + "pallet-transaction-payment", + "parity-scale-codec", + "scale-info", + "sp-api", + "sp-block-builder", + "sp-core", + "sp-inherents", + "sp-io", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-std", + "sp-transaction-pool", + "sp-version", + "substrate-wasm-builder", +] + +[[package]] +name = "cumulus-test-service" +version = "0.1.0" +dependencies = [ + "async-trait", + "clap 4.4.2", + "criterion 0.5.1", + "cumulus-client-cli", + "cumulus-client-consensus-common", + "cumulus-client-consensus-relay-chain", + "cumulus-client-pov-recovery", + "cumulus-client-service", + "cumulus-pallet-parachain-system", + "cumulus-primitives-core", + "cumulus-primitives-parachain-inherent", + "cumulus-relay-chain-inprocess-interface", + "cumulus-relay-chain-interface", + "cumulus-relay-chain-minimal-node", + "cumulus-test-client", + "cumulus-test-relay-sproof-builder", + "cumulus-test-relay-validation-worker-provider", + "cumulus-test-runtime", + "frame-system", + "frame-system-rpc-runtime-api", + "futures", + "jsonrpsee", + "pallet-im-online", + "pallet-timestamp", + "pallet-transaction-payment", + "parachains-common", + "parity-scale-codec", + "polkadot-cli", + "polkadot-node-subsystem", + "polkadot-overseer", + "polkadot-primitives", + "polkadot-service", + "polkadot-test-service", + "portpicker", + "rand 0.8.5", + "rococo-parachain-runtime", + "sc-basic-authorship", + "sc-block-builder", + "sc-chain-spec", + "sc-cli", + "sc-client-api", + "sc-consensus", + "sc-executor", + "sc-executor-common", + "sc-executor-wasmtime", + "sc-network", + "sc-service", + "sc-telemetry", + "sc-tracing", + "sc-transaction-pool", + "sc-transaction-pool-api", + "serde", + "sp-api", + "sp-arithmetic", + "sp-authority-discovery", + "sp-blockchain", + "sp-consensus", + "sp-consensus-grandpa", + "sp-core", + "sp-io", + "sp-keyring", + "sp-runtime", + "sp-state-machine", + "sp-timestamp", + "sp-tracing", + "substrate-test-client", + "substrate-test-utils", + "tempfile", + "tokio", + "tracing", + "url", ] [[package]] @@ -1569,23 +4044,50 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.0.0-rc.1" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d4ba9852b42210c7538b75484f9daa0655e9a3ac04f693747bb0f02cf3cfe16" +checksum = "f711ade317dd348950a9910f81c5947e3d8907ebd2b83f76203ff1807e6a2bc2" dependencies = [ "cfg-if", + "cpufeatures", + "curve25519-dalek-derive", + "digest 0.10.7", "fiat-crypto", - "packed_simd_2", "platforms", + "rustc_version 0.4.0", "subtle", "zeroize", ] [[package]] +name = "curve25519-dalek-derive" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.31", +] + +[[package]] +name = "curve25519-dalek-ng" +version = "4.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c359b7249347e46fb28804470d071c921156ad62b3eef5d34e2ba867533dec8" +dependencies = [ + "byteorder", + "digest 0.9.0", + "rand_core 0.6.4", + "subtle-ng", + "zeroize", +] + +[[package]] name = "cxx" -version = "1.0.80" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b7d4e43b25d3c994662706a1d4fcfc32aaa6afd287502c111b237093bb23f3a" +checksum = "28403c86fc49e3401fdf45499ba37fad6493d9329449d6449d7f0e10f4654d28" dependencies = [ "cc", "cxxbridge-flags", @@ -1595,9 +4097,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.80" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84f8829ddc213e2c1368e51a2564c552b65a8cb6a28f31e576270ac81d5e5827" +checksum = "78da94fef01786dc3e0c76eafcd187abcaa9972c78e05ff4041e24fdf059c285" dependencies = [ "cc", "codespan-reporting", @@ -1605,31 +4107,31 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn 1.0.109", + "syn 2.0.31", ] [[package]] name = "cxxbridge-flags" -version = "1.0.80" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e72537424b474af1460806647c41d4b6d35d09ef7fe031c5c2fa5766047cc56a" +checksum = "e2a6f5e1dfb4b34292ad4ea1facbfdaa1824705b231610087b00b17008641809" [[package]] name = "cxxbridge-macro" -version = "1.0.80" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "309e4fb93eed90e1e14bea0da16b209f81813ba9fc7830c20ed151dd7bc0a4d7" +checksum = "50c49547d73ba8dcfd4ad7325d64c6d5391ff4224d498fc39a6f3f49825a530d" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.31", ] [[package]] name = "darling" -version = "0.14.2" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0dd3cd20dc6b5a876612a6e5accfe7f3dd883db6d07acfbf14c128f61550dfa" +checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" dependencies = [ "darling_core", "darling_macro", @@ -1637,9 +4139,9 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.14.2" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a784d2ccaf7c98501746bf0be29b2022ba41fd62a2e622af997a03e9f972859f" +checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" dependencies = [ "fnv", "ident_case", @@ -1651,9 +4153,9 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.14.2" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7618812407e9402654622dd402b0a89dff9ba93badd6540781526117b92aab7e" +checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" dependencies = [ "darling_core", "quote", @@ -1661,16 +4163,29 @@ dependencies = [ ] [[package]] +name = "dashmap" +version = "5.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edd72493923899c6f10c641bdbdeddc7183d6396641d99c1a0d1597f37f92e28" +dependencies = [ + "cfg-if", + "hashbrown 0.14.0", + "lock_api", + "once_cell", + "parking_lot_core 0.9.8", +] + +[[package]] name = "data-encoding" -version = "2.3.2" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57" +checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" [[package]] name = "data-encoding-macro" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86927b7cd2fe88fa698b87404b287ab98d1a0063a34071d92e575b72d3029aca" +checksum = "c904b33cc60130e1aeea4956ab803d08a3f4a0ca82d64ed757afac3891f2bb99" dependencies = [ "data-encoding", "data-encoding-macro-internal", @@ -1678,9 +4193,9 @@ dependencies = [ [[package]] name = "data-encoding-macro-internal" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5bbed42daaa95e780b60a50546aa345b8413a1e46f9a40a12907d3598f038db" +checksum = "8fdf3fce3ce863539ec1d7fd1b6dcc3c645663376b43ed376bbf887733e4f772" dependencies = [ "data-encoding", "syn 1.0.109", @@ -1697,9 +4212,9 @@ dependencies = [ [[package]] name = "der" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13dd2ae565c0a381dde7fade45fce95984c568bdcb4700a4fdbe3175e0380b2f" +checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" dependencies = [ "const-oid", "pem-rfc7468", @@ -1708,9 +4223,9 @@ dependencies = [ [[package]] name = "der" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7ed52955ce76b1554f509074bb357d3fb8ac9b51288a65a3fd480d1dfba946" +checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" dependencies = [ "const-oid", "zeroize", @@ -1732,11 +4247,11 @@ dependencies = [ [[package]] name = "der-parser" -version = "8.1.0" +version = "8.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42d4bc9b0db0a0df9ae64634ac5bdefb7afcb534e182275ca0beadbe486701c1" +checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e" dependencies = [ - "asn1-rs 0.5.1", + "asn1-rs 0.5.2", "displaydoc", "nom", "num-bigint", @@ -1745,6 +4260,12 @@ dependencies = [ ] [[package]] +name = "deranged" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" + +[[package]] name = "derivative" version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1806,15 +4327,15 @@ dependencies = [ "convert_case", "proc-macro2", "quote", - "rustc_version", + "rustc_version 0.4.0", "syn 1.0.109", ] [[package]] name = "diff" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499" +checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" [[package]] name = "difflib" @@ -1837,16 +4358,16 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", ] [[package]] name = "digest" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "block-buffer 0.10.3", + "block-buffer 0.10.4", "const-oid", "crypto-common", "subtle", @@ -1873,9 +4394,9 @@ dependencies = [ [[package]] name = "dirs-sys" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" dependencies = [ "libc", "redox_users", @@ -1895,20 +4416,37 @@ dependencies = [ [[package]] name = "displaydoc" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.31", ] [[package]] name = "dissimilar" -version = "1.0.3" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31ad93652f40969dead8d4bf897a41e9462095152eb21c56e5830537e41179dd" +checksum = "86e3bdc80eee6e16b2b6b0f87fbc98c04bee3455e35174c0de1a125d0688c632" + +[[package]] +name = "dleq_vrf" +version = "0.0.2" +source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-scale", + "ark-secret-scalar", + "ark-serialize", + "ark-std", + "ark-transcript", + "arrayvec 0.7.4", + "rand_core 0.6.4", + "zeroize", +] [[package]] name = "dlmalloc" @@ -1927,28 +4465,28 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" [[package]] name = "docify" -version = "0.1.13" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18b972b74c30cbe838fc6a07665132ff94f257350e26fd01d80bc59ee7fcf129" +checksum = "029de870d175d11969524d91a3fb2cbf6d488b853bff99d41cf65e533ac7d9d2" dependencies = [ "docify_macros", ] [[package]] name = "docify_macros" -version = "0.1.13" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c93004d1011191c56df9e853dca42f2012e7488638bcd5078935f5ce43e06cf3" +checksum = "cac43324656a1b05eb0186deb51f27d2d891c704c37f34de281ef6297ba193e5" dependencies = [ "common-path", "derive-syn-parse", - "lazy_static", - "prettyplease", + "once_cell", "proc-macro2", "quote", "regex", - "syn 2.0.16", + "syn 2.0.31", "termcolor", + "toml 0.7.6", "walkdir", ] @@ -1959,10 +4497,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" [[package]] +name = "downcast-rs" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" + +[[package]] name = "dtoa" -version = "1.0.2" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5caaa75cbd2b960ff1e5392d2cfb1f44717fffe12fc1f32b7b5d1267f99732a6" +checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" [[package]] name = "dyn-clonable" @@ -1987,9 +4531,9 @@ dependencies = [ [[package]] name = "dyn-clone" -version = "1.0.4" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee2626afccd7561a06cf1367e2950c4718ea04565e20fb5029b6c7d8ad09abcf" +checksum = "bbfc4744c1b8f2a09adc0e55242f60b1af195d88596bd8700be74418c056c555" [[package]] name = "ecdsa" @@ -1997,7 +4541,7 @@ version = "0.14.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" dependencies = [ - "der 0.6.0", + "der 0.6.1", "elliptic-curve 0.12.3", "rfc6979 0.3.1", "signature 1.6.4", @@ -2005,12 +4549,12 @@ dependencies = [ [[package]] name = "ecdsa" -version = "0.16.7" +version = "0.16.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0997c976637b606099b9985693efa3581e84e41f5c11ba5255f88711058ad428" +checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4" dependencies = [ - "der 0.7.7", - "digest 0.10.6", + "der 0.7.8", + "digest 0.10.7", "elliptic-curve 0.13.5", "rfc6979 0.4.0", "signature 2.1.0", @@ -2027,16 +4571,40 @@ dependencies = [ ] [[package]] +name = "ed25519" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60f6d271ca33075c88028be6f04d502853d63a5ece419d269c15315d4fc1cf1d" +dependencies = [ + "pkcs8 0.10.2", + "signature 2.1.0", +] + +[[package]] name = "ed25519-dalek" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" dependencies = [ "curve25519-dalek 3.2.0", - "ed25519", + "ed25519 1.5.3", "rand 0.7.3", "serde", - "sha2 0.9.8", + "sha2 0.9.9", + "zeroize", +] + +[[package]] +name = "ed25519-dalek" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980" +dependencies = [ + "curve25519-dalek 4.0.0", + "ed25519 2.2.2", + "rand_core 0.6.4", + "serde", + "sha2 0.10.7", "zeroize", ] @@ -2050,15 +4618,30 @@ dependencies = [ "hashbrown 0.12.3", "hex", "rand_core 0.6.4", - "sha2 0.9.8", + "sha2 0.9.9", + "zeroize", +] + +[[package]] +name = "ed25519-zebra" +version = "4.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e83e509bcd060ca4b54b72bde5bb306cb2088cb01e14797ebae90a24f70f5f7" +dependencies = [ + "curve25519-dalek 4.0.0", + "ed25519 2.2.2", + "hashbrown 0.14.0", + "hex", + "rand_core 0.6.4", + "sha2 0.10.7", "zeroize", ] [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "elliptic-curve" @@ -2068,10 +4651,10 @@ checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" dependencies = [ "base16ct 0.1.1", "crypto-bigint 0.4.9", - "der 0.6.0", - "digest 0.10.6", + "der 0.6.1", + "digest 0.10.7", "ff 0.12.1", - "generic-array 0.14.6", + "generic-array 0.14.7", "group 0.12.1", "hkdf", "pem-rfc7468", @@ -2090,13 +4673,13 @@ checksum = "968405c8fdc9b3bf4df0a6638858cc0b52462836ab6b1c87377785dd09cf1c0b" dependencies = [ "base16ct 0.2.0", "crypto-bigint 0.5.2", - "digest 0.10.6", + "digest 0.10.7", "ff 0.13.0", - "generic-array 0.14.6", + "generic-array 0.14.7", "group 0.13.0", "pkcs8 0.10.2", "rand_core 0.6.4", - "sec1 0.7.1", + "sec1 0.7.3", "subtle", "zeroize", ] @@ -2109,9 +4692,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "encoding_rs" -version = "0.8.30" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dc8abb250ffdda33912550faa54c88ec8b998dec0b2c55ab224921ce11df" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" dependencies = [ "cfg-if", ] @@ -2145,28 +4728,28 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.31", ] [[package]] name = "enumn" -version = "0.1.8" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48016319042fb7c87b78d2993084a831793a897a5cd1a2a67cab9d1eeb4b7d76" +checksum = "c2ad8cef1d801a4686bfd8919f0b30eac4c8e48968c437a6405ded4fb5272d2b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.31", ] [[package]] name = "env_logger" -version = "0.7.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" +checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" dependencies = [ "atty", - "humantime 1.3.0", + "humantime", "log", "regex", "termcolor", @@ -2174,12 +4757,12 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" dependencies = [ - "atty", - "humantime 2.1.0", + "humantime", + "is-terminal", "log", "regex", "termcolor", @@ -2192,10 +4775,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48c92028aaa870e83d51c64e5d4e0b6981b360c522198c23959f219a4e1b15b" [[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] name = "erased-serde" -version = "0.3.20" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad132dd8d0d0b546348d7d86cb3191aad14b34e5f979781fc005c80d4ac67ffd" +checksum = "837c0466252947ada828b975e12daf82e18bb5444e4df87be6038d4469e2a3d2" dependencies = [ "serde", ] @@ -2212,20 +4801,9 @@ dependencies = [ [[package]] name = "errno" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" -dependencies = [ - "errno-dragonfly", - "libc", - "winapi", -] - -[[package]] -name = "errno" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" dependencies = [ "errno-dragonfly", "libc", @@ -2243,10 +4821,37 @@ dependencies = [ ] [[package]] +name = "ethbloom" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c22d4b5885b6aa2fe5e8b9329fb8d232bf739e434e6b87347c63bdd00c120f60" +dependencies = [ + "crunchy", + "fixed-hash", + "impl-rlp", + "impl-serde", + "tiny-keccak", +] + +[[package]] +name = "ethereum-types" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02d215cbf040552efcbe99a38372fe80ab9d00268e20012b79fcd0f073edd8ee" +dependencies = [ + "ethbloom", + "fixed-hash", + "impl-rlp", + "impl-serde", + "primitive-types", + "uint", +] + +[[package]] name = "event-listener" -version = "2.5.1" +version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "exit-future" @@ -2297,14 +4902,14 @@ dependencies = [ "fs-err", "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.31", ] [[package]] name = "eyre" -version = "0.6.5" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "221239d1d5ea86bf5d6f91c9d6bc3646ffe471b08ff9b0f91c44f115ac969d2b" +checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb" dependencies = [ "indenter", "once_cell", @@ -2324,14 +4929,20 @@ checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" [[package]] name = "fastrand" -version = "1.7.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" dependencies = [ "instant", ] [[package]] +name = "fastrand" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" + +[[package]] name = "fatality" version = "0.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2348,7 +4959,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5aa1e3ae159e592ad222dc90c5acbad632b527779ba88486abe92782ab268bd" dependencies = [ "expander 0.0.4", - "indexmap", + "indexmap 1.9.3", "proc-macro-crate", "proc-macro2", "quote", @@ -2402,6 +5013,19 @@ dependencies = [ ] [[package]] +name = "fflonk" +version = "0.1.0" +source = "git+https://github.com/w3f/fflonk#26a5045b24e169cffc1f9328ca83d71061145c40" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-poly", + "ark-serialize", + "ark-std", + "merlin 3.0.0", +] + +[[package]] name = "fiat-crypto" version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2409,24 +5033,24 @@ checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" [[package]] name = "file-per-thread-logger" -version = "0.1.4" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fdbe0d94371f9ce939b555dd342d0686cc4c0cadbcd4b61d70af5ff97eb4126" +checksum = "84f2e425d9790201ba4af4630191feac6dcc98765b118d4d18e91d23c2353866" dependencies = [ - "env_logger 0.7.1", + "env_logger 0.10.0", "log", ] [[package]] name = "filetime" -version = "0.2.17" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94a7bbaa59354bc20dd75b67f23e2797b4490e9d6928203fb105c79e448c86c" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" dependencies = [ "cfg-if", "libc", - "redox_syscall", - "windows-sys 0.36.1", + "redox_syscall 0.3.5", + "windows-sys 0.48.0", ] [[package]] @@ -2442,6 +5066,7 @@ dependencies = [ "num-traits", "parity-scale-codec", "parking_lot 0.12.1", + "rand 0.8.5", "scale-info", ] @@ -2471,21 +5096,19 @@ dependencies = [ [[package]] name = "fixedbitset" -version = "0.4.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "398ea4fabe40b9b0d885340a2a991a44c8a645624075ad966d21f88688e2b69e" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.22" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ - "cfg-if", "crc32fast", - "libc", "libz-sys", - "miniz_oxide 0.4.4", + "miniz_oxide", ] [[package]] @@ -2506,21 +5129,30 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "parity-scale-codec", ] [[package]] name = "form_urlencoded" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ "percent-encoding", ] [[package]] +name = "fraction" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3027ae1df8d41b4bed2241c8fdad4acc1e7af60c8e17743534b545e77182d678" +dependencies = [ + "lazy_static", + "num", +] + +[[package]] name = "fragile" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2529,8 +5161,8 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ + "array-bytes", "frame-support", "frame-support-procedural", "frame-system", @@ -2538,12 +5170,14 @@ dependencies = [ "log", "parity-scale-codec", "paste", + "rusty-fork", "scale-info", "serde", "sp-api", "sp-application-crypto", "sp-core", "sp-io", + "sp-keystore", "sp-runtime", "sp-runtime-interface", "sp-std", @@ -2554,19 +5188,18 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "Inflector", "array-bytes", "chrono", - "clap 4.2.5", + "clap 4.4.2", "comfy-table", "frame-benchmarking", "frame-support", "frame-system", "gethostname", "handlebars", - "itertools", + "itertools 0.10.5", "lazy_static", "linked-hash-map", "log", @@ -2600,48 +5233,90 @@ dependencies = [ ] [[package]] +name = "frame-benchmarking-pallet-pov" +version = "4.0.0-dev" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] name = "frame-election-provider-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ + "frame-election-provider-support", + "frame-support", + "parity-scale-codec", "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.16", + "scale-info", + "sp-arithmetic", + "syn 2.0.31", + "trybuild", ] [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-election-provider-solution-type", "frame-support", "frame-system", "parity-scale-codec", + "rand 0.8.5", "scale-info", "sp-arithmetic", "sp-core", + "sp-io", "sp-npos-elections", "sp-runtime", "sp-std", ] [[package]] +name = "frame-election-solution-type-fuzzer" +version = "2.0.0-alpha.5" +dependencies = [ + "clap 4.4.2", + "frame-election-provider-solution-type", + "frame-election-provider-support", + "frame-support", + "honggfuzz", + "parity-scale-codec", + "rand 0.8.5", + "scale-info", + "sp-arithmetic", + "sp-npos-elections", + "sp-runtime", +] + +[[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ + "array-bytes", "frame-support", "frame-system", "frame-try-runtime", + "log", + "pallet-balances", + "pallet-transaction-payment", "parity-scale-codec", "scale-info", "sp-core", + "sp-inherents", "sp-io", "sp-runtime", "sp-std", "sp-tracing", + "sp-version", ] [[package]] @@ -2659,7 +5334,6 @@ dependencies = [ [[package]] name = "frame-remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-recursion", "futures", @@ -2671,6 +5345,8 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", + "sp-state-machine", + "sp-tracing", "spinners", "substrate-rpc-client", "tokio", @@ -2680,84 +5356,90 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ - "bitflags", + "aquamarine", + "array-bytes", + "assert_matches", + "bitflags 1.3.2", + "docify", "environmental", "frame-metadata", "frame-support-procedural", + "frame-system", "impl-trait-for-tuples", "k256", "log", "macro_magic", "parity-scale-codec", "paste", + "pretty_assertions", "scale-info", "serde", + "serde_json", "smallvec", "sp-api", "sp-arithmetic", "sp-core", "sp-core-hashing-proc-macro", "sp-debug-derive", + "sp-genesis-builder", "sp-inherents", "sp-io", + "sp-metadata-ir", "sp-runtime", "sp-staking", "sp-state-machine", "sp-std", "sp-tracing", "sp-weights", + "static_assertions", "tt-call", ] [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "Inflector", "cfg-expr", "derive-syn-parse", "expander 2.0.0", "frame-support-procedural-tools", - "itertools", + "itertools 0.10.5", "macro_magic", "proc-macro-warning", "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.31", ] [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.31", ] [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.31", ] [[package]] name = "frame-support-test" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-executive", + "frame-metadata", "frame-support", "frame-support-test-pallet", "frame-system", @@ -2770,6 +5452,7 @@ dependencies = [ "sp-arithmetic", "sp-core", "sp-io", + "sp-metadata-ir", "sp-runtime", "sp-state-machine", "sp-std", @@ -2779,40 +5462,54 @@ dependencies = [ ] [[package]] +name = "frame-support-test-compile-pass" +version = "4.0.0-dev" +dependencies = [ + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-runtime", + "sp-version", +] + +[[package]] name = "frame-support-test-pallet" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", "scale-info", "serde", + "sp-runtime", ] [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "cfg-if", + "criterion 0.4.0", "frame-support", "log", "parity-scale-codec", "scale-info", "serde", "sp-core", + "sp-externalities", "sp-io", "sp-runtime", "sp-std", "sp-version", "sp-weights", + "substrate-test-runtime-client", ] [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", @@ -2820,14 +5517,16 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-core", + "sp-externalities", + "sp-io", "sp-runtime", "sp-std", + "sp-version", ] [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "parity-scale-codec", "sp-api", @@ -2836,7 +5535,6 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-support", "parity-scale-codec", @@ -2847,9 +5545,9 @@ dependencies = [ [[package]] name = "fs-err" -version = "2.6.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ebd3504ad6116843b8375ad70df74e7bfe83cac77a1f3fe73200c844d43bfe0" +checksum = "0845fa252299212f0389d64ba26f34fa32cfe41588355f21ed507c59a0f64541" [[package]] name = "fs2" @@ -2863,13 +5561,12 @@ dependencies = [ [[package]] name = "fs4" -version = "0.6.3" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea55201cc351fdb478217c0fb641b59813da9b4efe4c414a9d8f989a657d149" +checksum = "2eeb4ed9e12f43b7fa0baae3f9cdda28352770132ef2e09a23760c29cae8bd47" dependencies = [ - "libc", - "rustix 0.35.13", - "winapi", + "rustix 0.38.8", + "windows-sys 0.48.0", ] [[package]] @@ -2935,16 +5632,16 @@ checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-lite" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ - "fastrand", + "fastrand 1.9.0", "futures-core", "futures-io", "memchr", "parking", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.12", "waker-fn", ] @@ -2956,7 +5653,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.31", ] [[package]] @@ -2966,7 +5663,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2411eed028cdf8c8034eaf21f9915f956b6c3abec4d4c7949ee67f0721127bd" dependencies = [ "futures-io", - "rustls 0.20.7", + "rustls 0.20.8", "webpki 0.22.0", ] @@ -3001,7 +5698,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.12", "pin-utils", "slab", ] @@ -3018,7 +5715,6 @@ dependencies = [ [[package]] name = "generate-bags" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "chrono", "frame-election-provider-support", @@ -3040,9 +5736,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.6" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", @@ -3072,57 +5768,65 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", + "js-sys", "libc", "wasi 0.11.0+wasi-snapshot-preview1", + "wasm-bindgen", ] [[package]] name = "ghash" -version = "0.3.1" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97304e4cd182c3846f7575ced3890c53012ce534ad9114046b0a9e00bb30a375" +checksum = "1583cc1656d7839fd3732b80cf4f38850336cdb9b8ded1cd399ca62958de3c99" dependencies = [ "opaque-debug 0.3.0", - "polyval 0.4.5", + "polyval 0.5.3", ] [[package]] name = "ghash" -version = "0.4.4" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1583cc1656d7839fd3732b80cf4f38850336cdb9b8ded1cd399ca62958de3c99" +checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40" dependencies = [ "opaque-debug 0.3.0", - "polyval 0.5.3", + "polyval 0.6.1", ] [[package]] name = "gimli" -version = "0.27.0" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dec7af912d60cdbd3677c1af9352ebae6fb8394d165568a2234df0fa00f87793" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" dependencies = [ "fallible-iterator", - "indexmap", + "indexmap 1.9.3", "stable_deref_trait", ] [[package]] +name = "gimli" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" + +[[package]] name = "glob" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.8" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10463d9ff00a2a068db14231982f5132edebad0d7660cd956a1c30292dbcbfbd" +checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" dependencies = [ "aho-corasick", "bstr", @@ -3132,6 +5836,43 @@ dependencies = [ ] [[package]] +name = "glutton-runtime" +version = "1.0.0" +dependencies = [ + "cumulus-pallet-parachain-system", + "cumulus-pallet-xcm", + "cumulus-primitives-core", + "frame-benchmarking", + "frame-executive", + "frame-support", + "frame-system", + "frame-system-benchmarking", + "frame-system-rpc-runtime-api", + "frame-try-runtime", + "pallet-glutton", + "pallet-sudo", + "parachain-info", + "parachains-common", + "parity-scale-codec", + "scale-info", + "sp-api", + "sp-block-builder", + "sp-core", + "sp-inherents", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-std", + "sp-storage", + "sp-transaction-pool", + "sp-version", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "substrate-wasm-builder", +] + +[[package]] name = "group" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3155,9 +5896,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.17" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66b91535aa35fea1523ad1b86cb6b53c28e0ae566ba4a460f4457e936cad7c6f" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" dependencies = [ "bytes", "fnv", @@ -3165,7 +5906,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.3", "slab", "tokio", "tokio-util", @@ -3180,16 +5921,16 @@ checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] name = "handlebars" -version = "4.2.2" +version = "4.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d6a30320f094710245150395bc763ad23128d6a1ebbad7594dc4164b62c56b" +checksum = "83c3372087601b532857d332f5957cbae686da52bb7810bf038c3e3c3cc2fa0d" dependencies = [ "log", "pest", "pest_derive", - "quick-error 2.0.1", "serde", "serde_json", + "thiserror", ] [[package]] @@ -3222,14 +5963,25 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash 0.8.2", + "ahash 0.8.3", +] + +[[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +dependencies = [ + "ahash 0.8.3", + "allocator-api2", + "serde", ] [[package]] name = "heck" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" @@ -3242,9 +5994,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "hex" @@ -3285,16 +6037,6 @@ dependencies = [ [[package]] name = "hmac" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15" -dependencies = [ - "crypto-mac 0.10.1", - "digest 0.9.0", -] - -[[package]] -name = "hmac" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" @@ -3309,7 +6051,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -3319,7 +6061,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17ea0a1394df5b6574da6e0c1ade9e78868c9fb0a4e5ef4428e32da4676b85b1" dependencies = [ "digest 0.9.0", - "generic-array 0.14.6", + "generic-array 0.14.7", "hmac 0.8.1", ] @@ -3332,7 +6074,7 @@ dependencies = [ "arbitrary", "lazy_static", "memmap2", - "rustc_version", + "rustc_version 0.4.0", ] [[package]] @@ -3348,9 +6090,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ "bytes", "fnv", @@ -3365,35 +6107,26 @@ checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", "http", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.12", ] [[package]] name = "http-range-header" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" +checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" [[package]] name = "httparse" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9100414882e15fb7feccb4897e5f0ff0ff1ca7d1a86a23208ada4d7a18e6c6c4" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" - -[[package]] -name = "humantime" -version = "1.3.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" -dependencies = [ - "quick-error 1.2.3", -] +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "humantime" @@ -3403,9 +6136,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.20" +version = "0.14.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02c929dc5c39e335a03c405292728118860721b10190d98c2a0f0efd5baafbac" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" dependencies = [ "bytes", "futures-channel", @@ -3417,8 +6150,8 @@ dependencies = [ "httparse", "httpdate", "itoa", - "pin-project-lite 0.2.9", - "socket2", + "pin-project-lite 0.2.12", + "socket2 0.4.9", "tokio", "tower-service", "tracing", @@ -3427,33 +6160,42 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.23.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d87c48c02e0dc5e3b849a2041db3029fd066650f8f717c07bf8ed78ccb895cac" +checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" dependencies = [ + "futures-util", "http", "hyper", "log", - "rustls 0.20.7", + "rustls 0.21.6", "rustls-native-certs", "tokio", - "tokio-rustls 0.23.2", - "webpki-roots", + "tokio-rustls", + "webpki-roots 0.23.1", ] [[package]] -name = "hyper-rustls" -version = "0.24.0" +name = "iana-time-zone" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" dependencies = [ - "http", - "hyper", - "log", - "rustls 0.21.2", - "rustls-native-certs", - "tokio", - "tokio-rustls 0.24.1", + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows 0.48.0", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", ] [[package]] @@ -3475,9 +6217,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -3495,9 +6237,9 @@ dependencies = [ [[package]] name = "if-watch" -version = "3.0.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba7abdbb86e485125dad06c2691e1e393bf3b08c7b743b43aa162a00fd39062e" +checksum = "a9465340214b296cd17a0009acdb890d6160010b8adf8f78a00d0d7ab270f79f" dependencies = [ "async-io", "core-foundation", @@ -3509,7 +6251,7 @@ dependencies = [ "rtnetlink", "system-configuration", "tokio", - "windows", + "windows 0.34.0", ] [[package]] @@ -3522,6 +6264,26 @@ dependencies = [ ] [[package]] +name = "impl-num-traits" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "951641f13f873bff03d4bf19ae8bec531935ac0ac2cc775f84d7edfdcfed3f17" +dependencies = [ + "integer-sqrt", + "num-traits", + "uint", +] + +[[package]] +name = "impl-rlp" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28220f89297a075ddc7245cd538076ee98b01f2a9c23a53a4f1105d5a322808" +dependencies = [ + "rlp", +] + +[[package]] name = "impl-serde" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3542,6 +6304,25 @@ dependencies = [ ] [[package]] +name = "include_dir" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18762faeff7122e89e0857b02f7ce6fcc0d101d5e9ad2ad7846cc01d61b7f19e" +dependencies = [ + "include_dir_macros", +] + +[[package]] +name = "include_dir_macros" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b139284b5cf57ecfa712bcc66950bb635b31aff41c188e8a4cfc758eca374a3f" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] name = "indenter" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3549,9 +6330,9 @@ checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" [[package]] name = "indexmap" -version = "1.9.1" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown 0.12.3", @@ -3559,18 +6340,44 @@ dependencies = [ ] [[package]] +name = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown 0.14.0", +] + +[[package]] +name = "indexmap-nostd" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e04e2fd2b8188ea827b32ef11de88377086d690286ab35747ef7f9bf3ccb590" + +[[package]] name = "indicatif" -version = "0.17.3" +version = "0.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cef509aa9bc73864d6756f0d34d35504af3cf0844373afe9b8669a5b8005a729" +checksum = "0b297dc40733f23a0e52728a58fa9489a5b7638a324932de16b41adc3ef80730" dependencies = [ "console", + "instant", "number_prefix", "portable-atomic", "unicode-width", ] [[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array 0.14.7", +] + +[[package]] name = "instant" version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3581,9 +6388,9 @@ dependencies = [ [[package]] name = "integer-encoding" -version = "3.0.2" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90c11140ffea82edce8dcd74137ce9324ec24b3cf0175fc9d7e29164da9915b8" +checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02" [[package]] name = "integer-sqrt" @@ -3595,6 +6402,57 @@ dependencies = [ ] [[package]] +name = "integration-tests-common" +version = "1.0.0" +dependencies = [ + "asset-hub-kusama-runtime", + "asset-hub-polkadot-runtime", + "asset-hub-westend-runtime", + "bp-messages", + "bridge-hub-kusama-runtime", + "bridge-hub-polkadot-runtime", + "bridge-hub-rococo-runtime", + "bridge-runtime-common", + "collectives-polkadot-runtime", + "cumulus-pallet-dmp-queue", + "cumulus-pallet-parachain-system", + "cumulus-pallet-xcmp-queue", + "cumulus-primitives-core", + "frame-support", + "kusama-runtime-constants", + "pallet-assets", + "pallet-bridge-messages", + "pallet-im-online", + "pallet-message-queue", + "pallet-staking", + "pallet-xcm", + "parachains-common", + "parity-scale-codec", + "paste", + "penpal-runtime", + "polkadot-core-primitives", + "polkadot-parachain-primitives", + "polkadot-primitives", + "polkadot-runtime", + "polkadot-runtime-constants", + "polkadot-runtime-parachains", + "polkadot-service", + "rococo-runtime", + "rococo-runtime-constants", + "sc-consensus-grandpa", + "sp-authority-discovery", + "sp-consensus-babe", + "sp-consensus-beefy", + "sp-core", + "sp-runtime", + "staging-kusama-runtime", + "staging-xcm", + "westend-runtime", + "westend-runtime-constants", + "xcm-emulator", +] + +[[package]] name = "interceptor" version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3615,17 +6473,11 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074" - -[[package]] -name = "io-lifetimes" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.1", + "hermit-abi 0.3.2", "libc", "windows-sys 0.48.0", ] @@ -3638,48 +6490,65 @@ checksum = "aa2f047c0a98b2f299aa5d6d7088443570faae494e9ae1305e48be000c9e0eb1" [[package]] name = "ipconfig" -version = "0.3.0" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "723519edce41262b05d4143ceb95050e4c614f483e78e9fd9e39a8275a84ad98" +checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2", + "socket2 0.5.3", "widestring", - "winapi", - "winreg 0.7.0", + "windows-sys 0.48.0", + "winreg", ] [[package]] name = "ipnet" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11b0d96e660696543b251e58030cf9787df56da39dab19ad60eae7353040917e" +checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" [[package]] name = "is-terminal" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes 1.0.10", - "rustix 0.37.18", + "hermit-abi 0.3.2", + "rustix 0.38.8", "windows-sys 0.48.0", ] [[package]] +name = "is_executable" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa9acdc6d67b75e626ad644734e8bc6df893d9cd2a834129065d3dd6158ea9c8" +dependencies = [ + "winapi", +] + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] name = "itertools" -version = "0.10.3" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" dependencies = [ "either", ] [[package]] name = "itoa" -version = "1.0.4" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jobserver" @@ -3692,9 +6561,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.62" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68c16e1bfd491478ab155fd8b4896b86f9ede344949b641e61501e07c2b8b4d5" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] @@ -3706,10 +6575,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "078e285eafdfb6c4b434e0d31e8cfcb5115b651496faca5749b88fafd4f23bfd" [[package]] +name = "json-patch" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f54898088ccb91df1b492cc80029a6fdf1c48ca0db7c6822a8babad69c94658" +dependencies = [ + "serde", + "serde_json", + "thiserror", +] + +[[package]] name = "jsonrpsee" -version = "0.16.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d291e3a5818a2384645fd9756362e6d89cf0541b0b916fa7702ea4a9833608e" +checksum = "367a292944c07385839818bb71c8d76611138e2dedb0677d035b8da21d29c78b" dependencies = [ "jsonrpsee-core", "jsonrpsee-http-client", @@ -3722,9 +6602,9 @@ dependencies = [ [[package]] name = "jsonrpsee-client-transport" -version = "0.16.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "965de52763f2004bc91ac5bcec504192440f0b568a5d621c59d9dbd6f886c3fb" +checksum = "c8b3815d9f5d5de348e5f162b316dc9cdf4548305ebb15b4eb9328e66cf27d7a" dependencies = [ "futures-util", "http", @@ -3735,20 +6615,20 @@ dependencies = [ "soketto", "thiserror", "tokio", - "tokio-rustls 0.23.2", + "tokio-rustls", "tokio-util", "tracing", - "webpki-roots", + "webpki-roots 0.25.2", ] [[package]] name = "jsonrpsee-core" -version = "0.16.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4e70b4439a751a5de7dd5ed55eacff78ebf4ffe0fc009cb1ebb11417f5b536b" +checksum = "2b5dde66c53d6dcdc8caea1874a45632ec0fcf5b437789f1e45766a1512ce803" dependencies = [ "anyhow", - "arrayvec 0.7.2", + "arrayvec 0.7.4", "async-lock", "async-trait", "beef", @@ -3771,13 +6651,13 @@ dependencies = [ [[package]] name = "jsonrpsee-http-client" -version = "0.16.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc345b0a43c6bc49b947ebeb936e886a419ee3d894421790c969cc56040542ad" +checksum = "7e5f9fabdd5d79344728521bb65e3106b49ec405a78b66fbff073b72b389fa43" dependencies = [ "async-trait", "hyper", - "hyper-rustls 0.23.0", + "hyper-rustls", "jsonrpsee-core", "jsonrpsee-types", "rustc-hash", @@ -3790,9 +6670,9 @@ dependencies = [ [[package]] name = "jsonrpsee-proc-macros" -version = "0.16.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baa6da1e4199c10d7b1d0a6e5e8bd8e55f351163b6f4b3cbb044672a69bd4c1c" +checksum = "44e8ab85614a08792b9bff6c8feee23be78c98d0182d4c622c05256ab553892a" dependencies = [ "heck", "proc-macro-crate", @@ -3803,9 +6683,9 @@ dependencies = [ [[package]] name = "jsonrpsee-server" -version = "0.16.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb69dad85df79527c019659a992498d03f8495390496da2f07e6c24c2b356fc" +checksum = "cf4d945a6008c9b03db3354fb3c83ee02d2faa9f2e755ec1dfb69c3551b8f4ba" dependencies = [ "futures-channel", "futures-util", @@ -3825,9 +6705,9 @@ dependencies = [ [[package]] name = "jsonrpsee-types" -version = "0.16.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bd522fe1ce3702fd94812965d7bb7a3364b1c9aba743944c5a00529aae80f8c" +checksum = "245ba8e5aa633dd1c1e4fae72bce06e71f42d34c14a2767c6b4d173b57bee5e5" dependencies = [ "anyhow", "beef", @@ -3839,9 +6719,9 @@ dependencies = [ [[package]] name = "jsonrpsee-ws-client" -version = "0.16.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b83daeecfc6517cfe210df24e570fb06213533dfb990318fae781f4c7119dd9" +checksum = "4e1b3975ed5d73f456478681a417128597acd6a2487855fdb7b4a3d4d195bf5e" dependencies = [ "http", "jsonrpsee-client-transport", @@ -3856,56 +6736,85 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cadb76004ed8e97623117f3df85b17aaa6626ab0b0831e6573f104df16cd1bcc" dependencies = [ "cfg-if", - "ecdsa 0.16.7", + "ecdsa 0.16.8", "elliptic-curve 0.13.5", "once_cell", - "sha2 0.10.2", + "sha2 0.10.7", ] [[package]] name = "keccak" -version = "0.1.0" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7" +checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" +dependencies = [ + "cpufeatures", +] [[package]] -name = "kusama-runtime" -version = "1.0.0" +name = "keccak-hasher" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ea4653859ca2266a86419d3f592d3f22e7a854b482f99180d2498507902048" +dependencies = [ + "hash-db", + "hash256-std-hasher", + "tiny-keccak", +] + +[[package]] +name = "kitchensink-runtime" +version = "3.0.0-dev" dependencies = [ - "bitvec", "frame-benchmarking", + "frame-benchmarking-pallet-pov", "frame-election-provider-support", "frame-executive", - "frame-remote-externalities", "frame-support", "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", - "hex-literal 0.4.1", - "kusama-runtime-constants", "log", + "node-primitives", + "pallet-alliance", + "pallet-asset-conversion", + "pallet-asset-conversion-tx-payment", + "pallet-asset-rate", + "pallet-asset-tx-payment", + "pallet-assets", "pallet-authority-discovery", "pallet-authorship", "pallet-babe", "pallet-bags-list", "pallet-balances", "pallet-bounties", + "pallet-broker", "pallet-child-bounties", "pallet-collective", + "pallet-contracts", + "pallet-contracts-primitives", "pallet-conviction-voting", + "pallet-core-fellowship", "pallet-democracy", "pallet-election-provider-multi-phase", "pallet-election-provider-support-benchmarking", "pallet-elections-phragmen", "pallet-fast-unstake", + "pallet-glutton", "pallet-grandpa", "pallet-identity", "pallet-im-online", "pallet-indices", + "pallet-insecure-randomness-collective-flip", + "pallet-lottery", "pallet-membership", "pallet-message-queue", + "pallet-mmr", "pallet-multisig", + "pallet-nft-fractionalization", + "pallet-nfts", + "pallet-nfts-runtime-api", "pallet-nis", "pallet-nomination-pools", "pallet-nomination-pools-benchmarking", @@ -3917,62 +6826,53 @@ dependencies = [ "pallet-ranked-collective", "pallet-recovery", "pallet-referenda", + "pallet-remark", + "pallet-root-testing", + "pallet-safe-mode", + "pallet-salary", "pallet-scheduler", "pallet-session", "pallet-session-benchmarking", "pallet-society", "pallet-staking", + "pallet-staking-reward-curve", "pallet-staking-runtime-api", "pallet-state-trie-migration", + "pallet-statement", + "pallet-sudo", "pallet-timestamp", "pallet-tips", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", + "pallet-transaction-storage", "pallet-treasury", + "pallet-tx-pause", + "pallet-uniques", "pallet-utility", "pallet-vesting", "pallet-whitelist", - "pallet-xcm", - "pallet-xcm-benchmarks", "parity-scale-codec", - "polkadot-primitives", - "polkadot-runtime-common", - "polkadot-runtime-parachains", - "rustc-hex", + "primitive-types", "scale-info", - "separator", - "serde", - "serde_derive", - "serde_json", - "smallvec", "sp-api", - "sp-arithmetic", "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", - "sp-consensus-beefy", + "sp-consensus-grandpa", "sp-core", "sp-inherents", "sp-io", - "sp-keyring", - "sp-mmr-primitives", - "sp-npos-elections", "sp-offchain", "sp-runtime", "sp-session", "sp-staking", + "sp-statement-store", "sp-std", - "sp-tracing", + "sp-storage", "sp-transaction-pool", - "sp-trie", "sp-version", "static_assertions", "substrate-wasm-builder", - "tiny-keccak", - "tokio", - "xcm", - "xcm-builder", - "xcm-executor", ] [[package]] @@ -4054,16 +6954,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] +name = "leb128" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" + +[[package]] name = "libc" -version = "0.2.142" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libflate" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97822bf791bd4d5b403713886a5fbe8bf49520fe78e323b0dc480ca1a03e50b0" +checksum = "5ff4ae71b685bbad2f2f391fe74f6b7659a34871c08b210fdc039e43bee07d18" dependencies = [ "adler32", "crc32fast", @@ -4081,9 +6987,9 @@ dependencies = [ [[package]] name = "libloading" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afe203d669ec979b7128619bae5a63b7b42e9203c1b29146079ee05e2f604b52" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" dependencies = [ "cfg-if", "winapi", @@ -4091,9 +6997,9 @@ dependencies = [ [[package]] name = "libm" -version = "0.1.4" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a" +checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" [[package]] name = "libp2p" @@ -4104,7 +7010,7 @@ dependencies = [ "bytes", "futures", "futures-timer", - "getrandom 0.2.8", + "getrandom 0.2.10", "instant", "libp2p-allow-block-list", "libp2p-connection-limits", @@ -4209,7 +7115,7 @@ dependencies = [ "libp2p-identity", "libp2p-swarm", "log", - "lru 0.10.0", + "lru 0.10.1", "quick-protobuf", "quick-protobuf-codec", "smallvec", @@ -4219,18 +7125,18 @@ dependencies = [ [[package]] name = "libp2p-identity" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e2d584751cecb2aabaa56106be6be91338a60a0f4e420cf2af639204f596fc1" +checksum = "276bb57e7af15d8f100d3c11cbdd32c6752b7eef4ba7a18ecf464972c07abcce" dependencies = [ - "bs58", - "ed25519-dalek", + "bs58 0.4.0", + "ed25519-dalek 2.0.0", "log", "multiaddr", "multihash", "quick-protobuf", "rand 0.8.5", - "sha2 0.10.2", + "sha2 0.10.7", "thiserror", "zeroize", ] @@ -4241,7 +7147,7 @@ version = "0.43.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39d5ef876a2b2323d63c258e63c2f8e36f205fe5a11f0b3095d59635650790ff" dependencies = [ - "arrayvec 0.7.2", + "arrayvec 0.7.4", "asynchronous-codec", "bytes", "either", @@ -4255,7 +7161,7 @@ dependencies = [ "log", "quick-protobuf", "rand 0.8.5", - "sha2 0.10.2", + "sha2 0.10.7", "smallvec", "thiserror", "uint", @@ -4278,7 +7184,7 @@ dependencies = [ "log", "rand 0.8.5", "smallvec", - "socket2", + "socket2 0.4.9", "tokio", "trust-dns-proto", "void", @@ -4313,7 +7219,7 @@ dependencies = [ "once_cell", "quick-protobuf", "rand 0.8.5", - "sha2 0.10.2", + "sha2 0.10.7", "snow", "static_assertions", "thiserror", @@ -4355,7 +7261,7 @@ dependencies = [ "parking_lot 0.12.1", "quinn-proto", "rand 0.8.5", - "rustls 0.20.7", + "rustls 0.20.8", "thiserror", "tokio", ] @@ -4420,7 +7326,7 @@ dependencies = [ "libc", "libp2p-core", "log", - "socket2", + "socket2 0.4.9", "tokio", ] @@ -4435,8 +7341,8 @@ dependencies = [ "libp2p-core", "libp2p-identity", "rcgen 0.10.0", - "ring", - "rustls 0.20.7", + "ring 0.16.20", + "rustls 0.20.8", "thiserror", "webpki 0.22.0", "x509-parser 0.14.0", @@ -4504,7 +7410,7 @@ dependencies = [ "rw-stream-sink", "soketto", "url", - "webpki-roots", + "webpki-roots 0.22.6", ] [[package]] @@ -4537,12 +7443,12 @@ dependencies = [ [[package]] name = "libsecp256k1" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0452aac8bab02242429380e9b2f94ea20cea2b37e2c1777a1358799bbe97f37" +checksum = "95b09eff1b35ed3b33b877ced3a691fc7a481919c7e29c53c906226fcf55e2a1" dependencies = [ "arrayref", - "base64 0.13.0", + "base64 0.13.1", "digest 0.9.0", "hmac-drbg", "libsecp256k1-core", @@ -4550,7 +7456,7 @@ dependencies = [ "libsecp256k1-gen-genmult", "rand 0.8.5", "serde", - "sha2 0.9.8", + "sha2 0.9.9", "typenum", ] @@ -4585,9 +7491,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.3" +version = "1.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de5435b8549c16d423ed0c03dbaafe57cf6c3344744f1242520d59c9d8ecec66" +checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" dependencies = [ "cc", "pkg-config", @@ -4596,18 +7502,18 @@ dependencies = [ [[package]] name = "link-cplusplus" -version = "1.0.7" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369" +checksum = "9d240c6f7e1ba3a28b0249f774e6a9dd0175054b52dfbb61b16eb8505c3785c9" dependencies = [ "cc", ] [[package]] name = "linked-hash-map" -version = "0.5.4" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linked_hash_set" @@ -4620,36 +7526,54 @@ dependencies = [ [[package]] name = "linregress" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "475015a7f8f017edb28d2e69813be23500ad4b32cfe3421c4148efc97324ee52" +checksum = "4de0b5f52a9f84544d268f5fabb71b38962d6aa3c6600b8bcd27d44ccf9c9c45" dependencies = [ "nalgebra", ] [[package]] name = "linux-raw-sys" -version = "0.0.46" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" [[package]] name = "linux-raw-sys" -version = "0.1.4" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.3.6" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" + +[[package]] +name = "lite-json" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b64f40e5e03e0d54f03845c8197d0291253cdbedfb1cb46b13c2c117554a9f4c" +checksum = "cd0e787ffe1153141a0f6f6d759fdf1cc34b1226e088444523812fd412a5cca2" +dependencies = [ + "lite-parser", +] + +[[package]] +name = "lite-parser" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3d5f9dc37c52d889a21fd701983d02bb6a84f852c5140a6c80ef4557f7dc29e" +dependencies = [ + "paste", +] [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ "autocfg", "scopeguard", @@ -4657,9 +7581,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" dependencies = [ "serde", "value-bag", @@ -4667,23 +7591,29 @@ dependencies = [ [[package]] name = "lru" -version = "0.9.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e7d46de488603ffdd5f30afbc64fbba2378214a2c3a2fb83abf3d33126df17" +checksum = "b6e8aaa3f231bb4bd57b84b2d5dc3ae7f350265df8aa96492e0bc394a1571909" dependencies = [ - "hashbrown 0.13.2", + "hashbrown 0.12.3", ] [[package]] name = "lru" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03f1160296536f10c833a82dca22267d5486734230d47bf00bf435885814ba1e" +checksum = "718e8fae447df0c7e1ba7f5189829e63fd536945c8988d61444c19039f16b670" dependencies = [ "hashbrown 0.13.2", ] [[package]] +name = "lru" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eedb2bdbad7e0634f83989bf596f497b070130daaa398ab22d84c39e266deec5" + +[[package]] name = "lru-cache" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4723,49 +7653,50 @@ dependencies = [ [[package]] name = "macro_magic" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614b1304ab7877b499925b4dcc5223ff480f2646ad4db1ee7065badb8d530439" +checksum = "aee866bfee30d2d7e83835a4574aad5b45adba4cc807f2a3bbba974e5d4383c9" dependencies = [ "macro_magic_core", "macro_magic_macros", "quote", - "syn 2.0.16", + "syn 2.0.31", ] [[package]] name = "macro_magic_core" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8d72c1b662d07b8e482c80d3a7fc4168e058b3bef4c573e94feb714b670f406" +checksum = "7e766a20fd9c72bab3e1e64ed63f36bd08410e75803813df210d1ce297d7ad00" dependencies = [ + "const-random", "derive-syn-parse", "macro_magic_core_macros", "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.31", ] [[package]] name = "macro_magic_core_macros" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93d7d9e6e234c040dafc745c7592738d56a03ad04b1fa04ab60821deb597466a" +checksum = "c12469fc165526520dff2807c2975310ab47cf7190a45b99b49a7dc8befab17b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.31", ] [[package]] name = "macro_magic_macros" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffd19f13cfd2bfbd83692adfef8c244fe5109b3eb822a1fb4e0a6253b406cd81" +checksum = "b8fb85ec1620619edf2984a7693497d4ec88a9665d8b87e942856884c92dbf2a" dependencies = [ "macro_magic_core", "quote", - "syn 2.0.16", + "syn 2.0.31", ] [[package]] @@ -4786,7 +7717,7 @@ version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1" dependencies = [ - "regex-automata", + "regex-automata 0.1.10", ] [[package]] @@ -4795,46 +7726,47 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" dependencies = [ - "regex-automata", + "regex-automata 0.1.10", ] [[package]] name = "matches" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "matrixmultiply" -version = "0.3.2" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add85d4dd35074e6fedc608f8c8f513a3548619a9024b751949ef0e8e45a4d84" +checksum = "090126dc04f95dc0d1c1c91f61bdd474b3930ca064c1edc8a849da2c6cbe1e77" dependencies = [ + "autocfg", "rawpointer", ] [[package]] name = "md-5" -version = "0.10.4" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66b48670c893079d3c2ed79114e3644b7004df1c361a4e0ad52e2e6940d07c3d" +checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", ] [[package]] name = "memchr" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memfd" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b20a59d985586e4a5aef64564ac77299f8586d8be6cf9106a5a40207e8908efb" +checksum = "ffc89ccdc6e10d6907450f753537ebc5c5d3460d2e4e62ea74bd571db62c0f9e" dependencies = [ - "rustix 0.36.7", + "rustix 0.37.23", ] [[package]] @@ -4848,9 +7780,9 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" dependencies = [ "autocfg", ] @@ -4874,6 +7806,15 @@ dependencies = [ ] [[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[package]] name = "memory-db" version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4895,6 +7836,18 @@ dependencies = [ ] [[package]] +name = "merlin" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d" +dependencies = [ + "byteorder", + "keccak", + "rand_core 0.6.4", + "zeroize", +] + +[[package]] name = "mick-jaeger" version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4907,9 +7860,9 @@ dependencies = [ [[package]] name = "mime" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "minimal-lexical" @@ -4919,43 +7872,33 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" -dependencies = [ - "adler", - "autocfg", -] - -[[package]] -name = "miniz_oxide" -version = "0.6.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.5" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", - "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.42.0", + "windows-sys 0.48.0", ] [[package]] name = "mmr-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "futures", "log", "parity-scale-codec", + "parking_lot 0.12.1", + "sc-block-builder", "sc-client-api", "sc-offchain", "sp-api", @@ -4965,17 +7908,20 @@ dependencies = [ "sp-core", "sp-mmr-primitives", "sp-runtime", + "sp-tracing", + "substrate-test-runtime-client", + "tokio", ] [[package]] name = "mmr-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "anyhow", "jsonrpsee", "parity-scale-codec", "serde", + "serde_json", "sp-api", "sp-blockchain", "sp-core", @@ -4985,24 +7931,24 @@ dependencies = [ [[package]] name = "mockall" -version = "0.11.3" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50e4a1c770583dac7ab5e2f6c139153b783a53a1bbee9729613f193e59828326" +checksum = "4c84490118f2ee2d74570d114f3d0493cbf02790df303d2707606c3e14e07c96" dependencies = [ "cfg-if", "downcast", "fragile", "lazy_static", "mockall_derive", - "predicates", + "predicates 2.1.5", "predicates-tree", ] [[package]] name = "mockall_derive" -version = "0.11.3" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "832663583d5fa284ca8810bf7015e46c9fff9622d3cf34bd1eea5003fec06dd0" +checksum = "22ce75669015c4f47b289fd4d4f56e894e4c96003ffdf3ac51313126f94c6cbb" dependencies = [ "cfg-if", "proc-macro2", @@ -5050,9 +7996,9 @@ dependencies = [ "blake2s_simd", "blake3", "core2", - "digest 0.10.6", + "digest 0.10.7", "multihash-derive", - "sha2 0.10.2", + "sha2 0.10.7", "sha3", "unsigned-varint", ] @@ -5093,9 +8039,9 @@ dependencies = [ [[package]] name = "nalgebra" -version = "0.32.1" +version = "0.32.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6515c882ebfddccaa73ead7320ca28036c4bc84c9bcca3cc0cbba8efe89223a" +checksum = "307ed9b18cc2423f29e83f84fd23a8e73628727990181f18641a8b5dc2ab1caa" dependencies = [ "approx", "matrixmultiply", @@ -5109,9 +8055,9 @@ dependencies = [ [[package]] name = "nalgebra-macros" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d232c68884c0c99810a5a4d333ef7e47689cfd0edc85efc9e54e1e6bf5212766" +checksum = "91761aed67d03ad966ef783ae962ef9bbaca728d2dd7ceb7939ec110fffad998" dependencies = [ "proc-macro2", "quote", @@ -5124,7 +8070,16 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7d66043b25d4a6cccb23619d10c19c25304b355a7dccd4a8e11423dd2382146" dependencies = [ - "clap 3.2.23", + "rand 0.8.5", +] + +[[package]] +name = "names" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bddcd3bf5144b6392de80e04c347cd7fab2508f6df16a85fc496ecd5cec39bc" +dependencies = [ + "clap 3.2.25", "rand 0.8.5", ] @@ -5153,7 +8108,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9ea4302b9759a7a88242299225ea3688e63c85ea136371bb6cf94fd674efaab" dependencies = [ "anyhow", - "bitflags", + "bitflags 1.3.2", "byteorder", "libc", "netlink-packet-core", @@ -5162,9 +8117,9 @@ dependencies = [ [[package]] name = "netlink-packet-utils" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25af9cf0dc55498b7bd94a1508af7a78706aa0ab715a73c5169273e03c84845e" +checksum = "0ede8a08c71ad5a95cdd0e4e52facd37190977039a4704eb82a283f713747d34" dependencies = [ "anyhow", "byteorder", @@ -5189,9 +8144,9 @@ dependencies = [ [[package]] name = "netlink-sys" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92b654097027250401127914afb37cb1f311df6610a9891ff07a757e94199027" +checksum = "6471bf08e7ac0135876a9581bf3217ef0333c191c128d34878079f42ee150411" dependencies = [ "bytes", "futures", @@ -5202,14 +8157,14 @@ dependencies = [ [[package]] name = "nix" -version = "0.24.1" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f17df307904acd05aa8e32e97bb20f2a0df1728bbc2d771ae8f9a90463441e9" +checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "libc", - "memoffset 0.6.4", + "memoffset 0.6.5", ] [[package]] @@ -5218,7 +8173,7 @@ version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "libc", "memoffset 0.7.1", @@ -5227,6 +8182,375 @@ dependencies = [ ] [[package]] +name = "no-std-net" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43794a0ace135be66a25d3ae77d41b91615fb68ae937f904090203e81f755b65" + +[[package]] +name = "node-bench" +version = "0.9.0-dev" +dependencies = [ + "array-bytes", + "clap 4.4.2", + "derive_more", + "fs_extra", + "futures", + "hash-db", + "kitchensink-runtime", + "kvdb", + "kvdb-rocksdb", + "lazy_static", + "log", + "node-primitives", + "node-testing", + "parity-db", + "rand 0.8.5", + "sc-basic-authorship", + "sc-client-api", + "sc-transaction-pool", + "sc-transaction-pool-api", + "serde", + "serde_json", + "sp-consensus", + "sp-core", + "sp-inherents", + "sp-runtime", + "sp-state-machine", + "sp-timestamp", + "sp-tracing", + "sp-trie", + "tempfile", +] + +[[package]] +name = "node-cli" +version = "3.0.0-dev" +dependencies = [ + "array-bytes", + "assert_cmd", + "clap 4.4.2", + "clap_complete", + "criterion 0.4.0", + "frame-benchmarking-cli", + "frame-system", + "frame-system-rpc-runtime-api", + "futures", + "jsonrpsee", + "kitchensink-runtime", + "log", + "nix 0.26.2", + "node-executor", + "node-inspect", + "node-primitives", + "node-rpc", + "pallet-asset-conversion-tx-payment", + "pallet-asset-tx-payment", + "pallet-assets", + "pallet-balances", + "pallet-im-online", + "pallet-timestamp", + "parity-scale-codec", + "platforms", + "rand 0.8.5", + "regex", + "sc-authority-discovery", + "sc-basic-authorship", + "sc-block-builder", + "sc-chain-spec", + "sc-cli", + "sc-client-api", + "sc-client-db", + "sc-consensus", + "sc-consensus-babe", + "sc-consensus-epochs", + "sc-consensus-grandpa", + "sc-consensus-slots", + "sc-executor", + "sc-keystore", + "sc-network", + "sc-network-common", + "sc-network-statement", + "sc-network-sync", + "sc-offchain", + "sc-rpc", + "sc-service", + "sc-service-test", + "sc-statement-store", + "sc-storage-monitor", + "sc-sync-state-rpc", + "sc-sysinfo", + "sc-telemetry", + "sc-transaction-pool", + "sc-transaction-pool-api", + "serde", + "serde_json", + "soketto", + "sp-api", + "sp-authority-discovery", + "sp-blockchain", + "sp-consensus", + "sp-consensus-babe", + "sp-consensus-grandpa", + "sp-core", + "sp-inherents", + "sp-io", + "sp-keyring", + "sp-keystore", + "sp-runtime", + "sp-statement-store", + "sp-timestamp", + "sp-tracing", + "sp-transaction-storage-proof", + "substrate-build-script-utils", + "substrate-cli-test-utils", + "substrate-frame-cli", + "substrate-rpc-client", + "tempfile", + "tokio", + "tokio-util", + "try-runtime-cli", + "wait-timeout", +] + +[[package]] +name = "node-executor" +version = "3.0.0-dev" +dependencies = [ + "criterion 0.4.0", + "frame-benchmarking", + "frame-support", + "frame-system", + "futures", + "kitchensink-runtime", + "node-primitives", + "node-testing", + "pallet-balances", + "pallet-contracts", + "pallet-glutton", + "pallet-im-online", + "pallet-root-testing", + "pallet-sudo", + "pallet-timestamp", + "pallet-transaction-payment", + "pallet-treasury", + "parity-scale-codec", + "sc-executor", + "scale-info", + "sp-application-crypto", + "sp-consensus-babe", + "sp-core", + "sp-externalities", + "sp-keyring", + "sp-keystore", + "sp-runtime", + "sp-state-machine", + "sp-statement-store", + "sp-tracing", + "sp-trie", + "wat", +] + +[[package]] +name = "node-inspect" +version = "0.9.0-dev" +dependencies = [ + "clap 4.4.2", + "parity-scale-codec", + "sc-cli", + "sc-client-api", + "sc-service", + "sp-blockchain", + "sp-core", + "sp-runtime", + "thiserror", +] + +[[package]] +name = "node-primitives" +version = "2.0.0" +dependencies = [ + "sp-core", + "sp-runtime", +] + +[[package]] +name = "node-rpc" +version = "3.0.0-dev" +dependencies = [ + "jsonrpsee", + "mmr-rpc", + "node-primitives", + "pallet-transaction-payment-rpc", + "sc-chain-spec", + "sc-client-api", + "sc-consensus-babe", + "sc-consensus-babe-rpc", + "sc-consensus-grandpa", + "sc-consensus-grandpa-rpc", + "sc-rpc", + "sc-rpc-api", + "sc-rpc-spec-v2", + "sc-sync-state-rpc", + "sc-transaction-pool-api", + "sp-api", + "sp-block-builder", + "sp-blockchain", + "sp-consensus", + "sp-consensus-babe", + "sp-keystore", + "sp-runtime", + "sp-statement-store", + "substrate-frame-rpc-system", + "substrate-state-trie-migration-rpc", +] + +[[package]] +name = "node-runtime-generate-bags" +version = "3.0.0" +dependencies = [ + "clap 4.4.2", + "generate-bags", + "kitchensink-runtime", +] + +[[package]] +name = "node-template" +version = "4.0.0-dev" +dependencies = [ + "clap 4.4.2", + "frame-benchmarking", + "frame-benchmarking-cli", + "frame-system", + "futures", + "jsonrpsee", + "node-template-runtime", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc", + "sc-basic-authorship", + "sc-cli", + "sc-client-api", + "sc-consensus", + "sc-consensus-aura", + "sc-consensus-grandpa", + "sc-executor", + "sc-network", + "sc-offchain", + "sc-rpc-api", + "sc-service", + "sc-telemetry", + "sc-transaction-pool", + "sc-transaction-pool-api", + "sp-api", + "sp-block-builder", + "sp-blockchain", + "sp-consensus-aura", + "sp-consensus-grandpa", + "sp-core", + "sp-inherents", + "sp-io", + "sp-keyring", + "sp-runtime", + "sp-timestamp", + "substrate-build-script-utils", + "substrate-frame-rpc-system", + "try-runtime-cli", +] + +[[package]] +name = "node-template-release" +version = "3.0.0" +dependencies = [ + "clap 4.4.2", + "flate2", + "fs_extra", + "glob", + "itertools 0.10.5", + "tar", + "tempfile", + "toml_edit", +] + +[[package]] +name = "node-template-runtime" +version = "4.0.0-dev" +dependencies = [ + "frame-benchmarking", + "frame-executive", + "frame-support", + "frame-system", + "frame-system-benchmarking", + "frame-system-rpc-runtime-api", + "frame-try-runtime", + "pallet-aura", + "pallet-balances", + "pallet-grandpa", + "pallet-sudo", + "pallet-template", + "pallet-timestamp", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "parity-scale-codec", + "scale-info", + "sp-api", + "sp-block-builder", + "sp-consensus-aura", + "sp-consensus-grandpa", + "sp-core", + "sp-inherents", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-std", + "sp-storage", + "sp-transaction-pool", + "sp-version", + "substrate-wasm-builder", +] + +[[package]] +name = "node-testing" +version = "3.0.0-dev" +dependencies = [ + "frame-system", + "fs_extra", + "futures", + "kitchensink-runtime", + "log", + "node-executor", + "node-primitives", + "pallet-asset-conversion", + "pallet-asset-conversion-tx-payment", + "pallet-asset-tx-payment", + "pallet-assets", + "parity-scale-codec", + "sc-block-builder", + "sc-client-api", + "sc-client-db", + "sc-consensus", + "sc-executor", + "sc-service", + "sp-api", + "sp-block-builder", + "sp-blockchain", + "sp-consensus", + "sp-core", + "sp-inherents", + "sp-io", + "sp-keyring", + "sp-runtime", + "sp-timestamp", + "substrate-test-client", + "tempfile", +] + +[[package]] +name = "nodrop" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" + +[[package]] name = "nohash-hasher" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5234,13 +8558,12 @@ checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" [[package]] name = "nom" -version = "7.1.0" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d11e1ef389c76fe5b81bcaf2ea32cf88b62bc494e19f493d0b30e7a930109" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" dependencies = [ "memchr", "minimal-lexical", - "version_check", ] [[package]] @@ -5250,10 +8573,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" [[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" +dependencies = [ + "num-bigint", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] name = "num-bigint" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", @@ -5262,34 +8609,45 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.0" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26873667bbbb7c5182d4a37c1add32cdf09f841af72da53318fdb81543c15085" +checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" dependencies = [ "num-traits", ] [[package]] name = "num-format" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54b862ff8df690cf089058c98b183676a7ed0f974cc08b426800093227cbff3b" +checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3" dependencies = [ - "arrayvec 0.7.2", + "arrayvec 0.7.4", "itoa", ] [[package]] name = "num-integer" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" dependencies = [ "autocfg", "num-traits", ] [[package]] +name = "num-iter" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] name = "num-rational" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5303,20 +8661,21 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.14" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", + "libm", ] [[package]] name = "num_cpus" -version = "1.13.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.1.19", + "hermit-abi 0.3.2", "libc", ] @@ -5328,13 +8687,22 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "object" -version = "0.30.3" +version = "0.30.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" +checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385" dependencies = [ "crc32fast", "hashbrown 0.13.2", - "indexmap", + "indexmap 1.9.3", + "memchr", +] + +[[package]] +name = "object" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" +dependencies = [ "memchr", ] @@ -5353,14 +8721,14 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff" dependencies = [ - "asn1-rs 0.5.1", + "asn1-rs 0.5.2", ] [[package]] name = "once_cell" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "oorandom" @@ -5382,9 +8750,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl-probe" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "orchestra" @@ -5410,7 +8778,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2871aadd82a2c216ee68a69837a526dfe788ecbe74c4c5038a6acdbff6653066" dependencies = [ "expander 0.0.6", - "itertools", + "itertools 0.10.5", "petgraph", "proc-macro-crate", "proc-macro2", @@ -5429,24 +8797,21 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.0.0" +version = "6.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64" +checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac" [[package]] -name = "output_vt100" -version = "0.1.2" +name = "overload" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53cdc5b785b7a58c5aad8216b3dfa114df64b0b06ae6e1501cef91df2fbdf8f9" -dependencies = [ - "winapi", -] +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "owo-colors" -version = "3.2.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20448fd678ec04e6ea15bbe0476874af65e98a01515d667aa49f1434dc44ebf4" +checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" [[package]] name = "p256" @@ -5456,7 +8821,7 @@ checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" dependencies = [ "ecdsa 0.14.8", "elliptic-curve 0.12.3", - "sha2 0.10.2", + "sha2 0.10.7", ] [[package]] @@ -5467,30 +8832,153 @@ checksum = "dfc8c5bf642dde52bb9e87c0ecd8ca5a76faac2eeed98dedb7c717997e1080aa" dependencies = [ "ecdsa 0.14.8", "elliptic-curve 0.12.3", - "sha2 0.10.2", + "sha2 0.10.7", ] [[package]] -name = "packed_simd_2" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1914cd452d8fccd6f9db48147b29fd4ae05bea9dc5d9ad578509f72415de282" +name = "pallet-alliance" +version = "4.0.0-dev" dependencies = [ - "cfg-if", - "libm", + "array-bytes", + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "pallet-balances", + "pallet-collective", + "pallet-identity", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-core-hashing", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-asset-conversion" +version = "4.0.0-dev" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "pallet-assets", + "pallet-balances", + "parity-scale-codec", + "primitive-types", + "scale-info", + "sp-api", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-asset-conversion-tx-payment" +version = "4.0.0-dev" +dependencies = [ + "frame-support", + "frame-system", + "pallet-asset-conversion", + "pallet-assets", + "pallet-balances", + "pallet-transaction-payment", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "sp-storage", +] + +[[package]] +name = "pallet-asset-rate" +version = "4.0.0-dev" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "pallet-balances", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-asset-tx-payment" +version = "4.0.0-dev" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "pallet-assets", + "pallet-authorship", + "pallet-balances", + "pallet-transaction-payment", + "parity-scale-codec", + "scale-info", + "serde", + "serde_json", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "sp-storage", ] [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "log", + "pallet-balances", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-atomic-swap" +version = "4.0.0-dev" +dependencies = [ + "frame-support", + "frame-system", + "pallet-balances", "parity-scale-codec", "scale-info", "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-aura" +version = "4.0.0-dev" +dependencies = [ + "frame-support", + "frame-system", + "log", + "pallet-timestamp", + "parity-scale-codec", + "scale-info", + "sp-application-crypto", + "sp-consensus-aura", + "sp-core", + "sp-io", "sp-runtime", "sp-std", ] @@ -5498,7 +8986,6 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-support", "frame-system", @@ -5507,6 +8994,8 @@ dependencies = [ "scale-info", "sp-application-crypto", "sp-authority-discovery", + "sp-core", + "sp-io", "sp-runtime", "sp-std", ] @@ -5514,13 +9003,14 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-support", "frame-system", "impl-trait-for-tuples", "parity-scale-codec", "scale-info", + "sp-core", + "sp-io", "sp-runtime", "sp-std", ] @@ -5528,14 +9018,18 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", + "frame-election-provider-support", "frame-support", "frame-system", "log", "pallet-authorship", + "pallet-balances", + "pallet-offences", "pallet-session", + "pallet-staking", + "pallet-staking-reward-curve", "pallet-timestamp", "parity-scale-codec", "scale-info", @@ -5552,8 +9046,9 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ + "aquamarine", + "docify", "frame-benchmarking", "frame-election-provider-support", "frame-support", @@ -5570,9 +9065,18 @@ dependencies = [ ] [[package]] +name = "pallet-bags-list-fuzzer" +version = "4.0.0-dev" +dependencies = [ + "frame-election-provider-support", + "honggfuzz", + "pallet-bags-list", + "rand 0.8.5", +] + +[[package]] name = "pallet-bags-list-remote-tests" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-election-provider-support", "frame-remote-externalities", @@ -5591,14 +9095,17 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", + "pallet-transaction-payment", "parity-scale-codec", + "paste", "scale-info", + "sp-core", + "sp-io", "sp-runtime", "sp-std", ] @@ -5606,26 +9113,34 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ + "frame-election-provider-support", "frame-support", "frame-system", + "log", "pallet-authorship", + "pallet-balances", + "pallet-offences", "pallet-session", + "pallet-staking", + "pallet-staking-reward-curve", + "pallet-timestamp", "parity-scale-codec", "scale-info", "serde", "sp-consensus-beefy", + "sp-core", + "sp-io", "sp-runtime", "sp-session", "sp-staking", + "sp-state-machine", "sp-std", ] [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "array-bytes", "binary-merkle-tree", @@ -5643,18 +9158,20 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", + "sp-staking", + "sp-state-machine", "sp-std", ] [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", + "pallet-balances", "pallet-treasury", "parity-scale-codec", "scale-info", @@ -5665,14 +9182,119 @@ dependencies = [ ] [[package]] +name = "pallet-bridge-grandpa" +version = "0.1.0" +dependencies = [ + "bp-header-chain", + "bp-runtime", + "bp-test-utils", + "finality-grandpa", + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "sp-consensus-grandpa", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "sp-trie", +] + +[[package]] +name = "pallet-bridge-messages" +version = "0.1.0" +dependencies = [ + "bp-messages", + "bp-runtime", + "bp-test-utils", + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "num-traits", + "pallet-balances", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-bridge-parachains" +version = "0.1.0" +dependencies = [ + "bp-header-chain", + "bp-parachains", + "bp-polkadot-core", + "bp-runtime", + "bp-test-utils", + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "pallet-bridge-grandpa", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "sp-trie", +] + +[[package]] +name = "pallet-bridge-relayers" +version = "0.1.0" +dependencies = [ + "bp-messages", + "bp-relayers", + "bp-runtime", + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "pallet-balances", + "pallet-bridge-messages", + "parity-scale-codec", + "scale-info", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-broker" +version = "0.1.0" +dependencies = [ + "bitvec", + "frame-benchmarking", + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] name = "pallet-child-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", + "pallet-balances", "pallet-bounties", "pallet-treasury", "parity-scale-codec", @@ -5684,9 +9306,33 @@ dependencies = [ ] [[package]] +name = "pallet-collator-selection" +version = "3.0.0" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "pallet-aura", + "pallet-authorship", + "pallet-balances", + "pallet-session", + "pallet-timestamp", + "parity-scale-codec", + "rand 0.8.5", + "scale-info", + "sp-consensus-aura", + "sp-core", + "sp-io", + "sp-runtime", + "sp-staking", + "sp-std", + "sp-tracing", +] + +[[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", @@ -5701,17 +9347,110 @@ dependencies = [ ] [[package]] +name = "pallet-contracts" +version = "4.0.0-dev" +dependencies = [ + "array-bytes", + "assert_matches", + "bitflags 1.3.2", + "env_logger 0.9.3", + "environmental", + "frame-benchmarking", + "frame-support", + "frame-system", + "impl-trait-for-tuples", + "log", + "pallet-balances", + "pallet-contracts-primitives", + "pallet-contracts-proc-macro", + "pallet-insecure-randomness-collective-flip", + "pallet-proxy", + "pallet-timestamp", + "pallet-utility", + "parity-scale-codec", + "pretty_assertions", + "rand 0.8.5", + "rand_pcg", + "scale-info", + "serde", + "smallvec", + "sp-api", + "sp-core", + "sp-io", + "sp-keystore", + "sp-runtime", + "sp-std", + "wasm-instrument 0.4.0", + "wasmi", + "wat", +] + +[[package]] +name = "pallet-contracts-primitives" +version = "24.0.0" +dependencies = [ + "bitflags 1.3.2", + "parity-scale-codec", + "scale-info", + "sp-runtime", + "sp-std", + "sp-weights", +] + +[[package]] +name = "pallet-contracts-proc-macro" +version = "4.0.0-dev" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.31", +] + +[[package]] name = "pallet-conviction-voting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "assert_matches", "frame-benchmarking", "frame-support", "frame-system", + "pallet-balances", + "pallet-scheduler", "parity-scale-codec", "scale-info", "serde", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-core-fellowship" +version = "4.0.0-dev" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-default-config-example" +version = "4.0.0-dev" +dependencies = [ + "frame-support", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -5720,12 +9459,14 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", + "pallet-balances", + "pallet-preimage", + "pallet-scheduler", "parity-scale-codec", "scale-info", "serde", @@ -5736,17 +9477,60 @@ dependencies = [ ] [[package]] +name = "pallet-dev-mode" +version = "4.0.0-dev" +dependencies = [ + "frame-support", + "frame-system", + "log", + "pallet-balances", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-election-provider-e2e-test" +version = "1.0.0" +dependencies = [ + "frame-election-provider-support", + "frame-support", + "frame-system", + "log", + "pallet-bags-list", + "pallet-balances", + "pallet-election-provider-multi-phase", + "pallet-session", + "pallet-staking", + "pallet-timestamp", + "parity-scale-codec", + "parking_lot 0.12.1", + "scale-info", + "sp-core", + "sp-io", + "sp-npos-elections", + "sp-runtime", + "sp-staking", + "sp-std", + "sp-tracing", +] + +[[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-election-provider-support", "frame-support", "frame-system", "log", + "pallet-balances", "pallet-election-provider-support-benchmarking", "parity-scale-codec", + "parking_lot 0.12.1", "rand 0.8.5", "scale-info", "sp-arithmetic", @@ -5755,13 +9539,13 @@ dependencies = [ "sp-npos-elections", "sp-runtime", "sp-std", + "sp-tracing", "strum", ] [[package]] name = "pallet-election-provider-support-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5769,17 +9553,18 @@ dependencies = [ "parity-scale-codec", "sp-npos-elections", "sp-runtime", + "sp-std", ] [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", + "pallet-balances", "parity-scale-codec", "scale-info", "sp-core", @@ -5788,12 +9573,91 @@ dependencies = [ "sp-runtime", "sp-staking", "sp-std", + "sp-tracing", + "substrate-test-utils", +] + +[[package]] +name = "pallet-example-basic" +version = "4.0.0-dev" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "pallet-balances", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-example-kitchensink" +version = "4.0.0-dev" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "pallet-balances", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-example-offchain-worker" +version = "4.0.0-dev" +dependencies = [ + "frame-support", + "frame-system", + "lite-json", + "log", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-keystore", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-example-split" +version = "4.0.0-dev" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-std", +] + +[[package]] +name = "pallet-examples" +version = "4.0.0-dev" +dependencies = [ + "pallet-default-config-example", + "pallet-dev-mode", + "pallet-example-basic", + "pallet-example-kitchensink", + "pallet-example-offchain-worker", + "pallet-example-split", ] [[package]] name = "pallet-fast-unstake" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "docify", "frame-benchmarking", @@ -5801,31 +9665,63 @@ dependencies = [ "frame-support", "frame-system", "log", + "pallet-balances", + "pallet-staking", + "pallet-staking-reward-curve", + "pallet-timestamp", "parity-scale-codec", "scale-info", + "sp-core", "sp-io", "sp-runtime", "sp-staking", "sp-std", + "sp-tracing", + "substrate-test-utils", +] + +[[package]] +name = "pallet-glutton" +version = "4.0.0-dev" +dependencies = [ + "blake2", + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "pallet-balances", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ + "finality-grandpa", "frame-benchmarking", + "frame-election-provider-support", "frame-support", "frame-system", "log", "pallet-authorship", + "pallet-balances", + "pallet-offences", "pallet-session", + "pallet-staking", + "pallet-staking-reward-curve", + "pallet-timestamp", "parity-scale-codec", "scale-info", "sp-application-crypto", "sp-consensus-grandpa", "sp-core", "sp-io", + "sp-keyring", "sp-runtime", "sp-session", "sp-staking", @@ -5835,14 +9731,15 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "enumflags2", "frame-benchmarking", "frame-support", "frame-system", + "pallet-balances", "parity-scale-codec", "scale-info", + "sp-core", "sp-io", "sp-runtime", "sp-std", @@ -5851,13 +9748,13 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", "pallet-authorship", + "pallet-session", "parity-scale-codec", "scale-info", "sp-application-crypto", @@ -5871,11 +9768,11 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "pallet-balances", "parity-scale-codec", "scale-info", "sp-core", @@ -5886,9 +9783,40 @@ dependencies = [ ] [[package]] +name = "pallet-insecure-randomness-collective-flip" +version = "4.0.0-dev" +dependencies = [ + "frame-support", + "frame-system", + "parity-scale-codec", + "safe-mix", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-lottery" +version = "4.0.0-dev" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-support-test", + "frame-system", + "pallet-balances", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", @@ -5905,30 +9833,36 @@ dependencies = [ [[package]] name = "pallet-message-queue" version = "7.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", "parity-scale-codec", + "rand 0.8.5", + "rand_distr", "scale-info", + "serde", "sp-arithmetic", "sp-core", "sp-io", "sp-runtime", "sp-std", + "sp-tracing", "sp-weights", ] [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ + "array-bytes", + "env_logger 0.9.3", "frame-benchmarking", "frame-support", "frame-system", + "itertools 0.10.5", + "log", "parity-scale-codec", "scale-info", "sp-core", @@ -5941,14 +9875,76 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", + "pallet-balances", + "parity-scale-codec", + "scale-info", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-nft-fractionalization" +version = "4.0.0-dev" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "pallet-assets", + "pallet-balances", + "pallet-nfts", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-nfts" +version = "4.0.0-dev" +dependencies = [ + "enumflags2", + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "pallet-balances", "parity-scale-codec", "scale-info", + "sp-core", + "sp-io", + "sp-keystore", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-nfts-runtime-api" +version = "4.0.0-dev" +dependencies = [ + "pallet-nfts", + "parity-scale-codec", + "sp-api", +] + +[[package]] +name = "pallet-nicks" +version = "4.0.0-dev" +dependencies = [ + "frame-support", + "frame-system", + "pallet-balances", + "parity-scale-codec", + "scale-info", + "sp-core", "sp-io", "sp-runtime", "sp-std", @@ -5957,15 +9953,31 @@ dependencies = [ [[package]] name = "pallet-nis" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "pallet-balances", "parity-scale-codec", "scale-info", "sp-arithmetic", "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-node-authorization" +version = "4.0.0-dev" +dependencies = [ + "frame-support", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", "sp-runtime", "sp-std", ] @@ -5973,11 +9985,11 @@ dependencies = [ [[package]] name = "pallet-nomination-pools" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-support", "frame-system", "log", + "pallet-balances", "parity-scale-codec", "scale-info", "sp-core", @@ -5985,22 +9997,27 @@ dependencies = [ "sp-runtime", "sp-staking", "sp-std", + "sp-tracing", ] [[package]] name = "pallet-nomination-pools-benchmarking" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-election-provider-support", "frame-support", "frame-system", "pallet-bags-list", + "pallet-balances", "pallet-nomination-pools", "pallet-staking", + "pallet-staking-reward-curve", + "pallet-timestamp", "parity-scale-codec", "scale-info", + "sp-core", + "sp-io", "sp-runtime", "sp-runtime-interface", "sp-staking", @@ -6008,9 +10025,23 @@ dependencies = [ ] [[package]] +name = "pallet-nomination-pools-fuzzer" +version = "2.0.0" +dependencies = [ + "frame-support", + "frame-system", + "honggfuzz", + "log", + "pallet-nomination-pools", + "rand 0.8.5", + "sp-io", + "sp-runtime", + "sp-tracing", +] + +[[package]] name = "pallet-nomination-pools-runtime-api" version = "1.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "pallet-nomination-pools", "parity-scale-codec", @@ -6019,9 +10050,32 @@ dependencies = [ ] [[package]] +name = "pallet-nomination-pools-test-staking" +version = "1.0.0" +dependencies = [ + "frame-election-provider-support", + "frame-support", + "frame-system", + "log", + "pallet-bags-list", + "pallet-balances", + "pallet-nomination-pools", + "pallet-staking", + "pallet-staking-reward-curve", + "pallet-timestamp", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-staking", + "sp-std", + "sp-tracing", +] + +[[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-support", "frame-system", @@ -6030,6 +10084,8 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", + "sp-core", + "sp-io", "sp-runtime", "sp-staking", "sp-std", @@ -6038,7 +10094,6 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6052,22 +10107,69 @@ dependencies = [ "pallet-offences", "pallet-session", "pallet-staking", + "pallet-staking-reward-curve", + "pallet-timestamp", "parity-scale-codec", "scale-info", + "sp-core", + "sp-io", "sp-runtime", "sp-staking", "sp-std", ] [[package]] +name = "pallet-paged-list" +version = "0.1.0" +dependencies = [ + "docify", + "frame-benchmarking", + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-metadata-ir", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-paged-list-fuzzer" +version = "0.1.0" +dependencies = [ + "arbitrary", + "frame-support", + "honggfuzz", + "pallet-paged-list", + "sp-io", +] + +[[package]] +name = "pallet-parachain-template" +version = "0.1.0" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "serde", + "sp-core", + "sp-io", + "sp-runtime", +] + +[[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", + "pallet-balances", "parity-scale-codec", "scale-info", "sp-core", @@ -6079,13 +10181,15 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "pallet-balances", + "pallet-utility", "parity-scale-codec", "scale-info", + "sp-core", "sp-io", "sp-runtime", "sp-std", @@ -6094,7 +10198,6 @@ dependencies = [ [[package]] name = "pallet-ranked-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", @@ -6112,13 +10215,14 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "pallet-balances", "parity-scale-codec", "scale-info", + "sp-core", "sp-io", "sp-runtime", "sp-std", @@ -6127,17 +10231,107 @@ dependencies = [ [[package]] name = "pallet-referenda" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "assert_matches", "frame-benchmarking", "frame-support", "frame-system", "log", + "pallet-balances", + "pallet-preimage", + "pallet-scheduler", "parity-scale-codec", "scale-info", "serde", "sp-arithmetic", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-remark" +version = "4.0.0-dev" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "serde", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-root-offences" +version = "1.0.0-dev" +dependencies = [ + "frame-election-provider-support", + "frame-support", + "frame-system", + "pallet-balances", + "pallet-session", + "pallet-staking", + "pallet-staking-reward-curve", + "pallet-timestamp", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-staking", + "sp-std", +] + +[[package]] +name = "pallet-root-testing" +version = "1.0.0-dev" +dependencies = [ + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-safe-mode" +version = "4.0.0-dev" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "pallet-balances", + "pallet-proxy", + "pallet-utility", + "parity-scale-codec", + "scale-info", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-salary" +version = "4.0.0-dev" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "sp-arithmetic", + "sp-core", "sp-io", "sp-runtime", "sp-std", @@ -6146,24 +10340,41 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ + "docify", "frame-benchmarking", "frame-support", "frame-system", "log", + "pallet-preimage", "parity-scale-codec", "scale-info", + "sp-core", "sp-io", "sp-runtime", "sp-std", "sp-weights", + "substrate-test-utils", +] + +[[package]] +name = "pallet-scored-pool" +version = "4.0.0-dev" +dependencies = [ + "frame-support", + "frame-system", + "pallet-balances", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-support", "frame-system", @@ -6177,6 +10388,7 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", + "sp-state-machine", "sp-std", "sp-trie", ] @@ -6184,14 +10396,21 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", + "frame-election-provider-support", "frame-support", "frame-system", + "pallet-balances", "pallet-session", "pallet-staking", + "pallet-staking-reward-curve", + "pallet-timestamp", + "parity-scale-codec", "rand 0.8.5", + "scale-info", + "sp-core", + "sp-io", "sp-runtime", "sp-session", "sp-std", @@ -6200,17 +10419,18 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", + "frame-support-test", "frame-system", - "hex-literal 0.3.4", "log", + "pallet-balances", "parity-scale-codec", "rand_chacha 0.2.2", "scale-info", "sp-arithmetic", + "sp-core", "sp-io", "sp-runtime", "sp-std", @@ -6219,7 +10439,6 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6227,33 +10446,40 @@ dependencies = [ "frame-system", "log", "pallet-authorship", + "pallet-bags-list", + "pallet-balances", "pallet-session", + "pallet-staking-reward-curve", + "pallet-timestamp", "parity-scale-codec", "rand_chacha 0.2.2", "scale-info", "serde", "sp-application-crypto", + "sp-core", "sp-io", + "sp-npos-elections", "sp-runtime", "sp-staking", "sp-std", + "sp-tracing", + "substrate-test-utils", ] [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.16", + "sp-runtime", + "syn 2.0.31", ] [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "log", "sp-arithmetic", @@ -6262,7 +10488,6 @@ dependencies = [ [[package]] name = "pallet-staking-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "parity-scale-codec", "sp-api", @@ -6271,30 +10496,71 @@ dependencies = [ [[package]] name = "pallet-state-trie-migration" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", + "frame-remote-externalities", + "frame-support", + "frame-system", + "log", + "pallet-balances", + "parity-scale-codec", + "parking_lot 0.12.1", + "scale-info", + "serde", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "sp-tracing", + "substrate-state-trie-migration-rpc", + "thousands", + "tokio", + "zstd 0.12.4", +] + +[[package]] +name = "pallet-statement" +version = "4.0.0-dev" +dependencies = [ "frame-support", "frame-system", "log", + "pallet-balances", "parity-scale-codec", "scale-info", + "sp-api", "sp-core", "sp-io", "sp-runtime", + "sp-statement-store", "sp-std", ] [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "parity-scale-codec", "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-template" +version = "4.0.0-dev" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-core", "sp-io", "sp-runtime", "sp-std", @@ -6303,7 +10569,6 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", @@ -6311,22 +10576,24 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", + "sp-core", "sp-inherents", "sp-io", "sp-runtime", "sp-std", + "sp-storage", "sp-timestamp", ] [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", + "pallet-balances", "pallet-treasury", "parity-scale-codec", "scale-info", @@ -6335,18 +10602,20 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", + "sp-storage", ] [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-support", "frame-system", + "pallet-balances", "parity-scale-codec", "scale-info", "serde", + "serde_json", "sp-core", "sp-io", "sp-runtime", @@ -6356,7 +10625,6 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -6372,7 +10640,6 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -6382,18 +10649,59 @@ dependencies = [ ] [[package]] +name = "pallet-transaction-storage" +version = "4.0.0-dev" +dependencies = [ + "array-bytes", + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "pallet-balances", + "parity-scale-codec", + "scale-info", + "serde", + "sp-core", + "sp-inherents", + "sp-io", + "sp-runtime", + "sp-std", + "sp-transaction-storage-proof", +] + +[[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "impl-trait-for-tuples", "pallet-balances", + "pallet-utility", "parity-scale-codec", "scale-info", "serde", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-tx-pause" +version = "4.0.0-dev" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "pallet-balances", + "pallet-proxy", + "pallet-utility", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", "sp-runtime", "sp-std", ] @@ -6401,14 +10709,16 @@ dependencies = [ [[package]] name = "pallet-uniques" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", + "pallet-balances", "parity-scale-codec", "scale-info", + "sp-core", + "sp-io", "sp-runtime", "sp-std", ] @@ -6416,11 +10726,14 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "pallet-balances", + "pallet-collective", + "pallet-root-testing", + "pallet-timestamp", "parity-scale-codec", "scale-info", "sp-core", @@ -6432,14 +10745,16 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", + "pallet-balances", "parity-scale-codec", "scale-info", + "sp-core", + "sp-io", "sp-runtime", "sp-std", ] @@ -6447,14 +10762,17 @@ dependencies = [ [[package]] name = "pallet-whitelist" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "pallet-balances", + "pallet-preimage", "parity-scale-codec", "scale-info", "sp-api", + "sp-core", + "sp-io", "sp-runtime", "sp-std", ] @@ -6470,7 +10788,7 @@ dependencies = [ "log", "pallet-balances", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-runtime-parachains", "scale-info", "serde", @@ -6478,9 +10796,9 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "xcm", - "xcm-builder", - "xcm-executor", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", ] [[package]] @@ -6503,16 +10821,229 @@ dependencies = [ "sp-runtime", "sp-std", "sp-tracing", - "xcm", - "xcm-builder", - "xcm-executor", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", +] + +[[package]] +name = "pallet-xcm-bridge-hub-router" +version = "0.1.0" +dependencies = [ + "bp-xcm-bridge-hub-router", + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "staging-xcm", + "staging-xcm-builder", +] + +[[package]] +name = "parachain-info" +version = "0.1.0" +dependencies = [ + "cumulus-primitives-core", + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "parachain-template-node" +version = "0.1.0" +dependencies = [ + "clap 4.4.2", + "color-print", + "cumulus-client-cli", + "cumulus-client-collator", + "cumulus-client-consensus-aura", + "cumulus-client-consensus-common", + "cumulus-client-consensus-proposer", + "cumulus-client-service", + "cumulus-primitives-core", + "cumulus-primitives-parachain-inherent", + "cumulus-relay-chain-interface", + "frame-benchmarking", + "frame-benchmarking-cli", + "futures", + "jsonrpsee", + "log", + "pallet-transaction-payment-rpc", + "parachain-template-runtime", + "parity-scale-codec", + "polkadot-cli", + "polkadot-primitives", + "sc-basic-authorship", + "sc-chain-spec", + "sc-cli", + "sc-client-api", + "sc-consensus", + "sc-executor", + "sc-network", + "sc-network-sync", + "sc-offchain", + "sc-rpc", + "sc-service", + "sc-sysinfo", + "sc-telemetry", + "sc-tracing", + "sc-transaction-pool", + "sc-transaction-pool-api", + "serde", + "sp-api", + "sp-block-builder", + "sp-blockchain", + "sp-consensus-aura", + "sp-core", + "sp-io", + "sp-keystore", + "sp-runtime", + "sp-timestamp", + "staging-xcm", + "substrate-build-script-utils", + "substrate-frame-rpc-system", + "substrate-prometheus-endpoint", +] + +[[package]] +name = "parachain-template-runtime" +version = "0.1.0" +dependencies = [ + "cumulus-pallet-aura-ext", + "cumulus-pallet-dmp-queue", + "cumulus-pallet-parachain-system", + "cumulus-pallet-session-benchmarking", + "cumulus-pallet-xcm", + "cumulus-pallet-xcmp-queue", + "cumulus-primitives-core", + "cumulus-primitives-utility", + "frame-benchmarking", + "frame-executive", + "frame-support", + "frame-system", + "frame-system-benchmarking", + "frame-system-rpc-runtime-api", + "frame-try-runtime", + "hex-literal 0.4.1", + "log", + "pallet-aura", + "pallet-authorship", + "pallet-balances", + "pallet-collator-selection", + "pallet-parachain-template", + "pallet-session", + "pallet-sudo", + "pallet-timestamp", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "pallet-xcm", + "parachain-info", + "parity-scale-codec", + "polkadot-parachain-primitives", + "polkadot-runtime-common", + "scale-info", + "smallvec", + "sp-api", + "sp-block-builder", + "sp-consensus-aura", + "sp-core", + "sp-inherents", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-std", + "sp-transaction-pool", + "sp-version", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "substrate-wasm-builder", +] + +[[package]] +name = "parachains-common" +version = "1.0.0" +dependencies = [ + "cumulus-primitives-core", + "cumulus-primitives-utility", + "frame-support", + "frame-system", + "kusama-runtime-constants", + "log", + "num-traits", + "pallet-asset-tx-payment", + "pallet-assets", + "pallet-authorship", + "pallet-balances", + "pallet-collator-selection", + "parity-scale-codec", + "polkadot-core-primitives", + "polkadot-primitives", + "polkadot-runtime-constants", + "rococo-runtime-constants", + "scale-info", + "smallvec", + "sp-consensus-aura", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "substrate-wasm-builder", + "westend-runtime-constants", +] + +[[package]] +name = "parachains-runtimes-test-utils" +version = "1.0.0" +dependencies = [ + "assets-common", + "cumulus-pallet-dmp-queue", + "cumulus-pallet-parachain-system", + "cumulus-pallet-xcmp-queue", + "cumulus-primitives-core", + "cumulus-primitives-parachain-inherent", + "cumulus-test-relay-sproof-builder", + "frame-support", + "frame-system", + "hex-literal 0.4.1", + "pallet-assets", + "pallet-balances", + "pallet-collator-selection", + "pallet-session", + "pallet-xcm", + "parachain-info", + "parachains-common", + "parity-scale-codec", + "polkadot-parachain-primitives", + "sp-consensus-aura", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "sp-tracing", + "staging-xcm", + "staging-xcm-executor", + "substrate-wasm-builder", ] [[package]] name = "parity-db" -version = "0.4.8" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4890dcb9556136a4ec2b0c51fa4a08c8b733b829506af8fff2e853f3a065985b" +checksum = "78f19d20a0d2cc52327a88d131fa1c4ea81ea4a04714aedcfeca2dd410049cf8" dependencies = [ "blake2", "crc32fast", @@ -6530,11 +11061,11 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "3.6.1" +version = "3.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2287753623c76f953acd29d15d8100bcab84d29db78fb6f352adb3c53e83b967" +checksum = "dd8e946cc0cc711189c0b0249fb8b599cbeeab9784d83c415719368bb8d4ac64" dependencies = [ - "arrayvec 0.7.2", + "arrayvec 0.7.4", "bitvec", "byte-slice-cast", "bytes", @@ -6545,9 +11076,9 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.6.1" +version = "3.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b6937b5e67bfba3351b87b040d48352a2fcb6ad72f81855412ce97b45c8f110" +checksum = "2a296c3079b5fefbc499e1de58dc26c09b1b9a5952d26694ee89f04a43ebbb3e" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -6562,6 +11093,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa9777aa91b8ad9dd5aaa04a9b6bcb02c7f1deb952fca5a66034d5e63afc5c6f" [[package]] +name = "parity-util-mem" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d32c34f4f5ca7f9196001c0aba5a1f9a5a12382c8944b8b0f90233282d1e8f8" +dependencies = [ + "cfg-if", + "ethereum-types", + "hashbrown 0.12.3", + "impl-trait-for-tuples", + "lru 0.8.1", + "parity-util-mem-derive", + "parking_lot 0.12.1", + "primitive-types", + "smallvec", + "winapi", +] + +[[package]] +name = "parity-util-mem-derive" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f557c32c6d268a07c921471619c0295f5efad3a0e76d4f97a05c091a51d110b2" +dependencies = [ + "proc-macro2", + "syn 1.0.109", + "synstructure", +] + +[[package]] name = "parity-wasm" version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6569,9 +11129,9 @@ checksum = "e1ad0aff30c1da14b1254fcb2af73e1fa9a28670e584a626f53a369d0e157304" [[package]] name = "parking" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" +checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" [[package]] name = "parking_lot" @@ -6581,7 +11141,7 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", "lock_api", - "parking_lot_core 0.8.5", + "parking_lot_core 0.8.6", ] [[package]] @@ -6591,34 +11151,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.6", + "parking_lot_core 0.9.8", ] [[package]] name = "parking_lot_core" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" dependencies = [ "cfg-if", "instant", "libc", - "redox_syscall", + "redox_syscall 0.2.16", "smallvec", "winapi", ] [[package]] name = "parking_lot_core" -version = "0.9.6" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.3.5", "smallvec", - "windows-sys 0.42.0", + "windows-targets 0.48.5", ] [[package]] @@ -6629,9 +11189,9 @@ checksum = "7924d1d0ad836f665c9065e26d016c673ece3993f30d340068b16f282afc1156" [[package]] name = "paste" -version = "1.0.7" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "pbkdf2" @@ -6648,7 +11208,16 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", +] + +[[package]] +name = "pbkdf2" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" +dependencies = [ + "digest 0.10.7", ] [[package]] @@ -6659,11 +11228,11 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "pem" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03c64931a1a212348ec4f3b4362585eca7159d0d09cbdf4a7f74f02173596fd4" +checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", ] [[package]] @@ -6676,25 +11245,85 @@ dependencies = [ ] [[package]] +name = "penpal-runtime" +version = "0.9.27" +dependencies = [ + "cumulus-pallet-aura-ext", + "cumulus-pallet-dmp-queue", + "cumulus-pallet-parachain-system", + "cumulus-pallet-session-benchmarking", + "cumulus-pallet-xcm", + "cumulus-pallet-xcmp-queue", + "cumulus-primitives-core", + "cumulus-primitives-utility", + "frame-benchmarking", + "frame-executive", + "frame-support", + "frame-system", + "frame-system-benchmarking", + "frame-system-rpc-runtime-api", + "frame-try-runtime", + "hex-literal 0.4.1", + "log", + "pallet-asset-tx-payment", + "pallet-assets", + "pallet-aura", + "pallet-authorship", + "pallet-balances", + "pallet-collator-selection", + "pallet-session", + "pallet-sudo", + "pallet-timestamp", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "pallet-xcm", + "parachain-info", + "parachains-common", + "parity-scale-codec", + "polkadot-parachain-primitives", + "polkadot-primitives", + "polkadot-runtime-common", + "scale-info", + "smallvec", + "sp-api", + "sp-block-builder", + "sp-consensus-aura", + "sp-core", + "sp-inherents", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-std", + "sp-storage", + "sp-transaction-pool", + "sp-version", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "substrate-wasm-builder", +] + +[[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pest" -version = "2.1.3" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" +checksum = "1acb4a4365a13f749a93f1a094a7805e5cfa0955373a9de860d962eaa3a5fe5a" dependencies = [ + "thiserror", "ucd-trie", ] [[package]] name = "pest_derive" -version = "2.1.0" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0" +checksum = "666d00490d4ac815001da55838c500eafb0320019bbaa44444137c48b443a853" dependencies = [ "pest", "pest_generator", @@ -6702,56 +11331,56 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.1.3" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55" +checksum = "68ca01446f50dbda87c1786af8770d535423fa8a53aec03b8f4e3d7eb10e0929" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.31", ] [[package]] name = "pest_meta" -version = "2.1.3" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d" +checksum = "56af0a30af74d0445c0bf6d9d051c979b516a1a5af790d251daee76005420a48" dependencies = [ - "maplit", + "once_cell", "pest", - "sha-1 0.8.2", + "sha2 0.10.7", ] [[package]] name = "petgraph" -version = "0.6.0" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a13a2fa9d0b63e5f22328828741e523766fff0ee9e779316902290dff3f824f" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap", + "indexmap 2.0.0", ] [[package]] name = "pin-project" -version = "1.0.12" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.12" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.31", ] [[package]] @@ -6762,9 +11391,9 @@ checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" [[package]] name = "pin-utils" @@ -6778,7 +11407,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" dependencies = [ - "der 0.6.0", + "der 0.6.1", "spki 0.6.0", ] @@ -6788,15 +11417,15 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" dependencies = [ - "der 0.7.7", + "der 0.7.8", "spki 0.7.2", ] [[package]] name = "pkg-config" -version = "0.3.22" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12295df4f294471248581bc09bef3c38a5e46f1e36d6a37353621a0c6c357e1f" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "platforms" @@ -6805,8 +11434,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630" [[package]] +name = "plotters" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" +dependencies = [ + "num-traits", + "plotters-backend", + "plotters-svg", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "plotters-backend" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" + +[[package]] +name = "plotters-svg" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" +dependencies = [ + "plotters-backend", +] + +[[package]] name = "polkadot" -version = "1.0.0" +version = "1.1.0" dependencies = [ "assert_cmd", "color-eyre", @@ -6814,8 +11471,11 @@ dependencies = [ "polkadot-cli", "polkadot-core-primitives", "polkadot-node-core-pvf", + "polkadot-node-core-pvf-common", + "polkadot-node-core-pvf-execute-worker", "polkadot-node-core-pvf-prepare-worker", "polkadot-overseer", + "substrate-build-script-utils", "substrate-rpc-client", "tempfile", "tikv-jemallocator", @@ -6827,7 +11487,7 @@ name = "polkadot-approval-distribution" version = "1.0.0" dependencies = [ "assert_matches", - "env_logger 0.9.0", + "env_logger 0.9.3", "futures", "futures-timer", "log", @@ -6843,7 +11503,7 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "rand_core 0.5.1", - "schnorrkel", + "schnorrkel 0.9.1", "sp-authority-discovery", "sp-core", "tracing-gum", @@ -6853,9 +11513,10 @@ dependencies = [ name = "polkadot-availability-bitfield-distribution" version = "1.0.0" dependencies = [ + "always-assert", "assert_matches", "bitvec", - "env_logger 0.9.0", + "env_logger 0.9.3", "futures", "futures-timer", "log", @@ -6884,7 +11545,6 @@ dependencies = [ "fatality", "futures", "futures-timer", - "lru 0.9.0", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", @@ -6896,6 +11556,7 @@ dependencies = [ "polkadot-primitives-test-helpers", "rand 0.8.5", "sc-network", + "schnellru", "sp-core", "sp-keyring", "sp-keystore", @@ -6909,12 +11570,11 @@ name = "polkadot-availability-recovery" version = "1.0.0" dependencies = [ "assert_matches", - "env_logger 0.9.0", + "env_logger 0.9.3", "fatality", "futures", "futures-timer", "log", - "lru 0.9.0", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", @@ -6926,6 +11586,7 @@ dependencies = [ "polkadot-primitives-test-helpers", "rand 0.8.5", "sc-network", + "schnellru", "sp-application-crypto", "sp-core", "sp-keyring", @@ -6935,14 +11596,12 @@ dependencies = [ [[package]] name = "polkadot-cli" -version = "1.0.0" +version = "1.1.0" dependencies = [ - "clap 4.2.5", + "clap 4.4.2", "frame-benchmarking-cli", "futures", "log", - "polkadot-node-core-pvf-execute-worker", - "polkadot-node-core-pvf-prepare-worker", "polkadot-node-metrics", "polkadot-performance-test", "polkadot-service", @@ -6967,10 +11626,9 @@ dependencies = [ name = "polkadot-collator-protocol" version = "1.0.0" dependencies = [ - "always-assert", "assert_matches", "bitvec", - "env_logger 0.9.0", + "env_logger 0.9.3", "fatality", "futures", "futures-timer", @@ -6983,12 +11641,14 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "polkadot-primitives-test-helpers", + "sc-keystore", "sc-network", "sp-core", "sp-keyring", "sp-keystore", "sp-runtime", "thiserror", + "tokio-util", "tracing-gum", ] @@ -7014,9 +11674,8 @@ dependencies = [ "fatality", "futures", "futures-timer", - "indexmap", + "indexmap 1.9.3", "lazy_static", - "lru 0.9.0", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", @@ -7028,6 +11687,7 @@ dependencies = [ "polkadot-primitives-test-helpers", "sc-keystore", "sc-network", + "schnellru", "sp-application-crypto", "sp-keyring", "sp-keystore", @@ -7040,7 +11700,7 @@ dependencies = [ name = "polkadot-erasure-coding" version = "1.0.0" dependencies = [ - "criterion", + "criterion 0.4.0", "parity-scale-codec", "polkadot-node-primitives", "polkadot-primitives", @@ -7067,6 +11727,7 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "sc-network", + "sc-network-common", "sp-application-crypto", "sp-authority-discovery", "sp-consensus-babe", @@ -7110,6 +11771,7 @@ dependencies = [ name = "polkadot-node-collation-generation" version = "1.0.0" dependencies = [ + "assert_matches", "futures", "parity-scale-codec", "polkadot-erasure-coding", @@ -7120,6 +11782,7 @@ dependencies = [ "polkadot-primitives", "polkadot-primitives-test-helpers", "sp-core", + "sp-keyring", "sp-maybe-compressed-blob", "thiserror", "tracing-gum", @@ -7137,8 +11800,7 @@ dependencies = [ "futures-timer", "kvdb", "kvdb-memorydb", - "lru 0.9.0", - "merlin", + "merlin 2.0.1", "parity-scale-codec", "parking_lot 0.12.1", "polkadot-node-jaeger", @@ -7151,7 +11813,8 @@ dependencies = [ "polkadot-primitives-test-helpers", "rand_core 0.5.1", "sc-keystore", - "schnorrkel", + "schnellru", + "schnorrkel 0.9.1", "sp-application-crypto", "sp-consensus", "sp-consensus-babe", @@ -7170,7 +11833,7 @@ version = "1.0.0" dependencies = [ "assert_matches", "bitvec", - "env_logger 0.9.0", + "env_logger 0.9.3", "futures", "futures-timer", "kvdb", @@ -7251,7 +11914,8 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-test-helpers", "polkadot-node-subsystem-util", - "polkadot-parachain", + "polkadot-overseer", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-primitives-test-helpers", "sp-core", @@ -7310,7 +11974,6 @@ dependencies = [ "futures-timer", "kvdb", "kvdb-memorydb", - "lru 0.9.0", "parity-scale-codec", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -7319,6 +11982,7 @@ dependencies = [ "polkadot-primitives", "polkadot-primitives-test-helpers", "sc-keystore", + "schnellru", "sp-application-crypto", "sp-core", "sp-keyring", @@ -7345,6 +12009,31 @@ dependencies = [ ] [[package]] +name = "polkadot-node-core-prospective-parachains" +version = "1.0.0" +dependencies = [ + "assert_matches", + "bitvec", + "fatality", + "futures", + "parity-scale-codec", + "polkadot-node-primitives", + "polkadot-node-subsystem", + "polkadot-node-subsystem-test-helpers", + "polkadot-node-subsystem-types", + "polkadot-node-subsystem-util", + "polkadot-primitives", + "polkadot-primitives-test-helpers", + "sc-keystore", + "sp-application-crypto", + "sp-core", + "sp-keyring", + "sp-keystore", + "thiserror", + "tracing-gum", +] + +[[package]] name = "polkadot-node-core-provisioner" version = "1.0.0" dependencies = [ @@ -7358,7 +12047,6 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "polkadot-primitives-test-helpers", - "rand 0.8.5", "sp-application-crypto", "sp-keystore", "thiserror", @@ -7378,12 +12066,13 @@ dependencies = [ "parity-scale-codec", "pin-project", "polkadot-core-primitives", + "polkadot-node-core-pvf", "polkadot-node-core-pvf-common", "polkadot-node-core-pvf-execute-worker", "polkadot-node-core-pvf-prepare-worker", "polkadot-node-metrics", "polkadot-node-primitives", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "rand 0.8.5", "slotmap", @@ -7432,7 +12121,7 @@ dependencies = [ "landlock", "libc", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "sc-executor", "sc-executor-common", @@ -7441,7 +12130,6 @@ dependencies = [ "sp-externalities", "sp-io", "sp-tracing", - "substrate-build-script-utils", "tempfile", "tokio", "tracing-gum", @@ -7455,13 +12143,12 @@ dependencies = [ "futures", "parity-scale-codec", "polkadot-node-core-pvf-common", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "rayon", "sp-core", "sp-maybe-compressed-blob", "sp-tracing", - "tikv-jemalloc-ctl", "tokio", "tracing-gum", ] @@ -7474,7 +12161,7 @@ dependencies = [ "libc", "parity-scale-codec", "polkadot-node-core-pvf-common", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "rayon", "sc-executor", @@ -7492,8 +12179,8 @@ dependencies = [ name = "polkadot-node-core-runtime-api" version = "1.0.0" dependencies = [ + "async-trait", "futures", - "lru 0.9.0", "polkadot-node-metrics", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -7501,8 +12188,8 @@ dependencies = [ "polkadot-node-subsystem-types", "polkadot-primitives", "polkadot-primitives-test-helpers", + "schnellru", "sp-api", - "sp-authority-discovery", "sp-consensus-babe", "sp-core", "sp-keyring", @@ -7531,7 +12218,7 @@ name = "polkadot-node-metrics" version = "1.0.0" dependencies = [ "assert_cmd", - "bs58", + "bs58 0.5.0", "futures", "futures-timer", "hyper", @@ -7542,7 +12229,6 @@ dependencies = [ "prioritized-metered-channel", "prometheus-parse", "sc-cli", - "sc-client-api", "sc-service", "sc-tracing", "sp-keyring", @@ -7559,6 +12245,7 @@ version = "1.0.0" dependencies = [ "async-channel", "async-trait", + "bitvec", "derive_more", "fatality", "futures", @@ -7584,9 +12271,9 @@ dependencies = [ "futures", "parity-scale-codec", "polkadot-erasure-coding", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", - "schnorrkel", + "schnorrkel 0.9.1", "serde", "sp-application-crypto", "sp-consensus-babe", @@ -7595,7 +12282,7 @@ dependencies = [ "sp-maybe-compressed-blob", "sp-runtime", "thiserror", - "zstd 0.11.2+zstd.1.5.2", + "zstd 0.12.4", ] [[package]] @@ -7639,6 +12326,7 @@ dependencies = [ "polkadot-primitives", "polkadot-statement-table", "sc-network", + "sc-transaction-pool-api", "smallvec", "sp-api", "sp-authority-discovery", @@ -7654,17 +12342,16 @@ dependencies = [ "assert_matches", "async-trait", "derive_more", - "env_logger 0.9.0", + "env_logger 0.9.3", "fatality", "futures", "futures-channel", - "itertools", + "itertools 0.10.5", "kvdb", "kvdb-memorydb", "kvdb-shared-tests", "lazy_static", "log", - "lru 0.9.0", "parity-db", "parity-scale-codec", "parking_lot 0.11.2", @@ -7680,6 +12367,7 @@ dependencies = [ "polkadot-primitives-test-helpers", "prioritized-metered-channel", "rand 0.8.5", + "schnellru", "sp-application-crypto", "sp-core", "sp-keystore", @@ -7697,7 +12385,6 @@ dependencies = [ "femme", "futures", "futures-timer", - "lru 0.9.0", "orchestra", "parking_lot 0.12.1", "polkadot-node-metrics", @@ -7708,6 +12395,7 @@ dependencies = [ "polkadot-primitives-test-helpers", "prioritized-metered-channel", "sc-client-api", + "schnellru", "sp-api", "sp-core", "tikv-jemalloc-ctl", @@ -7715,7 +12403,90 @@ dependencies = [ ] [[package]] -name = "polkadot-parachain" +name = "polkadot-parachain-bin" +version = "1.0.0" +dependencies = [ + "assert_cmd", + "asset-hub-kusama-runtime", + "asset-hub-polkadot-runtime", + "asset-hub-westend-runtime", + "async-trait", + "bridge-hub-kusama-runtime", + "bridge-hub-polkadot-runtime", + "bridge-hub-rococo-runtime", + "clap 4.4.2", + "collectives-polkadot-runtime", + "color-print", + "contracts-rococo-runtime", + "cumulus-client-cli", + "cumulus-client-collator", + "cumulus-client-consensus-aura", + "cumulus-client-consensus-common", + "cumulus-client-consensus-proposer", + "cumulus-client-consensus-relay-chain", + "cumulus-client-service", + "cumulus-primitives-core", + "cumulus-primitives-parachain-inherent", + "cumulus-relay-chain-interface", + "frame-benchmarking", + "frame-benchmarking-cli", + "futures", + "glutton-runtime", + "hex-literal 0.4.1", + "jsonrpsee", + "log", + "nix 0.26.2", + "pallet-transaction-payment-rpc", + "parachains-common", + "parity-scale-codec", + "penpal-runtime", + "polkadot-cli", + "polkadot-primitives", + "polkadot-service", + "rococo-parachain-runtime", + "sc-basic-authorship", + "sc-chain-spec", + "sc-cli", + "sc-client-api", + "sc-consensus", + "sc-executor", + "sc-network", + "sc-network-sync", + "sc-rpc", + "sc-service", + "sc-sysinfo", + "sc-telemetry", + "sc-tracing", + "sc-transaction-pool", + "sc-transaction-pool-api", + "seedling-runtime", + "serde", + "serde_json", + "shell-runtime", + "sp-api", + "sp-block-builder", + "sp-blockchain", + "sp-consensus-aura", + "sp-core", + "sp-io", + "sp-keystore", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-timestamp", + "sp-transaction-pool", + "staging-xcm", + "substrate-build-script-utils", + "substrate-frame-rpc-system", + "substrate-prometheus-endpoint", + "substrate-state-trie-migration-rpc", + "tempfile", + "tokio", + "wait-timeout", +] + +[[package]] +name = "polkadot-parachain-primitives" version = "1.0.0" dependencies = [ "bounded-collections", @@ -7734,8 +12505,7 @@ dependencies = [ name = "polkadot-performance-test" version = "1.0.0" dependencies = [ - "env_logger 0.9.0", - "kusama-runtime", + "env_logger 0.9.3", "log", "polkadot-erasure-coding", "polkadot-node-core-pvf-prepare-worker", @@ -7744,6 +12514,7 @@ dependencies = [ "quote", "sc-executor-common", "sp-maybe-compressed-blob", + "staging-kusama-runtime", "thiserror", ] @@ -7755,7 +12526,7 @@ dependencies = [ "hex-literal 0.4.1", "parity-scale-codec", "polkadot-core-primitives", - "polkadot-parachain", + "polkadot-parachain-primitives", "scale-info", "serde", "sp-api", @@ -7875,6 +12646,7 @@ dependencies = [ "pallet-vesting", "pallet-whitelist", "pallet-xcm", + "pallet-xcm-benchmarks", "parity-scale-codec", "polkadot-primitives", "polkadot-runtime-common", @@ -7904,17 +12676,18 @@ dependencies = [ "sp-session", "sp-staking", "sp-std", + "sp-storage", "sp-tracing", "sp-transaction-pool", "sp-trie", "sp-version", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "static_assertions", "substrate-wasm-builder", "tiny-keccak", "tokio", - "xcm", - "xcm-builder", - "xcm-executor", ] [[package]] @@ -7964,8 +12737,8 @@ dependencies = [ "sp-session", "sp-staking", "sp-std", + "staging-xcm", "static_assertions", - "xcm", ] [[package]] @@ -7985,7 +12758,7 @@ dependencies = [ name = "polkadot-runtime-metrics" version = "1.0.0" dependencies = [ - "bs58", + "bs58 0.5.0", "frame-benchmarking", "parity-scale-codec", "polkadot-primitives", @@ -7998,7 +12771,7 @@ name = "polkadot-runtime-parachains" version = "1.0.0" dependencies = [ "assert_matches", - "bitflags", + "bitflags 1.3.2", "bitvec", "derive_more", "frame-benchmarking", @@ -8007,6 +12780,7 @@ dependencies = [ "frame-system", "futures", "hex-literal 0.4.1", + "impl-trait-for-tuples", "log", "pallet-authority-discovery", "pallet-authorship", @@ -8018,7 +12792,7 @@ dependencies = [ "pallet-timestamp", "pallet-vesting", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-primitives-test-helpers", "polkadot-runtime-metrics", @@ -8041,10 +12815,10 @@ dependencies = [ "sp-staking", "sp-std", "sp-tracing", + "staging-xcm", + "staging-xcm-executor", "static_assertions", "thousands", - "xcm", - "xcm-executor", ] [[package]] @@ -8053,7 +12827,7 @@ version = "1.0.0" dependencies = [ "assert_matches", "async-trait", - "env_logger 0.9.0", + "env_logger 0.9.3", "frame-benchmarking", "frame-benchmarking-cli", "frame-support", @@ -8061,12 +12835,11 @@ dependencies = [ "frame-system-rpc-runtime-api", "futures", "hex-literal 0.4.1", - "kusama-runtime", + "is_executable", "kusama-runtime-constants", "kvdb", "kvdb-rocksdb", "log", - "lru 0.9.0", "mmr-gadget", "pallet-babe", "pallet-im-online", @@ -8094,7 +12867,9 @@ dependencies = [ "polkadot-node-core-chain-selection", "polkadot-node-core-dispute-coordinator", "polkadot-node-core-parachains-inherent", + "polkadot-node-core-prospective-parachains", "polkadot-node-core-provisioner", + "polkadot-node-core-pvf", "polkadot-node-core-pvf-checker", "polkadot-node-core-runtime-api", "polkadot-node-network-protocol", @@ -8104,7 +12879,7 @@ dependencies = [ "polkadot-node-subsystem-types", "polkadot-node-subsystem-util", "polkadot-overseer", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-rpc", "polkadot-runtime", @@ -8137,8 +12912,11 @@ dependencies = [ "sc-sysinfo", "sc-telemetry", "sc-transaction-pool", + "sc-transaction-pool-api", + "schnellru", "serde", "serde_json", + "serial_test", "sp-api", "sp-authority-discovery", "sp-block-builder", @@ -8160,9 +12938,9 @@ dependencies = [ "sp-storage", "sp-timestamp", "sp-transaction-pool", - "sp-trie", "sp-version", "sp-weights", + "staging-kusama-runtime", "substrate-prometheus-endpoint", "tempfile", "thiserror", @@ -8175,20 +12953,24 @@ dependencies = [ name = "polkadot-statement-distribution" version = "1.0.0" dependencies = [ - "arrayvec 0.5.2", + "arrayvec 0.7.4", "assert_matches", + "async-channel", + "bitvec", "fatality", "futures", "futures-timer", - "indexmap", + "indexmap 1.9.3", "parity-scale-codec", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-test-helpers", + "polkadot-node-subsystem-types", "polkadot-node-subsystem-util", "polkadot-primitives", "polkadot-primitives-test-helpers", + "rand_chacha 0.3.1", "sc-keystore", "sc-network", "sp-application-crypto", @@ -8246,7 +13028,7 @@ version = "1.0.0" dependencies = [ "assert_matches", "async-trait", - "clap 4.2.5", + "clap 4.4.2", "color-eyre", "futures", "futures-timer", @@ -8255,6 +13037,7 @@ dependencies = [ "polkadot-node-core-backing", "polkadot-node-core-candidate-validation", "polkadot-node-core-dispute-coordinator", + "polkadot-node-core-pvf-common", "polkadot-node-core-pvf-execute-worker", "polkadot-node-core-pvf-prepare-worker", "polkadot-node-primitives", @@ -8266,6 +13049,7 @@ dependencies = [ "rand 0.8.5", "sp-core", "sp-keystore", + "substrate-build-script-utils", "tracing-gum", ] @@ -8298,7 +13082,7 @@ dependencies = [ "pallet-vesting", "pallet-xcm", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", @@ -8326,12 +13110,12 @@ dependencies = [ "sp-transaction-pool", "sp-trie", "sp-version", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "substrate-wasm-builder", "test-runtime-constants", "tiny-keccak", - "xcm", - "xcm-builder", - "xcm-executor", ] [[package]] @@ -8347,7 +13131,7 @@ dependencies = [ "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-overseer", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-rpc", "polkadot-runtime-common", @@ -8390,25 +13174,28 @@ dependencies = [ name = "polkadot-voter-bags" version = "1.0.0" dependencies = [ - "clap 4.2.5", + "clap 4.4.2", "generate-bags", - "kusama-runtime", "polkadot-runtime", "sp-io", + "staging-kusama-runtime", "westend-runtime", ] [[package]] name = "polling" -version = "2.2.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "685404d509889fade3e86fe3a5803bca2ec09b0c0778d5ada6ec8bf7a8de5259" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" dependencies = [ + "autocfg", + "bitflags 1.3.2", "cfg-if", + "concurrent-queue", "libc", "log", - "wepoll-ffi", - "winapi", + "pin-project-lite 0.2.12", + "windows-sys 0.48.0", ] [[package]] @@ -8419,18 +13206,18 @@ checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede" dependencies = [ "cpufeatures", "opaque-debug 0.3.0", - "universal-hash", + "universal-hash 0.4.1", ] [[package]] -name = "polyval" -version = "0.4.5" +name = "poly1305" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eebcc4aa140b9abd2bc40d9c3f7ccec842679cd79045ac3a7ac698c1a064b7cd" +checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" dependencies = [ - "cpuid-bool", + "cpufeatures", "opaque-debug 0.3.0", - "universal-hash", + "universal-hash 0.5.1", ] [[package]] @@ -8442,27 +13229,48 @@ dependencies = [ "cfg-if", "cpufeatures", "opaque-debug 0.3.0", - "universal-hash", + "universal-hash 0.4.1", +] + +[[package]] +name = "polyval" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52cff9d1d4dee5fe6d03729099f4a310a41179e0a10dbf542039873f2e826fb" +dependencies = [ + "cfg-if", + "cpufeatures", + "opaque-debug 0.3.0", + "universal-hash 0.5.1", ] [[package]] name = "portable-atomic" -version = "0.3.19" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26f6a7b87c2e435a3241addceeeff740ff8b7e76b74c13bf9acb17fa454ea00b" +checksum = "f32154ba0af3a075eefa1eda8bb414ee928f62303a54ea85b8d6638ff1a6ee9e" + +[[package]] +name = "portpicker" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be97d76faf1bfab666e1375477b23fde79eccf0276e9b63b92a39d676a889ba9" +dependencies = [ + "rand 0.8.5", +] [[package]] name = "pprof" -version = "0.10.1" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6472bfed9475542ac46c518734a8d06d71b0f6cb2c17f904aa301711a57786f" +checksum = "978385d59daf9269189d052ca8a84c1acfd0715c0599a5d5188d4acc078ca46a" dependencies = [ "backtrace", "cfg-if", "findshlibs", "libc", "log", - "nix 0.24.1", + "nix 0.26.2", "once_cell", "parking_lot 0.12.1", "smallvec", @@ -8479,29 +13287,41 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "predicates" -version = "2.1.0" +version = "2.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95e5a7689e456ab905c22c2b48225bb921aba7c8dfa58440d68ba13f6222a715" +checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" dependencies = [ "difflib", "float-cmp", - "itertools", + "itertools 0.10.5", "normalize-line-endings", "predicates-core", "regex", ] [[package]] +name = "predicates" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09963355b9f467184c04017ced4a2ba2d75cbcb4e7462690d388233253d4b1a9" +dependencies = [ + "anstyle", + "difflib", + "itertools 0.10.5", + "predicates-core", +] + +[[package]] name = "predicates-core" -version = "1.0.2" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57e35a3326b75e49aa85f5dc6ec15b41108cf5aee58eabb1f274dd18b73c2451" +checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" [[package]] name = "predicates-tree" -version = "1.0.4" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "338c7be2905b732ae3984a2f40032b5e94fd8f52505b186c7d4d68d193445df7" +checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" dependencies = [ "predicates-core", "termtree", @@ -8509,24 +13329,32 @@ dependencies = [ [[package]] name = "pretty_assertions" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755" +checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" dependencies = [ - "ctor", "diff", - "output_vt100", "yansi", ] [[package]] name = "prettyplease" -version = "0.2.4" +version = "0.1.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" +dependencies = [ + "proc-macro2", + "syn 1.0.109", +] + +[[package]] +name = "prettyplease" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ceca8aaf45b5c46ec7ed39fff75f57290368c1846d33d24a122ca81416ab058" +checksum = "6c64d9ba0963cdcea2e1b2230fbae2bab30eb25a174be395c41e764bfb65dd62" dependencies = [ "proc-macro2", - "syn 2.0.16", + "syn 2.0.31", ] [[package]] @@ -8537,6 +13365,8 @@ checksum = "9f3486ccba82358b11a77516035647c34ba167dfa53312630de83b12bd4f3d66" dependencies = [ "fixed-hash", "impl-codec", + "impl-num-traits", + "impl-rlp", "impl-serde", "scale-info", "uint", @@ -8593,36 +13423,42 @@ dependencies = [ ] [[package]] +name = "proc-macro-hack" +version = "0.5.20+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" + +[[package]] name = "proc-macro-warning" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70550716265d1ec349c41f70dd4f964b4fd88394efe4405f0c1da679c4799a07" +checksum = "3d1eaa7fa0aa1929ffdf7eeb6eac234dde6268914a14ad44d23521ab6a9b258e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.31", ] [[package]] name = "proc-macro2" -version = "1.0.60" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] [[package]] name = "prometheus" -version = "0.13.0" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7f64969ffd5dd8f39bd57a68ac53c163a095ed9d0fb707146da1b27025a3504" +checksum = "449811d15fbdf5ceb5c1144416066429cf82316e2ec8ce0c1f6f8a02e7bbcf8c" dependencies = [ "cfg-if", "fnv", "lazy_static", "memchr", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "thiserror", ] @@ -8640,87 +13476,67 @@ dependencies = [ [[package]] name = "prometheus-client-derive-encode" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b6a5217beb0ad503ee7fa752d451c905113d70721b937126158f3106a48cc1" +checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.31", ] [[package]] name = "prometheus-parse" -version = "0.2.2" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c996f3caea1c51aa034c0d2dfd8447a12c555f4567b02677ef8a865ac4cce712" +checksum = "0c2aa5feb83bf4b2c8919eaf563f51dbab41183de73ba2353c0e03cd7b6bd892" dependencies = [ "chrono", - "lazy_static", + "itertools 0.10.5", + "once_cell", "regex", ] [[package]] name = "prost" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71adf41db68aa0daaefc69bb30bcd68ded9b9abaad5d1fbb6304c4fb390e083e" -dependencies = [ - "bytes", - "prost-derive 0.10.1", -] - -[[package]] -name = "prost" -version = "0.11.0" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "399c3c31cdec40583bb68f0b18403400d01ec4289c383aa047560439952c4dd7" +checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" dependencies = [ "bytes", - "prost-derive 0.11.0", + "prost-derive", ] [[package]] name = "prost-build" -version = "0.11.1" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f835c582e6bd972ba8347313300219fed5bfa52caf175298d860b61ff6069bb" +checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" dependencies = [ "bytes", "heck", - "itertools", + "itertools 0.10.5", "lazy_static", "log", "multimap", "petgraph", - "prost 0.11.0", + "prettyplease 0.1.25", + "prost", "prost-types", "regex", + "syn 1.0.109", "tempfile", "which", ] [[package]] name = "prost-derive" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc" -dependencies = [ - "anyhow", - "itertools", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "prost-derive" -version = "0.11.0" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7345d5f0e08c0536d7ac7229952590239e77abf0a0100a1b1d890add6ea96364" +checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" dependencies = [ "anyhow", - "itertools", + "itertools 0.10.5", "proc-macro2", "quote", "syn 1.0.109", @@ -8728,35 +13544,34 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.11.1" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dfaa718ad76a44b3415e6c4d53b17c8f99160dcb3a99b10470fce8ad43f6e3e" +checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" dependencies = [ - "bytes", - "prost 0.11.0", + "prost", ] [[package]] name = "psm" -version = "0.1.16" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd136ff4382c4753fc061cb9e4712ab2af263376b95bbd5bd8cd50c020b78e69" +checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" dependencies = [ "cc", ] [[package]] name = "pyroscope" -version = "0.5.5" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6636d352280fb587c8716f10e1d61fe88cb002660e0a8b0d3e47de17f3b5aaed" +checksum = "ac8a53ce01af1087eaeee6ce7c4fbf50ea4040ab1825c0115c4bafa039644ba9" dependencies = [ "json", "libc", "libflate", "log", - "names", - "prost 0.10.4", + "names 0.14.0", + "prost", "reqwest", "thiserror", "url", @@ -8765,9 +13580,9 @@ dependencies = [ [[package]] name = "pyroscope_pprofrs" -version = "0.2.5" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14e699bf3e7da41b3a7573d5944d77b1bd96a187aa72f5fa96afb4ed5609cc45" +checksum = "43f010b2a981a7f8449a650f25f309e520b5206ea2d89512dcb146aaa5518ff4" dependencies = [ "log", "pprof", @@ -8782,12 +13597,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] -name = "quick-error" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" - -[[package]] name = "quick-protobuf" version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8810,6 +13619,15 @@ dependencies = [ ] [[package]] +name = "quickcheck" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" +dependencies = [ + "rand 0.8.5", +] + +[[package]] name = "quicksink" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8822,15 +13640,15 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.9.2" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72ef4ced82a24bb281af338b9e8f94429b6eca01b4e66d899f40031f074e74c9" +checksum = "f31999cfc7927c4e212e60fd50934ab40e8e8bfd2d493d6095d2d306bc0764d9" dependencies = [ "bytes", "rand 0.8.5", - "ring", + "ring 0.16.20", "rustc-hash", - "rustls 0.20.7", + "rustls 0.20.8", "slab", "thiserror", "tinyvec", @@ -8840,9 +13658,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.28" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -8912,7 +13730,17 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.10", +] + +[[package]] +name = "rand_distr" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" +dependencies = [ + "num-traits", + "rand 0.8.5", ] [[package]] @@ -8941,26 +13769,23 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.5.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" dependencies = [ - "autocfg", - "crossbeam-deque", "either", "rayon-core", ] [[package]] name = "rayon-core" -version = "1.9.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" dependencies = [ "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "lazy_static", "num_cpus", ] @@ -8971,8 +13796,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd" dependencies = [ "pem", - "ring", - "time 0.3.17", + "ring 0.16.20", + "time 0.3.27", "x509-parser 0.13.2", "yasna", ] @@ -8984,8 +13809,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" dependencies = [ "pem", - "ring", - "time 0.3.17", + "ring 0.16.20", + "time 0.3.27", "yasna", ] @@ -8995,17 +13820,27 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", ] [[package]] name = "redox_users" -version = "0.4.0" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.8", - "redox_syscall", + "getrandom 0.2.10", + "redox_syscall 0.2.16", + "thiserror", ] [[package]] @@ -9016,29 +13851,29 @@ checksum = "3bd8f48b2066e9f69ab192797d66da804d1935bf22763204ed3675740cb0f221" dependencies = [ "derive_more", "fs-err", - "itertools", + "itertools 0.10.5", "static_init 0.5.2", "thiserror", ] [[package]] name = "ref-cast" -version = "1.0.6" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "300f2a835d808734ee295d45007adacb9ebb29dd3ae2424acfa17930cae541da" +checksum = "acde58d073e9c79da00f2b5b84eed919c8326832648a5b109b3fce1bb1175280" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.6" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c38e3aecd2b21cb3959637b883bb3714bc7e43f0268b9a29d3743ee3e55cdd2" +checksum = "7f7473c2cfcf90008193dd0e3e16599455cb601a9fce322b5bb55de799664925" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.31", ] [[package]] @@ -9055,13 +13890,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.6.0" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" +checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" dependencies = [ "aho-corasick", "memchr", - "regex-syntax", + "regex-automata 0.3.6", + "regex-syntax 0.7.4", ] [[package]] @@ -9070,22 +13906,38 @@ 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]] +name = "regex-automata" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.7.4", ] [[package]] name = "regex-syntax" -version = "0.6.27" +version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "remote-ext-tests-bags-list" version = "1.0.0" dependencies = [ - "clap 4.2.5", + "clap 4.4.2", "frame-system", - "kusama-runtime", "kusama-runtime-constants", "log", "pallet-bags-list-remote-tests", @@ -9093,27 +13945,19 @@ dependencies = [ "polkadot-runtime-constants", "sp-core", "sp-tracing", + "staging-kusama-runtime", "tokio", "westend-runtime", "westend-runtime-constants", ] [[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] - -[[package]] name = "reqwest" -version = "0.11.17" +version = "0.11.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13293b639a097af28fc8a90f22add145a9c954e49d77da06263d58cf44d5fb91" +checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" dependencies = [ - "base64 0.21.0", + "base64 0.21.2", "bytes", "encoding_rs", "futures-core", @@ -9122,28 +13966,28 @@ dependencies = [ "http", "http-body", "hyper", - "hyper-rustls 0.23.0", + "hyper-rustls", "ipnet", "js-sys", "log", "mime", "once_cell", "percent-encoding", - "pin-project-lite 0.2.9", - "rustls 0.20.7", - "rustls-pemfile 1.0.2", + "pin-project-lite 0.2.12", + "rustls 0.21.6", + "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", "tokio", - "tokio-rustls 0.23.2", + "tokio-rustls", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots", - "winreg 0.10.1", + "webpki-roots 0.25.2", + "winreg", ] [[package]] @@ -9153,7 +13997,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" dependencies = [ "hostname", - "quick-error 1.2.3", + "quick-error", ] [[package]] @@ -9179,6 +14023,21 @@ dependencies = [ [[package]] name = "ring" +version = "0.1.0" +source = "git+https://github.com/w3f/ring-proof?rev=0e948f3#0e948f3c28cbacecdd3020403c4841c0eb339213" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-poly", + "ark-serialize", + "ark-std", + "common", + "fflonk", + "merlin 3.0.0", +] + +[[package]] +name = "ring" version = "0.16.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" @@ -9186,7 +14045,7 @@ dependencies = [ "cc", "libc", "once_cell", - "spin", + "spin 0.5.2", "untrusted", "web-sys", "winapi", @@ -9199,6 +14058,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422" [[package]] +name = "rlp" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb919243f34364b6bd2fc10ef797edbfa75f33c252e7998527479c6d6b47e1ec" +dependencies = [ + "bytes", + "rustc-hex", +] + +[[package]] name = "rocksdb" version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -9209,6 +14078,53 @@ dependencies = [ ] [[package]] +name = "rococo-parachain-runtime" +version = "0.1.0" +dependencies = [ + "cumulus-pallet-aura-ext", + "cumulus-pallet-dmp-queue", + "cumulus-pallet-parachain-system", + "cumulus-pallet-xcm", + "cumulus-pallet-xcmp-queue", + "cumulus-ping", + "cumulus-primitives-core", + "cumulus-primitives-utility", + "frame-benchmarking", + "frame-executive", + "frame-support", + "frame-system", + "frame-system-rpc-runtime-api", + "pallet-assets", + "pallet-aura", + "pallet-balances", + "pallet-sudo", + "pallet-timestamp", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "pallet-xcm", + "parachain-info", + "parachains-common", + "parity-scale-codec", + "polkadot-parachain-primitives", + "scale-info", + "sp-api", + "sp-block-builder", + "sp-consensus-aura", + "sp-core", + "sp-inherents", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-std", + "sp-transaction-pool", + "sp-version", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "substrate-wasm-builder", +] + +[[package]] name = "rococo-runtime" version = "1.0.0" dependencies = [ @@ -9263,7 +14179,7 @@ dependencies = [ "pallet-xcm", "pallet-xcm-benchmarks", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", @@ -9289,17 +14205,18 @@ dependencies = [ "sp-session", "sp-staking", "sp-std", + "sp-storage", "sp-tracing", "sp-transaction-pool", "sp-trie", "sp-version", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "static_assertions", "substrate-wasm-builder", "tiny-keccak", "tokio", - "xcm", - "xcm-builder", - "xcm-executor", ] [[package]] @@ -9317,11 +14234,12 @@ dependencies = [ [[package]] name = "rpassword" -version = "7.0.0" +version = "7.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b763cb66df1c928432cc35053f8bd4cec3335d8559fc16010017d16b3c1680" +checksum = "6678cf63ab3491898c0d021b493c94c9b221d91295294a2a5746eacbe5928322" dependencies = [ "libc", + "rtoolbox", "winapi", ] @@ -9346,12 +14264,22 @@ dependencies = [ "log", "netlink-packet-route", "netlink-proto", - "nix 0.24.1", + "nix 0.24.3", "thiserror", "tokio", ] [[package]] +name = "rtoolbox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "034e22c514f5c0cb8a10ff341b9b048b5ceb21591f31c8f44c43b960f9b3524a" +dependencies = [ + "libc", + "winapi", +] + +[[package]] name = "rtp" version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -9367,9 +14295,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.21" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustc-hash" @@ -9385,11 +14313,20 @@ checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" [[package]] name = "rustc_version" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +dependencies = [ + "semver 0.9.0", +] + +[[package]] +name = "rustc_version" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.16", + "semver 1.0.18", ] [[package]] @@ -9403,43 +14340,42 @@ dependencies = [ [[package]] name = "rustix" -version = "0.35.13" +version = "0.36.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9" +checksum = "c37f1bd5ef1b5422177b7646cba67430579cfe2ace80f284fee876bca52ad941" dependencies = [ - "bitflags", - "errno 0.2.8", - "io-lifetimes 0.7.5", + "bitflags 1.3.2", + "errno", + "io-lifetimes", "libc", - "linux-raw-sys 0.0.46", - "windows-sys 0.42.0", + "linux-raw-sys 0.1.4", + "windows-sys 0.45.0", ] [[package]] name = "rustix" -version = "0.36.7" +version = "0.37.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03" +checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" dependencies = [ - "bitflags", - "errno 0.2.8", - "io-lifetimes 1.0.10", + "bitflags 1.3.2", + "errno", + "io-lifetimes", "libc", - "linux-raw-sys 0.1.4", - "windows-sys 0.42.0", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", ] [[package]] name = "rustix" -version = "0.37.18" +version = "0.38.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bbfc1d1c7c40c01715f47d71444744a81669ca84e8b63e25a55e169b1f86433" +checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" dependencies = [ - "bitflags", - "errno 0.3.1", - "io-lifetimes 1.0.10", + "bitflags 2.4.0", + "errno", "libc", - "linux-raw-sys 0.3.6", + "linux-raw-sys 0.4.5", "windows-sys 0.48.0", ] @@ -9449,82 +14385,105 @@ version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", "log", - "ring", + "ring 0.16.20", "sct 0.6.1", "webpki 0.21.4", ] [[package]] name = "rustls" -version = "0.20.7" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c" +checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" dependencies = [ "log", - "ring", + "ring 0.16.20", "sct 0.7.0", "webpki 0.22.0", ] [[package]] name = "rustls" -version = "0.21.2" +version = "0.21.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e32ca28af694bc1bbf399c33a516dbdf1c90090b8ab23c2bc24f834aa2247f5f" +checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb" dependencies = [ "log", - "ring", - "rustls-webpki", + "ring 0.16.20", + "rustls-webpki 0.101.4", "sct 0.7.0", ] [[package]] name = "rustls-native-certs" -version = "0.6.1" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca9ebdfa27d3fc180e42879037b5338ab1c040c06affd00d8338598e7800943" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ "openssl-probe", - "rustls-pemfile 0.2.1", + "rustls-pemfile", "schannel", "security-framework", ] [[package]] name = "rustls-pemfile" -version = "0.2.1" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9" +checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64 0.13.0", + "base64 0.21.2", ] [[package]] -name = "rustls-pemfile" -version = "1.0.2" +name = "rustls-webpki" +version = "0.100.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" +checksum = "e98ff011474fa39949b7e5c0428f9b4937eda7da7848bbb947786b7be0b27dab" dependencies = [ - "base64 0.21.0", + "ring 0.16.20", + "untrusted", ] [[package]] name = "rustls-webpki" -version = "0.100.1" +version = "0.101.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" +checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" dependencies = [ - "ring", + "ring 0.16.20", "untrusted", ] [[package]] name = "rustversion" -version = "1.0.6" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" + +[[package]] +name = "rusty-fork" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f" +dependencies = [ + "fnv", + "quick-error", + "tempfile", +] + +[[package]] +name = "ruzstd" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3ffab8f9715a0d455df4bbb9d21e91135aab3cd3ca187af0cd0c3c3f868fdc" +dependencies = [ + "byteorder", + "thiserror-core", + "twox-hash", +] [[package]] name = "rw-stream-sink" @@ -9539,15 +14498,24 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.6" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" + +[[package]] +name = "safe-mix" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c9613b5a66ab9ba26415184cfc41156594925a9cf3a2057e57f31ff145f6568" +checksum = "6d3d055a2582e6b00ed7a31c1524040aa391092bf636328350813f3a0605215c" +dependencies = [ + "rustc_version 0.2.3", +] [[package]] name = "safe_arch" -version = "0.6.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "794821e4ccb0d9f979512f9c1973480123f9bd62a90d74ab0f9426fcf8f4a529" +checksum = "f398075ce1e6a179b46f51bd88d0598b92b00d3551f1a2d4ac49e771b56ac354" dependencies = [ "bytemuck", ] @@ -9564,7 +14532,6 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "log", "sp-core", @@ -9575,7 +14542,6 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-trait", "futures", @@ -9585,8 +14551,9 @@ dependencies = [ "log", "multihash", "parity-scale-codec", - "prost 0.11.0", + "prost", "prost-build", + "quickcheck", "rand 0.8.5", "sc-client-api", "sc-network", @@ -9596,23 +14563,26 @@ dependencies = [ "sp-core", "sp-keystore", "sp-runtime", + "sp-tracing", "substrate-prometheus-endpoint", + "substrate-test-runtime-client", "thiserror", ] [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "futures", "futures-timer", "log", "parity-scale-codec", + "parking_lot 0.12.1", "sc-block-builder", "sc-client-api", "sc-proposer-metrics", "sc-telemetry", + "sc-transaction-pool", "sc-transaction-pool-api", "sp-api", "sp-blockchain", @@ -9621,12 +14591,12 @@ dependencies = [ "sp-inherents", "sp-runtime", "substrate-prometheus-endpoint", + "substrate-test-runtime-client", ] [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -9636,12 +14606,13 @@ dependencies = [ "sp-core", "sp-inherents", "sp-runtime", + "sp-state-machine", + "substrate-test-runtime-client", ] [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "memmap2", "sc-chain-spec-derive", @@ -9660,27 +14631,26 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.31", ] [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "array-bytes", "chrono", - "clap 4.2.5", + "clap 4.4.2", "fdlimit", "futures", + "futures-timer", "libp2p-identity", "log", - "names", + "names 0.13.0", "parity-scale-codec", "rand 0.8.5", "regex", @@ -9701,7 +14671,9 @@ dependencies = [ "sp-keystore", "sp-panic-handler", "sp-runtime", + "sp-tracing", "sp-version", + "tempfile", "thiserror", "tiny-bip39", "tokio", @@ -9710,7 +14682,6 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "fnv", "futures", @@ -9726,20 +14697,24 @@ dependencies = [ "sp-core", "sp-database", "sp-externalities", - "sp-keystore", "sp-runtime", "sp-state-machine", "sp-statement-store", "sp-storage", + "sp-test-primitives", "substrate-prometheus-endpoint", + "substrate-test-runtime", + "thiserror", ] [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ + "array-bytes", + "criterion 0.4.0", "hash-db", + "kitchensink-runtime", "kvdb", "kvdb-memorydb", "kvdb-rocksdb", @@ -9748,6 +14723,8 @@ dependencies = [ "parity-db", "parity-scale-codec", "parking_lot 0.12.1", + "quickcheck", + "rand 0.8.5", "sc-client-api", "sc-state-db", "schnellru", @@ -9757,13 +14734,15 @@ dependencies = [ "sp-database", "sp-runtime", "sp-state-machine", + "sp-tracing", "sp-trie", + "substrate-test-runtime-client", + "tempfile", ] [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-trait", "futures", @@ -9781,14 +14760,52 @@ dependencies = [ "sp-core", "sp-runtime", "sp-state-machine", + "sp-test-primitives", + "substrate-prometheus-endpoint", + "thiserror", +] + +[[package]] +name = "sc-consensus-aura" +version = "0.10.0-dev" +dependencies = [ + "async-trait", + "futures", + "log", + "parity-scale-codec", + "parking_lot 0.12.1", + "sc-block-builder", + "sc-client-api", + "sc-consensus", + "sc-consensus-slots", + "sc-keystore", + "sc-network", + "sc-network-test", + "sc-telemetry", + "sp-api", + "sp-application-crypto", + "sp-block-builder", + "sp-blockchain", + "sp-consensus", + "sp-consensus-aura", + "sp-consensus-slots", + "sp-core", + "sp-inherents", + "sp-keyring", + "sp-keystore", + "sp-runtime", + "sp-timestamp", + "sp-tracing", "substrate-prometheus-endpoint", + "substrate-test-runtime-client", + "tempfile", "thiserror", + "tokio", ] [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-trait", "fork-tree", @@ -9799,11 +14816,16 @@ dependencies = [ "num-traits", "parity-scale-codec", "parking_lot 0.12.1", + "rand_chacha 0.2.2", + "sc-block-builder", "sc-client-api", "sc-consensus", "sc-consensus-epochs", "sc-consensus-slots", + "sc-network", + "sc-network-test", "sc-telemetry", + "sc-transaction-pool-api", "scale-info", "sp-api", "sp-application-crypto", @@ -9814,38 +14836,48 @@ dependencies = [ "sp-consensus-slots", "sp-core", "sp-inherents", + "sp-keyring", "sp-keystore", "sp-runtime", + "sp-timestamp", + "sp-tracing", "substrate-prometheus-endpoint", + "substrate-test-runtime-client", "thiserror", + "tokio", ] [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "futures", "jsonrpsee", + "sc-consensus", "sc-consensus-babe", "sc-consensus-epochs", + "sc-keystore", "sc-rpc-api", + "sc-transaction-pool-api", "serde", + "serde_json", "sp-api", "sp-application-crypto", "sp-blockchain", "sp-consensus", "sp-consensus-babe", "sp-core", + "sp-keyring", "sp-keystore", "sp-runtime", + "substrate-test-runtime-client", "thiserror", + "tokio", ] [[package]] name = "sc-consensus-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "array-bytes", "async-channel", @@ -9855,31 +14887,39 @@ dependencies = [ "log", "parity-scale-codec", "parking_lot 0.12.1", + "sc-block-builder", "sc-client-api", "sc-consensus", "sc-network", "sc-network-gossip", "sc-network-sync", + "sc-network-test", "sc-utils", + "serde", "sp-api", "sp-application-crypto", "sp-arithmetic", "sp-blockchain", "sp-consensus", "sp-consensus-beefy", + "sp-consensus-grandpa", "sp-core", + "sp-keyring", "sp-keystore", "sp-mmr-primitives", "sp-runtime", + "sp-tracing", "substrate-prometheus-endpoint", + "substrate-test-runtime-client", + "tempfile", "thiserror", + "tokio", "wasm-timer", ] [[package]] name = "sc-consensus-beefy-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "futures", "jsonrpsee", @@ -9889,16 +14929,18 @@ dependencies = [ "sc-consensus-beefy", "sc-rpc", "serde", + "serde_json", "sp-consensus-beefy", "sp-core", "sp-runtime", + "substrate-test-runtime-client", "thiserror", + "tokio", ] [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "fork-tree", "parity-scale-codec", @@ -9911,10 +14953,10 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ - "ahash 0.8.2", + "ahash 0.8.3", "array-bytes", + "assert_matches", "async-trait", "dyn-clone", "finality-grandpa", @@ -9932,8 +14974,11 @@ dependencies = [ "sc-network", "sc-network-common", "sc-network-gossip", + "sc-network-test", "sc-telemetry", + "sc-transaction-pool-api", "sc-utils", + "serde", "serde_json", "sp-api", "sp-application-crypto", @@ -9942,36 +14987,105 @@ dependencies = [ "sp-consensus", "sp-consensus-grandpa", "sp-core", + "sp-keyring", "sp-keystore", "sp-runtime", + "sp-tracing", "substrate-prometheus-endpoint", + "substrate-test-runtime-client", "thiserror", + "tokio", ] [[package]] name = "sc-consensus-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "finality-grandpa", "futures", "jsonrpsee", "log", "parity-scale-codec", + "sc-block-builder", "sc-client-api", "sc-consensus-grandpa", "sc-rpc", "serde", "sp-blockchain", + "sp-consensus-grandpa", "sp-core", + "sp-keyring", "sp-runtime", + "substrate-test-runtime-client", + "thiserror", + "tokio", +] + +[[package]] +name = "sc-consensus-manual-seal" +version = "0.10.0-dev" +dependencies = [ + "assert_matches", + "async-trait", + "futures", + "futures-timer", + "jsonrpsee", + "log", + "parity-scale-codec", + "sc-basic-authorship", + "sc-client-api", + "sc-consensus", + "sc-consensus-aura", + "sc-consensus-babe", + "sc-consensus-epochs", + "sc-transaction-pool", + "sc-transaction-pool-api", + "serde", + "sp-api", + "sp-blockchain", + "sp-consensus", + "sp-consensus-aura", + "sp-consensus-babe", + "sp-consensus-slots", + "sp-core", + "sp-inherents", + "sp-keystore", + "sp-runtime", + "sp-timestamp", + "substrate-prometheus-endpoint", + "substrate-test-runtime-client", + "substrate-test-runtime-transaction-pool", + "thiserror", + "tokio", +] + +[[package]] +name = "sc-consensus-pow" +version = "0.10.0-dev" +dependencies = [ + "async-trait", + "futures", + "futures-timer", + "log", + "parity-scale-codec", + "parking_lot 0.12.1", + "sc-client-api", + "sc-consensus", + "sp-api", + "sp-block-builder", + "sp-blockchain", + "sp-consensus", + "sp-consensus-pow", + "sp-core", + "sp-inherents", + "sp-runtime", + "substrate-prometheus-endpoint", "thiserror", ] [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-trait", "futures", @@ -9989,63 +15103,84 @@ dependencies = [ "sp-inherents", "sp-runtime", "sp-state-machine", + "substrate-test-runtime-client", ] [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ + "array-bytes", + "assert_matches", + "criterion 0.4.0", + "env_logger 0.9.3", + "num_cpus", "parity-scale-codec", "parking_lot 0.12.1", + "paste", + "regex", "sc-executor-common", "sc-executor-wasmtime", + "sc-runtime-test", + "sc-tracing", "schnellru", "sp-api", "sp-core", "sp-externalities", "sp-io", + "sp-maybe-compressed-blob", "sp-panic-handler", + "sp-runtime", "sp-runtime-interface", + "sp-state-machine", + "sp-tracing", "sp-trie", "sp-version", "sp-wasm-interface", + "substrate-test-runtime", + "tempfile", "tracing", + "tracing-subscriber 0.2.25", + "wat", ] [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "sc-allocator", "sp-maybe-compressed-blob", "sp-wasm-interface", "thiserror", - "wasm-instrument", + "wasm-instrument 0.3.0", ] [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "anyhow", + "cargo_metadata", "cfg-if", "libc", "log", - "rustix 0.36.7", + "parity-scale-codec", + "paste", + "rustix 0.36.15", "sc-allocator", "sc-executor-common", + "sc-runtime-test", + "sp-io", "sp-runtime-interface", "sp-wasm-interface", + "tempfile", "wasmtime", + "wat", ] [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "ansi_term", "futures", @@ -10061,7 +15196,6 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "array-bytes", "parking_lot 0.12.1", @@ -10069,15 +15203,16 @@ dependencies = [ "sp-application-crypto", "sp-core", "sp-keystore", + "tempfile", "thiserror", ] [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "array-bytes", + "assert_matches", "async-channel", "async-trait", "asynchronous-codec", @@ -10091,6 +15226,7 @@ dependencies = [ "linked_hash_set", "log", "mockall", + "multistream-select", "parity-scale-codec", "parking_lot 0.12.1", "partial_sort", @@ -10098,6 +15234,8 @@ dependencies = [ "rand 0.8.5", "sc-client-api", "sc-network-common", + "sc-network-light", + "sc-network-sync", "sc-utils", "serde", "serde_json", @@ -10106,8 +15244,16 @@ dependencies = [ "sp-blockchain", "sp-core", "sp-runtime", + "sp-test-primitives", + "sp-tracing", "substrate-prometheus-endpoint", + "substrate-test-runtime", + "substrate-test-runtime-client", + "tempfile", "thiserror", + "tokio", + "tokio-test", + "tokio-util", "unsigned-varint", "wasm-timer", "zeroize", @@ -10116,30 +15262,35 @@ dependencies = [ [[package]] name = "sc-network-bitswap" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-channel", "cid", "futures", "libp2p-identity", "log", - "prost 0.11.0", + "prost", "prost-build", + "sc-block-builder", "sc-client-api", + "sc-consensus", "sc-network", "sp-blockchain", + "sp-consensus", + "sp-core", "sp-runtime", + "substrate-test-runtime", + "substrate-test-runtime-client", "thiserror", + "tokio", "unsigned-varint", ] [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-trait", - "bitflags", + "bitflags 1.3.2", "futures", "libp2p-identity", "parity-scale-codec", @@ -10148,30 +15299,32 @@ dependencies = [ "sp-consensus", "sp-consensus-grandpa", "sp-runtime", + "tempfile", ] [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ - "ahash 0.8.2", + "ahash 0.8.3", "futures", "futures-timer", "libp2p", "log", + "quickcheck", "sc-network", "sc-network-common", "schnellru", "sp-runtime", "substrate-prometheus-endpoint", + "substrate-test-runtime-client", + "tokio", "tracing", ] [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "array-bytes", "async-channel", @@ -10179,7 +15332,7 @@ dependencies = [ "libp2p-identity", "log", "parity-scale-codec", - "prost 0.11.0", + "prost", "prost-build", "sc-client-api", "sc-network", @@ -10190,9 +15343,25 @@ dependencies = [ ] [[package]] +name = "sc-network-statement" +version = "0.10.0-dev" +dependencies = [ + "array-bytes", + "async-channel", + "futures", + "libp2p", + "log", + "parity-scale-codec", + "sc-network", + "sc-network-common", + "sp-consensus", + "sp-statement-store", + "substrate-prometheus-endpoint", +] + +[[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "array-bytes", "async-channel", @@ -10204,8 +15373,10 @@ dependencies = [ "log", "mockall", "parity-scale-codec", - "prost 0.11.0", + "prost", "prost-build", + "quickcheck", + "sc-block-builder", "sc-client-api", "sc-consensus", "sc-network", @@ -10219,14 +15390,47 @@ dependencies = [ "sp-consensus-grandpa", "sp-core", "sp-runtime", + "sp-test-primitives", + "sp-tracing", "substrate-prometheus-endpoint", + "substrate-test-runtime-client", "thiserror", + "tokio", +] + +[[package]] +name = "sc-network-test" +version = "0.8.0" +dependencies = [ + "async-trait", + "futures", + "futures-timer", + "libp2p", + "log", + "parking_lot 0.12.1", + "rand 0.8.5", + "sc-block-builder", + "sc-client-api", + "sc-consensus", + "sc-network", + "sc-network-common", + "sc-network-light", + "sc-network-sync", + "sc-service", + "sc-utils", + "sp-blockchain", + "sp-consensus", + "sp-core", + "sp-runtime", + "sp-tracing", + "substrate-test-runtime", + "substrate-test-runtime-client", + "tokio", ] [[package]] name = "sc-network-transactions" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "array-bytes", "futures", @@ -10244,7 +15448,6 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "array-bytes", "bytes", @@ -10252,28 +15455,40 @@ dependencies = [ "futures", "futures-timer", "hyper", - "hyper-rustls 0.24.0", + "hyper-rustls", + "lazy_static", "libp2p", + "log", "num_cpus", "once_cell", "parity-scale-codec", "parking_lot 0.12.1", "rand 0.8.5", + "sc-block-builder", "sc-client-api", + "sc-client-db", "sc-network", + "sc-network-common", + "sc-transaction-pool", + "sc-transaction-pool-api", "sc-utils", "sp-api", + "sp-consensus", "sp-core", + "sp-externalities", + "sp-keystore", "sp-offchain", "sp-runtime", + "sp-tracing", + "substrate-test-runtime-client", "threadpool", + "tokio", "tracing", ] [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -10282,24 +15497,31 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ + "assert_matches", + "env_logger 0.9.3", "futures", "jsonrpsee", "log", "parity-scale-codec", "parking_lot 0.12.1", + "pretty_assertions", "sc-block-builder", "sc-chain-spec", "sc-client-api", + "sc-network", + "sc-network-common", "sc-rpc-api", "sc-tracing", + "sc-transaction-pool", "sc-transaction-pool-api", "sc-utils", "serde_json", "sp-api", "sp-blockchain", + "sp-consensus", "sp-core", + "sp-io", "sp-keystore", "sp-offchain", "sp-rpc", @@ -10307,13 +15529,13 @@ dependencies = [ "sp-session", "sp-statement-store", "sp-version", + "substrate-test-runtime-client", "tokio", ] [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -10332,7 +15554,6 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "http", "jsonrpsee", @@ -10347,9 +15568,9 @@ dependencies = [ [[package]] name = "sc-rpc-spec-v2" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "array-bytes", + "assert_matches", "futures", "futures-util", "hex", @@ -10357,23 +15578,44 @@ dependencies = [ "log", "parity-scale-codec", "parking_lot 0.12.1", + "pretty_assertions", + "sc-block-builder", "sc-chain-spec", "sc-client-api", + "sc-service", "sc-transaction-pool-api", + "sc-utils", "serde", + "serde_json", "sp-api", "sp-blockchain", + "sp-consensus", "sp-core", + "sp-maybe-compressed-blob", "sp-runtime", "sp-version", + "substrate-test-runtime", + "substrate-test-runtime-client", "thiserror", + "tokio", "tokio-stream", ] [[package]] +name = "sc-runtime-test" +version = "2.0.0" +dependencies = [ + "sp-core", + "sp-io", + "sp-runtime", + "sp-runtime-interface", + "sp-std", + "substrate-wasm-builder", +] + +[[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-trait", "directories", @@ -10400,7 +15642,6 @@ dependencies = [ "sc-network-light", "sc-network-sync", "sc-network-transactions", - "sc-offchain", "sc-rpc", "sc-rpc-server", "sc-rpc-spec-v2", @@ -10428,6 +15669,8 @@ dependencies = [ "sp-version", "static_init 1.0.3", "substrate-prometheus-endpoint", + "substrate-test-runtime", + "substrate-test-runtime-client", "tempfile", "thiserror", "tokio", @@ -10436,9 +15679,44 @@ dependencies = [ ] [[package]] +name = "sc-service-test" +version = "2.0.0" +dependencies = [ + "array-bytes", + "async-channel", + "fdlimit", + "futures", + "log", + "parity-scale-codec", + "parking_lot 0.12.1", + "sc-block-builder", + "sc-client-api", + "sc-client-db", + "sc-consensus", + "sc-executor", + "sc-network", + "sc-network-sync", + "sc-service", + "sc-transaction-pool-api", + "sp-api", + "sp-blockchain", + "sp-consensus", + "sp-core", + "sp-io", + "sp-runtime", + "sp-state-machine", + "sp-storage", + "sp-tracing", + "sp-trie", + "substrate-test-runtime", + "substrate-test-runtime-client", + "tempfile", + "tokio", +] + +[[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "log", "parity-scale-codec", @@ -10447,11 +15725,30 @@ dependencies = [ ] [[package]] +name = "sc-statement-store" +version = "4.0.0-dev" +dependencies = [ + "env_logger 0.9.3", + "log", + "parity-db", + "parking_lot 0.12.1", + "sc-client-api", + "sc-keystore", + "sp-api", + "sp-blockchain", + "sp-core", + "sp-runtime", + "sp-statement-store", + "substrate-prometheus-endpoint", + "tempfile", + "tokio", +] + +[[package]] name = "sc-storage-monitor" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ - "clap 4.2.5", + "clap 4.4.2", "fs4", "log", "sc-client-db", @@ -10463,7 +15760,6 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -10482,7 +15778,6 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "futures", "libc", @@ -10495,13 +15790,13 @@ dependencies = [ "serde_json", "sp-core", "sp-io", + "sp-runtime", "sp-std", ] [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "chrono", "futures", @@ -10520,11 +15815,11 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "ansi_term", "atty", "chrono", + "criterion 0.4.0", "lazy_static", "libc", "log", @@ -10549,50 +15844,56 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.31", ] [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ + "array-bytes", + "assert_matches", "async-trait", + "criterion 0.4.0", "futures", "futures-timer", "linked-hash-map", "log", "parity-scale-codec", "parking_lot 0.12.1", + "sc-block-builder", "sc-client-api", "sc-transaction-pool-api", "sc-utils", "serde", "sp-api", "sp-blockchain", + "sp-consensus", "sp-core", "sp-runtime", "sp-tracing", "sp-transaction-pool", "substrate-prometheus-endpoint", + "substrate-test-runtime", + "substrate-test-runtime-client", + "substrate-test-runtime-transaction-pool", "thiserror", ] [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-trait", "futures", "log", "parity-scale-codec", "serde", + "serde_json", "sp-blockchain", "sp-core", "sp-runtime", @@ -10602,7 +15903,6 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-channel", "futures", @@ -10612,13 +15912,14 @@ dependencies = [ "parking_lot 0.12.1", "prometheus", "sp-arithmetic", + "tokio-test", ] [[package]] name = "scale-info" -version = "2.5.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cfdffd972d76b22f3d7f81c8be34b2296afd3a25e0a547bd9abe340a4dbbe97" +checksum = "35c0a159d0c45c12b20c5a844feb1fe4bea86e28f17b92a5f0c42193634d3782" dependencies = [ "bitvec", "cfg-if", @@ -10630,9 +15931,9 @@ dependencies = [ [[package]] name = "scale-info-derive" -version = "2.5.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61fa974aea2d63dd18a4ec3a49d59af9f34178c73a4f56d2f18205628d00681e" +checksum = "912e55f6d20e0e80d63733872b40e1227c0bce1e1ab81ba67d696339bfd7fd29" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -10642,12 +15943,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.19" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "lazy_static", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -10656,7 +15956,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "772575a524feeb803e5b0fcbc6dd9f367e579488197c94c6e4023aad2305774d" dependencies = [ - "ahash 0.8.2", + "ahash 0.8.3", "cfg-if", "hashbrown 0.13.2", ] @@ -10671,7 +15971,7 @@ dependencies = [ "arrayvec 0.5.2", "curve25519-dalek 2.1.3", "getrandom 0.1.16", - "merlin", + "merlin 2.0.1", "rand 0.7.3", "rand_core 0.5.1", "sha2 0.8.2", @@ -10680,16 +15980,32 @@ dependencies = [ ] [[package]] +name = "schnorrkel" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "844b7645371e6ecdf61ff246ba1958c29e802881a749ae3fb1993675d210d28d" +dependencies = [ + "arrayref", + "arrayvec 0.7.4", + "curve25519-dalek-ng", + "merlin 3.0.0", + "rand_core 0.6.4", + "sha2 0.9.9", + "subtle-ng", + "zeroize", +] + +[[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "scratch" -version = "1.0.2" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" +checksum = "a3cf7c11c38cb994f3d40e8a8cde3bbd1f72a435e4c49e85d6553d8312306152" [[package]] name = "sct" @@ -10697,7 +16013,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" dependencies = [ - "ring", + "ring 0.16.20", "untrusted", ] @@ -10707,7 +16023,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" dependencies = [ - "ring", + "ring 0.16.20", "untrusted", ] @@ -10730,8 +16046,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" dependencies = [ "base16ct 0.1.1", - "der 0.6.0", - "generic-array 0.14.6", + "der 0.6.1", + "generic-array 0.14.7", "pkcs8 0.9.0", "subtle", "zeroize", @@ -10739,13 +16055,13 @@ dependencies = [ [[package]] name = "sec1" -version = "0.7.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48518a2b5775ba8ca5b46596aae011caa431e6ce7e4a67ead66d92f08884220e" +checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" dependencies = [ "base16ct 0.2.0", - "der 0.7.7", - "generic-array 0.14.6", + "der 0.7.8", + "generic-array 0.14.7", "pkcs8 0.10.2", "subtle", "zeroize", @@ -10753,18 +16069,18 @@ dependencies = [ [[package]] name = "secp256k1" -version = "0.24.2" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9512ffd81e3a3503ed401f79c33168b9148c75038956039166cd750eaa037c3" +checksum = "6b1629c9c557ef9b293568b338dddfc8208c98a18c59d722a9d53f859d9c9b62" dependencies = [ "secp256k1-sys", ] [[package]] name = "secp256k1-sys" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7058dc8eaf3f2810d7828680320acda0b25a288f6d288e19278e249bbf74226b" +checksum = "83080e2c2fc1006e625be82e5d1eb6a43b7fd9578b617fcc55814daf286bba4b" dependencies = [ "cc", ] @@ -10780,11 +16096,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.4.2" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525bc1abfda2e1998d152c45cf13e696f76d0a4972310b22fac1658b05df7c87" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -10793,15 +16109,44 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.4.2" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9dd14d83160b528b7bfd66439110573efcfbe281b17fc2ca9f39f550d619c7e" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ "core-foundation-sys", "libc", ] [[package]] +name = "seedling-runtime" +version = "0.1.0" +dependencies = [ + "cumulus-pallet-parachain-system", + "cumulus-pallet-solo-to-para", + "cumulus-primitives-core", + "frame-executive", + "frame-support", + "frame-system", + "pallet-balances", + "pallet-sudo", + "parachain-info", + "parachains-common", + "parity-scale-codec", + "scale-info", + "sp-api", + "sp-block-builder", + "sp-core", + "sp-inherents", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-std", + "sp-transaction-pool", + "sp-version", + "substrate-wasm-builder", +] + +[[package]] name = "semver" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -10812,9 +16157,18 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.16" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +dependencies = [ + "semver-parser", +] + +[[package]] +name = "semver" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" dependencies = [ "serde", ] @@ -10833,38 +16187,38 @@ checksum = "f97841a747eef040fcd2e7b3b9a220a7205926e60488e673d9e4926d27772ce5" [[package]] name = "serde" -version = "1.0.164" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.164" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.31", ] [[package]] name = "serde_fmt" -version = "1.0.1" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2963a69a2b3918c1dc75a45a18bd3fcd1120e31d3f59deb1b2f9b5d5ffb8baa4" +checksum = "e1d4ddca14104cd60529e8c7f7ba71a2c8acd8f7f5cfcdc2faf97eeb7c3010a4" dependencies = [ "serde", ] [[package]] name = "serde_json" -version = "1.0.96" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" dependencies = [ "itoa", "ryu", @@ -10873,9 +16227,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.1" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" +checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" dependencies = [ "serde", ] @@ -10893,15 +16247,28 @@ dependencies = [ ] [[package]] -name = "sha-1" -version = "0.8.2" +name = "serial_test" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df" +checksum = "0e56dd856803e253c8f298af3f4d7eb0ae5e23a737252cd90bb4f3b435033b2d" dependencies = [ - "block-buffer 0.7.3", - "digest 0.8.1", - "fake-simd", - "opaque-debug 0.2.3", + "dashmap", + "futures", + "lazy_static", + "log", + "parking_lot 0.12.1", + "serial_test_derive", +] + +[[package]] +name = "serial_test_derive" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.31", ] [[package]] @@ -10919,13 +16286,24 @@ dependencies = [ [[package]] name = "sha-1" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" +checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.6", + "digest 0.10.7", +] + +[[package]] +name = "sha1" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest 0.10.7", ] [[package]] @@ -10942,9 +16320,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b69f9a4c9740d74c5baa3fd2e547f9525fa8088a8a958e0ca2409a514e33f5fa" +checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ "block-buffer 0.9.0", "cfg-if", @@ -10955,22 +16333,22 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.2" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676" +checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.6", + "digest 0.10.7", ] [[package]] name = "sha3" -version = "0.10.0" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f935e31cf406e8c0e96c2815a5516181b7004ae8c5f296293221e9b1e356bd" +checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", "keccak", ] @@ -10984,6 +16362,37 @@ dependencies = [ ] [[package]] +name = "shell-runtime" +version = "0.1.0" +dependencies = [ + "cumulus-pallet-parachain-system", + "cumulus-pallet-xcm", + "cumulus-primitives-core", + "frame-executive", + "frame-support", + "frame-system", + "frame-try-runtime", + "parachain-info", + "parachains-common", + "parity-scale-codec", + "scale-info", + "sp-api", + "sp-block-builder", + "sp-core", + "sp-inherents", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-std", + "sp-transaction-pool", + "sp-version", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "substrate-wasm-builder", +] + +[[package]] name = "shlex" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -10991,9 +16400,9 @@ checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" [[package]] name = "signal-hook" -version = "0.3.14" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" dependencies = [ "libc", "signal-hook-registry", @@ -11001,9 +16410,9 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" dependencies = [ "libc", ] @@ -11026,7 +16435,7 @@ version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", "rand_core 0.6.4", ] @@ -11036,15 +16445,15 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", "rand_core 0.6.4", ] [[package]] name = "simba" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50582927ed6f77e4ac020c057f37a268fc6aebc29225050365aacbb9deeeddc4" +checksum = "061507c94fc6ab4ba1c9a0305018408e312e17c041eb63bef8aa726fa33aceae" dependencies = [ "approx", "num-complex", @@ -11055,21 +16464,24 @@ dependencies = [ [[package]] name = "siphasher" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] name = "slab" -version = "0.4.5" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] [[package]] name = "slice-group-by" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03b634d87b960ab1a38c4fe143b508576f075e7c978bfad18217645ebfdfa2ec" +checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7" [[package]] name = "slot-range-helper" @@ -11093,9 +16505,116 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" + +[[package]] +name = "smol" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13f2b548cd8447f8de0fdf1c592929f70f4fc7039a05e47404b0d096ec6987a1" +dependencies = [ + "async-channel", + "async-executor", + "async-fs", + "async-io", + "async-lock", + "async-net", + "async-process", + "blocking", + "futures-lite", +] + +[[package]] +name = "smoldot" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0bb30cf57b7b5f6109ce17c3164445e2d6f270af2cb48f6e4d31c2967c9a9f5" +dependencies = [ + "arrayvec 0.7.4", + "async-lock", + "atomic-take", + "base64 0.21.2", + "bip39", + "blake2-rfc", + "bs58 0.5.0", + "chacha20 0.9.1", + "crossbeam-queue", + "derive_more", + "ed25519-zebra 4.0.2", + "either", + "event-listener", + "fnv", + "futures-lite", + "futures-util", + "hashbrown 0.14.0", + "hex", + "hmac 0.12.1", + "itertools 0.11.0", + "libsecp256k1", + "merlin 3.0.0", + "no-std-net", + "nom", + "num-bigint", + "num-rational", + "num-traits", + "pbkdf2 0.12.2", + "pin-project", + "poly1305 0.8.0", + "rand 0.8.5", + "rand_chacha 0.3.1", + "ruzstd", + "schnorrkel 0.10.2", + "serde", + "serde_json", + "sha2 0.10.7", + "sha3", + "siphasher", + "slab", + "smallvec", + "soketto", + "twox-hash", + "wasmi", + "x25519-dalek 2.0.0", + "zeroize", +] + +[[package]] +name = "smoldot-light" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "256b5bad1d6b49045e95fe87492ce73d5af81545d8b4d8318a872d2007024c33" +dependencies = [ + "async-channel", + "async-lock", + "base64 0.21.2", + "blake2-rfc", + "derive_more", + "either", + "event-listener", + "fnv", + "futures-channel", + "futures-lite", + "futures-util", + "hashbrown 0.14.0", + "hex", + "itertools 0.11.0", + "log", + "lru 0.11.0", + "no-std-net", + "parking_lot 0.12.1", + "pin-project", + "rand 0.8.5", + "rand_chacha 0.3.1", + "serde", + "serde_json", + "siphasher", + "slab", + "smol", + "smoldot", + "zeroize", +] [[package]] name = "snap" @@ -11105,18 +16624,18 @@ checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831" [[package]] name = "snow" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ccba027ba85743e09d15c03296797cad56395089b832b48b5a5217880f57733" +checksum = "0c9d1425eb528a21de2755c75af4c9b5d57f50a0d4c3b7f1828a4cd03f8ba155" dependencies = [ "aes-gcm 0.9.4", "blake2", "chacha20poly1305", - "curve25519-dalek 4.0.0-rc.1", + "curve25519-dalek 4.0.0", "rand_core 0.6.4", - "ring", - "rustc_version", - "sha2 0.10.2", + "ring 0.16.20", + "rustc_version 0.4.0", + "sha2 0.10.7", "subtle", ] @@ -11131,12 +16650,22 @@ dependencies = [ ] [[package]] +name = "socket2" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] name = "soketto" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41d1c5305e39e09653383c2c7244f2f78b3bcae37cf50c64cb4789c9f5096ec2" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", "bytes", "flate2", "futures", @@ -11150,7 +16679,6 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "hash-db", "log", @@ -11158,10 +16686,12 @@ dependencies = [ "scale-info", "sp-api-proc-macro", "sp-core", + "sp-externalities", "sp-metadata-ir", "sp-runtime", "sp-state-machine", "sp-std", + "sp-test-primitives", "sp-trie", "sp-version", "thiserror", @@ -11170,21 +16700,43 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "Inflector", + "assert_matches", "blake2", "expander 2.0.0", "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.31", +] + +[[package]] +name = "sp-api-test" +version = "2.0.1" +dependencies = [ + "criterion 0.4.0", + "futures", + "log", + "parity-scale-codec", + "rustversion", + "sc-block-builder", + "scale-info", + "sp-api", + "sp-consensus", + "sp-core", + "sp-runtime", + "sp-state-machine", + "sp-tracing", + "sp-version", + "static_assertions", + "substrate-test-runtime-client", + "trybuild", ] [[package]] name = "sp-application-crypto" version = "23.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "parity-scale-codec", "scale-info", @@ -11195,23 +16747,141 @@ dependencies = [ ] [[package]] +name = "sp-application-crypto-test" +version = "2.0.0" +dependencies = [ + "sp-api", + "sp-application-crypto", + "sp-core", + "sp-keystore", + "substrate-test-runtime-client", +] + +[[package]] name = "sp-arithmetic" version = "16.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ + "criterion 0.4.0", "integer-sqrt", "num-traits", "parity-scale-codec", + "primitive-types", + "rand 0.8.5", "scale-info", "serde", + "sp-core", "sp-std", "static_assertions", ] [[package]] +name = "sp-arithmetic-fuzzer" +version = "2.0.0" +dependencies = [ + "arbitrary", + "fraction", + "honggfuzz", + "num-bigint", + "sp-arithmetic", +] + +[[package]] +name = "sp-ark-bls12-377" +version = "0.4.1-beta" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9b60ba7d8fbb82e21f5be499b02438c9a79365acb441a4dc3993179f09c4cc9" +dependencies = [ + "ark-bls12-377", + "ark-ff", + "ark-r1cs-std", + "ark-scale", + "ark-std", + "parity-scale-codec", + "sp-ark-models", +] + +[[package]] +name = "sp-ark-bls12-381" +version = "0.4.1-beta" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2cd101171d2e988a4e1b2320ad3f26f8746a263110c7153213fe86293e0552b" +dependencies = [ + "ark-bls12-381", + "ark-ff", + "ark-scale", + "ark-serialize", + "ark-std", + "parity-scale-codec", + "sp-ark-models", +] + +[[package]] +name = "sp-ark-bw6-761" +version = "0.4.1-beta" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d94d66ba98893cc42dfe81d5b5dee9142577176bdbdba80ec25a37d8cdffdbd5" +dependencies = [ + "ark-bw6-761", + "ark-ff", + "ark-scale", + "ark-std", + "parity-scale-codec", + "sp-ark-models", +] + +[[package]] +name = "sp-ark-ed-on-bls12-377" +version = "0.4.1-beta" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37f6ea96c9b1cd4cbd05d741225ff7f6328ab035bda16cf3fac105c87ad98959" +dependencies = [ + "ark-ed-on-bls12-377", + "ark-ff", + "ark-r1cs-std", + "ark-scale", + "ark-serialize", + "ark-std", + "parity-scale-codec", + "sp-ark-models", +] + +[[package]] +name = "sp-ark-ed-on-bls12-381-bandersnatch" +version = "0.4.1-beta" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4db7a801260397cd58077befcee87acfdde8c189f48718bba1bc3783c799b67b" +dependencies = [ + "ark-ec", + "ark-ed-on-bls12-381-bandersnatch", + "ark-ff", + "ark-r1cs-std", + "ark-scale", + "ark-std", + "parity-scale-codec", + "sp-ark-bls12-381", + "sp-ark-models", +] + +[[package]] +name = "sp-ark-models" +version = "0.4.1-beta" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd77599e09f12893739e1ef822ae065f2f46c3be040ba1979bb786ae21059f44" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-serialize", + "ark-std", + "derivative", + "getrandom 0.2.10", + "itertools 0.10.5", + "num-traits", + "zeroize", +] + +[[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "parity-scale-codec", "scale-info", @@ -11224,7 +16894,6 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "sp-api", "sp-inherents", @@ -11235,7 +16904,6 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "futures", "log", @@ -11253,7 +16921,6 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-trait", "futures", @@ -11262,13 +16929,13 @@ dependencies = [ "sp-inherents", "sp-runtime", "sp-state-machine", + "sp-test-primitives", "thiserror", ] [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-trait", "parity-scale-codec", @@ -11285,7 +16952,6 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-trait", "parity-scale-codec", @@ -11304,8 +16970,8 @@ dependencies = [ [[package]] name = "sp-consensus-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ + "array-bytes", "lazy_static", "parity-scale-codec", "scale-info", @@ -11318,12 +16984,12 @@ dependencies = [ "sp-runtime", "sp-std", "strum", + "w3f-bls", ] [[package]] name = "sp-consensus-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "finality-grandpa", "log", @@ -11339,9 +17005,34 @@ dependencies = [ ] [[package]] +name = "sp-consensus-pow" +version = "0.10.0-dev" +dependencies = [ + "parity-scale-codec", + "sp-api", + "sp-core", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "sp-consensus-sassafras" +version = "0.3.4-dev" +dependencies = [ + "parity-scale-codec", + "scale-info", + "serde", + "sp-api", + "sp-application-crypto", + "sp-consensus-slots", + "sp-core", + "sp-runtime", + "sp-std", +] + +[[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "parity-scale-codec", "scale-info", @@ -11353,15 +17044,17 @@ dependencies = [ [[package]] name = "sp-core" version = "21.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "array-bytes", - "bitflags", + "arrayvec 0.7.4", + "bandersnatch_vrfs", + "bitflags 1.3.2", "blake2", "bounded-collections", - "bs58", + "bs58 0.5.0", + "criterion 0.4.0", "dyn-clonable", - "ed25519-zebra", + "ed25519-zebra 3.1.0", "futures", "hash-db", "hash256-std-hasher", @@ -11369,7 +17062,7 @@ dependencies = [ "lazy_static", "libsecp256k1", "log", - "merlin", + "merlin 2.0.1", "parity-scale-codec", "parking_lot 0.12.1", "paste", @@ -11377,11 +17070,13 @@ dependencies = [ "rand 0.8.5", "regex", "scale-info", - "schnorrkel", + "schnorrkel 0.9.1", "secp256k1", "secrecy", "serde", + "serde_json", "sp-core-hashing", + "sp-core-hashing-proc-macro", "sp-debug-derive", "sp-externalities", "sp-runtime-interface", @@ -11391,18 +17086,19 @@ dependencies = [ "substrate-bip39", "thiserror", "tiny-bip39", + "tracing", + "w3f-bls", "zeroize", ] [[package]] name = "sp-core-hashing" version = "9.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "blake2b_simd", "byteorder", - "digest 0.10.6", - "sha2 0.10.2", + "digest 0.10.7", + "sha2 0.10.7", "sha3", "twox-hash", ] @@ -11410,17 +17106,42 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "9.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "quote", "sp-core-hashing", - "syn 2.0.16", + "syn 2.0.31", +] + +[[package]] +name = "sp-crypto-ec-utils" +version = "0.4.0" +dependencies = [ + "ark-algebra-test-templates", + "ark-bls12-377", + "ark-bls12-381", + "ark-bw6-761", + "ark-ec", + "ark-ed-on-bls12-377", + "ark-ed-on-bls12-381-bandersnatch", + "ark-ff", + "ark-scale", + "ark-serialize", + "ark-std", + "parity-scale-codec", + "sp-ark-bls12-377", + "sp-ark-bls12-381", + "sp-ark-bw6-761", + "sp-ark-ed-on-bls12-377", + "sp-ark-ed-on-bls12-381-bandersnatch", + "sp-ark-models", + "sp-io", + "sp-runtime-interface", + "sp-std", ] [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "kvdb", "parking_lot 0.12.1", @@ -11429,17 +17150,15 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "8.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.31", ] [[package]] name = "sp-externalities" version = "0.19.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "environmental", "parity-scale-codec", @@ -11448,11 +17167,21 @@ dependencies = [ ] [[package]] +name = "sp-genesis-builder" +version = "0.1.0" +dependencies = [ + "serde_json", + "sp-api", + "sp-runtime", + "sp-std", +] + +[[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-trait", + "futures", "impl-trait-for-tuples", "parity-scale-codec", "scale-info", @@ -11464,11 +17193,9 @@ dependencies = [ [[package]] name = "sp-io" version = "23.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "bytes", - "ed25519", - "ed25519-dalek", + "ed25519-dalek 2.0.0", "libsecp256k1", "log", "parity-scale-codec", @@ -11489,7 +17216,6 @@ dependencies = [ [[package]] name = "sp-keyring" version = "24.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "lazy_static", "sp-core", @@ -11500,10 +17226,11 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.27.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", + "rand 0.7.3", + "rand_chacha 0.2.2", "sp-core", "sp-externalities", "thiserror", @@ -11512,16 +17239,14 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "thiserror", - "zstd 0.12.3+zstd.1.5.2", + "zstd 0.12.4", ] [[package]] name = "sp-metadata-ir" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-metadata", "parity-scale-codec", @@ -11532,8 +17257,8 @@ dependencies = [ [[package]] name = "sp-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ + "array-bytes", "ckb-merkle-mountain-range", "log", "parity-scale-codec", @@ -11550,21 +17275,32 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "parity-scale-codec", + "rand 0.8.5", "scale-info", "serde", "sp-arithmetic", "sp-core", "sp-runtime", "sp-std", + "substrate-test-utils", +] + +[[package]] +name = "sp-npos-elections-fuzzer" +version = "2.0.0-alpha.5" +dependencies = [ + "clap 4.4.2", + "honggfuzz", + "rand 0.8.5", + "sp-npos-elections", + "sp-runtime", ] [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "sp-api", "sp-core", @@ -11574,7 +17310,6 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "8.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "backtrace", "lazy_static", @@ -11584,17 +17319,16 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "rustc-hash", "serde", + "serde_json", "sp-core", ] [[package]] name = "sp-runtime" version = "24.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "either", "hash256-std-hasher", @@ -11605,53 +17339,101 @@ dependencies = [ "rand 0.8.5", "scale-info", "serde", + "serde_json", + "sp-api", "sp-application-crypto", "sp-arithmetic", "sp-core", "sp-io", + "sp-state-machine", "sp-std", + "sp-tracing", "sp-weights", + "substrate-test-runtime-client", + "zstd 0.12.4", ] [[package]] name = "sp-runtime-interface" version = "17.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "bytes", "impl-trait-for-tuples", "parity-scale-codec", "primitive-types", + "rustversion", + "sp-core", "sp-externalities", + "sp-io", "sp-runtime-interface-proc-macro", + "sp-runtime-interface-test-wasm", + "sp-state-machine", "sp-std", "sp-storage", "sp-tracing", "sp-wasm-interface", "static_assertions", + "trybuild", ] [[package]] name = "sp-runtime-interface-proc-macro" version = "11.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "Inflector", "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.31", +] + +[[package]] +name = "sp-runtime-interface-test" +version = "2.0.0" +dependencies = [ + "sc-executor", + "sc-executor-common", + "sp-io", + "sp-runtime", + "sp-runtime-interface", + "sp-runtime-interface-test-wasm", + "sp-runtime-interface-test-wasm-deprecated", + "sp-state-machine", + "tracing", + "tracing-core", +] + +[[package]] +name = "sp-runtime-interface-test-wasm" +version = "2.0.0" +dependencies = [ + "bytes", + "sp-core", + "sp-io", + "sp-runtime-interface", + "sp-std", + "substrate-wasm-builder", +] + +[[package]] +name = "sp-runtime-interface-test-wasm-deprecated" +version = "2.0.0" +dependencies = [ + "sp-core", + "sp-io", + "sp-runtime-interface", + "substrate-wasm-builder", ] [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "parity-scale-codec", "scale-info", "sp-api", "sp-core", + "sp-keystore", "sp-runtime", "sp-staking", "sp-std", @@ -11660,7 +17442,6 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -11674,17 +17455,20 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.28.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ + "array-bytes", + "assert_matches", "hash-db", "log", "parity-scale-codec", "parking_lot 0.12.1", + "pretty_assertions", "rand 0.8.5", "smallvec", "sp-core", "sp-externalities", "sp-panic-handler", + "sp-runtime", "sp-std", "sp-trie", "thiserror", @@ -11695,10 +17479,15 @@ dependencies = [ [[package]] name = "sp-statement-store" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ + "aes-gcm 0.10.2", + "curve25519-dalek 4.0.0", + "ed25519-dalek 2.0.0", + "hkdf", "parity-scale-codec", + "rand 0.8.5", "scale-info", + "sha2 0.10.7", "sp-api", "sp-application-crypto", "sp-core", @@ -11707,17 +17496,16 @@ dependencies = [ "sp-runtime-interface", "sp-std", "thiserror", + "x25519-dalek 2.0.0", ] [[package]] name = "sp-std" version = "8.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" [[package]] name = "sp-storage" version = "13.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "impl-serde", "parity-scale-codec", @@ -11728,9 +17516,21 @@ dependencies = [ ] [[package]] +name = "sp-test-primitives" +version = "2.0.0" +dependencies = [ + "parity-scale-codec", + "scale-info", + "serde", + "sp-application-crypto", + "sp-core", + "sp-runtime", + "sp-std", +] + +[[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-trait", "parity-scale-codec", @@ -11743,7 +17543,6 @@ dependencies = [ [[package]] name = "sp-tracing" version = "10.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "parity-scale-codec", "sp-std", @@ -11755,7 +17554,6 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "sp-api", "sp-runtime", @@ -11764,7 +17562,6 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-trait", "parity-scale-codec", @@ -11779,9 +17576,10 @@ dependencies = [ [[package]] name = "sp-trie" version = "22.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ - "ahash 0.8.2", + "ahash 0.8.3", + "array-bytes", + "criterion 0.4.0", "hash-db", "hashbrown 0.13.2", "lazy_static", @@ -11792,17 +17590,19 @@ dependencies = [ "scale-info", "schnellru", "sp-core", + "sp-runtime", "sp-std", "thiserror", "tracing", + "trie-bench", "trie-db", "trie-root", + "trie-standardmap", ] [[package]] name = "sp-version" version = "22.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "impl-serde", "parity-scale-codec", @@ -11819,18 +17619,17 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "8.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "parity-scale-codec", "proc-macro2", "quote", - "syn 2.0.16", + "sp-version", + "syn 2.0.31", ] [[package]] name = "sp-wasm-interface" version = "14.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "anyhow", "impl-trait-for-tuples", @@ -11843,7 +17642,6 @@ dependencies = [ [[package]] name = "sp-weights" version = "20.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "parity-scale-codec", "scale-info", @@ -11862,6 +17660,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + +[[package]] name = "spinners" version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -11879,7 +17683,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" dependencies = [ "base64ct", - "der 0.6.0", + "der 0.6.1", ] [[package]] @@ -11889,14 +17693,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" dependencies = [ "base64ct", - "der 0.7.7", + "der 0.7.8", ] [[package]] name = "ss58-registry" -version = "1.36.0" +version = "1.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d92659e7d18d82b803824a9ba5a6022cff101c3491d027c1c1d8d30e749284" +checksum = "5e6915280e2d0db8911e5032a5c275571af6bdded2916abd691a659be25d3439" dependencies = [ "Inflector", "num-format", @@ -11914,11 +17718,124 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] -name = "staking-miner" +name = "staging-kusama-runtime" +version = "1.0.0" +dependencies = [ + "binary-merkle-tree", + "bitvec", + "frame-benchmarking", + "frame-election-provider-support", + "frame-executive", + "frame-remote-externalities", + "frame-support", + "frame-system", + "frame-system-benchmarking", + "frame-system-rpc-runtime-api", + "frame-try-runtime", + "hex-literal 0.4.1", + "kusama-runtime-constants", + "log", + "pallet-authority-discovery", + "pallet-authorship", + "pallet-babe", + "pallet-bags-list", + "pallet-balances", + "pallet-beefy", + "pallet-beefy-mmr", + "pallet-bounties", + "pallet-child-bounties", + "pallet-collective", + "pallet-conviction-voting", + "pallet-democracy", + "pallet-election-provider-multi-phase", + "pallet-election-provider-support-benchmarking", + "pallet-elections-phragmen", + "pallet-fast-unstake", + "pallet-grandpa", + "pallet-identity", + "pallet-im-online", + "pallet-indices", + "pallet-membership", + "pallet-message-queue", + "pallet-mmr", + "pallet-multisig", + "pallet-nis", + "pallet-nomination-pools", + "pallet-nomination-pools-benchmarking", + "pallet-nomination-pools-runtime-api", + "pallet-offences", + "pallet-offences-benchmarking", + "pallet-preimage", + "pallet-proxy", + "pallet-ranked-collective", + "pallet-recovery", + "pallet-referenda", + "pallet-scheduler", + "pallet-session", + "pallet-session-benchmarking", + "pallet-society", + "pallet-staking", + "pallet-staking-runtime-api", + "pallet-state-trie-migration", + "pallet-timestamp", + "pallet-tips", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "pallet-treasury", + "pallet-utility", + "pallet-vesting", + "pallet-whitelist", + "pallet-xcm", + "pallet-xcm-benchmarks", + "parity-scale-codec", + "polkadot-primitives", + "polkadot-runtime-common", + "polkadot-runtime-parachains", + "rustc-hex", + "scale-info", + "separator", + "serde", + "serde_derive", + "serde_json", + "smallvec", + "sp-api", + "sp-application-crypto", + "sp-arithmetic", + "sp-authority-discovery", + "sp-block-builder", + "sp-consensus-babe", + "sp-consensus-beefy", + "sp-core", + "sp-inherents", + "sp-io", + "sp-keyring", + "sp-mmr-primitives", + "sp-npos-elections", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-staking", + "sp-std", + "sp-storage", + "sp-tracing", + "sp-transaction-pool", + "sp-trie", + "sp-version", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "static_assertions", + "substrate-wasm-builder", + "tiny-keccak", + "tokio", +] + +[[package]] +name = "staging-staking-miner" version = "1.0.0" dependencies = [ "assert_cmd", - "clap 4.2.5", + "clap 4.4.2", "exitcode", "frame-election-provider-support", "frame-remote-externalities", @@ -11926,7 +17843,6 @@ dependencies = [ "frame-system", "futures-util", "jsonrpsee", - "kusama-runtime", "log", "pallet-balances", "pallet-election-provider-multi-phase", @@ -11943,18 +17859,87 @@ dependencies = [ "signal-hook", "signal-hook-tokio", "sp-core", - "sp-io", "sp-npos-elections", "sp-runtime", + "sp-state-machine", "sp-version", + "staging-kusama-runtime", "sub-tokens", "thiserror", "tokio", - "tracing-subscriber 0.3.11", + "tracing-subscriber 0.3.17", "westend-runtime", ] [[package]] +name = "staging-xcm" +version = "1.0.0" +dependencies = [ + "bounded-collections", + "derivative", + "environmental", + "hex", + "hex-literal 0.4.1", + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "scale-info", + "serde", + "sp-io", + "sp-weights", + "xcm-procedural", +] + +[[package]] +name = "staging-xcm-builder" +version = "1.0.0" +dependencies = [ + "assert_matches", + "frame-support", + "frame-system", + "impl-trait-for-tuples", + "log", + "pallet-assets", + "pallet-balances", + "pallet-salary", + "pallet-transaction-payment", + "pallet-xcm", + "parity-scale-codec", + "polkadot-parachain-primitives", + "polkadot-primitives", + "polkadot-runtime-parachains", + "polkadot-test-runtime", + "primitive-types", + "scale-info", + "sp-arithmetic", + "sp-io", + "sp-runtime", + "sp-std", + "sp-weights", + "staging-xcm", + "staging-xcm-executor", +] + +[[package]] +name = "staging-xcm-executor" +version = "1.0.0" +dependencies = [ + "environmental", + "frame-benchmarking", + "frame-support", + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "sp-weights", + "staging-xcm", +] + +[[package]] name = "static_assertions" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -11978,11 +17963,11 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a2a1c578e98c1c16fc3b8ec1328f7659a500737d7a0c6d625e73e830ff9c1f6" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg_aliases", "libc", "parking_lot 0.11.2", - "parking_lot_core 0.8.5", + "parking_lot_core 0.8.6", "static_init_macro 1.0.2", "winapi", ] @@ -12030,9 +18015,9 @@ dependencies = [ [[package]] name = "strum_macros" -version = "0.24.0" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6878079b17446e4d3eba6192bb0a2950d5b14f0ed8424b852310e5a94345d0ef" +checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ "heck", "proc-macro2", @@ -12047,12 +18032,12 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7e94b1ec00bad60e6410e058b52f1c66de3dc5fe4d62d09b3e52bb7d3b73e25" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", "crc", "lazy_static", "md-5", "rand 0.8.5", - "ring", + "ring 0.16.20", "subtle", "thiserror", "tokio", @@ -12069,6 +18054,14 @@ dependencies = [ ] [[package]] +name = "subkey" +version = "3.0.0" +dependencies = [ + "clap 4.4.2", + "sc-cli", +] + +[[package]] name = "substrate-bip39" version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -12076,39 +18069,87 @@ checksum = "49eee6965196b32f882dd2ee85a92b1dbead41b04e53907f269de3b0dc04733c" dependencies = [ "hmac 0.11.0", "pbkdf2 0.8.0", - "schnorrkel", - "sha2 0.9.8", + "schnorrkel 0.9.1", + "sha2 0.9.9", "zeroize", ] [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" + +[[package]] +name = "substrate-cli-test-utils" +version = "0.1.0" +dependencies = [ + "assert_cmd", + "futures", + "nix 0.26.2", + "node-cli", + "node-primitives", + "regex", + "sc-cli", + "sc-service", + "sp-rpc", + "substrate-rpc-client", + "tokio", +] + +[[package]] +name = "substrate-frame-cli" +version = "4.0.0-dev" +dependencies = [ + "clap 4.4.2", + "frame-support", + "frame-system", + "sc-cli", + "sp-core", + "sp-runtime", +] + +[[package]] +name = "substrate-frame-rpc-support" +version = "3.0.0" +dependencies = [ + "frame-support", + "frame-system", + "jsonrpsee", + "parity-scale-codec", + "sc-rpc-api", + "scale-info", + "serde", + "sp-core", + "sp-runtime", + "sp-storage", + "tokio", +] [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ + "assert_matches", "frame-system-rpc-runtime-api", "futures", "jsonrpsee", "log", "parity-scale-codec", "sc-rpc-api", + "sc-transaction-pool", "sc-transaction-pool-api", "sp-api", "sp-block-builder", "sp-blockchain", "sp-core", "sp-runtime", + "sp-tracing", + "substrate-test-runtime-client", + "tokio", ] [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "hyper", "log", @@ -12120,26 +18161,27 @@ dependencies = [ [[package]] name = "substrate-rpc-client" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-trait", "jsonrpsee", "log", "sc-rpc-api", "serde", + "sp-core", "sp-runtime", + "tokio", ] [[package]] name = "substrate-state-trie-migration-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "jsonrpsee", "parity-scale-codec", "sc-client-api", "sc-rpc-api", "serde", + "serde_json", "sp-core", "sp-runtime", "sp-state-machine", @@ -12150,7 +18192,6 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "array-bytes", "async-trait", @@ -12174,30 +18215,100 @@ dependencies = [ ] [[package]] -name = "substrate-test-utils" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" +name = "substrate-test-runtime" +version = "2.0.0" dependencies = [ + "array-bytes", + "frame-executive", + "frame-support", + "frame-system", + "frame-system-rpc-runtime-api", "futures", - "substrate-test-utils-derive", - "tokio", + "json-patch", + "log", + "pallet-babe", + "pallet-balances", + "pallet-timestamp", + "parity-scale-codec", + "sc-block-builder", + "sc-executor", + "sc-executor-common", + "sc-service", + "scale-info", + "serde", + "serde_json", + "sp-api", + "sp-application-crypto", + "sp-block-builder", + "sp-consensus", + "sp-consensus-aura", + "sp-consensus-babe", + "sp-consensus-grandpa", + "sp-core", + "sp-externalities", + "sp-genesis-builder", + "sp-inherents", + "sp-io", + "sp-keyring", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-state-machine", + "sp-std", + "sp-tracing", + "sp-transaction-pool", + "sp-trie", + "sp-version", + "substrate-test-runtime-client", + "substrate-wasm-builder", + "trie-db", ] [[package]] -name = "substrate-test-utils-derive" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" +name = "substrate-test-runtime-client" +version = "2.0.0" dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 2.0.16", + "futures", + "sc-block-builder", + "sc-client-api", + "sc-consensus", + "sp-api", + "sp-blockchain", + "sp-consensus", + "sp-core", + "sp-runtime", + "substrate-test-client", + "substrate-test-runtime", +] + +[[package]] +name = "substrate-test-runtime-transaction-pool" +version = "2.0.0" +dependencies = [ + "futures", + "parity-scale-codec", + "parking_lot 0.12.1", + "sc-transaction-pool", + "sc-transaction-pool-api", + "sp-blockchain", + "sp-runtime", + "substrate-test-runtime-client", + "thiserror", +] + +[[package]] +name = "substrate-test-utils" +version = "4.0.0-dev" +dependencies = [ + "futures", + "sc-service", + "tokio", + "trybuild", ] [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "ansi_term", "build-helper", @@ -12207,7 +18318,7 @@ dependencies = [ "sp-maybe-compressed-blob", "strum", "tempfile", - "toml 0.7.3", + "toml 0.7.6", "walkdir", "wasm-opt", ] @@ -12228,6 +18339,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] +name = "subtle-ng" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "734676eb262c623cec13c3155096e08d1f8f29adce39ba17948b18dad1e54142" + +[[package]] name = "sval" version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -12297,9 +18414,9 @@ dependencies = [ [[package]] name = "symbolic-common" -version = "9.2.1" +version = "12.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "800963ba330b09a2ae4a4f7c6392b81fbc2784099a98c1eac68c3437aa9382b2" +checksum = "167a4ffd7c35c143fd1030aa3c2caf76ba42220bd5a6b5f4781896434723b8c3" dependencies = [ "debugid", "memmap2", @@ -12309,11 +18426,11 @@ dependencies = [ [[package]] name = "symbolic-demangle" -version = "9.2.1" +version = "12.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b940a1fdbc72bb3369e38714efe6cd332dbbe46d093cf03d668b9ac390d1ad0" +checksum = "e378c50e80686c1c5c205674e1f86a2858bec3d2a7dfdd690331a8a19330f293" dependencies = [ - "cpp_demangle", + "cpp_demangle 0.4.3", "rustc-demangle", "symbolic-common", ] @@ -12331,9 +18448,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.16" +version = "2.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01" +checksum = "718fa2415bcb8d8bd775917a1bf12a7931b6dfa890753378538118181e0cb398" dependencies = [ "proc-macro2", "quote", @@ -12354,11 +18471,11 @@ dependencies = [ [[package]] name = "system-configuration" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d75182f12f490e953596550b65ee31bda7c8e043d9386174b353bda50838c3fd" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "system-configuration-sys", ] @@ -12380,39 +18497,49 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] +name = "tar" +version = "0.4.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" +dependencies = [ + "filetime", + "libc", + "xattr", +] + +[[package]] name = "target-lexicon" -version = "0.12.5" +version = "0.12.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9410d0f6853b1d94f0e519fb95df60f29d2c1eff2d921ffdf01a4c8a3b54f12d" +checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" [[package]] name = "tempfile" -version = "3.3.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if", - "fastrand", - "libc", - "redox_syscall", - "remove_dir_all", - "winapi", + "fastrand 2.0.0", + "redox_syscall 0.3.5", + "rustix 0.38.8", + "windows-sys 0.48.0", ] [[package]] name = "termcolor" -version = "1.1.2" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" dependencies = [ "winapi-util", ] [[package]] name = "termtree" -version = "0.2.3" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13a4ec180a2de59b57434704ccfad967f789b12737738798fa08798cd5824c16" +checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "test-parachain-adder" @@ -12420,7 +18547,7 @@ version = "1.0.0" dependencies = [ "dlmalloc", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "sp-io", "sp-std", "substrate-wasm-builder", @@ -12431,7 +18558,7 @@ dependencies = [ name = "test-parachain-adder-collator" version = "1.0.0" dependencies = [ - "clap 4.2.5", + "clap 4.4.2", "futures", "futures-timer", "log", @@ -12440,7 +18567,7 @@ dependencies = [ "polkadot-node-core-pvf", "polkadot-node-primitives", "polkadot-node-subsystem", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-service", "polkadot-test-service", @@ -12450,6 +18577,7 @@ dependencies = [ "sp-keyring", "substrate-test-utils", "test-parachain-adder", + "test-parachain-adder-collator", "tokio", ] @@ -12468,7 +18596,7 @@ dependencies = [ "dlmalloc", "log", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "sp-io", "sp-std", "substrate-wasm-builder", @@ -12479,7 +18607,7 @@ dependencies = [ name = "test-parachain-undying-collator" version = "1.0.0" dependencies = [ - "clap 4.2.5", + "clap 4.4.2", "futures", "futures-timer", "log", @@ -12488,7 +18616,7 @@ dependencies = [ "polkadot-node-core-pvf", "polkadot-node-primitives", "polkadot-node-subsystem", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-service", "polkadot-test-service", @@ -12498,6 +18626,7 @@ dependencies = [ "sp-keyring", "substrate-test-utils", "test-parachain-undying", + "test-parachain-undying-collator", "tokio", ] @@ -12533,22 +18662,42 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" dependencies = [ "thiserror-impl", ] [[package]] +name = "thiserror-core" +version = "1.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d97345f6437bb2004cd58819d8a9ef8e36cdd7661c2abc4bbde0a7c40d9f497" +dependencies = [ + "thiserror-core-impl", +] + +[[package]] +name = "thiserror-core-impl" +version = "1.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10ac1c5050e43014d16b2f94d0d2ce79e65ffdd8b38d8048f9c8f6a8a6da62ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.31", ] [[package]] @@ -12559,10 +18708,11 @@ checksum = "3bf63baf9f5039dadc247375c29eb13706706cfde997d0330d05aa63a77d8820" [[package]] name = "thread_local" -version = "1.1.4" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" dependencies = [ + "cfg-if", "once_cell", ] @@ -12590,9 +18740,9 @@ dependencies = [ [[package]] name = "tikv-jemalloc-ctl" -version = "0.5.0" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e37706572f4b151dff7a0146e040804e9c26fe3a3118591112f05cf12a4216c1" +checksum = "619bfed27d807b54f7f776b9430d4f8060e66ee138a28632ca898584d462c31c" dependencies = [ "libc", "paste", @@ -12601,20 +18751,19 @@ dependencies = [ [[package]] name = "tikv-jemalloc-sys" -version = "0.5.2+5.3.0-patched" +version = "0.5.4+5.3.0-patched" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec45c14da997d0925c7835883e4d5c181f196fa142f8c19d7643d1e9af2592c3" +checksum = "9402443cb8fd499b6f327e40565234ff34dbda27460c5b47db0db77443dd85d1" dependencies = [ "cc", - "fs_extra", "libc", ] [[package]] name = "tikv-jemallocator" -version = "0.5.0" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20612db8a13a6c06d57ec83953694185a367e16945f66565e8028d2c0bd76979" +checksum = "965fe0c26be5c56c94e38ba547249074803efd52adfb66de62107d95aab3eaca" dependencies = [ "libc", "tikv-jemalloc-sys", @@ -12622,9 +18771,9 @@ dependencies = [ [[package]] name = "time" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" dependencies = [ "libc", "wasi 0.10.0+wasi-snapshot-preview1", @@ -12633,10 +18782,11 @@ dependencies = [ [[package]] name = "time" -version = "0.3.17" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" +checksum = "0bb39ee79a6d8de55f48f2293a830e040392f1c5f16e336bdd1788cd0aadce07" dependencies = [ + "deranged", "itoa", "serde", "time-core", @@ -12645,15 +18795,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.6" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" +checksum = "733d258752e9303d392b94b75230d07b0b9c489350c69b851fc6c065fde3e8f9" dependencies = [ "time-core", ] @@ -12670,7 +18820,7 @@ dependencies = [ "pbkdf2 0.11.0", "rand 0.8.5", "rustc-hash", - "sha2 0.10.2", + "sha2 0.10.7", "thiserror", "unicode-normalization", "wasm-bindgen", @@ -12698,34 +18848,34 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" dependencies = [ "tinyvec_macros", ] [[package]] name = "tinyvec_macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.28.0" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c786bf8134e5a3a166db9b29ab8f48134739014a3eca7bc6bfa95d673b136f" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ - "autocfg", + "backtrace", "bytes", "libc", "mio", "num_cpus", "parking_lot 0.12.1", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.12", "signal-hook-registry", - "socket2", + "socket2 0.5.3", "tokio-macros", "windows-sys 0.48.0", ] @@ -12738,7 +18888,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.31", ] [[package]] @@ -12754,42 +18904,44 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.23.2" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a27d5f2b839802bd8267fa19b0530f5a08b9c08cd417976be2a65d130fe1c11b" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.20.7", + "rustls 0.21.6", "tokio", - "webpki 0.22.0", ] [[package]] -name = "tokio-rustls" -version = "0.24.1" +name = "tokio-stream" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" dependencies = [ - "rustls 0.21.2", + "futures-core", + "pin-project-lite 0.2.12", "tokio", + "tokio-util", ] [[package]] -name = "tokio-stream" -version = "0.1.9" +name = "tokio-test" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df54d54117d6fdc4e4fea40fe1e4e566b3505700e148a6827e59b34b0d2600d9" +checksum = "e89b3cbabd3ae862100094ae433e1def582cf86451b4e9bf83aa7ac1d8a7d719" dependencies = [ + "async-stream", + "bytes", "futures-core", - "pin-project-lite 0.2.9", "tokio", - "tokio-util", + "tokio-stream", ] [[package]] name = "tokio-tungstenite" -version = "0.17.1" +version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06cda1232a49558c46f8a504d5b93101d42c0bf7f911f12a105ba48168f821ae" +checksum = "f714dd15bead90401d77e04243611caec13726c2408afd5b31901dfcdcb3b181" dependencies = [ "futures-util", "log", @@ -12799,15 +18951,15 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.1" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0edfdeb067411dba2044da6d1cb2df793dd35add7888d73c16e3381ded401764" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" dependencies = [ "bytes", "futures-core", "futures-io", "futures-sink", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.12", "tokio", "tracing", ] @@ -12823,9 +18975,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.3" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" +checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" dependencies = [ "serde", "serde_spanned", @@ -12835,20 +18987,20 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.1" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.8" +version = "0.19.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" +checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" dependencies = [ - "indexmap", + "indexmap 2.0.0", "serde", "serde_spanned", "toml_datetime", @@ -12868,18 +19020,18 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.4.0" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d1d42a9b3f3ec46ba828e8d376aec14592ea199f70a06a548587ecd1c4ab658" +checksum = "55ae70283aba8d2a8b411c695c437fe25b8b5e44e23e780662002fc72fb47a82" dependencies = [ - "bitflags", + "bitflags 2.4.0", "bytes", "futures-core", "futures-util", "http", "http-body", "http-range-header", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.12", "tower-layer", "tower-service", ] @@ -12892,9 +19044,9 @@ checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" [[package]] name = "tower-service" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" @@ -12904,27 +19056,27 @@ checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ "cfg-if", "log", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.12", "tracing-attributes", "tracing-core", ] [[package]] name = "tracing-attributes" -version = "0.1.23" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.31", ] [[package]] name = "tracing-core" -version = "0.1.30" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" dependencies = [ "once_cell", "valuable", @@ -12944,6 +19096,7 @@ dependencies = [ name = "tracing-gum" version = "1.0.0" dependencies = [ + "coarsetime", "polkadot-node-jaeger", "polkadot-primitives", "tracing", @@ -12959,7 +19112,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.31", ] [[package]] @@ -12975,9 +19128,9 @@ dependencies = [ [[package]] name = "tracing-serde" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb65ea441fbb84f9f6748fd496cf7f63ec9af5bca94dd86456978d055e8eb28b" +checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" dependencies = [ "serde", "tracing-core", @@ -13008,13 +19161,13 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.11" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bc28f93baff38037f64e6f43d34cfa1605f27a49c34e8a04c5e78b0babf2596" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" dependencies = [ - "ansi_term", - "lazy_static", "matchers 0.1.0", + "nu-ansi-term", + "once_cell", "regex", "sharded-slab", "smallvec", @@ -13025,6 +19178,22 @@ dependencies = [ ] [[package]] +name = "trie-bench" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f54b4f9d51d368e62cf7e0730c7c1e18fc658cc84333656bab5b328f44aa964" +dependencies = [ + "criterion 0.4.0", + "hash-db", + "keccak-hasher", + "memory-db", + "parity-scale-codec", + "trie-db", + "trie-root", + "trie-standardmap", +] + +[[package]] name = "trie-db" version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -13047,6 +19216,16 @@ dependencies = [ ] [[package]] +name = "trie-standardmap" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "684aafb332fae6f83d7fe10b3fbfdbe39a1b3234c4e2a618f030815838519516" +dependencies = [ + "hash-db", + "keccak-hasher", +] + +[[package]] name = "trust-dns-proto" version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -13064,7 +19243,7 @@ dependencies = [ "lazy_static", "rand 0.8.5", "smallvec", - "socket2", + "socket2 0.4.9", "thiserror", "tinyvec", "tokio", @@ -13094,22 +19273,24 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ + "assert_cmd", "async-trait", - "clap 4.2.5", + "clap 4.4.2", "frame-remote-externalities", "frame-try-runtime", "hex", "log", + "node-primitives", "parity-scale-codec", + "regex", "sc-cli", "sc-executor", "serde", @@ -13130,16 +19311,20 @@ dependencies = [ "sp-transaction-storage-proof", "sp-version", "sp-weights", + "substrate-cli-test-utils", "substrate-rpc-client", - "zstd 0.12.3+zstd.1.5.2", + "tempfile", + "tokio", + "zstd 0.12.4", ] [[package]] name = "trybuild" -version = "1.0.75" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1212c215a87a183687a7cc7065901b1a98da6b37277d51a1b5faedbb4efd4f3" +checksum = "6df60d81823ed9c520ee897489573da4b1d79ffbe006b8134f46de1a1aa03555" dependencies = [ + "basic-toml", "dissimilar", "glob", "once_cell", @@ -13147,29 +19332,28 @@ dependencies = [ "serde_derive", "serde_json", "termcolor", - "toml 0.5.11", ] [[package]] name = "tt-call" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e66dcbec4290c69dd03c57e76c2469ea5c7ce109c6dd4351c13055cf71ea055" +checksum = "f4f195fd851901624eee5a58c4bb2b4f06399148fcd0ed336e6f1cb60a9881df" [[package]] name = "tungstenite" -version = "0.17.2" +version = "0.17.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96a2dea40e7570482f28eb57afbe42d97551905da6a9400acc5c328d24004f5" +checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", "byteorder", "bytes", "http", "httparse", "log", "rand 0.8.5", - "sha-1 0.10.0", + "sha-1 0.10.1", "thiserror", "url", "utf-8", @@ -13182,12 +19366,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4712ee30d123ec7ae26d1e1b218395a16c87cdbaf4b3925d170d684af62ea5e8" dependencies = [ "async-trait", - "base64 0.13.0", + "base64 0.13.1", "futures", "log", "md-5", "rand 0.8.5", - "ring", + "ring 0.16.20", "stun", "thiserror", "tokio", @@ -13201,7 +19385,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if", - "digest 0.10.6", + "digest 0.10.7", "rand 0.8.5", "static_assertions", ] @@ -13214,15 +19398,15 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "ucd-trie" -version = "0.1.3" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" +checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" [[package]] name = "uint" -version = "0.9.1" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6470ab50f482bde894a037a57064480a246dbfdd5960bd65a44824693f08da5f" +checksum = "76f64bba2c53b04fcab63c01a7d7427eadc821e3bc48c34dc9ba29c501164b52" dependencies = [ "byteorder", "crunchy", @@ -13232,36 +19416,36 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.7" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unicode-normalization" -version = "0.1.19" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" dependencies = [ "tinyvec", ] [[package]] name = "unicode-width" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" [[package]] name = "unicode-xid" -version = "0.2.2" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "universal-hash" @@ -13269,7 +19453,17 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", + "subtle", +] + +[[package]] +name = "universal-hash" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" +dependencies = [ + "crypto-common", "subtle", ] @@ -13293,12 +19487,12 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "url" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" dependencies = [ "form_urlencoded", - "idna 0.3.0", + "idna 0.4.0", "percent-encoding", ] @@ -13316,11 +19510,11 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.2.2" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.10", ] [[package]] @@ -13384,6 +19578,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" [[package]] +name = "w3f-bls" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7335e4c132c28cc43caef6adb339789e599e39adbe78da0c4d547fad48cbc331" +dependencies = [ + "ark-bls12-377", + "ark-bls12-381", + "ark-ec", + "ark-ff", + "ark-serialize", + "ark-serialize-derive", + "arrayref", + "constcat", + "digest 0.10.7", + "rand 0.8.5", + "rand_chacha 0.3.1", + "rand_core 0.6.4", + "sha2 0.10.7", + "sha3", + "thiserror", + "zeroize", +] + +[[package]] name = "wait-timeout" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -13409,22 +19627,20 @@ checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" [[package]] name = "walkdir" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" dependencies = [ "same-file", - "winapi", "winapi-util", ] [[package]] name = "want" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" dependencies = [ - "log", "try-lock", ] @@ -13448,9 +19664,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.85" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b6cb788c4e39112fbe1822277ef6fb3c55cd86b95cb3d3c4c1c9597e4ac74b4" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "serde", @@ -13460,24 +19676,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.85" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35e522ed4105a9d626d885b35d62501b30d9666283a5c8be12c14a8bdafe7822" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.31", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.35" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "083abe15c5d88556b77bdf7aef403625be9e327ad37c62c4e4129af740168163" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" dependencies = [ "cfg-if", "js-sys", @@ -13487,9 +19703,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.85" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "358a79a0cb89d21db8120cbfb91392335913e4890665b1a7981d9e956903b434" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -13497,22 +19713,31 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.85" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4783ce29f09b9d93134d41297aded3a712b7b979e9c6f28c32cb88c973a94869" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.31", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.85" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a901d592cafaa4d711bc324edfaff879ac700b19c3dfd60058d2b445be2691eb" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" + +[[package]] +name = "wasm-encoder" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41763f20eafed1399fff1afb466496d3a959f58241436cfdc17e3f5ca954de16" +dependencies = [ + "leb128", +] [[package]] name = "wasm-instrument" @@ -13524,10 +19749,19 @@ dependencies = [ ] [[package]] +name = "wasm-instrument" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a47ecb37b9734d1085eaa5ae1a81e60801fd8c28d4cabdd8aedb982021918bc" +dependencies = [ + "parity-wasm", +] + +[[package]] name = "wasm-opt" -version = "0.112.0" +version = "0.114.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87fef6d0d508f08334e0ab0e6877feb4c0ecb3956bcf2cb950699b22fedf3e9c" +checksum = "4d005a95f934878a1fb446a816d51c3601a0120ff929005ba3bab3c749cfd1c7" dependencies = [ "anyhow", "libc", @@ -13541,9 +19775,9 @@ dependencies = [ [[package]] name = "wasm-opt-cxx-sys" -version = "0.112.0" +version = "0.114.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc816bbc1596c8f2e8127e137a760c798023ef3d378f2ae51f0f1840e2dfa445" +checksum = "6d04e240598162810fad3b2e96fa0dec6dba1eb65a03f3bd99a9248ab8b56caa" dependencies = [ "anyhow", "cxx", @@ -13553,9 +19787,9 @@ dependencies = [ [[package]] name = "wasm-opt-sys" -version = "0.112.0" +version = "0.114.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40199e4f68ef1071b3c6d0bd8026a12b481865d4b9e49c156932ea9a6234dd14" +checksum = "2efd2aaca519d64098c4faefc8b7433a97ed511caf4c9e516384eb6aef1ff4f9" dependencies = [ "anyhow", "cc", @@ -13579,16 +19813,56 @@ dependencies = [ ] [[package]] +name = "wasmi" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f341edb80021141d4ae6468cbeefc50798716a347d4085c3811900049ea8945" +dependencies = [ + "smallvec", + "spin 0.9.8", + "wasmi_arena", + "wasmi_core", + "wasmparser-nostd", +] + +[[package]] +name = "wasmi_arena" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "401c1f35e413fac1846d4843745589d9ec678977ab35a384db8ae7830525d468" + +[[package]] +name = "wasmi_core" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcf1a7db34bff95b85c261002720c00c3a6168256dcb93041d3fa2054d19856a" +dependencies = [ + "downcast-rs", + "libm", + "num-traits", + "paste", +] + +[[package]] name = "wasmparser" version = "0.102.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48134de3d7598219ab9eaf6b91b15d8e50d31da76b8519fe4ecfcec2cf35104b" dependencies = [ - "indexmap", + "indexmap 1.9.3", "url", ] [[package]] +name = "wasmparser-nostd" +version = "0.100.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9157cab83003221bfd385833ab587a039f5d6fa7304854042ba358a3b09e0724" +dependencies = [ + "indexmap-nostd", +] + +[[package]] name = "wasmtime" version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -13597,10 +19871,10 @@ dependencies = [ "anyhow", "bincode", "cfg-if", - "indexmap", + "indexmap 1.9.3", "libc", "log", - "object", + "object 0.30.4", "once_cell", "paste", "psm", @@ -13632,14 +19906,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c86437fa68626fe896e5afc69234bb2b5894949083586535f200385adfd71213" dependencies = [ "anyhow", - "base64 0.21.0", + "base64 0.21.2", "bincode", "directories-next", "file-per-thread-logger", "log", - "rustix 0.36.7", + "rustix 0.36.15", "serde", - "sha2 0.10.2", + "sha2 0.10.7", "toml 0.5.11", "windows-sys 0.45.0", "zstd 0.11.2+zstd.1.5.2", @@ -13657,9 +19931,9 @@ dependencies = [ "cranelift-frontend", "cranelift-native", "cranelift-wasm", - "gimli", + "gimli 0.27.3", "log", - "object", + "object 0.30.4", "target-lexicon", "thiserror", "wasmparser", @@ -13676,8 +19950,8 @@ dependencies = [ "anyhow", "cranelift-codegen", "cranelift-native", - "gimli", - "object", + "gimli 0.27.3", + "object 0.30.4", "target-lexicon", "wasmtime-environ", ] @@ -13690,10 +19964,10 @@ checksum = "a990198cee4197423045235bf89d3359e69bd2ea031005f4c2d901125955c949" dependencies = [ "anyhow", "cranelift-entity", - "gimli", - "indexmap", + "gimli 0.27.3", + "indexmap 1.9.3", "log", - "object", + "object 0.30.4", "serde", "target-lexicon", "thiserror", @@ -13707,14 +19981,14 @@ version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0de48df552cfca1c9b750002d3e07b45772dd033b0b206d5c0968496abf31244" dependencies = [ - "addr2line", + "addr2line 0.19.0", "anyhow", "bincode", "cfg-if", - "cpp_demangle", - "gimli", + "cpp_demangle 0.3.5", + "gimli 0.27.3", "log", - "object", + "object 0.30.4", "rustc-demangle", "serde", "target-lexicon", @@ -13731,9 +20005,9 @@ version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e0554b84c15a27d76281d06838aed94e13a77d7bf604bbbaf548aa20eb93846" dependencies = [ - "object", + "object 0.30.4", "once_cell", - "rustix 0.36.7", + "rustix 0.36.15", ] [[package]] @@ -13756,7 +20030,7 @@ dependencies = [ "anyhow", "cc", "cfg-if", - "indexmap", + "indexmap 1.9.3", "libc", "log", "mach", @@ -13764,7 +20038,7 @@ dependencies = [ "memoffset 0.8.0", "paste", "rand 0.8.5", - "rustix 0.36.7", + "rustix 0.36.15", "wasmtime-asm-macros", "wasmtime-environ", "wasmtime-jit-debug", @@ -13784,10 +20058,31 @@ dependencies = [ ] [[package]] +name = "wast" +version = "63.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2560471f60a48b77fccefaf40796fda61c97ce1e790b59dfcec9dc3995c9f63a" +dependencies = [ + "leb128", + "memchr", + "unicode-width", + "wasm-encoder", +] + +[[package]] +name = "wat" +version = "1.0.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bdc306c2c4c2f2bf2ba69e083731d0d2a77437fc6a350a19db139636e7e416c" +dependencies = [ + "wast", +] + +[[package]] name = "web-sys" -version = "0.3.55" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" dependencies = [ "js-sys", "wasm-bindgen", @@ -13799,7 +20094,7 @@ version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" dependencies = [ - "ring", + "ring 0.16.20", "untrusted", ] @@ -13809,20 +20104,35 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" dependencies = [ - "ring", + "ring 0.16.20", "untrusted", ] [[package]] name = "webpki-roots" -version = "0.22.2" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "552ceb903e957524388c4d3475725ff2c8b7960922063af6ce53c9a43da07449" +checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" dependencies = [ "webpki 0.22.0", ] [[package]] +name = "webpki-roots" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" +dependencies = [ + "rustls-webpki 0.100.2", +] + +[[package]] +name = "webpki-roots" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" + +[[package]] name = "webrtc" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -13838,17 +20148,17 @@ dependencies = [ "rand 0.8.5", "rcgen 0.9.3", "regex", - "ring", + "ring 0.16.20", "rtcp", "rtp", "rustls 0.19.1", "sdp", "serde", "serde_json", - "sha2 0.10.2", + "sha2 0.10.7", "stun", "thiserror", - "time 0.3.17", + "time 0.3.27", "tokio", "turn", "url", @@ -13880,50 +20190,49 @@ dependencies = [ [[package]] name = "webrtc-dtls" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7021987ae0a2ed6c8cd33f68e98e49bb6e74ffe9543310267b48a1bbe3900e5f" +checksum = "c4a00f4242f2db33307347bd5be53263c52a0331c96c14292118c9a6bb48d267" dependencies = [ "aes 0.6.0", - "aes-gcm 0.8.0", + "aes-gcm 0.10.2", "async-trait", "bincode", "block-modes", "byteorder", "ccm", "curve25519-dalek 3.2.0", - "der-parser 8.1.0", + "der-parser 8.2.0", "elliptic-curve 0.12.3", "hkdf", - "hmac 0.10.1", + "hmac 0.12.1", "log", - "oid-registry 0.6.1", "p256", "p384", "rand 0.8.5", "rand_core 0.6.4", - "rcgen 0.9.3", - "ring", + "rcgen 0.10.0", + "ring 0.16.20", "rustls 0.19.1", "sec1 0.3.0", "serde", - "sha-1 0.9.8", - "sha2 0.9.8", + "sha1", + "sha2 0.10.7", "signature 1.6.4", "subtle", "thiserror", "tokio", "webpki 0.21.4", "webrtc-util", - "x25519-dalek 2.0.0-pre.1", + "x25519-dalek 2.0.0", "x509-parser 0.13.2", ] [[package]] name = "webrtc-ice" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "494483fbb2f5492620871fdc78b084aed8807377f6e3fe88b2e49f0a9c9c41d7" +checksum = "465a03cc11e9a7d7b4f9f99870558fe37a102b65b93f8045392fef7c67b39e80" dependencies = [ "arc-swap", "async-trait", @@ -13950,7 +20259,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f08dfd7a6e3987e255c4dbe710dde5d94d0f0574f8a21afa95d171376c143106" dependencies = [ "log", - "socket2", + "socket2 0.4.9", "thiserror", "tokio", "webrtc-util", @@ -13958,18 +20267,15 @@ dependencies = [ [[package]] name = "webrtc-media" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee2a3c157a040324e5049bcbd644ffc9079e6738fa2cfab2bcff64e5cc4c00d7" +checksum = "f72e1650a8ae006017d1a5280efb49e2610c19ccc3c0905b03b648aee9554991" dependencies = [ "byteorder", "bytes", - "derive_builder", - "displaydoc", "rand 0.8.5", "rtp", "thiserror", - "webrtc-util", ] [[package]] @@ -14020,14 +20326,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93f1db1727772c05cf7a2cfece52c3aca8045ca1e176cd517d323489aa3c6d87" dependencies = [ "async-trait", - "bitflags", + "bitflags 1.3.2", "bytes", "cc", "ipnet", "lazy_static", "libc", "log", - "nix 0.24.1", + "nix 0.24.3", "rand 0.8.5", "thiserror", "tokio", @@ -14035,18 +20341,10 @@ dependencies = [ ] [[package]] -name = "wepoll-ffi" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb" -dependencies = [ - "cc", -] - -[[package]] name = "westend-runtime" version = "1.0.0" dependencies = [ + "binary-merkle-tree", "bitvec", "frame-benchmarking", "frame-election-provider-support", @@ -14064,6 +20362,8 @@ dependencies = [ "pallet-babe", "pallet-bags-list", "pallet-balances", + "pallet-beefy", + "pallet-beefy-mmr", "pallet-collective", "pallet-democracy", "pallet-election-provider-multi-phase", @@ -14076,6 +20376,7 @@ dependencies = [ "pallet-indices", "pallet-membership", "pallet-message-queue", + "pallet-mmr", "pallet-multisig", "pallet-nomination-pools", "pallet-nomination-pools-benchmarking", @@ -14103,7 +20404,7 @@ dependencies = [ "pallet-xcm", "pallet-xcm-benchmarks", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", @@ -14114,6 +20415,7 @@ dependencies = [ "serde_json", "smallvec", "sp-api", + "sp-application-crypto", "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", @@ -14129,16 +20431,17 @@ dependencies = [ "sp-session", "sp-staking", "sp-std", + "sp-storage", "sp-tracing", "sp-transaction-pool", "sp-version", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "substrate-wasm-builder", "tiny-keccak", "tokio", "westend-runtime-constants", - "xcm", - "xcm-builder", - "xcm-executor", ] [[package]] @@ -14156,20 +20459,20 @@ dependencies = [ [[package]] name = "which" -version = "4.2.2" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea187a8ef279bc014ec368c27a920da2024d2a711109bfbe3440585d5cf27ad9" +checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" dependencies = [ "either", - "lazy_static", "libc", + "once_cell", ] [[package]] name = "wide" -version = "0.7.6" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feff0a412894d67223777b6cc8d68c0dab06d52d95e9890d5f2d47f10dd9366c" +checksum = "aa469ffa65ef7e0ba0f164183697b89b854253fd31aeb92358b7b6155177d62f" dependencies = [ "bytemuck", "safe_arch", @@ -14177,9 +20480,9 @@ dependencies = [ [[package]] name = "widestring" -version = "0.5.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983" +checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" [[package]] name = "winapi" @@ -14226,31 +20529,12 @@ dependencies = [ ] [[package]] -name = "windows-sys" -version = "0.36.1" +name = "windows" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows_aarch64_msvc 0.36.1", - "windows_i686_gnu 0.36.1", - "windows_i686_msvc 0.36.1", - "windows_x86_64_gnu 0.36.1", - "windows_x86_64_msvc 0.36.1", -] - -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", + "windows-targets 0.48.5", ] [[package]] @@ -14268,7 +20552,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.0", + "windows-targets 0.48.5", ] [[package]] @@ -14288,17 +20572,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", ] [[package]] @@ -14309,9 +20593,9 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" @@ -14321,21 +20605,15 @@ checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d" [[package]] name = "windows_aarch64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" - -[[package]] -name = "windows_aarch64_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" @@ -14345,21 +20623,15 @@ checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed" [[package]] name = "windows_i686_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" - -[[package]] -name = "windows_i686_gnu" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" @@ -14369,21 +20641,15 @@ checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956" [[package]] name = "windows_i686_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" - -[[package]] -name = "windows_i686_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" @@ -14393,21 +20659,15 @@ checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4" [[package]] name = "windows_x86_64_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" - -[[package]] -name = "windows_x86_64_gnu" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" @@ -14417,9 +20677,9 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" @@ -14429,47 +20689,33 @@ checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" [[package]] name = "windows_x86_64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" - -[[package]] -name = "windows_x86_64_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.4.0" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deac0939bd6e4f24ab5919fbf751c97a8cfc8543bb083a305ed5c0c10bb241d1" +checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" dependencies = [ "memchr", ] [[package]] name = "winreg" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69" -dependencies = [ - "winapi", -] - -[[package]] -name = "winreg" -version = "0.10.1" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ - "winapi", + "cfg-if", + "windows-sys 0.48.0", ] [[package]] @@ -14494,12 +20740,13 @@ dependencies = [ [[package]] name = "x25519-dalek" -version = "2.0.0-pre.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5da623d8af10a62342bcbbb230e33e58a63255a58012f8653c578e54bab48df" +checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96" dependencies = [ - "curve25519-dalek 3.2.0", + "curve25519-dalek 4.0.0", "rand_core 0.6.4", + "serde", "zeroize", ] @@ -14510,16 +20757,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9fb9bace5b5589ffead1afb76e43e34cff39cd0f3ce7e170ae0c29e53b88eb1c" dependencies = [ "asn1-rs 0.3.1", - "base64 0.13.0", + "base64 0.13.1", "data-encoding", "der-parser 7.0.0", "lazy_static", "nom", "oid-registry 0.4.0", - "ring", + "ring 0.16.20", "rusticata-macros", "thiserror", - "time 0.3.17", + "time 0.3.27", ] [[package]] @@ -14528,80 +20775,56 @@ version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e0ecbeb7b67ce215e40e3cc7f2ff902f94a223acf44995934763467e7b1febc8" dependencies = [ - "asn1-rs 0.5.1", - "base64 0.13.0", + "asn1-rs 0.5.2", + "base64 0.13.1", "data-encoding", - "der-parser 8.1.0", + "der-parser 8.2.0", "lazy_static", "nom", "oid-registry 0.6.1", "rusticata-macros", "thiserror", - "time 0.3.17", + "time 0.3.27", ] [[package]] -name = "xcm" -version = "1.0.0" +name = "xattr" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" dependencies = [ - "bounded-collections", - "derivative", - "hex", - "hex-literal 0.4.1", - "impl-trait-for-tuples", - "log", - "parity-scale-codec", - "scale-info", - "serde", - "sp-io", - "sp-weights", - "xcm-procedural", + "libc", ] [[package]] -name = "xcm-builder" -version = "1.0.0" +name = "xcm-emulator" +version = "0.1.0" dependencies = [ - "assert_matches", + "cumulus-pallet-parachain-system", + "cumulus-primitives-core", + "cumulus-primitives-parachain-inherent", + "cumulus-test-relay-sproof-builder", "frame-support", "frame-system", "impl-trait-for-tuples", + "lazy_static", "log", "pallet-balances", - "pallet-transaction-payment", - "pallet-xcm", + "pallet-message-queue", + "parachains-common", "parity-scale-codec", - "polkadot-parachain", + "paste", + "polkadot-parachain-primitives", + "polkadot-primitives", "polkadot-runtime-parachains", - "polkadot-test-runtime", - "primitive-types", - "scale-info", - "sp-arithmetic", - "sp-io", - "sp-runtime", - "sp-std", - "sp-weights", - "xcm", - "xcm-executor", -] - -[[package]] -name = "xcm-executor" -version = "1.0.0" -dependencies = [ - "environmental", - "frame-benchmarking", - "frame-support", - "impl-trait-for-tuples", - "log", - "parity-scale-codec", "sp-arithmetic", "sp-core", "sp-io", "sp-runtime", "sp-std", - "sp-weights", - "xcm", + "sp-tracing", + "staging-xcm", + "staging-xcm-executor", ] [[package]] @@ -14612,6 +20835,7 @@ dependencies = [ "frame-system", "futures", "pallet-xcm", + "parity-scale-codec", "polkadot-test-client", "polkadot-test-runtime", "polkadot-test-service", @@ -14620,8 +20844,8 @@ dependencies = [ "sp-runtime", "sp-state-machine", "sp-tracing", - "xcm", - "xcm-executor", + "staging-xcm", + "staging-xcm-executor", ] [[package]] @@ -14631,7 +20855,7 @@ dependencies = [ "Inflector", "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.31", ] [[package]] @@ -14642,13 +20866,13 @@ dependencies = [ "parity-scale-codec", "paste", "polkadot-core-primitives", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-runtime-parachains", "sp-io", "sp-std", - "xcm", - "xcm-builder", - "xcm-executor", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", ] [[package]] @@ -14664,7 +20888,7 @@ dependencies = [ "pallet-xcm", "parity-scale-codec", "polkadot-core-primitives", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-runtime-parachains", "scale-info", "sp-core", @@ -14672,9 +20896,9 @@ dependencies = [ "sp-runtime", "sp-std", "sp-tracing", - "xcm", - "xcm-builder", - "xcm-executor", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "xcm-simulator", ] @@ -14691,16 +20915,16 @@ dependencies = [ "pallet-xcm", "parity-scale-codec", "polkadot-core-primitives", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-runtime-parachains", "scale-info", "sp-core", "sp-io", "sp-runtime", "sp-std", - "xcm", - "xcm-builder", - "xcm-executor", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "xcm-simulator", ] @@ -14726,11 +20950,11 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] name = "yasna" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aed2e7a52e3744ab4d0c05c20aa065258e84c49fd4226f5191b2ed29712710b4" +checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" dependencies = [ - "time 0.3.17", + "time 0.3.27", ] [[package]] @@ -14744,14 +20968,13 @@ dependencies = [ [[package]] name = "zeroize_derive" -version = "1.3.2" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", - "synstructure", + "syn 2.0.31", ] [[package]] @@ -14782,11 +21005,11 @@ dependencies = [ [[package]] name = "zstd" -version = "0.12.3+zstd.1.5.2" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76eea132fb024e0e13fd9c2f5d5d595d8a967aa72382ac2f9d39fcc95afd0806" +checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c" dependencies = [ - "zstd-safe 6.0.5+zstd.1.5.4", + "zstd-safe 6.0.6", ] [[package]] @@ -14801,9 +21024,9 @@ dependencies = [ [[package]] name = "zstd-safe" -version = "6.0.5+zstd.1.5.4" +version = "6.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d56d9e60b4b1758206c238a10165fbcae3ca37b01744e394c463463f6529d23b" +checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581" dependencies = [ "libc", "zstd-sys", diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index 942d1755accda..1ed5d9819110a 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -3,19 +3,20 @@ , protobuf , rocksdb , rustPlatform +, rustc-wasm32 , stdenv , Security , SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "paritytech"; - repo = "polkadot"; - rev = "v${version}"; - hash = "sha256-izm0rpLzwlhpp3dciQ1zj1boWxhgGnNMG5ceZoZQGEE="; + repo = "polkadot-sdk"; + rev = "polkadot-v${version}"; + hash = "sha256-B9egLeXZ6xGJ5g5+A9KXYGdesN5Gkrr2qQJe/7hwB5I="; # the build process of polkadot requires a .git folder in order to determine # the git commit hash that is being built and add it to the version string. @@ -31,48 +32,41 @@ rustPlatform.buildRustPackage rec { ''; }; + preBuild = '' + export SUBSTRATE_CLI_GIT_COMMIT_HASH=$(< .git_commit) + rm .git_commit + ''; + cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "binary-merkle-tree-4.0.0-dev" = "sha256-J09SHQVOLGStMGONdreI5QZlk+uNNKzWRZpGiNJ+lrk="; + "ark-secret-scalar-0.0.2" = "sha256-Nbf77KSsAjDKiFIP5kgzl23fRB+68x1EirNuZlS7jeM="; + "common-0.1.0" = "sha256-3OKBPpk0exdlV0N9rJRVIncSrkwdI8bkYL2QNsJl+sY="; + "fflonk-0.1.0" = "sha256-MNvlePHQdY8DiOq6w7Hc1pgn7G58GDTeghCKHJdUy7E="; "sub-tokens-0.1.0" = "sha256-GvhgZhOIX39zF+TbQWtTCgahDec4lQjH+NqamLFLUxM="; }; }; - # NOTE: the build process currently tries to read some files to generate - # documentation from hardcoded paths that aren't compatible with the cargo - # vendoring strategy, so we need to manually put them in their expected place. - # this should be fixed with the next polkadot release that includes - # https://github.com/paritytech/substrate/pull/14570. - postPatch = '' - FAST_UNSTAKE_DIR=$PWD/../cargo-vendor-dir/pallet-fast-unstake-4.0.0-dev - FAST_UNSTAKE_DOCIFY_DIR=$FAST_UNSTAKE_DIR/frame/fast-unstake + cargoBuildFlags = [ "-p" "polkadot" ]; - mkdir -p $FAST_UNSTAKE_DOCIFY_DIR - cp -r $FAST_UNSTAKE_DIR/src $FAST_UNSTAKE_DOCIFY_DIR - ''; - - buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; + # NOTE: tests currently fail to compile due to an issue with cargo-auditable + # and resolution of features flags, potentially related to this: + # https://github.com/rust-secure-code/cargo-auditable/issues/66 + doCheck = false; - nativeBuildInputs = [ rustPlatform.bindgenHook ]; + nativeBuildInputs = [ + rustPlatform.bindgenHook + rustc-wasm32 + rustc-wasm32.llvmPackages.lld + ]; - preBuild = '' - export SUBSTRATE_CLI_GIT_COMMIT_HASH=$(cat .git_commit) - rm .git_commit - ''; + buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; + # NOTE: we need to force lld otherwise rust-lld is not found for wasm32 target + CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_LINKER = "lld"; PROTOC = "${protobuf}/bin/protoc"; ROCKSDB_LIB_DIR = "${rocksdb}/lib"; - # NOTE: We don't build the WASM runtimes since this would require a more - # complicated rust environment setup and this is only needed for developer - # environments. The resulting binary is useful for end-users of live networks - # since those just use the WASM blob from the network chainspec. - SKIP_WASM_BUILD = 1; - - # We can't run the test suite since we didn't compile the WASM runtimes. - doCheck = false; - meta = with lib; { description = "Polkadot Node Implementation"; homepage = "https://polkadot.network"; diff --git a/pkgs/applications/blockchains/quorum/default.nix b/pkgs/applications/blockchains/quorum/default.nix index 1424ddc9516f8..b50d91a07e895 100644 --- a/pkgs/applications/blockchains/quorum/default.nix +++ b/pkgs/applications/blockchains/quorum/default.nix @@ -1,41 +1,35 @@ -{ lib, fetchFromGitHub, buildGoPackage, git, which, removeReferencesTo, go }: +{ lib, fetchFromGitHub, buildGoModule }: -buildGoPackage rec { +buildGoModule rec { pname = "quorum"; - version = "2.5.0"; - - goPackagePath = "github.com/jpmorganchase/quorum"; + version = "23.4.0"; src = fetchFromGitHub { - owner = "jpmorganchase"; + owner = "Consensys"; repo = pname; rev = "v${version}"; - sha256 = "0xfdaqp9bj5dkw12gy19lxj73zh7w80j051xclsvnd41sfah86ll"; + hash = "sha256-N8MlDHo6LQ/m9xFUeOCm6bqDtjnCc86i/s4ebFLjUT0="; }; - buildInputs = [ git which ]; + vendorHash = "sha256-dTYKGFqVaAnspvKhfBU10bpSzhtQHGTm6KxnNKUVAIg="; - buildPhase = '' - cd "go/src/$goPackagePath" - make geth bootnode swarm - ''; + patches = [ + # Add missing requirements + ./go.mod.patch + ]; - installPhase = '' - mkdir -pv $out/bin - cp -v build/bin/geth build/bin/bootnode build/bin/swarm $out/bin - ''; + subPackages = [ + "cmd/geth" + "cmd/bootnode" + ]; - # fails with `GOFLAGS=-trimpath` - allowGoReference = true; - preFixup = '' - find $out -type f -exec ${removeReferencesTo}/bin/remove-references-to -t ${go} '{}' + - ''; + ldflags = [ "-s" "-w" ]; meta = with lib; { description = "A permissioned implementation of Ethereum supporting data privacy"; - homepage = "https://www.goquorum.com/"; + homepage = "https://consensys.net/quorum/"; license = licenses.lgpl3; maintainers = with maintainers; [ mmahut ]; - platforms = subtractLists ["aarch64-linux"] platforms.linux; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/applications/blockchains/quorum/go.mod.patch b/pkgs/applications/blockchains/quorum/go.mod.patch new file mode 100644 index 0000000000000..7161371ac60c3 --- /dev/null +++ b/pkgs/applications/blockchains/quorum/go.mod.patch @@ -0,0 +1,12 @@ +diff --git a/go.mod b/go.mod +index ace412f41..3336c1e08 100644 +--- a/go.mod ++++ b/go.mod +@@ -89,6 +89,7 @@ require ( + golang.org/x/text v0.3.7 + golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 + google.golang.org/grpc v1.46.0 ++ google.golang.org/protobuf v1.28.0 + gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c + gopkg.in/karalabe/cookiejar.v2 v2.0.0-20150724131613-8dcd6a7f4951 + gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce diff --git a/pkgs/applications/blockchains/stellar-core/default.nix b/pkgs/applications/blockchains/stellar-core/default.nix index 53b0de40cbb44..6d3359cdcd006 100644 --- a/pkgs/applications/blockchains/stellar-core/default.nix +++ b/pkgs/applications/blockchains/stellar-core/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "stellar-core"; - version = "19.13.0"; + version = "19.14.0"; src = fetchFromGitHub { owner = "stellar"; repo = "stellar-core"; rev = "v${finalAttrs.version}"; - hash = "sha256-C775tL+x1IX4kfCM/7gOg/V8xunq/rkhIfdkwkhLENk="; + hash = "sha256-lxBn/T01Tsa7tid3mRJUigUwv9d3BAPZhV9Mp1lywBU="; fetchSubmodules = true; }; diff --git a/pkgs/applications/blockchains/trezor-suite/default.nix b/pkgs/applications/blockchains/trezor-suite/default.nix index 67c02e299e19a..c56e6da52f0f3 100644 --- a/pkgs/applications/blockchains/trezor-suite/default.nix +++ b/pkgs/applications/blockchains/trezor-suite/default.nix @@ -18,7 +18,7 @@ let src = fetchurl { url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage"; - sha512 = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/latest/download/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/' + hash = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/latest/download/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/' aarch64-linux = "sha512-+dcogzj0mENWSAVKqUG/xyF+TD/nKpA3UiNyI2M7iiCaW+tpwO5Y0uUmzb1rFRtDsKMflDPZNWe8qMJmrtaIrA=="; x86_64-linux = "sha512-8UyPa3hDmALiYGao451ZBQLxv9H9OLbzzHiANp4zgvjBLGNhZnPFBIYM6KGyKkgRJJiTcgd7VHCgEhPpfm0qzg=="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/applications/display-managers/lemurs/default.nix b/pkgs/applications/display-managers/lemurs/default.nix index 9973099b1f590..a83b6c271448e 100644 --- a/pkgs/applications/display-managers/lemurs/default.nix +++ b/pkgs/applications/display-managers/lemurs/default.nix @@ -3,19 +3,21 @@ lib, linux-pam, rustPlatform, + testers, + lemurs, }: rustPlatform.buildRustPackage rec { pname = "lemurs"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "coastalwhite"; repo = "lemurs"; rev = "v${version}"; - hash = "sha256-6mNSLEWafw8yDGnemOhEiK8FTrBC+6+PuhlbOXTGmN0="; + hash = "sha256-YDopY+wdWlVL2X+/wc1tLSSqFclAkt++JXMK3VodD4s="; }; - cargoHash = "sha256-nfUBC1HSs7PcIbD7MViJFkfFAPda83XbAupNeShfwOs="; + cargoHash = "sha256-uuHPJe+1VsnLRGbHtgTMrib6Tk359cwTDVfvtHnDToo="; # Fixes a lock issue preConfigure = "cargo update --offline"; @@ -24,10 +26,15 @@ rustPlatform.buildRustPackage rec { linux-pam ]; + passthru.tests.version = testers.testVersion { + package = lemurs; + }; + meta = with lib; { description = "A customizable TUI display/login manager written in Rust"; homepage = "https://github.com/coastalwhite/lemurs"; license = with licenses; [asl20 mit]; maintainers = with maintainers; [jeremiahs]; + mainProgram = "lemurs"; }; } diff --git a/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix b/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix index 53f004c2a3671..bb70fa299d107 100644 --- a/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, linkFarm, lightdm-tiny-greeter, fetchFromGitHub -, pkg-config, lightdm, gtk3, glib, wrapGAppsHook, conf ? "" }: +, pkg-config, lightdm, gtk3, glib, wrapGAppsHook, config, conf ? config.lightdm-tiny-greeter.conf or "" }: stdenv.mkDerivation rec { pname = "lightdm-tiny-greeter"; diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index 04826274bb695..94550f69d941a 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub +{ mkDerivation, lib, fetchFromGitHub, fetchpatch , cmake, extra-cmake-modules, pkg-config, qttools , libxcb, libXau, pam, qtbase, qtdeclarative, qtquickcontrols2, systemd, xkeyboardconfig }: @@ -16,6 +16,25 @@ mkDerivation rec { patches = [ ./sddm-ignore-config-mtime.patch ./sddm-default-session.patch + + # FIXME: all of the following are Wayland related backports, drop in next release + # Don't use Qt virtual keyboard on Wayland + (fetchpatch { + url = "https://github.com/sddm/sddm/commit/07631f2ef00a52d883d0fd47ff7d1e1a6bc6358f.patch"; + hash = "sha256-HTSw3YeT4z9ldr4sLmsnrPQ+LA8/a6XxrF+KUFqXUlM="; + }) + + # Fix running sddm-greeter manually in Wayland sessions + (fetchpatch { + url = "https://github.com/sddm/sddm/commit/e27b70957505dc7b986ab2fa68219af546c63344.patch"; + hash = "sha256-6hzrFeS2epL9vzLOA29ZA/dD3Jd4rPMBHhNp+FBq1bA="; + }) + + # Prefer GreeterEnvironment over PAM environment + (fetchpatch { + url = "https://github.com/sddm/sddm/commit/9e7791d5fb375933d20f590daba9947195515b26.patch"; + hash = "sha256-JNsVTJNZV6T+SPqPkaFf3wg8NDqXGx8NZ4qQfZWOli4="; + }) ]; postPatch = '' diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix deleted file mode 100644 index 29c4bb6c884c9..0000000000000 --- a/pkgs/applications/editors/atom/default.nix +++ /dev/null @@ -1,96 +0,0 @@ -{ lib, stdenv, pkgs, fetchurl, wrapGAppsHook, glib, gtk3, atomEnv }: - -let - versions = { - atom = { - version = "1.60.0"; - sha256 = "sha256-XHwCWQYrnUkR0lN7/Or/Uxb53hEWmIQKkNfNSX34kaY="; - }; - - atom-beta = { - version = "1.61.0"; - beta = 0; - sha256 = "sha256-viY/is7Nh3tlIkHhUBWtgMAjD6HDiC0pyJpUjsP5pRY="; - broken = true; - }; - }; - - common = pname: {version, sha256, beta ? null, broken ? false}: - let fullVersion = version + lib.optionalString (beta != null) "-beta${toString beta}"; - name = "${pname}-${fullVersion}"; - in stdenv.mkDerivation { - inherit name; - version = fullVersion; - - src = fetchurl { - url = "https://github.com/atom/atom/releases/download/v${fullVersion}/atom-amd64.deb"; - name = "${name}.deb"; - inherit sha256; - }; - - nativeBuildInputs = [ - wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system - ]; - - buildInputs = [ - gtk3 # Fix error: GLib-GIO-ERROR **: Settings schema 'org.gtk.Settings.FileChooser' is not installed - ]; - - dontBuild = true; - dontConfigure = true; - - unpackPhase = '' - ar p $src data.tar.xz | tar xJ ./usr/ - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out - mv usr/bin usr/share $out - rm -rf $out/share/lintian - - runHook postInstall - ''; - - preFixup = '' - gappsWrapperArgs+=( - # needed for gio executable to be able to delete files - --prefix "PATH" : "${glib.bin}/bin" - ) - ''; - - postFixup = '' - share=$out/share/${pname} - - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${atomEnv.libPath}:$share" \ - $share/atom - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${atomEnv.libPath}" \ - $share/resources/app/apm/bin/node - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - $share/resources/app.asar.unpacked/node_modules/symbols-view/vendor/ctags-linux - - dugite=$share/resources/app.asar.unpacked/node_modules/dugite - rm -f $dugite/git/bin/git - ln -s ${pkgs.git}/bin/git $dugite/git/bin/git - rm -f $dugite/git/libexec/git-core/git - ln -s ${pkgs.git}/bin/git $dugite/git/libexec/git-core/git - - find $share -name "*.node" -exec patchelf --set-rpath "${atomEnv.libPath}:$share" {} \; - - sed -i -e "s|Exec=.*$|Exec=$out/bin/${pname}|" $out/share/applications/${pname}.desktop - ''; - - meta = with lib; { - description = "A hackable text editor for the 21st Century"; - homepage = "https://atom.io/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.mit; - maintainers = with maintainers; [ offline ysndr ]; - platforms = platforms.x86_64; - inherit broken; - }; - }; -in lib.mapAttrs common versions diff --git a/pkgs/applications/editors/atom/env.nix b/pkgs/applications/editors/atom/env.nix deleted file mode 100644 index a5ca5775aae3f..0000000000000 --- a/pkgs/applications/editors/atom/env.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, lib, zlib, glib, alsa-lib, dbus, gtk3, atk, pango, freetype, fontconfig -, gdk-pixbuf, cairo, cups, expat, libgpg-error, nspr -, nss, xorg, libcap, systemd, libnotify, libsecret, libuuid, at-spi2-atk -, at-spi2-core, libdbusmenu, libdrm, mesa -}: - -let - packages = [ - stdenv.cc.cc zlib glib dbus gtk3 atk pango freetype - fontconfig gdk-pixbuf cairo cups expat libgpg-error alsa-lib nspr nss - xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst - xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr - xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify - xorg.libxcb libsecret libuuid at-spi2-atk at-spi2-core libdbusmenu - libdrm - mesa # required for libgbm - ]; - - libPathNative = lib.makeLibraryPath packages; - libPath64 = lib.makeSearchPathOutput "lib" "lib64" packages; - libPath = "${libPathNative}:${libPath64}"; - -in { inherit packages libPath; } diff --git a/pkgs/applications/editors/bluej/default.nix b/pkgs/applications/editors/bluej/default.nix index ddcb002db5d14..a90cfba529fb6 100644 --- a/pkgs/applications/editors/bluej/default.nix +++ b/pkgs/applications/editors/bluej/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openjdk, glib, wrapGAppsHook, zstd }: +{ lib, stdenv, fetchurl, openjdk, glib, dpkg, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "bluej"; @@ -12,21 +12,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-sOT86opMa9ytxJlfURIsD06HiP+j+oz3lQ0DqmLV1wE="; }; - nativeBuildInputs = [ zstd wrapGAppsHook ]; + nativeBuildInputs = [ dpkg wrapGAppsHook ]; buildInputs = [ glib ]; - sourceRoot = "."; - - preUnpack = '' - unpackCmdHooks+=(_tryDebData) - _tryDebData() { - if ! [[ "$1" =~ \.deb$ ]]; then return 1; fi - ar xf $src - if ! [[ -e data.tar.zst ]]; then return 1; fi - unpackFile data.tar.zst - } - ''; - dontWrapGApps = true; installPhase = '' diff --git a/pkgs/applications/editors/bviplus/default.nix b/pkgs/applications/editors/bviplus/default.nix index f56fe637f83f8..1cffe049c73de 100644 --- a/pkgs/applications/editors/bviplus/default.nix +++ b/pkgs/applications/editors/bviplus/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { homepage = "https://bviplus.sourceforge.net"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index 87e2776f67e0c..9eed461413a6c 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.198.0"; + version = "1.200.0"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - hash = "sha256-zm5acOTcjQdgKf6cSPP3mE070TVXbV6ixVa/+7g/SFE="; + hash = "sha256-0+bjp9JOR06wLzA3CJqtGjCK1M0qPdzoLRt6+fV8tJ0="; }; postPatch = '' diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index d6b0212014629..52a333495ef61 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -11,13 +11,13 @@ }, "ATFlatControls": { "owner": "Alexey-T", - "rev": "2023.09.03", - "hash": "sha256-8mopVCqhmDW5MkrOzjt9+iBVgOf7/SbZy0Y40CzuNG0=" + "rev": "2023.10.02", + "hash": "sha256-9oV8xqkqpCfA7rk4UMxWFBIFQQ9slClFbaENRldFb8Q=" }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2023.09.03", - "hash": "sha256-Sk7G4dP5703yq26MC/c1EBhphBVWIbanvHJMcFJDqfk=" + "rev": "2023.10.03", + "hash": "sha256-dJYpsvJNwQg6/NeXT23cpWFXwcfIYnWkHYoDItiUeOo=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", @@ -26,18 +26,18 @@ }, "EControl": { "owner": "Alexey-T", - "rev": "2023.05.31", - "hash": "sha256-sejyNiPmTboP6HlXao+RaMaEf67tAv4mXDHVkkMErPE=" + "rev": "2023.08.18", + "hash": "sha256-X/KFQfLAnbcquLSsOk0ve0X5SzoEgEG0q0JY4TuQXpY=" }, "ATSynEdit_Ex": { "owner": "Alexey-T", - "rev": "2023.08.12", - "hash": "sha256-cEu8qkmcsNwrLR5t3bfMHI9fd3wmAq/dI/iRM4I4wmQ=" + "rev": "2023.10.02", + "hash": "sha256-mn+mTZZyDkc7P7w1PG/rDgp+rpXC3dahoiRk+DUDMHQ=" }, "Python-for-Lazarus": { "owner": "Alexey-T", - "rev": "2023.05.15", - "hash": "sha256-8dWitKZB4nLcJ3fIN40jfNnyAGcRPLfA0iKNZ0zWFWo=" + "rev": "2023.06.29", + "hash": "sha256-mO8/RNJjy9KtFuDUmV2Y8Ff+Jjm9yRd7GSrI6mOONUc=" }, "Emmet-Pascal": { "owner": "Alexey-T", @@ -51,7 +51,7 @@ }, "bgrabitmap": { "owner": "bgrabitmap", - "rev": "v11.5.5", - "hash": "sha256-M4ql+9zk5AJfmmHb9EG0PsJZGWcMm9/Y0lrPQqnKqcU=" + "rev": "v11.5.6", + "hash": "sha256-7TuHCCaH8/RxiVQmDILPW4T6op/XW6djwA5iSh/Yb5w=" } } diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 686ec3681183b..fb02345379b5f 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -6,19 +6,18 @@ , callPackage }: -# https://download.eclipse.org/eclipse/downloads/ is the main place to -# find the downloads needed for new versions +# use ./update.sh to help with updating for each quarterly release # -# to test: +# then, to test: # for e in cpp modeling platform sdk java jee committers rcp; do for s in pkgs pkgsCross.aarch64-multiplatform; do echo; echo $s $e; nix build -f default.nix ${s}.eclipses.eclipse-${e} -o eclipse-${s}-${e}; done; done let platform_major = "4"; - platform_minor = "27"; + platform_minor = "28"; year = "2023"; - month = "03"; #release month - buildmonth = "03"; #sometimes differs from release month - timestamp = "${year}${buildmonth}020300"; + month = "06"; #release month + buildmonth = "06"; #sometimes differs from release month + timestamp = "${year}${buildmonth}050440"; gtk = gtk3; arch = if stdenv.hostPlatform.isx86_64 then "x86_64" @@ -44,8 +43,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-MBng3ETarHMlUUPpVvMIZxVqpe9JW5xNHonnN6CHRcw="; - aarch64 = "sha256-7FgpPzp5MY/fB6Q/wvrvi+Lpcm3tmH7bUTLh7q2Rjek="; + x86_64 = "sha256-0VFg68+M84SEPbLv2f3hNTK1tvUjN3u0X3DYFCMAFX8="; + aarch64 = "sha256-K1e1Q//X+R4FfY60eE4nPgEaF0wUkUIO/AFzzjIrGRY="; }.${arch}; }; }; @@ -59,8 +58,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-BXofrKElgCG3+WUCanpX1sGLhirj2pLi+pi24Z+WjBk="; - aarch64 = "sha256-CdePRa6jmWlt3Wismt3RahGzYOm1ZDwQRt82kRVXSdM="; + x86_64 = "sha256-wdZninKynNQ5o2nxyOxA7GDQ75tWs1TB2jh21O0fEpg="; + aarch64 = "sha256-5iAoMyesBjmdAy/eSMkgtuYv5rnXAEjgLb0yNX02mdw="; }.${arch}; }; }; @@ -74,8 +73,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-aprXjNv2NMoIDCNkFxwmMKcGUt2ssRonzTZ/hH57Mig="; - aarch64 = "sha256-Aq9PDVo/9zTeQ2j6q5bf1aIKjKM7oonIr1mEQ7rX48Y="; + x86_64 = "sha256-SYeCXWGSi8bPbqngGC+ZSBQaKyZrDTFeT+RLKC+ZsDk="; + aarch64 = "sha256-DN6fl7p+q96wsg9Mq6v3lTV0/7b87MFKTJSFuNrjLgs="; }.${arch}; }; }; @@ -106,8 +105,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-39DXU7wIsdxkUpNKnYPT7+qPJ2DrF7G7UJqPfhEDGGs="; - aarch64 = "sha256-7GwKGNHWPZ3uOFyzQj1dftFFz/3oa2j8XWkRn0wnllY="; + x86_64 = "sha256-QY16KSNZj6rq7YL+gOajI80XVtSdCh7MJGPscRJuf1o="; + aarch64 = "sha256-oZXx87dlLZ61ezwDD0WnV48ZMjcK0FkSGl83LhkJvmc="; }.${arch}; }; }; @@ -121,8 +120,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-zNBzFHmNaxUutzMh/5pOglJiKh5NAvSVwvPYyA6RVr4="; - aarch64 = "sha256-RtLXB9kgpLERfhpvDTaJG84qVyN1Puud1PTZtk/WIO0="; + x86_64 = "sha256-FC4zgx+75S9TJVp0azWgON/wNmoEy0074tj+DOdvNOg="; + aarch64 = "sha256-wnRQKqg1V4hrD9VAg6sw8yypB97Wcivt4cH6MFP4KPs="; }.${arch}; }; }; @@ -136,8 +135,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-jee-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-vpvmKZKVl6ubfq8QMDr0xprXYMWl576hu+ovvREN4ak="; - aarch64 = "sha256-5Yqxgl4kkN3Bb7hsTnd9q5TsCpVBVkEVvqPbL5MYEyg="; + x86_64 = "sha256-eSYWuw6s3H1ht4zPDwjd4oZ49KhIn1OaywtwKHyS0wI="; + aarch64 = "sha256-9O0+S3G3vtjN1Vd4euf3gYRPPtrVxoBB+Uj7BlDAS5M="; }.${arch}; }; }; @@ -151,8 +150,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-4SAiEZWSUaiK8QO2Hg39FBcj1aYRtbOJkeF1W1AMQBo="; - aarch64 = "sha256-+KGDlo6QK3o/n2vSiD0HpIkBwqwIiMXzdFUpfE48gps="; + x86_64 = "sha256-kJoXaSwsjArpe4tqeSkZiU4AcR5dLBvdsyU7tBTiTdc="; + aarch64 = "sha256-qydFxa0lQEwsxZQPlBXV/wiuXGuIcBHRasKZEmXJaOk="; }.${arch}; }; }; @@ -166,8 +165,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rcp-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-bhcpzsS9cci3Y3Pk9DOrtPonKjRg/vzDqDr3Be/xfks="; - aarch64 = "sha256-YCb4leFWRtx4VPwK/5vgwwDH3/f0/0OWEy4ueAS7sUw="; + x86_64 = "sha256-BAEXN6sx4f+BJnKz0lkPoAmRXnlbl5s5ETAyfE/AZak="; + aarch64 = "sha256-xayvsFAglBxAB49j2tnt52d6KX6LxMBRfx0wR/p8K70="; }.${arch}; }; }; diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index a8a248804b046..2eb87c8394d85 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -255,12 +255,12 @@ rec { cdt = buildEclipseUpdateSite rec { name = "cdt-${version}"; # find current version at https://github.com/eclipse-cdt/cdt/releases - version = "11.1.1"; + version = "11.2.0"; src = fetchzip { stripRoot = false; url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/${lib.versions.majorMinor version}/${name}/${name}.zip"; - hash = "sha256-k78QKPIb3Lr0Wcg2tTlX1abdpcvxspjaxJiP2Hrgb4A="; + hash = "sha256-YEmoAFzyGOyreg8FiL/gcwXROHT5VoLb1DfHhBp1tsQ="; }; meta = with lib; { @@ -355,7 +355,7 @@ rec { src = fetchzip { url = "https://download.jboss.org/drools/release/${version}/droolsjbpm-tools-distribution-${version}.zip"; - sha512 = "2qzc1iszqfrfnw8xip78n3kp6hlwrvrr708vlmdk7nv525xhs0ssjaxriqdhcr0s6jripmmazxivv3763rnk2bfkh31hmbnckpx4r3m"; + hash = "sha512-dWTS72R2VRgGnG6JafMwZ+wd+1e13pil0SAz2HDMXUmtgYa9iLLtma3SjcDJeWdOoblzWHRu7Ihblx3+Ogb2sQ=="; postFetch = '' # update site is a couple levels deep, alongside some other irrelevant stuff cd $out; diff --git a/pkgs/applications/editors/eclipse/update.sh b/pkgs/applications/editors/eclipse/update.sh new file mode 100755 index 0000000000000..7e100ccfbcd7f --- /dev/null +++ b/pkgs/applications/editors/eclipse/update.sh @@ -0,0 +1,72 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash --pure -p curl cacert libxml2 yq nix jq +#! nix-shell -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/3c7487575d9445185249a159046cc02ff364bff8.tar.gz +# ^ +# | +# nixos-unstable ~ 2023-07-06 -----------------/ + +set -o errexit +set -o nounset + +# scrape the downloads page for release info + +curl -s -o eclipse-dl.html https://download.eclipse.org/eclipse/downloads/ +trap "rm eclipse-dl.html" EXIT + +dlquery() { + q=$1 + xmllint --html eclipse-dl.html --xmlout 2>/dev/null | xq -r ".html.body.main.div.table[3].tr[1].td[0].a${q}"; +} + +# extract release info from download page HTML + +platform_major=$(dlquery '."#text" | split(".") | .[0]' -r); +platform_minor=$(dlquery '."#text" | split(".") | .[1]' -r); + +year=$(dlquery '."@href" | split("/") | .[] | select(. | startswith("R")) | split("-") | .[2] | .[0:4]') +buildmonth=$(dlquery '."@href" | split("/") | .[] | select(. | startswith("R")) | split("-") | .[2] | .[4:6]') +builddaytime=$(dlquery '."@href" | split("/") | .[] | select(. | startswith("R")) | split("-") | .[2] | .[6:12]') +timestamp="${year}${buildmonth}${builddaytime}"; + +# account for possible release-month vs. build-month mismatches + +month=$buildmonth; +case "$buildmonth" in + '02'|'04') month='03' ;; + '05'|'07') month='06' ;; + '08'|'10') month='09' ;; + '11'|'01') month='12' ;; +esac + +cat <<EOF + +paste the following into the 'let' block near the top of pkgs/applications/editors/eclipse/default.nix: + + platform_major = "${platform_major}"; + platform_minor = "${platform_minor}"; + year = "${year}"; + month = "${month}"; #release month + buildmonth = "${buildmonth}"; #sometimes differs from release month + timestamp = "\${year}\${buildmonth}${builddaytime}"; +EOF + +# strip existing download hashes + +sed -i 's/64 = ".*";$/64 = "";/g' pkgs/applications/editors/eclipse/default.nix + +# prefetch new download hashes + +echo; +echo "paste the following url + hash blocks into pkgs/applications/editors/eclipse/default.nix:"; + +for u in $(grep 'url = ' pkgs/applications/editors/eclipse/default.nix | grep arch | cut -d '"' -f 2 | sed 's/&/\\&/g'); do + echo; + echo " url = \"${u}\";"; + echo " hash = {"; + for arch in x86_64 aarch64; do + us=$(eval echo "$u"); + h=$(nix store prefetch-file --json "$us" | jq -r .hash); + echo " $arch = \"${h}\";"; + done + echo ' }.${arch};'; +done diff --git a/pkgs/applications/editors/gedit/default.nix b/pkgs/applications/editors/gedit/default.nix index 4352b74f964d7..a7f1fd135fd6c 100644 --- a/pkgs/applications/editors/gedit/default.nix +++ b/pkgs/applications/editors/gedit/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , meson +, mesonEmulatorHook , fetchurl , python3 , pkg-config @@ -58,6 +59,8 @@ stdenv.mkDerivation rec { gtk-doc gobject-introspection docbook-xsl-nons + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; buildInputs = [ diff --git a/pkgs/applications/editors/glow/default.nix b/pkgs/applications/editors/glow/default.nix index cbd63c0ffcd08..fde2bebe5e4e2 100644 --- a/pkgs/applications/editors/glow/default.nix +++ b/pkgs/applications/editors/glow/default.nix @@ -1,6 +1,8 @@ { lib , buildGoModule , fetchFromGitHub +, installShellFiles +, stdenv }: buildGoModule rec { pname = "glow"; @@ -19,6 +21,14 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; + nativeBuildInputs = [ installShellFiles ]; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd glow \ + --bash <($out/bin/glow completion bash) \ + --fish <($out/bin/glow completion fish) \ + --zsh <($out/bin/glow completion zsh) + ''; + meta = with lib; { description = "Render markdown on the CLI, with pizzazz!"; homepage = "https://github.com/charmbracelet/glow"; diff --git a/pkgs/applications/editors/greenfoot/default.nix b/pkgs/applications/editors/greenfoot/default.nix index f7dc988de1536..52d52a0785eea 100644 --- a/pkgs/applications/editors/greenfoot/default.nix +++ b/pkgs/applications/editors/greenfoot/default.nix @@ -1,31 +1,41 @@ -{ lib, stdenv, fetchurl, makeWrapper, jdk }: +{ lib, stdenv, fetchurl, openjdk, glib, dpkg, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "greenfoot"; - version = "3.7.1"; + version = "3.8.0"; + src = fetchurl { # We use the deb here. First instinct might be to go for the "generic" JAR # download, but that is actually a graphical installer that is much harder # to unpack than the deb. url = "https://www.greenfoot.org/download/files/Greenfoot-linux-${builtins.replaceStrings ["."] [""] version}.deb"; - sha256 = "sha256-wGgKDsA/2luw+Nzs9dWb/HRHMx/0S0CFfoI53OCzxug="; + sha256 = "sha256-HDXmgLHS18VZVV+hCA0RgIrKRftOlV7t+fvE0pAHGjk="; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ dpkg wrapGAppsHook ]; + buildInputs = [ glib ]; - unpackPhase = '' - ar xf $src - tar xf data.tar.xz - ''; + dontWrapGApps = true; installPhase = '' + runHook preInstall + mkdir -p $out cp -r usr/* $out + rm -r $out/share/greenfoot/jdk - rm -r $out/share/greenfoot/javafx + rm -r $out/share/greenfoot/javafx-*.jar + + makeWrapper ${openjdk}/bin/java $out/bin/greenfoot \ + "''${gappsWrapperArgs[@]}" \ + --add-flags "-Dawt.useSystemAAFontSettings=on -Xmx512M \ + --add-opens javafx.graphics/com.sun.glass.ui=ALL-UNNAMED \ + -cp $out/share/greenfoot/boot.jar bluej.Boot \ + -greenfoot=true -bluej.compiler.showunchecked=false \ + -greenfoot.scenarios=$out/share/doc/Greenfoot/scenarios \ + -greenfoot.url.javadoc=file://$out/share/doc/Greenfoot/API" - makeWrapper ${jdk}/bin/java $out/bin/greenfoot \ - --add-flags "-Djavafx.embed.singleThread=true -Dawt.useSystemAAFontSettings=on -Xmx512M -cp \"$out/share/greenfoot/bluej.jar\" bluej.Boot -greenfoot=true -bluej.compiler.showunchecked=false -greenfoot.scenarios=$out/share/doc/Greenfoot/scenarios -greenfoot.url.javadoc=file://$out/share/doc/Greenfoot/API" + runHook postInstall ''; meta = with lib; { @@ -33,7 +43,8 @@ stdenv.mkDerivation rec { homepage = "https://www.greenfoot.org/"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl2ClasspathPlus; + mainProgram = pname; maintainers = [ maintainers.chvp ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/editors/hexcurse/default.nix b/pkgs/applications/editors/hexcurse/default.nix index 715693770c550..1c2e09695e5e4 100644 --- a/pkgs/applications/editors/hexcurse/default.nix +++ b/pkgs/applications/editors/hexcurse/default.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/LonnyGomes/hexcurse"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/editors/ht/default.nix b/pkgs/applications/editors/ht/default.nix index 42b3f1495a317..c8a13738c9109 100644 --- a/pkgs/applications/editors/ht/default.nix +++ b/pkgs/applications/editors/ht/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { homepage = "https://hte.sourceforge.net"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/editors/jetbrains/darwin.nix b/pkgs/applications/editors/jetbrains/darwin.nix index bd14cf2ffdad5..747f03f55d5e9 100644 --- a/pkgs/applications/editors/jetbrains/darwin.nix +++ b/pkgs/applications/editors/jetbrains/darwin.nix @@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation { runHook preInstall APP_DIR="$out/Applications/${product}.app" mkdir -p "$APP_DIR" - cp -Tr "${product}.app" "$APP_DIR" + cp -Tr *.app "$APP_DIR" mkdir -p "$out/bin" cat << EOF > "$out/bin/${loname}" open -na '$APP_DIR' --args "\$@" diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 07372413b73cb..a278a05fe33b5 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -124,7 +124,7 @@ let server with your local machine, downloads necessary components on the backend, and opens your project in JetBrains Client. ''; - maintainers = with maintainers; [ kouyk ]; + maintainers = with maintainers; [ ]; }; }); diff --git a/pkgs/applications/editors/jetbrains/linux.nix b/pkgs/applications/editors/jetbrains/linux.nix index efc939d0324f2..2d6cbf5b87207 100644 --- a/pkgs/applications/editors/jetbrains/linux.nix +++ b/pkgs/applications/editors/jetbrains/linux.nix @@ -11,6 +11,7 @@ , unzip , libsecret , libnotify +, udev , e2fsprogs , python3 , vmopts ? null @@ -109,6 +110,9 @@ with stdenv; lib.makeOverridable mkDerivation (rec { # Some internals want libstdc++.so.6 stdenv.cc.cc.lib libsecret e2fsprogs libnotify + # Required for Help -> Collect Logs + # in at least rider and goland + udev ] ++ extraLdPath)}" \ ${lib.concatStringsSep " " extraWrapperArgs} \ --set-default JDK_HOME "$jdk" \ diff --git a/pkgs/applications/editors/jetbrains/plugins/plugins.json b/pkgs/applications/editors/jetbrains/plugins/plugins.json index dd86e3e807ed8..e3c39af090991 100644 --- a/pkgs/applications/editors/jetbrains/plugins/plugins.json +++ b/pkgs/applications/editors/jetbrains/plugins/plugins.json @@ -21,12 +21,12 @@ "232.9559.28": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", "232.9559.58": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", "232.9559.61": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", - "232.9559.64": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", "232.9921.42": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", - "232.9921.46": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", "232.9921.47": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", "232.9921.48": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", - "232.9921.53": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip" + "232.9921.53": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", + "232.9921.55": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", + "232.9921.62": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip" }, "name": "ideavim" }, @@ -60,12 +60,12 @@ "232.9559.28": null, "232.9559.58": null, "232.9559.61": null, - "232.9559.64": null, "232.9921.42": null, - "232.9921.46": null, "232.9921.47": null, "232.9921.48": null, - "232.9921.53": null + "232.9921.53": null, + "232.9921.55": null, + "232.9921.62": null }, "name": "kotlin" }, @@ -90,12 +90,12 @@ "232.9559.28": "https://plugins.jetbrains.com/files/6981/383851/ini-232.9559.64.zip", "232.9559.58": "https://plugins.jetbrains.com/files/6981/383851/ini-232.9559.64.zip", "232.9559.61": "https://plugins.jetbrains.com/files/6981/383851/ini-232.9559.64.zip", - "232.9559.64": "https://plugins.jetbrains.com/files/6981/383851/ini-232.9559.64.zip", - "232.9921.42": "https://plugins.jetbrains.com/files/6981/393737/ini-232.9921.36.zip", - "232.9921.46": "https://plugins.jetbrains.com/files/6981/393737/ini-232.9921.36.zip", - "232.9921.47": "https://plugins.jetbrains.com/files/6981/393737/ini-232.9921.36.zip", - "232.9921.48": "https://plugins.jetbrains.com/files/6981/393737/ini-232.9921.36.zip", - "232.9921.53": "https://plugins.jetbrains.com/files/6981/393737/ini-232.9921.36.zip" + "232.9921.42": "https://plugins.jetbrains.com/files/6981/398535/ini-232.9921.55.zip", + "232.9921.47": "https://plugins.jetbrains.com/files/6981/398535/ini-232.9921.55.zip", + "232.9921.48": "https://plugins.jetbrains.com/files/6981/398535/ini-232.9921.55.zip", + "232.9921.53": "https://plugins.jetbrains.com/files/6981/398535/ini-232.9921.55.zip", + "232.9921.55": "https://plugins.jetbrains.com/files/6981/398535/ini-232.9921.55.zip", + "232.9921.62": "https://plugins.jetbrains.com/files/6981/398535/ini-232.9921.55.zip" }, "name": "ini" }, @@ -105,8 +105,8 @@ "phpstorm" ], "builds": { - "232.9559.64": "https://plugins.jetbrains.com/files/7219/389222/Symfony_Plugin-2022.1.256.zip", - "232.9921.47": "https://plugins.jetbrains.com/files/7219/389222/Symfony_Plugin-2022.1.256.zip" + "232.9921.47": "https://plugins.jetbrains.com/files/7219/401047/Symfony_Plugin-2022.1.257.zip", + "232.9921.55": "https://plugins.jetbrains.com/files/7219/401047/Symfony_Plugin-2022.1.257.zip" }, "name": "symfony-support" }, @@ -116,8 +116,8 @@ "phpstorm" ], "builds": { - "232.9559.64": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip", - "232.9921.47": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip" + "232.9921.47": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip", + "232.9921.55": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip" }, "name": "php-annotations" }, @@ -132,9 +132,9 @@ "builds": { "232.9559.28": "https://plugins.jetbrains.com/files/7322/381781/python-ce-232.9559.62.zip", "232.9559.61": "https://plugins.jetbrains.com/files/7322/381781/python-ce-232.9559.62.zip", - "232.9921.46": "https://plugins.jetbrains.com/files/7322/395441/python-ce-232.9921.47.zip", - "232.9921.47": "https://plugins.jetbrains.com/files/7322/395441/python-ce-232.9921.47.zip", - "232.9921.53": "https://plugins.jetbrains.com/files/7322/395441/python-ce-232.9921.47.zip" + "232.9921.47": "https://plugins.jetbrains.com/files/7322/401058/python-ce-232.9921.77.zip", + "232.9921.53": "https://plugins.jetbrains.com/files/7322/401058/python-ce-232.9921.77.zip", + "232.9921.62": "https://plugins.jetbrains.com/files/7322/401058/python-ce-232.9921.77.zip" }, "name": "python-community-edition" }, @@ -158,11 +158,11 @@ "232.9559.28": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", "232.9559.58": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", "232.9559.61": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", - "232.9559.64": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", "232.9921.42": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", "232.9921.47": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", "232.9921.48": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", - "232.9921.53": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip" + "232.9921.53": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", + "232.9921.55": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip" }, "name": "-deprecated-rust" }, @@ -186,11 +186,11 @@ "232.9559.28": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", "232.9559.58": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", "232.9559.61": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", - "232.9559.64": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", "232.9921.42": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", "232.9921.47": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", "232.9921.48": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", - "232.9921.53": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip" + "232.9921.53": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", + "232.9921.55": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip" }, "name": "-deprecated-rust-beta" }, @@ -234,12 +234,12 @@ "232.9559.28": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", "232.9559.58": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", "232.9559.61": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", - "232.9559.64": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", "232.9921.42": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", - "232.9921.46": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", "232.9921.47": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", "232.9921.48": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", - "232.9921.53": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip" + "232.9921.53": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", + "232.9921.55": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", + "232.9921.62": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip" }, "name": "nixidea" }, @@ -273,12 +273,12 @@ "232.9559.28": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", "232.9559.58": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", "232.9559.61": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", - "232.9559.64": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", "232.9921.42": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", - "232.9921.46": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", "232.9921.47": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", "232.9921.48": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", - "232.9921.53": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip" + "232.9921.53": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", + "232.9921.55": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", + "232.9921.62": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip" }, "name": "csv-editor" }, @@ -303,12 +303,12 @@ "232.9559.28": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", "232.9559.58": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", "232.9559.61": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", - "232.9559.64": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", "232.9921.42": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", - "232.9921.46": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", "232.9921.47": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", "232.9921.48": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", - "232.9921.53": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip" + "232.9921.53": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", + "232.9921.55": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", + "232.9921.62": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip" }, "name": "vscode-keymap" }, @@ -333,12 +333,12 @@ "232.9559.28": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", "232.9559.58": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", "232.9559.61": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", - "232.9559.64": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", "232.9921.42": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", - "232.9921.46": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", "232.9921.47": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", "232.9921.48": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", - "232.9921.53": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip" + "232.9921.53": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", + "232.9921.55": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", + "232.9921.62": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip" }, "name": "eclipse-keymap" }, @@ -363,12 +363,12 @@ "232.9559.28": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", "232.9559.58": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", "232.9559.61": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", - "232.9559.64": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", "232.9921.42": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", - "232.9921.46": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", "232.9921.47": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", "232.9921.48": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", - "232.9921.53": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip" + "232.9921.53": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", + "232.9921.55": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", + "232.9921.62": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip" }, "name": "visual-studio-keymap" }, @@ -393,12 +393,12 @@ "232.9559.28": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "232.9559.58": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "232.9559.61": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "232.9559.64": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "232.9921.42": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "232.9921.46": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "232.9921.47": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "232.9921.48": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "232.9921.53": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" + "232.9921.53": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "232.9921.55": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "232.9921.62": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" }, "name": "darcula-pitch-black" }, @@ -423,12 +423,12 @@ "232.9559.28": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip", "232.9559.58": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip", "232.9559.61": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip", - "232.9559.64": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip", "232.9921.42": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip", - "232.9921.46": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip", "232.9921.47": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip", "232.9921.48": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip", - "232.9921.53": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip" + "232.9921.53": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip", + "232.9921.55": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip", + "232.9921.62": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip" }, "name": "github-copilot" }, @@ -453,14 +453,27 @@ "232.9559.28": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "232.9559.58": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "232.9559.61": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "232.9559.64": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "232.9921.42": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "232.9921.46": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "232.9921.47": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "232.9921.48": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "232.9921.53": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" + "232.9921.53": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "232.9921.55": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "232.9921.62": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" }, "name": "netbeans-6-5-keymap" + }, + "22407": { + "compatible": [ + "clion", + "idea-ultimate", + "rust-rover" + ], + "builds": { + "232.9921.42": "https://plugins.jetbrains.com/files/22407/397545/intellij-rust-232.9921.62.zip", + "232.9921.47": "https://plugins.jetbrains.com/files/22407/397545/intellij-rust-232.9921.62.zip", + "232.9921.62": "https://plugins.jetbrains.com/files/22407/397545/intellij-rust-232.9921.62.zip" + }, + "name": "rust" } }, "files": { @@ -477,14 +490,15 @@ "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip": "sha256-eFKMFSkzQ0rJKuTUjFo8Yj5Z/mdGoF6REtpSqg/WkNc=", "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip": "sha256-SXzP1lg/FRroeaNQ4q5ePpDI+AiVF+dOE8tRWfm+sGk=", "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip": "sha256-KrzZTKZMQqoEMw+vDUv2jjs0EX0leaPBkU8H/ecq/oI=", + "https://plugins.jetbrains.com/files/22407/397545/intellij-rust-232.9921.62.zip": "sha256-YTZZbObuUWxIZoU3vKnWve/nRtcDWLubx4Z43ljlCYI=", "https://plugins.jetbrains.com/files/631/395438/python-232.9921.47.zip": "sha256-+2ow+tbZUipK92SKp0AegcRwUL1OSQuGE4FlZPOAGSk=", "https://plugins.jetbrains.com/files/6954/381727/kotlin-plugin-223-1.9.10-release-459-IJ8836.35.zip": "sha256-gHkNQyWh6jtY1986aI7Qo6ZNrniPy+Yq4XLLA0pKJkA=", "https://plugins.jetbrains.com/files/6981/383851/ini-232.9559.64.zip": "sha256-XJoRZ3ExKHkUZljuuMjMzMCcFw0A+vOyJAwtf+soHU4=", - "https://plugins.jetbrains.com/files/6981/393737/ini-232.9921.36.zip": "sha256-oUb3W64ZpXep3MsbL+/DG0kVzBQYEv6LG7jghb2aUQQ=", - "https://plugins.jetbrains.com/files/7219/389222/Symfony_Plugin-2022.1.256.zip": "sha256-PeaqtFldh89x6wMGSM1RUR2PLSnXa7mKSojOkrFM2R8=", + "https://plugins.jetbrains.com/files/6981/398535/ini-232.9921.55.zip": "sha256-Jntjg8pXb2HfE8yojDcECM/Lbv4k7J2AoxQ2yD2R23s=", + "https://plugins.jetbrains.com/files/7219/401047/Symfony_Plugin-2022.1.257.zip": "sha256-H5ZfeMT93sGUrDh/7ba9zsW/eQz37Rl/iShY6ryNM3E=", "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip": "sha256-hT5K4w4lhvNwDzDMDSvsIDGj9lyaRqglfOhlbNdqpWs=", "https://plugins.jetbrains.com/files/7322/381781/python-ce-232.9559.62.zip": "sha256-wyqNQO4fFU9fJVbHbde/NWtY/RVOF/71o+TgWfS7VuM=", - "https://plugins.jetbrains.com/files/7322/395441/python-ce-232.9921.47.zip": "sha256-2oRXtVv9ima8W6vywkDX4IeUGwfVNEo4rsqYBmmWhKc=", + "https://plugins.jetbrains.com/files/7322/401058/python-ce-232.9921.77.zip": "sha256-cr4LxSz8xVzC+Zm+6LnWGLbF6aGBVLW56crCIQOawhc=", "https://plugins.jetbrains.com/files/8182/329558/intellij-rust-0.4.194.5382-223.zip": "sha256-AgaKH4ZaxLhumk1P9BVJGpvluKnpYIulCDIRQpaWlKA=", "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip": "sha256-ZlSfPvhPixEz5JxU9qyG0nL3jiSjr4gKaf/xYcQI1vQ=", "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip": "sha256-pVwBEyUCx/DJET9uIm8vxFeChE8FskWyfLjDpfg2mAE=", diff --git a/pkgs/applications/editors/jetbrains/plugins/specialPlugins.nix b/pkgs/applications/editors/jetbrains/plugins/specialPlugins.nix index 5d04debc7b08a..e6e00962c9de5 100644 --- a/pkgs/applications/editors/jetbrains/plugins/specialPlugins.nix +++ b/pkgs/applications/editors/jetbrains/plugins/specialPlugins.nix @@ -13,7 +13,7 @@ buildInputs = [ stdenv.cc.cc.lib ]; }; "8182" = { - # Rust + # Rust (deprecated) nativeBuildInputs = [ autoPatchelfHook ]; buildInputs = [ stdenv.cc.cc.lib ]; buildPhase = '' @@ -60,4 +60,14 @@ fix_offset PRELUDE_POSITION ''; }; + "22407" = { + # Rust + nativeBuildInputs = [ autoPatchelfHook ]; + buildInputs = [ stdenv.cc.cc.lib ]; + buildPhase = '' + runHook preBuild + chmod +x -R bin + runHook postBuild + ''; + }; } diff --git a/pkgs/applications/editors/jetbrains/versions.json b/pkgs/applications/editors/jetbrains/versions.json index b627ea855053c..1a1f17c54e973 100644 --- a/pkgs/applications/editors/jetbrains/versions.json +++ b/pkgs/applications/editors/jetbrains/versions.json @@ -67,10 +67,10 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz", - "version": "2023.2.1", - "sha256": "bcb506fa27078f78da44a38f4fbab0a2000cea26385f51800c931d0cbd1b47c4", - "url": "https://download.jetbrains.com/webide/PhpStorm-2023.2.1.tar.gz", - "build_number": "232.9559.64", + "version": "2023.2.2", + "sha256": "5e3dd021b82dcad0f51bded677aa87680dcc3f5d843951c48848a9191141bf1d", + "url": "https://download.jetbrains.com/webide/PhpStorm-2023.2.2.tar.gz", + "build_number": "232.9921.55", "version-major-minor": "2022.3" }, "pycharm-community": { @@ -108,10 +108,10 @@ "rust-rover": { "update-channel": "RustRover EAP", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.tar.gz", - "version": "2023.2", - "sha256": "5a51bcae179467e9c6440bc0c31bffd27c6fc58d593a0cbecd5aeb51508d27b6", - "url": "https://download.jetbrains.com/rustrover/RustRover-232.9921.46.tar.gz", - "build_number": "232.9921.46" + "version": "2023.2 EAP", + "sha256": "1f67e1a82f5cbb7c84382c7f251ae06b1e2699fa7d2fa4129e23ec2e43251687", + "url": "https://download.jetbrains.com/rustrover/RustRover-232.9921.62.tar.gz", + "build_number": "232.9921.62" }, "webstorm": { "update-channel": "WebStorm RELEASE", @@ -190,10 +190,10 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg", - "version": "2023.2.1", - "sha256": "5d238f0d3ddd59762256dc406ae2430e5abf79f9a04488722a87e54b70db68ef", - "url": "https://download.jetbrains.com/webide/PhpStorm-2023.2.1.dmg", - "build_number": "232.9559.64", + "version": "2023.2.2", + "sha256": "99a9bb313a5c141ecd1810306deaca3cf52d338edf206362b3f9d9337a27890e", + "url": "https://download.jetbrains.com/webide/PhpStorm-2023.2.2.dmg", + "build_number": "232.9921.55", "version-major-minor": "2022.3" }, "pycharm-community": { @@ -231,10 +231,10 @@ "rust-rover": { "update-channel": "RustRover EAP", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.dmg", - "version": "2023.2", - "sha256": "4c7193acf07f44b91512d8b4c04c88068b8599e76150a81dfd728046910a0929", - "url": "https://download.jetbrains.com/rustrover/RustRover-232.9921.46.dmg", - "build_number": "232.9921.46" + "version": "2023.2 EAP", + "sha256": "dfde444bff011783cb4a5aa2aafae8ea989874c19535b01da8214df5eb3174fb", + "url": "https://download.jetbrains.com/rustrover/RustRover-232.9921.62.dmg", + "build_number": "232.9921.62" }, "webstorm": { "update-channel": "WebStorm RELEASE", @@ -313,10 +313,10 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg", - "version": "2023.2.1", - "sha256": "886e79089e5e783739e71f57f8f20b9ecbc2e9e7cc9b941bb99d1444181939df", - "url": "https://download.jetbrains.com/webide/PhpStorm-2023.2.1-aarch64.dmg", - "build_number": "232.9559.64", + "version": "2023.2.2", + "sha256": "a31daeddae532324436b2d11acbd5fb657721883f17c7ef4457ac76a51bd4189", + "url": "https://download.jetbrains.com/webide/PhpStorm-2023.2.2-aarch64.dmg", + "build_number": "232.9921.55", "version-major-minor": "2022.3" }, "pycharm-community": { @@ -354,10 +354,10 @@ "rust-rover": { "update-channel": "RustRover EAP", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.dmg", - "version": "2023.2", - "sha256": "7f01fef11d89c6c6c870a79007607babde40f7a958b7103d1028aa760ed713b7", - "url": "https://download.jetbrains.com/rustrover/RustRover-232.9921.46-aarch64.dmg", - "build_number": "232.9921.46" + "version": "2023.2 EAP", + "sha256": "35d44a4f72c027283843aaa6409de701d14274cdc5a614c3fdc53121383f9389", + "url": "https://download.jetbrains.com/rustrover/RustRover-232.9921.62-aarch64.dmg", + "build_number": "232.9921.62" }, "webstorm": { "update-channel": "WebStorm RELEASE", diff --git a/pkgs/applications/editors/ldtk/default.nix b/pkgs/applications/editors/ldtk/default.nix index 4d8dc4d58dc57..f82ee11c3f88d 100644 --- a/pkgs/applications/editors/ldtk/default.nix +++ b/pkgs/applications/editors/ldtk/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "ldtk"; - version = "1.3.4"; + version = "1.4.0"; src = fetchurl { url = "https://github.com/deepnight/ldtk/releases/download/v${finalAttrs.version}/ubuntu-distribution.zip"; - hash = "sha256-/EFmuzj8hYhQJegZpZhZb4fuSeMF9wdG1Be4duEvW54="; + hash = "sha256-WuKzhE9r/yMqlV2bf/0AuNVKfxq/SlecmN3rHt6RjXo="; }; nativeBuildInputs = [ unzip makeWrapper copyDesktopItems appimage-run ]; diff --git a/pkgs/applications/editors/mg/default.nix b/pkgs/applications/editors/mg/default.nix index 0dc52b863014c..c54cd01dbf281 100644 --- a/pkgs/applications/editors/mg/default.nix +++ b/pkgs/applications/editors/mg/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { description = "Micro GNU/emacs, a portable version of the mg maintained by the OpenBSD team"; homepage = "https://man.openbsd.org/OpenBSD-current/man1/mg.1"; license = licenses.publicDomain; + mainProgram = "mg"; platforms = platforms.all; }; } diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 9bf6fb51bdfff..4b77b2b7c6662 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -7,6 +7,7 @@ , buildPackages , treesitter-parsers ? import ./treesitter-parsers.nix { inherit fetchurl; } , CoreServices +, fixDarwinDylibNames , glibcLocales ? null, procps ? null # now defaults to false because some tests can be flaky (clipboard etc), see @@ -16,8 +17,29 @@ }: let + nvim-lpeg-dylib = luapkgs: if stdenv.isDarwin + then (luapkgs.lpeg.overrideAttrs (oa: { + preConfigure = '' + # neovim wants clang .dylib + sed -i makefile -e "s/CC = gcc/CC = clang/" + sed -i makefile -e "s/-bundle/-dynamiclib/" + ''; + preBuild = '' + # there seems to be implicit calls to Makefile from luarocks, we need to + # add a stage to build our dylib + make macosx + mkdir -p $out/lib + mv lpeg.so $out/lib/lpeg.dylib + ''; + nativeBuildInputs = + oa.nativeBuildInputs + ++ ( + lib.optional stdenv.isDarwin fixDarwinDylibNames + ); + })) + else luapkgs.lpeg; requiredLuaPkgs = ps: (with ps; [ - lpeg + (nvim-lpeg-dylib ps) luabitop mpack ] ++ lib.optionals doCheck [ @@ -40,10 +62,11 @@ let deterministicStringIds = true; self = deterministicLuajit; }; - in deterministicLuajit.withPackages(ps: [ ps.mpack ps.lpeg ]) + in deterministicLuajit.withPackages(ps: [ ps.mpack (nvim-lpeg-dylib ps) ]) else lua.luaOnBuild; pyEnv = python3.withPackages(ps: with ps; [ pynvim msgpack ]); + in stdenv.mkDerivation rec { pname = "neovim-unwrapped"; diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 2352cdb82a441..0fbb54df01acd 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -39,11 +39,9 @@ let wrapperArgsStr = if lib.isString wrapperArgs then wrapperArgs else lib.escapeShellArgs wrapperArgs; - # "--add-flags" (lib.escapeShellArgs flags) - # wrapper args used both when generating the manifest and in the final neovim executable - commonWrapperArgs = (lib.optionals (lib.isList wrapperArgs) wrapperArgs) + commonWrapperArgs = # vim accepts a limited number of commands so we join them all - ++ [ + [ "--add-flags" ''--cmd "lua ${providerLuaRc}"'' # (lib.intersperse "|" hostProviderViml) ] ++ lib.optionals (packpathDirs.myNeovimPackages.start != [] || packpathDirs.myNeovimPackages.opt != []) [ diff --git a/pkgs/applications/editors/orbiton/default.nix b/pkgs/applications/editors/orbiton/default.nix index 41b9d0b1f9da7..4c3fefad7fd37 100644 --- a/pkgs/applications/editors/orbiton/default.nix +++ b/pkgs/applications/editors/orbiton/default.nix @@ -4,13 +4,13 @@ buildGoModule rec { pname = "orbiton"; - version = "2.64.3"; + version = "2.65.0"; src = fetchFromGitHub { owner = "xyproto"; repo = "orbiton"; rev = "v${version}"; - hash = "sha256-mx6k6OXr3iTCD1FTC7J1fnz7Gs/GyggHXnVywuPo5BY="; + hash = "sha256-ul5E5xOtH5qh5tNE+S/VhUOr079wHwgtXF7ZIAwGzgU="; }; vendorHash = null; diff --git a/pkgs/applications/editors/pulsar/default.nix b/pkgs/applications/editors/pulsar/default.nix index e0b967f8043c3..33dd4f2bb7a3a 100644 --- a/pkgs/applications/editors/pulsar/default.nix +++ b/pkgs/applications/editors/pulsar/default.nix @@ -1,22 +1,32 @@ { lib , stdenv , git -, runtimeShell , fetchurl , wrapGAppsHook +, alsa-lib +, at-spi2-atk +, cairo +, cups +, dbus +, expat +, gdk-pixbuf , glib , gtk3 -, atomEnv +, mesa +, nss +, nspr , xorg +, libdrm +, libsecret , libxkbcommon -, hunspell +, pango +, systemd , hunspellDicts , useHunspell ? true , languages ? [ "en_US" ] , withNemoAction ? true , makeDesktopItem , copyDesktopItems -, makeWrapper , asar , python3 }: @@ -32,13 +42,35 @@ let aarch64-linux.hash = "sha256-GdPnmhMZR3Y2WB2j98JEWomdKFZuTgxN8oga/tBwA4U="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - additionalLibs = lib.makeLibraryPath [ + newLibpath = lib.makeLibraryPath [ + alsa-lib + at-spi2-atk + cairo + cups + dbus + expat + gdk-pixbuf + glib + gtk3 + libsecret + mesa + nss + nspr + libdrm + xorg.libX11 + xorg.libxcb + xorg.libXcomposite + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXrandr xorg.libxshmfence libxkbcommon xorg.libxkbfile + pango stdenv.cc.cc.lib + systemd ]; - newLibpath = "${atomEnv.libPath}:${additionalLibs}"; # Hunspell hunspellDirs = builtins.map (lang: "${hunspellDicts.${lang}}/share/hunspell") languages; diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index e854291310b8c..2ce482f356c8c 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -16,13 +16,13 @@ , qtsensors , qtwebengine , qtwebchannel +, quarto , libuuid , hunspellDicts , unzip , ant , jdk , gnumake -, makeWrapper , pandoc , llvmPackages , yaml-cpp @@ -40,39 +40,39 @@ let pname = "RStudio"; - version = "2022.07.1+554"; - RSTUDIO_VERSION_MAJOR = "2022"; - RSTUDIO_VERSION_MINOR = "07"; - RSTUDIO_VERSION_PATCH = "1"; - RSTUDIO_VERSION_SUFFIX = "+554"; + version = + "${RSTUDIO_VERSION_MAJOR}.${RSTUDIO_VERSION_MINOR}.${RSTUDIO_VERSION_PATCH}${RSTUDIO_VERSION_SUFFIX}"; + RSTUDIO_VERSION_MAJOR = "2023"; + RSTUDIO_VERSION_MINOR = "09"; + RSTUDIO_VERSION_PATCH = "0"; + RSTUDIO_VERSION_SUFFIX = "+463"; src = fetchFromGitHub { owner = "rstudio"; repo = "rstudio"; rev = "v${version}"; - sha256 = "0rmdqxizxqg2vgr3lv066cjmlpjrxjlgi0m97wbh6iyhkfm2rrj1"; + hash = "sha256-FwNuU2rbE3GEhuwphvZISUMhvSZJ6FjjaZ1oQ9F8NWc="; }; mathJaxSrc = fetchurl { url = "https://s3.amazonaws.com/rstudio-buildtools/mathjax-27.zip"; - sha256 = "sha256-xWy6psTOA8H8uusrXqPDEtL7diajYCVHcMvLiPsgQXY="; + hash = "sha256-xWy6psTOA8H8uusrXqPDEtL7diajYCVHcMvLiPsgQXY="; }; rsconnectSrc = fetchFromGitHub { owner = "rstudio"; repo = "rsconnect"; - rev = "e287b586e7da03105de3faa8774c63f08984eb3c"; - sha256 = "sha256-ULyWdSgGPSAwMt0t4QPuzeUE6Bo6IJh+5BMgW1bFN+Y="; + rev = "5175a927a41acfd9a21d9fdecb705ea3292109f2"; + hash = "sha256-c1fFcN6KAfxXv8bv4WnIqQKg1wcNP2AywhEmIbyzaBA="; }; - panmirrorModules = mkYarnModules rec { - inherit pname version; - packageJSON = ./package.json; - yarnLock = "${src}/src/gwt/panmirror/src/editor/yarn.lock"; - offlineCache = fetchYarnDeps { - inherit yarnLock; - hash = "sha256-v05Up6VMlYlvgUYQVYo+YfpcsMohliNfMgyjq6QymCI="; - }; + # Ideally, rev should match the rstudio release name. + # e.g. release/rstudio-mountain-hydrangea + quartoSrc = fetchFromGitHub { + owner = "quarto-dev"; + repo = "quarto"; + rev = "bb264a572c6331d46abcf087748c021d815c55d7"; + hash = "sha256-lZnZvioztbBWWa6H177X6rRrrgACx2gMjVFDgNup93g="; }; description = "Set of integrated tools for the R language"; @@ -86,7 +86,6 @@ in unzip ant jdk - makeWrapper pandoc nodejs ] ++ lib.optionals (!server) [ @@ -102,6 +101,7 @@ in yaml-cpp soci postgresql + quarto ] ++ (if server then [ sqlite.dev pam @@ -115,11 +115,10 @@ in cmakeFlags = [ "-DRSTUDIO_TARGET=${if server then "Server" else "Desktop"}" - "-DCMAKE_BUILD_TYPE=Release" "-DRSTUDIO_USE_SYSTEM_SOCI=ON" "-DRSTUDIO_USE_SYSTEM_BOOST=ON" "-DRSTUDIO_USE_SYSTEM_YAML_CPP=ON" - "-DQUARTO_ENABLED=FALSE" + "-DQUARTO_ENABLED=TRUE" "-DPANDOC_VERSION=${pandoc.version}" "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/lib/rstudio" ] ++ lib.optionals (!server) [ @@ -133,8 +132,7 @@ in ./use-system-node.patch ./fix-resources-path.patch ./pandoc-nix-path.patch - ./remove-quarto-from-generator.patch - ./do-not-install-pandoc.patch + ./use-system-quarto.patch ]; postPatch = '' @@ -144,16 +142,20 @@ in --replace 'SOCI_LIBRARY_DIR "/usr/lib"' 'SOCI_LIBRARY_DIR "${soci}/lib"' substituteInPlace src/gwt/build.xml \ - --replace '@node@' ${nodejs} + --replace '@node@' ${nodejs} \ + --replace './lib/quarto' ${quartoSrc} substituteInPlace src/cpp/core/libclang/LibClang.cpp \ --replace '@libclang@' ${llvmPackages.libclang.lib} \ --replace '@libclang.so@' ${llvmPackages.libclang.lib}/lib/libclang.so - substituteInPlace src/cpp/session/include/session/SessionConstants.hpp \ - --replace '@pandoc@' ${pandoc}/bin/pandoc + substituteInPlace src/cpp/session/CMakeLists.txt \ + --replace '@pandoc@' ${pandoc} \ + --replace '@quarto@' ${quarto} - sed '1i#include <set>' -i src/cpp/core/include/core/Thread.hpp + substituteInPlace src/cpp/session/include/session/SessionConstants.hpp \ + --replace '@pandoc@' ${pandoc}/bin \ + --replace '@quarto@' ${quarto} ''; hunspellDictionaries = with lib; filter isDerivation (unique (attrValues hunspellDicts)); @@ -181,8 +183,6 @@ in cp -r ${rsconnectSrc} dependencies/rsconnect ( cd dependencies && ${R}/bin/R CMD build -d --no-build-vignettes rsconnect ) - - cp -r "${panmirrorModules}" src/gwt/panmirror/src/editor/node_modules ''; postInstall = '' @@ -206,14 +206,14 @@ in rm -r $out/lib/rstudio/{INSTALL,COPYING,NOTICE,README.md,SOURCE,VERSION} ''; - meta = with lib; { + meta = { broken = (stdenv.isLinux && stdenv.isAarch64); inherit description; homepage = "https://www.rstudio.com/"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ ciil cfhammill ]; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ ciil cfhammill ]; mainProgram = "rstudio" + lib.optionalString server "-server"; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; passthru = { diff --git a/pkgs/applications/editors/rstudio/do-not-install-pandoc.patch b/pkgs/applications/editors/rstudio/do-not-install-pandoc.patch deleted file mode 100644 index 25bfb2b1e8f49..0000000000000 --- a/pkgs/applications/editors/rstudio/do-not-install-pandoc.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/src/cpp/session/CMakeLists.txt -+++ b/src/cpp/session/CMakeLists.txt -@@ -60,8 +60,7 @@ - - # validate our dependencies exist - foreach(VAR RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR -- RSTUDIO_DEPENDENCIES_MATHJAX_DIR -- RSTUDIO_DEPENDENCIES_PANDOC_DIR) -+ RSTUDIO_DEPENDENCIES_MATHJAX_DIR) - - # validate existence - if(NOT EXISTS "${${VAR}}") - diff --git a/pkgs/applications/editors/rstudio/package.json b/pkgs/applications/editors/rstudio/package.json deleted file mode 100644 index 6677ca9e06de8..0000000000000 --- a/pkgs/applications/editors/rstudio/package.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "name": "panmirror", - "version": "0.1.0", - "private": true, - "license": "agpl-3.0", - "dependencies": { - "@types/ace": "^0.0.43", - "@types/clipboard": "^2.0.7", - "@types/diff-match-patch": "^1.0.32", - "@types/js-yaml": "^4.0.3", - "@types/lodash.debounce": "^4.0.6", - "@types/lodash.orderby": "^4.6.6", - "@types/lodash.uniqby": "^4.7.6", - "@types/orderedmap": "^1.0.0", - "@types/pinyin": "^2.10.0", - "@types/prosemirror-commands": "^1.0.4", - "@types/prosemirror-dropcursor": "^1.0.3", - "@types/prosemirror-gapcursor": "^1.0.4", - "@types/prosemirror-history": "^1.0.3", - "@types/prosemirror-inputrules": "^1.0.4", - "@types/prosemirror-keymap": "^1.0.4", - "@types/prosemirror-schema-list": "^1.0.3", - "@types/prosemirror-tables": "^0.9.1", - "@types/react": "^17.0.20", - "@types/react-dom": "^17.0.9", - "@types/react-window": "^1.8.5", - "@types/transliteration": "^1.6.6", - "@types/zenscroll": "^4.0.1", - "biblatex-csl-converter": "^2.0.2", - "clipboard": "^2.0.8", - "diff-match-patch": "^1.0.5", - "fuse.js": "^6.4.6", - "js-yaml": "^4.1.0", - "lodash.debounce": "^4.0.8", - "lodash.orderby": "^4.6.0", - "lodash.uniqby": "^4.7.0", - "orderedmap": "^1.0.0", - "pinyin": "^2.10.2", - "prosemirror-changeset": "^2.1.2", - "prosemirror-commands": "^1.1.10", - "prosemirror-dev-tools": "^2.1.1", - "prosemirror-dropcursor": "^1.3.5", - "prosemirror-gapcursor": "^1.1.5", - "prosemirror-history": "^1.2.0", - "prosemirror-inputrules": "^1.1.3", - "prosemirror-keymap": "^1.1.4", - "prosemirror-model": "^1.14.3", - "prosemirror-schema-list": "^1.1.5", - "prosemirror-state": "^1.3.4", - "prosemirror-tables": "^1.1.1", - "prosemirror-transform": "^1.3.2", - "prosemirror-utils": "^0.9.6", - "prosemirror-view": "^1.20.1", - "react": "^17.0.2", - "react-dom": "^17.0.2", - "react-window": "^1.8.6", - "sentence-splitter": "^3.2.2", - "thenby": "^1.3.3", - "tlite": "^0.1.9", - "transliteration": "^2.2.0", - "typescript": "3.8.3", - "zenscroll": "^4.0.2" - }, - "scripts": { - "format": "prettier --write \"src/**/*.ts\" \"src/**/*.tsx\"", - "lint": "tslint -c tslint.json 'src/**/*.{ts,tsx}'", - "watch": "tsc --watch --noEmit --project './tsconfig.json'", - "generate-symbols": "ts-node tools/generate-symbols.ts" - }, - "devDependencies": { - "@types/node": "^14.0.4", - "@types/unzip": "^0.1.1", - "fast-xml-parser": "^3.17.1", - "fuse-box": "^3.7.1", - "prettier": "^1.18.2", - "terser": "^4.6.2", - "ts-node": "^8.10.2", - "tslint": "^5.20.0", - "tslint-config-prettier": "^1.18.0", - "tslint-react": "^5.0.0", - "typescript-tslint-plugin": "^0.5.5", - "uglify-js": "^3.7.4", - "unzip": "^0.1.11" - } -} diff --git a/pkgs/applications/editors/rstudio/pandoc-nix-path.patch b/pkgs/applications/editors/rstudio/pandoc-nix-path.patch index a2b9bbd9f02bb..2782a5a0d7a25 100644 --- a/pkgs/applications/editors/rstudio/pandoc-nix-path.patch +++ b/pkgs/applications/editors/rstudio/pandoc-nix-path.patch @@ -1,11 +1,18 @@ --- a/src/cpp/session/include/session/SessionConstants.hpp +++ b/src/cpp/session/include/session/SessionConstants.hpp -@@ -140,7 +140,7 @@ +@@ -142,13 +142,13 @@ + #define kSessionTmpDir "rstudio-rsession" + #ifdef QUARTO_ENABLED - # define kDefaultPandocPath "bin/quarto/bin" - #else --# define kDefaultPandocPath "bin/pandoc" +-# define kDefaultPandocPath "bin/quarto/bin/tools" +# define kDefaultPandocPath "@pandoc@" + #else + # define kDefaultPandocPath "bin/pandoc" #endif - #define kDefaultQuartoPath "bin/quarto" + #define kDefaultNodePath "bin/node" +-#define kDefaultQuartoPath "bin/quarto" ++#define kDefaultQuartoPath "@quarto@" + #define kDefaultRsclangPath "bin/rsclang" + + #ifdef _WIN32 diff --git a/pkgs/applications/editors/rstudio/remove-quarto-from-generator.patch b/pkgs/applications/editors/rstudio/remove-quarto-from-generator.patch deleted file mode 100644 index 1c28bbada6dab..0000000000000 --- a/pkgs/applications/editors/rstudio/remove-quarto-from-generator.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/src/cpp/session/CMakeLists.txt -+++ b/src/cpp/session/CMakeLists.txt -@@ -43,12 +43,6 @@ - set(RSTUDIO_DEPENDENCIES_MATHJAX_DIR "${RSTUDIO_DEPENDENCIES_DIR}/mathjax-27") - endif() - -- if(EXISTS "${RSTUDIO_TOOLS_ROOT}/quarto") -- set(RSTUDIO_DEPENDENCIES_QUARTO_DIR "${RSTUDIO_TOOLS_ROOT}/quarto") -- else() -- set(RSTUDIO_DEPENDENCIES_QUARTO_DIR "${RSTUDIO_DEPENDENCIES_DIR}/quarto") -- endif() -- - endif() - - -@@ -67,14 +61,7 @@ - # validate our dependencies exist - foreach(VAR RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR - RSTUDIO_DEPENDENCIES_MATHJAX_DIR -- RSTUDIO_DEPENDENCIES_PANDOC_DIR -- RSTUDIO_DEPENDENCIES_QUARTO_DIR) -- -- -- # skip quarto if not enabled -- if("${VAR}" STREQUAL "RSTUDIO_DEPENDENCIES_QUARTO_DIR" AND NOT QUARTO_ENABLED) -- continue() -- endif() -+ RSTUDIO_DEPENDENCIES_PANDOC_DIR) - - # validate existence - if(NOT EXISTS "${${VAR}}") - diff --git a/pkgs/applications/editors/rstudio/use-system-node.patch b/pkgs/applications/editors/rstudio/use-system-node.patch index 248f4fe86e215..8593490961346 100644 --- a/pkgs/applications/editors/rstudio/use-system-node.patch +++ b/pkgs/applications/editors/rstudio/use-system-node.patch @@ -1,29 +1,60 @@ +diff --git a/src/gwt/build.xml b/src/gwt/build.xml +index 83e9433..f1ee63d 100644 --- a/src/gwt/build.xml +++ b/src/gwt/build.xml -@@ -83,24 +83,7 @@ - <echo>Concatenated acesupport files to 'acesupport.js'</echo> - </target> - -- <!-- panmirror typescript library --> -- <!-- ensure version matches RSTUDIO_NODE_VERSION --> -- <property name="node.version" value="16.14.0"/> -- <property name="node.dir" value="../../dependencies/common/node/${node.version}"/> -- <condition property="node.bin" value="../../../${node.dir}/bin/node"> +@@ -87,29 +87,7 @@ + <!-- ensure version matches RSTUDIO_NODE_VERSION --> + <property name="node.version" value="16.14.0"/> + <property name="node.dir" value="../../dependencies/common/node/${node.version}"/> +- <!-- use yarn from system but will prefer yarn from dependencies if available --> +- <condition property="yarn.bin" value="yarn"> - <not> - <os family="windows" /> - </not> - </condition> -- <condition property="node.bin" value="${node.dir}/node.exe"> +- <available +- property="yarn.bin" +- value="${node.dir}/bin/yarn" +- file="${node.dir}/bin/yarn"/> +- <condition property="yarn.bin" value="${node.dir}/node_modules/yarn/bin/yarn.cmd"> - <os family="windows" /> - </condition> -- -- <!-- use node from /opt/rstudio-tools if installed (typical for Docker) --> +- <!-- use yarn from /opt/rstudio-tools if installed (typical for Docker) --> +- <available +- property="yarn.bin" +- value="/opt/rstudio-tools/dependencies/common/node/${node.version}/bin/yarn" +- file="/opt/rstudio-tools/dependencies/common/node/${node.version}/bin/yarn"/> +- <!-- use yarn from c:/rstudio-tools if installed (typical for Docker on Windows) --> - <available -- property="node.bin" -- value="/opt/rstudio-tools/dependencies/common/node/${node.version}/bin/node" -- file="/opt/rstudio-tools/dependencies/common/node/${node.version}/bin/node"/> -+ <property name="node.bin" value="@node@/bin/node"/> +- property="yarn.bin" +- value="c:\rstudio-tools\dependencies\common\node\${node.version}\node_modules\yarn\bin\yarn.cmd" +- file="c:\rstudio-tools\dependencies\common\node\${node.version}\node_modules\yarn\bin\yarn.cmd"/> ++ <property name="node.bin" value="@node@/bin/node"/> - <property name="panmirror.dir" value="./panmirror/src/editor"/> + <property name="panmirror.dir" value="./lib/quarto/apps/panmirror"/> <property name="panmirror.build.dir" value="./www/js/panmirror"/> - +@@ -126,21 +104,11 @@ + file="c:\rstudio-tools\src\gwt\lib\quarto\apps\panmirror"/> + + <target name="panmirror" description="Compile panmirror library"> +- <echo message="yarn location: ${yarn.bin}"/> +- <echo message="panmirror location: ${panmirror.dir}"/> + <mkdir dir="${panmirror.build.dir}"/> +- <exec executable="${yarn.bin}" dir="${panmirror.dir}" resolveexecutable="true" failonerror="true"> +- <arg value="install"/> +- <arg value="--network-timeout"/> +- <arg value="240000"/> +- </exec> +- <exec executable="${yarn.bin}" dir="${panmirror.dir}" resolveexecutable="true" failonerror="true"> +- <arg value="build"/> +- <env key="PANMIRROR_OUTDIR" value="dist-rstudio"/> ++ <exec executable="${node.bin}" dir="${panmirror.dir}" spawn="${panmirror.spawn}"> ++ <arg value="fuse"/> ++ <arg value="${panmirror.target}"/> + </exec> +- <copy todir="${panmirror.build.dir}"> +- <fileset dir="${panmirror.dir}/dist-rstudio"/> +- </copy> + </target> + + <target name="javac" description="Compile java source"> diff --git a/pkgs/applications/editors/rstudio/use-system-quarto.patch b/pkgs/applications/editors/rstudio/use-system-quarto.patch new file mode 100644 index 0000000000000..89653219dbea6 --- /dev/null +++ b/pkgs/applications/editors/rstudio/use-system-quarto.patch @@ -0,0 +1,46 @@ +--- a/src/cpp/session/CMakeLists.txt ++++ b/src/cpp/session/CMakeLists.txt +@@ -36,18 +36,14 @@ + else() + set(RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR "${RSTUDIO_DEPENDENCIES_DIR}/dictionaries") + endif() +- ++ + if(EXISTS "${RSTUDIO_TOOLS_ROOT}/mathjax-27") + set(RSTUDIO_DEPENDENCIES_MATHJAX_DIR "${RSTUDIO_TOOLS_ROOT}/mathjax-27") + else() + set(RSTUDIO_DEPENDENCIES_MATHJAX_DIR "${RSTUDIO_DEPENDENCIES_DIR}/mathjax-27") + endif() + +- if(EXISTS "${RSTUDIO_TOOLS_ROOT}/quarto") +- set(RSTUDIO_DEPENDENCIES_QUARTO_DIR "${RSTUDIO_TOOLS_ROOT}/quarto") +- else() +- set(RSTUDIO_DEPENDENCIES_QUARTO_DIR "${RSTUDIO_DEPENDENCIES_DIR}/quarto") +- endif() ++ set(RSTUDIO_DEPENDENCIES_QUARTO_DIR "@quarto@") + + endif() + +@@ -56,7 +52,7 @@ + # - by default, we use quarto + quarto's bundled pandoc + # - if quarto is not enabled, use pandoc fallback + if(QUARTO_ENABLED) +- set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_DEPENDENCIES_QUARTO_DIR}/bin/tools") ++ set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "@pandoc@/bin") + elseif(EXISTS "${RSTUDIO_TOOLS_ROOT}/pandoc/${PANDOC_VERSION}") + set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_TOOLS_ROOT}/pandoc/${PANDOC_VERSION}") + else() +@@ -66,11 +62,9 @@ + + # validate our dependencies exist + foreach(VAR RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR +- RSTUDIO_DEPENDENCIES_MATHJAX_DIR +- RSTUDIO_DEPENDENCIES_PANDOC_DIR +- RSTUDIO_DEPENDENCIES_QUARTO_DIR) ++ RSTUDIO_DEPENDENCIES_MATHJAX_DIR) ++ + +- + # skip quarto if not enabled + if("${VAR}" STREQUAL "RSTUDIO_DEPENDENCIES_QUARTO_DIR" AND NOT QUARTO_ENABLED) + continue() diff --git a/pkgs/applications/editors/setzer/default.nix b/pkgs/applications/editors/setzer/default.nix index 55c98249dd369..640a00eaaa2c7 100644 --- a/pkgs/applications/editors/setzer/default.nix +++ b/pkgs/applications/editors/setzer/default.nix @@ -20,13 +20,13 @@ python3.pkgs.buildPythonApplication rec { pname = "setzer"; - version = "59"; + version = "60"; src = fetchFromGitHub { owner = "cvfosammmm"; repo = "Setzer"; rev = "v${version}"; - hash = "sha256-PmkEOOi30Fa8VXNmKPvp6UAaw74MID9uTaCzXs9vPpk="; + hash = "sha256-SfMqGQKJtPTMSv4B70jOvTAIzNQc0AC16mum4fuNch4="; }; format = "other"; @@ -54,8 +54,10 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ bibtexparser + numpy pdfminer-six pexpect + pillow pycairo pygobject3 pyxdg diff --git a/pkgs/applications/editors/standardnotes/src.json b/pkgs/applications/editors/standardnotes/src.json index ab59232d859e3..59c79721a6ef5 100644 --- a/pkgs/applications/editors/standardnotes/src.json +++ b/pkgs/applications/editors/standardnotes/src.json @@ -1,13 +1,13 @@ { - "version": "3.167.2", + "version": "3.173.4", "deb": { "x86_64-linux": { - "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.167.2/standard-notes-3.167.2-linux-amd64.deb", - "hash": "sha512-xW08R1oZm8lw8Iap/TT29WJCagmcQNWXzdSDY8pArG9Fjv8nm+DcV6paVL35Hj35Dk9CJdf1KxeTRB9JW6u3dg==" + "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.173.4/standard-notes-3.173.4-linux-amd64.deb", + "hash": "sha512-8GDzj7Xm61rF5xybLE74D4yMbT2HgEG0ez1gQio/qWtWSqY72+GSKWlCA+3wz8Mz2jThRDlka9s2fHBBUvG+fg==" }, "aarch64-linux": { - "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.167.2/standard-notes-3.167.2-linux-arm64.deb", - "hash": "sha512-ua0lg6aK++RDi4WyCYygHoQasYD4+I21ip5To9ImMN072vJSyAoz9gxs8HBF+uEl4/uUBdlMCQHEioYMeJCwbw==" + "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.173.4/standard-notes-3.173.4-linux-arm64.deb", + "hash": "sha512-yJ8yZK+RkPUzkjbscCXT5yv9BxeHGQsZsCrKwOJRdd/XbcVPnKWQm00JVZmMuz17d8rhm8Km/EW81JufZByM0Q==" } } } diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 0abb7db9d99d5..0179dabe39454 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "9.0.1811"; + version = "9.0.1897"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - hash = "sha256-b/fATWaHcIZIvkmr/UQ4R45ii9N0kWJMb7DerF/JYIA="; + hash = "sha256-ywxJ9evXWbqZ6o6EqDIQWK16J05McAdvPl0Y9cW5Zvc="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index 8440d1fd6d9c2..ce83128e98b10 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -180,7 +180,7 @@ stdenv.mkDerivation { description = "Vim - the text editor - for macOS"; homepage = "https://github.com/macvim-dev/macvim"; license = licenses.vim; - maintainers = with maintainers; [ cstrahan lilyball ]; + maintainers = with maintainers; [ lilyball ]; platforms = platforms.darwin; hydraPlatforms = []; # hydra can't build this as long as we rely on Xcode and sandboxProfile }; diff --git a/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix b/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix index 20641908115c2..1611adc97ee3b 100644 --- a/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix +++ b/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix @@ -16,8 +16,8 @@ rec { , namePrefix ? "vimplugin-" , src , unpackPhase ? "" - , configurePhase ? "" - , buildPhase ? "" + , configurePhase ? ":" + , buildPhase ? ":" , preInstall ? "" , postInstall ? "" , path ? "." @@ -48,9 +48,4 @@ rec { in addRtp (toVimPlugin drv); - buildVimPluginFrom2Nix = attrs: buildVimPlugin ({ - # vim plugins may override this - buildPhase = ":"; - configurePhase = ":"; - } // attrs); } diff --git a/pkgs/applications/editors/vim/plugins/default.nix b/pkgs/applications/editors/vim/plugins/default.nix index cf35e31736ee2..e557cd7effe3a 100644 --- a/pkgs/applications/editors/vim/plugins/default.nix +++ b/pkgs/applications/editors/vim/plugins/default.nix @@ -7,14 +7,14 @@ let inherit (vimUtils.override {inherit vim;}) - buildVimPluginFrom2Nix; + buildVimPlugin; inherit (lib) extends; initialPackages = self: { }; plugins = callPackage ./generated.nix { - inherit buildVimPluginFrom2Nix; + inherit buildVimPlugin; inherit (neovimUtils) buildNeovimPlugin; }; @@ -26,7 +26,7 @@ let # add to ./overrides.nix. overrides = callPackage ./overrides.nix { inherit (darwin.apple_sdk.frameworks) Cocoa CoreFoundation CoreServices; - inherit buildVimPluginFrom2Nix; + inherit buildVimPlugin; inherit llvmPackages luaPackages; }; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 40a7667ea1e0f..f529df13170a2 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1,9 +1,9 @@ # GENERATED by ./pkgs/applications/editors/vim/plugins/update.py. Do not edit! -{ lib, buildVimPluginFrom2Nix, buildNeovimPlugin, fetchFromGitHub, fetchgit }: +{ lib, buildVimPlugin, buildNeovimPlugin, fetchFromGitHub, fetchgit }: final: prev: { - BetterLua-vim = buildVimPluginFrom2Nix { + BetterLua-vim = buildVimPlugin { pname = "BetterLua.vim"; version = "2020-08-14"; src = fetchFromGitHub { @@ -15,7 +15,7 @@ final: prev: meta.homepage = "https://github.com/euclidianAce/BetterLua.vim/"; }; - BufOnly-vim = buildVimPluginFrom2Nix { + BufOnly-vim = buildVimPlugin { pname = "BufOnly.vim"; version = "2010-10-18"; src = fetchFromGitHub { @@ -27,7 +27,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/BufOnly.vim/"; }; - ChatGPT-nvim = buildVimPluginFrom2Nix { + ChatGPT-nvim = buildVimPlugin { pname = "ChatGPT.nvim"; version = "2023-09-14"; src = fetchFromGitHub { @@ -39,7 +39,7 @@ final: prev: meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/"; }; - CheckAttach = buildVimPluginFrom2Nix { + CheckAttach = buildVimPlugin { pname = "CheckAttach"; version = "2019-05-08"; src = fetchFromGitHub { @@ -51,7 +51,7 @@ final: prev: meta.homepage = "https://github.com/chrisbra/CheckAttach/"; }; - Colour-Sampler-Pack = buildVimPluginFrom2Nix { + Colour-Sampler-Pack = buildVimPlugin { pname = "Colour-Sampler-Pack"; version = "2012-11-30"; src = fetchFromGitHub { @@ -63,19 +63,19 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/Colour-Sampler-Pack/"; }; - Coqtail = buildVimPluginFrom2Nix { + Coqtail = buildVimPlugin { pname = "Coqtail"; - version = "2023-08-05"; + version = "2023-09-17"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "dfe3939c9caff69d9af76bfd74f1a40fb7dc5609"; - sha256 = "0av2m075n6z05ah9ndrgnp9s16yrz6n2lj0igd9fh3c5k41x5xks"; + rev = "6462fb4b41215fac4558608c4d944074075ceb17"; + sha256 = "06c8w36bvgnspn7frmldrvxl40108pbfrn0spzympyg03c693swr"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; - DoxygenToolkit-vim = buildVimPluginFrom2Nix { + DoxygenToolkit-vim = buildVimPlugin { pname = "DoxygenToolkit.vim"; version = "2010-11-06"; src = fetchFromGitHub { @@ -87,7 +87,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/DoxygenToolkit.vim/"; }; - FTerm-nvim = buildVimPluginFrom2Nix { + FTerm-nvim = buildVimPlugin { pname = "FTerm.nvim"; version = "2022-11-13"; src = fetchFromGitHub { @@ -99,7 +99,7 @@ final: prev: meta.homepage = "https://github.com/numToStr/FTerm.nvim/"; }; - FixCursorHold-nvim = buildVimPluginFrom2Nix { + FixCursorHold-nvim = buildVimPlugin { pname = "FixCursorHold.nvim"; version = "2023-02-13"; src = fetchFromGitHub { @@ -111,7 +111,7 @@ final: prev: meta.homepage = "https://github.com/antoinemadec/FixCursorHold.nvim/"; }; - Improved-AnsiEsc = buildVimPluginFrom2Nix { + Improved-AnsiEsc = buildVimPlugin { pname = "Improved-AnsiEsc"; version = "2015-08-26"; src = fetchFromGitHub { @@ -123,7 +123,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/Improved-AnsiEsc/"; }; - Ionide-vim = buildVimPluginFrom2Nix { + Ionide-vim = buildVimPlugin { pname = "Ionide-vim"; version = "2023-07-17"; src = fetchFromGitHub { @@ -135,7 +135,7 @@ final: prev: meta.homepage = "https://github.com/ionide/Ionide-vim/"; }; - Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix { + Jenkinsfile-vim-syntax = buildVimPlugin { pname = "Jenkinsfile-vim-syntax"; version = "2021-01-26"; src = fetchFromGitHub { @@ -147,7 +147,7 @@ final: prev: meta.homepage = "https://github.com/martinda/Jenkinsfile-vim-syntax/"; }; - LanguageClient-neovim = buildVimPluginFrom2Nix { + LanguageClient-neovim = buildVimPlugin { pname = "LanguageClient-neovim"; version = "2022-06-07"; src = fetchFromGitHub { @@ -159,7 +159,7 @@ final: prev: meta.homepage = "https://github.com/autozimu/LanguageClient-neovim/"; }; - LanguageTool-nvim = buildVimPluginFrom2Nix { + LanguageTool-nvim = buildVimPlugin { pname = "LanguageTool.nvim"; version = "2020-10-19"; src = fetchFromGitHub { @@ -171,31 +171,31 @@ final: prev: meta.homepage = "https://github.com/vigoux/LanguageTool.nvim/"; }; - LazyVim = buildVimPluginFrom2Nix { + LazyVim = buildVimPlugin { pname = "LazyVim"; - version = "2023-09-04"; + version = "2023-10-01"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "a72a84972d85e5bbc6b9d60a0983b37efef21b8a"; - sha256 = "15j0aq3x8n22a7r5kw7mynch82527xgjlj4z03kzyrfwagnrnjf3"; + rev = "dd95de5dbe31ecb106305920cbd0e24e26c17afe"; + sha256 = "1vmh1b8mwpwvfyigxhc5pnda1ddyccqgjz3jmn2pm101bwgg6424"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; }; - LeaderF = buildVimPluginFrom2Nix { + LeaderF = buildVimPlugin { pname = "LeaderF"; - version = "2023-09-15"; + version = "2023-09-25"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "9c4451d2c1a6ea1f32e39fe52d58f6f5655b231d"; - sha256 = "1czr6nbwdba4m9yd1y892za5bkhx58m9svkz36g2blpma7cq65lw"; + rev = "a77f45791edeaa82fa75c5959ca73a59d7549549"; + sha256 = "1pw6jk6qlgba87gcdr7iawmbyfa48qy5zf63ghrrddfh1850gxsj"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; - MatchTagAlways = buildVimPluginFrom2Nix { + MatchTagAlways = buildVimPlugin { pname = "MatchTagAlways"; version = "2017-05-20"; src = fetchFromGitHub { @@ -207,7 +207,7 @@ final: prev: meta.homepage = "https://github.com/Valloric/MatchTagAlways/"; }; - Navigator-nvim = buildVimPluginFrom2Nix { + Navigator-nvim = buildVimPlugin { pname = "Navigator.nvim"; version = "2023-02-02"; src = fetchFromGitHub { @@ -219,7 +219,7 @@ final: prev: meta.homepage = "https://github.com/numToStr/Navigator.nvim/"; }; - NeoSolarized = buildVimPluginFrom2Nix { + NeoSolarized = buildVimPlugin { pname = "NeoSolarized"; version = "2020-08-07"; src = fetchFromGitHub { @@ -231,7 +231,7 @@ final: prev: meta.homepage = "https://github.com/overcache/NeoSolarized/"; }; - NrrwRgn = buildVimPluginFrom2Nix { + NrrwRgn = buildVimPlugin { pname = "NrrwRgn"; version = "2022-02-13"; src = fetchFromGitHub { @@ -243,7 +243,7 @@ final: prev: meta.homepage = "https://github.com/chrisbra/NrrwRgn/"; }; - PreserveNoEOL = buildVimPluginFrom2Nix { + PreserveNoEOL = buildVimPlugin { pname = "PreserveNoEOL"; version = "2013-06-14"; src = fetchFromGitHub { @@ -255,7 +255,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/PreserveNoEOL/"; }; - QFEnter = buildVimPluginFrom2Nix { + QFEnter = buildVimPlugin { pname = "QFEnter"; version = "2022-10-15"; src = fetchFromGitHub { @@ -267,7 +267,7 @@ final: prev: meta.homepage = "https://github.com/yssl/QFEnter/"; }; - Recover-vim = buildVimPluginFrom2Nix { + Recover-vim = buildVimPlugin { pname = "Recover.vim"; version = "2022-09-07"; src = fetchFromGitHub { @@ -279,7 +279,7 @@ final: prev: meta.homepage = "https://github.com/chrisbra/Recover.vim/"; }; - Rename = buildVimPluginFrom2Nix { + Rename = buildVimPlugin { pname = "Rename"; version = "2011-08-31"; src = fetchFromGitHub { @@ -291,7 +291,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/Rename/"; }; - ReplaceWithRegister = buildVimPluginFrom2Nix { + ReplaceWithRegister = buildVimPlugin { pname = "ReplaceWithRegister"; version = "2014-10-31"; src = fetchFromGitHub { @@ -303,19 +303,19 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/ReplaceWithRegister/"; }; - SchemaStore-nvim = buildVimPluginFrom2Nix { + SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "2023-09-15"; + version = "2023-09-30"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "2a6a5d3e2bc8a5727b6d083d2920d12a392ed05b"; - sha256 = "097nqimjz2c5g0rsbbvp36haga334sfrlpqvfwwp8zyxxkgh7n77"; + rev = "daf2f4397e97c0f12b89068eec35078c61069ceb"; + sha256 = "1yzg8qld4w4xzdb0v3vls47kf753d8d8lfcsz6fl40sprwdfj8px"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; - Shade-nvim = buildVimPluginFrom2Nix { + Shade-nvim = buildVimPlugin { pname = "Shade.nvim"; version = "2022-02-01"; src = fetchFromGitHub { @@ -327,7 +327,7 @@ final: prev: meta.homepage = "https://github.com/sunjon/Shade.nvim/"; }; - ShowMultiBase = buildVimPluginFrom2Nix { + ShowMultiBase = buildVimPlugin { pname = "ShowMultiBase"; version = "2010-10-18"; src = fetchFromGitHub { @@ -339,7 +339,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/ShowMultiBase/"; }; - SimpylFold = buildVimPluginFrom2Nix { + SimpylFold = buildVimPlugin { pname = "SimpylFold"; version = "2022-05-02"; src = fetchFromGitHub { @@ -351,7 +351,7 @@ final: prev: meta.homepage = "https://github.com/tmhedberg/SimpylFold/"; }; - SmartCase = buildVimPluginFrom2Nix { + SmartCase = buildVimPlugin { pname = "SmartCase"; version = "2010-10-18"; src = fetchFromGitHub { @@ -363,7 +363,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/SmartCase/"; }; - SpaceCamp = buildVimPluginFrom2Nix { + SpaceCamp = buildVimPlugin { pname = "SpaceCamp"; version = "2023-08-25"; src = fetchFromGitHub { @@ -375,19 +375,19 @@ final: prev: meta.homepage = "https://github.com/jaredgorski/SpaceCamp/"; }; - SpaceVim = buildVimPluginFrom2Nix { + SpaceVim = buildVimPlugin { pname = "SpaceVim"; - version = "2023-09-16"; + version = "2023-09-23"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "92395fbeae1ba673aa618e673e731cefa0effa5b"; - sha256 = "10rhrxq866rlkbh24c5khnk6lkm78370smd6dph4pa5mrx6dbqjn"; + rev = "f7151f55a9e9b96e332d7cc1e0febdcae6198356"; + sha256 = "155d7b0vgqcsdayry8gz7sz2l3wlabh1pp6jksanjbfcq3gydvxn"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; - SudoEdit-vim = buildVimPluginFrom2Nix { + SudoEdit-vim = buildVimPlugin { pname = "SudoEdit.vim"; version = "2023-04-25"; src = fetchFromGitHub { @@ -399,7 +399,7 @@ final: prev: meta.homepage = "https://github.com/chrisbra/SudoEdit.vim/"; }; - VimOrganizer = buildVimPluginFrom2Nix { + VimOrganizer = buildVimPlugin { pname = "VimOrganizer"; version = "2020-12-15"; src = fetchFromGitHub { @@ -411,7 +411,7 @@ final: prev: meta.homepage = "https://github.com/hsitz/VimOrganizer/"; }; - Vundle-vim = buildVimPluginFrom2Nix { + Vundle-vim = buildVimPlugin { pname = "Vundle.vim"; version = "2023-08-19"; src = fetchFromGitHub { @@ -423,7 +423,7 @@ final: prev: meta.homepage = "https://github.com/VundleVim/Vundle.vim/"; }; - YUNOcommit-vim = buildVimPluginFrom2Nix { + YUNOcommit-vim = buildVimPlugin { pname = "YUNOcommit.vim"; version = "2014-11-26"; src = fetchFromGitHub { @@ -435,7 +435,7 @@ final: prev: meta.homepage = "https://github.com/esneider/YUNOcommit.vim/"; }; - YankRing-vim = buildVimPluginFrom2Nix { + YankRing-vim = buildVimPlugin { pname = "YankRing.vim"; version = "2015-07-29"; src = fetchFromGitHub { @@ -447,20 +447,20 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/YankRing.vim/"; }; - YouCompleteMe = buildVimPluginFrom2Nix { + YouCompleteMe = buildVimPlugin { pname = "YouCompleteMe"; - version = "2023-09-14"; + version = "2023-09-27"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "91ee858de446a150c10cf2aacaeed90db9235880"; - sha256 = "08qhz4c5kl8y1r5ikk5174y738fai1s3s6sy114f2fmggx8130nq"; + rev = "3367b9b4a921b673ffe88454ac838f272375e0b2"; + sha256 = "1mqzvnrjf8r9s1g5ah7mfxxl5hcj2jp0phak45h0vvb7g185951w"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; }; - a-vim = buildVimPluginFrom2Nix { + a-vim = buildVimPlugin { pname = "a.vim"; version = "2010-11-06"; src = fetchFromGitHub { @@ -472,7 +472,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/a.vim/"; }; - ack-vim = buildVimPluginFrom2Nix { + ack-vim = buildVimPlugin { pname = "ack.vim"; version = "2018-02-27"; src = fetchFromGitHub { @@ -484,7 +484,7 @@ final: prev: meta.homepage = "https://github.com/mileszs/ack.vim/"; }; - acp = buildVimPluginFrom2Nix { + acp = buildVimPlugin { pname = "acp"; version = "2013-02-05"; src = fetchFromGitHub { @@ -496,7 +496,7 @@ final: prev: meta.homepage = "https://github.com/eikenb/acp/"; }; - actions-preview-nvim = buildVimPluginFrom2Nix { + actions-preview-nvim = buildVimPlugin { pname = "actions-preview.nvim"; version = "2023-08-23"; src = fetchFromGitHub { @@ -508,7 +508,7 @@ final: prev: meta.homepage = "https://github.com/aznhe21/actions-preview.nvim/"; }; - adwaita-nvim = buildVimPluginFrom2Nix { + adwaita-nvim = buildVimPlugin { pname = "adwaita.nvim"; version = "2023-06-22"; src = fetchFromGitHub { @@ -520,20 +520,20 @@ final: prev: meta.homepage = "https://github.com/Mofiqul/adwaita.nvim/"; }; - aerial-nvim = buildVimPluginFrom2Nix { + aerial-nvim = buildVimPlugin { pname = "aerial.nvim"; - version = "2023-09-16"; + version = "2023-09-29"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "bed048ddef3e7b7fd992bc3a28c413aaa25d63de"; - sha256 = "08x46r1k87wrf8bdlbzbnv4czrn4qq1hp7apl7q13gmp1dyf3llm"; + rev = "551a2b679f265917990207e6d8de28018d55f437"; + sha256 = "07jaqdqdd46q2y4n5vbfkg6v7wxyhiy035fi1wrjyvb1rfil766b"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; }; - ag-nvim = buildVimPluginFrom2Nix { + ag-nvim = buildVimPlugin { pname = "ag.nvim"; version = "2021-07-15"; src = fetchFromGitHub { @@ -545,7 +545,7 @@ final: prev: meta.homepage = "https://github.com/Numkil/ag.nvim/"; }; - agda-vim = buildVimPluginFrom2Nix { + agda-vim = buildVimPlugin { pname = "agda-vim"; version = "2021-10-28"; src = fetchFromGitHub { @@ -557,7 +557,7 @@ final: prev: meta.homepage = "https://github.com/derekelkins/agda-vim/"; }; - ai-vim = buildVimPluginFrom2Nix { + ai-vim = buildVimPlugin { pname = "ai.vim"; version = "2023-04-05"; src = fetchFromGitHub { @@ -569,7 +569,7 @@ final: prev: meta.homepage = "https://github.com/aduros/ai.vim/"; }; - alchemist-vim = buildVimPluginFrom2Nix { + alchemist-vim = buildVimPlugin { pname = "alchemist.vim"; version = "2023-09-01"; src = fetchFromGitHub { @@ -581,19 +581,19 @@ final: prev: meta.homepage = "https://github.com/slashmili/alchemist.vim/"; }; - ale = buildVimPluginFrom2Nix { + ale = buildVimPlugin { pname = "ale"; - version = "2023-09-16"; + version = "2023-09-17"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "cf270a1adadff2fa8b2931940ef8192b975f1ee4"; - sha256 = "1pbfb2jp6ygwy3k22aihsdshh5nr0bz0s5n596nn9b875l5q3fzc"; + rev = "53b01d6a546384a28f1ccbed41baae58d7341da4"; + sha256 = "1jqsxgys7285m99y553ydvf0cwdkm98s0mi6mnmghzv3q7d9ngik"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; - align = buildVimPluginFrom2Nix { + align = buildVimPlugin { pname = "align"; version = "2012-08-08"; src = fetchFromGitHub { @@ -605,7 +605,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/align/"; }; - alpha-nvim = buildVimPluginFrom2Nix { + alpha-nvim = buildVimPlugin { pname = "alpha-nvim"; version = "2023-09-14"; src = fetchFromGitHub { @@ -617,7 +617,7 @@ final: prev: meta.homepage = "https://github.com/goolord/alpha-nvim/"; }; - aniseed = buildVimPluginFrom2Nix { + aniseed = buildVimPlugin { pname = "aniseed"; version = "2023-07-06"; src = fetchFromGitHub { @@ -629,7 +629,7 @@ final: prev: meta.homepage = "https://github.com/Olical/aniseed/"; }; - ansible-vim = buildVimPluginFrom2Nix { + ansible-vim = buildVimPlugin { pname = "ansible-vim"; version = "2022-02-11"; src = fetchFromGitHub { @@ -641,7 +641,7 @@ final: prev: meta.homepage = "https://github.com/pearofducks/ansible-vim/"; }; - antonys-macro-repeater = buildVimPluginFrom2Nix { + antonys-macro-repeater = buildVimPlugin { pname = "antonys-macro-repeater"; version = "2017-09-10"; src = fetchFromGitHub { @@ -653,7 +653,7 @@ final: prev: meta.homepage = "https://github.com/ckarnell/antonys-macro-repeater/"; }; - arcanist-vim = buildVimPluginFrom2Nix { + arcanist-vim = buildVimPlugin { pname = "arcanist.vim"; version = "2016-05-27"; src = fetchFromGitHub { @@ -665,7 +665,7 @@ final: prev: meta.homepage = "https://github.com/solarnz/arcanist.vim/"; }; - argtextobj-vim = buildVimPluginFrom2Nix { + argtextobj-vim = buildVimPlugin { pname = "argtextobj.vim"; version = "2010-10-18"; src = fetchFromGitHub { @@ -677,7 +677,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/argtextobj.vim/"; }; - async-vim = buildVimPluginFrom2Nix { + async-vim = buildVimPlugin { pname = "async.vim"; version = "2022-04-04"; src = fetchFromGitHub { @@ -689,7 +689,7 @@ final: prev: meta.homepage = "https://github.com/prabirshrestha/async.vim/"; }; - asyncomplete-buffer-vim = buildVimPluginFrom2Nix { + asyncomplete-buffer-vim = buildVimPlugin { pname = "asyncomplete-buffer.vim"; version = "2020-06-26"; src = fetchFromGitHub { @@ -701,7 +701,7 @@ final: prev: meta.homepage = "https://github.com/prabirshrestha/asyncomplete-buffer.vim/"; }; - asyncomplete-file-vim = buildVimPluginFrom2Nix { + asyncomplete-file-vim = buildVimPlugin { pname = "asyncomplete-file.vim"; version = "2022-07-11"; src = fetchFromGitHub { @@ -713,7 +713,7 @@ final: prev: meta.homepage = "https://github.com/prabirshrestha/asyncomplete-file.vim/"; }; - asyncomplete-lsp-vim = buildVimPluginFrom2Nix { + asyncomplete-lsp-vim = buildVimPlugin { pname = "asyncomplete-lsp.vim"; version = "2022-11-21"; src = fetchFromGitHub { @@ -725,7 +725,7 @@ final: prev: meta.homepage = "https://github.com/prabirshrestha/asyncomplete-lsp.vim/"; }; - asyncomplete-omni-vim = buildVimPluginFrom2Nix { + asyncomplete-omni-vim = buildVimPlugin { pname = "asyncomplete-omni.vim"; version = "2018-04-04"; src = fetchFromGitHub { @@ -737,7 +737,7 @@ final: prev: meta.homepage = "https://github.com/prabirshrestha/asyncomplete-omni.vim/"; }; - asyncomplete-tags-vim = buildVimPluginFrom2Nix { + asyncomplete-tags-vim = buildVimPlugin { pname = "asyncomplete-tags.vim"; version = "2021-04-29"; src = fetchFromGitHub { @@ -749,7 +749,7 @@ final: prev: meta.homepage = "https://github.com/prabirshrestha/asyncomplete-tags.vim/"; }; - asyncomplete-ultisnips-vim = buildVimPluginFrom2Nix { + asyncomplete-ultisnips-vim = buildVimPlugin { pname = "asyncomplete-ultisnips.vim"; version = "2023-01-13"; src = fetchFromGitHub { @@ -761,7 +761,7 @@ final: prev: meta.homepage = "https://github.com/prabirshrestha/asyncomplete-ultisnips.vim/"; }; - asyncomplete-vim = buildVimPluginFrom2Nix { + asyncomplete-vim = buildVimPlugin { pname = "asyncomplete.vim"; version = "2023-04-11"; src = fetchFromGitHub { @@ -773,31 +773,31 @@ final: prev: meta.homepage = "https://github.com/prabirshrestha/asyncomplete.vim/"; }; - asyncrun-vim = buildVimPluginFrom2Nix { + asyncrun-vim = buildVimPlugin { pname = "asyncrun.vim"; - version = "2023-08-20"; + version = "2023-09-26"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asyncrun.vim"; - rev = "42385d54b8546c163b946fd50eed2103ef7993c9"; - sha256 = "1brqg6315z4rwsjv28yf86lynzshzpwxys248mpfzyhkz5jfad1y"; + rev = "61cc3081963a12048e00e89f8cedc8bd1cb83b8c"; + sha256 = "1l86kk0ha6yw3i285xaizzrgxvnxf95q0ys44glz8mns1z2jq4zk"; }; meta.homepage = "https://github.com/skywind3000/asyncrun.vim/"; }; - asynctasks-vim = buildVimPluginFrom2Nix { + asynctasks-vim = buildVimPlugin { pname = "asynctasks.vim"; - version = "2023-09-16"; + version = "2023-09-21"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asynctasks.vim"; - rev = "15daa3b70b2b8b78cfbf04dd070b962ab1283406"; - sha256 = "1cwn0fbf0xh7zp7v13qbpfx1hyvy7m9ixn8wxwyrqzx5xhf6xj3j"; + rev = "7b77b195a4297d3e4c9dde01c20aa6be17e3fcf3"; + sha256 = "0bvchmk1pdfjmyidf393chmc17y0v6zq92p3ac7dpwyiz01c360l"; }; meta.homepage = "https://github.com/skywind3000/asynctasks.vim/"; }; - ats-vim = buildVimPluginFrom2Nix { + ats-vim = buildVimPlugin { pname = "ats-vim"; version = "2020-09-04"; src = fetchFromGitHub { @@ -809,7 +809,7 @@ final: prev: meta.homepage = "https://github.com/vmchale/ats-vim/"; }; - aurora = buildVimPluginFrom2Nix { + aurora = buildVimPlugin { pname = "aurora"; version = "2023-09-09"; src = fetchFromGitHub { @@ -821,7 +821,7 @@ final: prev: meta.homepage = "https://github.com/ray-x/aurora/"; }; - auto-git-diff = buildVimPluginFrom2Nix { + auto-git-diff = buildVimPlugin { pname = "auto-git-diff"; version = "2022-10-29"; src = fetchFromGitHub { @@ -833,7 +833,7 @@ final: prev: meta.homepage = "https://github.com/hotwatermorning/auto-git-diff/"; }; - auto-hlsearch-nvim = buildVimPluginFrom2Nix { + auto-hlsearch-nvim = buildVimPlugin { pname = "auto-hlsearch.nvim"; version = "2023-03-04"; src = fetchFromGitHub { @@ -845,7 +845,7 @@ final: prev: meta.homepage = "https://github.com/asiryk/auto-hlsearch.nvim/"; }; - auto-pairs = buildVimPluginFrom2Nix { + auto-pairs = buildVimPlugin { pname = "auto-pairs"; version = "2019-02-27"; src = fetchFromGitHub { @@ -857,7 +857,7 @@ final: prev: meta.homepage = "https://github.com/jiangmiao/auto-pairs/"; }; - auto-save-nvim = buildVimPluginFrom2Nix { + auto-save-nvim = buildVimPlugin { pname = "auto-save.nvim"; version = "2022-11-01"; src = fetchFromGitHub { @@ -869,7 +869,7 @@ final: prev: meta.homepage = "https://github.com/pocco81/auto-save.nvim/"; }; - auto-session = buildVimPluginFrom2Nix { + auto-session = buildVimPlugin { pname = "auto-session"; version = "2023-08-29"; src = fetchFromGitHub { @@ -881,7 +881,7 @@ final: prev: meta.homepage = "https://github.com/rmagatti/auto-session/"; }; - autoclose-nvim = buildVimPluginFrom2Nix { + autoclose-nvim = buildVimPlugin { pname = "autoclose.nvim"; version = "2023-09-16"; src = fetchFromGitHub { @@ -893,7 +893,7 @@ final: prev: meta.homepage = "https://github.com/m4xshen/autoclose.nvim/"; }; - autoload_cscope-vim = buildVimPluginFrom2Nix { + autoload_cscope-vim = buildVimPlugin { pname = "autoload_cscope.vim"; version = "2011-01-28"; src = fetchFromGitHub { @@ -905,7 +905,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/autoload_cscope.vim/"; }; - autosave-nvim = buildVimPluginFrom2Nix { + autosave-nvim = buildVimPlugin { pname = "autosave.nvim"; version = "2022-10-13"; src = fetchFromGitHub { @@ -917,7 +917,7 @@ final: prev: meta.homepage = "https://github.com/nullishamy/autosave.nvim/"; }; - awesome-vim-colorschemes = buildVimPluginFrom2Nix { + awesome-vim-colorschemes = buildVimPlugin { pname = "awesome-vim-colorschemes"; version = "2023-05-06"; src = fetchFromGitHub { @@ -929,7 +929,7 @@ final: prev: meta.homepage = "https://github.com/rafi/awesome-vim-colorschemes/"; }; - ayu-vim = buildVimPluginFrom2Nix { + ayu-vim = buildVimPlugin { pname = "ayu-vim"; version = "2020-05-29"; src = fetchFromGitHub { @@ -941,7 +941,7 @@ final: prev: meta.homepage = "https://github.com/ayu-theme/ayu-vim/"; }; - b64-nvim = buildVimPluginFrom2Nix { + b64-nvim = buildVimPlugin { pname = "b64.nvim"; version = "2023-04-12"; src = fetchFromGitHub { @@ -953,7 +953,7 @@ final: prev: meta.homepage = "https://github.com/taybart/b64.nvim/"; }; - barbar-nvim = buildVimPluginFrom2Nix { + barbar-nvim = buildVimPlugin { pname = "barbar.nvim"; version = "2023-09-14"; src = fetchFromGitHub { @@ -965,7 +965,7 @@ final: prev: meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; - barbecue-nvim = buildVimPluginFrom2Nix { + barbecue-nvim = buildVimPlugin { pname = "barbecue.nvim"; version = "2023-09-13"; src = fetchFromGitHub { @@ -977,7 +977,7 @@ final: prev: meta.homepage = "https://github.com/utilyre/barbecue.nvim/"; }; - base16-vim = buildVimPluginFrom2Nix { + base16-vim = buildVimPlugin { pname = "base16-vim"; version = "2022-09-20"; src = fetchFromGitHub { @@ -989,19 +989,19 @@ final: prev: meta.homepage = "https://github.com/chriskempson/base16-vim/"; }; - base46 = buildVimPluginFrom2Nix { + base46 = buildVimPlugin { pname = "base46"; - version = "2023-09-14"; + version = "2023-10-01"; src = fetchFromGitHub { owner = "nvchad"; repo = "base46"; - rev = "fc7aafe0d0348323d3fd41689cde95af86d4c7ba"; - sha256 = "0b0r9hf7a7a4ipsqcc7q97ijk8p5a9lq9kqh93a92kq1x2qhlf2j"; + rev = "104510cb339071f4350acdc30d1630ce15dca8b1"; + sha256 = "0bwgdvfvwikvlbb97n0iddpk3bw6nwl02596nb567s4xkijx91nk"; }; meta.homepage = "https://github.com/nvchad/base46/"; }; - bat-vim = buildVimPluginFrom2Nix { + bat-vim = buildVimPlugin { pname = "bat.vim"; version = "2022-11-14"; src = fetchFromGitHub { @@ -1013,7 +1013,7 @@ final: prev: meta.homepage = "https://github.com/jamespwilliams/bat.vim/"; }; - bats-vim = buildVimPluginFrom2Nix { + bats-vim = buildVimPlugin { pname = "bats.vim"; version = "2013-07-03"; src = fetchFromGitHub { @@ -1025,7 +1025,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/bats.vim/"; }; - bclose-vim = buildVimPluginFrom2Nix { + bclose-vim = buildVimPlugin { pname = "bclose.vim"; version = "2018-10-10"; src = fetchFromGitHub { @@ -1037,7 +1037,7 @@ final: prev: meta.homepage = "https://github.com/rbgrouleff/bclose.vim/"; }; - better-escape-nvim = buildVimPluginFrom2Nix { + better-escape-nvim = buildVimPlugin { pname = "better-escape.nvim"; version = "2023-05-02"; src = fetchFromGitHub { @@ -1049,7 +1049,7 @@ final: prev: meta.homepage = "https://github.com/max397574/better-escape.nvim/"; }; - bigfile-nvim = buildVimPluginFrom2Nix { + bigfile-nvim = buildVimPlugin { pname = "bigfile.nvim"; version = "2023-06-28"; src = fetchFromGitHub { @@ -1061,19 +1061,19 @@ final: prev: meta.homepage = "https://github.com/LunarVim/bigfile.nvim/"; }; - blamer-nvim = buildVimPluginFrom2Nix { + blamer-nvim = buildVimPlugin { pname = "blamer.nvim"; - version = "2021-11-17"; + version = "2023-09-19"; src = fetchFromGitHub { owner = "APZelos"; repo = "blamer.nvim"; - rev = "f4eb22a9013642c411725fdda945ae45f8d93181"; - sha256 = "1czjagkfjw57f2nvjjgbma1gcy1ylcd68dyfc5ivr2wc6fdw5lks"; + rev = "e0d43c11697300eb68f00d69df8b87deb0bf52dc"; + sha256 = "1r88z0320lsv1q0bhnf8hgzi2qp1a6s1fb198zypc5m0kf410n3v"; }; meta.homepage = "https://github.com/APZelos/blamer.nvim/"; }; - block-nvim = buildVimPluginFrom2Nix { + block-nvim = buildVimPlugin { pname = "block.nvim"; version = "2023-06-22"; src = fetchFromGitHub { @@ -1085,7 +1085,7 @@ final: prev: meta.homepage = "https://github.com/HampusHauffman/block.nvim/"; }; - blueballs-neovim = buildVimPluginFrom2Nix { + blueballs-neovim = buildVimPlugin { pname = "blueballs-neovim"; version = "2021-11-28"; src = fetchFromGitHub { @@ -1097,7 +1097,7 @@ final: prev: meta.homepage = "https://github.com/blueballs-theme/blueballs-neovim/"; }; - boole-nvim = buildVimPluginFrom2Nix { + boole-nvim = buildVimPlugin { pname = "boole.nvim"; version = "2023-07-08"; src = fetchFromGitHub { @@ -1109,7 +1109,7 @@ final: prev: meta.homepage = "https://github.com/nat-418/boole.nvim/"; }; - bracey-vim = buildVimPluginFrom2Nix { + bracey-vim = buildVimPlugin { pname = "bracey.vim"; version = "2021-08-20"; src = fetchFromGitHub { @@ -1121,7 +1121,7 @@ final: prev: meta.homepage = "https://github.com/turbio/bracey.vim/"; }; - brainfuck-vim = buildVimPluginFrom2Nix { + brainfuck-vim = buildVimPlugin { pname = "brainfuck-vim"; version = "2021-01-28"; src = fetchFromGitHub { @@ -1133,7 +1133,7 @@ final: prev: meta.homepage = "https://github.com/fruit-in/brainfuck-vim/"; }; - bufdelete-nvim = buildVimPluginFrom2Nix { + bufdelete-nvim = buildVimPlugin { pname = "bufdelete.nvim"; version = "2023-06-29"; src = fetchFromGitHub { @@ -1145,7 +1145,7 @@ final: prev: meta.homepage = "https://github.com/famiu/bufdelete.nvim/"; }; - bufexplorer = buildVimPluginFrom2Nix { + bufexplorer = buildVimPlugin { pname = "bufexplorer"; version = "2023-05-02"; src = fetchFromGitHub { @@ -1157,7 +1157,7 @@ final: prev: meta.homepage = "https://github.com/jlanzarotta/bufexplorer/"; }; - bufferize-vim = buildVimPluginFrom2Nix { + bufferize-vim = buildVimPlugin { pname = "bufferize.vim"; version = "2023-02-25"; src = fetchFromGitHub { @@ -1169,19 +1169,19 @@ final: prev: meta.homepage = "https://github.com/AndrewRadev/bufferize.vim/"; }; - bufferline-nvim = buildVimPluginFrom2Nix { + bufferline-nvim = buildVimPlugin { pname = "bufferline.nvim"; - version = "2023-08-29"; + version = "2023-09-20"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "9961d87bb3ec008213c46ba14b3f384a5f520eb5"; - sha256 = "0g521d6ngl7wajipqpksarxld0pwdk7878yjw64j7lc6p80si3js"; + rev = "6ecd37e0fa8b156099daedd2191130e083fb1490"; + sha256 = "1b70xycm9ggqdqbqhkl2ch6k3r3qsww9zvnl2cs9198lr1f2j0ri"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; - bufjump-nvim = buildVimPluginFrom2Nix { + bufjump-nvim = buildVimPlugin { pname = "bufjump.nvim"; version = "2021-12-05"; src = fetchFromGitHub { @@ -1193,7 +1193,7 @@ final: prev: meta.homepage = "https://github.com/kwkarlwang/bufjump.nvim/"; }; - bullets-vim = buildVimPluginFrom2Nix { + bullets-vim = buildVimPlugin { pname = "bullets.vim"; version = "2022-10-10"; src = fetchFromGitHub { @@ -1205,7 +1205,7 @@ final: prev: meta.homepage = "https://github.com/dkarter/bullets.vim/"; }; - calendar-vim = buildVimPluginFrom2Nix { + calendar-vim = buildVimPlugin { pname = "calendar.vim"; version = "2023-03-02"; src = fetchFromGitHub { @@ -1217,7 +1217,7 @@ final: prev: meta.homepage = "https://github.com/itchyny/calendar.vim/"; }; - camelcasemotion = buildVimPluginFrom2Nix { + camelcasemotion = buildVimPlugin { pname = "camelcasemotion"; version = "2019-12-02"; src = fetchFromGitHub { @@ -1229,7 +1229,7 @@ final: prev: meta.homepage = "https://github.com/bkad/camelcasemotion/"; }; - caw-vim = buildVimPluginFrom2Nix { + caw-vim = buildVimPlugin { pname = "caw.vim"; version = "2023-03-16"; src = fetchFromGitHub { @@ -1241,19 +1241,19 @@ final: prev: meta.homepage = "https://github.com/tyru/caw.vim/"; }; - ccc-nvim = buildVimPluginFrom2Nix { + ccc-nvim = buildVimPlugin { pname = "ccc.nvim"; - version = "2023-06-12"; + version = "2023-09-26"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "ccc.nvim"; - rev = "4a0ddaf787cc82796e84ab8a7f70d086f250aeb6"; - sha256 = "1qm3dp7w2rqnyvgsrn0j7s14nw2a1z7dfhyawkvzslsv6z4z4njg"; + rev = "b7ae63e2f4fdf7540ce3f42dd1ec5a27b9930560"; + sha256 = "01l2rlrmcl72fb0i39wzny9216x8p11mi24g1pgd4ayipx057i68"; }; meta.homepage = "https://github.com/uga-rosa/ccc.nvim/"; }; - chadtree = buildVimPluginFrom2Nix { + chadtree = buildVimPlugin { pname = "chadtree"; version = "2023-09-05"; src = fetchFromGitHub { @@ -1265,7 +1265,7 @@ final: prev: meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; - changeColorScheme-vim = buildVimPluginFrom2Nix { + changeColorScheme-vim = buildVimPlugin { pname = "changeColorScheme.vim"; version = "2010-10-18"; src = fetchFromGitHub { @@ -1277,7 +1277,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/changeColorScheme.vim/"; }; - cheatsheet-nvim = buildVimPluginFrom2Nix { + cheatsheet-nvim = buildVimPlugin { pname = "cheatsheet.nvim"; version = "2021-12-23"; src = fetchFromGitHub { @@ -1289,7 +1289,7 @@ final: prev: meta.homepage = "https://github.com/sudormrfbin/cheatsheet.nvim/"; }; - ci_dark = buildVimPluginFrom2Nix { + ci_dark = buildVimPlugin { pname = "ci_dark"; version = "2022-03-27"; src = fetchFromGitHub { @@ -1301,7 +1301,7 @@ final: prev: meta.homepage = "https://github.com/yunlingz/ci_dark/"; }; - circles-nvim = buildVimPluginFrom2Nix { + circles-nvim = buildVimPlugin { pname = "circles.nvim"; version = "2023-04-08"; src = fetchFromGitHub { @@ -1313,7 +1313,7 @@ final: prev: meta.homepage = "https://github.com/projekt0n/circles.nvim/"; }; - clang_complete = buildVimPluginFrom2Nix { + clang_complete = buildVimPlugin { pname = "clang_complete"; version = "2022-11-30"; src = fetchFromGitHub { @@ -1325,7 +1325,7 @@ final: prev: meta.homepage = "https://github.com/xavierd/clang_complete/"; }; - clangd_extensions-nvim = buildVimPluginFrom2Nix { + clangd_extensions-nvim = buildVimPlugin { pname = "clangd_extensions.nvim"; version = "2023-09-08"; src = fetchFromGitHub { @@ -1337,7 +1337,7 @@ final: prev: meta.homepage = "https://github.com/p00f/clangd_extensions.nvim/"; }; - clever-f-vim = buildVimPluginFrom2Nix { + clever-f-vim = buildVimPlugin { pname = "clever-f.vim"; version = "2022-10-15"; src = fetchFromGitHub { @@ -1349,7 +1349,7 @@ final: prev: meta.homepage = "https://github.com/rhysd/clever-f.vim/"; }; - clighter8 = buildVimPluginFrom2Nix { + clighter8 = buildVimPlugin { pname = "clighter8"; version = "2018-07-25"; src = fetchFromGitHub { @@ -1361,7 +1361,7 @@ final: prev: meta.homepage = "https://github.com/bbchung/clighter8/"; }; - clipboard-image-nvim = buildVimPluginFrom2Nix { + clipboard-image-nvim = buildVimPlugin { pname = "clipboard-image.nvim"; version = "2022-11-10"; src = fetchFromGitHub { @@ -1373,7 +1373,7 @@ final: prev: meta.homepage = "https://github.com/ekickx/clipboard-image.nvim/"; }; - close-buffers-vim = buildVimPluginFrom2Nix { + close-buffers-vim = buildVimPlugin { pname = "close-buffers.vim"; version = "2020-09-23"; src = fetchFromGitHub { @@ -1385,7 +1385,7 @@ final: prev: meta.homepage = "https://github.com/asheq/close-buffers.vim/"; }; - cmd-parser-nvim = buildVimPluginFrom2Nix { + cmd-parser-nvim = buildVimPlugin { pname = "cmd-parser.nvim"; version = "2022-02-23"; src = fetchFromGitHub { @@ -1397,7 +1397,7 @@ final: prev: meta.homepage = "https://github.com/winston0410/cmd-parser.nvim/"; }; - cmp-async-path = buildVimPluginFrom2Nix { + cmp-async-path = buildVimPlugin { pname = "cmp-async-path"; version = "2023-01-16"; src = fetchFromGitHub { @@ -1409,7 +1409,7 @@ final: prev: meta.homepage = "https://github.com/FelipeLema/cmp-async-path/"; }; - cmp-beancount = buildVimPluginFrom2Nix { + cmp-beancount = buildVimPlugin { pname = "cmp-beancount"; version = "2022-11-27"; src = fetchFromGitHub { @@ -1421,7 +1421,7 @@ final: prev: meta.homepage = "https://github.com/crispgm/cmp-beancount/"; }; - cmp-buffer = buildVimPluginFrom2Nix { + cmp-buffer = buildVimPlugin { pname = "cmp-buffer"; version = "2022-08-10"; src = fetchFromGitHub { @@ -1433,7 +1433,7 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-buffer/"; }; - cmp-calc = buildVimPluginFrom2Nix { + cmp-calc = buildVimPlugin { pname = "cmp-calc"; version = "2023-08-18"; src = fetchFromGitHub { @@ -1445,7 +1445,7 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-calc/"; }; - cmp-clippy = buildVimPluginFrom2Nix { + cmp-clippy = buildVimPlugin { pname = "cmp-clippy"; version = "2023-02-08"; src = fetchFromGitHub { @@ -1457,7 +1457,7 @@ final: prev: meta.homepage = "https://github.com/vappolinario/cmp-clippy/"; }; - cmp-cmdline = buildVimPluginFrom2Nix { + cmp-cmdline = buildVimPlugin { pname = "cmp-cmdline"; version = "2023-06-08"; src = fetchFromGitHub { @@ -1469,7 +1469,7 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-cmdline/"; }; - cmp-cmdline-history = buildVimPluginFrom2Nix { + cmp-cmdline-history = buildVimPlugin { pname = "cmp-cmdline-history"; version = "2022-05-04"; src = fetchFromGitHub { @@ -1481,7 +1481,7 @@ final: prev: meta.homepage = "https://github.com/dmitmel/cmp-cmdline-history/"; }; - cmp-conjure = buildVimPluginFrom2Nix { + cmp-conjure = buildVimPlugin { pname = "cmp-conjure"; version = "2023-06-22"; src = fetchFromGitHub { @@ -1493,7 +1493,7 @@ final: prev: meta.homepage = "https://github.com/PaterJason/cmp-conjure/"; }; - cmp-conventionalcommits = buildVimPluginFrom2Nix { + cmp-conventionalcommits = buildVimPlugin { pname = "cmp-conventionalcommits"; version = "2022-10-16"; src = fetchFromGitHub { @@ -1505,7 +1505,7 @@ final: prev: meta.homepage = "https://github.com/davidsierradz/cmp-conventionalcommits/"; }; - cmp-copilot = buildVimPluginFrom2Nix { + cmp-copilot = buildVimPlugin { pname = "cmp-copilot"; version = "2022-04-11"; src = fetchFromGitHub { @@ -1517,7 +1517,7 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-copilot/"; }; - cmp-dap = buildVimPluginFrom2Nix { + cmp-dap = buildVimPlugin { pname = "cmp-dap"; version = "2022-11-13"; src = fetchFromGitHub { @@ -1529,7 +1529,7 @@ final: prev: meta.homepage = "https://github.com/rcarriga/cmp-dap/"; }; - cmp-dictionary = buildVimPluginFrom2Nix { + cmp-dictionary = buildVimPlugin { pname = "cmp-dictionary"; version = "2023-08-30"; src = fetchFromGitHub { @@ -1541,7 +1541,7 @@ final: prev: meta.homepage = "https://github.com/uga-rosa/cmp-dictionary/"; }; - cmp-digraphs = buildVimPluginFrom2Nix { + cmp-digraphs = buildVimPlugin { pname = "cmp-digraphs"; version = "2021-12-13"; src = fetchFromGitHub { @@ -1553,7 +1553,7 @@ final: prev: meta.homepage = "https://github.com/dmitmel/cmp-digraphs/"; }; - cmp-emoji = buildVimPluginFrom2Nix { + cmp-emoji = buildVimPlugin { pname = "cmp-emoji"; version = "2021-09-28"; src = fetchFromGitHub { @@ -1565,7 +1565,7 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-emoji/"; }; - cmp-fish = buildVimPluginFrom2Nix { + cmp-fish = buildVimPlugin { pname = "cmp-fish"; version = "2022-09-01"; src = fetchFromGitHub { @@ -1577,7 +1577,7 @@ final: prev: meta.homepage = "https://github.com/mtoohey31/cmp-fish/"; }; - cmp-fuzzy-buffer = buildVimPluginFrom2Nix { + cmp-fuzzy-buffer = buildVimPlugin { pname = "cmp-fuzzy-buffer"; version = "2023-04-02"; src = fetchFromGitHub { @@ -1589,7 +1589,7 @@ final: prev: meta.homepage = "https://github.com/tzachar/cmp-fuzzy-buffer/"; }; - cmp-fuzzy-path = buildVimPluginFrom2Nix { + cmp-fuzzy-path = buildVimPlugin { pname = "cmp-fuzzy-path"; version = "2023-06-18"; src = fetchFromGitHub { @@ -1601,7 +1601,7 @@ final: prev: meta.homepage = "https://github.com/tzachar/cmp-fuzzy-path/"; }; - cmp-git = buildVimPluginFrom2Nix { + cmp-git = buildVimPlugin { pname = "cmp-git"; version = "2023-05-30"; src = fetchFromGitHub { @@ -1613,7 +1613,7 @@ final: prev: meta.homepage = "https://github.com/petertriho/cmp-git/"; }; - cmp-greek = buildVimPluginFrom2Nix { + cmp-greek = buildVimPlugin { pname = "cmp-greek"; version = "2022-01-10"; src = fetchFromGitHub { @@ -1625,7 +1625,7 @@ final: prev: meta.homepage = "https://github.com/max397574/cmp-greek/"; }; - cmp-latex-symbols = buildVimPluginFrom2Nix { + cmp-latex-symbols = buildVimPlugin { pname = "cmp-latex-symbols"; version = "2023-01-23"; src = fetchFromGitHub { @@ -1637,7 +1637,7 @@ final: prev: meta.homepage = "https://github.com/kdheepak/cmp-latex-symbols/"; }; - cmp-look = buildVimPluginFrom2Nix { + cmp-look = buildVimPlugin { pname = "cmp-look"; version = "2022-06-26"; src = fetchFromGitHub { @@ -1649,7 +1649,7 @@ final: prev: meta.homepage = "https://github.com/octaltree/cmp-look/"; }; - cmp-neosnippet = buildVimPluginFrom2Nix { + cmp-neosnippet = buildVimPlugin { pname = "cmp-neosnippet"; version = "2022-01-06"; src = fetchFromGitHub { @@ -1661,7 +1661,7 @@ final: prev: meta.homepage = "https://github.com/notomo/cmp-neosnippet/"; }; - cmp-npm = buildVimPluginFrom2Nix { + cmp-npm = buildVimPlugin { pname = "cmp-npm"; version = "2023-06-12"; src = fetchFromGitHub { @@ -1673,7 +1673,7 @@ final: prev: meta.homepage = "https://github.com/David-Kunz/cmp-npm/"; }; - cmp-nvim-lsp = buildVimPluginFrom2Nix { + cmp-nvim-lsp = buildVimPlugin { pname = "cmp-nvim-lsp"; version = "2023-06-23"; src = fetchFromGitHub { @@ -1685,7 +1685,7 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp/"; }; - cmp-nvim-lsp-document-symbol = buildVimPluginFrom2Nix { + cmp-nvim-lsp-document-symbol = buildVimPlugin { pname = "cmp-nvim-lsp-document-symbol"; version = "2023-04-01"; src = fetchFromGitHub { @@ -1697,7 +1697,7 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp-document-symbol/"; }; - cmp-nvim-lsp-signature-help = buildVimPluginFrom2Nix { + cmp-nvim-lsp-signature-help = buildVimPlugin { pname = "cmp-nvim-lsp-signature-help"; version = "2023-02-03"; src = fetchFromGitHub { @@ -1709,7 +1709,7 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp-signature-help/"; }; - cmp-nvim-lua = buildVimPluginFrom2Nix { + cmp-nvim-lua = buildVimPlugin { pname = "cmp-nvim-lua"; version = "2023-04-14"; src = fetchFromGitHub { @@ -1721,7 +1721,7 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lua/"; }; - cmp-nvim-tags = buildVimPluginFrom2Nix { + cmp-nvim-tags = buildVimPlugin { pname = "cmp-nvim-tags"; version = "2023-05-10"; src = fetchFromGitHub { @@ -1733,7 +1733,7 @@ final: prev: meta.homepage = "https://github.com/quangnguyen30192/cmp-nvim-tags/"; }; - cmp-nvim-ultisnips = buildVimPluginFrom2Nix { + cmp-nvim-ultisnips = buildVimPlugin { pname = "cmp-nvim-ultisnips"; version = "2023-07-05"; src = fetchFromGitHub { @@ -1745,19 +1745,19 @@ final: prev: meta.homepage = "https://github.com/quangnguyen30192/cmp-nvim-ultisnips/"; }; - cmp-omni = buildVimPluginFrom2Nix { + cmp-omni = buildVimPlugin { pname = "cmp-omni"; - version = "2023-05-25"; + version = "2023-09-24"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-omni"; - rev = "9436e6cdd7c5dfa24a99a60d9280b24dbdea3649"; - sha256 = "0jypzs5y9pq55db5jkmvshlx4lzi82mxcfr53nsb0nd3xr38ywxd"; + rev = "4ef610bbd85a5ee4e97e09450c0daecbdc60de86"; + sha256 = "17963f45rly6p4jl47v7dsvqc02wj36mq7qx5mkmzqmrpwcrj81z"; }; meta.homepage = "https://github.com/hrsh7th/cmp-omni/"; }; - cmp-pandoc-references = buildVimPluginFrom2Nix { + cmp-pandoc-references = buildVimPlugin { pname = "cmp-pandoc-references"; version = "2022-04-20"; src = fetchFromGitHub { @@ -1769,7 +1769,7 @@ final: prev: meta.homepage = "https://github.com/jc-doyle/cmp-pandoc-references/"; }; - cmp-pandoc-nvim = buildVimPluginFrom2Nix { + cmp-pandoc-nvim = buildVimPlugin { pname = "cmp-pandoc.nvim"; version = "2023-03-03"; src = fetchFromGitHub { @@ -1781,7 +1781,7 @@ final: prev: meta.homepage = "https://github.com/aspeddro/cmp-pandoc.nvim/"; }; - cmp-path = buildVimPluginFrom2Nix { + cmp-path = buildVimPlugin { pname = "cmp-path"; version = "2022-10-03"; src = fetchFromGitHub { @@ -1793,7 +1793,7 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-path/"; }; - cmp-rg = buildVimPluginFrom2Nix { + cmp-rg = buildVimPlugin { pname = "cmp-rg"; version = "2023-09-01"; src = fetchFromGitHub { @@ -1805,7 +1805,7 @@ final: prev: meta.homepage = "https://github.com/lukas-reineke/cmp-rg/"; }; - cmp-snippy = buildVimPluginFrom2Nix { + cmp-snippy = buildVimPlugin { pname = "cmp-snippy"; version = "2023-06-15"; src = fetchFromGitHub { @@ -1817,19 +1817,19 @@ final: prev: meta.homepage = "https://github.com/dcampos/cmp-snippy/"; }; - cmp-spell = buildVimPluginFrom2Nix { + cmp-spell = buildVimPlugin { pname = "cmp-spell"; - version = "2022-10-10"; + version = "2023-09-20"; src = fetchFromGitHub { owner = "f3fora"; repo = "cmp-spell"; - rev = "60584cb75e5e8bba5a0c9e4c3ab0791e0698bffa"; - sha256 = "1lzv8wbq1w45pbig7lcgyj46nmz4gkag7b37j72p04bixr7wgabv"; + rev = "32a0867efa59b43edbb2db67b0871cfad90c9b66"; + sha256 = "1yr2cq1b6di4k93pjlshkkf4phhd3lzmkm0s679j35crzgwhxnbd"; }; meta.homepage = "https://github.com/f3fora/cmp-spell/"; }; - cmp-tabnine = buildVimPluginFrom2Nix { + cmp-tabnine = buildVimPlugin { pname = "cmp-tabnine"; version = "2023-05-09"; src = fetchFromGitHub { @@ -1841,7 +1841,7 @@ final: prev: meta.homepage = "https://github.com/tzachar/cmp-tabnine/"; }; - cmp-tmux = buildVimPluginFrom2Nix { + cmp-tmux = buildVimPlugin { pname = "cmp-tmux"; version = "2023-09-02"; src = fetchFromGitHub { @@ -1853,7 +1853,7 @@ final: prev: meta.homepage = "https://github.com/andersevenrud/cmp-tmux/"; }; - cmp-treesitter = buildVimPluginFrom2Nix { + cmp-treesitter = buildVimPlugin { pname = "cmp-treesitter"; version = "2023-04-06"; src = fetchFromGitHub { @@ -1865,7 +1865,7 @@ final: prev: meta.homepage = "https://github.com/ray-x/cmp-treesitter/"; }; - cmp-under-comparator = buildVimPluginFrom2Nix { + cmp-under-comparator = buildVimPlugin { pname = "cmp-under-comparator"; version = "2021-11-11"; src = fetchFromGitHub { @@ -1877,7 +1877,7 @@ final: prev: meta.homepage = "https://github.com/lukas-reineke/cmp-under-comparator/"; }; - cmp-vim-lsp = buildVimPluginFrom2Nix { + cmp-vim-lsp = buildVimPlugin { pname = "cmp-vim-lsp"; version = "2021-10-26"; src = fetchFromGitHub { @@ -1889,7 +1889,7 @@ final: prev: meta.homepage = "https://github.com/dmitmel/cmp-vim-lsp/"; }; - cmp-vimwiki-tags = buildVimPluginFrom2Nix { + cmp-vimwiki-tags = buildVimPlugin { pname = "cmp-vimwiki-tags"; version = "2022-04-25"; src = fetchFromGitHub { @@ -1901,7 +1901,7 @@ final: prev: meta.homepage = "https://github.com/pontusk/cmp-vimwiki-tags/"; }; - cmp-vsnip = buildVimPluginFrom2Nix { + cmp-vsnip = buildVimPlugin { pname = "cmp-vsnip"; version = "2022-11-22"; src = fetchFromGitHub { @@ -1913,7 +1913,7 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-vsnip/"; }; - cmp-zsh = buildVimPluginFrom2Nix { + cmp-zsh = buildVimPlugin { pname = "cmp-zsh"; version = "2022-10-03"; src = fetchFromGitHub { @@ -1925,7 +1925,7 @@ final: prev: meta.homepage = "https://github.com/tamago324/cmp-zsh/"; }; - cmp_luasnip = buildVimPluginFrom2Nix { + cmp_luasnip = buildVimPlugin { pname = "cmp_luasnip"; version = "2022-10-28"; src = fetchFromGitHub { @@ -1937,7 +1937,7 @@ final: prev: meta.homepage = "https://github.com/saadparwaiz1/cmp_luasnip/"; }; - coc-clap = buildVimPluginFrom2Nix { + coc-clap = buildVimPlugin { pname = "coc-clap"; version = "2021-09-18"; src = fetchFromGitHub { @@ -1949,7 +1949,7 @@ final: prev: meta.homepage = "https://github.com/vn-ki/coc-clap/"; }; - coc-denite = buildVimPluginFrom2Nix { + coc-denite = buildVimPlugin { pname = "coc-denite"; version = "2021-02-24"; src = fetchFromGitHub { @@ -1961,7 +1961,7 @@ final: prev: meta.homepage = "https://github.com/neoclide/coc-denite/"; }; - coc-fzf = buildVimPluginFrom2Nix { + coc-fzf = buildVimPlugin { pname = "coc-fzf"; version = "2023-01-30"; src = fetchFromGitHub { @@ -1973,7 +1973,7 @@ final: prev: meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; - coc-lua = buildVimPluginFrom2Nix { + coc-lua = buildVimPlugin { pname = "coc-lua"; version = "2023-02-22"; src = fetchFromGitHub { @@ -1985,7 +1985,7 @@ final: prev: meta.homepage = "https://github.com/josa42/coc-lua/"; }; - coc-neco = buildVimPluginFrom2Nix { + coc-neco = buildVimPlugin { pname = "coc-neco"; version = "2020-04-07"; src = fetchFromGitHub { @@ -1997,7 +1997,7 @@ final: prev: meta.homepage = "https://github.com/neoclide/coc-neco/"; }; - coc-svelte = buildVimPluginFrom2Nix { + coc-svelte = buildVimPlugin { pname = "coc-svelte"; version = "2022-03-14"; src = fetchFromGitHub { @@ -2009,7 +2009,7 @@ final: prev: meta.homepage = "https://github.com/coc-extensions/coc-svelte/"; }; - coc-tailwindcss = buildVimPluginFrom2Nix { + coc-tailwindcss = buildVimPlugin { pname = "coc-tailwindcss"; version = "2020-08-19"; src = fetchFromGitHub { @@ -2021,19 +2021,19 @@ final: prev: meta.homepage = "https://github.com/iamcco/coc-tailwindcss/"; }; - coc-nvim = buildVimPluginFrom2Nix { + coc-nvim = buildVimPlugin { pname = "coc.nvim"; - version = "2023-09-15"; + version = "2023-09-30"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "b4735a634aa397491fd6adcebd7deff501592f62"; - sha256 = "1yvyrdv95xskklv6dmpq656bhy5hixfswzymfcxqqchhz7w7nc7q"; + rev = "7b9e1ef0a1399907c51d23b6080b94a5aba4a654"; + sha256 = "10gdqqz71gbna9wy3awbncbn7m0g6wfn1256bx7ga8b3bsl3nmch"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; - coconut-vim = buildVimPluginFrom2Nix { + coconut-vim = buildVimPlugin { pname = "coconut.vim"; version = "2017-10-10"; src = fetchFromGitHub { @@ -2045,31 +2045,31 @@ final: prev: meta.homepage = "https://github.com/manicmaniac/coconut.vim/"; }; - codeium-vim = buildVimPluginFrom2Nix { + codeium-vim = buildVimPlugin { pname = "codeium.vim"; - version = "2023-09-15"; + version = "2023-09-26"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.vim"; - rev = "45dd945883c2ff87553d78710797ad7a2602b269"; - sha256 = "042ah6laxrjlghc9nd7b1116qghh750x6qh9gg9apbha4w5zcpxx"; + rev = "bee5429aba9bc1df9cb15a2f10fea06ce87a47be"; + sha256 = "0lnrpxrggy9gds2968iwyyg3m0z07gi9x1fbc5z56girh44vs816"; }; meta.homepage = "https://github.com/Exafunction/codeium.vim/"; }; - codewindow-nvim = buildVimPluginFrom2Nix { + codewindow-nvim = buildVimPlugin { pname = "codewindow.nvim"; - version = "2023-07-23"; + version = "2023-09-23"; src = fetchFromGitHub { owner = "gorbit99"; repo = "codewindow.nvim"; - rev = "11fb5520898d22a563fe6a124a61c0d2887f3d3f"; - sha256 = "1rnw5z3vwc183gvk3v3xciyzgqwfp0jsd5vckj5gpig1lg9l4yzf"; + rev = "8c8f5ff66e123491c946c04848d744fcdc7cac6c"; + sha256 = "18xlrphibm5f49l04wrjzaxb2xfdqmydrj2d4pi7z6vxny6rkvgy"; }; meta.homepage = "https://github.com/gorbit99/codewindow.nvim/"; }; - codi-vim = buildVimPluginFrom2Nix { + codi-vim = buildVimPlugin { pname = "codi.vim"; version = "2023-02-28"; src = fetchFromGitHub { @@ -2081,7 +2081,7 @@ final: prev: meta.homepage = "https://github.com/metakirby5/codi.vim/"; }; - colorbuddy-nvim = buildVimPluginFrom2Nix { + colorbuddy-nvim = buildVimPlugin { pname = "colorbuddy.nvim"; version = "2022-02-28"; src = fetchFromGitHub { @@ -2093,7 +2093,7 @@ final: prev: meta.homepage = "https://github.com/tjdevries/colorbuddy.nvim/"; }; - colorizer = buildVimPluginFrom2Nix { + colorizer = buildVimPlugin { pname = "colorizer"; version = "2022-01-03"; src = fetchFromGitHub { @@ -2105,19 +2105,19 @@ final: prev: meta.homepage = "https://github.com/lilydjwg/colorizer/"; }; - com-cloudedmountain-ide-neovim = buildVimPluginFrom2Nix { + com-cloudedmountain-ide-neovim = buildVimPlugin { pname = "com.cloudedmountain.ide.neovim"; - version = "2023-01-07"; + version = "2023-09-25"; src = fetchFromGitHub { owner = "Domeee"; repo = "com.cloudedmountain.ide.neovim"; - rev = "d479b806f06cd6714e321cf88e94aae858e8274e"; - sha256 = "0nwp8drcy1bxd493gmi3bz41yw0avpvbfwx9dq03x9kxsjc81rsz"; + rev = "ade9b58e458049949dbd308a4d0554c3f20f5e4d"; + sha256 = "00sf0d5yd1xmfgzr6vf988qm10cdx2arxvvm4r4gy9pcqqfwgm18"; }; meta.homepage = "https://github.com/Domeee/com.cloudedmountain.ide.neovim/"; }; - command-t = buildVimPluginFrom2Nix { + command-t = buildVimPlugin { pname = "command-t"; version = "2023-08-07"; src = fetchFromGitHub { @@ -2129,7 +2129,7 @@ final: prev: meta.homepage = "https://github.com/wincent/command-t/"; }; - comment-nvim = buildVimPluginFrom2Nix { + comment-nvim = buildVimPlugin { pname = "comment.nvim"; version = "2023-08-07"; src = fetchFromGitHub { @@ -2141,7 +2141,7 @@ final: prev: meta.homepage = "https://github.com/numtostr/comment.nvim/"; }; - committia-vim = buildVimPluginFrom2Nix { + committia-vim = buildVimPlugin { pname = "committia.vim"; version = "2021-11-24"; src = fetchFromGitHub { @@ -2153,7 +2153,7 @@ final: prev: meta.homepage = "https://github.com/rhysd/committia.vim/"; }; - compe-conjure = buildVimPluginFrom2Nix { + compe-conjure = buildVimPlugin { pname = "compe-conjure"; version = "2020-12-06"; src = fetchFromGitHub { @@ -2165,7 +2165,7 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/compe-conjure/"; }; - compe-latex-symbols = buildVimPluginFrom2Nix { + compe-latex-symbols = buildVimPlugin { pname = "compe-latex-symbols"; version = "2021-05-14"; src = fetchFromGitHub { @@ -2177,7 +2177,7 @@ final: prev: meta.homepage = "https://github.com/GoldsteinE/compe-latex-symbols/"; }; - compe-tabnine = buildVimPluginFrom2Nix { + compe-tabnine = buildVimPlugin { pname = "compe-tabnine"; version = "2021-09-14"; src = fetchFromGitHub { @@ -2189,7 +2189,7 @@ final: prev: meta.homepage = "https://github.com/tzachar/compe-tabnine/"; }; - compe-zsh = buildVimPluginFrom2Nix { + compe-zsh = buildVimPlugin { pname = "compe-zsh"; version = "2021-04-03"; src = fetchFromGitHub { @@ -2201,7 +2201,7 @@ final: prev: meta.homepage = "https://github.com/tamago324/compe-zsh/"; }; - compiler-explorer-nvim = buildVimPluginFrom2Nix { + compiler-explorer-nvim = buildVimPlugin { pname = "compiler-explorer.nvim"; version = "2023-05-29"; src = fetchFromGitHub { @@ -2213,7 +2213,7 @@ final: prev: meta.homepage = "https://github.com/krady21/compiler-explorer.nvim/"; }; - completion-buffers = buildVimPluginFrom2Nix { + completion-buffers = buildVimPlugin { pname = "completion-buffers"; version = "2021-01-17"; src = fetchFromGitHub { @@ -2225,7 +2225,7 @@ final: prev: meta.homepage = "https://github.com/steelsojka/completion-buffers/"; }; - completion-nvim = buildVimPluginFrom2Nix { + completion-nvim = buildVimPlugin { pname = "completion-nvim"; version = "2021-10-12"; src = fetchFromGitHub { @@ -2237,7 +2237,7 @@ final: prev: meta.homepage = "https://github.com/nvim-lua/completion-nvim/"; }; - completion-tabnine = buildVimPluginFrom2Nix { + completion-tabnine = buildVimPlugin { pname = "completion-tabnine"; version = "2021-09-27"; src = fetchFromGitHub { @@ -2249,7 +2249,7 @@ final: prev: meta.homepage = "https://github.com/aca/completion-tabnine/"; }; - completion-treesitter = buildVimPluginFrom2Nix { + completion-treesitter = buildVimPlugin { pname = "completion-treesitter"; version = "2020-06-26"; src = fetchFromGitHub { @@ -2261,7 +2261,7 @@ final: prev: meta.homepage = "https://github.com/nvim-treesitter/completion-treesitter/"; }; - concealedyank-vim = buildVimPluginFrom2Nix { + concealedyank-vim = buildVimPlugin { pname = "concealedyank.vim"; version = "2013-03-24"; src = fetchFromGitHub { @@ -2273,7 +2273,7 @@ final: prev: meta.homepage = "https://github.com/chikatoike/concealedyank.vim/"; }; - conflict-marker-vim = buildVimPluginFrom2Nix { + conflict-marker-vim = buildVimPlugin { pname = "conflict-marker.vim"; version = "2022-11-01"; src = fetchFromGitHub { @@ -2285,7 +2285,7 @@ final: prev: meta.homepage = "https://github.com/rhysd/conflict-marker.vim/"; }; - conjure = buildVimPluginFrom2Nix { + conjure = buildVimPlugin { pname = "conjure"; version = "2023-08-27"; src = fetchFromGitHub { @@ -2297,7 +2297,7 @@ final: prev: meta.homepage = "https://github.com/Olical/conjure/"; }; - context-vim = buildVimPluginFrom2Nix { + context-vim = buildVimPlugin { pname = "context.vim"; version = "2023-06-13"; src = fetchFromGitHub { @@ -2309,7 +2309,7 @@ final: prev: meta.homepage = "https://github.com/wellle/context.vim/"; }; - context_filetype-vim = buildVimPluginFrom2Nix { + context_filetype-vim = buildVimPlugin { pname = "context_filetype.vim"; version = "2023-07-23"; src = fetchFromGitHub { @@ -2321,7 +2321,7 @@ final: prev: meta.homepage = "https://github.com/Shougo/context_filetype.vim/"; }; - copilot-cmp = buildVimPluginFrom2Nix { + copilot-cmp = buildVimPlugin { pname = "copilot-cmp"; version = "2023-09-09"; src = fetchFromGitHub { @@ -2333,31 +2333,31 @@ final: prev: meta.homepage = "https://github.com/zbirenbaum/copilot-cmp/"; }; - copilot-lua = buildVimPluginFrom2Nix { + copilot-lua = buildVimPlugin { pname = "copilot.lua"; - version = "2023-09-04"; + version = "2023-09-21"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot.lua"; - rev = "2c942f33ba5c621c906e625e00a1bb504b65e2f0"; - sha256 = "0dwvqf2spg0vg8vi5w2a75dyyl5s9kz3mgn9xbyp8a6pqdnvqfk1"; + rev = "1a8032ae496916ccc7a7a52ee79194fbef29f462"; + sha256 = "0a3k8nb39j0n14ylg84x8c6n8g4m7llx78vad2vz247wnyw4z9sj"; }; meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; }; - copilot-vim = buildVimPluginFrom2Nix { + copilot-vim = buildVimPlugin { pname = "copilot.vim"; - version = "2023-09-02"; + version = "2023-09-20"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "719dd8d0beab993dbad47a9e86ecb0dbd4a99da5"; - sha256 = "07shpmy4296mvcqzjs7hhaw1vg81rjncg6r1q8p1jxc6w5gq7b2g"; + rev = "998cf5ab1b85e844c7e8edb864a997e590df7182"; + sha256 = "1sf566vwyj21h9vbs64j8458v4ncqpmfb5cr74pyl59qi33yq1zd"; }; meta.homepage = "https://github.com/github/copilot.vim/"; }; - coq-artifacts = buildVimPluginFrom2Nix { + coq-artifacts = buildVimPlugin { pname = "coq.artifacts"; version = "2023-09-07"; src = fetchFromGitHub { @@ -2369,7 +2369,7 @@ final: prev: meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; - coq-thirdparty = buildVimPluginFrom2Nix { + coq-thirdparty = buildVimPlugin { pname = "coq.thirdparty"; version = "2023-08-27"; src = fetchFromGitHub { @@ -2381,7 +2381,7 @@ final: prev: meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; - coq-vim = buildVimPluginFrom2Nix { + coq-vim = buildVimPlugin { pname = "coq.vim"; version = "2013-01-16"; src = fetchFromGitHub { @@ -2393,7 +2393,7 @@ final: prev: meta.homepage = "https://github.com/jvoorhis/coq.vim/"; }; - coq_nvim = buildVimPluginFrom2Nix { + coq_nvim = buildVimPlugin { pname = "coq_nvim"; version = "2023-09-05"; src = fetchFromGitHub { @@ -2405,7 +2405,7 @@ final: prev: meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; - cosco-vim = buildVimPluginFrom2Nix { + cosco-vim = buildVimPlugin { pname = "cosco.vim"; version = "2018-08-07"; src = fetchFromGitHub { @@ -2417,7 +2417,7 @@ final: prev: meta.homepage = "https://github.com/lfilho/cosco.vim/"; }; - cpsm = buildVimPluginFrom2Nix { + cpsm = buildVimPlugin { pname = "cpsm"; version = "2021-07-25"; src = fetchFromGitHub { @@ -2429,19 +2429,19 @@ final: prev: meta.homepage = "https://github.com/nixprime/cpsm/"; }; - crates-nvim = buildVimPluginFrom2Nix { + crates-nvim = buildVimPlugin { pname = "crates.nvim"; - version = "2023-09-11"; + version = "2023-09-29"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "db629b5cfb2aa8de9e44efb795657297ee95ca91"; - sha256 = "00ndgfa070044sqjg41lxv26vvjahfa6b1ysydyccln9wa27n6nc"; + rev = "7e0e24b5c28c9fababf2b965f5840e6867c96848"; + sha256 = "0c1vykv382hbri0r86scxzh8665knam6nim2rh9nq8s4davxxjwn"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; - csapprox = buildVimPluginFrom2Nix { + csapprox = buildVimPlugin { pname = "csapprox"; version = "2013-07-27"; src = fetchFromGitHub { @@ -2453,7 +2453,7 @@ final: prev: meta.homepage = "https://github.com/godlygeek/csapprox/"; }; - csharpls-extended-lsp-nvim = buildVimPluginFrom2Nix { + csharpls-extended-lsp-nvim = buildVimPlugin { pname = "csharpls-extended-lsp.nvim"; version = "2022-07-15"; src = fetchFromGitHub { @@ -2465,19 +2465,19 @@ final: prev: meta.homepage = "https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/"; }; - csv-vim = buildVimPluginFrom2Nix { + csv-vim = buildVimPlugin { pname = "csv.vim"; - version = "2023-05-04"; + version = "2023-09-28"; src = fetchFromGitHub { owner = "chrisbra"; repo = "csv.vim"; - rev = "15ff93edf5b26c466affbb356e0696b7d6a3b499"; - sha256 = "0mjvy0lbcd3j5dnfq2575m29pbs8w3asdwmknhnk6by6aih3mdsj"; + rev = "4fd88346aed02123aa5daa1a363868a576c6fdcf"; + sha256 = "10c2hgzhnv1zr461hvp4cnxpfs0aja43whjimdsb5sjd4xk5x7cc"; }; meta.homepage = "https://github.com/chrisbra/csv.vim/"; }; - ctrlp-cmatcher = buildVimPluginFrom2Nix { + ctrlp-cmatcher = buildVimPlugin { pname = "ctrlp-cmatcher"; version = "2015-10-15"; src = fetchFromGitHub { @@ -2489,7 +2489,7 @@ final: prev: meta.homepage = "https://github.com/JazzCore/ctrlp-cmatcher/"; }; - ctrlp-py-matcher = buildVimPluginFrom2Nix { + ctrlp-py-matcher = buildVimPlugin { pname = "ctrlp-py-matcher"; version = "2021-09-20"; src = fetchFromGitHub { @@ -2501,7 +2501,7 @@ final: prev: meta.homepage = "https://github.com/FelikZ/ctrlp-py-matcher/"; }; - ctrlp-z = buildVimPluginFrom2Nix { + ctrlp-z = buildVimPlugin { pname = "ctrlp-z"; version = "2015-10-17"; src = fetchFromGitHub { @@ -2513,7 +2513,7 @@ final: prev: meta.homepage = "https://github.com/amiorin/ctrlp-z/"; }; - ctrlp-vim = buildVimPluginFrom2Nix { + ctrlp-vim = buildVimPlugin { pname = "ctrlp.vim"; version = "2023-07-16"; src = fetchFromGitHub { @@ -2525,7 +2525,7 @@ final: prev: meta.homepage = "https://github.com/ctrlpvim/ctrlp.vim/"; }; - dart-vim-plugin = buildVimPluginFrom2Nix { + dart-vim-plugin = buildVimPlugin { pname = "dart-vim-plugin"; version = "2023-07-18"; src = fetchFromGitHub { @@ -2537,7 +2537,7 @@ final: prev: meta.homepage = "https://github.com/dart-lang/dart-vim-plugin/"; }; - dash-vim = buildVimPluginFrom2Nix { + dash-vim = buildVimPlugin { pname = "dash.vim"; version = "2017-09-12"; src = fetchFromGitHub { @@ -2549,19 +2549,19 @@ final: prev: meta.homepage = "https://github.com/rizzatti/dash.vim/"; }; - dashboard-nvim = buildVimPluginFrom2Nix { + dashboard-nvim = buildVimPlugin { pname = "dashboard-nvim"; - version = "2023-09-09"; + version = "2023-09-30"; src = fetchFromGitHub { owner = "nvimdev"; repo = "dashboard-nvim"; - rev = "bbe0234168501b8ba46f24b4fb3cb7c5b88c0784"; - sha256 = "1876r48hxfz0x1ylkwr3ljgmls861rcjxx5rs686bqmdrwffm9lj"; + rev = "b2637e92a294068d79cde7929094f050981c5969"; + sha256 = "0y7s03in2y68c7n81q9a8mfba6s6dz2j8hp7a3kqldy8mhz4mqad"; }; meta.homepage = "https://github.com/nvimdev/dashboard-nvim/"; }; - defx-git = buildVimPluginFrom2Nix { + defx-git = buildVimPlugin { pname = "defx-git"; version = "2021-01-01"; src = fetchFromGitHub { @@ -2573,7 +2573,7 @@ final: prev: meta.homepage = "https://github.com/kristijanhusak/defx-git/"; }; - defx-icons = buildVimPluginFrom2Nix { + defx-icons = buildVimPlugin { pname = "defx-icons"; version = "2021-08-21"; src = fetchFromGitHub { @@ -2585,7 +2585,7 @@ final: prev: meta.homepage = "https://github.com/kristijanhusak/defx-icons/"; }; - defx-nvim = buildVimPluginFrom2Nix { + defx-nvim = buildVimPlugin { pname = "defx.nvim"; version = "2023-09-07"; src = fetchFromGitHub { @@ -2597,7 +2597,7 @@ final: prev: meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; - delimitMate = buildVimPluginFrom2Nix { + delimitMate = buildVimPlugin { pname = "delimitMate"; version = "2020-12-14"; src = fetchFromGitHub { @@ -2609,7 +2609,7 @@ final: prev: meta.homepage = "https://github.com/Raimondi/delimitMate/"; }; - denite-extra = buildVimPluginFrom2Nix { + denite-extra = buildVimPlugin { pname = "denite-extra"; version = "2019-03-29"; src = fetchFromGitHub { @@ -2621,7 +2621,7 @@ final: prev: meta.homepage = "https://github.com/neoclide/denite-extra/"; }; - denite-git = buildVimPluginFrom2Nix { + denite-git = buildVimPlugin { pname = "denite-git"; version = "2021-01-25"; src = fetchFromGitHub { @@ -2633,7 +2633,7 @@ final: prev: meta.homepage = "https://github.com/neoclide/denite-git/"; }; - denite-nvim = buildVimPluginFrom2Nix { + denite-nvim = buildVimPlugin { pname = "denite.nvim"; version = "2023-04-22"; src = fetchFromGitHub { @@ -2645,7 +2645,7 @@ final: prev: meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; - denops-vim = buildVimPluginFrom2Nix { + denops-vim = buildVimPlugin { pname = "denops.vim"; version = "2023-09-07"; src = fetchFromGitHub { @@ -2657,7 +2657,7 @@ final: prev: meta.homepage = "https://github.com/vim-denops/denops.vim/"; }; - deol-nvim = buildVimPluginFrom2Nix { + deol-nvim = buildVimPlugin { pname = "deol.nvim"; version = "2023-08-21"; src = fetchFromGitHub { @@ -2669,7 +2669,7 @@ final: prev: meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; - deoplete-clang = buildVimPluginFrom2Nix { + deoplete-clang = buildVimPlugin { pname = "deoplete-clang"; version = "2019-11-10"; src = fetchFromGitHub { @@ -2682,7 +2682,7 @@ final: prev: meta.homepage = "https://github.com/deoplete-plugins/deoplete-clang/"; }; - deoplete-dictionary = buildVimPluginFrom2Nix { + deoplete-dictionary = buildVimPlugin { pname = "deoplete-dictionary"; version = "2019-04-16"; src = fetchFromGitHub { @@ -2694,7 +2694,7 @@ final: prev: meta.homepage = "https://github.com/deoplete-plugins/deoplete-dictionary/"; }; - deoplete-fish = buildVimPluginFrom2Nix { + deoplete-fish = buildVimPlugin { pname = "deoplete-fish"; version = "2020-04-04"; src = fetchFromGitHub { @@ -2706,7 +2706,7 @@ final: prev: meta.homepage = "https://github.com/ponko2/deoplete-fish/"; }; - deoplete-github = buildVimPluginFrom2Nix { + deoplete-github = buildVimPlugin { pname = "deoplete-github"; version = "2018-03-04"; src = fetchFromGitHub { @@ -2718,7 +2718,7 @@ final: prev: meta.homepage = "https://github.com/SevereOverfl0w/deoplete-github/"; }; - deoplete-go = buildVimPluginFrom2Nix { + deoplete-go = buildVimPlugin { pname = "deoplete-go"; version = "2021-03-30"; src = fetchFromGitHub { @@ -2731,7 +2731,7 @@ final: prev: meta.homepage = "https://github.com/deoplete-plugins/deoplete-go/"; }; - deoplete-greek = buildVimPluginFrom2Nix { + deoplete-greek = buildVimPlugin { pname = "deoplete-greek"; version = "2019-12-23"; src = fetchFromGitHub { @@ -2743,7 +2743,7 @@ final: prev: meta.homepage = "https://github.com/Inazuma110/deoplete-greek/"; }; - deoplete-jedi = buildVimPluginFrom2Nix { + deoplete-jedi = buildVimPlugin { pname = "deoplete-jedi"; version = "2022-11-15"; src = fetchFromGitHub { @@ -2755,7 +2755,7 @@ final: prev: meta.homepage = "https://github.com/deoplete-plugins/deoplete-jedi/"; }; - deoplete-julia = buildVimPluginFrom2Nix { + deoplete-julia = buildVimPlugin { pname = "deoplete-julia"; version = "2018-06-11"; src = fetchFromGitHub { @@ -2767,7 +2767,7 @@ final: prev: meta.homepage = "https://github.com/JuliaEditorSupport/deoplete-julia/"; }; - deoplete-khard = buildVimPluginFrom2Nix { + deoplete-khard = buildVimPlugin { pname = "deoplete-khard"; version = "2020-09-18"; src = fetchFromGitHub { @@ -2779,7 +2779,7 @@ final: prev: meta.homepage = "https://github.com/nicoe/deoplete-khard/"; }; - deoplete-lsp = buildVimPluginFrom2Nix { + deoplete-lsp = buildVimPlugin { pname = "deoplete-lsp"; version = "2022-12-13"; src = fetchFromGitHub { @@ -2791,7 +2791,7 @@ final: prev: meta.homepage = "https://github.com/deoplete-plugins/deoplete-lsp/"; }; - deoplete-notmuch = buildVimPluginFrom2Nix { + deoplete-notmuch = buildVimPlugin { pname = "deoplete-notmuch"; version = "2018-12-11"; src = fetchFromGitHub { @@ -2803,7 +2803,7 @@ final: prev: meta.homepage = "https://github.com/Valodim/deoplete-notmuch/"; }; - deoplete-phpactor = buildVimPluginFrom2Nix { + deoplete-phpactor = buildVimPlugin { pname = "deoplete-phpactor"; version = "2020-09-12"; src = fetchFromGitHub { @@ -2815,7 +2815,7 @@ final: prev: meta.homepage = "https://github.com/kristijanhusak/deoplete-phpactor/"; }; - deoplete-rust = buildVimPluginFrom2Nix { + deoplete-rust = buildVimPlugin { pname = "deoplete-rust"; version = "2017-07-18"; src = fetchFromGitHub { @@ -2827,7 +2827,7 @@ final: prev: meta.homepage = "https://github.com/sebastianmarkow/deoplete-rust/"; }; - deoplete-tabnine = buildVimPluginFrom2Nix { + deoplete-tabnine = buildVimPlugin { pname = "deoplete-tabnine"; version = "2023-08-06"; src = fetchFromGitHub { @@ -2839,7 +2839,7 @@ final: prev: meta.homepage = "https://github.com/tbodt/deoplete-tabnine/"; }; - deoplete-ternjs = buildVimPluginFrom2Nix { + deoplete-ternjs = buildVimPlugin { pname = "deoplete-ternjs"; version = "2019-12-19"; src = fetchFromGitHub { @@ -2851,7 +2851,7 @@ final: prev: meta.homepage = "https://github.com/carlitux/deoplete-ternjs/"; }; - deoplete-vim-lsp = buildVimPluginFrom2Nix { + deoplete-vim-lsp = buildVimPlugin { pname = "deoplete-vim-lsp"; version = "2021-02-22"; src = fetchFromGitHub { @@ -2863,7 +2863,7 @@ final: prev: meta.homepage = "https://github.com/lighttiger2505/deoplete-vim-lsp/"; }; - deoplete-zsh = buildVimPluginFrom2Nix { + deoplete-zsh = buildVimPlugin { pname = "deoplete-zsh"; version = "2019-11-10"; src = fetchFromGitHub { @@ -2875,7 +2875,7 @@ final: prev: meta.homepage = "https://github.com/deoplete-plugins/deoplete-zsh/"; }; - deoplete-nvim = buildVimPluginFrom2Nix { + deoplete-nvim = buildVimPlugin { pname = "deoplete.nvim"; version = "2023-08-06"; src = fetchFromGitHub { @@ -2887,7 +2887,7 @@ final: prev: meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; - devdocs-vim = buildVimPluginFrom2Nix { + devdocs-vim = buildVimPlugin { pname = "devdocs.vim"; version = "2018-08-27"; src = fetchFromGitHub { @@ -2899,7 +2899,7 @@ final: prev: meta.homepage = "https://github.com/rhysd/devdocs.vim/"; }; - dhall-vim = buildVimPluginFrom2Nix { + dhall-vim = buildVimPlugin { pname = "dhall-vim"; version = "2021-06-05"; src = fetchFromGitHub { @@ -2911,7 +2911,7 @@ final: prev: meta.homepage = "https://github.com/vmchale/dhall-vim/"; }; - diaglist-nvim = buildVimPluginFrom2Nix { + diaglist-nvim = buildVimPlugin { pname = "diaglist.nvim"; version = "2022-09-01"; src = fetchFromGitHub { @@ -2923,7 +2923,7 @@ final: prev: meta.homepage = "https://github.com/onsails/diaglist.nvim/"; }; - diagnostic-nvim = buildVimPluginFrom2Nix { + diagnostic-nvim = buildVimPlugin { pname = "diagnostic-nvim"; version = "2020-11-13"; src = fetchFromGitHub { @@ -2935,7 +2935,7 @@ final: prev: meta.homepage = "https://github.com/nvim-lua/diagnostic-nvim/"; }; - dial-nvim = buildVimPluginFrom2Nix { + dial-nvim = buildVimPlugin { pname = "dial.nvim"; version = "2023-09-09"; src = fetchFromGitHub { @@ -2947,19 +2947,19 @@ final: prev: meta.homepage = "https://github.com/monaqa/dial.nvim/"; }; - diffview-nvim = buildVimPluginFrom2Nix { + diffview-nvim = buildVimPlugin { pname = "diffview.nvim"; - version = "2023-08-21"; + version = "2023-09-17"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "7e5a85c186027cab1e825d018f07c350177077fc"; - sha256 = "0jzlrk8dbijwzv5gc80s4bh3ji3bcxxdfffk5jbzlijjs76cpwl9"; + rev = "a111d19ccceac6530448d329c63f998f77b5626e"; + sha256 = "18g71p8k2ksfzh3hpm27ry9fd8vi6wkl5czwv3sag8cix1lkm56d"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; - dirbuf-nvim = buildVimPluginFrom2Nix { + dirbuf-nvim = buildVimPlugin { pname = "dirbuf.nvim"; version = "2022-08-28"; src = fetchFromGitHub { @@ -2971,7 +2971,7 @@ final: prev: meta.homepage = "https://github.com/elihunter173/dirbuf.nvim/"; }; - direnv-vim = buildVimPluginFrom2Nix { + direnv-vim = buildVimPlugin { pname = "direnv.vim"; version = "2023-06-26"; src = fetchFromGitHub { @@ -2983,7 +2983,7 @@ final: prev: meta.homepage = "https://github.com/direnv/direnv.vim/"; }; - distant-nvim = buildVimPluginFrom2Nix { + distant-nvim = buildVimPlugin { pname = "distant.nvim"; version = "2023-09-13"; src = fetchFromGitHub { @@ -2995,7 +2995,7 @@ final: prev: meta.homepage = "https://github.com/chipsenkbeil/distant.nvim/"; }; - doki-theme-vim = buildVimPluginFrom2Nix { + doki-theme-vim = buildVimPlugin { pname = "doki-theme-vim"; version = "2023-01-07"; src = fetchFromGitHub { @@ -3007,7 +3007,7 @@ final: prev: meta.homepage = "https://github.com/doki-theme/doki-theme-vim/"; }; - dracula-nvim = buildVimPluginFrom2Nix { + dracula-nvim = buildVimPlugin { pname = "dracula.nvim"; version = "2023-07-29"; src = fetchFromGitHub { @@ -3019,31 +3019,31 @@ final: prev: meta.homepage = "https://github.com/Mofiqul/dracula.nvim/"; }; - dressing-nvim = buildVimPluginFrom2Nix { + dressing-nvim = buildVimPlugin { pname = "dressing.nvim"; - version = "2023-09-05"; + version = "2023-09-30"; src = fetchFromGitHub { owner = "stevearc"; repo = "dressing.nvim"; - rev = "c1e1d5fa44fe08811b6ef4aadac2b50e602f9504"; - sha256 = "0kxal34ll2xqgaa9sc1pyh7481q1kcfkqsn356brfwf277hflr7a"; + rev = "8f4d62b7817455896a3c73cab642002072c114bc"; + sha256 = "0cjn0w4v1n31qgxvwnd7ix1lxjdqhrbllb543lhdc1p48a00sqx1"; }; meta.homepage = "https://github.com/stevearc/dressing.nvim/"; }; - dropbar-nvim = buildVimPluginFrom2Nix { + dropbar-nvim = buildVimPlugin { pname = "dropbar.nvim"; - version = "2023-09-05"; + version = "2023-09-30"; src = fetchFromGitHub { owner = "Bekaboo"; repo = "dropbar.nvim"; - rev = "d9e2b240e9d4fe42fc74c9e40127f3217f00e14b"; - sha256 = "0bp845ll7pj7il0zkyqdvq735grfws6lw8hywqfwa15xxqys6xwf"; + rev = "9c2bc34bf78bbbf1633b41358e9a203a58b7d19f"; + sha256 = "06l68i8zjgpmzq0yqxbmgl2ncswqpyxxfivjjsm1s1lx5jya97j1"; }; meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/"; }; - echodoc-vim = buildVimPluginFrom2Nix { + echodoc-vim = buildVimPlugin { pname = "echodoc.vim"; version = "2022-11-27"; src = fetchFromGitHub { @@ -3055,7 +3055,7 @@ final: prev: meta.homepage = "https://github.com/Shougo/echodoc.vim/"; }; - edge = buildVimPluginFrom2Nix { + edge = buildVimPlugin { pname = "edge"; version = "2023-08-07"; src = fetchFromGitHub { @@ -3067,7 +3067,7 @@ final: prev: meta.homepage = "https://github.com/sainnhe/edge/"; }; - edgedb-vim = buildVimPluginFrom2Nix { + edgedb-vim = buildVimPlugin { pname = "edgedb-vim"; version = "2023-05-26"; src = fetchFromGitHub { @@ -3079,32 +3079,32 @@ final: prev: meta.homepage = "https://github.com/edgedb/edgedb-vim/"; }; - edgy-nvim = buildVimPluginFrom2Nix { + edgy-nvim = buildVimPlugin { pname = "edgy.nvim"; - version = "2023-07-25"; + version = "2023-09-30"; src = fetchFromGitHub { owner = "folke"; repo = "edgy.nvim"; - rev = "4ccc1c67ae2b1a0c55f18c83d03b714e2bb1bae4"; - sha256 = "0s0h8s2wwg2niacp401j7l3c0knl44awf32clq15h1hcabqvvkn3"; + rev = "70e334c9cd7915aedde3255ade01ceeebe735b53"; + sha256 = "0zcm2p3qwiz2vkj4h4jy30dvphb6j6j8kyl3pzaxkiwlqlslsfma"; }; meta.homepage = "https://github.com/folke/edgy.nvim/"; }; - editorconfig-vim = buildVimPluginFrom2Nix { + editorconfig-vim = buildVimPlugin { pname = "editorconfig-vim"; - version = "2023-08-30"; + version = "2023-09-23"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "aefcf3d735122f349b172302d164d5eb61cd7e5f"; - sha256 = "1aj3bx2gf348mka27bw7k85kgm8j9gpiih5p79zrsry515vy0smx"; + rev = "0d54ea863089fb13be423b4aed6cca35f3a5d778"; + sha256 = "1d5r480njjgvn5w5ldhrj5gi38lqhnlyi1f7fvpjgl0lbyyqwp9s"; fetchSubmodules = true; }; meta.homepage = "https://github.com/editorconfig/editorconfig-vim/"; }; - editorconfig-nvim = buildVimPluginFrom2Nix { + editorconfig-nvim = buildVimPlugin { pname = "editorconfig.nvim"; version = "2023-01-10"; src = fetchFromGitHub { @@ -3116,31 +3116,31 @@ final: prev: meta.homepage = "https://github.com/gpanders/editorconfig.nvim/"; }; - efmls-configs-nvim = buildVimPluginFrom2Nix { + efmls-configs-nvim = buildVimPlugin { pname = "efmls-configs-nvim"; - version = "2023-09-16"; + version = "2023-09-28"; src = fetchFromGitHub { owner = "creativenull"; repo = "efmls-configs-nvim"; - rev = "055323cf4fefe7032165867a8e9ffa7b638b5770"; - sha256 = "10ifgv4iaqi4pcfv1q7xqvizf0755vv342m226h524b17f2q1skx"; + rev = "dcdb132451dfc2c0d7ec815e66e69ca5b8ae8577"; + sha256 = "1rrj7vvdzzzcacvbkl4pzfq7a19jc25bhk31g017az9q2mmap0mz"; }; meta.homepage = "https://github.com/creativenull/efmls-configs-nvim/"; }; - elixir-tools-nvim = buildVimPluginFrom2Nix { + elixir-tools-nvim = buildVimPlugin { pname = "elixir-tools.nvim"; - version = "2023-09-15"; + version = "2023-09-19"; src = fetchFromGitHub { owner = "elixir-tools"; repo = "elixir-tools.nvim"; - rev = "33eace2f6943d8240f8030e76569806f11090f5b"; - sha256 = "1mh235yss7j5z7qqidpf365s0bl22h9mvmfdb8s76gvgasf33rg3"; + rev = "3099bacca3745aa805b04eacad3d2721c9d477f4"; + sha256 = "0kpwvz1a1h958gr1mig547scg8wpxg4bkrdqmn52ayl27xj5iy1h"; }; meta.homepage = "https://github.com/elixir-tools/elixir-tools.nvim/"; }; - elm-vim = buildVimPluginFrom2Nix { + elm-vim = buildVimPlugin { pname = "elm-vim"; version = "2020-09-23"; src = fetchFromGitHub { @@ -3152,7 +3152,7 @@ final: prev: meta.homepage = "https://github.com/elmcast/elm-vim/"; }; - elvish-vim = buildVimPluginFrom2Nix { + elvish-vim = buildVimPlugin { pname = "elvish.vim"; version = "2022-04-04"; src = fetchFromGitHub { @@ -3164,7 +3164,7 @@ final: prev: meta.homepage = "https://github.com/dmix/elvish.vim/"; }; - emmet-vim = buildVimPluginFrom2Nix { + emmet-vim = buildVimPlugin { pname = "emmet-vim"; version = "2021-12-04"; src = fetchFromGitHub { @@ -3177,7 +3177,7 @@ final: prev: meta.homepage = "https://github.com/mattn/emmet-vim/"; }; - emodeline = buildVimPluginFrom2Nix { + emodeline = buildVimPlugin { pname = "emodeline"; version = "2010-10-18"; src = fetchFromGitHub { @@ -3189,7 +3189,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/emodeline/"; }; - errormarker-vim = buildVimPluginFrom2Nix { + errormarker-vim = buildVimPlugin { pname = "errormarker.vim"; version = "2015-01-26"; src = fetchFromGitHub { @@ -3201,7 +3201,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/errormarker.vim/"; }; - everforest = buildVimPluginFrom2Nix { + everforest = buildVimPlugin { pname = "everforest"; version = "2023-08-07"; src = fetchFromGitHub { @@ -3213,7 +3213,7 @@ final: prev: meta.homepage = "https://github.com/sainnhe/everforest/"; }; - executor-nvim = buildVimPluginFrom2Nix { + executor-nvim = buildVimPlugin { pname = "executor.nvim"; version = "2023-09-07"; src = fetchFromGitHub { @@ -3225,7 +3225,7 @@ final: prev: meta.homepage = "https://github.com/google/executor.nvim/"; }; - eyeliner-nvim = buildVimPluginFrom2Nix { + eyeliner-nvim = buildVimPlugin { pname = "eyeliner.nvim"; version = "2023-09-16"; src = fetchFromGitHub { @@ -3237,7 +3237,7 @@ final: prev: meta.homepage = "https://github.com/jinh0/eyeliner.nvim/"; }; - falcon = buildVimPluginFrom2Nix { + falcon = buildVimPlugin { pname = "falcon"; version = "2023-03-12"; src = fetchFromGitHub { @@ -3249,7 +3249,7 @@ final: prev: meta.homepage = "https://github.com/fenetikm/falcon/"; }; - far-vim = buildVimPluginFrom2Nix { + far-vim = buildVimPlugin { pname = "far.vim"; version = "2022-08-25"; src = fetchFromGitHub { @@ -3261,7 +3261,7 @@ final: prev: meta.homepage = "https://github.com/brooth/far.vim/"; }; - fastfold = buildVimPluginFrom2Nix { + fastfold = buildVimPlugin { pname = "fastfold"; version = "2023-03-21"; src = fetchFromGitHub { @@ -3273,7 +3273,7 @@ final: prev: meta.homepage = "https://github.com/konfekt/fastfold/"; }; - fcitx-vim = buildVimPluginFrom2Nix { + fcitx-vim = buildVimPlugin { pname = "fcitx.vim"; version = "2023-08-03"; src = fetchFromGitHub { @@ -3285,19 +3285,19 @@ final: prev: meta.homepage = "https://github.com/lilydjwg/fcitx.vim/"; }; - feline-nvim = buildVimPluginFrom2Nix { + feline-nvim = buildVimPlugin { pname = "feline.nvim"; - version = "2023-06-19"; + version = "2023-09-29"; src = fetchFromGitHub { owner = "freddiehaddad"; repo = "feline.nvim"; - rev = "c32c2ffcee38f14e157582552fa9ee41c24452d2"; - sha256 = "1mlwjxyb0w3pdg9ny7q6wjdhq1l35a1g4ylp28vfpnrvhfbbxzvy"; + rev = "ee9f8afdbe8654001b200530903f1dcbcc3394e6"; + sha256 = "1x7c6shkx5gxqv7lcby40gkx5f7sr4rgv23pxbzk0l2xy6nsvvmd"; }; meta.homepage = "https://github.com/freddiehaddad/feline.nvim/"; }; - fennel-vim = buildVimPluginFrom2Nix { + fennel-vim = buildVimPlugin { pname = "fennel.vim"; version = "2020-11-15"; src = fetchFromGitHub { @@ -3309,7 +3309,7 @@ final: prev: meta.homepage = "https://github.com/bakpakin/fennel.vim/"; }; - fern-vim = buildVimPluginFrom2Nix { + fern-vim = buildVimPlugin { pname = "fern.vim"; version = "2023-08-26"; src = fetchFromGitHub { @@ -3321,7 +3321,7 @@ final: prev: meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; - ferret = buildVimPluginFrom2Nix { + ferret = buildVimPlugin { pname = "ferret"; version = "2022-12-08"; src = fetchFromGitHub { @@ -3333,7 +3333,7 @@ final: prev: meta.homepage = "https://github.com/wincent/ferret/"; }; - fidget-nvim = buildVimPluginFrom2Nix { + fidget-nvim = buildVimPlugin { pname = "fidget.nvim"; version = "2023-06-10"; src = fetchFromGitHub { @@ -3345,7 +3345,7 @@ final: prev: meta.homepage = "https://github.com/j-hui/fidget.nvim/"; }; - file-line = buildVimPluginFrom2Nix { + file-line = buildVimPlugin { pname = "file-line"; version = "2016-10-21"; src = fetchFromGitHub { @@ -3357,7 +3357,7 @@ final: prev: meta.homepage = "https://github.com/bogado/file-line/"; }; - firenvim = buildVimPluginFrom2Nix { + firenvim = buildVimPlugin { pname = "firenvim"; version = "2023-08-18"; src = fetchFromGitHub { @@ -3369,7 +3369,7 @@ final: prev: meta.homepage = "https://github.com/glacambre/firenvim/"; }; - flake8-vim = buildVimPluginFrom2Nix { + flake8-vim = buildVimPlugin { pname = "flake8-vim"; version = "2020-10-20"; src = fetchFromGitHub { @@ -3382,31 +3382,31 @@ final: prev: meta.homepage = "https://github.com/andviro/flake8-vim/"; }; - flash-nvim = buildVimPluginFrom2Nix { + flash-nvim = buildVimPlugin { pname = "flash.nvim"; - version = "2023-08-29"; + version = "2023-10-01"; src = fetchFromGitHub { owner = "folke"; repo = "flash.nvim"; - rev = "8a8e74922a383c253b7f92e042b749150140c8d1"; - sha256 = "19a1i4lh4ij5x7pqrvs43yw24li1zajxrm6zrlbiffwppl7903dl"; + rev = "eccef9f34ac332e0f1652d7559fe5cbeab614201"; + sha256 = "1s3vjrz4lcz7lqdxxizj1fdrjax1p5farvi4fr0058k18s8hqqmz"; }; meta.homepage = "https://github.com/folke/flash.nvim/"; }; - flatten-nvim = buildVimPluginFrom2Nix { + flatten-nvim = buildVimPlugin { pname = "flatten.nvim"; - version = "2023-09-15"; + version = "2023-09-24"; src = fetchFromGitHub { owner = "willothy"; repo = "flatten.nvim"; - rev = "9d0fa9964f88de09990e661d1014487f9ad028fd"; - sha256 = "1hsykmrvrmp2kfspqw5h8r72pn1ipjidn3675zfzanzp92ldxrb5"; + rev = "67c70f0be3bc536850e1c224a39aef075d23344f"; + sha256 = "09dsal7a95z62f7nw8rjllm102z1112rfxbkj6fxvbw0y5gxmplk"; }; meta.homepage = "https://github.com/willothy/flatten.nvim/"; }; - flit-nvim = buildVimPluginFrom2Nix { + flit-nvim = buildVimPlugin { pname = "flit.nvim"; version = "2023-07-13"; src = fetchFromGitHub { @@ -3418,7 +3418,7 @@ final: prev: meta.homepage = "https://github.com/ggandor/flit.nvim/"; }; - float-preview-nvim = buildVimPluginFrom2Nix { + float-preview-nvim = buildVimPlugin { pname = "float-preview.nvim"; version = "2023-07-04"; src = fetchFromGitHub { @@ -3430,7 +3430,7 @@ final: prev: meta.homepage = "https://github.com/ncm2/float-preview.nvim/"; }; - floating-input-nvim = buildVimPluginFrom2Nix { + floating-input-nvim = buildVimPlugin { pname = "floating-input.nvim"; version = "2023-05-26"; src = fetchFromGitHub { @@ -3442,7 +3442,7 @@ final: prev: meta.homepage = "https://github.com/liangxianzhe/floating-input.nvim/"; }; - floating-nvim = buildVimPluginFrom2Nix { + floating-nvim = buildVimPlugin { pname = "floating.nvim"; version = "2021-07-19"; src = fetchFromGitHub { @@ -3454,7 +3454,7 @@ final: prev: meta.homepage = "https://github.com/fhill2/floating.nvim/"; }; - floobits-neovim = buildVimPluginFrom2Nix { + floobits-neovim = buildVimPlugin { pname = "floobits-neovim"; version = "2021-10-18"; src = fetchFromGitHub { @@ -3466,19 +3466,19 @@ final: prev: meta.homepage = "https://github.com/floobits/floobits-neovim/"; }; - flutter-tools-nvim = buildVimPluginFrom2Nix { + flutter-tools-nvim = buildVimPlugin { pname = "flutter-tools.nvim"; - version = "2023-09-13"; + version = "2023-10-01"; src = fetchFromGitHub { owner = "akinsho"; repo = "flutter-tools.nvim"; - rev = "974859e9fafbff48450a85c0c7f57cb576c53626"; - sha256 = "04zaghw9dbwxz48rrssihr7907rcg6g3dmrxihhyzqqw6q33i2b2"; + rev = "1119125206075c4703f2147f964ed0a45f84c6ab"; + sha256 = "1nm24s024ahfgsgplj5gxan009kxdalwwzdvg1vbysavgxhfzwra"; }; meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/"; }; - fold-preview-nvim = buildVimPluginFrom2Nix { + fold-preview-nvim = buildVimPlugin { pname = "fold-preview.nvim"; version = "2023-01-27"; src = fetchFromGitHub { @@ -3490,19 +3490,19 @@ final: prev: meta.homepage = "https://github.com/anuvyklack/fold-preview.nvim/"; }; - formatter-nvim = buildVimPluginFrom2Nix { + formatter-nvim = buildVimPlugin { pname = "formatter.nvim"; - version = "2023-08-14"; + version = "2023-09-21"; src = fetchFromGitHub { owner = "mhartington"; repo = "formatter.nvim"; - rev = "44c89f09dcc220dc2a9b056e93c3a87c86e79804"; - sha256 = "0x07bqrwqzw56rvwarxxf9ylx01fk5a7ds1zq1fvjxizyf1qya03"; + rev = "34dcdfa0c75df667743b2a50dd99c84a557376f0"; + sha256 = "09dks17yi1cbk4gviv7kw7r04rcn8ridq75slm3vxf3jkid095ns"; }; meta.homepage = "https://github.com/mhartington/formatter.nvim/"; }; - forms = buildVimPluginFrom2Nix { + forms = buildVimPlugin { pname = "forms"; version = "2012-11-28"; src = fetchFromGitHub { @@ -3514,19 +3514,19 @@ final: prev: meta.homepage = "https://github.com/megaannum/forms/"; }; - friendly-snippets = buildVimPluginFrom2Nix { + friendly-snippets = buildVimPlugin { pname = "friendly-snippets"; - version = "2023-09-03"; + version = "2023-10-01"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "ebf6d6e83494cdd88a54a429340256f4dbb6a052"; - sha256 = "01z4xqb46xlycbv0w7akrf7rajy9rnl0jml0vk9dngblgcf1x2sp"; + rev = "43727c2ff84240e55d4069ec3e6158d74cb534b6"; + sha256 = "1sjk17gn919aa84dkjfagwwjsas9zfkbrk840bjf580k8m83d9m8"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; - fruzzy = buildVimPluginFrom2Nix { + fruzzy = buildVimPlugin { pname = "fruzzy"; version = "2020-08-31"; src = fetchFromGitHub { @@ -3538,7 +3538,7 @@ final: prev: meta.homepage = "https://github.com/raghur/fruzzy/"; }; - fugitive-gitlab-vim = buildVimPluginFrom2Nix { + fugitive-gitlab-vim = buildVimPlugin { pname = "fugitive-gitlab.vim"; version = "2023-05-22"; src = fetchFromGitHub { @@ -3550,7 +3550,7 @@ final: prev: meta.homepage = "https://github.com/shumphrey/fugitive-gitlab.vim/"; }; - futhark-vim = buildVimPluginFrom2Nix { + futhark-vim = buildVimPlugin { pname = "futhark-vim"; version = "2021-08-24"; src = fetchFromGitHub { @@ -3562,7 +3562,7 @@ final: prev: meta.homepage = "https://github.com/BeneCollyridam/futhark-vim/"; }; - fuzzy-nvim = buildVimPluginFrom2Nix { + fuzzy-nvim = buildVimPlugin { pname = "fuzzy.nvim"; version = "2023-05-15"; src = fetchFromGitHub { @@ -3574,7 +3574,7 @@ final: prev: meta.homepage = "https://github.com/tzachar/fuzzy.nvim/"; }; - fwatch-nvim = buildVimPluginFrom2Nix { + fwatch-nvim = buildVimPlugin { pname = "fwatch.nvim"; version = "2022-07-04"; src = fetchFromGitHub { @@ -3586,7 +3586,7 @@ final: prev: meta.homepage = "https://github.com/rktjmp/fwatch.nvim/"; }; - fzf-checkout-vim = buildVimPluginFrom2Nix { + fzf-checkout-vim = buildVimPlugin { pname = "fzf-checkout.vim"; version = "2022-12-27"; src = fetchFromGitHub { @@ -3598,7 +3598,7 @@ final: prev: meta.homepage = "https://github.com/stsewd/fzf-checkout.vim/"; }; - fzf-hoogle-vim = buildVimPluginFrom2Nix { + fzf-hoogle-vim = buildVimPlugin { pname = "fzf-hoogle.vim"; version = "2022-05-01"; src = fetchFromGitHub { @@ -3610,7 +3610,7 @@ final: prev: meta.homepage = "https://github.com/monkoose/fzf-hoogle.vim/"; }; - fzf-lsp-nvim = buildVimPluginFrom2Nix { + fzf-lsp-nvim = buildVimPlugin { pname = "fzf-lsp.nvim"; version = "2023-02-02"; src = fetchFromGitHub { @@ -3622,31 +3622,31 @@ final: prev: meta.homepage = "https://github.com/gfanto/fzf-lsp.nvim/"; }; - fzf-lua = buildVimPluginFrom2Nix { + fzf-lua = buildVimPlugin { pname = "fzf-lua"; - version = "2023-09-16"; + version = "2023-09-29"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "30df82df8f5f0932bc07ff11f64b94bdf89b884d"; - sha256 = "01ar6p0iknlk131g7j1x1cfb9yngnql2q7yalr0dlq4g1kv30id9"; + rev = "f4091b9fa05ae6c2eab2823c0b345be2a27208c6"; + sha256 = "1q48jk4cm9djkz1czf80f024fv6mdysc38x4r66m5gkqs4vky3ma"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; - fzf-vim = buildVimPluginFrom2Nix { + fzf-vim = buildVimPlugin { pname = "fzf.vim"; - version = "2023-09-16"; + version = "2023-09-17"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "fe362d413a0286b1474c1d235c6eb1d0cd6ae8a4"; - sha256 = "0ff2h9ry67zpjjmn4f384bbfcmkyq7kbbsl3s6c1ykhhj6943b7g"; + rev = "678ee1a549bd873dde35f6146f288a3f2e29d983"; + sha256 = "0ls94bxj1awx1z0x4h9pmc08zh917gyyllalm562a0a51x6sr9sg"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; - galaxyline-nvim = buildVimPluginFrom2Nix { + galaxyline-nvim = buildVimPlugin { pname = "galaxyline.nvim"; version = "2022-01-21"; src = fetchFromGitHub { @@ -3658,7 +3658,7 @@ final: prev: meta.homepage = "https://github.com/NTBBloodbath/galaxyline.nvim/"; }; - gen_tags-vim = buildVimPluginFrom2Nix { + gen_tags-vim = buildVimPlugin { pname = "gen_tags.vim"; version = "2023-03-06"; src = fetchFromGitHub { @@ -3670,7 +3670,7 @@ final: prev: meta.homepage = "https://github.com/jsfaint/gen_tags.vim/"; }; - gentoo-syntax = buildVimPluginFrom2Nix { + gentoo-syntax = buildVimPlugin { pname = "gentoo-syntax"; version = "2023-06-14"; src = fetchFromGitHub { @@ -3682,7 +3682,7 @@ final: prev: meta.homepage = "https://github.com/gentoo/gentoo-syntax/"; }; - ghcid = buildVimPluginFrom2Nix { + ghcid = buildVimPlugin { pname = "ghcid"; version = "2023-07-02"; src = fetchFromGitHub { @@ -3694,7 +3694,7 @@ final: prev: meta.homepage = "https://github.com/ndmitchell/ghcid/"; }; - ghcmod-vim = buildVimPluginFrom2Nix { + ghcmod-vim = buildVimPlugin { pname = "ghcmod-vim"; version = "2016-06-19"; src = fetchFromGitHub { @@ -3706,7 +3706,7 @@ final: prev: meta.homepage = "https://github.com/eagletmt/ghcmod-vim/"; }; - gina-vim = buildVimPluginFrom2Nix { + gina-vim = buildVimPlugin { pname = "gina.vim"; version = "2022-03-30"; src = fetchFromGitHub { @@ -3718,31 +3718,31 @@ final: prev: meta.homepage = "https://github.com/lambdalisue/gina.vim/"; }; - git-blame-nvim = buildVimPluginFrom2Nix { + git-blame-nvim = buildVimPlugin { pname = "git-blame.nvim"; - version = "2023-09-14"; + version = "2023-09-29"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "02fadac1702c014ce49a9499137d798934bdb465"; - sha256 = "1i5d388blpsrpms4ljqgy6sm1yhh172bf4ydjdbhvw16m6gpdkpm"; + rev = "39df33dad2cbf4eb9d17264bcda0c12e670ef1c2"; + sha256 = "0faaqj4a0nz005gl1r3hp07zrckq00v9ik0g04wwzbr0phccka8q"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; - git-conflict-nvim = buildVimPluginFrom2Nix { + git-conflict-nvim = buildVimPlugin { pname = "git-conflict.nvim"; - version = "2023-09-13"; + version = "2023-09-18"; src = fetchFromGitHub { owner = "akinsho"; repo = "git-conflict.nvim"; - rev = "a0f1bffdb7ccb81bb16f4bbfd9740775835b71b3"; - sha256 = "13hx5ipfakilx0zfgq9jdv0i7yykqvvjly128diw4yxpzwvi7rnb"; + rev = "896261933afe2fddf6fb043d9cd4d88301b151a9"; + sha256 = "1pkvhl1bf76nvc9rdyn60dq619pkwr2a03gn2zkqlap28lhw2xn8"; }; meta.homepage = "https://github.com/akinsho/git-conflict.nvim/"; }; - git-messenger-vim = buildVimPluginFrom2Nix { + git-messenger-vim = buildVimPlugin { pname = "git-messenger.vim"; version = "2022-08-30"; src = fetchFromGitHub { @@ -3754,7 +3754,7 @@ final: prev: meta.homepage = "https://github.com/rhysd/git-messenger.vim/"; }; - git-worktree-nvim = buildVimPluginFrom2Nix { + git-worktree-nvim = buildVimPlugin { pname = "git-worktree.nvim"; version = "2021-12-24"; src = fetchFromGitHub { @@ -3766,7 +3766,7 @@ final: prev: meta.homepage = "https://github.com/ThePrimeagen/git-worktree.nvim/"; }; - gitignore-vim = buildVimPluginFrom2Nix { + gitignore-vim = buildVimPlugin { pname = "gitignore.vim"; version = "2014-03-16"; src = fetchFromGitHub { @@ -3778,7 +3778,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/gitignore.vim/"; }; - gitlinker-nvim = buildVimPluginFrom2Nix { + gitlinker-nvim = buildVimPlugin { pname = "gitlinker.nvim"; version = "2023-02-03"; src = fetchFromGitHub { @@ -3792,17 +3792,17 @@ final: prev: gitsigns-nvim = buildNeovimPlugin { pname = "gitsigns.nvim"; - version = "2023-09-12"; + version = "2023-10-01"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "907ae8636016aab2f283576fc60d46ca3427e579"; - sha256 = "0v2ikhhqqxrfzp6wnqcszazq3zbmlf1g3n1jgln459bsyj7qq00v"; + rev = "e2ca739be75447fb5ccc9bfeb64f7afbc2cee5e6"; + sha256 = "0x9mwarz61xggw4xdxllzgardi2qxp33bk24x59rqpkb8135bjrz"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; - gitv = buildVimPluginFrom2Nix { + gitv = buildVimPlugin { pname = "gitv"; version = "2019-08-22"; src = fetchFromGitHub { @@ -3814,7 +3814,7 @@ final: prev: meta.homepage = "https://github.com/gregsexton/gitv/"; }; - glance-nvim = buildVimPluginFrom2Nix { + glance-nvim = buildVimPlugin { pname = "glance.nvim"; version = "2023-08-26"; src = fetchFromGitHub { @@ -3826,7 +3826,7 @@ final: prev: meta.homepage = "https://github.com/DNLHC/glance.nvim/"; }; - gleam-vim = buildVimPluginFrom2Nix { + gleam-vim = buildVimPlugin { pname = "gleam.vim"; version = "2020-06-24"; src = fetchFromGitHub { @@ -3838,7 +3838,7 @@ final: prev: meta.homepage = "https://github.com/gleam-lang/gleam.vim/"; }; - glow-nvim = buildVimPluginFrom2Nix { + glow-nvim = buildVimPlugin { pname = "glow.nvim"; version = "2023-08-28"; src = fetchFromGitHub { @@ -3850,19 +3850,19 @@ final: prev: meta.homepage = "https://github.com/ellisonleao/glow.nvim/"; }; - go-nvim = buildVimPluginFrom2Nix { + go-nvim = buildVimPlugin { pname = "go.nvim"; - version = "2023-09-07"; + version = "2023-09-30"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "5e9e083f4927402eab6ab233e970b397daa2e826"; - sha256 = "0mqfmmaazx18ji75rwvvcw1slyrhllpgdlzfwg61q5bnkr8a2p92"; + rev = "2f573a297bea3a483a3607ae7c607a8a08d27993"; + sha256 = "0knxirf1kimjck9f8mx26m8s9v2vbjmacnr29rm9la96fs5bg2n4"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; }; - godbolt-nvim = buildVimPluginFrom2Nix { + godbolt-nvim = buildVimPlugin { pname = "godbolt.nvim"; version = "2023-09-07"; src = fetchFromGitHub { @@ -3874,7 +3874,7 @@ final: prev: meta.homepage = "https://github.com/p00f/godbolt.nvim/"; }; - golden-ratio = buildVimPluginFrom2Nix { + golden-ratio = buildVimPlugin { pname = "golden-ratio"; version = "2022-06-28"; src = fetchFromGitHub { @@ -3886,7 +3886,7 @@ final: prev: meta.homepage = "https://github.com/roman/golden-ratio/"; }; - gotests-vim = buildVimPluginFrom2Nix { + gotests-vim = buildVimPlugin { pname = "gotests-vim"; version = "2022-07-12"; src = fetchFromGitHub { @@ -3898,19 +3898,19 @@ final: prev: meta.homepage = "https://github.com/buoto/gotests-vim/"; }; - goto-preview = buildVimPluginFrom2Nix { + goto-preview = buildVimPlugin { pname = "goto-preview"; - version = "2023-07-19"; + version = "2023-09-26"; src = fetchFromGitHub { owner = "rmagatti"; repo = "goto-preview"; - rev = "84532db88f8ee272bcd1c07cda55884e23fd9087"; - sha256 = "0insrplfq6rwm9bgfj5adjk8c4mbvqhpzbd32lqq6bg4960m09vl"; + rev = "b428db4d2a5b7c06e149a020e31b2121fbf57a67"; + sha256 = "13lc0yjmwzwkdj92rlcwqpyic30z5vq3ss73bkzwl4vkqg413zla"; }; meta.homepage = "https://github.com/rmagatti/goto-preview/"; }; - goyo-vim = buildVimPluginFrom2Nix { + goyo-vim = buildVimPlugin { pname = "goyo.vim"; version = "2023-03-04"; src = fetchFromGitHub { @@ -3922,7 +3922,7 @@ final: prev: meta.homepage = "https://github.com/junegunn/goyo.vim/"; }; - grammar-guard-nvim = buildVimPluginFrom2Nix { + grammar-guard-nvim = buildVimPlugin { pname = "grammar-guard.nvim"; version = "2023-08-12"; src = fetchFromGitHub { @@ -3934,7 +3934,7 @@ final: prev: meta.homepage = "https://github.com/brymer-meneses/grammar-guard.nvim/"; }; - graphviz-vim = buildVimPluginFrom2Nix { + graphviz-vim = buildVimPlugin { pname = "graphviz.vim"; version = "2022-12-11"; src = fetchFromGitHub { @@ -3946,7 +3946,7 @@ final: prev: meta.homepage = "https://github.com/liuchengxu/graphviz.vim/"; }; - gruvbox = buildVimPluginFrom2Nix { + gruvbox = buildVimPlugin { pname = "gruvbox"; version = "2023-08-14"; src = fetchFromGitHub { @@ -3958,7 +3958,7 @@ final: prev: meta.homepage = "https://github.com/morhetz/gruvbox/"; }; - gruvbox-flat-nvim = buildVimPluginFrom2Nix { + gruvbox-flat-nvim = buildVimPlugin { pname = "gruvbox-flat.nvim"; version = "2023-05-27"; src = fetchFromGitHub { @@ -3970,7 +3970,7 @@ final: prev: meta.homepage = "https://github.com/eddyekofo94/gruvbox-flat.nvim/"; }; - gruvbox-material = buildVimPluginFrom2Nix { + gruvbox-material = buildVimPlugin { pname = "gruvbox-material"; version = "2023-08-07"; src = fetchFromGitHub { @@ -3982,19 +3982,19 @@ final: prev: meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; - gruvbox-nvim = buildVimPluginFrom2Nix { + gruvbox-nvim = buildVimPlugin { pname = "gruvbox.nvim"; - version = "2023-08-29"; + version = "2023-09-30"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "7fb36e0f67aa6f3d7f3e54f37ca7032ea1af0b59"; - sha256 = "0i9aivg66fg9rp9m9z8vzg3g15yfki5c9hrwhd5j577k5m8bybj6"; + rev = "61b0b3be2f0cfd521667403a0367298144d6c165"; + sha256 = "1dphrf8bq088d47macxhx2ql9bq5s9axs9cqwqbp6vkmr4zcx072"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; - guess-indent-nvim = buildVimPluginFrom2Nix { + guess-indent-nvim = buildVimPlugin { pname = "guess-indent.nvim"; version = "2023-04-03"; src = fetchFromGitHub { @@ -4006,7 +4006,7 @@ final: prev: meta.homepage = "https://github.com/nmac427/guess-indent.nvim/"; }; - gundo-vim = buildVimPluginFrom2Nix { + gundo-vim = buildVimPlugin { pname = "gundo.vim"; version = "2021-02-21"; src = fetchFromGitHub { @@ -4018,7 +4018,7 @@ final: prev: meta.homepage = "https://github.com/sjl/gundo.vim/"; }; - gv-vim = buildVimPluginFrom2Nix { + gv-vim = buildVimPlugin { pname = "gv.vim"; version = "2022-10-25"; src = fetchFromGitHub { @@ -4030,19 +4030,19 @@ final: prev: meta.homepage = "https://github.com/junegunn/gv.vim/"; }; - hardtime-nvim = buildVimPluginFrom2Nix { + hardtime-nvim = buildVimPlugin { pname = "hardtime.nvim"; - version = "2023-09-11"; + version = "2023-09-23"; src = fetchFromGitHub { owner = "m4xshen"; repo = "hardtime.nvim"; - rev = "370dea43c353c57bd2c9c985f43812b0634adb7b"; - sha256 = "070caab311blcl0j2ygmvv0rdqqb6kad6bvwwgravrwb3d4yy1a0"; + rev = "3d98663dbd2ed51a3be97e50dfe7df6c26d62d8d"; + sha256 = "07fv14zi1c55grzhzbri3rs4bv1lx5ywpkdgvmhgr1h7blm3d9g1"; }; meta.homepage = "https://github.com/m4xshen/hardtime.nvim/"; }; - hare-vim = buildVimPluginFrom2Nix { + hare-vim = buildVimPlugin { pname = "hare.vim"; version = "2023-09-09"; src = fetchgit { @@ -4053,7 +4053,7 @@ final: prev: meta.homepage = "https://git.sr.ht/~sircmpwn/hare.vim"; }; - harpoon = buildVimPluginFrom2Nix { + harpoon = buildVimPlugin { pname = "harpoon"; version = "2023-05-28"; src = fetchFromGitHub { @@ -4067,17 +4067,17 @@ final: prev: haskell-tools-nvim = buildNeovimPlugin { pname = "haskell-tools.nvim"; - version = "2023-09-14"; + version = "2023-10-01"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "c41aad691fc16fc2ff334e7a2b4df79886323dad"; - sha256 = "088a55l4z6qmqi7dhsimarnhi7dpkcs44m4wwy4rsxwbc88g42fk"; + rev = "8b472cf9abf5c2996843894d1231aed5f6653bc2"; + sha256 = "1msyfigc97vxsbinm404vzd68biy5hgj61ppz2lc96xbyq7r66xd"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; - haskell-vim = buildVimPluginFrom2Nix { + haskell-vim = buildVimPlugin { pname = "haskell-vim"; version = "2021-01-19"; src = fetchFromGitHub { @@ -4089,7 +4089,7 @@ final: prev: meta.homepage = "https://github.com/neovimhaskell/haskell-vim/"; }; - haskell-with-unicode-vim = buildVimPluginFrom2Nix { + haskell-with-unicode-vim = buildVimPlugin { pname = "haskell-with-unicode.vim"; version = "2022-09-11"; src = fetchFromGitHub { @@ -4101,7 +4101,7 @@ final: prev: meta.homepage = "https://github.com/wenzel-hoffman/haskell-with-unicode.vim/"; }; - hasksyn = buildVimPluginFrom2Nix { + hasksyn = buildVimPlugin { pname = "hasksyn"; version = "2014-09-04"; src = fetchFromGitHub { @@ -4113,7 +4113,7 @@ final: prev: meta.homepage = "https://github.com/travitch/hasksyn/"; }; - headlines-nvim = buildVimPluginFrom2Nix { + headlines-nvim = buildVimPlugin { pname = "headlines.nvim"; version = "2023-07-27"; src = fetchFromGitHub { @@ -4125,7 +4125,7 @@ final: prev: meta.homepage = "https://github.com/lukas-reineke/headlines.nvim/"; }; - heirline-nvim = buildVimPluginFrom2Nix { + heirline-nvim = buildVimPlugin { pname = "heirline.nvim"; version = "2023-09-03"; src = fetchFromGitHub { @@ -4137,7 +4137,7 @@ final: prev: meta.homepage = "https://github.com/rebelot/heirline.nvim/"; }; - hex-nvim = buildVimPluginFrom2Nix { + hex-nvim = buildVimPlugin { pname = "hex.nvim"; version = "2023-09-09"; src = fetchFromGitHub { @@ -4149,7 +4149,7 @@ final: prev: meta.homepage = "https://github.com/RaafatTurki/hex.nvim/"; }; - hiPairs = buildVimPluginFrom2Nix { + hiPairs = buildVimPlugin { pname = "hiPairs"; version = "2020-12-10"; src = fetchFromGitHub { @@ -4161,19 +4161,19 @@ final: prev: meta.homepage = "https://github.com/Yggdroot/hiPairs/"; }; - highlight-undo-nvim = buildVimPluginFrom2Nix { + highlight-undo-nvim = buildVimPlugin { pname = "highlight-undo.nvim"; - version = "2023-08-17"; + version = "2023-09-20"; src = fetchFromGitHub { owner = "tzachar"; repo = "highlight-undo.nvim"; - rev = "d9e674a2eb4d95ee16cd477d47eab7ddc586e336"; - sha256 = "02ic1ag8k28na6ia48bwkmg0ca961dliizjzsvhp28hkvvx6py9r"; + rev = "50a6884a8476be04ecce8f1c4ed692c5000ef0a1"; + sha256 = "09fmds9ibl6n4fgxmmypifnxpyc0slpinc2h5cvx0959i9ak0l13"; }; meta.homepage = "https://github.com/tzachar/highlight-undo.nvim/"; }; - himalaya-vim = buildVimPluginFrom2Nix { + himalaya-vim = buildVimPlugin { pname = "himalaya-vim"; version = "2023-09-14"; src = fetchgit { @@ -4184,7 +4184,7 @@ final: prev: meta.homepage = "https://git.sr.ht/~soywod/himalaya-vim"; }; - hlint-refactor-vim = buildVimPluginFrom2Nix { + hlint-refactor-vim = buildVimPlugin { pname = "hlint-refactor-vim"; version = "2015-12-05"; src = fetchFromGitHub { @@ -4196,7 +4196,7 @@ final: prev: meta.homepage = "https://github.com/mpickering/hlint-refactor-vim/"; }; - hmts-nvim = buildVimPluginFrom2Nix { + hmts-nvim = buildVimPlugin { pname = "hmts.nvim"; version = "2023-08-28"; src = fetchFromGitHub { @@ -4208,7 +4208,7 @@ final: prev: meta.homepage = "https://github.com/calops/hmts.nvim/"; }; - hologram-nvim = buildVimPluginFrom2Nix { + hologram-nvim = buildVimPlugin { pname = "hologram.nvim"; version = "2022-10-09"; src = fetchFromGitHub { @@ -4220,7 +4220,7 @@ final: prev: meta.homepage = "https://github.com/edluffy/hologram.nvim/"; }; - hoon-vim = buildVimPluginFrom2Nix { + hoon-vim = buildVimPlugin { pname = "hoon.vim"; version = "2023-05-04"; src = fetchFromGitHub { @@ -4232,19 +4232,19 @@ final: prev: meta.homepage = "https://github.com/urbit/hoon.vim/"; }; - hop-nvim = buildVimPluginFrom2Nix { + hop-nvim = buildVimPlugin { pname = "hop.nvim"; - version = "2023-09-09"; + version = "2023-09-19"; src = fetchFromGitHub { - owner = "phaazon"; + owner = "smoka7"; repo = "hop.nvim"; - rev = "1a1eceafe54b5081eae4cb91c723abd1d450f34b"; - sha256 = "08h18cam2yr57qvfsnf1bra28vbl6013wlchnr5crb757xw8aysa"; + rev = "f2508f415b9fe34082696009574ca26f57a66531"; + sha256 = "0l8b2ag894chk8ljznmspr1ac53n3wf6iww37ksd2pdas51la344"; }; - meta.homepage = "https://github.com/phaazon/hop.nvim/"; + meta.homepage = "https://github.com/smoka7/hop.nvim/"; }; - hotpot-nvim = buildVimPluginFrom2Nix { + hotpot-nvim = buildVimPlugin { pname = "hotpot.nvim"; version = "2023-09-14"; src = fetchFromGitHub { @@ -4256,7 +4256,7 @@ final: prev: meta.homepage = "https://github.com/rktjmp/hotpot.nvim/"; }; - hover-nvim = buildVimPluginFrom2Nix { + hover-nvim = buildVimPlugin { pname = "hover.nvim"; version = "2023-09-10"; src = fetchFromGitHub { @@ -4268,7 +4268,7 @@ final: prev: meta.homepage = "https://github.com/lewis6991/hover.nvim/"; }; - html5-vim = buildVimPluginFrom2Nix { + html5-vim = buildVimPlugin { pname = "html5.vim"; version = "2020-08-22"; src = fetchFromGitHub { @@ -4280,7 +4280,7 @@ final: prev: meta.homepage = "https://github.com/othree/html5.vim/"; }; - hydra-nvim = buildVimPluginFrom2Nix { + hydra-nvim = buildVimPlugin { pname = "hydra.nvim"; version = "2023-02-06"; src = fetchFromGitHub { @@ -4292,7 +4292,7 @@ final: prev: meta.homepage = "https://github.com/anuvyklack/hydra.nvim/"; }; - i3config-vim = buildVimPluginFrom2Nix { + i3config-vim = buildVimPlugin { pname = "i3config.vim"; version = "2021-06-23"; src = fetchFromGitHub { @@ -4304,7 +4304,7 @@ final: prev: meta.homepage = "https://github.com/mboughaba/i3config.vim/"; }; - iceberg-vim = buildVimPluginFrom2Nix { + iceberg-vim = buildVimPlugin { pname = "iceberg.vim"; version = "2022-11-23"; src = fetchFromGitHub { @@ -4316,7 +4316,7 @@ final: prev: meta.homepage = "https://github.com/cocopon/iceberg.vim/"; }; - idris-vim = buildVimPluginFrom2Nix { + idris-vim = buildVimPlugin { pname = "idris-vim"; version = "2017-12-04"; src = fetchFromGitHub { @@ -4328,7 +4328,7 @@ final: prev: meta.homepage = "https://github.com/idris-hackers/idris-vim/"; }; - idris2-vim = buildVimPluginFrom2Nix { + idris2-vim = buildVimPlugin { pname = "idris2-vim"; version = "2020-11-26"; src = fetchFromGitHub { @@ -4340,19 +4340,19 @@ final: prev: meta.homepage = "https://github.com/edwinb/idris2-vim/"; }; - image-nvim = buildVimPluginFrom2Nix { + image-nvim = buildVimPlugin { pname = "image.nvim"; - version = "2023-09-02"; + version = "2023-09-24"; src = fetchFromGitHub { owner = "3rd"; repo = "image.nvim"; - rev = "84e8324b603b50d753203113babbef6800982cf4"; - sha256 = "01g6zci4qlfwavlhja8h80z65z71ig9sgrblwys7r44rbdm748iz"; + rev = "961e5a68998dd76bf5e25ae2d96fcf3bb1ee22ae"; + sha256 = "0k1gj83w3lqx9dass0mff1yhzn9p0ln96sz0cds14kkgyzfq6dw4"; }; meta.homepage = "https://github.com/3rd/image.nvim/"; }; - impatient-nvim = buildVimPluginFrom2Nix { + impatient-nvim = buildVimPlugin { pname = "impatient.nvim"; version = "2023-05-05"; src = fetchFromGitHub { @@ -4364,7 +4364,7 @@ final: prev: meta.homepage = "https://github.com/lewis6991/impatient.nvim/"; }; - inc-rename-nvim = buildVimPluginFrom2Nix { + inc-rename-nvim = buildVimPlugin { pname = "inc-rename.nvim"; version = "2023-06-03"; src = fetchFromGitHub { @@ -4376,7 +4376,7 @@ final: prev: meta.homepage = "https://github.com/smjonas/inc-rename.nvim/"; }; - increment-activator = buildVimPluginFrom2Nix { + increment-activator = buildVimPlugin { pname = "increment-activator"; version = "2021-09-16"; src = fetchFromGitHub { @@ -4388,7 +4388,7 @@ final: prev: meta.homepage = "https://github.com/nishigori/increment-activator/"; }; - incsearch-easymotion-vim = buildVimPluginFrom2Nix { + incsearch-easymotion-vim = buildVimPlugin { pname = "incsearch-easymotion.vim"; version = "2016-01-18"; src = fetchFromGitHub { @@ -4400,7 +4400,7 @@ final: prev: meta.homepage = "https://github.com/haya14busa/incsearch-easymotion.vim/"; }; - incsearch-vim = buildVimPluginFrom2Nix { + incsearch-vim = buildVimPlugin { pname = "incsearch.vim"; version = "2022-05-13"; src = fetchFromGitHub { @@ -4412,19 +4412,19 @@ final: prev: meta.homepage = "https://github.com/haya14busa/incsearch.vim/"; }; - indent-blankline-nvim = buildVimPluginFrom2Nix { + indent-blankline-nvim = buildVimPlugin { pname = "indent-blankline.nvim"; - version = "2023-08-22"; + version = "2023-10-01"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "9637670896b68805430e2f72cf5d16be5b97a22a"; - sha256 = "01h49q9j3hh5mi3hxsaipfsc03ypgg14r79fbm6sy63rh8a66jnl"; + rev = "3d26bc7ab0e8dfddc0f40c840a8f925dddc2fef6"; + sha256 = "1p3bxdrj2xibyqw37b1247sz5nqx460d3lr4py3fn0cdgrf3420s"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; - indent-o-matic = buildVimPluginFrom2Nix { + indent-o-matic = buildVimPlugin { pname = "indent-o-matic"; version = "2023-06-03"; src = fetchFromGitHub { @@ -4436,7 +4436,7 @@ final: prev: meta.homepage = "https://github.com/Darazaki/indent-o-matic/"; }; - indentLine = buildVimPluginFrom2Nix { + indentLine = buildVimPlugin { pname = "indentLine"; version = "2023-07-14"; src = fetchFromGitHub { @@ -4448,7 +4448,7 @@ final: prev: meta.homepage = "https://github.com/Yggdroot/indentLine/"; }; - inkpot = buildVimPluginFrom2Nix { + inkpot = buildVimPlugin { pname = "inkpot"; version = "2013-02-10"; src = fetchFromGitHub { @@ -4460,7 +4460,7 @@ final: prev: meta.homepage = "https://github.com/ciaranm/inkpot/"; }; - instant-nvim = buildVimPluginFrom2Nix { + instant-nvim = buildVimPlugin { pname = "instant.nvim"; version = "2022-06-25"; src = fetchFromGitHub { @@ -4472,7 +4472,7 @@ final: prev: meta.homepage = "https://github.com/jbyuki/instant.nvim/"; }; - intellitab-nvim = buildVimPluginFrom2Nix { + intellitab-nvim = buildVimPlugin { pname = "intellitab.nvim"; version = "2021-11-13"; src = fetchFromGitHub { @@ -4484,7 +4484,7 @@ final: prev: meta.homepage = "https://github.com/pta2002/intellitab.nvim/"; }; - intero-neovim = buildVimPluginFrom2Nix { + intero-neovim = buildVimPlugin { pname = "intero-neovim"; version = "2019-11-15"; src = fetchFromGitHub { @@ -4496,7 +4496,7 @@ final: prev: meta.homepage = "https://github.com/parsonsmatt/intero-neovim/"; }; - investigate-vim = buildVimPluginFrom2Nix { + investigate-vim = buildVimPlugin { pname = "investigate.vim"; version = "2020-02-29"; src = fetchFromGitHub { @@ -4508,7 +4508,7 @@ final: prev: meta.homepage = "https://github.com/keith/investigate.vim/"; }; - iosvkem = buildVimPluginFrom2Nix { + iosvkem = buildVimPlugin { pname = "iosvkem"; version = "2021-03-26"; src = fetchFromGitHub { @@ -4520,7 +4520,7 @@ final: prev: meta.homepage = "https://github.com/neutaaaaan/iosvkem/"; }; - ir_black = buildVimPluginFrom2Nix { + ir_black = buildVimPlugin { pname = "ir_black"; version = "2012-03-05"; src = fetchFromGitHub { @@ -4532,7 +4532,7 @@ final: prev: meta.homepage = "https://github.com/twerth/ir_black/"; }; - iron-nvim = buildVimPluginFrom2Nix { + iron-nvim = buildVimPlugin { pname = "iron.nvim"; version = "2023-07-13"; src = fetchFromGitHub { @@ -4544,7 +4544,7 @@ final: prev: meta.homepage = "https://github.com/Vigemus/iron.nvim/"; }; - is-vim = buildVimPluginFrom2Nix { + is-vim = buildVimPlugin { pname = "is.vim"; version = "2020-10-27"; src = fetchFromGitHub { @@ -4556,7 +4556,7 @@ final: prev: meta.homepage = "https://github.com/haya14busa/is.vim/"; }; - jdaddy-vim = buildVimPluginFrom2Nix { + jdaddy-vim = buildVimPlugin { pname = "jdaddy.vim"; version = "2014-02-22"; src = fetchFromGitHub { @@ -4568,7 +4568,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/jdaddy.vim/"; }; - jedi-vim = buildVimPluginFrom2Nix { + jedi-vim = buildVimPlugin { pname = "jedi-vim"; version = "2023-07-31"; src = fetchFromGitHub { @@ -4581,7 +4581,7 @@ final: prev: meta.homepage = "https://github.com/davidhalter/jedi-vim/"; }; - jellybeans-nvim = buildVimPluginFrom2Nix { + jellybeans-nvim = buildVimPlugin { pname = "jellybeans-nvim"; version = "2022-03-21"; src = fetchFromGitHub { @@ -4593,7 +4593,7 @@ final: prev: meta.homepage = "https://github.com/metalelf0/jellybeans-nvim/"; }; - jellybeans-vim = buildVimPluginFrom2Nix { + jellybeans-vim = buildVimPlugin { pname = "jellybeans.vim"; version = "2019-06-22"; src = fetchFromGitHub { @@ -4605,7 +4605,7 @@ final: prev: meta.homepage = "https://github.com/nanotech/jellybeans.vim/"; }; - jinja-vim = buildVimPluginFrom2Nix { + jinja-vim = buildVimPlugin { pname = "jinja.vim"; version = "2020-06-18"; src = fetchFromGitHub { @@ -4617,7 +4617,7 @@ final: prev: meta.homepage = "https://github.com/HiPhish/jinja.vim/"; }; - jq-vim = buildVimPluginFrom2Nix { + jq-vim = buildVimPlugin { pname = "jq.vim"; version = "2022-11-26"; src = fetchFromGitHub { @@ -4629,7 +4629,7 @@ final: prev: meta.homepage = "https://github.com/vito-c/jq.vim/"; }; - jsonc-vim = buildVimPluginFrom2Nix { + jsonc-vim = buildVimPlugin { pname = "jsonc.vim"; version = "2022-10-31"; src = fetchFromGitHub { @@ -4641,7 +4641,7 @@ final: prev: meta.homepage = "https://github.com/neoclide/jsonc.vim/"; }; - julia-vim = buildVimPluginFrom2Nix { + julia-vim = buildVimPlugin { pname = "julia-vim"; version = "2023-07-05"; src = fetchFromGitHub { @@ -4653,7 +4653,7 @@ final: prev: meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; - kanagawa-nvim = buildVimPluginFrom2Nix { + kanagawa-nvim = buildVimPlugin { pname = "kanagawa.nvim"; version = "2023-09-13"; src = fetchFromGitHub { @@ -4665,7 +4665,7 @@ final: prev: meta.homepage = "https://github.com/rebelot/kanagawa.nvim/"; }; - keymap-layer-nvim = buildVimPluginFrom2Nix { + keymap-layer-nvim = buildVimPlugin { pname = "keymap-layer.nvim"; version = "2022-07-16"; src = fetchFromGitHub { @@ -4677,7 +4677,7 @@ final: prev: meta.homepage = "https://github.com/anuvyklack/keymap-layer.nvim/"; }; - kmonad-vim = buildVimPluginFrom2Nix { + kmonad-vim = buildVimPlugin { pname = "kmonad-vim"; version = "2022-03-20"; src = fetchFromGitHub { @@ -4689,7 +4689,7 @@ final: prev: meta.homepage = "https://github.com/kmonad/kmonad-vim/"; }; - knap = buildVimPluginFrom2Nix { + knap = buildVimPlugin { pname = "knap"; version = "2023-07-25"; src = fetchFromGitHub { @@ -4701,7 +4701,7 @@ final: prev: meta.homepage = "https://github.com/frabjous/knap/"; }; - kommentary = buildVimPluginFrom2Nix { + kommentary = buildVimPlugin { pname = "kommentary"; version = "2023-01-06"; src = fetchFromGitHub { @@ -4713,7 +4713,7 @@ final: prev: meta.homepage = "https://github.com/b3nj5m1n/kommentary/"; }; - kotlin-vim = buildVimPluginFrom2Nix { + kotlin-vim = buildVimPlugin { pname = "kotlin-vim"; version = "2022-12-30"; src = fetchFromGitHub { @@ -4725,7 +4725,7 @@ final: prev: meta.homepage = "https://github.com/udalov/kotlin-vim/"; }; - lalrpop-vim = buildVimPluginFrom2Nix { + lalrpop-vim = buildVimPlugin { pname = "lalrpop.vim"; version = "2017-11-22"; src = fetchFromGitHub { @@ -4737,7 +4737,7 @@ final: prev: meta.homepage = "https://github.com/qnighy/lalrpop.vim/"; }; - last256 = buildVimPluginFrom2Nix { + last256 = buildVimPlugin { pname = "last256"; version = "2020-12-09"; src = fetchFromGitHub { @@ -4749,7 +4749,7 @@ final: prev: meta.homepage = "https://github.com/sk1418/last256/"; }; - latex-box = buildVimPluginFrom2Nix { + latex-box = buildVimPlugin { pname = "latex-box"; version = "2015-06-01"; src = fetchFromGitHub { @@ -4761,7 +4761,7 @@ final: prev: meta.homepage = "https://github.com/latex-box-team/latex-box/"; }; - lazy-lsp-nvim = buildVimPluginFrom2Nix { + lazy-lsp-nvim = buildVimPlugin { pname = "lazy-lsp.nvim"; version = "2023-09-13"; src = fetchFromGitHub { @@ -4773,43 +4773,43 @@ final: prev: meta.homepage = "https://github.com/dundalek/lazy-lsp.nvim/"; }; - lazy-nvim = buildVimPluginFrom2Nix { + lazy-nvim = buildVimPlugin { pname = "lazy.nvim"; - version = "2023-08-26"; + version = "2023-09-30"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "2a9354c7d2368d78cbd5575a51a2af5bd8a6ad01"; - sha256 = "01c09qqzjlmsksac39g2bqygx0xh5ibzb3s4v35b9mlhfyylaxyk"; + rev = "59335c5b9d116f5d3948f833288a89e2a829a005"; + sha256 = "04x04mzs3cc736l4phsws981nsga8hws3ca46pniz5h3qhj8zfwa"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; - lazygit-nvim = buildVimPluginFrom2Nix { + lazygit-nvim = buildVimPlugin { pname = "lazygit.nvim"; - version = "2023-09-05"; + version = "2023-09-26"; src = fetchFromGitHub { owner = "kdheepak"; repo = "lazygit.nvim"; - rev = "75c920883f44243f2bbb172be423e484a58f7c45"; - sha256 = "101vnzc67yxadziyyjc07kca7jd9ms3gfqjkaq7lg3gh5q1gh5my"; + rev = "de35012036d43bca03628d40d083f7c02a4cda3f"; + sha256 = "1wgcl487gijm0ydp8n79jc8pmh947vphhh67vk6p79fxaihc56bl"; }; meta.homepage = "https://github.com/kdheepak/lazygit.nvim/"; }; - lean-nvim = buildVimPluginFrom2Nix { + lean-nvim = buildVimPlugin { pname = "lean.nvim"; - version = "2023-09-14"; + version = "2023-09-30"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "ad8305e07dd6226724e87607c9c5a8331bb3f62e"; - sha256 = "1q99m9xmdalnisnk4nixwgkkf2mq8s3vh4kd2kaxd2psg3a0a5dy"; + rev = "cd33d84e954ac15b42020889d1d0d6a9cc0e9e9c"; + sha256 = "11gkkc32ha1n6b7x88mvnw1afkp45mx8abpa1c4hkc2x7666sxc5"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; - lean-vim = buildVimPluginFrom2Nix { + lean-vim = buildVimPlugin { pname = "lean.vim"; version = "2021-09-29"; src = fetchFromGitHub { @@ -4821,7 +4821,7 @@ final: prev: meta.homepage = "https://github.com/leanprover/lean.vim/"; }; - leap-ast-nvim = buildVimPluginFrom2Nix { + leap-ast-nvim = buildVimPlugin { pname = "leap-ast.nvim"; version = "2022-10-10"; src = fetchFromGitHub { @@ -4833,7 +4833,7 @@ final: prev: meta.homepage = "https://github.com/ggandor/leap-ast.nvim/"; }; - leap-nvim = buildVimPluginFrom2Nix { + leap-nvim = buildVimPlugin { pname = "leap.nvim"; version = "2023-07-23"; src = fetchFromGitHub { @@ -4845,7 +4845,7 @@ final: prev: meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; - legendary-nvim = buildVimPluginFrom2Nix { + legendary-nvim = buildVimPlugin { pname = "legendary.nvim"; version = "2023-07-08"; src = fetchFromGitHub { @@ -4857,7 +4857,7 @@ final: prev: meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; - lens-vim = buildVimPluginFrom2Nix { + lens-vim = buildVimPlugin { pname = "lens.vim"; version = "2021-05-30"; src = fetchFromGitHub { @@ -4869,7 +4869,7 @@ final: prev: meta.homepage = "https://github.com/camspiers/lens.vim/"; }; - lessspace-vim = buildVimPluginFrom2Nix { + lessspace-vim = buildVimPlugin { pname = "lessspace.vim"; version = "2023-02-13"; src = fetchFromGitHub { @@ -4881,7 +4881,7 @@ final: prev: meta.homepage = "https://github.com/thirtythreeforty/lessspace.vim/"; }; - lexima-vim = buildVimPluginFrom2Nix { + lexima-vim = buildVimPlugin { pname = "lexima.vim"; version = "2023-09-04"; src = fetchFromGitHub { @@ -4893,7 +4893,7 @@ final: prev: meta.homepage = "https://github.com/cohama/lexima.vim/"; }; - lf-vim = buildVimPluginFrom2Nix { + lf-vim = buildVimPlugin { pname = "lf.vim"; version = "2022-08-24"; src = fetchFromGitHub { @@ -4905,7 +4905,7 @@ final: prev: meta.homepage = "https://github.com/ptzz/lf.vim/"; }; - lh-brackets = buildVimPluginFrom2Nix { + lh-brackets = buildVimPlugin { pname = "lh-brackets"; version = "2023-05-16"; src = fetchFromGitHub { @@ -4917,7 +4917,7 @@ final: prev: meta.homepage = "https://github.com/LucHermitte/lh-brackets/"; }; - lh-vim-lib = buildVimPluginFrom2Nix { + lh-vim-lib = buildVimPlugin { pname = "lh-vim-lib"; version = "2023-05-16"; src = fetchFromGitHub { @@ -4929,7 +4929,7 @@ final: prev: meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/"; }; - lightline-ale = buildVimPluginFrom2Nix { + lightline-ale = buildVimPlugin { pname = "lightline-ale"; version = "2021-06-09"; src = fetchFromGitHub { @@ -4941,7 +4941,7 @@ final: prev: meta.homepage = "https://github.com/maximbaz/lightline-ale/"; }; - lightline-bufferline = buildVimPluginFrom2Nix { + lightline-bufferline = buildVimPlugin { pname = "lightline-bufferline"; version = "2023-06-06"; src = fetchFromGitHub { @@ -4953,7 +4953,7 @@ final: prev: meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/"; }; - lightline-gruvbox-vim = buildVimPluginFrom2Nix { + lightline-gruvbox-vim = buildVimPlugin { pname = "lightline-gruvbox.vim"; version = "2023-04-02"; src = fetchFromGitHub { @@ -4965,7 +4965,7 @@ final: prev: meta.homepage = "https://github.com/shinchu/lightline-gruvbox.vim/"; }; - lightline-lsp = buildVimPluginFrom2Nix { + lightline-lsp = buildVimPlugin { pname = "lightline-lsp"; version = "2023-03-15"; src = fetchFromGitHub { @@ -4977,7 +4977,7 @@ final: prev: meta.homepage = "https://github.com/spywhere/lightline-lsp/"; }; - lightline-vim = buildVimPluginFrom2Nix { + lightline-vim = buildVimPlugin { pname = "lightline.vim"; version = "2023-09-03"; src = fetchFromGitHub { @@ -4989,7 +4989,7 @@ final: prev: meta.homepage = "https://github.com/itchyny/lightline.vim/"; }; - lightspeed-nvim = buildVimPluginFrom2Nix { + lightspeed-nvim = buildVimPlugin { pname = "lightspeed.nvim"; version = "2022-10-21"; src = fetchFromGitHub { @@ -5001,7 +5001,7 @@ final: prev: meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; - limelight-vim = buildVimPluginFrom2Nix { + limelight-vim = buildVimPlugin { pname = "limelight.vim"; version = "2022-08-03"; src = fetchFromGitHub { @@ -5013,7 +5013,7 @@ final: prev: meta.homepage = "https://github.com/junegunn/limelight.vim/"; }; - lingua-franca-vim = buildVimPluginFrom2Nix { + lingua-franca-vim = buildVimPlugin { pname = "lingua-franca.vim"; version = "2021-09-05"; src = fetchFromGitHub { @@ -5025,7 +5025,7 @@ final: prev: meta.homepage = "https://github.com/lf-lang/lingua-franca.vim/"; }; - lir-nvim = buildVimPluginFrom2Nix { + lir-nvim = buildVimPlugin { pname = "lir.nvim"; version = "2023-07-12"; src = fetchFromGitHub { @@ -5037,7 +5037,7 @@ final: prev: meta.homepage = "https://github.com/tamago324/lir.nvim/"; }; - lispdocs-nvim = buildVimPluginFrom2Nix { + lispdocs-nvim = buildVimPlugin { pname = "lispdocs.nvim"; version = "2022-07-05"; src = fetchFromGitHub { @@ -5049,7 +5049,7 @@ final: prev: meta.homepage = "https://github.com/kkharji/lispdocs.nvim/"; }; - litee-calltree-nvim = buildVimPluginFrom2Nix { + litee-calltree-nvim = buildVimPlugin { pname = "litee-calltree.nvim"; version = "2022-09-28"; src = fetchFromGitHub { @@ -5061,7 +5061,7 @@ final: prev: meta.homepage = "https://github.com/ldelossa/litee-calltree.nvim/"; }; - litee-filetree-nvim = buildVimPluginFrom2Nix { + litee-filetree-nvim = buildVimPlugin { pname = "litee-filetree.nvim"; version = "2022-09-27"; src = fetchFromGitHub { @@ -5073,7 +5073,7 @@ final: prev: meta.homepage = "https://github.com/ldelossa/litee-filetree.nvim/"; }; - litee-symboltree-nvim = buildVimPluginFrom2Nix { + litee-symboltree-nvim = buildVimPlugin { pname = "litee-symboltree.nvim"; version = "2022-09-28"; src = fetchFromGitHub { @@ -5085,7 +5085,7 @@ final: prev: meta.homepage = "https://github.com/ldelossa/litee-symboltree.nvim/"; }; - litee-nvim = buildVimPluginFrom2Nix { + litee-nvim = buildVimPlugin { pname = "litee.nvim"; version = "2022-12-11"; src = fetchFromGitHub { @@ -5097,7 +5097,7 @@ final: prev: meta.homepage = "https://github.com/ldelossa/litee.nvim/"; }; - live-command-nvim = buildVimPluginFrom2Nix { + live-command-nvim = buildVimPlugin { pname = "live-command.nvim"; version = "2023-06-05"; src = fetchFromGitHub { @@ -5109,7 +5109,7 @@ final: prev: meta.homepage = "https://github.com/smjonas/live-command.nvim/"; }; - lsp-colors-nvim = buildVimPluginFrom2Nix { + lsp-colors-nvim = buildVimPlugin { pname = "lsp-colors.nvim"; version = "2023-02-27"; src = fetchFromGitHub { @@ -5121,7 +5121,7 @@ final: prev: meta.homepage = "https://github.com/folke/lsp-colors.nvim/"; }; - lsp-format-nvim = buildVimPluginFrom2Nix { + lsp-format-nvim = buildVimPlugin { pname = "lsp-format.nvim"; version = "2023-09-13"; src = fetchFromGitHub { @@ -5133,7 +5133,7 @@ final: prev: meta.homepage = "https://github.com/lukas-reineke/lsp-format.nvim/"; }; - lsp-inlayhints-nvim = buildVimPluginFrom2Nix { + lsp-inlayhints-nvim = buildVimPlugin { pname = "lsp-inlayhints.nvim"; version = "2023-06-08"; src = fetchFromGitHub { @@ -5145,7 +5145,7 @@ final: prev: meta.homepage = "https://github.com/lvimuser/lsp-inlayhints.nvim/"; }; - lsp-overloads-nvim = buildVimPluginFrom2Nix { + lsp-overloads-nvim = buildVimPlugin { pname = "lsp-overloads.nvim"; version = "2023-08-13"; src = fetchFromGitHub { @@ -5157,7 +5157,7 @@ final: prev: meta.homepage = "https://github.com/Issafalcon/lsp-overloads.nvim/"; }; - lsp-rooter-nvim = buildVimPluginFrom2Nix { + lsp-rooter-nvim = buildVimPlugin { pname = "lsp-rooter.nvim"; version = "2021-08-13"; src = fetchFromGitHub { @@ -5169,7 +5169,7 @@ final: prev: meta.homepage = "https://github.com/ahmedkhalf/lsp-rooter.nvim/"; }; - lsp-status-nvim = buildVimPluginFrom2Nix { + lsp-status-nvim = buildVimPlugin { pname = "lsp-status.nvim"; version = "2022-08-03"; src = fetchFromGitHub { @@ -5181,7 +5181,7 @@ final: prev: meta.homepage = "https://github.com/nvim-lua/lsp-status.nvim/"; }; - lsp-zero-nvim = buildVimPluginFrom2Nix { + lsp-zero-nvim = buildVimPlugin { pname = "lsp-zero.nvim"; version = "2023-08-23"; src = fetchFromGitHub { @@ -5193,7 +5193,7 @@ final: prev: meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/"; }; - lsp_extensions-nvim = buildVimPluginFrom2Nix { + lsp_extensions-nvim = buildVimPlugin { pname = "lsp_extensions.nvim"; version = "2022-07-07"; src = fetchFromGitHub { @@ -5205,30 +5205,30 @@ final: prev: meta.homepage = "https://github.com/nvim-lua/lsp_extensions.nvim/"; }; - lsp_lines-nvim = buildVimPluginFrom2Nix { + lsp_lines-nvim = buildVimPlugin { pname = "lsp_lines.nvim"; - version = "2023-05-15"; + version = "2023-09-25"; src = fetchgit { url = "https://git.sr.ht/~whynothugo/lsp_lines.nvim"; - rev = "f53af96d4789eef39a082dbcce078d2bfc384ece"; - sha256 = "11nsp21n1lhjl6m4mgj1vdcvalik9dmvv8baflzd2njb5g3gc5v6"; + rev = "9e3f99fbbd28aaec80dc0158c43be8cca8dd5017"; + sha256 = "1rva0ykikkj8wssga5h0ccqarkvcvi9g2kgr3il889v3zsim7d2m"; }; meta.homepage = "https://git.sr.ht/~whynothugo/lsp_lines.nvim"; }; - lsp_signature-nvim = buildVimPluginFrom2Nix { + lsp_signature-nvim = buildVimPlugin { pname = "lsp_signature.nvim"; - version = "2023-09-11"; + version = "2023-09-20"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "51784ba4ce87b362c139b8c2db6583c0aec20536"; - sha256 = "10bbmwzsk882qp8x9c516v8jk73sslg0ac1vcqchkw3yc9gn73jc"; + rev = "bdf3dc7bb03edd25c2173e0e31c2fb122052ed23"; + sha256 = "16lca28qd9aik71lb9vkfg0ypsabx36j9aqaqjsihbhb2b2z8v4p"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; - lspcontainers-nvim = buildVimPluginFrom2Nix { + lspcontainers-nvim = buildVimPlugin { pname = "lspcontainers.nvim"; version = "2023-06-03"; src = fetchFromGitHub { @@ -5240,7 +5240,7 @@ final: prev: meta.homepage = "https://github.com/lspcontainers/lspcontainers.nvim/"; }; - lspkind-nvim = buildVimPluginFrom2Nix { + lspkind-nvim = buildVimPlugin { pname = "lspkind-nvim"; version = "2023-05-05"; src = fetchFromGitHub { @@ -5252,19 +5252,19 @@ final: prev: meta.homepage = "https://github.com/onsails/lspkind.nvim/"; }; - lspsaga-nvim = buildVimPluginFrom2Nix { + lspsaga-nvim = buildVimPlugin { pname = "lspsaga.nvim"; - version = "2023-09-15"; + version = "2023-10-01"; src = fetchFromGitHub { owner = "nvimdev"; repo = "lspsaga.nvim"; - rev = "32c1b404489723771d385579d695b61cf12bf3a4"; - sha256 = "1i4f220r1m5sczbgzmm0bc8dzvbv9vwfy4qlsrcjv2jg9xgmapzj"; + rev = "f8a6d7cfe185637616d7fdee676dd543ae5fde55"; + sha256 = "0vwk2nn8mm113lk6sywdgfp6k0887d14pys9w8b6k4hm8xw5zfzq"; }; meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/"; }; - ltex_extra-nvim = buildVimPluginFrom2Nix { + ltex_extra-nvim = buildVimPlugin { pname = "ltex_extra.nvim"; version = "2023-07-28"; src = fetchFromGitHub { @@ -5276,7 +5276,7 @@ final: prev: meta.homepage = "https://github.com/barreiroleo/ltex_extra.nvim/"; }; - lualine-lsp-progress = buildVimPluginFrom2Nix { + lualine-lsp-progress = buildVimPlugin { pname = "lualine-lsp-progress"; version = "2021-10-23"; src = fetchFromGitHub { @@ -5288,7 +5288,7 @@ final: prev: meta.homepage = "https://github.com/arkav/lualine-lsp-progress/"; }; - lualine-nvim = buildVimPluginFrom2Nix { + lualine-nvim = buildVimPlugin { pname = "lualine.nvim"; version = "2023-08-03"; src = fetchFromGitHub { @@ -5300,20 +5300,20 @@ final: prev: meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; - luasnip = buildVimPluginFrom2Nix { + luasnip = buildVimPlugin { pname = "luasnip"; - version = "2023-08-31"; + version = "2023-09-25"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "ea7d7ea510c641c4f15042becd27f35b3e5b3c2b"; - sha256 = "0r0k265m5nf0rl8hma13yjw8fyd08629h1awa94lk0s6dvk7mkh0"; + rev = "480b032f6708573334f4437d3f83307d143f1a72"; + sha256 = "0jb4aaspl3xcqafqych973qrgnnp5bqhvinf03id8494da8zf9z7"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; - luatab-nvim = buildVimPluginFrom2Nix { + luatab-nvim = buildVimPlugin { pname = "luatab.nvim"; version = "2021-12-05"; src = fetchFromGitHub { @@ -5327,17 +5327,17 @@ final: prev: lush-nvim = buildNeovimPlugin { pname = "lush.nvim"; - version = "2023-08-03"; + version = "2023-09-23"; src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "a8f0f7b9f837887f13a61d67b40ae26188fe4d62"; - sha256 = "1zni7l5ldfv1inq30b7kqg1mv26558hif4nssawk5mjisjwdlwsp"; + rev = "966aad1accd47fa11fbe2539234f81f678fef2de"; + sha256 = "0g1xib2k42py9qqccjz11qk52ri0drgdk5rb0ls7wzx4v636k15h"; }; meta.homepage = "https://github.com/rktjmp/lush.nvim/"; }; - lushtags = buildVimPluginFrom2Nix { + lushtags = buildVimPlugin { pname = "lushtags"; version = "2017-04-19"; src = fetchFromGitHub { @@ -5349,7 +5349,7 @@ final: prev: meta.homepage = "https://github.com/mkasa/lushtags/"; }; - magma-nvim-goose = buildVimPluginFrom2Nix { + magma-nvim-goose = buildVimPlugin { pname = "magma-nvim-goose"; version = "2023-07-04"; src = fetchFromGitHub { @@ -5361,7 +5361,7 @@ final: prev: meta.homepage = "https://github.com/WhiteBlackGoose/magma-nvim-goose/"; }; - mark-radar-nvim = buildVimPluginFrom2Nix { + mark-radar-nvim = buildVimPlugin { pname = "mark-radar.nvim"; version = "2021-06-22"; src = fetchFromGitHub { @@ -5373,7 +5373,7 @@ final: prev: meta.homepage = "https://github.com/winston0410/mark-radar.nvim/"; }; - markdown-preview-nvim = buildVimPluginFrom2Nix { + markdown-preview-nvim = buildVimPlugin { pname = "markdown-preview.nvim"; version = "2022-05-13"; src = fetchFromGitHub { @@ -5385,7 +5385,7 @@ final: prev: meta.homepage = "https://github.com/iamcco/markdown-preview.nvim/"; }; - markid = buildVimPluginFrom2Nix { + markid = buildVimPlugin { pname = "markid"; version = "2023-07-01"; src = fetchFromGitHub { @@ -5397,7 +5397,7 @@ final: prev: meta.homepage = "https://github.com/David-Kunz/markid/"; }; - marks-nvim = buildVimPluginFrom2Nix { + marks-nvim = buildVimPlugin { pname = "marks.nvim"; version = "2023-02-25"; src = fetchFromGitHub { @@ -5409,31 +5409,31 @@ final: prev: meta.homepage = "https://github.com/chentoast/marks.nvim/"; }; - mason-lspconfig-nvim = buildVimPluginFrom2Nix { + mason-lspconfig-nvim = buildVimPlugin { pname = "mason-lspconfig.nvim"; - version = "2023-09-14"; + version = "2023-10-01"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "f014db32437aa61c86fc0ef1067cd2bc6a37205c"; - sha256 = "0wagin4cr5rjjcnjlnh8z3g0sw7aml44y6wm3l9s170d7inqqylm"; + rev = "48025d62f45af52ba47e4193b854864839392e4c"; + sha256 = "1n3xlfjjjwng0rhlgvl0dj25fhlfk35vscwmz1kpdad627lzg83b"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; - mason-tool-installer-nvim = buildVimPluginFrom2Nix { + mason-tool-installer-nvim = buildVimPlugin { pname = "mason-tool-installer.nvim"; - version = "2023-07-13"; + version = "2023-09-23"; src = fetchFromGitHub { owner = "WhoIsSethDaniel"; repo = "mason-tool-installer.nvim"; - rev = "031903fefbf59371502092ef9e22cab9161d90ba"; - sha256 = "1za6shsh5ykdv9ivf971b3ckfxk25p8lsd9qdgrmm5bag6vih8cl"; + rev = "83dcddb6477f9ba5db98971ef27bd18bdca921b4"; + sha256 = "1g04jj1z7ak74b8rccwhmg1yqlfxhhn3mblsqzxbz48xy4bjlsdp"; }; meta.homepage = "https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/"; }; - mason-nvim = buildVimPluginFrom2Nix { + mason-nvim = buildVimPlugin { pname = "mason.nvim"; version = "2023-09-10"; src = fetchFromGitHub { @@ -5445,7 +5445,7 @@ final: prev: meta.homepage = "https://github.com/williamboman/mason.nvim/"; }; - matchit-zip = buildVimPluginFrom2Nix { + matchit-zip = buildVimPlugin { pname = "matchit.zip"; version = "2010-10-18"; src = fetchFromGitHub { @@ -5457,7 +5457,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/matchit.zip/"; }; - material-nvim = buildVimPluginFrom2Nix { + material-nvim = buildVimPlugin { pname = "material.nvim"; version = "2023-07-11"; src = fetchFromGitHub { @@ -5469,7 +5469,7 @@ final: prev: meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; }; - material-vim = buildVimPluginFrom2Nix { + material-vim = buildVimPlugin { pname = "material.vim"; version = "2023-02-09"; src = fetchFromGitHub { @@ -5481,7 +5481,7 @@ final: prev: meta.homepage = "https://github.com/kaicataldo/material.vim/"; }; - mayansmoke = buildVimPluginFrom2Nix { + mayansmoke = buildVimPlugin { pname = "mayansmoke"; version = "2010-10-18"; src = fetchFromGitHub { @@ -5493,7 +5493,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/mayansmoke/"; }; - mediawiki-vim = buildVimPluginFrom2Nix { + mediawiki-vim = buildVimPlugin { pname = "mediawiki.vim"; version = "2015-11-15"; src = fetchFromGitHub { @@ -5505,7 +5505,7 @@ final: prev: meta.homepage = "https://github.com/chikamichi/mediawiki.vim/"; }; - melange-nvim = buildVimPluginFrom2Nix { + melange-nvim = buildVimPlugin { pname = "melange-nvim"; version = "2023-08-11"; src = fetchFromGitHub { @@ -5517,7 +5517,7 @@ final: prev: meta.homepage = "https://github.com/savq/melange-nvim/"; }; - mind-nvim = buildVimPluginFrom2Nix { + mind-nvim = buildVimPlugin { pname = "mind.nvim"; version = "2023-03-22"; src = fetchFromGitHub { @@ -5529,19 +5529,19 @@ final: prev: meta.homepage = "https://github.com/phaazon/mind.nvim/"; }; - mini-nvim = buildVimPluginFrom2Nix { + mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2023-09-14"; + version = "2023-09-26"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "e2273ec6186a7af206cc73de10970c0c3867c46d"; - sha256 = "0rry8fiyinjgp0s6qphdixra1wgg01k8da1xb8qcd39qx0nrlpf2"; + rev = "1fdbb864e2015eb6f501394d593630f825154385"; + sha256 = "1iivgd0hlsi6d3i9lzffy74ilra7rigmdq6z3wrdfv33iwgm1k12"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; - minimap-vim = buildVimPluginFrom2Nix { + minimap-vim = buildVimPlugin { pname = "minimap.vim"; version = "2023-07-25"; src = fetchFromGitHub { @@ -5553,7 +5553,7 @@ final: prev: meta.homepage = "https://github.com/wfxr/minimap.vim/"; }; - mkdir-nvim = buildVimPluginFrom2Nix { + mkdir-nvim = buildVimPlugin { pname = "mkdir.nvim"; version = "2022-07-23"; src = fetchFromGitHub { @@ -5565,7 +5565,7 @@ final: prev: meta.homepage = "https://github.com/jghauser/mkdir.nvim/"; }; - mkdnflow-nvim = buildVimPluginFrom2Nix { + mkdnflow-nvim = buildVimPlugin { pname = "mkdnflow.nvim"; version = "2023-07-05"; src = fetchFromGitHub { @@ -5577,7 +5577,7 @@ final: prev: meta.homepage = "https://github.com/jakewvincent/mkdnflow.nvim/"; }; - mkdx = buildVimPluginFrom2Nix { + mkdx = buildVimPlugin { pname = "mkdx"; version = "2023-08-23"; src = fetchFromGitHub { @@ -5589,7 +5589,7 @@ final: prev: meta.homepage = "https://github.com/SidOfc/mkdx/"; }; - modicator-nvim = buildVimPluginFrom2Nix { + modicator-nvim = buildVimPlugin { pname = "modicator.nvim"; version = "2023-08-25"; src = fetchFromGitHub { @@ -5601,7 +5601,7 @@ final: prev: meta.homepage = "https://github.com/mawkler/modicator.nvim/"; }; - molokai = buildVimPluginFrom2Nix { + molokai = buildVimPlugin { pname = "molokai"; version = "2015-11-11"; src = fetchFromGitHub { @@ -5613,19 +5613,19 @@ final: prev: meta.homepage = "https://github.com/tomasr/molokai/"; }; - monokai-pro-nvim = buildVimPluginFrom2Nix { + monokai-pro-nvim = buildVimPlugin { pname = "monokai-pro.nvim"; - version = "2023-09-05"; + version = "2023-09-29"; src = fetchFromGitHub { owner = "loctvl842"; repo = "monokai-pro.nvim"; - rev = "488a0152331c59a33d7f8bdef6eb88dae299c808"; - sha256 = "1nmak9fp7mkbwxrmd3h23468ywsdfcjfyq29p0c4nhglyxlnqhal"; + rev = "6b3bf9a4e0c988471969f62b36486023b33dd963"; + sha256 = "1frrsxvvklq6lpwclqsknqwpca1bgb13ijwj17x2x69bnzd13vhi"; }; meta.homepage = "https://github.com/loctvl842/monokai-pro.nvim/"; }; - moonscript-vim = buildVimPluginFrom2Nix { + moonscript-vim = buildVimPlugin { pname = "moonscript-vim"; version = "2016-11-22"; src = fetchFromGitHub { @@ -5637,7 +5637,7 @@ final: prev: meta.homepage = "https://github.com/leafo/moonscript-vim/"; }; - mru = buildVimPluginFrom2Nix { + mru = buildVimPlugin { pname = "mru"; version = "2023-05-27"; src = fetchFromGitHub { @@ -5649,7 +5649,7 @@ final: prev: meta.homepage = "https://github.com/yegappan/mru/"; }; - multicursors-nvim = buildVimPluginFrom2Nix { + multicursors-nvim = buildVimPlugin { pname = "multicursors.nvim"; version = "2023-09-16"; src = fetchFromGitHub { @@ -5661,7 +5661,7 @@ final: prev: meta.homepage = "https://github.com/smoka7/multicursors.nvim/"; }; - nabla-nvim = buildVimPluginFrom2Nix { + nabla-nvim = buildVimPlugin { pname = "nabla.nvim"; version = "2023-04-22"; src = fetchFromGitHub { @@ -5673,7 +5673,7 @@ final: prev: meta.homepage = "https://github.com/jbyuki/nabla.nvim/"; }; - ncm2 = buildVimPluginFrom2Nix { + ncm2 = buildVimPlugin { pname = "ncm2"; version = "2022-03-17"; src = fetchFromGitHub { @@ -5685,7 +5685,7 @@ final: prev: meta.homepage = "https://github.com/ncm2/ncm2/"; }; - ncm2-bufword = buildVimPluginFrom2Nix { + ncm2-bufword = buildVimPlugin { pname = "ncm2-bufword"; version = "2019-01-19"; src = fetchFromGitHub { @@ -5697,7 +5697,7 @@ final: prev: meta.homepage = "https://github.com/ncm2/ncm2-bufword/"; }; - ncm2-cssomni = buildVimPluginFrom2Nix { + ncm2-cssomni = buildVimPlugin { pname = "ncm2-cssomni"; version = "2018-07-09"; src = fetchFromGitHub { @@ -5709,7 +5709,7 @@ final: prev: meta.homepage = "https://github.com/ncm2/ncm2-cssomni/"; }; - ncm2-dictionary = buildVimPluginFrom2Nix { + ncm2-dictionary = buildVimPlugin { pname = "ncm2-dictionary"; version = "2018-11-15"; src = fetchFromGitHub { @@ -5721,7 +5721,7 @@ final: prev: meta.homepage = "https://github.com/yuki-yano/ncm2-dictionary/"; }; - ncm2-github = buildVimPluginFrom2Nix { + ncm2-github = buildVimPlugin { pname = "ncm2-github"; version = "2018-08-01"; src = fetchFromGitHub { @@ -5733,7 +5733,7 @@ final: prev: meta.homepage = "https://github.com/ncm2/ncm2-github/"; }; - ncm2-html-subscope = buildVimPluginFrom2Nix { + ncm2-html-subscope = buildVimPlugin { pname = "ncm2-html-subscope"; version = "2018-07-01"; src = fetchFromGitHub { @@ -5745,7 +5745,7 @@ final: prev: meta.homepage = "https://github.com/ncm2/ncm2-html-subscope/"; }; - ncm2-jedi = buildVimPluginFrom2Nix { + ncm2-jedi = buildVimPlugin { pname = "ncm2-jedi"; version = "2021-01-05"; src = fetchFromGitHub { @@ -5757,7 +5757,7 @@ final: prev: meta.homepage = "https://github.com/ncm2/ncm2-jedi/"; }; - ncm2-markdown-subscope = buildVimPluginFrom2Nix { + ncm2-markdown-subscope = buildVimPlugin { pname = "ncm2-markdown-subscope"; version = "2020-03-09"; src = fetchFromGitHub { @@ -5769,7 +5769,7 @@ final: prev: meta.homepage = "https://github.com/ncm2/ncm2-markdown-subscope/"; }; - ncm2-neoinclude = buildVimPluginFrom2Nix { + ncm2-neoinclude = buildVimPlugin { pname = "ncm2-neoinclude"; version = "2020-07-19"; src = fetchFromGitHub { @@ -5781,7 +5781,7 @@ final: prev: meta.homepage = "https://github.com/ncm2/ncm2-neoinclude/"; }; - ncm2-neosnippet = buildVimPluginFrom2Nix { + ncm2-neosnippet = buildVimPlugin { pname = "ncm2-neosnippet"; version = "2021-10-08"; src = fetchFromGitHub { @@ -5793,7 +5793,7 @@ final: prev: meta.homepage = "https://github.com/ncm2/ncm2-neosnippet/"; }; - ncm2-path = buildVimPluginFrom2Nix { + ncm2-path = buildVimPlugin { pname = "ncm2-path"; version = "2019-02-20"; src = fetchFromGitHub { @@ -5805,7 +5805,7 @@ final: prev: meta.homepage = "https://github.com/ncm2/ncm2-path/"; }; - ncm2-syntax = buildVimPluginFrom2Nix { + ncm2-syntax = buildVimPlugin { pname = "ncm2-syntax"; version = "2020-07-19"; src = fetchFromGitHub { @@ -5817,7 +5817,7 @@ final: prev: meta.homepage = "https://github.com/ncm2/ncm2-syntax/"; }; - ncm2-tagprefix = buildVimPluginFrom2Nix { + ncm2-tagprefix = buildVimPlugin { pname = "ncm2-tagprefix"; version = "2018-11-08"; src = fetchFromGitHub { @@ -5829,7 +5829,7 @@ final: prev: meta.homepage = "https://github.com/ncm2/ncm2-tagprefix/"; }; - ncm2-tmux = buildVimPluginFrom2Nix { + ncm2-tmux = buildVimPlugin { pname = "ncm2-tmux"; version = "2019-01-11"; src = fetchFromGitHub { @@ -5841,7 +5841,7 @@ final: prev: meta.homepage = "https://github.com/ncm2/ncm2-tmux/"; }; - ncm2-ultisnips = buildVimPluginFrom2Nix { + ncm2-ultisnips = buildVimPlugin { pname = "ncm2-ultisnips"; version = "2019-01-26"; src = fetchFromGitHub { @@ -5853,7 +5853,7 @@ final: prev: meta.homepage = "https://github.com/ncm2/ncm2-ultisnips/"; }; - ncm2-vim = buildVimPluginFrom2Nix { + ncm2-vim = buildVimPlugin { pname = "ncm2-vim"; version = "2020-07-19"; src = fetchFromGitHub { @@ -5865,7 +5865,7 @@ final: prev: meta.homepage = "https://github.com/ncm2/ncm2-vim/"; }; - neco-ghc = buildVimPluginFrom2Nix { + neco-ghc = buildVimPlugin { pname = "neco-ghc"; version = "2021-02-22"; src = fetchFromGitHub { @@ -5877,7 +5877,7 @@ final: prev: meta.homepage = "https://github.com/eagletmt/neco-ghc/"; }; - neco-look = buildVimPluginFrom2Nix { + neco-look = buildVimPlugin { pname = "neco-look"; version = "2021-07-26"; src = fetchFromGitHub { @@ -5889,7 +5889,7 @@ final: prev: meta.homepage = "https://github.com/ujihisa/neco-look/"; }; - neco-syntax = buildVimPluginFrom2Nix { + neco-syntax = buildVimPlugin { pname = "neco-syntax"; version = "2020-09-13"; src = fetchFromGitHub { @@ -5901,7 +5901,7 @@ final: prev: meta.homepage = "https://github.com/Shougo/neco-syntax/"; }; - neco-vim = buildVimPluginFrom2Nix { + neco-vim = buildVimPlugin { pname = "neco-vim"; version = "2023-08-15"; src = fetchFromGitHub { @@ -5913,19 +5913,19 @@ final: prev: meta.homepage = "https://github.com/Shougo/neco-vim/"; }; - neo-tree-nvim = buildVimPluginFrom2Nix { + neo-tree-nvim = buildVimPlugin { pname = "neo-tree.nvim"; - version = "2023-09-16"; + version = "2023-09-30"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "54fe2a5f6f698094b34461a11370fcc29b8a4393"; - sha256 = "18y0saknah3hhxjjqprk608m0y1ccqs03rjs29q6yv7lin1mwxy2"; + rev = "7e2a3caf999e2028abb643eb0472f351b2777591"; + sha256 = "0mqrvk1aqs72vpwsy9ys9c3v3xbi1f7k4n692nm1v58v6d70gffk"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; }; - neocomplete-vim = buildVimPluginFrom2Nix { + neocomplete-vim = buildVimPlugin { pname = "neocomplete.vim"; version = "2023-05-18"; src = fetchFromGitHub { @@ -5937,19 +5937,19 @@ final: prev: meta.homepage = "https://github.com/Shougo/neocomplete.vim/"; }; - neoconf-nvim = buildVimPluginFrom2Nix { + neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "2023-09-16"; + version = "2023-09-30"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "a4eb3675cb87be2e2dcb283dddc8c7aabd2c50ca"; - sha256 = "0kqm855707llmacig446q809gplwddp98vgsxz00c0gbgvpb7r33"; + rev = "466ba6f645f63f91ac84d3dd986acede5d107f39"; + sha256 = "0vqprdkbr8vgdfqhjwnqjfw76sfrr4akfn589kyzwpvncb6ygwv1"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; - neodark-vim = buildVimPluginFrom2Nix { + neodark-vim = buildVimPlugin { pname = "neodark.vim"; version = "2023-07-15"; src = fetchFromGitHub { @@ -5961,31 +5961,31 @@ final: prev: meta.homepage = "https://github.com/KeitaNakamura/neodark.vim/"; }; - neodev-nvim = buildVimPluginFrom2Nix { + neodev-nvim = buildVimPlugin { pname = "neodev.nvim"; - version = "2023-09-15"; + version = "2023-10-01"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "471324e6c746284dbbdc1d357799d1911bb7e120"; - sha256 = "156lr9mrvwg0b5p933617yhdzdygsgcrayw94sq1zxhqpwc9zbjz"; + rev = "41581561a0ffc6ea6a191ee90a23f8c1c7f470fb"; + sha256 = "1q0vfzbzdyc1cnfa2icgrs4zkjajxbqzqypa4q8sfh3cgq364l92"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; - neoformat = buildVimPluginFrom2Nix { + neoformat = buildVimPlugin { pname = "neoformat"; - version = "2023-08-20"; + version = "2023-09-22"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "0c285d7a7c06a6ee88db70871a274797693fce42"; - sha256 = "1vmgj3dd728wbg4hxzaqrvzypbpkxhawdsqy43lp1bbq27b008bf"; + rev = "aedb6f9d3f53d5da229095f7d761d749f8c5c7e0"; + sha256 = "09lk5q7zfvjcfvijk3pr830zl602j3i06zil148fwhkghig0flkg"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; - neogen = buildVimPluginFrom2Nix { + neogen = buildVimPlugin { pname = "neogen"; version = "2023-09-09"; src = fetchFromGitHub { @@ -5997,19 +5997,19 @@ final: prev: meta.homepage = "https://github.com/danymat/neogen/"; }; - neogit = buildVimPluginFrom2Nix { + neogit = buildVimPlugin { pname = "neogit"; - version = "2023-09-15"; + version = "2023-09-29"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "9d9355137b1e2503a47fedfc395e75a8330163e8"; - sha256 = "1ma0yfff1nk091yhs092qvgb2qm86ly4x19ahijj8xa7q85v6p4p"; + rev = "8b06f91ae973fd68fde074f15a887f9a3a3411cb"; + sha256 = "120h0n3md78hzddyd77b47k7dicnij8zb1rw624b9956612slg07"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; - neoinclude-vim = buildVimPluginFrom2Nix { + neoinclude-vim = buildVimPlugin { pname = "neoinclude.vim"; version = "2020-09-13"; src = fetchFromGitHub { @@ -6021,7 +6021,7 @@ final: prev: meta.homepage = "https://github.com/Shougo/neoinclude.vim/"; }; - neomake = buildVimPluginFrom2Nix { + neomake = buildVimPlugin { pname = "neomake"; version = "2023-02-20"; src = fetchFromGitHub { @@ -6033,7 +6033,7 @@ final: prev: meta.homepage = "https://github.com/neomake/neomake/"; }; - neomru-vim = buildVimPluginFrom2Nix { + neomru-vim = buildVimPlugin { pname = "neomru.vim"; version = "2020-02-05"; src = fetchFromGitHub { @@ -6045,7 +6045,7 @@ final: prev: meta.homepage = "https://github.com/Shougo/neomru.vim/"; }; - neon = buildVimPluginFrom2Nix { + neon = buildVimPlugin { pname = "neon"; version = "2022-11-27"; src = fetchFromGitHub { @@ -6057,7 +6057,7 @@ final: prev: meta.homepage = "https://github.com/rafamadriz/neon/"; }; - neorepl-nvim = buildVimPluginFrom2Nix { + neorepl-nvim = buildVimPlugin { pname = "neorepl.nvim"; version = "2022-11-07"; src = fetchFromGitHub { @@ -6069,19 +6069,19 @@ final: prev: meta.homepage = "https://github.com/ii14/neorepl.nvim/"; }; - neorg = buildVimPluginFrom2Nix { + neorg = buildVimPlugin { pname = "neorg"; - version = "2023-09-15"; + version = "2023-09-23"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "069cf8a460594ca6f4233c83aac1a31a96c62d98"; - sha256 = "0a1gr33nr8fagipfmhl98jdpafgc8czi5w3ixbn1nazwigjp3air"; + rev = "745715c873395840a5127413d1ef30a42735605e"; + sha256 = "0nm85zcai92wm4afhaswsmybhyxak7sfmga6dacv0z4v3gnghhav"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; - neorg-telescope = buildVimPluginFrom2Nix { + neorg-telescope = buildVimPlugin { pname = "neorg-telescope"; version = "2023-08-06"; src = fetchFromGitHub { @@ -6093,7 +6093,7 @@ final: prev: meta.homepage = "https://github.com/nvim-neorg/neorg-telescope/"; }; - neoscroll-nvim = buildVimPluginFrom2Nix { + neoscroll-nvim = buildVimPlugin { pname = "neoscroll.nvim"; version = "2023-08-10"; src = fetchFromGitHub { @@ -6105,7 +6105,7 @@ final: prev: meta.homepage = "https://github.com/karb94/neoscroll.nvim/"; }; - neosnippet-snippets = buildVimPluginFrom2Nix { + neosnippet-snippets = buildVimPlugin { pname = "neosnippet-snippets"; version = "2022-04-01"; src = fetchFromGitHub { @@ -6117,7 +6117,7 @@ final: prev: meta.homepage = "https://github.com/Shougo/neosnippet-snippets/"; }; - neosnippet-vim = buildVimPluginFrom2Nix { + neosnippet-vim = buildVimPlugin { pname = "neosnippet.vim"; version = "2023-07-23"; src = fetchFromGitHub { @@ -6129,7 +6129,7 @@ final: prev: meta.homepage = "https://github.com/Shougo/neosnippet.vim/"; }; - neoterm = buildVimPluginFrom2Nix { + neoterm = buildVimPlugin { pname = "neoterm"; version = "2023-03-09"; src = fetchFromGitHub { @@ -6141,7 +6141,7 @@ final: prev: meta.homepage = "https://github.com/kassio/neoterm/"; }; - neotest = buildVimPluginFrom2Nix { + neotest = buildVimPlugin { pname = "neotest"; version = "2023-09-10"; src = fetchFromGitHub { @@ -6153,7 +6153,7 @@ final: prev: meta.homepage = "https://github.com/nvim-neotest/neotest/"; }; - neotest-dart = buildVimPluginFrom2Nix { + neotest-dart = buildVimPlugin { pname = "neotest-dart"; version = "2023-08-27"; src = fetchFromGitHub { @@ -6165,7 +6165,7 @@ final: prev: meta.homepage = "https://github.com/sidlatau/neotest-dart/"; }; - neotest-deno = buildVimPluginFrom2Nix { + neotest-deno = buildVimPlugin { pname = "neotest-deno"; version = "2022-12-09"; src = fetchFromGitHub { @@ -6177,7 +6177,7 @@ final: prev: meta.homepage = "https://github.com/MarkEmmons/neotest-deno/"; }; - neotest-dotnet = buildVimPluginFrom2Nix { + neotest-dotnet = buildVimPlugin { pname = "neotest-dotnet"; version = "2023-08-13"; src = fetchFromGitHub { @@ -6189,7 +6189,7 @@ final: prev: meta.homepage = "https://github.com/Issafalcon/neotest-dotnet/"; }; - neotest-elixir = buildVimPluginFrom2Nix { + neotest-elixir = buildVimPlugin { pname = "neotest-elixir"; version = "2023-08-23"; src = fetchFromGitHub { @@ -6202,7 +6202,7 @@ final: prev: meta.homepage = "https://github.com/jfpedroza/neotest-elixir/"; }; - neotest-go = buildVimPluginFrom2Nix { + neotest-go = buildVimPlugin { pname = "neotest-go"; version = "2023-09-10"; src = fetchFromGitHub { @@ -6214,19 +6214,19 @@ final: prev: meta.homepage = "https://github.com/nvim-neotest/neotest-go/"; }; - neotest-haskell = buildVimPluginFrom2Nix { + neotest-haskell = buildVimPlugin { pname = "neotest-haskell"; - version = "2023-09-11"; + version = "2023-10-01"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "cda6f5ab76f63e9f24b0008f7df9525ded5e8721"; - sha256 = "0xa4qzcaik7hpiv3dv1n7nb15640qnh70ggwzkbp30yhjqb3rjn6"; + rev = "6f8f89cef7e5ed811e8e2f2031f8a214d5dd6c0a"; + sha256 = "0b27zr14y9cx9za3akzpmvgri8y0jw302i7xwkc89wbxxkyjszi2"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; - neotest-jest = buildVimPluginFrom2Nix { + neotest-jest = buildVimPlugin { pname = "neotest-jest"; version = "2023-09-03"; src = fetchFromGitHub { @@ -6238,7 +6238,7 @@ final: prev: meta.homepage = "https://github.com/nvim-neotest/neotest-jest/"; }; - neotest-pest = buildVimPluginFrom2Nix { + neotest-pest = buildVimPlugin { pname = "neotest-pest"; version = "2022-11-24"; src = fetchFromGitHub { @@ -6250,7 +6250,7 @@ final: prev: meta.homepage = "https://github.com/theutz/neotest-pest/"; }; - neotest-phpunit = buildVimPluginFrom2Nix { + neotest-phpunit = buildVimPlugin { pname = "neotest-phpunit"; version = "2023-06-04"; src = fetchFromGitHub { @@ -6262,19 +6262,19 @@ final: prev: meta.homepage = "https://github.com/olimorris/neotest-phpunit/"; }; - neotest-plenary = buildVimPluginFrom2Nix { + neotest-plenary = buildVimPlugin { pname = "neotest-plenary"; - version = "2023-04-27"; + version = "2023-09-29"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest-plenary"; - rev = "e0d9b1530307a03abcc52fc0ae28f054dea3f752"; - sha256 = "1d5ay6jbc8f10zp7nffx67d627389szr8zkvdx02pzq21m9dsv92"; + rev = "dcaf5ed67a9e28a246e9783319e5aa6c9ea1c584"; + sha256 = "01dg3n3bnhc1ppai24syq48n5xkm1a3vm731xrah2y0qi390q0l3"; }; meta.homepage = "https://github.com/nvim-neotest/neotest-plenary/"; }; - neotest-python = buildVimPluginFrom2Nix { + neotest-python = buildVimPlugin { pname = "neotest-python"; version = "2023-08-25"; src = fetchFromGitHub { @@ -6286,31 +6286,31 @@ final: prev: meta.homepage = "https://github.com/nvim-neotest/neotest-python/"; }; - neotest-rspec = buildVimPluginFrom2Nix { + neotest-rspec = buildVimPlugin { pname = "neotest-rspec"; - version = "2023-08-25"; + version = "2023-09-17"; src = fetchFromGitHub { owner = "olimorris"; repo = "neotest-rspec"; - rev = "5638880f0adcdb5366fe57a477dfa94074463709"; - sha256 = "17104fdfiv8iw9g2l2yvkakmqa1pkyb6dj6yh5qnczpylwilkgci"; + rev = "51a3b866d85733d2df2c6b5a16d75ce6ed2fbade"; + sha256 = "028qqd0ywlf93ndy3vqp6pj9pbp3nsibdnkmg3b45g1phc49hbrw"; }; meta.homepage = "https://github.com/olimorris/neotest-rspec/"; }; - neotest-rust = buildVimPluginFrom2Nix { + neotest-rust = buildVimPlugin { pname = "neotest-rust"; - version = "2023-09-16"; + version = "2023-09-20"; src = fetchFromGitHub { owner = "rouge8"; repo = "neotest-rust"; - rev = "c8894d826a2cb5003cb6bc0a2fa8f7a359899130"; - sha256 = "1awrcpdaz1bn8bqfxg0wv7gh1bg9kvan45m8yv4l3m4g8xs7fq1d"; + rev = "139cff7c85598ec591b5ed7d71ce8ed3b5313b97"; + sha256 = "1p8c2mnvv131nn7id2panm68nvmmbn44phzzwa2gggdv1snz0xax"; }; meta.homepage = "https://github.com/rouge8/neotest-rust/"; }; - neotest-scala = buildVimPluginFrom2Nix { + neotest-scala = buildVimPlugin { pname = "neotest-scala"; version = "2022-10-15"; src = fetchFromGitHub { @@ -6322,7 +6322,7 @@ final: prev: meta.homepage = "https://github.com/stevanmilic/neotest-scala/"; }; - neotest-testthat = buildVimPluginFrom2Nix { + neotest-testthat = buildVimPlugin { pname = "neotest-testthat"; version = "2022-07-04"; src = fetchFromGitHub { @@ -6334,7 +6334,7 @@ final: prev: meta.homepage = "https://github.com/shunsambongi/neotest-testthat/"; }; - neotest-vitest = buildVimPluginFrom2Nix { + neotest-vitest = buildVimPlugin { pname = "neotest-vitest"; version = "2023-06-23"; src = fetchFromGitHub { @@ -6346,7 +6346,7 @@ final: prev: meta.homepage = "https://github.com/marilari88/neotest-vitest/"; }; - neovim-ayu = buildVimPluginFrom2Nix { + neovim-ayu = buildVimPlugin { pname = "neovim-ayu"; version = "2023-06-29"; src = fetchFromGitHub { @@ -6358,7 +6358,7 @@ final: prev: meta.homepage = "https://github.com/Shatur/neovim-ayu/"; }; - neovim-fuzzy = buildVimPluginFrom2Nix { + neovim-fuzzy = buildVimPlugin { pname = "neovim-fuzzy"; version = "2023-01-25"; src = fetchFromGitHub { @@ -6370,7 +6370,7 @@ final: prev: meta.homepage = "https://github.com/cloudhead/neovim-fuzzy/"; }; - neovim-sensible = buildVimPluginFrom2Nix { + neovim-sensible = buildVimPlugin { pname = "neovim-sensible"; version = "2017-09-20"; src = fetchFromGitHub { @@ -6382,7 +6382,7 @@ final: prev: meta.homepage = "https://github.com/jeffkreeftmeijer/neovim-sensible/"; }; - neoyank-vim = buildVimPluginFrom2Nix { + neoyank-vim = buildVimPlugin { pname = "neoyank.vim"; version = "2020-12-20"; src = fetchFromGitHub { @@ -6394,7 +6394,7 @@ final: prev: meta.homepage = "https://github.com/Shougo/neoyank.vim/"; }; - nerdcommenter = buildVimPluginFrom2Nix { + nerdcommenter = buildVimPlugin { pname = "nerdcommenter"; version = "2023-08-12"; src = fetchFromGitHub { @@ -6406,7 +6406,7 @@ final: prev: meta.homepage = "https://github.com/preservim/nerdcommenter/"; }; - nerdtree = buildVimPluginFrom2Nix { + nerdtree = buildVimPlugin { pname = "nerdtree"; version = "2023-09-04"; src = fetchFromGitHub { @@ -6418,7 +6418,7 @@ final: prev: meta.homepage = "https://github.com/preservim/nerdtree/"; }; - nerdtree-git-plugin = buildVimPluginFrom2Nix { + nerdtree-git-plugin = buildVimPlugin { pname = "nerdtree-git-plugin"; version = "2021-08-18"; src = fetchFromGitHub { @@ -6430,7 +6430,7 @@ final: prev: meta.homepage = "https://github.com/Xuyuanp/nerdtree-git-plugin/"; }; - netman-nvim = buildVimPluginFrom2Nix { + netman-nvim = buildVimPlugin { pname = "netman.nvim"; version = "2023-04-19"; src = fetchFromGitHub { @@ -6442,7 +6442,7 @@ final: prev: meta.homepage = "https://github.com/miversen33/netman.nvim/"; }; - neuron-nvim = buildVimPluginFrom2Nix { + neuron-nvim = buildVimPlugin { pname = "neuron.nvim"; version = "2022-02-27"; src = fetchFromGitHub { @@ -6454,7 +6454,7 @@ final: prev: meta.homepage = "https://github.com/oberblastmeister/neuron.nvim/"; }; - neuron-vim = buildVimPluginFrom2Nix { + neuron-vim = buildVimPlugin { pname = "neuron.vim"; version = "2023-07-06"; src = fetchFromGitHub { @@ -6466,7 +6466,7 @@ final: prev: meta.homepage = "https://github.com/fiatjaf/neuron.vim/"; }; - nginx-vim = buildVimPluginFrom2Nix { + nginx-vim = buildVimPlugin { pname = "nginx.vim"; version = "2023-01-25"; src = fetchFromGitHub { @@ -6478,19 +6478,19 @@ final: prev: meta.homepage = "https://github.com/chr4/nginx.vim/"; }; - nightfox-nvim = buildVimPluginFrom2Nix { + nightfox-nvim = buildVimPlugin { pname = "nightfox.nvim"; - version = "2023-09-05"; + version = "2023-09-27"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "e886e39e592e89f316536a6f070365a9d88901c9"; - sha256 = "08jdrfjkjx6gkf17h8wh7swnjg19bagb0lxcdhg4bsgb87mbi99v"; + rev = "fe2fc7b93d66349eff2c5baa6cec922ee3958f56"; + sha256 = "1paipf7phkkr66xnfsi9hwxlqpj339nza8ni42hc5lg12c4h0p14"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; - nim-vim = buildVimPluginFrom2Nix { + nim-vim = buildVimPlugin { pname = "nim.vim"; version = "2021-11-11"; src = fetchFromGitHub { @@ -6502,7 +6502,7 @@ final: prev: meta.homepage = "https://github.com/zah/nim.vim/"; }; - nix-develop-nvim = buildVimPluginFrom2Nix { + nix-develop-nvim = buildVimPlugin { pname = "nix-develop.nvim"; version = "2023-07-23"; src = fetchFromGitHub { @@ -6514,7 +6514,7 @@ final: prev: meta.homepage = "https://github.com/figsoda/nix-develop.nvim/"; }; - nlsp-settings-nvim = buildVimPluginFrom2Nix { + nlsp-settings-nvim = buildVimPlugin { pname = "nlsp-settings.nvim"; version = "2023-08-23"; src = fetchFromGitHub { @@ -6526,7 +6526,7 @@ final: prev: meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; - nlua-nvim = buildVimPluginFrom2Nix { + nlua-nvim = buildVimPlugin { pname = "nlua.nvim"; version = "2022-12-20"; src = fetchFromGitHub { @@ -6538,7 +6538,7 @@ final: prev: meta.homepage = "https://github.com/tjdevries/nlua.nvim/"; }; - nnn-vim = buildVimPluginFrom2Nix { + nnn-vim = buildVimPlugin { pname = "nnn.vim"; version = "2023-05-23"; src = fetchFromGitHub { @@ -6550,31 +6550,31 @@ final: prev: meta.homepage = "https://github.com/mcchrish/nnn.vim/"; }; - no-neck-pain-nvim = buildVimPluginFrom2Nix { + no-neck-pain-nvim = buildVimPlugin { pname = "no-neck-pain.nvim"; - version = "2023-06-24"; + version = "2023-09-30"; src = fetchFromGitHub { owner = "shortcuts"; repo = "no-neck-pain.nvim"; - rev = "fb27d3bff0834d9178250b439d46bfa04b4e1ae2"; - sha256 = "0ri8qwhx4fsrs3im01nr0v05pg3c17k7zfgdmps61s6f1n0rpjf4"; + rev = "a3a76540533909aa42b4f9430c5b1976a6508f81"; + sha256 = "1yrni32ailamah5rbf6haypvik2wm4ywxrlrk3d12wl2hd9g7yxq"; }; meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/"; }; - noice-nvim = buildVimPluginFrom2Nix { + noice-nvim = buildVimPlugin { pname = "noice.nvim"; - version = "2023-08-30"; + version = "2023-09-25"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "74c2902146b080035beb19944baf6f014a954720"; - sha256 = "10sjrxvnhrx1bi77lcdn5qz9kww4qcanajqzp2v8d3jlm5p2cc2c"; + rev = "396f9146529130904e07c45e90ecdbfa607534f3"; + sha256 = "0n7z491mg9wlr9vhpzanly9ywykbjavv04qk1f5msj5i5r613jh9"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; - nord-nvim = buildVimPluginFrom2Nix { + nord-nvim = buildVimPlugin { pname = "nord.nvim"; version = "2023-08-30"; src = fetchFromGitHub { @@ -6586,7 +6586,7 @@ final: prev: meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; - nordic-nvim = buildVimPluginFrom2Nix { + nordic-nvim = buildVimPlugin { pname = "nordic.nvim"; version = "2022-12-08"; src = fetchFromGitHub { @@ -6598,7 +6598,7 @@ final: prev: meta.homepage = "https://github.com/andersevenrud/nordic.nvim/"; }; - notifier-nvim = buildVimPluginFrom2Nix { + notifier-nvim = buildVimPlugin { pname = "notifier.nvim"; version = "2023-06-09"; src = fetchFromGitHub { @@ -6610,7 +6610,7 @@ final: prev: meta.homepage = "https://github.com/vigoux/notifier.nvim/"; }; - nterm-nvim = buildVimPluginFrom2Nix { + nterm-nvim = buildVimPlugin { pname = "nterm.nvim"; version = "2022-05-10"; src = fetchFromGitHub { @@ -6622,7 +6622,7 @@ final: prev: meta.homepage = "https://github.com/jlesquembre/nterm.nvim/"; }; - nui-nvim = buildVimPluginFrom2Nix { + nui-nvim = buildVimPlugin { pname = "nui.nvim"; version = "2023-09-06"; src = fetchFromGitHub { @@ -6634,7 +6634,7 @@ final: prev: meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; - null-ls-nvim = buildVimPluginFrom2Nix { + null-ls-nvim = buildVimPlugin { pname = "null-ls.nvim"; version = "2023-08-12"; src = fetchFromGitHub { @@ -6646,7 +6646,7 @@ final: prev: meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; - numb-nvim = buildVimPluginFrom2Nix { + numb-nvim = buildVimPlugin { pname = "numb.nvim"; version = "2023-08-25"; src = fetchFromGitHub { @@ -6658,19 +6658,19 @@ final: prev: meta.homepage = "https://github.com/nacro90/numb.nvim/"; }; - nvchad = buildVimPluginFrom2Nix { + nvchad = buildVimPlugin { pname = "nvchad"; - version = "2023-09-16"; + version = "2023-09-28"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvchad"; - rev = "3091ea58359bb85f087499bd73fbc0a57a935c34"; - sha256 = "0vfgh6a459jqlmsjnnf6dwkm1mqim3g6znlkbgdlizrlm16hfj5n"; + rev = "195fe4ae72365c75757c5d0df677f3b29d8697ce"; + sha256 = "01ycw6c0dlzyjpkp5kklp484ccygmrww65k5pcqgipvhzq0ldfm4"; }; meta.homepage = "https://github.com/nvchad/nvchad/"; }; - nvcode-color-schemes-vim = buildVimPluginFrom2Nix { + nvcode-color-schemes-vim = buildVimPlugin { pname = "nvcode-color-schemes.vim"; version = "2021-07-03"; src = fetchFromGitHub { @@ -6682,7 +6682,7 @@ final: prev: meta.homepage = "https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/"; }; - nvim-FeMaco-lua = buildVimPluginFrom2Nix { + nvim-FeMaco-lua = buildVimPlugin { pname = "nvim-FeMaco.lua"; version = "2023-08-28"; src = fetchFromGitHub { @@ -6694,7 +6694,7 @@ final: prev: meta.homepage = "https://github.com/AckslD/nvim-FeMaco.lua/"; }; - nvim-ale-diagnostic = buildVimPluginFrom2Nix { + nvim-ale-diagnostic = buildVimPlugin { pname = "nvim-ale-diagnostic"; version = "2021-11-06"; src = fetchFromGitHub { @@ -6706,31 +6706,31 @@ final: prev: meta.homepage = "https://github.com/nathanmsmith/nvim-ale-diagnostic/"; }; - nvim-autopairs = buildVimPluginFrom2Nix { + nvim-autopairs = buildVimPlugin { pname = "nvim-autopairs"; - version = "2023-09-08"; + version = "2023-09-23"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "defad64afbf19381fe31488a7582bbac421d6e38"; - sha256 = "05ihrriym44g01rryaah2h2xnl183dpwcsf8q8rxzr29z0jpxxip"; + rev = "de4f7138a68d5d5063170f2182fd27faf06b0b54"; + sha256 = "0ppip04x0z98aq7b0zpg1yyy2cgqr94jgf5dy2dr1wvgrjh9lxhd"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; - nvim-base16 = buildVimPluginFrom2Nix { + nvim-base16 = buildVimPlugin { pname = "nvim-base16"; - version = "2023-09-12"; + version = "2023-09-30"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-base16"; - rev = "96e308958625a84940d5e443475465abf99c7bd9"; - sha256 = "1cz3nby9l2fg9ppl8pbgbcz70yzj87rci2lbzy9qm2mbj5y232sf"; + rev = "88f209605b7857ce5911e8aaa503a210876e935d"; + sha256 = "1767iwhbgi7lrfwn4wsk96h8x8dyfgbp11wffm8c42yhjwwmp0kl"; }; meta.homepage = "https://github.com/RRethy/nvim-base16/"; }; - nvim-biscuits = buildVimPluginFrom2Nix { + nvim-biscuits = buildVimPlugin { pname = "nvim-biscuits"; version = "2023-03-28"; src = fetchFromGitHub { @@ -6742,19 +6742,19 @@ final: prev: meta.homepage = "https://github.com/code-biscuits/nvim-biscuits/"; }; - nvim-bqf = buildVimPluginFrom2Nix { + nvim-bqf = buildVimPlugin { pname = "nvim-bqf"; - version = "2023-09-12"; + version = "2023-09-19"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "a906a9dfc1bd7b3ac51ac954e32e157ffad9a7cd"; - sha256 = "03zn97fwhw661xfmj9mcvskryph12a7lh6sflcapd0pdx2fwbr7l"; + rev = "8784eebf34371049b641646d00232c2603215297"; + sha256 = "1vrp72kc1f1rkfdb9xnmd792l4h1j7vrnhf99l54pi700dnbjzcg"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; - nvim-bufdel = buildVimPluginFrom2Nix { + nvim-bufdel = buildVimPlugin { pname = "nvim-bufdel"; version = "2023-04-13"; src = fetchFromGitHub { @@ -6766,7 +6766,7 @@ final: prev: meta.homepage = "https://github.com/ojroques/nvim-bufdel/"; }; - nvim-cm-racer = buildVimPluginFrom2Nix { + nvim-cm-racer = buildVimPlugin { pname = "nvim-cm-racer"; version = "2017-07-27"; src = fetchFromGitHub { @@ -6790,7 +6790,7 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; - nvim-code-action-menu = buildVimPluginFrom2Nix { + nvim-code-action-menu = buildVimPlugin { pname = "nvim-code-action-menu"; version = "2022-12-20"; src = fetchFromGitHub { @@ -6802,19 +6802,19 @@ final: prev: meta.homepage = "https://github.com/weilbith/nvim-code-action-menu/"; }; - nvim-cokeline = buildVimPluginFrom2Nix { + nvim-cokeline = buildVimPlugin { pname = "nvim-cokeline"; - version = "2023-09-08"; + version = "2023-09-25"; src = fetchFromGitHub { owner = "willothy"; repo = "nvim-cokeline"; - rev = "dae7f8d04a2a4a999adc19858d3748ee9229831d"; - sha256 = "0fa0ahb1alagdmdnk6fiivdgcplm3fw40bpv51i4975gbhdj7ibd"; + rev = "52e050a319f37a5f752fe8f461db209ab03a3188"; + sha256 = "0i8h1a7m4q3rsxbsxqbzlyyk4yv77kr56lvfs94d1xj8wq7nqgp7"; }; meta.homepage = "https://github.com/willothy/nvim-cokeline/"; }; - nvim-colorizer-lua = buildVimPluginFrom2Nix { + nvim-colorizer-lua = buildVimPlugin { pname = "nvim-colorizer.lua"; version = "2023-02-27"; src = fetchFromGitHub { @@ -6826,7 +6826,7 @@ final: prev: meta.homepage = "https://github.com/nvchad/nvim-colorizer.lua/"; }; - nvim-comment = buildVimPluginFrom2Nix { + nvim-comment = buildVimPlugin { pname = "nvim-comment"; version = "2022-08-09"; src = fetchFromGitHub { @@ -6838,7 +6838,7 @@ final: prev: meta.homepage = "https://github.com/terrortylor/nvim-comment/"; }; - nvim-compe = buildVimPluginFrom2Nix { + nvim-compe = buildVimPlugin { pname = "nvim-compe"; version = "2021-10-02"; src = fetchFromGitHub { @@ -6850,7 +6850,7 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; }; - nvim-completion-manager = buildVimPluginFrom2Nix { + nvim-completion-manager = buildVimPlugin { pname = "nvim-completion-manager"; version = "2018-07-27"; src = fetchFromGitHub { @@ -6862,7 +6862,7 @@ final: prev: meta.homepage = "https://github.com/roxma/nvim-completion-manager/"; }; - nvim-config-local = buildVimPluginFrom2Nix { + nvim-config-local = buildVimPlugin { pname = "nvim-config-local"; version = "2023-06-15"; src = fetchFromGitHub { @@ -6874,7 +6874,7 @@ final: prev: meta.homepage = "https://github.com/klen/nvim-config-local/"; }; - nvim-coverage = buildVimPluginFrom2Nix { + nvim-coverage = buildVimPlugin { pname = "nvim-coverage"; version = "2023-07-20"; src = fetchFromGitHub { @@ -6886,7 +6886,7 @@ final: prev: meta.homepage = "https://github.com/andythigpen/nvim-coverage/"; }; - nvim-cursorline = buildVimPluginFrom2Nix { + nvim-cursorline = buildVimPlugin { pname = "nvim-cursorline"; version = "2022-04-15"; src = fetchFromGitHub { @@ -6898,7 +6898,7 @@ final: prev: meta.homepage = "https://github.com/yamatsum/nvim-cursorline/"; }; - nvim-dap = buildVimPluginFrom2Nix { + nvim-dap = buildVimPlugin { pname = "nvim-dap"; version = "2023-09-14"; src = fetchFromGitHub { @@ -6910,7 +6910,7 @@ final: prev: meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; - nvim-dap-go = buildVimPluginFrom2Nix { + nvim-dap-go = buildVimPlugin { pname = "nvim-dap-go"; version = "2023-08-23"; src = fetchFromGitHub { @@ -6922,7 +6922,7 @@ final: prev: meta.homepage = "https://github.com/leoluz/nvim-dap-go/"; }; - nvim-dap-python = buildVimPluginFrom2Nix { + nvim-dap-python = buildVimPlugin { pname = "nvim-dap-python"; version = "2023-05-23"; src = fetchFromGitHub { @@ -6934,7 +6934,7 @@ final: prev: meta.homepage = "https://github.com/mfussenegger/nvim-dap-python/"; }; - nvim-dap-ui = buildVimPluginFrom2Nix { + nvim-dap-ui = buildVimPlugin { pname = "nvim-dap-ui"; version = "2023-09-10"; src = fetchFromGitHub { @@ -6946,7 +6946,7 @@ final: prev: meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; - nvim-dap-virtual-text = buildVimPluginFrom2Nix { + nvim-dap-virtual-text = buildVimPlugin { pname = "nvim-dap-virtual-text"; version = "2023-05-25"; src = fetchFromGitHub { @@ -6958,7 +6958,7 @@ final: prev: meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/"; }; - nvim-expand-expr = buildVimPluginFrom2Nix { + nvim-expand-expr = buildVimPlugin { pname = "nvim-expand-expr"; version = "2021-08-14"; src = fetchFromGitHub { @@ -6970,7 +6970,7 @@ final: prev: meta.homepage = "https://github.com/allendang/nvim-expand-expr/"; }; - nvim-fzf = buildVimPluginFrom2Nix { + nvim-fzf = buildVimPlugin { pname = "nvim-fzf"; version = "2023-09-05"; src = fetchFromGitHub { @@ -6982,7 +6982,7 @@ final: prev: meta.homepage = "https://github.com/vijaymarupudi/nvim-fzf/"; }; - nvim-fzf-commands = buildVimPluginFrom2Nix { + nvim-fzf-commands = buildVimPlugin { pname = "nvim-fzf-commands"; version = "2022-12-20"; src = fetchFromGitHub { @@ -6994,7 +6994,7 @@ final: prev: meta.homepage = "https://github.com/vijaymarupudi/nvim-fzf-commands/"; }; - nvim-gdb = buildVimPluginFrom2Nix { + nvim-gdb = buildVimPlugin { pname = "nvim-gdb"; version = "2023-08-16"; src = fetchFromGitHub { @@ -7006,7 +7006,7 @@ final: prev: meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; - nvim-gps = buildVimPluginFrom2Nix { + nvim-gps = buildVimPlugin { pname = "nvim-gps"; version = "2022-07-05"; src = fetchFromGitHub { @@ -7018,7 +7018,7 @@ final: prev: meta.homepage = "https://github.com/smiteshp/nvim-gps/"; }; - nvim-highlight-colors = buildVimPluginFrom2Nix { + nvim-highlight-colors = buildVimPlugin { pname = "nvim-highlight-colors"; version = "2023-07-27"; src = fetchFromGitHub { @@ -7030,19 +7030,19 @@ final: prev: meta.homepage = "https://github.com/brenoprata10/nvim-highlight-colors/"; }; - nvim-highlite = buildVimPluginFrom2Nix { + nvim-highlite = buildVimPlugin { pname = "nvim-highlite"; - version = "2023-08-29"; + version = "2023-09-28"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "b93d2c63ed39f76c4fea9348bb0ad3e261e89695"; - sha256 = "00jgq2qiqp6i8mm1vrp3g4g9kvb42yvfr0d37afg97jwkim0k3g5"; + rev = "c1a83ce4f3e12250ffa30a9aab79dad8d9b9fb95"; + sha256 = "0n49zyifb0ljm88b52gpb9808gzpplgwc1cmbjy4f87zgn4smqkv"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; - nvim-hlslens = buildVimPluginFrom2Nix { + nvim-hlslens = buildVimPlugin { pname = "nvim-hlslens"; version = "2023-08-06"; src = fetchFromGitHub { @@ -7054,7 +7054,7 @@ final: prev: meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; - nvim-hs-vim = buildVimPluginFrom2Nix { + nvim-hs-vim = buildVimPlugin { pname = "nvim-hs.vim"; version = "2022-01-30"; src = fetchFromGitHub { @@ -7066,19 +7066,19 @@ final: prev: meta.homepage = "https://github.com/neovimhaskell/nvim-hs.vim/"; }; - nvim-jdtls = buildVimPluginFrom2Nix { + nvim-jdtls = buildVimPlugin { pname = "nvim-jdtls"; - version = "2023-09-14"; + version = "2023-09-19"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "697b39e3db0e0d0ce9ee4c2df506a4e0386af6c2"; - sha256 = "0iaccv986r4z1lmfih24dk2ls501bfqw3n7z4h0mwbf7xqm9jml3"; + rev = "3ca419c52a7c20a2565237db2c110ed68fc7e6f1"; + sha256 = "1jy5yklfc3fvajy5mqwfi4h6p5bxb71ar1hnck8k8hciggrijhrq"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; - nvim-jqx = buildVimPluginFrom2Nix { + nvim-jqx = buildVimPlugin { pname = "nvim-jqx"; version = "2023-02-28"; src = fetchFromGitHub { @@ -7090,7 +7090,7 @@ final: prev: meta.homepage = "https://github.com/gennaro-tedesco/nvim-jqx/"; }; - nvim-julia-autotest = buildVimPluginFrom2Nix { + nvim-julia-autotest = buildVimPlugin { pname = "nvim-julia-autotest"; version = "2022-10-31"; src = fetchgit { @@ -7101,7 +7101,7 @@ final: prev: meta.homepage = "https://gitlab.com/usmcamp0811/nvim-julia-autotest"; }; - nvim-lastplace = buildVimPluginFrom2Nix { + nvim-lastplace = buildVimPlugin { pname = "nvim-lastplace"; version = "2023-07-27"; src = fetchFromGitHub { @@ -7113,7 +7113,7 @@ final: prev: meta.homepage = "https://github.com/ethanholz/nvim-lastplace/"; }; - nvim-lightbulb = buildVimPluginFrom2Nix { + nvim-lightbulb = buildVimPlugin { pname = "nvim-lightbulb"; version = "2023-07-20"; src = fetchFromGitHub { @@ -7125,7 +7125,7 @@ final: prev: meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/"; }; - nvim-lightline-lsp = buildVimPluginFrom2Nix { + nvim-lightline-lsp = buildVimPlugin { pname = "nvim-lightline-lsp"; version = "2022-05-30"; src = fetchFromGitHub { @@ -7137,31 +7137,31 @@ final: prev: meta.homepage = "https://github.com/josa42/nvim-lightline-lsp/"; }; - nvim-lilypond-suite = buildVimPluginFrom2Nix { + nvim-lilypond-suite = buildVimPlugin { pname = "nvim-lilypond-suite"; - version = "2023-09-15"; + version = "2023-09-27"; src = fetchFromGitHub { owner = "martineausimon"; repo = "nvim-lilypond-suite"; - rev = "b734d3f3e91b1cdf7944d10b842e2898188669d6"; - sha256 = "00vbhfglgspbmv1ar5xjdcv8kv3s1y8a6cqalw6va5wazzy2slci"; + rev = "ac99483249bfa202395e3abcfce7bd39288d93e7"; + sha256 = "11l0bbbaxxinm17j9aqw7an1nfd77pgmkmh3acdx5ppnk8d9141z"; }; meta.homepage = "https://github.com/martineausimon/nvim-lilypond-suite/"; }; - nvim-lint = buildVimPluginFrom2Nix { + nvim-lint = buildVimPlugin { pname = "nvim-lint"; - version = "2023-09-14"; + version = "2023-09-30"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "12517fb62b9760053b3edebc0b03308921a30f5c"; - sha256 = "1qsn5ziprl8wz606rjpri18i25hdsc12b39w4xb2nqkxwx3hdi2l"; + rev = "1065763f115a7765ef237347ad676ba348d7193a"; + sha256 = "0wlfq7xpi60nrqxx2v0h2pjv9jhx5alir8z9q1h7vcnf2hykj45c"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; - nvim-lsp-notify = buildVimPluginFrom2Nix { + nvim-lsp-notify = buildVimPlugin { pname = "nvim-lsp-notify"; version = "2023-03-19"; src = fetchFromGitHub { @@ -7173,7 +7173,7 @@ final: prev: meta.homepage = "https://github.com/mrded/nvim-lsp-notify/"; }; - nvim-lsp-ts-utils = buildVimPluginFrom2Nix { + nvim-lsp-ts-utils = buildVimPlugin { pname = "nvim-lsp-ts-utils"; version = "2022-07-17"; src = fetchFromGitHub { @@ -7185,19 +7185,19 @@ final: prev: meta.homepage = "https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/"; }; - nvim-lspconfig = buildVimPluginFrom2Nix { + nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2023-09-15"; + version = "2023-10-01"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "cc388d3f6b9c7c943ae2b2dcd46ad470fd257f91"; - sha256 = "0xw1xya93qks2azp0rg2k7fyg2ak31c3z897af9d3lx0nrhy31xs"; + rev = "eb1b53162755888ff75e495797071644d983bff7"; + sha256 = "04kgsf3rhr0wk3vyx6lawlxj5icvaryx925flh72f234vkhigmq2"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; - nvim-lsputils = buildVimPluginFrom2Nix { + nvim-lsputils = buildVimPlugin { pname = "nvim-lsputils"; version = "2022-01-29"; src = fetchFromGitHub { @@ -7209,7 +7209,7 @@ final: prev: meta.homepage = "https://github.com/RishabhRD/nvim-lsputils/"; }; - nvim-lua-gf = buildVimPluginFrom2Nix { + nvim-lua-gf = buildVimPlugin { pname = "nvim-lua-gf"; version = "2022-07-31"; src = fetchFromGitHub { @@ -7221,7 +7221,7 @@ final: prev: meta.homepage = "https://github.com/sam4llis/nvim-lua-gf/"; }; - nvim-luadev = buildVimPluginFrom2Nix { + nvim-luadev = buildVimPlugin { pname = "nvim-luadev"; version = "2023-03-13"; src = fetchFromGitHub { @@ -7233,7 +7233,7 @@ final: prev: meta.homepage = "https://github.com/bfredl/nvim-luadev/"; }; - nvim-luapad = buildVimPluginFrom2Nix { + nvim-luapad = buildVimPlugin { pname = "nvim-luapad"; version = "2022-12-11"; src = fetchFromGitHub { @@ -7245,19 +7245,19 @@ final: prev: meta.homepage = "https://github.com/rafcamlet/nvim-luapad/"; }; - nvim-metals = buildVimPluginFrom2Nix { + nvim-metals = buildVimPlugin { pname = "nvim-metals"; - version = "2023-08-17"; + version = "2023-09-18"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "57cff9a240f3337129188997887d8848fe6022ad"; - sha256 = "0ysrq30k3fblgd1hlvywrq1jrkcgdnm3habcaw13b2xfp4hqlps7"; + rev = "f41c14ae8500ceccb71e6695574b67881f0b5a93"; + sha256 = "177l4rl3in93qk0ncjalr0bj5jfiv5z5c1g6n0b7d8wvlc3j24cm"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; - nvim-moonwalk = buildVimPluginFrom2Nix { + nvim-moonwalk = buildVimPlugin { pname = "nvim-moonwalk"; version = "2022-04-12"; src = fetchFromGitHub { @@ -7269,7 +7269,7 @@ final: prev: meta.homepage = "https://github.com/gpanders/nvim-moonwalk/"; }; - nvim-navbuddy = buildVimPluginFrom2Nix { + nvim-navbuddy = buildVimPlugin { pname = "nvim-navbuddy"; version = "2023-09-14"; src = fetchFromGitHub { @@ -7281,19 +7281,19 @@ final: prev: meta.homepage = "https://github.com/SmiteshP/nvim-navbuddy/"; }; - nvim-navic = buildVimPluginFrom2Nix { + nvim-navic = buildVimPlugin { pname = "nvim-navic"; - version = "2023-07-21"; + version = "2023-09-18"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-navic"; - rev = "9c89730da6a05acfeb6a197e212dfadf5aa60ca0"; - sha256 = "1ginwysk4apjx2f045isidnzw863zrv272bdmzh247vi5za57c1k"; + rev = "0ffa7ffe6588f3417e680439872f5049e38a24db"; + sha256 = "04fd7gcs6hhc44pya1k8ds332hm1jpg44w3ri14g3r2850b8b02z"; }; meta.homepage = "https://github.com/smiteshp/nvim-navic/"; }; - nvim-neoclip-lua = buildVimPluginFrom2Nix { + nvim-neoclip-lua = buildVimPlugin { pname = "nvim-neoclip.lua"; version = "2023-05-16"; src = fetchFromGitHub { @@ -7305,7 +7305,7 @@ final: prev: meta.homepage = "https://github.com/AckslD/nvim-neoclip.lua/"; }; - nvim-nonicons = buildVimPluginFrom2Nix { + nvim-nonicons = buildVimPlugin { pname = "nvim-nonicons"; version = "2023-02-04"; src = fetchFromGitHub { @@ -7317,19 +7317,19 @@ final: prev: meta.homepage = "https://github.com/yamatsum/nvim-nonicons/"; }; - nvim-notify = buildVimPluginFrom2Nix { + nvim-notify = buildVimPlugin { pname = "nvim-notify"; - version = "2023-09-10"; + version = "2023-09-28"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "94859430020f5cf32a1b97ddd9e596fed9db7981"; - sha256 = "04fcm8277csv8davwirndinm0cpnb5h8azr2cxnw1szgqry2yh7k"; + rev = "e4a2022f4fec2d5ebc79afa612f96d8b11c627b3"; + sha256 = "1a7s4y8xd1plcidnzs29rhqw7mfbj1q01bqffqjmimii9v6azmfn"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; - nvim-nu = buildVimPluginFrom2Nix { + nvim-nu = buildVimPlugin { pname = "nvim-nu"; version = "2023-03-07"; src = fetchFromGitHub { @@ -7341,7 +7341,7 @@ final: prev: meta.homepage = "https://github.com/LhKipp/nvim-nu/"; }; - nvim-osc52 = buildVimPluginFrom2Nix { + nvim-osc52 = buildVimPlugin { pname = "nvim-osc52"; version = "2023-05-15"; src = fetchFromGitHub { @@ -7353,7 +7353,7 @@ final: prev: meta.homepage = "https://github.com/ojroques/nvim-osc52/"; }; - nvim-peekup = buildVimPluginFrom2Nix { + nvim-peekup = buildVimPlugin { pname = "nvim-peekup"; version = "2023-02-23"; src = fetchFromGitHub { @@ -7365,7 +7365,7 @@ final: prev: meta.homepage = "https://github.com/gennaro-tedesco/nvim-peekup/"; }; - nvim-pqf = buildVimPluginFrom2Nix { + nvim-pqf = buildVimPlugin { pname = "nvim-pqf"; version = "2023-07-24"; src = fetchFromGitHub { @@ -7377,7 +7377,7 @@ final: prev: meta.homepage = "https://github.com/yorickpeterse/nvim-pqf/"; }; - nvim-remote-containers = buildVimPluginFrom2Nix { + nvim-remote-containers = buildVimPlugin { pname = "nvim-remote-containers"; version = "2023-08-01"; src = fetchFromGitHub { @@ -7389,7 +7389,7 @@ final: prev: meta.homepage = "https://github.com/jamestthompson3/nvim-remote-containers/"; }; - nvim-rename-state = buildVimPluginFrom2Nix { + nvim-rename-state = buildVimPlugin { pname = "nvim-rename-state"; version = "2023-01-30"; src = fetchFromGitHub { @@ -7401,7 +7401,7 @@ final: prev: meta.homepage = "https://github.com/olrtg/nvim-rename-state/"; }; - nvim-scrollbar = buildVimPluginFrom2Nix { + nvim-scrollbar = buildVimPlugin { pname = "nvim-scrollbar"; version = "2023-05-23"; src = fetchFromGitHub { @@ -7413,7 +7413,7 @@ final: prev: meta.homepage = "https://github.com/petertriho/nvim-scrollbar/"; }; - nvim-scrollview = buildVimPluginFrom2Nix { + nvim-scrollview = buildVimPlugin { pname = "nvim-scrollview"; version = "2023-09-03"; src = fetchFromGitHub { @@ -7425,7 +7425,7 @@ final: prev: meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; - nvim-search-and-replace = buildVimPluginFrom2Nix { + nvim-search-and-replace = buildVimPlugin { pname = "nvim-search-and-replace"; version = "2022-09-06"; src = fetchFromGitHub { @@ -7437,7 +7437,7 @@ final: prev: meta.homepage = "https://github.com/s1n7ax/nvim-search-and-replace/"; }; - nvim-snippy = buildVimPluginFrom2Nix { + nvim-snippy = buildVimPlugin { pname = "nvim-snippy"; version = "2023-09-09"; src = fetchFromGitHub { @@ -7449,7 +7449,7 @@ final: prev: meta.homepage = "https://github.com/dcampos/nvim-snippy/"; }; - nvim-solarized-lua = buildVimPluginFrom2Nix { + nvim-solarized-lua = buildVimPlugin { pname = "nvim-solarized-lua"; version = "2022-11-19"; src = fetchFromGitHub { @@ -7461,7 +7461,7 @@ final: prev: meta.homepage = "https://github.com/ishan9299/nvim-solarized-lua/"; }; - nvim-spectre = buildVimPluginFrom2Nix { + nvim-spectre = buildVimPlugin { pname = "nvim-spectre"; version = "2023-09-13"; src = fetchFromGitHub { @@ -7473,7 +7473,7 @@ final: prev: meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; - nvim-spider = buildVimPluginFrom2Nix { + nvim-spider = buildVimPlugin { pname = "nvim-spider"; version = "2023-09-14"; src = fetchFromGitHub { @@ -7485,7 +7485,7 @@ final: prev: meta.homepage = "https://github.com/chrisgrieser/nvim-spider/"; }; - nvim-surround = buildVimPluginFrom2Nix { + nvim-surround = buildVimPlugin { pname = "nvim-surround"; version = "2023-08-18"; src = fetchFromGitHub { @@ -7497,7 +7497,7 @@ final: prev: meta.homepage = "https://github.com/kylechui/nvim-surround/"; }; - nvim-teal-maker = buildVimPluginFrom2Nix { + nvim-teal-maker = buildVimPlugin { pname = "nvim-teal-maker"; version = "2022-04-09"; src = fetchFromGitHub { @@ -7509,7 +7509,7 @@ final: prev: meta.homepage = "https://github.com/svermeulen/nvim-teal-maker/"; }; - nvim-terminal-lua = buildVimPluginFrom2Nix { + nvim-terminal-lua = buildVimPlugin { pname = "nvim-terminal.lua"; version = "2019-10-17"; src = fetchFromGitHub { @@ -7521,7 +7521,7 @@ final: prev: meta.homepage = "https://github.com/norcalli/nvim-terminal.lua/"; }; - nvim-test = buildVimPluginFrom2Nix { + nvim-test = buildVimPlugin { pname = "nvim-test"; version = "2023-05-02"; src = fetchFromGitHub { @@ -7533,55 +7533,55 @@ final: prev: meta.homepage = "https://github.com/klen/nvim-test/"; }; - nvim-tree-lua = buildVimPluginFrom2Nix { + nvim-tree-lua = buildVimPlugin { pname = "nvim-tree.lua"; - version = "2023-09-16"; + version = "2023-10-01"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "7f7665a17b60d80533b7a69cfad3b6875f2dd453"; - sha256 = "1cv3zc1d6cvqxf9kpi6dw7xzr9qj3zj6v990x7hfpds38f2ps87l"; + rev = "113e0950c88b81b01d253d8f3da17bbd0e6716bb"; + sha256 = "1nmx68gjc59cn6lapvml12x4yj9iqaqdb8q3ad5w3gfnmva03sjd"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; - nvim-treesitter = buildVimPluginFrom2Nix { + nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2023-09-16"; + version = "2023-10-01"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "794266a4edc8ab57b0d637626f01b5278a9123d8"; - sha256 = "0h2wa98ljgkr56yfcbif4xyn2721padzfavj3fd89wib3ylk5qzx"; + rev = "776e4d341b5416c995e74c3abbf75f9cec26aa5e"; + sha256 = "02pk5di7lxvbwzi2ajq7kj6rfrxd46635jccw6xf5fbxcl84cqsb"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; - nvim-treesitter-context = buildVimPluginFrom2Nix { + nvim-treesitter-context = buildVimPlugin { pname = "nvim-treesitter-context"; - version = "2023-09-06"; + version = "2023-10-01"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "b6c763db8cc486215ba96e0a67418848a710ab25"; - sha256 = "0zawrncadph3ra9fb48d63g4lg7ng5gkskkxl3hqy71lcngsi51b"; + rev = "bc19b78e9c705d67be98d56e9fab96470af45f33"; + sha256 = "1xfdiyz0a07zpmavyinq3mc3f81xw99n7847ijwb3rwpmiqs7hns"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; - nvim-treesitter-endwise = buildVimPluginFrom2Nix { + nvim-treesitter-endwise = buildVimPlugin { pname = "nvim-treesitter-endwise"; - version = "2023-06-28"; + version = "2023-09-23"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-treesitter-endwise"; - rev = "9298b3ac8fd6d0d8f9e321194c6d3fd37e417cf9"; - sha256 = "1zkc892v347380awywfyfk0q8nsavi37zgz9yhizc4am6lphn391"; + rev = "4c344ffc8d54d7e1ba2cefaaa2c10ea93aa1cc2d"; + sha256 = "0320lz13zymw70wx7malkw4nkma3scz4kz35mq59f9p51dan6iky"; }; meta.homepage = "https://github.com/RRethy/nvim-treesitter-endwise/"; }; - nvim-treesitter-pyfold = buildVimPluginFrom2Nix { + nvim-treesitter-pyfold = buildVimPlugin { pname = "nvim-treesitter-pyfold"; version = "2023-04-11"; src = fetchFromGitHub { @@ -7593,7 +7593,7 @@ final: prev: meta.homepage = "https://github.com/eddiebergman/nvim-treesitter-pyfold/"; }; - nvim-treesitter-refactor = buildVimPluginFrom2Nix { + nvim-treesitter-refactor = buildVimPlugin { pname = "nvim-treesitter-refactor"; version = "2023-04-04"; src = fetchFromGitHub { @@ -7605,7 +7605,7 @@ final: prev: meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-refactor/"; }; - nvim-treesitter-textobjects = buildVimPluginFrom2Nix { + nvim-treesitter-textobjects = buildVimPlugin { pname = "nvim-treesitter-textobjects"; version = "2023-08-29"; src = fetchFromGitHub { @@ -7617,19 +7617,19 @@ final: prev: meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; - nvim-treesitter-textsubjects = buildVimPluginFrom2Nix { + nvim-treesitter-textsubjects = buildVimPlugin { pname = "nvim-treesitter-textsubjects"; - version = "2023-08-03"; + version = "2023-09-30"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-treesitter-textsubjects"; - rev = "df75fcec548014f158cda6498ac38c4622c221e1"; - sha256 = "0fx8b9w03zn6v8db2w6h29y8hpbjckvm27nh49vvsis3icqyk7iv"; + rev = "48b3bf54e32f23e2299c59ff76fa3b0599565b39"; + sha256 = "11nmxnqr8dnn1l24gcrm4bpvpmy4ibsi6x46iz5y2vp7pzrj6cf9"; }; meta.homepage = "https://github.com/RRethy/nvim-treesitter-textsubjects/"; }; - nvim-ts-autotag = buildVimPluginFrom2Nix { + nvim-ts-autotag = buildVimPlugin { pname = "nvim-ts-autotag"; version = "2023-06-16"; src = fetchFromGitHub { @@ -7641,19 +7641,19 @@ final: prev: meta.homepage = "https://github.com/windwp/nvim-ts-autotag/"; }; - nvim-ts-context-commentstring = buildVimPluginFrom2Nix { + nvim-ts-context-commentstring = buildVimPlugin { pname = "nvim-ts-context-commentstring"; - version = "2023-09-14"; + version = "2023-09-30"; src = fetchFromGitHub { owner = "joosepalviste"; repo = "nvim-ts-context-commentstring"; - rev = "95e9ba9de4289d221666b66fd930d157c7ca08c6"; - sha256 = "0acr7d16h22xk5c2dfv2wmwa9p5g5k06pqghkzym8bv70ag4lr8g"; + rev = "0c136439fb93fd94db9106250ff6f6858101422b"; + sha256 = "0cmszvwxbis2m36zwb7bcq0yfw19ska31j1r7k7pn55skr605527"; }; meta.homepage = "https://github.com/joosepalviste/nvim-ts-context-commentstring/"; }; - nvim-ts-rainbow = buildVimPluginFrom2Nix { + nvim-ts-rainbow = buildVimPlugin { pname = "nvim-ts-rainbow"; version = "2023-06-07"; src = fetchFromGitHub { @@ -7665,7 +7665,7 @@ final: prev: meta.homepage = "https://github.com/mrjones2014/nvim-ts-rainbow/"; }; - nvim-ts-rainbow2 = buildVimPluginFrom2Nix { + nvim-ts-rainbow2 = buildVimPlugin { pname = "nvim-ts-rainbow2"; version = "2023-07-12"; src = fetchgit { @@ -7676,19 +7676,19 @@ final: prev: meta.homepage = "https://gitlab.com/HiPhish/nvim-ts-rainbow2"; }; - nvim-ufo = buildVimPluginFrom2Nix { + nvim-ufo = buildVimPlugin { pname = "nvim-ufo"; - version = "2023-09-13"; + version = "2023-09-22"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-ufo"; - rev = "ddec0c27e9cd2d22df4ecacc45e9d6ce567f7c35"; - sha256 = "1jyrhrpp5144nnni1m054h94a99gmlp9c3hhjmg27zm9hwwd01z0"; + rev = "6f2ccdf2da390d62f8f9e15fc5ddbcbd312e1e66"; + sha256 = "05k9f2zxk1kkzp8xzsyc6j5szvvd8znjim10sj27jc0rmg5qldam"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-ufo/"; }; - nvim-unception = buildVimPluginFrom2Nix { + nvim-unception = buildVimPlugin { pname = "nvim-unception"; version = "2023-04-11"; src = fetchFromGitHub { @@ -7700,19 +7700,19 @@ final: prev: meta.homepage = "https://github.com/samjwill/nvim-unception/"; }; - nvim-web-devicons = buildVimPluginFrom2Nix { + nvim-web-devicons = buildVimPlugin { pname = "nvim-web-devicons"; - version = "2023-09-15"; + version = "2023-09-24"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "973ab742f143a796a779af4d786ec409116a0d87"; - sha256 = "1fmvym6ryxmff5559s6aw6nv4h5cgz2lnkjnhzbwws4iryvc90zl"; + rev = "45d0237c427baba8cd05e0ab26d30e2ee58c2c82"; + sha256 = "0cbp2xv6gnjd1plc8psj0qgwxfrfqw7qg8jn1cgr1la563jjlnlk"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; - nvim-whichkey-setup-lua = buildVimPluginFrom2Nix { + nvim-whichkey-setup-lua = buildVimPlugin { pname = "nvim-whichkey-setup.lua"; version = "2021-04-16"; src = fetchFromGitHub { @@ -7724,19 +7724,19 @@ final: prev: meta.homepage = "https://github.com/AckslD/nvim-whichkey-setup.lua/"; }; - nvim-window-picker = buildVimPluginFrom2Nix { + nvim-window-picker = buildVimPlugin { pname = "nvim-window-picker"; - version = "2023-07-29"; + version = "2023-09-24"; src = fetchFromGitHub { owner = "s1n7ax"; repo = "nvim-window-picker"; - rev = "1b1bb834b0acb9eebb11a61664efc665757f1ba2"; - sha256 = "1ds2x5hnliw8c7zkqvmnij9bycnxgf3q0vnl0bzb7ki3jc2qg1r8"; + rev = "e7b6699fbd007bbe61dc444734b9bade445b2984"; + sha256 = "01l5d0bylgv1kg4wlq3n2rk656fzh0scy68l88nkbra7qqj9d5i2"; }; meta.homepage = "https://github.com/s1n7ax/nvim-window-picker/"; }; - nvim-yarp = buildVimPluginFrom2Nix { + nvim-yarp = buildVimPlugin { pname = "nvim-yarp"; version = "2022-06-08"; src = fetchFromGitHub { @@ -7748,7 +7748,7 @@ final: prev: meta.homepage = "https://github.com/roxma/nvim-yarp/"; }; - nvim_context_vt = buildVimPluginFrom2Nix { + nvim_context_vt = buildVimPlugin { pname = "nvim_context_vt"; version = "2023-08-26"; src = fetchFromGitHub { @@ -7760,7 +7760,7 @@ final: prev: meta.homepage = "https://github.com/andersevenrud/nvim_context_vt/"; }; - nvimdev-nvim = buildVimPluginFrom2Nix { + nvimdev-nvim = buildVimPlugin { pname = "nvimdev.nvim"; version = "2023-09-05"; src = fetchFromGitHub { @@ -7772,7 +7772,7 @@ final: prev: meta.homepage = "https://github.com/neovim/nvimdev.nvim/"; }; - nvterm = buildVimPluginFrom2Nix { + nvterm = buildVimPlugin { pname = "nvterm"; version = "2023-09-09"; src = fetchFromGitHub { @@ -7784,7 +7784,7 @@ final: prev: meta.homepage = "https://github.com/nvchad/nvterm/"; }; - oceanic-material = buildVimPluginFrom2Nix { + oceanic-material = buildVimPlugin { pname = "oceanic-material"; version = "2023-06-22"; src = fetchFromGitHub { @@ -7796,7 +7796,7 @@ final: prev: meta.homepage = "https://github.com/nvimdev/oceanic-material/"; }; - oceanic-next = buildVimPluginFrom2Nix { + oceanic-next = buildVimPlugin { pname = "oceanic-next"; version = "2023-05-01"; src = fetchFromGitHub { @@ -7808,32 +7808,32 @@ final: prev: meta.homepage = "https://github.com/mhartington/oceanic-next/"; }; - octo-nvim = buildVimPluginFrom2Nix { + octo-nvim = buildVimPlugin { pname = "octo.nvim"; - version = "2023-08-28"; + version = "2023-09-26"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "d1e52f9b3c755fcebb93d635821663a2c0f53281"; - sha256 = "0gvb7g6844w9ll6w7qwh5ian0vz5sr90nyw7x3pybms8w74wvcrn"; + rev = "04334f0602b351e4995f352b6fed3d6f91f64610"; + sha256 = "1sjig39rj9xli6nrf58xgvqbdnhrmz5zjdicn28pv7d67mydgvbw"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; - oil-nvim = buildVimPluginFrom2Nix { + oil-nvim = buildVimPlugin { pname = "oil.nvim"; - version = "2023-09-12"; + version = "2023-09-30"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "9e036c6a4868b971127f3cb6bac6197bb4103723"; - sha256 = "1q6r479xfcx1xwrm0b2zzv88qjilbm4pw2nvcsdlczhdwqnsq0al"; + rev = "956d7fc89b0bd1f9ea6515ca10c1e2a293e4d8fd"; + sha256 = "0gbrnnji01pdz7x78cbdnvs6y4gpb298f239i5b41mr9vdc55ysl"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; }; - omnisharp-extended-lsp-nvim = buildVimPluginFrom2Nix { + omnisharp-extended-lsp-nvim = buildVimPlugin { pname = "omnisharp-extended-lsp.nvim"; version = "2023-04-14"; src = fetchFromGitHub { @@ -7845,7 +7845,7 @@ final: prev: meta.homepage = "https://github.com/Hoffs/omnisharp-extended-lsp.nvim/"; }; - one-nvim = buildVimPluginFrom2Nix { + one-nvim = buildVimPlugin { pname = "one-nvim"; version = "2021-06-10"; src = fetchFromGitHub { @@ -7857,7 +7857,7 @@ final: prev: meta.homepage = "https://github.com/Th3Whit3Wolf/one-nvim/"; }; - onedark-nvim = buildVimPluginFrom2Nix { + onedark-nvim = buildVimPlugin { pname = "onedark.nvim"; version = "2023-09-04"; src = fetchFromGitHub { @@ -7869,7 +7869,7 @@ final: prev: meta.homepage = "https://github.com/navarasu/onedark.nvim/"; }; - onedark-vim = buildVimPluginFrom2Nix { + onedark-vim = buildVimPlugin { pname = "onedark.vim"; version = "2023-07-19"; src = fetchFromGitHub { @@ -7881,19 +7881,19 @@ final: prev: meta.homepage = "https://github.com/joshdick/onedark.vim/"; }; - onedarkpro-nvim = buildVimPluginFrom2Nix { + onedarkpro-nvim = buildVimPlugin { pname = "onedarkpro.nvim"; - version = "2023-09-16"; + version = "2023-09-29"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "15c9b5b4ff38b3dcde4370e0a1ce12b927451dd4"; - sha256 = "1y8a7hyd2aghzgf83s3y4yanhzmcxads19hqfbl84cqf3lg4f4k8"; + rev = "7c02b4eeb310173ef6d741e60200d72b76923eae"; + sha256 = "1vmix76dr7sv199nwmvmxxgp7cqysi77m79p4bgsx2mynmkdx4p4"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; - onehalf = buildVimPluginFrom2Nix { + onehalf = buildVimPlugin { pname = "onehalf"; version = "2022-08-02"; src = fetchFromGitHub { @@ -7905,7 +7905,7 @@ final: prev: meta.homepage = "https://github.com/sonph/onehalf/"; }; - onenord-nvim = buildVimPluginFrom2Nix { + onenord-nvim = buildVimPlugin { pname = "onenord.nvim"; version = "2023-09-11"; src = fetchFromGitHub { @@ -7917,7 +7917,7 @@ final: prev: meta.homepage = "https://github.com/rmehri01/onenord.nvim/"; }; - open-browser-github-vim = buildVimPluginFrom2Nix { + open-browser-github-vim = buildVimPlugin { pname = "open-browser-github.vim"; version = "2021-03-21"; src = fetchFromGitHub { @@ -7929,7 +7929,7 @@ final: prev: meta.homepage = "https://github.com/tyru/open-browser-github.vim/"; }; - open-browser-vim = buildVimPluginFrom2Nix { + open-browser-vim = buildVimPlugin { pname = "open-browser.vim"; version = "2022-10-08"; src = fetchFromGitHub { @@ -7941,19 +7941,19 @@ final: prev: meta.homepage = "https://github.com/tyru/open-browser.vim/"; }; - openingh-nvim = buildVimPluginFrom2Nix { + openingh-nvim = buildVimPlugin { pname = "openingh.nvim"; - version = "2023-08-28"; + version = "2023-09-26"; src = fetchFromGitHub { owner = "Almo7aya"; repo = "openingh.nvim"; - rev = "27655e19d4cad90f2ceed4f0a08cf7ebfb3a8e40"; - sha256 = "0jl5y6pgwdjin7rcrw8p2xv7x6z8gz9wkn7ijx3ixs5278q8wijb"; + rev = "cdca4f17dbc2ed85ea5e54c594eb57c4057d9290"; + sha256 = "04jx2pprk1072a06vanyml6bv4qh0hhfmjz145jjp69rn1pzqm8f"; }; meta.homepage = "https://github.com/Almo7aya/openingh.nvim/"; }; - openscad-nvim = buildVimPluginFrom2Nix { + openscad-nvim = buildVimPlugin { pname = "openscad.nvim"; version = "2023-06-19"; src = fetchFromGitHub { @@ -7965,19 +7965,19 @@ final: prev: meta.homepage = "https://github.com/salkin-mada/openscad.nvim/"; }; - orgmode = buildVimPluginFrom2Nix { + orgmode = buildVimPlugin { pname = "orgmode"; - version = "2023-09-15"; + version = "2023-09-27"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "34f977c090da2ff9f8cea01eecae8bd7d83fdef9"; - sha256 = "1dxnd0b7fljfzkfqvbf7snkz1ia8npc4x458pakd641r9ad3ny6z"; + rev = "6e40eec330afdcec051a2fb6d85b92d3a04b6dac"; + sha256 = "03yxbwj3xcbnbi622gfnq4hn9w1isq0rqwrvhi84mxnmpg934win"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; - other-nvim = buildVimPluginFrom2Nix { + other-nvim = buildVimPlugin { pname = "other.nvim"; version = "2023-08-02"; src = fetchFromGitHub { @@ -7989,44 +7989,44 @@ final: prev: meta.homepage = "https://github.com/rgroli/other.nvim/"; }; - otter-nvim = buildVimPluginFrom2Nix { + otter-nvim = buildVimPlugin { pname = "otter.nvim"; version = "2023-09-16"; src = fetchFromGitHub { owner = "jmbuhr"; repo = "otter.nvim"; - rev = "3501362a98fbbb64d23fe5fbcd2a98307f9229f8"; - sha256 = "0innvpbih3w22mara59nnxcpsg9rnn7xlxgb3db5gy7f3g2am5r5"; + rev = "2752dd199d73342f13a1bd599a99822505e2803f"; + sha256 = "00jmwd8la3cadhy2dzl3gzq8wbgn6xwjb9l35h1w1k161pl5p882"; }; meta.homepage = "https://github.com/jmbuhr/otter.nvim/"; }; - overseer-nvim = buildVimPluginFrom2Nix { + overseer-nvim = buildVimPlugin { pname = "overseer.nvim"; - version = "2023-09-14"; + version = "2023-09-26"; src = fetchFromGitHub { owner = "stevearc"; repo = "overseer.nvim"; - rev = "2749d8893a069a0020eba3ddbc26f1624a57d7b3"; - sha256 = "0976kdjsdjdk41zda42hi3wnk0x08iqlmiajs2amzgxdyj4x349r"; + rev = "8065976876cea89d0b99ffef4d997b930296f0e8"; + sha256 = "1sk0pf90hib69nyjr5vfr3kqgy0jh400nix6d8yp8qvdw5y1aw4a"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/overseer.nvim/"; }; - oxocarbon-nvim = buildVimPluginFrom2Nix { + oxocarbon-nvim = buildVimPlugin { pname = "oxocarbon.nvim"; - version = "2023-08-30"; + version = "2023-09-23"; src = fetchFromGitHub { owner = "nyoom-engineering"; repo = "oxocarbon.nvim"; - rev = "162a92e2bcca588a01c2f9fd857bdb4dabd8d72c"; - sha256 = "06q6ykda4pbkqblkqvk7l1gjw9hwn06l13v1sann39dzgwi1yrw7"; + rev = "b47c0ecab3a4270815afb3b05e03423b04cca8f2"; + sha256 = "1hkjc7x5ma8pmz5vi93ygqmbdfammikpvjjxkw9axlh5wh8ys48y"; }; meta.homepage = "https://github.com/nyoom-engineering/oxocarbon.nvim/"; }; - package-info-nvim = buildVimPluginFrom2Nix { + package-info-nvim = buildVimPlugin { pname = "package-info.nvim"; version = "2023-03-28"; src = fetchFromGitHub { @@ -8038,7 +8038,7 @@ final: prev: meta.homepage = "https://github.com/vuki656/package-info.nvim/"; }; - packer-nvim = buildVimPluginFrom2Nix { + packer-nvim = buildVimPlugin { pname = "packer.nvim"; version = "2023-08-24"; src = fetchFromGitHub { @@ -8050,7 +8050,7 @@ final: prev: meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; - palenight-vim = buildVimPluginFrom2Nix { + palenight-vim = buildVimPlugin { pname = "palenight.vim"; version = "2023-04-27"; src = fetchFromGitHub { @@ -8062,7 +8062,7 @@ final: prev: meta.homepage = "https://github.com/drewtempelmeyer/palenight.vim/"; }; - papercolor-theme = buildVimPluginFrom2Nix { + papercolor-theme = buildVimPlugin { pname = "papercolor-theme"; version = "2022-06-08"; src = fetchFromGitHub { @@ -8074,7 +8074,7 @@ final: prev: meta.homepage = "https://github.com/NLKNguyen/papercolor-theme/"; }; - pear-tree = buildVimPluginFrom2Nix { + pear-tree = buildVimPlugin { pname = "pear-tree"; version = "2019-12-08"; src = fetchFromGitHub { @@ -8086,7 +8086,7 @@ final: prev: meta.homepage = "https://github.com/tmsvg/pear-tree/"; }; - pears-nvim = buildVimPluginFrom2Nix { + pears-nvim = buildVimPlugin { pname = "pears.nvim"; version = "2021-05-27"; src = fetchFromGitHub { @@ -8098,7 +8098,7 @@ final: prev: meta.homepage = "https://github.com/steelsojka/pears.nvim/"; }; - persistence-nvim = buildVimPluginFrom2Nix { + persistence-nvim = buildVimPlugin { pname = "persistence.nvim"; version = "2023-05-22"; src = fetchFromGitHub { @@ -8110,7 +8110,7 @@ final: prev: meta.homepage = "https://github.com/folke/persistence.nvim/"; }; - peskcolor-vim = buildVimPluginFrom2Nix { + peskcolor-vim = buildVimPlugin { pname = "peskcolor.vim"; version = "2016-06-11"; src = fetchFromGitHub { @@ -8122,7 +8122,7 @@ final: prev: meta.homepage = "https://github.com/andsild/peskcolor.vim/"; }; - pest-vim = buildVimPluginFrom2Nix { + pest-vim = buildVimPlugin { pname = "pest.vim"; version = "2023-06-16"; src = fetchFromGitHub { @@ -8134,7 +8134,7 @@ final: prev: meta.homepage = "https://github.com/pest-parser/pest.vim/"; }; - pgsql-vim = buildVimPluginFrom2Nix { + pgsql-vim = buildVimPlugin { pname = "pgsql.vim"; version = "2021-12-08"; src = fetchFromGitHub { @@ -8146,7 +8146,7 @@ final: prev: meta.homepage = "https://github.com/lifepillar/pgsql.vim/"; }; - pig-vim = buildVimPluginFrom2Nix { + pig-vim = buildVimPlugin { pname = "pig.vim"; version = "2017-06-08"; src = fetchFromGitHub { @@ -8158,7 +8158,7 @@ final: prev: meta.homepage = "https://github.com/motus/pig.vim/"; }; - plantuml-previewer-vim = buildVimPluginFrom2Nix { + plantuml-previewer-vim = buildVimPlugin { pname = "plantuml-previewer.vim"; version = "2023-03-07"; src = fetchFromGitHub { @@ -8170,7 +8170,7 @@ final: prev: meta.homepage = "https://github.com/weirongxu/plantuml-previewer.vim/"; }; - plantuml-syntax = buildVimPluginFrom2Nix { + plantuml-syntax = buildVimPlugin { pname = "plantuml-syntax"; version = "2022-08-26"; src = fetchFromGitHub { @@ -8182,7 +8182,7 @@ final: prev: meta.homepage = "https://github.com/aklt/plantuml-syntax/"; }; - playground = buildVimPluginFrom2Nix { + playground = buildVimPlugin { pname = "playground"; version = "2023-09-15"; src = fetchFromGitHub { @@ -8206,7 +8206,7 @@ final: prev: meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; - poimandres-nvim = buildVimPluginFrom2Nix { + poimandres-nvim = buildVimPlugin { pname = "poimandres.nvim"; version = "2023-08-16"; src = fetchFromGitHub { @@ -8218,7 +8218,7 @@ final: prev: meta.homepage = "https://github.com/olivercederborg/poimandres.nvim/"; }; - pony-vim-syntax = buildVimPluginFrom2Nix { + pony-vim-syntax = buildVimPlugin { pname = "pony-vim-syntax"; version = "2017-09-26"; src = fetchFromGitHub { @@ -8230,7 +8230,7 @@ final: prev: meta.homepage = "https://github.com/dleonard0/pony-vim-syntax/"; }; - popfix = buildVimPluginFrom2Nix { + popfix = buildVimPlugin { pname = "popfix"; version = "2022-07-04"; src = fetchFromGitHub { @@ -8243,7 +8243,7 @@ final: prev: meta.homepage = "https://github.com/RishabhRD/popfix/"; }; - popup-nvim = buildVimPluginFrom2Nix { + popup-nvim = buildVimPlugin { pname = "popup.nvim"; version = "2021-11-18"; src = fetchFromGitHub { @@ -8255,7 +8255,7 @@ final: prev: meta.homepage = "https://github.com/nvim-lua/popup.nvim/"; }; - presence-nvim = buildVimPluginFrom2Nix { + presence-nvim = buildVimPlugin { pname = "presence.nvim"; version = "2023-01-29"; src = fetchFromGitHub { @@ -8267,7 +8267,7 @@ final: prev: meta.homepage = "https://github.com/andweeb/presence.nvim/"; }; - presenting-vim = buildVimPluginFrom2Nix { + presenting-vim = buildVimPlugin { pname = "presenting.vim"; version = "2022-03-27"; src = fetchFromGitHub { @@ -8279,7 +8279,7 @@ final: prev: meta.homepage = "https://github.com/sotte/presenting.vim/"; }; - preto = buildVimPluginFrom2Nix { + preto = buildVimPlugin { pname = "preto"; version = "2023-02-10"; src = fetchFromGitHub { @@ -8291,7 +8291,7 @@ final: prev: meta.homepage = "https://github.com/ewilazarus/preto/"; }; - pretty-fold-nvim = buildVimPluginFrom2Nix { + pretty-fold-nvim = buildVimPlugin { pname = "pretty-fold.nvim"; version = "2022-07-20"; src = fetchFromGitHub { @@ -8303,7 +8303,7 @@ final: prev: meta.homepage = "https://github.com/anuvyklack/pretty-fold.nvim/"; }; - prev_indent = buildVimPluginFrom2Nix { + prev_indent = buildVimPlugin { pname = "prev_indent"; version = "2014-03-08"; src = fetchFromGitHub { @@ -8315,7 +8315,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/prev_indent/"; }; - project-nvim = buildVimPluginFrom2Nix { + project-nvim = buildVimPlugin { pname = "project.nvim"; version = "2023-04-04"; src = fetchFromGitHub { @@ -8327,7 +8327,7 @@ final: prev: meta.homepage = "https://github.com/ahmedkhalf/project.nvim/"; }; - promise-async = buildVimPluginFrom2Nix { + promise-async = buildVimPlugin { pname = "promise-async"; version = "2023-04-09"; src = fetchFromGitHub { @@ -8339,7 +8339,7 @@ final: prev: meta.homepage = "https://github.com/kevinhwang91/promise-async/"; }; - psc-ide-vim = buildVimPluginFrom2Nix { + psc-ide-vim = buildVimPlugin { pname = "psc-ide-vim"; version = "2021-05-31"; src = fetchFromGitHub { @@ -8351,7 +8351,7 @@ final: prev: meta.homepage = "https://github.com/frigoeu/psc-ide-vim/"; }; - purescript-vim = buildVimPluginFrom2Nix { + purescript-vim = buildVimPlugin { pname = "purescript-vim"; version = "2023-02-06"; src = fetchFromGitHub { @@ -8363,20 +8363,20 @@ final: prev: meta.homepage = "https://github.com/purescript-contrib/purescript-vim/"; }; - python-mode = buildVimPluginFrom2Nix { + python-mode = buildVimPlugin { pname = "python-mode"; - version = "2023-07-03"; + version = "2023-09-23"; src = fetchFromGitHub { owner = "python-mode"; repo = "python-mode"; - rev = "57384b9f278ed1c2b402fe48aad05781882561f1"; - sha256 = "1y30inljvpjrq1yphfjv1x2f0m5bn6gbqg69f3b51fs53sqaswi8"; + rev = "e01c27e8c17b3af2b9df7f6fc5a8a44afc3ad020"; + sha256 = "0g2gcxax1h44rzyv0wfsz78w62cak9riynqh190gncqhzjzswdfp"; fetchSubmodules = true; }; meta.homepage = "https://github.com/python-mode/python-mode/"; }; - python-syntax = buildVimPluginFrom2Nix { + python-syntax = buildVimPlugin { pname = "python-syntax"; version = "2020-12-14"; src = fetchFromGitHub { @@ -8388,7 +8388,7 @@ final: prev: meta.homepage = "https://github.com/vim-python/python-syntax/"; }; - pywal-nvim = buildVimPluginFrom2Nix { + pywal-nvim = buildVimPlugin { pname = "pywal.nvim"; version = "2022-11-03"; src = fetchFromGitHub { @@ -8400,7 +8400,7 @@ final: prev: meta.homepage = "https://github.com/AlphaTechnolog/pywal.nvim/"; }; - quarto-nvim = buildVimPluginFrom2Nix { + quarto-nvim = buildVimPlugin { pname = "quarto-nvim"; version = "2023-09-08"; src = fetchFromGitHub { @@ -8412,7 +8412,7 @@ final: prev: meta.homepage = "https://github.com/quarto-dev/quarto-nvim/"; }; - quick-scope = buildVimPluginFrom2Nix { + quick-scope = buildVimPlugin { pname = "quick-scope"; version = "2023-08-08"; src = fetchFromGitHub { @@ -8424,7 +8424,7 @@ final: prev: meta.homepage = "https://github.com/unblevable/quick-scope/"; }; - quickfix-reflector-vim = buildVimPluginFrom2Nix { + quickfix-reflector-vim = buildVimPlugin { pname = "quickfix-reflector.vim"; version = "2022-02-02"; src = fetchFromGitHub { @@ -8436,7 +8436,7 @@ final: prev: meta.homepage = "https://github.com/stefandtw/quickfix-reflector.vim/"; }; - quickfixstatus = buildVimPluginFrom2Nix { + quickfixstatus = buildVimPlugin { pname = "quickfixstatus"; version = "2011-09-03"; src = fetchFromGitHub { @@ -8448,7 +8448,7 @@ final: prev: meta.homepage = "https://github.com/dannyob/quickfixstatus/"; }; - quickmath-nvim = buildVimPluginFrom2Nix { + quickmath-nvim = buildVimPlugin { pname = "quickmath.nvim"; version = "2023-03-12"; src = fetchFromGitHub { @@ -8460,7 +8460,7 @@ final: prev: meta.homepage = "https://github.com/jbyuki/quickmath.nvim/"; }; - rainbow = buildVimPluginFrom2Nix { + rainbow = buildVimPlugin { pname = "rainbow"; version = "2022-10-08"; src = fetchFromGitHub { @@ -8472,18 +8472,18 @@ final: prev: meta.homepage = "https://github.com/luochen1990/rainbow/"; }; - rainbow-delimiters-nvim = buildVimPluginFrom2Nix { + rainbow-delimiters-nvim = buildVimPlugin { pname = "rainbow-delimiters.nvim"; - version = "2023-08-26"; + version = "2023-09-28"; src = fetchgit { url = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; - rev = "9cbd3dc409af1f5531778ccd1ea6bce668241f39"; - sha256 = "0qz4my1xw1vww2109s8icscwfysa2aak3kjq2wym2smm259gd8g1"; + rev = "ece052dbcb2b3d2980f0f9881e41277929813644"; + sha256 = "05rc0mgn3jbp1aiac7531cidpc1s79qi1zhj2l7cz9353cfq0j47"; }; meta.homepage = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; }; - rainbow_parentheses-vim = buildVimPluginFrom2Nix { + rainbow_parentheses-vim = buildVimPlugin { pname = "rainbow_parentheses.vim"; version = "2013-03-05"; src = fetchFromGitHub { @@ -8495,7 +8495,7 @@ final: prev: meta.homepage = "https://github.com/kien/rainbow_parentheses.vim/"; }; - random-vim = buildVimPluginFrom2Nix { + random-vim = buildVimPlugin { pname = "random.vim"; version = "2010-10-18"; src = fetchFromGitHub { @@ -8507,7 +8507,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/random.vim/"; }; - range-highlight-nvim = buildVimPluginFrom2Nix { + range-highlight-nvim = buildVimPlugin { pname = "range-highlight.nvim"; version = "2021-08-03"; src = fetchFromGitHub { @@ -8519,7 +8519,7 @@ final: prev: meta.homepage = "https://github.com/winston0410/range-highlight.nvim/"; }; - ranger-vim = buildVimPluginFrom2Nix { + ranger-vim = buildVimPlugin { pname = "ranger.vim"; version = "2021-12-13"; src = fetchFromGitHub { @@ -8531,7 +8531,7 @@ final: prev: meta.homepage = "https://github.com/rafaqz/ranger.vim/"; }; - rcshell-vim = buildVimPluginFrom2Nix { + rcshell-vim = buildVimPlugin { pname = "rcshell.vim"; version = "2014-12-29"; src = fetchFromGitHub { @@ -8543,7 +8543,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/rcshell.vim/"; }; - readline-vim = buildVimPluginFrom2Nix { + readline-vim = buildVimPlugin { pname = "readline.vim"; version = "2023-03-09"; src = fetchFromGitHub { @@ -8555,19 +8555,19 @@ final: prev: meta.homepage = "https://github.com/ryvnf/readline.vim/"; }; - refactoring-nvim = buildVimPluginFrom2Nix { + refactoring-nvim = buildVimPlugin { pname = "refactoring.nvim"; - version = "2023-08-31"; + version = "2023-09-18"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "2ec9bc0fb5f3c8c6a0f776f0159dd2a3b1663554"; - sha256 = "038cczxj9ba3axb3aw5r2dsp5anzacnwnnp61i1pk7kk8l3wg2ck"; + rev = "be6505be8bdd306646bb81399312c02927a60a51"; + sha256 = "1h4hbg5x80anr4imfnlvvmcyqr0jg3s0jkpgzhpzq1783b89sj9s"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; - registers-nvim = buildVimPluginFrom2Nix { + registers-nvim = buildVimPlugin { pname = "registers.nvim"; version = "2023-09-05"; src = fetchFromGitHub { @@ -8579,7 +8579,7 @@ final: prev: meta.homepage = "https://github.com/tversteeg/registers.nvim/"; }; - remember-nvim = buildVimPluginFrom2Nix { + remember-nvim = buildVimPlugin { pname = "remember.nvim"; version = "2023-06-12"; src = fetchFromGitHub { @@ -8591,7 +8591,7 @@ final: prev: meta.homepage = "https://github.com/vladdoster/remember.nvim/"; }; - renamer-nvim = buildVimPluginFrom2Nix { + renamer-nvim = buildVimPlugin { pname = "renamer.nvim"; version = "2022-08-29"; src = fetchFromGitHub { @@ -8603,7 +8603,7 @@ final: prev: meta.homepage = "https://github.com/filipdutescu/renamer.nvim/"; }; - replacer-nvim = buildVimPluginFrom2Nix { + replacer-nvim = buildVimPlugin { pname = "replacer.nvim"; version = "2023-07-29"; src = fetchFromGitHub { @@ -8617,17 +8617,17 @@ final: prev: rest-nvim = buildNeovimPlugin { pname = "rest.nvim"; - version = "2023-09-15"; + version = "2023-09-30"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "rest.nvim"; - rev = "f13ae54ae2545d4d612593d4a442cbb33a1b5b65"; - sha256 = "0xiyg3yghjvvfzg2qa3gi28n9bm86083sghsv68wc7848s8s5ka4"; + rev = "35d949df1928b44b6d941fd9015eb3f973845b1f"; + sha256 = "13lcd7wgdfd1hy1jkqbwvkcpyz9caxj9gdrn03ckba5lcbbnf08k"; }; meta.homepage = "https://github.com/rest-nvim/rest.nvim/"; }; - riv-vim = buildVimPluginFrom2Nix { + riv-vim = buildVimPlugin { pname = "riv.vim"; version = "2021-08-09"; src = fetchFromGitHub { @@ -8639,7 +8639,7 @@ final: prev: meta.homepage = "https://github.com/gu-fan/riv.vim/"; }; - rnvimr = buildVimPluginFrom2Nix { + rnvimr = buildVimPlugin { pname = "rnvimr"; version = "2023-08-06"; src = fetchFromGitHub { @@ -8651,7 +8651,7 @@ final: prev: meta.homepage = "https://github.com/kevinhwang91/rnvimr/"; }; - robotframework-vim = buildVimPluginFrom2Nix { + robotframework-vim = buildVimPlugin { pname = "robotframework-vim"; version = "2017-04-14"; src = fetchFromGitHub { @@ -8663,7 +8663,7 @@ final: prev: meta.homepage = "https://github.com/mfukar/robotframework-vim/"; }; - ron-vim = buildVimPluginFrom2Nix { + ron-vim = buildVimPlugin { pname = "ron.vim"; version = "2022-08-19"; src = fetchFromGitHub { @@ -8675,7 +8675,7 @@ final: prev: meta.homepage = "https://github.com/ron-rs/ron.vim/"; }; - rspec-vim = buildVimPluginFrom2Nix { + rspec-vim = buildVimPlugin { pname = "rspec.vim"; version = "2020-08-20"; src = fetchFromGitHub { @@ -8687,7 +8687,7 @@ final: prev: meta.homepage = "https://github.com/keith/rspec.vim/"; }; - rtorrent-syntax-file = buildVimPluginFrom2Nix { + rtorrent-syntax-file = buildVimPlugin { pname = "rtorrent-syntax-file"; version = "2016-03-19"; src = fetchFromGitHub { @@ -8699,7 +8699,7 @@ final: prev: meta.homepage = "https://github.com/ccarpita/rtorrent-syntax-file/"; }; - rust-tools-nvim = buildVimPluginFrom2Nix { + rust-tools-nvim = buildVimPlugin { pname = "rust-tools.nvim"; version = "2023-07-10"; src = fetchFromGitHub { @@ -8711,7 +8711,7 @@ final: prev: meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; - rust-vim = buildVimPluginFrom2Nix { + rust-vim = buildVimPlugin { pname = "rust.vim"; version = "2022-11-27"; src = fetchFromGitHub { @@ -8723,7 +8723,7 @@ final: prev: meta.homepage = "https://github.com/rust-lang/rust.vim/"; }; - sad-vim = buildVimPluginFrom2Nix { + sad-vim = buildVimPlugin { pname = "sad.vim"; version = "2019-02-18"; src = fetchFromGitHub { @@ -8735,7 +8735,7 @@ final: prev: meta.homepage = "https://github.com/hauleth/sad.vim/"; }; - salt-vim = buildVimPluginFrom2Nix { + salt-vim = buildVimPlugin { pname = "salt-vim"; version = "2017-07-01"; src = fetchFromGitHub { @@ -8747,7 +8747,7 @@ final: prev: meta.homepage = "https://github.com/vmware-archive/salt-vim/"; }; - satellite-nvim = buildVimPluginFrom2Nix { + satellite-nvim = buildVimPlugin { pname = "satellite.nvim"; version = "2023-07-31"; src = fetchFromGitHub { @@ -8759,7 +8759,7 @@ final: prev: meta.homepage = "https://github.com/lewis6991/satellite.nvim/"; }; - scnvim = buildVimPluginFrom2Nix { + scnvim = buildVimPlugin { pname = "scnvim"; version = "2023-09-11"; src = fetchFromGitHub { @@ -8771,7 +8771,7 @@ final: prev: meta.homepage = "https://github.com/davidgranstrom/scnvim/"; }; - scope-nvim = buildVimPluginFrom2Nix { + scope-nvim = buildVimPlugin { pname = "scope.nvim"; version = "2023-09-10"; src = fetchFromGitHub { @@ -8783,7 +8783,7 @@ final: prev: meta.homepage = "https://github.com/tiagovla/scope.nvim/"; }; - scrollbar-nvim = buildVimPluginFrom2Nix { + scrollbar-nvim = buildVimPlugin { pname = "scrollbar.nvim"; version = "2022-06-16"; src = fetchFromGitHub { @@ -8795,7 +8795,7 @@ final: prev: meta.homepage = "https://github.com/Xuyuanp/scrollbar.nvim/"; }; - scss-syntax-vim = buildVimPluginFrom2Nix { + scss-syntax-vim = buildVimPlugin { pname = "scss-syntax.vim"; version = "2019-06-30"; src = fetchFromGitHub { @@ -8807,7 +8807,7 @@ final: prev: meta.homepage = "https://github.com/cakebaker/scss-syntax.vim/"; }; - searchbox-nvim = buildVimPluginFrom2Nix { + searchbox-nvim = buildVimPlugin { pname = "searchbox.nvim"; version = "2022-10-31"; src = fetchFromGitHub { @@ -8819,7 +8819,7 @@ final: prev: meta.homepage = "https://github.com/VonHeikemen/searchbox.nvim/"; }; - securemodelines = buildVimPluginFrom2Nix { + securemodelines = buildVimPlugin { pname = "securemodelines"; version = "2019-02-09"; src = fetchFromGitHub { @@ -8831,7 +8831,7 @@ final: prev: meta.homepage = "https://github.com/RobertAudi/securemodelines/"; }; - self = buildVimPluginFrom2Nix { + self = buildVimPlugin { pname = "self"; version = "2014-05-28"; src = fetchFromGitHub { @@ -8843,7 +8843,7 @@ final: prev: meta.homepage = "https://github.com/megaannum/self/"; }; - semantic-highlight-vim = buildVimPluginFrom2Nix { + semantic-highlight-vim = buildVimPlugin { pname = "semantic-highlight.vim"; version = "2020-09-11"; src = fetchFromGitHub { @@ -8855,7 +8855,7 @@ final: prev: meta.homepage = "https://github.com/jaxbot/semantic-highlight.vim/"; }; - semshi = buildVimPluginFrom2Nix { + semshi = buildVimPlugin { pname = "semshi"; version = "2021-07-24"; src = fetchFromGitHub { @@ -8867,7 +8867,7 @@ final: prev: meta.homepage = "https://github.com/numirias/semshi/"; }; - seoul256-vim = buildVimPluginFrom2Nix { + seoul256-vim = buildVimPlugin { pname = "seoul256.vim"; version = "2023-05-03"; src = fetchFromGitHub { @@ -8879,19 +8879,19 @@ final: prev: meta.homepage = "https://github.com/junegunn/seoul256.vim/"; }; - sg-nvim = buildVimPluginFrom2Nix { + sg-nvim = buildVimPlugin { pname = "sg.nvim"; - version = "2023-09-12"; + version = "2023-09-27"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "sg.nvim"; - rev = "a6a677225bffd66bc98e03ed77438cde93a6fd31"; - sha256 = "1410d2z73xnkcyfx3cq4p30qlbg6177alw9anpn7akvhhgr0dlz2"; + rev = "b0b543285dfefd47eeae93f3f5c812c1dce26ff4"; + sha256 = "09sldl3858nlhm10xzbrd3nigf05ia34n2ml4mqrzmb0zkkzidn6"; }; meta.homepage = "https://github.com/sourcegraph/sg.nvim/"; }; - shabadou-vim = buildVimPluginFrom2Nix { + shabadou-vim = buildVimPlugin { pname = "shabadou.vim"; version = "2016-07-19"; src = fetchFromGitHub { @@ -8903,7 +8903,7 @@ final: prev: meta.homepage = "https://github.com/osyo-manga/shabadou.vim/"; }; - sideways-vim = buildVimPluginFrom2Nix { + sideways-vim = buildVimPlugin { pname = "sideways.vim"; version = "2023-02-25"; src = fetchFromGitHub { @@ -8916,7 +8916,7 @@ final: prev: meta.homepage = "https://github.com/AndrewRadev/sideways.vim/"; }; - skim-vim = buildVimPluginFrom2Nix { + skim-vim = buildVimPlugin { pname = "skim.vim"; version = "2023-05-25"; src = fetchFromGitHub { @@ -8928,7 +8928,7 @@ final: prev: meta.homepage = "https://github.com/lotabout/skim.vim/"; }; - sky-color-clock-vim = buildVimPluginFrom2Nix { + sky-color-clock-vim = buildVimPlugin { pname = "sky-color-clock.vim"; version = "2018-11-03"; src = fetchFromGitHub { @@ -8940,7 +8940,7 @@ final: prev: meta.homepage = "https://github.com/mopp/sky-color-clock.vim/"; }; - slimv = buildVimPluginFrom2Nix { + slimv = buildVimPlugin { pname = "slimv"; version = "2023-07-01"; src = fetchFromGitHub { @@ -8952,7 +8952,7 @@ final: prev: meta.homepage = "https://github.com/kovisoft/slimv/"; }; - smart-splits-nvim = buildVimPluginFrom2Nix { + smart-splits-nvim = buildVimPlugin { pname = "smart-splits.nvim"; version = "2023-09-12"; src = fetchFromGitHub { @@ -8964,7 +8964,7 @@ final: prev: meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; }; - smartcolumn-nvim = buildVimPluginFrom2Nix { + smartcolumn-nvim = buildVimPlugin { pname = "smartcolumn.nvim"; version = "2023-09-12"; src = fetchFromGitHub { @@ -8976,7 +8976,7 @@ final: prev: meta.homepage = "https://github.com/m4xshen/smartcolumn.nvim/"; }; - smartpairs-vim = buildVimPluginFrom2Nix { + smartpairs-vim = buildVimPlugin { pname = "smartpairs.vim"; version = "2018-01-01"; src = fetchFromGitHub { @@ -8988,7 +8988,7 @@ final: prev: meta.homepage = "https://github.com/gorkunov/smartpairs.vim/"; }; - smartyank-nvim = buildVimPluginFrom2Nix { + smartyank-nvim = buildVimPlugin { pname = "smartyank.nvim"; version = "2023-02-25"; src = fetchFromGitHub { @@ -9000,7 +9000,7 @@ final: prev: meta.homepage = "https://github.com/ibhagwan/smartyank.nvim/"; }; - snap = buildVimPluginFrom2Nix { + snap = buildVimPlugin { pname = "snap"; version = "2022-08-03"; src = fetchFromGitHub { @@ -9012,7 +9012,7 @@ final: prev: meta.homepage = "https://github.com/camspiers/snap/"; }; - snippets-nvim = buildVimPluginFrom2Nix { + snippets-nvim = buildVimPlugin { pname = "snippets.nvim"; version = "2020-09-09"; src = fetchFromGitHub { @@ -9024,7 +9024,7 @@ final: prev: meta.homepage = "https://github.com/norcalli/snippets.nvim/"; }; - solarized-nvim = buildVimPluginFrom2Nix { + solarized-nvim = buildVimPlugin { pname = "solarized.nvim"; version = "2023-02-09"; src = fetchFromGitHub { @@ -9036,7 +9036,7 @@ final: prev: meta.homepage = "https://github.com/shaunsingh/solarized.nvim/"; }; - sonokai = buildVimPluginFrom2Nix { + sonokai = buildVimPlugin { pname = "sonokai"; version = "2023-08-07"; src = fetchFromGitHub { @@ -9048,7 +9048,7 @@ final: prev: meta.homepage = "https://github.com/sainnhe/sonokai/"; }; - sort-nvim = buildVimPluginFrom2Nix { + sort-nvim = buildVimPlugin { pname = "sort.nvim"; version = "2023-04-12"; src = fetchFromGitHub { @@ -9060,7 +9060,7 @@ final: prev: meta.homepage = "https://github.com/sQVe/sort.nvim/"; }; - sourcemap-vim = buildVimPluginFrom2Nix { + sourcemap-vim = buildVimPlugin { pname = "sourcemap.vim"; version = "2012-09-19"; src = fetchFromGitHub { @@ -9072,7 +9072,7 @@ final: prev: meta.homepage = "https://github.com/chikatoike/sourcemap.vim/"; }; - space-vim = buildVimPluginFrom2Nix { + space-vim = buildVimPlugin { pname = "space-vim"; version = "2023-04-17"; src = fetchFromGitHub { @@ -9084,7 +9084,7 @@ final: prev: meta.homepage = "https://github.com/liuchengxu/space-vim/"; }; - spacevim = buildVimPluginFrom2Nix { + spacevim = buildVimPlugin { pname = "spacevim"; version = "2018-03-29"; src = fetchFromGitHub { @@ -9096,7 +9096,7 @@ final: prev: meta.homepage = "https://github.com/ctjhoa/spacevim/"; }; - sparkup = buildVimPluginFrom2Nix { + sparkup = buildVimPlugin { pname = "sparkup"; version = "2012-06-11"; src = fetchFromGitHub { @@ -9108,7 +9108,7 @@ final: prev: meta.homepage = "https://github.com/chrisgeo/sparkup/"; }; - specs-nvim = buildVimPluginFrom2Nix { + specs-nvim = buildVimPlugin { pname = "specs.nvim"; version = "2022-09-20"; src = fetchFromGitHub { @@ -9120,7 +9120,7 @@ final: prev: meta.homepage = "https://github.com/edluffy/specs.nvim/"; }; - spellsitter-nvim = buildVimPluginFrom2Nix { + spellsitter-nvim = buildVimPlugin { pname = "spellsitter.nvim"; version = "2022-09-06"; src = fetchFromGitHub { @@ -9132,7 +9132,7 @@ final: prev: meta.homepage = "https://github.com/lewis6991/spellsitter.nvim/"; }; - sphinx-nvim = buildVimPluginFrom2Nix { + sphinx-nvim = buildVimPlugin { pname = "sphinx.nvim"; version = "2023-08-25"; src = fetchFromGitHub { @@ -9144,7 +9144,7 @@ final: prev: meta.homepage = "https://github.com/stsewd/sphinx.nvim/"; }; - splice-vim = buildVimPluginFrom2Nix { + splice-vim = buildVimPlugin { pname = "splice.vim"; version = "2020-01-15"; src = fetchFromGitHub { @@ -9156,7 +9156,7 @@ final: prev: meta.homepage = "https://github.com/sjl/splice.vim/"; }; - split-term-vim = buildVimPluginFrom2Nix { + split-term-vim = buildVimPlugin { pname = "split-term.vim"; version = "2018-09-30"; src = fetchFromGitHub { @@ -9168,7 +9168,7 @@ final: prev: meta.homepage = "https://github.com/vimlab/split-term.vim/"; }; - splitjoin-vim = buildVimPluginFrom2Nix { + splitjoin-vim = buildVimPlugin { pname = "splitjoin.vim"; version = "2023-09-02"; src = fetchFromGitHub { @@ -9181,7 +9181,7 @@ final: prev: meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; }; - sqlite-lua = buildVimPluginFrom2Nix { + sqlite-lua = buildVimPlugin { pname = "sqlite.lua"; version = "2023-04-19"; src = fetchFromGitHub { @@ -9193,19 +9193,19 @@ final: prev: meta.homepage = "https://github.com/kkharji/sqlite.lua/"; }; - srcery-vim = buildVimPluginFrom2Nix { + srcery-vim = buildVimPlugin { pname = "srcery-vim"; - version = "2023-09-04"; + version = "2023-09-25"; src = fetchFromGitHub { owner = "srcery-colors"; repo = "srcery-vim"; - rev = "755e4ab8a63ec2b4ea756a2fa128d642771369e5"; - sha256 = "0f7bhdhpa79f457rhnmg64vl6nnzxmrkl47n30q31y9rvz9v9bp6"; + rev = "8ea4c4f5caf61ac4ab887fc53eabc916985db881"; + sha256 = "0z6i35gcf4qcy9cgsrg2bg2alh0sk6zxqvid8lgkmds4qgrvhxp3"; }; meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; }; - sslsecure-vim = buildVimPluginFrom2Nix { + sslsecure-vim = buildVimPlugin { pname = "sslsecure.vim"; version = "2017-07-27"; src = fetchFromGitHub { @@ -9217,7 +9217,7 @@ final: prev: meta.homepage = "https://github.com/chr4/sslsecure.vim/"; }; - ssr-nvim = buildVimPluginFrom2Nix { + ssr-nvim = buildVimPlugin { pname = "ssr.nvim"; version = "2023-08-20"; src = fetchFromGitHub { @@ -9229,7 +9229,7 @@ final: prev: meta.homepage = "https://github.com/cshuaimin/ssr.nvim/"; }; - stabilize-nvim = buildVimPluginFrom2Nix { + stabilize-nvim = buildVimPlugin { pname = "stabilize.nvim"; version = "2023-04-14"; src = fetchFromGitHub { @@ -9241,7 +9241,7 @@ final: prev: meta.homepage = "https://github.com/luukvbaal/stabilize.nvim/"; }; - stan-vim = buildVimPluginFrom2Nix { + stan-vim = buildVimPlugin { pname = "stan-vim"; version = "2021-05-28"; src = fetchFromGitHub { @@ -9253,7 +9253,7 @@ final: prev: meta.homepage = "https://github.com/eigenfoo/stan-vim/"; }; - starrynight = buildVimPluginFrom2Nix { + starrynight = buildVimPlugin { pname = "starrynight"; version = "2021-09-09"; src = fetchFromGitHub { @@ -9265,7 +9265,7 @@ final: prev: meta.homepage = "https://github.com/josegamez82/starrynight/"; }; - starsearch-vim = buildVimPluginFrom2Nix { + starsearch-vim = buildVimPlugin { pname = "starsearch.vim"; version = "2014-09-21"; src = fetchFromGitHub { @@ -9277,7 +9277,7 @@ final: prev: meta.homepage = "https://github.com/darfink/starsearch.vim/"; }; - statuscol-nvim = buildVimPluginFrom2Nix { + statuscol-nvim = buildVimPlugin { pname = "statuscol.nvim"; version = "2023-08-27"; src = fetchFromGitHub { @@ -9289,7 +9289,7 @@ final: prev: meta.homepage = "https://github.com/luukvbaal/statuscol.nvim/"; }; - stylish-nvim = buildVimPluginFrom2Nix { + stylish-nvim = buildVimPlugin { pname = "stylish.nvim"; version = "2022-02-01"; src = fetchFromGitHub { @@ -9301,7 +9301,7 @@ final: prev: meta.homepage = "https://github.com/teto/stylish.nvim/"; }; - substitute-nvim = buildVimPluginFrom2Nix { + substitute-nvim = buildVimPlugin { pname = "substitute.nvim"; version = "2023-07-20"; src = fetchFromGitHub { @@ -9313,7 +9313,7 @@ final: prev: meta.homepage = "https://github.com/gbprod/substitute.nvim/"; }; - substrata-nvim = buildVimPluginFrom2Nix { + substrata-nvim = buildVimPlugin { pname = "substrata.nvim"; version = "2022-10-07"; src = fetchFromGitHub { @@ -9325,7 +9325,7 @@ final: prev: meta.homepage = "https://github.com/kvrohit/substrata.nvim/"; }; - suda-vim = buildVimPluginFrom2Nix { + suda-vim = buildVimPlugin { pname = "suda.vim"; version = "2023-06-27"; src = fetchFromGitHub { @@ -9337,7 +9337,7 @@ final: prev: meta.homepage = "https://github.com/lambdalisue/suda.vim/"; }; - supertab = buildVimPluginFrom2Nix { + supertab = buildVimPlugin { pname = "supertab"; version = "2021-04-30"; src = fetchFromGitHub { @@ -9349,7 +9349,7 @@ final: prev: meta.homepage = "https://github.com/ervandew/supertab/"; }; - surround-nvim = buildVimPluginFrom2Nix { + surround-nvim = buildVimPlugin { pname = "surround.nvim"; version = "2022-10-10"; src = fetchFromGitHub { @@ -9361,7 +9361,7 @@ final: prev: meta.homepage = "https://github.com/ur4ltz/surround.nvim/"; }; - sved = buildVimPluginFrom2Nix { + sved = buildVimPlugin { pname = "sved"; version = "2022-08-11"; src = fetchFromGitHub { @@ -9373,7 +9373,7 @@ final: prev: meta.homepage = "https://github.com/peterbjorgensen/sved/"; }; - swayconfig-vim = buildVimPluginFrom2Nix { + swayconfig-vim = buildVimPlugin { pname = "swayconfig.vim"; version = "2023-08-26"; src = fetchFromGitHub { @@ -9385,7 +9385,7 @@ final: prev: meta.homepage = "https://github.com/jamespeapen/swayconfig.vim/"; }; - swift-vim = buildVimPluginFrom2Nix { + swift-vim = buildVimPlugin { pname = "swift.vim"; version = "2023-08-02"; src = fetchFromGitHub { @@ -9397,7 +9397,7 @@ final: prev: meta.homepage = "https://github.com/keith/swift.vim/"; }; - switch-vim = buildVimPluginFrom2Nix { + switch-vim = buildVimPlugin { pname = "switch.vim"; version = "2023-08-22"; src = fetchFromGitHub { @@ -9410,7 +9410,7 @@ final: prev: meta.homepage = "https://github.com/AndrewRadev/switch.vim/"; }; - symbols-outline-nvim = buildVimPluginFrom2Nix { + symbols-outline-nvim = buildVimPlugin { pname = "symbols-outline.nvim"; version = "2023-01-25"; src = fetchFromGitHub { @@ -9422,7 +9422,7 @@ final: prev: meta.homepage = "https://github.com/simrat39/symbols-outline.nvim/"; }; - syntastic = buildVimPluginFrom2Nix { + syntastic = buildVimPlugin { pname = "syntastic"; version = "2022-07-10"; src = fetchFromGitHub { @@ -9434,19 +9434,19 @@ final: prev: meta.homepage = "https://github.com/vim-syntastic/syntastic/"; }; - tabby-nvim = buildVimPluginFrom2Nix { + tabby-nvim = buildVimPlugin { pname = "tabby.nvim"; - version = "2023-08-30"; + version = "2023-09-21"; src = fetchFromGitHub { owner = "nanozuki"; repo = "tabby.nvim"; - rev = "e0a20dc4c0e16ca755184c34a27391f31a91e463"; - sha256 = "16bh1wbdvp2zlk2aq5b7xplirqlqg4mwldspapsmahjjh3mdzg8m"; + rev = "9e537762cbb7647357eab22c61c7c5dda00138dd"; + sha256 = "0wznkhpd3wax8jqw6wa2802x649jv8ph89plz1qwc08ia47lwcfb"; }; meta.homepage = "https://github.com/nanozuki/tabby.nvim/"; }; - tabline-nvim = buildVimPluginFrom2Nix { + tabline-nvim = buildVimPlugin { pname = "tabline.nvim"; version = "2023-07-24"; src = fetchFromGitHub { @@ -9458,7 +9458,7 @@ final: prev: meta.homepage = "https://github.com/kdheepak/tabline.nvim/"; }; - tabmerge = buildVimPluginFrom2Nix { + tabmerge = buildVimPlugin { pname = "tabmerge"; version = "2010-10-18"; src = fetchFromGitHub { @@ -9470,7 +9470,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/tabmerge/"; }; - tabnine-vim = buildVimPluginFrom2Nix { + tabnine-vim = buildVimPlugin { pname = "tabnine-vim"; version = "2023-01-01"; src = fetchFromGitHub { @@ -9483,7 +9483,7 @@ final: prev: meta.homepage = "https://github.com/codota/tabnine-vim/"; }; - taboo-vim = buildVimPluginFrom2Nix { + taboo-vim = buildVimPlugin { pname = "taboo.vim"; version = "2019-08-27"; src = fetchFromGitHub { @@ -9495,7 +9495,7 @@ final: prev: meta.homepage = "https://github.com/gcmt/taboo.vim/"; }; - tabout-nvim = buildVimPluginFrom2Nix { + tabout-nvim = buildVimPlugin { pname = "tabout.nvim"; version = "2023-03-29"; src = fetchFromGitHub { @@ -9507,7 +9507,7 @@ final: prev: meta.homepage = "https://github.com/abecodes/tabout.nvim/"; }; - tabpagebuffer-vim = buildVimPluginFrom2Nix { + tabpagebuffer-vim = buildVimPlugin { pname = "tabpagebuffer.vim"; version = "2014-09-30"; src = fetchFromGitHub { @@ -9519,7 +9519,7 @@ final: prev: meta.homepage = "https://github.com/Shougo/tabpagebuffer.vim/"; }; - tabular = buildVimPluginFrom2Nix { + tabular = buildVimPlugin { pname = "tabular"; version = "2019-02-19"; src = fetchFromGitHub { @@ -9531,7 +9531,7 @@ final: prev: meta.homepage = "https://github.com/godlygeek/tabular/"; }; - tagalong-vim = buildVimPluginFrom2Nix { + tagalong-vim = buildVimPlugin { pname = "tagalong.vim"; version = "2023-09-07"; src = fetchFromGitHub { @@ -9543,19 +9543,19 @@ final: prev: meta.homepage = "https://github.com/AndrewRadev/tagalong.vim/"; }; - tagbar = buildVimPluginFrom2Nix { + tagbar = buildVimPlugin { pname = "tagbar"; - version = "2023-08-15"; + version = "2023-09-25"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "402e3e117fc7b47e43dbb87c51064daae3bc3bf3"; - sha256 = "0cg7s68lr0282ci1r34ixnkvls830j2j5k5dr55vqqkqi7614n3p"; + rev = "5d6990e4fc5b3e3b88a3af90146f2561c4f6d828"; + sha256 = "08i5gx57hsj4840m1b85064077l3gbdiyxq04g6s1m1zpj0xq7zj"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; - taglist-vim = buildVimPluginFrom2Nix { + taglist-vim = buildVimPlugin { pname = "taglist.vim"; version = "2010-10-18"; src = fetchFromGitHub { @@ -9567,7 +9567,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/taglist.vim/"; }; - targets-vim = buildVimPluginFrom2Nix { + targets-vim = buildVimPlugin { pname = "targets.vim"; version = "2023-02-22"; src = fetchFromGitHub { @@ -9579,7 +9579,7 @@ final: prev: meta.homepage = "https://github.com/wellle/targets.vim/"; }; - taskwiki = buildVimPluginFrom2Nix { + taskwiki = buildVimPlugin { pname = "taskwiki"; version = "2022-12-14"; src = fetchFromGitHub { @@ -9591,19 +9591,19 @@ final: prev: meta.homepage = "https://github.com/tools-life/taskwiki/"; }; - tcomment_vim = buildVimPluginFrom2Nix { + tcomment_vim = buildVimPlugin { pname = "tcomment_vim"; - version = "2022-12-17"; + version = "2023-09-22"; src = fetchFromGitHub { owner = "tomtom"; repo = "tcomment_vim"; - rev = "b4930f9da28647e5417d462c341013f88184be7e"; - sha256 = "06nlnnrxh3jgnlcbbr7czpaz9v7n2g60mw28lshc14wzqpl01vvx"; + rev = "593c9a6e1d411e276aee3eb459bcdaabb21550e5"; + sha256 = "0hx20j02h753q9jmwhzbddr0bf0z5magc3ayrc3yw8sjvhnqvrhw"; }; meta.homepage = "https://github.com/tomtom/tcomment_vim/"; }; - telekasten-nvim = buildVimPluginFrom2Nix { + telekasten-nvim = buildVimPlugin { pname = "telekasten.nvim"; version = "2023-09-08"; src = fetchFromGitHub { @@ -9616,7 +9616,7 @@ final: prev: meta.homepage = "https://github.com/renerocksai/telekasten.nvim/"; }; - telescope-asynctasks-nvim = buildVimPluginFrom2Nix { + telescope-asynctasks-nvim = buildVimPlugin { pname = "telescope-asynctasks.nvim"; version = "2022-04-09"; src = fetchFromGitHub { @@ -9628,7 +9628,7 @@ final: prev: meta.homepage = "https://github.com/GustavoKatel/telescope-asynctasks.nvim/"; }; - telescope-cheat-nvim = buildVimPluginFrom2Nix { + telescope-cheat-nvim = buildVimPlugin { pname = "telescope-cheat.nvim"; version = "2023-02-19"; src = fetchFromGitHub { @@ -9640,7 +9640,7 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope-cheat.nvim/"; }; - telescope-coc-nvim = buildVimPluginFrom2Nix { + telescope-coc-nvim = buildVimPlugin { pname = "telescope-coc.nvim"; version = "2023-02-16"; src = fetchFromGitHub { @@ -9652,7 +9652,7 @@ final: prev: meta.homepage = "https://github.com/fannheyward/telescope-coc.nvim/"; }; - telescope-dap-nvim = buildVimPluginFrom2Nix { + telescope-dap-nvim = buildVimPlugin { pname = "telescope-dap.nvim"; version = "2023-09-10"; src = fetchFromGitHub { @@ -9664,31 +9664,31 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope-dap.nvim/"; }; - telescope-file-browser-nvim = buildVimPluginFrom2Nix { + telescope-file-browser-nvim = buildVimPlugin { pname = "telescope-file-browser.nvim"; - version = "2023-09-15"; + version = "2023-09-23"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "bec4b0fd6c293f5c42d7929d8eff49e5af43e7f3"; - sha256 = "1rnda6ckr18xhwh9zfx9kvypbd7ynxxkf3k4ml2qz48m2y9gyadn"; + rev = "6e51d0cd6447cf2525412220ff0a2885eef9039c"; + sha256 = "1ksx2w2vaxnjyvj937la3fsiw7z0ary5qjnylxspw0zqp6d2ri9q"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; - telescope-frecency-nvim = buildVimPluginFrom2Nix { + telescope-frecency-nvim = buildVimPlugin { pname = "telescope-frecency.nvim"; - version = "2023-08-27"; + version = "2023-10-01"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "fbda5d91d6e787f5977787fa4a81da5c8e22160a"; - sha256 = "1cm2jr0f719jhr4q5w8fh0c8qjncrvhck18h4g42xsgyhrkvfy2g"; + rev = "4bdd9bafc7ac2c6fed03e92efac1e6b4632eda28"; + sha256 = "01a4hdgjf3i0qywz45rvzga02hphb2zl5cnpafw0igzb3lrsxqqk"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; - telescope-fzf-native-nvim = buildVimPluginFrom2Nix { + telescope-fzf-native-nvim = buildVimPlugin { pname = "telescope-fzf-native.nvim"; version = "2023-09-10"; src = fetchFromGitHub { @@ -9700,7 +9700,7 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-native.nvim/"; }; - telescope-fzf-writer-nvim = buildVimPluginFrom2Nix { + telescope-fzf-writer-nvim = buildVimPlugin { pname = "telescope-fzf-writer.nvim"; version = "2021-04-16"; src = fetchFromGitHub { @@ -9712,7 +9712,7 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-writer.nvim/"; }; - telescope-fzy-native-nvim = buildVimPluginFrom2Nix { + telescope-fzy-native-nvim = buildVimPlugin { pname = "telescope-fzy-native.nvim"; version = "2022-09-11"; src = fetchFromGitHub { @@ -9725,7 +9725,7 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope-fzy-native.nvim/"; }; - telescope-github-nvim = buildVimPluginFrom2Nix { + telescope-github-nvim = buildVimPlugin { pname = "telescope-github.nvim"; version = "2022-04-22"; src = fetchFromGitHub { @@ -9737,7 +9737,7 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope-github.nvim/"; }; - telescope-live-grep-args-nvim = buildVimPluginFrom2Nix { + telescope-live-grep-args-nvim = buildVimPlugin { pname = "telescope-live-grep-args.nvim"; version = "2023-08-28"; src = fetchFromGitHub { @@ -9749,7 +9749,7 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope-live-grep-args.nvim/"; }; - telescope-lsp-handlers-nvim = buildVimPluginFrom2Nix { + telescope-lsp-handlers-nvim = buildVimPlugin { pname = "telescope-lsp-handlers.nvim"; version = "2023-03-04"; src = fetchFromGitHub { @@ -9773,7 +9773,7 @@ final: prev: meta.homepage = "https://github.com/MrcJkb/telescope-manix/"; }; - telescope-media-files-nvim = buildVimPluginFrom2Nix { + telescope-media-files-nvim = buildVimPlugin { pname = "telescope-media-files.nvim"; version = "2023-02-19"; src = fetchFromGitHub { @@ -9785,7 +9785,7 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope-media-files.nvim/"; }; - telescope-project-nvim = buildVimPluginFrom2Nix { + telescope-project-nvim = buildVimPlugin { pname = "telescope-project.nvim"; version = "2023-04-27"; src = fetchFromGitHub { @@ -9797,7 +9797,7 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope-project.nvim/"; }; - telescope-sg = buildVimPluginFrom2Nix { + telescope-sg = buildVimPlugin { pname = "telescope-sg"; version = "2023-08-09"; src = fetchFromGitHub { @@ -9809,7 +9809,7 @@ final: prev: meta.homepage = "https://github.com/Marskey/telescope-sg/"; }; - telescope-symbols-nvim = buildVimPluginFrom2Nix { + telescope-symbols-nvim = buildVimPlugin { pname = "telescope-symbols.nvim"; version = "2023-02-19"; src = fetchFromGitHub { @@ -9821,7 +9821,7 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope-symbols.nvim/"; }; - telescope-ui-select-nvim = buildVimPluginFrom2Nix { + telescope-ui-select-nvim = buildVimPlugin { pname = "telescope-ui-select.nvim"; version = "2022-04-30"; src = fetchFromGitHub { @@ -9833,7 +9833,7 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope-ui-select.nvim/"; }; - telescope-ultisnips-nvim = buildVimPluginFrom2Nix { + telescope-ultisnips-nvim = buildVimPlugin { pname = "telescope-ultisnips.nvim"; version = "2021-09-26"; src = fetchFromGitHub { @@ -9845,7 +9845,7 @@ final: prev: meta.homepage = "https://github.com/fhill2/telescope-ultisnips.nvim/"; }; - telescope-undo-nvim = buildVimPluginFrom2Nix { + telescope-undo-nvim = buildVimPlugin { pname = "telescope-undo.nvim"; version = "2023-06-03"; src = fetchFromGitHub { @@ -9857,7 +9857,7 @@ final: prev: meta.homepage = "https://github.com/debugloop/telescope-undo.nvim/"; }; - telescope-vim-bookmarks-nvim = buildVimPluginFrom2Nix { + telescope-vim-bookmarks-nvim = buildVimPlugin { pname = "telescope-vim-bookmarks.nvim"; version = "2022-07-17"; src = fetchFromGitHub { @@ -9869,7 +9869,7 @@ final: prev: meta.homepage = "https://github.com/tom-anders/telescope-vim-bookmarks.nvim/"; }; - telescope-z-nvim = buildVimPluginFrom2Nix { + telescope-z-nvim = buildVimPlugin { pname = "telescope-z.nvim"; version = "2023-08-17"; src = fetchFromGitHub { @@ -9881,7 +9881,7 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope-z.nvim/"; }; - telescope-zf-native-nvim = buildVimPluginFrom2Nix { + telescope-zf-native-nvim = buildVimPlugin { pname = "telescope-zf-native.nvim"; version = "2023-03-15"; src = fetchFromGitHub { @@ -9894,7 +9894,7 @@ final: prev: meta.homepage = "https://github.com/natecraddock/telescope-zf-native.nvim/"; }; - telescope-zoxide = buildVimPluginFrom2Nix { + telescope-zoxide = buildVimPlugin { pname = "telescope-zoxide"; version = "2023-02-08"; src = fetchFromGitHub { @@ -9908,29 +9908,29 @@ final: prev: telescope-nvim = buildNeovimPlugin { pname = "telescope.nvim"; - version = "2023-09-16"; + version = "2023-09-29"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "b543aaa2c9cf8123ed2fe7dbb6c211a9cd415124"; - sha256 = "0k0jymfkp9n65pb5iak7kf89pl41zr7iwg19ww31j3b814am4pjd"; + rev = "ffe90fac32122f401429b14d383137bd92a685d0"; + sha256 = "1wf2kq3pv98fzy12hv19jg80r9phr96j2x5qvzbqfagglc1zb3jf"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; - telescope_hoogle = buildVimPluginFrom2Nix { + telescope_hoogle = buildVimPlugin { pname = "telescope_hoogle"; - version = "2022-10-27"; + version = "2023-09-20"; src = fetchFromGitHub { owner = "luc-tielen"; repo = "telescope_hoogle"; - rev = "6322f74655a2773974377a8fc8d170c00f24938f"; - sha256 = "1pjq5bwnrxb3qhvvqd9v996hqfkbg5ah7qmbzrq1287h13m5jy2n"; + rev = "5c2ae51bcf905a7101134a597e6f7be2dc05f975"; + sha256 = "0nmzpyh9sdbvxf0hzvga748i4wnd0l6jmlwp8bmx84zazp93c667"; }; meta.homepage = "https://github.com/luc-tielen/telescope_hoogle/"; }; - template-string-nvim = buildVimPluginFrom2Nix { + template-string-nvim = buildVimPlugin { pname = "template-string.nvim"; version = "2023-09-11"; src = fetchFromGitHub { @@ -9942,7 +9942,7 @@ final: prev: meta.homepage = "https://github.com/axelvc/template-string.nvim/"; }; - tender-vim = buildVimPluginFrom2Nix { + tender-vim = buildVimPlugin { pname = "tender.vim"; version = "2021-05-24"; src = fetchFromGitHub { @@ -9954,7 +9954,7 @@ final: prev: meta.homepage = "https://github.com/jacoborus/tender.vim/"; }; - term-edit-nvim = buildVimPluginFrom2Nix { + term-edit-nvim = buildVimPlugin { pname = "term-edit.nvim"; version = "2023-07-30"; src = fetchFromGitHub { @@ -9966,7 +9966,7 @@ final: prev: meta.homepage = "https://github.com/chomosuke/term-edit.nvim/"; }; - terminus = buildVimPluginFrom2Nix { + terminus = buildVimPlugin { pname = "terminus"; version = "2021-12-28"; src = fetchFromGitHub { @@ -9978,7 +9978,7 @@ final: prev: meta.homepage = "https://github.com/wincent/terminus/"; }; - termwrapper-nvim = buildVimPluginFrom2Nix { + termwrapper-nvim = buildVimPlugin { pname = "termwrapper.nvim"; version = "2021-03-28"; src = fetchFromGitHub { @@ -9990,7 +9990,7 @@ final: prev: meta.homepage = "https://github.com/oberblastmeister/termwrapper.nvim/"; }; - tern_for_vim = buildVimPluginFrom2Nix { + tern_for_vim = buildVimPlugin { pname = "tern_for_vim"; version = "2019-01-23"; src = fetchFromGitHub { @@ -10002,7 +10002,7 @@ final: prev: meta.homepage = "https://github.com/ternjs/tern_for_vim/"; }; - tex-conceal-vim = buildVimPluginFrom2Nix { + tex-conceal-vim = buildVimPlugin { pname = "tex-conceal.vim"; version = "2022-01-15"; src = fetchFromGitHub { @@ -10014,7 +10014,7 @@ final: prev: meta.homepage = "https://github.com/KeitaNakamura/tex-conceal.vim/"; }; - text-case-nvim = buildVimPluginFrom2Nix { + text-case-nvim = buildVimPlugin { pname = "text-case.nvim"; version = "2023-09-03"; src = fetchFromGitHub { @@ -10026,7 +10026,7 @@ final: prev: meta.homepage = "https://github.com/johmsalas/text-case.nvim/"; }; - thesaurus_query-vim = buildVimPluginFrom2Nix { + thesaurus_query-vim = buildVimPlugin { pname = "thesaurus_query.vim"; version = "2022-12-11"; src = fetchFromGitHub { @@ -10038,7 +10038,7 @@ final: prev: meta.homepage = "https://github.com/ron89/thesaurus_query.vim/"; }; - thumbnail-vim = buildVimPluginFrom2Nix { + thumbnail-vim = buildVimPlugin { pname = "thumbnail.vim"; version = "2022-03-21"; src = fetchFromGitHub { @@ -10050,7 +10050,7 @@ final: prev: meta.homepage = "https://github.com/itchyny/thumbnail.vim/"; }; - timestamp-vim = buildVimPluginFrom2Nix { + timestamp-vim = buildVimPlugin { pname = "timestamp.vim"; version = "2010-11-06"; src = fetchFromGitHub { @@ -10062,7 +10062,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/timestamp.vim/"; }; - tint-nvim = buildVimPluginFrom2Nix { + tint-nvim = buildVimPlugin { pname = "tint.nvim"; version = "2023-08-28"; src = fetchFromGitHub { @@ -10074,7 +10074,7 @@ final: prev: meta.homepage = "https://github.com/levouh/tint.nvim/"; }; - tlib_vim = buildVimPluginFrom2Nix { + tlib_vim = buildVimPlugin { pname = "tlib_vim"; version = "2022-07-22"; src = fetchFromGitHub { @@ -10086,7 +10086,7 @@ final: prev: meta.homepage = "https://github.com/tomtom/tlib_vim/"; }; - tmux-complete-vim = buildVimPluginFrom2Nix { + tmux-complete-vim = buildVimPlugin { pname = "tmux-complete.vim"; version = "2021-03-26"; src = fetchFromGitHub { @@ -10098,7 +10098,7 @@ final: prev: meta.homepage = "https://github.com/wellle/tmux-complete.vim/"; }; - tmux-nvim = buildVimPluginFrom2Nix { + tmux-nvim = buildVimPlugin { pname = "tmux.nvim"; version = "2023-09-06"; src = fetchFromGitHub { @@ -10110,7 +10110,7 @@ final: prev: meta.homepage = "https://github.com/aserowy/tmux.nvim/"; }; - tmuxline-vim = buildVimPluginFrom2Nix { + tmuxline-vim = buildVimPlugin { pname = "tmuxline.vim"; version = "2021-07-20"; src = fetchFromGitHub { @@ -10122,7 +10122,7 @@ final: prev: meta.homepage = "https://github.com/edkolev/tmuxline.vim/"; }; - todo-comments-nvim = buildVimPluginFrom2Nix { + todo-comments-nvim = buildVimPlugin { pname = "todo-comments.nvim"; version = "2023-07-28"; src = fetchFromGitHub { @@ -10134,7 +10134,7 @@ final: prev: meta.homepage = "https://github.com/folke/todo-comments.nvim/"; }; - todo-txt-vim = buildVimPluginFrom2Nix { + todo-txt-vim = buildVimPlugin { pname = "todo.txt-vim"; version = "2021-03-20"; src = fetchFromGitHub { @@ -10147,31 +10147,31 @@ final: prev: meta.homepage = "https://github.com/freitass/todo.txt-vim/"; }; - toggleterm-nvim = buildVimPluginFrom2Nix { + toggleterm-nvim = buildVimPlugin { pname = "toggleterm.nvim"; - version = "2023-09-11"; + version = "2023-09-25"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "0427b908ebefcb3701c7f2cfbdafa37d11afe71a"; - sha256 = "1wxrwl530kxm8k8ymgk3w77av770ndr1hhzfk315jgl2p5hqmqm0"; + rev = "61e8ad370d4da5d84c77e31671027bc094ac06ca"; + sha256 = "0cwqlaqvbnw4ncm717v052mzb943jcynrfpx38c8aspzjqybdcpj"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; - tokyonight-nvim = buildVimPluginFrom2Nix { + tokyonight-nvim = buildVimPlugin { pname = "tokyonight.nvim"; - version = "2023-08-29"; + version = "2023-09-28"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "9a01eada39558dc3243278e6805d90e8dff45dc0"; - sha256 = "1rd7d16gqy9g2dixnsk186lqc17a4d1h5c2409s0xi7wzj7czw68"; + rev = "e89caa3ad6d8da9d0dd981ec74a82c55adc61ffd"; + sha256 = "11r0vd7yzmlim6r48nby0zm508fxfcmhcm7fz7alhwb480h7s22a"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; - traces-vim = buildVimPluginFrom2Nix { + traces-vim = buildVimPlugin { pname = "traces.vim"; version = "2022-04-11"; src = fetchFromGitHub { @@ -10183,7 +10183,7 @@ final: prev: meta.homepage = "https://github.com/markonm/traces.vim/"; }; - train-nvim = buildVimPluginFrom2Nix { + train-nvim = buildVimPlugin { pname = "train.nvim"; version = "2023-07-31"; src = fetchFromGitHub { @@ -10195,19 +10195,19 @@ final: prev: meta.homepage = "https://github.com/tjdevries/train.nvim/"; }; - treesj = buildVimPluginFrom2Nix { + treesj = buildVimPlugin { pname = "treesj"; - version = "2023-08-25"; + version = "2023-09-28"; src = fetchFromGitHub { owner = "Wansmer"; repo = "treesj"; - rev = "bff8c32b826e188fa558e94c7c93ac17a8ef0365"; - sha256 = "0m30d7d9bgs7ni2npgzd7h83l47a9phi4qs3g1za4znqsjj2wmbd"; + rev = "81d0ae51b84143e228d27b6cf79d09012d2021cb"; + sha256 = "0pk3zvz982gfdfwz4a1c8zr9ilqsip42l8bfc0vmnd7gc1r096w8"; }; meta.homepage = "https://github.com/Wansmer/treesj/"; }; - tremor-vim = buildVimPluginFrom2Nix { + tremor-vim = buildVimPlugin { pname = "tremor-vim"; version = "2021-09-07"; src = fetchFromGitHub { @@ -10219,7 +10219,7 @@ final: prev: meta.homepage = "https://github.com/tremor-rs/tremor-vim/"; }; - trim-nvim = buildVimPluginFrom2Nix { + trim-nvim = buildVimPlugin { pname = "trim.nvim"; version = "2023-03-22"; src = fetchFromGitHub { @@ -10231,7 +10231,7 @@ final: prev: meta.homepage = "https://github.com/cappyzawa/trim.nvim/"; }; - trouble-nvim = buildVimPluginFrom2Nix { + trouble-nvim = buildVimPlugin { pname = "trouble.nvim"; version = "2023-08-30"; src = fetchFromGitHub { @@ -10243,7 +10243,7 @@ final: prev: meta.homepage = "https://github.com/folke/trouble.nvim/"; }; - true-zen-nvim = buildVimPluginFrom2Nix { + true-zen-nvim = buildVimPlugin { pname = "true-zen.nvim"; version = "2023-06-09"; src = fetchFromGitHub { @@ -10255,7 +10255,7 @@ final: prev: meta.homepage = "https://github.com/Pocco81/true-zen.nvim/"; }; - tslime-vim = buildVimPluginFrom2Nix { + tslime-vim = buildVimPlugin { pname = "tslime.vim"; version = "2020-09-09"; src = fetchFromGitHub { @@ -10267,7 +10267,7 @@ final: prev: meta.homepage = "https://github.com/jgdavey/tslime.vim/"; }; - tsuquyomi = buildVimPluginFrom2Nix { + tsuquyomi = buildVimPlugin { pname = "tsuquyomi"; version = "2022-04-12"; src = fetchFromGitHub { @@ -10279,19 +10279,19 @@ final: prev: meta.homepage = "https://github.com/Quramy/tsuquyomi/"; }; - twilight-nvim = buildVimPluginFrom2Nix { + twilight-nvim = buildVimPlugin { pname = "twilight.nvim"; - version = "2023-05-22"; + version = "2023-09-25"; src = fetchFromGitHub { owner = "folke"; repo = "twilight.nvim"; - rev = "a4843e6e67092a1e6fa9666f02bf0ab59174c1df"; - sha256 = "1d9c77kq55nyl5jlma4m1qg69hldm6zm75d0sjzc3ifq6f82ai0g"; + rev = "8b7b50c0cb2dc781b2f4262a5ddd57571556d1e4"; + sha256 = "0j3vvj1hdsxj36pi4fnfcnj34hk26igicnvzk6xch4rwjlakqlaq"; }; meta.homepage = "https://github.com/folke/twilight.nvim/"; }; - typescript-vim = buildVimPluginFrom2Nix { + typescript-vim = buildVimPlugin { pname = "typescript-vim"; version = "2023-05-11"; src = fetchFromGitHub { @@ -10303,7 +10303,7 @@ final: prev: meta.homepage = "https://github.com/leafgarland/typescript-vim/"; }; - typescript-nvim = buildVimPluginFrom2Nix { + typescript-nvim = buildVimPlugin { pname = "typescript.nvim"; version = "2023-08-12"; src = fetchFromGitHub { @@ -10315,31 +10315,31 @@ final: prev: meta.homepage = "https://github.com/jose-elias-alvarez/typescript.nvim/"; }; - typst-vim = buildVimPluginFrom2Nix { + typst-vim = buildVimPlugin { pname = "typst.vim"; - version = "2023-09-11"; + version = "2023-09-19"; src = fetchFromGitHub { owner = "kaarmu"; repo = "typst.vim"; - rev = "1e672863c52184264dec59d234030a4898bb67cb"; - sha256 = "18ksiv66rjfw8hmysl8m7zkhd69w3dj7aqlfq6ph6vy0cqh6c4sf"; + rev = "65f9e78c11829a643d1539f3481c0ff875c83603"; + sha256 = "1q5v37l4awz5pm8cqvbvvwjizf45m7nqnxqv0inxzr70g9gqp7qv"; }; meta.homepage = "https://github.com/kaarmu/typst.vim/"; }; - ultisnips = buildVimPluginFrom2Nix { + ultisnips = buildVimPlugin { pname = "ultisnips"; - version = "2023-08-05"; + version = "2023-09-25"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "24a3ebb36687b6d59a19d63173713575b486d739"; - sha256 = "0v6iq1mcnj1a6p2fks544wwhkgm0h8xnwr7ms427b1abvmj0sikz"; + rev = "f6d1501b630cb783b0af8507c5588328f826d40f"; + sha256 = "0h0rcqrfk4r48phlsb8nhvxb89vm9820lhbmkqvk1bqkjblsv279"; }; meta.homepage = "https://github.com/SirVer/ultisnips/"; }; - undotree = buildVimPluginFrom2Nix { + undotree = buildVimPlugin { pname = "undotree"; version = "2023-07-07"; src = fetchFromGitHub { @@ -10351,31 +10351,31 @@ final: prev: meta.homepage = "https://github.com/mbbill/undotree/"; }; - unicode-vim = buildVimPluginFrom2Nix { + unicode-vim = buildVimPlugin { pname = "unicode.vim"; - version = "2023-03-19"; + version = "2023-09-20"; src = fetchFromGitHub { owner = "chrisbra"; repo = "unicode.vim"; - rev = "c8aa12b1e2e1b6254885b12bdb239ce6c885fdb1"; - sha256 = "1mvsb0l9wi903rfazskgn0yzylcb1xkdaqvlcbj1w5yay372x4i9"; + rev = "bc20d0fb3331a7b41708388c56bb8221c2104da7"; + sha256 = "1nrx791gj66sky9bb039n7hwkvcic7wr1nrrb1vrx1sgqmwfpy6f"; }; meta.homepage = "https://github.com/chrisbra/unicode.vim/"; }; - unison = buildVimPluginFrom2Nix { + unison = buildVimPlugin { pname = "unison"; - version = "2023-09-14"; + version = "2023-09-29"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "bb06e1cce822f807c0e2db04c13c8cd5dad0803d"; - sha256 = "11qichfhqadp0xhral514szaq5bcc6ymf3cph0xy92sgk0a9rn27"; + rev = "5fa80db737fa357d9f9f14a36cdc10cbb1cb7651"; + sha256 = "1001rbbwhfbb26ji36kpkc3ji1gsgf3xmlr990bxv8wh33qib2rf"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; - unite-vim = buildVimPluginFrom2Nix { + unite-vim = buildVimPlugin { pname = "unite.vim"; version = "2023-05-18"; src = fetchFromGitHub { @@ -10387,19 +10387,19 @@ final: prev: meta.homepage = "https://github.com/Shougo/unite.vim/"; }; - urlview-nvim = buildVimPluginFrom2Nix { + urlview-nvim = buildVimPlugin { pname = "urlview.nvim"; - version = "2023-05-23"; + version = "2023-09-19"; src = fetchFromGitHub { owner = "axieax"; repo = "urlview.nvim"; - rev = "b183133fd25caa6dd98b415e0f62e51e061cd522"; - sha256 = "0ychlw7lnnpmjflb5f5xyspv63kyrdzbxx88aw9ifaqiiyz3i4aq"; + rev = "bdbdf1e020e283551f003e71b0004096c746ef57"; + sha256 = "1bf226s400vyjffr6zqx9kr52qznzcgx1jnh356vfx3fjxsq81nl"; }; meta.homepage = "https://github.com/axieax/urlview.nvim/"; }; - utl-vim = buildVimPluginFrom2Nix { + utl-vim = buildVimPlugin { pname = "utl.vim"; version = "2010-10-18"; src = fetchFromGitHub { @@ -10411,7 +10411,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/utl.vim/"; }; - vCoolor-vim = buildVimPluginFrom2Nix { + vCoolor-vim = buildVimPlugin { pname = "vCoolor.vim"; version = "2020-10-14"; src = fetchFromGitHub { @@ -10423,7 +10423,7 @@ final: prev: meta.homepage = "https://github.com/KabbAmine/vCoolor.vim/"; }; - vader-vim = buildVimPluginFrom2Nix { + vader-vim = buildVimPlugin { pname = "vader.vim"; version = "2020-02-13"; src = fetchFromGitHub { @@ -10435,7 +10435,7 @@ final: prev: meta.homepage = "https://github.com/junegunn/vader.vim/"; }; - venn-nvim = buildVimPluginFrom2Nix { + venn-nvim = buildVimPlugin { pname = "venn.nvim"; version = "2022-11-22"; src = fetchFromGitHub { @@ -10447,7 +10447,7 @@ final: prev: meta.homepage = "https://github.com/jbyuki/venn.nvim/"; }; - verilog_systemverilog-vim = buildVimPluginFrom2Nix { + verilog_systemverilog-vim = buildVimPlugin { pname = "verilog_systemverilog.vim"; version = "2023-08-11"; src = fetchFromGitHub { @@ -10459,7 +10459,7 @@ final: prev: meta.homepage = "https://github.com/vhda/verilog_systemverilog.vim/"; }; - vifm-vim = buildVimPluginFrom2Nix { + vifm-vim = buildVimPlugin { pname = "vifm.vim"; version = "2023-08-24"; src = fetchFromGitHub { @@ -10471,7 +10471,7 @@ final: prev: meta.homepage = "https://github.com/vifm/vifm.vim/"; }; - vim-CtrlXA = buildVimPluginFrom2Nix { + vim-CtrlXA = buildVimPlugin { pname = "vim-CtrlXA"; version = "2023-05-17"; src = fetchFromGitHub { @@ -10483,7 +10483,7 @@ final: prev: meta.homepage = "https://github.com/Konfekt/vim-CtrlXA/"; }; - vim-DetectSpellLang = buildVimPluginFrom2Nix { + vim-DetectSpellLang = buildVimPlugin { pname = "vim-DetectSpellLang"; version = "2022-03-15"; src = fetchFromGitHub { @@ -10495,7 +10495,7 @@ final: prev: meta.homepage = "https://github.com/konfekt/vim-DetectSpellLang/"; }; - vim-LanguageTool = buildVimPluginFrom2Nix { + vim-LanguageTool = buildVimPlugin { pname = "vim-LanguageTool"; version = "2021-02-08"; src = fetchFromGitHub { @@ -10507,7 +10507,7 @@ final: prev: meta.homepage = "https://github.com/dpelle/vim-LanguageTool/"; }; - vim-ReplaceWithRegister = buildVimPluginFrom2Nix { + vim-ReplaceWithRegister = buildVimPlugin { pname = "vim-ReplaceWithRegister"; version = "2021-07-05"; src = fetchFromGitHub { @@ -10519,7 +10519,7 @@ final: prev: meta.homepage = "https://github.com/inkarkat/vim-ReplaceWithRegister/"; }; - vim-ReplaceWithSameIndentRegister = buildVimPluginFrom2Nix { + vim-ReplaceWithSameIndentRegister = buildVimPlugin { pname = "vim-ReplaceWithSameIndentRegister"; version = "2020-06-17"; src = fetchFromGitHub { @@ -10531,7 +10531,7 @@ final: prev: meta.homepage = "https://github.com/inkarkat/vim-ReplaceWithSameIndentRegister/"; }; - vim-SyntaxRange = buildVimPluginFrom2Nix { + vim-SyntaxRange = buildVimPlugin { pname = "vim-SyntaxRange"; version = "2021-01-16"; src = fetchFromGitHub { @@ -10543,19 +10543,19 @@ final: prev: meta.homepage = "https://github.com/inkarkat/vim-SyntaxRange/"; }; - vim-abolish = buildVimPluginFrom2Nix { + vim-abolish = buildVimPlugin { pname = "vim-abolish"; - version = "2023-04-10"; + version = "2023-09-29"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-abolish"; - rev = "cb3dcb220262777082f63972298d57ef9e9455ec"; - sha256 = "0xriiima13cv84jlv37qd6ab4l6fjapqd8a8xsr5c87k0kkyyg13"; + rev = "dcbfe065297d31823561ba787f51056c147aa682"; + sha256 = "1yvpk0cnsx1b1q2wp52fv4mj71w8ssz4dcbbdix65m8qna6d0m9h"; }; meta.homepage = "https://github.com/tpope/vim-abolish/"; }; - vim-addon-actions = buildVimPluginFrom2Nix { + vim-addon-actions = buildVimPlugin { pname = "vim-addon-actions"; version = "2023-02-15"; src = fetchFromGitHub { @@ -10567,7 +10567,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-actions/"; }; - vim-addon-async = buildVimPluginFrom2Nix { + vim-addon-async = buildVimPlugin { pname = "vim-addon-async"; version = "2017-03-20"; src = fetchFromGitHub { @@ -10579,7 +10579,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-async/"; }; - vim-addon-background-cmd = buildVimPluginFrom2Nix { + vim-addon-background-cmd = buildVimPlugin { pname = "vim-addon-background-cmd"; version = "2015-12-11"; src = fetchFromGitHub { @@ -10591,7 +10591,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-background-cmd/"; }; - vim-addon-commenting = buildVimPluginFrom2Nix { + vim-addon-commenting = buildVimPlugin { pname = "vim-addon-commenting"; version = "2013-06-10"; src = fetchFromGitHub { @@ -10603,7 +10603,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-commenting/"; }; - vim-addon-completion = buildVimPluginFrom2Nix { + vim-addon-completion = buildVimPlugin { pname = "vim-addon-completion"; version = "2015-02-10"; src = fetchFromGitHub { @@ -10615,7 +10615,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-completion/"; }; - vim-addon-errorformats = buildVimPluginFrom2Nix { + vim-addon-errorformats = buildVimPlugin { pname = "vim-addon-errorformats"; version = "2022-08-28"; src = fetchFromGitHub { @@ -10627,7 +10627,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-errorformats/"; }; - vim-addon-goto-thing-at-cursor = buildVimPluginFrom2Nix { + vim-addon-goto-thing-at-cursor = buildVimPlugin { pname = "vim-addon-goto-thing-at-cursor"; version = "2020-02-07"; src = fetchFromGitHub { @@ -10639,7 +10639,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-goto-thing-at-cursor/"; }; - vim-addon-local-vimrc = buildVimPluginFrom2Nix { + vim-addon-local-vimrc = buildVimPlugin { pname = "vim-addon-local-vimrc"; version = "2023-02-28"; src = fetchFromGitHub { @@ -10651,7 +10651,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-local-vimrc/"; }; - vim-addon-manager = buildVimPluginFrom2Nix { + vim-addon-manager = buildVimPlugin { pname = "vim-addon-manager"; version = "2023-02-13"; src = fetchFromGitHub { @@ -10663,7 +10663,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-manager/"; }; - vim-addon-mru = buildVimPluginFrom2Nix { + vim-addon-mru = buildVimPlugin { pname = "vim-addon-mru"; version = "2013-08-08"; src = fetchFromGitHub { @@ -10675,7 +10675,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-mru/"; }; - vim-addon-mw-utils = buildVimPluginFrom2Nix { + vim-addon-mw-utils = buildVimPlugin { pname = "vim-addon-mw-utils"; version = "2020-02-07"; src = fetchFromGitHub { @@ -10687,7 +10687,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-mw-utils/"; }; - vim-addon-nix = buildVimPluginFrom2Nix { + vim-addon-nix = buildVimPlugin { pname = "vim-addon-nix"; version = "2017-09-11"; src = fetchFromGitHub { @@ -10699,7 +10699,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-nix/"; }; - vim-addon-other = buildVimPluginFrom2Nix { + vim-addon-other = buildVimPlugin { pname = "vim-addon-other"; version = "2021-10-06"; src = fetchFromGitHub { @@ -10711,7 +10711,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-other/"; }; - vim-addon-php-manual = buildVimPluginFrom2Nix { + vim-addon-php-manual = buildVimPlugin { pname = "vim-addon-php-manual"; version = "2015-01-01"; src = fetchFromGitHub { @@ -10723,7 +10723,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-php-manual/"; }; - vim-addon-signs = buildVimPluginFrom2Nix { + vim-addon-signs = buildVimPlugin { pname = "vim-addon-signs"; version = "2013-04-19"; src = fetchFromGitHub { @@ -10735,7 +10735,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-signs/"; }; - vim-addon-sql = buildVimPluginFrom2Nix { + vim-addon-sql = buildVimPlugin { pname = "vim-addon-sql"; version = "2017-02-11"; src = fetchFromGitHub { @@ -10747,7 +10747,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-sql/"; }; - vim-addon-syntax-checker = buildVimPluginFrom2Nix { + vim-addon-syntax-checker = buildVimPlugin { pname = "vim-addon-syntax-checker"; version = "2017-06-26"; src = fetchFromGitHub { @@ -10759,7 +10759,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-syntax-checker/"; }; - vim-addon-toggle-buffer = buildVimPluginFrom2Nix { + vim-addon-toggle-buffer = buildVimPlugin { pname = "vim-addon-toggle-buffer"; version = "2012-01-13"; src = fetchFromGitHub { @@ -10771,7 +10771,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-toggle-buffer/"; }; - vim-addon-xdebug = buildVimPluginFrom2Nix { + vim-addon-xdebug = buildVimPlugin { pname = "vim-addon-xdebug"; version = "2014-08-29"; src = fetchFromGitHub { @@ -10783,7 +10783,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-xdebug/"; }; - vim-after-object = buildVimPluginFrom2Nix { + vim-after-object = buildVimPlugin { pname = "vim-after-object"; version = "2018-09-17"; src = fetchFromGitHub { @@ -10795,7 +10795,7 @@ final: prev: meta.homepage = "https://github.com/junegunn/vim-after-object/"; }; - vim-agda = buildVimPluginFrom2Nix { + vim-agda = buildVimPlugin { pname = "vim-agda"; version = "2022-03-01"; src = fetchFromGitHub { @@ -10807,7 +10807,7 @@ final: prev: meta.homepage = "https://github.com/msuperdock/vim-agda/"; }; - vim-airline = buildVimPluginFrom2Nix { + vim-airline = buildVimPlugin { pname = "vim-airline"; version = "2023-07-19"; src = fetchFromGitHub { @@ -10819,7 +10819,7 @@ final: prev: meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; - vim-airline-clock = buildVimPluginFrom2Nix { + vim-airline-clock = buildVimPlugin { pname = "vim-airline-clock"; version = "2021-04-14"; src = fetchFromGitHub { @@ -10831,7 +10831,7 @@ final: prev: meta.homepage = "https://github.com/enricobacis/vim-airline-clock/"; }; - vim-airline-themes = buildVimPluginFrom2Nix { + vim-airline-themes = buildVimPlugin { pname = "vim-airline-themes"; version = "2022-11-08"; src = fetchFromGitHub { @@ -10843,7 +10843,7 @@ final: prev: meta.homepage = "https://github.com/vim-airline/vim-airline-themes/"; }; - vim-alias = buildVimPluginFrom2Nix { + vim-alias = buildVimPlugin { pname = "vim-alias"; version = "2021-05-25"; src = fetchFromGitHub { @@ -10855,19 +10855,19 @@ final: prev: meta.homepage = "https://github.com/Konfekt/vim-alias/"; }; - vim-android = buildVimPluginFrom2Nix { + vim-android = buildVimPlugin { pname = "vim-android"; - version = "2023-08-24"; + version = "2023-09-30"; src = fetchFromGitHub { owner = "hsanson"; repo = "vim-android"; - rev = "31c593b8025f62f184418dd658c3a358a8d0ef70"; - sha256 = "14l7v8jg4kq8qh9j64nxir4a7d9ls0zp6zk3rjzbzf9viqyw1bp5"; + rev = "26990f9fa27b23ca5faf83e14d56711c0fec40ea"; + sha256 = "1iy9ap2i9lmqcjaqb38syb240m834ifacv79cjiwzxcpr23vq4r1"; }; meta.homepage = "https://github.com/hsanson/vim-android/"; }; - vim-anzu = buildVimPluginFrom2Nix { + vim-anzu = buildVimPlugin { pname = "vim-anzu"; version = "2022-12-18"; src = fetchFromGitHub { @@ -10879,7 +10879,7 @@ final: prev: meta.homepage = "https://github.com/osyo-manga/vim-anzu/"; }; - vim-apm = buildVimPluginFrom2Nix { + vim-apm = buildVimPlugin { pname = "vim-apm"; version = "2020-09-28"; src = fetchFromGitHub { @@ -10891,7 +10891,7 @@ final: prev: meta.homepage = "https://github.com/ThePrimeagen/vim-apm/"; }; - vim-argumentative = buildVimPluginFrom2Nix { + vim-argumentative = buildVimPlugin { pname = "vim-argumentative"; version = "2014-11-24"; src = fetchFromGitHub { @@ -10903,19 +10903,19 @@ final: prev: meta.homepage = "https://github.com/PeterRincker/vim-argumentative/"; }; - vim-argwrap = buildVimPluginFrom2Nix { + vim-argwrap = buildVimPlugin { pname = "vim-argwrap"; - version = "2022-07-14"; + version = "2023-09-23"; src = fetchFromGitHub { owner = "FooSoft"; repo = "vim-argwrap"; - rev = "feaba6b8b6ca099d267c81ee2c4ba43ce6de8499"; - sha256 = "08hjsxwm0fxgc54awzr7fmq1mrddq3rah40wnj44l4lsd73f5lba"; + rev = "b532cb6805864da4cfcfe0bb6a1ced61e291be02"; + sha256 = "1z51vrh49260aydz135mmq3k8912k8svbg6l4n83ghfjjzdlp5q0"; }; meta.homepage = "https://github.com/FooSoft/vim-argwrap/"; }; - vim-asterisk = buildVimPluginFrom2Nix { + vim-asterisk = buildVimPlugin { pname = "vim-asterisk"; version = "2020-02-03"; src = fetchFromGitHub { @@ -10927,7 +10927,7 @@ final: prev: meta.homepage = "https://github.com/haya14busa/vim-asterisk/"; }; - vim-astro = buildVimPluginFrom2Nix { + vim-astro = buildVimPlugin { pname = "vim-astro"; version = "2022-08-25"; src = fetchFromGitHub { @@ -10939,7 +10939,7 @@ final: prev: meta.homepage = "https://github.com/wuelnerdotexe/vim-astro/"; }; - vim-asymptote = buildVimPluginFrom2Nix { + vim-asymptote = buildVimPlugin { pname = "vim-asymptote"; version = "2014-06-26"; src = fetchFromGitHub { @@ -10951,7 +10951,7 @@ final: prev: meta.homepage = "https://github.com/hura/vim-asymptote/"; }; - vim-auto-save = buildVimPluginFrom2Nix { + vim-auto-save = buildVimPlugin { pname = "vim-auto-save"; version = "2022-08-08"; src = fetchFromGitHub { @@ -10963,7 +10963,7 @@ final: prev: meta.homepage = "https://github.com/907th/vim-auto-save/"; }; - vim-autoformat = buildVimPluginFrom2Nix { + vim-autoformat = buildVimPlugin { pname = "vim-autoformat"; version = "2023-08-26"; src = fetchFromGitHub { @@ -10975,7 +10975,7 @@ final: prev: meta.homepage = "https://github.com/vim-autoformat/vim-autoformat/"; }; - vim-automkdir = buildVimPluginFrom2Nix { + vim-automkdir = buildVimPlugin { pname = "vim-automkdir"; version = "2016-01-17"; src = fetchFromGitHub { @@ -10987,7 +10987,7 @@ final: prev: meta.homepage = "https://github.com/benizi/vim-automkdir/"; }; - vim-autosource = buildVimPluginFrom2Nix { + vim-autosource = buildVimPlugin { pname = "vim-autosource"; version = "2021-12-22"; src = fetchFromGitHub { @@ -10999,7 +10999,7 @@ final: prev: meta.homepage = "https://github.com/jenterkin/vim-autosource/"; }; - vim-autoswap = buildVimPluginFrom2Nix { + vim-autoswap = buildVimPlugin { pname = "vim-autoswap"; version = "2019-01-09"; src = fetchFromGitHub { @@ -11011,7 +11011,7 @@ final: prev: meta.homepage = "https://github.com/gioele/vim-autoswap/"; }; - vim-bazel = buildVimPluginFrom2Nix { + vim-bazel = buildVimPlugin { pname = "vim-bazel"; version = "2022-04-09"; src = fetchFromGitHub { @@ -11023,7 +11023,7 @@ final: prev: meta.homepage = "https://github.com/bazelbuild/vim-bazel/"; }; - vim-bbye = buildVimPluginFrom2Nix { + vim-bbye = buildVimPlugin { pname = "vim-bbye"; version = "2018-03-03"; src = fetchFromGitHub { @@ -11035,7 +11035,7 @@ final: prev: meta.homepage = "https://github.com/moll/vim-bbye/"; }; - vim-be-good = buildVimPluginFrom2Nix { + vim-be-good = buildVimPlugin { pname = "vim-be-good"; version = "2022-11-08"; src = fetchFromGitHub { @@ -11047,7 +11047,7 @@ final: prev: meta.homepage = "https://github.com/ThePrimeagen/vim-be-good/"; }; - vim-beancount = buildVimPluginFrom2Nix { + vim-beancount = buildVimPlugin { pname = "vim-beancount"; version = "2023-01-02"; src = fetchFromGitHub { @@ -11059,7 +11059,7 @@ final: prev: meta.homepage = "https://github.com/nathangrigg/vim-beancount/"; }; - vim-bepoptimist = buildVimPluginFrom2Nix { + vim-bepoptimist = buildVimPlugin { pname = "vim-bepoptimist"; version = "2022-06-24"; src = fetchFromGitHub { @@ -11071,7 +11071,7 @@ final: prev: meta.homepage = "https://github.com/sheoak/vim-bepoptimist/"; }; - vim-better-whitespace = buildVimPluginFrom2Nix { + vim-better-whitespace = buildVimPlugin { pname = "vim-better-whitespace"; version = "2022-06-30"; src = fetchFromGitHub { @@ -11083,7 +11083,7 @@ final: prev: meta.homepage = "https://github.com/ntpeters/vim-better-whitespace/"; }; - vim-bookmarks = buildVimPluginFrom2Nix { + vim-bookmarks = buildVimPlugin { pname = "vim-bookmarks"; version = "2021-08-22"; src = fetchFromGitHub { @@ -11095,7 +11095,7 @@ final: prev: meta.homepage = "https://github.com/MattesGroeger/vim-bookmarks/"; }; - vim-boxdraw = buildVimPluginFrom2Nix { + vim-boxdraw = buildVimPlugin { pname = "vim-boxdraw"; version = "2021-01-28"; src = fetchFromGitHub { @@ -11107,7 +11107,7 @@ final: prev: meta.homepage = "https://github.com/gyim/vim-boxdraw/"; }; - vim-bracketed-paste = buildVimPluginFrom2Nix { + vim-bracketed-paste = buildVimPlugin { pname = "vim-bracketed-paste"; version = "2022-03-21"; src = fetchFromGitHub { @@ -11119,7 +11119,7 @@ final: prev: meta.homepage = "https://github.com/ConradIrwin/vim-bracketed-paste/"; }; - vim-bsv = buildVimPluginFrom2Nix { + vim-bsv = buildVimPlugin { pname = "vim-bsv"; version = "2020-11-08"; src = fetchFromGitHub { @@ -11131,7 +11131,7 @@ final: prev: meta.homepage = "https://github.com/mtikekar/vim-bsv/"; }; - vim-buffergator = buildVimPluginFrom2Nix { + vim-buffergator = buildVimPlugin { pname = "vim-buffergator"; version = "2021-11-28"; src = fetchFromGitHub { @@ -11143,7 +11143,7 @@ final: prev: meta.homepage = "https://github.com/jeetsukumaran/vim-buffergator/"; }; - vim-bufferline = buildVimPluginFrom2Nix { + vim-bufferline = buildVimPlugin { pname = "vim-bufferline"; version = "2016-02-09"; src = fetchFromGitHub { @@ -11155,7 +11155,7 @@ final: prev: meta.homepage = "https://github.com/bling/vim-bufferline/"; }; - vim-bufkill = buildVimPluginFrom2Nix { + vim-bufkill = buildVimPlugin { pname = "vim-bufkill"; version = "2022-04-19"; src = fetchFromGitHub { @@ -11167,7 +11167,7 @@ final: prev: meta.homepage = "https://github.com/qpkorr/vim-bufkill/"; }; - vim-caddyfile = buildVimPluginFrom2Nix { + vim-caddyfile = buildVimPlugin { pname = "vim-caddyfile"; version = "2022-05-09"; src = fetchFromGitHub { @@ -11179,7 +11179,7 @@ final: prev: meta.homepage = "https://github.com/isobit/vim-caddyfile/"; }; - vim-capslock = buildVimPluginFrom2Nix { + vim-capslock = buildVimPlugin { pname = "vim-capslock"; version = "2023-04-26"; src = fetchFromGitHub { @@ -11191,7 +11191,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-capslock/"; }; - vim-carbon-now-sh = buildVimPluginFrom2Nix { + vim-carbon-now-sh = buildVimPlugin { pname = "vim-carbon-now-sh"; version = "2022-08-11"; src = fetchFromGitHub { @@ -11203,7 +11203,7 @@ final: prev: meta.homepage = "https://github.com/kristijanhusak/vim-carbon-now-sh/"; }; - vim-ccls = buildVimPluginFrom2Nix { + vim-ccls = buildVimPlugin { pname = "vim-ccls"; version = "2022-04-23"; src = fetchFromGitHub { @@ -11215,7 +11215,7 @@ final: prev: meta.homepage = "https://github.com/m-pilia/vim-ccls/"; }; - vim-choosewin = buildVimPluginFrom2Nix { + vim-choosewin = buildVimPlugin { pname = "vim-choosewin"; version = "2021-04-22"; src = fetchFromGitHub { @@ -11227,7 +11227,7 @@ final: prev: meta.homepage = "https://github.com/t9md/vim-choosewin/"; }; - vim-clang-format = buildVimPluginFrom2Nix { + vim-clang-format = buildVimPlugin { pname = "vim-clang-format"; version = "2021-12-04"; src = fetchFromGitHub { @@ -11239,7 +11239,7 @@ final: prev: meta.homepage = "https://github.com/rhysd/vim-clang-format/"; }; - vim-clojure-highlight = buildVimPluginFrom2Nix { + vim-clojure-highlight = buildVimPlugin { pname = "vim-clojure-highlight"; version = "2015-07-05"; src = fetchFromGitHub { @@ -11251,7 +11251,7 @@ final: prev: meta.homepage = "https://github.com/guns/vim-clojure-highlight/"; }; - vim-clojure-static = buildVimPluginFrom2Nix { + vim-clojure-static = buildVimPlugin { pname = "vim-clojure-static"; version = "2017-10-23"; src = fetchFromGitHub { @@ -11263,7 +11263,7 @@ final: prev: meta.homepage = "https://github.com/guns/vim-clojure-static/"; }; - vim-closer = buildVimPluginFrom2Nix { + vim-closer = buildVimPlugin { pname = "vim-closer"; version = "2022-11-01"; src = fetchFromGitHub { @@ -11275,7 +11275,7 @@ final: prev: meta.homepage = "https://github.com/rstacruz/vim-closer/"; }; - vim-closetag = buildVimPluginFrom2Nix { + vim-closetag = buildVimPlugin { pname = "vim-closetag"; version = "2022-05-22"; src = fetchFromGitHub { @@ -11287,7 +11287,7 @@ final: prev: meta.homepage = "https://github.com/alvan/vim-closetag/"; }; - vim-cmake = buildVimPluginFrom2Nix { + vim-cmake = buildVimPlugin { pname = "vim-cmake"; version = "2021-06-25"; src = fetchFromGitHub { @@ -11299,7 +11299,7 @@ final: prev: meta.homepage = "https://github.com/vhdirk/vim-cmake/"; }; - vim-code-dark = buildVimPluginFrom2Nix { + vim-code-dark = buildVimPlugin { pname = "vim-code-dark"; version = "2023-07-18"; src = fetchFromGitHub { @@ -11311,7 +11311,7 @@ final: prev: meta.homepage = "https://github.com/tomasiser/vim-code-dark/"; }; - vim-codefmt = buildVimPluginFrom2Nix { + vim-codefmt = buildVimPlugin { pname = "vim-codefmt"; version = "2023-08-22"; src = fetchFromGitHub { @@ -11323,7 +11323,7 @@ final: prev: meta.homepage = "https://github.com/google/vim-codefmt/"; }; - vim-coffee-script = buildVimPluginFrom2Nix { + vim-coffee-script = buildVimPlugin { pname = "vim-coffee-script"; version = "2020-12-20"; src = fetchFromGitHub { @@ -11335,7 +11335,7 @@ final: prev: meta.homepage = "https://github.com/kchmck/vim-coffee-script/"; }; - vim-colemak = buildVimPluginFrom2Nix { + vim-colemak = buildVimPlugin { pname = "vim-colemak"; version = "2016-10-16"; src = fetchFromGitHub { @@ -11347,7 +11347,7 @@ final: prev: meta.homepage = "https://github.com/kalbasit/vim-colemak/"; }; - vim-colors-solarized = buildVimPluginFrom2Nix { + vim-colors-solarized = buildVimPlugin { pname = "vim-colors-solarized"; version = "2011-05-09"; src = fetchFromGitHub { @@ -11359,7 +11359,7 @@ final: prev: meta.homepage = "https://github.com/altercation/vim-colors-solarized/"; }; - vim-colorschemes = buildVimPluginFrom2Nix { + vim-colorschemes = buildVimPlugin { pname = "vim-colorschemes"; version = "2020-05-15"; src = fetchFromGitHub { @@ -11371,7 +11371,7 @@ final: prev: meta.homepage = "https://github.com/flazz/vim-colorschemes/"; }; - vim-colorstepper = buildVimPluginFrom2Nix { + vim-colorstepper = buildVimPlugin { pname = "vim-colorstepper"; version = "2016-01-28"; src = fetchFromGitHub { @@ -11383,7 +11383,7 @@ final: prev: meta.homepage = "https://github.com/jonbri/vim-colorstepper/"; }; - vim-commentary = buildVimPluginFrom2Nix { + vim-commentary = buildVimPlugin { pname = "vim-commentary"; version = "2022-10-31"; src = fetchFromGitHub { @@ -11395,7 +11395,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-commentary/"; }; - vim-concourse = buildVimPluginFrom2Nix { + vim-concourse = buildVimPlugin { pname = "vim-concourse"; version = "2016-11-21"; src = fetchFromGitHub { @@ -11407,7 +11407,7 @@ final: prev: meta.homepage = "https://github.com/luan/vim-concourse/"; }; - vim-cool = buildVimPluginFrom2Nix { + vim-cool = buildVimPlugin { pname = "vim-cool"; version = "2023-09-06"; src = fetchFromGitHub { @@ -11419,7 +11419,7 @@ final: prev: meta.homepage = "https://github.com/romainl/vim-cool/"; }; - vim-cpp-enhanced-highlight = buildVimPluginFrom2Nix { + vim-cpp-enhanced-highlight = buildVimPlugin { pname = "vim-cpp-enhanced-highlight"; version = "2021-04-19"; src = fetchFromGitHub { @@ -11431,7 +11431,7 @@ final: prev: meta.homepage = "https://github.com/octol/vim-cpp-enhanced-highlight/"; }; - vim-crates = buildVimPluginFrom2Nix { + vim-crates = buildVimPlugin { pname = "vim-crates"; version = "2021-05-07"; src = fetchFromGitHub { @@ -11443,7 +11443,7 @@ final: prev: meta.homepage = "https://github.com/mhinz/vim-crates/"; }; - vim-crystal = buildVimPluginFrom2Nix { + vim-crystal = buildVimPlugin { pname = "vim-crystal"; version = "2023-03-15"; src = fetchFromGitHub { @@ -11455,7 +11455,7 @@ final: prev: meta.homepage = "https://github.com/vim-crystal/vim-crystal/"; }; - vim-csharp = buildVimPluginFrom2Nix { + vim-csharp = buildVimPlugin { pname = "vim-csharp"; version = "2017-03-29"; src = fetchFromGitHub { @@ -11467,7 +11467,7 @@ final: prev: meta.homepage = "https://github.com/OrangeT/vim-csharp/"; }; - vim-css-color = buildVimPluginFrom2Nix { + vim-css-color = buildVimPlugin { pname = "vim-css-color"; version = "2023-07-26"; src = fetchFromGitHub { @@ -11479,7 +11479,7 @@ final: prev: meta.homepage = "https://github.com/ap/vim-css-color/"; }; - vim-cue = buildVimPluginFrom2Nix { + vim-cue = buildVimPlugin { pname = "vim-cue"; version = "2021-06-18"; src = fetchFromGitHub { @@ -11491,7 +11491,7 @@ final: prev: meta.homepage = "https://github.com/jjo/vim-cue/"; }; - vim-cursorword = buildVimPluginFrom2Nix { + vim-cursorword = buildVimPlugin { pname = "vim-cursorword"; version = "2022-11-17"; src = fetchFromGitHub { @@ -11503,7 +11503,7 @@ final: prev: meta.homepage = "https://github.com/itchyny/vim-cursorword/"; }; - vim-cute-python = buildVimPluginFrom2Nix { + vim-cute-python = buildVimPlugin { pname = "vim-cute-python"; version = "2020-11-17"; src = fetchFromGitHub { @@ -11515,7 +11515,7 @@ final: prev: meta.homepage = "https://github.com/ehamberg/vim-cute-python/"; }; - vim-dadbod = buildVimPluginFrom2Nix { + vim-dadbod = buildVimPlugin { pname = "vim-dadbod"; version = "2023-05-22"; src = fetchFromGitHub { @@ -11527,7 +11527,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-dadbod/"; }; - vim-dadbod-completion = buildVimPluginFrom2Nix { + vim-dadbod-completion = buildVimPlugin { pname = "vim-dadbod-completion"; version = "2023-04-25"; src = fetchFromGitHub { @@ -11539,19 +11539,19 @@ final: prev: meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-completion/"; }; - vim-dadbod-ui = buildVimPluginFrom2Nix { + vim-dadbod-ui = buildVimPlugin { pname = "vim-dadbod-ui"; - version = "2023-09-15"; + version = "2023-09-29"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-ui"; - rev = "0df3e984ba43d1688e4223315b4f27cbb556f6ad"; - sha256 = "1kb3h7y0bmnrb5g6mwkwcf1y3bm8yc85f0sfgzzybca0y3dbp7ii"; + rev = "95fd22469507e86b78aa55d868c14108adee2881"; + sha256 = "049bqzh61rj3xril9mxb8h75jr074126pgvq65c90h4rm9ddk4ql"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/"; }; - vim-dasht = buildVimPluginFrom2Nix { + vim-dasht = buildVimPlugin { pname = "vim-dasht"; version = "2023-01-31"; src = fetchFromGitHub { @@ -11563,7 +11563,7 @@ final: prev: meta.homepage = "https://github.com/sunaku/vim-dasht/"; }; - vim-deus = buildVimPluginFrom2Nix { + vim-deus = buildVimPlugin { pname = "vim-deus"; version = "2021-03-28"; src = fetchFromGitHub { @@ -11575,7 +11575,7 @@ final: prev: meta.homepage = "https://github.com/ajmwagar/vim-deus/"; }; - vim-devicons = buildVimPluginFrom2Nix { + vim-devicons = buildVimPlugin { pname = "vim-devicons"; version = "2022-10-01"; src = fetchFromGitHub { @@ -11587,7 +11587,7 @@ final: prev: meta.homepage = "https://github.com/ryanoasis/vim-devicons/"; }; - vim-dim = buildVimPluginFrom2Nix { + vim-dim = buildVimPlugin { pname = "vim-dim"; version = "2021-01-29"; src = fetchFromGitHub { @@ -11599,7 +11599,7 @@ final: prev: meta.homepage = "https://github.com/jeffkreeftmeijer/vim-dim/"; }; - vim-diminactive = buildVimPluginFrom2Nix { + vim-diminactive = buildVimPlugin { pname = "vim-diminactive"; version = "2017-08-27"; src = fetchFromGitHub { @@ -11611,7 +11611,7 @@ final: prev: meta.homepage = "https://github.com/blueyed/vim-diminactive/"; }; - vim-dirdiff = buildVimPluginFrom2Nix { + vim-dirdiff = buildVimPlugin { pname = "vim-dirdiff"; version = "2021-06-03"; src = fetchFromGitHub { @@ -11623,7 +11623,7 @@ final: prev: meta.homepage = "https://github.com/will133/vim-dirdiff/"; }; - vim-dirvish = buildVimPluginFrom2Nix { + vim-dirvish = buildVimPlugin { pname = "vim-dirvish"; version = "2023-06-18"; src = fetchFromGitHub { @@ -11635,7 +11635,7 @@ final: prev: meta.homepage = "https://github.com/justinmk/vim-dirvish/"; }; - vim-dirvish-git = buildVimPluginFrom2Nix { + vim-dirvish-git = buildVimPlugin { pname = "vim-dirvish-git"; version = "2021-05-22"; src = fetchFromGitHub { @@ -11647,7 +11647,7 @@ final: prev: meta.homepage = "https://github.com/kristijanhusak/vim-dirvish-git/"; }; - vim-dispatch = buildVimPluginFrom2Nix { + vim-dispatch = buildVimPlugin { pname = "vim-dispatch"; version = "2023-02-05"; src = fetchFromGitHub { @@ -11659,7 +11659,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-dispatch/"; }; - vim-dispatch-neovim = buildVimPluginFrom2Nix { + vim-dispatch-neovim = buildVimPlugin { pname = "vim-dispatch-neovim"; version = "2017-01-18"; src = fetchFromGitHub { @@ -11671,7 +11671,7 @@ final: prev: meta.homepage = "https://github.com/radenling/vim-dispatch-neovim/"; }; - vim-docbk = buildVimPluginFrom2Nix { + vim-docbk = buildVimPlugin { pname = "vim-docbk"; version = "2015-04-01"; src = fetchFromGitHub { @@ -11683,7 +11683,7 @@ final: prev: meta.homepage = "https://github.com/jhradilek/vim-docbk/"; }; - vim-dotenv = buildVimPluginFrom2Nix { + vim-dotenv = buildVimPlugin { pname = "vim-dotenv"; version = "2022-05-15"; src = fetchFromGitHub { @@ -11695,7 +11695,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-dotenv/"; }; - vim-easy-align = buildVimPluginFrom2Nix { + vim-easy-align = buildVimPlugin { pname = "vim-easy-align"; version = "2019-04-29"; src = fetchFromGitHub { @@ -11707,7 +11707,7 @@ final: prev: meta.homepage = "https://github.com/junegunn/vim-easy-align/"; }; - vim-easyescape = buildVimPluginFrom2Nix { + vim-easyescape = buildVimPlugin { pname = "vim-easyescape"; version = "2020-11-22"; src = fetchFromGitHub { @@ -11719,7 +11719,7 @@ final: prev: meta.homepage = "https://github.com/zhou13/vim-easyescape/"; }; - vim-easygit = buildVimPluginFrom2Nix { + vim-easygit = buildVimPlugin { pname = "vim-easygit"; version = "2018-07-08"; src = fetchFromGitHub { @@ -11731,7 +11731,7 @@ final: prev: meta.homepage = "https://github.com/neoclide/vim-easygit/"; }; - vim-easymotion = buildVimPluginFrom2Nix { + vim-easymotion = buildVimPlugin { pname = "vim-easymotion"; version = "2022-04-04"; src = fetchFromGitHub { @@ -11743,7 +11743,7 @@ final: prev: meta.homepage = "https://github.com/easymotion/vim-easymotion/"; }; - vim-easytags = buildVimPluginFrom2Nix { + vim-easytags = buildVimPlugin { pname = "vim-easytags"; version = "2015-07-01"; src = fetchFromGitHub { @@ -11755,7 +11755,7 @@ final: prev: meta.homepage = "https://github.com/xolox/vim-easytags/"; }; - vim-eighties = buildVimPluginFrom2Nix { + vim-eighties = buildVimPlugin { pname = "vim-eighties"; version = "2016-12-15"; src = fetchFromGitHub { @@ -11767,7 +11767,7 @@ final: prev: meta.homepage = "https://github.com/justincampbell/vim-eighties/"; }; - vim-elixir = buildVimPluginFrom2Nix { + vim-elixir = buildVimPlugin { pname = "vim-elixir"; version = "2022-06-25"; src = fetchFromGitHub { @@ -11779,7 +11779,7 @@ final: prev: meta.homepage = "https://github.com/elixir-editors/vim-elixir/"; }; - vim-elm-syntax = buildVimPluginFrom2Nix { + vim-elm-syntax = buildVimPlugin { pname = "vim-elm-syntax"; version = "2021-01-09"; src = fetchFromGitHub { @@ -11791,7 +11791,7 @@ final: prev: meta.homepage = "https://github.com/andys8/vim-elm-syntax/"; }; - vim-emoji = buildVimPluginFrom2Nix { + vim-emoji = buildVimPlugin { pname = "vim-emoji"; version = "2018-01-30"; src = fetchFromGitHub { @@ -11803,7 +11803,7 @@ final: prev: meta.homepage = "https://github.com/junegunn/vim-emoji/"; }; - vim-endwise = buildVimPluginFrom2Nix { + vim-endwise = buildVimPlugin { pname = "vim-endwise"; version = "2023-04-23"; src = fetchFromGitHub { @@ -11815,7 +11815,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-endwise/"; }; - vim-enmasse = buildVimPluginFrom2Nix { + vim-enmasse = buildVimPlugin { pname = "vim-enmasse"; version = "2018-04-03"; src = fetchFromGitHub { @@ -11827,7 +11827,7 @@ final: prev: meta.homepage = "https://github.com/Olical/vim-enmasse/"; }; - vim-erlang-compiler = buildVimPluginFrom2Nix { + vim-erlang-compiler = buildVimPlugin { pname = "vim-erlang-compiler"; version = "2021-06-20"; src = fetchFromGitHub { @@ -11839,7 +11839,7 @@ final: prev: meta.homepage = "https://github.com/vim-erlang/vim-erlang-compiler/"; }; - vim-erlang-omnicomplete = buildVimPluginFrom2Nix { + vim-erlang-omnicomplete = buildVimPlugin { pname = "vim-erlang-omnicomplete"; version = "2021-07-03"; src = fetchFromGitHub { @@ -11851,7 +11851,7 @@ final: prev: meta.homepage = "https://github.com/vim-erlang/vim-erlang-omnicomplete/"; }; - vim-erlang-runtime = buildVimPluginFrom2Nix { + vim-erlang-runtime = buildVimPlugin { pname = "vim-erlang-runtime"; version = "2022-10-02"; src = fetchFromGitHub { @@ -11863,7 +11863,7 @@ final: prev: meta.homepage = "https://github.com/vim-erlang/vim-erlang-runtime/"; }; - vim-erlang-tags = buildVimPluginFrom2Nix { + vim-erlang-tags = buildVimPlugin { pname = "vim-erlang-tags"; version = "2022-04-02"; src = fetchFromGitHub { @@ -11875,7 +11875,7 @@ final: prev: meta.homepage = "https://github.com/vim-erlang/vim-erlang-tags/"; }; - vim-eunuch = buildVimPluginFrom2Nix { + vim-eunuch = buildVimPlugin { pname = "vim-eunuch"; version = "2023-06-28"; src = fetchFromGitHub { @@ -11887,7 +11887,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-eunuch/"; }; - vim-exchange = buildVimPluginFrom2Nix { + vim-exchange = buildVimPlugin { pname = "vim-exchange"; version = "2021-10-21"; src = fetchFromGitHub { @@ -11899,7 +11899,7 @@ final: prev: meta.homepage = "https://github.com/tommcdo/vim-exchange/"; }; - vim-expand-region = buildVimPluginFrom2Nix { + vim-expand-region = buildVimPlugin { pname = "vim-expand-region"; version = "2013-08-19"; src = fetchFromGitHub { @@ -11911,7 +11911,7 @@ final: prev: meta.homepage = "https://github.com/terryma/vim-expand-region/"; }; - vim-extradite = buildVimPluginFrom2Nix { + vim-extradite = buildVimPlugin { pname = "vim-extradite"; version = "2022-04-15"; src = fetchFromGitHub { @@ -11923,7 +11923,7 @@ final: prev: meta.homepage = "https://github.com/int3/vim-extradite/"; }; - vim-fetch = buildVimPluginFrom2Nix { + vim-fetch = buildVimPlugin { pname = "vim-fetch"; version = "2023-05-29"; src = fetchFromGitHub { @@ -11935,7 +11935,7 @@ final: prev: meta.homepage = "https://github.com/wsdjeg/vim-fetch/"; }; - vim-figlet = buildVimPluginFrom2Nix { + vim-figlet = buildVimPlugin { pname = "vim-figlet"; version = "2022-12-08"; src = fetchFromGitHub { @@ -11947,7 +11947,7 @@ final: prev: meta.homepage = "https://github.com/fadein/vim-figlet/"; }; - vim-fireplace = buildVimPluginFrom2Nix { + vim-fireplace = buildVimPlugin { pname = "vim-fireplace"; version = "2023-03-26"; src = fetchFromGitHub { @@ -11959,7 +11959,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-fireplace/"; }; - vim-fish = buildVimPluginFrom2Nix { + vim-fish = buildVimPlugin { pname = "vim-fish"; version = "2017-11-22"; src = fetchFromGitHub { @@ -11971,7 +11971,7 @@ final: prev: meta.homepage = "https://github.com/dag/vim-fish/"; }; - vim-flagship = buildVimPluginFrom2Nix { + vim-flagship = buildVimPlugin { pname = "vim-flagship"; version = "2023-08-26"; src = fetchFromGitHub { @@ -11983,19 +11983,19 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-flagship/"; }; - vim-flake8 = buildVimPluginFrom2Nix { + vim-flake8 = buildVimPlugin { pname = "vim-flake8"; - version = "2023-03-22"; + version = "2023-09-20"; src = fetchFromGitHub { owner = "nvie"; repo = "vim-flake8"; - rev = "5b950566e20d877184a06b1d2fe8bad0998b3ece"; - sha256 = "1mpj8n38fr1gfp65cah4w141cw381ms17zwmvl2iga2hz60rnz0d"; + rev = "fe47074aa4228b460ebc0d4b159345f886babbd9"; + sha256 = "1zb88dsb1m29cav42i95xz1h0f8zpx5p1snrlm7769fqx9gdyzcq"; }; meta.homepage = "https://github.com/nvie/vim-flake8/"; }; - vim-flatbuffers = buildVimPluginFrom2Nix { + vim-flatbuffers = buildVimPlugin { pname = "vim-flatbuffers"; version = "2018-10-11"; src = fetchFromGitHub { @@ -12007,7 +12007,7 @@ final: prev: meta.homepage = "https://github.com/dcharbon/vim-flatbuffers/"; }; - vim-floaterm = buildVimPluginFrom2Nix { + vim-floaterm = buildVimPlugin { pname = "vim-floaterm"; version = "2023-09-02"; src = fetchFromGitHub { @@ -12019,7 +12019,7 @@ final: prev: meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; - vim-flog = buildVimPluginFrom2Nix { + vim-flog = buildVimPlugin { pname = "vim-flog"; version = "2023-09-02"; src = fetchFromGitHub { @@ -12031,7 +12031,7 @@ final: prev: meta.homepage = "https://github.com/rbong/vim-flog/"; }; - vim-flutter = buildVimPluginFrom2Nix { + vim-flutter = buildVimPlugin { pname = "vim-flutter"; version = "2023-06-07"; src = fetchFromGitHub { @@ -12043,7 +12043,7 @@ final: prev: meta.homepage = "https://github.com/thosakwe/vim-flutter/"; }; - vim-fsharp = buildVimPluginFrom2Nix { + vim-fsharp = buildVimPlugin { pname = "vim-fsharp"; version = "2018-11-13"; src = fetchFromGitHub { @@ -12055,7 +12055,7 @@ final: prev: meta.homepage = "https://github.com/fsharp/vim-fsharp/"; }; - vim-ft-diff_fold = buildVimPluginFrom2Nix { + vim-ft-diff_fold = buildVimPlugin { pname = "vim-ft-diff_fold"; version = "2013-02-10"; src = fetchFromGitHub { @@ -12067,7 +12067,7 @@ final: prev: meta.homepage = "https://github.com/thinca/vim-ft-diff_fold/"; }; - vim-fubitive = buildVimPluginFrom2Nix { + vim-fubitive = buildVimPlugin { pname = "vim-fubitive"; version = "2023-08-16"; src = fetchFromGitHub { @@ -12079,19 +12079,19 @@ final: prev: meta.homepage = "https://github.com/tommcdo/vim-fubitive/"; }; - vim-fugitive = buildVimPluginFrom2Nix { + vim-fugitive = buildVimPlugin { pname = "vim-fugitive"; - version = "2023-09-08"; + version = "2023-09-18"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "6fcb0ad03982de646e3fecb6915e585651b9a9fb"; - sha256 = "1acl8akxdgpanyn56y4lyvgljrhf2dlrdhisl924l9r0zba0kc3i"; + rev = "99db68d9b3304580bd383da7aaee05c7a954a344"; + sha256 = "04c5zip3rll58zswjmns42g4wl69s7gbq7qja4w8q4p7phgb5l5w"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; - vim-fzf-coauthorship = buildVimPluginFrom2Nix { + vim-fzf-coauthorship = buildVimPlugin { pname = "vim-fzf-coauthorship"; version = "2021-07-14"; src = fetchFromGitHub { @@ -12103,7 +12103,7 @@ final: prev: meta.homepage = "https://github.com/maxjacobson/vim-fzf-coauthorship/"; }; - vim-gas = buildVimPluginFrom2Nix { + vim-gas = buildVimPlugin { pname = "vim-gas"; version = "2022-03-07"; src = fetchFromGitHub { @@ -12115,7 +12115,7 @@ final: prev: meta.homepage = "https://github.com/Shirk/vim-gas/"; }; - vim-gh-line = buildVimPluginFrom2Nix { + vim-gh-line = buildVimPlugin { pname = "vim-gh-line"; version = "2022-11-25"; src = fetchFromGitHub { @@ -12127,7 +12127,7 @@ final: prev: meta.homepage = "https://github.com/ruanyl/vim-gh-line/"; }; - vim-ghost = buildVimPluginFrom2Nix { + vim-ghost = buildVimPlugin { pname = "vim-ghost"; version = "2021-09-26"; src = fetchFromGitHub { @@ -12139,7 +12139,7 @@ final: prev: meta.homepage = "https://github.com/raghur/vim-ghost/"; }; - vim-gist = buildVimPluginFrom2Nix { + vim-gist = buildVimPlugin { pname = "vim-gist"; version = "2022-10-09"; src = fetchFromGitHub { @@ -12151,7 +12151,7 @@ final: prev: meta.homepage = "https://github.com/mattn/vim-gist/"; }; - vim-gista = buildVimPluginFrom2Nix { + vim-gista = buildVimPlugin { pname = "vim-gista"; version = "2020-09-19"; src = fetchFromGitHub { @@ -12163,7 +12163,7 @@ final: prev: meta.homepage = "https://github.com/lambdalisue/vim-gista/"; }; - vim-git = buildVimPluginFrom2Nix { + vim-git = buildVimPlugin { pname = "vim-git"; version = "2023-03-26"; src = fetchFromGitHub { @@ -12175,7 +12175,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-git/"; }; - vim-gitbranch = buildVimPluginFrom2Nix { + vim-gitbranch = buildVimPlugin { pname = "vim-gitbranch"; version = "2021-08-20"; src = fetchFromGitHub { @@ -12187,7 +12187,7 @@ final: prev: meta.homepage = "https://github.com/itchyny/vim-gitbranch/"; }; - vim-gitgutter = buildVimPluginFrom2Nix { + vim-gitgutter = buildVimPlugin { pname = "vim-gitgutter"; version = "2023-09-01"; src = fetchFromGitHub { @@ -12199,7 +12199,7 @@ final: prev: meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; - vim-github-dashboard = buildVimPluginFrom2Nix { + vim-github-dashboard = buildVimPlugin { pname = "vim-github-dashboard"; version = "2022-01-27"; src = fetchFromGitHub { @@ -12211,7 +12211,7 @@ final: prev: meta.homepage = "https://github.com/junegunn/vim-github-dashboard/"; }; - vim-glsl = buildVimPluginFrom2Nix { + vim-glsl = buildVimPlugin { pname = "vim-glsl"; version = "2022-05-10"; src = fetchFromGitHub { @@ -12223,7 +12223,7 @@ final: prev: meta.homepage = "https://github.com/tikhomirov/vim-glsl/"; }; - vim-gnupg = buildVimPluginFrom2Nix { + vim-gnupg = buildVimPlugin { pname = "vim-gnupg"; version = "2022-05-19"; src = fetchFromGitHub { @@ -12235,7 +12235,7 @@ final: prev: meta.homepage = "https://github.com/jamessan/vim-gnupg/"; }; - vim-go = buildVimPluginFrom2Nix { + vim-go = buildVimPlugin { pname = "vim-go"; version = "2023-09-04"; src = fetchFromGitHub { @@ -12247,7 +12247,7 @@ final: prev: meta.homepage = "https://github.com/fatih/vim-go/"; }; - vim-grammarous = buildVimPluginFrom2Nix { + vim-grammarous = buildVimPlugin { pname = "vim-grammarous"; version = "2020-11-30"; src = fetchFromGitHub { @@ -12259,7 +12259,7 @@ final: prev: meta.homepage = "https://github.com/rhysd/vim-grammarous/"; }; - vim-graphql = buildVimPluginFrom2Nix { + vim-graphql = buildVimPlugin { pname = "vim-graphql"; version = "2023-09-11"; src = fetchFromGitHub { @@ -12271,7 +12271,7 @@ final: prev: meta.homepage = "https://github.com/jparise/vim-graphql/"; }; - vim-grepper = buildVimPluginFrom2Nix { + vim-grepper = buildVimPlugin { pname = "vim-grepper"; version = "2021-08-30"; src = fetchFromGitHub { @@ -12283,7 +12283,7 @@ final: prev: meta.homepage = "https://github.com/mhinz/vim-grepper/"; }; - vim-gruvbox8 = buildVimPluginFrom2Nix { + vim-gruvbox8 = buildVimPlugin { pname = "vim-gruvbox8"; version = "2023-08-04"; src = fetchFromGitHub { @@ -12295,7 +12295,7 @@ final: prev: meta.homepage = "https://github.com/lifepillar/vim-gruvbox8/"; }; - vim-gui-position = buildVimPluginFrom2Nix { + vim-gui-position = buildVimPlugin { pname = "vim-gui-position"; version = "2019-06-06"; src = fetchFromGitHub { @@ -12307,7 +12307,7 @@ final: prev: meta.homepage = "https://github.com/brennanfee/vim-gui-position/"; }; - vim-gutentags = buildVimPluginFrom2Nix { + vim-gutentags = buildVimPlugin { pname = "vim-gutentags"; version = "2023-04-14"; src = fetchFromGitHub { @@ -12319,7 +12319,7 @@ final: prev: meta.homepage = "https://github.com/ludovicchabant/vim-gutentags/"; }; - vim-hardtime = buildVimPluginFrom2Nix { + vim-hardtime = buildVimPlugin { pname = "vim-hardtime"; version = "2022-05-06"; src = fetchFromGitHub { @@ -12331,7 +12331,7 @@ final: prev: meta.homepage = "https://github.com/takac/vim-hardtime/"; }; - vim-haskell-module-name = buildVimPluginFrom2Nix { + vim-haskell-module-name = buildVimPlugin { pname = "vim-haskell-module-name"; version = "2020-01-20"; src = fetchFromGitHub { @@ -12343,7 +12343,7 @@ final: prev: meta.homepage = "https://github.com/chkno/vim-haskell-module-name/"; }; - vim-haskellConcealPlus = buildVimPluginFrom2Nix { + vim-haskellConcealPlus = buildVimPlugin { pname = "vim-haskellConcealPlus"; version = "2020-01-21"; src = fetchFromGitHub { @@ -12355,7 +12355,7 @@ final: prev: meta.homepage = "https://github.com/enomsg/vim-haskellConcealPlus/"; }; - vim-haskellconceal = buildVimPluginFrom2Nix { + vim-haskellconceal = buildVimPlugin { pname = "vim-haskellconceal"; version = "2017-06-15"; src = fetchFromGitHub { @@ -12367,7 +12367,7 @@ final: prev: meta.homepage = "https://github.com/twinside/vim-haskellconceal/"; }; - vim-hcl = buildVimPluginFrom2Nix { + vim-hcl = buildVimPlugin { pname = "vim-hcl"; version = "2022-02-25"; src = fetchFromGitHub { @@ -12379,7 +12379,7 @@ final: prev: meta.homepage = "https://github.com/jvirtanen/vim-hcl/"; }; - vim-hdevtools = buildVimPluginFrom2Nix { + vim-hdevtools = buildVimPlugin { pname = "vim-hdevtools"; version = "2018-11-19"; src = fetchFromGitHub { @@ -12391,7 +12391,7 @@ final: prev: meta.homepage = "https://github.com/bitc/vim-hdevtools/"; }; - vim-helm = buildVimPluginFrom2Nix { + vim-helm = buildVimPlugin { pname = "vim-helm"; version = "2022-08-22"; src = fetchFromGitHub { @@ -12403,7 +12403,7 @@ final: prev: meta.homepage = "https://github.com/towolf/vim-helm/"; }; - vim-hexokinase = buildVimPluginFrom2Nix { + vim-hexokinase = buildVimPlugin { pname = "vim-hexokinase"; version = "2021-04-25"; src = fetchFromGitHub { @@ -12416,7 +12416,7 @@ final: prev: meta.homepage = "https://github.com/RRethy/vim-hexokinase/"; }; - vim-hier = buildVimPluginFrom2Nix { + vim-hier = buildVimPlugin { pname = "vim-hier"; version = "2011-08-27"; src = fetchFromGitHub { @@ -12428,7 +12428,7 @@ final: prev: meta.homepage = "https://github.com/jceb/vim-hier/"; }; - vim-highlightedyank = buildVimPluginFrom2Nix { + vim-highlightedyank = buildVimPlugin { pname = "vim-highlightedyank"; version = "2023-03-19"; src = fetchFromGitHub { @@ -12440,7 +12440,7 @@ final: prev: meta.homepage = "https://github.com/machakann/vim-highlightedyank/"; }; - vim-hindent = buildVimPluginFrom2Nix { + vim-hindent = buildVimPlugin { pname = "vim-hindent"; version = "2018-07-31"; src = fetchFromGitHub { @@ -12452,7 +12452,7 @@ final: prev: meta.homepage = "https://github.com/alx741/vim-hindent/"; }; - vim-hocon = buildVimPluginFrom2Nix { + vim-hocon = buildVimPlugin { pname = "vim-hocon"; version = "2017-09-08"; src = fetchFromGitHub { @@ -12464,7 +12464,7 @@ final: prev: meta.homepage = "https://github.com/GEverding/vim-hocon/"; }; - vim-hoogle = buildVimPluginFrom2Nix { + vim-hoogle = buildVimPlugin { pname = "vim-hoogle"; version = "2018-03-04"; src = fetchFromGitHub { @@ -12476,7 +12476,7 @@ final: prev: meta.homepage = "https://github.com/Twinside/vim-hoogle/"; }; - vim-horizon = buildVimPluginFrom2Nix { + vim-horizon = buildVimPlugin { pname = "vim-horizon"; version = "2023-03-17"; src = fetchFromGitHub { @@ -12488,7 +12488,7 @@ final: prev: meta.homepage = "https://github.com/ntk148v/vim-horizon/"; }; - vim-html-template-literals = buildVimPluginFrom2Nix { + vim-html-template-literals = buildVimPlugin { pname = "vim-html-template-literals"; version = "2021-06-03"; src = fetchFromGitHub { @@ -12500,7 +12500,7 @@ final: prev: meta.homepage = "https://github.com/jonsmithers/vim-html-template-literals/"; }; - vim-husk = buildVimPluginFrom2Nix { + vim-husk = buildVimPlugin { pname = "vim-husk"; version = "2015-11-29"; src = fetchFromGitHub { @@ -12512,7 +12512,7 @@ final: prev: meta.homepage = "https://github.com/vim-utils/vim-husk/"; }; - vim-hybrid = buildVimPluginFrom2Nix { + vim-hybrid = buildVimPlugin { pname = "vim-hybrid"; version = "2016-01-05"; src = fetchFromGitHub { @@ -12524,7 +12524,7 @@ final: prev: meta.homepage = "https://github.com/w0ng/vim-hybrid/"; }; - vim-hybrid-material = buildVimPluginFrom2Nix { + vim-hybrid-material = buildVimPlugin { pname = "vim-hybrid-material"; version = "2020-06-16"; src = fetchFromGitHub { @@ -12536,7 +12536,7 @@ final: prev: meta.homepage = "https://github.com/kristijanhusak/vim-hybrid-material/"; }; - vim-iced-coffee-script = buildVimPluginFrom2Nix { + vim-iced-coffee-script = buildVimPlugin { pname = "vim-iced-coffee-script"; version = "2013-12-26"; src = fetchFromGitHub { @@ -12548,19 +12548,19 @@ final: prev: meta.homepage = "https://github.com/noc7c9/vim-iced-coffee-script/"; }; - vim-illuminate = buildVimPluginFrom2Nix { + vim-illuminate = buildVimPlugin { pname = "vim-illuminate"; - version = "2023-09-12"; + version = "2023-09-26"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "8c910b2f84ae6acd9b4b17330bb94dd783c0c11a"; - sha256 = "0v6w5lm8f39yg9s3lfh15a2sbw8sr6pfiz6p83fmigrxncvb49cp"; + rev = "1b5d70332a51a1de05f281069851865a2bb1e6d7"; + sha256 = "0dbbak53d5hi8jkp0wxcb3x6kysdi7ry2w1k9n0lj64qkmp5afnb"; }; meta.homepage = "https://github.com/RRethy/vim-illuminate/"; }; - vim-indent-guides = buildVimPluginFrom2Nix { + vim-indent-guides = buildVimPlugin { pname = "vim-indent-guides"; version = "2023-03-18"; src = fetchFromGitHub { @@ -12572,7 +12572,7 @@ final: prev: meta.homepage = "https://github.com/preservim/vim-indent-guides/"; }; - vim-indent-object = buildVimPluginFrom2Nix { + vim-indent-object = buildVimPlugin { pname = "vim-indent-object"; version = "2018-04-08"; src = fetchFromGitHub { @@ -12584,7 +12584,7 @@ final: prev: meta.homepage = "https://github.com/michaeljsmith/vim-indent-object/"; }; - vim-indentwise = buildVimPluginFrom2Nix { + vim-indentwise = buildVimPlugin { pname = "vim-indentwise"; version = "2015-06-07"; src = fetchFromGitHub { @@ -12596,7 +12596,7 @@ final: prev: meta.homepage = "https://github.com/jeetsukumaran/vim-indentwise/"; }; - vim-indexed-search = buildVimPluginFrom2Nix { + vim-indexed-search = buildVimPlugin { pname = "vim-indexed-search"; version = "2021-12-13"; src = fetchFromGitHub { @@ -12608,7 +12608,7 @@ final: prev: meta.homepage = "https://github.com/henrik/vim-indexed-search/"; }; - vim-ipython = buildVimPluginFrom2Nix { + vim-ipython = buildVimPlugin { pname = "vim-ipython"; version = "2015-06-23"; src = fetchFromGitHub { @@ -12620,7 +12620,7 @@ final: prev: meta.homepage = "https://github.com/ivanov/vim-ipython/"; }; - vim-isort = buildVimPluginFrom2Nix { + vim-isort = buildVimPlugin { pname = "vim-isort"; version = "2023-07-12"; src = fetchFromGitHub { @@ -12632,7 +12632,7 @@ final: prev: meta.homepage = "https://github.com/fisadev/vim-isort/"; }; - vim-jack-in = buildVimPluginFrom2Nix { + vim-jack-in = buildVimPlugin { pname = "vim-jack-in"; version = "2023-04-17"; src = fetchFromGitHub { @@ -12644,7 +12644,7 @@ final: prev: meta.homepage = "https://github.com/clojure-vim/vim-jack-in/"; }; - vim-janah = buildVimPluginFrom2Nix { + vim-janah = buildVimPlugin { pname = "vim-janah"; version = "2018-10-01"; src = fetchFromGitHub { @@ -12656,7 +12656,7 @@ final: prev: meta.homepage = "https://github.com/mhinz/vim-janah/"; }; - vim-javacomplete2 = buildVimPluginFrom2Nix { + vim-javacomplete2 = buildVimPlugin { pname = "vim-javacomplete2"; version = "2022-06-05"; src = fetchFromGitHub { @@ -12668,7 +12668,7 @@ final: prev: meta.homepage = "https://github.com/artur-shaik/vim-javacomplete2/"; }; - vim-javascript = buildVimPluginFrom2Nix { + vim-javascript = buildVimPlugin { pname = "vim-javascript"; version = "2022-08-15"; src = fetchFromGitHub { @@ -12680,7 +12680,7 @@ final: prev: meta.homepage = "https://github.com/pangloss/vim-javascript/"; }; - vim-javascript-syntax = buildVimPluginFrom2Nix { + vim-javascript-syntax = buildVimPlugin { pname = "vim-javascript-syntax"; version = "2020-09-27"; src = fetchFromGitHub { @@ -12692,7 +12692,7 @@ final: prev: meta.homepage = "https://github.com/jelera/vim-javascript-syntax/"; }; - vim-jinja = buildVimPluginFrom2Nix { + vim-jinja = buildVimPlugin { pname = "vim-jinja"; version = "2021-08-26"; src = fetchFromGitHub { @@ -12704,7 +12704,7 @@ final: prev: meta.homepage = "https://github.com/lepture/vim-jinja/"; }; - vim-jinja-languages = buildVimPluginFrom2Nix { + vim-jinja-languages = buildVimPlugin { pname = "vim-jinja-languages"; version = "2022-04-04"; src = fetchFromGitHub { @@ -12716,7 +12716,7 @@ final: prev: meta.homepage = "https://github.com/seirl/vim-jinja-languages/"; }; - vim-jsbeautify = buildVimPluginFrom2Nix { + vim-jsbeautify = buildVimPlugin { pname = "vim-jsbeautify"; version = "2020-12-11"; src = fetchFromGitHub { @@ -12729,7 +12729,7 @@ final: prev: meta.homepage = "https://github.com/maksimr/vim-jsbeautify/"; }; - vim-jsdoc = buildVimPluginFrom2Nix { + vim-jsdoc = buildVimPlugin { pname = "vim-jsdoc"; version = "2023-05-23"; src = fetchFromGitHub { @@ -12741,7 +12741,7 @@ final: prev: meta.homepage = "https://github.com/heavenshell/vim-jsdoc/"; }; - vim-json = buildVimPluginFrom2Nix { + vim-json = buildVimPlugin { pname = "vim-json"; version = "2018-01-10"; src = fetchFromGitHub { @@ -12753,7 +12753,7 @@ final: prev: meta.homepage = "https://github.com/elzr/vim-json/"; }; - vim-jsonnet = buildVimPluginFrom2Nix { + vim-jsonnet = buildVimPlugin { pname = "vim-jsonnet"; version = "2023-02-20"; src = fetchFromGitHub { @@ -12765,7 +12765,7 @@ final: prev: meta.homepage = "https://github.com/google/vim-jsonnet/"; }; - vim-jsonpath = buildVimPluginFrom2Nix { + vim-jsonpath = buildVimPlugin { pname = "vim-jsonpath"; version = "2020-06-16"; src = fetchFromGitHub { @@ -12777,7 +12777,7 @@ final: prev: meta.homepage = "https://github.com/mogelbrod/vim-jsonpath/"; }; - vim-jsx-pretty = buildVimPluginFrom2Nix { + vim-jsx-pretty = buildVimPlugin { pname = "vim-jsx-pretty"; version = "2021-01-12"; src = fetchFromGitHub { @@ -12789,7 +12789,7 @@ final: prev: meta.homepage = "https://github.com/MaxMEllon/vim-jsx-pretty/"; }; - vim-jsx-typescript = buildVimPluginFrom2Nix { + vim-jsx-typescript = buildVimPlugin { pname = "vim-jsx-typescript"; version = "2020-12-03"; src = fetchFromGitHub { @@ -12801,7 +12801,7 @@ final: prev: meta.homepage = "https://github.com/peitalin/vim-jsx-typescript/"; }; - vim-julia-cell = buildVimPluginFrom2Nix { + vim-julia-cell = buildVimPlugin { pname = "vim-julia-cell"; version = "2020-08-04"; src = fetchFromGitHub { @@ -12813,7 +12813,7 @@ final: prev: meta.homepage = "https://github.com/mroavi/vim-julia-cell/"; }; - vim-just = buildVimPluginFrom2Nix { + vim-just = buildVimPlugin { pname = "vim-just"; version = "2023-08-02"; src = fetchFromGitHub { @@ -12825,7 +12825,7 @@ final: prev: meta.homepage = "https://github.com/NoahTheDuke/vim-just/"; }; - vim-kitty-navigator = buildVimPluginFrom2Nix { + vim-kitty-navigator = buildVimPlugin { pname = "vim-kitty-navigator"; version = "2023-05-25"; src = fetchFromGitHub { @@ -12837,7 +12837,7 @@ final: prev: meta.homepage = "https://github.com/knubie/vim-kitty-navigator/"; }; - vim-lastplace = buildVimPluginFrom2Nix { + vim-lastplace = buildVimPlugin { pname = "vim-lastplace"; version = "2023-08-24"; src = fetchFromGitHub { @@ -12849,19 +12849,19 @@ final: prev: meta.homepage = "https://github.com/farmergreg/vim-lastplace/"; }; - vim-latex-live-preview = buildVimPluginFrom2Nix { + vim-latex-live-preview = buildVimPlugin { pname = "vim-latex-live-preview"; - version = "2023-04-01"; + version = "2023-09-25"; src = fetchFromGitHub { owner = "xuhdev"; repo = "vim-latex-live-preview"; - rev = "e1a6a31b123bf6b15635cac6d391afcb2670187a"; - sha256 = "163zvzchxmpff2slj769bqagfblq6n7h3gyxn557dfl7hj5bfs2y"; + rev = "e1906cd4930a58ebaa5eb446436df23522eafb51"; + sha256 = "1adfyk96prwbf8dmznnfqvz27jxq0fpjygdhbrcc8b2i93i2dia2"; }; meta.homepage = "https://github.com/xuhdev/vim-latex-live-preview/"; }; - vim-lawrencium = buildVimPluginFrom2Nix { + vim-lawrencium = buildVimPlugin { pname = "vim-lawrencium"; version = "2022-01-19"; src = fetchFromGitHub { @@ -12873,7 +12873,7 @@ final: prev: meta.homepage = "https://github.com/ludovicchabant/vim-lawrencium/"; }; - vim-leader-guide = buildVimPluginFrom2Nix { + vim-leader-guide = buildVimPlugin { pname = "vim-leader-guide"; version = "2018-10-06"; src = fetchFromGitHub { @@ -12885,7 +12885,7 @@ final: prev: meta.homepage = "https://github.com/hecal3/vim-leader-guide/"; }; - vim-lean = buildVimPluginFrom2Nix { + vim-lean = buildVimPlugin { pname = "vim-lean"; version = "2017-07-29"; src = fetchFromGitHub { @@ -12897,7 +12897,7 @@ final: prev: meta.homepage = "https://github.com/mk12/vim-lean/"; }; - vim-ledger = buildVimPluginFrom2Nix { + vim-ledger = buildVimPlugin { pname = "vim-ledger"; version = "2023-02-23"; src = fetchFromGitHub { @@ -12909,7 +12909,7 @@ final: prev: meta.homepage = "https://github.com/ledger/vim-ledger/"; }; - vim-lexical = buildVimPluginFrom2Nix { + vim-lexical = buildVimPlugin { pname = "vim-lexical"; version = "2022-02-11"; src = fetchFromGitHub { @@ -12921,7 +12921,7 @@ final: prev: meta.homepage = "https://github.com/preservim/vim-lexical/"; }; - vim-lfe = buildVimPluginFrom2Nix { + vim-lfe = buildVimPlugin { pname = "vim-lfe"; version = "2018-04-30"; src = fetchFromGitHub { @@ -12933,7 +12933,7 @@ final: prev: meta.homepage = "https://github.com/lfe-support/vim-lfe/"; }; - vim-lightline-coc = buildVimPluginFrom2Nix { + vim-lightline-coc = buildVimPlugin { pname = "vim-lightline-coc"; version = "2021-03-03"; src = fetchFromGitHub { @@ -12945,7 +12945,7 @@ final: prev: meta.homepage = "https://github.com/josa42/vim-lightline-coc/"; }; - vim-lion = buildVimPluginFrom2Nix { + vim-lion = buildVimPlugin { pname = "vim-lion"; version = "2020-07-18"; src = fetchFromGitHub { @@ -12957,7 +12957,7 @@ final: prev: meta.homepage = "https://github.com/tommcdo/vim-lion/"; }; - vim-liquid = buildVimPluginFrom2Nix { + vim-liquid = buildVimPlugin { pname = "vim-liquid"; version = "2021-11-28"; src = fetchFromGitHub { @@ -12969,7 +12969,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-liquid/"; }; - vim-llvm = buildVimPluginFrom2Nix { + vim-llvm = buildVimPlugin { pname = "vim-llvm"; version = "2023-05-31"; src = fetchFromGitHub { @@ -12981,7 +12981,7 @@ final: prev: meta.homepage = "https://github.com/rhysd/vim-llvm/"; }; - vim-localvimrc = buildVimPluginFrom2Nix { + vim-localvimrc = buildVimPlugin { pname = "vim-localvimrc"; version = "2023-06-08"; src = fetchFromGitHub { @@ -12993,7 +12993,7 @@ final: prev: meta.homepage = "https://github.com/embear/vim-localvimrc/"; }; - vim-logreview = buildVimPluginFrom2Nix { + vim-logreview = buildVimPlugin { pname = "vim-logreview"; version = "2022-02-28"; src = fetchFromGitHub { @@ -13005,7 +13005,7 @@ final: prev: meta.homepage = "https://github.com/andreshazard/vim-logreview/"; }; - vim-loves-dafny = buildVimPluginFrom2Nix { + vim-loves-dafny = buildVimPlugin { pname = "vim-loves-dafny"; version = "2018-09-25"; src = fetchFromGitHub { @@ -13017,7 +13017,7 @@ final: prev: meta.homepage = "https://github.com/mlr-msft/vim-loves-dafny/"; }; - vim-lsc = buildVimPluginFrom2Nix { + vim-lsc = buildVimPlugin { pname = "vim-lsc"; version = "2023-08-04"; src = fetchFromGitHub { @@ -13029,7 +13029,7 @@ final: prev: meta.homepage = "https://github.com/natebosch/vim-lsc/"; }; - vim-lsp = buildVimPluginFrom2Nix { + vim-lsp = buildVimPlugin { pname = "vim-lsp"; version = "2023-09-09"; src = fetchFromGitHub { @@ -13041,7 +13041,7 @@ final: prev: meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; - vim-lsp-ale = buildVimPluginFrom2Nix { + vim-lsp-ale = buildVimPlugin { pname = "vim-lsp-ale"; version = "2021-12-28"; src = fetchFromGitHub { @@ -13053,7 +13053,7 @@ final: prev: meta.homepage = "https://github.com/rhysd/vim-lsp-ale/"; }; - vim-lsp-cxx-highlight = buildVimPluginFrom2Nix { + vim-lsp-cxx-highlight = buildVimPlugin { pname = "vim-lsp-cxx-highlight"; version = "2021-10-20"; src = fetchFromGitHub { @@ -13065,19 +13065,19 @@ final: prev: meta.homepage = "https://github.com/jackguo380/vim-lsp-cxx-highlight/"; }; - vim-lsp-settings = buildVimPluginFrom2Nix { + vim-lsp-settings = buildVimPlugin { pname = "vim-lsp-settings"; - version = "2023-09-03"; + version = "2023-09-17"; src = fetchFromGitHub { owner = "mattn"; repo = "vim-lsp-settings"; - rev = "7344e006d06070a7e3f09655de552040a26a49c9"; - sha256 = "0v76sp0v5h4i41hda62rnqxvxc55wd9mnk2idnnp2p67xkb41pvy"; + rev = "7613a3f702ae7ff2794b659a9769494203f5cb67"; + sha256 = "0fa56dn9jmqz0hwd2jjc9g4j0rqyw5d5v64vzs8lq6r52fvzcm6j"; }; meta.homepage = "https://github.com/mattn/vim-lsp-settings/"; }; - vim-lsp-snippets = buildVimPluginFrom2Nix { + vim-lsp-snippets = buildVimPlugin { pname = "vim-lsp-snippets"; version = "2020-01-15"; src = fetchFromGitHub { @@ -13089,7 +13089,7 @@ final: prev: meta.homepage = "https://github.com/thomasfaingnaert/vim-lsp-snippets/"; }; - vim-lsp-ultisnips = buildVimPluginFrom2Nix { + vim-lsp-ultisnips = buildVimPlugin { pname = "vim-lsp-ultisnips"; version = "2023-04-07"; src = fetchFromGitHub { @@ -13101,7 +13101,7 @@ final: prev: meta.homepage = "https://github.com/thomasfaingnaert/vim-lsp-ultisnips/"; }; - vim-lua = buildVimPluginFrom2Nix { + vim-lua = buildVimPlugin { pname = "vim-lua"; version = "2020-08-05"; src = fetchFromGitHub { @@ -13113,7 +13113,7 @@ final: prev: meta.homepage = "https://github.com/tbastos/vim-lua/"; }; - vim-maktaba = buildVimPluginFrom2Nix { + vim-maktaba = buildVimPlugin { pname = "vim-maktaba"; version = "2023-03-21"; src = fetchFromGitHub { @@ -13125,7 +13125,7 @@ final: prev: meta.homepage = "https://github.com/google/vim-maktaba/"; }; - vim-manpager = buildVimPluginFrom2Nix { + vim-manpager = buildVimPlugin { pname = "vim-manpager"; version = "2022-07-23"; src = fetchFromGitHub { @@ -13137,7 +13137,7 @@ final: prev: meta.homepage = "https://github.com/lambdalisue/vim-manpager/"; }; - vim-markbar = buildVimPluginFrom2Nix { + vim-markbar = buildVimPlugin { pname = "vim-markbar"; version = "2023-08-24"; src = fetchFromGitHub { @@ -13149,19 +13149,19 @@ final: prev: meta.homepage = "https://github.com/Yilin-Yang/vim-markbar/"; }; - vim-markdown = buildVimPluginFrom2Nix { + vim-markdown = buildVimPlugin { pname = "vim-markdown"; - version = "2023-04-08"; + version = "2023-09-20"; src = fetchFromGitHub { owner = "preservim"; repo = "vim-markdown"; - rev = "cc82d88e2a791f54d2b6e2b26e41f743351ac947"; - sha256 = "1l3vdx87sgqbxbh1jz00xm8s589rca4pszqk4jj9yvn1vxljnk87"; + rev = "4e9b4deda11d05a157ab34e97f76089669b5b7af"; + sha256 = "027i9y3f0dh6m3fw4fr7jd3pichbs9004c5hqm4i2fz82vb35smm"; }; meta.homepage = "https://github.com/preservim/vim-markdown/"; }; - vim-markdown-composer = buildVimPluginFrom2Nix { + vim-markdown-composer = buildVimPlugin { pname = "vim-markdown-composer"; version = "2022-06-14"; src = fetchFromGitHub { @@ -13174,7 +13174,7 @@ final: prev: meta.homepage = "https://github.com/euclio/vim-markdown-composer/"; }; - vim-markdown-toc = buildVimPluginFrom2Nix { + vim-markdown-toc = buildVimPlugin { pname = "vim-markdown-toc"; version = "2022-08-29"; src = fetchFromGitHub { @@ -13186,7 +13186,7 @@ final: prev: meta.homepage = "https://github.com/mzlogin/vim-markdown-toc/"; }; - vim-matchup = buildVimPluginFrom2Nix { + vim-matchup = buildVimPlugin { pname = "vim-matchup"; version = "2023-09-02"; src = fetchFromGitHub { @@ -13198,7 +13198,7 @@ final: prev: meta.homepage = "https://github.com/andymass/vim-matchup/"; }; - vim-mediawiki-editor = buildVimPluginFrom2Nix { + vim-mediawiki-editor = buildVimPlugin { pname = "vim-mediawiki-editor"; version = "2022-10-29"; src = fetchFromGitHub { @@ -13210,7 +13210,7 @@ final: prev: meta.homepage = "https://github.com/aquach/vim-mediawiki-editor/"; }; - vim-mergetool = buildVimPluginFrom2Nix { + vim-mergetool = buildVimPlugin { pname = "vim-mergetool"; version = "2019-06-22"; src = fetchFromGitHub { @@ -13222,7 +13222,7 @@ final: prev: meta.homepage = "https://github.com/samoshkin/vim-mergetool/"; }; - vim-merginal = buildVimPluginFrom2Nix { + vim-merginal = buildVimPlugin { pname = "vim-merginal"; version = "2023-08-27"; src = fetchFromGitHub { @@ -13234,7 +13234,7 @@ final: prev: meta.homepage = "https://github.com/idanarye/vim-merginal/"; }; - vim-metamath = buildVimPluginFrom2Nix { + vim-metamath = buildVimPlugin { pname = "vim-metamath"; version = "2017-02-10"; src = fetchFromGitHub { @@ -13246,7 +13246,7 @@ final: prev: meta.homepage = "https://github.com/david-a-wheeler/vim-metamath/"; }; - vim-misc = buildVimPluginFrom2Nix { + vim-misc = buildVimPlugin { pname = "vim-misc"; version = "2015-05-21"; src = fetchFromGitHub { @@ -13258,7 +13258,7 @@ final: prev: meta.homepage = "https://github.com/xolox/vim-misc/"; }; - vim-molokai-delroth = buildVimPluginFrom2Nix { + vim-molokai-delroth = buildVimPlugin { pname = "vim-molokai-delroth"; version = "2023-05-30"; src = fetchFromGitHub { @@ -13270,7 +13270,7 @@ final: prev: meta.homepage = "https://github.com/delroth/vim-molokai-delroth/"; }; - vim-monokai = buildVimPluginFrom2Nix { + vim-monokai = buildVimPlugin { pname = "vim-monokai"; version = "2022-12-09"; src = fetchFromGitHub { @@ -13282,7 +13282,7 @@ final: prev: meta.homepage = "https://github.com/crusoexia/vim-monokai/"; }; - vim-monokai-pro = buildVimPluginFrom2Nix { + vim-monokai-pro = buildVimPlugin { pname = "vim-monokai-pro"; version = "2022-06-25"; src = fetchFromGitHub { @@ -13294,7 +13294,7 @@ final: prev: meta.homepage = "https://github.com/phanviet/vim-monokai-pro/"; }; - vim-monokai-tasty = buildVimPluginFrom2Nix { + vim-monokai-tasty = buildVimPlugin { pname = "vim-monokai-tasty"; version = "2023-09-12"; src = fetchFromGitHub { @@ -13306,7 +13306,7 @@ final: prev: meta.homepage = "https://github.com/patstockwell/vim-monokai-tasty/"; }; - vim-move = buildVimPluginFrom2Nix { + vim-move = buildVimPlugin { pname = "vim-move"; version = "2023-05-11"; src = fetchFromGitHub { @@ -13318,7 +13318,7 @@ final: prev: meta.homepage = "https://github.com/matze/vim-move/"; }; - vim-mucomplete = buildVimPluginFrom2Nix { + vim-mucomplete = buildVimPlugin { pname = "vim-mucomplete"; version = "2022-09-28"; src = fetchFromGitHub { @@ -13330,7 +13330,7 @@ final: prev: meta.homepage = "https://github.com/lifepillar/vim-mucomplete/"; }; - vim-multiple-cursors = buildVimPluginFrom2Nix { + vim-multiple-cursors = buildVimPlugin { pname = "vim-multiple-cursors"; version = "2020-07-30"; src = fetchFromGitHub { @@ -13342,7 +13342,7 @@ final: prev: meta.homepage = "https://github.com/terryma/vim-multiple-cursors/"; }; - vim-mundo = buildVimPluginFrom2Nix { + vim-mundo = buildVimPlugin { pname = "vim-mundo"; version = "2022-11-05"; src = fetchFromGitHub { @@ -13354,7 +13354,7 @@ final: prev: meta.homepage = "https://github.com/simnalamburt/vim-mundo/"; }; - vim-mustache-handlebars = buildVimPluginFrom2Nix { + vim-mustache-handlebars = buildVimPlugin { pname = "vim-mustache-handlebars"; version = "2021-11-30"; src = fetchFromGitHub { @@ -13366,7 +13366,7 @@ final: prev: meta.homepage = "https://github.com/mustache/vim-mustache-handlebars/"; }; - vim-nerdtree-syntax-highlight = buildVimPluginFrom2Nix { + vim-nerdtree-syntax-highlight = buildVimPlugin { pname = "vim-nerdtree-syntax-highlight"; version = "2023-07-07"; src = fetchFromGitHub { @@ -13378,7 +13378,7 @@ final: prev: meta.homepage = "https://github.com/tiagofumo/vim-nerdtree-syntax-highlight/"; }; - vim-nerdtree-tabs = buildVimPluginFrom2Nix { + vim-nerdtree-tabs = buildVimPlugin { pname = "vim-nerdtree-tabs"; version = "2018-12-21"; src = fetchFromGitHub { @@ -13390,7 +13390,7 @@ final: prev: meta.homepage = "https://github.com/jistr/vim-nerdtree-tabs/"; }; - vim-nftables = buildVimPluginFrom2Nix { + vim-nftables = buildVimPlugin { pname = "vim-nftables"; version = "2020-06-29"; src = fetchFromGitHub { @@ -13402,7 +13402,7 @@ final: prev: meta.homepage = "https://github.com/nfnty/vim-nftables/"; }; - vim-niceblock = buildVimPluginFrom2Nix { + vim-niceblock = buildVimPlugin { pname = "vim-niceblock"; version = "2018-09-06"; src = fetchFromGitHub { @@ -13414,19 +13414,19 @@ final: prev: meta.homepage = "https://github.com/kana/vim-niceblock/"; }; - vim-nickel = buildVimPluginFrom2Nix { + vim-nickel = buildVimPlugin { pname = "vim-nickel"; - version = "2023-07-05"; + version = "2023-09-26"; src = fetchFromGitHub { owner = "nickel-lang"; repo = "vim-nickel"; - rev = "535196c1e6b77e05f31a5ba50a5eaef393bbf280"; - sha256 = "042n288b6c58jihbgsxhilycx56llbqck341zw7gf8sk4sypqhhr"; + rev = "f22898d88affc0958453b42e1147ba076637e0ed"; + sha256 = "1yczwjs3svan4hmsmb3lzn3i2n50qfkmkncqyrvsy5qyrlv19gy1"; }; meta.homepage = "https://github.com/nickel-lang/vim-nickel/"; }; - vim-ninja-feet = buildVimPluginFrom2Nix { + vim-ninja-feet = buildVimPlugin { pname = "vim-ninja-feet"; version = "2021-05-27"; src = fetchFromGitHub { @@ -13438,7 +13438,7 @@ final: prev: meta.homepage = "https://github.com/tommcdo/vim-ninja-feet/"; }; - vim-nix = buildVimPluginFrom2Nix { + vim-nix = buildVimPlugin { pname = "vim-nix"; version = "2023-07-29"; src = fetchFromGitHub { @@ -13450,7 +13450,7 @@ final: prev: meta.homepage = "https://github.com/LnL7/vim-nix/"; }; - vim-nixhash = buildVimPluginFrom2Nix { + vim-nixhash = buildVimPlugin { pname = "vim-nixhash"; version = "2023-01-09"; src = fetchFromGitHub { @@ -13462,7 +13462,7 @@ final: prev: meta.homepage = "https://github.com/symphorien/vim-nixhash/"; }; - vim-noctu = buildVimPluginFrom2Nix { + vim-noctu = buildVimPlugin { pname = "vim-noctu"; version = "2015-06-27"; src = fetchFromGitHub { @@ -13474,7 +13474,7 @@ final: prev: meta.homepage = "https://github.com/noahfrederick/vim-noctu/"; }; - vim-nong-theme = buildVimPluginFrom2Nix { + vim-nong-theme = buildVimPlugin { pname = "vim-nong-theme"; version = "2020-12-16"; src = fetchFromGitHub { @@ -13486,7 +13486,7 @@ final: prev: meta.homepage = "https://github.com/fruit-in/vim-nong-theme/"; }; - vim-numbertoggle = buildVimPluginFrom2Nix { + vim-numbertoggle = buildVimPlugin { pname = "vim-numbertoggle"; version = "2021-07-14"; src = fetchFromGitHub { @@ -13498,7 +13498,7 @@ final: prev: meta.homepage = "https://github.com/jeffkreeftmeijer/vim-numbertoggle/"; }; - vim-obsession = buildVimPluginFrom2Nix { + vim-obsession = buildVimPlugin { pname = "vim-obsession"; version = "2022-12-02"; src = fetchFromGitHub { @@ -13510,7 +13510,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-obsession/"; }; - vim-ocaml = buildVimPluginFrom2Nix { + vim-ocaml = buildVimPlugin { pname = "vim-ocaml"; version = "2023-07-04"; src = fetchFromGitHub { @@ -13522,7 +13522,7 @@ final: prev: meta.homepage = "https://github.com/ocaml/vim-ocaml/"; }; - vim-one = buildVimPluginFrom2Nix { + vim-one = buildVimPlugin { pname = "vim-one"; version = "2020-12-14"; src = fetchFromGitHub { @@ -13534,7 +13534,7 @@ final: prev: meta.homepage = "https://github.com/rakr/vim-one/"; }; - vim-opencl = buildVimPluginFrom2Nix { + vim-opencl = buildVimPlugin { pname = "vim-opencl"; version = "2018-06-13"; src = fetchFromGitHub { @@ -13546,7 +13546,7 @@ final: prev: meta.homepage = "https://github.com/petRUShka/vim-opencl/"; }; - vim-openscad = buildVimPluginFrom2Nix { + vim-openscad = buildVimPlugin { pname = "vim-openscad"; version = "2022-07-26"; src = fetchFromGitHub { @@ -13558,7 +13558,7 @@ final: prev: meta.homepage = "https://github.com/sirtaj/vim-openscad/"; }; - vim-operator-replace = buildVimPluginFrom2Nix { + vim-operator-replace = buildVimPlugin { pname = "vim-operator-replace"; version = "2015-02-24"; src = fetchFromGitHub { @@ -13570,7 +13570,7 @@ final: prev: meta.homepage = "https://github.com/kana/vim-operator-replace/"; }; - vim-operator-surround = buildVimPluginFrom2Nix { + vim-operator-surround = buildVimPlugin { pname = "vim-operator-surround"; version = "2018-11-01"; src = fetchFromGitHub { @@ -13582,7 +13582,7 @@ final: prev: meta.homepage = "https://github.com/rhysd/vim-operator-surround/"; }; - vim-operator-user = buildVimPluginFrom2Nix { + vim-operator-user = buildVimPlugin { pname = "vim-operator-user"; version = "2015-02-17"; src = fetchFromGitHub { @@ -13594,7 +13594,7 @@ final: prev: meta.homepage = "https://github.com/kana/vim-operator-user/"; }; - vim-orgmode = buildVimPluginFrom2Nix { + vim-orgmode = buildVimPlugin { pname = "vim-orgmode"; version = "2022-12-09"; src = fetchFromGitHub { @@ -13606,7 +13606,7 @@ final: prev: meta.homepage = "https://github.com/jceb/vim-orgmode/"; }; - vim-ormolu = buildVimPluginFrom2Nix { + vim-ormolu = buildVimPlugin { pname = "vim-ormolu"; version = "2020-11-25"; src = fetchFromGitHub { @@ -13618,7 +13618,7 @@ final: prev: meta.homepage = "https://github.com/sdiehl/vim-ormolu/"; }; - vim-osc52 = buildVimPluginFrom2Nix { + vim-osc52 = buildVimPlugin { pname = "vim-osc52"; version = "2020-09-19"; src = fetchFromGitHub { @@ -13630,7 +13630,7 @@ final: prev: meta.homepage = "https://github.com/fcpg/vim-osc52/"; }; - vim-oscyank = buildVimPluginFrom2Nix { + vim-oscyank = buildVimPlugin { pname = "vim-oscyank"; version = "2023-07-01"; src = fetchFromGitHub { @@ -13642,7 +13642,7 @@ final: prev: meta.homepage = "https://github.com/ojroques/vim-oscyank/"; }; - vim-over = buildVimPluginFrom2Nix { + vim-over = buildVimPlugin { pname = "vim-over"; version = "2020-01-26"; src = fetchFromGitHub { @@ -13654,7 +13654,7 @@ final: prev: meta.homepage = "https://github.com/osyo-manga/vim-over/"; }; - vim-packer = buildVimPluginFrom2Nix { + vim-packer = buildVimPlugin { pname = "vim-packer"; version = "2018-11-11"; src = fetchFromGitHub { @@ -13666,7 +13666,7 @@ final: prev: meta.homepage = "https://github.com/hashivim/vim-packer/"; }; - vim-pager = buildVimPluginFrom2Nix { + vim-pager = buildVimPlugin { pname = "vim-pager"; version = "2015-08-26"; src = fetchFromGitHub { @@ -13678,7 +13678,7 @@ final: prev: meta.homepage = "https://github.com/lambdalisue/vim-pager/"; }; - vim-pandoc = buildVimPluginFrom2Nix { + vim-pandoc = buildVimPlugin { pname = "vim-pandoc"; version = "2023-02-24"; src = fetchFromGitHub { @@ -13690,7 +13690,7 @@ final: prev: meta.homepage = "https://github.com/vim-pandoc/vim-pandoc/"; }; - vim-pandoc-after = buildVimPluginFrom2Nix { + vim-pandoc-after = buildVimPlugin { pname = "vim-pandoc-after"; version = "2019-04-29"; src = fetchFromGitHub { @@ -13702,7 +13702,7 @@ final: prev: meta.homepage = "https://github.com/vim-pandoc/vim-pandoc-after/"; }; - vim-pandoc-syntax = buildVimPluginFrom2Nix { + vim-pandoc-syntax = buildVimPlugin { pname = "vim-pandoc-syntax"; version = "2023-01-10"; src = fetchFromGitHub { @@ -13714,7 +13714,7 @@ final: prev: meta.homepage = "https://github.com/vim-pandoc/vim-pandoc-syntax/"; }; - vim-paper = buildVimPluginFrom2Nix { + vim-paper = buildVimPlugin { pname = "vim-paper"; version = "2023-08-02"; src = fetchFromGitHub { @@ -13726,7 +13726,7 @@ final: prev: meta.homepage = "https://github.com/yorickpeterse/vim-paper/"; }; - vim-parinfer = buildVimPluginFrom2Nix { + vim-parinfer = buildVimPlugin { pname = "vim-parinfer"; version = "2022-11-29"; src = fetchFromGitHub { @@ -13738,7 +13738,7 @@ final: prev: meta.homepage = "https://github.com/bhurlow/vim-parinfer/"; }; - vim-pasta = buildVimPluginFrom2Nix { + vim-pasta = buildVimPlugin { pname = "vim-pasta"; version = "2023-08-12"; src = fetchFromGitHub { @@ -13750,7 +13750,7 @@ final: prev: meta.homepage = "https://github.com/ku1ik/vim-pasta/"; }; - vim-pathogen = buildVimPluginFrom2Nix { + vim-pathogen = buildVimPlugin { pname = "vim-pathogen"; version = "2022-08-24"; src = fetchFromGitHub { @@ -13762,7 +13762,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-pathogen/"; }; - vim-peekaboo = buildVimPluginFrom2Nix { + vim-peekaboo = buildVimPlugin { pname = "vim-peekaboo"; version = "2019-12-12"; src = fetchFromGitHub { @@ -13774,7 +13774,7 @@ final: prev: meta.homepage = "https://github.com/junegunn/vim-peekaboo/"; }; - vim-pencil = buildVimPluginFrom2Nix { + vim-pencil = buildVimPlugin { pname = "vim-pencil"; version = "2023-04-03"; src = fetchFromGitHub { @@ -13786,7 +13786,7 @@ final: prev: meta.homepage = "https://github.com/preservim/vim-pencil/"; }; - vim-phabricator = buildVimPluginFrom2Nix { + vim-phabricator = buildVimPlugin { pname = "vim-phabricator"; version = "2021-11-06"; src = fetchFromGitHub { @@ -13798,7 +13798,7 @@ final: prev: meta.homepage = "https://github.com/jparise/vim-phabricator/"; }; - vim-pico8-syntax = buildVimPluginFrom2Nix { + vim-pico8-syntax = buildVimPlugin { pname = "vim-pico8-syntax"; version = "2016-10-30"; src = fetchFromGitHub { @@ -13810,7 +13810,7 @@ final: prev: meta.homepage = "https://github.com/justinj/vim-pico8-syntax/"; }; - vim-plug = buildVimPluginFrom2Nix { + vim-plug = buildVimPlugin { pname = "vim-plug"; version = "2023-04-01"; src = fetchFromGitHub { @@ -13822,7 +13822,7 @@ final: prev: meta.homepage = "https://github.com/junegunn/vim-plug/"; }; - vim-plugin-AnsiEsc = buildVimPluginFrom2Nix { + vim-plugin-AnsiEsc = buildVimPlugin { pname = "vim-plugin-AnsiEsc"; version = "2019-04-07"; src = fetchFromGitHub { @@ -13834,7 +13834,7 @@ final: prev: meta.homepage = "https://github.com/powerman/vim-plugin-AnsiEsc/"; }; - vim-pluto = buildVimPluginFrom2Nix { + vim-pluto = buildVimPlugin { pname = "vim-pluto"; version = "2022-02-01"; src = fetchFromGitHub { @@ -13846,7 +13846,7 @@ final: prev: meta.homepage = "https://github.com/hasundue/vim-pluto/"; }; - vim-polyglot = buildVimPluginFrom2Nix { + vim-polyglot = buildVimPlugin { pname = "vim-polyglot"; version = "2022-10-14"; src = fetchFromGitHub { @@ -13858,19 +13858,7 @@ final: prev: meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; - vim-pony = buildVimPluginFrom2Nix { - pname = "vim-pony"; - version = "2018-07-27"; - src = fetchFromGitHub { - owner = "jakwings"; - repo = "vim-pony"; - rev = "b26f01a869000b73b80dceabd725d91bfe175b75"; - sha256 = "0if8g94m3xmpda80byfxs649w2is9ah1k8v3028nblan73zlc8x8"; - }; - meta.homepage = "https://github.com/jakwings/vim-pony/"; - }; - - vim-poweryank = buildVimPluginFrom2Nix { + vim-poweryank = buildVimPlugin { pname = "vim-poweryank"; version = "2017-08-13"; src = fetchFromGitHub { @@ -13882,7 +13870,7 @@ final: prev: meta.homepage = "https://github.com/haya14busa/vim-poweryank/"; }; - vim-prettier = buildVimPluginFrom2Nix { + vim-prettier = buildVimPlugin { pname = "vim-prettier"; version = "2021-11-24"; src = fetchFromGitHub { @@ -13894,7 +13882,7 @@ final: prev: meta.homepage = "https://github.com/prettier/vim-prettier/"; }; - vim-prettyprint = buildVimPluginFrom2Nix { + vim-prettyprint = buildVimPlugin { pname = "vim-prettyprint"; version = "2016-07-16"; src = fetchFromGitHub { @@ -13906,7 +13894,7 @@ final: prev: meta.homepage = "https://github.com/thinca/vim-prettyprint/"; }; - vim-printer = buildVimPluginFrom2Nix { + vim-printer = buildVimPlugin { pname = "vim-printer"; version = "2022-03-01"; src = fetchFromGitHub { @@ -13918,7 +13906,7 @@ final: prev: meta.homepage = "https://github.com/meain/vim-printer/"; }; - vim-prisma = buildVimPluginFrom2Nix { + vim-prisma = buildVimPlugin { pname = "vim-prisma"; version = "2023-01-24"; src = fetchFromGitHub { @@ -13930,7 +13918,7 @@ final: prev: meta.homepage = "https://github.com/prisma/vim-prisma/"; }; - vim-projectionist = buildVimPluginFrom2Nix { + vim-projectionist = buildVimPlugin { pname = "vim-projectionist"; version = "2023-03-16"; src = fetchFromGitHub { @@ -13942,7 +13930,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-projectionist/"; }; - vim-prosession = buildVimPluginFrom2Nix { + vim-prosession = buildVimPlugin { pname = "vim-prosession"; version = "2023-08-08"; src = fetchFromGitHub { @@ -13954,7 +13942,7 @@ final: prev: meta.homepage = "https://github.com/dhruvasagar/vim-prosession/"; }; - vim-protobuf = buildVimPluginFrom2Nix { + vim-protobuf = buildVimPlugin { pname = "vim-protobuf"; version = "2017-12-26"; src = fetchFromGitHub { @@ -13966,7 +13954,7 @@ final: prev: meta.homepage = "https://github.com/uarun/vim-protobuf/"; }; - vim-ps1 = buildVimPluginFrom2Nix { + vim-ps1 = buildVimPlugin { pname = "vim-ps1"; version = "2023-01-11"; src = fetchFromGitHub { @@ -13978,7 +13966,7 @@ final: prev: meta.homepage = "https://github.com/PProvost/vim-ps1/"; }; - vim-pug = buildVimPluginFrom2Nix { + vim-pug = buildVimPlugin { pname = "vim-pug"; version = "2019-09-23"; src = fetchFromGitHub { @@ -13990,7 +13978,7 @@ final: prev: meta.homepage = "https://github.com/digitaltoad/vim-pug/"; }; - vim-puppet = buildVimPluginFrom2Nix { + vim-puppet = buildVimPlugin { pname = "vim-puppet"; version = "2022-05-21"; src = fetchFromGitHub { @@ -14002,7 +13990,7 @@ final: prev: meta.homepage = "https://github.com/rodjek/vim-puppet/"; }; - vim-python-pep8-indent = buildVimPluginFrom2Nix { + vim-python-pep8-indent = buildVimPlugin { pname = "vim-python-pep8-indent"; version = "2020-03-20"; src = fetchFromGitHub { @@ -14014,7 +14002,7 @@ final: prev: meta.homepage = "https://github.com/Vimjas/vim-python-pep8-indent/"; }; - vim-qf = buildVimPluginFrom2Nix { + vim-qf = buildVimPlugin { pname = "vim-qf"; version = "2023-05-09"; src = fetchFromGitHub { @@ -14026,7 +14014,7 @@ final: prev: meta.homepage = "https://github.com/romainl/vim-qf/"; }; - vim-qlist = buildVimPluginFrom2Nix { + vim-qlist = buildVimPlugin { pname = "vim-qlist"; version = "2019-07-18"; src = fetchFromGitHub { @@ -14038,7 +14026,7 @@ final: prev: meta.homepage = "https://github.com/romainl/vim-qlist/"; }; - vim-qml = buildVimPluginFrom2Nix { + vim-qml = buildVimPlugin { pname = "vim-qml"; version = "2023-09-11"; src = fetchFromGitHub { @@ -14050,7 +14038,7 @@ final: prev: meta.homepage = "https://github.com/peterhoeg/vim-qml/"; }; - vim-quickrun = buildVimPluginFrom2Nix { + vim-quickrun = buildVimPlugin { pname = "vim-quickrun"; version = "2022-07-10"; src = fetchFromGitHub { @@ -14062,7 +14050,7 @@ final: prev: meta.homepage = "https://github.com/thinca/vim-quickrun/"; }; - vim-racer = buildVimPluginFrom2Nix { + vim-racer = buildVimPlugin { pname = "vim-racer"; version = "2021-04-04"; src = fetchFromGitHub { @@ -14074,7 +14062,7 @@ final: prev: meta.homepage = "https://github.com/racer-rust/vim-racer/"; }; - vim-racket = buildVimPluginFrom2Nix { + vim-racket = buildVimPlugin { pname = "vim-racket"; version = "2022-12-30"; src = fetchFromGitHub { @@ -14086,7 +14074,7 @@ final: prev: meta.homepage = "https://github.com/wlangstroth/vim-racket/"; }; - vim-ragtag = buildVimPluginFrom2Nix { + vim-ragtag = buildVimPlugin { pname = "vim-ragtag"; version = "2022-03-21"; src = fetchFromGitHub { @@ -14098,7 +14086,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-ragtag/"; }; - vim-rails = buildVimPluginFrom2Nix { + vim-rails = buildVimPlugin { pname = "vim-rails"; version = "2023-09-11"; src = fetchFromGitHub { @@ -14110,7 +14098,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-rails/"; }; - vim-reasonml = buildVimPluginFrom2Nix { + vim-reasonml = buildVimPlugin { pname = "vim-reasonml"; version = "2020-07-16"; src = fetchFromGitHub { @@ -14122,7 +14110,7 @@ final: prev: meta.homepage = "https://github.com/jordwalke/vim-reasonml/"; }; - vim-repeat = buildVimPluginFrom2Nix { + vim-repeat = buildVimPlugin { pname = "vim-repeat"; version = "2021-01-25"; src = fetchFromGitHub { @@ -14134,7 +14122,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-repeat/"; }; - vim-rhubarb = buildVimPluginFrom2Nix { + vim-rhubarb = buildVimPlugin { pname = "vim-rhubarb"; version = "2023-03-29"; src = fetchFromGitHub { @@ -14146,7 +14134,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-rhubarb/"; }; - vim-rooter = buildVimPluginFrom2Nix { + vim-rooter = buildVimPlugin { pname = "vim-rooter"; version = "2023-09-14"; src = fetchFromGitHub { @@ -14158,7 +14146,7 @@ final: prev: meta.homepage = "https://github.com/airblade/vim-rooter/"; }; - vim-rsi = buildVimPluginFrom2Nix { + vim-rsi = buildVimPlugin { pname = "vim-rsi"; version = "2023-04-30"; src = fetchFromGitHub { @@ -14170,7 +14158,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-rsi/"; }; - vim-ruby = buildVimPluginFrom2Nix { + vim-ruby = buildVimPlugin { pname = "vim-ruby"; version = "2023-09-15"; src = fetchFromGitHub { @@ -14182,7 +14170,7 @@ final: prev: meta.homepage = "https://github.com/vim-ruby/vim-ruby/"; }; - vim-salve = buildVimPluginFrom2Nix { + vim-salve = buildVimPlugin { pname = "vim-salve"; version = "2022-04-15"; src = fetchFromGitHub { @@ -14194,7 +14182,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-salve/"; }; - vim-sandwich = buildVimPluginFrom2Nix { + vim-sandwich = buildVimPlugin { pname = "vim-sandwich"; version = "2022-12-07"; src = fetchFromGitHub { @@ -14206,7 +14194,7 @@ final: prev: meta.homepage = "https://github.com/machakann/vim-sandwich/"; }; - vim-sayonara = buildVimPluginFrom2Nix { + vim-sayonara = buildVimPlugin { pname = "vim-sayonara"; version = "2021-08-12"; src = fetchFromGitHub { @@ -14218,7 +14206,7 @@ final: prev: meta.homepage = "https://github.com/mhinz/vim-sayonara/"; }; - vim-scala = buildVimPluginFrom2Nix { + vim-scala = buildVimPlugin { pname = "vim-scala"; version = "2021-08-11"; src = fetchFromGitHub { @@ -14230,7 +14218,7 @@ final: prev: meta.homepage = "https://github.com/derekwyatt/vim-scala/"; }; - vim-scouter = buildVimPluginFrom2Nix { + vim-scouter = buildVimPlugin { pname = "vim-scouter"; version = "2014-08-10"; src = fetchFromGitHub { @@ -14242,7 +14230,7 @@ final: prev: meta.homepage = "https://github.com/thinca/vim-scouter/"; }; - vim-scriptease = buildVimPluginFrom2Nix { + vim-scriptease = buildVimPlugin { pname = "vim-scriptease"; version = "2022-05-30"; src = fetchFromGitHub { @@ -14254,7 +14242,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-scriptease/"; }; - vim-search-pulse = buildVimPluginFrom2Nix { + vim-search-pulse = buildVimPlugin { pname = "vim-search-pulse"; version = "2022-04-26"; src = fetchFromGitHub { @@ -14266,7 +14254,7 @@ final: prev: meta.homepage = "https://github.com/inside/vim-search-pulse/"; }; - vim-sensible = buildVimPluginFrom2Nix { + vim-sensible = buildVimPlugin { pname = "vim-sensible"; version = "2023-03-29"; src = fetchFromGitHub { @@ -14278,7 +14266,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-sensible/"; }; - vim-sentence-chopper = buildVimPluginFrom2Nix { + vim-sentence-chopper = buildVimPlugin { pname = "vim-sentence-chopper"; version = "2023-02-15"; src = fetchFromGitHub { @@ -14290,7 +14278,7 @@ final: prev: meta.homepage = "https://github.com/Konfekt/vim-sentence-chopper/"; }; - vim-sexp = buildVimPluginFrom2Nix { + vim-sexp = buildVimPlugin { pname = "vim-sexp"; version = "2021-03-08"; src = fetchFromGitHub { @@ -14302,7 +14290,7 @@ final: prev: meta.homepage = "https://github.com/guns/vim-sexp/"; }; - vim-sexp-mappings-for-regular-people = buildVimPluginFrom2Nix { + vim-sexp-mappings-for-regular-people = buildVimPlugin { pname = "vim-sexp-mappings-for-regular-people"; version = "2022-11-26"; src = fetchFromGitHub { @@ -14314,7 +14302,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-sexp-mappings-for-regular-people/"; }; - vim-shellcheck = buildVimPluginFrom2Nix { + vim-shellcheck = buildVimPlugin { pname = "vim-shellcheck"; version = "2019-07-25"; src = fetchFromGitHub { @@ -14326,7 +14314,7 @@ final: prev: meta.homepage = "https://github.com/itspriddle/vim-shellcheck/"; }; - vim-signature = buildVimPluginFrom2Nix { + vim-signature = buildVimPlugin { pname = "vim-signature"; version = "2018-07-06"; src = fetchFromGitHub { @@ -14338,7 +14326,7 @@ final: prev: meta.homepage = "https://github.com/kshenoy/vim-signature/"; }; - vim-signify = buildVimPluginFrom2Nix { + vim-signify = buildVimPlugin { pname = "vim-signify"; version = "2023-05-10"; src = fetchFromGitHub { @@ -14350,7 +14338,7 @@ final: prev: meta.homepage = "https://github.com/mhinz/vim-signify/"; }; - vim-simpledb = buildVimPluginFrom2Nix { + vim-simpledb = buildVimPlugin { pname = "vim-simpledb"; version = "2020-10-02"; src = fetchFromGitHub { @@ -14362,7 +14350,7 @@ final: prev: meta.homepage = "https://github.com/ivalkeen/vim-simpledb/"; }; - vim-slash = buildVimPluginFrom2Nix { + vim-slash = buildVimPlugin { pname = "vim-slash"; version = "2019-08-28"; src = fetchFromGitHub { @@ -14374,7 +14362,7 @@ final: prev: meta.homepage = "https://github.com/junegunn/vim-slash/"; }; - vim-sleuth = buildVimPluginFrom2Nix { + vim-sleuth = buildVimPlugin { pname = "vim-sleuth"; version = "2023-01-10"; src = fetchFromGitHub { @@ -14386,19 +14374,19 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-sleuth/"; }; - vim-slime = buildVimPluginFrom2Nix { + vim-slime = buildVimPlugin { pname = "vim-slime"; - version = "2023-08-29"; + version = "2023-09-29"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "7cfe5ac9f5d5512a7aeeb2e0a13a64975ac129e5"; - sha256 = "1lzvsdzpmrsdacxy73a6jnji3b3rjq3qm1r3qk4l46291xn8b9cw"; + rev = "3c523dd9d12f96703d07fa35e75d1afe45eecd96"; + sha256 = "0j9db2lvlzizhxf5arg3rfb1cxdsnqa3f8ri7afpl9n2zsa5prp0"; }; meta.homepage = "https://github.com/jpalardy/vim-slime/"; }; - vim-smali = buildVimPluginFrom2Nix { + vim-smali = buildVimPlugin { pname = "vim-smali"; version = "2015-11-05"; src = fetchFromGitHub { @@ -14410,7 +14398,7 @@ final: prev: meta.homepage = "https://github.com/mzlogin/vim-smali/"; }; - vim-smalls = buildVimPluginFrom2Nix { + vim-smalls = buildVimPlugin { pname = "vim-smalls"; version = "2015-05-02"; src = fetchFromGitHub { @@ -14422,7 +14410,7 @@ final: prev: meta.homepage = "https://github.com/t9md/vim-smalls/"; }; - vim-smartbd = buildVimPluginFrom2Nix { + vim-smartbd = buildVimPlugin { pname = "vim-smartbd"; version = "2015-12-20"; src = fetchFromGitHub { @@ -14434,7 +14422,7 @@ final: prev: meta.homepage = "https://github.com/Industrial/vim-smartbd/"; }; - vim-smartbw = buildVimPluginFrom2Nix { + vim-smartbw = buildVimPlugin { pname = "vim-smartbw"; version = "2015-12-20"; src = fetchFromGitHub { @@ -14446,7 +14434,7 @@ final: prev: meta.homepage = "https://github.com/Industrial/vim-smartbw/"; }; - vim-smoothie = buildVimPluginFrom2Nix { + vim-smoothie = buildVimPlugin { pname = "vim-smoothie"; version = "2022-06-10"; src = fetchFromGitHub { @@ -14458,7 +14446,7 @@ final: prev: meta.homepage = "https://github.com/psliwka/vim-smoothie/"; }; - vim-smt2 = buildVimPluginFrom2Nix { + vim-smt2 = buildVimPlugin { pname = "vim-smt2"; version = "2023-05-17"; src = fetchFromGitHub { @@ -14470,7 +14458,7 @@ final: prev: meta.homepage = "https://github.com/bohlender/vim-smt2/"; }; - vim-sneak = buildVimPluginFrom2Nix { + vim-sneak = buildVimPlugin { pname = "vim-sneak"; version = "2023-07-12"; src = fetchFromGitHub { @@ -14482,7 +14470,7 @@ final: prev: meta.homepage = "https://github.com/justinmk/vim-sneak/"; }; - vim-snipmate = buildVimPluginFrom2Nix { + vim-snipmate = buildVimPlugin { pname = "vim-snipmate"; version = "2023-03-12"; src = fetchFromGitHub { @@ -14494,7 +14482,7 @@ final: prev: meta.homepage = "https://github.com/garbas/vim-snipmate/"; }; - vim-snippets = buildVimPluginFrom2Nix { + vim-snippets = buildVimPlugin { pname = "vim-snippets"; version = "2023-09-11"; src = fetchFromGitHub { @@ -14506,7 +14494,7 @@ final: prev: meta.homepage = "https://github.com/honza/vim-snippets/"; }; - vim-solarized8 = buildVimPluginFrom2Nix { + vim-solarized8 = buildVimPlugin { pname = "vim-solarized8"; version = "2023-08-13"; src = fetchFromGitHub { @@ -14518,7 +14506,7 @@ final: prev: meta.homepage = "https://github.com/lifepillar/vim-solarized8/"; }; - vim-solidity = buildVimPluginFrom2Nix { + vim-solidity = buildVimPlugin { pname = "vim-solidity"; version = "2018-04-17"; src = fetchFromGitHub { @@ -14530,7 +14518,7 @@ final: prev: meta.homepage = "https://github.com/tomlion/vim-solidity/"; }; - vim-sort-motion = buildVimPluginFrom2Nix { + vim-sort-motion = buildVimPlugin { pname = "vim-sort-motion"; version = "2021-03-07"; src = fetchFromGitHub { @@ -14542,7 +14530,7 @@ final: prev: meta.homepage = "https://github.com/christoomey/vim-sort-motion/"; }; - vim-speeddating = buildVimPluginFrom2Nix { + vim-speeddating = buildVimPlugin { pname = "vim-speeddating"; version = "2022-10-10"; src = fetchFromGitHub { @@ -14554,7 +14542,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-speeddating/"; }; - vim-spirv = buildVimPluginFrom2Nix { + vim-spirv = buildVimPlugin { pname = "vim-spirv"; version = "2023-09-16"; src = fetchFromGitHub { @@ -14566,19 +14554,19 @@ final: prev: meta.homepage = "https://github.com/kbenzie/vim-spirv/"; }; - vim-startify = buildVimPluginFrom2Nix { + vim-startify = buildVimPlugin { pname = "vim-startify"; - version = "2021-05-08"; + version = "2023-09-20"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-startify"; - rev = "81e36c352a8deea54df5ec1e2f4348685569bed2"; - sha256 = "1y8yi099lqg03781bnma2bj6x5lkvfq65vhdpnm65mfyak6dpzgz"; + rev = "4e089dffdad46f3f5593f34362d530e8fe823dcf"; + sha256 = "1ycqfqnmalqzrx1yy9a1fc2p0w922x4sqv2222bi9xjzmh77z4sv"; }; meta.homepage = "https://github.com/mhinz/vim-startify/"; }; - vim-startuptime = buildVimPluginFrom2Nix { + vim-startuptime = buildVimPlugin { pname = "vim-startuptime"; version = "2023-06-03"; src = fetchFromGitHub { @@ -14590,7 +14578,7 @@ final: prev: meta.homepage = "https://github.com/dstein64/vim-startuptime/"; }; - vim-strip-trailing-whitespace = buildVimPluginFrom2Nix { + vim-strip-trailing-whitespace = buildVimPlugin { pname = "vim-strip-trailing-whitespace"; version = "2022-02-01"; src = fetchFromGitHub { @@ -14602,7 +14590,7 @@ final: prev: meta.homepage = "https://github.com/axelf4/vim-strip-trailing-whitespace/"; }; - vim-stylish-haskell = buildVimPluginFrom2Nix { + vim-stylish-haskell = buildVimPlugin { pname = "vim-stylish-haskell"; version = "2022-08-08"; src = fetchFromGitHub { @@ -14614,7 +14602,7 @@ final: prev: meta.homepage = "https://github.com/nbouscal/vim-stylish-haskell/"; }; - vim-stylishask = buildVimPluginFrom2Nix { + vim-stylishask = buildVimPlugin { pname = "vim-stylishask"; version = "2021-09-10"; src = fetchFromGitHub { @@ -14626,7 +14614,7 @@ final: prev: meta.homepage = "https://github.com/alx741/vim-stylishask/"; }; - vim-substrata = buildVimPluginFrom2Nix { + vim-substrata = buildVimPlugin { pname = "vim-substrata"; version = "2021-03-23"; src = fetchFromGitHub { @@ -14638,7 +14626,7 @@ final: prev: meta.homepage = "https://github.com/lunacookies/vim-substrata/"; }; - vim-subversive = buildVimPluginFrom2Nix { + vim-subversive = buildVimPlugin { pname = "vim-subversive"; version = "2022-01-26"; src = fetchFromGitHub { @@ -14650,7 +14638,7 @@ final: prev: meta.homepage = "https://github.com/svermeulen/vim-subversive/"; }; - vim-surround = buildVimPluginFrom2Nix { + vim-surround = buildVimPlugin { pname = "vim-surround"; version = "2022-10-25"; src = fetchFromGitHub { @@ -14662,7 +14650,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-surround/"; }; - vim-svelte = buildVimPluginFrom2Nix { + vim-svelte = buildVimPlugin { pname = "vim-svelte"; version = "2022-10-27"; src = fetchFromGitHub { @@ -14674,7 +14662,7 @@ final: prev: meta.homepage = "https://github.com/evanleck/vim-svelte/"; }; - vim-swap = buildVimPluginFrom2Nix { + vim-swap = buildVimPlugin { pname = "vim-swap"; version = "2021-08-08"; src = fetchFromGitHub { @@ -14686,7 +14674,7 @@ final: prev: meta.homepage = "https://github.com/machakann/vim-swap/"; }; - vim-table-mode = buildVimPluginFrom2Nix { + vim-table-mode = buildVimPlugin { pname = "vim-table-mode"; version = "2022-10-20"; src = fetchFromGitHub { @@ -14698,7 +14686,7 @@ final: prev: meta.homepage = "https://github.com/dhruvasagar/vim-table-mode/"; }; - vim-tabpagecd = buildVimPluginFrom2Nix { + vim-tabpagecd = buildVimPlugin { pname = "vim-tabpagecd"; version = "2021-09-23"; src = fetchFromGitHub { @@ -14710,7 +14698,7 @@ final: prev: meta.homepage = "https://github.com/kana/vim-tabpagecd/"; }; - vim-tbone = buildVimPluginFrom2Nix { + vim-tbone = buildVimPlugin { pname = "vim-tbone"; version = "2023-03-31"; src = fetchFromGitHub { @@ -14722,7 +14710,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-tbone/"; }; - vim-teal = buildVimPluginFrom2Nix { + vim-teal = buildVimPlugin { pname = "vim-teal"; version = "2021-01-05"; src = fetchFromGitHub { @@ -14734,7 +14722,7 @@ final: prev: meta.homepage = "https://github.com/teal-language/vim-teal/"; }; - vim-terminator = buildVimPluginFrom2Nix { + vim-terminator = buildVimPlugin { pname = "vim-terminator"; version = "2022-04-15"; src = fetchFromGitHub { @@ -14746,7 +14734,7 @@ final: prev: meta.homepage = "https://github.com/erietz/vim-terminator/"; }; - vim-terraform = buildVimPluginFrom2Nix { + vim-terraform = buildVimPlugin { pname = "vim-terraform"; version = "2023-04-26"; src = fetchFromGitHub { @@ -14758,7 +14746,7 @@ final: prev: meta.homepage = "https://github.com/hashivim/vim-terraform/"; }; - vim-terraform-completion = buildVimPluginFrom2Nix { + vim-terraform-completion = buildVimPlugin { pname = "vim-terraform-completion"; version = "2021-04-11"; src = fetchFromGitHub { @@ -14771,19 +14759,19 @@ final: prev: meta.homepage = "https://github.com/juliosueiras/vim-terraform-completion/"; }; - vim-test = buildVimPluginFrom2Nix { + vim-test = buildVimPlugin { pname = "vim-test"; - version = "2023-09-15"; + version = "2023-09-30"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "a007258adc7b319943bf71dfead88d2ad721b923"; - sha256 = "0sk2bfk54ds22sri1a3jw4fmn2nw1cr06hlwmclxd8gpaxqv6rmh"; + rev = "53c6c72f3a0c6a24a74e659eaa769d7057ef2ecd"; + sha256 = "0y36ckap8z07b3ayj53l9drz1m4wrg0fd12q8p0cyhhghf0g8s2i"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; - vim-textobj-comment = buildVimPluginFrom2Nix { + vim-textobj-comment = buildVimPlugin { pname = "vim-textobj-comment"; version = "2014-04-11"; src = fetchFromGitHub { @@ -14795,7 +14783,7 @@ final: prev: meta.homepage = "https://github.com/glts/vim-textobj-comment/"; }; - vim-textobj-entire = buildVimPluginFrom2Nix { + vim-textobj-entire = buildVimPlugin { pname = "vim-textobj-entire"; version = "2018-01-19"; src = fetchFromGitHub { @@ -14807,7 +14795,7 @@ final: prev: meta.homepage = "https://github.com/kana/vim-textobj-entire/"; }; - vim-textobj-function = buildVimPluginFrom2Nix { + vim-textobj-function = buildVimPlugin { pname = "vim-textobj-function"; version = "2014-05-03"; src = fetchFromGitHub { @@ -14819,7 +14807,7 @@ final: prev: meta.homepage = "https://github.com/kana/vim-textobj-function/"; }; - vim-textobj-haskell = buildVimPluginFrom2Nix { + vim-textobj-haskell = buildVimPlugin { pname = "vim-textobj-haskell"; version = "2014-10-27"; src = fetchFromGitHub { @@ -14831,7 +14819,7 @@ final: prev: meta.homepage = "https://github.com/gibiansky/vim-textobj-haskell/"; }; - vim-textobj-multiblock = buildVimPluginFrom2Nix { + vim-textobj-multiblock = buildVimPlugin { pname = "vim-textobj-multiblock"; version = "2014-06-02"; src = fetchFromGitHub { @@ -14843,7 +14831,7 @@ final: prev: meta.homepage = "https://github.com/osyo-manga/vim-textobj-multiblock/"; }; - vim-textobj-user = buildVimPluginFrom2Nix { + vim-textobj-user = buildVimPlugin { pname = "vim-textobj-user"; version = "2020-02-21"; src = fetchFromGitHub { @@ -14855,7 +14843,7 @@ final: prev: meta.homepage = "https://github.com/kana/vim-textobj-user/"; }; - vim-textobj-variable-segment = buildVimPluginFrom2Nix { + vim-textobj-variable-segment = buildVimPlugin { pname = "vim-textobj-variable-segment"; version = "2022-07-16"; src = fetchFromGitHub { @@ -14867,7 +14855,7 @@ final: prev: meta.homepage = "https://github.com/Julian/vim-textobj-variable-segment/"; }; - vim-themis = buildVimPluginFrom2Nix { + vim-themis = buildVimPlugin { pname = "vim-themis"; version = "2021-12-03"; src = fetchFromGitHub { @@ -14879,7 +14867,7 @@ final: prev: meta.homepage = "https://github.com/thinca/vim-themis/"; }; - vim-tmux = buildVimPluginFrom2Nix { + vim-tmux = buildVimPlugin { pname = "vim-tmux"; version = "2021-10-04"; src = fetchFromGitHub { @@ -14891,7 +14879,7 @@ final: prev: meta.homepage = "https://github.com/tmux-plugins/vim-tmux/"; }; - vim-tmux-clipboard = buildVimPluginFrom2Nix { + vim-tmux-clipboard = buildVimPlugin { pname = "vim-tmux-clipboard"; version = "2023-04-24"; src = fetchFromGitHub { @@ -14903,7 +14891,7 @@ final: prev: meta.homepage = "https://github.com/roxma/vim-tmux-clipboard/"; }; - vim-tmux-focus-events = buildVimPluginFrom2Nix { + vim-tmux-focus-events = buildVimPlugin { pname = "vim-tmux-focus-events"; version = "2021-04-27"; src = fetchFromGitHub { @@ -14915,19 +14903,19 @@ final: prev: meta.homepage = "https://github.com/tmux-plugins/vim-tmux-focus-events/"; }; - vim-tmux-navigator = buildVimPluginFrom2Nix { + vim-tmux-navigator = buildVimPlugin { pname = "vim-tmux-navigator"; - version = "2023-08-20"; + version = "2023-09-16"; src = fetchFromGitHub { owner = "christoomey"; repo = "vim-tmux-navigator"; - rev = "addb64a772cb4a3ae1f1363583012b2cada2cd66"; - sha256 = "0vnsjcslz3w02jlkvpnld8wjb73qpninylp0alpniwqyjm43nrl9"; + rev = "7db70e08ea03b3e4d91f63713d76134512e28d7e"; + sha256 = "05mz1lpc0akanxf7pcrlwp08v84x69ah6042cc2pzqsjj5l24a64"; }; meta.homepage = "https://github.com/christoomey/vim-tmux-navigator/"; }; - vim-togglelist = buildVimPluginFrom2Nix { + vim-togglelist = buildVimPlugin { pname = "vim-togglelist"; version = "2021-12-08"; src = fetchFromGitHub { @@ -14939,7 +14927,7 @@ final: prev: meta.homepage = "https://github.com/milkypostman/vim-togglelist/"; }; - vim-toml = buildVimPluginFrom2Nix { + vim-toml = buildVimPlugin { pname = "vim-toml"; version = "2022-09-24"; src = fetchFromGitHub { @@ -14951,7 +14939,7 @@ final: prev: meta.homepage = "https://github.com/cespare/vim-toml/"; }; - vim-tpipeline = buildVimPluginFrom2Nix { + vim-tpipeline = buildVimPlugin { pname = "vim-tpipeline"; version = "2023-09-10"; src = fetchFromGitHub { @@ -14963,7 +14951,7 @@ final: prev: meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; - vim-trailing-whitespace = buildVimPluginFrom2Nix { + vim-trailing-whitespace = buildVimPlugin { pname = "vim-trailing-whitespace"; version = "2023-02-28"; src = fetchFromGitHub { @@ -14975,7 +14963,7 @@ final: prev: meta.homepage = "https://github.com/bronson/vim-trailing-whitespace/"; }; - vim-tridactyl = buildVimPluginFrom2Nix { + vim-tridactyl = buildVimPlugin { pname = "vim-tridactyl"; version = "2022-11-30"; src = fetchFromGitHub { @@ -14987,7 +14975,7 @@ final: prev: meta.homepage = "https://github.com/tridactyl/vim-tridactyl/"; }; - vim-tsx = buildVimPluginFrom2Nix { + vim-tsx = buildVimPlugin { pname = "vim-tsx"; version = "2017-03-16"; src = fetchFromGitHub { @@ -14999,7 +14987,7 @@ final: prev: meta.homepage = "https://github.com/ianks/vim-tsx/"; }; - vim-twig = buildVimPluginFrom2Nix { + vim-twig = buildVimPlugin { pname = "vim-twig"; version = "2018-05-23"; src = fetchFromGitHub { @@ -15011,7 +14999,7 @@ final: prev: meta.homepage = "https://github.com/lumiliet/vim-twig/"; }; - vim-twiggy = buildVimPluginFrom2Nix { + vim-twiggy = buildVimPlugin { pname = "vim-twiggy"; version = "2022-01-10"; src = fetchFromGitHub { @@ -15023,7 +15011,7 @@ final: prev: meta.homepage = "https://github.com/sodapopcan/vim-twiggy/"; }; - vim-ultest = buildVimPluginFrom2Nix { + vim-ultest = buildVimPlugin { pname = "vim-ultest"; version = "2023-02-09"; src = fetchFromGitHub { @@ -15035,7 +15023,7 @@ final: prev: meta.homepage = "https://github.com/rcarriga/vim-ultest/"; }; - vim-unicoder = buildVimPluginFrom2Nix { + vim-unicoder = buildVimPlugin { pname = "vim-unicoder"; version = "2019-04-16"; src = fetchFromGitHub { @@ -15047,7 +15035,7 @@ final: prev: meta.homepage = "https://github.com/arthurxavierx/vim-unicoder/"; }; - vim-unimpaired = buildVimPluginFrom2Nix { + vim-unimpaired = buildVimPlugin { pname = "vim-unimpaired"; version = "2022-11-21"; src = fetchFromGitHub { @@ -15059,7 +15047,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-unimpaired/"; }; - vim-vagrant = buildVimPluginFrom2Nix { + vim-vagrant = buildVimPlugin { pname = "vim-vagrant"; version = "2018-11-11"; src = fetchFromGitHub { @@ -15071,7 +15059,7 @@ final: prev: meta.homepage = "https://github.com/hashivim/vim-vagrant/"; }; - vim-vinegar = buildVimPluginFrom2Nix { + vim-vinegar = buildVimPlugin { pname = "vim-vinegar"; version = "2022-01-11"; src = fetchFromGitHub { @@ -15083,7 +15071,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-vinegar/"; }; - vim-visual-increment = buildVimPluginFrom2Nix { + vim-visual-increment = buildVimPlugin { pname = "vim-visual-increment"; version = "2020-05-03"; src = fetchFromGitHub { @@ -15095,7 +15083,7 @@ final: prev: meta.homepage = "https://github.com/triglav/vim-visual-increment/"; }; - vim-visual-multi = buildVimPluginFrom2Nix { + vim-visual-multi = buildVimPlugin { pname = "vim-visual-multi"; version = "2022-09-14"; src = fetchFromGitHub { @@ -15107,7 +15095,7 @@ final: prev: meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; - vim-visual-star-search = buildVimPluginFrom2Nix { + vim-visual-star-search = buildVimPlugin { pname = "vim-visual-star-search"; version = "2021-07-14"; src = fetchFromGitHub { @@ -15119,7 +15107,7 @@ final: prev: meta.homepage = "https://github.com/bronson/vim-visual-star-search/"; }; - vim-visualstar = buildVimPluginFrom2Nix { + vim-visualstar = buildVimPlugin { pname = "vim-visualstar"; version = "2015-08-27"; src = fetchFromGitHub { @@ -15131,7 +15119,7 @@ final: prev: meta.homepage = "https://github.com/thinca/vim-visualstar/"; }; - vim-vp4 = buildVimPluginFrom2Nix { + vim-vp4 = buildVimPlugin { pname = "vim-vp4"; version = "2022-06-06"; src = fetchFromGitHub { @@ -15143,7 +15131,7 @@ final: prev: meta.homepage = "https://github.com/ngemily/vim-vp4/"; }; - vim-vsnip = buildVimPluginFrom2Nix { + vim-vsnip = buildVimPlugin { pname = "vim-vsnip"; version = "2023-09-15"; src = fetchFromGitHub { @@ -15155,7 +15143,7 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; - vim-vsnip-integ = buildVimPluginFrom2Nix { + vim-vsnip-integ = buildVimPlugin { pname = "vim-vsnip-integ"; version = "2023-07-01"; src = fetchFromGitHub { @@ -15167,7 +15155,7 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/vim-vsnip-integ/"; }; - vim-vue = buildVimPluginFrom2Nix { + vim-vue = buildVimPlugin { pname = "vim-vue"; version = "2019-08-03"; src = fetchFromGitHub { @@ -15179,7 +15167,7 @@ final: prev: meta.homepage = "https://github.com/posva/vim-vue/"; }; - vim-vue-plugin = buildVimPluginFrom2Nix { + vim-vue-plugin = buildVimPlugin { pname = "vim-vue-plugin"; version = "2023-02-02"; src = fetchFromGitHub { @@ -15191,7 +15179,7 @@ final: prev: meta.homepage = "https://github.com/leafOfTree/vim-vue-plugin/"; }; - vim-wakatime = buildVimPluginFrom2Nix { + vim-wakatime = buildVimPlugin { pname = "vim-wakatime"; version = "2023-08-16"; src = fetchFromGitHub { @@ -15203,7 +15191,7 @@ final: prev: meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; - vim-watchdogs = buildVimPluginFrom2Nix { + vim-watchdogs = buildVimPlugin { pname = "vim-watchdogs"; version = "2019-09-09"; src = fetchFromGitHub { @@ -15215,7 +15203,7 @@ final: prev: meta.homepage = "https://github.com/osyo-manga/vim-watchdogs/"; }; - vim-wayland-clipboard = buildVimPluginFrom2Nix { + vim-wayland-clipboard = buildVimPlugin { pname = "vim-wayland-clipboard"; version = "2023-09-08"; src = fetchFromGitHub { @@ -15227,7 +15215,7 @@ final: prev: meta.homepage = "https://github.com/jasonccox/vim-wayland-clipboard/"; }; - vim-which-key = buildVimPluginFrom2Nix { + vim-which-key = buildVimPlugin { pname = "vim-which-key"; version = "2023-09-14"; src = fetchFromGitHub { @@ -15239,7 +15227,7 @@ final: prev: meta.homepage = "https://github.com/liuchengxu/vim-which-key/"; }; - vim-windowswap = buildVimPluginFrom2Nix { + vim-windowswap = buildVimPlugin { pname = "vim-windowswap"; version = "2018-05-16"; src = fetchFromGitHub { @@ -15251,7 +15239,7 @@ final: prev: meta.homepage = "https://github.com/wesQ3/vim-windowswap/"; }; - vim-wordmotion = buildVimPluginFrom2Nix { + vim-wordmotion = buildVimPlugin { pname = "vim-wordmotion"; version = "2023-02-26"; src = fetchFromGitHub { @@ -15263,7 +15251,7 @@ final: prev: meta.homepage = "https://github.com/chaoren/vim-wordmotion/"; }; - vim-wordy = buildVimPluginFrom2Nix { + vim-wordy = buildVimPlugin { pname = "vim-wordy"; version = "2022-02-13"; src = fetchFromGitHub { @@ -15275,7 +15263,7 @@ final: prev: meta.homepage = "https://github.com/preservim/vim-wordy/"; }; - vim-xdebug = buildVimPluginFrom2Nix { + vim-xdebug = buildVimPlugin { pname = "vim-xdebug"; version = "2012-08-15"; src = fetchFromGitHub { @@ -15287,7 +15275,7 @@ final: prev: meta.homepage = "https://github.com/joonty/vim-xdebug/"; }; - vim-xkbswitch = buildVimPluginFrom2Nix { + vim-xkbswitch = buildVimPlugin { pname = "vim-xkbswitch"; version = "2023-05-11"; src = fetchFromGitHub { @@ -15299,7 +15287,7 @@ final: prev: meta.homepage = "https://github.com/lyokha/vim-xkbswitch/"; }; - vim-xtabline = buildVimPluginFrom2Nix { + vim-xtabline = buildVimPlugin { pname = "vim-xtabline"; version = "2022-02-03"; src = fetchFromGitHub { @@ -15311,7 +15299,7 @@ final: prev: meta.homepage = "https://github.com/mg979/vim-xtabline/"; }; - vim-yaml = buildVimPluginFrom2Nix { + vim-yaml = buildVimPlugin { pname = "vim-yaml"; version = "2021-01-14"; src = fetchFromGitHub { @@ -15323,7 +15311,7 @@ final: prev: meta.homepage = "https://github.com/stephpy/vim-yaml/"; }; - vim-yapf = buildVimPluginFrom2Nix { + vim-yapf = buildVimPlugin { pname = "vim-yapf"; version = "2018-10-04"; src = fetchFromGitHub { @@ -15335,7 +15323,7 @@ final: prev: meta.homepage = "https://github.com/simonrw/vim-yapf/"; }; - vim-zettel = buildVimPluginFrom2Nix { + vim-zettel = buildVimPlugin { pname = "vim-zettel"; version = "2023-08-17"; src = fetchFromGitHub { @@ -15347,7 +15335,7 @@ final: prev: meta.homepage = "https://github.com/michal-h21/vim-zettel/"; }; - vim2hs = buildVimPluginFrom2Nix { + vim2hs = buildVimPlugin { pname = "vim2hs"; version = "2014-04-16"; src = fetchFromGitHub { @@ -15359,7 +15347,7 @@ final: prev: meta.homepage = "https://github.com/dag/vim2hs/"; }; - vim9-stargate = buildVimPluginFrom2Nix { + vim9-stargate = buildVimPlugin { pname = "vim9-stargate"; version = "2023-01-21"; src = fetchFromGitHub { @@ -15371,7 +15359,7 @@ final: prev: meta.homepage = "https://github.com/monkoose/vim9-stargate/"; }; - vim_current_word = buildVimPluginFrom2Nix { + vim_current_word = buildVimPlugin { pname = "vim_current_word"; version = "2023-05-23"; src = fetchFromGitHub { @@ -15383,7 +15371,7 @@ final: prev: meta.homepage = "https://github.com/dominikduda/vim_current_word/"; }; - vimacs = buildVimPluginFrom2Nix { + vimacs = buildVimPlugin { pname = "vimacs"; version = "2016-03-24"; src = fetchFromGitHub { @@ -15395,7 +15383,7 @@ final: prev: meta.homepage = "https://github.com/andrep/vimacs/"; }; - vimade = buildVimPluginFrom2Nix { + vimade = buildVimPlugin { pname = "vimade"; version = "2022-01-31"; src = fetchFromGitHub { @@ -15407,7 +15395,7 @@ final: prev: meta.homepage = "https://github.com/TaDaa/vimade/"; }; - vimagit = buildVimPluginFrom2Nix { + vimagit = buildVimPlugin { pname = "vimagit"; version = "2022-07-03"; src = fetchFromGitHub { @@ -15419,7 +15407,7 @@ final: prev: meta.homepage = "https://github.com/jreybert/vimagit/"; }; - vimelette = buildVimPluginFrom2Nix { + vimelette = buildVimPlugin { pname = "vimelette"; version = "2019-05-02"; src = fetchFromGitHub { @@ -15431,7 +15419,7 @@ final: prev: meta.homepage = "https://github.com/gotcha/vimelette/"; }; - vimfiler-vim = buildVimPluginFrom2Nix { + vimfiler-vim = buildVimPlugin { pname = "vimfiler.vim"; version = "2023-05-18"; src = fetchFromGitHub { @@ -15443,7 +15431,7 @@ final: prev: meta.homepage = "https://github.com/Shougo/vimfiler.vim/"; }; - vimoutliner = buildVimPluginFrom2Nix { + vimoutliner = buildVimPlugin { pname = "vimoutliner"; version = "2023-08-29"; src = fetchFromGitHub { @@ -15455,7 +15443,7 @@ final: prev: meta.homepage = "https://github.com/vimoutliner/vimoutliner/"; }; - vimpreviewpandoc = buildVimPluginFrom2Nix { + vimpreviewpandoc = buildVimPlugin { pname = "vimpreviewpandoc"; version = "2023-08-14"; src = fetchFromGitHub { @@ -15467,7 +15455,7 @@ final: prev: meta.homepage = "https://github.com/tex/vimpreviewpandoc/"; }; - vimproc-vim = buildVimPluginFrom2Nix { + vimproc-vim = buildVimPlugin { pname = "vimproc.vim"; version = "2023-01-05"; src = fetchFromGitHub { @@ -15479,7 +15467,7 @@ final: prev: meta.homepage = "https://github.com/Shougo/vimproc.vim/"; }; - vimsence = buildVimPluginFrom2Nix { + vimsence = buildVimPlugin { pname = "vimsence"; version = "2021-05-01"; src = fetchFromGitHub { @@ -15491,7 +15479,7 @@ final: prev: meta.homepage = "https://github.com/vimsence/vimsence/"; }; - vimshell-vim = buildVimPluginFrom2Nix { + vimshell-vim = buildVimPlugin { pname = "vimshell.vim"; version = "2019-07-16"; src = fetchFromGitHub { @@ -15503,32 +15491,32 @@ final: prev: meta.homepage = "https://github.com/Shougo/vimshell.vim/"; }; - vimspector = buildVimPluginFrom2Nix { + vimspector = buildVimPlugin { pname = "vimspector"; - version = "2023-09-10"; + version = "2023-09-25"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "bee01e1186a65f551de456b0a6eea5b445943b1d"; - sha256 = "1yd0g67vjdqabjjicgwfdsxfbkpmh91w3cfj4m628h4la2iiwg6s"; + rev = "162a176f217616bac51ab1eb3b018b6e15b02e3a"; + sha256 = "1afnmrh9vp1zxsyn6w81pqmsnqd49vvipd80hsy8pxpzj4lpca9n"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; }; - vimtex = buildVimPluginFrom2Nix { + vimtex = buildVimPlugin { pname = "vimtex"; - version = "2023-09-11"; + version = "2023-09-28"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "2b8a5f16a5768b3ae1780c266b73022dbb658af1"; - sha256 = "0i6rjzkbcibb9dxgk1406w6w1dab5nja0iiqpp1mwgdb28hjrswv"; + rev = "7d453a61b0256337f341a1195ca9eb3f3890a7df"; + sha256 = "0yk9zmcyl3mbfr5m1vs9w593irc78a9xwsn048qf7bpkwwmp1b0h"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; - vimux = buildVimPluginFrom2Nix { + vimux = buildVimPlugin { pname = "vimux"; version = "2022-09-26"; src = fetchFromGitHub { @@ -15540,7 +15528,7 @@ final: prev: meta.homepage = "https://github.com/preservim/vimux/"; }; - vimwiki = buildVimPluginFrom2Nix { + vimwiki = buildVimPlugin { pname = "vimwiki"; version = "2023-07-31"; src = fetchFromGitHub { @@ -15552,7 +15540,7 @@ final: prev: meta.homepage = "https://github.com/vimwiki/vimwiki/"; }; - virtual-types-nvim = buildVimPluginFrom2Nix { + virtual-types-nvim = buildVimPlugin { pname = "virtual-types.nvim"; version = "2023-04-07"; src = fetchFromGitHub { @@ -15564,7 +15552,7 @@ final: prev: meta.homepage = "https://github.com/jubnzv/virtual-types.nvim/"; }; - vis = buildVimPluginFrom2Nix { + vis = buildVimPlugin { pname = "vis"; version = "2013-04-26"; src = fetchFromGitHub { @@ -15576,7 +15564,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/vis/"; }; - vissort-vim = buildVimPluginFrom2Nix { + vissort-vim = buildVimPlugin { pname = "vissort.vim"; version = "2014-01-31"; src = fetchFromGitHub { @@ -15588,19 +15576,19 @@ final: prev: meta.homepage = "https://github.com/navicore/vissort.vim/"; }; - vista-vim = buildVimPluginFrom2Nix { + vista-vim = buildVimPlugin { pname = "vista.vim"; - version = "2023-09-14"; + version = "2023-10-01"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "40daf5e97be70a90465182fbbdfba92442bfd8e1"; - sha256 = "17kgca407nzvaddp5416rri46sk6dry1kmxp8kishha3x6fx0iym"; + rev = "58dabc027909330970ac549e52bf799a723878c5"; + sha256 = "0xb385781kll7hrhgm7nw7frjx2fwd2gzriwn9gby2s7m6yx8xib"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; - wal-vim = buildVimPluginFrom2Nix { + wal-vim = buildVimPlugin { pname = "wal.vim"; version = "2020-11-08"; src = fetchFromGitHub { @@ -15612,7 +15600,7 @@ final: prev: meta.homepage = "https://github.com/dylanaraps/wal.vim/"; }; - webapi-vim = buildVimPluginFrom2Nix { + webapi-vim = buildVimPlugin { pname = "webapi-vim"; version = "2022-11-23"; src = fetchFromGitHub { @@ -15624,7 +15612,7 @@ final: prev: meta.homepage = "https://github.com/mattn/webapi-vim/"; }; - wgsl-vim = buildVimPluginFrom2Nix { + wgsl-vim = buildVimPlugin { pname = "wgsl.vim"; version = "2023-04-29"; src = fetchFromGitHub { @@ -15636,7 +15624,7 @@ final: prev: meta.homepage = "https://github.com/DingDean/wgsl.vim/"; }; - which-key-nvim = buildVimPluginFrom2Nix { + which-key-nvim = buildVimPlugin { pname = "which-key.nvim"; version = "2023-07-28"; src = fetchFromGitHub { @@ -15648,7 +15636,7 @@ final: prev: meta.homepage = "https://github.com/folke/which-key.nvim/"; }; - whitespace-nvim = buildVimPluginFrom2Nix { + whitespace-nvim = buildVimPlugin { pname = "whitespace.nvim"; version = "2023-04-18"; src = fetchFromGitHub { @@ -15660,7 +15648,7 @@ final: prev: meta.homepage = "https://github.com/johnfrankmorgan/whitespace.nvim/"; }; - wiki-ft-vim = buildVimPluginFrom2Nix { + wiki-ft-vim = buildVimPlugin { pname = "wiki-ft.vim"; version = "2023-05-14"; src = fetchFromGitHub { @@ -15672,19 +15660,19 @@ final: prev: meta.homepage = "https://github.com/lervag/wiki-ft.vim/"; }; - wiki-vim = buildVimPluginFrom2Nix { + wiki-vim = buildVimPlugin { pname = "wiki.vim"; - version = "2023-09-04"; + version = "2023-09-25"; src = fetchFromGitHub { owner = "lervag"; repo = "wiki.vim"; - rev = "04fd37ae2b22c2134830a51ad49ed710c140145d"; - sha256 = "0gwxm6l6knskpnb2zh0963dr1il3x1m2la38v0z3vr8h5yn74gah"; + rev = "65b67f3669a0db078dab2750d3c51c680ee14df1"; + sha256 = "1j6bkk2gqmdaszs6q97yxjqnp3akl1wrlbvs6r31pz0faaswaqb8"; }; meta.homepage = "https://github.com/lervag/wiki.vim/"; }; - wilder-nvim = buildVimPluginFrom2Nix { + wilder-nvim = buildVimPlugin { pname = "wilder.nvim"; version = "2022-08-13"; src = fetchFromGitHub { @@ -15696,7 +15684,7 @@ final: prev: meta.homepage = "https://github.com/gelguy/wilder.nvim/"; }; - wildfire-vim = buildVimPluginFrom2Nix { + wildfire-vim = buildVimPlugin { pname = "wildfire.vim"; version = "2023-07-22"; src = fetchFromGitHub { @@ -15708,7 +15696,7 @@ final: prev: meta.homepage = "https://github.com/gcmt/wildfire.vim/"; }; - winbar-nvim = buildVimPluginFrom2Nix { + winbar-nvim = buildVimPlugin { pname = "winbar.nvim"; version = "2022-07-18"; src = fetchFromGitHub { @@ -15720,7 +15708,7 @@ final: prev: meta.homepage = "https://github.com/fgheng/winbar.nvim/"; }; - windows-nvim = buildVimPluginFrom2Nix { + windows-nvim = buildVimPlugin { pname = "windows.nvim"; version = "2023-01-16"; src = fetchFromGitHub { @@ -15732,7 +15720,7 @@ final: prev: meta.homepage = "https://github.com/anuvyklack/windows.nvim/"; }; - winshift-nvim = buildVimPluginFrom2Nix { + winshift-nvim = buildVimPlugin { pname = "winshift.nvim"; version = "2022-09-06"; src = fetchFromGitHub { @@ -15744,7 +15732,7 @@ final: prev: meta.homepage = "https://github.com/sindrets/winshift.nvim/"; }; - wmgraphviz-vim = buildVimPluginFrom2Nix { + wmgraphviz-vim = buildVimPlugin { pname = "wmgraphviz.vim"; version = "2018-04-26"; src = fetchFromGitHub { @@ -15756,7 +15744,7 @@ final: prev: meta.homepage = "https://github.com/wannesm/wmgraphviz.vim/"; }; - wombat256-vim = buildVimPluginFrom2Nix { + wombat256-vim = buildVimPlugin { pname = "wombat256.vim"; version = "2010-10-18"; src = fetchFromGitHub { @@ -15768,7 +15756,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/wombat256.vim/"; }; - workflowish = buildVimPluginFrom2Nix { + workflowish = buildVimPlugin { pname = "workflowish"; version = "2015-12-03"; src = fetchFromGitHub { @@ -15780,19 +15768,19 @@ final: prev: meta.homepage = "https://github.com/lukaszkorecki/workflowish/"; }; - wrapping-nvim = buildVimPluginFrom2Nix { + wrapping-nvim = buildVimPlugin { pname = "wrapping.nvim"; - version = "2023-08-08"; + version = "2023-09-23"; src = fetchFromGitHub { owner = "andrewferrier"; repo = "wrapping.nvim"; - rev = "1fc811d99b512ca53a4a773580f9ed5394fe6b2a"; - sha256 = "01j0whf2f4bzkq9p1bdpf7bhj1v7sj1bzdq47xck1f7fkkk2i8cr"; + rev = "e1ce68aae5ea729fc20e5bc17fb569314f76b9bb"; + sha256 = "1wsvy0j3zgd34ssbnajih8sx12666v0yywp7vr6bijz0hc4mlihs"; }; meta.homepage = "https://github.com/andrewferrier/wrapping.nvim/"; }; - wstrip-vim = buildVimPluginFrom2Nix { + wstrip-vim = buildVimPlugin { pname = "wstrip.vim"; version = "2021-03-14"; src = fetchFromGitHub { @@ -15804,7 +15792,7 @@ final: prev: meta.homepage = "https://github.com/tweekmonster/wstrip.vim/"; }; - xptemplate = buildVimPluginFrom2Nix { + xptemplate = buildVimPlugin { pname = "xptemplate"; version = "2022-09-08"; src = fetchFromGitHub { @@ -15816,7 +15804,7 @@ final: prev: meta.homepage = "https://github.com/drmingdrmer/xptemplate/"; }; - xterm-color-table-vim = buildVimPluginFrom2Nix { + xterm-color-table-vim = buildVimPlugin { pname = "xterm-color-table.vim"; version = "2022-11-21"; src = fetchFromGitHub { @@ -15828,7 +15816,7 @@ final: prev: meta.homepage = "https://github.com/guns/xterm-color-table.vim/"; }; - yats-vim = buildVimPluginFrom2Nix { + yats-vim = buildVimPlugin { pname = "yats.vim"; version = "2023-08-24"; src = fetchFromGitHub { @@ -15841,7 +15829,7 @@ final: prev: meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/"; }; - yescapsquit-vim = buildVimPluginFrom2Nix { + yescapsquit-vim = buildVimPlugin { pname = "yescapsquit.vim"; version = "2022-08-31"; src = fetchFromGitHub { @@ -15853,7 +15841,7 @@ final: prev: meta.homepage = "https://github.com/lucasew/yescapsquit.vim/"; }; - yuck-vim = buildVimPluginFrom2Nix { + yuck-vim = buildVimPlugin { pname = "yuck.vim"; version = "2022-10-29"; src = fetchFromGitHub { @@ -15865,7 +15853,7 @@ final: prev: meta.homepage = "https://github.com/elkowar/yuck.vim/"; }; - zeavim-vim = buildVimPluginFrom2Nix { + zeavim-vim = buildVimPlugin { pname = "zeavim.vim"; version = "2019-06-07"; src = fetchFromGitHub { @@ -15877,7 +15865,7 @@ final: prev: meta.homepage = "https://github.com/KabbAmine/zeavim.vim/"; }; - zen-mode-nvim = buildVimPluginFrom2Nix { + zen-mode-nvim = buildVimPlugin { pname = "zen-mode.nvim"; version = "2023-05-22"; src = fetchFromGitHub { @@ -15889,7 +15877,7 @@ final: prev: meta.homepage = "https://github.com/folke/zen-mode.nvim/"; }; - zenbones-nvim = buildVimPluginFrom2Nix { + zenbones-nvim = buildVimPlugin { pname = "zenbones.nvim"; version = "2023-08-30"; src = fetchFromGitHub { @@ -15901,7 +15889,7 @@ final: prev: meta.homepage = "https://github.com/mcchrish/zenbones.nvim/"; }; - zenburn = buildVimPluginFrom2Nix { + zenburn = buildVimPlugin { pname = "zenburn"; version = "2022-08-13"; src = fetchFromGitHub { @@ -15913,7 +15901,7 @@ final: prev: meta.homepage = "https://github.com/jnurmine/zenburn/"; }; - zephyr-nvim = buildVimPluginFrom2Nix { + zephyr-nvim = buildVimPlugin { pname = "zephyr-nvim"; version = "2022-12-31"; src = fetchFromGitHub { @@ -15925,31 +15913,31 @@ final: prev: meta.homepage = "https://github.com/nvimdev/zephyr-nvim/"; }; - zig-vim = buildVimPluginFrom2Nix { + zig-vim = buildVimPlugin { pname = "zig.vim"; - version = "2023-07-22"; + version = "2023-09-27"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "15841fc4fecfb1b6c02da9b4cc17ced135edbf8e"; - sha256 = "0m9p0055x6j5bz7whln7arz6w7cn02wq4rgs1ynczrvbqd68iji2"; + rev = "a34fb9850a56bb1f1e62bb5cfd0641c8baaeb3f9"; + sha256 = "0zgd892b8z8blbs7z29qwwkvp43633iri9jf5rin9bgicj412cg9"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; - zk-nvim = buildVimPluginFrom2Nix { + zk-nvim = buildVimPlugin { pname = "zk-nvim"; - version = "2023-07-09"; + version = "2023-09-30"; src = fetchFromGitHub { owner = "mickael-menu"; repo = "zk-nvim"; - rev = "797618aa07f58ceba6f79fb6e777e8e45c51e1ce"; - sha256 = "1hr1k3h3pwh7iga7zdd62hkwgnvivsr6z9nbs8ypks3r34rw60xx"; + rev = "e9e5e21dbeacd0e753728c7ea45b7a7582d9080a"; + sha256 = "0ycx8ad6a9xyc2i4gzjccbl5pzvg1y7rqhpxf4mys5vh5j7iisvv"; }; meta.homepage = "https://github.com/mickael-menu/zk-nvim/"; }; - zoomwintab-vim = buildVimPluginFrom2Nix { + zoomwintab-vim = buildVimPlugin { pname = "zoomwintab.vim"; version = "2021-10-10"; src = fetchFromGitHub { @@ -15961,7 +15949,7 @@ final: prev: meta.homepage = "https://github.com/troydm/zoomwintab.vim/"; }; - zoxide-vim = buildVimPluginFrom2Nix { + zoxide-vim = buildVimPlugin { pname = "zoxide.vim"; version = "2023-05-21"; src = fetchFromGitHub { @@ -15973,19 +15961,19 @@ final: prev: meta.homepage = "https://github.com/nanotee/zoxide.vim/"; }; - catppuccin-nvim = buildVimPluginFrom2Nix { + catppuccin-nvim = buildVimPlugin { pname = "catppuccin-nvim"; - version = "2023-09-11"; + version = "2023-09-30"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "85e93601e0f0b48aa2c6bbfae4d0e9d7a1898280"; - sha256 = "0cdgh3x417m4xcwqaj4c76fylfnyyjq2az8jbvw5gxrpvz9lmazk"; + rev = "7a4bcdadafc59a5bedbd866c643fa486d8cca4a1"; + sha256 = "0v8syhgyvl4zs484dycz65qrclds2cd6f9ja85xy4gzfhisnc6s3"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; - catppuccin-vim = buildVimPluginFrom2Nix { + catppuccin-vim = buildVimPlugin { pname = "catppuccin-vim"; version = "2023-09-12"; src = fetchFromGitHub { @@ -15997,7 +15985,7 @@ final: prev: meta.homepage = "https://github.com/catppuccin/vim/"; }; - dracula-vim = buildVimPluginFrom2Nix { + dracula-vim = buildVimPlugin { pname = "dracula-vim"; version = "2023-08-30"; src = fetchFromGitHub { @@ -16009,7 +15997,7 @@ final: prev: meta.homepage = "https://github.com/dracula/vim/"; }; - embark-vim = buildVimPluginFrom2Nix { + embark-vim = buildVimPlugin { pname = "embark-vim"; version = "2023-04-21"; src = fetchFromGitHub { @@ -16021,19 +16009,19 @@ final: prev: meta.homepage = "https://github.com/embark-theme/vim/"; }; - gruvbox-community = buildVimPluginFrom2Nix { + gruvbox-community = buildVimPlugin { pname = "gruvbox-community"; - version = "2023-09-12"; + version = "2023-09-19"; src = fetchFromGitHub { owner = "gruvbox-community"; repo = "gruvbox"; - rev = "121309cebfc5a9b4f71b7b962d0d0df7e82cc456"; - sha256 = "0211bkj92rk3gv70p7xlqny481s0qk345cgl05m2l1x6bmcm5zps"; + rev = "86c767ff91e2518da44ba8c78b3bc6c979cf5403"; + sha256 = "1map59hiin7qwwyliqxqwq3v64hskn4xpxisnfpj7ci56c9viby8"; }; meta.homepage = "https://github.com/gruvbox-community/gruvbox/"; }; - mattn-calendar-vim = buildVimPluginFrom2Nix { + mattn-calendar-vim = buildVimPlugin { pname = "mattn-calendar-vim"; version = "2022-02-10"; src = fetchFromGitHub { @@ -16045,19 +16033,19 @@ final: prev: meta.homepage = "https://github.com/mattn/calendar-vim/"; }; - nightfly = buildVimPluginFrom2Nix { + nightfly = buildVimPlugin { pname = "nightfly"; - version = "2023-09-01"; + version = "2023-10-01"; src = fetchFromGitHub { owner = "bluz71"; repo = "vim-nightfly-colors"; - rev = "2737ba5b8d22ad6803bb0f51099f90c61bab566c"; - sha256 = "07g6s0p9mqs3s65a027zvpwpfmx191ajg0h8v9qilgzw755barx7"; + rev = "60d7e7749c21dec4e77c70672c3882dc5653d02c"; + sha256 = "1z8d6i81n2j8ynfpa8gvlw27svjgv4rxs1ham4rl90vraryqgpl1"; }; meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/"; }; - nord-vim = buildVimPluginFrom2Nix { + nord-vim = buildVimPlugin { pname = "nord-vim"; version = "2023-05-03"; src = fetchFromGitHub { @@ -16069,7 +16057,7 @@ final: prev: meta.homepage = "https://github.com/nordtheme/vim/"; }; - nvchad-ui = buildVimPluginFrom2Nix { + nvchad-ui = buildVimPlugin { pname = "nvchad-ui"; version = "2023-09-13"; src = fetchFromGitHub { @@ -16081,7 +16069,7 @@ final: prev: meta.homepage = "https://github.com/nvchad/ui/"; }; - pure-lua = buildVimPluginFrom2Nix { + pure-lua = buildVimPlugin { pname = "pure-lua"; version = "2021-05-16"; src = fetchFromGitHub { @@ -16093,7 +16081,7 @@ final: prev: meta.homepage = "https://github.com/shaunsingh/moonlight.nvim/"; }; - restore-view-vim = buildVimPluginFrom2Nix { + restore-view-vim = buildVimPlugin { pname = "restore-view-vim"; version = "2014-11-21"; src = fetchFromGitHub { @@ -16105,7 +16093,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/restore_view.vim/"; }; - rose-pine = buildVimPluginFrom2Nix { + rose-pine = buildVimPlugin { pname = "rose-pine"; version = "2023-07-28"; src = fetchFromGitHub { @@ -16117,7 +16105,7 @@ final: prev: meta.homepage = "https://github.com/rose-pine/neovim/"; }; - samodostal-image-nvim = buildVimPluginFrom2Nix { + samodostal-image-nvim = buildVimPlugin { pname = "samodostal-image-nvim"; version = "2023-06-08"; src = fetchFromGitHub { @@ -16129,7 +16117,7 @@ final: prev: meta.homepage = "https://github.com/samodostal/image.nvim/"; }; - tinykeymap = buildVimPluginFrom2Nix { + tinykeymap = buildVimPlugin { pname = "tinykeymap"; version = "2019-03-15"; src = fetchFromGitHub { @@ -16141,7 +16129,7 @@ final: prev: meta.homepage = "https://github.com/tomtom/tinykeymap_vim/"; }; - vim-advanced-sorters = buildVimPluginFrom2Nix { + vim-advanced-sorters = buildVimPlugin { pname = "vim-advanced-sorters"; version = "2021-11-21"; src = fetchFromGitHub { @@ -16153,14 +16141,14 @@ final: prev: meta.homepage = "https://github.com/inkarkat/vim-AdvancedSorters/"; }; - vim-docbk-snippets = buildVimPluginFrom2Nix { + vim-docbk-snippets = buildVimPlugin { pname = "vim-docbk-snippets"; - version = "2023-06-05"; + version = "2023-09-29"; src = fetchFromGitHub { owner = "jhradilek"; repo = "vim-snippets"; - rev = "a279b708a49ca410b41b1628f62c56ab4dc0390b"; - sha256 = "06rnj834nrd0c1g088zfvb2bvbzqzbmbdhga9gza8srjw7p8kvhw"; + rev = "73aa6c7a3dcd9ac452271fbd4f8a2bdf66a7513e"; + sha256 = "1wpn6gfw1r89232d779lz8wy19asrribindlcsaikrsqvml3a0hr"; }; meta.homepage = "https://github.com/jhradilek/vim-snippets/"; }; diff --git a/pkgs/applications/editors/vim/plugins/get-plugins.nix b/pkgs/applications/editors/vim/plugins/get-plugins.nix index f81b9fc3464e3..06ed71f379240 100644 --- a/pkgs/applications/editors/vim/plugins/get-plugins.nix +++ b/pkgs/applications/editors/vim/plugins/get-plugins.nix @@ -1,10 +1,10 @@ with import <localpkgs> {}; let - inherit (vimUtils.override {inherit vim;}) buildVimPluginFrom2Nix; + inherit (vimUtils.override {inherit vim;}) buildVimPlugin; inherit (neovimUtils) buildNeovimPlugin; generated = callPackage <localpkgs/pkgs/applications/editors/vim/plugins/generated.nix> { - inherit buildNeovimPlugin buildVimPluginFrom2Nix; + inherit buildNeovimPlugin buildVimPlugin; } {} {}; hasChecksum = value: lib.isAttrs value && lib.hasAttrByPath ["src" "outputHash"] value; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 3c1e6c2ff4112..dfda03ac5a314 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -16,14 +16,26 @@ }; agda = buildGrammar { language = "agda"; - version = "0.0.0+rev=80ea622"; + version = "0.0.0+rev=c21c3a0"; src = fetchFromGitHub { - owner = "AusCyberman"; + owner = "tree-sitter"; repo = "tree-sitter-agda"; - rev = "80ea622cf952a0059e168e5c92a798b2f1925652"; - hash = "sha256-D63jvITL2RA8yg/TBSi6GsOxwLKzSHibbm3hwIKzesU="; + rev = "c21c3a0f996363ed17b8ac99d827fe5a4821f217"; + hash = "sha256-EV0J38zcfSHaBqzu2Rcut1l20FpB+xneFRaizEX1DXg="; }; - meta.homepage = "https://github.com/AusCyberman/tree-sitter-agda"; + meta.homepage = "https://github.com/tree-sitter/tree-sitter-agda"; + }; + apex = buildGrammar { + language = "apex"; + version = "0.0.0+rev=e63bcdc"; + src = fetchFromGitHub { + owner = "aheber"; + repo = "tree-sitter-sfapex"; + rev = "e63bcdcc26ae808b3fe79dfb8fa61bebdb95bda4"; + hash = "sha256-7kfg8oqi39sExBuuKxmUgg5m9g22TW94rccas/7/5zE="; + }; + location = "apex"; + meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; }; arduino = buildGrammar { language = "arduino"; @@ -49,23 +61,23 @@ }; awk = buildGrammar { language = "awk"; - version = "0.0.0+rev=2444262"; + version = "0.0.0+rev=374da90"; src = fetchFromGitHub { owner = "Beaglefoot"; repo = "tree-sitter-awk"; - rev = "244426241376b08d9531616290d657106ec8f7ff"; - hash = "sha256-rNQxGMgK9O1wpi1Rdhz/3I210w92AIPAJzEf0v/ICz8="; + rev = "374da90decaa60fea7a22490a77440ece6d4161d"; + hash = "sha256-gbA6VyhPh2lH9FqYKj9sL8uhuMizCmV0U42s5gvk7AE="; }; meta.homepage = "https://github.com/Beaglefoot/tree-sitter-awk"; }; bash = buildGrammar { language = "bash"; - version = "0.0.0+rev=bdcd56c"; + version = "0.0.0+rev=fd4e40d"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-bash"; - rev = "bdcd56c5a3896f7bbb7684e223c43d9f24380351"; - hash = "sha256-zkhCk19kd/KiqYTamFxui7KDE9d+P9pLjc1KVTvYPhI="; + rev = "fd4e40dab883d6456da4d847de8321aee9c80805"; + hash = "sha256-dJUJGrpBWBLjcqiqxCnJ/MENwa2+uxAmQD71aYloxsw="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-bash"; }; @@ -115,12 +127,12 @@ }; bitbake = buildGrammar { language = "bitbake"; - version = "0.0.0+rev=ed92abd"; + version = "0.0.0+rev=6cb07d9"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-bitbake"; - rev = "ed92abd7b67ab66a6fa3a747a0157f01d2e467d8"; - hash = "sha256-HfWUDYiBCmtlu5fFX287BSDHyCiD7gqIVFDTxH5APAE="; + rev = "6cb07d98f1cad180b8ea28965e59ee05023a5693"; + hash = "sha256-KfX0vzxHn4XVtmjOSPl31t17e+rSEoSacjAFQCl4+Ik="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-bitbake"; }; @@ -303,12 +315,12 @@ }; cuda = buildGrammar { language = "cuda"; - version = "0.0.0+rev=f00c914"; + version = "0.0.0+rev=275cfb9"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-cuda"; - rev = "f00c91430124797e798cbf28e09075d7d192938a"; - hash = "sha256-9Jx6O4yfIrbCLTEPgpoZZ+3yxhi2r0MwrbiHCUexa60="; + rev = "275cfb95013b88382e11490aef1e7c9b17a95ef7"; + hash = "sha256-3sb9YLPRPjafSLGvyjLSuu+vqvolF63CI0MWZzvEGJw="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda"; }; @@ -381,12 +393,12 @@ }; dockerfile = buildGrammar { language = "dockerfile"; - version = "0.0.0+rev=c0a9d69"; + version = "0.0.0+rev=1800d5a"; src = fetchFromGitHub { owner = "camdencheek"; repo = "tree-sitter-dockerfile"; - rev = "c0a9d694d9bf8ab79a919f5f9c7bc9c169caf321"; - hash = "sha256-dNrLw9E3I3LqQUqYx+YUBZTlSoAp/qoOf6+RL7Lv3ew="; + rev = "1800d5a06789797065ba5e7d80712b6bbf5483d7"; + hash = "sha256-qt626fHCZkHkl8yrEtDbJ+l7wwmU0XMcP0oPwrCYNgI="; }; meta.homepage = "https://github.com/camdencheek/tree-sitter-dockerfile"; }; @@ -515,12 +527,12 @@ }; erlang = buildGrammar { language = "erlang"; - version = "0.0.0+rev=7aa24fe"; + version = "0.0.0+rev=4a0ec79"; src = fetchFromGitHub { owner = "WhatsApp"; repo = "tree-sitter-erlang"; - rev = "7aa24fe8616072fc1a659f72d5b60bd8c01fb5cc"; - hash = "sha256-7rhwMBq5u5bVjyCE4j3f5tzY+9jL80Xd5hgkJjlqSr8="; + rev = "4a0ec79b7eb7671efe935cd97967430c34598c7d"; + hash = "sha256-q1V5lJsSQyx7ji4T+leIfSH9wAZRHW0XeLnY3Rc9WWI="; }; meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang"; }; @@ -636,12 +648,12 @@ }; git_config = buildGrammar { language = "git_config"; - version = "0.0.0+rev=a01b498"; + version = "0.0.0+rev=9c2a1b7"; src = fetchFromGitHub { owner = "the-mikedavis"; repo = "tree-sitter-git-config"; - rev = "a01b498b25003d97a5f93b0da0e6f28307454347"; - hash = "sha256-9gLmao4zmDYj7uxrngjMa4AG9yIkKyptgaCBcL4GZYA="; + rev = "9c2a1b7894e6d9eedfe99805b829b4ecd871375e"; + hash = "sha256-O0w0BhhPPwhnKfniAFSPMWfBsZUTrijifAsmFiAncWg="; }; meta.homepage = "https://github.com/the-mikedavis/tree-sitter-git-config"; }; @@ -691,12 +703,12 @@ }; gleam = buildGrammar { language = "gleam"; - version = "0.0.0+rev=297031d"; + version = "0.0.0+rev=32c8f1e"; src = fetchFromGitHub { owner = "gleam-lang"; repo = "tree-sitter-gleam"; - rev = "297031dce60e07acf90345d62777623469e46027"; - hash = "sha256-/LieoIseeZwQttCHnAOfwWRpCmBnUdWTcGwSOyjHexg="; + rev = "32c8f1e32aee036583ca09e7e6e4ea881852b42c"; + hash = "sha256-tAYlenGQM+TK8AR8RtyDULBgWjAXgHx13/lrhNAZVhs="; }; meta.homepage = "https://github.com/gleam-lang/tree-sitter-gleam"; }; @@ -713,12 +725,12 @@ }; glsl = buildGrammar { language = "glsl"; - version = "0.0.0+rev=64e786e"; + version = "0.0.0+rev=ec6100d"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-glsl"; - rev = "64e786e36398b1e18ccfdbfd964d922a67392ebc"; - hash = "sha256-6G5j3xfkbcFjAT6OWQyTgeryJEW2SSnyOhedF0QPmSw="; + rev = "ec6100d2bdf22363ca8a711a212f2144ea49233f"; + hash = "sha256-QFsOq/1GH40XgnBT9V3Eb7aQabtBGOtxHp65FdugOz8="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl"; }; @@ -834,23 +846,23 @@ }; haskell = buildGrammar { language = "haskell"; - version = "0.0.0+rev=9970682"; + version = "0.0.0+rev=d7ac98f"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-haskell"; - rev = "99706824b92f162d4e0f47c7e930bbccb367276e"; - hash = "sha256-JJvXkunDFRjWoXipxl1o2P+lRIDa4kw/Ys3LUu3piIY="; + rev = "d7ac98f49e3ed7e17541256fe3881a967d7ffdd3"; + hash = "sha256-XEfZSNnvF2BMOWwTfk6GXSnSpbKVfAYk7I3XbO1tIBg="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-haskell"; }; haskell_persistent = buildGrammar { language = "haskell_persistent"; - version = "0.0.0+rev=58a6ccf"; + version = "0.0.0+rev=577259b"; src = fetchFromGitHub { owner = "MercuryTechnologies"; repo = "tree-sitter-haskell-persistent"; - rev = "58a6ccfd56d9f1de8fb9f77e6c42151f8f0d0f3d"; - hash = "sha256-p4Anm/xeG/d7nYBPDABcdDih/a+0rMjwtVUJru7m9QY="; + rev = "577259b4068b2c281c9ebf94c109bd50a74d5857"; + hash = "sha256-ASdkBQ57GfpLF8NXgDzJMB/Marz9p1q03TZkwMgF/eQ="; }; meta.homepage = "https://github.com/MercuryTechnologies/tree-sitter-haskell-persistent"; }; @@ -1186,12 +1198,12 @@ }; luadoc = buildGrammar { language = "luadoc"; - version = "0.0.0+rev=8981072"; + version = "0.0.0+rev=990926b"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-luadoc"; - rev = "8981072676ec8bd74def6134be4f883655f7c082"; - hash = "sha256-HRHZDX0/duvQza0SJwCI/uKO0d12VYtvpuYB+KCkfow="; + rev = "990926b13488a4bc0fc0804fc0f8400b5b0a1fb4"; + hash = "sha256-LU8zF6gM8tlwfbdUy/tlg5ubhyFKUrwF/vU8NPXlOGQ="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-luadoc"; }; @@ -1489,12 +1501,12 @@ }; php = buildGrammar { language = "php"; - version = "0.0.0+rev=ce2c73a"; + version = "0.0.0+rev=a05c611"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "ce2c73a8d84b5648e8792698dc9fd955e5f6a906"; - hash = "sha256-HZOIz9KiZ13aqeQtCeQln56RRRPUSgT7ulPJs54fzJc="; + rev = "a05c6112a1dfdd9e586cb275700931e68d3c7c85"; + hash = "sha256-9t+9TnyBVkQVrxHhCzoBkfIjHoKw3HW4gTJjNv+DpPw="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; }; @@ -1644,12 +1656,12 @@ }; python = buildGrammar { language = "python"; - version = "0.0.0+rev=c01fb4e"; + version = "0.0.0+rev=a901729"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-python"; - rev = "c01fb4e38587e959b9058b8cd34b9e6a3068c827"; - hash = "sha256-cV/QwvEQkIQcgo0Pm+3pUH2LhpYOPsuWMgjXMa8dv+s="; + rev = "a901729099257aac932d79c60adb5e8a53fa7e6c"; + hash = "sha256-gRhD3M1DkmwYQDDnyRq6QMTWUJUY0vbetGnN+pBTd84="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-python"; }; @@ -1831,23 +1843,23 @@ }; rust = buildGrammar { language = "rust"; - version = "0.0.0+rev=17a6b15"; + version = "0.0.0+rev=48e0533"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-rust"; - rev = "17a6b15562b09db1f27b8f5f26f17edbb2aac097"; - hash = "sha256-seWoMuA87ZWCq3mUXopVeDCcTxX/Bh+B4PFLVa0CBQA="; + rev = "48e053397b587de97790b055a1097b7c8a4ef846"; + hash = "sha256-ht0l1a3esvBbVHNbUosItmqxwL7mDp+QyhIU6XTUiEk="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-rust"; }; scala = buildGrammar { language = "scala"; - version = "0.0.0+rev=70afdd5"; + version = "0.0.0+rev=1b4c2fa"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-scala"; - rev = "70afdd5632d57dd63a960972ab25945e353a52f6"; - hash = "sha256-bi0Lqo/Zs2Uaz1efuKAARpEDg5Hm59oUe7eSXgL1Wow="; + rev = "1b4c2fa5c55c5fd83cbb0d2f818f916aba221a42"; + hash = "sha256-93uWT5KMqCUwntdL5U2Vc71ci+uP3OdP9y6kVZ3bYLo="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala"; }; @@ -1940,6 +1952,30 @@ }; meta.homepage = "https://github.com/JoranHonig/tree-sitter-solidity"; }; + soql = buildGrammar { + language = "soql"; + version = "0.0.0+rev=e63bcdc"; + src = fetchFromGitHub { + owner = "aheber"; + repo = "tree-sitter-sfapex"; + rev = "e63bcdcc26ae808b3fe79dfb8fa61bebdb95bda4"; + hash = "sha256-7kfg8oqi39sExBuuKxmUgg5m9g22TW94rccas/7/5zE="; + }; + location = "soql"; + meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; + }; + sosl = buildGrammar { + language = "sosl"; + version = "0.0.0+rev=e63bcdc"; + src = fetchFromGitHub { + owner = "aheber"; + repo = "tree-sitter-sfapex"; + rev = "e63bcdcc26ae808b3fe79dfb8fa61bebdb95bda4"; + hash = "sha256-7kfg8oqi39sExBuuKxmUgg5m9g22TW94rccas/7/5zE="; + }; + location = "sosl"; + meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; + }; sparql = buildGrammar { language = "sparql"; version = "0.0.0+rev=05f949d"; @@ -1973,6 +2009,17 @@ }; meta.homepage = "https://github.com/amaanq/tree-sitter-squirrel"; }; + ssh_config = buildGrammar { + language = "ssh_config"; + version = "0.0.0+rev=e400863"; + src = fetchFromGitHub { + owner = "ObserverOfTime"; + repo = "tree-sitter-ssh-config"; + rev = "e4008633536870f3fed3198c96503250af0b0a12"; + hash = "sha256-jPEJQgFys+gwwLiIXmhHvrsT9ai0R7wXJVxRQANACkI="; + }; + meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-ssh-config"; + }; starlark = buildGrammar { language = "starlark"; version = "0.0.0+rev=c45ce2b"; @@ -2064,12 +2111,12 @@ }; t32 = buildGrammar { language = "t32"; - version = "0.0.0+rev=5e6ce99"; + version = "0.0.0+rev=c544082"; src = fetchFromGitLab { owner = "xasc"; repo = "tree-sitter-t32"; - rev = "5e6ce99611b2fef9b4d812e43898b176185c61ed"; - hash = "sha256-3gRMvJh8vVr7E2b0/RDGqjrlhzjZciWgOYbE+e3dkeE="; + rev = "c544082904fd1d27da5493857bd3fc278bae2a1a"; + hash = "sha256-0iH5zEe5/BD2Wi4jb67grCXafmHhJkSD/NkjqGZZ3pY="; }; meta.homepage = "https://gitlab.com/xasc/tree-sitter-t32.git"; }; @@ -2108,6 +2155,17 @@ location = "dialects/terraform"; meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-hcl"; }; + textproto = buildGrammar { + language = "textproto"; + version = "0.0.0+rev=8dacf02"; + src = fetchFromGitHub { + owner = "PorterAtGoogle"; + repo = "tree-sitter-textproto"; + rev = "8dacf02aa402892c91079f8577998ed5148c0496"; + hash = "sha256-MpQTrNjjNO2Bj5qR6ESwI9SZtJPmcS6ckqjAR0qaLx8="; + }; + meta.homepage = "https://github.com/PorterAtGoogle/tree-sitter-textproto"; + }; thrift = buildGrammar { language = "thrift"; version = "0.0.0+rev=d4deb1b"; @@ -2368,12 +2426,12 @@ }; wing = buildGrammar { language = "wing"; - version = "0.0.0+rev=430ec75"; + version = "0.0.0+rev=fac3f72"; src = fetchFromGitHub { owner = "winglang"; repo = "wing"; - rev = "430ec7527a3eee00719ce9735854177629410f63"; - hash = "sha256-vfmpob+2yh/Lnhc6b+Lz0nB7bwk2tMbbIFs1iASj19M="; + rev = "fac3f72d80d379fea61d1eca782cb99ac6d78b62"; + hash = "sha256-/PIqwqG5h2iFVzpTTlXOrAKEDNctcxRHIhGyv5jlkIw="; }; location = "libs/tree-sitter-wing"; generate = true; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py b/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py index bbacc6959c255..37414b073538a 100755 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py @@ -7,8 +7,6 @@ from concurrent.futures import ThreadPoolExecutor from os import environ from os.path import dirname, join -lockfile = json.load(open(join(environ["NVIM_TREESITTER"], "lockfile.json"))) - configs = json.loads( subprocess.check_output( [ @@ -58,20 +56,26 @@ def generate_grammar(item): return generated -generated_file = """# generated by pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py +def update_grammars(lockfile: str): -{ buildGrammar, """ + generated_file = """# generated by pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py -generated_file += subprocess.check_output(["nurl", "-Ls", ", "], text=True) + { buildGrammar, """ -generated_file += """ }: + generated_file += subprocess.check_output(["nurl", "-Ls", ", "], text=True) -{ -""" + generated_file += """ }: + + { + """ + for generated in ThreadPoolExecutor().map(generate_grammar, lockfile.items()): + generated_file += generated + generated_file += "}\n" + generated_file += "}\n" -for generated in ThreadPoolExecutor().map(generate_grammar, lockfile.items()): - generated_file += generated + open(join(dirname(__file__), "generated.nix"), "w").write(generated_file) -generated_file += "}\n" -open(join(dirname(__file__), "generated.nix"), "w").write(generated_file) +if __name__ == "__main__": + # TODO add lockfile + update_grammars() diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index b16f9eae5a881..bf3181f8fe7d2 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -3,7 +3,7 @@ # nixpkgs functions , buildGoModule -, buildVimPluginFrom2Nix +, buildVimPlugin , fetchFromGitHub , fetchFromSourcehut , fetchpatch @@ -153,7 +153,7 @@ self: super: { }; # The GitHub repository returns 404, which breaks the update script - bitbake-vim = buildVimPluginFrom2Nix { + bitbake-vim = buildVimPlugin { pname = "bitbake.vim"; version = "2021-02-06"; src = fetchFromGitHub { @@ -165,6 +165,19 @@ self: super: { meta.homepage = "https://github.com/sblumentritt/bitbake.vim/"; }; + # The GitHub repository returns 404, which breaks the update script + vim-pony = buildVimPlugin { + pname = "vim-pony"; + version = "2018-07-27"; + src = fetchFromGitHub { + owner = "jakwings"; + repo = "vim-pony"; + rev = "b26f01a869000b73b80dceabd725d91bfe175b75"; + sha256 = "0if8g94m3xmpda80byfxs649w2is9ah1k8v3028nblan73zlc8x8"; + }; + meta.homepage = "https://github.com/jakwings/vim-pony/"; + }; + chadtree = super.chadtree.overrideAttrs { passthru.python3Dependencies = ps: with ps; [ pynvim-pp @@ -305,7 +318,7 @@ self: super: { dependencies = with self; [ nvim-cmp zsh ]; }; - coc-nginx = buildVimPluginFrom2Nix { + coc-nginx = buildVimPlugin { pname = "coc-nginx"; inherit (nodePackages."@yaegassy/coc-nginx") version meta; src = "${nodePackages."@yaegassy/coc-nginx"}/lib/node_modules/@yaegassy/coc-nginx"; @@ -553,7 +566,7 @@ self: super: { # Mainly used as a dependency for fzf-vim. Wraps the fzf program as a vim # plugin, since part of the fzf vim plugin is included in the main fzf # program. - fzfWrapper = buildVimPluginFrom2Nix { + fzfWrapper = buildVimPlugin { inherit (fzf) src version; pname = "fzf"; postInstall = '' @@ -594,7 +607,7 @@ self: super: { }; # https://hurl.dev/ - hurl = buildVimPluginFrom2Nix { + hurl = buildVimPlugin { pname = "hurl"; version = hurl.version; # dontUnpack = true; @@ -658,7 +671,7 @@ self: super: { ''; }; in - buildVimPluginFrom2Nix { + buildVimPlugin { pname = "LanguageClient-neovim"; inherit version; src = LanguageClient-neovim-src; @@ -707,7 +720,7 @@ self: super: { dependencies = with self; [ plenary-nvim ]; }; - magma-nvim-goose = buildVimPluginFrom2Nix { + magma-nvim-goose = buildVimPlugin { pname = "magma-nvim-goose"; version = "2023-03-13"; src = fetchFromGitHub { @@ -767,7 +780,7 @@ self: super: { dependencies = with self; [ mason-nvim ]; }; - meson = buildVimPluginFrom2Nix { + meson = buildVimPlugin { inherit (meson) pname version src; preInstall = "cd data/syntax-highlighting/vim"; meta.maintainers = with lib.maintainers; [ vcunat ]; @@ -785,7 +798,7 @@ self: super: { vimCommandCheck = "MinimapToggle"; }; - minsnip-nvim = buildVimPluginFrom2Nix { + minsnip-nvim = buildVimPlugin { pname = "minsnip.nvim"; version = "2022-01-04"; src = fetchFromGitHub { @@ -862,10 +875,18 @@ self: super: { dontBuild = true; }; + nvim-navbuddy = super.nvim-navbuddy.overrideAttrs { + dependencies = with self; [ nui-nvim nvim-lspconfig nvim-navic ]; + }; + vim-mediawiki-editor = super.vim-mediawiki-editor.overrideAttrs { passthru.python3Dependencies = [ python3.pkgs.mwclient ]; }; + nvim-navic = super.nvim-navic.overrideAttrs { + dependencies = with self; [ nvim-lspconfig ]; + }; + nvim-spectre = super.nvim-spectre.overrideAttrs { dependencies = with self; [ plenary-nvim ]; }; @@ -931,7 +952,7 @@ self: super: { inherit parinfer-rust; - phpactor = buildVimPluginFrom2Nix { + phpactor = buildVimPlugin { inherit (phpactor) pname src meta version; postPatch = '' substituteInPlace plugin/phpactor.vim \ @@ -978,7 +999,7 @@ self: super: { pname = "sg-nvim-rust"; inherit (old) version src; - cargoHash = "sha256-JwEOfxGH2wiFkdepxBsUYrpQ2kMV6koqpkD7s+gbWw8="; + cargoHash = "sha256-HdewCCraJ2jj2KAVnjzND+4O52jqfABonFU6ybWWAWY="; nativeBuildInputs = [ pkg-config ]; @@ -1000,7 +1021,7 @@ self: super: { ''; }); - skim = buildVimPluginFrom2Nix { + skim = buildVimPlugin { pname = "skim"; inherit (skim) version; src = skim.vim; @@ -1040,7 +1061,7 @@ self: super: { doCheck = false; }; in - buildVimPluginFrom2Nix { + buildVimPlugin { pname = "sniprun"; inherit version src; @@ -1053,7 +1074,7 @@ self: super: { }; # The GitHub repository returns 404, which breaks the update script - Spacegray-vim = buildVimPluginFrom2Nix { + Spacegray-vim = buildVimPlugin { pname = "Spacegray.vim"; version = "2021-07-06"; src = fetchFromGitHub { @@ -1078,7 +1099,7 @@ self: super: { dependencies = with self; [ nvim-treesitter ]; }; - statix = buildVimPluginFrom2Nix rec { + statix = buildVimPlugin rec { inherit (statix) pname src meta; version = "0.1.0"; postPatch = '' @@ -1128,7 +1149,7 @@ self: super: { }; }; - taskwarrior = buildVimPluginFrom2Nix { + taskwarrior = buildVimPlugin { inherit (taskwarrior) version pname; src = "${taskwarrior.src}/scripts/vim"; }; @@ -1214,7 +1235,7 @@ self: super: { au BufNewFile,BufRead Tupfile,*.tup setf tup ''; in - buildVimPluginFrom2Nix { + buildVimPlugin { inherit (tup) pname version src; preInstall = '' mkdir -p vim-plugin/syntax vim-plugin/ftdetect @@ -1428,7 +1449,7 @@ self: super: { hexokinase = buildGoModule { name = "hexokinase"; src = old.src + "/hexokinase"; - vendorSha256 = null; + vendorHash = null; }; in '' @@ -1538,7 +1559,7 @@ self: super: { ''; }; - vim2nix = buildVimPluginFrom2Nix { + vim2nix = buildVimPlugin { pname = "vim2nix"; version = "1.0"; src = ./vim2nix; @@ -1562,7 +1583,7 @@ self: super: { }; # The GitHub repository returns 404, which breaks the update script - VimCompletesMe = buildVimPluginFrom2Nix { + VimCompletesMe = buildVimPlugin { pname = "VimCompletesMe"; version = "2022-02-18"; src = fetchFromGitHub { @@ -1698,7 +1719,7 @@ self: super: { "coc-yaml" "coc-yank" ]; - nodePackage2VimPackage = name: buildVimPluginFrom2Nix { + nodePackage2VimPackage = name: buildVimPlugin { pname = name; inherit (nodePackages.${name}) version meta; src = "${nodePackages.${name}}/lib/node_modules/${name}"; diff --git a/pkgs/applications/editors/vim/plugins/update-shell.nix b/pkgs/applications/editors/vim/plugins/update-shell.nix deleted file mode 100644 index eae7db7f53ec0..0000000000000 --- a/pkgs/applications/editors/vim/plugins/update-shell.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ pkgs ? import ../../../../.. { } }: - -# Ideally, pkgs points to default.nix file of Nixpkgs official tree -with pkgs; -let - pyEnv = python3.withPackages (ps: [ ps.gitpython ]); -in - -mkShell { - packages = [ - bash - pyEnv - nix - nix-prefetch-scripts - ]; -} diff --git a/pkgs/applications/editors/vim/plugins/update.py b/pkgs/applications/editors/vim/plugins/update.py index b77032849b399..9770b27252cd8 100755 --- a/pkgs/applications/editors/vim/plugins/update.py +++ b/pkgs/applications/editors/vim/plugins/update.py @@ -1,97 +1,109 @@ -#!/usr/bin/env nix-shell -#!nix-shell update-shell.nix -i python3 - +#!/usr/bin/env python +# run with: +# $ nix run .\#vimPluginsUpdater # format: -# $ nix run nixpkgs.python3Packages.black -c black update.py +# $ nix run nixpkgs#python3Packages.black -- update.py # type-check: -# $ nix run nixpkgs.python3Packages.mypy -c mypy update.py +# $ nix run nixpkgs#python3Packages.mypy -- update.py # linted: -# $ nix run nixpkgs.python3Packages.flake8 -c flake8 --ignore E501,E265,E402 update.py +# $ nix run nixpkgs#python3Packages.flake8 -- --ignore E501,E265,E402 update.py -# If you see `HTTP Error 429: too many requests` errors while running this script, -# refer to: +# If you see `HTTP Error 429: too many requests` errors while running this +# script, refer to: # # https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks/vim.section.md#updating-plugins-in-nixpkgs-updating-plugins-in-nixpkgs # -# (or the equivalent file /doc/languages-frameworks/vim.section.md from Nixpkgs master tree). +# (or the equivalent file /doc/languages-frameworks/vim.section.md +# from Nixpkgs master tree). # import inspect import os -import sys import logging -import subprocess import textwrap +import json from typing import List, Tuple from pathlib import Path -import git log = logging.getLogger() sh = logging.StreamHandler() -formatter = logging.Formatter('%(name)s:%(levelname)s: %(message)s') +formatter = logging.Formatter("%(name)s:%(levelname)s: %(message)s") sh.setFormatter(formatter) log.addHandler(sh) # Import plugin update library from maintainers/scripts/pluginupdate.py ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))) -# Ideally, ROOT.(parent^5) points to root of Nixpkgs official tree -sys.path.insert(0, os.path.join(ROOT.parent.parent.parent.parent.parent, "maintainers", "scripts")) import pluginupdate +import importlib from pluginupdate import run_nix_expr, PluginDesc +from treesitter import update_grammars - -GET_PLUGINS_LUA = """ -with import <localpkgs> {}; -lib.attrNames lua51Packages""" - HEADER = ( "# GENERATED by ./pkgs/applications/editors/vim/plugins/update.py. Do not edit!" ) -def isNeovimPlugin(plug: pluginupdate.Plugin) -> bool: - ''' - Whether it's a neovim-only plugin - We can check if it's available in lua packages - ''' - global luaPlugins - if plug.normalized_name in luaPlugins: - log.debug("%s is a neovim plugin", plug) - return True - return False +NVIM_TREESITTER_GENERATED_NIX = \ + "pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix" class VimEditor(pluginupdate.Editor): nvim_treesitter_updated = False - def generate_nix(self, plugins: List[Tuple[PluginDesc, pluginupdate.Plugin]], outfile: str): + def generate_nix( + self, plugins: List[Tuple[PluginDesc, pluginupdate.Plugin]], outfile: str + ): sorted_plugins = sorted(plugins, key=lambda v: v[0].name.lower()) - nvim_treesitter_rev = pluginupdate.run_nix_expr("(import <localpkgs> { }).vimPlugins.nvim-treesitter.src.rev") + nvim_treesitter_rev = pluginupdate.run_nix_expr( + "(import <localpkgs> { }).vimPlugins.nvim-treesitter.src.rev", + self.nixpkgs + ) with open(outfile, "w+") as f: f.write(HEADER) - f.write(textwrap.dedent(""" - { lib, buildVimPluginFrom2Nix, buildNeovimPlugin, fetchFromGitHub, fetchgit }: + f.write( + textwrap.dedent( + """ + { lib, buildVimPlugin, buildNeovimPlugin, fetchFromGitHub, fetchgit }: final: prev: { """ - )) + ) + ) for pdesc, plugin in sorted_plugins: content = self.plugin2nix(pdesc, plugin) f.write(content) - if plugin.name == "nvim-treesitter" and plugin.commit != nvim_treesitter_rev: + if ( + plugin.name == "nvim-treesitter" and plugin.commit != nvim_treesitter_rev + ): self.nvim_treesitter_updated = True f.write("\n}\n") print(f"updated {outfile}") def plugin2nix(self, pdesc: PluginDesc, plugin: pluginupdate.Plugin) -> str: + GET_PLUGINS_LUA = """ + with import <localpkgs> {}; + lib.attrNames lua51Packages""" + luaPlugins = run_nix_expr(GET_PLUGINS_LUA, self.nixpkgs) repo = pdesc.repo - isNeovim = isNeovimPlugin(plugin) + + def _isNeovimPlugin(plug: pluginupdate.Plugin) -> bool: + """ + Whether it's a neovim-only plugin + We can check if it's available in lua packages + """ + # global luaPlugins + if plug.normalized_name in luaPlugins: + log.debug("%s is a neovim plugin", plug) + return True + return False + + isNeovim = _isNeovimPlugin(plugin) content = f" {plugin.normalized_name} = " src_nix = repo.as_nix(plugin) @@ -103,23 +115,28 @@ class VimEditor(pluginupdate.Editor): }}; """.format( - buildFn="buildNeovimPlugin" if isNeovim else "buildVimPluginFrom2Nix", plugin=plugin, src_nix=src_nix, repo=repo) + buildFn="buildNeovimPlugin" if isNeovim else "buildVimPlugin", + plugin=plugin, + src_nix=src_nix, + repo=repo, + ) log.debug(content) return content - def update(self, args): pluginupdate.update_plugins(self, args) if self.nvim_treesitter_updated: print("updating nvim-treesitter grammars") nvim_treesitter_dir = ROOT.joinpath("nvim-treesitter") - subprocess.check_call([nvim_treesitter_dir.joinpath("update.py")]) + lockfile = json.load(open(args.nixpkgs.join(NVIM_TREESITTER_GENERATED_FILE, "lockfile.json"))) + + nvim_treesitter.update_grammars(lockfile) if self.nixpkgs_repo: index = self.nixpkgs_repo.index for diff in index.diff(None): - if diff.a_path == "pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix": + if diff.a_path == NVIM_TREESITTER_GENERATED_NIX: msg = "vimPlugins.nvim-treesitter: update grammars" print(f"committing to nixpkgs: {msg}") index.add([str(nvim_treesitter_dir.joinpath("generated.nix"))]) @@ -131,11 +148,11 @@ class VimEditor(pluginupdate.Editor): def main(): global luaPlugins - luaPlugins = run_nix_expr(GET_PLUGINS_LUA) - with open(f"{ROOT}/get-plugins.nix") as f: + log.debug(f"Loading from {ROOT}/../get-plugins.nix") + with open(f"{ROOT}/../get-plugins.nix") as f: GET_PLUGINS = f.read() - editor = VimEditor("vim", ROOT, GET_PLUGINS) + editor = VimEditor("vim", Path("pkgs/applications/editors/vim/plugins"), GET_PLUGINS) editor.run() diff --git a/pkgs/applications/editors/vim/plugins/updater.nix b/pkgs/applications/editors/vim/plugins/updater.nix new file mode 100644 index 0000000000000..e82650a040f23 --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/updater.nix @@ -0,0 +1,47 @@ +{ buildPythonApplication +, nix +, makeWrapper +, python3Packages +, lib + +# optional +, vimPlugins +, neovim +}: +let + my_neovim = neovim.override { + configure.packages.all.start = [ vimPlugins.nvim-treesitter ]; + }; + +in +buildPythonApplication { + format = "other"; + pname = "vim-plugins-updater"; + version = "0.1"; + + nativeBuildInputs = [ + makeWrapper + python3Packages.wrapPython + ]; + + pythonPath = [ + python3Packages.gitpython + ]; + + dontUnpack = true; + + installPhase = '' + mkdir -p $out/bin $out/lib + cp ${./update.py} $out/bin/vim-plugins-updater + cp ${./get-plugins.nix} $out/get-plugins.nix + cp ${./nvim-treesitter/update.py} $out/lib/treesitter.py + cp ${../../../../../maintainers/scripts/pluginupdate.py} $out/lib/pluginupdate.py + + # wrap python scripts + makeWrapperArgs+=( --prefix PATH : "${lib.makeBinPath [ nix my_neovim ]}" --prefix PYTHONPATH : "$out/lib" ) + wrapPythonPrograms + ''; + + meta.mainProgram = "vim-plugins-updater"; +} + diff --git a/pkgs/applications/editors/vim/plugins/vim-clap/default.nix b/pkgs/applications/editors/vim/plugins/vim-clap/default.nix index 4236cf79e1353..271f50919fc53 100644 --- a/pkgs/applications/editors/vim/plugins/vim-clap/default.nix +++ b/pkgs/applications/editors/vim/plugins/vim-clap/default.nix @@ -53,7 +53,7 @@ let }; in -vimUtils.buildVimPluginFrom2Nix { +vimUtils.buildVimPlugin { pname = "vim-clap"; inherit version src meta; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 0a92f46e741bc..64f721cee38c7 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -353,7 +353,7 @@ https://github.com/mpickering/hlint-refactor-vim/,, https://github.com/calops/hmts.nvim/,, https://github.com/edluffy/hologram.nvim/,, https://github.com/urbit/hoon.vim/,, -https://github.com/phaazon/hop.nvim/,, +https://github.com/smoka7/hop.nvim/,, https://github.com/rktjmp/hotpot.nvim/,, https://github.com/lewis6991/hover.nvim/,HEAD, https://github.com/othree/html5.vim/,HEAD, @@ -1167,7 +1167,6 @@ https://github.com/junegunn/vim-plug/,, https://github.com/powerman/vim-plugin-AnsiEsc/,, https://github.com/hasundue/vim-pluto/,HEAD, https://github.com/sheerun/vim-polyglot/,, -https://github.com/jakwings/vim-pony/,, https://github.com/haya14busa/vim-poweryank/,, https://github.com/prettier/vim-prettier/,, https://github.com/thinca/vim-prettyprint/,, diff --git a/pkgs/applications/editors/vim/plugins/vim-utils.nix b/pkgs/applications/editors/vim/plugins/vim-utils.nix index 16317a5d0c66e..7b023118f0570 100644 --- a/pkgs/applications/editors/vim/plugins/vim-utils.nix +++ b/pkgs/applications/editors/vim/plugins/vim-utils.nix @@ -392,8 +392,9 @@ rec { inherit (import ./build-vim-plugin.nix { inherit lib stdenv rtpPath toVimPlugin; - }) buildVimPlugin buildVimPluginFrom2Nix; + }) buildVimPlugin; + buildVimPluginFrom2Nix = lib.warn "buildVimPluginFrom2Nix is deprecated: use buildVimPlugin instead" buildVimPlugin; # used to figure out which python dependencies etc. neovim needs requiredPlugins = { diff --git a/pkgs/applications/editors/vim/plugins/vim2nix/autoload/nix.vim b/pkgs/applications/editors/vim/plugins/vim2nix/autoload/nix.vim index 0ddbeaae6be1c..f6160795c5c8b 100644 --- a/pkgs/applications/editors/vim/plugins/vim2nix/autoload/nix.vim +++ b/pkgs/applications/editors/vim/plugins/vim2nix/autoload/nix.vim @@ -50,7 +50,7 @@ fun! nix#NixDerivation(opts, name, repository) abort let dependencies = nix#DependenciesFromCheckout(a:opts, a:name, a:repository, dir) return {'n_a_name': n_a_name, 'n_n_name': n_n_name, 'dependencies': dependencies, 'derivation': join([ - \ ' '.n_a_name.' = buildVimPluginFrom2Nix {'.created_notice, + \ ' '.n_a_name.' = buildVimPlugin {'.created_notice, \ ' name = "'.n_n_name.'-'.date.'";', \ ' src = fetchgit {', \ ' url = "'. a:repository.url .'";', @@ -74,7 +74,7 @@ fun! nix#NixDerivation(opts, name, repository) abort let dependencies = nix#DependenciesFromCheckout(a:opts, a:name, a:repository, dir) return {'n_a_name': n_a_name, 'n_n_name': n_n_name, 'dependencies': dependencies, 'derivation': join([ - \ ' '.n_a_name.' = buildVimPluginFrom2Nix {'.created_notice, + \ ' '.n_a_name.' = buildVimPlugin {'.created_notice, \ ' name = "'.n_n_name.'";', \ ' src = fetchhg {', \ ' url = "'. a:repository.url .'";', @@ -99,7 +99,7 @@ fun! nix#NixDerivation(opts, name, repository) abort let dependencies = keys(get(addon_info, 'dependencies', {})) return {'n_a_name': n_a_name, 'n_n_name': n_n_name, 'dependencies': dependencies, 'derivation': join([ - \ ' '.n_a_name.' = buildVimPluginFrom2Nix {'.created_notice, + \ ' '.n_a_name.' = buildVimPlugin {'.created_notice, \ ' name = "'.n_n_name.'";', \ ' src = fetchurl {', \ ' url = "'. a:repository.url .'";', diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 1f5d14282d207..d0a6df0378317 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -700,8 +700,8 @@ let mktplcRef = { name = "ruff"; publisher = "charliermarsh"; - version = "2023.38.0"; - sha256 = "sha256-Gcw+X8e8MrTflotHUwkrdP/DD/6AX/kEgtRiqvqyqRM="; + version = "2023.40.0"; + sha256 = "sha256-Ym76WtKvz18NgxH9o8O/Ozn+/AtqLvjJs8ffLhPOWkQ="; }; meta = { license = lib.licenses.mit; diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 39e4fbc966d72..e8ae861bf2fbc 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -1,6 +1,6 @@ { stdenv, lib, makeDesktopItem , unzip, libsecret, libXScrnSaver, libxshmfence, buildPackages -, atomEnv, at-spi2-atk, autoPatchelfHook +, at-spi2-atk, autoPatchelfHook, alsa-lib, mesa, nss, nspr, xorg , systemd, fontconfig, libdbusmenu, glib, buildFHSEnv, wayland , libglvnd, libkrb5 @@ -67,7 +67,7 @@ let }; buildInputs = [ libsecret libXScrnSaver libxshmfence ] - ++ lib.optionals (!stdenv.isDarwin) ([ at-spi2-atk libkrb5 ] ++ atomEnv.packages); + ++ lib.optionals (!stdenv.isDarwin) [ alsa-lib at-spi2-atk libkrb5 mesa nss nspr systemd xorg.libxkbfile ]; runtimeDependencies = lib.optionals stdenv.isLinux [ (lib.getLib systemd) fontconfig.lib libdbusmenu wayland libsecret ]; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index ad245ba05d9a6..f7527096f17a4 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -15,11 +15,11 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "152vr796sa1gq62zp3grcr3ywg4b4z233cvwm3s2jhi2nzra26vq"; - x86_64-darwin = "0zk4nf8zyj6vq7yqnidjqgidrj1nq7rri9y2d4aay44kanm3v03f"; - aarch64-linux = "0bprcnd93h13x5d2hzfgpa9yyda3x0zi3w0rfwhi2rbyzlr7vzhf"; - aarch64-darwin = "0rwdknqdhgf3fby1i0gz6hha1vnxfk2dwrpn75g0ra21m11b5b4g"; - armv7l-linux = "0ck2bxhy3k239ici3y2xsc8kwa8bsfn8ywh1p4lh2dkc91liisnq"; + x86_64-linux = "1xzmfvkzqfxblahi2pc54fr7i6rynqm76p4wpbfzxrrh5a3xjwn3"; + x86_64-darwin = "0lp6yqwqwfngl98nba8f77yypb44cfn7kcjhbc93s8kqd57m97zj"; + aarch64-linux = "1hpwjdbfc8l4a7ln50s6h68abcb6djcc5y0h686s9k5v2axm7f3v"; + aarch64-darwin = "0cbms9p8g2gjx9wmm78fzlscw62qasjv30al8v39bda3k694wnh5"; + armv7l-linux = "0hvaray6b36j8s0fvffnkbsw7kf2rn2z4y8q4wlnqx3hfyalcvcn"; }.${system} or throwSystem; sourceRoot = lib.optionalString (!stdenv.isDarwin) "."; @@ -29,7 +29,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.82.1.23255"; + version = "1.82.2.23257"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/emulators/cemu/default.nix b/pkgs/applications/emulators/cemu/default.nix index d38865adc2057..3858ddf55b0dc 100644 --- a/pkgs/applications/emulators/cemu/default.nix +++ b/pkgs/applications/emulators/cemu/default.nix @@ -13,6 +13,7 @@ , fmt_9 , glm , gtk3 +, hidapi , imgui , libpng , libzip @@ -31,13 +32,13 @@ stdenv.mkDerivation rec { pname = "cemu"; - version = "2.0-45"; + version = "2.0-47"; src = fetchFromGitHub { owner = "cemu-project"; repo = "Cemu"; rev = "v${version}"; - hash = "sha256-Bi2ws08e+6rNv83ypLrgB/KZWt95i7UkFrqhCr/0Zko="; + hash = "sha256-0N/bJJHWMHF+ZlVxNHV8t/1jFr3ER3GNF8CPAHVSsak="; }; patches = [ @@ -64,6 +65,7 @@ stdenv.mkDerivation rec { fmt_9 glm gtk3 + hidapi imgui libpng libzip diff --git a/pkgs/applications/emulators/duckstation/001-fix-test-inclusion.diff b/pkgs/applications/emulators/duckstation/001-fix-test-inclusion.diff new file mode 100644 index 0000000000000..b2dabe0262db3 --- /dev/null +++ b/pkgs/applications/emulators/duckstation/001-fix-test-inclusion.diff @@ -0,0 +1,11 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 879d46bc..95570f6b 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -20,5 +20,5 @@ if(BUILD_REGTEST) + endif() + + if(BUILD_TESTS) +- add_subdirectory(common-tests EXCLUDE_FROM_ALL) ++ add_subdirectory(common-tests) + endif() diff --git a/pkgs/applications/emulators/duckstation/002-hardcode-vars.diff b/pkgs/applications/emulators/duckstation/002-hardcode-vars.diff new file mode 100644 index 0000000000000..f0b7bb67a0eed --- /dev/null +++ b/pkgs/applications/emulators/duckstation/002-hardcode-vars.diff @@ -0,0 +1,19 @@ +diff --git a/src/scmversion/gen_scmversion.sh b/src/scmversion/gen_scmversion.sh +index 9c1dacab..d1f895ee 100755 +--- a/src/scmversion/gen_scmversion.sh ++++ b/src/scmversion/gen_scmversion.sh +@@ -10,10 +10,10 @@ else + fi + + +-HASH=$(git rev-parse HEAD) +-BRANCH=$(git rev-parse --abbrev-ref HEAD | tr -d '\r\n') +-TAG=$(git describe --tags --dirty --exclude latest --exclude preview --exclude legacy --exclude previous-latest | tr -d '\r\n') +-DATE=$(git log -1 --date=iso8601-strict --format=%cd) ++HASH="@gitHash@" ++BRANCH="@gitBranch@" ++TAG="@gitTag@" ++DATE="@gitDate@" + + cd $CURDIR + diff --git a/pkgs/applications/emulators/duckstation/default.nix b/pkgs/applications/emulators/duckstation/default.nix index 87470f5614132..e7980e20dddd4 100644 --- a/pkgs/applications/emulators/duckstation/default.nix +++ b/pkgs/applications/emulators/duckstation/default.nix @@ -8,31 +8,45 @@ , curl , extra-cmake-modules , libXrandr +, libbacktrace , makeDesktopItem -, mesa # for libgbm , ninja , pkg-config , qtbase , qtsvg , qttools , qtwayland +, substituteAll , vulkan-loader , wayland , wrapQtAppsHook , enableWayland ? true }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "duckstation"; - version = "unstable-2023-04-14"; + version = "unstable-2023-09-30"; src = fetchFromGitHub { owner = "stenzek"; repo = "duckstation"; - rev = "5fee6f5abee7f3aad65da5523e57896e10e2a53a"; - sha256 = "sha256-sRs/b4GVXhF3zrOef8DSBKJJGYECUER/nNWZAqv7suA="; + rev = "d5608bf12df7a7e03750cb94a08a3d7999034ae2"; + hash = "sha256-ktfZgacjkN6GQb1vLmyTZMr8QmmH12qAvFSIBTjgRSs="; }; + patches = [ + # Tests are not built by default + ./001-fix-test-inclusion.diff + # Patching yet another script that fills data based on git commands... + (substituteAll { + src = ./002-hardcode-vars.diff; + gitHash = finalAttrs.src.rev; + gitBranch = "master"; + gitTag = "0.1-5889-gd5608bf1"; + gitDate = "2023-09-30T23:20:09+10:00"; + }) + ]; + nativeBuildInputs = [ cmake copyDesktopItems @@ -49,7 +63,7 @@ stdenv.mkDerivation { SDL2 curl libXrandr - mesa + libbacktrace qtbase qtsvg vulkan-loader @@ -60,10 +74,12 @@ stdenv.mkDerivation { ] ++ cubeb.passthru.backendLibs; + strictDeps = true; + cmakeFlags = [ - "-DUSE_DRMKMS=ON" - ] - ++ lib.optionals enableWayland [ "-DUSE_WAYLAND=ON" ]; + (lib.cmakeBool "BUILD_TESTS" true) + (lib.cmakeBool "ENABLE_WAYLAND" enableWayland) + ]; desktopItems = [ (makeDesktopItem { @@ -79,6 +95,13 @@ stdenv.mkDerivation { }) ]; + doCheck = true; + checkPhase = '' + runHook preCheck + bin/common-tests + runHook postCheck + ''; + installPhase = '' runHook preInstall @@ -92,23 +115,16 @@ stdenv.mkDerivation { runHook postInstall ''; - doCheck = true; - checkPhase = '' - runHook preCheck - bin/common-tests - runHook postCheck - ''; - qtWrapperArgs = [ "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ vulkan-loader ] ++ cubeb.passthru.backendLibs)}" ]; - meta = with lib; { + meta = { homepage = "https://github.com/stenzek/duckstation"; description = "Fast PlayStation 1 emulator for x86-64/AArch32/AArch64"; - license = licenses.gpl3Only; + license = lib.licenses.gpl3Only; mainProgram = "duckstation-qt"; - maintainers = with maintainers; [ guibou AndersonTorres ]; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ guibou AndersonTorres ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/applications/emulators/dynamips/default.nix b/pkgs/applications/emulators/dynamips/default.nix index 80910700da933..2c529af3a80f3 100644 --- a/pkgs/applications/emulators/dynamips/default.nix +++ b/pkgs/applications/emulators/dynamips/default.nix @@ -35,7 +35,8 @@ stdenv.mkDerivation rec { routers. ''; license = licenses.gpl2Plus; - platforms = platforms.linux; + mainProgram = "dynamips"; maintainers = with maintainers; [ primeos ]; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/applications/emulators/fs-uae/launcher.nix b/pkgs/applications/emulators/fs-uae/launcher.nix index 63ff7eee2ea65..6135ee064e15b 100644 --- a/pkgs/applications/emulators/fs-uae/launcher.nix +++ b/pkgs/applications/emulators/fs-uae/launcher.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation (finalAttrs: { # fs-uae-launcher search side by side for fs-uae # see $src/fsgs/plugins/pluginexecutablefinder.py#find_executable ln -s ${fsuae}/bin/fs-uae $out/bin + ln -s ${fsuae}/bin/fs-uae-device-helper $out/bin ''; meta = { diff --git a/pkgs/applications/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix index 6edfd2e149d6d..730ed7b7ac0af 100644 --- a/pkgs/applications/emulators/mame/default.nix +++ b/pkgs/applications/emulators/mame/default.nix @@ -38,14 +38,14 @@ let in stdenv.mkDerivation rec { pname = "mame"; - version = "0.258"; + version = "0.259"; srcVersion = builtins.replaceStrings [ "." ] [ "" ] version; src = fetchFromGitHub { owner = "mamedev"; repo = "mame"; rev = "mame${srcVersion}"; - hash = "sha256-5wsPlI3xTCeadxvOjjNSGtaa8F7M6gZobsv2Ks8DSGE="; + hash = "sha256-F8psPvwuaILXZF7dCStJApVTD9zzzBwjf1CKGelHlqE="; }; outputs = [ "out" "tools" ]; diff --git a/pkgs/applications/emulators/ppsspp/default.nix b/pkgs/applications/emulators/ppsspp/default.nix index 94a04de14c91d..db76473250c68 100644 --- a/pkgs/applications/emulators/ppsspp/default.nix +++ b/pkgs/applications/emulators/ppsspp/default.nix @@ -34,14 +34,14 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString enableQt "-qt" + lib.optionalString (!enableQt) "-sdl" + lib.optionalString forceWayland "-wayland"; - version = "1.16.1"; + version = "1.16.5"; src = fetchFromGitHub { owner = "hrydgard"; repo = "ppsspp"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - sha256 = "sha256-bKRb7a5lEfE1uUeVl7i1He3qLJ4wI5HmKmWAk2oKdYI="; + sha256 = "sha256-R4XJ/Rn1e7tWjYMztE/YQFlTEVGmt2izaLvLdycVCXQ="; }; postPatch = '' diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 7611a8860b91f..d1cbf12b34d09 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -50,7 +50,7 @@ let mkLibretroCore = { core , src ? (getCoreSrc core) - , version ? "unstable-2023-03-13" + , version ? "unstable-2023-09-24" , ... }@args: import ./mkLibretroCore.nix ({ @@ -100,12 +100,22 @@ in }; }; + beetle-pce = mkLibretroCore { + core = "mednafen-pce"; + src = getCoreSrc "beetle-pce"; + makefile = "Makefile"; + meta = { + description = "Port of Mednafen's PC Engine core to libretro"; + license = lib.licenses.gpl2Only; + }; + }; + beetle-pce-fast = mkLibretroCore { core = "mednafen-pce-fast"; src = getCoreSrc "beetle-pce-fast"; makefile = "Makefile"; meta = { - description = "Port of Mednafen's PC Engine core to libretro"; + description = "Port of Mednafen's PC Engine fast core to libretro"; license = lib.licenses.gpl2Only; }; }; @@ -291,7 +301,11 @@ in core = "citra"; extraBuildInputs = [ libGLU libGL boost ffmpeg nasm ]; makefile = "Makefile"; - makeFlags = [ "HAVE_FFMPEG_STATIC=0" ]; + makeFlags = [ + "HAVE_FFMPEG_STATIC=0" + # https://github.com/libretro/citra/blob/1a66174355b5ed948de48ef13c0ed508b6d6169f/Makefile#L90 + "BUILD_DATE=01/01/1970_00:00" + ]; meta = { description = "Port of Citra to libretro"; license = lib.licenses.gpl2Plus; @@ -410,7 +424,9 @@ in flycast = mkLibretroCore { core = "flycast"; + extraNativeBuildInputs = [ cmake ]; extraBuildInputs = [ libGL libGLU ]; + cmakeFlags = [ "-DLIBRETRO=ON" ]; makefile = "Makefile"; meta = { description = "Flycast libretro port"; @@ -502,7 +518,10 @@ in mame = mkLibretroCore { core = "mame"; - extraBuildInputs = [ alsa-lib libGLU libGL portaudio python3 xorg.libX11 ]; + extraNativeBuildInputs = [ python3 ]; + extraBuildInputs = [ alsa-lib libGLU libGL ]; + # Setting this is breaking compilation of src/3rdparty/genie for some reason + makeFlags = [ "ARCH=" ]; meta = { description = "Port of MAME to libretro"; license = with lib.licenses; [ bsd3 gpl2Plus ]; @@ -626,6 +645,13 @@ in src = getCoreSrc "mupen64plus"; extraBuildInputs = [ libGLU libGL libpng nasm xorg.libX11 ]; makefile = "Makefile"; + makeFlags = [ + "HAVE_PARALLEL_RDP=1" + "HAVE_PARALLEL_RSP=1" + "HAVE_THR_AL=1" + "LLE=1" + "WITH_DYNAREC=${stdenv.hostPlatform.parsed.cpu.name}" + ]; meta = { description = "Libretro port of Mupen64 Plus, GL only"; license = lib.licenses.gpl3Only; @@ -698,6 +724,11 @@ in core = "parallel-n64"; extraBuildInputs = [ libGLU libGL libpng ]; makefile = "Makefile"; + makeFlags = [ + "HAVE_PARALLEL=1" + "HAVE_PARALLEL_RSP=1" + "ARCH=${stdenv.hostPlatform.parsed.cpu.name}" + ]; postPatch = lib.optionalString stdenv.hostPlatform.isAarch64 '' sed -i -e '1 i\CPUFLAGS += -DARM_FIX -DNO_ASM -DARM_ASM -DDONT_WANT_ARM_OPTIMIZATIONS -DARM64' Makefile \ && sed -i -e 's,CPUFLAGS :=,,g' Makefile @@ -737,7 +768,7 @@ in # causes redefinition of _FORTIFY_SOURCE hardeningDisable = [ "fortify3" ]; - postBuild = "cd /build/source/build/pcsx2"; + postBuild = "cd $NIX_BUILD_TOP/source/build/pcsx2"; meta = { description = "Port of PCSX2 to libretro"; license = lib.licenses.gpl3Plus; @@ -852,19 +883,8 @@ in }; }; - scummvm = mkLibretroCore rec { + scummvm = mkLibretroCore { core = "scummvm"; - version = "unstable-2022-04-06"; - # Commit below introduces libretro platform, that uses libretro-{deps,common} as - # submodules. We will probably need to introduce this as separate derivations, - # but for now let's just use the last known version that does not use it. - # https://github.com/libretro/scummvm/commit/36446fa6eb33e67cc798f56ce1a31070260e2ada - src = fetchFromGitHub { - owner = "libretro"; - repo = core; - rev = "2fb2e4c551c9c1510c56f6e890ee0300b7b3fca3"; - hash = "sha256-wrlFqu+ONbYH4xMFDByOgySobGrkhVc7kYWI4JzA4ew="; - }; extraBuildInputs = [ fluidsynth libjpeg libvorbis libGLU libGL ]; makefile = "Makefile"; preConfigure = "cd backends/platform/libretro/build"; diff --git a/pkgs/applications/emulators/retroarch/default.nix b/pkgs/applications/emulators/retroarch/default.nix index 2abbdb1c46ef3..6b7da614cdbef 100644 --- a/pkgs/applications/emulators/retroarch/default.nix +++ b/pkgs/applications/emulators/retroarch/default.nix @@ -8,7 +8,6 @@ , alsa-lib , dbus , fetchFromGitHub -, fetchpatch , ffmpeg_4 , flac , freetype @@ -17,7 +16,6 @@ , libGL , libGLU , libpulseaudio -, libretro-core-info , libv4l , libX11 , libXdmcp @@ -32,10 +30,8 @@ , pkg-config , python3 , qtbase -, retroarch-assets , SDL2 , spirv-tools -, substituteAll , udev , vulkan-loader , wayland @@ -50,12 +46,12 @@ let in stdenv.mkDerivation rec { pname = "retroarch-bare"; - version = "1.15.0"; + version = "1.16.0.3"; src = fetchFromGitHub { owner = "libretro"; repo = "RetroArch"; - hash = "sha256-kJOR3p3fKqGM8a5rgDPkz43uuf5AtS5fVnvr3tJgWbc="; + hash = "sha256-BT+LzRDoQF03aNT2Kg7YaSWhK74CvOOiHUeHDtFpe9s="; rev = "v${version}"; }; diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 9e38d15cac89e..f1099967fe789 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -8,8 +8,8 @@ "atari800": { "owner": "libretro", "repo": "libretro-atari800", - "rev": "94033288b026fe699bc50703609807aa8075f4dd", - "hash": "sha256-fTKFELELt1g7t3uPgnXIgeMkkSbl9GHr0/k2FHcpDFI=" + "rev": "20d59afb3f19065749549732f20845c3be82e68c", + "hash": "sha256-5cxBubhw60Jmp1p5TQ/L6RLaLANctG0TdpzGnpCadIM=" }, "beetle-gba": { "owner": "libretro", @@ -20,8 +20,8 @@ "beetle-lynx": { "owner": "libretro", "repo": "beetle-lynx-libretro", - "rev": "3ca44fda26f27418c92ada1b0f38b948af2151ae", - "hash": "sha256-f0A8gA3UT40UDaAkWQcPoDd6vAcM37tNtZ2hCOIyBJA=" + "rev": "fab3ac02d5622eb53a707bd392cc037282e9d8b4", + "hash": "sha256-+MKH8LmqDqznDIca/Q129zIXYI23V7s38sCD6rKiZlk=" }, "beetle-ngp": { "owner": "libretro", @@ -29,29 +29,35 @@ "rev": "65460e3a9ad529f6901caf669abbda11f437ab55", "hash": "sha256-+xfD1ZMKtbv5Lp12+5RM7Vl3eEF38kykKW8wj/2EN5w=" }, + "beetle-pce": { + "owner": "libretro", + "repo": "beetle-pce-libretro", + "rev": "541463bd937dad175aec09c2a0c8d6a52d175386", + "hash": "sha256-wWS9reb6aN71Q7OlGst+32T8XX1yMCSOHUKHkXht3hg=" + }, "beetle-pce-fast": { "owner": "libretro", "repo": "beetle-pce-fast-libretro", - "rev": "e480f6388375f59fd3e7aeef8ef8531c20e5c73e", - "hash": "sha256-uURt6rB0IngWzEpl0DjbckdaTIjNwVCm3auvy7AwUdA=" + "rev": "f2ff19e56fb33361793f9fdaf44c1ea28bce1da3", + "hash": "sha256-w7weSz8HR4YNPiBPqa81s3/8b9oFijr6DxNeQ/+I9OE=" }, "beetle-pcfx": { "owner": "libretro", "repo": "beetle-pcfx-libretro", - "rev": "724bd21b4524f8cf376dbc29c3e5a12cb674c758", - "hash": "sha256-xeIVZ8FWGbETWYRIBNs3Yum7FDit5fb77hhH+RU45BY=" + "rev": "47c355b6a515aef6dc57f57df1535570108a0e21", + "hash": "sha256-ylFo/wmLQpQGYSrv9PF2DBmr/8rklmHF9R+3y8v93Rs=" }, "beetle-psx": { "owner": "libretro", "repo": "beetle-psx-libretro", - "rev": "fd812d4cf8f65644faef1ea8597f826ddc37c0a0", - "hash": "sha256-yvMgnY2dGUk8TvvfDklN3f6b1ol7vDu6AJcYzdwy9pI=" + "rev": "f256cc3dc3ec2f6017f7088f056996f8f155db64", + "hash": "sha256-McMV5p1qEvqkeTjqOaD+xHNRQly+CNen9YUJxqLpJzk=" }, "beetle-saturn": { "owner": "libretro", "repo": "beetle-saturn-libretro", - "rev": "9bd31a4a42d06ca0f6d30ee38a569e57c150c414", - "hash": "sha256-RHvH9Jp6c4cgEMTo+p+dU7qgJqjPbRqJLURadjAysrM=" + "rev": "cd395e9e3ee407608450ebc565e871b24e7ffed6", + "hash": "sha256-EIZRv1EydfLWFoBb8TzvAY3kkL9Qr2OrwrljOnnM92A=" }, "beetle-snes": { "owner": "libretro", @@ -62,26 +68,26 @@ "beetle-supafaust": { "owner": "libretro", "repo": "supafaust", - "rev": "75c658cce454e58ae04ea252f53a31c60d61548e", - "hash": "sha256-2fXarVfb5/SYXF8t25/fGNFvODpGas5Bi0hLIbXgB+0=" + "rev": "6b639c98372d1c9bac885c55d772c812d2a9d525", + "hash": "sha256-EVXwjrxooZm1JqG4HswUe8zwN81Rm7SPB5Fr4WfpTnc=" }, "beetle-supergrafx": { "owner": "libretro", "repo": "beetle-supergrafx-libretro", - "rev": "1ff2daa9377114d5394142f75f1c388b706567ed", - "hash": "sha256-0FCm9kURtUQpyPb8cSmRAxttnUJnhE3EWV8DPvlj8HE=" + "rev": "56261ccd56f576a42a2d22190c09eb326a4331da", + "hash": "sha256-aoEq4o9uZIAsjQQsN+tJNhOuFA9SNb7RKIUwqUGPhJQ=" }, "beetle-vb": { "owner": "libretro", "repo": "beetle-vb-libretro", - "rev": "dd6393f76ff781df0f4e8c953f5b053b1e61b313", - "hash": "sha256-C8OtTNdC7GNFsY2EH56in35IX8d6ou/1R04kMvM9674=" + "rev": "732a8f701e671bf032165730fdf8bd96fb5ca7bb", + "hash": "sha256-M19+ZidqqDdohuAVPxGVFQDQqoMl2QYM+K1WToqeOWM=" }, "beetle-wswan": { "owner": "libretro", "repo": "beetle-wswan-libretro", - "rev": "81e8b2afd31b7f0f939a3df6d70c8723bcc8a701", - "hash": "sha256-xmDtMC5pId5X4vf9kHO55HmRpp/4ZruOM8QJSl//9R8=" + "rev": "a0ddcd3f084f5b4eb06acb6e03b8c4707a2f6123", + "hash": "sha256-FJfznSo/3YKecVSU9mZW6yzd4/8vf2qrX4xhWjptd+A=" }, "blastem": { "owner": "libretro", @@ -92,20 +98,20 @@ "bluemsx": { "owner": "libretro", "repo": "bluemsx-libretro", - "rev": "acf358be18644a9df0ed9602d63c2f73d4fe605a", - "hash": "sha256-K4mH+brakYZcVEeYMFUkFThqdZGt2+aP5DfpOgWSJxg=" + "rev": "e21bf74bddb79ad1bbe20b4d964e7515269c669b", + "hash": "sha256-U58zJd7txOyd9jymVmogQMIH5Av2kjO5MOn49T2FmqQ=" }, "bsnes": { "owner": "libretro", "repo": "bsnes-libretro", - "rev": "4da970a334ba4644cef72e560985ea3f31fa40f7", - "hash": "sha256-Bu5j1wrMNVMmxQULZwTdXyWi2i6F5C6m8wFDxvtjYdI=" + "rev": "3fe4f9049f99ac71d038b3cb684ebfc8e6cef15a", + "hash": "sha256-fUcJQGkLGTgxEGwWVoZ4Hys9kOKAft7CDTTdQ8j4+Do=" }, "bsnes-hd": { "owner": "DerKoun", "repo": "bsnes-hd", - "rev": "04821703aefdc909a4fd66d168433fcac06c2ba7", - "hash": "sha256-QmNthbWb92vel5PFwJRXeEEVZHIxfvZ0ls+csodpGbU=" + "rev": "f46b6d6368ea93943a30b5d4e79e8ed51c2da5e8", + "hash": "sha256-Y3FhGtcz7BzwUSBy1SGMuylJdZti/JB8qQnabIkG/dI=" }, "bsnes-mercury": { "owner": "libretro", @@ -123,8 +129,8 @@ "desmume": { "owner": "libretro", "repo": "desmume", - "rev": "fbd368c8109f95650e1f81bca1facd6d4d8687d7", - "hash": "sha256-7MFa5zd1jdOCqSI+VPl5nAHE7Kfm/lA0lbSPFskzqaQ=" + "rev": "cf0fcc6ea4a85b7491bdf9adc7bf09748b4be7da", + "hash": "sha256-ne4Tu8U/WSB4vlwBQMK7Ss3UEpDxsOFltpMk2hIx23M=" }, "desmume2015": { "owner": "libretro", @@ -147,14 +153,14 @@ "dosbox-pure": { "owner": "schellingb", "repo": "dosbox-pure", - "rev": "035e01e43623f83a9e71f362364fd74091379455", - "hash": "sha256-j7Or4yTK5l+ZVC5UFeym9sLx+88PRlofoBT1tMuf31A=" + "rev": "e8396b8564ed88d87702ee40b935dec6384c0e5a", + "hash": "sha256-rD7b1uX/Wsu2ik06IiHKbUHT05IllCoBcPMN9OJ0+X4=" }, "eightyone": { "owner": "libretro", "repo": "81-libretro", - "rev": "340a51b250fb8fbf1a9e5d3ad3924044250064e0", - "hash": "sha256-Cz3gPwbME8lDMKju3dn8hM8O2u9h9+8EUg7Nf6a7epA=" + "rev": "6d1b4d26aa9870133616fcfb5a763ca138ae25d1", + "hash": "sha256-KCtJvYWcS3DjAZfyP4sG496X9fOHji/ZwpjiZD0OFDY=" }, "fbalpha2012": { "owner": "libretro", @@ -165,32 +171,33 @@ "fbneo": { "owner": "libretro", "repo": "fbneo", - "rev": "ffcd114b8ea3f3387b66997263ea5df358675aa5", - "hash": "sha256-a4hXRluHQY5hC5jFU2mlqUAI5GmQk6Rbl1HNRA929CI=" + "rev": "9e22c4c7ac42d5f1e5ffacdecb26acae60c663eb", + "hash": "sha256-obzPz5lPqcQzLbB7cFGI50W1rFnF8tqZkpocETSAH0Q=" }, "fceumm": { "owner": "libretro", "repo": "libretro-fceumm", - "rev": "1fa798b220a6df8417dcf7da0ab117533385d9c2", - "hash": "sha256-B1iHZ7BVaM/GBgdD2jNZIEmXcRqKC6YaO9z1ByocMtE=" + "rev": "7fad08e5522e5396a1196055fc106be9b5d5de77", + "hash": "sha256-XHutsAc2PD8INP2u8WTmr2+rxuklXjBruH/mNl5Ro34=" }, "flycast": { - "owner": "libretro", + "owner": "flyinghead", "repo": "flycast", - "rev": "4c293f306bc16a265c2d768af5d0cea138426054", - "hash": "sha256-9IxpRBY1zifhOebLJSDMA/wiOfcZj+KOiPrgmjiFxvo=" + "rev": "39a212140a159e7e7a183a40a201863c0560a945", + "hash": "sha256-lvagJRedkh9m48yHo7ErsIyW9W2QXs6wnEjSgtrHE74=", + "fetchSubmodules": true }, "fmsx": { "owner": "libretro", "repo": "fmsx-libretro", - "rev": "1360c9ff32b390383567774d01fbe5d6dfcadaa3", - "hash": "sha256-LLGD29HKpV34IOJ2ygjHZZT7XQqHHXccnpGNfWCuabg=" + "rev": "1806eed4376fbe2fad82fa19271ea298cfbb7795", + "hash": "sha256-nX0H/+iEq7eBN4tm1+dT6/3BYLCpoyiE/L6waDPmUZI=" }, "freeintv": { "owner": "libretro", "repo": "freeintv", - "rev": "9a65ec6e31d48ad0dae1f381c1ec61c897f970cb", - "hash": "sha256-ZeWw/K6i04XRympqZ6sQG/yjN8cJglVcIkxpyRHx424=" + "rev": "85bf25a39a34bbc39fe36677175d87c2b597dbe7", + "hash": "sha256-4cU/YRZZb7EWNBJX8M91Lb+bCCIlks6xX2Cf6Iq/g9g=" }, "fuse": { "owner": "libretro", @@ -201,62 +208,62 @@ "gambatte": { "owner": "libretro", "repo": "gambatte-libretro", - "rev": "ea563fac40e281b29d37f6b56657abef8f1aaf0d", - "hash": "sha256-2jVbEsGkvdH1lA2//mb2Rm3xeh4EyFUcOUXdydSisvk=" + "rev": "64561b7e1b21dfa42eecb94963c1c495ba332466", + "hash": "sha256-BRh357MGHlglGSs48LhhRNTTyAUD9O0QmGeqLnyYap0=" }, "genesis-plus-gx": { "owner": "libretro", "repo": "Genesis-Plus-GX", - "rev": "f6a9bd72a56a11c2068be2d15fa52dda3e1e8027", - "hash": "sha256-4siJGPRMpXHfP6mBPoDJArNaISTNjPKT69cvtGldadI=" + "rev": "141257e1e2104c4e4a49dc771d9f3c06e00292ec", + "hash": "sha256-voNDwfwBIzuq9peNJ2CtF6UBnaJCDpiWmqPgtrPZplU=" }, "gpsp": { "owner": "libretro", "repo": "gpsp", - "rev": "541adc9e1c6c9328c07058659594d6300ae0fa19", - "hash": "sha256-2iv/gMOgTZReDgVzEc3WyOdAlYgfANK08CtpZIyPxgA=" + "rev": "c0d8ffaa384f724e1a0743e18cb042c29dd48f7f", + "hash": "sha256-KKO0bBV+5+8UcSspZHfinntp/mxukcf6/P4kIi6doUs=" }, "gw": { "owner": "libretro", "repo": "gw-libretro", - "rev": "19a1cb3105ca4a82139fb4994e7995fd956f6f8d", - "hash": "sha256-luhKXzxrXVNAHw8ArF1I78Zch7XEPwI3aqe0f6WRgD0=" + "rev": "0ecff52b11c327af52b22ea94b268c90472b6732", + "hash": "sha256-N/nZoo+duk7XhRtNdV1paWzxYUhv8nLUcnnOs2gbZuQ=" }, "handy": { "owner": "libretro", "repo": "libretro-handy", - "rev": "63db085af671bad2929078c55434623b7d4632a1", - "hash": "sha256-N6M3KSU4NPJCqoG/UMrna9/6H5PsBBMUQLrvqiIdxpE=" + "rev": "0559d3397f689ea453b986311aeac8dbd33afb0b", + "hash": "sha256-Nsp0jiOLWjTGJRURkwx8mj7bBG8nM5fRqE93Lo9n4ac=" }, "hatari": { "owner": "libretro", "repo": "hatari", - "rev": "1ebf0a0488580ef95c0b28f02223b31813c867c5", - "hash": "sha256-i6dr+fFWPatRCIY+ajIZ1p3ERPV5ktv0nxHKxbGE5ao=" + "rev": "d0903a9447323e647ed9756238ba1550cac92940", + "hash": "sha256-kSdK7rkORgTkMg8kL56pNb+wU+m2413shEt7UQ9SCjM=" }, "mame": { "owner": "libretro", "repo": "mame", - "rev": "f7761a9902d59030882c58d4482446196e748c50", - "hash": "sha256-g37WAMt9iBbAYq4DfeTlHWmdW5/Vl7g90v6vCLmMQ3g=" + "rev": "3d612fb19eb95c0ae322c3cab343857b14a65a9c", + "hash": "sha256-ibd8HEKQJo7hrhzqYDu6LzMmIFncXCafod9VXBx9OU0=" }, "mame2000": { "owner": "libretro", "repo": "mame2000-libretro", - "rev": "0208517404e841fce0c094f1a2776a0e1c6c101d", - "hash": "sha256-WEJd7wSzY32sqMpMrjCD0hrOyAQq1WMBaGiY/2QQ4BQ=" + "rev": "720b8ad4cbd76abd57b9aeced9ba541dc8476f7f", + "hash": "sha256-3HnDsZQRjp7PqUdYTAEGsroP1paoTAcTBb1fd7/LBJA=" }, "mame2003": { "owner": "libretro", "repo": "mame2003-libretro", - "rev": "b1cc49cf1d8bbef88b890e1c2a315a39d009171b", - "hash": "sha256-bc4uER92gHf20JjR/Qcetvlu89ZmldJ1DiQphJZt/EA=" + "rev": "105ca02fb85e92b9dd5d6ee43f7152d1199eb149", + "hash": "sha256-zYv3OIgapglsyjWs69IhSJGVQ7CkviKJjKnVom5f9/c=" }, "mame2003-plus": { "owner": "libretro", "repo": "mame2003-plus-libretro", - "rev": "0b9309d9d86aea2457df74709e997bea37899475", - "hash": "sha256-US0nkEH4EeKRejuN8UoDeLt5dhafuo7PEVx0FnpeUG0=" + "rev": "a1ff7485de011926ab21309ad1766f9cad3af58e", + "hash": "sha256-Amp+Fcl2dWS1qDMaa/QL0X5loXRYmnByUjUzliQmLvY=" }, "mame2010": { "owner": "libretro", @@ -279,14 +286,14 @@ "melonds": { "owner": "libretro", "repo": "melonds", - "rev": "0e1f06da626cbe67215c3f06f6bdf510dd4e4649", - "hash": "sha256-ax9Vu8+1pNAHWPXrx5QA0n5EsmaJ2T7KJ5Otz8DSZwM=" + "rev": "c6488c88cb4c7583dbcd61609e0eef441572fae8", + "hash": "sha256-kU0xPM6WBqK6UpMNMotHc3jRFTodahPJRrfbcjdCJTI=" }, "mesen": { "owner": "libretro", "repo": "mesen", - "rev": "caa4e6f14373c40bd2805c600d1b476e7616444a", - "hash": "sha256-cnPNBWXbnCpjgW/wJIboiRBzv3zrHWxpNM1kg09ShLU=" + "rev": "d25d60fc190f3f7603a1113ef1e11d9da65b7583", + "hash": "sha256-C/05mkPHJ8Bsj+uZOqY6rhMc0qx33kSxAT5SNDUPRUU=" }, "mesen-s": { "owner": "libretro", @@ -303,14 +310,14 @@ "mgba": { "owner": "libretro", "repo": "mgba", - "rev": "a69c3434afe8b26cb8f9463077794edfa7d5efad", - "hash": "sha256-rmitsZzRWJ0VYzcNz/UtIK8OscQ4lkyuAwgfXOvSTzg=" + "rev": "314bf7b676f5b820f396209eb0c7d6fbe8103486", + "hash": "sha256-Rk+glDgSa1J1IIe5NrJElX9zr59+LQynfDXuHWyZcEM=" }, "mupen64plus": { "owner": "libretro", "repo": "mupen64plus-libretro-nx", - "rev": "5a63aadedc29655254d8fc7b4da3a325472e198b", - "hash": "sha256-QNa8WGJFShO4vc4idUntCUaLik4xQXBA+X7z5sjZ2NE=" + "rev": "26fd1edd640ff3db49dd5ebb7e54f0de6600fc45", + "hash": "sha256-JueRR2PheAz8sPG8OIpjp1Xih6z2Xp8f7WD+2MuBPo4=" }, "neocd": { "owner": "libretro", @@ -321,8 +328,8 @@ "nestopia": { "owner": "libretro", "repo": "nestopia", - "rev": "16b14865caf1effca030630e2fc73d2d4271fc53", - "hash": "sha256-dU9X8sK/qDA/Qj0x1GicmSAzQyRqVmLiTcfCPe8+BjM=" + "rev": "3dcbec4682e079312d6943e1357487645ec608c7", + "hash": "sha256-+jWedFwuFwZzdYEyKR77AhEBoW6ecY7HAIYEKt9PRg8=" }, "np2kai": { "owner": "AZO234", @@ -346,71 +353,71 @@ "opera": { "owner": "libretro", "repo": "opera-libretro", - "rev": "8a49bb8877611037438aeb857cb182f41ee0e3a1", - "hash": "sha256-oH+sQi4D+xkqiJbq7fgGdHjgvyLt8UjlgXIo7K3wXZM=" + "rev": "100ae1e7decefe1f17d98cfcb9f2af4ff8452691", + "hash": "sha256-GOabGs5JP4hg4y5xEATZMEWuqQxFxdc6ZMnO4oLC2yk=" }, "parallel-n64": { "owner": "libretro", "repo": "parallel-n64", - "rev": "a03fdcba6b2e9993f050b50112f597ce2f44fa2c", - "hash": "sha256-aJG+s+1OkHQHPvVzlJWU/VziQWj1itKkRwqcEBK+lgA=" + "rev": "49eadb4da85f7e3bd59b60f61e8fd5dbfb9f07d5", + "hash": "sha256-S8gsPOgxdq0SwoYFua4ouT7XjT45d/mwCYmI3VVahdI=" }, "pcsx2": { "owner": "libretro", - "repo": "pcsx2", + "repo": "lrps2", "rev": "f3c8743d6a42fe429f703b476fecfdb5655a98a9", "hash": "sha256-0piCNWX7QbZ58KyTlWp4h1qLxXpi1z6ML8sBHMTvCY4=" }, "pcsx_rearmed": { "owner": "libretro", "repo": "pcsx_rearmed", - "rev": "4373e29de72c917dbcd04ec2a5fb685e69d9def3", - "hash": "sha256-727//NqBNEo6RHNQr1RY5cxMrEvfuJczCo+cUJZVv7U=" + "rev": "ead6fd751369f6fe50cb5092ab5530fbf1d66b67", + "hash": "sha256-JzvcM8T/xMP7MDn/58TDNrHN8bjU63/PBtj7JJYYiVo=" }, "picodrive": { "owner": "libretro", "repo": "picodrive", - "rev": "7ab066aab84f15388a53433ea273420bcf917e00", - "hash": "sha256-NK9ASiiIkGZmi2YfCqEzZallVfS7nprLRrBk4dlGyAI=", + "rev": "570319349588288f64c676123244acdb0be33881", + "hash": "sha256-KG5A5NBWi5jKpJOSdSQxjn+wm2F198AINKIU+figoqs=", "fetchSubmodules": true }, "play": { "owner": "jpd002", "repo": "Play-", - "rev": "b33834af08a4954f06be215eee80a72e7a378e91", - "hash": "sha256-IxZk+kSdrkDAabbzdFM8QUrjaJUc1DHjSfAtDuwDJkw=", + "rev": "f50566ffdf6a2f1d0cedfb900f1ee24b9c80fd8e", + "hash": "sha256-G45UMzNh5I7beO8sBtwc80HPioB907UEPtfB1NSS4OY=", "fetchSubmodules": true }, "ppsspp": { "owner": "hrydgard", "repo": "ppsspp", - "rev": "7df51c3d060a780b7383c5c1380e346ad9304bb4", - "hash": "sha256-GK3W0/yWaID3s0W0v6TcgJ0ZU984YspWMS6+XLyThjM=", + "rev": "638192b0245e73a602c5f0d60e80dc7b78ff0793", + "hash": "sha256-Ls9k563j8yEasu6dBs2cmWR+9twBKTolqTLkr3Nt7Uk=", "fetchSubmodules": true }, "prboom": { "owner": "libretro", "repo": "libretro-prboom", - "rev": "d9c3975669b4aab5a1397e0174838bcbbc3c1582", - "hash": "sha256-klSJ7QIpNjlfyjhfeEQZ3j8Gnp4agd0qKVp0vr+KHVA=" + "rev": "6ec854969fd9dec33bb2cab350f05675d1158969", + "hash": "sha256-y0qZwYNwcO4ofWDZ7UXN9ZVMPFxjCnLDDZKBMdZLxEY=" }, "prosystem": { "owner": "libretro", "repo": "prosystem-libretro", - "rev": "763ad22c7de51c8f06d6be0d49c554ce6a94a29b", - "hash": "sha256-rE/hxP8hl9lLTNx/WympFDByjZs46ekyxLKRV4V8D9E=" + "rev": "4202ac5bdb2ce1a21f84efc0e26d75bb5aa7e248", + "hash": "sha256-BR0DTWcB5g0rEoNSxBx+OxBmLELjdR2fgsmdPU7cK68=" }, "puae": { "owner": "libretro", "repo": "libretro-uae", - "rev": "ae58c0f226b654d643b9f2dce58f64657f57cb76", - "hash": "sha256-6oMTwCYGdVhh+R853gOQRzZfa7slDwe6aGVCvdm6NDU=" + "rev": "7bdd798ef14dccafe283588cbf8eb303832a1858", + "hash": "sha256-ML3hRYujyh7WPm9Sx6RzQAxaTqlhneVLDi6qcNJ+hi8=" }, "quicknes": { "owner": "libretro", "repo": "QuickNES_Core", - "rev": "75d501a87ec2074e8d2f7256fb0359513c263c29", - "hash": "sha256-yAHVTgOt8SGyPXihp4YNKKAvxl9VBBAvHyzLW86zSCw=" + "rev": "058d66516ed3f1260b69e5b71cd454eb7e9234a3", + "hash": "sha256-eWnbx4NsxanvSls8lguKBijYZ4+uF97d9es9Yn+3PKs=" }, "same_cdi": { "owner": "libretro", @@ -425,10 +432,10 @@ "hash": "sha256-hQWIuNwCykkJR+6naNarR50kUvIFNny+bbZHR6/GA/4=" }, "scummvm": { - "owner": "libretro", + "owner": "libretro-mirrors", "repo": "scummvm", - "rev": "ab2e5d59cd25dfa5943d45c2567e8330d67fad8b", - "hash": "sha256-9IaQR0prbCT70iWA99NMgGAKPobifdWBX17p4zL0fEM=" + "rev": "2fb2e4c551c9c1510c56f6e890ee0300b7b3fca3", + "hash": "sha256-wrlFqu+ONbYH4xMFDByOgySobGrkhVc7kYWI4JzA4ew=" }, "smsplus-gx": { "owner": "libretro", @@ -439,8 +446,8 @@ "snes9x": { "owner": "snes9xgit", "repo": "snes9x", - "rev": "cc0a87711a7a208cabefc9fd1dbb90e31fe51684", - "hash": "sha256-1m6QvYl5Z0WM1XeXCYLvQaXH8A15P3x8ZzwdFeVPeWo=" + "rev": "0e03a36847c2ab14d84963b0263e653aa4087ff4", + "hash": "sha256-wRkBT80HBE1JXqNSvm0LhhUSjHe1DP3uMy3fKW71uZA=" }, "snes9x2002": { "owner": "libretro", @@ -463,8 +470,8 @@ "stella": { "owner": "stella-emu", "repo": "stella", - "rev": "93ea39d6155f08c21707a85a0b04b33008a7ab15", - "hash": "sha256-9dCBaLxb1CBbngBd3tJ0x5lT+dnzzhK2DO4Gk/S6WW4=" + "rev": "85f23044437a5da35d68f96045d363d0e339f872", + "hash": "sha256-b/3cq+CdQ6MLFzzF/cFTbL0XCSqZFc0Rj9e+bNiN3WY=" }, "stella2014": { "owner": "libretro", @@ -475,8 +482,8 @@ "swanstation": { "owner": "libretro", "repo": "swanstation", - "rev": "e24f21196cdcd50321475c4366b51af245a6bbe6", - "hash": "sha256-DjAB0Z0yY9IGESeNNkkbdoAO5ItJ/8cZ5ycRofHG978=" + "rev": "376744746a6880b5eec7ac48b5c006c9ae8c6770", + "hash": "sha256-5mKNypA0x/FkDZvWhuEr/J5WP7saR7cKo0DQ2DZ36ZE=" }, "tgbdual": { "owner": "libretro", @@ -500,26 +507,26 @@ "vba-m": { "owner": "libretro", "repo": "vbam-libretro", - "rev": "640ce45325694d1dc574e90c95c55bc464368d7e", - "hash": "sha256-aiIeleZHt95Y/kigLEbRaCb3KM0ezMB7yzO16FbuBNM=" + "rev": "a2378f05f600a5a9cf450c60a87976b80d6a895a", + "hash": "sha256-vWm28cSEGex5h7JkJjzNPqEGtQWHK0dpK2gVDlQ3NbM=" }, "vba-next": { "owner": "libretro", "repo": "vba-next", - "rev": "0c310082a6345790124e9348861b300bcccbeced", - "hash": "sha256-RQx/WR83EtPcQkx0ft4Y0/5LaKIOST3L/fh4qoPxz78=" + "rev": "ee92625d2f1666496be4f5662508a2430e846b00", + "hash": "sha256-r3FKBD4GUUkobMJ33VceseyTyqxm/Wsa5Er6XcfGL2Q=" }, "vecx": { "owner": "libretro", "repo": "libretro-vecx", - "rev": "8e932c1d585ae9e467186dea9e73ce38fe1490f7", - "hash": "sha256-2Vo30yiP6SfUt3XHCfQTKTKEtCywdRIoUe6d0Or21WM=" + "rev": "a401c268e425dc8ae6a301e7fdb9a9e96f39b8ea", + "hash": "sha256-24/bcQ5mgLl7zKvpnnSYr5SoLG02al6dP27KoOtnua4=" }, "virtualjaguar": { "owner": "libretro", "repo": "virtualjaguar-libretro", - "rev": "2cc06899b839639397b8b30384a191424b6f529d", - "hash": "sha256-7FiU5/n1hVePttkz7aVfXXx88+zX06/5SJk3EaRYvhQ=" + "rev": "8126e5c504ac7217a638f38e4cd9190822c8abdd", + "hash": "sha256-U/qdKApE0OU3jc6ekfgEZ7VCaIqCc2h+Y+IHe7PIRY0=" }, "yabause": { "owner": "libretro", diff --git a/pkgs/applications/emulators/retroarch/libretro-core-info.nix b/pkgs/applications/emulators/retroarch/libretro-core-info.nix index 308f78c08e2b0..952881f410b7d 100644 --- a/pkgs/applications/emulators/retroarch/libretro-core-info.nix +++ b/pkgs/applications/emulators/retroarch/libretro-core-info.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation rec { pname = "libretro-core-info"; - version = "1.15.0"; + version = "unstable-2023-07-31"; src = fetchFromGitHub { owner = "libretro"; repo = "libretro-core-info"; - hash = "sha256-WIgcHuZgAOrlg+WyOS4TyzWziNzjyQB2sPDM9fR6kwA="; - rev = "v${version}"; + hash = "sha256-VdFsrLiJ+Wu1OKvwX9fMI96CxTareOTK8x6OfksBuYs="; + rev = "dacae85b406131feb12395a415fdf57fc4745201"; }; makeFlags = [ diff --git a/pkgs/applications/emulators/retroarch/retroarch-assets.nix b/pkgs/applications/emulators/retroarch/retroarch-assets.nix index 265b827577185..19022963979b2 100644 --- a/pkgs/applications/emulators/retroarch/retroarch-assets.nix +++ b/pkgs/applications/emulators/retroarch/retroarch-assets.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation rec { pname = "retroarch-assets"; - version = "unstable-2022-10-24"; + version = "unstable-2023-09-11"; src = fetchFromGitHub { owner = "libretro"; repo = "retroarch-assets"; - rev = "4ec80faf1b5439d1654f407805bb66141b880826"; - hash = "sha256-j1npVKEknq7hpFr/XfST2GNHI5KnEYjZAM0dw4tMsYk="; + rev = "7b735ef18bcc6508b1c9a626eb237779ff787179"; + hash = "sha256-S9wWag9fNpCTMKY8yQaF7jFuX1P5XLy/Z4vjtVDK7lg="; }; makeFlags = [ diff --git a/pkgs/applications/emulators/retroarch/retroarch-joypad-autoconfig.nix b/pkgs/applications/emulators/retroarch/retroarch-joypad-autoconfig.nix index 92ba7f20c8b36..ca12c1e2a18d9 100644 --- a/pkgs/applications/emulators/retroarch/retroarch-joypad-autoconfig.nix +++ b/pkgs/applications/emulators/retroarch/retroarch-joypad-autoconfig.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation rec { pname = "retroarch-joypad-autoconfig"; - version = "1.15.0"; + version = "unstable-2023-08-01"; src = fetchFromGitHub { owner = "libretro"; repo = "retroarch-joypad-autoconfig"; - rev = "v${version}"; - hash = "sha256-/F2Y08uDA/pIIeLiLfOQfGVjX2pkuOqPourlx2RbZ28="; + rev = "5666e46bb89caf4e9af358fdb97a2b384cb62f36"; + hash = "sha256-5Po0v0E/dc+nVHnHlJRZzv66B/DKYarwqTkS9+/ktC4="; }; makeFlags = [ diff --git a/pkgs/applications/emulators/retroarch/update_cores.py b/pkgs/applications/emulators/retroarch/update_cores.py index 76147ccf20f41..5348092c52473 100755 --- a/pkgs/applications/emulators/retroarch/update_cores.py +++ b/pkgs/applications/emulators/retroarch/update_cores.py @@ -17,6 +17,7 @@ CORES = { "beetle-gba": {"repo": "beetle-gba-libretro"}, "beetle-lynx": {"repo": "beetle-lynx-libretro"}, "beetle-ngp": {"repo": "beetle-ngp-libretro"}, + "beetle-pce": {"repo": "beetle-pce-libretro"}, "beetle-pce-fast": {"repo": "beetle-pce-fast-libretro"}, "beetle-pcfx": {"repo": "beetle-pcfx-libretro"}, "beetle-psx": {"repo": "beetle-psx-libretro"}, @@ -41,7 +42,7 @@ CORES = { "fbalpha2012": {"repo": "fbalpha2012"}, "fbneo": {"repo": "fbneo"}, "fceumm": {"repo": "libretro-fceumm"}, - "flycast": {"repo": "flycast"}, + "flycast": {"repo": "flycast", "owner": "flyinghead", "fetch_submodules": True}, "fmsx": {"repo": "fmsx-libretro"}, "freeintv": {"repo": "freeintv"}, "fuse": {"repo": "fuse-libretro"}, @@ -71,7 +72,10 @@ CORES = { "o2em": {"repo": "libretro-o2em"}, "opera": {"repo": "opera-libretro"}, "parallel-n64": {"repo": "parallel-n64"}, - "pcsx2": {"repo": "pcsx2"}, + # libretro/lrps2 is a hard-fork of pcsx2 with simplified code to target + # only libretro, while libretro/pcsx2 is supposedly closer to upstream. + # TODO: switch to libretro/pcsx2 since this is more up-to-date + "pcsx2": {"repo": "lrps2"}, "pcsx_rearmed": {"repo": "pcsx_rearmed"}, "picodrive": {"repo": "picodrive", "fetch_submodules": True}, "play": {"repo": "Play-", "owner": "jpd002", "fetch_submodules": True}, @@ -82,7 +86,12 @@ CORES = { "quicknes": {"repo": "QuickNES_Core"}, "sameboy": {"repo": "sameboy"}, "same_cdi": {"repo": "same_cdi"}, - "scummvm": {"repo": "scummvm"}, + # This is the old source code before they upstreamed the source code, + # so now the libretro related code lives in the scummvm/scummvm repository. + # However this broke the old way we were doing builds, so for now point + # to a mirror with the old source code until this issue is fixed. + # TODO: switch to libretro/scummvm since this is more up-to-date + "scummvm": {"repo": "scummvm", "owner": "libretro-mirrors"}, "smsplus-gx": {"repo": "smsplus-gx"}, "snes9x": {"repo": "snes9x", "owner": "snes9xgit"}, "snes9x2002": {"repo": "snes9x2002"}, diff --git a/pkgs/applications/emulators/ryujinx/default.nix b/pkgs/applications/emulators/ryujinx/default.nix index 8136be89601d7..028e1daff09e6 100644 --- a/pkgs/applications/emulators/ryujinx/default.nix +++ b/pkgs/applications/emulators/ryujinx/default.nix @@ -28,13 +28,13 @@ buildDotnetModule rec { pname = "ryujinx"; - version = "1.1.999"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml + version = "1.1.1012"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "7f96dbc0242f169caeb8461237bc01a23c115f56"; - sha256 = "1fi1bfbz07k9n8civ7gv0rlksdm59wpjcq50hrj7dgwnkrlmxdi2"; + rev = "e6700b314f1384f015666767baf9ea1d8411e330"; + sha256 = "1szgmvwril7zwfbvqz850xavrk70i56i1yyqfh9mxpxlc3n9xxzr"; }; dotnet-sdk = dotnetCorePackages.sdk_7_0; diff --git a/pkgs/applications/emulators/vbam/default.nix b/pkgs/applications/emulators/vbam/default.nix index f0cd38de8949d..b090864d0d00a 100644 --- a/pkgs/applications/emulators/vbam/default.nix +++ b/pkgs/applications/emulators/vbam/default.nix @@ -44,7 +44,6 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE='Release'" "-DENABLE_FFMPEG='true'" "-DENABLE_LINK='true'" "-DSYSCONFDIR=etc" diff --git a/pkgs/applications/emulators/vice/default.nix b/pkgs/applications/emulators/vice/default.nix index 45fb03f1ac427..f16ee43352f1d 100644 --- a/pkgs/applications/emulators/vice/default.nix +++ b/pkgs/applications/emulators/vice/default.nix @@ -35,15 +35,6 @@ let }) (makeDesktopItem { - name = "x64"; - exec = "x64"; - comment = "VICE: C64 Emulator"; - desktopName = "VICE: C64 Emulator"; - genericName = "Commodore 64 emulator"; - categories = [ "System" ]; - }) - - (makeDesktopItem { name = "x64dtv"; exec = "x64dtv"; comment = "VICE: C64 DTV Emulator"; @@ -55,8 +46,8 @@ let (makeDesktopItem { name = "x64sc"; exec = "x64sc"; - comment = "VICE: C64 SC Emulator"; - desktopName = "VICE: C64 SC Emulator"; + comment = "VICE: C64 Emulator"; + desktopName = "VICE: C64 Emulator"; genericName = "Commodore 64 SC emulator"; categories = [ "System" ]; }) @@ -127,11 +118,11 @@ let in stdenv.mkDerivation rec { pname = "vice"; - version = "3.6.1"; + version = "3.7.1"; src = fetchurl { url = "mirror://sourceforge/vice-emu/vice-${version}.tar.gz"; - sha256 = "sha256-IN+EyFGq8vUABRCSf20xsy8mmRbTUUZcNm3Ar8ncFQw="; + sha256 = "sha256-fjgR5gJNsGmL+8MhuzJFckRriFPQG0Bz8JhllXsMq5g="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/emulators/yuzu/sources.nix b/pkgs/applications/emulators/yuzu/sources.nix index 4a792c973b53e..1d150cb9ffe98 100644 --- a/pkgs/applications/emulators/yuzu/sources.nix +++ b/pkgs/applications/emulators/yuzu/sources.nix @@ -1,19 +1,19 @@ # Generated by ./update.sh - do not update manually! -# Last updated: 2023-09-13 +# Last updated: 2023-09-27 { compatList = { - rev = "463d5f3537eed71638d4f5809467afec1eb5988c"; + rev = "0e93552d7d65a8eb5149d69488281e4abeeba396"; hash = "sha256:1hdsza3wf9a0yvj6h55gsl7xqvhafvbz1i8paz9kg7l49b0gnlh1"; }; mainline = { - version = "1557"; - hash = "sha256:19wlia1g2ll9fwbn4yj57cax4lvs3d6w41z2yy2pjdq84yzgg1gs"; + version = "1569"; + hash = "sha256:17qs5fn75zqxz0c325zyj46z79pvm2j536afyg96glq6av2kql2b"; }; ea = { - version = "3864"; - distHash = "sha256:02dxf9f33agnp91myxxklrdjalh6d32zjlg07p7v5v48mymnxhv9"; - fullHash = "sha256:020ljbgb79i66y6fqj4xblzv4s808l50jy7wwl0d6jwpck1q3i11"; + version = "3897"; + distHash = "sha256:1kxn7hcrn7kkdjgkxpxjw2pdrg73jhlbv3gvhc6z8358bav7xcbs"; + fullHash = "sha256:1zc1k90f4jzbm8l8fjfsnd77hljh4nqa78l7cczcc3yv2jwrgrz6"; }; } diff --git a/pkgs/applications/file-managers/clifm/default.nix b/pkgs/applications/file-managers/clifm/default.nix index f07309a8ad806..37369ccdb2061 100644 --- a/pkgs/applications/file-managers/clifm/default.nix +++ b/pkgs/applications/file-managers/clifm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "clifm"; - version = "1.13"; + version = "1.14.6"; src = fetchFromGitHub { owner = "leo-arch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Y9z3HT36Z1fwweOnniRgyNQX1cbrLSGGgB5UAxkq9mI="; + sha256 = "sha256-0EOG7BAZL3OPP2/qePNkljAa0/Qb3zwuJWz2P4l8GZc="; }; buildInputs = [ libcap acl file readline ]; diff --git a/pkgs/applications/file-managers/xplr/default.nix b/pkgs/applications/file-managers/xplr/default.nix index 5f058f2baf3ef..b16c59503848f 100644 --- a/pkgs/applications/file-managers/xplr/default.nix +++ b/pkgs/applications/file-managers/xplr/default.nix @@ -23,6 +23,20 @@ rustPlatform.buildRustPackage rec { rm .cargo/config ''; + postInstall = '' + mkdir -p $out/share + cp assets/desktop/xplr.desktop $out/share + + mkdir -p $out/share/icons/hicolor/scalable/apps + cp assets/icon/xplr.svg $out/share/icons/hicolor/scalable/apps + + for size in 16 32 64 128; do + icon_dir=$out/share/icons/hicolor/''${size}x$size/apps + mkdir -p $icon_dir + cp assets/icon/xplr$size.png $icon_dir/xplr.png + done + ''; + meta = with lib; { description = "A hackable, minimal, fast TUI file explorer"; homepage = "https://xplr.dev"; diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index 6bade43a7449a..83be13b959960 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchpatch , makeWrapper , mkDerivation , substituteAll @@ -138,6 +139,11 @@ in mkDerivation rec { pyQt5PackageDir = "${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}"; qsciPackageDir = "${py.pkgs.qscintilla-qt5}/${py.pkgs.python.sitePackages}"; }) + (fetchpatch { + name = "qgis-3.28.9-exiv2-0.28.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-geosciences/qgis/files/qgis-3.28.9-exiv2-0.28.patch?id=002882203ad6a2b08ce035a18b95844a9f4b85d0"; + hash = "sha256-mPRo0A7ko4GCHJrfJ2Ls0dUKvkFtDmhKekI2CR9StMw="; + }) ]; cmakeFlags = [ diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 9ddef90fa2e06..8d01ce5f7a529 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchpatch , makeWrapper , mkDerivation , substituteAll @@ -141,6 +142,11 @@ in mkDerivation rec { pyQt5PackageDir = "${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}"; qsciPackageDir = "${py.pkgs.qscintilla-qt5}/${py.pkgs.python.sitePackages}"; }) + (fetchpatch { + name = "exiv2-0.28.patch"; + url = "https://github.com/qgis/QGIS/commit/32f5418fc4f7bb2ee986dee1824ff2989c113a94.patch"; + hash = "sha256-zWyf+kLro4ZyUJLX/nDjY0nLneTaI1DxHvRsvwoWq14="; + }) ]; # Add path to Qt platform plugins diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index fa90b95bd7337..c6d3a83e0c287 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -30,6 +30,7 @@ , Foundation , testers , imagemagick +, perlPackages , python3 }: @@ -47,13 +48,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "imagemagick"; - version = "7.1.1-15"; + version = "7.1.1-19"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = finalAttrs.version; - hash = "sha256-/fI/RrwcgvKX5loIrDAur60VF5O4FgyPYN7BbcPP/bU="; + hash = "sha256-SxvaodAjSlOvmGPnD0AcXHrE5dTX2eX1sDM/441rP64="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big @@ -125,12 +126,14 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests = { version = testers.testVersion { package = finalAttrs.finalPackage; }; + inherit (perlPackages) ImageMagick; inherit (python3.pkgs) img2pdf; pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; meta = with lib; { homepage = "http://www.imagemagick.org/"; + changelog = "https://github.com/ImageMagick/Website/blob/main/ChangeLog.md"; description = "A software suite to create, edit, compose, or convert bitmap images"; pkgConfigModules = [ "ImageMagick" "MagickWand" ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/applications/graphics/brlcad/default.nix b/pkgs/applications/graphics/brlcad/default.nix index 2a0853fb2212a..f30a6acbbbee7 100644 --- a/pkgs/applications/graphics/brlcad/default.nix +++ b/pkgs/applications/graphics/brlcad/default.nix @@ -34,7 +34,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBRLCAD_ENABLE_STRICT=OFF" - "-DCMAKE_BUILD_TYPE=Release" ]; meta = with lib; { diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index 0adc585603ef3..093a53978a06f 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -2,12 +2,11 @@ , stdenv , fetchFromGitLab , appstream-glib -, cmake , dblatex , desktop-file-utils , graphene -, gtk2 -, gtk-mac-integration-gtk2 +, gtk3 +, gtk-mac-integration-gtk3 , intltool , libxml2 , libxslt @@ -16,24 +15,22 @@ , pkg-config , poppler , python3 - # Building with docs are failing in unstable-2022-12-14 + # Building with docs are still failing in unstable-2023-09-28 , withDocs ? false }: stdenv.mkDerivation { pname = "dia"; - version = "unstable-2022-12-14"; + version = "unstable-2023-09-28"; src = fetchFromGitLab { owner = "GNOME"; repo = "dia"; domain = "gitlab.gnome.org"; - rev = "4a619ec7cc93be5ddfbcc48d9e1572d04943bcad"; - hash = "sha256-xi45Ak4rlDQjs/FNkdkm145mx76GNHjE6Nrs1dc94ww="; + rev = "bd551bb2558dcc89bc0bf7b4dd85b38cd85ad322"; + hash = "sha256-U+8TUE1ULt6MNxnvw9kFjCAVBecUy2Sarof6H9+kR7Q="; }; - patches = [ ./poppler-22_09-build-fix.patch ]; - # Required for the PDF plugin when building with clang. CXXFLAGS = "-std=c++17"; @@ -43,7 +40,7 @@ stdenv.mkDerivation { buildInputs = [ graphene - gtk2 + gtk3 libxml2 python3 poppler @@ -52,7 +49,7 @@ stdenv.mkDerivation { libxslt ] ++ lib.optionals stdenv.isDarwin [ - gtk-mac-integration-gtk2 + gtk-mac-integration-gtk3 ]; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/hdrmerge/default.nix b/pkgs/applications/graphics/hdrmerge/default.nix index d690f5e0671a9..a8db24c35283f 100644 --- a/pkgs/applications/graphics/hdrmerge/default.nix +++ b/pkgs/applications/graphics/hdrmerge/default.nix @@ -3,7 +3,6 @@ , fetchpatch , fetchFromGitHub , cmake -, extra-cmake-modules , qtbase , wrapQtAppsHook , libraw @@ -17,12 +16,12 @@ mkDerivation rec { pname = "hdrmerge"; - version = "unstable-2020-11-12"; + version = "unstable-2023-01-04"; src = fetchFromGitHub { owner = "jcelaya"; repo = "hdrmerge"; - rev = "f5a2538cffe3e27bd9bea5d6a199fa211d05e6da"; - sha256 = "1bzf9wawbdvdbv57hnrmh0gpjfi5hamgf2nwh2yzd4sh1ssfa8jz"; + rev = "ca38b54f980564942a7f2b014a5f57a64c1d9019"; + hash = "sha256-DleYgpDXP0NvbmEURXnBfe3OYnT1CaQq+Mw93JQQprE="; }; nativeBuildInputs = [ @@ -39,17 +38,11 @@ mkDerivation rec { ]; patches = [ + # https://github.com/jcelaya/hdrmerge/pull/222 (fetchpatch { - # patch FindAlglib.cmake to respect ALGLIB_DIR - # see https://github.com/jcelaya/hdrmerge/pull/213 - name = "patch-hdrmerge-CMake.patch"; - url = "https://github.com/mkroehnert/hdrmerge/commit/472b2dfe7d54856158aea3d5412a02d0bab1da4c.patch"; - sha256 = "0jc713ajr4w08pfbi6bva442prj878nxp1fpl9112i3xj34x9sdi"; - }) - (fetchpatch { - name = "support-libraw-0.21.patch"; - url = "https://github.com/jcelaya/hdrmerge/commit/779e566b3e2807280b78c79affda2cdfa64bde87.diff"; - sha256 = "48sivCfJWEtGiBXTrO+SWTVlT9xyx92w2kkB8Wt/clk="; + name = "exiv2-0.28.patch"; + url = "https://github.com/jcelaya/hdrmerge/commit/377d8e6f3c7cdd1a45b63bce2493ad177dde03fb.patch"; + hash = "sha256-lXHML6zGkVeWKvmY5ECoJL2xjmtZz77XJd5prpgJiZo="; }) ]; diff --git a/pkgs/applications/graphics/hydrus/0001-inform-nixpkgs.patch b/pkgs/applications/graphics/hydrus/0001-inform-nixpkgs.patch new file mode 100644 index 0000000000000..e7200814eb059 --- /dev/null +++ b/pkgs/applications/graphics/hydrus/0001-inform-nixpkgs.patch @@ -0,0 +1,18 @@ +diff --git a/hydrus/core/HydrusConstants.py b/hydrus/core/HydrusConstants.py +index 809338ef..9125928f 100644 +--- a/hydrus/core/HydrusConstants.py ++++ b/hydrus/core/HydrusConstants.py +@@ -59,12 +59,7 @@ elif PLATFORM_HAIKU: + RUNNING_FROM_SOURCE = sys.argv[0].endswith( '.py' ) or sys.argv[0].endswith( '.pyw' ) + RUNNING_FROM_MACOS_APP = os.path.exists( os.path.join( BASE_DIR, 'running_from_app' ) ) + +-if RUNNING_FROM_SOURCE: +- NICE_RUNNING_AS_STRING = 'from source' +-elif RUNNING_FROM_FROZEN_BUILD: +- NICE_RUNNING_AS_STRING = 'from frozen build' +-elif RUNNING_FROM_MACOS_APP: +- NICE_RUNNING_AS_STRING = 'from App' ++NICE_RUNNING_AS_STRING = "from nixpkgs (source)" + + BIN_DIR = os.path.join( BASE_DIR, 'bin' ) + HELP_DIR = os.path.join( BASE_DIR, 'help' ) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index ed8f2bef9e352..968f60ba80965 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -12,16 +12,21 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "520"; + version = "544"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - hash = "sha256-y8KfPe3cBBq/iPCG7hNXrZDkOSNi+qSir6rO/65SHkI="; + hash = "sha256-e3VvkdJAQx5heKDJ1Ms6XpXrXWdzv48f8yu0DHfPy1A="; }; + patches = [ + # Nixpkgs specific, can be removed if upstream makes a more reasonable check + ./0001-inform-nixpkgs.patch + ]; + nativeBuildInputs = [ wrapQtAppsHook python3Packages.mkdocs-material @@ -37,13 +42,16 @@ python3Packages.buildPythonPackage rec { cbor2 chardet cloudscraper + dateparser html5lib lxml lz4 numpy opencv4 pillow + pillow-heif psutil + psd-tools pympler pyopenssl pyqt6 @@ -56,7 +64,6 @@ python3Packages.buildPythonPackage rec { requests send2trash service-identity - six twisted ]; @@ -92,6 +99,7 @@ python3Packages.buildPythonPackage rec { -e TestHydrusSessions \ -e TestServer \ -e TestClientMetadataMigration \ + -e TestClientFileStorage \ ''; outputs = [ "out" "doc" ]; @@ -100,13 +108,16 @@ python3Packages.buildPythonPackage rec { # Move the hydrus module and related directories mkdir -p $out/${python3Packages.python.sitePackages} mv {hydrus,static} $out/${python3Packages.python.sitePackages} + # Fix random files being marked with execute permissions + chmod -x $out/${python3Packages.python.sitePackages}/static/*.{png,svg,ico} + # Build docs mkdocs build -d help mv help $out/doc/ # install the hydrus binaries mkdir -p $out/bin - install -m0755 server.py $out/bin/hydrus-server - install -m0755 client.py $out/bin/hydrus-client + install -m0755 hydrus_server.py $out/bin/hydrus-server + install -m0755 hydrus_client.py $out/bin/hydrus-client '' + lib.optionalString enableSwftools '' mkdir -p $out/${python3Packages.python.sitePackages}/bin # swfrender seems to have to be called sfwrender_linux diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 3e1e482bb39c8..575f93efcb270 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -10,6 +10,7 @@ , ghostscript , glib , glibmm +, gobject-introspection , gsl , gspell , gtk-mac-integration @@ -47,6 +48,7 @@ let appdirs beautifulsoup4 cachecontrol + filelock numpy lxml packaging @@ -104,6 +106,7 @@ stdenv.mkDerivation rec { glib # for setup hook gdk-pixbuf # for setup hook wrapGAppsHook + gobject-introspection ] ++ (with perlPackages; [ perl XMLParser diff --git a/pkgs/applications/graphics/inkscape/extensions.nix b/pkgs/applications/graphics/inkscape/extensions.nix index 08260c968cfb8..d411091bbd40e 100644 --- a/pkgs/applications/graphics/inkscape/extensions.nix +++ b/pkgs/applications/graphics/inkscape/extensions.nix @@ -10,13 +10,13 @@ hexmap = stdenv.mkDerivation { pname = "hexmap"; - version = "unstable-2020-06-06"; + version = "unstable-2023-01-26"; src = fetchFromGitHub { owner = "lifelike"; repo = "hexmapextension"; - rev = "11401e23889318bdefb72df6980393050299d8cc"; - sha256 = "1a4jhva624mbljj2k43wzi6hrxacjz4626jfk9y2fg4r4sga22mm"; + rev = "241c9512d0113e8193b7cf06b69ef2c4730b0295"; + hash = "sha256-pSPAupp3xLlbODE2BGu1Xiiiu1Y6D4gG4HhZwccAZ2E="; }; preferLocalBuild = true; diff --git a/pkgs/applications/graphics/komikku/default.nix b/pkgs/applications/graphics/komikku/default.nix index eb37adba6b42c..8f317bd513ffe 100644 --- a/pkgs/applications/graphics/komikku/default.nix +++ b/pkgs/applications/graphics/komikku/default.nix @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { pname = "komikku"; - version = "1.23.0"; + version = "1.24.2"; format = "other"; @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { owner = "valos"; repo = "Komikku"; rev = "v${version}"; - hash = "sha256-duWAOod2co62NJ5Jk+7eWTf2LcfV5ZbFw0BhrbdGdUY="; + hash = "sha256-c00JRy1K/jYoQYNAMSm6lQkuGQXZv/2liV1F4jpg+C4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/krita/generic.nix b/pkgs/applications/graphics/krita/generic.nix index 4f16661cedb11..507aaf0f76868 100644 --- a/pkgs/applications/graphics/krita/generic.nix +++ b/pkgs/applications/graphics/krita/generic.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, makeWrapper, fetchurl, cmake, extra-cmake-modules +{ mkDerivation, lib, stdenv, fetchpatch, makeWrapper, fetchurl, cmake, extra-cmake-modules , karchive, kconfig, kwidgetsaddons, kcompletion, kcoreaddons , kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem , kio, kcrash, breeze-icons @@ -21,6 +21,14 @@ mkDerivation rec { inherit sha256; }; + patches = [ + (fetchpatch { + name = "exiv2-0.28.patch"; + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/krita/-/raw/acd9a818660e86b14a66fceac295c2bab318c671/exiv2-0.28.patch"; + hash = "sha256-iD2pyid513ThJVeotUlVDrwYANofnEiZmWINNUm/saw="; + }) + ]; + nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip makeWrapper ]; buildInputs = [ @@ -47,10 +55,11 @@ mkDerivation rec { --replace 'PYTHONPATH=''${_krita_python_path}' 'PYTHONPATH=${pythonPath}' ''; + cmakeBuildType = "RelWithDebInfo"; + cmakeFlags = [ "-DPYQT5_SIP_DIR=${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings" "-DPYQT_SIP_DIR_OVERRIDE=${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings" - "-DCMAKE_BUILD_TYPE=RelWithDebInfo" ]; preInstall = '' diff --git a/pkgs/applications/graphics/luminance-hdr/default.nix b/pkgs/applications/graphics/luminance-hdr/default.nix index 257878d20f63f..53d127857617d 100644 --- a/pkgs/applications/graphics/luminance-hdr/default.nix +++ b/pkgs/applications/graphics/luminance-hdr/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, cmake, fetchFromGitHub, pkg-config +{ lib, mkDerivation, cmake, fetchFromGitHub, fetchpatch, pkg-config , boost, exiv2, fftwFloat, gsl , ilmbase, lcms2, libraw, libtiff, openexr , qtbase, qtdeclarative, qttools, qtwebengine, eigen @@ -15,6 +15,14 @@ mkDerivation rec { sha256 = "sha256-PWqtYGx8drfMVp7D7MzN1sIUTQ+Xz5yyeHN87p2r6PY="; }; + patches = [ + (fetchpatch { + name = "exiv2-0.28.patch"; + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/luminancehdr/-/raw/2e4a7321c7d20a52da104f4aa4dc76ac7224d94b/exiv2-0.28.patch"; + hash = "sha256-Hj+lqAd5VuTjmip8Po7YiGOWWDxnu4IMXOiEFBukXpk="; + }) + ]; + env.NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; buildInputs = [ diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix index 7c909de9f84c5..3169d5f0d4f1f 100644 --- a/pkgs/applications/graphics/nomacs/default.nix +++ b/pkgs/applications/graphics/nomacs/default.nix @@ -1,10 +1,9 @@ -{ stdenv -, lib -, mkDerivation +{ lib +, stdenv , fetchFromGitHub -, fetchpatch , cmake , pkg-config +, wrapQtAppsHook , qtbase , qttools @@ -18,32 +17,24 @@ , quazip }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "nomacs"; - version = "3.17.2206"; + version = "3.17.2285"; src = fetchFromGitHub { owner = "nomacs"; repo = "nomacs"; rev = version; - sha256 = "1bq7bv4p7w67172y893lvpk90d6fgdpnylynbj2kn8m2hs6khya4"; + hash = "sha256-/K7LRPwNy2PG7tIGD0tiKnEOPZ491lxFRlgf4xWYtxs="; }; - patches = [ - # Add support for Quazip 1.x. - (fetchpatch { - url = "https://github.com/nomacs/nomacs/pull/576.patch"; - sha256 = "11ryjvd9jbb0cqagai4a6980jfq8lrcbyw2d7z9yld1f42w9kbxm"; - stripLen = 1; - }) - ]; - setSourceRoot = '' sourceRoot=$(echo */ImageLounge) ''; nativeBuildInputs = [cmake - pkg-config]; + pkg-config + wrapQtAppsHook]; buildInputs = [qtbase qttools @@ -62,13 +53,16 @@ mkDerivation rec { "-DENABLE_TRANSLATIONS=ON" "-DUSE_SYSTEM_QUAZIP=ON"]; + postInstall = lib.optionalString stdenv.isDarwin '' + mkdir -p $out/lib + mv $out/libnomacsCore.dylib $out/lib/libnomacsCore.dylib + ''; + meta = with lib; { homepage = "https://nomacs.org"; description = "Qt-based image viewer"; maintainers = with lib.maintainers; [ mindavi ]; license = licenses.gpl3Plus; inherit (qtbase.meta) platforms; - # Broken on hydra since 2020-08-15: https://hydra.nixos.org/build/125495291 (bump from 3.16 to 3.17 prerelease) - broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/graphics/nufraw/default.nix b/pkgs/applications/graphics/nufraw/default.nix index f6031bea069d9..8b5966bbaf0a5 100644 --- a/pkgs/applications/graphics/nufraw/default.nix +++ b/pkgs/applications/graphics/nufraw/default.nix @@ -1,6 +1,7 @@ -{ stdenv +{ lib +, stdenv , fetchurl -, lib +, fetchpatch , autoreconfHook , bzip2 @@ -49,14 +50,28 @@ stdenv.mkDerivation rec { "--enable-dst-correction" ]; + env.NIX_CFLAGS_COMPILE = "-Wno-narrowing"; + postInstall = lib.optionalString addThumbnailer '' mkdir -p $out/share/thumbnailers substituteAll ${./nufraw.thumbnailer} $out/share/thumbnailers/${pname}.thumbnailer ''; - # Fixes an upstream issue where headers with templates were included in an extern-C scope - # which caused the build to fail - patches = [ ./move-extern-c.patch ]; + patches = [ + # Fixes an upstream issue where headers with templates were included in an extern-C scope + # which caused the build to fail + (fetchpatch { + name = "0001-nufraw-glib-2.70.patch"; + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/gimp-nufraw/-/raw/3405bc864752dbd04f2d182a21b4108d6cc3aa95/0001-nufraw-glib-2.70.patch"; + hash = "sha256-XgzgjikWTcqymHa7bKmruNZaeb2/lpN19HXoRUt5rTk="; + }) + ] ++ lib.optionals (lib.versionAtLeast exiv2.version "0.28") [ + (fetchpatch { + name = "0002-exiv2-error.patch"; + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/gimp-nufraw/-/raw/3405bc864752dbd04f2d182a21b4108d6cc3aa95/0002-exiv2-error.patch"; + hash = "sha256-40/Wwk1sWiaIWp077EYgP8jFO4k1cvf30heRDMYJw3M="; + }) + ]; meta = with lib; { homepage = "https://nufraw.sourceforge.io/"; @@ -70,6 +85,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2Plus; maintainers = with maintainers; [ asbachb ]; - platforms = [ "x86_64-linux" "i686-linux" ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/nufraw/move-extern-c.patch b/pkgs/applications/graphics/nufraw/move-extern-c.patch deleted file mode 100644 index 43a4942d3e62d..0000000000000 --- a/pkgs/applications/graphics/nufraw/move-extern-c.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/uf_glib.h b/uf_glib.h -index c1a17bd..8a10800 100644 ---- a/uf_glib.h -+++ b/uf_glib.h -@@ -13,13 +13,13 @@ - #ifndef _UF_GLIB_H - #define _UF_GLIB_H - -+#include <glib.h> -+#include <glib/gstdio.h> -+ - #ifdef __cplusplus - extern "C" { - #endif - --#include <glib.h> --#include <glib/gstdio.h> -- - // g_win32_locale_filename_from_utf8 is needed only on win32 - #ifdef _WIN32 - #define uf_win32_locale_filename_from_utf8(__some_string__) \ diff --git a/pkgs/applications/graphics/panotools/default.nix b/pkgs/applications/graphics/panotools/default.nix index 0bd1fc20c59fc..9448e0b17213e 100644 --- a/pkgs/applications/graphics/panotools/default.nix +++ b/pkgs/applications/graphics/panotools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libpano13"; - version = "2.9.21"; + version = "2.9.22"; src = fetchurl { url = "mirror://sourceforge/panotools/${pname}-${version}.tar.gz"; - sha256 = "sha256-eeWhRSGZMF4pYUYnIO9ZQRUnecEnxblvw0DSSS5jNZA="; + sha256 = "sha256-r/xoMM2+ccKNJzHcv43qKs2m2f/UYJxtvzugxoRAqOM="; }; buildInputs = [ perl libjpeg libpng libtiff ]; diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index c50a0ebb74909..14c86082e6714 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -45,7 +45,6 @@ in stdenv.mkDerivation rec { ''; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DPARAVIEW_ENABLE_FFMPEG=ON" "-DPARAVIEW_ENABLE_GDAL=ON" "-DPARAVIEW_ENABLE_MOTIONFX=ON" diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix index 3b17ce8fd4f87..fed2c944e5c58 100644 --- a/pkgs/applications/graphics/photoqt/default.nix +++ b/pkgs/applications/graphics/photoqt/default.nix @@ -1,28 +1,70 @@ -{ mkDerivation, lib, fetchurl, cmake, exiv2, graphicsmagick, libraw -, qtbase, qtdeclarative, qtmultimedia, qtquickcontrols2, qttools, qtgraphicaleffects -, extra-cmake-modules, poppler, kimageformats, libarchive, pugixml, wrapQtAppsHook}: +{ lib +, stdenv +, fetchurl +, cmake +, extra-cmake-modules +, qttools +, wrapQtAppsHook +, exiv2 +, graphicsmagick +, kimageformats +, libarchive +, libraw +, mpv +, poppler +, pugixml +, qtbase +, qtdeclarative +, qtgraphicaleffects +, qtmultimedia +, qtquickcontrols +, qtquickcontrols2 +}: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "photoqt"; - version = "3.1"; + version = "3.3"; src = fetchurl { - url = "https://${pname}.org/pkgs/${pname}-${version}.tar.gz"; - hash = "sha256-hihfqE7XIlSAxPg3Kzld3LrYS97wDH//GGqpBpBwFm0="; + url = "https://photoqt.org/pkgs/photoqt-${version}.tar.gz"; + hash = "sha256-AD+Uww/tmXRiAkmeuHBBollE6Y9L7c+fB882ALVtSXQ="; }; - nativeBuildInputs = [ cmake extra-cmake-modules qttools wrapQtAppsHook ]; + # error: no member named 'setlocale' in namespace 'std'; did you mean simply 'setlocale'? + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace cplusplus/main.cpp \ + --replace "std::setlocale" "setlocale" + ''; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + qttools + wrapQtAppsHook + ]; buildInputs = [ - qtbase qtquickcontrols2 exiv2 graphicsmagick poppler - qtmultimedia qtdeclarative libraw qtgraphicaleffects - kimageformats libarchive pugixml + exiv2 + graphicsmagick + kimageformats + libarchive + libraw + mpv + poppler + pugixml + qtbase + qtdeclarative + qtgraphicaleffects + qtmultimedia + qtquickcontrols + qtquickcontrols2 ]; cmakeFlags = [ - "-DFREEIMAGE=OFF" "-DDEVIL=OFF" "-DCHROMECAST=OFF" + "-DFREEIMAGE=OFF" + "-DIMAGEMAGICK=OFF" ]; preConfigure = '' @@ -30,9 +72,11 @@ mkDerivation rec { ''; meta = { - homepage = "https://photoqt.org/"; description = "Simple, yet powerful and good looking image viewer"; + homepage = "https://photoqt.org/"; license = lib.licenses.gpl2Plus; + mainProgram = "photoqt"; + maintainers = with lib.maintainers; [ wegank ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/graphics/phototonic/default.nix b/pkgs/applications/graphics/phototonic/default.nix index 5044e60161cf4..738f78cf347d7 100644 --- a/pkgs/applications/graphics/phototonic/default.nix +++ b/pkgs/applications/graphics/phototonic/default.nix @@ -1,18 +1,26 @@ -{ mkDerivation, lib, fetchFromGitHub, qtbase, qmake, exiv2 }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, qmake, wrapQtAppsHook, qtbase, exiv2 }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "phototonic"; version = "2.1"; src = fetchFromGitHub { - repo = "phototonic"; owner = "oferkv"; + repo = "phototonic"; rev = "v${version}"; - sha256 = "0csidmxl1sfmn6gq81vn9f9jckb4swz3sgngnwqa4f75lr6604h7"; + hash = "sha256-BxJgTKblOKIwt88+PT7XZE0mk0t2B4SfsdXpQHttUTM="; }; + patches = [ + (fetchpatch { + name = "exiv2-0.28.patch"; + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/phototonic/-/raw/fcfa17307ad8988750cc09200188c9365c2c0b79/exiv2-0.28.patch"; + hash = "sha256-EayJYM4qobUWosxV2Ylj+2eiyhk1jM8OfnFZDbVdGII="; + }) + ]; + + nativeBuildInputs = [ qmake wrapQtAppsHook ]; buildInputs = [ qtbase exiv2 ]; - nativeBuildInputs = [ qmake ]; preConfigure = '' sed -i 's;/usr;$$PREFIX/;g' phototonic.pro @@ -20,9 +28,9 @@ mkDerivation rec { meta = with lib; { description = "An image viewer and organizer"; - homepage = "https://sourceforge.net/projects/phototonic/"; - license = licenses.gpl3; - platforms = platforms.linux; + homepage = "https://github.com/oferkv/phototonic"; + license = licenses.gpl3Plus; maintainers = with maintainers; [ pSub ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/pixinsight/default.nix b/pkgs/applications/graphics/pixinsight/default.nix index f2c200ed82b94..08502ccf06bab 100644 --- a/pkgs/applications/graphics/pixinsight/default.nix +++ b/pkgs/applications/graphics/pixinsight/default.nix @@ -10,9 +10,9 @@ stdenv.mkDerivation rec { version = "1.8.9-2"; src = requireFile rec { - name = "PI-linux-x64-${version}-20230828-c.tar.xz"; + name = "PI-linux-x64-${version}-20230920-c.tar.xz"; url = "https://pixinsight.com/"; - sha256 = "sha256-f4E6F3LeEolDGcN9Uo/n8GlIuwMIVI26fW9NYtEesd4="; + hash = "sha256-g7paYTYv52XBg0w3d3YhVNrmt+iS20uobaUsvY6F3jM="; message = '' PixInsight is available from ${url} and requires a commercial (or trial) license. After a license has been obtained, PixInsight can be downloaded from the software distribution diff --git a/pkgs/applications/graphics/structorizer/default.nix b/pkgs/applications/graphics/structorizer/default.nix index ca58271425d94..d1f796e42fee1 100755 --- a/pkgs/applications/graphics/structorizer/default.nix +++ b/pkgs/applications/graphics/structorizer/default.nix @@ -5,11 +5,12 @@ , makeDesktopItem , makeWrapper , copyDesktopItems +, nix-update-script }: stdenv.mkDerivation rec { pname = "structorizer"; - version = "3.32-11"; + version = "3.32-12"; desktopItems = [ (makeDesktopItem { @@ -37,7 +38,7 @@ stdenv.mkDerivation rec { owner = "fesch"; repo = "Structorizer.Desktop"; rev = version; - hash = "sha256-rGyeOcGm6uBplgTjMIOy/xRekfHacwDy9kkMigmRSdk="; + hash = "sha256-DZktq07MoXBg2AwHOoPLTbON/giSqDZOfmaMkZl1w1g="; }; patches = [ ./makeStructorizer.patch ./makeBigJar.patch ]; @@ -94,11 +95,14 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Create Nassi-Shneiderman diagrams (NSD)"; homepage = "https://structorizer.fisch.lu"; license = licenses.gpl3Plus; platforms = platforms.all; maintainers = with maintainers; [ annaaurora ]; + mainProgram = "structorizer"; }; } diff --git a/pkgs/applications/graphics/upscayl/default.nix b/pkgs/applications/graphics/upscayl/default.nix index d146919e556f0..ec37b9b429f0f 100644 --- a/pkgs/applications/graphics/upscayl/default.nix +++ b/pkgs/applications/graphics/upscayl/default.nix @@ -4,11 +4,11 @@ lib, }: let pname = "upscayl"; - version = "2.8.1"; + version = "2.8.6"; src = fetchurl { url = "https://github.com/upscayl/upscayl/releases/download/v${version}/upscayl-${version}-linux.AppImage"; - hash = "sha256-gmFT6onuoaw9WDCUDImZM/AxuZECqPC73ZyNnp6WSGA="; + hash = "sha256-w5rjLqdlPOZWgdc2t0Y3tl24qZqpjBV6I9gruLaI+qc="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/graphics/vipsdisp/default.nix b/pkgs/applications/graphics/vipsdisp/default.nix index 2752eaff87d29..c40de85767a30 100644 --- a/pkgs/applications/graphics/vipsdisp/default.nix +++ b/pkgs/applications/graphics/vipsdisp/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "vipsdisp"; - version = "2.5.1"; + version = "2.6.0"; src = fetchFromGitHub { owner = "jcupitt"; repo = "vipsdisp"; rev = "v${version}"; - hash = "sha256-hx7daXVarV4JdxZfwnTHsuxxijCRP17gkOjicI3EFlM="; + hash = "sha256-iLjS3vBhdPPQNtIaM++xKekYTsr1X9f6ED2A7DYV7Lc="; }; postPatch = '' @@ -46,6 +46,8 @@ stdenv.mkDerivation rec { homepage = "https://github.com/jcupitt/vipsdisp"; description = "Tiny image viewer with libvips"; license = licenses.mit; + mainProgram = "vipsdisp"; maintainers = with maintainers; [ foo-dogsquared ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix index 7810ea3213d8c..ccb6b087215a8 100644 --- a/pkgs/applications/graphics/yed/default.nix +++ b/pkgs/applications/graphics/yed/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "yEd"; - version = "3.23.1"; + version = "3.23.2"; src = fetchzip { url = "https://www.yworks.com/resources/yed/demo/${pname}-${version}.zip"; - sha256 = "sha256-MboljULek5vCcHpRFL9kdT4AROTD774AOBYeOTzcdig="; + sha256 = "sha256-u83OmIzq9VygKbfa886mj6BIa/9ET1btry2nR/wxeyI="; }; nativeBuildInputs = [ makeWrapper unzip wrapGAppsHook ]; diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index e61e99751d0d6..a0e59c43d17c4 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -120,7 +120,7 @@ let kdebugsettings = callPackage ./kdebugsettings.nix {}; kdeconnect-kde = callPackage ./kdeconnect-kde.nix {}; kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {}; - kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {}; + kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers {}; kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {}; kdenlive = callPackage ./kdenlive {}; kdepim-addons = callPackage ./kdepim-addons.nix {}; diff --git a/pkgs/applications/kde/kdegraphics-thumbnailers.nix b/pkgs/applications/kde/kdegraphics-thumbnailers/default.nix index f0d9fea5d0e68..6686f582d6d2b 100644 --- a/pkgs/applications/kde/kdegraphics-thumbnailers.nix +++ b/pkgs/applications/kde/kdegraphics-thumbnailers/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, fetchpatch, + mkDerivation, lib, ghostscript, substituteAll, extra-cmake-modules, karchive, kio, libkexiv2, libkdcraw, kdegraphics-mobipocket }: @@ -11,4 +11,13 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ karchive kio libkexiv2 libkdcraw kdegraphics-mobipocket ]; + + patches = [ + # Hardcode patches to Ghostscript so PDF thumbnails work OOTB. + # Intentionally not doing the same for dvips because TeX is big. + (substituteAll { + gs = "${ghostscript}/bin/gs"; + src = ./gs-paths.patch; + }) + ]; } diff --git a/pkgs/applications/kde/kdegraphics-thumbnailers/gs-paths.patch b/pkgs/applications/kde/kdegraphics-thumbnailers/gs-paths.patch new file mode 100644 index 0000000000000..5aa4a8d7444c9 --- /dev/null +++ b/pkgs/applications/kde/kdegraphics-thumbnailers/gs-paths.patch @@ -0,0 +1,22 @@ +diff --git a/ps/gscreator.cpp b/ps/gscreator.cpp +index 5b84e49..cbb7c25 100644 +--- a/ps/gscreator.cpp ++++ b/ps/gscreator.cpp +@@ -101,7 +101,7 @@ static const char *epsprolog = + "[ ] 0 setdash newpath false setoverprint false setstrokeadjust\n"; + + static const char * gsargs_ps[] = { +- "gs", ++ "@gs@", + "-sDEVICE=png16m", + "-sOutputFile=-", + "-dSAFER", +@@ -120,7 +120,7 @@ static const char * gsargs_ps[] = { + }; + + static const char * gsargs_eps[] = { +- "gs", ++ "@gs@", + "-sDEVICE=png16m", + "-sOutputFile=-", + "-dSAFER", diff --git a/pkgs/applications/maui/booth.nix b/pkgs/applications/maui/booth.nix index 0f753832ad147..f820558958546 100644 --- a/pkgs/applications/maui/booth.nix +++ b/pkgs/applications/maui/booth.nix @@ -7,6 +7,7 @@ , kirigami2 , mauikit , mauikit-filebrowsing +, prison , qtgraphicaleffects , qtmultimedia , qtquickcontrols2 @@ -27,6 +28,7 @@ mkDerivation { kirigami2 mauikit mauikit-filebrowsing + prison qtgraphicaleffects qtmultimedia qtquickcontrols2 diff --git a/pkgs/applications/maui/default.nix b/pkgs/applications/maui/default.nix index 5379910c880f8..b64a3d8455eb8 100644 --- a/pkgs/applications/maui/default.nix +++ b/pkgs/applications/maui/default.nix @@ -61,6 +61,7 @@ let mauikit = callPackage ./mauikit.nix { }; mauikit-accounts = callPackage ./mauikit-accounts.nix { }; mauikit-calendar = callPackage ./mauikit-calendar { }; + mauikit-documents = callPackage ./mauikit-documents.nix { }; mauikit-filebrowsing = callPackage ./mauikit-filebrowsing.nix { }; mauikit-imagetools = callPackage ./mauikit-imagetools.nix { }; mauikit-terminal = callPackage ./mauikit-terminal.nix { }; diff --git a/pkgs/applications/maui/mauikit-documents.nix b/pkgs/applications/maui/mauikit-documents.nix new file mode 100644 index 0000000000000..19d8e9faa2072 --- /dev/null +++ b/pkgs/applications/maui/mauikit-documents.nix @@ -0,0 +1,44 @@ +{ lib +, mkDerivation +, cmake +, extra-cmake-modules +, karchive +, kconfig +, kcoreaddons +, kfilemetadata +, kguiaddons +, ki18n +, kiconthemes +, kio +, mauikit +, poppler +}: + +mkDerivation { + pname = "mauikit-documents"; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + karchive + kconfig + kcoreaddons + kfilemetadata + kguiaddons + ki18n + kiconthemes + kio + mauikit + poppler + ]; + + meta = { + homepage = "https://invent.kde.org/maui/mauikit-documents"; + description = "MauiKit QtQuick plugins for text editing"; + license = with lib.licenses; [ bsd2 lgpl21Plus ]; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/applications/maui/shelf.nix b/pkgs/applications/maui/shelf.nix index 3942b9a34d6a1..3ac804512531d 100644 --- a/pkgs/applications/maui/shelf.nix +++ b/pkgs/applications/maui/shelf.nix @@ -9,6 +9,7 @@ , kio , kirigami2 , mauikit +, mauikit-documents , mauikit-filebrowsing , mauikit-texteditor , qtmultimedia @@ -32,6 +33,7 @@ mkDerivation { kio kirigami2 mauikit + mauikit-documents mauikit-filebrowsing mauikit-texteditor qtmultimedia diff --git a/pkgs/applications/maui/srcs.nix b/pkgs/applications/maui/srcs.nix index 2221ae4a42f16..6473b9607bfd6 100644 --- a/pkgs/applications/maui/srcs.nix +++ b/pkgs/applications/maui/srcs.nix @@ -4,19 +4,19 @@ { agenda = { - version = "0.5.0"; + version = "0.5.1"; src = fetchurl { - url = "${mirror}/stable/maui/agenda/0.5.0/agenda-0.5.0.tar.xz"; - sha256 = "1ak87cda64c05knzdjf6sxjn70chs2sa6zh2adhq3mqm3dh9flf7"; - name = "agenda-0.5.0.tar.xz"; + url = "${mirror}/stable/maui/agenda/0.5.1/agenda-0.5.1.tar.xz"; + sha256 = "1c45fnlg15pjd3ljmm3w2jcrq94jirrykpq1xrvgfbv5d50796x7"; + name = "agenda-0.5.1.tar.xz"; }; }; arca = { - version = "0.5.0"; + version = "0.5.1"; src = fetchurl { - url = "${mirror}/stable/maui/arca/0.5.0/arca-0.5.0.tar.xz"; - sha256 = "12bqk5dxh1rqnbj61kymkzzgmilas6jilid4rijdgjaahdahw6hk"; - name = "arca-0.5.0.tar.xz"; + url = "${mirror}/stable/maui/arca/0.5.1/arca-0.5.1.tar.xz"; + sha256 = "0irbc1ysnia5wp398ddijad77qg7gd076fkm972wgk4pmqnm0rcz"; + name = "arca-0.5.1.tar.xz"; }; }; bonsai = { @@ -28,35 +28,35 @@ }; }; booth = { - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "${mirror}/stable/maui/booth/1.1.0/booth-1.1.0.tar.xz"; - sha256 = "1jr5iha1lvqnsh29y6k60nd63dqyh1clj8idqssfvaz09skbyk1q"; - name = "booth-1.1.0.tar.xz"; + url = "${mirror}/stable/maui/booth/1.1.1/booth-1.1.1.tar.xz"; + sha256 = "1s3h083qbjjj5dmm27vc66vx0mzgpl4klhi9cc07z3apjldf1si0"; + name = "booth-1.1.1.tar.xz"; }; }; buho = { - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/buho/3.0.0/buho-3.0.0.tar.xz"; - sha256 = "1426b9wr8l8rzxgyahlchv9d4dgpqz5dr5nza3jax6mlh4ams507"; - name = "buho-3.0.0.tar.xz"; + url = "${mirror}/stable/maui/buho/3.0.1/buho-3.0.1.tar.xz"; + sha256 = "0favgdwnb8gvmpisq58bmjvnajzgdk886z5m07vz4mfj7ipjjzbv"; + name = "buho-3.0.1.tar.xz"; }; }; clip = { - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/clip/3.0.0/clip-3.0.0.tar.xz"; - sha256 = "0a6z4h5rp3kmy5pp37df0abvbqxd6hx1jkss9w2sh59v8zijvrck"; - name = "clip-3.0.0.tar.xz"; + url = "${mirror}/stable/maui/clip/3.0.1/clip-3.0.1.tar.xz"; + sha256 = "1acjnam8ljc6mw7xbphh99li9437kqlmdb258j7w3vgnqh2psipx"; + name = "clip-3.0.1.tar.xz"; }; }; communicator = { - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/communicator/3.0.0/communicator-3.0.0.tar.xz"; - sha256 = "01qgqirjax3l8sn9813dl6ppz9p2syg83ljrxqgaj94h08ll2vi0"; - name = "communicator-3.0.0.tar.xz"; + url = "${mirror}/stable/maui/communicator/3.0.1/communicator-3.0.1.tar.xz"; + sha256 = "1j4yaw8w1hyvndra881r70ayz4ph00w41hhysqhgccxr36abcncl"; + name = "communicator-3.0.1.tar.xz"; }; }; era = { @@ -68,123 +68,123 @@ }; }; fiery = { - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "${mirror}/stable/maui/fiery/1.1.0/fiery-1.1.0.tar.xz"; - sha256 = "16kwi6gwxzrb2c8x9s97ibsflv30j3z3sp2if6ypand74ni1b4px"; - name = "fiery-1.1.0.tar.xz"; + url = "${mirror}/stable/maui/fiery/1.1.1/fiery-1.1.1.tar.xz"; + sha256 = "03aszdvksx5bsrh479wl6vq28l026ddfv8p9privigjpcdbbaslk"; + name = "fiery-1.1.1.tar.xz"; }; }; index-fm = { - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/index/3.0.0/index-fm-3.0.0.tar.xz"; - sha256 = "1w9fdwn7yvy389300p8qhb3795zzaqkqfrc1vnxydgzn995yv80w"; - name = "index-fm-3.0.0.tar.xz"; + url = "${mirror}/stable/maui/index/3.0.1/index-fm-3.0.1.tar.xz"; + sha256 = "046in0bqblpqcxp4rz417pjpy1m57p611wlzdsw8hp4dl1l2qmn9"; + name = "index-fm-3.0.1.tar.xz"; }; }; mauikit = { - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit/3.0.0/mauikit-3.0.0.tar.xz"; - sha256 = "1n95fcwgda9m9fmc90q0079xx4m9yh99yd51pj0nw7ynazlq2wyy"; - name = "mauikit-3.0.0.tar.xz"; + url = "${mirror}/stable/maui/mauikit/3.0.1/mauikit-3.0.1.tar.xz"; + sha256 = "0vlxs13k3wk2kk3jcxrdmpa3d9gblvzp22sqqd7nys6kilq8kzdb"; + name = "mauikit-3.0.1.tar.xz"; }; }; mauikit-accounts = { - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit-accounts/3.0.0/mauikit-accounts-3.0.0.tar.xz"; - sha256 = "0ff7zrlvhqfsnwbfbp5bz3vgxldxl09rlaajz4g9k7n81apa0fgv"; - name = "mauikit-accounts-3.0.0.tar.xz"; + url = "${mirror}/stable/maui/mauikit-accounts/3.0.1/mauikit-accounts-3.0.1.tar.xz"; + sha256 = "1b6nmnh5fh6gis7r56s41204g9y7cp5g2qmsk0r6b3a3x0ndwmqj"; + name = "mauikit-accounts-3.0.1.tar.xz"; }; }; mauikit-calendar = { - version = "1.1.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit-calendar/1.1.0/mauikit-calendar-1.1.0.tar.xz"; - sha256 = "1532ndxw6a2isw1zxhp5khk0ydczm03d7b42c5smjy56fkp7xmgx"; - name = "mauikit-calendar-1.1.0.tar.xz"; + url = "${mirror}/stable/maui/mauikit-calendar/3.0.1/mauikit-calendar-3.0.1.tar.xz"; + sha256 = "1s95nkbyc4k8999hsnr5aw80qhr66q4z51wq2ail3h0df7p1f700"; + name = "mauikit-calendar-3.0.1.tar.xz"; }; }; mauikit-documents = { - version = "1.1.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit-documents/1.1.0/mauikit-documents-1.1.0.tar.xz"; - sha256 = "06r5jf0rmrry9hd0gbjz63a0f5r8dykkggww531jaqm898h79wrs"; - name = "mauikit-documents-1.1.0.tar.xz"; + url = "${mirror}/stable/maui/mauikit-documents/3.0.1/mauikit-documents-3.0.1.tar.xz"; + sha256 = "1w2dszggxbqla5ab3739l1j79l2qa3br8drvkidivir8vwxifj3v"; + name = "mauikit-documents-3.0.1.tar.xz"; }; }; mauikit-filebrowsing = { - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit-filebrowsing/3.0.0/mauikit-filebrowsing-3.0.0.tar.xz"; - sha256 = "03qdiww4dh6picsfhmzg0v5mf3ygsnprwq3x6s1lzlanl5a83pyk"; - name = "mauikit-filebrowsing-3.0.0.tar.xz"; + url = "${mirror}/stable/maui/mauikit-filebrowsing/3.0.1/mauikit-filebrowsing-3.0.1.tar.xz"; + sha256 = "0z8070p1m2c2mv3xdhsz4scnasbwxf698mql0svqzmjiy8vjfnn2"; + name = "mauikit-filebrowsing-3.0.1.tar.xz"; }; }; mauikit-imagetools = { - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit-imagetools/3.0.0/mauikit-imagetools-3.0.0.tar.xz"; - sha256 = "0lj8d6k78xiy3wcc2jhhqvdw0p5vji95280dvclkmh0ilvb7lfrd"; - name = "mauikit-imagetools-3.0.0.tar.xz"; + url = "${mirror}/stable/maui/mauikit-imagetools/3.0.1/mauikit-imagetools-3.0.1.tar.xz"; + sha256 = "0aayhmmk6bd3n5p1mgm9k1jycsw8li5fs1xq7x42h93zhvxcw1va"; + name = "mauikit-imagetools-3.0.1.tar.xz"; }; }; mauikit-terminal = { - version = "1.1.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit-terminal/1.1.0/mauikit-terminal-1.1.0.tar.xz"; - sha256 = "0aki6m39yy2cnq3v6mdgyzld3slp0k5qd7v5g5hqb38mrbsbl66a"; - name = "mauikit-terminal-1.1.0.tar.xz"; + url = "${mirror}/stable/maui/mauikit-terminal/3.0.1/mauikit-terminal-3.0.1.tar.xz"; + sha256 = "1w7d04cdq2b4mkjl7ngj1v580dlhrpvr1n0gy5jcfv6x4ia3g8k3"; + name = "mauikit-terminal-3.0.1.tar.xz"; }; }; mauikit-texteditor = { - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit-texteditor/3.0.0/mauikit-texteditor-3.0.0.tar.xz"; - sha256 = "1flbgsrp91fgv9m1xvlzsng3ks94i07k79832nx2azzs4g704sgf"; - name = "mauikit-texteditor-3.0.0.tar.xz"; + url = "${mirror}/stable/maui/mauikit-texteditor/3.0.1/mauikit-texteditor-3.0.1.tar.xz"; + sha256 = "063zxzc530zgamr6fm5brm2rqpmq4rx4wsq7cx7sxfgyknag52m6"; + name = "mauikit-texteditor-3.0.1.tar.xz"; }; }; mauiman = { - version = "1.1.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/mauiman/1.1.0/mauiman-1.1.0.tar.xz"; - sha256 = "13s6wvp7h4zivw2m4hblsyha9qkihfqx41gh9jyw9pj8kmfp08v5"; - name = "mauiman-1.1.0.tar.xz"; + url = "${mirror}/stable/maui/mauiman/3.0.1/mauiman-3.0.1.tar.xz"; + sha256 = "0nygvb0nixcidla94xhwa4rrdwi3r2kcq62m9a3sabpl0z22mppq"; + name = "mauiman-3.0.1.tar.xz"; }; }; nota = { - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/nota/3.0.0/nota-3.0.0.tar.xz"; - sha256 = "0jk18qxkcx6n54pnm4mr2vpnhi07hscavacr1kijk4rxf0dyxf1i"; - name = "nota-3.0.0.tar.xz"; + url = "${mirror}/stable/maui/nota/3.0.1/nota-3.0.1.tar.xz"; + sha256 = "1ynnpkwjmj9xx5xzlz32y0k6mcrz2y50z1s4lq5kshiwa3vbjn61"; + name = "nota-3.0.1.tar.xz"; }; }; pix = { - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/pix/3.0.0/pix-3.0.0.tar.xz"; - sha256 = "1h82c3xip1s3ii5f1maq5d9invgbxzarai8ba6c274lkv70yv1ni"; - name = "pix-3.0.0.tar.xz"; + url = "${mirror}/stable/maui/pix/3.0.1/pix-3.0.1.tar.xz"; + sha256 = "1c1fz21x324r606ab7qsnbqpz3xvc4b6794xbf7vm6p7cfsgkdq7"; + name = "pix-3.0.1.tar.xz"; }; }; shelf = { - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/shelf/3.0.0/shelf-3.0.0.tar.xz"; - sha256 = "1944626qyxyybd8asfs00mkvljykz5ndxmnmi4jiz01j0xc70dyd"; - name = "shelf-3.0.0.tar.xz"; + url = "${mirror}/stable/maui/shelf/3.0.1/shelf-3.0.1.tar.xz"; + sha256 = "02qg37qpfccan3n87pbq3i7zyl22g32ipr8smbdcpwdyhxz1v00q"; + name = "shelf-3.0.1.tar.xz"; }; }; station = { - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/station/3.0.0/station-3.0.0.tar.xz"; - sha256 = "04kidqm8hcxf8l1r6qi5bfxg6rkdy77i4inzgsgf3i7ky6gvah96"; - name = "station-3.0.0.tar.xz"; + url = "${mirror}/stable/maui/station/3.0.1/station-3.0.1.tar.xz"; + sha256 = "11nbhax5xxrypy6ly5i609yvg7n754fhwjdpbf8c5c8j7285lnbz"; + name = "station-3.0.1.tar.xz"; }; }; strike = { @@ -196,11 +196,11 @@ }; }; vvave = { - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/vvave/3.0.0/vvave-3.0.0.tar.xz"; - sha256 = "1x2vbmc3qk2kgx64dm8k5xm16vlvnhfnhgzv5kx1qxpr7kr3vif8"; - name = "vvave-3.0.0.tar.xz"; + url = "${mirror}/stable/maui/vvave/3.0.1/vvave-3.0.1.tar.xz"; + sha256 = "0z7y27sdwcpxh0jr8k0h17rk0smljvky28ck741ysxqdv992bbk9"; + name = "vvave-3.0.1.tar.xz"; }; }; } diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index 1539c1693e64e..a1bc11ce970d5 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -9,43 +9,43 @@ let pname = "1password"; - version = if channel == "stable" then "8.10.9" else "8.10.12-10.BETA"; + version = if channel == "stable" then "8.10.16" else "8.10.18-19.BETA"; sources = { stable = { x86_64-linux = { url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz"; - hash = "sha256-Ef0ee41WVN46IOYbdyF1w8Ud2s7ncR71/5TFnQwOnVU="; + hash = "sha256-p9JTJUwPqJAAykhfVwlEkPlqgZ0h9VLQR3K2BYABn5I="; }; aarch64-linux = { url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz"; - hash = "sha256-IuRPCphagpx0jynJmhL9ETSzS0JaWCpDaodt0TDm7xs="; + hash = "sha256-RyG1QzmErwJi31pytlOjWE6QfhWjvZQuaTEtIEpg02k="; }; x86_64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; - hash = "sha256-KwMYxe6WpLFXaJ3jyEOc18IYO/pwZ7RiPF/7RN2c5xg="; + hash = "sha256-a2U6jmHMZY4PgigLCzTAOOtt5xOSV6sqJy7Tr2y2VvQ="; }; aarch64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; - hash = "sha256-MDc2Okc8nZbAPPn0ihoraDe9kNI5xx654DdTe7AlD3E="; + hash = "sha256-0LKAiY+eLYeWG/66d7n92aqI2nHZMijS0YM/d9TqYFo="; }; }; beta = { x86_64-linux = { url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz"; - hash = "sha256-SnfFd+ksJc69r7GGFUYCLH0NAwwiSxEDyaIRTrj/VWo="; + hash = "sha256-siQ6w1byDkfNrbkvjLWmQRbJ5nVZZv24vg0RFWaRHmE="; }; aarch64-linux = { url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz"; - hash = "sha256-5PDlMe/EZNBkfIrf6se4B5TKVYycSSoqiv0iMEPiIrA="; + hash = "sha256-WX6NzBXBSBf/hIl1kTIuUvCnEZ1+B0NBHfKvMeIZOw4="; }; x86_64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; - hash = "sha256-nn8lnn52MkKcFRluH9k8IoAu4vZ1C9Uk/+k6TQ6CKFs="; + hash = "sha256-HQRw1OGIT/cVjDk4PGa8x4QdYHQxtqMePsUh+cpyysM="; }; aarch64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; - hash = "sha256-ACeFyaDzo1I4w/9CrkQ5iO/JBHYRbxxzMDhTX4oI548="; + hash = "sha256-1KcTgmxDhbvB6gzTqF3bhu5toCSjskGjCflrBSNYzk4="; }; }; }; diff --git a/pkgs/applications/misc/activate-linux/default.nix b/pkgs/applications/misc/activate-linux/default.nix index b48236dd96811..1a6da925d0575 100644 --- a/pkgs/applications/misc/activate-linux/default.nix +++ b/pkgs/applications/misc/activate-linux/default.nix @@ -4,39 +4,63 @@ , pkg-config , xorg , cairo +, wayland +, wayland-protocols +, wayland-scanner +, libconfig }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "activate-linux"; - version = "unstable-2022-05-22"; + version = "1.1.0"; src = fetchFromGitHub { owner = "MrGlockenspiel"; - repo = pname; - rev = "18a6dc9771c568c557569ef680386d5d67f25e96"; - sha256 = "wYoCyWZqu/jgqAuNYdNr2bjpz4pFRTnAF7qF4BRs9GE="; + repo = "activate-linux"; + rev = "v${finalAttrs.version}"; + hash = "sha256-6XnoAoZwAs2hKToWlDqkaGqucmV1VMkEc4QO0G0xmrg="; }; makeFlags = [ "PREFIX=$(out)" ]; nativeBuildInputs = [ pkg-config + wayland-scanner ]; buildInputs = [ + cairo xorg.libX11 xorg.libXext xorg.libXfixes + xorg.libXi xorg.libXinerama - cairo + xorg.libXrandr + xorg.libXt + xorg.xorgproto + wayland + wayland-protocols + libconfig ]; + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + mkdir -p $out/share/man/man1 + + cp activate-linux $out/bin + cp activate-linux.1 $out/share/man/man1 + + runHook postInstall + ''; meta = with lib; { description = "The \"Activate Windows\" watermark ported to Linux"; homepage = "https://github.com/MrGlockenspiel/activate-linux"; license = licenses.gpl3; - maintainers = with maintainers; [ alexnortung ]; + maintainers = with maintainers; [ alexnortung donovanglover ]; platforms = platforms.linux; + mainProgram = "activate-linux"; }; -} +}) diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix index c53226f82767d..186e33a959ea9 100644 --- a/pkgs/applications/misc/albert/default.nix +++ b/pkgs/applications/misc/albert/default.nix @@ -13,22 +13,24 @@ , qt5compat , wrapQtAppsHook , nix-update-script +, pkg-config }: stdenv.mkDerivation (finalAttrs: { pname = "albert"; - version = "0.22.4"; + version = "0.22.9"; src = fetchFromGitHub { owner = "albertlauncher"; repo = "albert"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-M5wMi/yH5c08Y7tpHpOulcz0utnnduGsR5z3EHeBecM="; + sha256 = "sha256-MhZHklb//VH2GkAzK46P7EwCIa50l5y+2VssrgpTlWA="; fetchSubmodules = true; }; nativeBuildInputs = [ cmake + pkg-config wrapQtAppsHook ]; diff --git a/pkgs/applications/misc/anytype/default.nix b/pkgs/applications/misc/anytype/default.nix index c7cfbe53d2de1..8096dd9ea22f6 100644 --- a/pkgs/applications/misc/anytype/default.nix +++ b/pkgs/applications/misc/anytype/default.nix @@ -2,13 +2,13 @@ let pname = "anytype"; - version = "0.34.3"; + version = "0.35.2"; name = "Anytype-${version}"; nameExecutable = pname; src = fetchurl { url = "https://anytype-release.fra1.cdn.digitaloceanspaces.com/Anytype-${version}.AppImage"; name = "Anytype-${version}.AppImage"; - sha256 = "sha256-YJMpCEQ6eJYISGeYgvS6TcQwU2eD6fjgHrHRKA6CQJU="; + sha256 = "RLkAC9rNGHdbX/EfDTfpbBBKaY+BqdFuCMm99mkjOjw="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; in diff --git a/pkgs/applications/misc/appcleaner/default.nix b/pkgs/applications/misc/appcleaner/default.nix new file mode 100644 index 0000000000000..eff32c76f988a --- /dev/null +++ b/pkgs/applications/misc/appcleaner/default.nix @@ -0,0 +1,35 @@ +{ lib +, stdenvNoCC +, fetchurl +, unzip +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "appcleaner"; + version = "3.6.8"; + + src = fetchurl { + url = "https://freemacsoft.net/downloads/AppCleaner_${finalAttrs.version}.zip"; + hash = "sha256-4BL3KUQkc8IOfM4zSwAYJSHktmcupoGzSTGxgP6z1r4="; + }; + dontUnpack = true; + + nativeBuildInputs = [ unzip ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications + unzip -d $out/Applications $src + + runHook postInstall + ''; + + meta = with lib; { + description = "Uninstall unwanted apps"; + homepage = "https://freemacsoft.net/appcleaner"; + license = licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with maintainers; [ emilytrau Enzime ]; + platforms = platforms.darwin; + }; +}) diff --git a/pkgs/applications/misc/azuredatastudio/default.nix b/pkgs/applications/misc/azuredatastudio/default.nix index 7e366d19d54c9..f90bed6390f22 100644 --- a/pkgs/applications/misc/azuredatastudio/default.nix +++ b/pkgs/applications/misc/azuredatastudio/default.nix @@ -4,21 +4,31 @@ , copyDesktopItems , makeDesktopItem , makeWrapper -, libuuid -, libunwind -, libxkbcommon -, icu -, openssl -, zlib -, curl -, at-spi2-core +, alsa-lib , at-spi2-atk +, at-spi2-core +, cairo +, cups +, curl +, dbus +, expat +, gdk-pixbuf +, glib , gnutar -, atomEnv -, libkrb5 +, gtk3 +, icu , libdrm +, libunwind +, libuuid +, libxkbcommon , mesa +, nspr +, nss +, openssl +, pango +, systemd , xorg +, zlib }: # from justinwoo/azuredatastudio-nix @@ -115,20 +125,34 @@ stdenv.mkDerivation rec { sqltoolsservicePath = "${targetPath}/resources/app/extensions/mssql/sqltoolsservice/Linux/4.7.1.6"; rpath = lib.concatStringsSep ":" [ - atomEnv.libPath - ( - lib.makeLibraryPath [ - libuuid - at-spi2-core - at-spi2-atk - stdenv.cc.cc.lib - libkrb5 - libdrm - libxkbcommon - mesa - xorg.libxshmfence - ] - ) + (lib.makeLibraryPath [ + alsa-lib + at-spi2-atk + cairo + cups + dbus + expat + gdk-pixbuf + glib + gtk3 + mesa + nss + nspr + libdrm + xorg.libX11 + xorg.libxcb + xorg.libXcomposite + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXrandr + xorg.libxshmfence + libxkbcommon + xorg.libxkbfile + pango + stdenv.cc.cc.lib + systemd + ]) targetPath sqltoolsserviceRpath ]; diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 84aaa4295729a..0b368ef1b3152 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -15,6 +15,9 @@ , potrace , openxr-loader , embree, gmp, libharu +, openpgl +, mesa +, runCommand }: let @@ -26,13 +29,13 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: rec { pname = "blender"; - version = "3.6.2"; + version = "3.6.4"; src = fetchurl { url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; - hash = "sha256-olEmcOM3VKo/IWOhQp/qOkdJvwzM7bCkf8i8Bzh07Eg="; + hash = "sha256-zFL0GRWAtNC3C+SAspWZmGa8US92EiYQgVfiOsCJRx4="; }; patches = [ @@ -56,6 +59,7 @@ stdenv.mkDerivation rec { potrace libharu libepoxy + openpgl ] ++ lib.optionals waylandSupport [ wayland wayland-protocols libffi libdecor libxkbcommon dbus @@ -184,7 +188,45 @@ stdenv.mkDerivation rec { done ''; - passthru = { inherit python; }; + passthru = { + inherit python; + + tests = { + render = runCommand "${pname}-test" { } '' + set -euo pipefail + + export LIBGL_DRIVERS_PATH=${mesa.drivers}/lib/dri + export __EGL_VENDOR_LIBRARY_FILENAMES=${mesa.drivers}/share/glvnd/egl_vendor.d/50_mesa.json + + cat <<'PYTHON' > scene-config.py + import bpy + bpy.context.scene.eevee.taa_render_samples = 32 + bpy.context.scene.cycles.samples = 32 + if ${if stdenv.isAarch64 then "True" else "False"}: + bpy.context.scene.cycles.use_denoising = False + bpy.context.scene.render.resolution_x = 100 + bpy.context.scene.render.resolution_y = 100 + bpy.context.scene.render.threads_mode = 'FIXED' + bpy.context.scene.render.threads = 1 + PYTHON + + mkdir $out + for engine in BLENDER_EEVEE CYCLES; do + echo "Rendering with $engine..." + # Beware that argument order matters + ${finalAttrs.finalPackage}/bin/blender \ + --background \ + -noaudio \ + --factory-startup \ + --python-exit-code 1 \ + --python scene-config.py \ + --engine "$engine" \ + --render-output "$out/$engine" \ + --render-frame 1 + done + ''; + }; + }; meta = with lib; { description = "3D Creation/Animation/Publishing System"; @@ -198,4 +240,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ goibhniu veprbl ]; mainProgram = "blender"; }; -} +}) diff --git a/pkgs/applications/misc/cambrinary/default.nix b/pkgs/applications/misc/cambrinary/default.nix index 67e325cbce029..1fecfe1c17cb4 100644 --- a/pkgs/applications/misc/cambrinary/default.nix +++ b/pkgs/applications/misc/cambrinary/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonApplication , fetchFromGitHub +, flit , aiohttp , beautifulsoup4 }: @@ -8,7 +9,7 @@ buildPythonApplication rec { pname = "cambrinary"; version = "unstable-2023-07-16"; - format = "flit"; + format = "pyproject"; src = fetchFromGitHub { owner = "xueyuanl"; @@ -17,6 +18,10 @@ buildPythonApplication rec { hash = "sha256-wDcvpKAY/6lBjO5h3qKH3+Y2G2gm7spcKCXFMt/bAtE="; }; + nativeBuildInputs = [ + flit + ]; + propagatedBuildInputs = [ aiohttp beautifulsoup4 diff --git a/pkgs/applications/misc/camunda-modeler/default.nix b/pkgs/applications/misc/camunda-modeler/default.nix index 5b52aae8df42a..be7898d6967c8 100644 --- a/pkgs/applications/misc/camunda-modeler/default.nix +++ b/pkgs/applications/misc/camunda-modeler/default.nix @@ -9,11 +9,11 @@ stdenvNoCC.mkDerivation rec { pname = "camunda-modeler"; - version = "5.14.0"; + version = "5.15.1"; src = fetchurl { url = "https://github.com/camunda/camunda-modeler/releases/download/v${version}/camunda-modeler-${version}-linux-x64.tar.gz"; - hash = "sha256-zGxuvS4T1olMH+QOqrPcsFjfO3PDERmFQOa+ISN9u0c="; + hash = "sha256-q9wzfNyMzlyGTjaFOA7TZt+F/jC6EnPb/i4Q9eRxS3E="; }; sourceRoot = "camunda-modeler-${version}-linux-x64"; diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix index c6e6568eaa095..1b85a1ec65fe2 100644 --- a/pkgs/applications/misc/cheat/default.nix +++ b/pkgs/applications/misc/cheat/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { installShellCompletion scripts/cheat.{bash,fish,zsh} ''; - vendorSha256 = null; + vendorHash = null; doCheck = false; diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index 0abdb65ca03dd..04c30deef773e 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "cherrytree"; - version = "0.99.56"; + version = "1.0.1"; src = fetchFromGitHub { owner = "giuspen"; repo = "cherrytree"; rev = version; - hash = "sha256-kDbUn81YfSMAX7FKcw+nDSrsNvrhOX0+NmgZUYNqCqQ="; + hash = "sha256-A/4OcsAOECgQnENj2l9BX713KHG+zk5cJE+yyHXw1TM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cointop/default.nix b/pkgs/applications/misc/cointop/default.nix index a0ceabf9d1052..6e22b443a573b 100644 --- a/pkgs/applications/misc/cointop/default.nix +++ b/pkgs/applications/misc/cointop/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-NAw1uoBL/FnNLJ86L9aBCOY65aJn1DDGK0Cd0IO2kr0="; }; - vendorSha256 = null; + vendorHash = null; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/misc/cubocore-packages/coreaction/default.nix b/pkgs/applications/misc/cubocore-packages/coreaction/default.nix index 258c8b4ce7d6c..b21f001a0a800 100644 --- a/pkgs/applications/misc/cubocore-packages/coreaction/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreaction/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "coreaction"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rJ4EFKk/zlvQqptbL81WdqqZQUR9hYADFkXuw11SzRc="; + hash = "sha256-qhYuLqWXCpOJCqg+JJ8VQQokNEQVwxpHAtYGITxHZ3Y="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix b/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix index 4403a2c08d1c9..590f41a764d0b 100644 --- a/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corearchiver"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rn0rasFWSjgBIOpKIb35xsEewOfAQOr4kEiA1GhShg0="; + hash = "sha256-TKBr/CFY4ixQnJuaN+wJB88s6g4lvQz4rwq9YsccRYk="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/corefm/default.nix b/pkgs/applications/misc/cubocore-packages/corefm/default.nix index 3d3edae1b179a..c618ee100a28b 100644 --- a/pkgs/applications/misc/cubocore-packages/corefm/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corefm/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corefm"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ue0OOBf0PAxYHTfo37RvxnsKxzAEGIiGltXBVZpI6lk="; + hash = "sha256-mCFFT/vHzfC4jl1I8SkgaX8qu+AFNNcwUZx4eJeE+i4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/coregarage/default.nix b/pkgs/applications/misc/cubocore-packages/coregarage/default.nix index 15cd71ec9e2bc..4c332c4a9a2bf 100644 --- a/pkgs/applications/misc/cubocore-packages/coregarage/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coregarage/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "coregarage"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NsCJS+FyHWj2aLXlbzxcHEcdZ2cViZmJlh501/48xdI="; + hash = "sha256-WCSc3ppYaktj9WnPb4n7SmSNWxT2HiXNmPKS3md3ST4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/corehunt/default.nix b/pkgs/applications/misc/cubocore-packages/corehunt/default.nix index 060a5bc4eb98b..52c39752afae4 100644 --- a/pkgs/applications/misc/cubocore-packages/corehunt/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corehunt/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corehunt"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-txQ/uoSwseo0i4/CqdQm3wN9/3p3gioRG9IuJTsgSF4="; + hash = "sha256-Xir1RQG7AlO166lZq1TJssiWoSixY6EfLEjxek+9ifo="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/coreimage/default.nix b/pkgs/applications/misc/cubocore-packages/coreimage/default.nix index 07035867271bf..8ba09d6c9416b 100644 --- a/pkgs/applications/misc/cubocore-packages/coreimage/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreimage/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "coreimage"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8ILnZQIErLakiNfGZ91/vY+9XS/eOHcAnIFIuT1x9Mg="; + hash = "sha256-SyGIeoYC4bTBWZ0adOfYJpWkW3/bvFNZg5zK2MN27kA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix b/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix index bb9e603f06c70..69dbcd33a85fc 100644 --- a/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "coreinfo"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EWz2FQQzWVeP2qw1pz2Lg3COUo2y7/9a105R1Bj0Aqw="; + hash = "sha256-DmvmFMttEvNnIp1zwCe0BLrMx3Wlw1U9LcJwyb4Mx9U="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix b/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix index 760fe6b1d2c16..734b183c844d7 100644 --- a/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix @@ -8,7 +8,7 @@ mkDerivation rec { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Hylz1x9Wsk0iVhpNBFZJChsl3gIvJDICgpITjIXDZAg="; + hash = "sha256-Hylz1x9Wsk0iVhpNBFZJChsl3gIvJDICgpITjIXDZAg="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/corepad/default.nix b/pkgs/applications/misc/cubocore-packages/corepad/default.nix index d1856445ab3c1..4b27137980ea5 100644 --- a/pkgs/applications/misc/cubocore-packages/corepad/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corepad/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corepad"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MZdEdGfCaQp5DuDDYRNXi37O+O/aRS8XgAN0Jma/J3k="; + hash = "sha256-qiw6P+I9iAcFcBWiMKAzyxM6waXx/2TPVQHLcLjAnoY="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/corepaint/default.nix b/pkgs/applications/misc/cubocore-packages/corepaint/default.nix index 745a9637643df..958532bb6fce4 100644 --- a/pkgs/applications/misc/cubocore-packages/corepaint/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corepaint/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corepaint"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wRF2Z2n9rEixmKYDRqKxQad2JDSxsgfGIWQWpjz/+yU="; + hash = "sha256-ndknVT/gl2P0s3ADW0txiVtAyI/l/ZFWEgufFleS0A4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/corepdf/default.nix b/pkgs/applications/misc/cubocore-packages/corepdf/default.nix index 8bf3a6f8cbbf9..b7679827f3213 100644 --- a/pkgs/applications/misc/cubocore-packages/corepdf/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corepdf/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corepdf"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Dm3RDVHw1JXSC3HdS0k/IVTO/o5vaWiCr5vPDjr2uFk="; + hash = "sha256-t3r/bF/uKoprdDoRjrmYTND0Jws+jX6tAGnBeqofBF8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/corepins/default.nix b/pkgs/applications/misc/cubocore-packages/corepins/default.nix index c71e64f1623ad..e1274c6d6dfea 100644 --- a/pkgs/applications/misc/cubocore-packages/corepins/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corepins/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corepins"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wrP9Jm3T9gzEwEjNH2SXSqwP/+YRxVIyQRSPxdYgPCs="; + hash = "sha256-vA2Phs+sEs+Gd73xzj6vb91Krm8q3+koWDM7rCUayTQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix b/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix index cdec45c745f68..7d87fc6f45266 100644 --- a/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corerenamer"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hjI7KK+/u7OcqyjrZkRtBTfo8obDNqdudlFYcJR0dl8="; + hash = "sha256-jN1keyo2tDlgUu243173zgChw2nhvbsLPH9af6jDhKs="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/coreshot/default.nix b/pkgs/applications/misc/cubocore-packages/coreshot/default.nix index 808adcc3d3f09..183765f63511a 100644 --- a/pkgs/applications/misc/cubocore-packages/coreshot/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreshot/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "coreshot"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-K/K6630ctWG856igXF1fAukwu6FbsBzF8JxG8K3gICc="; + hash = "sha256-XPECvwZkJIoN/r5oFWJpgl/WASpybgLjCK/F0XVMHyU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/corestats/default.nix b/pkgs/applications/misc/cubocore-packages/corestats/default.nix index b08a7980fe63b..8dd6f1089d457 100644 --- a/pkgs/applications/misc/cubocore-packages/corestats/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corestats/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corestats"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AhM7Rvxh8WZPrpDzhY6DYALVe4VlF9b77oX61AVntI0="; + hash = "sha256-584dSlXhPfvTBeDjex1o2TZPoG40tl1fNDiIYqjyzOI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/corestuff/default.nix b/pkgs/applications/misc/cubocore-packages/corestuff/default.nix index e482ece3d15e0..a2946485ab56c 100644 --- a/pkgs/applications/misc/cubocore-packages/corestuff/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corestuff/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corestuff"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-F0kddb622W44MDkZOh4YTyFQ+J/UGGbkcrWXCSDYcek="; + hash = "sha256-2tnJMBbROGWZQDWjy/xGBNkv7DXXKLWrHf2XnMjOjWQ="; }; patches = [ diff --git a/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix b/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix index 7710f2f753ec8..30570f5e91e53 100644 --- a/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "coreterminal"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sFNKyqzNrPAGitmR8YEtIf6vtnvAP7+jXk4GFnDeGJs="; + hash = "sha256-zMSE1gQ2HJQCqil3MB4slRe0Cojv2XRLd8wLTokF8H0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/coretime/default.nix b/pkgs/applications/misc/cubocore-packages/coretime/default.nix index 844e18b26b7b6..c2a717453e786 100644 --- a/pkgs/applications/misc/cubocore-packages/coretime/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coretime/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "coretime"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XTX4oeUFwfZE0ey1NjXpAzw0x+4d8IGwU/sEojRwBBY="; + hash = "sha256-0x3014UG861lXRwIBpYiiYVPmhln9Q20jJ4tIO50Tjs="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix b/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix index 9da76dfa4c006..920850cc60216 100644 --- a/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix @@ -30,13 +30,13 @@ mkDerivation rec { pname = "coretoppings"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3wLDTN3SrbQNs43nQmSBrSB0bD6YineBQ8eNPDws1G8="; + hash = "sha256-IYUkPGgFGI6889IyromMBobIoqSZtALVsSswQ7O1Bp0="; }; patches = [ diff --git a/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix b/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix index a29aa95fdcee8..8eb056f7772c1 100644 --- a/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "coreuniverse"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ThEzuwBrPUkXURcW9KiXJs8ExqYWZamlfeQ1IggMWdc="; + hash = "sha256-SjD37+uLKJrPvjxK0douNgGCUq9He3EK86takZlrX7Q="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/libcprime/0001-fix-application-dirs.patch b/pkgs/applications/misc/cubocore-packages/libcprime/0001-fix-application-dirs.patch index 3d2238b577889..08214c30a887c 100644 --- a/pkgs/applications/misc/cubocore-packages/libcprime/0001-fix-application-dirs.patch +++ b/pkgs/applications/misc/cubocore-packages/libcprime/0001-fix-application-dirs.patch @@ -15,13 +15,13 @@ index 4c40d4c..5dbb6ff 100644 SystemXdgMime::SystemXdgMime() { -- appsDirs << QDir::home().filePath(".local/share/applications/"); -- appsDirs << "/usr/local/share/applications/" << "/usr/share/applications/"; -- appsDirs << "/usr/share/applications/kde4/" << "/usr/share/gnome/applications/"; -+ appsDirs << QDir::home().filePath(".nix-profile/share/applications/"); -+ appsDirs << "/run/current-system/sw/share/applications/"; -+ appsDirs << "/run/current-system/sw/share/applications/kde4/"; -+ appsDirs << "/run/current-system/sw/share/gnome/applications/"; +- appsDirs << QDir::home().filePath(".local/share/applications/"); +- appsDirs << QDir::root().filePath("usr/local/share/applications/") << QDir::root().filePath("usr/share/applications/"); +- appsDirs << QDir::root().filePath("usr/share/applications/kde4/") << QDir::root().filePath("usr/share/gnome/applications/"); ++ appsDirs << QDir::home().filePath(".nix-profile/share/applications/"); ++ appsDirs << "/run/current-system/sw/share/applications/"; ++ appsDirs << "/run/current-system/sw/share/applications/kde4/"; ++ appsDirs << "/run/current-system/sw/share/gnome/applications/"; } diff --git a/pkgs/applications/misc/cubocore-packages/libcprime/default.nix b/pkgs/applications/misc/cubocore-packages/libcprime/default.nix index 37f95c4ad1771..90df8e546e7bd 100644 --- a/pkgs/applications/misc/cubocore-packages/libcprime/default.nix +++ b/pkgs/applications/misc/cubocore-packages/libcprime/default.nix @@ -10,13 +10,13 @@ mkDerivation rec { pname = "libcprime"; - version = "4.4.1"; + version = "4.5.0"; src = fetchFromGitLab { owner = "cubocore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6kkKmF9mARhSm93ZrWJiwRNmpkiCxyhSD3W7X3gYuu4="; + hash = "sha256-j6WFLcjDMkYl+9HCmhMRttwtjNX05oP5mfdOsoLC7og="; }; patches = [ diff --git a/pkgs/applications/misc/cubocore-packages/libcsys/default.nix b/pkgs/applications/misc/cubocore-packages/libcsys/default.nix index adba59b9da1ee..3a36c40fd2813 100644 --- a/pkgs/applications/misc/cubocore-packages/libcsys/default.nix +++ b/pkgs/applications/misc/cubocore-packages/libcsys/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "libcsys"; - version = "4.4.1"; + version = "4.5.0"; src = fetchFromGitLab { owner = "cubocore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IWzgRwouI/0bQBuEd9CV0Ue6cF2HwRw3jMdLyGA1+TY="; + hash = "sha256-1MHyx01w+dCeAeumcSXRBStgAec2yu1rLwaZaCXRgTc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 15dbb33118b84..bd4504611758a 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -14,7 +14,7 @@ , libXtst , zlib , maven -, webkitgtk_4_1 +, webkitgtk , glib-networking }: @@ -53,7 +53,7 @@ mavenJdk17.buildMavenPackage rec { libXtst zlib ] ++ lib.optionals stdenv.isLinux [ - webkitgtk_4_1 + webkitgtk glib-networking ]; @@ -109,7 +109,7 @@ mavenJdk17.buildMavenPackage rec { makeWrapper $out/dbeaver/dbeaver $out/bin/dbeaver \ --prefix PATH : ${jdk17}/bin \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk3 libXtst webkitgtk_4_1 glib-networking ])} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk3 libXtst webkitgtk glib-networking ])} \ --prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" diff --git a/pkgs/applications/misc/dstask/default.nix b/pkgs/applications/misc/dstask/default.nix index fb2a5b729ab3d..571763be5fef9 100644 --- a/pkgs/applications/misc/dstask/default.nix +++ b/pkgs/applications/misc/dstask/default.nix @@ -11,12 +11,12 @@ buildGoModule rec { sha256 = "sha256-xZFQQDK+yGAv4IbuNe2dvNa3GDASeJY2mOYw94goAIM="; }; - # Set vendorSha256 to null because dstask vendors its dependencies (meaning + # Set vendorHash to null because dstask vendors its dependencies (meaning # that third party dependencies are stored in the repository). # # Ref <https://github.com/NixOS/nixpkgs/pull/87383#issuecomment-633204382> # and <https://github.com/NixOS/nixpkgs/blob/d4226e3a4b5fcf988027147164e86665d382bbfa/pkgs/development/go-modules/generic/default.nix#L18> - vendorSha256 = null; + vendorHash = null; doCheck = false; diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 5c6614b98263a..49da3ac99a83a 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "gallery-dl"; - version = "1.25.8"; + version = "1.26.0"; format = "setuptools"; src = fetchPypi { inherit version; pname = "gallery_dl"; - sha256 = "sha256-6q2F9zSGZp0iZoBvOUIuIEqNs97hbsbzE23XJyTZUDc="; + sha256 = "sha256-+g4tfr7RF9rrimQcXhcz3o/Cx9xLNrTDV1Fx7XSxh7I="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/go-thumbnailer/default.nix b/pkgs/applications/misc/go-thumbnailer/default.nix deleted file mode 100644 index 9dd571735e627..0000000000000 --- a/pkgs/applications/misc/go-thumbnailer/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, pkg-config -, vips -}: - -buildGoModule rec { - pname = "go-thumbnailer"; - version = "0.1.0"; - - src = fetchFromGitHub { - owner = "donovanglover"; - repo = pname; - rev = version; - sha256 = "sha256-sgd5kNnDXcSesGT+OignZ+APjNSxSP0Z60dr8cWO6sU="; - }; - - buildInputs = [ - vips - ]; - - nativeBuildInputs = [ - pkg-config - ]; - - vendorHash = "sha256-4zgsoExdhEqvycGerNVxZ6LnjeRRO+f6DhJdINR5ZyI="; - - postInstall = '' - mkdir -p $out/share/thumbnailers - substituteAll ${./go.thumbnailer} $out/share/thumbnailers/go.thumbnailer - ''; - - meta = with lib; { - description = "A cover thumbnailer written in Go for performance and reliability"; - homepage = "https://github.com/donovanglover/go-thumbnailer"; - license = licenses.mit; - maintainers = with maintainers; [ donovanglover ]; - }; -} diff --git a/pkgs/applications/misc/go-thumbnailer/go.thumbnailer b/pkgs/applications/misc/go-thumbnailer/go.thumbnailer deleted file mode 100644 index c105e0674d197..0000000000000 --- a/pkgs/applications/misc/go-thumbnailer/go.thumbnailer +++ /dev/null @@ -1,3 +0,0 @@ -[Thumbnailer Entry] -Exec=@out@/bin/go-thumbnailer %s %i %o -MimeType=inode/directory diff --git a/pkgs/applications/misc/gpscorrelate/default.nix b/pkgs/applications/misc/gpscorrelate/default.nix index 4fe60064cd59f..67e246227f06d 100644 --- a/pkgs/applications/misc/gpscorrelate/default.nix +++ b/pkgs/applications/misc/gpscorrelate/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, stdenv, pkg-config, exiv2, libxml2, gtk3 +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, exiv2, libxml2, gtk3 , libxslt, docbook_xsl, docbook_xml_dtd_42, desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -12,6 +12,14 @@ stdenv.mkDerivation rec { sha256 = "1wkpb0nqnm0ik46hp2sibf96h2gxi6n951zm8c72scgmh4ciq4fl"; }; + patches = [ + (fetchpatch { + name = "gpscorrelate-2.0-exiv2-0.28.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-geosciences/gpscorrelate/files/gpscorrelate-2.0-exiv2-0.28.patch?id=002882203ad6a2b08ce035a18b95844a9f4b85d0"; + hash = "sha256-/5czvSh2siPmohXWHQEg6VWCUQnZxEm2livLsEOAa6c="; + }) + ]; + nativeBuildInputs = [ desktop-file-utils docbook_xml_dtd_42 diff --git a/pkgs/applications/misc/gpx-viewer/default.nix b/pkgs/applications/misc/gpx-viewer/default.nix index c196a107f0068..887a469397e10 100644 --- a/pkgs/applications/misc/gpx-viewer/default.nix +++ b/pkgs/applications/misc/gpx-viewer/default.nix @@ -1,31 +1,58 @@ -{ lib, stdenv, fetchurl, intltool, libxml2, pkg-config, gnome, libchamplain, gdl, wrapGAppsHook }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, libxml2 +, meson +, ninja +, vala +, pkg-config +, gnome +, libchamplain +, gdl +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "gpx-viewer"; - version = "0.4.0"; + version = "0.5.0"; - src = fetchurl { - url = "https://launchpad.net/gpx-viewer/trunk/${version}/+download/${pname}-${version}.tar.gz"; - sha256 = "956acfaf870ac436300cd9953dece630df7fd7dff8e4ae2577a6002884466f80"; + src = fetchFromGitHub { + owner = "DaveDavenport"; + repo = "gpx-viewer"; + rev = version; + hash = "sha256-6AChX0UEIrQExaq3oo9Be5Sr13+POHFph7pZegqcjio="; }; - patches = fetchurl { - url = "https://code.launchpad.net/~chkr/gpx-viewer/gtk3-bugfix/+merge/260766/+preview-diff/628965/+files/preview.diff"; - sha256 = "1yl7jk7skkcx10nny5zdixswcymjd9s9c1zhm1i5y3aqhchvmfs7"; - }; - patchFlags = [ "-p0" ]; - - configureFlags = [ "--disable-database-updates" ]; + patches = [ + # Compile with libchamplain>=0.12.21 + (fetchpatch { + url = "https://github.com/DaveDavenport/gpx-viewer/commit/12ed6003bdad840586351bdb4e00c18719873c0e.patch"; + hash = "sha256-2/r0M3Yxj+vWgny1Pd5G7NYMb0uC/ByZ7y3tqLVccOc="; + }) + ]; nativeBuildInputs = [ - intltool pkg-config + meson + ninja + pkg-config + vala wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system ]; - buildInputs = [ gdl libchamplain gnome.adwaita-icon-theme libxml2 ]; + + buildInputs = [ + gdl + libchamplain + gnome.adwaita-icon-theme + libxml2 + ]; + + hardeningDisable = [ "format" ]; meta = with lib; { homepage = "https://blog.sarine.nl/tag/gpxviewer/"; description = "Simple tool to visualize tracks and waypoints stored in a gpx file"; + changelog = "https://github.com/DaveDavenport/gpx-viewer/blob/${src.rev}/NEWS"; platforms = with platforms; linux; license = licenses.gpl2Plus; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/applications/misc/huggle/default.nix b/pkgs/applications/misc/huggle/default.nix index a136f1f678ae1..3a6f25ede695d 100644 --- a/pkgs/applications/misc/huggle/default.nix +++ b/pkgs/applications/misc/huggle/default.nix @@ -40,9 +40,10 @@ stdenv.mkDerivation rec { substituteInPlace src/CMakeLists.txt --replace '@libirc_includes@' '${libirc.out}' ''; + cmakeBuildType = "None"; + cmakeFlags = [ "-S" "/build/source/src" - "-DCMAKE_BUILD_TYPE=None" "-DINSTALL_DATA_DIR=bin" "-DQT5_BUILD=ON" "-DWEB_ENGINE=ON" diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index a61ddb0e6e634..a88cf10f15411 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.118.2"; + version = "0.119.0"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-kEcLcNdhUjCTBfBVMYh+/5xxiCrGWeW8my//FcyXWtA="; + hash = "sha256-QumHL3S57Xm6N3u4VakNzRGmUi0RT8lVXG1K5/Dsq4A="; }; - vendorHash = "sha256-FXL6MtZ3kQOlzFuAWdnRoj/0b+XIWy2avuXbU5gz7Bc="; + vendorHash = "sha256-KbGZ7MSioP82UNgmeKFdgCBkTIqL0fV5QhzrcxYyl4k="; doCheck = false; diff --git a/pkgs/applications/misc/hyprland-autoname-workspaces/default.nix b/pkgs/applications/misc/hyprland-autoname-workspaces/default.nix index abd18f8eac9e1..0798aadf2f7a9 100644 --- a/pkgs/applications/misc/hyprland-autoname-workspaces/default.nix +++ b/pkgs/applications/misc/hyprland-autoname-workspaces/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "hyprland-autoname-workspaces"; - version = "1.1.10"; + version = "1.1.11"; src = fetchFromGitHub { owner = "hyprland-community"; repo = "hyprland-autoname-workspaces"; rev = version; - hash = "sha256-I0ELCexJxZgbTLzO4GtvOtaIghzVND8kgOFmlQ0oca8="; + hash = "sha256-x9MXp2MZtrnVI3W+6xo34uUHuRnpVeXS+3vbyti1p24="; }; - cargoHash = "sha256-MmWYsYRxrcEtL+efK1yCzq5b+PsrsrG1flSXn2kGdYs="; + cargoHash = "sha256-mSUtFZvq5+rumefJ6I9C6YzRzu64oJ/bTwaa+rrFlL4="; meta = with lib; { description = "Automatically rename workspaces with icons of started applications"; diff --git a/pkgs/applications/misc/iptsd/default.nix b/pkgs/applications/misc/iptsd/default.nix index 1c26194770b43..91256c8027f62 100644 --- a/pkgs/applications/misc/iptsd/default.nix +++ b/pkgs/applications/misc/iptsd/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "iptsd"; - version = "1.3.2"; + version = "1.4.0"; src = fetchFromGitHub { owner = "linux-surface"; repo = pname; rev = "v${version}"; - hash = "sha256-iVxxlblwrZ4SPbVR0kIG+ePExk4qT6gExgvHS1Ksp6A="; + hash = "sha256-qBABt0qEePGrZH4khnikvStrSi/OVmP3yVMJZbEd36M="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/jetbrains-toolbox/default.nix b/pkgs/applications/misc/jetbrains-toolbox/default.nix index e82c0f591262d..1a2304d340447 100644 --- a/pkgs/applications/misc/jetbrains-toolbox/default.nix +++ b/pkgs/applications/misc/jetbrains-toolbox/default.nix @@ -10,11 +10,11 @@ }: let pname = "jetbrains-toolbox"; - version = "2.0.3.17006"; + version = "2.0.4.17212"; src = fetchzip { url = "https://download.jetbrains.com/toolbox/jetbrains-toolbox-${version}.tar.gz"; - sha256 = "sha256-jZzGoeYv9HxuJmHrQKm5kgReARaoMr2kPe+SWkWOBAw="; + sha256 = "sha256-lnTYLZJBiM8nnUvMqtcp/i/VNek/9zlxYyZFa+hew5g="; stripRoot = false; }; diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index 7f783eb371ec4..840eb846c271a 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -2,8 +2,7 @@ let pname = "joplin-desktop"; - version = "2.12.16"; - name = "${pname}-${version}"; + version = "2.12.18"; inherit (stdenv.hostPlatform) system; throwSystem = throw "Unsupported system: ${system}"; @@ -17,14 +16,14 @@ let src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}${suffix}"; sha256 = { - x86_64-linux = "sha256-9ib8lymmSINqC0oXUxkKcpKfPh7qmU3YytU1/4aKMLg="; - x86_64-darwin = "sha256-vWc5yx3i5Ru8vrQbrTQwr43ZMBzOAb9254cxTHg6A/Q="; - aarch64-darwin = "sha256-dhwPqT+zfBYOVUV5JprPfgrSJR2ZNsC3LJmRHGJVM4k="; + x86_64-linux = "1fwcqgqni7d9x0prdy3p8ccc5lzgn57rhph4498vs1q40kyq8823"; + x86_64-darwin = "sha256-atd7nkefLvilTq39nTLbXQhm1zzBCHOLL7MRJwlTSMk="; + aarch64-darwin = "sha256-xiWXD+ULSVJ80uruYz0uRFkDRT1QOUd6FSWDKK9yLMc="; }.${system} or throwSystem; }; appimageContents = appimageTools.extractType2 { - inherit name src; + inherit pname version src; }; meta = with lib; { @@ -43,7 +42,7 @@ let }; linux = appimageTools.wrapType2 rec { - inherit name src meta; + inherit pname version src meta; profile = '' export LC_ALL=C.UTF-8 @@ -52,7 +51,7 @@ let multiArch = false; # no 32bit needed extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; extraInstallCommands = '' - mv $out/bin/{${name},${pname}} + mv $out/bin/{${pname}-${version},${pname}} source "${makeWrapper}/nix-support/setup-hook" wrapProgram $out/bin/${pname} \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}" @@ -65,7 +64,7 @@ let }; darwin = stdenv.mkDerivation { - inherit name src meta; + inherit pname version src meta; nativeBuildInputs = [ undmg ]; diff --git a/pkgs/applications/misc/kaufkauflist/default.nix b/pkgs/applications/misc/kaufkauflist/default.nix index 1d72341a3981a..8950a3017c189 100644 --- a/pkgs/applications/misc/kaufkauflist/default.nix +++ b/pkgs/applications/misc/kaufkauflist/default.nix @@ -1,33 +1,39 @@ -{ lib, buildPackages, buildGoModule, fetchFromGitHub, esbuild, buildNpmPackage, fetchFromGitea }: +{ lib +, buildPackages +, fetchFromGitHub +, buildNpmPackage +, fetchFromGitea +, nix-update-script +}: let esbuild' = buildPackages.esbuild.override { buildGoModule = args: buildPackages.buildGoModule (args // rec { - version = "0.17.19"; + version = "0.18.20"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-PLC7OJLSOiDq4OjvrdfCawZPfbfuZix4Waopzrj8qsU="; + hash = "sha256-mED3h+mY+4H465m02ewFK/BgA1i/PQ+ksUNxBlgpUoI="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; }); }; in buildNpmPackage rec { pname = "kaufkauflist"; - version = "2.2.0"; + version = "3.0.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "annaaurora"; repo = "kaufkauflist"; rev = "v${version}"; - hash = "sha256-a7C4yHTHPhL5/p1/XsrMA0PnbIzer6FShDiwUMOg69Y="; + hash = "sha256-W/FlHLZYYG/s9NdAqm0OJHlpTZtEG4iaegc4iOnAwWk="; }; - npmDepsHash = "sha256-uQ4XoaR3JjvPm8EQ2pnDM+x4zjVn4PEHq7BRqVbvFyw="; + npmDepsHash = "sha256-d1mvC72ugmKLNStoemUr8ISCUYjyo9EDWdWUCD1FMiM="; - ESBUILD_BINARY_PATH = "${lib.getExe esbuild'}"; + ESBUILD_BINARY_PATH = lib.getExe esbuild'; postInstall = '' mkdir -p $out/share/kaufkauflist $out/share/pocketbase @@ -35,8 +41,7 @@ in buildNpmPackage rec { cp -v pb_schema.json $out/share/pocketbase/ ''; - # Uncomment this when nix-update-script supports Gitea. - #passthru.updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { }; meta = with lib; { homepage = "https://codeberg.org/annaaurora/kaufkauflist"; diff --git a/pkgs/applications/misc/keepassxc/default.nix b/pkgs/applications/misc/keepassxc/default.nix index 277a1b99cc1e8..762434ef12c1b 100644 --- a/pkgs/applications/misc/keepassxc/default.nix +++ b/pkgs/applications/misc/keepassxc/default.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "keepassxc"; - version = "2.7.5"; + version = "2.7.6"; src = fetchFromGitHub { owner = "keepassxreboot"; repo = "keepassxc"; rev = version; - sha256 = "sha256-OBEjczUIkY3pQXJfsuNj9Bm2TIbVWEHqMSolQnSfvLE="; + hash = "sha256-xgrkMz7BCBxjfxHsAz/CFLv1d175LnrAJIOZMM3GmU0="; }; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang (toString [ @@ -129,7 +129,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://keepassxc.org/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ jonafato srapenne ]; + maintainers = with maintainers; [ jonafato srapenne blankparticle ]; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/applications/misc/keyleds/default.nix b/pkgs/applications/misc/keyleds/default.nix index c48b30b34dc90..a759b8e393e9b 100644 --- a/pkgs/applications/misc/keyleds/default.nix +++ b/pkgs/applications/misc/keyleds/default.nix @@ -52,9 +52,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=MinSizeRel" - ]; + cmakeBuildType = "MinSizeRel"; meta = { homepage = "https://github.com/keyleds/keyleds"; diff --git a/pkgs/applications/misc/konsave/default.nix b/pkgs/applications/misc/konsave/default.nix new file mode 100644 index 0000000000000..75950d28e2320 --- /dev/null +++ b/pkgs/applications/misc/konsave/default.nix @@ -0,0 +1,27 @@ +{ lib, python3Packages, fetchPypi }: + +python3Packages.buildPythonApplication rec { + pname = "konsave"; + version = "2.2.0"; + + src = fetchPypi { + inherit version; + pname = "Konsave"; + hash = "sha256-tWarqT2jFgCuSsa2NwMHRaR3/wj0khiRHidvRNMwM8M="; + }; + + nativeBuildInputs = with python3Packages; [ setuptools-scm ]; + propagatedBuildInputs = with python3Packages; [ pyyaml setuptools ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + meta = with lib; { + description = "Save Linux Customization"; + maintainers = with maintainers; [ MoritzBoehme ]; + homepage = "https://github.com/Prayag2/konsave"; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/limesctl/default.nix b/pkgs/applications/misc/limesctl/default.nix index 87aa8945409a7..9d87de5432ebf 100644 --- a/pkgs/applications/misc/limesctl/default.nix +++ b/pkgs/applications/misc/limesctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "limesctl"; - version = "3.2.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "sapcc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/9focZIm6tVnkAGIZYTJ9uewXKLv/x74LEMUZbXInb0="; + sha256 = "sha256-TR3cFIGU5hmZuzlYUJX+84vb8gmErSIZizK9J5Ieagk="; }; - vendorHash = "sha256-Zc8X29tsSsM/tkSYvplF1LxBS76eSs+cm5Li3OE/3o8="; + vendorHash = null; subPackages = [ "." ]; diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index 17f4a68f7daea..4dfcdc5879094 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: let in { pname = "logseq"; - version = "0.9.17"; + version = "0.9.18"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - hash = "sha256-1CXr/evINfB+VwLQBeuVhq0rCzRVM1ULQC3epYECN+I="; + hash = "sha256-+2BnVW0qWSJ/PIY3zl1c9qzcP9DZVp6E9B7AI6LqibE="; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/misc/lunatask/default.nix b/pkgs/applications/misc/lunatask/default.nix index 3d1340a05728d..0ee3c0eff0c43 100644 --- a/pkgs/applications/misc/lunatask/default.nix +++ b/pkgs/applications/misc/lunatask/default.nix @@ -1,12 +1,12 @@ { lib, appimageTools, fetchurl }: let - version = "1.6.4"; + version = "1.7.6"; pname = "lunatask"; src = fetchurl { url = "https://lunatask.app/download/Lunatask-${version}.AppImage"; - sha256 = "sha256-rvjjzVgtDNryj7GO+ZfK92nZvWRnRPFoy9hEIGjviqQ="; + sha256 = "sha256-WmnwFrE9mYDE39DeYnq8+i2KZ7V2F+rRwJvn6delLyc="; }; appimageContents = appimageTools.extractType2 { @@ -17,9 +17,11 @@ 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 \ + mv $out/bin/${pname}-${version} $out/bin/${pname} + + install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop + install -m 444 -D ${appimageContents}/${pname}.png $out/share/icons/hicolor/512x512/apps/${pname}.png + substituteInPlace $out/share/applications/${pname}.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' ''; diff --git a/pkgs/applications/misc/madonctl/default.nix b/pkgs/applications/misc/madonctl/default.nix index df783aa36a9c7..0e204ea838545 100644 --- a/pkgs/applications/misc/madonctl/default.nix +++ b/pkgs/applications/misc/madonctl/default.nix @@ -32,6 +32,6 @@ buildGoModule rec { description = "CLI for the Mastodon social network API"; homepage = "https://github.com/McKael/madonctl"; license = licenses.mit; - maintainers = with maintainers; [ aaronjheng ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/mangal/default.nix b/pkgs/applications/misc/mangal/default.nix index 26e735039b3fa..6edc9da4f602f 100644 --- a/pkgs/applications/misc/mangal/default.nix +++ b/pkgs/applications/misc/mangal/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { }; proxyVendor = true; - vendorSha256 = null; + vendorHash = null; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix index 51cd4df77bfab..854d8d17b55f0 100644 --- a/pkgs/applications/misc/moonlight-embedded/default.nix +++ b/pkgs/applications/misc/moonlight-embedded/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "moonlight-embedded"; - version = "2.5.3"; + version = "2.6.0"; src = fetchFromGitHub { owner = "moonlight-stream"; repo = "moonlight-embedded"; rev = "v${version}"; - sha256 = "sha256-TUS0eTlQA7O59EvJHrQkqDQexv84ucza6kE4t98AGPs="; + sha256 = "sha256-BZYFN6X6UNllwlovnpEwDSocA5ZfSDUOyr8JTg4z9ak="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/nut/default.nix b/pkgs/applications/misc/nut/default.nix index 275d6bd3d84b7..5596fc6010ecc 100644 --- a/pkgs/applications/misc/nut/default.nix +++ b/pkgs/applications/misc/nut/default.nix @@ -57,6 +57,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + # Add `cgi-bin` to the default list to avoid pulling in whole + # of `gcc` into build closure. + stripDebugList = [ "cgi-bin" "lib" "lib32" "lib64" "libexec" "bin" "sbin" ]; + postInstall = '' substituteInPlace $out/lib/systemd/system-shutdown/nutshutdown \ --replace /bin/sleep "${coreutils}/bin/sleep" \ diff --git a/pkgs/applications/misc/nwg-dock-hyprland/default.nix b/pkgs/applications/misc/nwg-dock-hyprland/default.nix index 2e1beb1b399e4..676af3ec58912 100644 --- a/pkgs/applications/misc/nwg-dock-hyprland/default.nix +++ b/pkgs/applications/misc/nwg-dock-hyprland/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "nwg-dock-hyprland"; - version = "0.1.6"; + version = "0.1.7"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-54ir80aSIdBnogE9a0pAq16niwXm2DFjTbb0AIijuo4="; + sha256 = "sha256-Lekvk3tQfeOR+Ltbc5b7TMiUZpktZ2nvCtUncrFb+Kc="; }; vendorHash = "sha256-5fN/6HASfTMb80YYAIoWRqnRGMvvX4d8C2UvOc0jQU0="; diff --git a/pkgs/applications/misc/nwg-dock/default.nix b/pkgs/applications/misc/nwg-dock/default.nix index c480a1481a719..b2154db0d7942 100644 --- a/pkgs/applications/misc/nwg-dock/default.nix +++ b/pkgs/applications/misc/nwg-dock/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "nwg-dock"; - version = "0.3.7"; + version = "0.3.9"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Ci+221sXlaqr164OYVhj8sqGSwlpFln2RRUiGoTO8Fk="; + sha256 = "sha256-/iUtVym+fNnbBeLlrYIiO5tV9eeAVBh6Nw+d3GCJ/F8="; }; vendorHash = "sha256-GW+shKOCwU8yprEfBeAPx1RDgjA7cZZzXDG112bdZ6k="; diff --git a/pkgs/applications/misc/nwg-drawer/default.nix b/pkgs/applications/misc/nwg-drawer/default.nix index 009476e6bca70..6e7af27f3b13b 100644 --- a/pkgs/applications/misc/nwg-drawer/default.nix +++ b/pkgs/applications/misc/nwg-drawer/default.nix @@ -45,6 +45,7 @@ buildGoModule rec { homepage = "https://github.com/nwg-piotr/nwg-drawer"; license = licenses.mit; platforms = platforms.linux; + mainProgram = "nwg-drawer"; maintainers = with maintainers; [ plabadens ]; }; } diff --git a/pkgs/applications/misc/nwg-panel/default.nix b/pkgs/applications/misc/nwg-panel/default.nix index 35db52a1ae7e6..a4d333e594c31 100644 --- a/pkgs/applications/misc/nwg-panel/default.nix +++ b/pkgs/applications/misc/nwg-panel/default.nix @@ -15,13 +15,13 @@ python3Packages.buildPythonApplication rec { pname = "nwg-panel"; - version = "0.9.12"; + version = "0.9.13"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-panel"; rev = "v${version}"; - hash = "sha256-lCo58v2UGolFagci2xHcieTUvqNc1KKNj3Z92oG5WPI="; + hash = "sha256-dP/FbMrjPextwedQeLJHM6f/a+EuZ+hQSLrH/rF2XOg="; }; # No tests diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index a1d96287edca3..78967c55a5d72 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -12,7 +12,7 @@ let inherit (stdenv.hostPlatform) system; pname = "obsidian"; - version = "1.4.13"; + version = "1.4.14"; appname = "Obsidian"; meta = with lib; { description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files"; @@ -25,12 +25,12 @@ let filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; - sha256 = if stdenv.isDarwin then "sha256-FMaEq99D8bCQF91drHrB5icXyQIdnWIwhAM9yuG97aA=" else "sha256-TWDmoXpBhBrrdbqS6dbFq4BxC2Bshap3gbnB4/ONrQE="; + hash = if stdenv.isDarwin then "sha256-5cVKlZJDtXOkil+RohijCcqyJVTrysmqyTvJR0dDAuc=" else "sha256-qFSQer37Nkh3A3oVAFP/0qXzPWJ7SqY2GYA6b1iaYmE="; }; icon = fetchurl { url = "https://obsidian.md/images/obsidian-logo-gradient.svg"; - sha256 = "100j8fcrc5q8zv525siapminffri83s2khs2hw4kdxwrdjwh36qi"; + hash = "sha256-EZsBuWyZ9zYJh0LDKfRAMTtnY70q6iLK/ggXlplDEoA="; }; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/misc/opentrack/default.nix b/pkgs/applications/misc/opentrack/default.nix index b4c455c0ce043..84edbc567b418 100644 --- a/pkgs/applications/misc/opentrack/default.nix +++ b/pkgs/applications/misc/opentrack/default.nix @@ -46,7 +46,6 @@ in dontWrapQtApps = true; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=RELEASE" "-DSDK_ARUCO_LIBPATH=${aruco}/lib/libaruco.a" "-DSDK_XPLANE=${xplaneSdk}" ]; diff --git a/pkgs/applications/misc/oranda/default.nix b/pkgs/applications/misc/oranda/default.nix index ec449c12c3763..0e06c8a6fbe46 100644 --- a/pkgs/applications/misc/oranda/default.nix +++ b/pkgs/applications/misc/oranda/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "oranda"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "axodotdev"; repo = "oranda"; rev = "v${version}"; - hash = "sha256-PHaqWKsZyNZnEAzEWMzJK6MD0b4O6pkYQG403ONIj0w="; + hash = "sha256-k4xrgRanQmkjmXGvfeaGU61+GP8asYPq4RQrao3rd4Q="; }; - cargoHash = "sha256-zV7vG1mcgVusWCa4jKNLD+SqzReLZQRotk6nvzPYCU4="; + cargoHash = "sha256-CLMhzPM11LnQdCVD66xC4Fk+8LnfRfFzk3FwQeXboes="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/misc/osmium-tool/default.nix b/pkgs/applications/misc/osmium-tool/default.nix index 00d157eb25fb0..cf7c419e40de3 100644 --- a/pkgs/applications/misc/osmium-tool/default.nix +++ b/pkgs/applications/misc/osmium-tool/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "osmium-tool"; - version = "1.15.0"; + version = "1.16.0"; src = fetchFromGitHub { owner = "osmcode"; repo = "osmium-tool"; rev = "v${version}"; - sha256 = "sha256-xV/1LFby0L/o648XEQQ9gS9/eHssWhMIG7R1E8bfIDU="; + sha256 = "sha256-DObqbzdPA4RlrlcZhqA0MQtWBE+D6GRD1pd9U4DARIk="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/owmods-cli/Cargo.lock b/pkgs/applications/misc/owmods-cli/Cargo.lock index 8c32ad4b651dd..128ab926d1590 100644 --- a/pkgs/applications/misc/owmods-cli/Cargo.lock +++ b/pkgs/applications/misc/owmods-cli/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "1.0.2" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" dependencies = [ "memchr", ] @@ -58,24 +58,23 @@ dependencies = [ [[package]] name = "anstream" -version = "0.3.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", - "is-terminal", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" +checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" [[package]] name = "anstyle-parse" @@ -97,9 +96,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "1.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" dependencies = [ "anstyle", "windows-sys 0.48.0", @@ -107,9 +106,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.72" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "async-stream" @@ -130,7 +129,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -165,9 +164,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", @@ -186,9 +185,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.2" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" [[package]] name = "bincode" @@ -207,9 +206,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" [[package]] name = "block" @@ -254,7 +253,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" dependencies = [ "memchr", - "regex-automata 0.3.3", + "regex-automata 0.3.7", "serde", ] @@ -321,11 +320,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", + "libc", ] [[package]] @@ -356,9 +356,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.3" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "215c0072ecc28f92eeb0eea38ba63ddfcb65c2828c46311d646f1a3ff5f9841c" +checksum = "b40ccee03b5175c18cde8f37e7d2a33bcef6f8ec8f7cc0d81090d1bb380949c9" dependencies = [ "smallvec", "target-lexicon", @@ -387,9 +387,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.19" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d" +checksum = "1d5f1946157a96594eb2d2c10eb7ad9a2b27518cb3000209dec700c35df9197d" dependencies = [ "clap_builder", "clap_derive", @@ -398,9 +398,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.19" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1" +checksum = "78116e32a042dd73c2901f0dc30790d20ff3447f3e3472fad359e8c3d282bcd6" dependencies = [ "anstream", "anstyle", @@ -410,36 +410,36 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.3.2" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc443334c81a804575546c5a8a79b4913b50e28d69232903604cada1de817ce" +checksum = "586a385f7ef2f8b4d86bddaa0c094794e7ccbfe5ffef1f434fe928143fc783a5" dependencies = [ "clap", ] [[package]] name = "clap_derive" -version = "4.3.12" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" +checksum = "c9fd1a5729c4548118d7d70ff234a44868d00489a4b6597b0b020918a0e91a1a" dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] name = "clap_lex" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" +checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" [[package]] name = "clap_mangen" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f2e32b579dae093c2424a8b7e2bea09c89da01e1ce5065eb2f0a6f1cc15cc1f" +checksum = "cf8e5f34d85d9e0bbe2491d100a7a7c1007bb2467b518080bfe311e8947197a9" dependencies = [ "clap", "roff", @@ -639,7 +639,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -673,7 +673,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -684,7 +684,16 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core", "quote", - "syn 2.0.27", + "syn 2.0.29", +] + +[[package]] +name = "deranged" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +dependencies = [ + "serde", ] [[package]] @@ -815,9 +824,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "encoding_rs" -version = "0.8.32" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" dependencies = [ "cfg-if", ] @@ -830,9 +839,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" dependencies = [ "errno-dragonfly", "libc", @@ -876,21 +885,21 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.21" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.2.16", + "redox_syscall 0.3.5", "windows-sys 0.48.0", ] [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", "miniz_oxide", @@ -992,7 +1001,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -1167,9 +1176,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.3" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "gio" @@ -1254,9 +1263,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aca8bbd8e0707c1887a8bbb7e6b40e228f251ff5d62c8220a4a7a53c73aff006" +checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" dependencies = [ "aho-corasick", "bstr", @@ -1333,9 +1342,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.20" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" dependencies = [ "bytes", "fnv", @@ -1439,9 +1448,9 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" @@ -1460,7 +1469,7 @@ dependencies = [ "httpdate", "itoa 1.0.9", "pin-project-lite", - "socket2", + "socket2 0.4.9", "tokio", "tower-service", "tracing", @@ -1562,9 +1571,9 @@ dependencies = [ [[package]] name = "image" -version = "0.24.6" +version = "0.24.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a" +checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" dependencies = [ "bytemuck", "byteorder", @@ -1592,13 +1601,14 @@ checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" dependencies = [ "equivalent", "hashbrown 0.14.0", + "serde", ] [[package]] name = "indicatif" -version = "0.17.5" +version = "0.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ff8cc23a7393a397ed1d7f56e6365cba772aba9f9912ab968b03043c395d057" +checksum = "0b297dc40733f23a0e52728a58fa9489a5b7638a324932de16b41adc3ef80730" dependencies = [ "console", "instant", @@ -1763,9 +1773,9 @@ dependencies = [ [[package]] name = "kqueue" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c8fc60ba15bf51257aa9807a48a61013db043fcf3a78cb0d916e8e396dcad98" +checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" dependencies = [ "kqueue-sys", "libc", @@ -1773,9 +1783,9 @@ dependencies = [ [[package]] name = "kqueue-sys" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8367585489f01bc55dd27404dcf56b95e6da061a256a666ab23be9ba96a2e587" +checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" dependencies = [ "bitflags 1.3.2", "libc", @@ -1816,9 +1826,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" [[package]] name = "lock_api" @@ -1832,9 +1842,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" dependencies = [ "serde", ] @@ -2016,18 +2026,19 @@ dependencies = [ [[package]] name = "notify" -version = "6.0.1" +version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5738a2795d57ea20abec2d6d76c6081186709c0024187cd5977265eda6598b51" +checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "filetime", "inotify", "kqueue", "libc", + "log", "mio", "walkdir", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -2102,6 +2113,15 @@ dependencies = [ ] [[package]] +name = "num_threads" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +dependencies = [ + "libc", +] + +[[package]] name = "number_prefix" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2136,9 +2156,9 @@ checksum = "99e1d07c6eab1ce8b6382b8e3c7246fe117ff3f8b34be065f5ebace6749fe845" [[package]] name = "objc2" -version = "0.3.0-beta.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef3a6024722b4230242a53e5b5759ce117548983696b8e4b7bc2fd1f8fce621e" +checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" dependencies = [ "objc-sys", "objc2-encode", @@ -2146,9 +2166,9 @@ dependencies = [ [[package]] name = "objc2-encode" -version = "2.0.0-pre.4" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f8f7297b786454a87e392631e2b2754ed59a7b413effa8521225d93f46b2192" +checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" [[package]] name = "objc_exception" @@ -2170,9 +2190,9 @@ dependencies = [ [[package]] name = "object" -version = "0.31.1" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" dependencies = [ "memchr", ] @@ -2206,11 +2226,11 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.55" +version = "0.10.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" +checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "cfg-if", "foreign-types", "libc", @@ -2227,7 +2247,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -2238,9 +2258,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.90" +version = "0.9.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" +checksum = "db7e971c2c2bba161b2d2fdf37080177eff520b3bc044787c7f1f5f9e78d869b" dependencies = [ "cc", "libc", @@ -2273,7 +2293,7 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "owmods_cli" -version = "0.10.0" +version = "0.11.2" dependencies = [ "anyhow", "clap", @@ -2288,7 +2308,7 @@ dependencies = [ [[package]] name = "owmods_core" -version = "0.10.0" +version = "0.11.2" dependencies = [ "anyhow", "directories", @@ -2297,6 +2317,7 @@ dependencies = [ "lazy_static", "log", "opener", + "regex", "reqwest", "serde", "serde_json", @@ -2305,6 +2326,7 @@ dependencies = [ "tokio", "tokio-test", "typeshare", + "unicode-normalization", "uuid", "version-compare 0.1.1", "zip", @@ -2312,7 +2334,7 @@ dependencies = [ [[package]] name = "owmods_gui" -version = "0.10.0" +version = "0.11.2" dependencies = [ "anyhow", "log", @@ -2376,7 +2398,7 @@ dependencies = [ "libc", "redox_syscall 0.3.5", "smallvec", - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -2491,9 +2513,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.10" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -2513,7 +2535,7 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bdc0001cfea3db57a2e24bc0d818e9e20e554b5f97fabb9bc231dc240269ae06" dependencies = [ - "base64 0.21.2", + "base64 0.21.3", "indexmap 1.9.3", "line-wrap", "quick-xml", @@ -2523,9 +2545,9 @@ dependencies = [ [[package]] name = "png" -version = "0.17.9" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11" +checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" dependencies = [ "bitflags 1.3.2", "crc32fast", @@ -2536,9 +2558,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.4.2" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f32154ba0af3a075eefa1eda8bb414ee928f62303a54ea85b8d6638ff1a6ee9e" +checksum = "31114a898e107c51bb1609ffaf55a0e011cf6a4d7f1170d0015a165082c0338b" [[package]] name = "ppv-lite86" @@ -2612,9 +2634,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -2737,14 +2759,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.1" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.3", - "regex-syntax 0.7.4", + "regex-automata 0.3.7", + "regex-syntax 0.7.5", ] [[package]] @@ -2758,13 +2780,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.3" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" +checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.4", + "regex-syntax 0.7.5", ] [[package]] @@ -2775,17 +2797,17 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "reqwest" -version = "0.11.18" +version = "0.11.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" +checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" dependencies = [ - "base64 0.21.2", + "base64 0.21.3", "bytes", "encoding_rs", "futures-core", @@ -2820,7 +2842,7 @@ dependencies = [ "wasm-streams", "web-sys", "webpki-roots", - "winreg 0.10.1", + "winreg 0.50.0", ] [[package]] @@ -2885,11 +2907,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.4" +version = "0.38.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" +checksum = "9bfe0f2582b4931a45d1fa608f8a8722e8b3c7ac54dd6d5f3b3212791fedef49" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.0", "errno", "libc", "linux-raw-sys", @@ -2898,9 +2920,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.5" +version = "0.21.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79ea77c539259495ce8ca47f53e66ae0330a8819f67e23ac96ca02f50e7b7d36" +checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb" dependencies = [ "log", "ring", @@ -2914,14 +2936,14 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64 0.21.2", + "base64 0.21.3", ] [[package]] name = "rustls-webpki" -version = "0.101.2" +version = "0.101.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "513722fd73ad80a71f72b61009ea1b584bcfa1483ca93949c8f290298837fa59" +checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" dependencies = [ "ring", "untrusted", @@ -3039,29 +3061,29 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.177" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63ba2516aa6bf82e0b19ca8b50019d52df58455d3cf9bdaf6315225fdd0c560a" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.177" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "401797fe7833d72109fedec6bfcbe67c0eed9b99772f26eb8afd261f0abc6fd3" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] name = "serde_json" -version = "1.0.104" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" +checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" dependencies = [ "itoa 1.0.9", "ryu", @@ -3076,7 +3098,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -3102,14 +3124,15 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.1.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e47d95bc83ed33b2ecf84f4187ad1ab9685d18ff28db000c99deac8ce180e3" +checksum = "1ca3b16a3d82c4088f343b7480a93550b3eabe1a358569c2dfe38bbcead07237" dependencies = [ - "base64 0.21.2", + "base64 0.21.3", "chrono", "hex", "indexmap 1.9.3", + "indexmap 2.0.0", "serde", "serde_json", "serde_with_macros", @@ -3118,14 +3141,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.1.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea3cee93715c2e266b9338b7544da68a9f24e227722ba482bd1c024367c77c65" +checksum = "2e6be15c453eb305019bfa438b1593c731f36a289a7853f7707ee29e870b3b3c" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -3197,15 +3220,15 @@ checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] name = "siphasher" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] name = "slab" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] @@ -3227,6 +3250,16 @@ dependencies = [ ] [[package]] +name = "socket2" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] name = "soup2" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3320,9 +3353,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.27" +version = "2.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" dependencies = [ "proc-macro2", "quote", @@ -3361,7 +3394,7 @@ version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3" dependencies = [ - "cfg-expr 0.15.3", + "cfg-expr 0.15.4", "heck 0.4.1", "pkg-config", "toml 0.7.6", @@ -3417,9 +3450,9 @@ dependencies = [ [[package]] name = "tao-macros" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b27a4bcc5eb524658234589bdffc7e7bfb996dbae6ce9393bfd39cb4159b445" +checksum = "ec114582505d158b669b136e6851f85840c109819d77c42bb7c0709f727d18c2" dependencies = [ "proc-macro2", "quote", @@ -3428,9 +3461,9 @@ dependencies = [ [[package]] name = "tar" -version = "0.4.39" +version = "0.4.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec96d2ffad078296368d46ff1cb309be1c23c513b4ab0e22a45de0185275ac96" +checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" dependencies = [ "filetime", "libc", @@ -3439,9 +3472,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.10" +version = "0.12.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2faeef5759ab89935255b1a4cd98e0baf99d1085e37d36599c625dac49ae8e" +checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" [[package]] name = "tauri" @@ -3450,7 +3483,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fbe522898e35407a8e60dc3870f7579fea2fc262a6a6072eccdd37ae1e1d91e" dependencies = [ "anyhow", - "base64 0.21.2", + "base64 0.21.3", "bytes", "cocoa", "dirs-next", @@ -3522,7 +3555,7 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54ad2d49fdeab4a08717f5b49a163bdc72efc3b1950b6758245fcde79b645e1a" dependencies = [ - "base64 0.21.2", + "base64 0.21.3", "brotli", "ico", "json-patch", @@ -3558,9 +3591,9 @@ dependencies = [ [[package]] name = "tauri-plugin-deep-link" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33a3ae55bcfe692e5361edc4708bd9f415270cc02e1cdba8ab7768566208b4e2" +checksum = "4536f5f6602e8fdfaa7b3b185076c2a0704f8eb7015f4e58461eb483ec3ed1f8" dependencies = [ "dirs", "interprocess", @@ -3578,7 +3611,7 @@ version = "0.1.0" source = "git+https://github.com/tauri-apps/plugins-workspace?branch=dev#dce0f02bc571128308c30278cde3233f341e6a50" dependencies = [ "bincode", - "bitflags 2.3.3", + "bitflags 2.4.0", "log", "serde", "serde_json", @@ -3668,9 +3701,9 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.7.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if", "fastrand", @@ -3698,22 +3731,22 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" [[package]] name = "thiserror" -version = "1.0.44" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" +checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.44" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" +checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -3728,11 +3761,14 @@ dependencies = [ [[package]] name = "time" -version = "0.3.23" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446" +checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" dependencies = [ + "deranged", "itoa 1.0.9", + "libc", + "num_threads", "serde", "time-core", "time-macros", @@ -3746,9 +3782,9 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.10" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4" +checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" dependencies = [ "time-core", ] @@ -3776,11 +3812,10 @@ checksum = "c7c4ceeeca15c8384bbc3e011dbd8fccb7f068a440b752b7d9b32ceb0ca0e2e8" [[package]] name = "tokio" -version = "1.29.1" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ - "autocfg", "backtrace", "bytes", "libc", @@ -3788,7 +3823,7 @@ dependencies = [ "num_cpus", "pin-project-lite", "signal-hook-registry", - "socket2", + "socket2 0.5.3", "tokio-macros", "windows-sys 0.48.0", ] @@ -3801,7 +3836,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -3837,9 +3872,9 @@ dependencies = [ [[package]] name = "tokio-test" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53474327ae5e166530d17f2d956afcb4f8a004de581b3cae10f12006bc8163e3" +checksum = "e89b3cbabd3ae862100094ae433e1def582cf86451b4e9bf83aa7ac1d8a7d719" dependencies = [ "async-stream", "bytes", @@ -3931,7 +3966,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -4191,7 +4226,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", "wasm-bindgen-shared", ] @@ -4225,7 +4260,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4238,9 +4273,9 @@ checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "wasm-streams" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bbae3363c08332cadccd13b67db371814cd214c2524020932f0804b8cf7c078" +checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" dependencies = [ "futures-util", "js-sys", @@ -4307,23 +4342,10 @@ dependencies = [ ] [[package]] -name = "webpki" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] name = "webpki-roots" -version = "0.22.6" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" -dependencies = [ - "webpki", -] +checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" [[package]] name = "webview2-com" @@ -4427,7 +4449,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -4486,7 +4508,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -4506,17 +4528,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", ] [[package]] @@ -4533,9 +4555,9 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" @@ -4557,9 +4579,9 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" @@ -4581,9 +4603,9 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" @@ -4605,9 +4627,9 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" @@ -4629,9 +4651,9 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" @@ -4641,9 +4663,9 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" @@ -4665,30 +4687,21 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.1" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25b5872fa2e10bd067ae946f927e726d7d603eaeb6e02fa6a350e0722d2b8c11" +checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" dependencies = [ "memchr", ] [[package]] name = "winreg" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" -dependencies = [ - "winapi", -] - -[[package]] -name = "winreg" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76a1a57ff50e9b408431e8f97d5456f2807f8eb2a2cd79b06068fc87f8ecf189" @@ -4768,16 +4781,16 @@ dependencies = [ [[package]] name = "xattr" -version = "0.2.3" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" +checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" dependencies = [ "libc", ] [[package]] name = "xtask" -version = "0.10.0" +version = "0.11.2" dependencies = [ "anyhow", "clap", diff --git a/pkgs/applications/misc/owmods-cli/default.nix b/pkgs/applications/misc/owmods-cli/default.nix index 3a1c224c2cf58..f0e325677a912 100644 --- a/pkgs/applications/misc/owmods-cli/default.nix +++ b/pkgs/applications/misc/owmods-cli/default.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "owmods-cli"; - version = "0.10.0"; + version = "0.11.2"; src = fetchFromGitHub { owner = "ow-mods"; repo = "ow-mod-man"; rev = "cli_v${version}"; - hash = "sha256-kumYLlp2LRqTQz23N9lriJJf7x2pPXbqqUvkiAhyMDY="; + hash = "sha256-kjHGuVYX9pKy2I+m347cEdPj6MjCDz8vz2Cnce9+z90="; }; cargoLock = { diff --git a/pkgs/applications/misc/owmods-cli/update.sh b/pkgs/applications/misc/owmods-cli/update.sh new file mode 100755 index 0000000000000..4848dc3210b38 --- /dev/null +++ b/pkgs/applications/misc/owmods-cli/update.sh @@ -0,0 +1,38 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnused nix-prefetch nix-prefetch-github jq wget + +#modified version of https://github.com/NixOS/nixpkgs/blob/nixos-23.05/pkgs/servers/readarr/update.sh +set -e + +dirname="$(dirname "$0")" + +updateHash() +{ + version=$1 + + url="https://github.com/ow-mods/ow-mod-man/releases/cli_v$version" + prefetchJson=$(nix-prefetch-github ow-mods ow-mod-man --rev cli_v$version) + sha256="$(echo $prefetchJson | jq -r ".sha256")" + echo "sha256=${sha256}" + + sed -i "s/hash = \"[a-zA-Z0-9\/+-=]*\";/hash = \"sha256-$sha256\";/g" "$dirname/default.nix" + + #downloads and replaces .lock file + wget https://raw.githubusercontent.com/ow-mods/ow-mod-man/cli_v$version/Cargo.lock -q -O $dirname/Cargo.lock + +} + +updateVersion() +{ + sed -i "s/version = \"[0-9.]*\";/version = \"$1\";/g" "$dirname/default.nix" +} + +latestTag=$(curl https://api.github.com/repos/ow-mods/ow-mod-man/releases | jq -r ".[0].tag_name") +latestVersion="$(expr $latestTag : 'gui_v\(.*\)')" +echo "latest version: ${latestVersion}" + +echo "updating..." +updateVersion $latestVersion + +updateHash $latestVersion +echo "updated cli" diff --git a/pkgs/applications/misc/p2pool/default.nix b/pkgs/applications/misc/p2pool/default.nix index a2b403f60f476..7f09f3b616196 100644 --- a/pkgs/applications/misc/p2pool/default.nix +++ b/pkgs/applications/misc/p2pool/default.nix @@ -19,13 +19,13 @@ let in stdenv.mkDerivation rec { pname = "p2pool"; - version = "3.5"; + version = "3.7"; src = fetchFromGitHub { owner = "SChernykh"; repo = "p2pool"; rev = "v${version}"; - sha256 = "sha256-qwdEmDfH+TE0WF2HIVCn23RlzelLBvCOu9VKpScdO68="; + sha256 = "sha256-WGavhxCGM10LXKvrXT3A2SOMSJRuoA/wAlEj7NFs8Ok="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/perkeep/default.nix b/pkgs/applications/misc/perkeep/default.nix index 2b14079ae609f..da67c39ab585d 100644 --- a/pkgs/applications/misc/perkeep/default.nix +++ b/pkgs/applications/misc/perkeep/default.nix @@ -3,12 +3,12 @@ let gouiJS = fetchurl { url = "https://storage.googleapis.com/perkeep-release/gopherjs/goui.js"; - sha256 = "0xbkdpd900gnmzj8p0x38dn4sv170pdvgzcvzsq70s80p6ykkh6g"; + hash = "sha256-z8A5vbkAaXCw/pv9t9sFJ2xNbEOjg4vkr/YBkNptc3U="; }; publisherJS = fetchurl { url = "https://storage.googleapis.com/perkeep-release/gopherjs/publisher.js"; - sha256 = "09hd7p0xscqnh612jbrjvh3njmlm4292zd5sbqx2lg0aw688q8p2"; + hash = "sha256-4iKMkOEKPCo6Xrq0L5IglVZpB9wyLymCgRYz3cE9DSY="; }; packages = [ @@ -19,7 +19,8 @@ let "perkeep.org/cmd/pk-mount" ]; -in buildGoModule rec { +in +buildGoModule rec { pname = "perkeep"; version = "0.11"; @@ -27,10 +28,10 @@ in buildGoModule rec { owner = "perkeep"; repo = "perkeep"; rev = version; - sha256 = "07j5gplk4kcrbazyg4m4bwggzlz5gk89h90r14jvfcpms7v5nrll"; + hash = "sha256-lGZb9tH1MrclCRkkmNB85dP/Hl+kkue/WplNMul9RR4="; }; - vendorSha256 = "1af9a6r9qfrak0n5xyv9z8n7gn7xw2sdjn4s9bwwidkrdm81iq6b"; + vendorHash = "sha256-y+AYUG15tsj5SppY2bTg/dh3LPpp+14smCo7nLJRyak="; deleteVendor = true; # Vendor is out of sync with go.mod buildPhase = '' @@ -54,6 +55,6 @@ in buildGoModule rec { description = "A way of storing, syncing, sharing, modelling and backing up content (née Camlistore)"; homepage = "https://perkeep.org"; license = licenses.asl20; - maintainers = with maintainers; [ cstrahan danderson kalbasit ]; + maintainers = with maintainers; [ danderson kalbasit ]; }; } diff --git a/pkgs/applications/misc/phoc/0001-handle-outputs-that-arent-in-the-layout.patch b/pkgs/applications/misc/phoc/0001-handle-outputs-that-arent-in-the-layout.patch deleted file mode 100644 index 4555f8a8704f5..0000000000000 --- a/pkgs/applications/misc/phoc/0001-handle-outputs-that-arent-in-the-layout.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/types/wlr_output_layout.c b/types/wlr_output_layout.c -index eb672f06..f0f546da 100644 ---- a/types/wlr_output_layout.c -+++ b/types/wlr_output_layout.c -@@ -242,6 +242,9 @@ bool wlr_output_layout_contains_point(struct wlr_output_layout *layout, - if (reference) { - struct wlr_output_layout_output *l_output = - wlr_output_layout_get(layout, reference); -+ if (!l_output) { -+ return false; -+ } - struct wlr_box *box = output_layout_output_get_box(l_output); - return wlr_box_contains_point(box, lx, ly); - } else { \ No newline at end of file diff --git a/pkgs/applications/misc/phoc/default.nix b/pkgs/applications/misc/phoc/default.nix index babd3578d25bf..10342269d6fe5 100644 --- a/pkgs/applications/misc/phoc/default.nix +++ b/pkgs/applications/misc/phoc/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchFromGitLab +, fetchurl , fetchpatch , meson , ninja @@ -16,6 +16,7 @@ , libdrm , libxkbcommon , wlroots +, xorg }: let @@ -25,43 +26,19 @@ let # https://source.puri.sm/Librem5/phosh/-/issues/422 (fetchpatch { name = "0001-Revert-layer-shell-error-on-0-dimension-without-anch.patch"; - url = "https://source.puri.sm/Librem5/wlroots/-/commit/4f66b0931aaaee65367102e9c4ccb736097412c7.patch"; - hash = "sha256-2Vy5a4lWh8FP2PN6xRIZv6IlUuLZibT0MYW+EyvVULs="; + url = "https://gitlab.gnome.org/World/Phosh/phoc/-/raw/acb17171267ae0934f122af294d628ad68b09f88/subprojects/packagefiles/wlroots/0001-Revert-layer-shell-error-on-0-dimension-without-anch.patch"; + hash = "sha256-uNJaYwkZImkzNUEqyLCggbXAoIRX5h2eJaGbSHj1B+o="; }) - - # xdg-activation: Deduplicate token creation code - (fetchpatch { - name = "xdg-activation-deduplicate-token-creation-code.patch"; - url = "https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/dd03d839ab56c3e5d7c607a8d76e58e0b75edb85.patch"; - sha256 = "sha256-mxt68MISC24xpaBtVSc1F2W4cyNs5wQowtbUQH9Eqr8="; - }) - - # seat: Allow to cancel touches - (fetchpatch { - name = "seat-Allow-to-cancel-touches.patch"; - url = "https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/17b2b06633729f1826715c1d0b84614aa3cedb3a.patch"; - sha256 = "sha256-BAeXa3ZB5TXnlq0ZP2+rZlVXEPWpLP4Wi4TLwoXjkz4="; - }) - - # From - # https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/13fcdba75cf5f21cfd49c1a05f4fa62f77619b40 - # which has been merged upstream, but doesn't cleanly apply on to the - # latest released version. - ./0001-handle-outputs-that-arent-in-the-layout.patch ]; }); in stdenv.mkDerivation rec { pname = "phoc"; - version = "0.27.0"; + version = "0.31.0"; - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - group = "World"; - owner = "Phosh"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-4/Fxo72KXLy3gxXMS+PrTUbZl0EFt2GPMXg8+/fE7MY="; - fetchSubmodules = true; + src = fetchurl { + # This tarball includes the meson wrapped subproject 'gmobile'. + url = "https://storage.puri.sm/releases/phoc/phoc-${version}.tar.xz"; + hash = "sha256-P7Bs9JMv6KNKo4d2ID0/Ba4+Nel6DMn8o4I7EDvY4vY="; }; nativeBuildInputs = [ @@ -83,6 +60,7 @@ in stdenv.mkDerivation rec { gnome.mutter wayland phocWlroots + xorg.xcbutilwm ]; mesonFlags = ["-Dembed-wlroots=disabled"]; diff --git a/pkgs/applications/misc/process-compose/default.nix b/pkgs/applications/misc/process-compose/default.nix index 0e90ad933d5eb..8ec268c212deb 100644 --- a/pkgs/applications/misc/process-compose/default.nix +++ b/pkgs/applications/misc/process-compose/default.nix @@ -8,13 +8,13 @@ let config-module = "github.com/f1bonacc1/process-compose/src/config"; in buildGoModule rec { pname = "process-compose"; - version = "0.60.0"; + version = "0.65.1"; src = fetchFromGitHub { owner = "F1bonacc1"; repo = pname; rev = "v${version}"; - hash = "sha256-BsDel6F09HP5Oz2p0DDXKuS7Id5XPhZZxEzwu76vVwk="; + hash = "sha256-wlsZV9yE9486EBbIwVOcA4KBf9tfI0Ao1JSIPjJAcEU="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; diff --git a/pkgs/applications/misc/protonup-qt/default.nix b/pkgs/applications/misc/protonup-qt/default.nix index f52b2681495b2..cce3aaf77452a 100644 --- a/pkgs/applications/misc/protonup-qt/default.nix +++ b/pkgs/applications/misc/protonup-qt/default.nix @@ -1,10 +1,10 @@ { appimageTools, fetchurl, lib }: let pname = "protonup-qt"; - version = "2.8.0"; + version = "2.8.2"; src = fetchurl { url = "https://github.com/DavidoTek/ProtonUp-Qt/releases/download/v${version}/ProtonUp-Qt-${version}-x86_64.AppImage"; - hash = "sha256-o3Tsrdrj5qDcTqhdgdf4Lcpp9zfBQY+/l3Ohm1A/pm4="; + hash = "sha256-y7PoYbZBwkohqVEb/vGE0B8TTCtMncZIozABs0KJpL0="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 402162689caac..fb796eb95de3e 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -67,7 +67,7 @@ let }); wxGTK-override' = if wxGTK-override == null then wxGTK-prusa else wxGTK-override; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "prusa-slicer"; version = "2.6.1"; @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { xorg.libX11 ] ++ lib.optionals withSystemd [ systemd - ] ++ nativeCheckInputs; + ] ++ finalAttrs.nativeCheckInputs; doCheck = true; nativeCheckInputs = [ gtest ]; @@ -167,7 +167,7 @@ stdenv.mkDerivation rec { owner = "prusa3d"; repo = "PrusaSlicer"; hash = "sha256-t5lnBL7SZVfyR680ZK29YXgE3pag+uVv4+BGJZq40/A="; - rev = "version_${version}"; + rev = "version_${finalAttrs.version}"; }; cmakeFlags = [ @@ -201,4 +201,4 @@ stdenv.mkDerivation rec { } // lib.optionalAttrs (stdenv.isDarwin) { mainProgram = "PrusaSlicer"; }; -} +}) diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index f10201b4f3757..c7cfbbbb65d35 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -18,14 +18,14 @@ mkDerivation rec { pname = "qcad"; - version = "3.28.1.3"; + version = "3.28.2.2"; src = fetchFromGitHub { name = "qcad-${version}-src"; owner = "qcad"; repo = "qcad"; rev = "v${version}"; - sha256 = "sha256-4Kr/zKE2VqAblNvxT9dg1325V0OCMca3MPEiG3fTxT4="; + sha256 = "sha256-0iH+fuh7jurk7FmEdTig+Tfm7ts3b2Azqv6T5kUNpg4="; }; patches = [ diff --git a/pkgs/applications/misc/remnote/default.nix b/pkgs/applications/misc/remnote/default.nix index b1039e17a757d..42d5535f5535d 100644 --- a/pkgs/applications/misc/remnote/default.nix +++ b/pkgs/applications/misc/remnote/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation (finalAttrs: let in { pname = "remnote"; - version = "1.12.36"; + version = "1.12.43"; src = fetchurl { url = "https://download.remnote.io/remnote-desktop/RemNote-${version}.AppImage"; - hash = "sha256-uVncAEKCuUvJCeKMqflWq3R6BVHfbt1Bo+PwNk/pOu4="; + hash = "sha256-3GNp+0ZUZbUcBkE8DbIEDRYlWfG3HDTTS6wK3u42jJg="; }; appexec = appimageTools.wrapType2 { inherit pname version src; diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix index ea97f8305fee1..22a1964e466df 100644 --- a/pkgs/applications/misc/rescuetime/default.nix +++ b/pkgs/applications/misc/rescuetime/default.nix @@ -52,7 +52,7 @@ in mkDerivation rec { meta = with lib; { description = "Helps you understand your daily habits so you can focus and be more productive"; homepage = "https://www.rescuetime.com"; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/applications/misc/resp-app/default.nix b/pkgs/applications/misc/resp-app/default.nix index e9781d40db7b9..b95bc98fdd3ac 100644 --- a/pkgs/applications/misc/resp-app/default.nix +++ b/pkgs/applications/misc/resp-app/default.nix @@ -98,6 +98,6 @@ mkDerivation rec { homepage = "https://resp.app/"; license = licenses.gpl3Only; platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/sampler/default.nix b/pkgs/applications/misc/sampler/default.nix index bea22977097a0..e5e090e7da4dc 100644 --- a/pkgs/applications/misc/sampler/default.nix +++ b/pkgs/applications/misc/sampler/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch, darwin, libiconv, alsa-lib, stdenv }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch, darwin, alsa-lib, stdenv }: buildGoModule rec { pname = "sampler"; @@ -8,18 +8,18 @@ buildGoModule rec { owner = "sqshq"; repo = pname; rev = "v${version}"; - sha256 = "1lanighxhnn28dfzils7i55zgxbw2abd6y723mq7x9wg1aa2bd0z"; + hash = "sha256-H7QllAqPp35wHeJ405YSfPX3S4lH0/hdQ8Ja2OGLVtE="; }; patches = [ # fix build with go 1.17 (fetchpatch { url = "https://github.com/sqshq/sampler/commit/97a4a0ebe396a780d62f50f112a99b27044e832b.patch"; - sha256 = "1czns7jc85mzdf1mg874jimls8x32l35x3lysxfgfah7cvvwznbk"; + hash = "sha256-c9nP92YHKvdc156OXgYVoyNNa5TkoFeDa78WxOTR9rM="; }) ]; - vendorSha256 = "02cfzqadpsk2vkzsp7ciji9wisjza0yp35pw42q44navhbzcb4ji"; + vendorHash = "sha256-UZLF/oJbWUKwIPyWcT1QX+rIU5SRnav/3GLq2xT+jgk="; doCheck = false; diff --git a/pkgs/applications/misc/semver/default.nix b/pkgs/applications/misc/semver/default.nix index 5453467b9ef6d..cdafd32027192 100644 --- a/pkgs/applications/misc/semver/default.nix +++ b/pkgs/applications/misc/semver/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0v3j7rw917wnmp4lyjscqzk4qf4azfiz70ynbq3wl4gwp1m783vv"; }; - vendorSha256 = null; + vendorHash = null; nativeBuildInputs = [ git ]; meta = with lib; { diff --git a/pkgs/applications/misc/sidequest/default.nix b/pkgs/applications/misc/sidequest/default.nix index 7c6f9249a2dc6..b5898c48cd908 100644 --- a/pkgs/applications/misc/sidequest/default.nix +++ b/pkgs/applications/misc/sidequest/default.nix @@ -1,4 +1,31 @@ -{ stdenv, lib, fetchurl, buildFHSEnv, makeDesktopItem, makeWrapper, atomEnv, libuuid, libxkbcommon, libxshmfence, at-spi2-atk, icu, openssl, zlib }: +{ stdenv +, lib +, fetchurl +, buildFHSEnv +, makeDesktopItem +, makeWrapper +, alsa-lib +, at-spi2-atk +, cairo +, cups +, dbus +, expat +, gdk-pixbuf +, glib +, gtk3 +, mesa +, nss +, nspr +, libdrm +, xorg +, libxkbcommon +, libxshmfence +, pango +, systemd +, icu +, openssl +, zlib +}: let pname = "sidequest"; version = "0.10.33"; @@ -21,20 +48,46 @@ nativeBuildInputs = [ makeWrapper ]; - buildCommand = '' + installPhase = '' mkdir -p "$out/lib/SideQuest" "$out/bin" tar -xJf "$src" -C "$out/lib/SideQuest" --strip-components 1 ln -s "$out/lib/SideQuest/sidequest" "$out/bin" + ''; - fixupPhase - - # mkdir -p "$out/share/applications" - # ln -s "${desktopItem}/share/applications/*" "$out/share/applications" - + postFixup = let + libPath = lib.makeLibraryPath [ + alsa-lib + at-spi2-atk + cairo + cups + dbus + expat + gdk-pixbuf + glib + gtk3 + mesa + nss + nspr + libdrm + xorg.libX11 + xorg.libxcb + xorg.libXcomposite + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXrandr + xorg.libxshmfence + libxkbcommon + xorg.libxkbfile + pango + stdenv.cc.cc.lib + systemd + ]; + in '' patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${atomEnv.libPath}/lib:${lib.makeLibraryPath [libuuid at-spi2-atk]}:$out/lib/SideQuest" \ + --set-rpath "${libPath}:$out/lib/SideQuest" \ "$out/lib/SideQuest/sidequest" ''; }; diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix index 35f153393518c..82008de9576b6 100644 --- a/pkgs/applications/misc/simplenote/default.nix +++ b/pkgs/applications/misc/simplenote/default.nix @@ -1,5 +1,4 @@ -{ atomEnv -, autoPatchelfHook +{ autoPatchelfHook , dpkg , fetchurl , makeDesktopItem @@ -7,7 +6,13 @@ , lib , stdenv , udev +, alsa-lib +, mesa +, nss +, nspr +, systemd , wrapGAppsHook +, xorg }: let @@ -40,9 +45,7 @@ let inherit pname version meta; src = fetchurl { - url = - "https://github.com/Automattic/simplenote-electron/releases/download/" - + "v${version}/Simplenote-linux-${version}-amd64.deb"; + url = "https://github.com/Automattic/simplenote-electron/releases/download/v${version}/Simplenote-linux-${version}-amd64.deb"; inherit sha256; }; @@ -61,6 +64,7 @@ let dontPatchELF = true; dontWrapGApps = true; + # TODO: migrate off autoPatchelfHook and use nixpkgs' electron nativeBuildInputs = [ autoPatchelfHook dpkg @@ -68,7 +72,16 @@ let wrapGAppsHook ]; - buildInputs = atomEnv.packages; + buildInputs = [ + alsa-lib + mesa + xorg.libXScrnSaver + xorg.libXtst + nss + nspr + stdenv.cc.cc + systemd + ]; unpackPhase = "dpkg-deb -x $src ."; diff --git a/pkgs/applications/misc/slweb/default.nix b/pkgs/applications/misc/slweb/default.nix index 1fcee352bdc46..1c6931fadcd46 100644 --- a/pkgs/applications/misc/slweb/default.nix +++ b/pkgs/applications/misc/slweb/default.nix @@ -2,29 +2,35 @@ , stdenv , fetchFromSourcehut , redo-apenwarr +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "slweb"; - version = "0.6.7"; + version = "0.6.11"; src = fetchFromSourcehut { owner = "~strahinja"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-Y7w3yVqA8MNJJ3OcGaeziydZyzF0bap41Il6eE/Hu40="; + repo = "slweb"; + rev = "v${finalAttrs.version}"; + hash = "sha256-+bKapK/s1pmo1NRRslf7V4ogWTtchFNWpzi+S8YG6+4="; }; nativeBuildInputs = [ redo-apenwarr ]; installPhase = '' runHook preInstall + export FALLBACKVER=${finalAttrs.version} PREFIX=$out redo install runHook postInstall ''; enableParallelBuilding = true; + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + }; + meta = with lib; { description = "A static website generator which aims at being simplistic"; homepage = "https://strahinja.srht.site/slweb/"; @@ -32,4 +38,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ GaetanLepage ]; }; -} +}) diff --git a/pkgs/applications/misc/snagboot/default.nix b/pkgs/applications/misc/snagboot/default.nix index 35ac8b28aa994..61c906ec464ac 100644 --- a/pkgs/applications/misc/snagboot/default.nix +++ b/pkgs/applications/misc/snagboot/default.nix @@ -10,27 +10,14 @@ python3.pkgs.buildPythonApplication rec { pname = "snagboot"; - version = "1.1"; + version = "1.2"; format = "pyproject"; src = fetchFromGitHub { owner = "bootlin"; repo = "snagboot"; rev = "v${version}"; - hash = "sha256-MU6LzjH6s2MS7T3u1OUeJ5ZmWgL0otA/q0ylwTNH4fA="; - }; - - passthru = { - updateScript = gitUpdater { - rev-prefix = "v"; - ignoredVersions = ".(rc|beta).*"; - }; - - tests.version = testers.testVersion { - package = snagboot; - command = "snagrecover --version"; - version = "v${version}"; - }; + hash = "sha256-OuHY5+2puZAERtwmXduUW5Wjus6KeQLJLcGcl48umLA="; }; nativeBuildInputs = [ @@ -69,6 +56,19 @@ python3.pkgs.buildPythonApplication rec { # There are no tests doCheck = false; + passthru = { + updateScript = gitUpdater { + rev-prefix = "v"; + ignoredVersions = ".(rc|beta).*"; + }; + + tests.version = testers.testVersion { + package = snagboot; + command = "snagrecover --version"; + version = "v${version}"; + }; + }; + meta = { homepage = "https://github.com/bootlin/snagboot"; description = "Generic recovery and reflashing tool for embedded platforms"; diff --git a/pkgs/applications/misc/spicetify-cli/default.nix b/pkgs/applications/misc/spicetify-cli/default.nix index d90b67f1cab4f..a6ce353694963 100644 --- a/pkgs/applications/misc/spicetify-cli/default.nix +++ b/pkgs/applications/misc/spicetify-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "spicetify-cli"; - version = "2.23.2"; + version = "2.24.2"; src = fetchFromGitHub { owner = "spicetify"; repo = "spicetify-cli"; rev = "v${version}"; - hash = "sha256-wL4aZt64NWlGabEjU885dv8WYz4MNPM4saDoraaRMjw="; + hash = "sha256-jzEtXmlpt6foldLW57ZcpevX8CDc+c8iIynT5nOD9qY="; }; vendorHash = "sha256-rMMTUT7HIgYvxGcqR02VmxOh1ihE6xuIboDsnuOo09g="; diff --git a/pkgs/applications/misc/stog/default.nix b/pkgs/applications/misc/stog/default.nix index c840bbfe5b845..17affeb3bbf65 100644 --- a/pkgs/applications/misc/stog/default.nix +++ b/pkgs/applications/misc/stog/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, fetchFromGitLab, ocaml +{ lib, buildDunePackage, fetchFromGitLab, fetchpatch, ocaml , fmt, lwt_ppx, menhir, ocf_ppx, ppx_blob, xtmpl_ppx , dune-build-info, dune-site, higlo, logs, lwt, ocf, ptime, uri, uutf, xtmpl }: @@ -10,7 +10,6 @@ else buildDunePackage rec { pname = "stog"; version = "0.20.0"; - duneVersion = "3"; minimalOCamlVersion = "4.12"; src = fetchFromGitLab { domain = "framagit.org"; @@ -20,6 +19,12 @@ buildDunePackage rec { sha256 = "sha256:0krj5w4y05bcfx7hk9blmap8avl31gp7yi01lpqzs6ync23mvm0x"; }; + # Compatibility with higlo 0.9 + patches = fetchpatch { + url = "https://framagit.org/zoggy/stog/-/commit/ea0546ab4cda8cc5c4c820ebaf2e3dfddc2ab101.patch"; + hash = "sha256-86GRHF9OjfcalGfA0Om2wXH99j4THCs9a4+o5ghuiJc="; + }; + nativeBuildInputs = [ menhir ]; buildInputs = [ fmt lwt_ppx ocf_ppx ppx_blob xtmpl_ppx ]; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/streamdeck-ui/default.nix b/pkgs/applications/misc/streamdeck-ui/default.nix index 5685dea608238..f46be1a24324b 100644 --- a/pkgs/applications/misc/streamdeck-ui/default.nix +++ b/pkgs/applications/misc/streamdeck-ui/default.nix @@ -4,6 +4,7 @@ , copyDesktopItems , writeText , makeDesktopItem +, wrapGAppsHook , xvfb-run , qt6 }: @@ -61,7 +62,8 @@ python3Packages.buildPythonApplication rec { ''; dontWrapQtApps = true; - makeWrapperArgs = [ "\${qtWrapperArgs[@]}" ]; + dontWrapGApps = true; + makeWrapperArgs = [ "\${qtWrapperArgs[@]}" "\${gappsWrapperArgs[@]}"]; format = "pyproject"; @@ -69,6 +71,7 @@ python3Packages.buildPythonApplication rec { python3Packages.poetry-core copyDesktopItems qt6.wrapQtAppsHook + wrapGAppsHook ]; propagatedBuildInputs = with python3Packages; [ @@ -97,6 +100,7 @@ python3Packages.buildPythonApplication rec { description = "Linux compatible UI for the Elgato Stream Deck"; homepage = "https://streamdeck-linux-gui.github.io/streamdeck-linux-gui/"; license = licenses.mit; + mainProgram = "streamdeck"; maintainers = with maintainers; [ majiir ]; }; } diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index c464fddcc7022..93d539b9f42d5 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -17,6 +17,8 @@ , plasma-framework , qttools , iconv +, cppunit +, syncthing , webviewSupport ? true , jsSupport ? true , kioPluginSupport ? stdenv.isLinux @@ -31,14 +33,14 @@ https://github.com/NixOS/nixpkgs/issues/199596#issuecomment-1310136382 */ }: stdenv.mkDerivation (finalAttrs: { - version = "1.4.6"; + version = "1.4.7"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-/HAqO0eVFt4YLGeTbZSZcH2pOojvykukAGTBHZTfKLQ="; + sha256 = "sha256-ddOyAyvFifsdNMbwcMZTyhA+5pvz6/Eu/VoBmdsHi54="; }; buildInputs = [ @@ -58,18 +60,31 @@ stdenv.mkDerivation (finalAttrs: { wrapQtAppsHook cmake qttools + # Although these are test dependencies, we add them anyway so that we test + # whether the test units compile. On Darwin we don't run the tests but we + # still build them. + cppunit + syncthing ] ++ lib.optionals plasmoidSupport [ extra-cmake-modules ] ; - # No tests are available by upstream, but we test --help anyway - # Don't test on Darwin because output is .app + # syncthing server seems to hang on darwin, causing tests to fail. + doCheck = !stdenv.isDarwin; + preCheck = '' + export QT_QPA_PLATFORM=offscreen + export QT_PLUGIN_PATH="${qtbase.bin}/${qtbase.qtPluginPrefix}" + ''; + # don't test --help on Darwin because output is .app doInstallCheck = !stdenv.isDarwin; installCheckPhase = '' $out/bin/syncthingtray --help | grep ${finalAttrs.version} ''; cmakeFlags = [ + "-DBUILD_TESTING=ON" + # See https://github.com/Martchus/syncthingtray/issues/208 + "-DEXCLUDE_TESTS_FROM_ALL=OFF" "-DAUTOSTART_EXEC_PATH=${autostartExecPath}" # See https://github.com/Martchus/syncthingtray/issues/42 "-DQT_PLUGIN_DIR:STRING=${placeholder "out"}/${qtbase.qtPluginPrefix}" diff --git a/pkgs/applications/misc/terminal-notifier/default.nix b/pkgs/applications/misc/terminal-notifier/default.nix index cde53ef41654b..19370fae01333 100644 --- a/pkgs/applications/misc/terminal-notifier/default.nix +++ b/pkgs/applications/misc/terminal-notifier/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; homepage = "https://github.com/julienXX/terminal-notifier"; license = licenses.mit; platforms = platforms.darwin; diff --git a/pkgs/applications/misc/terminal-parrot/default.nix b/pkgs/applications/misc/terminal-parrot/default.nix index b44b4bd0a7033..f0b4d20b1a76e 100644 --- a/pkgs/applications/misc/terminal-parrot/default.nix +++ b/pkgs/applications/misc/terminal-parrot/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "jmhobbs"; repo = "terminal-parrot"; rev = version; - sha256 = "1b4vr4s1zpkpf5kc1r2kdlp3hf88qp1f7h05g8kd62zf4sfbj722"; + hash = "sha256-Qhy5nCbuC9MmegXA48LFCDk4Lm1T5MBmcXfeHzTJm6w="; }; - vendorSha256 = "1qalnhhq3fmyzj0hkzc5gk9wbypr558mz3ik5msw7fid68k2i48c"; + vendorHash = "sha256-DJEoJjItusN1LTOOX1Ep+frF03yF/QmB/L66gSG0VOE="; doCheck = false; diff --git a/pkgs/applications/misc/timew-sync-server/default.nix b/pkgs/applications/misc/timew-sync-server/default.nix index 8fb6bb3a10434..04c9cfad1af1d 100644 --- a/pkgs/applications/misc/timew-sync-server/default.nix +++ b/pkgs/applications/misc/timew-sync-server/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "timewarrior-synchronize"; repo = pname; rev = "v${version}"; - sha256 = "GaDcnPJBcDJ3AQaHzifDgdl0QT4GSbAOIqp4RrAcO3M="; + hash = "sha256-GaDcnPJBcDJ3AQaHzifDgdl0QT4GSbAOIqp4RrAcO3M="; }; - vendorSha256 = "iROqiRWkHG6N6kivUmgmu6sg14JDdG4f98BdR7CL1gs="; + vendorHash = "sha256-iROqiRWkHG6N6kivUmgmu6sg14JDdG4f98BdR7CL1gs="; meta = with lib; { homepage = "https://github.com/timewarrior-synchronize/timew-sync-server"; diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/applications/misc/timewarrior/default.nix index 026f5ae5014eb..640a367b8bb20 100644 --- a/pkgs/applications/misc/timewarrior/default.nix +++ b/pkgs/applications/misc/timewarrior/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "timewarrior"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "GothenburgBitFactory"; repo = "timewarrior"; rev = "v${version}"; - sha256 = "sha256-qD49NExR0OZ6hgt5ejGiltxF9xkmseJjhJNzEGofnhw="; + sha256 = "sha256-0obIMnPBvMO30o+qXqwtINNRobBR6cFO65B/xjVt+2w="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/tty-share/default.nix b/pkgs/applications/misc/tty-share/default.nix index 6bf83be75703c..cd741b8338d62 100644 --- a/pkgs/applications/misc/tty-share/default.nix +++ b/pkgs/applications/misc/tty-share/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { }; # Upstream has a `./vendor` directory with all deps which we rely upon. - vendorSha256 = null; + vendorHash = null; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/pkgs/applications/misc/ttyper/default.nix b/pkgs/applications/misc/ttyper/default.nix index 7ccc562bb0f29..cdb348c08c612 100644 --- a/pkgs/applications/misc/ttyper/default.nix +++ b/pkgs/applications/misc/ttyper/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "ttyper"; - version = "1.2.2"; + version = "1.4.0"; src = fetchFromGitHub { owner = "max-niederman"; repo = pname; rev = "v${version}"; - hash = "sha256-5U6+16gy5s+1zDSxy6rMheZFAbpiya3uxvr21VaHDZQ="; + hash = "sha256-kMJcZ9U2pUXFza66fpK07IHbRc5ZQ49+bytgty94o/s="; }; - cargoHash = "sha256-O5fPV20OSEMv7Yw982ZorhN7y3NTzrprS79n2ID0LwU="; + cargoHash = "sha256-pmPT8GREXKun5uyGx+b6IATp/cKziZTL7YcYwKEo/NU="; meta = with lib; { description = "Terminal-based typing test"; diff --git a/pkgs/applications/misc/tui-journal/default.nix b/pkgs/applications/misc/tui-journal/default.nix index ca61f0aedecc3..25e3058da9aa1 100644 --- a/pkgs/applications/misc/tui-journal/default.nix +++ b/pkgs/applications/misc/tui-journal/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "tui-journal"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "AmmarAbouZor"; repo = "tui-journal"; rev = "v${version}"; - hash = "sha256-DKactqPyZTDmD4F15wKHvwuzsZUj6y1MJuPyASnia/c="; + hash = "sha256-ASozznbqtQc9bIzxbL94t2CHY2/PeXfR1DKfhTmsX74="; }; - cargoHash = "sha256-dLyI2cmIz1ucKdhAEs3Nz1tamcJUDZtdv4Fk/Wo+Zxs="; + cargoHash = "sha256-H+j/i0Gfk7O2TLdw5FYHOrLy/jfMSF4cpzMtQ2XJn2M="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix index e28eb1e2ce358..e4e31669525dc 100644 --- a/pkgs/applications/misc/udiskie/default.nix +++ b/pkgs/applications/misc/udiskie/default.nix @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { pname = "udiskie"; - version = "2.4.2"; + version = "2.5.0"; format = "setuptools"; @@ -22,7 +22,7 @@ python3.pkgs.buildPythonApplication rec { owner = "coldfix"; repo = "udiskie"; rev = "v${version}"; - hash = "sha256-lQMJVSY3JeZYYOFDyV29Ye2j8r+ngE/ta2wQYipy4hU="; + hash = "sha256-wIXh7dzygjzSXo51LBt1BW+sar6qUELWC6oTGPDGgcE="; }; patches = [ @@ -63,6 +63,10 @@ python3.pkgs.buildPythonApplication rec { postInstall = '' installManPage doc/udiskie.8 + + installShellCompletion \ + --bash completions/bash/* \ + --zsh completions/zsh/* ''; preFixup = '' diff --git a/pkgs/applications/misc/ultralist/default.nix b/pkgs/applications/misc/ultralist/default.nix index af2b6be2b2ff3..4ca7283631c0c 100644 --- a/pkgs/applications/misc/ultralist/default.nix +++ b/pkgs/applications/misc/ultralist/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-GGBW6rpwv1bVbLTD//cU8jNbq/27Ls0su7DymCJTSmY="; }; - vendorSha256 = null; + vendorHash = null; meta = with lib; { description = "Simple GTD-style todo list for the command line"; diff --git a/pkgs/applications/misc/usql/default.nix b/pkgs/applications/misc/usql/default.nix index 173e50d175182..66a9eedeff647 100644 --- a/pkgs/applications/misc/usql/default.nix +++ b/pkgs/applications/misc/usql/default.nix @@ -10,18 +10,18 @@ buildGoModule rec { pname = "usql"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "xo"; repo = "usql"; rev = "v${version}"; - hash = "sha256-YjRbrhJSbX1OLEc7A72ubg1KtzJSWY0KphD4d8dAKQ8="; + hash = "sha256-thpVcJ1HRhoOAli7829zM4fermEcS9FwzKX7ZjHGhZg="; }; buildInputs = [ unixODBC icu ]; - vendorHash = "sha256-OZ/eui+LR+Gn1nmu9wryGmz3jiUMuDScmTZ5G8UKWP8="; + vendorHash = "sha256-S7fahA+ykviQoWc7p0CcTGfouswxQNBn4HH+tbl0fbI="; proxyVendor = true; # Exclude broken genji, hive & impala drivers (bad group) @@ -73,6 +73,7 @@ buildGoModule rec { homepage = "https://github.com/xo/usql"; changelog = "https://github.com/xo/usql/releases/tag/v${version}"; license = licenses.mit; + mainProgram = "usql"; maintainers = with maintainers; [ georgyo anthonyroussel ]; platforms = with platforms; linux ++ darwin; }; diff --git a/pkgs/applications/misc/valentina/default.nix b/pkgs/applications/misc/valentina/default.nix index c00159c0c64d9..09b3eabf1845c 100644 --- a/pkgs/applications/misc/valentina/default.nix +++ b/pkgs/applications/misc/valentina/default.nix @@ -2,17 +2,18 @@ , qmake, qttools , qtsvg, qtxmlpatterns , wrapQtAppsHook +, autoPatchelfHook }: stdenv.mkDerivation rec { pname = "valentina"; - version = "0.7.51"; + version = "0.7.52"; src = fetchFromGitLab { owner = "smart-pattern"; repo = "valentina"; rev = "v${version}"; - hash = "sha256-N9fC2tCP4TVNncatHaz5W5Mp3jOmAcEWYCl30+0myaE="; + hash = "sha256-DmNRBxqyBvDTdA7Sz9X04Dhejtxx7tOVpST+SkUNguM="; }; postPatch = '' @@ -20,7 +21,7 @@ stdenv.mkDerivation rec { --replace '$$[QT_INSTALL_BINS]/$$LRELEASE' '${lib.getDev qttools}/bin/lrelease' ''; - nativeBuildInputs = [ qmake qttools wrapQtAppsHook installShellFiles ]; + nativeBuildInputs = [ qmake qttools wrapQtAppsHook installShellFiles autoPatchelfHook ]; buildInputs = [ qtsvg qtxmlpatterns ]; diff --git a/pkgs/applications/misc/wallust/default.nix b/pkgs/applications/misc/wallust/default.nix index 5add364c76b13..cbbe3408d47ec 100644 --- a/pkgs/applications/misc/wallust/default.nix +++ b/pkgs/applications/misc/wallust/default.nix @@ -1,26 +1,29 @@ { lib , fetchFromGitea , rustPlatform +, nix-update-script }: rustPlatform.buildRustPackage rec { pname = "wallust"; - version = "2.6.1"; + version = "2.7.1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "explosion-mental"; repo = pname; rev = version; - hash = "sha256-xcsOOA6esvIhzeka8E9OvCT8aXMWWSHO4lNLtaocTSo="; + hash = "sha256-WhL2HWM1onRrCqWJPLnAVMd/f/xfLrK3mU8jFSLFjAM="; }; - cargoSha256 = "sha256-YDIBn2fjlvNTYwMVn/MkID/EMmzz4oLieVgG2R95q4M="; + cargoSha256 = "sha256-pR2vdqMGJZ6zvXwwKUIPjb/lWzVgYqQ7C7/sk/+usc4="; + + passthru.updateScript = nix-update-script { }; meta = with lib; { description = "A better pywal"; homepage = "https://codeberg.org/explosion-mental/wallust"; license = licenses.mit; - maintainers = with maintainers; [onemoresuza iynaix]; + maintainers = with maintainers; [ onemoresuza iynaix ]; downloadPage = "https://codeberg.org/explosion-mental/wallust/releases/tag/${version}"; platforms = platforms.unix; mainProgram = "wallust"; diff --git a/pkgs/applications/misc/watchmate/Cargo.lock b/pkgs/applications/misc/watchmate/Cargo.lock index 2e0ae13192aaf..df3bf599d496a 100644 --- a/pkgs/applications/misc/watchmate/Cargo.lock +++ b/pkgs/applications/misc/watchmate/Cargo.lock @@ -1054,9 +1054,9 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.6.2" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e47dca53cb1a8ae3006e869b5711ae7370180db537f6d98e3bcaf23fabfd911f" +checksum = "b28a32a04cd75cef14a0983f8b0c669e0fe152a0a7725accdeb594e2c764c88b" dependencies = [ "bitflags", "cairo-rs", @@ -1109,6 +1109,24 @@ dependencies = [ ] [[package]] +name = "gvdb" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6fc5915836ff1779eb9455810dad729811334b1026d4316eaf89c3a415e32ea" +dependencies = [ + "byteorder", + "flate2", + "lazy_static", + "memmap2", + "quick-xml", + "safe-transmute", + "serde", + "serde_json", + "walkdir", + "zvariant", +] + +[[package]] name = "h2" version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1474,6 +1492,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] +name = "memmap2" +version = "0.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" +dependencies = [ + "libc", +] + +[[package]] name = "memoffset" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1843,6 +1870,16 @@ dependencies = [ ] [[package]] +name = "quick-xml" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffc053f057dd768a56f62cd7e434c42c831d296968997e9ac1f76ea7c2d14c41" +dependencies = [ + "memchr", + "serde", +] + +[[package]] name = "quote" version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1920,9 +1957,9 @@ checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" [[package]] name = "relm4" -version = "0.6.0-alpha.2" +version = "0.6.0-beta.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7acc5e3ddd682eeb0ca33da36b821fc907017c6d7758b09ce280247b0b0ea8cd" +checksum = "f169f698ce2e487eed2306898fcf262224a287d0e81480db4190e74cfec412cf" dependencies = [ "async-trait", "flume", @@ -1938,9 +1975,9 @@ dependencies = [ [[package]] name = "relm4-components" -version = "0.6.0-alpha.2" +version = "0.6.0-beta.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26bc1784d641cd5d97ac4d26c56f68699aaa4518b7c827c295c1515ddafa96e4" +checksum = "734838f188ee58954351c75175cb5ba6e9e67f90576b7fb90b928b2cb6043e1d" dependencies = [ "once_cell", "relm4", @@ -1948,10 +1985,20 @@ dependencies = [ ] [[package]] +name = "relm4-icons" +version = "0.6.0-beta.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7123701f31271a2e33a53270a6e73010356d99cff1b97c89276299609af3303" +dependencies = [ + "gtk4", + "gvdb", +] + +[[package]] name = "relm4-macros" -version = "0.6.0-alpha.2" +version = "0.6.0-beta.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8525ce12dcd7d2a9e9070d84b8b885600eccd0a143df6712ce34a87d001a8b7" +checksum = "7fa06febb3685960e7c1c44e21e44a3829325940b31d1e91391a43c32020c201" dependencies = [ "proc-macro2", "quote", @@ -2031,6 +2078,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" [[package]] +name = "safe-transmute" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98a01dab6acf992653be49205bdd549f32f17cb2803e8eacf1560bf97259aae8" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] name = "schannel" version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2603,6 +2665,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" [[package]] +name = "walkdir" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] name = "want" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2701,6 +2773,7 @@ dependencies = [ "log", "relm4", "relm4-components", + "relm4-icons", "version-compare", ] diff --git a/pkgs/applications/misc/watchmate/default.nix b/pkgs/applications/misc/watchmate/default.nix index db1faf2463738..b78d7f5277ca6 100644 --- a/pkgs/applications/misc/watchmate/default.nix +++ b/pkgs/applications/misc/watchmate/default.nix @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { pname = "watchmate"; - version = "0.4.4"; + version = "0.4.5"; src = fetchFromGitHub { owner = "azymohliad"; repo = "watchmate"; rev = "v${version}"; - hash = "sha256-+E1tyDfFSu3J89fXd75bdYxh+Z1zTwKL6AmMTNQBEYY="; + hash = "sha256-4L9mfZWphwXON8VgRcGrz+k62wyPzd1phtRu9HQnVdE="; }; cargoLock = { diff --git a/pkgs/applications/misc/waypaper/default.nix b/pkgs/applications/misc/waypaper/default.nix index cfb7ec3abf69a..b17e8b974e41e 100644 --- a/pkgs/applications/misc/waypaper/default.nix +++ b/pkgs/applications/misc/waypaper/default.nix @@ -2,8 +2,8 @@ , python3 , fetchFromGitHub , gobject-introspection -, gtk3 , wrapGAppsHook +, killall }: python3.pkgs.buildPythonApplication rec { @@ -22,8 +22,9 @@ python3.pkgs.buildPythonApplication rec { wrapGAppsHook ]; - propagatedBuildInputs = with python3.pkgs; [ - pygobject3 + propagatedBuildInputs = [ + python3.pkgs.pygobject3 + killall ]; # has no tests diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index 25856f0e58df3..002c753caff0a 100644 --- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { ''; license = licenses.zlib; platforms = platforms.unix; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix index 57f33559c6675..e482241bbd6cc 100644 --- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix +++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { ''; license = licenses.zlib; platforms = platforms.unix; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/zathura/ps/default.nix b/pkgs/applications/misc/zathura/ps/default.nix index 151a63af33e83..180001b52aeb4 100644 --- a/pkgs/applications/misc/zathura/ps/default.nix +++ b/pkgs/applications/misc/zathura/ps/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; license = licenses.zlib; platforms = platforms.unix; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/zola/default.nix b/pkgs/applications/misc/zola/default.nix index ca5a4684a48c7..9a76eed6dff6d 100644 --- a/pkgs/applications/misc/zola/default.nix +++ b/pkgs/applications/misc/zola/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , rustPlatform , cmake , pkg-config @@ -26,6 +27,14 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-AAub8UwAvX3zNX+SM/T9biyNxFTgfqUQG/MUGfwWuno="; + patches = [ + (fetchpatch { + name = "CVE-2023-40274.patch"; + url = "https://github.com/getzola/zola/commit/fe1967fb0fe063b1cee1ad48820870ab2ecc0e5b.patch"; + hash = "sha256-B/SVGhVX5hAbvMhBYO+mU5+xdZXU2JyS4uKmOj+aZuI="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/applications/networking/alpnpass/default.nix b/pkgs/applications/networking/alpnpass/default.nix index 1d24c80287703..81bdc29a54f33 100644 --- a/pkgs/applications/networking/alpnpass/default.nix +++ b/pkgs/applications/networking/alpnpass/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { hash = "sha256-hNZqGTV17rFSKLhZzNqH2E4SSb6Jhk7YQ4TN0HnE+9g="; }; - vendorSha256 = null; + vendorHash = null; meta = with lib; { description = "Inspect the plaintext payload inside of proxied TLS connections"; diff --git a/pkgs/applications/networking/avalanchego/default.nix b/pkgs/applications/networking/avalanchego/default.nix index 849520543c012..7e79064833a42 100644 --- a/pkgs/applications/networking/avalanchego/default.nix +++ b/pkgs/applications/networking/avalanchego/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "avalanchego"; - version = "1.10.9"; + version = "1.10.11"; src = fetchFromGitHub { owner = "ava-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-ofIpTDlD8ztC5vR975GhH/yYb4LqVs17kdfbU2UN6gg="; + hash = "sha256-6eebc8+SsonTngOIM5C+cxqzhFSLK5wLB/sBhVQuTQ4="; }; - vendorHash = "sha256-EjdlIfY5he1P1JMJNwPNHFSwhlczGZb2ygvxviggesM="; + vendorHash = "sha256-sBoH/0SQtHO/fgyfve4bpy74GIS8qWr6KcIQyOnkgkI="; # go mod vendor has a bug, see: https://github.com/golang/go/issues/57529 proxyVendor = true; diff --git a/pkgs/applications/networking/brig/default.nix b/pkgs/applications/networking/brig/default.nix index d049ed4e3893a..23370866e7215 100644 --- a/pkgs/applications/networking/brig/default.nix +++ b/pkgs/applications/networking/brig/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { sha256 = "0gi39jmnzqrgj146yw8lcmgmvzx7ii1dgw4iqig7kx8c0jiqi600"; }; - vendorSha256 = null; + vendorHash = null; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/browsers/bombadillo/default.nix b/pkgs/applications/networking/browsers/bombadillo/default.nix index 983f8ac1ee39a..96a968a50fe98 100644 --- a/pkgs/applications/networking/browsers/bombadillo/default.nix +++ b/pkgs/applications/networking/browsers/bombadillo/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - vendorSha256 = null; + vendorHash = null; outputs = [ "out" "man" ]; diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index fe3df61ae10b8..bb926f50ab7d0 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -40,6 +40,7 @@ , udev , wayland , xdg-utils +, coreutils , xorg , zlib @@ -91,11 +92,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.58.124"; + version = "1.58.135"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "sha256-Q/bdauGZR68ueeKxOKI8X7OAc7UmNgixxEJncDsYhH0="; + sha256 = "sha256-tJfpBIZvBr0diympUmImXYELPERJIzCSuOB0aovhodI="; }; dontConfigure = true; @@ -171,7 +172,7 @@ stdenv.mkDerivation rec { gappsWrapperArgs+=( --prefix LD_LIBRARY_PATH : ${rpath} --prefix PATH : ${binpath} - --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} + --suffix PATH : ${lib.makeBinPath [ xdg-utils coreutils ]} ${optionalString (enableFeatures != []) '' --add-flags "--enable-features=${strings.concatStringsSep "," enableFeatures}" ''} diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 3825849aac3ae..562fbbbb3061f 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -12,7 +12,6 @@ , python3, perl , which , llvmPackages_attrName -, rustc , libuuid , overrideCC # postPatch: @@ -251,14 +250,20 @@ let fi done - # Required for patchShebangs (unsupported interpreter directive, basename: invalid option -- '*', etc.): - substituteInPlace native_client/SConstruct --replace "#! -*- python -*-" "" + if [[ -e native_client/SConstruct ]]; then + # Required for patchShebangs (unsupported interpreter directive, basename: invalid option -- '*', etc.): + substituteInPlace native_client/SConstruct --replace "#! -*- python -*-" "" + fi if [ -e third_party/harfbuzz-ng/src/src/update-unicode-tables.make ]; then substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \ --replace "/usr/bin/env -S make -f" "/usr/bin/make -f" fi - chmod -x third_party/webgpu-cts/src/tools/run_deno - chmod -x third_party/dawn/third_party/webgpu-cts/tools/run_deno + if [ -e third_party/webgpu-cts/src/tools/run_deno ]; then + chmod -x third_party/webgpu-cts/src/tools/run_deno + fi + if [ -e third_party/dawn/third_party/webgpu-cts/tools/run_deno ]; then + chmod -x third_party/dawn/third_party/webgpu-cts/tools/run_deno + fi # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \ @@ -388,7 +393,7 @@ let # Use nixpkgs Rust compiler instead of the one shipped by Chromium. # We do intentionally not set rustc_version as nixpkgs will never do incremental # rebuilds, thus leaving this empty is fine. - rust_sysroot_absolute = "${rustc}"; + rust_sysroot_absolute = "${buildPackages.rustc}"; # Building with rust is disabled for now - this matches the flags in other major distributions. enable_rust = false; } // lib.optionalAttrs (!(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) { diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 6419fa6a14fd6..5677bc37e8441 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -6,10 +6,12 @@ , libva, pipewire, wayland , gcc, nspr, nss, runCommand , lib, libkrb5 +, electron-source # for warnObsoleteVersionConditional # package customization # Note: enable* flags should not require full rebuilds (i.e. only affect the wrapper) , channel ? "stable" +, upstream-info ? (import ./upstream-info.nix).${channel} , proprietaryCodecs ? true , enableWideVine ? false , ungoogled ? false # Whether to build chromium or ungoogled-chromium @@ -28,14 +30,12 @@ let llvmPackages_attrName = "llvmPackages_16"; stdenv = pkgs.${llvmPackages_attrName}.stdenv; - upstream-info = (import ./upstream-info.nix).${channel}; - # Helper functions for changes that depend on specific versions: warnObsoleteVersionConditional = min-version: result: - let ungoogled-version = (import ./upstream-info.nix).ungoogled-chromium.version; + let min-supported-version = (lib.head (lib.attrValues electron-source)).unwrapped.info.chromium.version; in lib.warnIf - (lib.versionAtLeast ungoogled-version min-version) - "chromium: ungoogled version ${ungoogled-version} is newer than a conditional bounded at ${min-version}. You can safely delete it." + (lib.versionAtLeast min-supported-version min-version) + "chromium: min-supported-version ${min-supported-version} is newer than a conditional bounded at ${min-version}. You can safely delete it." result; chromiumVersionAtLeast = min-version: let result = lib.versionAtLeast upstream-info.version min-version; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index e67e3c1144681..7cae2fada33c3 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -27,11 +27,11 @@ }; stable = { chromedriver = { - sha256_darwin = "0phhcqid7wjw923qdi65zql3fid25swwszksgnw3b8fgz67jn955"; + sha256_darwin = "138mw5p6r0n0531fs6322yxsjgj9hia5plw4mj0b3mclykzy5l37"; sha256_darwin_aarch64 = - "00fwq8slvjm6c7krgwjd4mxhkkrp23n4icb63qlvi2hy06gfj4l6"; - sha256_linux = "0ws8ch1j2hzp483vr0acvam1zxmzg9d37x6gqdwiqwgrk6x5pvkh"; - version = "117.0.5938.88"; + "1cym94av2gw2zwj3rdqbjcqkigpzf0zk2bam2hw9n2hiabb4rm0p"; + sha256_linux = "1q1vyhmcx6b5criz5bn1c3x3z2dzqdgsmwcvlb0rzqlzpla9q26m"; + version = "117.0.5938.92"; }; deps = { gn = { @@ -41,9 +41,9 @@ version = "2023-08-01"; }; }; - sha256 = "01n9aqnilsjrbpv5kkx3c6nxs9p5l5lfwxj67hd5s5g4740di4a6"; - sha256bin64 = "1dhgagphdzbd19gkc7vpl1hxc9vn0l7sxny346qjlmrwafqlhbgi"; - version = "117.0.5938.88"; + sha256 = "1bdfvcywj6ggrn6fz6g7hqhikg0cjdj8llgcm4wji52i7897gw18"; + sha256bin64 = "05a2sggxm76kc6m5wcpb4gibnxa07j291m7292zdvyg32kffqxjr"; + version = "117.0.5938.132"; }; ungoogled-chromium = { deps = { @@ -54,12 +54,12 @@ version = "2023-08-01"; }; ungoogled-patches = { - rev = "117.0.5938.88-1"; - sha256 = "1wz15ib56j8c84bgrbf0djk5wli49b1lvaqbg18pdclkp1mqy5w9"; + rev = "117.0.5938.132-1"; + sha256 = "11bg7j5838nhkwpv7blvpijjhqrisvx032bjmkng1cpy2d0kmfcx"; }; }; - sha256 = "01n9aqnilsjrbpv5kkx3c6nxs9p5l5lfwxj67hd5s5g4740di4a6"; - sha256bin64 = "1dhgagphdzbd19gkc7vpl1hxc9vn0l7sxny346qjlmrwafqlhbgi"; - version = "117.0.5938.88"; + sha256 = "1bdfvcywj6ggrn6fz6g7hqhikg0cjdj8llgcm4wji52i7897gw18"; + sha256bin64 = "05a2sggxm76kc6m5wcpb4gibnxa07j291m7292zdvyg32kffqxjr"; + version = "117.0.5938.132"; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 6728d414e68f6..41162c62fde6b 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,1015 +1,1025 @@ { - version = "118.0b9"; + version = "119.0b2"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/ach/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/ach/firefox-119.0b2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "f72001f4d0ba2dfd78b9f8bac01d192f662253083558b09c2667c4af386bbf3a"; + sha256 = "aa29040f88069af03afae04007bf26e68b059b820a9510028b5a0c98d5c7f66c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/af/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/af/firefox-119.0b2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "5f5225cc4749354ddf0abe12183a4075c80fc8c97147e4de042b9125153a5dfe"; + sha256 = "848d07f46146c49239e81026643a71432970e2eeacef9373341d437fd3c144b6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/an/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/an/firefox-119.0b2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "9d0e2327ad0529699cdf1d4f095added5b72c21b7e33d10f19bbd8270161e04e"; + sha256 = "332d3a8635651eb22cd7bd21b5ed9b752bfcca1f957aefd61ecdfa569345b012"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/ar/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/ar/firefox-119.0b2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "232e1c520efa0cc381c6d974916093fa28d19d2bbd2627a929f2a991d6f806ca"; + sha256 = "11564b37246158180ee50db38791fe5361b48e341a75dcba37b52c7f75390052"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/ast/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/ast/firefox-119.0b2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "aa6aa6ebf4c33ac3cfc098861865c29c03e0c5d59dafe1ef89baf4808465f108"; + sha256 = "c5b0bac92d46f815b3fa00523f8f173b113677d6732d2a685033437429463a50"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/az/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/az/firefox-119.0b2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "94031a2deb6d83d9f288c31f309e76e7208495b2910a00773ab44bc062cf94fc"; + sha256 = "c35e1ce330200d6393d79cbebefb745bfb85dd37194d7238b061fac5d4c502ce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/be/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/be/firefox-119.0b2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "670db6f2516e65393beba241abf8ec2087c05213a0696ff8faec33f23b976bf6"; + sha256 = "24559c2a9fa67773d520cc2ba411814afca0ea526bc6dca21434977ad33c43de"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/bg/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/bg/firefox-119.0b2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "ea99012cb2bf95a6ade558760cf09d863fe41ecf62c101b1bf62a8656778de67"; + sha256 = "1485e979aa3b95b55a73cd1227331f709cc5aa523bce8fdd7bd1bd7b895001a4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/bn/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/bn/firefox-119.0b2.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "930d0dd0eaa7f66757286cdf2e56e1214c4d4757ebbcb58c14ab2e59c3829c30"; + sha256 = "8db676c5d1a4daeb178d99d924f473f0b87ecfa00784aab2547bb02ae08ccac8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/br/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/br/firefox-119.0b2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "da70de64d8fedc624de7c31b949e32d4cf7af7ff5b7e2a3c033dd98c17d88640"; + sha256 = "31db3ec1ed14ad401e7106962894fa28081b7189e4b98601fffa2a94112ffd8c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/bs/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/bs/firefox-119.0b2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "432de03ac8f58003b5b5efcaece2348f1acdac08f4dad0041ed45a2ab69d9df0"; + sha256 = "7dee2df1461b62edf17f9218ac5e8cb993078930c53b7a691b529e18e008a235"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/ca-valencia/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/ca-valencia/firefox-119.0b2.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "b83adaefd0af409f3f705042c1d14a1ac29590c3eca3e76acef5a7737973d124"; + sha256 = "b7746bde3ae1f75cdda3e5ff36d36c9260cf860329d3bddaf3f96b1dd652d303"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/ca/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/ca/firefox-119.0b2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "a83a0ca50189912eec1e4ab4ecb8df2b4a325b427e885fac05953d8785d3e2d0"; + sha256 = "1fb3a39ed59a808d79504fc65720a420e05d8f4809ce4cef16291100012c26e1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/cak/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/cak/firefox-119.0b2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "b0a07bc374c2d075de127b9b7234c8b9c741b25e766c3b9aea572cfd8eea4c4c"; + sha256 = "91ecfbcf7c4790a8b2508f97b8386f03eae720781e7515d599311d2b60d2553f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/cs/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/cs/firefox-119.0b2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "ec822539c04cf95b20143241b056d533e48406dc2a033e33ad9dc380e8d71166"; + sha256 = "93780bb5ba6a4f6e83dcf9253e688d44e37cf7ff33aebc475b51efff6fca09c9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/cy/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/cy/firefox-119.0b2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "57927f4e222c8080dd0d624ae04423f5bd18d49a1fcf6a6bdd9b6999829ae4ed"; + sha256 = "222eeeb6f5540198244329305b10eeb43c283452dd86753625060f79adddbd7d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/da/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/da/firefox-119.0b2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "82d5490828555ff7a96488364b5f2b9c088cb252f869d87a9b22620a0b0d96f0"; + sha256 = "6a00340dfae62bf44604c7b4ed868194db6209664e80b557e8d0b494fefdfa35"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/de/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/de/firefox-119.0b2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "ba978d2d0ece5516248a93c82f5a5eee23e3862a9c773f815be5b1579ab4864d"; + sha256 = "9093fc0bbbc87c77ea4c347d753fd4d636b38cedc040d12a7485622ad64bb22b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/dsb/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/dsb/firefox-119.0b2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "3f244e9b6557d0c3a8bbdfcb86d5331639f812a9bc62029dbf6e5c41523f9944"; + sha256 = "b012bef8849b1f83585a280481a1d7c5fd6bb99a401f4e059194451a836177b6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/el/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/el/firefox-119.0b2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "cf2e147d97cacdea6f8d436849319e75e31d52aa734f955966602e70d182134f"; + sha256 = "8b17a4239790849d26a4b6d141aa99cac59ef6065c04c04d336cc455afb62af5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/en-CA/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/en-CA/firefox-119.0b2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "cea957300e8ed433001ae08cb47a3d328b18a7e204419ed14fd34781ba59580b"; + sha256 = "30e10d22fd99edf8a4ec9016b1668a3a9a1c7f4434e002330614affe70bd2fe9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/en-GB/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/en-GB/firefox-119.0b2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "617874a277c006eba600ef2b30a0a014b782f1f527e03a99ba3bfd5084228208"; + sha256 = "0331f989ad8fb7157c830f8406a9a10bd3acbf2ba66c603c7e64a4b723d7c8ab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/en-US/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/en-US/firefox-119.0b2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "aabef5f4ad520030de0d7ab47e1b9fab6a90d5deea50829fe7e92feb4a426e56"; + sha256 = "a466113986c7697d1451143aa8c1135dcfc993767303bb9be3080108b87dbd2f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/eo/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/eo/firefox-119.0b2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "3f772bf847ba5862f47571d61ffbee761e0385d3d679ceed2d7f164e2593d327"; + sha256 = "b299bd695c636a99fe912760b46bc6c523ac1a86f0c2e5e9fe59811ead8f0408"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/es-AR/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/es-AR/firefox-119.0b2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "aab97e8facafd3a0963ed88a054aa3ff92c867a4b884ee4fda33e981201ac0bb"; + sha256 = "cb2b14c37d3f004da6b09e903cb4d8a9aed92416fa7e44583a358fc25b4f6d4c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/es-CL/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/es-CL/firefox-119.0b2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "5bd079dd36652a56dd8aa1a80ca508f71878451a71dd9675823f57874f92335a"; + sha256 = "6f3a42ff6bf955cb739dc4f41270bb4085405a6e51884d1ca8db63eac69f36e6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/es-ES/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/es-ES/firefox-119.0b2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "c9eead7601d8f100b78c55d3e2dbcf404a20e121bc2149dfb976bee1420266da"; + sha256 = "df63303437fb8455070acd6a7c9884d67d6b5c9b370cb1be7a9bdc4769180ac6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/es-MX/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/es-MX/firefox-119.0b2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "97314737bdfd21c5add2b4b34220432cd060016db8c048827149e48dcd739d4b"; + sha256 = "d3e52cc7c73f282130f07f302b7f1bebe7217e8703d65b368aae30b6a07e7b53"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/et/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/et/firefox-119.0b2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "14a99bbebfc7f0c6bc0980308ca8ede871a52448aab60171188d69b8124dbba5"; + sha256 = "6739be96567bdb251551ea1c95a154b652941dff62a726c3f4e46550fb4a770c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/eu/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/eu/firefox-119.0b2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "3c7d325322f115643b7336c337a1abb3ba1865000adc254866439c1d765f8aca"; + sha256 = "d933f44278d6ec9410b2a0cbc0d3096e69781f16341f8cdc300d088c28d158ab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/fa/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/fa/firefox-119.0b2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "bee85cdfda5f8c4476952b76eb465138c0c27ffc0fb90949af89b7c9f42b5eff"; + sha256 = "4e67595aeb1c3f3ea2474fd3b775c99d196a32df102d91c3b5cf2e347c1a54db"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/ff/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/ff/firefox-119.0b2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "45ae468b94bb433f2ea088721214e1d1fa8fd6dabb83f116d0550036251c42a5"; + sha256 = "47f25e3872162c34db46c2a92e2e7d8e0e2aa1ea51cb78ac00bb618707b8d116"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/fi/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/fi/firefox-119.0b2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "5f6772ac889863442e2bfa24d2df5f9e32921d3cf6eec068449ce14e8626ae4f"; + sha256 = "eb726502b272da0e5f133aa536725e3b0bbd182129596df7e1425585c12f6228"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/fr/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/fr/firefox-119.0b2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "dd158242f3201b1c19fb17149c792f08983eafb44395dc7cd1ce43d66280dabd"; + sha256 = "a7627f9701cc267c83a474722dd3dadb0ca95355e042b35a0cdc6acd8a061b5b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/fur/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/fur/firefox-119.0b2.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "c889aa9c0b31b8b64a052572d35fa90d9d12754382f155241e9805f0cd1b1e8e"; + sha256 = "7ac08c98bac199c38dd06c16149604d47fec18a3e4b40e1a605ea1ca4a2a8726"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/fy-NL/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/fy-NL/firefox-119.0b2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "fe2efe2703fe10ad852a63f39e21e7d5e693e469ee6a06106a761166f507c316"; + sha256 = "b2c920b297a542cd38e098bfc0201e0b78eb336c10e249b8ff03aaad46927878"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/ga-IE/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/ga-IE/firefox-119.0b2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "f0723c589cdf037c93ca6db45e9d82c247ec4123a6681880b7a3a88af9e01163"; + sha256 = "9085255102b322bc6a827b889dc2cbe7be1fec3e6d1e81bf9ca41491d2262296"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/gd/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/gd/firefox-119.0b2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "df6eb344664a2e0b87f6059a4b6e83e6090c8c48bf1ebe540a691ff8d3b3b21c"; + sha256 = "3ececa203093cf37332b67bc0376d6c1ddb41e486f013393942feef47d80eeb4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/gl/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/gl/firefox-119.0b2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "1aa5a76632f370707cb4460e07a14b22e25be0fa69d92c163010ee0fa3c307b3"; + sha256 = "90f7a08354a7597d409ec7584d3ac83861f330a7f45dd530f859142a4c2a0f9c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/gn/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/gn/firefox-119.0b2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "cbd9a24f1e07ff132a08d17c62b4b7506012838c7613f5707fcb38aa577c6b1c"; + sha256 = "8780fa181377da1363dd27f19dc1bb5e525be2c3c54543f4fb2f2ef05d8e1acf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/gu-IN/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/gu-IN/firefox-119.0b2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "3db260ae43f6e6a765ec8e30a18dd96eb2f683e5e68f6ae930c24bc1bd9d60e2"; + sha256 = "d3769d7e7c8370bf3099ec23e9b28ba954870fa13ced4edc524a45eaa04361a8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/he/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/he/firefox-119.0b2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "07f4bd764b292e1c18b9284b736fce17978bac724fe8fab035404bca1c8c87dd"; + sha256 = "684b1e3161a58fcc871fa5098f7da976379103df9d76753fc6f7c0ea8d2d788a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/hi-IN/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/hi-IN/firefox-119.0b2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "14b6761109974f03fb7e39c2553ba3186f023cb3ae1c0fb90530ac01e1acf0e0"; + sha256 = "f18af98c6b73840c34e91d982bcbb76e401f5e659f513e92eaedd9d960903618"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/hr/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/hr/firefox-119.0b2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "0d5d9582fc90c9aa78708a89d2ebb1d3c27de664aa9ce938c5b1a3359bf5f618"; + sha256 = "f3ee346c091bc26ca1c1812247e73c9c474bf479d4fcde118bf1838e9b951880"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/hsb/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/hsb/firefox-119.0b2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "a36c2f068f8b87a37f27d3ae2d6fd9063b7876199e9b69018837128e1d6d5c7f"; + sha256 = "1003cafbea7bfcacfcb00eef2c4da1414b9deaab0d1d6c392858de2631b65150"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/hu/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/hu/firefox-119.0b2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "8010a7c126c4d5b8e3b597d1838d71763787f5614343a749eb72a012db8fbffd"; + sha256 = "0e00e30768f0f8f2f74d7e4d0963bdb017d33bcc1c27a04a0aa642fec01d2d83"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/hy-AM/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/hy-AM/firefox-119.0b2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "7a349f6d7a691b57b27261acc59fcd3240a82466f863574d33e9da4e27f65034"; + sha256 = "791b8c969e38363f4c67f98bd89e590840ed077d1da43f90483c6e27ad9de402"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/ia/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/ia/firefox-119.0b2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "946ffcdafe7914f3da03f7d02cabf8c2d9fb4edac772730453e0af161da70d46"; + sha256 = "8b98a33d1f96e0359e5061eb5ab90bc3df65ad60c25c7c832ffa3f4150733b23"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/id/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/id/firefox-119.0b2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "122258b2d09c7b9f8574c8f826246c5199e3da6a88a89ccbe37e987ec51a8059"; + sha256 = "29929faf8864db78fbdcec221f32b5d4792c750f400086df8b4948e2bae26ad6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/is/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/is/firefox-119.0b2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "5fa985e76ae9b63abe8fdb9c365d23c7bb3bf7f96b53c44e71c1ddb4af9ce575"; + sha256 = "cc2c68ebbdf3b3df8cb5bbc457644dd8b2ee148bd7ae2496408b43ee65522a28"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/it/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/it/firefox-119.0b2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "080da934123e4d3227cfc7025ef6c929e3917f3c3100401469a2add650b6cd58"; + sha256 = "d6f4c8f9c12676378f314b80e0aed1978df303cf82c097d95f0e5c807eb14a87"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/ja/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/ja/firefox-119.0b2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "29c2592955ea2865f9f7d1cb4941baa83e5fdb6364f617c894d12ed692a755ac"; + sha256 = "efe9e9ab253d7c722b3c2056195e60222ac61763614bd9e64ecbd87c3ccfa9cf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/ka/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/ka/firefox-119.0b2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "cbad3823ba003cc336dce36ce040130474de76ec8799d509866ba236b3375a47"; + sha256 = "e954ff92220b3cab7914bec848c467cc75914a1b1c34b195ee0f70c041c3225b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/kab/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/kab/firefox-119.0b2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "fefba92cd1a6cf4458ef4a2ee19551ff7f4d37b276ce17751b881c9399f52774"; + sha256 = "0bc06f44cb3fa271ce091407952a98995f937bc57d018f2fd87206bf127ee755"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/kk/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/kk/firefox-119.0b2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "6378160343673b82e726dd4f14dc0740cde0dc93a670d3a73b22e3de61659d0e"; + sha256 = "a571f1959a67294fff9840d8d686faa8c7045e2497c3028e29cbb12acef81b91"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/km/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/km/firefox-119.0b2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "4aedd8481619549d2f7b24b71e4b08dc28f896123b56123882b999267059caeb"; + sha256 = "8f7f63f3cb80d8340c0306b3e2d82ef917b04fbf09274e7bd436a640b2dad1d3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/kn/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/kn/firefox-119.0b2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "35b3e0f320aecd7413b9a9be467e1f3d2ad9a1728f3f754c6a0ef98151c13ff3"; + sha256 = "6333082b856b6e7647d1e32288ea77cc32e68d1c913e3e20cee82274a86ccd6c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/ko/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/ko/firefox-119.0b2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "1c79c8ad7b37d4e662bb77d64cb84821385a60194ff0ae838d3d92b2ab0327bf"; + sha256 = "0e999bb9442e9cf0be08503a431c3fc900723e351ac5cd70c2428aacbaca2385"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/lij/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/lij/firefox-119.0b2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "6e3b6486d7655a944dfadf9ade95c016ee39a866b8236ea139c1ae78a800eec6"; + sha256 = "b3bb7fe6774e29efbfee08391adf0f578b97effa35372cab6785bef76cbb09dd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/lt/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/lt/firefox-119.0b2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "f9207bdb283681481f39ec9eccb444eb1132441d53855053de5ff559a972584b"; + sha256 = "b56b06b93bc2f13bfdd8bd33471e5c891bafc8fa0e02daac8005c41f4e87ceee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/lv/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/lv/firefox-119.0b2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "9f0021e21f0da3eaface718d82b45240b7de9ae5ae84f0121f8967846ed9fba9"; + sha256 = "34dc1a2ad18142e1725f08d35ba1112ae780e11620fbc9afad521838e9b255b7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/mk/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/mk/firefox-119.0b2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "835c7480b6ca9d773a0299efdd3c1e1f21060d1388dff107323957a7af239bfe"; + sha256 = "4f951ea1e1ce47fa19b546cc24bea43d7ceacdee9ec88e0269b22514e81e8452"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/mr/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/mr/firefox-119.0b2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "4f5668ad6c54563b71930eb5783384ff69fa28698276e48d3a36c04afdf08873"; + sha256 = "75337bb9e961494907b09044e2ca227d442bd7fc854dfebd11f892f73983dd9d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/ms/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/ms/firefox-119.0b2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "93de09a08a5f674f0f02f0469e5107a6d35dadc67daeb7fe2815acc0d86113b3"; + sha256 = "ac59c1e1f0d2fedb886cb43056ab9fbf3dab5c20a12c0673fac88fe388085cc2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/my/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/my/firefox-119.0b2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "5e1a6a46481f69cf628d466e0f313038f5806149e2ce9ec1881486e0c8fb1d0c"; + sha256 = "1e75212d832aae53c3e6773d5a281fedb698070b8286748edaa3883e1cbc49e9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/nb-NO/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/nb-NO/firefox-119.0b2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "e9736d25e67e391a54c0fbb3a09d01a1fde799c9006e9fbcf6026c5d6765a926"; + sha256 = "0aa2f12cdf5b32d3d8b5b76e3d0e40619ed1ce23a7532f648f830a3df31c4c27"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/ne-NP/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/ne-NP/firefox-119.0b2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "79c0e4dfd0736531770ada99d86360c94374614c3350fa7b803f8669a750e829"; + sha256 = "140ab995f797769714a2ff8848575e7047129900ae020d49aa615738a2dca7ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/nl/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/nl/firefox-119.0b2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "9347f8a89e16d4e40fa1cab9639b86274375bee9e41dc695c09543d1f787ced6"; + sha256 = "7ce60087cea88252aa2fbbbbe8904d50f75ea4bf76121bb47b6d79b60a185755"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/nn-NO/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/nn-NO/firefox-119.0b2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "a8b96fdadba73eaa0a7a8d5a217fb4195520313f0179d5fbce73243dee51beb3"; + sha256 = "7dea9d0ea86dd62ea43f53aa29e78d963a74fbf65b7b15719ee821a8578f9ca0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/oc/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/oc/firefox-119.0b2.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "78c28687c6eb11709cd4014d3318621c13cab6ae40fe2b5a4e8a39a56f51a0cf"; + sha256 = "0b91545c046084ed6bce8387c09371e8b55eb1dd70c201828a3bbf6bc1ea40eb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/pa-IN/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/pa-IN/firefox-119.0b2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "09abdcc3c8ead12c44f6fe4ecd0fe039546697fc049879b3a21366bb0d17ff45"; + sha256 = "f81d25e0d944b1d5d4b906f44c741de65c959c5005b7eb1629fec36732d5a39e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/pl/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/pl/firefox-119.0b2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "d3fbe55c05ce87c7577c840f1386d82102d1ab62f7335f89d120038b85c40fd7"; + sha256 = "79428c143126ef8d0c8afed51093d865bc264f495b8cede68cb7588637abcca2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/pt-BR/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/pt-BR/firefox-119.0b2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "eeba36fc7d5ec24942d2108f6cd8209479c90f482bba008e1268e01eb395dee6"; + sha256 = "f2b7da1935e9741a0a0484c8dc88b412126a7e6d4a813802b91559049317a9f4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/pt-PT/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/pt-PT/firefox-119.0b2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "a21167a3b085fd996784272ac77fb6f693870ef456a0a0484aea7cdc4e79e021"; + sha256 = "d5246136a69c2f082cb0f73ceb4e9ac9de553245cad950de08b75efac4dc25e8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/rm/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/rm/firefox-119.0b2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "bb0ef4f7b2055f8b1a319ba3515d8085a48a4febb2c863475dde5c2001b13f38"; + sha256 = "ddb16f9123c15045cac3faeeba13a47e3058b0f5d3d63782e60a80ef633b3601"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/ro/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/ro/firefox-119.0b2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "34a4fb9d4fd5ab2b8ea58052e55d378f7cad23876e7a4981009795f6d3337b92"; + sha256 = "ff7d9dfec76aaeac28e020e6a442a13a2630f995f6ab3f8a5c442faed6898339"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/ru/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/ru/firefox-119.0b2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "070b29e6f6ff7913b92443c7ee57b0eefa452c9eed24473cad75f7e3ab0959c4"; + sha256 = "67f8b2a779940555d0a3ec1d22e40b84fffa088bf25f3fed25d8cd51ba117f05"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/sc/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/sat/firefox-119.0b2.tar.bz2"; + locale = "sat"; + arch = "linux-x86_64"; + sha256 = "9e0198247b331b81c776fd8d3d519fc999ace73da6437404a727552051c436fd"; + } + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/sc/firefox-119.0b2.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "cf7bff01c791fc4a3b9215b7621ace361594f6cf217303d5bdc57a252b6f931b"; + sha256 = "e06611e2697caafa428821f397b73a282cb95fd04e27a0053a4626d4e27c0f0a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/sco/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/sco/firefox-119.0b2.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "529365a5acbbd2a9668718bca5d257b4d664ee2521dee88e87ecfab0c786df95"; + sha256 = "1dcd186dd4a07afcdceb5cd78d4bab8acec29bc33c22f00241146a95dc671681"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/si/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/si/firefox-119.0b2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "22c085fa5cedbd8bf4136123852dee8394b60a17685aafdf2460ec35c689ca0c"; + sha256 = "ea6f325e4abc2deadd846758c3a46e6f05272a84e2f0a5bfefd71d4654573c51"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/sk/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/sk/firefox-119.0b2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "b9c8fc34c2c77aeff5fbf8d1e3684d544a7159a57ac68e978a6ec8bee9664832"; + sha256 = "1e926336db28b651c62a08401dad98fb35e354435bc5980e46bcda601c20c4a8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/sl/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/sl/firefox-119.0b2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "a60628c4dc95213ad9d6dd8d57b13409cf0f7baaa97cc75203de2388c7ac9c66"; + sha256 = "863f87c1b3259d8c2b1e5eb46c8eebc11f7e51466d2152f7906fc43286dad6a4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/son/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/son/firefox-119.0b2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "576fe1dc1c1a17d9dc52b70188123b50cf994450b5973f1f3dfb6fde743194b3"; + sha256 = "294327e09950cc5a87e8ca995f8399f8557d0ff6139bec9bbcb4d71ef86041b8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/sq/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/sq/firefox-119.0b2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "8370af0eb7d24231940c774d06e34316d7f2f969875824c561ad9a3a6693887d"; + sha256 = "fd1a5d4c657fd49065cb7fc730f79ab59b10e0ac1857a6bf2029b9e3b384e259"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/sr/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/sr/firefox-119.0b2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "aba836509cd6ce84014d425b9006b02d2d4e55a54b5ad88fc190ff83f2a5d37e"; + sha256 = "3796d67d405a07de959b5b0ad1a858044a0d77ae8605f0c0eadeef3d72a1b9ea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/sv-SE/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/sv-SE/firefox-119.0b2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "7cbffc0749a33a7aaadc8e37cee884d56a9e5b036dd0d4cb98f62e9c632ac00a"; + sha256 = "acd35f920e8a27d036c0a60475eb24b3b5f7715495d9a906ebc6338b646a1bab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/szl/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/szl/firefox-119.0b2.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "d48ed7358db84ba359777cfa5f80a175ee48e8e485bbab2e46d87de70204b1f8"; + sha256 = "d0a298daa1d3c264c31351e8079c31e111ecfe29c0c5e808460f087b4087d0bb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/ta/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/ta/firefox-119.0b2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "366edca487cf36da2038d70ff2c4e4507e28460ae081bfbf76cf8423b941296d"; + sha256 = "2d2d8e94c76650323ad13408c9309c149e064f69f9b3aa327537b3113104efb8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/te/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/te/firefox-119.0b2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "06fe2acfc05575fa49c2dc893e71f7ffa018befb22f51411c89aef1d80bdd52d"; + sha256 = "185a700c7d3307c7d970675b6e488ad8a404626c5b826500a813f7597c5df0f3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/tg/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/tg/firefox-119.0b2.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "276dee83245badeb1ff86c3e51a288e19d171d0ab5f859fa0a3c3bb3c5669b07"; + sha256 = "2edb8b3734c83a6a6e1a4cb9671abd5762fb7e1d62f38c49902241d57d9aeda1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/th/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/th/firefox-119.0b2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "63dc82c449a96900fdecca383844432e8e5d98c5685b3f29e5d3dc4fbbe8f5d6"; + sha256 = "831df82268c79869730a4d31c574ee6d5d65a56611fcea858ecb700eee768098"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/tl/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/tl/firefox-119.0b2.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "17ae4e7bd7e9b44aaa157941cdf728d9ea96aec36c0e8929e523406ae6318c15"; + sha256 = "03602e65d339244c8c7792e2ec3307b5b3559dd9d3fd586c27c73967bb34f580"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/tr/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/tr/firefox-119.0b2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "8e3a12ca4696fb081fc9bf24df4505a2766836cfa7c16156d59e9f46c3c4119b"; + sha256 = "5d25f30d6b9c147867660321337960a51937acaa2aae4abbfdf8e5b3ae999b31"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/trs/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/trs/firefox-119.0b2.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "cb35fe559b4afb00cdd4a3e599e044e693cc9182e8f57d7906dd49a4eca9dcc5"; + sha256 = "6418756d1bd6516be637382e0315664bcdd2a06936c7d68e7898314888f0b28c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/uk/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/uk/firefox-119.0b2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "a4967895256ffbce73c7890a42914124f1de49486d28b2a063eff2bde7e421c8"; + sha256 = "d0443018b3090f98e615ab14cbbc321f7f5855c0508c417ba8f81d7d75174ae7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/ur/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/ur/firefox-119.0b2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "98477e519e2c0445cae1b48de06c89dee92f82aa82b391c19db9f03d6ebf03ef"; + sha256 = "42fafb4efc7a3c50634e37c73f411a57079a5d1fa9a78b03c6d26f3debc92374"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/uz/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/uz/firefox-119.0b2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "f099bb0f5db267823ce0a6cbd57971a4b32c09b5860c7c57d70e1f2fc55c86e1"; + sha256 = "201d1fb0f398734120ed898fc88b2ac4f846375e1dedac78902a40e9c6f8795e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/vi/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/vi/firefox-119.0b2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "399fce77713276835581da583484dd8ce7639b7cd355aceea8643d50937a4dec"; + sha256 = "a567ab70825748b18cc23efdcc2fabe8d2c9f78f3632f11d89d0b9f8b842a782"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/xh/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/xh/firefox-119.0b2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "521a939b97ec4aa0c8734d15f5fd8c3fe3e8427e773bc067a987904cb446e63d"; + sha256 = "e5e8fd2000a9a1f03a099f1004b9a6b83d136cc719df7d053caeb6aa9e614961"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/zh-CN/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/zh-CN/firefox-119.0b2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "0a3b0188ec777dad4c5364e205ab6ecdc710f94c2e4cc2ead1186a6315303b06"; + sha256 = "c18070c69528e8abc4d5b9862eb8fb535f044a247854fbbde3ad4d67adf76572"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-x86_64/zh-TW/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-x86_64/zh-TW/firefox-119.0b2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "c1d5bb35eea837bd7af95a2ecf4c0db0bb6553857511d20de7f67555ba972662"; + sha256 = "66f47c79c312f3049687eda3915cb6f07deaa4b8fb02b3d858926f3664059a0a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/ach/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/ach/firefox-119.0b2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "34c9c9446f5bd2109df1867cca538093da3292517b98238a4ad1d3f4c326cd96"; + sha256 = "035131aa193806dacf049edb9a53e78e5a8101c779fb6912a86a2b0a05ae92a3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/af/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/af/firefox-119.0b2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "f190075a4e243e9cad1a74ac8a5081a61000f1ae35daaef8ddec3d57176808c9"; + sha256 = "66081bf06add5f6c28d6cd495304f0f8194b86946148bcb32b171450d9f70b8f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/an/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/an/firefox-119.0b2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "74fda08893894e3bc34149712ad581555c2d19883264eb41cfe1d547023dc309"; + sha256 = "e11cb313507f03944186f9c6b19154f6ac7809137b77a8b209790acb5160082f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/ar/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/ar/firefox-119.0b2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "8aeafdd4ca2cc0b48bb48f8b0ea71d39f6627e0c30d42320507b8e12df929a5d"; + sha256 = "622daba775f1ea1393cea791e2b777f43ee592e81dbb6094721e65338f355e24"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/ast/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/ast/firefox-119.0b2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "6b396009138f13ef334c46e21b64541d7812de4ce2abd30388075a36e5ad3a3b"; + sha256 = "bb9668d0cc030b29b780edf7e81548764745c0d9667602031ed11beb2cb32d07"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/az/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/az/firefox-119.0b2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "426ffbe9214221bc6fe50a80b8fad851bd10f89844bef60cfcf01be33cc26135"; + sha256 = "f15a85ec663a744a06b4829d038c7abab371315529cf4ef5c460e6e4dc768800"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/be/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/be/firefox-119.0b2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "6f78b08fce7dc39e00c4d7c867c3838b89f100dff6225de6b80ce30897822857"; + sha256 = "adbd8a9a2c0a0f40054a62d771ae3f06b6681269d04c58ca8dedcea709af7600"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/bg/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/bg/firefox-119.0b2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "afbffae61d37c2699a8977265ca1f6be95f5614634581991fc6a991816767243"; + sha256 = "d9e70cb3d0f5f0a5ce2a8ee016b52eaf4c1bb0f6bcce478522da8e4d41d084e4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/bn/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/bn/firefox-119.0b2.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "953a458a32805c8c4b50d266868fe693e7a514da25df0c8a4d6ce4d27d911869"; + sha256 = "13437d3f1c0dd023de8a8fbc2bc0db7b7635478877c8c9bdd2339b5b756a1bc3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/br/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/br/firefox-119.0b2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "ef53a4f59b27fa0952820b71edee67e7f034ca14df4e0689e3c8403f0dc04c94"; + sha256 = "9de0d55c475e5db8f07abc506787f5013b751140bff0f527feeffa9bf538b6f9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/bs/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/bs/firefox-119.0b2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "6db39d0d5e87a13cc9edfe529b38825cff492a353f401660a73ce3acdbed56ac"; + sha256 = "b3641160b8dcb23326268aa15b1397b591accf40ba9c5b2d80e6db9a14ca8f30"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/ca-valencia/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/ca-valencia/firefox-119.0b2.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "6e7c7d909e5b67af5c2a180e99d80b6e24ca74f45f1f679a9825de073aebcf11"; + sha256 = "cb23589ab6157516cc5d49dc9c6dd26cd222f444002afd36a0f4c69cc437537c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/ca/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/ca/firefox-119.0b2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "e9a442ad17e7d16c4eb641aeb72f37417af3fec37b9c556a122e97dbfa97a41b"; + sha256 = "a362e057d30ee855d15bf7d3ca7a85b94ebd027049b1ce05c025b148cdb3fd92"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/cak/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/cak/firefox-119.0b2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "724d73539d0948dbc003c5718110e867b79b108fa3a8379d9d79da7b19c5502b"; + sha256 = "ce903e91d62778587132c7b64fa1ff478a4512b5b0df21a9d7e85fdbc839ee4c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/cs/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/cs/firefox-119.0b2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "29844c34ea3b32c13b96bc0febd44fde74897c3f665e9831dbc7945d6e4df59d"; + sha256 = "508700cd54ade97db9152b41f49dc59ed8d3e611a23cbe59e2e15be477069ff6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/cy/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/cy/firefox-119.0b2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "1df970bfdcddf5a53a6731a931db243cb934c243c8a3e420e5b95e670c0e1cee"; + sha256 = "fac2d773f8980bddecada6ff8c6af922f1367526b7eb54d812a2a0959ea6a142"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/da/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/da/firefox-119.0b2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "3722861a85abc170f231b6eca8323b10f8e77194fa93e919a27fbc0a84c5d967"; + sha256 = "8565bdf5b71b748a2520f47837880c7e96744eae26c4d634a3cd1abbe1b41738"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/de/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/de/firefox-119.0b2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "58e9da64015de5a0c9c953084260c0fe069658d41b03958d3679ece5cadea7ed"; + sha256 = "4c455b4b2f2f002b7e0199ef21312ebdec01965b528decabb9af94fec165d12c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/dsb/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/dsb/firefox-119.0b2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "1c7b1613d2da0daeefc954d5c8628fb44f4f320178c7b73d8dfdc585670d957e"; + sha256 = "522f64e7359af23d22533288ba77f9d6c618f92dc6b2208db4fed2d5253a55d1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/el/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/el/firefox-119.0b2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "015d999733cae11c5acf9aae70a4bbf300eaa6f608c1a5077cfc7c5e4572ea3a"; + sha256 = "10a63cc7cb35c57220ba46ca61c815b51f2940dba5418a62a9f5b3154b6c0b41"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/en-CA/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/en-CA/firefox-119.0b2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "795ccb4af1029d6edb738934e139f9c17d3cd0a79ba740f638b415faf08f9f23"; + sha256 = "53604beb9cfd51c58d6cb848297503c46aec8a352542c64c0ce459f02d9ddc90"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/en-GB/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/en-GB/firefox-119.0b2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "9df5dd4fa68f0699436c70f69b9f1723209b84d9b53c90327ea35d77b48d3623"; + sha256 = "dfa27d197a73da2abd64dee64c3c87fd8aa4c623bac2f33e5b51f5911bc190db"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/en-US/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/en-US/firefox-119.0b2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "cbec17edb051fb08aae350726b7a3dacec2c5fb5ca913215a1d73e172a4d37ae"; + sha256 = "82bc39d905905d2090d6de135f72a5eb72ce2e4116ded808464be85809d454b2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/eo/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/eo/firefox-119.0b2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "58cfbc25f95ccfda3a5a7bec3856ee3160104051a016b95ceaef31832d60ca9f"; + sha256 = "ff2498a9c836625b87aa01a442f9d87ad79d83422a5c42fc3dd2da2b94a813ec"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/es-AR/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/es-AR/firefox-119.0b2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "5a72bb00c42787b7ebfebc2084f9a264f5e73db93cc1019092df934da697e63e"; + sha256 = "3b2f08337f9c86b3794c9a416d9f6fcb4896c5b5a08cb50be3527e27d026d573"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/es-CL/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/es-CL/firefox-119.0b2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "a6acbbf4c471bd29b32ddf2b2212880f6dc6cd23eb431f44b2842600fa65f87c"; + sha256 = "b21c4549d6950bb90593fe397e904d05c8478c9b43fe353ebfb57e4650f5d521"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/es-ES/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/es-ES/firefox-119.0b2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "1362d06c2d4487ea2353cca4bb93f70545b3e75ec0b08e719c60f110a6b47ce7"; + sha256 = "24c766dd98eb4eceac01b2037151da585763af82bf7cf5f61bcc01c27babecac"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/es-MX/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/es-MX/firefox-119.0b2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "6fbb0d41035c57182be15d3e9e09b9362ff1fdf1465d6b1eb3bea659697c7a2d"; + sha256 = "da6288a4d72ab0d28d01d48eec5c9f00bd77bea2f180d878c88b741643e94a64"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/et/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/et/firefox-119.0b2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "320fb9d47f2c5338a055881a1115fecf55ce6cf0736200a0fabfcdd5eae746c0"; + sha256 = "fa0ea3e43829dbfcee4bd994037f41d20875ef5459f599bc0c48130c6f3c5b54"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/eu/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/eu/firefox-119.0b2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "8c186b872d23d0dfb35e1f82f5b45e8bd5776a4c40ffbefb2b308d724c466a0f"; + sha256 = "9e9909b383cc395315788db911e8b04f80bb700125b082f4ecbb753cc0f62ab6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/fa/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/fa/firefox-119.0b2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "5ed6bb9c021801332c067ae17afac584d33cde8cf3328886151022d03562d5d7"; + sha256 = "4fdea69afeda312f16229743b55a9c01572afdf19c4f1e2a018f49af97f282cf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/ff/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/ff/firefox-119.0b2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "1c3dfda6c68e83c5ae75016120641a4895cdc522e057b4b23f711af4ed81eec2"; + sha256 = "ce13c84cc691709e9e46caf97dfe652e1a1518765a65a57d807ce00720afd2a3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/fi/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/fi/firefox-119.0b2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "fcafd7a3a7fd1d30298794c49a028a6112c4f3339b70d99190e140e2abdc78d0"; + sha256 = "c94e76743bb5c65ba35ea32e9b692b4fe095c5b52e9df35dd726edfdc789ddb7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/fr/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/fr/firefox-119.0b2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "098d0a88d644d05c70366e8c6acb7ba6fc8bee46f795a2e17cf339caa8f1abc1"; + sha256 = "7af9e2cd9fc0ff976732fb664e34644da717b73f1b847e0f71ceb747c8dd9fbe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/fur/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/fur/firefox-119.0b2.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "92dab0deab11f23936f6444453bb4d5722925d5b4516861bf1c6978ede8abc61"; + sha256 = "ea20bb0cf18c8a3d9c72a022f2ef2e280d0c9691c69a7429db2e407e769a00e1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/fy-NL/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/fy-NL/firefox-119.0b2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "fb6f60c00442067d06f9e579d8a896ac1a104429badc47384633b1ef84b67283"; + sha256 = "39d3b6b4ea2c934a070d49a17b9f57a4e496a11ac0a4827f4150c7cf3013fe35"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/ga-IE/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/ga-IE/firefox-119.0b2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "88cd22c3ee46b11c1f84c5085148e0a7ffe69ce081c9aa94aa39fe59a50d80d1"; + sha256 = "e2b7b6f211038c78adff23d9088a690cddeec7a9b3f12e0ad824cbec9d26c0e3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/gd/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/gd/firefox-119.0b2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "3223071a9f76c5575069ffc629e4e65510a2065e735c97a148fabba58e06238f"; + sha256 = "6cbc957879c3c9b9594cdc70cf42f3511aaf7a3ba3c2d341d14cffbbddb09759"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/gl/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/gl/firefox-119.0b2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "28b4e6dd3ce7c8fc6858b833c4625b5b91507a5a9edf9726d23d3e4c2b731f8f"; + sha256 = "569e3dd2a3532005cf9a6367310996520eb04fd1fdaa8a244652563816a1d5fb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/gn/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/gn/firefox-119.0b2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "04724b3746350c7f7f495ce6672c2f612679692a5cc054471515b475490ec29c"; + sha256 = "c1dc87336ed8b0fd814212e6fdfd3b916ab11c56917cb33000808383f6411cee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/gu-IN/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/gu-IN/firefox-119.0b2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "1b23e1491bbc1b5c5832d7b2dc9d827d700af5b3845fd83b32589274c766cea6"; + sha256 = "8d10aeb8803743699e8591e000749011990159bd556b5cebe8c100837c74de9a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/he/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/he/firefox-119.0b2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "6812d83a044593ff1bef318009aa783892bc91f22d3af3a21b034bc2222e881b"; + sha256 = "b680ea3c981be484f5a64126d7529a70982bf09d296fd88dec29b46e86717f30"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/hi-IN/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/hi-IN/firefox-119.0b2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "6c234ab7745dc7c1602957373d456dc34df6b99674b3b32f535ea501baa8b64e"; + sha256 = "cbc955e3850b233ebe46aa36c941f16bca30cdc3184fa02990c4386b09bd112a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/hr/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/hr/firefox-119.0b2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "a51b821ca289cf29ca63961fda7b6327e0c01ff42ff3315259f77c52105c9c4e"; + sha256 = "f099cfed0f1240ec55899c55398f61df195a902656097d1d7b524a2465c0bc08"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/hsb/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/hsb/firefox-119.0b2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "552119b76bcc6abaf99bdbda41d07f4d5e65c6c8ec0c0b6d1d2524ce44b820da"; + sha256 = "d478a55a9187c5abf92782bb808ebe6daf0fadaa606ab5efb2ad821faf0dd624"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/hu/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/hu/firefox-119.0b2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "85c21de6dc2a00b65324e56c592b97b96d9cb70ea2dc6d415d6b58dc3bb9d397"; + sha256 = "29d3ceee2886e287ef91e11027a30d119ac816bf5de9fc5e1b2a32cc95a9f14b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/hy-AM/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/hy-AM/firefox-119.0b2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "4b55c2a4229d623c170826512c2e39328cb3362c70b8cf090ee1d4a91262a8d1"; + sha256 = "a63e1defbf6142133abc688d8a7b78bed337ec68ac973eb7ed739f7157fd15f3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/ia/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/ia/firefox-119.0b2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "6953e56d0871aa7ed7b54a989e59189f87d7196db4035eb633aac83f281c38c0"; + sha256 = "c0fb8499d5984fe7f54333e7060793c923df2d121381811d18497828db38bb32"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/id/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/id/firefox-119.0b2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "b675af0c36bc4be5ecc05055a68f503ac0a511ef6a2f626c29c6f323f90c8246"; + sha256 = "663cd10815a42c56c618cb50d79e8139256fdbab2600a83f4ef5b47b0b94b1f3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/is/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/is/firefox-119.0b2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "4de6bf9707bf0e4706cf8482f4b429902d98c30b5cde383d5f774e93100a2688"; + sha256 = "47af307278acb5f61a928327585d702a1c56320f04c27790149ce854f5d6bd07"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/it/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/it/firefox-119.0b2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "1a09934e1d690685e5aeaff249401e6d79459531d8b991ccf95df839879bce52"; + sha256 = "113a7ee6637fde653bc0a4d5b198f33560bf2bf8e18049c4e63e522d96f4f74a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/ja/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/ja/firefox-119.0b2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "11c107ed07c6d2c08fbaa18dc7a4a630e9634a14939f0df036bb28bb879b9407"; + sha256 = "77afddb32582afbb100ebe31df62a6fafa79b36f57237ddd18f84611dc413dce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/ka/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/ka/firefox-119.0b2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "4f92dc867bacbd6dfc8e23f6695a6a2198ba13d95104088f06e4073b2ec3938f"; + sha256 = "f4c46cf57c0a4fd0e5024491ea4acf95d8ab694ccc86819f5fafe733e9d9bffc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/kab/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/kab/firefox-119.0b2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "6c9b580002996a789a61b5c1f79604d8f56debe090f173e7bcbbf7f2f4c5ec40"; + sha256 = "7202b9d0e06a1254b70d9d58b18a2747be7d383076598d93636e59c8a509001b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/kk/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/kk/firefox-119.0b2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "67cd40739a7ac9475a12cf0dedd632a34c92389b53dc8086cfc19bfe0403cf3a"; + sha256 = "178d7f1f86dfe100cd9bd368c99feb6a02a48274640994059181f4292c5e33a4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/km/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/km/firefox-119.0b2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "a37e42fd0f1ad0f68b54171a33526d3ff95c83b9701eb49256cff39b3c51ec0f"; + sha256 = "a13a9ba8474fc21597c12f602379e78a45612317b16613dccc433d4f4ea96498"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/kn/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/kn/firefox-119.0b2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "7ab921479608f3fe7783afd3b2683640ff337cae358a074f3b9ae3fb588406fd"; + sha256 = "e08ca6b2feaf81634c88abad583ea19907a7d76664d8180a851846ed697e031e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/ko/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/ko/firefox-119.0b2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "b9837bacb23bd2a0db927dbf16d511e078a144fc186e11b243dd254f6233c318"; + sha256 = "f4b65a21cbc26a96065c8e096094bdfa78038f89b45043fa1d49983bbf722a48"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/lij/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/lij/firefox-119.0b2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "1570679c9b806a3904bb5aa6f1198353238cbcd09380b63d940ffed160f97da4"; + sha256 = "f23c88f1a4b7373692798ef31d0c35fc488449b0e677e92d98ef4b1db492383a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/lt/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/lt/firefox-119.0b2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "dee7ef8015e0fcd46b6a3351a06399c39d4cdcd87e560c9a21611a3a83ffb931"; + sha256 = "8073ee74e40d946c0b4dbb9e3b30b8a4988824a7d938b5ac12cb1c6cf9c68390"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/lv/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/lv/firefox-119.0b2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "e82440ec1dd47f559bc7cc3d34c6d488a6a9d9bff6f02ec1cb16644a6499bb85"; + sha256 = "adfbd61925156a069b3473c9beee214e698502dc8ff0afe04a841c41c6071522"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/mk/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/mk/firefox-119.0b2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "f318a5fb18e6859b17f09776fd57bef1cc6b83959c73f18d6d3afe5616932221"; + sha256 = "9ceb9ac09fd7b6047b468991a7a3e9f416e858d5c028722b88028f1da57d121b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/mr/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/mr/firefox-119.0b2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "4c9879fa2278ce308568f441d9d8e459b87e6aa041f513a73b29248abcdddcdd"; + sha256 = "b47f17878b4241df9abfd439a9526ad7d4c8561a58d3961c2a5f6db28a052a12"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/ms/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/ms/firefox-119.0b2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "2daa97181d4da9e38a4ac2e0bbd2afe2a87ad89ab2869d15112771013cf24394"; + sha256 = "56ef17179b2c4a10c79bb2b263e2b5de72d2d8dad19f3f42f33564677bf60a8f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/my/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/my/firefox-119.0b2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "5481465dd497758c4995ba799ef00f6843c1128be96aba8a294ca3ea4fdf5cb9"; + sha256 = "e826c029b97584d6a640010d78c72a2f3c8649b3a65bc1b00aee46fa78114889"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/nb-NO/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/nb-NO/firefox-119.0b2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "0deb45d140d394aa526bb5f1a7a328b7890d1305b0137693a6af6de92f7709fb"; + sha256 = "537fe1af40c68bf73f984f3be63b3c05ab63114222f54d9aab7c486dfa18d54d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/ne-NP/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/ne-NP/firefox-119.0b2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "5eb82fc8dfc6aa6295109bc162275b2bd55fc6f66fb234e2e6eb164a59a32954"; + sha256 = "af6b51b7b3bcf75984419b87335e254d16399557fdfc83239973376c54499b7f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/nl/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/nl/firefox-119.0b2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "483560f27c4942cd0a1276fa6b6f0777747c4ba495fc8c1abb8410553f4ad292"; + sha256 = "20bc221cee98d756bbf1be7c31dee415210b3a4bd2abfca3182428fa414d931e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/nn-NO/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/nn-NO/firefox-119.0b2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "66bb124cbf673197f50280cda50844783935d4b71e6652614d05eedad3cee873"; + sha256 = "cbf4c8915222f4bba8ce8885b8c130209fb8904345860b85b1eba7453da91d56"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/oc/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/oc/firefox-119.0b2.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "05302cd02a9ed3ee60caa0c5235af40e2281bf2e41d07bd02147c251a14bc2c3"; + sha256 = "d460d1024951e7b1ccedd358ecef32a134f00f13912370f1fc7a40afcf60fc22"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/pa-IN/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/pa-IN/firefox-119.0b2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "9ee938ead1f1c2f036caafac1cfc0392edc62d524d3ac3a2148106f58bb80722"; + sha256 = "ab6a722ff19fbd01f8977b99313dca359e79dfea24b0d41c3b1b63014ec5134c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/pl/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/pl/firefox-119.0b2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "21a2300a9b19b308408a2f1458349c823f0fc630061f0b0b4af3aec80245ab1b"; + sha256 = "07febd6d75a0c94d85b08fdbb55667eb404ad34616b06903844f490243f0fb41"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/pt-BR/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/pt-BR/firefox-119.0b2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "cb4d1b405ce1d11e7ac3856c8dbb82e5285dfc88aad5f8df5ee25210044ca6c5"; + sha256 = "e714e6fc81d8f658359927df71d3e1778586a712d4185d7162c13484ea9fbf58"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/pt-PT/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/pt-PT/firefox-119.0b2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "bffe9e2e74983c1b265c97cfbb7eb96db5c80938deca2a292ee2a7c90ac8efdd"; + sha256 = "077a796a86502afce5cc4fb5fd25b650f0eed742b94432ba52a3eb4c58d7d2c3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/rm/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/rm/firefox-119.0b2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "c134d2c13754cd58008f7687785e90f7b58a9a7becc26d0e5aeadb7f04e3f6d7"; + sha256 = "634ac5c2e0cbd488b763c6fb8a8b239ea8910e7f4026632a2f97f9e90bef9a10"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/ro/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/ro/firefox-119.0b2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "e01b289e75b7e19422c34655c8100fad64479dc3e31e3c4746908075e51a4392"; + sha256 = "9a58ad2180720c410eb1b341042bd190b8bfc311cf7821bfd02c676acd31cb8d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/ru/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/ru/firefox-119.0b2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "451929bf4e1ed42dc06c9b2012316b5659e98058871fe90f1c8ff7078a8d76af"; + sha256 = "f39c378ab98b5c616bf908444189864b31dc218ad828b9b7bddb59372669df60"; + } + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/sat/firefox-119.0b2.tar.bz2"; + locale = "sat"; + arch = "linux-i686"; + sha256 = "9aa65c3648fe0e9e306901756069bc1d40b1a27ea52a244614d33d16d0da849a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/sc/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/sc/firefox-119.0b2.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "217ca07189bbc4f02bec82cb335f70bae02cb49ded439ac065e27d082a3c76fd"; + sha256 = "3bf9b3ceb9800d73ccf783cb80f38a896b392d54d441c0ee8896e613c35e1c15"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/sco/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/sco/firefox-119.0b2.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "a1b74967a2ca69a1a6780566fd260c14f80d9b7d01b7cbeb0f67467c83ee99e0"; + sha256 = "3ecd03947010a37eccce154dde954c7fe9830b665c25e545ea7f2f1a999ef2c5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/si/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/si/firefox-119.0b2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "aa938a3593e010289be018fc7427b72c0cff9aed1d0ea9435b8f722989367b7d"; + sha256 = "31fc98c73347bcc4a03b11183d64f881da5c0db73e2b2963edbd9e5f6ad90c71"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/sk/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/sk/firefox-119.0b2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "97516ed369a686dcee3adef077900b327a4757b093de7873734fcd728bee12ad"; + sha256 = "c617ed8276619164f20c7e1d22756adce397bb20b0c2e09deb2c4da8637581f2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/sl/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/sl/firefox-119.0b2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "bdce57a3b0cb8e212b172444e10b57baf71b05121d438acfb2558120f868f98b"; + sha256 = "e33d367eab10d990271099ccf70dd83d2133eda5be21405f8f6d2e4e1a609719"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/son/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/son/firefox-119.0b2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "804abfe83280bf64793e113198c99e166f52b04110215e39499ccc127e8c83b6"; + sha256 = "5a44059d9ebd4cc2202882350c4b60e912c2703d9ee993d5fdf5c009ab9ddd89"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/sq/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/sq/firefox-119.0b2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "215c7ef5aea49100d5749f757b17ebee504c9bb266b58745cd2508108df55f3a"; + sha256 = "8268c55012ba2793005ebaa7c8f6788847e9e98d4db3f869d8c468a68756923b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/sr/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/sr/firefox-119.0b2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "39e2be8f19980e494506101b18c107410ff1d8936022bcb518533478d76a7499"; + sha256 = "d1f9a34d209726cb14c61f53f53977f1b52d50fa3e3f6d9f39a4013b0c5442a5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/sv-SE/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/sv-SE/firefox-119.0b2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "0d40ee545df810bc2aa8fb98d7ef961ecbb6ebc950147c06d25d8fa125b4da7e"; + sha256 = "0825181c5746c1c0640277d9eff1f2942a1d86d4a7261879c9ac2026c4cdb1ec"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/szl/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/szl/firefox-119.0b2.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "e90d422f30d03becc7d9bdf94acf0f111d85f414f490b473322af3f9035727e3"; + sha256 = "c613bb508fc12d4ad9fa33ab81670927b520f93bca0ded05758c81d4ab6e8300"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/ta/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/ta/firefox-119.0b2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "6b07eb727992822e129f0139253bbd10798d0f7419225e6ac1e899a491a2adc1"; + sha256 = "1f428c6edcd027fee990577bcbd159eae2b2e53c4c05317cb3329560194f477b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/te/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/te/firefox-119.0b2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "37ff6b48108747e31559e9f9b9560aa6d8c3c59cdb3c568d2ecdeb582a70116a"; + sha256 = "62cff5ab64021fdfaeae5f47f3d3d579b89341017548c478e29e61a16813ec29"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/tg/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/tg/firefox-119.0b2.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "aca109dd00d54bf95c799aeb2d3dc494a68e6c1b6d687cbd83fd4482b966c4da"; + sha256 = "3341cd110dd69458aae73f1de31a88d86b75e992c0ee8baff3a55dccc310ef83"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/th/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/th/firefox-119.0b2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "c76d91c196706190e08739deb13bbb370f3e94f96183d0ff5a66e1775034105b"; + sha256 = "2b2bb108d16476c5e68a0bef5e39c9d20ed55edecf10a6b0534ea5896e966b09"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/tl/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/tl/firefox-119.0b2.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "f87630b32ea5e713a7c2f5e75481312d029b2a9a246c2dbddfb9f8a0b16bed82"; + sha256 = "adb9c09bdf1c38266aeb69256ca40f5a531d1287c5ebe1a75661d2fb1b069b31"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/tr/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/tr/firefox-119.0b2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "641d69112b37793ae809e5e79fce629f167855f5ff558a436c45a2d2cbd655f9"; + sha256 = "b1ded7566d1fb693cc72a5cc7c2469ad5f435dea8b2984d153e8e3be41c391b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/trs/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/trs/firefox-119.0b2.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "9ff9c70ce51f3042209148235f6bdb695d0e7a29bc71d283514d0f264d6ba83f"; + sha256 = "61d5e8b489673c78ca12e3f7230032e42dbecf380ff92fd6a85b77f5646eab88"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/uk/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/uk/firefox-119.0b2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "c05576aed0db4e30686c6314cddb27ce993e08061418ce4a537ad504f5193a1e"; + sha256 = "e095c8b3e87488083599b4d369378978a5023d219fdd0c9fdbe0c2a0ddee3b44"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/ur/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/ur/firefox-119.0b2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "2d4eaa6be878b461c817cff6f6629b6aca311eaf13d826a53f3e1ec9d6cf0b42"; + sha256 = "c8d8d7c6ab10f4d47628c59aa954ed21d8a5a9df237700fe72c74c1fe0418894"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/uz/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/uz/firefox-119.0b2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "250dc730c03884bb22a35d6d3c83a908126e7de59eb67f381ab1142685b101fd"; + sha256 = "74fa1c9203cb8a1475ee708254fdc8302848912900db9ee68133c90be8c62ae1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/vi/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/vi/firefox-119.0b2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "36c7dfe81774c6d9478177df7c6a840087c16dc3cf37967880fcad3ce1a93a85"; + sha256 = "f3449419f28fa5669dae1dafaed32c4e95a447a50ae5c915bdea57313358c9ae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/xh/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/xh/firefox-119.0b2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "26e21f4efcfcbad61bf603c146bc41440120dba5ec562d89c687975757355737"; + sha256 = "bbc8992c95fee611c7f8b2616f270018d54e362b2fdac144c26c2e0780653ff0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/zh-CN/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/zh-CN/firefox-119.0b2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "0717eea8baa6638c33016f0149820e8b569048f52de7203c798700af80bbb3af"; + sha256 = "80c5bb859ab2c1ccde1bdac07ef6dad6fc43e29ff908fa6db6bbd05eabdaf2d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/118.0b9/linux-i686/zh-TW/firefox-118.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b2/linux-i686/zh-TW/firefox-119.0b2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "6aaa6b0e349c6d06698aa7fed7fc9d5136581e3fc60f76edec79b5e423548b45"; + sha256 = "3b3e7e66fbd3e9c91823dc83081e9e9f4837a9f97889801207d083d9b122d6f5"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 31d1ef6920650..8130f9f775849 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -1,44 +1,13 @@ -{ lib, stdenv, fetchurl, config, wrapGAppsHook +{ lib, stdenv, fetchurl, config, wrapGAppsHook, autoPatchelfHook , alsa-lib -, atk -, cairo , curl -, cups , dbus-glib -, dbus -, fontconfig -, freetype -, gdk-pixbuf -, glib -, glibc , gtk3 -, libkrb5 -, libX11 -, libXScrnSaver -, libxcb -, libXcomposite -, libXcursor -, libXdamage -, libXext -, libXfixes -, libXi -, libXinerama -, libXrender -, libXrandr -, libXt , libXtst -, libcanberra -, libnotify -, adwaita-icon-theme -, libGLU, libGL -, nspr -, nss -, pango -, pipewire +, libva , pciutils -, heimdal -, libpulseaudio -, systemd +, pipewire +, adwaita-icon-theme , channel , generated , writeScript @@ -48,16 +17,18 @@ , gnused , gnugrep , gnupg -, ffmpeg , runtimeShell -, mesa # firefox wants gbm for drm+dmabuf , systemLocale ? config.i18n.defaultLocale or "en_US" +, patchelfUnstable # have to use patchelfUnstable to support --no-clobber-old-sections +, makeWrapper }: let inherit (generated) version sources; + binaryName = if channel == "release" then "firefox" else "firefox-${channel}"; + mozillaPlatforms = { i686-linux = "linux-i686"; x86_64-linux = "linux-x86_64"; @@ -88,6 +59,19 @@ let pname = "firefox-${channel}-bin-unwrapped"; + # FIXME: workaround for not being able to pass flags to patchelf + # Remove after https://github.com/NixOS/nixpkgs/pull/256525 + wrappedPatchelf = stdenv.mkDerivation { + pname = "patchelf-wrapped"; + inherit (patchelfUnstable) version; + + nativeBuildInputs = [ makeWrapper ]; + + buildCommand = '' + mkdir -p $out/bin + makeWrapper ${patchelfUnstable}/bin/patchelf $out/bin/patchelf --append-flags "--no-clobber-old-sections" + ''; + }; in stdenv.mkDerivation { @@ -95,115 +79,54 @@ stdenv.mkDerivation { src = fetchurl { inherit (source) url sha256; }; - libPath = lib.makeLibraryPath - [ stdenv.cc.cc - alsa-lib - atk - cairo - curl - cups - dbus-glib - dbus - fontconfig - freetype - gdk-pixbuf - glib - glibc - gtk3 - libkrb5 - mesa - libX11 - libXScrnSaver - libXcomposite - libXcursor - libxcb - libXdamage - libXext - libXfixes - libXi - libXinerama - libXrender - libXrandr - libXt - libXtst - libcanberra - libnotify - libGLU libGL - nspr - nss - pango - pipewire - pciutils - heimdal - libpulseaudio - systemd - ffmpeg - ] + ":" + lib.makeSearchPathOutput "lib" "lib64" [ - stdenv.cc.cc - ]; - - inherit gtk3; - - nativeBuildInputs = [ wrapGAppsHook ]; - buildInputs = [ gtk3 adwaita-icon-theme ]; - - # "strip" after "patchelf" may break binaries. - # See: https://github.com/NixOS/patchelf/issues/10 - dontStrip = true; - dontPatchELF = true; - - postPatch = '' - # Don't download updates from Mozilla directly - echo 'pref("app.update.auto", "false");' >> defaults/pref/channel-prefs.js - ''; + nativeBuildInputs = [ wrapGAppsHook autoPatchelfHook wrappedPatchelf ]; + buildInputs = [ + gtk3 + adwaita-icon-theme + alsa-lib + dbus-glib + libXtst + ]; + runtimeDependencies = [ + curl + libva.out + pciutils + ]; + appendRunpaths = [ + "${pipewire.lib}/lib" + ]; installPhase = '' - mkdir -p "$prefix/usr/lib/firefox-bin-${version}" - cp -r * "$prefix/usr/lib/firefox-bin-${version}" + mkdir -p "$prefix/lib/firefox-bin-${version}" + cp -r * "$prefix/lib/firefox-bin-${version}" mkdir -p "$out/bin" - ln -s "$prefix/usr/lib/firefox-bin-${version}/firefox" "$out/bin/" - - for executable in \ - firefox firefox-bin plugin-container \ - updater crashreporter webapprt-stub \ - glxtest vaapitest - do - if [ -e "$out/usr/lib/firefox-bin-${version}/$executable" ]; then - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - "$out/usr/lib/firefox-bin-${version}/$executable" - fi - done - - find . -executable -type f -exec \ - patchelf --set-rpath "$libPath" \ - "$out/usr/lib/firefox-bin-${version}/{}" \; - - # wrapFirefox expects "$out/lib" instead of "$out/usr/lib" - ln -s "$out/usr/lib" "$out/lib" - - gappsWrapperArgs+=(--argv0 "$out/bin/.firefox-wrapped") + ln -s "$prefix/lib/firefox-bin-${version}/firefox" "$out/bin/${binaryName}" # See: https://github.com/mozilla/policy-templates/blob/master/README.md mkdir -p "$out/lib/firefox-bin-${version}/distribution"; ln -s ${policiesJson} "$out/lib/firefox-bin-${version}/distribution/policies.json"; ''; - passthru.binaryName = "firefox"; - passthru.libName = "firefox-bin-${version}"; - passthru.execdir = "/bin"; - passthru.ffmpegSupport = true; - passthru.gssSupport = true; - # update with: - # $ nix-shell maintainers/scripts/update.nix --argstr package firefox-bin-unwrapped - passthru.updateScript = import ./update.nix { - inherit pname channel lib writeScript xidel coreutils gnused gnugrep gnupg curl runtimeShell; - baseUrl = - if channel == "devedition" - then "https://archive.mozilla.org/pub/devedition/releases/" - else "https://archive.mozilla.org/pub/firefox/releases/"; + passthru = { + inherit binaryName; + libName = "firefox-bin-${version}"; + ffmpegSupport = true; + gssSupport = true; + gtk3 = gtk3; + + # update with: + # $ nix-shell maintainers/scripts/update.nix --argstr package firefox-bin-unwrapped + updateScript = import ./update.nix { + inherit pname channel lib writeScript xidel coreutils gnused gnugrep gnupg curl runtimeShell; + baseUrl = + if channel == "devedition" + then "https://archive.mozilla.org/pub/devedition/releases/" + else "https://archive.mozilla.org/pub/firefox/releases/"; + }; }; + meta = with lib; { changelog = "https://www.mozilla.org/en-US/firefox/${version}/releasenotes/"; description = "Mozilla Firefox, free web browser (binary package)"; @@ -213,5 +136,6 @@ stdenv.mkDerivation { platforms = builtins.attrNames mozillaPlatforms; hydraPlatforms = []; maintainers = with maintainers; [ taku0 lovesegfault ]; + mainProgram = binaryName; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 042059c044624..249207f4bff05 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,1015 +1,1015 @@ { - version = "117.0.1"; + version = "118.0.1"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/ach/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/ach/firefox-118.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "bba2d74a558ff32c5e723708ab462cdd3af56aeccd06e5b4e842cd8a99f716e5"; + sha256 = "57ca2dfedca8ae33cd24c6bf63a747a75f931484dbd22104309d8aec9d655922"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/af/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/af/firefox-118.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "d7d3337e66a0cb6d63d669e7f9aa8a1afc970aeaa079dd206f2faea9d86f934c"; + sha256 = "3a67ded092941d1d1d5277bb116e29a6ced5cd7a68ba1c0ccdcb0c053a720f4a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/an/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/an/firefox-118.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "430c9a492de3dd9d0250901cb8e8ed675c6cf3e492f814a4e386d07998a2724f"; + sha256 = "92c26a519176f860af4cedf257bf48324c2f472036366bcdde837f054583ac4f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/ar/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/ar/firefox-118.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "8043636c3639d4803093eb1ff25a23a0a9e6b3746f06c03e0ac2ba5abeadfd55"; + sha256 = "d7233b314b69bebac80d84a9869eac18fa2f060395815ea8e9fa60c8f7c2cc2e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/ast/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/ast/firefox-118.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "b628087eb248939b53f744937d9f8c07bc204c65915a019e7cfaecfe2f8548f3"; + sha256 = "02d730fcfaa62ab22b070fef1e71fc002fdec6af7cb3d78d4f0f8434706e4a16"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/az/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/az/firefox-118.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "f9398fa0e7e8bd1146a2c28135aaaf785d6ea53e5795cd8aecb7d4df4fe744b0"; + sha256 = "a6f708dffe6cd42bdc4eaace5e3d602c5817e93e42dfc7d69ed69938670f5343"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/be/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/be/firefox-118.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "d8645fdd9c897d46f1ef169dae1e89b70e31adc0df743dac2f06eb4c1783646d"; + sha256 = "d4f861f6c782b19237c0c1aa9282506b9cd07fdb71a019721cc8e14f01d65351"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/bg/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/bg/firefox-118.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "6d5d684d096ea94b995c4fdca48dfdd423c7f3f203124ae39413ce301cca7e51"; + sha256 = "38cf1ffba2c1247fece1b2da997c8cab9f38d94b825ea3aa08d518fc898c0c7d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/bn/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/bn/firefox-118.0.1.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "054b468d029161b2fcadddc470a200f7d908bde5ae0fe5e187d9b5a594ce703d"; + sha256 = "614632a639969e25426a8243f1f93050882796b830459c165e7c31daa8baac05"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/br/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/br/firefox-118.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "4d3c5fb7ec494ca2bd4e52ea62e73405121777d38a2a833b39e4eddc3f21adfc"; + sha256 = "eabda4fb0d8e8278e26b3922f77a7fcce75797447e36edb7d9d065f5fdc65a2f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/bs/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/bs/firefox-118.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "fb2d1bc9329f73b889ad2149f157be4fd9219e4d4d1b160a61562a527d1d610c"; + sha256 = "e3744c0b5bbcf15734a53af39da6b281b24fa55156b0523c48a85d0366675a4c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/ca-valencia/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/ca-valencia/firefox-118.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "bc263c2196669b93226eda1825b6f2350c6bcf91cffd40ab12d3bd1a3c8148fc"; + sha256 = "86d5f1fa6a48ef3e96ea1443beaf456f25233f757d0154ec4d7e388bdc817ba1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/ca/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/ca/firefox-118.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "15087bd5732537e640034b9c3a70efc3e73b8aed20444b3ad63bdb242cb0aabf"; + sha256 = "b2ec3b39a96df6bbc8b43e8ea0313c1e11f3f65bdb01f79d23a653d76336b726"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/cak/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/cak/firefox-118.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "de6624dd9c6860d7ac3b03dc299b38e066babcae96187669f6df8257b42235a3"; + sha256 = "471fdf1610fc350b1dbef05c2f31ace65242d6bd143f057aa6d721d893568d0e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/cs/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/cs/firefox-118.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "d7bdd96c4c595d531cfc086553ab0704ec191e92ed54333f79a25d06bb8d6bec"; + sha256 = "f26a52cd29a308ca7c9b631f2132a3f29061648ed0136ac5be154cd2c486f266"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/cy/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/cy/firefox-118.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "7390d9f3e59a12fb9c181f340dbaca2be199cbac8fcee58b3d791f298f19feb2"; + sha256 = "093a242b307fa1a78eeeb7bbc849c0b9f70006b4e7515e5aea9c5dbb2a3e4857"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/da/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/da/firefox-118.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "41275e9881e4a4a9a61aa148d2f762fa17de9d042fbad7d453b886841e684bc5"; + sha256 = "a45e5abccf85084991851851687a45f620e96b802367b2305b5b712885f6cd59"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/de/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/de/firefox-118.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "dc19cb1199dcd7a86a4948309a5a0b220745f8fd2cf7108688b7f800a8d47510"; + sha256 = "4cfd67a3e0067a0c61dcec66c13e9d87532cd5e509f984f6c1baa7c23e2d86be"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/dsb/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/dsb/firefox-118.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "535994c82cd9aeb4b29658c0391c7264103cfaea0523db1cfcd649bd625f3402"; + sha256 = "f97990d46d590c158179f23df9744e0ac2d44aa3e2dc731828b9f10ad217d9c2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/el/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/el/firefox-118.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "8adbce720ef045f2a06ff61ac09e4ad36bd9b68c09544615ea4404104caf59c6"; + sha256 = "9c578f1c8434f7c0cd3918651cce62322d1a0af3f342f494fa76dcea15523082"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/en-CA/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/en-CA/firefox-118.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "11a0d2714181a0d6c3034e11b4d053826f48765baf495c050b0f983855230ba1"; + sha256 = "76f6b4d94e3bd1ccbe2c137c9899b84bf76faa00c954951f0596ac27b13c3c85"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/en-GB/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/en-GB/firefox-118.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "99d99376ace7f318e6a972ee14b05c51d43b5cb3431fdea03574a59d34e8c7bc"; + sha256 = "21123779061219834522dfca02828a8fb6234944002e0ef97e2b4f733e619773"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/en-US/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/en-US/firefox-118.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "e70b282ed0b8ce42981675ca2bc9a69fbad23f31f71fbd700b52dcf79e57761c"; + sha256 = "dfaaf6a2ff0fd4751659b797a688966907ae53bb76837b1aedc8c9c62bd641bd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/eo/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/eo/firefox-118.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "abcde5b6fe8bd9e543729dd87dc99b1bb42013f1741b3ae4d20ab4dd64186572"; + sha256 = "69ce9ac8c0610ce37ac7858c0b718a84e1a4a6749f5ac7ec69db4729634bb492"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/es-AR/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/es-AR/firefox-118.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "cd42590e111f426d607d3a18b1cd27c9b691c2d02800f747c8edbbab8f5e31f1"; + sha256 = "f983c4556bb618cf5e04fe083e55480c5768381ec194c5137e4e2d7e9ba90778"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/es-CL/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/es-CL/firefox-118.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "e8986d426d4bb3a93ca8a084ddd2994c1f876f04c88c9143ce4d6758e3a29ec2"; + sha256 = "c6216ab87cc6f63289341c49a97631ed4b4ba881a828d41395186d167d3b897e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/es-ES/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/es-ES/firefox-118.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "29ed9a0a92684f013a86aa84bb2f897795895635fd96cc3cd6b977dbc36b5449"; + sha256 = "e1e6fd750066192a0014757e4845a4f1a51a75987af5ea26467ecce6e7831022"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/es-MX/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/es-MX/firefox-118.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "bcfed213881bd7d2a3fbc2f477d63fa17a614cdc6b6462d20d27ed447d5d58d0"; + sha256 = "f21c46e08b67e362e999875a53d2ac7277acf9f2ec8ac2ef7f9d1abf347713e8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/et/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/et/firefox-118.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "d8be9ecdc37b2df6bb14e20030cc44c116d070f68886825ae84bac95b8d2040a"; + sha256 = "5a17f44761255c3a16eaadbdf85790775c41e75211a7520a32a6432665b28d30"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/eu/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/eu/firefox-118.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "59ad82bd51ca20192bb2e083a49e3af4ab5ef9851b05a3c553306a435ed22d38"; + sha256 = "d2f8f6180f7d4aa465df322f01a8e3ca5e61a3e51bdf58a130bc2339598a906e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/fa/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/fa/firefox-118.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "78a469007c15a02379c5ab8883134e40f4d4ffe4a09b9169d4263cbbc98a64f3"; + sha256 = "0b25641300d1adc30592814673a4c085d10581011a91b9c9ccff1db6b0175a17"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/ff/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/ff/firefox-118.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "33d4f8bf75b61ae0480450385ec6a5a3370a011f82ec626b5805052111f000fe"; + sha256 = "6433ea78711d7a034a45ce7a1ad358be8cc9bfddccab4c3ebe0e69209dd62f7d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/fi/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/fi/firefox-118.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "b78e9c2dd1319225ee966c87eaf36deb8b7734642b7122bf89d3d9cd7a8b3efc"; + sha256 = "d52abfff6798536bca7d83acd8fa88ca7fed22157e0276aee7fdb65278f27c55"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/fr/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/fr/firefox-118.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "6087f7fb5d7d898f86feba4dd176aebef55b5cb83a79606f2587482d2113c908"; + sha256 = "84fd988369815285286149def490876d00380c2bb2455ac674def76adac8f333"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/fur/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/fur/firefox-118.0.1.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "a76c39c67d956d1a5a399ad3a951e7ef85f873d4eeb4e0f0447e27482a8aab31"; + sha256 = "f6941eee1a8163d7eb48476b0da395a049f91420a94346d7b5050a192bc62faa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/fy-NL/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/fy-NL/firefox-118.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "e6f2627ad2e47087e34fa2d7de27b28dfd859184cbe717f6ba3b1230753aac1f"; + sha256 = "6b5aed85188727af3bff5864f19493d3ea4758bba7de051392b4b5772c5eedae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/ga-IE/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/ga-IE/firefox-118.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "4cd79d5097fbe4c1b8da60fb7452ec040e6a7404be83af94b3fc7bc430af93ee"; + sha256 = "b6424ab6d95c2dec1c75388c685ac6885f39ef0d0a39a5c6b1c105d60a5ea1c0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/gd/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/gd/firefox-118.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "58ea0722146548b82498682813c3e9ae0aca7cefac15829eb6251df6a09cf989"; + sha256 = "44443c7128426113992bb470e67d5121a59e9ade860047b4f903f2125995b8ad"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/gl/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/gl/firefox-118.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "bab03a33af0af44c76a6c45d441060a749bcf9795c35b7879996ca7c229ce9ed"; + sha256 = "fbc14f0cf6f02cdd0abc2dc7512b36da4151bf48df3d2d025f6ec36d226adce7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/gn/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/gn/firefox-118.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "c4ac97bb3e86ba34b0167a1a3370c36b092a0eef0d4d85a04411722fa97f9cfe"; + sha256 = "ba50704fbf51b6ed2f8289dd450c5774b0f53de8b0f1cf09055d337f662b1a68"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/gu-IN/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/gu-IN/firefox-118.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "92f267e5e1470e142de0ad2b8679c9021425cea37c7de898f918548bbbe0b46d"; + sha256 = "29c8c4721305bceaa80bdd2238e41af9e59e193900641863a00b82b467e49c5b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/he/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/he/firefox-118.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "773a53545da52e43d96c983842569ae1287494bd0e7363fff62b950fb454e542"; + sha256 = "becee2ea0ce9821518b3b18f1b593a9b2143f24438d8674e00fa3ca1a27f79d8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/hi-IN/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/hi-IN/firefox-118.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "403c66cb65fc2bb38f72d0483860e6667d5ac0235980b8b31404379908598f85"; + sha256 = "162c19be9f556103d79d81e53adc930311f67d6e445125758fb5661e3e173589"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/hr/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/hr/firefox-118.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "2048e4824d67d4e9b2b7b5517a6b7a5a3e10edd9893bdc59e78602ba7ba751c5"; + sha256 = "5cd7a8a042614f6444d262837ed5793aa5e1e85a0cb1b2be266b0ed463407b90"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/hsb/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/hsb/firefox-118.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "64dfd241702dca4923608ca22494cc422c36a78afd8633cb1b38e1c0206339c8"; + sha256 = "e86c552bd90768e681e8fa48ae1844d094549359cd12b134588454a3db30aad1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/hu/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/hu/firefox-118.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "f1dcc54e3b165ac6c9a5672427dbf07b3ce8a464174fd0561d31945a6da03c46"; + sha256 = "d27f59da039eab219cf869ccabce2b8b6be8dd41640e542ef0d2e696c16306e3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/hy-AM/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/hy-AM/firefox-118.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "b7675399988090dca87e08815d80fc9c3626fc51323c60fd0c68f6e2b0317ebe"; + sha256 = "e267f621b61c5ca629394f48b707b20a073c3620f6afeeb086983d20d9789173"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/ia/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/ia/firefox-118.0.1.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "aa7202913df0bcdc25df93ce730ca77521736668de2b057cd71f41888056dfc9"; + sha256 = "39c08d1f7b42abb776eae47fc9e468098cec626cd75dbbd90fe3031eb7900856"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/id/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/id/firefox-118.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "f5b57f8b7f7e90c875a3905d12b18a6a50581756803f42cd5c161fdd8dcae278"; + sha256 = "bb9ea3059f7f7928976fb42412c771c987113e9290a75fd5de8296d27d3e0960"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/is/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/is/firefox-118.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "3961d574adb39f68b608dcd45d1d9060e22ba06fc894c0a4fc91805780143b02"; + sha256 = "02a84fe761bae4b977cccf31b7183528ca19467db51304afb9086b92d6089a8f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/it/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/it/firefox-118.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "2b5121470b5eca3b09e8cd59471a3aec55a416edc148f11227d283d27d2c11d1"; + sha256 = "7702c2d4ada8f04199a2c777404a265f7d09dd1c95ab9092c1fe1e8f2c36ebb1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/ja/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/ja/firefox-118.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "d0a500a53d93eb3d87fd5dfb9d47a2bf82dff267144477b9a279c346c0f3b012"; + sha256 = "f0f2dd4ce61fcf6e893caf2c8c1b3dda14fab3b61f7742dc642bd677165f1bc3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/ka/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/ka/firefox-118.0.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "76c533fdd82f6ef8f3f26372cf203f21a838174e948b48b2f89a3602af0eae50"; + sha256 = "9fc09ff2f780cd0ba304bda13fbf3073265a5b38655ec7e35808ab21678c74ca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/kab/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/kab/firefox-118.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "2e32c95bc2c92c4859f3cb93995e08ee3f345b90c31157b57b13ec8521ad2146"; + sha256 = "41a23d0e24ab6239a8cbcc87b71a0d99cbe933ec9990822c7cdfd1309ea15a29"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/kk/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/kk/firefox-118.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "17d7d5acd90c005e07660092aecb92601e0dfd227f44c460f4e5d7541704f81c"; + sha256 = "a90fd47a0dc4e5beaec45155f404ae62bfa9ce1f7bf091d82ff8597780515cfb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/km/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/km/firefox-118.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "f14f332973af47ac3714b2822c88b55f9412a33935ec4d7a5d58b62cce13f8e7"; + sha256 = "017124b2f12d9be14cfa2d71723f76302b233d1b6ebab3ae5bbd7bad84418474"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/kn/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/kn/firefox-118.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "c32350aa7c40cbaf2092de7c3e25288f98f3917f933ca787ac16d948d0cb0d2f"; + sha256 = "40d346c14b1dccc762de644cee7e85ddd8a7725aeebe6dbeb0679a11da83dd58"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/ko/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/ko/firefox-118.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "3e3fc8664a85319ec3c8694f0f69a943d3d72f7995dbf52a389a13a7869feba2"; + sha256 = "9048f80c9244c301f010f5b90a58f48c7b150567494b479c7815037bb8d08595"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/lij/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/lij/firefox-118.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "fa5a4e03b3dd82255e33c531784691cb07c98c770445b4992700d11fcaeb7c0c"; + sha256 = "194f89e2ab1c4f9424f273898c3ba9283af5f5b38b633b1123efb8b3a071a770"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/lt/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/lt/firefox-118.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "97bb3f0ce856fcd9526f0601280d5621902b4a123e10d2cb7438d2686694d7c4"; + sha256 = "a5425acdcf1a2ac0bb8b0226eed96341d9f276d9a4dc358003529f08e7285381"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/lv/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/lv/firefox-118.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "461ac23e44fa7ff9992134cba28abcdb6ace665590f9a6fde293398d4f1a97ff"; + sha256 = "7079c544f4e3b6c3d0f7f1e89fb086581ab7919955b8a05c9ef2ef4e2ea46100"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/mk/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/mk/firefox-118.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "5231feaf4f03931150f3c8efbf76eebaf6b3989c9d9f2fba9a3c3ceb96378ad7"; + sha256 = "2764792958ed8eff978186a49f7fd97c0588dccba83b9a5d68c36793e1dd6c3b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/mr/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/mr/firefox-118.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "fbea27c3f30006571efc5a04b36c7ff34fb6b5665d0cf05d05a7ece70063afcf"; + sha256 = "c455572b46343f1749147801b74970154b76bc102214f21811883869c1b65b33"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/ms/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/ms/firefox-118.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "b210d2b88f9108880f41ef02c5c75529d53853828fc0aa26588d30c7e5dd4754"; + sha256 = "000938ec1fd1804af1f4f311a690dc2f1e425a88a1c05df31779ed2a5c579186"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/my/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/my/firefox-118.0.1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "260ecac1fea5671b769175cdf92b6c0be5f64d30a2cb71d9fb352d39db2e3439"; + sha256 = "07ef309b045af66b7f16dc2b6787e5424b41d61ac87d19a435b54004625240c5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/nb-NO/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/nb-NO/firefox-118.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "b3795293e9684677c94dc442ede2d6bba309ba48ca79d7c8d1eed33d5d2854bf"; + sha256 = "c3e1513003648e39417ef6a304a30ae85281865b555506b255bcfa799366a607"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/ne-NP/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/ne-NP/firefox-118.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "53c2628a86d456d2954777072c0e6ac30d85b7714c8e3a95364955fc07270b99"; + sha256 = "869fb60690023383648425f79fbc9f24bfb4813dd95d176f2a4d17796bf9ee4a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/nl/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/nl/firefox-118.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "c732de95a1e10e4fc1831d740e782d6a268bf0eb7196cd2ef4a549c0cbc3ab81"; + sha256 = "34d9fe25f8667f904b3784aa601a0f65bb63bc22d4c7048de4063db70893b5bf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/nn-NO/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/nn-NO/firefox-118.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "e2220c2548a9265beeaca69c9b9ab21ae238421d46a0b08cab11914986f89bd0"; + sha256 = "dd4c36fe148768a71c9786c29800c612aa037346f8f6c39b21dc6da7ac7029ad"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/oc/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/oc/firefox-118.0.1.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "d4c85b3d2e87fa8699661e4ea8f2481bb05888d30c33a6e457f34c77da65cdec"; + sha256 = "c2a8bcadd2602fd5c44483adfb38372125b2d386719d4943c64b82efe558bb8a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/pa-IN/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/pa-IN/firefox-118.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "f51d558b53650b2a9bb325081cdf1168ba3fbf7cb8668c8a5a8e99d0616c2f76"; + sha256 = "211dc4b245d004ccc0281f4431a58df767b7d1c762d32fa24188d72f2c522808"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/pl/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/pl/firefox-118.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "76b5ab1b8aa4e82fb29ef152c103529cb15c06de0a256eb2decf7ab5476f42f5"; + sha256 = "13cb01ba5414bfbb669bac781f33e641a870f407d9d4f87cbbb60489594d500a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/pt-BR/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/pt-BR/firefox-118.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "90447a08e0d1c707dedae731b5881415421391c1969db744bd65003cee7657a5"; + sha256 = "09f462ae3538a828cd98ac2f013b6151065fa8e38c586193b4f37f2b1d71e228"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/pt-PT/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/pt-PT/firefox-118.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "017f6a56b39b8abbea5bf72a11ca2a0f6630956e234981206c96eece50147c69"; + sha256 = "5001103a4cf5bfb31daedae4eb63dfa5a645c231c35927f7499746935c5ca7f1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/rm/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/rm/firefox-118.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "64ad854a79bfd50a42a3ea405b93494ab4bc10525d811e66c2acd75a85e14834"; + sha256 = "b07bcb0e7f4111197a98138d4892a420c88b7fa3df8c93e2038046078e82e424"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/ro/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/ro/firefox-118.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "fb0336084d8e34fe2fd321eb3ad2256c2718442936e34b12479aea3d05edadbd"; + sha256 = "9e249cca7806872a0fe8abfbfda509185591211a48bc28887a669994926b3f13"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/ru/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/ru/firefox-118.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "763b3534433c0376a65f6c0e065d6dce05cbf03ca95fe51087cb82bdb8ddac87"; + sha256 = "34e8a96a4642da70170c35ff8101244c17167fc1162d4547bd142e5e2c1b6b63"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/sc/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/sc/firefox-118.0.1.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "1b352e4edf8ef5067cc1ddc230fb907f5246ea612898a0c4f0715442f2ac7f47"; + sha256 = "f46be537b47b7c119cb0635740ee8d3a0fec34e53516af78fe74e4a8b56fa94c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/sco/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/sco/firefox-118.0.1.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "3fc7764ab6b13bdaab3f9a990ab7b2337500a24603b31ef65657c27705041783"; + sha256 = "386aa79bba02bc4717c6d9d81b0486f561532bad10600de8de2c1cd740efbc07"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/si/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/si/firefox-118.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "79255e4967614e18f11ddf3b32a5cf87058a01df12edc5f04671411796bd4844"; + sha256 = "ea5666a749f5d5ba0caffb51f4ba97b0bb0d4c22be2df71af8184d24410531c1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/sk/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/sk/firefox-118.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "8111813b6247526b6ab97aa212275f67a8b70556a7565541796cab9700dae295"; + sha256 = "4cc80425dcfdbe66c1843071e24519b51350d2e9de6da372cd4b00fe801896ac"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/sl/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/sl/firefox-118.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "c79c7b15b0bb3fad4b2fcb4cfddd15a3a43e6469a56b8557240700c65c544a28"; + sha256 = "e0feb4fca0521816739314e42fa3583355f62dc0ba94241e49f2d63f1d41173f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/son/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/son/firefox-118.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "c14447b86bd4b888db93ecae8f19e7e136365c6f8cf690a07cd5cdf74ea9e58d"; + sha256 = "9606cade30e14db9e9f9da4d2044734c09f188634c1d81bb79babe2c7a880aaa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/sq/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/sq/firefox-118.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "2575be23194405bfdf20fc8363f81b148b02081f26231977bf6032007a235558"; + sha256 = "f83ab52ef4b1bb643a8c1daf80e19ad6878fbe861e0ca251e0d4507f8c4dd9ab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/sr/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/sr/firefox-118.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "018f214f645800c738edb612ac4ff8cc806b382a96a80b720cb5d87607574d44"; + sha256 = "b9649571a1e768c176af22e010433098b06e9aa3b0ad9341e91b7b9402e5367a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/sv-SE/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/sv-SE/firefox-118.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "58d136a8a9e9dff6fc4a84a75055a73e90d2da68cc2676863985095691172332"; + sha256 = "7bf8027353c03917d849f715c2e2d9351a2d59a05f39e0375a2671bb48a3cf7d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/szl/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/szl/firefox-118.0.1.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "b1b76d0cc40f6f44f277db0b15e8877f54f137dd24614095273322b637367d10"; + sha256 = "cc7a90b08c7d8a1cbbae33160b4b63e5b84515642e7b78e8497128ad01189008"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/ta/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/ta/firefox-118.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "5efa32abf220da9c35d760bfb3bc46aba03b4f11733751821dcfc85b09ff58fa"; + sha256 = "72ee4da1a596e9d44fc7428f800b834d747f82aa716b6db9a7ff6c1fca5c34ab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/te/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/te/firefox-118.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "a20aec40164aabfbac2e2215665f8bbf0f3719d0317b9975a6f094eeb7d665f4"; + sha256 = "105a24e8555d0652fb516677f7c4a414155b5710b5abe4c6d4cc4fde3c4538d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/tg/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/tg/firefox-118.0.1.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "d7f8de05aa85b8a4a7312c6a217fa9ab6cb1765160dc0d45742bb2de9b6497b1"; + sha256 = "3b20242dafa0af9367237f72805709d5d6bea96cf3743ca9372625d456f4c3fd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/th/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/th/firefox-118.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "1bcd53cbb98ab3089b1175cc808c9781033a792e786604c13343b2866d3516c0"; + sha256 = "c5ce04d832063815557389cc1b3c6a57944890dce92b833901ab79f15c918438"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/tl/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/tl/firefox-118.0.1.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "55d52bae09ea4093e1eff96585dfdd477f908f1071fabcfc1bcd13354b94de1a"; + sha256 = "20d7481c7f0eaa5cd080d586320d896bf711952051bc08970a6da098c823e104"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/tr/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/tr/firefox-118.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "c57af5504418e23cde3402880be0d3797a186aa56954adfc2f3c0ed8942172ae"; + sha256 = "2fa9718354408518a0c61cc4d98267934f005a25d18d0691434c0772ebe30f78"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/trs/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/trs/firefox-118.0.1.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "409208e0f3f3cd5e25297f5120fc933ba83dace1449546589a97e62ff0dc9537"; + sha256 = "31c488d2dc2becf2c0dc25bbe1fd1ece1e0f75296138ccf9d93acf488791a50d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/uk/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/uk/firefox-118.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "df08ed863cd7d02e021953290ba609c8d00f63f8c03fa3c837ce0f6bdb121ddf"; + sha256 = "b7eb792b6b37e91d1512211ca5736ee1bf71d2860f7909d80167ca85258191b2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/ur/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/ur/firefox-118.0.1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "d549573c3571d0c20ddc6c3606d1a4784a6886a757943be423814f9f3e847061"; + sha256 = "e7845b7621cb024b31fdb212384a21961c7f5c0d18a100116e29c061b6e244a2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/uz/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/uz/firefox-118.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "7a09b51b30f4152f14e84f4590772daafce02165e1d314b70447cf09985bbd13"; + sha256 = "3fff96476de332de060bdb1e511bad5e70d763b38cf6373126bbe43ba239dae8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/vi/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/vi/firefox-118.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "cfe678b674c001b5818830be0eaf36cfa2b0ed31d005c4a559ecda2dac6fcae6"; + sha256 = "5a30899b084364adb01873e42901d1bd4203408c5c734603fd6d367546299ef7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/xh/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/xh/firefox-118.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "1c7e9e390ddcd9e006f86a5f645546359fa73c1c0f04d3504085bbcf3c82d74d"; + sha256 = "d9a5240cb39855653bf90552e96cd989f77b80f79ed14e09dd3c0c748c4f2407"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/zh-CN/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/zh-CN/firefox-118.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "d7636801fd5fa862c7a211f21ec7666eaa30c75d8394ede2e471a6671a9de2f3"; + sha256 = "64a99e44829eb0b9562770687ce8a62cf614bb5369e4b3accc5aa4792bb9bd33"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-x86_64/zh-TW/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/zh-TW/firefox-118.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "84786eb39341069a27ff31e4f99534bdc1e9d581f48f94234f90f0fe97c548c3"; + sha256 = "1962c3814753af75e9426ee7e856a2195b1a1323787f524abfb70f5cbda07839"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/ach/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/ach/firefox-118.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "ac3c882130b37750d3ab48d18443a140173220b14f6ece8de238677c7dd00d3f"; + sha256 = "8f013f3d8c138763e43aa855ce3785b6cb74a02a4bf81ee7b2ec1a006b0462e0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/af/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/af/firefox-118.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "bbbf07ae28faf976e4c4cbf87d5d0caf079087679958b43affa019ea8896bfad"; + sha256 = "48abe09a5e89e39e1924581f3dfe5ab0953c761fe792c39e30989910da82283f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/an/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/an/firefox-118.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "a82e2846b4ef077659f888d71ca415bf4918ab8f2841abb926ca8f86e6767b42"; + sha256 = "5e14802ef24033286e9ca77e6ca0c44895a21a8b07e89e532c7b6a4c98db6e3b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/ar/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/ar/firefox-118.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "107c2e66caef41e3f4e415f50842eaed1a1f02392f3514d60193b1cde6b0a340"; + sha256 = "a822c051bd2b1f14f6fc9816dddaaae73861b35fbf3539cdb2e95bf5c0c0ed16"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/ast/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/ast/firefox-118.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "b5c862ad4b1072433eedc82f4df4c13fe7e85b88a19e5b4e1772df01a64db916"; + sha256 = "39d15f544465b816e0ef88c007dd4049fcf498d74eee2b3495db37c36b844dd5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/az/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/az/firefox-118.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "dd43d0cd1897863ed3a2df05af1bd00ca7332954fdd3672f67ba7098691b7b0f"; + sha256 = "20f0043984c4ebadeab243563d8018f434e03c1e756e82cda0c3d5a2032dfd01"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/be/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/be/firefox-118.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "9badec5971f42c054618c1f6b86df5771278b07a44d8a345271b2241e057c565"; + sha256 = "9c7e8e8682ebee619286ba137e7713bf103286a1d87f92f0caa3d510fcab90af"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/bg/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/bg/firefox-118.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "0499c5e2b00eaa6df5ed88f699811d8a4d59ab232489eaa49a8ec3912ef4e295"; + sha256 = "bcdae2edd650c1a8b02b7650638e059dbc274df564a7c0f495f0042640883fd9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/bn/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/bn/firefox-118.0.1.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "b65f718dbd3400e643f059e62cc46104e9ea6545f79906e81ee796758571a7c1"; + sha256 = "3f334f3c99466ad107f4b17a3d45f7318d6a3b6bd2c1290c7da101c82abf0b8d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/br/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/br/firefox-118.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "b07c8981ce349ffab9c918dff7f14e11abbf47efed549085abafeb27c1d1ec74"; + sha256 = "bd2ee8ad5b0201abc50d39888b83652219c51a29b73dd2a7ce35cd682604ba3f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/bs/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/bs/firefox-118.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "90bc7796ea5a98965f313fbfccf892293d1c853b40d3721be646d19ead56d730"; + sha256 = "fcc31e454f02e140511c02dc94d736c96ee268cadeb8582386b468bbce6c39b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/ca-valencia/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/ca-valencia/firefox-118.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "c2af61e1b96a963afb0990c5604b25b9b8a5d4de3cdbbfaf0f146a710be7df8c"; + sha256 = "4c5886a2be50a26c646d1c5c8e5e8d91139e967d15b8ef73b67f612cdf14b368"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/ca/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/ca/firefox-118.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "270a4cd83f9aa805348e40b77ed02858a78a72ffcbc11959e9abcaaceab8f969"; + sha256 = "be75daddc1c8e47ad47f310a287f9bb203a3bfd19558476e5c971c6169eb1866"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/cak/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/cak/firefox-118.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "ea1ca329e0ff8309d24596ae2bacbb82e347626844e66aa39eb4c24b24a59b26"; + sha256 = "a25e63e13074e3cfe85f496f63601a5b4ca079007548fe1642da1b40b2d8af14"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/cs/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/cs/firefox-118.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "9f4fa709af30679b779f2ccf5a59cb667fc6a94239f80b3503fda365b08da4c4"; + sha256 = "b3dadc40ff303dacacf7d000eb9275667eb094a0cc77dfef738038b6ae530f63"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/cy/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/cy/firefox-118.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "d9d32157acf6c3c0d32831b0f109c75bfb0e93e4805e8b84ed98fd79107254c6"; + sha256 = "2d8f8a0374681ed9ce3da91b945cab3f77d2ce4d32b6a3449e9b9f19de64ecdd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/da/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/da/firefox-118.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "b462ffdf869d7fd924708f0118c1aeeed83147d7b6c0b9e8b7e157a45cffbdd5"; + sha256 = "166fcf5df925f70e660d9163995b1265f2323bca1c15bdd5d8fa5fb46d48a231"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/de/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/de/firefox-118.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "717ea34412ec90e31706e88a798907cd0d4da2f9a45c68965e11d451644ae503"; + sha256 = "0183fb7a7649c335a3df81498949439fd1011ca062ebde5110f9524d20ede65a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/dsb/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/dsb/firefox-118.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "1cda72a69e674ac5eecedc64718555a9522695d38093a338a38a895bb8d1c40a"; + sha256 = "2073788924e4d416eb196525199fe695cf145b5d98944170994986aecef0b0ef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/el/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/el/firefox-118.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "3b36d85a9213e1286e4731be02ec0d4fd959c80aefd8f5cd462c7489a03cd728"; + sha256 = "71242455bd09e3c29df35a393387927e6a5e0012efb8a23cb9b4ef7f367cabf9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/en-CA/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/en-CA/firefox-118.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "57071ebf1838ed52fcf0406a9c92c03ad8d92710c71dcfce4aeccbcf92e69a34"; + sha256 = "d9bb5089b09df3f888424481ee0b3acc99fe35b441eac134eda2ad56645d68d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/en-GB/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/en-GB/firefox-118.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "c6bb0aabf88c16cde1c8e9cdc084b9392559992d4ac2632487f4e02e04fe645e"; + sha256 = "4ec038d3a33ae0bbd8ccf70bb61ffab50fc582b8157a4a3c4f0f700def7f9924"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/en-US/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/en-US/firefox-118.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "946bfbddcbf7f373cf597191470cca704323081d40b79240a0deffc47da485e4"; + sha256 = "c68b22022a8ed2bb2a1857b70e4b0459a0a773b6781ed0a92921da8611ef8cf6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/eo/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/eo/firefox-118.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "e7a7d1d04818c5446c415cd42da9f9861729672ddef665745386bc8cd50a75df"; + sha256 = "94cb22f3644cf7e1588a2b7c1142cf872cbdbb5bafd542adc87018cd61665f54"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/es-AR/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/es-AR/firefox-118.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "9cd56ba61d04cd7fecbf870d51c71c3ee73fc40c95f58082cf63bce39bd52eff"; + sha256 = "e4e87c33cb7fb1820fcd576f32264c8709f5a12c1e8c454afcf7768789f191f7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/es-CL/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/es-CL/firefox-118.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "4eb297d641094c32f60ffd97231276a40622cdff051a9d404392361eb1335350"; + sha256 = "93573ed0237b3e2e86118d62eb0071eb7edad2f0f77eccd311dece05612b1280"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/es-ES/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/es-ES/firefox-118.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "cd8b324ba4172d4674ef5a3dcca6578e69afd60c865620a14eb8133ca6b090a1"; + sha256 = "2468ad13eb214da8c615fe80eb2231b51a0c0dacb99913870d8906dceed180bb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/es-MX/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/es-MX/firefox-118.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "aca1e6539b860868136de21e7bca7a95294378b8322d66a02ab8799a6fc4c62a"; + sha256 = "373b189a0de60f3656d9758a6ddf84ccf7bec9a0a577bfed7f11f58faf10587f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/et/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/et/firefox-118.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "b3c1b1ec5b65326023e35841f255d7bdc01c962c7e25cf94cee4035c88b0e84a"; + sha256 = "9aa31367c675bb7ac1251b626f5b3965114df71798044ecae1669f70a8b1df33"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/eu/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/eu/firefox-118.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "88129d6df309655acb54488aa58a38a36360396aeaeba1676ac5e487820e475a"; + sha256 = "831b47482c316bf5536d8bc2c14a20cdb39a1690ccb35f19d6db2a20ae99eab9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/fa/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/fa/firefox-118.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "abb3d073811dec8f9156832cbef0a2179df8b9247052dd6cfe3aefb12a1f1298"; + sha256 = "39e8d4c1c873519ea94ccaa2392746d69a5de78d77642b9ef0ff6a9ca3164d6b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/ff/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/ff/firefox-118.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "1ae27af807445715e9886e65362949487c39e27e934898af2b951c8c3b1ad23c"; + sha256 = "18582691a78894fa07fd32238c4417e26e92ba1f0d9af6387215d56da0decdc3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/fi/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/fi/firefox-118.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "8e3822f6f36a3b29d7e8626417376c43c2fdb2eb0882a62bfb451d4e74e49d81"; + sha256 = "34bcd002090c12d7976fe28f9125ee79dc1d18c1312394907fafa10cd7c9d86e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/fr/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/fr/firefox-118.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "baf787fd2881ffddd1d13045aa0b12ebd6f26e5d7a9b15f6d0178dd16e2f9c60"; + sha256 = "af448808cca3fa43f2a99a0c1f40d55c1353e994510ddafb96abe7b04fab01a3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/fur/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/fur/firefox-118.0.1.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "2da0f32811479ef389cd7594a375cdf0438c6126e142a93b4b9f456ea6124e88"; + sha256 = "4986aa9c0040c8a9d90243c80730f2bc5f4ed774e684486dd142503b69ab163c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/fy-NL/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/fy-NL/firefox-118.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "36b7670fc2417f732e62c129dacf9cccc3fd38bcac5ebc8354b4db69ed6357bc"; + sha256 = "fa8668765d334bae5314aab82ff80cb6ff27eb59cf25c3cdedf27c3abc708956"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/ga-IE/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/ga-IE/firefox-118.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "865b29db4fda9589069b3a9b05c2d75850247cadf56faa816536383381292032"; + sha256 = "fcc26e382e7ee584d0690f32fa32bc04982b4ab37bd173ebe4a7a84878716dd8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/gd/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/gd/firefox-118.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "2233ff73ea497ec7f8eb3db41289a8a488e21fb43966d2bd6ba3ec6f9bdcdf14"; + sha256 = "d3c3fd2fa1e40f76e8c3870be3c7a45a4674ea62ccdc66429a38e7bf1c9c657c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/gl/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/gl/firefox-118.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "1c3fadb78c4b292302ccc545d9bdb7f3750517487db65e6955fb1d8a159215cb"; + sha256 = "7569c06c1ad2bc71431aeac6cc323394f500e340321d139974ee94f076a9b90f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/gn/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/gn/firefox-118.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "e0d2c1859907c0385aa89d169c8bbe931484fca77ac28c27f4735e6d98b009bc"; + sha256 = "232fe5dd8b2a4c7510f4b470e9a0347183867045781388bf823635049dddbe4f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/gu-IN/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/gu-IN/firefox-118.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "fdba80a44f6a82df974894f59fbfab1dcefccd4e710c6377152f8fc025cac06c"; + sha256 = "9732e6c4f7dd8a99200b3f611f69497100b5d931c849dd858bbf3be058d8f5a3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/he/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/he/firefox-118.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "e0d2571389cfdb8191ff2fc796bd062b60b6c56cf0a5d2897896130edba96519"; + sha256 = "fcc77690e2944b6c3123caad0b773fb033b6e98cc006c3e116dc263245fc07df"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/hi-IN/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/hi-IN/firefox-118.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "2061872a3adca56a7c8369d44bd9612507c3ca83d0b463380b520ee9c88ad63d"; + sha256 = "c9ea5476e0a0590c37314cae49cd6ce7aff8f7889d2458d66b009fb158e6f52c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/hr/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/hr/firefox-118.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "7a1bb05e721957798a72f4703faa0a4b72481d9586566e7dfbb7ed01b4d80fd7"; + sha256 = "39f2808f62451650414d35b641223f8fc2477096f4dfb9fe62beeaa59f7cb04d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/hsb/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/hsb/firefox-118.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "b53c89601cd7afffd066f0737d03d5404b97e2edf6dfdb4255abb09d4b798e6b"; + sha256 = "0b4dca99c0d1aeff5a681f87fdc9432cd28a90147a1678f13f9d9c1ac826d10e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/hu/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/hu/firefox-118.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "e5e0a738474a14a22c637291f7071019a0cc8129164383277fe2d87b48df6b1e"; + sha256 = "db2e47a87ad306294580502dd823b6645bbb49f44ff26a2e5ed3a5e919db1c86"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/hy-AM/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/hy-AM/firefox-118.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "2acf47df4c1961b2eaafbbe169dc81fe717cc7568bdd70834e59ee607ab4d499"; + sha256 = "fb85e7930f5a0f91946b0780926c7231eb514cd346e13e8b41268a8e17da3a3a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/ia/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/ia/firefox-118.0.1.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "121a35d0584208dc36cad8633751314c518fd9160d36c487f4c22f80487c6d0a"; + sha256 = "e3eb266da530e8634209209a934f1f863440fe9b094f47567f1f5619f4c1d551"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/id/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/id/firefox-118.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "a63c847bfbfdbdb54f482bc526d217a3d9e62c6f7da224bcad490558c031177d"; + sha256 = "325a7d2fe7eacebbc441c78ce92acb98f5f0f3fc579b4e3db03f5959775e3467"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/is/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/is/firefox-118.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "e87e76e9e2f4b3ae8a6b227a1411808b18a11891a8cbe835bacb0b99f0f3d348"; + sha256 = "b952c6d9f62c83bbdf949a7436bd5d8d6ad77eb2dd877eb238a3c1efde041009"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/it/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/it/firefox-118.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "3204ce295752fa450b515431ad62b1a2506b77a5e2d8118f50a8c551cdf121ad"; + sha256 = "e868200b9b8d7493348a38dd57ab10c50965951cf68ea637fa78d02e4cf70e8b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/ja/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/ja/firefox-118.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "50fc16576bbe98de00d63e8c79b0c41aaf0c013548bcd2222b911fcf1abab564"; + sha256 = "1f366580739e430e83b406e79b662c9f63be1566defffe4bed8ed705949bbc93"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/ka/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/ka/firefox-118.0.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "839e73f97a4517a39484b190bc5419bec36d2065101400a489af1f4d6f2a32ef"; + sha256 = "d44df6d15b7a78cf702eaeab89028961fb03b1af3fca353cb48dab8efea8ae2c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/kab/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/kab/firefox-118.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "c2585304255fc4550510ae3e826745bcba0e586d1eb252675f5eb51ef8ace713"; + sha256 = "fe7ca11b6fa0069d18ea3d9e273e90ad736155384c6ad64cc2e99edecc802744"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/kk/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/kk/firefox-118.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "f7ff22dc2094c824c9e2e1585f1d79236b301b0dbf862f93c0de47ade0c1df1f"; + sha256 = "570daa49f4283ac79093e3bc3dcbc31b3d23e38cb3024c43899a51e8892054cb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/km/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/km/firefox-118.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "65e6263a990c294acebcc61581ddb1e18c5068d59ded08b7d57a47eeb8c43486"; + sha256 = "e5ebe59f44d4ba25053796f4fb3ee434123ce828dc2f2615fac72a5df8815e5a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/kn/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/kn/firefox-118.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "f0d510b70df7a89b81e1eaee4aae39e958dabd59d03db569e79f33a7d56d799a"; + sha256 = "aa57e50d7f6906073b7fc3c4a0ce7d416b677d5f7b60c56cbdab3e3b319fabbe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/ko/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/ko/firefox-118.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "bc6741b5e0d7e712beea5e9a301dfaf9ff5d42c1050b43c0b354bb673242e207"; + sha256 = "78c530bc3848ce345dad35e01e1e6d8b13bc0eb1b9194a8feee25bbffb70e709"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/lij/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/lij/firefox-118.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "b5767b9b389cc68dd9b4fc8d869dc2517d312ed9d6aa9ca190360b376807d9f3"; + sha256 = "a6e1fa50349dd5892382b75dc78405d71eb452ba01d919b76c9deb962e5f6e71"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/lt/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/lt/firefox-118.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "7a0d7fb9a6969be6e4fc87aef20bea9c4c8359a9608e5a77f63bb2d4eb774182"; + sha256 = "cf488c96d2ecc211d08cfd7f83def294133c115947290ad4ce7664710f7c0d0f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/lv/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/lv/firefox-118.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "9302a16902d942ec130dbfdbe2bd147bd5155f5ff575e23023378e76625ac3f2"; + sha256 = "82a9003b38a850a8866a28bafa5ffb7c189b9115cd1feb31b4131d3b69c68b6e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/mk/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/mk/firefox-118.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "f7adf51124738ab260edfa03f12b70644b5aa813460c91dd454af8f593d7806a"; + sha256 = "85f78f5e64f6ac47652fd09cee351c283f2b310b03aa17d40c622bbb3c005f13"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/mr/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/mr/firefox-118.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "7612235ad4d915d367d009c7d160bff107d4132b92b16d8e4d4f76f449e0eb4a"; + sha256 = "75dc12353acd76365b6eef4979b4de8ff586ac81b1fc15b9cd88993d9001b654"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/ms/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/ms/firefox-118.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "7bfcf302486c52310bc6c23cdf955b114d431153e46505e5ebf3abe45f1158c6"; + sha256 = "9380131172dc52cef4babe594d86363f07bfa6efc2d0279c881119ec69a3a956"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/my/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/my/firefox-118.0.1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "3de439e7ec33d0a98cfe1f0d2b8a96a0350edadc2698474e2a7520ac9dc5e61f"; + sha256 = "57c7fb3f591ac957c5a6b656e7cb9d113090d67d102a97f3b977dacbd1cb7e8e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/nb-NO/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/nb-NO/firefox-118.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "ec1eb9cfb49e6250e3ec1e7d2918a98389315075d7c5a71184605958984d08c7"; + sha256 = "81814477be0bf7761b4b6f6d14f9083be1f96fa2bfab4a82b223abf5bbea037e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/ne-NP/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/ne-NP/firefox-118.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "bd7f0e873a22ee7c8539292b8731d27230160d2ba7a3de223cf357a468c6fa66"; + sha256 = "4f0a13a980f44823dbce017fd1a6e2b75171206f3bfb2018ef90583fd8b723d9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/nl/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/nl/firefox-118.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "37c3289c522d84a785af6afbd1af6d868506569566234a306775e996928e5552"; + sha256 = "bd99d32238c48febb7b2a5e557371111f7d1fd879a481d383a4e4b99d8011aa2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/nn-NO/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/nn-NO/firefox-118.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "4d977db9e140b846be1562807fb9f4dc72020c25e93fc64428e819c1df1610dd"; + sha256 = "fa588b2c34eda24f89651eeb65ab646daab0b9ac846ef66d04abcb84d62a2b55"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/oc/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/oc/firefox-118.0.1.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "b642f568fbc00c7c12148e415eac9cae767c043e058c8c3c416cb8b83d8236b0"; + sha256 = "ab378a1241ef3d634bbabca453de5c7ae7240ffdb79e8cd9a36ca84d1dcb4eda"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/pa-IN/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/pa-IN/firefox-118.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "aaf14c69892fec4fbbf7b93cb01dba86eb26d744eca74e61753c15e06dd32d90"; + sha256 = "aea29e94e88ac16e98d5c1c4f8eadf56ba41f5c5e2d6a7640840c69c84423535"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/pl/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/pl/firefox-118.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "8d7fb18457966adf7ee53459ba8c8faaad2806bb228d3b8acd37dae30b50161a"; + sha256 = "4a66ec55133f59d612bd8a739dd00ca4e6d5d121aad4e27d65f607b63a3a084e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/pt-BR/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/pt-BR/firefox-118.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "8a2c8ad808982f53b953f1b3fb34cd7e829b20d6fc298f7c734d0b6eb158634f"; + sha256 = "3f3c8ac821c6c10eec513a997f3267f4816ade2dd14f33cf27b31f48d996e452"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/pt-PT/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/pt-PT/firefox-118.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "73e82c20cf4302427f99c48be6ca10477a23e9e174d960b4267f4ee1d8486beb"; + sha256 = "be5c2da69f95466931ac1b796d7a40e7e5fe8c4c38f082053cdebf15ac0e3b45"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/rm/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/rm/firefox-118.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "54ace8e61c0bd0788a42ac03c665aec1e65c963c30f2d26f39cae1257a5e6ef4"; + sha256 = "abc9384641663c1a017ce3e8d05de528a7e0600c6db416390a6d3c663ddcdaf6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/ro/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/ro/firefox-118.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "37c720f62c5c66f393d8344781db87b38cb4ed13089a8bc0ec45cef3e49b9672"; + sha256 = "b5d974e6714c01eaed4952158c52a910f3115744ade8c56b2c57c6e3a0f87c6d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/ru/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/ru/firefox-118.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "554ab054c041c279a62ce29a84ca030ec7e2b19b8db7bc61e5f3e2b2dd5118bf"; + sha256 = "12dd5c92533652e66c99fcfd818b00591f7ff2113d4c537720b503a692ba7439"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/sc/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/sc/firefox-118.0.1.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "a60581fac2fe16b2692a2e5ad5b625a93690c46ece6e25902193c3c7f5741b5a"; + sha256 = "30952cdb2f4e00bbbb2502a417b13bfdb200078f26dc56ed84ea45c3bd00aa9f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/sco/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/sco/firefox-118.0.1.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "63312e044a3b619552a8fcb901952a905d7740c2622234d63802fc90111a7ade"; + sha256 = "8f7ba9ce28ae517841627a2f4594494fbae847e9ab23d0c6c17b15832f01294b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/si/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/si/firefox-118.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "92d17e48142740d7d5e7e7ede07ad36ddeb82033a716e6532a54b4456a8e84a1"; + sha256 = "c873a26e519132a8d7f6ff253deabfab0e937bb947054b0f1bca2ecdaaafcc7c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/sk/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/sk/firefox-118.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "e58b27edd6d1e92bdd3dcc4118e66e7ebd60c716b82e527796a4debfd07888f4"; + sha256 = "7d94648ea110b2b4e462ee8b8dc03f2d14d5eb1264b97dbbbc1d69a7fe171d3a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/sl/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/sl/firefox-118.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "ac0642523b0603114faf56fde13dc2ffba9c80e781c7003ef65bf95f6d19fa8b"; + sha256 = "7a0e3e6d1269934c77ba3e89eb484311e79f7c54921929bf46839c1edbd98a7b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/son/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/son/firefox-118.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "bf1260296304692ed7cc09e8bf6aea61de8c3de7c01ca14d9a7ed98fed64d43d"; + sha256 = "4b8234d05db7af3d301afe1f489876986d325849ffa043d226c923ed089fae2b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/sq/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/sq/firefox-118.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "2379151ddaa60f60864834724be03b8893482979c2a9c627e48502e0d6a7c00b"; + sha256 = "39f839067a963c3b85706b30c3ba1bd4113518e3c075d758d11669ac745d33ca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/sr/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/sr/firefox-118.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "7e49e729e5bda8973d1e59c486f435bd4a65b37800210e2f99c09fbe40632deb"; + sha256 = "626a7b1e89a9b1bb89a7a94e966647acd6df526de2bea52444bc316515a86a42"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/sv-SE/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/sv-SE/firefox-118.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "94530cf755bf8e53354e687d57bd7ccd67a4c39b2985a75e6d8756b8e9fe2ee0"; + sha256 = "e4254eb17fd1769ad253242b3d5e513e72538daa0daf784693b97c01cbca66cf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/szl/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/szl/firefox-118.0.1.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "3cf2cf3a9dfc868c830d278c54a0d4634ee1ad3d7f2727a50a9fef3e4786309f"; + sha256 = "32571063b99520a5627dba81e0ce08b35ed08d9e40d060820adaf0b55ba80d41"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/ta/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/ta/firefox-118.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "659f85d4e72aa14609e82a37df1048eb039ffb2ff5613273eed7a9b66ae29871"; + sha256 = "e5581fde1d1b8287af54306f228466096a5844a5b33947f775476e0cf2a7dc9f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/te/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/te/firefox-118.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "e9f6025eefbb54340ef73849de76acb838bd31594667d53991fec1fe6a6052f9"; + sha256 = "300d514bc36af73721bad4f8cddf272b8d82a46ff867130e31bbadca601ada2d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/tg/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/tg/firefox-118.0.1.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "9862028cad77ad49e30da59c5a436205466a86aefa3e10c685153394ffc48fc1"; + sha256 = "ee30293e209a350065132068459d6c882d045d1e611aa08096d1fb4a2b100e36"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/th/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/th/firefox-118.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "e0aedabb6452b8ab296b4c7ec4e8328108bdd73fd7dd2f34a3ba2febcccb6ff2"; + sha256 = "95647fb5a8d8b2321113398ae2b5ad516be1228751272f356a49abe2206a687b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/tl/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/tl/firefox-118.0.1.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "e4abf5b13f05d3d6f5373fe178cdf53bc420a277549d5ab8d920ba541474ef1d"; + sha256 = "52d9033dd208f11afce6fb77d16bbd705c28b1b893b0c1ceee526e3ba4467de6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/tr/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/tr/firefox-118.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "80833c233a29bc6064b05f6ae0dd3484814ce8eac9af5b49e19313d47c965454"; + sha256 = "3c29ea78405aea803b3093bdbe7d4389dd73ebd9665fa9301a76a289c85bb59a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/trs/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/trs/firefox-118.0.1.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "8f71e5b5660e5fc70728fb4c14d3bd4626c5198964eadd5866604367c444c183"; + sha256 = "cda51b1fc45f59a0e9f3c51ddea94b030d180040b02f26a13baf37601e0bd961"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/uk/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/uk/firefox-118.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "1f4b2710661432b2dcc40b9489c4609f1e6b60147d09e221e74558e2fa595c1f"; + sha256 = "2f857d43702fc3af4649e7c22e324b8e7547c66c97d5013d84ee2ea8594e00ce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/ur/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/ur/firefox-118.0.1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "a6810d749716efe089b5ae67e52ff51e4368213648e64716b91da7806ac60e0c"; + sha256 = "4f0bd303ccadb1c8db47f5298642d6fa6f96598f7ad409dc273ae645fc739aad"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/uz/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/uz/firefox-118.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "b02d490c4ad4d3c9148ab9fe9cc28b6484d540832a7850ff049d1f2748bf0d3d"; + sha256 = "c419e83710a5d575cf56644a4cbe214b60cf24ea6dac70a6459a3bf8fbacc7c0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/vi/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/vi/firefox-118.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "65a7e90b36fa8b96972869c6e83c911cebb20b9de9ac91dadbe9048b0e5e8d5a"; + sha256 = "e00c7460e9e32f24ac1a2d968f6f20d647a1ab13188524d3bd39654172f2e3e3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/xh/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/xh/firefox-118.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "ab05ae65b098462761b67409fbcb92cb1c480defc70b9771fe6de0be3ea0a2e5"; + sha256 = "75d96c526ae353b5b5a63cb14d71ad7fd84256932945766afb3e826b7ee73edc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/zh-CN/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/zh-CN/firefox-118.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "7fc5a43500f9b190937f72f3d0203489a43b805762c02d48ac0844975f03cabb"; + sha256 = "37b687221c5d2d52dc6b225debc14c6cc842ce91d7e1ad87f8ad56c6ae7801c2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0.1/linux-i686/zh-TW/firefox-117.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/zh-TW/firefox-118.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "1a4c43ff0c176ede40b17275d2a5eea49e58711d228d1a34c3a15695786e23c1"; + sha256 = "95df34bcb9875d915690043f6dbe71d80a6acba5fb4b0ad5cae7143ca9ef72df"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 2d05c4699348a..d999d64da40eb 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -3,10 +3,10 @@ { firefox = buildMozillaMach rec { pname = "firefox"; - version = "117.0.1"; + version = "118.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "1583b0ad3b3b17c59bfbfb3e416074766327d0b926ef4f6c6b1e3b2d7cf6a18dec592b7d17fab9493ba1506f3540a02277096d28616dd29b6e7b9e93905f2071"; + sha512 = "b1efa1afea70434dc2a18d335bb8b526883cde200f1503b8c5fd2e7db8285e6a999cfa3aac354ea1c15a91d13a46d68db37023235314240b59eb8f55e01554ad"; }; meta = { @@ -30,11 +30,11 @@ firefox-beta = buildMozillaMach rec { pname = "firefox-beta"; - version = "118.0b7"; + version = "119.0b4"; applicationName = "Mozilla Firefox Beta"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "17dc6dbfe1c3085a7c85d53d7980660471253e64d081a01e59d0273b75c4000476bad31fe155c976a18c561c09c21ae9a95775c81bb99c5a53bea89f79b07cfb"; + sha512 = "7c067d759602608e527d032f7a3772df827a5b5c4270992c05abda726fcd665f4f2c5380e684623ed108364ace4afaed8b5959f75a4b0540edd5ae30422b0e54"; }; meta = { @@ -58,12 +58,12 @@ firefox-devedition = (buildMozillaMach rec { pname = "firefox-devedition"; - version = "118.0b7"; + version = "119.0b4"; applicationName = "Mozilla Firefox Developer Edition"; branding = "browser/branding/aurora"; src = fetchurl { url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "636df06a41bba9909c50a1c433a6d14d42573cfa8ba28e57b87ed709fb06d81c1fcf4a24a8e1c794b6b7eb894a72e188d5e91bb46ce589a3438c8b75acb6e812"; + sha512 = "ded00bc1e090bdca5f32160d980cec47590bb952a6c7f1dc8f4df30fa452cad8c47a3c6d20cf3e8345fd5811777b475354d71d704c866fb49396a83c8a795bcb"; }; meta = { @@ -90,11 +90,11 @@ firefox-esr-115 = buildMozillaMach rec { pname = "firefox-esr-115"; - version = "115.2.1esr"; + version = "115.3.1esr"; applicationName = "Mozilla Firefox ESR"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "5f9ff96996e3c482fa4d2e2861fdf14d2154bf0277d412bf9c9435204c7e2e2539ce7ef0891d8dafc74d5a12650a5ccd33d79547aa1bbb2c2a0972aaeb755edf"; + sha512 = "65cb6fc46bba03eed742bd67f8e36b63b19f2ad7b85d2f503595704a4e88f554758a1e66ba548c8efe97a76322fb2514db72e6ff4bb2992d1aaa86edc3af85f1"; }; meta = { diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index e909b15f77ae6..123d597031cdc 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -85,7 +85,8 @@ let ++ lib.optional jackSupport libjack2 ++ lib.optional smartcardSupport opensc ++ lib.optional (cfg.speechSynthesisSupport or false) speechd - ++ pkcs11Modules; + ++ pkcs11Modules + ++ gtk_modules; gtk_modules = [ libcanberra-gtk3 ]; launcherName = "${applicationName}${nameSuffix}"; @@ -362,7 +363,7 @@ let extraPoliciesFiles=(${builtins.toString extraPoliciesFiles}) for extraPoliciesFile in "''${extraPoliciesFiles[@]}"; do - jq -s '.[0] + .[1]' "$POL_PATH" $extraPoliciesFile > .tmp.json + jq -s '.[0] * .[1]' "$POL_PATH" $extraPoliciesFile > .tmp.json mv .tmp.json "$POL_PATH" done diff --git a/pkgs/applications/networking/browsers/librewolf/librewolf.nix b/pkgs/applications/networking/browsers/librewolf/librewolf.nix index baa76488f661a..f6689f6ae87db 100644 --- a/pkgs/applications/networking/browsers/librewolf/librewolf.nix +++ b/pkgs/applications/networking/browsers/librewolf/librewolf.nix @@ -29,9 +29,9 @@ rec { sed -i '/MOZ_NORMANDY/ s/True/False/' browser/moz.configure ''; - extraPrefsFiles = [ "${source}/submodules/settings/librewolf.cfg" ]; + extraPrefsFiles = [ "${src.settings}/librewolf.cfg" ]; - extraPoliciesFiles = [ "${source}/submodules/settings/distribution/policies.json" ]; + extraPoliciesFiles = [ "${src.settings}/distribution/policies.json" ]; extraPassthru = { librewolf = { inherit src extraPatches; }; diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index c9ecd3de9219a..e4516cb42428d 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,15 @@ { - "packageVersion": "116.0.3-1", + "packageVersion": "118.0.1-1", "source": { - "rev": "116.0.3-1", - "sha256": "19l5nny96p89xm8c9f5m1435sglshn7izmjnj338c8qh217zxiyq" + "rev": "118.0.1-1", + "sha256": "1wdqiif1la97w9b3xsz20xrcg2d1c0j13pdfcj7z23jz8846iqk4" + }, + "settings": { + "rev": "9c862f06f970d69e00c1035e0d4774fb44fd84a6", + "sha256": "0ay58wrhfn0b56748phpn0ahz11ls9y8d2fd1z4zrj6dv398vlmb" }, "firefox": { - "version": "116.0.3", - "sha512": "194c50e9ba5a918c37fbef8cd72ffb98e5e9f51955d8172b6666a758b5f20777ca0a7f79dff0328305fb6dafefb102ab002e326f47d0965a4dc6d3e9287c42b9" + "version": "118.0.1", + "sha512": "b1efa1afea70434dc2a18d335bb8b526883cde200f1503b8c5fd2e7db8285e6a999cfa3aac354ea1c15a91d13a46d68db37023235314240b59eb8f55e01554ad" } } diff --git a/pkgs/applications/networking/browsers/librewolf/src.nix b/pkgs/applications/networking/browsers/librewolf/src.nix index a2100ac2ab8bc..25a6e46d22770 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.nix +++ b/pkgs/applications/networking/browsers/librewolf/src.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, fetchFromGitLab }: +{ lib, fetchurl, fetchFromGitLab, fetchFromGitea }: let src = lib.importJSON ./src.json; in { @@ -9,6 +9,12 @@ in fetchSubmodules = true; inherit (src.source) rev sha256; }; + settings = fetchFromGitea { + domain = "codeberg.org"; + owner = "librewolf"; + repo = "settings"; + inherit (src.settings) rev sha256; + }; firefox = fetchurl { url = "mirror://mozilla/firefox/releases/${src.firefox.version}/source/firefox-${src.firefox.version}.source.tar.xz"; diff --git a/pkgs/applications/networking/browsers/librewolf/update.nix b/pkgs/applications/networking/browsers/librewolf/update.nix index b8bc64afafe07..2cd36786c755e 100644 --- a/pkgs/applications/networking/browsers/librewolf/update.nix +++ b/pkgs/applications/networking/browsers/librewolf/update.nix @@ -57,9 +57,18 @@ writeScript "update-librewolf" '' ffHash=$(grep '\.source\.tar\.xz$' "$HOME"/shasums | grep '^[^ ]*' -o) echo "ffHash=$ffHash" + # upstream does not specify settings rev, so just get the latest. see https://github.com/NixOS/nixpkgs/issues/252276 + settingsRev=$(curl 'https://codeberg.org/api/v1/repos/librewolf/settings/commits?sha=master&limit=1' | jq -r .[0].sha) + echo "settingsRev=$settingsRev" + repoUrl=https://codeberg.org/librewolf/settings + nix-prefetch-git $repoUrl --quiet --rev $settingsRev > $prefetchOut + settingsSha256=$(jq -r .sha256 < $prefetchOut) + jq ".source.rev = \"$latestTag\"" $srcJson | sponge $srcJson jq ".source.sha256 = \"$srcHash\"" $srcJson | sponge $srcJson jq ".firefox.version = \"$ffVersion\"" $srcJson | sponge $srcJson jq ".firefox.sha512 = \"$ffHash\"" $srcJson | sponge $srcJson jq ".packageVersion = \"$lwVersion\"" $srcJson | sponge $srcJson + jq ".settings.rev = \"$settingsRev\"" $srcJson | sponge $srcJson + jq ".settings.sha256 = \"$settingsSha256\"" $srcJson | sponge $srcJson '' diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix index e2d6854295a5f..0a41ad0feb262 100644 --- a/pkgs/applications/networking/browsers/lynx/default.nix +++ b/pkgs/applications/networking/browsers/lynx/default.nix @@ -58,6 +58,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A text-mode web browser"; homepage = "https://lynx.invisible-island.net/"; + mainProgram = "lynx"; maintainers = with maintainers; [ ]; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/pkgs/applications/networking/browsers/microsoft-edge/browser.nix b/pkgs/applications/networking/browsers/microsoft-edge/browser.nix index 7f72a42ffe0d0..d6898e9d86c28 100644 --- a/pkgs/applications/networking/browsers/microsoft-edge/browser.nix +++ b/pkgs/applications/networking/browsers/microsoft-edge/browser.nix @@ -52,7 +52,8 @@ let in stdenv.mkDerivation rec { - name="${baseName}-${channel}-${version}"; + pname="${baseName}-${channel}"; + inherit version; src = fetchurl { url = "https://packages.microsoft.com/repos/edge/pool/main/m/${baseName}-${channel}/${baseName}-${channel}_${version}-${revision}_amd64.deb"; @@ -181,12 +182,14 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.pname}-${gtk3.version}" ''; + passthru.updateScript = ./update.py; + meta = with lib; { homepage = "https://www.microsoft.com/en-us/edge"; description = "The web browser from Microsoft"; license = licenses.unfree; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ zanculmarktum kuwii ]; + maintainers = with maintainers; [ zanculmarktum kuwii rhysmdnz ]; }; } diff --git a/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/pkgs/applications/networking/browsers/microsoft-edge/default.nix index 9ef09ebe13d44..821348794bbe3 100644 --- a/pkgs/applications/networking/browsers/microsoft-edge/default.nix +++ b/pkgs/applications/networking/browsers/microsoft-edge/default.nix @@ -1,20 +1,20 @@ { stable = import ./browser.nix { channel = "stable"; - version = "116.0.1938.76"; + version = "117.0.2045.47"; revision = "1"; - sha256 = "sha256-zSnNgnpsxR2sRgoG+Vi2K3caaVUPLiJJ9d+EjjIzu7Y="; + sha256 = "sha256-h4iw+H8f62JEih1tWTpjxNC9+wu3hHQOM2VJid1kHNQ="; }; beta = import ./browser.nix { channel = "beta"; - version = "117.0.2045.21"; + version = "118.0.2088.17"; revision = "1"; - sha256 = "sha256-vsZy9WGlT4Yqf/tHmsgZV8Pj7D0nmhmziKYGrRj7Bi0="; + sha256 = "sha256-3Z37M2ZQRJ5uA7NcinMlF1XEsYVv9A+ppPZZf34ye6Q="; }; dev = import ./browser.nix { channel = "dev"; - version = "118.0.2060.1"; + version = "119.0.2116.0"; revision = "1"; - sha256 = "sha256-OKjCmULPjYuoumqAqivyCFzHSR1IOutEIWTqXtDgMhM="; + sha256 = "sha256-raLRFSHZyHaxKi6EG62VIbcW29HTjTnBFw7IJFVbm5I="; }; } diff --git a/pkgs/applications/networking/browsers/microsoft-edge/update.py b/pkgs/applications/networking/browsers/microsoft-edge/update.py index 0e9bfa8fe89af..f32b669f0360d 100755 --- a/pkgs/applications/networking/browsers/microsoft-edge/update.py +++ b/pkgs/applications/networking/browsers/microsoft-edge/update.py @@ -8,6 +8,9 @@ from urllib import request from collections import OrderedDict from debian.deb822 import Packages from debian.debian_support import Version +from os.path import abspath, dirname + +PIN_PATH = dirname(abspath(__file__)) + '/default.nix' def packages(): packages_url = 'https://packages.microsoft.com/repos/edge/dists/stable/main/binary-amd64/Packages' @@ -60,7 +63,7 @@ def write_expression(): latest = latest_packages(packages()) channel_strs = nix_expressions(latest) nix_expr = '{\n' + textwrap.indent('\n'.join(channel_strs), ' ') + '\n}\n' - with open('default.nix', 'w') as f: + with open(PIN_PATH, 'w') as f: f.write(nix_expr) diff --git a/pkgs/applications/networking/browsers/mullvad-browser/default.nix b/pkgs/applications/networking/browsers/mullvad-browser/default.nix index 5b619bd6452cf..3b3f292215372 100644 --- a/pkgs/applications/networking/browsers/mullvad-browser/default.nix +++ b/pkgs/applications/networking/browsers/mullvad-browser/default.nix @@ -78,15 +78,19 @@ let ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "12.5.4"; + version = "12.5.6"; sources = { x86_64-linux = fetchurl { urls = [ "https://cdn.mullvad.net/browser/${version}/mullvad-browser-linux64-${version}_ALL.tar.xz" "https://github.com/mullvad/mullvad-browser/releases/download/${version}/mullvad-browser-linux64-${version}_ALL.tar.xz" + "https://dist.torproject.org/mullvadbrowser/${version}/mullvad-browser-linux64-${version}_ALL.tar.xz" + "https://archive.torproject.org/tor-package-archive/mullvadbrowser/${version}/mullvad-browser-linux64-${version}_ALL.tar.xz" + "https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux64-${version}_ALL.tar.xz" + "https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux64-${version}_ALL.tar.xz" ]; - hash = "sha256-xjCsCg6XsnXAiNw6frgJVZRV9UBZA2EAcuHa2Bjq/ro="; + hash = "sha256-e7gRkRMipnEG1hMlhs25LUJ5KDGt8qP3wpbSG2K2aK8="; }; }; @@ -225,7 +229,7 @@ stdenv.mkDerivation rec { passthru = { inherit sources; - updateScript = callPackage ../tor-browser-bundle-bin/update.nix { + updateScript = callPackage ../tor-browser/update.nix { inherit pname version meta; baseUrl = "https://cdn.mullvad.net/browser/"; prefix = "mullvad-browser-"; diff --git a/pkgs/applications/networking/browsers/offpunk/default.nix b/pkgs/applications/networking/browsers/offpunk/default.nix index 7adb6a1130f53..e1b4fdcfa2056 100644 --- a/pkgs/applications/networking/browsers/offpunk/default.nix +++ b/pkgs/applications/networking/browsers/offpunk/default.nix @@ -32,7 +32,7 @@ in python3Packages.buildPythonPackage rec { pname = "offpunk"; version = "1.10"; - format = "flit"; + format = "pyproject"; disabled = python3Packages.pythonOlder "3.7"; @@ -43,7 +43,7 @@ python3Packages.buildPythonPackage rec { hash = "sha256-+jGKPPnKZHn+l6VAwuae6kICwR7ymkYJjsM2OHQAEmU="; }; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ python3Packages.flit-core installShellFiles ]; propagatedBuildInputs = otherDependencies ++ pythonDependencies; postInstall = '' diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix index ece75ad872572..a97d2b6ee81af 100644 --- a/pkgs/applications/networking/browsers/palemoon/bin.nix +++ b/pkgs/applications/networking/browsers/palemoon/bin.nix @@ -17,19 +17,19 @@ , palemoon-bin }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "palemoon-bin"; - version = "32.3.1"; + version = "32.4.0.1"; src = fetchzip { urls = [ - "https://rm-eu.palemoon.org/release/palemoon-${version}.linux-x86_64-gtk${if withGTK3 then "3" else "2"}.tar.xz" - "https://rm-us.palemoon.org/release/palemoon-${version}.linux-x86_64-gtk${if withGTK3 then "3" else "2"}.tar.xz" + "https://rm-eu.palemoon.org/release/palemoon-${finalAttrs.version}.linux-x86_64-gtk${if withGTK3 then "3" else "2"}.tar.xz" + "https://rm-us.palemoon.org/release/palemoon-${finalAttrs.version}.linux-x86_64-gtk${if withGTK3 then "3" else "2"}.tar.xz" ]; hash = if withGTK3 then - "sha256-1JYaxxkqgg/gLdZ+uGDB5BI0NKjHO4huk0b/M9QFuII=" + "sha256-kGt3pIgCjVeSD6UXRvj5w9opWrMx3q3B/Y0S55kKS08=" else - "sha256-p/Lid6Uv3XTEg+43Gke5VLILhzENHoBP6XjGVHy7wCY="; + "sha256-kNvUC/ir7TKjvKXYFoEDOPAY75CEgeixmEV1tuB/WIM="; }; preferLocalBuild = true; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ]; desktopItems = [(makeDesktopItem rec { - name = pname; + name = "palemoon-bin"; desktopName = "Pale Moon Web Browser"; comment = "Browse the World Wide Web"; keywords = [ @@ -164,6 +164,7 @@ stdenv.mkDerivation rec { longDescription = '' Pale Moon is an Open Source, Goanna-based web browser focusing on efficiency and customization. + Pale Moon offers you a browsing experience in a browser completely built from its own, independently developed source that has been forked off from Firefox/Mozilla code a number of years ago, with carefully selected @@ -186,4 +187,4 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; hydraPlatforms = []; }; -} +}) diff --git a/pkgs/applications/networking/browsers/polypane/default.nix b/pkgs/applications/networking/browsers/polypane/default.nix index 4426eabe60e5b..21dde7700b222 100644 --- a/pkgs/applications/networking/browsers/polypane/default.nix +++ b/pkgs/applications/networking/browsers/polypane/default.nix @@ -2,12 +2,12 @@ let pname = "polypane"; - version = "14.1.0"; + version = "15.0.0"; src = fetchurl { url = "https://github.com/firstversionist/${pname}/releases/download/v${version}/${pname}-${version}.AppImage"; name = "${pname}-${version}.AppImage"; - sha256 = "sha256-UJ4Ccz9PjpmZqJGbJjw3lyqR3VCl9xf3F6WUoBaUEVg="; + sha256 = "sha256-O0VWgx6FKulELZuJgMwFgGSo+EaCqb9dgneF2XFnq7U="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser/default.nix index 64f0a431ea24d..7de6e40de233b 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser/default.nix @@ -57,7 +57,7 @@ }: lib.warnIf (useHardenedMalloc != null) - "tor-browser-bundle-bin: useHardenedMalloc is deprecated and enabling it can cause issues" + "tor-browser: useHardenedMalloc is deprecated and enabling it can cause issues" (let libPath = lib.makeLibraryPath libPkgs; @@ -92,7 +92,7 @@ lib.warnIf (useHardenedMalloc != null) fteLibPath = lib.makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "12.5.4"; + version = "12.5.6"; lang = "ALL"; @@ -104,7 +104,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - hash = "sha256-AIwqIz8QG7Fq3Vvd22QTNFH1fnZgtH25qUaECX50QCQ="; + hash = "sha256-lZlGhyGDT9Vxox3ghfFSIZd3sazNyL23k0UtipaIGR8="; }; i686-linux = fetchurl { @@ -114,7 +114,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - hash = "sha256-s8UReyurIKlxG0bT0ecGUcXMTTHyYKy/AcygTE6ujqo="; + hash = "sha256-3Z3S6P3wkZeC/lhgO7XDdDDQ6cpyOX+e3SBuh47aMl8="; }; }; @@ -132,7 +132,7 @@ lib.warnIf (useHardenedMalloc != null) }); in stdenv.mkDerivation rec { - pname = "tor-browser-bundle-bin"; + pname = "tor-browser"; inherit version; src = sources.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}"); @@ -459,21 +459,11 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "Tor Browser Bundle built by torproject.org"; - longDescription = '' - Tor Browser Bundle is a bundle of the Tor daemon, Tor Browser (heavily patched version of - Firefox), several essential extensions for Tor Browser, and some tools that glue those - together with a convenient UI. - - `tor-browser-bundle-bin` package is the official version built by torproject.org patched with - `patchelf` to work under nix and with bundled scripts adapted to the read-only nature of - the `/nix/store`. - ''; + description = "Privacy-focused browser routing traffic through the Tor network"; homepage = "https://www.torproject.org/"; changelog = "https://gitweb.torproject.org/builders/tor-browser-build.git/plain/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt?h=maint-${version}"; platforms = attrNames sources; maintainers = with maintainers; [ felschr panicgh joachifm hax404 ]; - mainProgram = "tor-browser"; # MPL2.0+, GPL+, &c. While it's not entirely clear whether # the compound is "libre" in a strict sense (some components place certain # restrictions on redistribution), it's free enough for our purposes. diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/update.nix b/pkgs/applications/networking/browsers/tor-browser/update.nix index f169bd3c4efa1..f169bd3c4efa1 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/update.nix +++ b/pkgs/applications/networking/browsers/tor-browser/update.nix diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 79e439a6a0583..a956dee90d1a6 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -16,6 +16,7 @@ , enableWidevine ? false, widevine-cdm ? null , commandLineArgs ? "" , pulseSupport ? stdenv.isLinux, libpulseaudio +, kerberosSupport ? true, libkrb5 }: let @@ -23,7 +24,7 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "6.2.3105.45"; + version = "6.2.3105.54"; suffix = { aarch64-linux = "arm64"; @@ -33,8 +34,8 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb"; hash = { - aarch64-linux = "sha256-AumYFbCa5+Ou89e6MDQZFlyCu30IvX8jbz+deRojzOQ="; - x86_64-linux = "sha256-9U7vPvmCbwgkYGIZblKghuqClhOfGSEQqTVkaDgc0Ms="; + aarch64-linux = "sha256-QqdCnwSrqJAEj++xcr3cOkKSbZIFkyvMutxsLNR/Moc="; + x86_64-linux = "sha256-z5/l94MFhpHRLvbUdSwFSSt3n21mPZJzanYugXecLFk="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; @@ -57,7 +58,8 @@ in stdenv.mkDerivation rec { libdrm mesa vulkan-loader wayland pipewire ] ++ lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs - ++ lib.optional pulseSupport libpulseaudio; + ++ lib.optional pulseSupport libpulseaudio + ++ lib.optional kerberosSupport libkrb5; libPath = lib.makeLibraryPath buildInputs + lib.optionalString (stdenv.is64bit) diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index e4a064e790594..5d2ea47b34c65 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -95,7 +95,7 @@ in stdenv.mkDerivation rec { homepage = "https://w3m.sourceforge.net/"; changelog = "https://github.com/tats/w3m/blob/v${version}/ChangeLog"; description = "A text-mode web browser"; - maintainers = with maintainers; [ cstrahan anthonyroussel ]; + maintainers = with maintainers; [ anthonyroussel ]; platforms = platforms.unix; license = licenses.mit; mainProgram = "w3m"; diff --git a/pkgs/applications/networking/calls/default.nix b/pkgs/applications/networking/calls/default.nix index 250355aa42843..e062a3d151518 100644 --- a/pkgs/applications/networking/calls/default.nix +++ b/pkgs/applications/networking/calls/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { pname = "calls"; - version = "43.3"; + version = "44.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { repo = pname; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-GNICAk9SPrLc+zm3tHVwkQdiS20j4MVktGIbNWEEMHs="; + hash = "sha256-mdv/yDUi6tzYc3C7dtmkAWtk4IqzHvOZVO2CA3TP9TE="; }; outputs = [ "out" "devdoc" ]; diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix index e1afef0794fa3..269f97ac3948d 100644 --- a/pkgs/applications/networking/cluster/arkade/default.nix +++ b/pkgs/applications/networking/cluster/arkade/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "arkade"; - version = "0.10.0"; + version = "0.10.10"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - hash = "sha256-XjJt2bLGBl6T3nrTdwr8lNKW0cBZH+gYFAy6lkNtwgw="; + hash = "sha256-Lu/itKaF7mSG/jwg2sA4wNkbzBWdDY4pfwHB0elI1Bc="; }; CGO_ENABLED = 0; diff --git a/pkgs/applications/networking/cluster/civo/default.nix b/pkgs/applications/networking/cluster/civo/default.nix index ac6cea0fb2baa..be63630ab7174 100644 --- a/pkgs/applications/networking/cluster/civo/default.nix +++ b/pkgs/applications/networking/cluster/civo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "civo"; - version = "1.0.65"; + version = "1.0.66"; src = fetchFromGitHub { owner = "civo"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-zuWKU2bZM0zdEupvWi1CV3S7urEhm4dc+sFYoQmljCk="; + sha256 = "sha256-17dRFRG3HpYJvqE4+SFI6a6nP6umkKc61rwQu4FiG6Q="; }; - vendorHash = "sha256-Tym9Xu+oECUm78nIAyDwYYpR88wNxT4bmoy7iUwUQTU="; + vendorHash = "sha256-AvAS3S7bepaTFPelE+Bj5/UuQIXEDvSAtDuFaPRC9sk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix index ee7411b118bec..0371e8c813bdf 100644 --- a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix +++ b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "cloudfoundry-cli"; - version = "8.7.2"; + version = "8.7.3"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-6Ce9fmL0wZXCCRbJMqSD6xZQfDZl6EsiPpmfvYFT2tA="; + sha256 = "sha256-2ABsxoGRRUfa09tVPmn1IXDR2IXIewg/b/fmQnaKLoY="; }; - vendorHash = "sha256-5/aGyJ+SksnjuKsWVyz60OsAcz3z/BP+wCwlKEmxHb4="; + vendorHash = "sha256-k2NI9zyeQM4PJo2wE3WkG5sntJGISwmz4xqQVChu8WQ="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/clusterctl/default.nix b/pkgs/applications/networking/cluster/clusterctl/default.nix index 2f8e7cf0a7c48..af27ec6c93025 100644 --- a/pkgs/applications/networking/cluster/clusterctl/default.nix +++ b/pkgs/applications/networking/cluster/clusterctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - hash = "sha256-yzk2zIk3igi7xlOi8RlGsthxy/M051SsiLi2v0gMWYk="; + hash = "sha256-mbsmsNwUDjBqEbPuYFWHZPBfqDa92PnpiuD10mLhiEQ="; }; vendorHash = "sha256-FUimSBMZI4BDtNKnlzmxe2HiL7MGIUh7SFC2dwWYT3I="; diff --git a/pkgs/applications/networking/cluster/cmctl/default.nix b/pkgs/applications/networking/cluster/cmctl/default.nix index ac5273242472f..358c60ea28057 100644 --- a/pkgs/applications/networking/cluster/cmctl/default.nix +++ b/pkgs/applications/networking/cluster/cmctl/default.nix @@ -1,39 +1,52 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +, installShellFiles +, nix-update-script +}: buildGoModule rec { pname = "cmctl"; - version = "1.11.2"; + version = "1.13.0"; src = fetchFromGitHub { owner = "cert-manager"; repo = "cert-manager"; - rev = "4767427a40e0e193c976fd6bc228f50de8950572"; - sha256 = "128s5vd4hp5mr0rnb21grzmijzx0ibpv71as36dcgw7z4v3gq7lx"; + rev = "v${version}"; + hash = "sha256-o51CIwZeBq3XrNvu6n6dVCsmXH2pU7l3igw61KjI0cw="; }; - vendorHash = "sha256-+r0QpD97r6dokUr07Qjb9kvoK+oz2rvml0cIebtYuHg="; + sourceRoot = "${src.name}/cmd/ctl"; - subPackages = [ "cmd/ctl" ]; + vendorHash = "sha256-szDFQ5zxZ4IUMaIe/eyQAouomR6kpQXn/LZ3MEBbx0Y="; ldflags = [ - "-s" "-w" + "-s" + "-w" "-X github.com/cert-manager/cert-manager/cmd/ctl/pkg/build.name=cmctl" "-X github.com/cert-manager/cert-manager/cmd/ctl/pkg/build/commands.registerCompletion=true" "-X github.com/cert-manager/cert-manager/pkg/util.AppVersion=v${version}" "-X github.com/cert-manager/cert-manager/pkg/util.AppGitCommit=${src.rev}" ]; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + installShellFiles + ]; + + # Trusted by this computer: no: x509: “cert-manager” certificate is not trusted + doCheck = !stdenv.isDarwin; postInstall = '' mv $out/bin/ctl $out/bin/cmctl + '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd cmctl \ --bash <($out/bin/cmctl completion bash) \ --fish <($out/bin/cmctl completion fish) \ --zsh <($out/bin/cmctl completion zsh) ''; - passthru.updateScript = ./update.sh; + passthru.updateScript = nix-update-script { }; meta = with lib; { description = "A CLI tool for managing cert-manager service on Kubernetes clusters"; diff --git a/pkgs/applications/networking/cluster/cmctl/update.sh b/pkgs/applications/networking/cluster/cmctl/update.sh deleted file mode 100755 index 16a20edb577b3..0000000000000 --- a/pkgs/applications/networking/cluster/cmctl/update.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnugrep gnused jq - -set -x -eu -o pipefail - -NIXPKGS_PATH="$(git rev-parse --show-toplevel)" -CMCTL_PATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" - -OLD_VERSION="$(nix-instantiate --eval -E "with import $NIXPKGS_PATH {}; cmctl.version or (builtins.parseDrvName cmctl.name).version" | tr -d '"')" -LATEST_TAG="$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/cert-manager/cert-manager/releases" | jq '.[].tag_name' --raw-output | sed '/-/d' | sort --version-sort -r | head -n 1)" -LATEST_VERSION="${LATEST_TAG:1}" - -if [ ! "$OLD_VERSION" = "$LATEST_VERSION" ]; then - SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/cert-manager/cert-manager/archive/refs/tags/${LATEST_TAG}.tar.gz) - TAG_SHA=$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/cert-manager/cert-manager/git/ref/tags/${LATEST_TAG}" | jq -r '.object.sha') - TAG_COMMIT_SHA=$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/cert-manager/cert-manager/git/tags/${TAG_SHA}" | jq '.object.sha' --raw-output) - - setKV () { - sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" "${CMCTL_PATH}/default.nix" - } - - setKV version ${LATEST_VERSION} - setKV sha256 "${SHA256}" - setKV rev ${TAG_COMMIT_SHA} - setKV vendorSha256 "0000000000000000000000000000000000000000000000000000" # The same as lib.fakeSha256 - - set +e - VENDOR_SHA256=$(nix-build --no-out-link -A cmctl $NIXPKGS_PATH 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g') - set -e - - if [ -n "${VENDOR_SHA256:-}" ]; then - setKV vendorSha256 ${VENDOR_SHA256} - else - echo "Update failed. VENDOR_SHA256 is empty." - exit 1 - fi - - echo "updated cmctl to $LATEST_VERSION, please commit changes." -else - echo "cmctl is already up-to-date at $OLD_VERSION" -fi diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix index ce6aece378031..8421c3157e5e7 100644 --- a/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/pkgs/applications/networking/cluster/cni/plugins.nix @@ -48,6 +48,6 @@ buildGoModule rec { homepage = "https://www.cni.dev/plugins/"; license = licenses.asl20; platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan ] ++ teams.podman.members; + maintainers = with maintainers; [ ] ++ teams.podman.members; }; } diff --git a/pkgs/applications/networking/cluster/dnsname-cni/default.nix b/pkgs/applications/networking/cluster/dnsname-cni/default.nix index 3a543f40dd49c..3b6edd5752975 100644 --- a/pkgs/applications/networking/cluster/dnsname-cni/default.nix +++ b/pkgs/applications/networking/cluster/dnsname-cni/default.nix @@ -22,7 +22,7 @@ buildGoModule rec { wrapProgram $out/bin/dnsname --prefix PATH : ${lib.makeBinPath [ dnsmasq ]} ''; - vendorSha256 = null; + vendorHash = null; subPackages = [ "plugins/meta/dnsname" ]; doCheck = false; # NOTE: requires root privileges diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 500bd2a752b9a..a45b86ba55d2a 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,9 +1,9 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles, stdenv }: let - version = "2.1.0"; - sha256 = "08g9awlgij8privpmzmrg63aygcjqmycr981ak0lkbx5chynlnmn"; - manifestsSha256 = "06iqmc5rg9l7zwcyg66fvy6h1g4bg1mr496n17piapjiqiv3j3q4"; + version = "2.1.1"; + sha256 = "11g7zkzx28xi81qk00frpxn9qsp4m0pr7m1zm61p2in3i9qxrqjn"; + manifestsSha256 = "1zpw9yh5j9ymhj771ccr7a3zm37h3igcrl0xnzyzzrkg754wdv9s"; manifests = fetchzip { url = @@ -23,7 +23,7 @@ in buildGoModule rec { inherit sha256; }; - vendorHash = "sha256-RVHDiJS1MhskVorS/SNZlXWP/oc8OXjUjApeanBkIWQ="; + vendorHash = "sha256-CQt8GbUUUOLUExysZK2H6YZzMx+pXEroGj30BXAhPRY="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests diff --git a/pkgs/applications/networking/cluster/fluxcd/update.sh b/pkgs/applications/networking/cluster/fluxcd/update.sh index 8c80ef9fda344..f252d587daaf3 100755 --- a/pkgs/applications/networking/cluster/fluxcd/update.sh +++ b/pkgs/applications/networking/cluster/fluxcd/update.sh @@ -21,16 +21,17 @@ if [ ! "$OLD_VERSION" = "$LATEST_VERSION" ]; then setKV version ${LATEST_VERSION} setKV sha256 ${SHA256} setKV manifestsSha256 ${SPEC_SHA256} - setKV vendorSha256 "0000000000000000000000000000000000000000000000000000" # The same as lib.fakeSha256 + setKV vendorHash "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" # The same as lib.fakeHash set +e - VENDOR_SHA256=$(nix-build --no-out-link -A fluxcd $NIXPKGS_PATH 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g') + VENDOR_HASH=$(nix-build --no-out-link -A fluxcd $NIXPKGS_PATH 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g') + VENDOR_HASH=$(nix hash to-sri --type sha256 $VENDOR_HASH) set -e - if [ -n "${VENDOR_SHA256:-}" ]; then - setKV vendorSha256 ${VENDOR_SHA256} + if [ -n "${VENDOR_HASH:-}" ]; then + setKV vendorHash ${VENDOR_HASH} else - echo "Update failed. VENDOR_SHA256 is empty." + echo "Update failed. VENDOR_HASH is empty." exit 1 fi diff --git a/pkgs/applications/networking/cluster/helm-docs/default.nix b/pkgs/applications/networking/cluster/helm-docs/default.nix index 657d428912dd4..cf286c8dc6f54 100644 --- a/pkgs/applications/networking/cluster/helm-docs/default.nix +++ b/pkgs/applications/networking/cluster/helm-docs/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "helm-docs"; - version = "1.11.1"; + version = "1.11.2"; src = fetchFromGitHub { owner = "norwoodj"; repo = "helm-docs"; rev = "v${version}"; - hash = "sha256-4o3hdqaW/AtegKStMKVerE3dRr3iZxQ+Lm2Aj3aOy98="; + hash = "sha256-w4QV96/02Pbs/l0lTLPYY8Ag21ZDDVPdgvuveiKUCoM="; }; vendorHash = "sha256-6byD8FdeqdRDNUZFZ7FUUdyTuFOO8s3rb6YPGKdwLB8="; diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index f3af1036a8ffb..6a8c2d0166e8a 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "kubernetes-helm"; - version = "3.12.2"; + version = "3.13.0"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "sha256-nUkUb41UX9kCIjBrz3AMnaHZSgNoEc+lS6J8Edy6lVA="; + sha256 = "sha256-/czguDCjnQPO4bcWa9Idl9U3yzFDxL7D4P/Ia7ZzMXE="; }; - vendorHash = "sha256-4NsGosKFyl3T3bIndYRP0hhJQ5oj6KuSv4kYH9b83WE="; + vendorHash = "sha256-ba5ZUpV8QHn8T1mXxY5WB0pA1OGUzmNixtwwTQFrqb4="; subPackages = [ "cmd/helm" ]; ldflags = [ diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix index 22a993a017eb3..da65c169732c1 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "helm-secrets"; - version = "4.4.2"; + version = "4.5.0"; src = fetchFromGitHub { owner = "jkroepke"; repo = pname; rev = "v${version}"; - hash = "sha256-GpPgjRqzH4fcnaHs9SWfdaCZimwBleXnxQLjqy8SArs="; + hash = "sha256-zytorArHhdwF7F9c2QkaX3KxLNlWySKieK2K1b5omFI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index e175c49155404..b70ecd725eab6 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "helmfile"; - version = "0.156.0"; + version = "0.157.0"; src = fetchFromGitHub { owner = "helmfile"; repo = "helmfile"; rev = "v${version}"; - sha256 = "sha256-MrDhOsjXo4aaeWSo/WNheUqom7kF2MzyaqeZXVAAzz4="; + sha256 = "sha256-M0XhkmYdmKpaA1gTXGgI7XNqIAuerV2NqfUI7sIgIiw="; }; - vendorHash = "sha256-hMoBwA9KmQSBJkEu3UAxM1wi6RRHZdUhYqri5JGwEmw="; + vendorHash = "sha256-RRnziHhM3pxoi5dZSZI5bkGWIp3Nx0TU3mVsOoU/CCM="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/k3s/1_24/default.nix b/pkgs/applications/networking/cluster/k3s/1_24/default.nix index 6f7644dd543b4..25b615d6718f3 100644 --- a/pkgs/applications/networking/cluster/k3s/1_24/default.nix +++ b/pkgs/applications/networking/cluster/k3s/1_24/default.nix @@ -51,7 +51,7 @@ let k3sVersion = "1.24.10+k3s1"; # k3s git tag k3sCommit = "546a94e9ae1c3be6f9c0dcde32a6e6672b035bc8"; # k3s git commit at the above version k3sRepoSha256 = "sha256-HfkGb3GtR2wQkVIze26aFh6A6W0fegr8ovpSel7oujQ="; - k3sVendorSha256 = "sha256-YAerisDr/knlKPaO2fVMZA4FUpwshFmkpi3mJAmLqKM="; + k3sVendorHash = "sha256-YAerisDr/knlKPaO2fVMZA4FUpwshFmkpi3mJAmLqKM="; # Based on the traefik charts here: https://github.com/k3s-io/k3s/blob/v1.24.10%2Bk3s1/scripts/download#L29-L32 # see also https://github.com/k3s-io/k3s/blob/v1.24.10%2Bk3s1/manifests/traefik.yaml#L8-L16 @@ -117,7 +117,7 @@ let k3sCNIPlugins = buildGoModule rec { pname = "k3s-cni-plugins"; version = k3sCNIVersion; - vendorSha256 = null; + vendorHash = null; subPackages = [ "." ]; @@ -170,7 +170,7 @@ let version = k3sVersion; src = k3sRepo; - vendorSha256 = k3sVendorSha256; + vendorHash = k3sVendorHash; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libseccomp sqlite.dev ]; @@ -210,7 +210,7 @@ let rev = "v${containerdVersion}"; sha256 = containerdSha256; }; - vendorSha256 = null; + vendorHash = null; buildInputs = [ btrfs-progs ]; subPackages = [ "cmd/containerd" "cmd/containerd-shim-runc-v2" ]; ldflags = versionldflags; @@ -221,7 +221,7 @@ buildGoModule rec { version = k3sVersion; src = k3sRepo; - vendorSha256 = k3sVendorSha256; + vendorHash = k3sVendorHash; postPatch = '' # Nix prefers dynamically linked binaries over static binary. @@ -279,7 +279,7 @@ buildGoModule rec { # Specifically, it has a 'go generate' which runs part of the package. See # this comment: # https://github.com/NixOS/nixpkgs/pull/158089#discussion_r799965694 - # So, why do we use buildGoModule at all? For the `vendorSha256` / `go mod download` stuff primarily. + # So, why do we use buildGoModule at all? For the `vendorHash` / `go mod download` stuff primarily. buildPhase = '' patchShebangs ./scripts/package-cli ./scripts/download ./scripts/build-upload diff --git a/pkgs/applications/networking/cluster/k3s/1_25/default.nix b/pkgs/applications/networking/cluster/k3s/1_25/default.nix index 47c3b5886c59e..7ea3ff7867e66 100644 --- a/pkgs/applications/networking/cluster/k3s/1_25/default.nix +++ b/pkgs/applications/networking/cluster/k3s/1_25/default.nix @@ -51,7 +51,7 @@ let k3sVersion = "1.25.3+k3s1"; # k3s git tag k3sCommit = "f2585c1671b31b4b34bddbb3bf4e7d69662b0821"; # k3s git commit at the above version k3sRepoSha256 = "0zwf3iwjcidx14zw36s1hr0q8wmmbfc0rfqwd7fmpjq597h8zkms"; - k3sVendorSha256 = "sha256-U67tJRGqPFk5AfRe7I50zKGC9HJ2oh+iI/C7qF/76BQ="; + k3sVendorHash = "sha256-U67tJRGqPFk5AfRe7I50zKGC9HJ2oh+iI/C7qF/76BQ="; # taken from ./manifests/traefik.yaml, extracted from '.spec.chart' https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/download#L9 # The 'patch' and 'minor' versions are currently hardcoded as single digits only, so ignore the trailing two digits. Weird, I know. @@ -116,7 +116,7 @@ let k3sCNIPlugins = buildGoModule rec { pname = "k3s-cni-plugins"; version = k3sCNIVersion; - vendorSha256 = null; + vendorHash = null; subPackages = [ "." ]; @@ -169,7 +169,7 @@ let version = k3sVersion; src = k3sRepo; - vendorSha256 = k3sVendorSha256; + vendorHash = k3sVendorHash; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libseccomp sqlite.dev ]; @@ -208,7 +208,7 @@ let rev = "v${containerdVersion}"; sha256 = containerdSha256; }; - vendorSha256 = null; + vendorHash = null; buildInputs = [ btrfs-progs ]; subPackages = [ "cmd/containerd" "cmd/containerd-shim-runc-v2" ]; ldflags = versionldflags; @@ -219,7 +219,7 @@ buildGoModule rec { version = k3sVersion; src = k3sRepo; - vendorSha256 = k3sVendorSha256; + vendorHash = k3sVendorHash; patches = [ ./0001-script-download-strip-downloading-just-package-CRD.patch @@ -281,7 +281,7 @@ buildGoModule rec { # Specifically, it has a 'go generate' which runs part of the package. See # this comment: # https://github.com/NixOS/nixpkgs/pull/158089#discussion_r799965694 - # So, why do we use buildGoModule at all? For the `vendorSha256` / `go mod download` stuff primarily. + # So, why do we use buildGoModule at all? For the `vendorHash` / `go mod download` stuff primarily. buildPhase = '' patchShebangs ./scripts/package-cli ./scripts/download ./scripts/build-upload diff --git a/pkgs/applications/networking/cluster/k3s/1_26/versions.nix b/pkgs/applications/networking/cluster/k3s/1_26/versions.nix index 799fd3f9b1dba..93df5633f5a82 100644 --- a/pkgs/applications/networking/cluster/k3s/1_26/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_26/versions.nix @@ -2,7 +2,7 @@ k3sVersion = "1.26.6+k3s1"; k3sCommit = "3b1919b0d55811707bd1168f0abf11cccc656c26"; k3sRepoSha256 = "1g82bkq4w0jpfn1fanj1d24bj46rw908wk50p3cm47rqiqlys72y"; - k3sVendorSha256 = "sha256-+a9/q5a28zA9SmAdp2IItHR1MdJvlbMW5796bHTfKBw="; + k3sVendorHash = "sha256-+a9/q5a28zA9SmAdp2IItHR1MdJvlbMW5796bHTfKBw="; chartVersions = import ./chart-versions.nix; k3sRootVersion = "0.12.2"; k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k"; diff --git a/pkgs/applications/networking/cluster/k3s/1_27/versions.nix b/pkgs/applications/networking/cluster/k3s/1_27/versions.nix index 653fb2115d701..df84a0a95d66c 100644 --- a/pkgs/applications/networking/cluster/k3s/1_27/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_27/versions.nix @@ -1,14 +1,14 @@ { - k3sVersion = "1.27.5+k3s1"; - k3sCommit = "8d074ecb5a8765a09eeef6f8be7987055210bc40"; - k3sRepoSha256 = "0bv0r1l97zip9798d8r3ldymmdhlrfw3j9i0nvads1sd1d4az6m6"; - k3sVendorSha256 = "sha256-dFLBa/Sn3GrOPWsTFkP0H2HASE8XB99Orxx5K7nnNio="; + k3sVersion = "1.27.6+k3s1"; + k3sCommit = "bd04941a294793ec92e8703d5e5da14107902e88"; + k3sRepoSha256 = "04chr8gp0yprihigy1yzhvi2baby053fav384gq0sjq6bkp3fzd8"; + k3sVendorHash = "sha256-LH9OsBK0Pq/NGEHprbIgYKQsslYdR3i4LYVvo5P0K+8="; chartVersions = import ./chart-versions.nix; k3sRootVersion = "0.12.2"; k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k"; k3sCNIVersion = "1.3.0-k3s1"; k3sCNISha256 = "0zma9g4wvdnhs9igs03xlx15bk2nq56j73zns9xgqmfiixd9c9av"; - containerdVersion = "1.7.3-k3s1"; - containerdSha256 = "03352jn1igsqi23sll06mdsvdbkfhrscqa2ackwczx1a3innxv9r"; + containerdVersion = "1.7.6-k3s1.27"; + containerdSha256 = "1kzjqw56pcdpsqdkw2k5a3pnpf8n93dh4jc2yybgqz3nyj4fw0a8"; criCtlVersion = "1.26.0-rc.0-k3s1"; } diff --git a/pkgs/applications/networking/cluster/k3s/README.md b/pkgs/applications/networking/cluster/k3s/README.md index 2e16de7bfa6df..df2bead6be530 100644 --- a/pkgs/applications/networking/cluster/k3s/README.md +++ b/pkgs/applications/networking/cluster/k3s/README.md @@ -25,7 +25,7 @@ NixOS releases should avoid having deprecated software, or making major version As such, we would like to have only the newest K3s version in each NixOS release at the time the release branch is branched off, which will ensure the -K3s version in that release will receieve updates for the longest duration +K3s version in that release will receive updates for the longest duration possible. However, this conflicts with another desire: we would like people to be able to upgrade between NixOS stable releases without needing to make a large enough k3s version jump that they violate the Kubernetes version skew policy. diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix index 9605ff9f9476a..a914cf87102ea 100644 --- a/pkgs/applications/networking/cluster/k3s/builder.nix +++ b/pkgs/applications/networking/cluster/k3s/builder.nix @@ -5,7 +5,7 @@ lib: # commit hash k3sCommit, k3sRepoSha256 ? lib.fakeHash, - k3sVendorSha256 ? lib.fakeHash, + k3sVendorHash ? lib.fakeHash, # taken from ./scripts/version.sh VERSION_ROOT https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/version.sh#L47 k3sRootVersion, k3sRootSha256 ? lib.fakeHash, @@ -129,7 +129,7 @@ let k3sCNIPlugins = buildGoModule rec { pname = "k3s-cni-plugins"; version = k3sCNIVersion; - vendorSha256 = null; + vendorHash = null; subPackages = [ "." ]; @@ -182,7 +182,7 @@ let version = k3sVersion; src = k3sRepo; - vendorSha256 = k3sVendorSha256; + vendorHash = k3sVendorHash; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libseccomp sqlite.dev ]; @@ -226,7 +226,7 @@ let rev = "v${containerdVersion}"; sha256 = containerdSha256; }; - vendorSha256 = null; + vendorHash = null; buildInputs = [ btrfs-progs ]; subPackages = [ "cmd/containerd-shim-runc-v2" ]; ldflags = versionldflags; @@ -238,7 +238,7 @@ buildGoModule rec { tags = [ "libsqlite3" "linux" "ctrd" ]; src = k3sRepo; - vendorSha256 = k3sVendorSha256; + vendorHash = k3sVendorHash; postPatch = '' # Nix prefers dynamically linked binaries over static binary. @@ -296,7 +296,7 @@ buildGoModule rec { # Specifically, it has a 'go generate' which runs part of the package. See # this comment: # https://github.com/NixOS/nixpkgs/pull/158089#discussion_r799965694 - # So, why do we use buildGoModule at all? For the `vendorSha256` / `go mod download` stuff primarily. + # So, why do we use buildGoModule at all? For the `vendorHash` / `go mod download` stuff primarily. buildPhase = '' patchShebangs ./scripts/package-cli ./scripts/download ./scripts/build-upload diff --git a/pkgs/applications/networking/cluster/k3s/update-script.sh b/pkgs/applications/networking/cluster/k3s/update-script.sh index d1dad25b07a46..dc41d7325b6c7 100755 --- a/pkgs/applications/networking/cluster/k3s/update-script.sh +++ b/pkgs/applications/networking/cluster/k3s/update-script.sh @@ -101,7 +101,7 @@ cat >versions.nix <<EOF k3sVersion = "${K3S_VERSION}"; k3sCommit = "${K3S_COMMIT}"; k3sRepoSha256 = "${K3S_REPO_SHA256}"; - k3sVendorSha256 = "${FAKE_HASH}"; + k3sVendorHash = "${FAKE_HASH}"; chartVersions = import ./chart-versions.nix; k3sRootVersion = "${K3S_ROOT_VERSION}"; k3sRootSha256 = "${K3S_ROOT_SHA256}"; @@ -114,13 +114,13 @@ cat >versions.nix <<EOF EOF set +e -K3S_VENDOR_SHA256=$(nix-prefetch -I nixpkgs=${NIXPKGS_ROOT} "{ sha256 }: (import ${NIXPKGS_ROOT}. {}).k3s_1_${MINOR_VERSION}.goModules.overrideAttrs (_: { vendorSha256 = sha256; })") +K3S_VENDOR_HASH=$(nix-prefetch -I nixpkgs=${NIXPKGS_ROOT} "{ sha256 }: (import ${NIXPKGS_ROOT}. {}).k3s_1_${MINOR_VERSION}.goModules.overrideAttrs (_: { vendorHash = sha256; })") set -e -if [ -n "${K3S_VENDOR_SHA256:-}" ]; then - sed -i "s|${FAKE_HASH}|${K3S_VENDOR_SHA256}|g" ./versions.nix +if [ -n "${K3S_VENDOR_HASH:-}" ]; then + sed -i "s|${FAKE_HASH}|${K3S_VENDOR_HASH}|g" ./versions.nix else - echo "Update failed. K3S_VENDOR_SHA256 is empty." + echo "Update failed. K3S_VENDOR_HASH is empty." exit 1 fi diff --git a/pkgs/applications/networking/cluster/kaniko/default.nix b/pkgs/applications/networking/cluster/kaniko/default.nix index 7c6c76edc0c4e..7639c95a971f5 100644 --- a/pkgs/applications/networking/cluster/kaniko/default.nix +++ b/pkgs/applications/networking/cluster/kaniko/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "kaniko"; - version = "1.15.0"; + version = "1.16.0"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = "kaniko"; rev = "v${version}"; - hash = "sha256-PNAqdeB/ya3i1hRbagpfmpwS0tNRZbWBm9YIXME1HMc="; + hash = "sha256-PTcPlYJ0IHWNQKBJcMiotGp6GPH3qY3f6sJKgUVSTZU="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 9494729b68d7e..c3ae7d5081b77 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -48,15 +48,9 @@ in rec { mkKops = generic; - kops_1_25 = mkKops rec { - version = "1.25.4"; - sha256 = "sha256-Q40d62D+H7CpLmrjweCy75U3LgnHEV2pFZs2Ze+koqo="; - rev = "v${version}"; - }; - kops_1_26 = mkKops rec { - version = "1.26.5"; - sha256 = "sha256-DbKzqfcQCHP3ZWJQcRhPDkKVzHB/MkcfukguUDG4UQg="; + version = "1.26.6"; + sha256 = "sha256-qaehvPgB3phZl/K577hig4G4RxAUi6Im94vXP5ctnWM="; rev = "v${version}"; }; @@ -65,4 +59,10 @@ rec { sha256 = "sha256-WV+0380yj8GHckY4PDM3WspbZ/YuYZOAQEMd2ygEOjo="; rev = "v${version}"; }; + + kops_1_28 = mkKops rec { + version = "1.28.0"; + sha256 = "sha256-a/3amvgGG7Gro6K7uIi20jwCo+JAlSuPB3/EUf75hxc="; + rev = "v${version}"; + }; } diff --git a/pkgs/applications/networking/cluster/ktunnel/default.nix b/pkgs/applications/networking/cluster/ktunnel/default.nix index 73e1fff2db36c..3b05aabc00b9f 100644 --- a/pkgs/applications/networking/cluster/ktunnel/default.nix +++ b/pkgs/applications/networking/cluster/ktunnel/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, buildGoModule, fetchFromGitHub }: let - version = "1.5.3"; + version = "1.6.1"; in buildGoModule { pname = "ktunnel"; @@ -10,7 +10,7 @@ buildGoModule { owner = "omrikiei"; repo = "ktunnel"; rev = "v${version}"; - sha256 = "sha256-7SWj9Emm78xpzdvJFKqpI5HVQi0ohbixkgXKGTy5C/A="; + sha256 = "sha256-rcUCIUIyBCSuMly7y0GUNQCdJUgsj7Oi6Hpz23uXoJw="; }; ldflags = [ diff --git a/pkgs/applications/networking/cluster/kubebuilder/default.nix b/pkgs/applications/networking/cluster/kubebuilder/default.nix index 7ac56042a3fa7..1724cb60e148d 100644 --- a/pkgs/applications/networking/cluster/kubebuilder/default.nix +++ b/pkgs/applications/networking/cluster/kubebuilder/default.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "kubebuilder"; - version = "3.11.1"; + version = "3.12.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "kubebuilder"; rev = "v${version}"; - hash = "sha256-VT9S8Ijf684rowfoU1kvgPSTzR8ZGr3GwxWiYHWLANc="; + hash = "sha256-drg7hFUEFoicZxzorO365b3eFN9NRdhWYn9bIk+sSY8="; }; - vendorHash = "sha256-5XUYmAfFH6UlLF09PqcSLUxkgZ5iHZGj0Vurab+Jl1g="; + vendorHash = "sha256-qH7+DDGYRCrXI3B2dN/4pZMBqSXKkZUvIrtVEg0Ep+c="; subPackages = ["cmd"]; diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix index bfc95207a6ca5..405eff5897597 100644 --- a/pkgs/applications/networking/cluster/kubecfg/default.nix +++ b/pkgs/applications/networking/cluster/kubecfg/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "kubecfg"; - version = "0.33.0"; + version = "0.34.0"; src = fetchFromGitHub { owner = "kubecfg"; repo = "kubecfg"; rev = "v${version}"; - hash = "sha256-a/2qKiqn9en67uJD/jzU3G1k6gT73DTzjY32mi51xSQ="; + hash = "sha256-OoqmFv2cRUU/mDtDcXugx+NKwpePQzRD231YBT4xQmA="; }; - vendorHash = "sha256-mSYc12pjx34PhMx7jbKD/nPhPaK7jINmUSWxomikx7U="; + vendorHash = "sha256-0+I0EeCguo1RPwKlnqmxgwvRfuW1CKD58PhftZDLfSg="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/cluster/kubectl-evict-pod/default.nix b/pkgs/applications/networking/cluster/kubectl-evict-pod/default.nix index 54f99f91c8a25..f17c2b2ad1ab7 100644 --- a/pkgs/applications/networking/cluster/kubectl-evict-pod/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-evict-pod/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-alU1c1ppn4cQi582kcA/PIAJJt73i3uG02cQvSYij1A="; }; - vendorSha256 = null; + vendorHash = null; meta = with lib; { description = "This plugin evicts the given pod and is useful for testing pod disruption budget rules"; diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index afb82ff37d6d7..97d3a3140209a 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -20,13 +20,13 @@ buildGoModule rec { pname = "kubernetes"; - version = "1.28.1"; + version = "1.28.2"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - hash = "sha256-SsYSjGACGqg+RW7X1OVgPC7MF4KufyskXuES9YKM2mk="; + hash = "sha256-7juoX4nFvQbIIbhTlnIYVUEYUJGwu+aKrpw4ltujjXI="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/kubeshark/default.nix b/pkgs/applications/networking/cluster/kubeshark/default.nix index 23f43688d5c9a..d958e06b7ecab 100644 --- a/pkgs/applications/networking/cluster/kubeshark/default.nix +++ b/pkgs/applications/networking/cluster/kubeshark/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubeshark"; - version = "50.2"; + version = "50.4"; src = fetchFromGitHub { owner = "kubeshark"; repo = "kubeshark"; rev = version; - sha256 = "sha256-bABPfy790cMIfunKYfZwDbEn07fhq6g0m/yqeFgJg4Y="; + sha256 = "sha256-+9AnzY/vnB1OGzkKmYL0sxWS17NV+MGnHNXGOtt+BKU="; }; - vendorHash = "sha256-rcxnvKkc9zerfULRdU5eGRRqSDQQDNMYaLJ7oEMQghk="; + vendorHash = "sha256-Vcn1Ky/J/3QiV6M5fLedDcpkLp5WsVcXRkOEgkKPYEQ="; ldflags = let t = "github.com/kubeshark/kubeshark"; in [ "-s" "-w" diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix index 31b07419b4dd5..2e7b8a50b915c 100644 --- a/pkgs/applications/networking/cluster/linkerd/edge.nix +++ b/pkgs/applications/networking/cluster/linkerd/edge.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "edge"; - version = "23.8.3"; - sha256 = "1mj16nzs2da530lvvsg6gh8fcgy8rwq13mryqznflgyr39x4c56i"; - vendorHash = "sha256-HxxekAipoWNxcLUSOSwUOXlrWMODw7gS8fcyTD3CMYE="; + version = "23.9.4"; + sha256 = "1hjhbkwn44i1gsc7llxc9mrdjf5xc1nl4dxqgnxgks3hzkch6qqc"; + vendorHash = "sha256-OzHl9QhNLaTCBCWpCmqzPkdWMwygKXSkYTczQD5KVh8="; } diff --git a/pkgs/applications/networking/cluster/linkerd/update-edge.sh b/pkgs/applications/networking/cluster/linkerd/update-edge.sh index 0e5be4f197e13..f9d9569b3812c 100755 --- a/pkgs/applications/networking/cluster/linkerd/update-edge.sh +++ b/pkgs/applications/networking/cluster/linkerd/update-edge.sh @@ -17,17 +17,17 @@ setKV () { setKV version ${VERSION} setKV sha256 ${SHA256} -setKV vendorSha256 "0000000000000000000000000000000000000000000000000000" # Necessary to force clean build. +setKV vendorHash "sha256-BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB=" # Necessary to force clean build. cd ../../../../../ set +e -VENDOR_SHA256=$(nix-build --no-out-link -A linkerd_edge 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g') +VENDOR_HASH=$(nix-build --no-out-link -A linkerd_edge 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g') set -e cd - > /dev/null -if [ -n "${VENDOR_SHA256:-}" ]; then - setKV vendorSha256 ${VENDOR_SHA256} +if [ -n "${VENDOR_HASH:-}" ]; then + setKV vendorHash ${VENDOR_HASH} else - echo "Update failed. VENDOR_SHA256 is empty." + echo "Update failed. VENDOR_HASH is empty." exit 1 fi diff --git a/pkgs/applications/networking/cluster/linkerd/update-stable.sh b/pkgs/applications/networking/cluster/linkerd/update-stable.sh index 19aa4274bed35..8643262ec3ad0 100755 --- a/pkgs/applications/networking/cluster/linkerd/update-stable.sh +++ b/pkgs/applications/networking/cluster/linkerd/update-stable.sh @@ -17,17 +17,17 @@ setKV () { setKV version ${VERSION} setKV sha256 ${SHA256} -setKV vendorSha256 "0000000000000000000000000000000000000000000000000000" # Necessary to force clean build. +setKV vendorHash "sha256-BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB=" # Necessary to force clean build. cd ../../../../../ set +e -VENDOR_SHA256=$(nix-build --no-out-link -A linkerd 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g') +VENDOR_HASH=$(nix-build --no-out-link -A linkerd 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g') set -e cd - > /dev/null -if [ -n "${VENDOR_SHA256:-}" ]; then - setKV vendorSha256 ${VENDOR_SHA256} +if [ -n "${VENDOR_HASH:-}" ]; then + setKV vendorHash ${VENDOR_HASH} else - echo "Update failed. VENDOR_SHA256 is empty." + echo "Update failed. VENDOR_HASH is empty." exit 1 fi diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix index 401b5b156f769..72dbfde9f59b8 100644 --- a/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "nerdctl"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - hash = "sha256-ngR+xlhTy3oxPN34+MoT9TSOI0+Epp8QG3KiiPmRUts="; + hash = "sha256-O1N8+Gjo0EapRV5Z7Z27Cfs886cbwTmckJsSJ2OI5fM="; }; - vendorHash = "sha256-lsD8AtbREVKFXiPsteSFA7xntRlNgOQ1y5c44vOqMa8="; + vendorHash = "sha256-/4XFQagUbU8SgoBogK1hAsfGoTY+DaIVaNpSA3Enaho="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/ocm/default.nix b/pkgs/applications/networking/cluster/ocm/default.nix index e8180fa770cca..ac44c8efffdb0 100644 --- a/pkgs/applications/networking/cluster/ocm/default.nix +++ b/pkgs/applications/networking/cluster/ocm/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ocm"; - version = "0.1.68"; + version = "0.1.69"; src = fetchFromGitHub { owner = "openshift-online"; repo = "ocm-cli"; rev = "v${version}"; - sha256 = "sha256-pJ/QWdKLVKFQuaGO9sNf6lhMMgqk9VZS9NLtUz+2+t8="; + sha256 = "sha256-JKR58is8SzNmEQ8x1om1anReLIbNCHJkkzZQ1SiQ5J4="; }; vendorHash = "sha256-3HLTuWf4mK3r92s2mPE2yl/rrPxgcsB9EmrxkiJsMaE="; diff --git a/pkgs/applications/networking/cluster/octant/default.nix b/pkgs/applications/networking/cluster/octant/default.nix deleted file mode 100644 index 733e4c04a9cca..0000000000000 --- a/pkgs/applications/networking/cluster/octant/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ lib, stdenv, fetchzip }: - -stdenv.mkDerivation rec { - pname = "octant"; - version = "0.25.1"; - - src = - let - inherit (stdenv.hostPlatform) system; - suffix = { - x86_64-linux = "Linux-64bit"; - aarch64-linux = "Linux-arm64"; - x86_64-darwin = "macOS-64bit"; - aarch64-darwin = "macOS-arm64"; - }.${system} or (throw "Unsupported system: ${system}"); - fetchsrc = version: sha256: fetchzip { - url = "https://github.com/vmware-tanzu/octant/releases/download/v${version}/octant_${version}_${suffix}.tar.gz"; - sha256 = sha256.${system}; - }; - in - fetchsrc version { - x86_64-linux = "sha256-bYqycTB036J8trojySPNkC+jrw76F7+N4I4puGCyalU="; - aarch64-linux = "sha256-DlzSIZCAASPnflXQ8ndPU7/0jXA18U4bGGOfmgLXPr0="; - x86_64-darwin = "sha256-FaPyrPzO7AzC6LHQP5c58NjLTqU+ei8vFffT8x6mUhQ="; - aarch64-darwin = "sha256-31CYhAsHYIVAenp8hFHYj8LhFf3lSiOTw7gULBu3gio="; - }; - - dontConfigure = true; - dontBuild = true; - - installPhase = '' - runHook preInstall - install -D octant $out/bin/octant - runHook postInstall - ''; - - doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck - $out/bin/octant --help - $out/bin/octant version | grep "${version}" - runHook postInstallCheck - ''; - - dontPatchELF = true; - dontPatchShebangs = true; - - passthru.updateScript = ./update.sh; - - meta = with lib; { - homepage = "https://octant.dev/"; - changelog = "https://github.com/vmware-tanzu/octant/blob/v${version}/CHANGELOG.md"; - description = "Highly extensible platform for developers to better understand the complexity of Kubernetes clusters"; - longDescription = '' - Octant is a tool for developers to understand how applications run on a - Kubernetes cluster. - It aims to be part of the developer's toolkit for gaining insight and - approaching complexity found in Kubernetes. Octant offers a combination of - introspective tooling, cluster navigation, and object management along - with a plugin system to further extend its capabilities. - ''; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.asl20; - maintainers = with maintainers; [ jk ]; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; - }; -} diff --git a/pkgs/applications/networking/cluster/octant/desktop.nix b/pkgs/applications/networking/cluster/octant/desktop.nix deleted file mode 100644 index fc48ce1e9ef45..0000000000000 --- a/pkgs/applications/networking/cluster/octant/desktop.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ lib, stdenv, appimageTools, fetchurl, undmg }: - -let - pname = "octant-desktop"; - version = "0.23.0"; - name = "${pname}-${version}"; - - inherit (stdenv.hostPlatform) system; - - suffix = { - x86_64-linux = "AppImage"; - x86_64-darwin = "dmg"; - }.${system} or (throw "Unsupported system: ${system}"); - - src = fetchurl { - url = "https://github.com/vmware-tanzu/octant/releases/download/v${version}/Octant-${version}.${suffix}"; - sha256 = { - x86_64-linux = "sha256-K4z6SVCiuqy3xkWMWpm8KM7iYVXyKcnERljMG3NEFMw="; - x86_64-darwin = "sha256-WYra0yw/aPW/wUGrlIn5ud3kjFTkekYEi2LWZcYO5Nw="; - }.${system}; - }; - - linux = appimageTools.wrapType2 { - inherit name src passthru meta; - - profile = '' - export LC_ALL=C.UTF-8 - ''; - - multiArch = false; # no 32bit needed - extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; - extraInstallCommands = - let appimageContents = appimageTools.extractType2 { inherit name src; }; in - '' - mv $out/bin/{${name},${pname}} - install -Dm444 ${appimageContents}/octant.desktop -t $out/share/applications - substituteInPlace $out/share/applications/octant.desktop \ - --replace 'Exec=AppRun --no-sandbox' 'Exec=${pname}' - install -m 444 -D ${appimageContents}/octant.png \ - $out/share/icons/hicolor/512x512/apps/octant.png - ''; - }; - - darwin = stdenv.mkDerivation { - inherit name src passthru meta; - - nativeBuildInputs = [ undmg ]; - sourceRoot = "Octant.app"; - installPhase = '' - mkdir -p $out/Applications/Octant.app - cp -R . $out/Applications/Octant.app - ''; - }; - - passthru = { updateScript = ./update-desktop.sh; }; - - meta = with lib; { - homepage = "https://octant.dev/"; - changelog = "https://github.com/vmware-tanzu/octant/blob/v${version}/CHANGELOG.md"; - description = "Highly extensible platform for developers to better understand the complexity of Kubernetes clusters"; - longDescription = '' - Octant is a tool for developers to understand how applications run on a - Kubernetes cluster. - It aims to be part of the developer's toolkit for gaining insight and - approaching complexity found in Kubernetes. Octant offers a combination of - introspective tooling, cluster navigation, and object management along - with a plugin system to further extend its capabilities. - ''; - license = licenses.asl20; - maintainers = with maintainers; [ jk ]; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; - }; - -in -if stdenv.isDarwin -then darwin -else linux diff --git a/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix b/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix deleted file mode 100644 index f59b8d26de08f..0000000000000 --- a/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "starboard-octant-plugin"; - version = "0.12.0"; - - src = fetchFromGitHub { - owner = "aquasecurity"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-JTSZtIRVFdUjhQsp2EMukeoVIo6nNx4xofq+3iOZUIk="; - }; - - vendorHash = "sha256-1zrB+CobUBgdpBHRJPpfDYCD6oVWY4j4Met9EqNQQbE="; - - ldflags = [ - "-s" "-w" - ]; - - meta = with lib; { - homepage = "https://github.com/aquasecurity/starboard-octant-plugin"; - changelog = "https://github.com/aquasecurity/starboard-octant-plugin/releases/tag/v${version}"; - description = "Octant plugin for viewing Starboard security information"; - longDescription = '' - This is an Octant plugin for Starboard which provides visibility into vulnerability assessment reports for - Kubernetes workloads stored as custom security resources. - ''; - license = licenses.asl20; - maintainers = with maintainers; [ jk ]; - }; -} diff --git a/pkgs/applications/networking/cluster/octant/update-desktop.sh b/pkgs/applications/networking/cluster/octant/update-desktop.sh deleted file mode 100755 index 4450834b4b70a..0000000000000 --- a/pkgs/applications/networking/cluster/octant/update-desktop.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnused gawk nix-prefetch - -set -euo pipefail - -ROOT="$(dirname "$(readlink -f "$0")")" -NIX_DRV="$ROOT/desktop.nix" -if [ ! -f "$NIX_DRV" ]; then - echo "ERROR: cannot find desktop.nix in $ROOT" - exit 1 -fi - -fetch_arch() { - VER="$1"; SUFFIX="$2" - URL="https://github.com/vmware-tanzu/octant/releases/download/v${VER}/Octant-${VER}.${SUFFIX}" - nix-prefetch "{ stdenv, fetchurl }: -stdenv.mkDerivation rec { - pname = \"octant-desktop\"; version = \"${VER}\"; - src = fetchurl { url = \"$URL\"; }; -} -" -} - -replace_sha() { - sed -i "s#$1 = \"sha256-.\{44\}\"#$1 = \"$2\"#" "$NIX_DRV" -} - -OCTANT_VER=$(curl -Ls -w "%{url_effective}" -o /dev/null https://github.com/vmware-tanzu/octant/releases/latest | awk -F'/' '{print $NF}' | sed 's/v//') - -OCTANT_DESKTOP_LINUX_X64_SHA256=$(fetch_arch "$OCTANT_VER" "AppImage") -OCTANT_DESKTOP_DARWIN_X64_SHA256=$(fetch_arch "$OCTANT_VER" "dmg") - -sed -i "s/version = \".*\"/version = \"$OCTANT_VER\"/" "$NIX_DRV" - -replace_sha "x86_64-linux" "$OCTANT_DESKTOP_LINUX_X64_SHA256" -replace_sha "x86_64-darwin" "$OCTANT_DESKTOP_DARWIN_X64_SHA256" diff --git a/pkgs/applications/networking/cluster/octant/update.sh b/pkgs/applications/networking/cluster/octant/update.sh deleted file mode 100755 index 3e2b56b7a6198..0000000000000 --- a/pkgs/applications/networking/cluster/octant/update.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnused gawk nix-prefetch - -set -euo pipefail - -ROOT="$(dirname "$(readlink -f "$0")")" -NIX_DRV="$ROOT/default.nix" -if [ ! -f "$NIX_DRV" ]; then - echo "ERROR: cannot find default.nix in $ROOT" - exit 1 -fi - -fetch_arch() { - VER="$1"; ARCH="$2" - URL="https://github.com/vmware-tanzu/octant/releases/download/v${VER}/octant_${VER}_${ARCH}.tar.gz" - nix-prefetch "{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - pname = \"octant\"; version = \"${VER}\"; - src = fetchzip { url = \"$URL\"; }; -} -" -} - -replace_sha() { - sed -i "s#$1 = \"sha256-.\{44\}\"#$1 = \"$2\"#" "$NIX_DRV" -} - -OCTANT_VER=$(curl -Ls -w "%{url_effective}" -o /dev/null https://github.com/vmware-tanzu/octant/releases/latest | awk -F'/' '{print $NF}' | sed 's/v//') - -OCTANT_LINUX_X64_SHA256=$(fetch_arch "$OCTANT_VER" "Linux-64bit") -OCTANT_LINUX_AARCH64_SHA256=$(fetch_arch "$OCTANT_VER" "Linux-arm64") -OCTANT_DARWIN_X64_SHA256=$(fetch_arch "$OCTANT_VER" "macOS-64bit") -OCTANT_DARWIN_AARCH64_SHA256=$(fetch_arch "$OCTANT_VER" "macOS-arm64") - -sed -i "s/version = \".*\"/version = \"$OCTANT_VER\"/" "$NIX_DRV" - -replace_sha "x86_64-linux" "$OCTANT_LINUX_X64_SHA256" -replace_sha "aarch64-linux" "$OCTANT_LINUX_AARCH64_SHA256" -replace_sha "x86_64-darwin" "$OCTANT_DARWIN_X64_SHA256" -replace_sha "aarch64-darwin" "$OCTANT_DARWIN_AARCH64_SHA256" diff --git a/pkgs/applications/networking/cluster/opentofu/default.nix b/pkgs/applications/networking/cluster/opentofu/default.nix new file mode 100644 index 0000000000000..f499857189989 --- /dev/null +++ b/pkgs/applications/networking/cluster/opentofu/default.nix @@ -0,0 +1,172 @@ +{ stdenv +, lib +, buildGoModule +, fetchFromGitHub +, makeWrapper +, coreutils +, runCommand +, runtimeShell +, writeText +, terraform-providers +, installShellFiles +}: + +let + package = buildGoModule rec { + pname = "opentofu"; + version = "1.6.0-alpha1"; + + src = fetchFromGitHub { + owner = "opentofu"; + repo = "opentofu"; + rev = "v${version}"; + hash = "sha256-0FO55H1nOyhAd+ex1zA0XycH6x/HKkLlxzuIJNoaI9g="; + }; + vendorHash = "sha256-3jQfIIZOgOmNHQ06rXz+3QTZ37WcuCc7A7/MhC7udrg="; + ldflags = [ "-s" "-w" ]; + + postConfigure = '' + # speakeasy hardcodes /bin/stty https://github.com/bgentry/speakeasy/issues/22 + substituteInPlace vendor/github.com/bgentry/speakeasy/speakeasy_unix.go \ + --replace "/bin/stty" "${coreutils}/bin/stty" + ''; + + nativeBuildInputs = [ installShellFiles ]; + patches = [ ./provider-path-0_15.patch ]; + + passthru = { + inherit plugins withPlugins; + tests = { inherit opentofu_plugins_test; }; + }; + + # https://github.com/posener/complete/blob/9a4745ac49b29530e07dc2581745a218b646b7a3/cmd/install/bash.go#L8 + postInstall = '' + installShellCompletion --bash --name tofu <(echo complete -C tofu tofu) + ''; + + preCheck = '' + export HOME=$TMPDIR + export TF_SKIP_REMOTE_TESTS=1 + ''; + + subPackages = [ "./cmd/..." ]; + + meta = with lib; { + description = "Tool for building, changing, and versioning infrastructure"; + homepage = "https://opentofu.org/"; + changelog = "https://github.com/opentofu/opentofu/blob/v${version}/CHANGELOG.md"; + license = licenses.mpl20; + maintainers = with maintainers; [ + gmemstr + ]; + mainProgram = "tofu"; + }; + }; + + opentofu_plugins_test = let + mainTf = writeText "main.tf" '' + resource "random_id" "test" {} + ''; + opentofu = package.withPlugins (p: [ p.random ]); + test = runCommand "opentofu-plugin-test" { + buildInputs = [ opentofu ]; + } '' + # make it fail outside of sandbox + export HTTP_PROXY=http://127.0.0.1:0 HTTPS_PROXY=https://127.0.0.1:0 + cp ${mainTf} main.tf + tofu init + touch $out + ''; + in + test; + + plugins = removeAttrs terraform-providers [ + "override" + "overrideDerivation" + "recurseForDerivations" + ]; + + withPlugins = plugins: + let + actualPlugins = plugins package.plugins; + + # Wrap PATH of plugins propagatedBuildInputs, plugins may have runtime dependencies on external binaries + wrapperInputs = lib.unique (lib.flatten + (lib.catAttrs "propagatedBuildInputs" + (builtins.filter (x: x != null) actualPlugins))); + + passthru = { + withPlugins = newplugins: + withPlugins (x: newplugins x ++ actualPlugins); + full = withPlugins (p: lib.filter lib.isDerivation (lib.attrValues p.actualProviders)); + + # Expose wrappers around the override* functions of the terraform + # derivation. + # + # Note that this does not behave as anyone would expect if plugins + # are specified. The overrides are not on the user-visible wrapper + # derivation but instead on the function application that eventually + # generates the wrapper. This means: + # + # 1. When using overrideAttrs, only `passthru` attributes will + # become visible on the wrapper derivation. Other overrides that + # modify the derivation *may* still have an effect, but it can be + # difficult to follow. + # + # 2. Other overrides may work if they modify the terraform + # derivation, or they may have no effect, depending on what + # exactly is being changed. + # + # 3. Specifying overrides on the wrapper is unsupported. + # + # See nixpkgs#158620 for details. + overrideDerivation = f: + (package.overrideDerivation f).withPlugins plugins; + overrideAttrs = f: + (package.overrideAttrs f).withPlugins plugins; + override = x: + (package.override x).withPlugins plugins; + }; + # Don't bother wrapping unless we actually have plugins, since the wrapper will stop automatic downloading + # of plugins, which might be counterintuitive if someone just wants a vanilla Terraform. + in + if actualPlugins == [ ] then + package.overrideAttrs + (orig: { passthru = orig.passthru // passthru; }) + else + lib.appendToName "with-plugins" (stdenv.mkDerivation { + inherit (package) meta pname version; + nativeBuildInputs = [ makeWrapper ]; + + # Expose the passthru set with the override functions + # defined above, as well as any passthru values already + # set on `terraform` at this point (relevant in case a + # user overrides attributes). + passthru = package.passthru // passthru; + + buildCommand = '' + # Create wrappers for terraform plugins because Terraform only + # walks inside of a tree of files. + for providerDir in ${toString actualPlugins} + do + for file in $(find $providerDir/libexec/terraform-providers -type f) + do + relFile=''${file#$providerDir/} + mkdir -p $out/$(dirname $relFile) + cat <<WRAPPER > $out/$relFile + #!${runtimeShell} + exec "$file" "$@" + WRAPPER + chmod +x $out/$relFile + done + done + + # Create a wrapper for opentofu to point it to the plugins dir. + mkdir -p $out/bin/ + makeWrapper "${package}/bin/tofu" "$out/bin/tofu" \ + --set NIX_TERRAFORM_PLUGIN_DIR $out/libexec/terraform-providers \ + --prefix PATH : "${lib.makeBinPath wrapperInputs}" + ''; + }); +in +package diff --git a/pkgs/applications/networking/cluster/opentofu/provider-path-0_15.patch b/pkgs/applications/networking/cluster/opentofu/provider-path-0_15.patch new file mode 100644 index 0000000000000..318df9ab69a8c --- /dev/null +++ b/pkgs/applications/networking/cluster/opentofu/provider-path-0_15.patch @@ -0,0 +1,23 @@ +diff -Naur terraform.old/internal/command/init.go terraform.new/internal/command/init.go +--- terraform.old/internal/command/init.go ++++ terraform.new/internal/command/init.go +@@ -3,6 +3,7 @@ + import ( + "context" + "fmt" ++ "os" + "log" + "strings" + +@@ -55,6 +56,11 @@ + + var diags tfdiags.Diagnostics + ++ val, ok := os.LookupEnv("NIX_TERRAFORM_PLUGIN_DIR") ++ if ok { ++ flagPluginPath = append(flagPluginPath, val) ++ } ++ + if len(flagPluginPath) > 0 { + c.pluginPath = flagPluginPath + } diff --git a/pkgs/applications/networking/cluster/pinniped/default.nix b/pkgs/applications/networking/cluster/pinniped/default.nix index b04c770dd981f..823fdfb434d72 100644 --- a/pkgs/applications/networking/cluster/pinniped/default.nix +++ b/pkgs/applications/networking/cluster/pinniped/default.nix @@ -2,18 +2,18 @@ buildGoModule rec{ pname = "pinniped"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "pinniped"; rev = "v${version}"; - sha256 = "sha256-tUdPeBqAXYaBB2rtkhrhN3kRSVv8dg0UI7GEmIdO+fc="; + sha256 = "sha256-z+JwtrP3WGMK11RRYrDig5SrX6YCj7U3AwuLg/J8dgs="; }; subPackages = "cmd/pinniped"; - vendorHash = "sha256-IFVXNd1UkfZiw8YKG3v9uHCJQCE3ajOsjbHv5r3y3L4="; + vendorHash = "sha256-QywpqgQj76x0zmn4eC74fy7UECK4K81WO+nxOYKZqq0="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/cluster/prow/default.nix b/pkgs/applications/networking/cluster/prow/default.nix index b1ea88a11a332..9c8b311cf7cca 100644 --- a/pkgs/applications/networking/cluster/prow/default.nix +++ b/pkgs/applications/networking/cluster/prow/default.nix @@ -10,10 +10,10 @@ buildGoModule rec { owner = "kubernetes"; repo = "test-infra"; - sha256 = "0mc3ynmbf3kidibdy8k3v3xjlvmxl8w7zm1z2m0skmhd0y4bpmk4"; + hash = "sha256-ZNa7iAcN1qlBFT/UfziivW4q+9hjIt9WbHEOt6r1g1U="; }; - vendorSha256 = "16fdc5r28andm8my4fxj0f1yygx6j2mvn92i6xdfhbcra0lvr4ql"; + vendorHash = "sha256-FJO8KVCZLehaN1Eku6uQpj/vgwOyO+Irqs0qJHJhzZk="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/rancher/default.nix b/pkgs/applications/networking/cluster/rancher/default.nix index df8380010bbd4..8259a574cc1cc 100644 --- a/pkgs/applications/networking/cluster/rancher/default.nix +++ b/pkgs/applications/networking/cluster/rancher/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "rancher"; - version = "2.7.0"; + version = "2.7.7"; src = fetchFromGitHub { owner = "rancher"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-co4LVd5A0bJ4CIuCfv6WyV8XCMbPCFAAcV12WekYrw4="; + hash = "sha256-HgLV4iuZXkL6BOKtUul1pFuIWv09VnUSPbdrtFd6Khk="; }; ldflags = [ @@ -19,7 +19,7 @@ buildGoModule rec { "-static" ]; - vendorHash = "sha256-oclMnt6uJa8SG2fNM0fi+HCVMMi4rkykx8VpK/tXilQ="; + vendorHash = "sha256-mXLZMnGJ1m5gFroJcSoE4SbVvsyuS73hfXFeWBRtUdI="; postInstall = '' mv $out/bin/cli $out/bin/rancher diff --git a/pkgs/applications/networking/cluster/ssm-agent/default.nix b/pkgs/applications/networking/cluster/ssm-agent/default.nix index 5a0dc0d2d97e9..613bac4c9ea6e 100644 --- a/pkgs/applications/networking/cluster/ssm-agent/default.nix +++ b/pkgs/applications/networking/cluster/ssm-agent/default.nix @@ -5,9 +5,14 @@ , fetchFromGitHub , coreutils , nettools -, dmidecode +, busybox , util-linux +, stdenv +, dmidecode , bashInteractive +, nix-update-script +, testers +, ssm-agent , overrideEtc ? true }: @@ -27,17 +32,17 @@ let in buildGoPackage rec { pname = "amazon-ssm-agent"; - version = "3.2.1297.0"; + version = "3.2.1630.0"; goPackagePath = "github.com/aws/${pname}"; nativeBuildInputs = [ makeWrapper ]; src = fetchFromGitHub { - rev = version; + rev = "refs/tags/${version}"; owner = "aws"; repo = "amazon-ssm-agent"; - hash = "sha256-zRs7RsShZPH3hb5MsADUNrTfHbJVwCELE9mCqEWaTng="; + hash = "sha256-0tN0rBfz2VZ4UkYLFDGg9218O9vyyRT2Lrppu9TETao="; }; patches = [ @@ -49,7 +54,7 @@ buildGoPackage rec { ./0002-version-gen-don-t-use-unnecessary-constants.patch ]; - # See the list https://github.com/aws/amazon-ssm-agent/blob/3.2.1297.0/makefile#L120-L138 + # See the list https://github.com/aws/amazon-ssm-agent/blob/3.2.1630.0/makefile#L120-L138 # The updater is not built because it cannot work on NixOS subPackages = [ "core" @@ -65,24 +70,27 @@ buildGoPackage rec { "-w" ]; - preConfigure = '' + postPatch = '' printf "#!/bin/sh\ntrue" > ./Tools/src/checkstyle.sh substituteInPlace agent/platform/platform_unix.go \ - --replace "/usr/bin/uname" "${coreutils}/bin/uname" \ - --replace '"/bin", "hostname"' '"${nettools}/bin/hostname"' \ - --replace '"lsb_release"' '"${fake-lsb-release}/bin/lsb_release"' - - substituteInPlace agent/managedInstances/fingerprint/hardwareInfo_unix.go \ - --replace /usr/sbin/dmidecode ${dmidecode}/bin/dmidecode + --replace "/usr/bin/uname" "${coreutils}/bin/uname" \ + --replace '"/bin", "hostname"' '"${nettools}/bin/hostname"' \ + --replace '"lsb_release"' '"${fake-lsb-release}/bin/lsb_release"' substituteInPlace agent/session/shell/shell_unix.go \ - --replace '"script"' '"${util-linux}/bin/script"' + --replace '"script"' '"${util-linux}/bin/script"' + + substituteInPlace agent/rebooter/rebooter_unix.go \ + --replace "/sbin/shutdown" "shutdown" echo "${version}" > VERSION '' + lib.optionalString overrideEtc '' substituteInPlace agent/appconfig/constants_unix.go \ --replace '"/etc/amazon/ssm/"' '"${placeholder "out"}/etc/amazon/ssm/"' + '' + lib.optionalString stdenv.isLinux '' + substituteInPlace agent/managedInstances/fingerprint/hardwareInfo_unix.go \ + --replace /usr/sbin/dmidecode ${dmidecode}/bin/dmidecode ''; preBuild = '' @@ -129,11 +137,23 @@ buildGoPackage rec { wrapProgram $out/bin/amazon-ssm-agent --prefix PATH : ${bashInteractive}/bin ''; + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + package = ssm-agent; + command = "amazon-ssm-agent --version"; + }; + }; + meta = with lib; { description = "Agent to enable remote management of your Amazon EC2 instance configuration"; + changelog = "https://github.com/aws/amazon-ssm-agent/releases/tag/${version}"; homepage = "https://github.com/aws/amazon-ssm-agent"; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ copumpkin manveru ]; + maintainers = with maintainers; [ copumpkin manveru anthonyroussel ]; + + # Darwin support is broken + broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/networking/cluster/starboard/default.nix b/pkgs/applications/networking/cluster/starboard/default.nix index 337d86f9fedba..ddfa4443d826c 100644 --- a/pkgs/applications/networking/cluster/starboard/default.nix +++ b/pkgs/applications/networking/cluster/starboard/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "starboard"; - version = "0.15.13"; + version = "0.15.15"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8sEhR32CaTYGHi6tdhjGl8c42QUbaaUDdFwtpEFwRHo="; + sha256 = "sha256-aKxRjPXvj9rGUheUjpjGWlzg9I6LaCxfc6FJV8Kzj3I="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -20,7 +20,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorHash = "sha256-JEji1wPXLfVireuIVD2Ct/1Nvf92ukwRpMDCrT/CbOE="; + vendorHash = "sha256-dUqcg9/kJfKWIygem0rmtgOiYOHpfWOdH4YV0mYhxeQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix index 3d948dd89fb0e..1d0356e68ebb7 100644 --- a/pkgs/applications/networking/cluster/talosctl/default.nix +++ b/pkgs/applications/networking/cluster/talosctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "talosctl"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "siderolabs"; repo = "talos"; rev = "v${version}"; - hash = "sha256-CEalMrXdLa/pGok1uB60PmxYmmDnSas38cUxvOpkoGk="; + hash = "sha256-RoodFtZ4BINyPxxpVkliMD9Sam0eRujvd3gXR2Hxk70="; }; - vendorHash = "sha256-JDhpRXYnNhVJ5BBKdUmCponRpckH54gMRoKLQ+wx5zM="; + vendorHash = "sha256-PIuSn4qp6bLPFJwkLEb+pX1ra49IkxXYDRzEFbVqVI0="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/cluster/temporal/default.nix b/pkgs/applications/networking/cluster/temporal/default.nix index b53a6800111b8..6c0715939fe56 100644 --- a/pkgs/applications/networking/cluster/temporal/default.nix +++ b/pkgs/applications/networking/cluster/temporal/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "temporal"; - version = "1.21.5"; + version = "1.22.0"; src = fetchFromGitHub { owner = "temporalio"; repo = "temporal"; rev = "v${version}"; - hash = "sha256-G8HqoTdkAAGSadJRF+22hD8q0htwl21HWupfx1/5muc="; + hash = "sha256-7AdbGsgdDsSUtj8TkZl4CcvF2Xk1l9W9Vdos+fEsIVI="; }; - vendorHash = "sha256-AVij8Xb729UQt8BuRf+SoGhoDFzsVELAFV5xCBwnx4c="; + vendorHash = "sha256-gDiVB34fICaS6IyQCAa4ePff/vsT7/7HnJM9ZjiOh4k="; excludedPackages = [ "./build" ]; diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index a13dbfb543630..e6c122a53910b 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -53,7 +53,7 @@ let "Tool for building, changing, and versioning infrastructure"; homepage = "https://www.terraform.io/"; changelog = "https://github.com/hashicorp/terraform/blob/v${version}/CHANGELOG.md"; - license = licenses.mpl20; + license = licenses.bsl11; maintainers = with maintainers; [ Chili-Man babariviere @@ -167,9 +167,9 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.5.7"; - hash = "sha256-pIhwJfa71/gW7lw/KRFBO4Q5Z5YMcTt3r9kD25k8cqM="; - vendorHash = "sha256-lQgWNMBf+ioNxzAV7tnTQSIS840XdI9fg9duuwoK+U4="; + version = "1.6.0"; + hash = "sha256-R1phgtGn9hyNqa0wR1zY9uThTJSIj7TuK5ekXx48QP0="; + vendorHash = "sha256-V7S+IzHfBhIHo0xCvHJ75gOmvVbJd2k8XBdvLG1dcsc="; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index adc1b508d8624..f195f3e4cb276 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.50.17"; + version = "0.51.7"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-N/6l2hFb8jlq6NdGShXgr2BijOfWpfVziVFQRkz0Cu8="; + hash = "sha256-CZKY4/XQsWWlp6Xgv292LstahueJ9iFhxjB//RxlQOo="; }; - vendorHash = "sha256-HWcm8y8bySMV3ue1RpxiXfYyV33cXGFII1/d+XD2Iro="; + vendorHash = "sha256-NSrZVLQ3Qbnp94qCV7NbrEav/7LCRbTov+B2vzbuvdM="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/timoni/default.nix b/pkgs/applications/networking/cluster/timoni/default.nix index 317207f2ed975..ec91b83d0ee19 100644 --- a/pkgs/applications/networking/cluster/timoni/default.nix +++ b/pkgs/applications/networking/cluster/timoni/default.nix @@ -6,16 +6,16 @@ buildGo121Module rec { pname = "timoni"; - version = "0.13.1"; + version = "0.14.0"; src = fetchFromGitHub { owner = "stefanprodan"; repo = "timoni"; rev = "v${version}"; - hash = "sha256-fuDc9EMSjBE0DiZ+OiuRXTRlxnO4/2yxkDsdKpVdg5w="; + hash = "sha256-UYHb469x4VnFffjO9CfSyn0ZzLLaAee2WpWGFAQjBpA="; }; - vendorHash = "sha256-RdfFesMgQU+Iezg9tE3RJ0Tk6jjIWY+ByJoKqUVWHwA="; + vendorHash = "sha256-JDaQL+ferkYI74OUqgfopny8uFEg0J84JX1VtO5URpE="; subPackages = [ "cmd/timoni" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/weave-gitops/default.nix b/pkgs/applications/networking/cluster/weave-gitops/default.nix index 607955ef5c68b..3d43c8538096b 100644 --- a/pkgs/applications/networking/cluster/weave-gitops/default.nix +++ b/pkgs/applications/networking/cluster/weave-gitops/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "weave-gitops"; - version = "0.29.0"; + version = "0.31.2"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = "v${version}"; - sha256 = "sha256-d/MC+QJypLvURLRRp4U3oErf+MdyJ291Pa+gNPkV4xQ="; + sha256 = "sha256-bzYvyqLMdVdgp8C71mnykzB9HEIPDXQ+SpBOScKybJ8="; }; ldflags = [ "-s" "-w" "-X github.com/weaveworks/weave-gitops/cmd/gitops/version.Version=${version}" ]; - vendorHash = "sha256-qwuV/c4lWjtmLp197EOScgZHMe4Wmnbj/Jy8x0n2VSo="; + vendorHash = "sha256-3woVoEh+bU8QOzOEk7hnxxVe0mlPozqUDuP0Rn/9J6k="; subPackages = [ "cmd/gitops" ]; diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index 0c02ba8440245..3b165ab6fa6db 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "werf"; - version = "1.2.255"; + version = "1.2.263"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-XrW/owPeh+lpkGDy0iNigu68Zx0dZIyBhrUkOXaHsaM="; + hash = "sha256-eWiUn6v7XZZH7rudvCMLa3rUBmMsiSUKcwoDCFxRlFE="; }; - vendorHash = "sha256-rLUZnjrKZd1Br4upb+cGY3AMKtKVNxO/VxntmRLGu8A="; + vendorHash = "sha256-0bxM0Y4K6wxg6Ka1A9MusptiSMshTUWJItXoVDpo7lI="; proxyVendor = true; diff --git a/pkgs/applications/networking/cluster/zarf/default.nix b/pkgs/applications/networking/cluster/zarf/default.nix index 7d730763c16f8..eeb97e1b0f01b 100644 --- a/pkgs/applications/networking/cluster/zarf/default.nix +++ b/pkgs/applications/networking/cluster/zarf/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "zarf"; - version = "0.29.1"; + version = "0.29.2"; src = fetchFromGitHub { owner = "defenseunicorns"; repo = "zarf"; rev = "v${version}"; - hash = "sha256-m/eyy3MpHHlxlWU9Y7tsQw5jGGZIKCvBkIgoRmvecBI="; + hash = "sha256-eSKoh1Ab2rzpOOHRi+FZ92ic92Q6bFpu1jYIPhmoqQc="; }; vendorHash = "sha256-p1QLNbkNlIwqHzLjGX5YGC2Xxu0nAjmMfGwKXhi9XkU="; diff --git a/pkgs/applications/networking/deck/default.nix b/pkgs/applications/networking/deck/default.nix index ba5204b66139b..27b82928cc5d2 100644 --- a/pkgs/applications/networking/deck/default.nix +++ b/pkgs/applications/networking/deck/default.nix @@ -1,15 +1,14 @@ { buildGoModule, lib, installShellFiles, fetchFromGitHub }: -let - short_hash = "63b9742"; -in buildGoModule rec { + +buildGoModule rec { pname = "deck"; - version = "1.26.0"; + version = "1.27.0"; src = fetchFromGitHub { owner = "Kong"; repo = "deck"; rev = "v${version}"; - hash = "sha256-DxmIHJfvRZKsMyFllbfpriT4Ts9f7ha4aZcfVr/b9eA="; + hash = "sha256-QP267H1vfsIo1EhV9vAWt03ewGufPHT8sZWcj/AHuxw="; }; nativeBuildInputs = [ installShellFiles ]; @@ -18,10 +17,11 @@ in buildGoModule rec { ldflags = [ "-s -w -X github.com/kong/deck/cmd.VERSION=${version}" - "-X github.com/kong/deck/cmd.COMMIT=${short_hash}" + "-X github.com/kong/deck/cmd.COMMIT=${src.rev}" ]; - vendorHash = "sha256-jhLZvusYpX5fW1NCmJtwE/p9/wTwzA2hbwt657VsZts="; + proxyVendor = true; # darwin/linux hash mismatch + vendorHash = "sha256-ikgD17+lnKpxCzrIkOXOq332X48qEdSWXIIRoq76fB4="; postInstall = '' installShellCompletion --cmd deck \ diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index a00717801abaf..83544b7f9a27b 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnscontrol"; - version = "4.4.0"; + version = "4.4.1"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OxZH8dUl7PEzcan9Jl1rwPpP0+pj4jzLydEQfxxWM+o="; + sha256 = "sha256-+4TQAtqM1ruhv3W1SBHAd1WVJKa7dvGLHlxVqazc+uk="; }; vendorHash = "sha256-3aGdn6Gp+N/a+o9dl4h0oIOnYhtu4oZuBF6X/HKjQOI="; diff --git a/pkgs/applications/networking/drive/default.nix b/pkgs/applications/networking/drive/default.nix index b90be9e2a55d5..4c7b5727fbac9 100644 --- a/pkgs/applications/networking/drive/default.nix +++ b/pkgs/applications/networking/drive/default.nix @@ -29,6 +29,6 @@ buildGoModule rec { homepage = "https://github.com/odeke-em/drive"; description = "Google Drive client for the commandline"; license = licenses.asl20; - maintainers = with maintainers; [ aaronjheng ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/security/rucredstash/Cargo.lock b/pkgs/applications/networking/dyndns/cfdyndns/Cargo.lock index fe3e2c8909572..c7e42c551fe72 100644 --- a/pkgs/tools/security/rucredstash/Cargo.lock +++ b/pkgs/applications/networking/dyndns/cfdyndns/Cargo.lock @@ -3,28 +3,36 @@ version = 3 [[package]] -name = "aes" -version = "0.7.5" +name = "addr2line" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ - "cfg-if", - "cipher", - "cpufeatures", - "ctr", - "opaque-debug", + "gimli", ] [[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] name = "aho-corasick" -version = "1.0.1" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" dependencies = [ "memchr", ] [[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] name = "android_system_properties" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -34,25 +42,68 @@ dependencies = [ ] [[package]] -name = "async-trait" -version = "0.1.68" +name = "anstream" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" dependencies = [ - "proc-macro2", - "quote", - "syn", + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", ] [[package]] -name = "atty" -version = "0.2.14" +name = "anstyle" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46" + +[[package]] +name = "anstyle-parse" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "anstyle-wincon" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" +dependencies = [ + "anstyle", + "windows-sys", +] + +[[package]] +name = "anyhow" +version = "1.0.75" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" + +[[package]] +name = "async-trait" +version = "0.1.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.37", ] [[package]] @@ -62,43 +113,78 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] +name = "backtrace" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] name = "base64" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] +name = "base64" +version = "0.21.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" + +[[package]] name = "bitflags" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] -name = "block-buffer" -version = "0.9.0" +name = "bitflags" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "generic-array", -] +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" [[package]] name = "bumpalo" -version = "3.12.2" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c6ed94e98ecff0c12dd1b04c15ec0d7d9458ca8fe806cea6f12954efe74c63b" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "bytes" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] + +[[package]] +name = "cfdyndns" +version = "0.2.0" +dependencies = [ + "anyhow", + "clap", + "clap-verbosity-flag", + "cloudflare", + "log", + "pretty_env_logger", + "public-ip", + "tokio", +] [[package]] name = "cfg-if" @@ -108,51 +194,98 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.24" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ + "android-tzdata", "iana-time-zone", - "num-integer", + "js-sys", "num-traits", "serde", - "winapi", + "wasm-bindgen", + "windows-targets", ] [[package]] -name = "cipher" -version = "0.3.0" +name = "clap" +version = "4.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" +checksum = "824956d0dca8334758a5b7f7e50518d66ea319330cbceedcf76905c2f6ab30e3" dependencies = [ - "generic-array", + "clap_builder", + "clap_derive", ] [[package]] -name = "clap" -version = "3.2.25" +name = "clap-verbosity-flag" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1eef05769009513df2eb1c3b4613e7fad873a14c600ff025b08f250f59fee7de" +dependencies = [ + "clap", + "log", +] + +[[package]] +name = "clap_builder" +version = "4.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" +checksum = "122ec64120a49b4563ccaedcbea7818d069ed8e9aa6d829b82d8a4128936b2ab" dependencies = [ - "atty", - "bitflags", + "anstream", + "anstyle", "clap_lex", - "indexmap", - "strsim", - "termcolor", - "textwrap", + "strsim 0.10.0", + "terminal_size", +] + +[[package]] +name = "clap_derive" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.37", ] [[package]] name = "clap_lex" -version = "0.2.4" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" + +[[package]] +name = "cloudflare" +version = "0.10.1" +source = "git+https://github.com/jcgruenhage/cloudflare-rs.git?branch=make-owner-fields-optional#02397fc4211886548a31a0731b240f2e17309de4" dependencies = [ - "os_str_bytes", + "anyhow", + "async-trait", + "base64 0.13.1", + "cfg-if", + "chrono", + "http", + "percent-encoding", + "reqwest", + "serde", + "serde_json", + "serde_qs", + "serde_with", + "url", + "uuid", ] [[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] name = "core-foundation" version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -169,111 +302,162 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] -name = "cpufeatures" -version = "0.2.7" +name = "darling" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" +checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" dependencies = [ - "libc", + "darling_core 0.10.2", + "darling_macro 0.10.2", ] [[package]] -name = "crc32fast" -version = "1.3.2" +name = "darling" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" dependencies = [ - "cfg-if", + "darling_core 0.20.3", + "darling_macro 0.20.3", ] [[package]] -name = "credstash" -version = "0.9.0" +name = "darling_core" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" dependencies = [ - "aes", - "base64", - "bytes", - "clap", - "either", - "env_logger", - "futures", - "hex", - "log", - "ring", - "rusoto_core", - "rusoto_credential", - "rusoto_dynamodb", - "rusoto_ec2", - "rusoto_kms", - "rusoto_sts", - "serde", - "serde_json", - "tokio", + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim 0.9.3", + "syn 1.0.109", ] [[package]] -name = "crypto-mac" -version = "0.11.1" +name = "darling_core" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" +checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" dependencies = [ - "generic-array", - "subtle", + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim 0.10.0", + "syn 2.0.37", ] [[package]] -name = "ctr" -version = "0.8.0" +name = "darling_macro" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" +checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" dependencies = [ - "cipher", + "darling_core 0.10.2", + "quote", + "syn 1.0.109", ] [[package]] -name = "digest" +name = "darling_macro" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +dependencies = [ + "darling_core 0.20.3", + "quote", + "syn 2.0.37", +] + +[[package]] +name = "data-encoding" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" + +[[package]] +name = "deranged" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +dependencies = [ + "serde", +] + +[[package]] +name = "derive_builder" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" +checksum = "a2658621297f2cf68762a6f7dc0bb7e1ff2cfd6583daef8ee0fed6f7ec468ec0" dependencies = [ - "generic-array", + "darling 0.10.2", + "derive_builder_core", + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] -name = "dirs-next" -version = "2.0.0" +name = "derive_builder_core" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +checksum = "2791ea3e372c8495c0bc2033991d76b512cd799d07491fbd6890124db9458bef" dependencies = [ - "cfg-if", - "dirs-sys-next", + "darling 0.10.2", + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] -name = "dirs-sys-next" -version = "0.1.2" +name = "dns-lookup" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +checksum = "53ecafc952c4528d9b51a458d1a8904b81783feff9fde08ab6ed2545ff396872" dependencies = [ + "cfg-if", "libc", - "redox_users", + "socket2 0.4.9", "winapi", ] [[package]] -name = "either" -version = "1.8.1" +name = "encoding_rs" +version = "0.8.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "endian-type" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" + +[[package]] +name = "enum-as-inner" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 1.0.109", +] [[package]] name = "env_logger" -version = "0.9.3" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" dependencies = [ - "atty", "humantime", + "is-terminal", "log", "regex", "termcolor", @@ -281,13 +465,13 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" dependencies = [ "errno-dragonfly", "libc", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -302,12 +486,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "1.9.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fnv" @@ -332,9 +513,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ "percent-encoding", ] @@ -395,7 +576,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.37", ] [[package]] @@ -429,20 +610,10 @@ dependencies = [ ] [[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] name = "getrandom" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "libc", @@ -450,10 +621,16 @@ dependencies = [ ] [[package]] +name = "gimli" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" + +[[package]] name = "h2" -version = "0.3.19" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" dependencies = [ "bytes", "fnv", @@ -475,28 +652,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.2.6" +name = "heck" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "hex" @@ -505,16 +670,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] -name = "hmac" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" -dependencies = [ - "crypto-mac", - "digest", -] - -[[package]] name = "http" version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -544,9 +699,9 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "humantime" @@ -556,9 +711,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.26" +version = "0.14.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" dependencies = [ "bytes", "futures-channel", @@ -571,7 +726,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2", + "socket2 0.4.9", "tokio", "tower-service", "tracing", @@ -579,6 +734,38 @@ dependencies = [ ] [[package]] +name = "hyper-openssl" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6ee5d7a8f718585d1c3c61dfde28ef5b0bb14734b4db13f5ada856cdc6c612b" +dependencies = [ + "http", + "hyper", + "linked_hash_set", + "once_cell", + "openssl", + "openssl-sys", + "parking_lot", + "tokio", + "tokio-openssl", + "tower-layer", +] + +[[package]] +name = "hyper-system-resolver" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eea26c5d0b6ab9d72219f65000af310f042a740926f7b2fa3553e774036e2e7" +dependencies = [ + "derive_builder", + "dns-lookup", + "hyper", + "tokio", + "tower-service", + "tracing", +] + +[[package]] name = "hyper-tls" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -593,9 +780,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.56" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -615,6 +802,33 @@ dependencies = [ ] [[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +dependencies = [ + "matches", + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "idna" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] name = "indexmap" version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -622,39 +836,37 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown", + "serde", ] [[package]] -name = "instant" -version = "0.1.12" +name = "ipnet" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] +checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" [[package]] -name = "io-lifetimes" -version = "1.0.10" +name = "is-terminal" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.1", - "libc", - "windows-sys 0.48.0", + "hermit-abi", + "rustix", + "windows-sys", ] [[package]] name = "itoa" -version = "1.0.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "js-sys" -version = "0.3.62" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68c16e1bfd491478ab155fd8b4896b86f9ede344949b641e61501e07c2b8b4d5" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] @@ -667,52 +879,83 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.144" +version = "0.2.148" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" +checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" [[package]] -name = "linux-raw-sys" -version = "0.3.7" +name = "linked-hash-map" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ece97ea872ece730aed82664c424eb4c8291e1ff2480247ccf7409044bc6479f" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] -name = "log" -version = "0.4.17" +name = "linked_hash_set" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +checksum = "47186c6da4d81ca383c7c47c1bfc80f4b95f4720514d860a5407aaf4233f9588" dependencies = [ - "cfg-if", + "linked-hash-map", ] [[package]] -name = "md-5" -version = "0.9.1" +name = "linux-raw-sys" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" + +[[package]] +name = "lock_api" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5a279bb9607f9f53c22d496eade00d138d1bdcccd07d74650387cf94942a15" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ - "block-buffer", - "digest", - "opaque-debug", + "autocfg", + "scopeguard", ] [[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] +name = "matches" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" + +[[package]] name = "memchr" -version = "2.5.0" +version = "2.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" + +[[package]] +name = "mime" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] [[package]] name = "mio" -version = "0.8.6" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", - "log", "wasi", - "windows-sys 0.45.0", + "windows-sys", ] [[package]] @@ -734,53 +977,55 @@ dependencies = [ ] [[package]] -name = "num-integer" -version = "0.1.45" +name = "nibble_vec" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43" dependencies = [ - "autocfg", - "num-traits", + "smallvec", ] [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", ] [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi", "libc", ] [[package]] -name = "once_cell" -version = "1.17.1" +name = "object" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +dependencies = [ + "memchr", +] [[package]] -name = "opaque-debug" -version = "0.3.0" +name = "once_cell" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "openssl" -version = "0.10.52" +version = "0.10.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01b8574602df80f7b85fdfc5392fa884a4e3b3f4f35402c070ab34c3d3f78d56" +checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" dependencies = [ - "bitflags", + "bitflags 2.4.0", "cfg-if", "foreign-types", "libc", @@ -797,7 +1042,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.37", ] [[package]] @@ -808,9 +1053,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.87" +version = "0.9.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e17f59264b2809d77ae94f0e1ebabc434773f370d6ca667bd223ea10e06cc7e" +checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" dependencies = [ "cc", "libc", @@ -819,22 +1064,59 @@ dependencies = [ ] [[package]] -name = "os_str_bytes" -version = "6.5.0" +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets", +] [[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" + +[[package]] +name = "pin-project" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.37", +] [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -849,255 +1131,224 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] -name = "proc-macro2" -version = "1.0.56" +name = "ppv-lite86" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" -dependencies = [ - "unicode-ident", -] +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] -name = "quote" -version = "1.0.27" +name = "pretty_env_logger" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" +checksum = "865724d4dbe39d9f3dd3b52b88d859d66bcb2d6a0acfd5ea68a65fb66d4bdc1c" dependencies = [ - "proc-macro2", + "env_logger", + "log", ] [[package]] -name = "redox_syscall" -version = "0.2.16" +name = "proc-macro2" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" dependencies = [ - "bitflags", + "unicode-ident", ] [[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +name = "public-ip" +version = "0.2.2" +source = "git+https://github.com/jcgruenhage/rust-public-ip.git?branch=cloudflare-provider#f0f0e68aebf9d796deaa3af04c8c6d4df3c515fe" dependencies = [ - "bitflags", + "dns-lookup", + "futures-core", + "futures-util", + "http", + "hyper", + "hyper-openssl", + "hyper-system-resolver", + "openssl", + "pin-project-lite", + "thiserror", + "tokio", + "tower-layer", + "tracing", + "tracing-futures", + "trust-dns-client", + "trust-dns-proto", ] [[package]] -name = "redox_users" -version = "0.4.3" +name = "quote" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ - "getrandom", - "redox_syscall 0.2.16", - "thiserror", + "proc-macro2", ] [[package]] -name = "regex" -version = "1.8.1" +name = "radix_trie" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" +checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd" dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", + "endian-type", + "nibble_vec", ] [[package]] -name = "regex-syntax" -version = "0.7.1" +name = "rand" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" - -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ - "cc", "libc", - "once_cell", - "spin", - "untrusted", - "web-sys", - "winapi", + "rand_chacha", + "rand_core", ] [[package]] -name = "rusoto_core" -version = "0.47.0" +name = "rand_chacha" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b4f000e8934c1b4f70adde180056812e7ea6b1a247952db8ee98c94cd3116cc" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ - "async-trait", - "base64", - "bytes", - "crc32fast", - "futures", - "http", - "hyper", - "hyper-tls", - "lazy_static", - "log", - "rusoto_credential", - "rusoto_signature", - "rustc_version", - "serde", - "serde_json", - "tokio", - "xml-rs", + "ppv-lite86", + "rand_core", ] [[package]] -name = "rusoto_credential" -version = "0.47.0" +name = "rand_core" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a46b67db7bb66f5541e44db22b0a02fed59c9603e146db3a9e633272d3bac2f" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "async-trait", - "chrono", - "dirs-next", - "futures", - "hyper", - "serde", - "serde_json", - "shlex", - "tokio", - "zeroize", + "getrandom", ] [[package]] -name = "rusoto_dynamodb" -version = "0.47.0" +name = "redox_syscall" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7935e1f9ca57c4ee92a4d823dcd698eb8c992f7e84ca21976ae72cd2b03016e7" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "async-trait", - "bytes", - "futures", - "rusoto_core", - "serde", - "serde_json", + "bitflags 1.3.2", ] [[package]] -name = "rusoto_ec2" -version = "0.47.0" +name = "regex" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92315363c2f2acda29029ce0ce0e58e1c32caf10c9719068a1ec102add3d4878" +checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" dependencies = [ - "async-trait", - "bytes", - "futures", - "rusoto_core", - "serde_urlencoded", - "xml-rs", + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", ] [[package]] -name = "rusoto_kms" -version = "0.47.0" +name = "regex-automata" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7892cd2cca7644d33bd6fafdb2236efd3659162fd7b73ca68d3877f0528399c" +checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" dependencies = [ - "async-trait", - "bytes", - "futures", - "rusoto_core", - "serde", - "serde_json", + "aho-corasick", + "memchr", + "regex-syntax", ] [[package]] -name = "rusoto_signature" -version = "0.47.0" +name = "regex-syntax" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" + +[[package]] +name = "reqwest" +version = "0.11.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6264e93384b90a747758bcc82079711eacf2e755c3a8b5091687b5349d870bcc" +checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" dependencies = [ - "base64", + "base64 0.21.4", "bytes", - "chrono", - "digest", - "futures", - "hex", - "hmac", + "encoding_rs", + "futures-core", + "futures-util", + "h2", "http", + "http-body", "hyper", + "hyper-tls", + "ipnet", + "js-sys", "log", - "md-5", + "mime", + "native-tls", + "once_cell", "percent-encoding", "pin-project-lite", - "rusoto_credential", - "rustc_version", "serde", - "sha2", - "tokio", -] - -[[package]] -name = "rusoto_sts" -version = "0.47.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e7edd42473ac006fd54105f619e480b0a94136e7f53cf3fb73541363678fd92" -dependencies = [ - "async-trait", - "bytes", - "chrono", - "futures", - "rusoto_core", + "serde_json", "serde_urlencoded", - "xml-rs", + "tokio", + "tokio-native-tls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg", ] [[package]] -name = "rustc_version" -version = "0.4.0" +name = "rustc-demangle" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustix" -version = "0.37.19" +version = "0.38.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" +checksum = "747c788e9ce8e92b12cd485c49ddf90723550b654b32508f979b71a7b1ecda4f" dependencies = [ - "bitflags", + "bitflags 2.4.0", "errno", - "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "schannel" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "windows-sys 0.42.0", + "windows-sys", ] [[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] name = "security-framework" -version = "2.9.0" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2855b3715770894e67cbfa3df957790aa0c9edc3bf06efa1a84d77fa0839d1" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -1106,45 +1357,39 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ "core-foundation-sys", "libc", ] [[package]] -name = "semver" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" - -[[package]] name = "serde" -version = "1.0.163" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.163" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.37", ] [[package]] name = "serde_json" -version = "1.0.96" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ "itoa", "ryu", @@ -1152,6 +1397,17 @@ dependencies = [ ] [[package]] +name = "serde_qs" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cac3f1e2ca2fe333923a1ae72caca910b98ed0630bb35ef6f8c8517d6e81afa" +dependencies = [ + "percent-encoding", + "serde", + "thiserror", +] + +[[package]] name = "serde_urlencoded" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1164,43 +1420,49 @@ dependencies = [ ] [[package]] -name = "sha2" -version = "0.9.9" +name = "serde_with" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" +checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" dependencies = [ - "block-buffer", - "cfg-if", - "cpufeatures", - "digest", - "opaque-debug", + "base64 0.13.1", + "chrono", + "hex", + "indexmap", + "serde", + "serde_json", + "serde_with_macros", + "time", ] [[package]] -name = "shlex" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" - -[[package]] -name = "signal-hook-registry" -version = "1.4.1" +name = "serde_with_macros" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" dependencies = [ - "libc", + "darling 0.20.3", + "proc-macro2", + "quote", + "syn 2.0.37", ] [[package]] name = "slab" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] [[package]] +name = "smallvec" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" + +[[package]] name = "socket2" version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1211,10 +1473,20 @@ dependencies = [ ] [[package]] -name = "spin" -version = "0.5.2" +name = "socket2" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" +dependencies = [ + "libc", + "windows-sys", +] + +[[package]] +name = "strsim" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" [[package]] name = "strsim" @@ -1223,16 +1495,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] -name = "subtle" -version = "2.4.1" +name = "syn" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] [[package]] name = "syn" -version = "2.0.15" +version = "2.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" +checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" dependencies = [ "proc-macro2", "quote", @@ -1241,68 +1518,114 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.5.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if", "fastrand", - "redox_syscall 0.3.5", + "redox_syscall", "rustix", - "windows-sys 0.45.0", + "windows-sys", ] [[package]] name = "termcolor" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" dependencies = [ "winapi-util", ] [[package]] -name = "textwrap" -version = "0.16.0" +name = "terminal_size" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" +checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" +dependencies = [ + "rustix", + "windows-sys", +] [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.37", +] + +[[package]] +name = "time" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "426f806f4089c493dcac0d24c29c01e2c38baf8e30f1b716ee37e83d200b18fe" +dependencies = [ + "deranged", + "itoa", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +dependencies = [ + "time-core", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", ] [[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] name = "tokio" -version = "1.28.1" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ - "autocfg", + "backtrace", "bytes", "libc", "mio", "num_cpus", "pin-project-lite", - "signal-hook-registry", - "socket2", + "socket2 0.5.4", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -1313,7 +1636,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.37", ] [[package]] @@ -1327,10 +1650,22 @@ dependencies = [ ] [[package]] +name = "tokio-openssl" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08f9ffb7809f1b20c1b398d92acf4cc719874b3b2b2d9ea2f09b4a80350878a" +dependencies = [ + "futures-util", + "openssl", + "openssl-sys", + "tokio", +] + +[[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" dependencies = [ "bytes", "futures-core", @@ -1341,6 +1676,12 @@ dependencies = [ ] [[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + +[[package]] name = "tower-service" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1354,10 +1695,22 @@ checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ "cfg-if", "pin-project-lite", + "tracing-attributes", "tracing-core", ] [[package]] +name = "tracing-attributes" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.37", +] + +[[package]] name = "tracing-core" version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1367,48 +1720,128 @@ dependencies = [ ] [[package]] +name = "tracing-futures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" +dependencies = [ + "futures", + "futures-task", + "pin-project", + "tracing", +] + +[[package]] +name = "trust-dns-client" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c408c32e6a9dbb38037cece35740f2cf23c875d8ca134d33631cec83f74d3fe" +dependencies = [ + "cfg-if", + "data-encoding", + "futures-channel", + "futures-util", + "lazy_static", + "radix_trie", + "rand", + "thiserror", + "time", + "tokio", + "tracing", + "trust-dns-proto", +] + +[[package]] +name = "trust-dns-proto" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26" +dependencies = [ + "async-trait", + "cfg-if", + "data-encoding", + "enum-as-inner", + "futures-channel", + "futures-io", + "futures-util", + "idna 0.2.3", + "ipnet", + "lazy_static", + "rand", + "smallvec", + "thiserror", + "tinyvec", + "tokio", + "tracing", + "url", +] + +[[package]] name = "try-lock" version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] -name = "typenum" -version = "1.16.0" +name = "unicode-bidi" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] -name = "untrusted" -version = "0.7.1" +name = "unicode-normalization" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] [[package]] -name = "vcpkg" -version = "0.2.15" +name = "url" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +dependencies = [ + "form_urlencoded", + "idna 0.4.0", + "percent-encoding", +] [[package]] -name = "version_check" -version = "0.9.4" +name = "utf8parse" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "uuid" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +dependencies = [ + "getrandom", + "serde", +] + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "want" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" dependencies = [ - "log", "try-lock", ] @@ -1420,9 +1853,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.85" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b6cb788c4e39112fbe1822277ef6fb3c55cd86b95cb3d3c4c1c9597e4ac74b4" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -1430,24 +1863,36 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.85" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35e522ed4105a9d626d885b35d62501b30d9666283a5c8be12c14a8bdafe7822" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn", + "syn 2.0.37", "wasm-bindgen-shared", ] [[package]] +name = "wasm-bindgen-futures" +version = "0.4.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] name = "wasm-bindgen-macro" -version = "0.2.85" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "358a79a0cb89d21db8120cbfb91392335913e4890665b1a7981d9e956903b434" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1455,28 +1900,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.85" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4783ce29f09b9d93134d41297aded3a712b7b979e9c6f28c32cb88c973a94869" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.37", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.85" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a901d592cafaa4d711bc324edfaff879ac700b19c3dfd60058d2b445be2691eb" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "web-sys" -version = "0.3.62" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b5f940c7edfdc6d12126d98c9ef4d1b3d470011c47c76a6581df47ad9ba721" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" dependencies = [ "js-sys", "wasm-bindgen", @@ -1500,9 +1945,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ "winapi", ] @@ -1519,31 +1964,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets 0.48.0", -] - -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", + "windows-targets", ] [[package]] @@ -1552,131 +1973,72 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.0", -] - -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", + "windows-targets", ] [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" - -[[package]] -name = "xml-rs" -version = "0.8.10" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc95a04ea24f543cd9be5aab44f963fa35589c99e18415c38fb2b17e133bf8d2" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] -name = "zeroize" -version = "1.6.0" +name = "winreg" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys", +] diff --git a/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/pkgs/applications/networking/dyndns/cfdyndns/default.nix index af52ed7b64bab..3d348d3471726 100644 --- a/pkgs/applications/networking/dyndns/cfdyndns/default.nix +++ b/pkgs/applications/networking/dyndns/cfdyndns/default.nix @@ -2,24 +2,26 @@ rustPlatform.buildRustPackage rec { pname = "cfdyndns"; - version = "0.0.4"; + version = "0.2.0"; src = fetchFromGitHub { - owner = "colemickens"; + owner = "nrdxp"; repo = "cfdyndns"; rev = "v${version}"; - hash = "sha256-kgpTKhMvxuy+Q9M5U/PKJt7pZ2kSQxkCNjNu8aIyutg="; + hash = "sha256-iwKMTWLK7pgz8AEmPVBO1bTWrXTokQJ+Z1U4CiiRdho="; }; - cargoHash = "sha256-78TQkRHEbSaCyCM48hH1h8GG0BGJmC2zc7gTZc2t9Nc="; + cargoLock.lockFile = ./Cargo.lock; + cargoLock.outputHashes."cloudflare-0.10.1" = "sha256-AJW4AQ34EDhxf7zMhFY2rqq5n4IaSVWJAYi+7jXEUVo="; + cargoLock.outputHashes."public-ip-0.2.2" = "sha256-DDdh90EAo3Ppsym4AntczFuiAQo4/QQ9TEPJjMB1XzY="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; meta = with lib; { description = "CloudFlare Dynamic DNS Client"; - homepage = "https://github.com/colemickens/cfdyndns"; + homepage = "https://github.com/nrdxp/cfdyndns"; license = lib.licenses.mit; - maintainers = with maintainers; [ colemickens ]; + maintainers = with maintainers; [ colemickens nrdxp ]; platforms = with platforms; linux; }; } diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index cbfe6a8958ac9..723e2bef1b827 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "newsboat"; - version = "2.32"; + version = "2.33"; src = fetchFromGitHub { owner = "newsboat"; repo = "newsboat"; rev = "r${version}"; - hash = "sha256-ACPnCm2cu9BEpMd02t+G4mg6DZ8jCydfK4p+Ad87Hek="; + hash = "sha256-p9cyH5jANkB+PuvAq6KjaelgPwj1f7XNxuKMpT7jjpg="; }; - cargoHash = "sha256-HHc8HSNWoBkDR7lQgvXUML5ly8sShDn16DWNf/Jig2g="; + cargoHash = "sha256-95xM4kZZ70xhfx+EvqFecYbVdisq9hpgp0t+s5Cp8QQ="; # TODO: Check if that's still needed postPatch = lib.optionalString stdenv.isDarwin '' @@ -59,12 +59,12 @@ rustPlatform.buildRustPackage rec { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { homepage = "https://newsboat.org/"; changelog = "https://github.com/newsboat/newsboat/blob/${src.rev}/CHANGELOG.md"; description = "A fork of Newsbeuter, an RSS/Atom feed reader for the text console"; - maintainers = with maintainers; [ dotlambda nicknovitski ]; - license = licenses.mit; - platforms = platforms.unix; + maintainers = with lib.maintainers; [ dotlambda nicknovitski ]; + license = lib.licenses.mit; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 13b11c4ed5ace..80772c26ecc85 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -4,9 +4,26 @@ , fetchFromGitHub }: -python3.pkgs.buildPythonApplication rec { +let + python = python3.override { + # FlexGet doesn't support transmission-rpc>=5 yet + # https://github.com/NixOS/nixpkgs/issues/258504 + packageOverrides = self: super: { + transmission-rpc = super.transmission-rpc.overridePythonAttrs (old: rec { + version = "4.3.1"; + src = fetchPypi { + pname = "transmission_rpc"; + inherit version; + hash = "sha256-Kh2eARIfM6MuXu7RjPPVhvPZ+bs0AXkA4qUCbfu5hHU="; + }; + doCheck = false; + }); + }; + }; +in +python.pkgs.buildPythonApplication rec { pname = "flexget"; - version = "3.9.9"; + version = "3.9.11"; format = "pyproject"; # Fetch from GitHub in order to use `requirements.in` @@ -14,7 +31,7 @@ python3.pkgs.buildPythonApplication rec { owner = "Flexget"; repo = "Flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-kZ+RHkqmmRd7Ew5u8/SQADzOUa9YwCsj+nmtthCDlDw="; + hash = "sha256-0ONjRIMSfHKvaO05hhurfnS/waNNRZEVq7BodeV00kU="; }; postPatch = '' @@ -22,12 +39,12 @@ python3.pkgs.buildPythonApplication rec { sed 's/[~<>=][^;]*//' -i requirements.txt ''; - nativeBuildInputs = with python3.pkgs; [ + nativeBuildInputs = with python.pkgs; [ setuptools wheel ]; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = with python.pkgs; [ # See https://github.com/Flexget/Flexget/blob/master/requirements.txt apscheduler beautifulsoup4 diff --git a/pkgs/applications/networking/gnmic/default.nix b/pkgs/applications/networking/gnmic/default.nix index 43884541cdd13..4e78f0c0fcd23 100644 --- a/pkgs/applications/networking/gnmic/default.nix +++ b/pkgs/applications/networking/gnmic/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "gnmic"; - version = "0.31.7"; + version = "0.32.0"; src = fetchFromGitHub { owner = "openconfig"; repo = pname; rev = "v${version}"; - hash = "sha256-bX8oZk0psPqoXFU8b2JQmfFaPz18yiuSVXDmhoOnpFg="; + hash = "sha256-aEAbIh1BH8R05SpSMSXL2IrudjIki72k7NGvjjKkxZw="; }; vendorHash = "sha256-hIG3kG2e9Y2hnHJ+96cPLgnlp5ParsLgWQY0HZTDggY="; diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 43aa6e7343a72..bd1b74fe4a744 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -12,25 +12,25 @@ in { guiStable = mkGui { channel = "stable"; - version = "2.2.42"; - hash = "sha256-FW8Nuha+NrYVhR/66AiBpcCLHRhiLTW8KdHFyWSao84="; + version = "2.2.43"; + hash = "sha256-+2dcyWnTJqGaH9yhknYc9/0gnj3qh80eAy6uxG7+fFM="; }; guiPreview = mkGui { channel = "stable"; - version = "2.2.42"; - hash = "sha256-FW8Nuha+NrYVhR/66AiBpcCLHRhiLTW8KdHFyWSao84="; + version = "2.2.43"; + hash = "sha256-+2dcyWnTJqGaH9yhknYc9/0gnj3qh80eAy6uxG7+fFM="; }; serverStable = mkServer { channel = "stable"; - version = "2.2.42"; - hash = "sha256-YM07krEay2W+/6mKLAg+B7VEnAyDlkD+0+cSO1FAJzA="; + version = "2.2.43"; + hash = "sha256-xWt2qzeqBtt86Wv3dYl4GXkfjr+7WAKn5HdDeUzOQd8="; }; serverPreview = mkServer { channel = "stable"; - version = "2.2.42"; - hash = "sha256-YM07krEay2W+/6mKLAg+B7VEnAyDlkD+0+cSO1FAJzA="; + version = "2.2.43"; + hash = "sha256-xWt2qzeqBtt86Wv3dYl4GXkfjr+7WAKn5HdDeUzOQd8="; }; } diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix index 13764d5066979..a9537d9931711 100644 --- a/pkgs/applications/networking/gns3/gui.nix +++ b/pkgs/applications/networking/gns3/gui.nix @@ -6,6 +6,7 @@ { lib , python3 , fetchFromGitHub +, qt5 , wrapQtAppsHook }: @@ -21,7 +22,6 @@ python3.pkgs.buildPythonApplication rec { }; nativeBuildInputs = with python3.pkgs; [ - pythonRelaxDepsHook wrapQtAppsHook ]; @@ -33,21 +33,29 @@ python3.pkgs.buildPythonApplication rec { setuptools sip_4 (pyqt5.override { withWebSockets = true; }) truststore + ] ++ lib.optionals (pythonOlder "3.9") [ + importlib-resources ]; - pythonRelaxDeps = [ - "jsonschema" - "sentry-sdk" - ]; - - doCheck = false; # Failing - dontWrapQtApps = true; preFixup = '' wrapQtApp "$out/bin/gns3" ''; + doCheck = true; + + checkInputs = with python3.pkgs; [ + pytestCheckHook + ]; + + preCheck = '' + export HOME=$(mktemp -d) + export QT_PLUGIN_PATH="${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix}" + export QT_QPA_PLATFORM_PLUGIN_PATH="${qt5.qtbase.bin}/lib/qt-${qt5.qtbase.version}/plugins"; + export QT_QPA_PLATFORM=offscreen + ''; + meta = with lib; { description = "Graphical Network Simulator 3 GUI (${channel} release)"; longDescription = '' diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index 200153b15e031..48d48de83b2a5 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -7,6 +7,7 @@ , python3 , fetchFromGitHub , pkgsStatic +, stdenv }: python3.pkgs.buildPythonApplication { @@ -25,14 +26,6 @@ python3.pkgs.buildPythonApplication { cp ${pkgsStatic.busybox}/bin/busybox gns3server/compute/docker/resources/bin/busybox ''; - nativeBuildInputs = with python3.pkgs; [ - pythonRelaxDepsHook - ]; - - pythonRelaxDeps = [ - "jsonschema" - ]; - propagatedBuildInputs = with python3.pkgs; [ aiofiles aiohttp @@ -43,6 +36,7 @@ python3.pkgs.buildPythonApplication { jinja2 jsonschema multidict + platformdirs prompt-toolkit psutil py-cpuinfo @@ -53,13 +47,31 @@ python3.pkgs.buildPythonApplication { zipstream ]; - # Requires network access - doCheck = false; + postInstall = lib.optionalString (!stdenv.hostPlatform.isWindows) '' + rm $out/bin/gns3loopback + ''; + + doCheck = true; - postInstall = '' - rm $out/bin/gns3loopback # For Windows only + # Otherwise tests will fail to create directory + # Permission denied: '/homeless-shelter' + preCheck = '' + export HOME=$(mktemp -d) ''; + checkInputs = with python3.pkgs; [ + pytest-aiohttp + pytest-rerunfailures + pytestCheckHook + ]; + + pytestFlagsArray = [ + # fails on ofborg because of lack of cpu vendor information + "--deselect=tests/controller/gns3vm/test_virtualbox_gns3_vm.py::test_cpu_vendor_id" + # Rerun failed tests up to three times (flaky tests) + "--reruns 3" + ]; + meta = with lib; { description = "Graphical Network Simulator 3 server (${channel} release)"; longDescription = '' diff --git a/pkgs/applications/networking/gopher/sacc/default.nix b/pkgs/applications/networking/gopher/sacc/default.nix index 1afcbe4d2a86b..9944238703983 100644 --- a/pkgs/applications/networking/gopher/sacc/default.nix +++ b/pkgs/applications/networking/gopher/sacc/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "ftp://bitreich.org/releases/sacc/sacc-${version}.tar.gz"; - sha512 = "7a895e432e1d28b7d9b2bb2a5326ca32350876a2c80d39dc6c19e75347d72a4847f1aa4ff11f07e8a9adea14ea71b84d70890dcc170ff6ce0b779e1d6586b4fa"; + hash = "sha512-eoleQy4dKLfZsrsqUybKMjUIdqLIDTncbBnnU0fXKkhH8apP8R8H6Kmt6hTqcbhNcIkNzBcP9s4Ld54dZYa0+g=="; }; inherit patches; diff --git a/pkgs/applications/networking/instant-messengers/abaddon/default.nix b/pkgs/applications/networking/instant-messengers/abaddon/default.nix index d749e35096223..4fd9a36b0f516 100644 --- a/pkgs/applications/networking/instant-messengers/abaddon/default.nix +++ b/pkgs/applications/networking/instant-messengers/abaddon/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "abaddon"; - version = "0.1.11"; + version = "0.1.12"; src = fetchFromGitHub { owner = "uowuo"; repo = "abaddon"; rev = "v${version}"; - hash = "sha256-KrBZESYab7QFwUfpTl40cgKn/if31oqA9oCe0PwoYbs="; + hash = "sha256-Rz3c6RMZUiKQ0YKKQkCEkelfIGUq+xVmgNskj7uEjGI="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/instant-messengers/armcord/default.nix b/pkgs/applications/networking/instant-messengers/armcord/default.nix index 1f0d01b6f905f..1c7342c143df3 100644 --- a/pkgs/applications/networking/instant-messengers/armcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/armcord/default.nix @@ -138,5 +138,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ ludovicopiero wrmilling ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; mainProgram = "armcord"; + knownVulnerabilities = [ "CVE-2023-4863" ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix b/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix index 4194f4c228876..104f39f4460b0 100644 --- a/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix +++ b/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix @@ -43,6 +43,5 @@ in meta = metaCommon // { platforms = [ "x86_64-linux" ]; - mainProgram = "caprine"; }; }) diff --git a/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-dmg.nix b/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-dmg.nix index 3dc457c48826e..6a53bba026c5a 100644 --- a/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-dmg.nix +++ b/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-dmg.nix @@ -30,6 +30,5 @@ stdenvNoCC.mkDerivation { meta = metaCommon // { platforms = with lib.platforms; darwin; - mainProgram = "caprine"; }; } diff --git a/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix b/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix index 501d8f7d163fc..ed8fab4473c04 100644 --- a/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix +++ b/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix @@ -1,7 +1,7 @@ { lib, callPackage, stdenvNoCC }: let pname = "caprine"; - version = "2.58.0"; + version = "2.58.3"; metaCommon = with lib; { description = "An elegant Facebook Messenger desktop app"; homepage = "https://sindresorhus.com/caprine"; @@ -10,11 +10,11 @@ let }; x86_64-appimage = callPackage ./build-from-appimage.nix { inherit pname version metaCommon; - sha256 = "7iK2RyA63okJLH2Xm97fFilJHzqFuP96xkUr2+ADbC4="; + sha256 = "sha256-w0nBQhHYzFLsNu0MxWhoju6fh4JpAKC7MWWVxwDkRYk="; }; x86_64-dmg = callPackage ./build-from-dmg.nix { inherit pname version metaCommon; - sha256 = "RqK+fJJAt9W+m7zg6ZYI6PEAOa3V1UxsptEpG1qjibg="; + sha256 = "sha256-6Mx2ZkT2hdnaSVt2hKMMV9xc7rYPFFbxcj6vb84ojYU="; }; in (if stdenvNoCC.isDarwin then x86_64-dmg else x86_64-appimage).overrideAttrs (oldAttrs: { diff --git a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix index c95b84a3031e1..4353c983320b7 100644 --- a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "chatterino2"; - version = "2.4.5"; + version = "2.4.6"; src = fetchFromGitHub { owner = "Chatterino"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ughEavlvL1/mvevbYrDG+2/JYigMhVwyy3RFysQqUNs="; + sha256 = "sha256-CQviw5Fw6v5EwjCldAQoJfAIZMWKBfBzUIQZEgW34k0="; fetchSubmodules = true; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; diff --git a/pkgs/applications/networking/instant-messengers/discord/darwin.nix b/pkgs/applications/networking/instant-messengers/discord/darwin.nix index ef3a9031bb9f5..c6f901639693c 100644 --- a/pkgs/applications/networking/instant-messengers/discord/darwin.nix +++ b/pkgs/applications/networking/instant-messengers/discord/darwin.nix @@ -1,4 +1,4 @@ -{ pname, version, src, meta, stdenv, binaryName, desktopName, lib, undmg, makeWrapper +{ pname, version, src, meta, stdenv, binaryName, desktopName, lib, undmg, makeWrapper, writeScript , branch , withOpenASAR ? false, openasar , withVencord ? false, vencord }: @@ -31,4 +31,19 @@ stdenv.mkDerivation { echo '{"name":"discord","main":"index.js"}' > $out/Applications/${desktopName}.app/Contents/Resources/app.asar/package.json echo 'require("${vencord}/patcher.js")' > $out/Applications/${desktopName}.app/Contents/Resources/app.asar/index.js ''; + + passthru = { + updateScript = writeScript "discord-update-script" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl gnugrep common-updater-scripts + set -x + set -eou pipefail; + url=$(curl -sI "https://discordapp.com/api/download/${ + builtins.replaceStrings [ "discord-" "discord" ] [ "" "stable" ] pname + }?platform=osx&format=dmg" | grep -oP 'location: \K\S+') + version=''${url##https://dl*.discordapp.net/apps/osx/} + version=''${version%%/*.dmg} + update-source-version ${lib.optionalString (!stdenv.buildPlatform.isDarwin) "pkgsCross.aarch64-darwin."}${pname} "$version" --file=./pkgs/applications/networking/instant-messengers/discord/default.nix --version-key=${branch} + ''; + }; } diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 7e95ccc5142f3..2a461f382a00e 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,52 +1,52 @@ { branch ? "stable", callPackage, fetchurl, lib, stdenv }: let versions = if stdenv.isLinux then { - stable = "0.0.29"; - ptb = "0.0.46"; - canary = "0.0.167"; - development = "0.0.232"; + stable = "0.0.30"; + ptb = "0.0.48"; + canary = "0.0.169"; + development = "0.0.234"; } else { - stable = "0.0.273"; - ptb = "0.0.59"; - canary = "0.0.283"; - development = "0.0.8778"; + stable = "0.0.278"; + ptb = "0.0.79"; + canary = "0.0.314"; + development = "0.0.8797"; }; version = versions.${branch}; srcs = rec { x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - sha256 = "sha256-3vjOvkqMD7qKX2zRUbKrw5gHtE/v8WfH557rtagWIWc="; + hash = "sha256-eCfF7zC9JM/y14ovSJxMIvLY+IGv0Jvzn7MVgueltNs="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - sha256 = "omPqp8iyQpp5UxoOlp0+iaQG6yuKVVGaYhl7I643dqQ="; + hash = "sha256-Vea9Jm9qeU+bSFUGkAtd+3Goe6JvfT3KYX/Kt5UjFWc="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "sha256-ua99w5pJz8UZldMvYLB7SkcgAG2hQBdorbnugvFDktE="; + hash = "sha256-32eKiQ9EncEZNL6MlK8lKqo0ZoRQKOpADx62bDQ6tvQ="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; - sha256 = "sha256-AsHdQvDLzflhuYO8V4R+2zjQYpRo+aPa8HYXc3taayY="; + hash = "sha256-R5UwgpXgb32mEohTzyRVXmumcgPl8UPan3UjmLFLxLo="; }; }; x86_64-darwin = { stable = fetchurl { url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg"; - sha256 = "1vz2g83gz9ks9mxwx7gl7kys2xaw8ksnywwadrpsbj999fzlyyal"; + hash = "sha256-c60p8RX5Rv8tx6io65XbqyzJJKaCVDeL5NtwMLNIX5M="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - sha256 = "sha256-LS7KExVXkOv8O/GrisPMbBxg/pwoDXIOo1dK9wk1yB8="; + hash = "sha256-HI4+ABFQtRBL7a3koCehJgn8WxJW86sCyuZE70n1AHk="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - sha256 = "0mqpk1szp46mih95x42ld32rrspc6jx1j7qdaxf01whzb3d4pi9l"; + hash = "sha256-SbCEao9Nh3cqCRD7FsHoKMVdy8T1y5tZAAGWHE6bSz0="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; - sha256 = "sha256-K4rlShYhmsjT2QHjb6+IbCXJFK+9REIx/gW68bcVSVc="; + hash = "sha256-ra0El4Y7SqanY6ZBbHE1Y+pqel4OD7nXKKfg/vndULo="; }; }; aarch64-darwin = x86_64-darwin; diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index f3ec46f3641c0..7611f4dfa03f6 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -7,6 +7,7 @@ , yarn , nodejs , fetchYarnDeps +, jq , electron , element-web , sqlcipher @@ -40,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { sha256 = desktopYarnHash; }; - nativeBuildInputs = [ yarn fixup_yarn_lock nodejs makeWrapper ] + nativeBuildInputs = [ yarn fixup_yarn_lock nodejs makeWrapper jq ] ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; inherit seshat; diff --git a/pkgs/applications/networking/instant-messengers/element/pin.nix b/pkgs/applications/networking/instant-messengers/element/pin.nix index ef8b1e4b584b1..5f0506b0220c7 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.nix +++ b/pkgs/applications/networking/instant-messengers/element/pin.nix @@ -1,9 +1,9 @@ { - "version" = "1.11.43"; + "version" = "1.11.45"; "hashes" = { - "desktopSrcHash" = "sha256-mFI3+IRBrJT6wTxoggLTGoB48FyBoRhQSmUKbC8sASI="; - "desktopYarnHash" = "1w5blpdk61yqai6gwk9n28cf57crnahs6hr0p3xvwchbc9x50dfq"; - "webSrcHash" = "sha256-LF6SMHYP2mxxHnh1YcLYoTEME7SgTVMKa8lz1rVZ+HA="; - "webYarnHash" = "0qvvhbj5mrrry2zcslz5n3pv4bpmdr5vsv446fm4cfvrj4awbz06"; + "desktopSrcHash" = "sha256-SxpnvIctV738mMRmMiuLgr1InMrlWH39/6lTO0wu+vQ="; + "desktopYarnHash" = "09a2swngqjz4hahzvczhw0lh38y39glc1dkkhjkp4jqvmds9ni7n"; + "webSrcHash" = "sha256-hImwZ7vzpupRulk9g5jhfv0sgZqmPXnggJjUUwZ+UCE="; + "webYarnHash" = "0r2xzq9630vky32hqp3h1skdgv3jiiffi8553yzzk4zr45nlvf9d"; }; } diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index 263610b65cb25..7e3d8fc7a3592 100644 --- a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -1,30 +1,24 @@ { lib , stdenv , fetchurl -, atomEnv -, systemd -, pulseaudio -, libxshmfence -, libnotify -, libappindicator-gtk3 -, wrapGAppsHook -, autoPatchelfHook +, electron_26 +, makeWrapper }: let pname = "mattermost-desktop"; - version = "5.3.1"; + version = "5.5.0"; srcs = { "x86_64-linux" = { url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-x64.tar.gz"; - hash = "sha256-rw+SYCFmN2W4t5iIWEpV9VHxcvwTLOckMV58WRa5dZE="; + hash = "sha256-htjKGO16Qs1RVE4U47DdN8bNpUH4JD/LkMOeoIRmLPI="; }; "aarch64-linux" = { url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-arm64.tar.gz"; - hash = "sha256-FEIldkb3FbUfVAYRkjs7oPRJDHdsIGDW5iaC2Qz1dpc="; + hash = "sha256-LQhMSIrWDZTXBnJfLKph5e6txHGvQSqEu+P1j1zOiTg="; }; }; @@ -37,22 +31,7 @@ stdenv.mkDerivation { src = fetchurl (srcs."${system}" or (throw "Unsupported system ${system}")); - dontBuild = true; - dontConfigure = true; - dontStrip = true; - - nativeBuildInputs = [ wrapGAppsHook autoPatchelfHook ]; - - buildInputs = atomEnv.packages ++ [ - libxshmfence - ]; - - runtimeDependencies = [ - (lib.getLib systemd) - pulseaudio - libnotify - libappindicator-gtk3 - ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' runHook preInstall @@ -63,21 +42,19 @@ stdenv.mkDerivation { find . -type f \( -name '*.so.*' -o -name '*.s[oh]' \) -print0 | xargs -0 chmod +x chmod +x mattermost-desktop chrome-sandbox - mkdir -p $out/share/mattermost-desktop - cp -R . $out/share/mattermost-desktop + mkdir -p $out/bin $out/share/applications $out/share/${pname}/ + cp -r app_icon.png create_desktop_file.sh locales/ resources/* $out/share/${pname}/ - mkdir -p "$out/bin" - ln -s $out/share/mattermost-desktop/mattermost-desktop $out/bin/mattermost-desktop - - patchShebangs $out/share/mattermost-desktop/create_desktop_file.sh - $out/share/mattermost-desktop/create_desktop_file.sh - rm $out/share/mattermost-desktop/create_desktop_file.sh - mkdir -p $out/share/applications - chmod -x Mattermost.desktop + patchShebangs $out/share/${pname}/create_desktop_file.sh + $out/share/${pname}/create_desktop_file.sh + rm $out/share/${pname}/create_desktop_file.sh mv Mattermost.desktop $out/share/applications/Mattermost.desktop substituteInPlace $out/share/applications/Mattermost.desktop \ --replace /share/mattermost-desktop/mattermost-desktop /bin/mattermost-desktop + makeWrapper ${electron_26}/bin/electron $out/bin/${pname} \ + --add-flags $out/share/${pname}/app.asar + runHook postInstall ''; diff --git a/pkgs/applications/networking/instant-messengers/nchat/default.nix b/pkgs/applications/networking/instant-messengers/nchat/default.nix index 1c4f8ca811b01..51b704f5bc7b1 100644 --- a/pkgs/applications/networking/instant-messengers/nchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/nchat/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "nchat"; - version = "3.60"; + version = "3.67"; src = fetchFromGitHub { owner = "d99kris"; repo = "nchat"; rev = "v${version}"; - hash = "sha256-Fe+Cdh8NlrCkzSO/Juw96eXtGfXajhFIsKeTC3qXIlU="; + hash = "sha256-PhvZejtSoDptzoMP5uIe6T0Ws/bQQXVuYH9uoZo3JsI="; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/qq/default.nix b/pkgs/applications/networking/instant-messengers/qq/default.nix index a9ce755be58a2..54a2e9e6c0178 100644 --- a/pkgs/applications/networking/instant-messengers/qq/default.nix +++ b/pkgs/applications/networking/instant-messengers/qq/default.nix @@ -23,16 +23,16 @@ }: let - version = "3.1.2-13107"; - _hash = "ad5b5393"; + version = "3.2.1-17153"; + _hash = "b69de82d"; srcs = { x86_64-linux = fetchurl { url = "https://dldir1.qq.com/qqfile/qq/QQNT/${_hash}/linuxqq_${version}_amd64.deb"; - hash = "sha256-mBfeexWEYpGybFFianUFvlzMv0HoFR4EeFcwlGVXIRA="; + hash = "sha256-+GjTjv0K2vnlkb46KhMvRRFWuIEBz23Lg3QhiA7QzkA="; }; aarch64-linux = fetchurl { url = "https://dldir1.qq.com/qqfile/qq/QQNT/${_hash}/linuxqq_${version}_arm64.deb"; - hash = "sha256-V6kR2lb63nnNIEhn64Yg0BYYlz7W0Cw60TwnKaJuLgs="; + hash = "sha256-BtmmVpKZF15aU7RRmXl9g5leg2jz5sT4vYXluq9aIYk="; }; }; src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix index 6bee6f1476a29..c4fdf93520467 100644 --- a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix @@ -4,11 +4,11 @@ let in stdenv.mkDerivation rec { pname = "rocketchat-desktop"; - version = "3.9.7"; + version = "3.9.8"; src = fetchurl { url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat-${version}-linux-amd64.deb"; - hash = "sha256-DxY8cXWHBboH6Uh2i9DSJ2F8/OaGTRlIEaLzhQpXnKk="; + hash = "sha256-sx4WRAeitbBrz6jFvD0WF/EzR7cx4tOPoczbJ+tkw1s="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 8a3e30a99dd7c..7ae6a8a11abe0 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,12 +1,12 @@ { callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) { signal-desktop = { dir = "Signal"; - version = "6.30.2"; - hash = "sha256-qz3eO+pTLK0J+XjAccrZIJdyoU1zyYyrnpQKeLRZvc8="; + version = "6.32.0"; + hash = "sha256-FZ2wG3nkgIndeoUfXag/9jftXGDSY/MNpT8mqSZpJzA="; }; signal-desktop-beta = { dir = "Signal Beta"; - version = "6.31.0-beta.1"; - hash = "sha256-j3DY+FY7kVVGvVuVZw/JxIpwxtgBttSyWcRaa9MCSjE="; + version = "6.33.0-beta.1"; + hash = "sha256-FLCZvRYUysiE8BLMJVnn0hOkA3km0z383AjN6JvOyWI="; }; } diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix index 71b3660ca65dd..72a5c55e9cb6d 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix @@ -156,9 +156,10 @@ stdenv.mkDerivation rec { --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} ) - # Fix the desktop link + # Fix the desktop link and fix showing application icon in tray substituteInPlace $out/share/applications/${pname}.desktop \ - --replace "/opt/${dir}/${pname}" $out/bin/${pname} + --replace "/opt/${dir}/${pname}" $out/bin/${pname} \ + --replace "bin/signal-desktop" "bin/signal-desktop --use-tray-icon" autoPatchelf --no-recurse -- "$out/lib/${dir}/" patchelf --add-needed ${libpulseaudio}/lib/libpulse.so "$out/lib/${dir}/resources/app.asar.unpacked/node_modules/@signalapp/ringrtc/build/linux/libringrtc-x64.node" diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 91a7df4bbfd19..5755327aec742 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ (if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv).mkDerivation rec { pname = "signalbackup-tools"; - version = "20230919"; + version = "20231003"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - hash = "sha256-/Nz+T3ePjabETFrN8fq+JI5g18UEQmmqiJ0XAMR+gzM="; + hash = "sha256-fMVLmuhdccYzsOgVvViaICmbXgU0o3Fu0K85hbao4YI="; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/slack-term/default.nix b/pkgs/applications/networking/instant-messengers/slack-term/default.nix index 99b8b4563d232..2750336cf1d13 100644 --- a/pkgs/applications/networking/instant-messengers/slack-term/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack-term/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { rev = "v${version}"; sha256 = "1fbq7bdhy70hlkklppimgdjamnk0v059pg73xm9ax1f4616ki1m6"; }; - vendorSha256 = null; + vendorHash = null; meta = with lib; { description = "Slack client for your terminal"; diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index b52b9f479bd34..058f27d71fc1f 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -45,14 +45,14 @@ let pname = "slack"; - x86_64-darwin-version = "4.34.115"; - x86_64-darwin-sha256 = "1l2swrjxm47xyb8skwzy7clmr3qdckx9xs1x204jbrz1xk7yd7l5"; + x86_64-darwin-version = "4.34.119"; + x86_64-darwin-sha256 = "17ssha6a8iyvan3k7mbg2cdyy1y7gmlwrh4dlkgcc63bqqxsavy1"; - x86_64-linux-version = "4.34.115"; - x86_64-linux-sha256 = "0gyyjyvrvn13i5308fg34z6b3yzr7vmmh1148a9xh79ngq2pqv47"; + x86_64-linux-version = "4.34.120"; + x86_64-linux-sha256 = "0wldnj6hyzqxyc9p365gb46pyqq0im1ayl12mrc8xkrikx9phb7y"; - aarch64-darwin-version = "4.34.115"; - aarch64-darwin-sha256 = "09qcz57yxjfw8sdqbvmkd25hs4c7frmpf6v94hr4d1szy1rfv11k"; + aarch64-darwin-version = "4.34.119"; + aarch64-darwin-sha256 = "0xa39l4ynjmzq6811vprxxz8znwckmxcss9aa7v68cja8vj033vj"; version = { x86_64-darwin = x86_64-darwin-version; diff --git a/pkgs/applications/networking/instant-messengers/slack/update.sh b/pkgs/applications/networking/instant-messengers/slack/update.sh index 688fe579f877a..2981a26a8e3e8 100755 --- a/pkgs/applications/networking/instant-messengers/slack/update.sh +++ b/pkgs/applications/networking/instant-messengers/slack/update.sh @@ -6,12 +6,6 @@ set -eou pipefail latest_linux_version=$(curl -L --silent https://slack.com/downloads/linux | sed -n 's/.*Version \([0-9\.]\+\).*/\1/p') latest_mac_version=$(curl -L --silent https://slack.com/downloads/mac | sed -n 's/.*Version \([0-9\.]\+\).*/\1/p') -# Double check that the latest mac and linux versions are in sync. -if [[ "$latest_linux_version" != "$latest_mac_version" ]]; then - echo "the latest linux ($latest_linux_version) and mac ($latest_mac_version) versions are not the same" - exit 1 -fi - nixpkgs="$(git rev-parse --show-toplevel)" slack_nix="$nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix" nixpkgs_linux_version=$(cat "$slack_nix" | sed -n 's/.*x86_64-linux-version = \"\([0-9\.]\+\)\";.*/\1/p') diff --git a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix index 5fa07ea7a9234..157df8ca9a651 100644 --- a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix @@ -19,18 +19,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "teams-for-linux"; - version = "1.3.8"; + version = "1.3.13"; src = fetchFromGitHub { owner = "IsmaelMartinez"; repo = "teams-for-linux"; rev = "v${finalAttrs.version}"; - hash = "sha256-G0UBzSXoZPLHBsM0nslPLNBZs0sUAQYJ403nPV+3Qu4="; + hash = "sha256-WF2jWP6utopAMZPP/ZWOhqVGZJmACwHyLLE+HQaHJjg="; }; offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-j5N6d270myUylDVDFQTScbsGp1wlpt5sISDJBRCV/GU="; + hash = "sha256-vgjPGO5qa4IYfW1svClJ+wP/KtIFFd3P02T2sht69C8="; }; nativeBuildInputs = [ yarn fixup_yarn_lock nodejs copyDesktopItems makeWrapper ]; diff --git a/pkgs/applications/networking/instant-messengers/teams/default.nix b/pkgs/applications/networking/instant-messengers/teams/default.nix index 601643edcfd61..ce52a641124ec 100644 --- a/pkgs/applications/networking/instant-messengers/teams/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams/default.nix @@ -1,34 +1,17 @@ { lib , stdenv -, runtimeShell , fetchurl -, autoPatchelfHook -, wrapGAppsHook -, dpkg -, atomEnv -, libuuid -, libappindicator-gtk3 -, pulseaudio -, at-spi2-atk -, coreutils -, gawk -, xdg-utils -, systemd -, asar , xar , cpio , makeWrapper -, enableRectOverlay ? false }: let pname = "teams"; versions = { - linux = "1.5.00.23861"; darwin = "1.6.00.4464"; }; hashes = { - linux = "sha256-h0YnCeJX//l4TegJVZtavV3HrxjYUF2Fa5KmaYmZW8E="; darwin = "sha256-DvXMrXotKWUqFCb7rZj8wU7mmZJKuTLGyx8qOB/aQtg="; }; meta = with lib; { @@ -38,112 +21,10 @@ let sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ liff tricktron ]; - platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; + platforms = [ "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "teams"; }; - linux = stdenv.mkDerivation rec { - inherit pname meta; - version = versions.linux; - - src = fetchurl { - urls = [ - "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${versions.linux}_amd64.deb" - # NOTE: the archive.org timestamp must also be updated if the version changes. - "https://web.archive.org/web/20221130115842if_/https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${versions.linux}_amd64.deb" - ]; - hash = hashes.linux; - }; - - nativeBuildInputs = [ dpkg autoPatchelfHook wrapGAppsHook asar ]; - - unpackCmd = "dpkg -x $curSrc ."; - - buildInputs = atomEnv.packages ++ [ - libuuid - at-spi2-atk - ]; - - runtimeDependencies = [ - (lib.getLib systemd) - pulseaudio - libappindicator-gtk3 - ]; - - preFixup = '' - gappsWrapperArgs+=( - --prefix PATH : "${coreutils}/bin:${gawk}/bin" - - # fix for https://docs.microsoft.com/en-us/answers/questions/298724/open-teams-meeting-link-on-linux-doens39t-work.html?childToView=309406#comment-309406 - --append-flags '--disable-namespace-sandbox --disable-setuid-sandbox' - ) - ''; - - - buildPhase = '' - runHook preBuild - - asar extract share/teams/resources/app.asar "$TMP/work" - substituteInPlace $TMP/work/main.bundle.js \ - --replace "/usr/share/pixmaps/" "$out/share/pixmaps" \ - --replace "/usr/bin/xdg-mime" "${xdg-utils}/bin/xdg-mime" \ - --replace "Exec=/usr/bin/" "Exec=" # Remove usage of absolute path in autostart. - asar pack --unpack='{*.node,*.ftz,rect-overlay}' "$TMP/work" share/teams/resources/app.asar - - runHook postBuild - ''; - - preferLocalBuild = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/{opt,bin} - - mv share/teams $out/opt/ - mv share $out/share - - mkdir -p $out/share/icons/hicolor/512x512/apps - mv $out/share/pixmaps/teams.png $out/share/icons/hicolor/512x512/apps - rmdir $out/share/pixmaps - - substituteInPlace $out/share/applications/teams.desktop \ - --replace /usr/bin/ "" - - ln -s $out/opt/teams/teams $out/bin/ - - ${lib.optionalString (!enableRectOverlay) '' - # Work-around screen sharing bug - # https://docs.microsoft.com/en-us/answers/questions/42095/sharing-screen-not-working-anymore-bug.html - rm $out/opt/teams/resources/app.asar.unpacked/node_modules/slimcore/bin/rect-overlay - ''} - - runHook postInstall - ''; - - dontAutoPatchelf = true; - - # Includes runtimeDependencies in the RPATH of the included Node modules - # so that dynamic loading works. We cannot use directly runtimeDependencies - # here, since the libraries from runtimeDependencies are not propagated - # to the dynamically loadable node modules because of a condition in - # autoPatchElfHook since *.node modules have Type: DYN (Shared object file) - # instead of EXEC or INTERP it expects. - # Fixes: https://github.com/NixOS/nixpkgs/issues/85449 - postFixup = '' - autoPatchelf "$out" - - runtime_rpath="${lib.makeLibraryPath runtimeDependencies}" - - for mod in $(find "$out/opt/teams" -name '*.node'); do - mod_rpath="$(patchelf --print-rpath "$mod")" - - echo "Adding runtime dependencies to RPATH of Node module $mod" - patchelf --set-rpath "$runtime_rpath:$mod_rpath" "$mod" - done; - ''; - }; - appName = "Teams.app"; darwin = stdenv.mkDerivation { @@ -178,4 +59,4 @@ let in if stdenv.isDarwin then darwin -else linux +else throw "Teams app for Linux has been removed as it is unmaintained by upstream. (2023-09-29)" diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index 540555b412abd..a0c7b678d5a0d 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -30,11 +30,11 @@ in stdenv.mkDerivation rec { pname = "teamspeak-client"; - version = "3.6.1"; + version = "3.6.2"; src = fetchurl { url = "https://files.teamspeak-services.com/releases/client/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run"; - hash = "sha256-j4sgZ+tJpV6ST0yLmbLTLgBxQTcK1LZoEEfMe3TUAC4="; + hash = "sha256-WfEQQ4lxoj+QSnAOfdCoEc+Z1Oa5dbo6pFli1DsAZCI="; }; # grab the plugin sdk for the desktop icon diff --git a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix b/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix index 8d15b8e466b8f..d4877da694201 100644 --- a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix +++ b/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix @@ -36,5 +36,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/Xithrius/twitch-tui/releases/tag/v${version}"; license = licenses.mit; maintainers = [ maintainers.taha ]; + mainProgram = "twt"; }; } diff --git a/pkgs/applications/networking/instant-messengers/webcord/default.nix b/pkgs/applications/networking/instant-messengers/webcord/default.nix index f4ae642c79e5a..6417153c0939f 100644 --- a/pkgs/applications/networking/instant-messengers/webcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/webcord/default.nix @@ -13,16 +13,16 @@ buildNpmPackage rec { pname = "webcord"; - version = "4.4.0"; + version = "4.4.1"; src = fetchFromGitHub { owner = "SpacingBat3"; repo = "WebCord"; rev = "v${version}"; - hash = "sha256-Kiw3pebjH9Pz5oi6Gbjxrjd/kvozapLNqfWLVuTXF/I="; + hash = "sha256-g9UJANYs5IlKAeRc27oNOfdD3uD3nrG5Ecp+AbbsXLE="; }; - npmDepsHash = "sha256-CPGfhV8VXbpX9UB5oQhI+IwFWPgYq2dGnSuyByMNGg4="; + npmDepsHash = "sha256-SSlSLZs97LDtL7OyfCtEGZjDVfsn5KKUgRNyL8J5M5g="; nativeBuildInputs = [ copyDesktopItems diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 27a4a65605edf..2d14568424561 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -1,5 +1,4 @@ -{ atomEnv -, autoPatchelfHook +{ autoPatchelfHook , dpkg , fetchurl , makeDesktopItem @@ -11,7 +10,11 @@ , cpio , xar , libdbusmenu -, libxshmfence +, alsa-lib +, mesa +, nss +, nspr +, systemd }: let @@ -64,8 +67,7 @@ let inherit pname version meta; src = fetchurl { - url = "https://wire-app.wire.com/linux/debian/pool/main/" - + "Wire-${version}_amd64.deb"; + url = "https://wire-app.wire.com/linux/debian/pool/main/Wire-${version}_amd64.deb"; inherit hash; }; @@ -85,6 +87,7 @@ let dontPatchELF = true; dontWrapGApps = true; + # TODO: migrate off autoPatchelfHook and use nixpkgs' electron nativeBuildInputs = [ autoPatchelfHook dpkg @@ -92,7 +95,13 @@ let wrapGAppsHook ]; - buildInputs = [ libxshmfence ] ++ atomEnv.packages; + buildInputs = [ + alsa-lib + mesa + nss + nspr + systemd + ]; unpackPhase = '' runHook preUnpack @@ -132,8 +141,7 @@ let inherit pname version meta; src = fetchurl { - url = "https://github.com/wireapp/wire-desktop/releases/download/" - + "macos%2F${version}/Wire.pkg"; + url = "https://github.com/wireapp/wire-desktop/releases/download/macos%2F${version}/Wire.pkg"; inherit hash; }; diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 089521233b77e..4ed7a286c4645 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -48,23 +48,23 @@ let # and often with different versions. We write them on three lines # like this (rather than using {}) so that the updater script can # find where to edit them. - versions.aarch64-darwin = "5.15.12.22445"; - versions.x86_64-darwin = "5.15.12.22445"; - versions.x86_64-linux = "5.15.12.7665"; + versions.aarch64-darwin = "5.16.1.23158"; + versions.x86_64-darwin = "5.16.1.23158"; + versions.x86_64-linux = "5.16.1.8561"; srcs = { aarch64-darwin = fetchurl { url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; name = "zoomusInstallerFull.pkg"; - hash = "sha256-pTpNbKmJGTxRIrfD/zWIrkouhCbErxu9Gjy9mDdTtHc="; + hash = "sha256-D3eYHbnNSLLmOh7eIT2+J7PubhBZONqHThB6ibJLqGY="; }; x86_64-darwin = fetchurl { url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; - hash = "sha256-EItKg22id/e7OfJaWxxJdl9B+3nDHNl6ENvfGR4QJ6Y="; + hash = "sha256-kvnaHwwWUiJmNsef6H5S/JHHtQgfFJd9rWwzTvi05g0="; }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; - hash = "sha256-DMFMLwxPt1LV4Qhhrw6gdToe0z9743hGcxVWeR4O1YU="; + hash = "sha256-zT0qGl8ODIcBISiRQ184aVr9hE8ZHnYatolqcsS6dpo="; }; }; diff --git a/pkgs/applications/networking/instant-messengers/zulip/default.nix b/pkgs/applications/networking/instant-messengers/zulip/default.nix index 12ae864b8042d..e519b817e142c 100644 --- a/pkgs/applications/networking/instant-messengers/zulip/default.nix +++ b/pkgs/applications/networking/instant-messengers/zulip/default.nix @@ -5,11 +5,11 @@ let pname = "zulip"; - version = "5.10.2"; + version = "5.10.3"; src = fetchurl { url = "https://github.com/zulip/zulip-desktop/releases/download/v${version}/Zulip-${version}-x86_64.AppImage"; - hash = "sha256-lz9PiikIEgGWW1N5KeNJmtIRB+0zFjWsR92PY1r0+NU="; + hash = "sha256-AnaW/zH2Vng8lpzv6LHlzCUnNWJoLpsSpmD0iZfteFg="; name="${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/networking/irc/catgirl/default.nix b/pkgs/applications/networking/irc/catgirl/default.nix index d56573d9d728a..c3e4fa1b7a8ae 100644 --- a/pkgs/applications/networking/irc/catgirl/default.nix +++ b/pkgs/applications/networking/irc/catgirl/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; description = "A TLS-only terminal IRC client"; platforms = platforms.unix; + mainProgram = "catgirl"; maintainers = with maintainers; [ xfnw ]; }; } diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index 523573e3116c2..d95b64f042985 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "irssi"; - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitHub { owner = "irssi"; repo = "irssi"; rev = version; - hash = "sha256-a/+9M2zoywZBdOfXHrA4O6Q9W7HJZNTthB/aseUNefA="; + hash = "sha256-D+KMjkweStMqVhoQoiJPFt/G0vdf7x2FjYCvqGS8UqY="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 6d0cfdccde462..8136324770e64 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -36,14 +36,14 @@ let in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "4.0.4"; + version = "4.0.5"; pname = "weechat"; hardeningEnable = [ "pie" ]; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.xz"; - hash = "sha256-rl9JebWtoDObhOdB1ffkge6R4/7NQKCZB7ZHUYKetvY="; + hash = "sha256-PXLmGwVjHavcKDIxdo+TioVUSyfjH6v+E8V7TfXF47s="; }; outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; diff --git a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix index c1bb57b3b1bbc..c1b9b9fd60631 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wee-slack"; - version = "2.10.0"; + version = "2.10.1"; src = fetchFromGitHub { repo = "wee-slack"; owner = "wee-slack"; rev = "v${version}"; - sha256 = "sha256-SxmMCD7FdkmZ0ccDbuY2XUGcLxHlv62x4Pj55Wzf0AA="; + sha256 = "sha256-J4s7+JFd/y1espp3HZCs48++fhN6lmpaglGkgomtf3o="; }; patches = [ diff --git a/pkgs/applications/networking/kubo-migrator/all-migrations.nix b/pkgs/applications/networking/kubo-migrator/all-migrations.nix index 39a9f141c7a4a..54ae2551caa32 100644 --- a/pkgs/applications/networking/kubo-migrator/all-migrations.nix +++ b/pkgs/applications/networking/kubo-migrator/all-migrations.nix @@ -14,7 +14,7 @@ let inherit pname version; inherit (kubo-migrator-unwrapped) src; sourceRoot = "${kubo-migrator-unwrapped.src.name}/${pname}"; - vendorSha256 = null; + vendorHash = null; # Fix build on Go 1.17 and later: panic: qtls.ClientHelloInfo doesn't match # See https://github.com/ipfs/fs-repo-migrations/pull/163 postPatch = lib.optionalString (lib.elem pname [ "fs-repo-10-to-11" "fs-repo-11-to-12" ]) '' @@ -36,8 +36,9 @@ let }; # Concatenation of the latest repo version and the version of that migration - version = "14.1.0.0"; + version = "15.1.0.1"; + fs-repo-14-to-15 = fs-repo-common "fs-repo-14-to-15" "1.0.1"; fs-repo-13-to-14 = fs-repo-common "fs-repo-13-to-14" "1.0.0"; fs-repo-12-to-13 = fs-repo-common "fs-repo-12-to-13" "1.0.0"; fs-repo-11-to-12 = fs-repo-common "fs-repo-11-to-12" "1.0.2"; @@ -54,6 +55,7 @@ let fs-repo-0-to-1 = fs-repo-common "fs-repo-0-to-1" "1.0.1"; all-migrations = [ + fs-repo-14-to-15 fs-repo-13-to-14 fs-repo-12-to-13 fs-repo-11-to-12 diff --git a/pkgs/applications/networking/kubo-migrator/unwrapped.nix b/pkgs/applications/networking/kubo-migrator/unwrapped.nix index d5dc1421a58a8..1e63c5852ca30 100644 --- a/pkgs/applications/networking/kubo-migrator/unwrapped.nix +++ b/pkgs/applications/networking/kubo-migrator/unwrapped.nix @@ -11,12 +11,12 @@ buildGoModule rec { owner = "ipfs"; repo = "fs-repo-migrations"; # Use the latest git tag here, since v2.0.2 does not - # contain the latest migration fs-repo-13-to-14/v1.0.0 + # contain the latest migration fs-repo-14-to-15/v1.0.1 # The fs-repo-migrations code itself is the same between # the two versions but the migration code, which is built # into separate binaries, is not. - rev = "fs-repo-13-to-14/v1.0.0"; - hash = "sha256-y0IYSKKZlFbPrTUC6XqYKhS3a79rieNGBL58teWMlC4="; + rev = "fs-repo-14-to-15/v1.0.1"; + hash = "sha256-oIGDZr0cv+TIl5glHr3U+eIqAlPAOWyFzgfQGGM+xNM="; }; sourceRoot = "${src.name}/fs-repo-migrations"; diff --git a/pkgs/applications/networking/kubo/default.nix b/pkgs/applications/networking/kubo/default.nix index dccd827b12951..793f8b8d8613e 100644 --- a/pkgs/applications/networking/kubo/default.nix +++ b/pkgs/applications/networking/kubo/default.nix @@ -27,7 +27,7 @@ buildGoModule rec { passthru.tests.kubo = nixosTests.kubo; - vendorSha256 = null; + vendorHash = null; outputs = [ "out" "systemd_unit" "systemd_unit_hardened" ]; diff --git a/pkgs/applications/networking/localproxy/default.nix b/pkgs/applications/networking/localproxy/default.nix index ed2817ed10a49..019da46951241 100644 --- a/pkgs/applications/networking/localproxy/default.nix +++ b/pkgs/applications/networking/localproxy/default.nix @@ -3,37 +3,38 @@ , fetchFromGitHub , cmake , openssl -, protobuf3_19 +, protobuf3_21 , catch2 , boost181 , icu }: let boost = boost181.override { enableStatic = true; }; + protobuf = protobuf3_21.override { enableShared = false; }; in stdenv.mkDerivation (finalAttrs: { pname = "localproxy"; version = "3.1.0"; - src = fetchFromGitHub { - owner = "aws-samples"; - repo = "aws-iot-securetunneling-localproxy"; - rev = "v${finalAttrs.version}"; - hash = "sha256-ec72bvBkRBj4qlTNfzNPeQt02OfOPA8y2PoejHpP9cY="; - }; + src = fetchFromGitHub { + owner = "aws-samples"; + repo = "aws-iot-securetunneling-localproxy"; + rev = "v${finalAttrs.version}"; + hash = "sha256-ec72bvBkRBj4qlTNfzNPeQt02OfOPA8y2PoejHpP9cY="; + }; nativeBuildInputs = [ cmake ]; - buildInputs = [ openssl protobuf3_19 catch2 boost icu ]; + buildInputs = [ openssl protobuf catch2 boost icu ]; # causes redefinition of _FORTIFY_SOURCE hardeningDisable = [ "fortify3" ]; - meta = with lib; { - description = "AWS IoT Secure Tunneling Local Proxy Reference Implementation C++"; - homepage = "https://github.com/aws-samples/aws-iot-securetunneling-localproxy"; - license = licenses.asl20; - maintainers = with maintainers; [spalf]; - platforms = platforms.unix; - }; - }) + meta = with lib; { + description = "AWS IoT Secure Tunneling Local Proxy Reference Implementation C++"; + homepage = "https://github.com/aws-samples/aws-iot-securetunneling-localproxy"; + license = licenses.asl20; + maintainers = with maintainers; [ spalf ]; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/applications/networking/mailreaders/hasmail/default.nix b/pkgs/applications/networking/mailreaders/hasmail/default.nix index d750937c3ee13..cc2f5c91921d0 100644 --- a/pkgs/applications/networking/mailreaders/hasmail/default.nix +++ b/pkgs/applications/networking/mailreaders/hasmail/default.nix @@ -15,10 +15,10 @@ buildGoModule rec { owner = "jonhoo"; repo = "hasmail"; rev = "eb52536d26815383bfe5990cd5ace8bb9d036c8d"; - sha256 = "1p6kwa5xk1mb1fkkxz1b5rcyp5kb4zc8nfif1gk6fab6wbdj9ia1"; + hash = "sha256-QcUk2+JmKWfmCy46i9gna5brWS4r/D6nC6uG2Yvi09w="; }; - vendorSha256 = "129hvr8qh5mxj6mzg7793p5jsi4jmsm96f63j7r8wn544yq8sqci"; + vendorHash = "sha256-kWGNsCekWI7ykcM4k6qukkQtyx3pnPerkb0WiFHeMIk="; doCheck = false; diff --git a/pkgs/applications/networking/mailreaders/mailspring/default.nix b/pkgs/applications/networking/mailreaders/mailspring/default.nix index 9b5adb3a9772e..4f61935faac16 100644 --- a/pkgs/applications/networking/mailreaders/mailspring/default.nix +++ b/pkgs/applications/networking/mailreaders/mailspring/default.nix @@ -99,5 +99,6 @@ stdenv.mkDerivation rec { homepage = "https://getmailspring.com"; downloadPage = "https://github.com/Foundry376/Mailspring"; platforms = [ "x86_64-linux" ]; + knownVulnerabilities = [ "CVE-2023-4863" ]; }; } diff --git a/pkgs/applications/networking/mailreaders/meli/default.nix b/pkgs/applications/networking/mailreaders/meli/default.nix index 82bc21bc6f7cc..1ce4c39da7a3f 100644 --- a/pkgs/applications/networking/mailreaders/meli/default.nix +++ b/pkgs/applications/networking/mailreaders/meli/default.nix @@ -22,15 +22,15 @@ rustPlatform.buildRustPackage rec { pname = "meli"; - version = "0.8.1"; + version = "0.8.2"; src = fetchgit { url = "https://git.meli.delivery/meli/meli.git"; rev = "v${version}"; - hash = "sha256-sHpW2yjqYz4ePR6aQFUBD6BZwgDt3DT22/kWuKr9fAc="; + hash = "sha256-iEHTFofga/HV/1jSAqTsqV55zC22tqI7UW7m4PZgz0M="; }; - cargoSha256 = "sha256-Pg3V6Bd+drFPiJtUwsoKxu6snN88KvM+lsvnWBK/rvk="; + cargoHash = "sha256-ijlivyBezLECBSaWBYVy9tVcSO8U+yGDQyU4dIATR6k="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index d57f0a0b1faca..9ac8c83dc5e70 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { description = "A small but very powerful text-based mail client"; homepage = "http://www.neomutt.org"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ cstrahan erikryb jfrankenau vrthra ma27 raitobezarius ]; + maintainers = with maintainers; [ erikryb jfrankenau vrthra ma27 raitobezarius ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 5f0887354383b..9738a3dc8f36f 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "115.2.2"; + version = "115.3.1"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/af/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/af/thunderbird-115.3.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "abca901bd8ab959c56701ed2a1333cdc9e1c616755f7af66bfd2843beb150fbb"; + sha256 = "cebe0180a4a11d1a0d5478347ff1e80e8ba8217fdfde0ffc11e58c7b8a1da039"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/ar/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/ar/thunderbird-115.3.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "3b370800cf3020dd665438142b2510e1b93443fcdfb9afae4306fe783d65941d"; + sha256 = "ebc9d82cf60a18c1c9de514449aa9b4dc6e60c67c40be6a1de679354ab1ddb89"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/ast/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/ast/thunderbird-115.3.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "8877c0424559e17fdb8b7ebc543308c51325cd8ccfbcfb22de69a91cfb7da45c"; + sha256 = "130b99f167f3e56c8f85da354da70bceaecb7559fc524d2a0d30125557fbe925"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/be/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/be/thunderbird-115.3.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "0efdf2e14de556028e1518123d2879e9a544f9db4abb81a45acbffe24c1b57a8"; + sha256 = "d72f73e2dfcd9e3ef9477f4e1ddbfb478d3b2b069107128a28d0f22a939c8ab8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/bg/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/bg/thunderbird-115.3.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "2090a1df798386de4f7ce018b440e682c0ee002cff6b6cb9e0fc4e8f2354ad2e"; + sha256 = "58cde7ac9d2089b05f521505309249033773d7c366dfebda06043656c53afd09"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/br/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/br/thunderbird-115.3.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "031139a2b4e02e9948c4ef2511e51007dabdaa427f87cc5ebc37213c066417d9"; + sha256 = "3cb367bbca0965f42168798e6e18573edf6aa8a65ca6f99d2f31ae2393b7848e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/ca/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/ca/thunderbird-115.3.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "9486b45ff6aa2249a68889fc8c14c2eeb6f4157404aa58b6c57d42d2c7224b3a"; + sha256 = "18014fb63aab93646bbfe8af40a8a72c6ddac77ef5e0ccbf7fb4fc4aa2e64501"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/cak/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/cak/thunderbird-115.3.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "e25b0ef1ca7825088a9d824333b7e3c15c0f34d91e24f2a6fb95ca321cb35fd6"; + sha256 = "9c604f7ce4e1245b4fa78e67b9ee91bd5fe93f2e23618f6cc0ebed6235b3bff8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/cs/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/cs/thunderbird-115.3.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "66ff84c6eff82053899a5fb73d60b6dbe9a804a29d0a4c3e534b18b4f336d4a6"; + sha256 = "92b20cbe5c985338a2d690690ee7b84ebe53630383b3c88c2d54d5baa81616ba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/cy/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/cy/thunderbird-115.3.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "c67d74d7647dfef7bfa623f343a98d91921788c317a3ce6e0bcb9589c7dc8231"; + sha256 = "8ce9601654779de2319671565602bacd407c50834c3a7d9c3eed7663cd2dfda1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/da/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/da/thunderbird-115.3.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "b3a297d57b2052d0a97279933a545602bb123c66501751a65cc73c8140fc78f7"; + sha256 = "27efa3be6f134494ac05c91c2b7fd55c64c4df41a10eecad1edabb72b8ad1f1d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/de/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/de/thunderbird-115.3.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "43ffd505825af80846b644a36ef0a1254d8bed9c5a707aff633770f86c2be8a0"; + sha256 = "8b22cc8e30eba91349db1b6bb51425efc14684a78e5c55026d7be7741e42b7a7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/dsb/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/dsb/thunderbird-115.3.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "312109b1bfdc949873f3f7ed2e7ec58cbe6945c35ae5058d382e874bf458a2ae"; + sha256 = "a7a1aa4ea136eca7a564982aeff809b79f7e23e305a93a44361c876ad6eb72e3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/el/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/el/thunderbird-115.3.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "ed5705d70b211e293c13728ae66da78e7c217f5e06c48d4954a7dfe18e5029af"; + sha256 = "ff374034283855af4cb9e16e5680748bd7fc084c9a6c1f4c4f39087adde88d01"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/en-CA/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/en-CA/thunderbird-115.3.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "a51444f889c9602749b92fcde62c162f109908de9f30e01e96d1a15aed7eced2"; + sha256 = "1e06132986b4ad668d3ae053c77964b3aeb191e5bac16b3d54621a69c29c3906"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/en-GB/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/en-GB/thunderbird-115.3.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "a03bba9d46dab2e6582dc6e25a603db7a9343b042eb499b4fc47c355a7624fa5"; + sha256 = "12c1eeef9790b976fd3da5aadca9912ffa0951cf20cb1ea9be9cb5ecd2b262f4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/en-US/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/en-US/thunderbird-115.3.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "ffaee7ade088747636abf9ef9edafacc95591c1c317e39847a6dace08a863561"; + sha256 = "f12ece3d4df211e785d67ada46bdf239be68a2dd00118b15063c9fb12d5faaa2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/es-AR/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/es-AR/thunderbird-115.3.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "e694f9aa4a95e633fd0efec32e7bad139de2d17eddfe16b6cf68c583dae3f0c0"; + sha256 = "a232bcc945cb551e2633c1eb1876eb849d3dec5176640419245cedcac6c5cc09"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/es-ES/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/es-ES/thunderbird-115.3.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "3e62ec94a4882ff37796b0fb40d5da0f06f1f68d0f930ee5724d0a8be3e6ef90"; + sha256 = "c9a0ee9373ad30d8aa0280681b95eb8de72baa1b3cb09bc25ab9a4bde82fe88c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/es-MX/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/es-MX/thunderbird-115.3.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "b13f28b18f02119ed631f0dd7dc92e1e52053370987009846e01dcf63735f5dd"; + sha256 = "5b44241ce4e34c15346e229e9898f545acb298ddd8ed58ff95ceadd79e0b4d11"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/et/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/et/thunderbird-115.3.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "9941b5a3a35ae4059f16feb5471d08199a54cbde85751098ae612c806fcf8b5c"; + sha256 = "cdf87430b8f78f53c8b1bb94a577e8d06e85a619f41e69f9fb7d33f707c3e4d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/eu/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/eu/thunderbird-115.3.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "b7246ce71436f1894cc8440388e826d2b84d57e5b3666be6fa369ca80eac6aff"; + sha256 = "12f04c6677f0b37edd4daae6fde22b6ef0368e122d43434bdc80689e23923384"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/fi/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/fi/thunderbird-115.3.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "baac69f0a0c19ac5ca4ca541a67369dd94793929eaedd9e061f5edee39715864"; + sha256 = "47d42496f5a3904ded0f0503e682e06dc0caad999103ecbf58a43df05ba94c55"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/fr/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/fr/thunderbird-115.3.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "2b19d69fdf5fa542e513920b0e9f0616b74d6490dcd24e0f6fb6a50948cf7c2a"; + sha256 = "a05bbd534836e6ae2cf0cd908e8f4ecd04ee5ed6e380590716932fd24760e628"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/fy-NL/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/fy-NL/thunderbird-115.3.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "56abf13ec4453ad693e825e771fc02bd6d8ea87d795d9d5025c737f6fc57058c"; + sha256 = "a2f47372b7b40907639b98d47c69e36b89113fd30cad4cdecb060011b05c50e4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/ga-IE/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/ga-IE/thunderbird-115.3.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "640c68609d56c0a838305510ba208a9d9ce216dcb5fdec7126587ac418d8c067"; + sha256 = "50d8934a62bd65dcc3097ba53d5ec55de024d7c0ab3e3aa3de639f103fb9a8ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/gd/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/gd/thunderbird-115.3.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "c068ac36f73cfb2add5531e72e0268ec1d7d62505371fb0c7691655311fc26de"; + sha256 = "150d7d5848bab9111eac1e13869f7268728d293de067a2bab48106a59f087a4d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/gl/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/gl/thunderbird-115.3.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "5ea2c1bbd289d4a04306b247d773ee7fd30b93999c93b1a013a3b91ffcf5d843"; + sha256 = "d68375242a2296f33993c6a4c0695ab4ec147509ca2caae9af5b8eba8103ce5b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/he/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/he/thunderbird-115.3.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "0b343990193d616856c61d27655560e69114a41302806fccb688bc39e74c3ee0"; + sha256 = "097ad868096d22bc634e6304bd3ad836f5d767839d1cb48790c9caeab80f3819"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/hr/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/hr/thunderbird-115.3.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "7a2b5b4dbdbf7ce166ee378d55d3862fdbfccc1a4508cad6f042bbee4967e648"; + sha256 = "96093e3b5b9d1acf9d6ac14349ee9acb6616444ccecb8f35875c15c43ac38c42"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/hsb/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/hsb/thunderbird-115.3.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "624e6b231cd4b662c995237fa5c17e744106eca90cf6936877741ddb936a6880"; + sha256 = "fa63db473969f137ffd623c3882b55b91a6040eda2fb3b54903f76ec1d0dbf90"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/hu/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/hu/thunderbird-115.3.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "8b9a914ddcc8d86986d258e106584a7104b15d4e6be54c3f39df773cf0cc7aae"; + sha256 = "544774cf0ff36ef1cedaae27111755e5050f909fe5e0f3d2f16ba6f9ce0ec3a9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/hy-AM/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/hy-AM/thunderbird-115.3.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "a1090c31b81ad89734fefffe63b4c01c2a49bab91cf94d32c0ca429f9ae2409f"; + sha256 = "f11d0272755ec879b29349903437d8bf11ace96706e5c9453c1fa576206f4227"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/id/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/id/thunderbird-115.3.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "31ac099a9049edb6e74d5e4443b11668a5cab97d82470d08df84f8dc9930b882"; + sha256 = "9352fefd2809b13bedaae3df31160048b96d4efe743742e032da2cad22a0c8d0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/is/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/is/thunderbird-115.3.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "c11befb7b259e6883b85730a1a423745782c80fd6d49ae1754d66789c553c2e8"; + sha256 = "8d802906a852bbcc14c4b41ced9863eee597301aded1e409afce819084370762"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/it/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/it/thunderbird-115.3.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "8e2f30430057194862d93e9fd076b42ac33499ba2fa38c3330070b872faf4693"; + sha256 = "914f9304e31a3ffe4054c5521901040a875455f4d202a10712908073377a13c6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/ja/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/ja/thunderbird-115.3.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "36058ca20592a045a25621b3cb6e085fd7e4c79fb4d85e8851b1bc9429d7b987"; + sha256 = "2e7964c0ea3a586d365d201fb0fc32e0e1da3426fbfbca0754812844fe17f26c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/ka/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/ka/thunderbird-115.3.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "1187cd5eac5511f48d93e053dd391b0b484d2ed8c925f4acd267e1253938812d"; + sha256 = "468c045050b0b68254d042f15ec09303318a58d0f5e9fa4e824ec749b256ab0d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/kab/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/kab/thunderbird-115.3.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "1058188515e686ec4a2cdf19bd18333b6786a66c8fba768c39435a9b53f6f17c"; + sha256 = "8d76a4d2e7b491d5a912ff6eb3f64996b9d80ed4874ffb07109239f4f5dba699"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/kk/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/kk/thunderbird-115.3.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "cd305ce3935fbb6b028f7eacb978bc05ebe068c90c67e35f8cb020a4546e50bb"; + sha256 = "30cfbc6faa9cccd21e2d17c03267d3542c99d18d4124684458081a5f43b023ef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/ko/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/ko/thunderbird-115.3.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "a54216fc0f6d5e73c830a8d2af6b8b67f76469c5312b18aaa90c5561d2400dcb"; + sha256 = "c6817b34e8205680a3f92354bed9232b761249dfb316c61ae2d1d6f4c674b00b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/lt/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/lt/thunderbird-115.3.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "9cec3ecea52bf0de2be0afece9f93a83cd89c81a0fa5531aac5d0143c19e3eb5"; + sha256 = "1885249ad6b0b93d1f92cd12d8a7ec826522c0829c20f3650c0fe67409fb839c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/lv/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/lv/thunderbird-115.3.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "1d40bf00bfceb69058995d1b31d7eb1b95522b9c873c2e353bf91eeabc0fd4e9"; + sha256 = "f076a056ba8b68291e3461b6acd70d7de8540aaf34414442bdaf7febd54f6565"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/ms/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/ms/thunderbird-115.3.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "bf2257ee492c4b20dd2c393e783398379361fce3d6eb0e3c697dcc3e5c7692be"; + sha256 = "9b4bc1b4d08e3143c38dcbdde0d7d574cb321050a28afcf5826a9050119a087b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/nb-NO/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/nb-NO/thunderbird-115.3.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "8d10ff20e72063014de0af53284b6394dd137303de181a5568085b63e3556530"; + sha256 = "b1e90bcb60dfaee62765ecdfa2c149869304ae60eb8d4296664d8592b7f0e144"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/nl/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/nl/thunderbird-115.3.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "afe6d63a0394d2130b31501c8ed3a7f2d0f1f063eefc737679ba4eb22e7f9f94"; + sha256 = "6cdff185bff851dfa0a33cbc5cb70c5bbf9651f7b7cd3bff772d9574c52d09f3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/nn-NO/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/nn-NO/thunderbird-115.3.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "68e99bf9cf99fa8d8528dc7c18dc482922541ecbfad39251a1ae49dc8f73c0a2"; + sha256 = "76bcfcc43e07d2b6d869f8ac27e5a0d15edc9d90e1c60f29a6ead469937da00f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/pa-IN/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/pa-IN/thunderbird-115.3.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "d112133d7f9dc5d70bda58261f5b17fadd1da8ceb33f68ff98764658030266e2"; + sha256 = "5be1be208f37287d956867147a8cbf55bfc7c56691dd7850f142972fa1fd30d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/pl/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/pl/thunderbird-115.3.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "a670c46af55bb5c01cca9763fdc51c7ba883f3e61419e49313de79030ee8f300"; + sha256 = "a6f4372fd09296a5e057156c5857ba98d2b28185955bca4eab1bc9693eda454a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/pt-BR/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/pt-BR/thunderbird-115.3.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "94a4c6dc574ced2f5c8853fb8aa5028bd633372119875a84039b40945cd062af"; + sha256 = "fb19832f75b6d91d989a96b867826253c68c2b16d5bec58c0643caeb393afd43"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/pt-PT/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/pt-PT/thunderbird-115.3.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "510052bca71d439273e6101dc45a0dc5d5a0d0d73ca7d10799b60983ca8dad8b"; + sha256 = "34bb7b3b7972d651cd34f2e5d3759651c5e7f633560b355f9fdf838f94b2c24f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/rm/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/rm/thunderbird-115.3.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "9cbf37597f5273d45e7f82fd6a63c4664621886c5b517b139ba32cc92ed699ad"; + sha256 = "8ec988d4367a2d5a4c980a79e2ba0e8f6a8066b068938a16e3a9e3e7719fa9b6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/ro/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/ro/thunderbird-115.3.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "3824fb33a770c42cfb737b1ad2389df31d898f64f5464ef92b65446d84526276"; + sha256 = "ead67c7e3ec02ef561478494de852d2444941fa0562908a752a6c776fe4b9704"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/ru/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/ru/thunderbird-115.3.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "25d898a873fac3aeedd635e35caccb012e2cfcbb3eb9d9b04e32fba331409fc4"; + sha256 = "3d81c4f4ab6dcbc602adc4fdd265b18d635c646c50f051b8ade0aa6a8906ba13"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/sk/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/sk/thunderbird-115.3.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "6efd3f4af7de7c11c5a028a5be5de0459067cd455c237ed1df860b1bb2c2a70b"; + sha256 = "a2001b49f939b65f5df13fc27f55174281c73a90a657375d9191e5de4a425d58"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/sl/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/sl/thunderbird-115.3.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "87bdfa7acdaaeb4082190296f16540153696c3521ebdbf83b05e98b34d97423b"; + sha256 = "db0999eb0884206f59c5d7053771864590fa8a0911fcdab8d479f13cd76f57c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/sq/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/sq/thunderbird-115.3.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "da6c4f5552bc8a13503af5228cc8197f76d4045ccf44d40839d46dbd3021cf8f"; + sha256 = "08cd3e5927e0b853324cdf5d475dfbdff222723f21a34b31f59c8fdbdaaa36ab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/sr/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/sr/thunderbird-115.3.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "3f816d3718af424ce1ad395ae26899ee6a81d0b9cbc351b24284774f243f8a62"; + sha256 = "a4782d01b45030631bdda4692cb52d00f014d4360feaa1b1b9797a74c2fb3861"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/sv-SE/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/sv-SE/thunderbird-115.3.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "961695ad2889a4be8e0efc67537fbea786f72d9d0f900bc64346857249d74fde"; + sha256 = "a13453f4bb640b12ee6db4e83b3b59be2c7c42f0c86f212e7feacee6b7197530"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/th/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/th/thunderbird-115.3.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "24b1c5b1560f6e4e9ccfb9d2913e94c817b5bcf460d08f6a26fe75e3bd84c75d"; + sha256 = "279730d66c90a381a86ce15ad7b709d0dfe6eae305d3166352fd317df0ba5d56"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/tr/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/tr/thunderbird-115.3.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "7a45630926c83121d5b39705a45fc6534616df0a822c6f61c3d89bf8c5681563"; + sha256 = "7716e1d986c87342cc48a465a662329ac779d1b22d1ca009467716b4d0c60620"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/uk/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/uk/thunderbird-115.3.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "940ef8d84557c312b632b67f01f3b68dc1701a159caea8de34b4b950da05c8d9"; + sha256 = "0715cf2c118d342dc691581f5f9c617e145f3128887c7f7b9a1c4c464e0d621f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/uz/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/uz/thunderbird-115.3.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "1fd5533ac342d1a32d37428458fb2a08a99cf366b04cbb55acd745b8f931ba79"; + sha256 = "6af8bae5251ad53cbcfc4abc2b659f73145d246d5db7c655a811ca4a32897428"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/vi/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/vi/thunderbird-115.3.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "1156dd69b7ab889c2e812096e3f8a16d85d11e88b730e35aa6c6d4213410b874"; + sha256 = "16c2ef5305c51b6c00b6fe171cb7ad942b6411e53629a3603347ac7fa4a5917f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/zh-CN/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/zh-CN/thunderbird-115.3.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "e02ee486284735cf17e44fd15145265948e1548ba257be502f59662f81132278"; + sha256 = "a3f3a0d19ddb264031167e8c4eef2192239e4d09408d6972c2f63cd241068b4f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/zh-TW/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/zh-TW/thunderbird-115.3.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "1e0f7a45a93457c7a07366435df7e85c4a0f40dca7ab5a189495087aad11f0da"; + sha256 = "de1a3b31b76ccfca1ef2848d96703a0d3e85065d0f71a7a6f030b3054065ddd3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/af/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/af/thunderbird-115.3.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "3ee2902b72a9df7b2445fd4e729f8654493cb4b8052433dfd86dfecc26f3678b"; + sha256 = "a0e0caed0d502c2f5f4be6b80a874daa88ca776e88b848a5dafa9f89d7b7d03d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/ar/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/ar/thunderbird-115.3.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "8a882924914f3d7c7483ef778dfee8763102de06944f31b750fe95b7830da1a8"; + sha256 = "e073b739553b3ff1cd0e080b2e904e258bd9224e57640b8da8876932156a1a66"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/ast/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/ast/thunderbird-115.3.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "5a8feb49d844362b8938aaeca6d42a7d385cddfe8cfdb9e90b4fd304260895c0"; + sha256 = "bced7c19a96d8eb6819365421b8c79b1f4ed807b1e69b58c4e436a726aa6bcf8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/be/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/be/thunderbird-115.3.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "b0376f86764c564d2fddc6a7c868924f14ea1378c8b503b651eaff83bfbcfdbe"; + sha256 = "1c4d9e38742bccd79afc383c6fc7cbd6833476aedc714cabe2bf3dabdda60dec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/bg/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/bg/thunderbird-115.3.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "dd6c5ff2a77340e03dff6779f620e5c0df5a51b1c0fcd4171e4436d301dcf1a2"; + sha256 = "a26988b65430aa3a51f298c2ff0ae724367265467ed9a886011dbcec7a570155"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/br/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/br/thunderbird-115.3.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "7a6283099532171a9f695a1a84315c334f87391f20f41421caa13a82c6ffdce6"; + sha256 = "0b41b1ab5cf1e3ea4bfec6a60fddcca5c310f980b50b65632cdf580a96ce0c36"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/ca/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/ca/thunderbird-115.3.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "46cf076753e50dae6295a50f0fe55fdf1462fdde5f17eef865adfa2413b76c4a"; + sha256 = "41629371090e2d1ad19882931e344379c06d4eed8c42e445bd148cd5a5ac2eb1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/cak/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/cak/thunderbird-115.3.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "af4a0806d404938b720af1c50331d8b20c049251629ce8e6040d54f0da3d6e4a"; + sha256 = "0a55ee3b2249ed184c92e182da6ea5af630ca7112f88463aa70f34912f7351ca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/cs/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/cs/thunderbird-115.3.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "7f0af85bea543efd7ab154e42bd8aa077c96d8878f6850f0844daa3168af03b1"; + sha256 = "6a97c43fe413f14e0cc75f4122df69896f9a0765abfbca3c58000435fb468516"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/cy/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/cy/thunderbird-115.3.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "7c0992c257089531ec5b080f736bd10df364cf03f271e85d72398b28bbf5ea6a"; + sha256 = "c9bedd80cb934c54c7ee8a3965934a4a551f704b3823ab528c0db2fd8a2bddc2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/da/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/da/thunderbird-115.3.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "18c73fdedad32683ff300d7ff0518ebc800bdab42bb54bd09820d9783770417f"; + sha256 = "5d64f5fa14da87a192658a21bde9f600f94490f3b31b0e28d7b1e365840e9b2a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/de/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/de/thunderbird-115.3.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "a344a7de24b1c83882b395cd82dd1a9e6241b4b549a21290dea9efec9640caf4"; + sha256 = "b232fe451f7fb109c1e6bf8fe41715ca1e2b5021d0fead1b1ed25da8678cea85"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/dsb/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/dsb/thunderbird-115.3.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "88f81c3fe9096d84fe3461b1cd22b1df94fe4863ec2f10853f6ca69cbe4d812e"; + sha256 = "9e92a8e20e874ab7117001cd9db0c72f34f49569be8522f12ed0044829d4733c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/el/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/el/thunderbird-115.3.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "e620620d471704ff8c7a4783f797a5df5150adf0bd359fa032c46336f4a608a2"; + sha256 = "dd534a1bb9aff5322b190a3f214e3205c9d61447fb7306a52717960f16da1d4d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/en-CA/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/en-CA/thunderbird-115.3.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "f1e138849aa3fa71f23ce33710e7f547857b37cc66ba85853d3037e7f6c83c48"; + sha256 = "8f95507ee742cf3cc78d2ddef1a052262d3698f90ccbf157ea9227390ae65a4a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/en-GB/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/en-GB/thunderbird-115.3.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "4425e8e5af32d72844504db55cd60ebcd730614e6e8edfe65c177aa2e8937d50"; + sha256 = "181e6c65ccdb0a6e157557ae3da9adc7c6dec90c3423f7e96d5777adb15e61aa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/en-US/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/en-US/thunderbird-115.3.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "c31a3a9f85d2d22812846dc91fecd7cca9801542cf5fcc68266ae44801df7575"; + sha256 = "6df045b6d0a53f2ef9b882f093d069a70d60fe501835d09a8aed0d5fe810283d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/es-AR/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/es-AR/thunderbird-115.3.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "34a1296b1ddc22ea34c1996759cc74551533841e9802014085b18dd9e0cd1d5f"; + sha256 = "d77ac4665b50a84fd6b4a7699b2e60b44ddd0a8465144a6c703fa3aa98340b5d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/es-ES/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/es-ES/thunderbird-115.3.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "57b0bdac83109b513858ff30598bb64d113a5bff0bd77f0f0b5f2946f8ed89c5"; + sha256 = "4c28a5ecfac54d0939cd4020381fbb361f96ddd7113c7ef2e23ffba9121c62ea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/es-MX/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/es-MX/thunderbird-115.3.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "e251157e06a0c380075a00f8690d387718bd553ec2aabf8c81c1951b141c2651"; + sha256 = "7edde23453945f15db4b5742ffe3654a092cbd8a5ed77891eacd56aa0672f05b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/et/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/et/thunderbird-115.3.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "b4043ffdc9f5454a799243d5657860bbeb870d7343be0fc3c197527e4b20892c"; + sha256 = "e5c8d238030a6fac97a70429b16f2c69c85229928166a134c11422b1be17d9ce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/eu/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/eu/thunderbird-115.3.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "001662ce9fc1a7c9ab82ed4f0dbbc49d0fa0c6d5b3ae93573dbfd44af0e12a33"; + sha256 = "1c6f0b49244d16c4b092e5a5a04a459f927ad2a1a8233d9d88d53a81b41432f7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/fi/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/fi/thunderbird-115.3.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "c0c368797911327088819de0c1e6e6dbf6f7ccee871c11695ce64cacdd56341d"; + sha256 = "ee41a31bb89866b47398a4d7de1f656e8957e853961f570c3f50d5fa70983303"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/fr/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/fr/thunderbird-115.3.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "cd444fbdd2febd5aeee98ba4f4db737b3e6cd7a85b9cb456da179bd4cb9f67dd"; + sha256 = "cccb80a0d288821dd9e6a282430aa0793167a0bc5a74542ddcc82b46a3e3507f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/fy-NL/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/fy-NL/thunderbird-115.3.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "43203b502f5231c0caca6ea389a79558d5faa74f3b6256c3fe11c2392fbe45a2"; + sha256 = "6b90cc256a6a9b4c7c3d967ec843e5b0fdb4b78daa63fad79477cfc04c952719"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/ga-IE/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/ga-IE/thunderbird-115.3.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "0a86e1f993cc9f6cb9d19a481e028458287e765786bb5eb26fa1f45c253ef8e5"; + sha256 = "c6ef206267af6fdda477a972f3a59fad83866a0c4530fe9baca6ba7d68b271f6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/gd/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/gd/thunderbird-115.3.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "3331e8a202a131e4b2ebaa5990d5b4976df286287eb1d22381ddac30368584da"; + sha256 = "9f80964540eb64d49bfc6e0c459d6d3e57465d6cbfa72aee7ab50cb72cb2ca48"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/gl/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/gl/thunderbird-115.3.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "ddf7a4655bb5992c064d26b8f6c2ebd68b57f8a08168699f385848ef8471b600"; + sha256 = "e811f521e1aa9b210d2868f2d5492b5b9b8440a75a935c27699aa17a7eaa4937"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/he/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/he/thunderbird-115.3.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "d792d930eba7c959cae93726c56bbe172e372067d0cae36519b060d996e33ace"; + sha256 = "b123f32b8ee177dfba6378bfd1c872453bce2e90aa4839cde489bf60269a22de"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/hr/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/hr/thunderbird-115.3.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "4e18f2e41e066226f90bc324d0353e0cfe50e8b6a819e8e15e2a9c11ca15520a"; + sha256 = "90374d091f267036c6806ccd000b4cdbb72f5bbe957ad06e15f723682796fc2f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/hsb/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/hsb/thunderbird-115.3.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "f4a2d7b3f45b8fc238e62acec32a2f5512834933246f4f9c49eb8d77437e4fd7"; + sha256 = "8b99f5aaae0fc61c44780d996a21aad0c1173430d0a56a63d9cfb1bd116bd75a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/hu/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/hu/thunderbird-115.3.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "73ea347abc31da1cadabef37698debe1656f57c40014ffeb6bc66293c21cb85e"; + sha256 = "e31779d17e2968907097c367ad442371d86b6c42ed620e6b047b95b23715e48b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/hy-AM/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/hy-AM/thunderbird-115.3.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "5829588a384a770ab25008ccb16ee082c880d8e99082ab9df59c4d92e21aafd6"; + sha256 = "180c3453c664f31687dfa084012cf5527425c35c81019df65e9dede4680cf54f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/id/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/id/thunderbird-115.3.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "77a6b3c5ba1454fe8e8a93b463b6cbe841da25ba352ed1eeba7bb5f32108cc18"; + sha256 = "c74ff79b76f6b73f7962426594714a9864b6b735216aed7dd0ba15193ccbdf4f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/is/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/is/thunderbird-115.3.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "aeede33f1040ee9e9647df43bc88bf848017a91e2fb8ad42f5c109b42aa0f533"; + sha256 = "e93faa12d98ea04510ab192585fda996b0e2c06138133a2ca8078cf933e96fc2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/it/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/it/thunderbird-115.3.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "7cfd1ad0a4ad00bcb16539a8ff1a4b54447901501f05cba812245c70b8044d5c"; + sha256 = "b4c6a1ec49ef2e34d399001f2fa6073334223bff487db8764593cf57f641eccf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/ja/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/ja/thunderbird-115.3.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "d9d8c0983592c4e44374739d089759c13cdd7d6b912efbab5972a97ec43ec00f"; + sha256 = "8abd71c45890632ad38f6cebf8dcffd9938f1d6e5b63513e6cf139a5d657d2e5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/ka/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/ka/thunderbird-115.3.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "c3ac587b9d0cdfd74babff266f81538cdd701b75ecae61b9c0f7cbf499e16423"; + sha256 = "a6a0f69751aa4aa967aff05857d826905a25b949a507c6a5953e3a9d764ad6db"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/kab/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/kab/thunderbird-115.3.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "dfcff22ad267fafaea7d2e8892e50d24dbe191d3133ba927d2077b306a92d5c8"; + sha256 = "c6be26710c7a8fa9a7db710bfaf64d6d7bacad607c2f8eeff7b1f306e9050aa4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/kk/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/kk/thunderbird-115.3.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "6ab9f8ca37108634778631d0f4a4231a9fd6c1a96e1b8fe48bd976ae6c4176be"; + sha256 = "b221573610a8a98600e82db05544f916509822d3bebcc656bb2e64bcbb85a158"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/ko/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/ko/thunderbird-115.3.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "679d3f285efe8e3cfef0d6aac96e56638705f479cdd7a85decbc3376f684a362"; + sha256 = "ead6c335ac822391b773778abfe609bfdbdfe1e7dc6e5e0956531b0e29fe592d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/lt/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/lt/thunderbird-115.3.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "31c5bc57a65c371d13d6ecae2d9806462614cb0f25ae02385d64ad9b78e03e16"; + sha256 = "cfc792e830e60ca5ff8ff1c468493dbae332340ff0d786083b529e4f46b3e30b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/lv/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/lv/thunderbird-115.3.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "4d6dc7af4709b1fcd30bade79462faba7f97b63969be5d03b0bd06de4b5b3545"; + sha256 = "76d46bbc0d30c92816391c09ac111c5820c114165e879addb800e18637c7adb9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/ms/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/ms/thunderbird-115.3.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "a7a735fb888d4e1c93d5593c88e8c14080c3b05460c6b6b2ffedcc1ab5c1a53d"; + sha256 = "b14194b7637d0afb8d8b3ef61eb0eaa2bbbcea7ed39316342cb00105445fc2b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/nb-NO/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/nb-NO/thunderbird-115.3.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "47df0274374aea382dcae2a0d083fb36fc666500b320a0e3eb97f056e0fb02fa"; + sha256 = "19806dc92d6bc218be377bb7bd8a455a9e18aa5539a2cbc55a4359c0c00505a9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/nl/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/nl/thunderbird-115.3.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "95c73823294cc2d9348ff4855d8bba4aed0a61d430ddaabaae90be250d198e1b"; + sha256 = "d00a9436cb35db75f80472453e3f29694bde58fba07553ce9a6c4b4e559ef2ac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/nn-NO/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/nn-NO/thunderbird-115.3.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "9b170811ddd271db68c417650da56d9eb61e976e20a6787b5505497e3acc588d"; + sha256 = "4a7a0b70caa9d56b8c2ae25762a5ec6e20c805e92694655c31f0498a9b56e29a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/pa-IN/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/pa-IN/thunderbird-115.3.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "a25dc5ebf2ba028f5f9a5e23eb90e0862ead94c5d8476d2f3429d640c36a75a3"; + sha256 = "76d6f61c7053139ef52ddfac63454b152a0e5957773e5f293c975cc6468cdd36"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/pl/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/pl/thunderbird-115.3.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "dba916bca6c19c0771b7ef35199c89e77864f200df4ae40b15c3483ba3f02b2b"; + sha256 = "7afac7c8563248a3b2101a990cb0e84039475c8c7a41113fcaaf043df55a54e4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/pt-BR/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/pt-BR/thunderbird-115.3.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "2d3583f7062659a8642ee952205235abcde36e86918e905be85a1070ead65f88"; + sha256 = "d183b0f1d6c01e436bd38d1f5e06bdfe528584e7602103bb576d5640366fddb9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/pt-PT/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/pt-PT/thunderbird-115.3.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "c09cffe7f7043f6c757e478e46c30ada218999437d9e9748bb1ade9891365195"; + sha256 = "4eac7d59c9df12542ce2fc6fb1bfbce62d537c4520be627716559e2c1e7a2128"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/rm/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/rm/thunderbird-115.3.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "4a1853d5c7915181e949ee64611ea34525bc41fb72f16b02b083d81265d7bab9"; + sha256 = "115308e7f02fd241d80591bef5dd300421250827f8eb1373a2b4446018ab897b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/ro/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/ro/thunderbird-115.3.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "397379badeb37e27123c5316422567e7b2bcf1c3033a85d8549866f06090d2e0"; + sha256 = "118587e5d8697e2da4e353deecefe18073c1f2f531eb80903f65957b7bfb965a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/ru/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/ru/thunderbird-115.3.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "e23ceab86e0cce57522bea456f396fdf96bdca1b30eee4d7a2999709383544ae"; + sha256 = "a8b5a03ca48c985e38156d5c7fbfd67a48cfada1613cd1948083410dc1ccab78"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/sk/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/sk/thunderbird-115.3.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "87027b9270956fffa744d5d35b96094265a735eb7c361fd3badd2012b34e13ff"; + sha256 = "724f250a2efdb6d3f1b7cd3a16dd667ef013b8e7d8af76befc6a35692b6db51b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/sl/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/sl/thunderbird-115.3.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "cb65c05b17419a69b0835a7be064e40c6cd29a114b28e5682cf5df2d6ff07c22"; + sha256 = "e243ed7bf35315cbe856c66614b9c8df243884aa68dab703a155bffd3568964e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/sq/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/sq/thunderbird-115.3.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "0a04b9f2de594d18a39ed04dbf503c50afe5281100c04887eb1d907c5268edb5"; + sha256 = "7beb3635ce488c8ea059777eb986c2554fe064e162db146ed4074753b86b60ef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/sr/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/sr/thunderbird-115.3.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "30f05101328e20f56c0e45505a6b579f19aa6fe8e88014be5f1b201dd19b8567"; + sha256 = "162c3daade98baac53b44e03d42c3696f53d4259875f11b92622de756e1af457"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/sv-SE/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/sv-SE/thunderbird-115.3.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "1bd3ece9bc7d4c51d2f25d221eda2105e1f8ddd1071391a27d2875cd246f331f"; + sha256 = "f76cff08945f213f80997d231d0930a8641725063a6c95ab5090d50c1ef791ca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/th/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/th/thunderbird-115.3.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "6a448f673b6c4991faf6d6142a1557b2bd9f9c2f9cd540a7d48b5d27ac7d0419"; + sha256 = "e45b3bf416d32b65ef8c0e93170bce63f2a151ddc1ec54be637a2111a9966e07"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/tr/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/tr/thunderbird-115.3.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "87844be2d24111a275eb6e557cae904167c0c817bd98d8af8d198c4ca126950d"; + sha256 = "86859e3328fb519ef0183cffea86222392bd40ff11c6e1eef500de46e2c236ef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/uk/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/uk/thunderbird-115.3.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "4ea9214c1ca561dabc43be1a55d9e8bb56dad60b116f0e8814a2fa0dac2d740c"; + sha256 = "6e38fe346232dc10dd3fd71578856116c7005b89ee6a064b409481f9bf1b3ad5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/uz/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/uz/thunderbird-115.3.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "ca6a23a0234a15e05f5ffd627102bfd357882f8187e4ee5568173a926c186163"; + sha256 = "f4d3dad6b9ba9a417f9365617fc93f04b794ca5bbe1979606fc7ea2b9b4a919f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/vi/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/vi/thunderbird-115.3.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "14ce4927f2695c6c7e1b35f9f0e00600861c8cf05351da21e3c19aa8f6243b2a"; + sha256 = "740b1c77c00ece1cc21824bbaa76edf8fb1b5ea99307f0ff5c4db28da01b0fef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/zh-CN/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/zh-CN/thunderbird-115.3.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "014933d85792304b836d67bd449b85be0a17be014f842f9fcb1cf7a2e3077329"; + sha256 = "d1d5c77022286d5eade32a3fe26d0f707d5ea2b2c0288e2b1e589b272948dab3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/zh-TW/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/zh-TW/thunderbird-115.3.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "339fa1de720d6d24b778757fe4dc0d5a7b663e7ce608600f78821199dc596441"; + sha256 = "ab6d7d5d542146c063cb013c41e04ef6967bfcab0c3b9fad3248bc9a1fe6386f"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 4ddb0b6410f0d..71b0768dab6c6 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -11,7 +11,7 @@ rec { binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "4ae3f216833aec55421f827d55bc1b5fc2f0ad4fefecb27724a5be3318c351df24d30a4897b924e733ed2e3995be284b6d135049d46001143fb1c961fefc1830"; + hash = "sha512-SuPyFoM67FVCH4J9VbwbX8LwrU/v7LJ3JKW+MxjDUd8k0wpIl7kk5zPtLjmVvihLbRNQSdRgARQ/sclh/vwYMA=="; }; extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. @@ -29,6 +29,7 @@ rec { broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". # not in `badPlatforms` because cross-compilation on 64-bit machine might work. license = licenses.mpl20; + knownVulnerabilities = [ "Thunderbird 102 support has ended" ]; }; updateScript = callPackage ./update.nix { attrPath = "thunderbird-unwrapped"; @@ -43,13 +44,13 @@ rec { thunderbird-115 = (buildMozillaMach rec { pname = "thunderbird"; - version = "115.2.2"; + version = "115.3.1"; application = "comm/mail"; applicationName = "Mozilla Thunderbird"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "45843709c21eb19d69d43205da6b2f943b584811a29942ffef1933c1ce7882b48046b201c2ff198658fec2c53d479311d8a353731afe6ea53f97b31674d6074a"; + sha512 = "e3b643cfee07d3fdd7bcc686db6dd3e81b09ecabfa9df4d34dd32acf3799b4b0b4a88e169f957d420e06aabba55c4452f3a9761db37828b025048ad5d8ef2db9"; }; extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. diff --git a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix index 1a7eaf22ae054..d7ee8754c91c6 100644 --- a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix +++ b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix @@ -3,12 +3,12 @@ electron, libsecret }: stdenv.mkDerivation rec { pname = "tutanota-desktop"; - version = "3.118.7"; + version = "3.118.8"; src = fetchurl { url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/${pname}-${version}-unpacked-linux.tar.gz"; name = "tutanota-desktop-${version}.tar.gz"; - hash = "sha256-e62Wn8rfjX5HmlA3+D6NkZNw2jzx1fYEHC9R1tioQhc="; + hash = "sha256-12R8g5U8p2lXNaSeJiCvEb6AgCC40jDXDKO8kyEvM6w="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/mullvad/libwg.nix b/pkgs/applications/networking/mullvad/libwg.nix index 0ed9599963ef0..2f852e3a25bd0 100644 --- a/pkgs/applications/networking/mullvad/libwg.nix +++ b/pkgs/applications/networking/mullvad/libwg.nix @@ -1,6 +1,5 @@ { lib , buildGoModule -, fetchFromGitHub , mullvad }: buildGoModule { @@ -13,7 +12,7 @@ buildGoModule { sourceRoot = "${mullvad.src.name}/wireguard/libwg"; - vendorSha256 = "QNde5BqkSuqp3VJQOhn7aG6XknRDZQ62PE3WGhEJ5LU="; + vendorHash = "sha256-QNde5BqkSuqp3VJQOhn7aG6XknRDZQ62PE3WGhEJ5LU="; # XXX: hack to make the ar archive go to the correct place # This is necessary because passing `-o ...` to `ldflags` does not work diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 3464098d9749d..ce9476807465a 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -86,9 +86,6 @@ mkDerivation rec { "-DNO_SHIBBOLETH=1" # allows to compile without qtwebkit ]; - # causes redefinition of _FORTIFY_SOURCE - hardeningDisable = [ "fortify3" ]; - postBuild = '' make doc-man ''; diff --git a/pkgs/applications/networking/p2p/pyrosimple/default.nix b/pkgs/applications/networking/p2p/pyrosimple/default.nix index 15e7304ef9b96..41eedcc1b445c 100644 --- a/pkgs/applications/networking/p2p/pyrosimple/default.nix +++ b/pkgs/applications/networking/p2p/pyrosimple/default.nix @@ -10,14 +10,14 @@ python3.pkgs.buildPythonApplication rec { pname = "pyrosimple"; - version = "2.10.2"; + version = "2.11.3"; format = "pyproject"; src = fetchFromGitHub { owner = "kannibalox"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3ZsRJNGbcKGU6v2uYUintMpKY8Z/DyTIDDxTsDEV6lw="; + hash = "sha256-P12Tx9lEGp9OINL6vJIdyL3+pJbR/uaYe8k7v9kSz/A="; }; pythonRelaxDeps = [ diff --git a/pkgs/applications/networking/p2p/transmission/4.nix b/pkgs/applications/networking/p2p/transmission/4.nix index 05d757d53a2c9..07cdbcd25d575 100644 --- a/pkgs/applications/networking/p2p/transmission/4.nix +++ b/pkgs/applications/networking/p2p/transmission/4.nix @@ -141,8 +141,14 @@ stdenv.mkDerivation rec { EOF ''; + passthru.tests = { + apparmor = nixosTests.transmission_4; # starts the service with apparmor enabled + smoke-test = nixosTests.bittorrent; + }; + meta = { description = "A fast, easy and free BitTorrent client"; + mainProgram = if enableQt then "transmission-qt" else if enableGTK3 then "transmission-gtk" else "transmission-cli"; longDescription = '' Transmission is a BitTorrent client which features a simple interface on top of a cross-platform back-end. diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index cc82c5038083c..1cfa057a73eeb 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -129,6 +129,7 @@ in stdenv.mkDerivation { meta = { description = "A fast, easy and free BitTorrent client"; + mainProgram = if enableQt then "transmission-qt" else if enableGTK3 then "transmission-gtk" else "transmission-cli"; longDescription = '' Transmission is a BitTorrent client which features a simple interface on top of a cross-platform back-end. diff --git a/pkgs/applications/networking/qv2ray/default.nix b/pkgs/applications/networking/qv2ray/default.nix index bb9bb957f3d3d..038d904f453b0 100644 --- a/pkgs/applications/networking/qv2ray/default.nix +++ b/pkgs/applications/networking/qv2ray/default.nix @@ -42,7 +42,6 @@ mkDerivation rec { }; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DQV2RAY_DISABLE_AUTO_UPDATE=on" "-DQV2RAY_USE_V5_CORE=on" "-DQV2RAY_TRANSLATION_PATH=${placeholder "out"}/share/qv2ray/lang" diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index f9668a9eeaef1..66b8f8d59bd8d 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -18,14 +18,14 @@ let in stdenv.mkDerivation rec { pname = "anydesk"; - version = "6.2.1"; + version = "6.3.0"; src = fetchurl { urls = [ "https://download.anydesk.com/linux/${pname}-${version}-amd64.tar.gz" "https://download.anydesk.com/linux/generic-linux/${pname}-${version}-amd64.tar.gz" ]; - hash = "sha256-lqfe0hROza/zgcNOSe7jJ1yqqsAIR+kav153g3BsmJw="; + hash = "sha256-seMzfTXOGa+TljgpmIsgFOis+79r0bWt+4vH3Nb+5FI="; }; passthru = { diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 701b266b7309d..b9b8ee29b1807 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -76,13 +76,13 @@ let in stdenv.mkDerivation rec { pname = "freerdp"; - version = "2.11.1"; + version = "2.11.2"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; rev = version; - sha256 = "sha256-x97I0TDPAd/zULM/FpAvYQTcArG2CwGoUUp/eEM4vdc="; + sha256 = "sha256-buInsfjzpY4EF7bSojy42YNXssbNriSQGYBFE/DUJ7A="; }; postPatch = '' diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/applications/networking/remote/xrdp/default.nix index 0048368b8d4ad..bf3b8b64f1e7a 100644 --- a/pkgs/applications/networking/remote/xrdp/default.nix +++ b/pkgs/applications/networking/remote/xrdp/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, applyPatches, pkg-config, which, perl, autoconf, automake, libtool, openssl, systemd, pam, fuse, libjpeg, libopus, nasm, xorg }: let - version = "0.9.23"; + version = "0.9.23.1"; patchedXrdpSrc = applyPatches { patches = [ ./dynamic_config.patch ]; name = "xrdp-patched-${version}"; @@ -10,7 +10,7 @@ let repo = "xrdp"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-14qsRfLn+26rm+vyMmOtaBEs8mWfSTIsIVseSC2FjXc="; + hash = "sha256-fJKSEHB5X5QydKgRPjIMJzNaAy1EVJifHETSGmlJttQ="; }; }; diff --git a/pkgs/applications/networking/rymdport/default.nix b/pkgs/applications/networking/rymdport/default.nix index 0ad0fd09f4970..232b6460ec6f3 100644 --- a/pkgs/applications/networking/rymdport/default.nix +++ b/pkgs/applications/networking/rymdport/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "rymdport"; - version = "3.4.0"; + version = "3.5.0"; src = fetchFromGitHub { owner = "Jacalz"; repo = "rymdport"; rev = "v${version}"; - hash = "sha256-nqB4KZdYSTiyIaslFN6ncwJnD8+7ZgHj/SXAa5YAt9k="; + hash = "sha256-aNLAj8rQSRp6fsEu052uc2gJE55A996YJY7tDApjHxA="; }; - vendorHash = "sha256-03qdjeU6u0mBcdWlMhs9ORaeBkPNMO4Auqy/rOFIaVM="; + vendorHash = "sha256-8TxuExcxiBTHVA9DTLfElKOq45a2EVLxqmByDyKJQ4c="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/networking/soju/default.nix b/pkgs/applications/networking/soju/default.nix index 5eb262168892c..d4e6d7a393f23 100644 --- a/pkgs/applications/networking/soju/default.nix +++ b/pkgs/applications/networking/soju/default.nix @@ -18,13 +18,6 @@ buildGoModule rec { vendorHash = "sha256-iT/QMm6RM6kvw69Az+aLTtBuaCX7ELAiYlj5wXAtBd4="; - subPackages = [ - "cmd/soju" - "cmd/sojuctl" - "contrib/migrate-db" - "contrib/znc-import" - ]; - nativeBuildInputs = [ installShellFiles scdoc @@ -33,17 +26,14 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; postBuild = '' - make doc/soju.1 + make doc/soju.1 doc/sojuctl.1 ''; postInstall = '' - installManPage doc/soju.1 + installManPage doc/soju.1 doc/sojuctl.1 ''; preCheck = '' - # Test all targets. - unset subPackages - # Disable a test that requires an additional service. rm database/postgres_test.go ''; diff --git a/pkgs/applications/networking/sync/storj-uplink/default.nix b/pkgs/applications/networking/sync/storj-uplink/default.nix index 65b9630fd5a08..f8b381b4384e2 100644 --- a/pkgs/applications/networking/sync/storj-uplink/default.nix +++ b/pkgs/applications/networking/sync/storj-uplink/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "storj-uplink"; - version = "1.87.3"; + version = "1.89.2"; src = fetchFromGitHub { owner = "storj"; repo = "storj"; rev = "v${version}"; - hash = "sha256-16h7PzZVFnaHMyODLk9tSrW8OiXQlcuDobANG1ZQVxs="; + hash = "sha256-tbzdfKA3ojwTvJ+t7jLLy3iKQ/x/0lXDcb2w1XcyEhs="; }; subPackages = [ "cmd/uplink" ]; - vendorHash = "sha256-gskOhLdrRzbvZwuOlm04fjeSXhNr/cqVGejEPZVtuBk="; + vendorHash = "sha256-AME5EM2j7PQ/DodK+3BiVepTRbwMqqItQbmCJ2lrGM8="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index 3612892548fc5..10bc3ca686371 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/pkgs/applications/networking/sync/unison/default.nix @@ -6,7 +6,6 @@ , copyDesktopItems , makeDesktopItem , wrapGAppsHook -, glib , gsettings-desktop-schemas , zlib , enableX11 ? true @@ -26,10 +25,11 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - nativeBuildInputs = [ glib wrapGAppsHook ocamlPackages.ocaml ] - ++ lib.optional enableX11 copyDesktopItems; - buildInputs = [ gsettings-desktop-schemas ncurses zlib ] - ++ lib.optional stdenv.isDarwin Cocoa; + nativeBuildInputs = [ ocamlPackages.ocaml ] + ++ lib.optionals enableX11 [ copyDesktopItems wrapGAppsHook ]; + buildInputs = [ ncurses zlib ] + ++ lib.optionals enableX11 [ gsettings-desktop-schemas ] + ++ lib.optionals stdenv.isDarwin [ Cocoa ]; preBuild = lib.optionalString enableX11 '' sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${ocamlPackages.lablgtk3}"/lib/ocaml/*/site-lib/lablgtk3)|" src/Makefile.OCaml diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index cb150fb2ed4ab..daa54ae05a3a5 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -13,16 +13,16 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { pname = stname; - version = "1.24.0"; + version = "1.25.0"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - hash = "sha256-5vr9qWMHBYpu8wHpV1JZcX1kEPi+mYeZ7ZQBqXASp9I="; + hash = "sha256-HDzAqnWRfBlRHVf3V7+Y1IPH4QmZiRpxpEzOUgOYgUk="; }; - vendorHash = "sha256-BZwZ6npmWFU0lvynjRZOBOhtxqic0djoSUdCOLbUwjE="; + vendorHash = "sha256-I/ul8ocHPlvtgbTR+/1FyqF0IbHZZSoAFe/0RFJtOYk="; nativeBuildInputs = lib.optionals stdenv.isDarwin [ # Recent versions of macOS seem to require binaries to be signed when diff --git a/pkgs/applications/networking/termius/default.nix b/pkgs/applications/networking/termius/default.nix index 8b0e3e1b6dc19..f2d8b8d685414 100644 --- a/pkgs/applications/networking/termius/default.nix +++ b/pkgs/applications/networking/termius/default.nix @@ -1,14 +1,15 @@ -{ atomEnv -, autoPatchelfHook +{ autoPatchelfHook , squashfsTools +, alsa-lib , fetchurl , makeDesktopItem , makeWrapper , stdenv , lib +, libsecret +, mesa , udev , wrapGAppsHook -, libxshmfence }: stdenv.mkDerivation rec { @@ -41,9 +42,14 @@ stdenv.mkDerivation rec { dontPatchELF = true; dontWrapGApps = true; + # TODO: migrate off autoPatchelfHook and use nixpkgs' electron nativeBuildInputs = [ autoPatchelfHook squashfsTools makeWrapper wrapGAppsHook ]; - buildInputs = atomEnv.packages ++ [ libxshmfence ]; + buildInputs = [ + alsa-lib + libsecret + mesa + ]; unpackPhase = '' runHook preUnpack diff --git a/pkgs/applications/networking/twingate/default.nix b/pkgs/applications/networking/twingate/default.nix index 09b3000c875df..86349576d44da 100644 --- a/pkgs/applications/networking/twingate/default.nix +++ b/pkgs/applications/networking/twingate/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "twingate"; - version = "2023.227.93197"; + version = "2023.250.97595"; src = fetchurl { url = "https://binaries.twingate.com/client/linux/DEB/x86_64/${version}/twingate-amd64.deb"; - hash = "sha256-YV56U+RXpTOJvyufVKtTY1c460//ZJcifq2XroTQLXU="; + hash = "sha256-JTkyJLbcAEcmftPKejMnxwIY+ICkaFar2fahKeXk3fs="; }; buildInputs = [ diff --git a/pkgs/applications/networking/utahfs/default.nix b/pkgs/applications/networking/utahfs/default.nix deleted file mode 100644 index e867ff46e7def..0000000000000 --- a/pkgs/applications/networking/utahfs/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ buildGoPackage, lib, fetchFromGitHub }: - -buildGoPackage rec { - pname = "utahfs"; - version = "1.0"; - src = fetchFromGitHub { - owner = "cloudflare"; - repo = pname; - rev = "v${version}"; - sha256 = "1hpwch5fsqlxwpk5afawa1k5s0bx5c1cw0hvdllp7257lgly19fb"; - }; - - goPackagePath = "github.com/cloudflare/utahfs"; - - meta = with lib; { - homepage = "https://github.com/cloudflare/utahfs"; - description = - "Encrypted storage system that provides a user-friendly FUSE drive backed by cloud storage"; - license = licenses.bsd3; - maintainers = [ maintainers.snglth ]; - platforms = platforms.unix; - # does not build with go 1.17: https://github.com/cloudflare/utahfs/issues/46 - broken = true; - }; -} diff --git a/pkgs/applications/networking/versus/default.nix b/pkgs/applications/networking/versus/default.nix index 1e3dd21132693..57b14ed54c72f 100644 --- a/pkgs/applications/networking/versus/default.nix +++ b/pkgs/applications/networking/versus/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "INFURA"; repo = pname; rev = "v${version}"; - sha256 = "0j5mj9gwwvgx7r1svlg14dpcqlj8mhwlf7sampkkih6bv92qfzcd"; + hash = "sha256-jX2HRdrLwDjnrUofRzmsSFLMbiPh0a1DPv1tzl+StUg="; }; - vendorSha256 = "1d12jcd8crxcgp5m8ga691wivim4cg8cbz4pzgxp0jhzg9jplpbv"; + vendorHash = "sha256-e116ZXofSnD7+5f8xdBjpMYdeUhGPVTLfaxnhhqTIrQ="; meta = with lib; { description = "Benchmark multiple API endpoints against each other"; diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix index 11d2912387276..e99c0fedf9619 100644 --- a/pkgs/applications/office/appflowy/default.nix +++ b/pkgs/applications/office/appflowy/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "appflowy"; - version = "0.3.1"; + version = "0.3.2"; src = fetchzip { url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy_x86_64-unknown-linux-gnu_ubuntu-20.04.tar.gz"; - hash = "sha256-jIekGA+MG9tvjEyHAI3dcD7lI1JL/qPqRpVO9gRhcTw="; + hash = "sha256-UmBXAfRIr9zOScqibKPHeKzr+UTx3gbGEm0tl7qn+oE="; stripRoot = false; }; diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index a9827abf2062e..b7e2105a94eab 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -2,12 +2,12 @@ python3.pkgs.buildPythonApplication rec { pname = "fava"; - version = "1.26"; + version = "1.26.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-YSxUqwmv7LQqnT9U1dau9pYaKvEEG5Tbi7orylJKkp0="; + hash = "sha256-pj4kaQDXahjhN7bu7xxT/ZuoCfPdGyo898482S5gnlE="; }; nativeBuildInputs = with python3.pkgs; [ setuptools-scm ]; diff --git a/pkgs/applications/office/gnucash/0004-exec-fq-wrapper.patch b/pkgs/applications/office/gnucash/0004-exec-fq-wrapper.patch index e2b81538046b7..8b00b275e59cd 100644 --- a/pkgs/applications/office/gnucash/0004-exec-fq-wrapper.patch +++ b/pkgs/applications/office/gnucash/0004-exec-fq-wrapper.patch @@ -1,8 +1,6 @@ -diff --git a/libgnucash/app-utils/gnc-quotes.cpp b/libgnucash/app-utils/gnc-quotes.cpp -index 3003fca71f..2f2b1398e1 100644 ---- a/libgnucash/app-utils/gnc-quotes.cpp -+++ b/libgnucash/app-utils/gnc-quotes.cpp -@@ -122,7 +122,6 @@ private: +--- a/libgnucash/app-utils/gnc-quotes.cpp 2023-09-23 07:04:21.000000000 +0900 ++++ b/libgnucash/app-utils/gnc-quotes.cpp 2023-09-25 11:58:46.482696433 +0900 +@@ -125,7 +125,6 @@ class GncFQQuoteSource final : public GncQuoteSource { @@ -10,7 +8,7 @@ index 3003fca71f..2f2b1398e1 100644 std::string c_fq_wrapper; std::string m_version; StrVec m_sources; -@@ -145,13 +144,12 @@ static std::string parse_quotesource_error(const std::string& line); +@@ -148,13 +147,12 @@ static const std::string empty_string{}; GncFQQuoteSource::GncFQQuoteSource() : @@ -25,7 +23,7 @@ index 3003fca71f..2f2b1398e1 100644 auto [rv, sources, errors] = run_cmd(args, empty_string); if (rv) { -@@ -197,7 +195,7 @@ m_version{}, m_sources{}, m_api_key{} +@@ -200,7 +198,7 @@ QuoteResult GncFQQuoteSource::get_quotes(const std::string& json_str) const { @@ -34,7 +32,7 @@ index 3003fca71f..2f2b1398e1 100644 return run_cmd(args, json_str); } -@@ -215,13 +213,13 @@ GncFQQuoteSource::run_cmd (const StrVec& args, const std::string& json_string) c +@@ -218,7 +216,7 @@ auto input_buf = bp::buffer (json_string); bp::child process; if (m_api_key.empty()) @@ -43,6 +41,8 @@ index 3003fca71f..2f2b1398e1 100644 bp::std_out > out_buf, bp::std_err > err_buf, bp::std_in < input_buf, +@@ -227,7 +225,7 @@ + #endif svc); else - process = bp::child(c_cmd, args, diff --git a/pkgs/applications/office/gnucash/0005-remove-gncquotes-online-wiggle.patch b/pkgs/applications/office/gnucash/0005-remove-gncquotes-online-wiggle.patch deleted file mode 100644 index 14b68555f367d..0000000000000 --- a/pkgs/applications/office/gnucash/0005-remove-gncquotes-online-wiggle.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/libgnucash/app-utils/test/gtest-gnc-quotes.cpp b/libgnucash/app-utils/test/gtest-gnc-quotes.cpp -index 8a5221d19d..d14e96cb66 100644 ---- a/libgnucash/app-utils/test/gtest-gnc-quotes.cpp -+++ b/libgnucash/app-utils/test/gtest-gnc-quotes.cpp -@@ -153,25 +153,6 @@ TEST_F(GncQuotesTest, quotable_commodities) - EXPECT_EQ(4u, commodities.size()); - } - --#ifdef HAVE_F_Q --TEST_F(GncQuotesTest, online_wiggle) --{ -- GncQuotes quotes; -- quotes.fetch(m_book); -- auto pricedb{gnc_pricedb_get_db(m_book)}; -- auto failures{quotes.failures()}; -- ASSERT_EQ(1u, failures.size()); -- EXPECT_EQ(GncQuoteError::QUOTE_FAILED, std::get<2>(failures[0])); --// EXPECT_EQ(GncQuoteError::QUOTE_FAILED, std::get<2>(failures[1])); -- EXPECT_EQ(3u, gnc_pricedb_get_num_prices(pricedb)); --} --#else --TEST_F(GncQuotesTest, fq_failure) --{ -- EXPECT_THROW(GncQuotes quotes;, GncQuoteException); --} --#endif -- - TEST_F(GncQuotesTest, offline_wiggle) - { - StrVec quote_vec{ - diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index ae843bcf0f192..eacda570cc0c1 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , aqbanking , boost , cmake @@ -26,12 +27,13 @@ stdenv.mkDerivation rec { pname = "gnucash"; - version = "5.3"; + version = "5.4"; # raw source code doesn't work out of box; fetchFromGitHub not usable src = fetchurl { - url = "https://github.com/Gnucash/gnucash/releases/download/${version}/${pname}-${version}.tar.bz2"; - hash = "sha256-FFjLCMWF6unXJL7G8oErzAO76D7SlKRqeJeqqwGm8Vo="; + # Upstream uploaded a -1 tarball on the same release, remove on next release + url = "https://github.com/Gnucash/gnucash/releases/download/${version}/${pname}-${version}-1.tar.bz2"; + hash = "sha256-d0EWXW1lLqe0oehJjPQ5pWuBpcyLZTKRpZBU8jYqv8w="; }; nativeBuildInputs = [ @@ -74,8 +76,12 @@ stdenv.mkDerivation rec { ./0003-remove-valgrind.patch # this patch makes gnucash exec the Finance::Quote wrapper directly ./0004-exec-fq-wrapper.patch - # this patch removes the online_wiggle GncQuotes test - ./0005-remove-gncquotes-online-wiggle.patch + # this patch fixes a test that fails due to a type error, remove on next release + (fetchpatch { + name = "0005-utest-gnc-pricedb-fix.patch"; + url = "https://github.com/Gnucash/gnucash/commit/0bd556c581ac462ca41b3cb533323fc3587051e1.patch"; + hash = "sha256-k0ANZuOkWrtU4q380oDu/hC9PeGmujF49XEFQ8eCLGM="; + }) ]; # this needs to be an environment variable and not a cmake flag to suppress @@ -95,7 +101,7 @@ stdenv.mkDerivation rec { gappsWrapperArgs+=( # db drivers location --set GNC_DBD_DIR ${libdbiDrivers}/lib/dbd - # gnome settings schemas location on Nix + # gsettings schema location on Nix --set GSETTINGS_SCHEMA_DIR ${glib.makeSchemaPath "$out" "${pname}-${version}"} ) ''; @@ -108,6 +114,7 @@ stdenv.mkDerivation rec { # gnc-fq-* are cli utils written in Perl hence the extra wrapping postFixup = '' wrapProgram $out/bin/gnucash "''${gappsWrapperArgs[@]}" + wrapProgram $out/bin/gnucash-cli "''${gappsWrapperArgs[@]}" wrapProgram $out/bin/finance-quote-wrapper \ --prefix PERL5LIB : "${with perlPackages; makeFullPerlPath [ JSONParse FinanceQuote ]}" @@ -139,6 +146,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ domenkozar AndersonTorres rski nevivurn ]; platforms = platforms.unix; + mainProgram = "gnucash"; }; } # TODO: investigate Darwin support diff --git a/pkgs/applications/office/libreoffice/README.md b/pkgs/applications/office/libreoffice/README.md deleted file mode 100644 index a084572d2177f..0000000000000 --- a/pkgs/applications/office/libreoffice/README.md +++ /dev/null @@ -1,9 +0,0 @@ -LibreOffice -=========== - -To generate `src-$VARIANT/download.nix`, i.e. list of additional sources that -the libreoffice build process needs to download: - - nix-shell gen-shell.nix --argstr variant VARIANT --run generate - -Where VARIANT is either `still` or `fresh`. diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index bec44b0b7ff3c..44d07503b2fa7 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -1,6 +1,5 @@ { stdenv , fetchurl -, fetchpatch , lib , substituteAll , pam @@ -100,7 +99,7 @@ , langs ? [ "ar" "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sl" "tr" "uk" "zh-CN" ] , withHelp ? true , kdeIntegration ? false -, mkDerivation ? null +, wrapQtAppsHook ? null , qtbase ? null , qtx11extras ? null , qtwayland ? null @@ -145,31 +144,33 @@ let }; importVariant = f: import (./. + "/src-${variant}/${f}"); - - primary-src = importVariant "primary.nix" { inherit fetchurl; }; - - inherit (primary-src) major minor version; - - langsSpaces = concatStringsSep " " langs; - - mkDrv = if kdeIntegration then mkDerivation else stdenv.mkDerivation; - + # Update these files with: + # nix-shell maintainers/scripts/update.nix --argstr package libreoffice-$VARIANT.unwrapped + version = importVariant "version.nix"; + srcsAttributes = { + main = importVariant "main.nix"; + help = importVariant "help.nix"; + translations = importVariant "translations.nix"; + deps = (importVariant "deps.nix") ++ [ + # TODO: Why is this needed? + (rec { + name = "unowinreg.dll"; + url = "https://dev-www.libreoffice.org/extern/${md5name}"; + sha256 = "1infwvv1p6i21scywrldsxs22f62x85mns4iq8h6vr6vlx3fdzga"; + md5 = "185d60944ea767075d27247c3162b3bc"; + md5name = "${md5}-${name}"; + }) + ]; + }; srcs = { - primary = primary-src; - third_party = - map (x: ((fetchurl { inherit (x) url sha256 name; }) // { inherit (x) md5name md5; })) - (importVariant "download.nix" ++ [ - (rec { - name = "unowinreg.dll"; - url = "https://dev-www.libreoffice.org/extern/${md5name}"; - sha256 = "1infwvv1p6i21scywrldsxs22f62x85mns4iq8h6vr6vlx3fdzga"; - md5 = "185d60944ea767075d27247c3162b3bc"; - md5name = "${md5}-${name}"; - }) - ]); - - translations = primary-src.translations; - help = primary-src.help; + third_party = map (x: + (fetchurl { + inherit (x) url sha256 name; + }) // { + inherit (x) md5name md5; + }) srcsAttributes.deps; + translations = fetchurl srcsAttributes.translations; + help = fetchurl srcsAttributes.help; }; # See `postPatch` for details @@ -185,13 +186,12 @@ let kwindowsystem ]); }; + tarballPath = "external/tarballs"; -in -(mkDrv rec { +in stdenv.mkDerivation (finalAttrs: { pname = "libreoffice"; inherit version; - - inherit (primary-src) src; + src = fetchurl srcsAttributes.main; env.NIX_CFLAGS_COMPILE = toString ([ "-I${librdf_rasqal}/include/rasqal" # librdf_redland refers to rasqal.h instead of rasqal/rasqal.h @@ -200,8 +200,6 @@ in "-O2" # https://bugs.gentoo.org/727188 ]); - tarballPath = "external/tarballs"; - postUnpack = '' mkdir -v $sourceRoot/${tarballPath} '' + (flip concatMapStrings srcs.third_party (f: '' @@ -215,18 +213,11 @@ in tar -xf ${srcs.translations} ''; - # Remove build config to reduce the amount of `-dev` outputs in the - # runtime closure. This was introduced in upstream commit - # cbfac11330882c7d0a817b6c37a08b2ace2b66f4, so the patch doesn't apply - # for 7.4. - patches = lib.optionals (lib.versionAtLeast version "7.5") [ + patches = [ + # Remove build config to reduce the amount of `-dev` outputs in the + # runtime closure. This behavior was introduced by upstream in commit + # cbfac11330882c7d0a817b6c37a08b2ace2b66f4 ./0001-Strip-away-BUILDCONFIG.patch - ] ++ [ - (fetchpatch { - name = "fix-curl-8.2.patch"; - url = "https://github.com/LibreOffice/core/commit/2a68dc02bd19a717d3c86873206fabed1098f228.diff"; - hash = "sha256-C+kts+oaLR3+GbnX/wrFguF7SzgerNataxP0SPxhyY8="; - }) ]; # libreoffice tries to reference the BUILDCONFIG (e.g. PKG_CONFIG_PATH) @@ -236,27 +227,9 @@ in disallowedRequisites = lib.optionals (!kdeIntegration) (lib.concatMap (x: lib.optional (x?dev) x.dev) - buildInputs); - - ### QT/KDE - # - # configure.ac assumes that the first directory that contains headers and - # libraries during its checks contains *all* the relevant headers/libs which - # obviously doesn't work for us, so we have 2 options: - # - # 1. patch configure.ac in order to specify the direct paths to various Qt/KDE - # dependencies which is ugly and brittle, or - # - # 2. use symlinkJoin to pull in the relevant dependencies and just patch in - # that path which is *also* ugly, but far less likely to break - # - # The 2nd option is not very Nix'y, but I'll take robust over nice any day. - # Additionally, it's much easier to fix if LO breaks on the next upgrade (just - # add the missing dependencies to it). - postPatch = '' - substituteInPlace shell/source/unix/exec/shellexec.cxx \ - --replace xdg-open ${if kdeIntegration then "kde-open5" else "xdg-open"} + finalAttrs.buildInputs); + postPatch = '' # configure checks for header 'gpgme++/gpgmepp_version.h', # and if it is found (no matter where) uses a hardcoded path # in what presumably is an effort to make it possible to write @@ -267,6 +240,21 @@ in 'GPGMEPP_CFLAGS=-I/usr/include/gpgme++' \ 'GPGMEPP_CFLAGS=-I${gpgme.dev}/include/gpgme++' '' + optionalString kdeIntegration '' + substituteInPlace shell/source/unix/exec/shellexec.cxx \ + --replace xdg-open kde-open5 + # configure.ac assumes that the first directory that contains headers and + # libraries during its checks contains *all* the relevant headers/libs which + # obviously doesn't work for us, so we have 2 options: + # + # 1. patch configure.ac in order to specify the direct paths to various Qt/KDE + # dependencies which is ugly and brittle, or + # + # 2. use symlinkJoin to pull in the relevant dependencies and just patch in + # that path which is *also* ugly, but far less likely to break + # + # The 2nd option is not very Nix'y, but I'll take robust over nice any day. + # Additionally, it's much easier to fix if LO breaks on the next upgrade (just + # add the missing dependencies to it). substituteInPlace configure.ac \ --replace '$QT5INC ' '$QT5INC ${kdeDeps}/include ' \ --replace '$QT5LIB ' '$QT5LIB ${kdeDeps}/lib ' \ @@ -280,7 +268,7 @@ in preConfigure = '' configureFlagsArray=( "--with-parallelism=$NIX_BUILD_CORES" - "--with-lang=${langsSpaces}" + "--with-lang=${concatStringsSep " " langs}" ); chmod a+x ./bin/unpack-sources @@ -294,102 +282,110 @@ in NOCONFIGURE=1 ./autogen.sh ''; - postConfigure = + postConfigure = '' # fetch_Download_item tries to interpret the name as a variable name, let it do so... - '' - sed -e '1ilibreoffice-translations-${version}.tar.xz=libreoffice-translations-${version}.tar.xz' -i Makefile - sed -e '1ilibreoffice-help-${version}.tar.xz=libreoffice-help-${version}.tar.xz' -i Makefile - '' - # Test fixups - # May need to be revisited/pruned, left alone for now. - + '' - # unit test sd_tiledrendering seems to be fragile - # https://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html - echo > ./sd/CppunitTest_sd_tiledrendering.mk - sed -e /CppunitTest_sd_tiledrendering/d -i sd/Module_sd.mk - # Pivot chart tests. Fragile. - sed -e '/CPPUNIT_TEST(testRoundtrip)/d' -i chart2/qa/extras/PivotChartTest.cxx - sed -e '/CPPUNIT_TEST(testPivotTableMedianODS)/d' -i sc/qa/unit/pivottable_filters_test.cxx - # one more fragile test? - sed -e '/CPPUNIT_TEST(testTdf96536);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx - # this I actually hate, this should be a data consistency test! - sed -e '/CPPUNIT_TEST(testTdf115013);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx - # rendering-dependent test - # tilde expansion in path processing checks the existence of $HOME - sed -e 's@OString sSysPath("~/tmp");@& return ; @' -i sal/qa/osl/file/osl_File.cxx - # fails on systems using ZFS, see https://github.com/NixOS/nixpkgs/issues/19071 - sed -e '/CPPUNIT_TEST(getSystemPathFromFileURL_005);/d' -i './sal/qa/osl/file/osl_File.cxx' - # rendering-dependent: on my computer the test table actually doesn't fit… - # interesting fact: test disabled on macOS by upstream - sed -re '/DECLARE_WW8EXPORT_TEST[(]testTableKeep, "tdf91083.odt"[)]/,+5d' -i ./sw/qa/extras/ww8export/ww8export.cxx - # Segfault on DB access — maybe temporarily acceptable for a new version of Fresh? - sed -e 's/CppunitTest_dbaccess_empty_stdlib_save//' -i ./dbaccess/Module_dbaccess.mk - # one more fragile test? - sed -e '/CPPUNIT_TEST(testTdf77014);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx - # rendering-dependent tests - sed -e '/CPPUNIT_TEST(testLegacyCellAnchoredRotatedShape)/d' -i sc/qa/unit/filters-test.cxx - sed -zre 's/DesktopLOKTest::testGetFontSubset[^{]*[{]/& return; /' -i desktop/qa/desktop_lib/test_desktop_lib.cxx - sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testFlipAndRotateCustomShape,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx - sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]tdf105490_negativeMargins,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport9.cxx - sed -z -r -e 's/DECLARE_OOXMLIMPORT_TEST[(]testTdf112443,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlimport/ooxmlimport.cxx - sed -z -r -e 's/DECLARE_RTFIMPORT_TEST[(]testTdf108947,[^)]*[)].[{]/& return;/' -i sw/qa/extras/rtfimport/rtfimport.cxx - # not sure about this fragile test - sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testTDF87348,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx - # bunch of new Fresh failures. Sigh. - sed -e '/CPPUNIT_TEST(testDocumentLayout);/d' -i './sd/qa/unit/import-tests.cxx' - sed -e '/CPPUNIT_TEST(testErrorBarDataRangeODS);/d' -i './chart2/qa/extras/chart2export.cxx' - sed -e '/CPPUNIT_TEST(testLabelStringODS);/d' -i './chart2/qa/extras/chart2export.cxx' - sed -e '/CPPUNIT_TEST(testAxisNumberFormatODS);/d' -i './chart2/qa/extras/chart2export.cxx' - sed -e '/CPPUNIT_TEST(testBackgroundImage);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testFdo84043);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testTdf97630);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testTdf80020);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testTdf62176);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testTransparentBackground);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testEmbeddedPdf);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testEmbeddedText);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testTdf98477);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testAuthorField);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' - sed -e '/CPPUNIT_TEST(testTdf50499);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testTdf100926);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testPageWithTransparentBackground);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testTextRotation);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testTdf113818);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testTdf119629);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testTdf113822);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testTdf105739);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' - sed -e '/CPPUNIT_TEST(testPageBitmapWithTransparency);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' - sed -e '/CPPUNIT_TEST(testTdf115005);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' - sed -e '/CPPUNIT_TEST(testTdf115005_FallBack_Images_On);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' - sed -e '/CPPUNIT_TEST(testTdf115005_FallBack_Images_Off);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' - sed -e '/CPPUNIT_TEST(testTdf44774);/d' -i './sd/qa/unit/misc-tests.cxx' - sed -e '/CPPUNIT_TEST(testTdf38225);/d' -i './sd/qa/unit/misc-tests.cxx' - sed -e '/CPPUNIT_TEST(testAuthorField);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' - sed -e '/CPPUNIT_TEST(testAuthorField);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testFdo85554);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' - sed -e '/CPPUNIT_TEST(testEmbeddedDataSource);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' - sed -e '/CPPUNIT_TEST(testTdf96479);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' - sed -e '/CPPUNIT_TEST(testInconsistentBookmark);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' - sed -e /CppunitTest_sw_layoutwriter/d -i sw/Module_sw.mk - sed -e /CppunitTest_sw_htmlimport/d -i sw/Module_sw.mk - sed -e /CppunitTest_sw_core_layout/d -i sw/Module_sw.mk - sed -e /CppunitTest_sw_uiwriter6/d -i sw/Module_sw.mk - sed -e /CppunitTest_sdext_pdfimport/d -i sdext/Module_sdext.mk - sed -e /CppunitTest_vcl_pdfexport/d -i vcl/Module_vcl.mk - sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/ooxmlexport/ooxmlexport9.cxx" - sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/ooxmlexport/ooxmlencryption.cxx" - sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/odfexport/odfexport.cxx" - sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/unowriter/unowriter.cxx" - - # testReqIfTable fails since libxml2: 2.10.3 -> 2.10.4 - sed -e 's@.*"/html/body/div/table/tr/th".*@//&@' -i sw/qa/extras/htmlexport/htmlexport.cxx - '' - # This to avoid using /lib:/usr/lib at linking - + '' - sed -i '/gb_LinkTarget_LDFLAGS/{ n; /rpath-link/d;}' solenv/gbuild/platform/unxgcc.mk - - find -name "*.cmd" -exec sed -i s,/lib:/usr/lib,, {} \; - ''; + sed -e '1ilibreoffice-translations-${version}.tar.xz=libreoffice-translations-${version}.tar.xz' -i Makefile + sed -e '1ilibreoffice-help-${version}.tar.xz=libreoffice-help-${version}.tar.xz' -i Makefile + '' /* Test fixups. May need to be revisited/pruned, left alone for now. */ + '' + # unit test sd_tiledrendering seems to be fragile + # https://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html + echo > ./sd/CppunitTest_sd_tiledrendering.mk + sed -e /CppunitTest_sd_tiledrendering/d -i sd/Module_sd.mk + # Pivot chart tests. Fragile. + sed -e '/CPPUNIT_TEST(testRoundtrip)/d' -i chart2/qa/extras/PivotChartTest.cxx + sed -e '/CPPUNIT_TEST(testPivotTableMedianODS)/d' -i sc/qa/unit/pivottable_filters_test.cxx + # one more fragile test? + sed -e '/CPPUNIT_TEST(testTdf96536);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx + # this I actually hate, this should be a data consistency test! + sed -e '/CPPUNIT_TEST(testTdf115013);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx + # rendering-dependent test + # tilde expansion in path processing checks the existence of $HOME + sed -e 's@OString sSysPath("~/tmp");@& return ; @' -i sal/qa/osl/file/osl_File.cxx + # fails on systems using ZFS, see https://github.com/NixOS/nixpkgs/issues/19071 + sed -e '/CPPUNIT_TEST(getSystemPathFromFileURL_005);/d' -i './sal/qa/osl/file/osl_File.cxx' + # rendering-dependent: on my computer the test table actually doesn't fit… + # interesting fact: test disabled on macOS by upstream + sed -re '/DECLARE_WW8EXPORT_TEST[(]testTableKeep, "tdf91083.odt"[)]/,+5d' -i ./sw/qa/extras/ww8export/ww8export.cxx + # Segfault on DB access — maybe temporarily acceptable for a new version of Fresh? + sed -e 's/CppunitTest_dbaccess_empty_stdlib_save//' -i ./dbaccess/Module_dbaccess.mk + # one more fragile test? + sed -e '/CPPUNIT_TEST(testTdf77014);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx + # rendering-dependent tests + sed -e '/CPPUNIT_TEST(testLegacyCellAnchoredRotatedShape)/d' -i sc/qa/unit/filters-test.cxx + sed -zre 's/DesktopLOKTest::testGetFontSubset[^{]*[{]/& return; /' -i desktop/qa/desktop_lib/test_desktop_lib.cxx + sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testFlipAndRotateCustomShape,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx + sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]tdf105490_negativeMargins,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport9.cxx + sed -z -r -e 's/DECLARE_OOXMLIMPORT_TEST[(]testTdf112443,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlimport/ooxmlimport.cxx + sed -z -r -e 's/DECLARE_RTFIMPORT_TEST[(]testTdf108947,[^)]*[)].[{]/& return;/' -i sw/qa/extras/rtfimport/rtfimport.cxx + # not sure about this fragile test + sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testTDF87348,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx + # bunch of new Fresh failures. Sigh. + sed -e '/CPPUNIT_TEST(testDocumentLayout);/d' -i './sd/qa/unit/import-tests.cxx' + sed -e '/CPPUNIT_TEST(testErrorBarDataRangeODS);/d' -i './chart2/qa/extras/chart2export.cxx' + sed -e '/CPPUNIT_TEST(testLabelStringODS);/d' -i './chart2/qa/extras/chart2export.cxx' + sed -e '/CPPUNIT_TEST(testAxisNumberFormatODS);/d' -i './chart2/qa/extras/chart2export.cxx' + sed -e '/CPPUNIT_TEST(testBackgroundImage);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testFdo84043);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf97630);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf80020);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf62176);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTransparentBackground);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testEmbeddedPdf);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testEmbeddedText);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf98477);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testAuthorField);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' + sed -e '/CPPUNIT_TEST(testTdf50499);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf100926);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testPageWithTransparentBackground);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTextRotation);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf113818);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf119629);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf113822);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf105739);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' + sed -e '/CPPUNIT_TEST(testPageBitmapWithTransparency);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' + sed -e '/CPPUNIT_TEST(testTdf115005);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' + sed -e '/CPPUNIT_TEST(testTdf115005_FallBack_Images_On);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' + sed -e '/CPPUNIT_TEST(testTdf115005_FallBack_Images_Off);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' + sed -e '/CPPUNIT_TEST(testTdf44774);/d' -i './sd/qa/unit/misc-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf38225);/d' -i './sd/qa/unit/misc-tests.cxx' + sed -e '/CPPUNIT_TEST(testAuthorField);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' + sed -e '/CPPUNIT_TEST(testAuthorField);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testFdo85554);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' + sed -e '/CPPUNIT_TEST(testEmbeddedDataSource);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' + sed -e '/CPPUNIT_TEST(testTdf96479);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' + sed -e '/CPPUNIT_TEST(testInconsistentBookmark);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' + sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/inc/swmodeltestbase.hxx' + sed -e /CppunitTest_sw_layoutwriter/d -i sw/Module_sw.mk + sed -e /CppunitTest_sw_htmlimport/d -i sw/Module_sw.mk + sed -e /CppunitTest_sw_core_layout/d -i sw/Module_sw.mk + sed -e /CppunitTest_sw_uiwriter6/d -i sw/Module_sw.mk + sed -e /CppunitTest_sdext_pdfimport/d -i sdext/Module_sdext.mk + sed -e /CppunitTest_vcl_pdfexport/d -i vcl/Module_vcl.mk + sed -e /CppunitTest_sc_ucalc_formula/d -i sc/Module_sc.mk + sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/ooxmlexport/ooxmlexport9.cxx" + sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/ooxmlexport/ooxmlencryption.cxx" + sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/odfexport/odfexport.cxx" + sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/unowriter/unowriter.cxx" + + sed -e '/CPPUNIT_ASSERT(!bRTL);/d' -i './vcl/qa/cppunit/text.cxx' + sed -e '/CPPUNIT_ASSERT_EQUAL(0, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' + sed -e '/CPPUNIT_ASSERT_EQUAL(4, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' + sed -e '/CPPUNIT_ASSERT_EQUAL(11, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' + sed -e '/CPPUNIT_ASSERT_EQUAL(18, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' + sed -e '/CPPUNIT_ASSERT_EQUAL(3, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' + sed -e '/CPPUNIT_ASSERT_EQUAL(9, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' + sed -e '/CPPUNIT_ASSERT_EQUAL(17, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' + sed -e '/CPPUNIT_ASSERT_EQUAL(22, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' + + # testReqIfTable fails since libxml2: 2.10.3 -> 2.10.4 + sed -e 's@.*"/html/body/div/table/tr/th".*@//&@' -i sw/qa/extras/htmlexport/htmlexport.cxx + '' /* This to avoid using /lib:/usr/lib at linking */ + '' + sed -i '/gb_LinkTarget_LDFLAGS/{ n; /rpath-link/d;}' solenv/gbuild/platform/unxgcc.mk + + find -name "*.cmd" -exec sed -i s,/lib:/usr/lib,, {} \; + '' + optionalString stdenv.isAarch64 '' + sed -e '/CPPUNIT_TEST(testStatisticalFormulasFODS);/d' -i './sc/qa/unit/functions_statistical.cxx' + ''; makeFlags = [ "SHELL=${bash}/bin/bash" ]; @@ -406,13 +402,6 @@ in cp -r sysui/desktop/icons "$out/share" sed -re 's@Icon=libreoffice(dev)?[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop - - # Install dolphin templates, like debian does - install -D extras/source/shellnew/soffice.* --target-directory="$out/share/templates/.source" - cp ${substituteAll {src = ./soffice-template.desktop; app="Writer"; ext="odt"; type="text"; }} $out/share/templates/soffice.odt.desktop - cp ${substituteAll {src = ./soffice-template.desktop; app="Calc"; ext="ods"; type="spreadsheet"; }} $out/share/templates/soffice.ods.desktop - cp ${substituteAll {src = ./soffice-template.desktop; app="Impress"; ext="odp"; type="presentation";}} $out/share/templates/soffice.odp.desktop - cp ${substituteAll {src = ./soffice-template.desktop; app="Draw"; ext="odg"; type="drawing"; }} $out/share/templates/soffice.odg.desktop ''; # Wrapping is done in ./wrapper.nix @@ -475,16 +464,26 @@ in "--without-system-libqxp" "--without-system-dragonbox" "--without-system-libfixmath" + # the "still" variant doesn't support Nixpkgs' mdds 2.1, only mdds 2.0 + ] ++ optionals (variant == "still") [ + "--without-system-mdds" + ] ++ optionals (variant == "fresh") [ "--with-system-mdds" + ] ++ [ # https://github.com/NixOS/nixpkgs/commit/5c5362427a3fa9aefccfca9e531492a8735d4e6f "--without-system-orcus" "--without-system-xmlsec" - "--without-system-cuckoo" "--without-system-zxing" ] ++ optionals kdeIntegration [ "--enable-kf5" "--enable-qt5" "--enable-gtk3-kde5" + ] ++ optionals (variant == "fresh") [ + "--without-system-dragonbox" + "--without-system-libfixmath" + # Technically needed only when kdeIntegration is enabled in the "fresh" + # variant. Won't hurt to put it here for every "fresh" variant. + "--without-system-frozen" ]; checkTarget = concatStringsSep " " [ @@ -501,9 +500,11 @@ in jdk17 libtool pkg-config + ] ++ optionals kdeIntegration [ + wrapQtAppsHook ]; - buildInputs = with xorg; [ + buildInputs = with xorg; finalAttrs.passthru.gst_packages ++ [ ArchiveZip CoinMP IOCompress @@ -572,6 +573,7 @@ in libxshmfence libxslt libzmf + libwebp mdds mythes ncurses @@ -592,14 +594,23 @@ in which zip zlib - ] - ++ passthru.gst_packages - ++ optionals kdeIntegration [ qtbase qtx11extras kcoreaddons kio ] - ++ optionals (lib.versionAtLeast (lib.versions.majorMinor version) "7.4") [ libwebp ]; + ] ++ optionals kdeIntegration [ + qtbase + qtx11extras + kcoreaddons + kio + ]; passthru = { inherit srcs; jdk = jre'; + updateScript = [ + ./update.sh + # Pass it this file name as argument + (builtins.unsafeGetAttrPos "pname" finalAttrs.finalPackage).file + # And the variant + variant + ]; inherit kdeIntegration; # For the wrapper.nix inherit gtk3; @@ -656,4 +667,4 @@ in maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; }; -}).overrideAttrs ((importVariant "override.nix") (args // { inherit kdeIntegration; })) +}) diff --git a/pkgs/applications/office/libreoffice/download-list-builder.sh b/pkgs/applications/office/libreoffice/download-list-builder.sh deleted file mode 100644 index 31cab28fd82e2..0000000000000 --- a/pkgs/applications/office/libreoffice/download-list-builder.sh +++ /dev/null @@ -1,4 +0,0 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi -source $stdenv/setup - -tar --extract --file=$src libreoffice-$version/download.lst -O > $out diff --git a/pkgs/applications/office/libreoffice/gen-shell.nix b/pkgs/applications/office/libreoffice/gen-shell.nix deleted file mode 100644 index 7429bb0cb3828..0000000000000 --- a/pkgs/applications/office/libreoffice/gen-shell.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ pkgs ? (import <nixpkgs> {}), variant }: - -with pkgs; - -let - - primary-src = callPackage (./. + "/src-${variant}/primary.nix") {}; - -in - -stdenv.mkDerivation { - name = "generate-libreoffice-srcs-shell"; - - buildCommand = "exit 1"; - - downloadList = stdenv.mkDerivation { - name = "libreoffice-${primary-src.version}-download-list"; - inherit (primary-src) src version; - builder = ./download-list-builder.sh; - }; - - buildInputs = [ python3 ]; - - shellHook = '' - function generate { - python3 generate-libreoffice-srcs.py ${variant} > src-${variant}/download.nix - } - ''; -} diff --git a/pkgs/applications/office/libreoffice/gpgme-1.18.patch b/pkgs/applications/office/libreoffice/gpgme-1.18.patch deleted file mode 100644 index f554371e91b85..0000000000000 --- a/pkgs/applications/office/libreoffice/gpgme-1.18.patch +++ /dev/null @@ -1,10 +0,0 @@ -The way this check mixes C and C++ started to cause issues since gpgme 1.18.0 -But we can confidently skip the function check anyway. ---- a/configure.ac -+++ b/configure.ac -@@ -12302,4 +12302 @@ -- # progress_callback is the only func with plain C linkage -- # checking for it also filters out older, KDE-dependent libgpgmepp versions -- AC_CHECK_LIB(gpgmepp, progress_callback, [ GPGMEPP_LIBS=-lgpgmepp ], -- [AC_MSG_ERROR(gpgmepp not found or not functional)], []) -+ GPGMEPP_LIBS=-lgpgmepp diff --git a/pkgs/applications/office/libreoffice/poppler-22-04-0.patch b/pkgs/applications/office/libreoffice/poppler-22-04-0.patch deleted file mode 100644 index c907bf1680b4f..0000000000000 --- a/pkgs/applications/office/libreoffice/poppler-22-04-0.patch +++ /dev/null @@ -1,100 +0,0 @@ -Patch from OpenSUSE -https://build.opensuse.org/package/view_file/LibreOffice:Factory/libreoffice/poppler-22-04-0.patch?expand=1&rev=45e176f964509ebe3560d0dbf1ec8be9 -Index: libreoffice-7.3.3.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -=================================================================== ---- libreoffice-7.3.3.1.orig/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -+++ libreoffice-7.3.3.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -@@ -474,12 +474,21 @@ int PDFOutDev::parseFont( long long nNew - { - // TODO(P3): Unfortunately, need to read stream twice, since - // we must write byte count to stdout before -+#if POPPLER_CHECK_VERSION(22, 04, 0) // readEmbFontFile signature changed -+ auto pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef()); -+ if ( pBuf ) -+ { -+ aNewFont.isEmbedded = true; -+ nSize = pBuf->size(); -+ } -+#else - char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize ); - if( pBuf ) - { - aNewFont.isEmbedded = true; - gfree(pBuf); - } -+#endif - } - - m_aFontMap[ nNewId ] = aNewFont; -@@ -492,21 +501,35 @@ void PDFOutDev::writeFontFile( GfxFont* - return; - - int nSize = 0; -+#if POPPLER_CHECK_VERSION(22, 04, 0) // readEmbFontFile signature changed -+ auto pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef()); -+ if ( !pBuf ) -+ return; -+ nSize = pBuf->size(); -+#else - char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize ); - if( !pBuf ) - return; -+#endif - - // ---sync point--- see SYNC STREAMS above - fflush(stdout); - -+#if POPPLER_CHECK_VERSION(22, 04, 0) // readEmbFontFile signature changed -+ if( fwrite(pBuf->data(), sizeof(unsigned char), nSize, g_binary_out) != static_cast<size_t>(nSize) ) -+ { -+#else - if( fwrite(pBuf, sizeof(char), nSize, g_binary_out) != static_cast<size_t>(nSize) ) - { - gfree(pBuf); -+#endif - exit(1); // error - } - // ---sync point--- see SYNC STREAMS above - fflush(g_binary_out); -+#if !POPPLER_CHECK_VERSION(22, 04, 0) // readEmbFontFile signature changed - gfree(pBuf); -+#endif - } - - #if POPPLER_CHECK_VERSION(0, 83, 0) -@@ -759,7 +782,11 @@ void PDFOutDev::updateFont(GfxState *sta - { - assert(state); - -+#if POPPLER_CHECK_VERSION(22, 04, 0) -+ std::shared_ptr<GfxFont> gfxFont = state->getFont(); -+#else - GfxFont *gfxFont = state->getFont(); -+#endif - if( !gfxFont ) - return; - -@@ -776,7 +803,11 @@ void PDFOutDev::updateFont(GfxState *sta - m_aFontMap.find( fontID ); - if( it == m_aFontMap.end() ) - { -+#if POPPLER_CHECK_VERSION(22, 04, 0) -+ nEmbedSize = parseFont( fontID, gfxFont.get(), state ); -+#else - nEmbedSize = parseFont( fontID, gfxFont, state ); -+#endif - it = m_aFontMap.find( fontID ); - } - -@@ -806,7 +837,11 @@ void PDFOutDev::updateFont(GfxState *sta - - if (nEmbedSize) - { -+#if POPPLER_CHECK_VERSION(22, 04, 0) -+ writeFontFile(gfxFont.get()); -+#else - writeFontFile(gfxFont); -+#endif - } - } - diff --git a/pkgs/applications/office/libreoffice/skip-failed-test-with-icu70.patch b/pkgs/applications/office/libreoffice/skip-failed-test-with-icu70.patch deleted file mode 100644 index d3ae91835ada9..0000000000000 --- a/pkgs/applications/office/libreoffice/skip-failed-test-with-icu70.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/i18npool/qa/cppunit/test_breakiterator.cxx -+++ b/i18npool/qa/cppunit/test_breakiterator.cxx -@@ -35,7 +35,7 @@ public: - void testWeak(); - void testAsian(); - void testThai(); --#if (U_ICU_VERSION_MAJOR_NUM > 51) -+#if (U_ICU_VERSION_MAJOR_NUM > 51 && U_ICU_VERSION_MAJOR_NUM < 70) - void testLao(); - #ifdef TODO - void testNorthernThai(); -@@ -52,7 +52,7 @@ public: - CPPUNIT_TEST(testWeak); - CPPUNIT_TEST(testAsian); - CPPUNIT_TEST(testThai); --#if (U_ICU_VERSION_MAJOR_NUM > 51) -+#if (U_ICU_VERSION_MAJOR_NUM > 51 && U_ICU_VERSION_MAJOR_NUM < 70) - CPPUNIT_TEST(testLao); - #ifdef TODO - CPPUNIT_TEST(testKhmer); -@@ -843,7 +843,7 @@ void TestBreakIterator::testAsian() - } - } - --#if (U_ICU_VERSION_MAJOR_NUM > 51) -+#if (U_ICU_VERSION_MAJOR_NUM > 51 && U_ICU_VERSION_MAJOR_NUM < 70) - //A test to ensure that our Lao word boundary detection is useful - void TestBreakIterator::testLao() - { diff --git a/pkgs/applications/office/libreoffice/soffice-template.desktop b/pkgs/applications/office/libreoffice/soffice-template.desktop deleted file mode 100644 index 4adb91284a955..0000000000000 --- a/pkgs/applications/office/libreoffice/soffice-template.desktop +++ /dev/null @@ -1,6 +0,0 @@ -[Desktop Entry] -Name=LibreOffice @app@... -Comment=Enter LibreOffice @app@ filename: -Type=Link -URL=.source/soffice.@ext@ -Icon=libreoffice-oasis-@type@ diff --git a/pkgs/applications/office/libreoffice/src-still/download.nix b/pkgs/applications/office/libreoffice/src-fresh/deps.nix index c74bd2716e8ee..cea715cd1cfc7 100644 --- a/pkgs/applications/office/libreoffice/src-still/download.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/deps.nix @@ -7,11 +7,11 @@ md5name = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed-libabw-0.1.3.tar.xz"; } { - name = "boost_1_79_0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/boost_1_79_0.tar.xz"; - sha256 = "2058aa88758a0e1aaac1759b3c4bad2526f899c6ecc6eeea79aa5e8fd3ea95dc"; + name = "boost_1_82_0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/boost_1_82_0.tar.xz"; + sha256 = "e48ab6953fbd68ba47234bea5173e62427e9f6a7894e152305142895cfe955de"; md5 = ""; - md5name = "2058aa88758a0e1aaac1759b3c4bad2526f899c6ecc6eeea79aa5e8fd3ea95dc-boost_1_79_0.tar.xz"; + md5name = "e48ab6953fbd68ba47234bea5173e62427e9f6a7894e152305142895cfe955de-boost_1_82_0.tar.xz"; } { name = "box2d-2.4.1.tar.gz"; @@ -98,11 +98,11 @@ md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz"; } { - name = "curl-8.0.1.tar.xz"; - url = "https://dev-www.libreoffice.org/src/curl-8.0.1.tar.xz"; - sha256 = "0a381cd82f4d00a9a334438b8ca239afea5bfefcfa9a1025f2bf118e79e0b5f0"; + name = "curl-8.2.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/curl-8.2.1.tar.xz"; + sha256 = "dd322f6bd0a20e6cebdfd388f69e98c3d183bed792cf4713c8a7ef498cba4894"; md5 = ""; - md5name = "0a381cd82f4d00a9a334438b8ca239afea5bfefcfa9a1025f2bf118e79e0b5f0-curl-8.0.1.tar.xz"; + md5name = "dd322f6bd0a20e6cebdfd388f69e98c3d183bed792cf4713c8a7ef498cba4894-curl-8.2.1.tar.xz"; } { name = "libe-book-0.1.3.tar.xz"; @@ -154,11 +154,11 @@ md5name = "acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76-Firebird-3.0.7.33374-0.tar.bz2"; } { - name = "fontconfig-2.13.94.tar.xz"; - url = "https://dev-www.libreoffice.org/src/fontconfig-2.13.94.tar.xz"; - sha256 = "a5f052cb73fd479ffb7b697980510903b563bbb55b8f7a2b001fcfb94026003c"; + name = "fontconfig-2.14.2.tar.xz"; + url = "https://dev-www.libreoffice.org/src/fontconfig-2.14.2.tar.xz"; + sha256 = "dba695b57bce15023d2ceedef82062c2b925e51f5d4cc4aef736cf13f60a468b"; md5 = ""; - md5name = "a5f052cb73fd479ffb7b697980510903b563bbb55b8f7a2b001fcfb94026003c-fontconfig-2.13.94.tar.xz"; + md5name = "dba695b57bce15023d2ceedef82062c2b925e51f5d4cc4aef736cf13f60a468b-fontconfig-2.14.2.tar.xz"; } { name = "crosextrafonts-20130214.tar.gz"; @@ -210,34 +210,6 @@ md5name = "e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip"; } { - name = "source-code-pro-2.030R-ro-1.050R-it.tar.gz"; - url = "https://dev-www.libreoffice.org/src/907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz"; - sha256 = "09466dce87653333f189acd8358c60c6736dcd95f042dee0b644bdcf65b6ae2f"; - md5 = "907d6e99f241876695c19ff3db0b8923"; - md5name = "907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz"; - } - { - name = "source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; - url = "https://dev-www.libreoffice.org/src/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; - sha256 = "e7bc9a1fec787a529e49f5a26b93dcdcf41506449dfc70f92cdef6d17eb6fb61"; - md5 = "edc4d741888bc0d38e32dbaa17149596"; - md5name = "edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; - } - { - name = "source-serif-pro-3.000R.tar.gz"; - url = "https://dev-www.libreoffice.org/src/source-serif-pro-3.000R.tar.gz"; - sha256 = "826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3"; - md5 = ""; - md5name = "826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3-source-serif-pro-3.000R.tar.gz"; - } - { - name = "EmojiOneColor-SVGinOT-1.3.tar.gz"; - url = "https://dev-www.libreoffice.org/src/EmojiOneColor-SVGinOT-1.3.tar.gz"; - sha256 = "d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7"; - md5 = ""; - md5name = "d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7-EmojiOneColor-SVGinOT-1.3.tar.gz"; - } - { name = "noto-fonts-20171024.tar.gz"; url = "https://dev-www.libreoffice.org/src/noto-fonts-20171024.tar.gz"; sha256 = "29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994"; @@ -266,18 +238,11 @@ md5name = "b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52-alef-1.001.tar.gz"; } { - name = "Amiri-0.117.zip"; - url = "https://dev-www.libreoffice.org/src/Amiri-0.117.zip"; - sha256 = "9c4e768893e0023a0ad6f488d5c84bd5add6565d3dcadb838ba5b20e75fcc9a7"; + name = "Amiri-1.000.zip"; + url = "https://dev-www.libreoffice.org/src/Amiri-1.000.zip"; + sha256 = "926fe1bd7dfde8e55178281f645258bfced6420c951c6f2fd532fd21691bca30"; md5 = ""; - md5name = "9c4e768893e0023a0ad6f488d5c84bd5add6565d3dcadb838ba5b20e75fcc9a7-Amiri-0.117.zip"; - } - { - name = "ttf-kacst_2.01+mry.tar.gz"; - url = "https://dev-www.libreoffice.org/src/ttf-kacst_2.01+mry.tar.gz"; - sha256 = "dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56"; - md5 = ""; - md5name = "dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56-ttf-kacst_2.01+mry.tar.gz"; + md5name = "926fe1bd7dfde8e55178281f645258bfced6420c951c6f2fd532fd21691bca30-Amiri-1.000.zip"; } { name = "ReemKufi-1.2.zip"; @@ -301,11 +266,18 @@ md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz"; } { - name = "freetype-2.12.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/freetype-2.12.0.tar.xz"; - sha256 = "ef5c336aacc1a079ff9262d6308d6c2a066dd4d2a905301c4adda9b354399033"; + name = "freetype-2.13.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/freetype-2.13.0.tar.xz"; + sha256 = "5ee23abd047636c24b2d43c6625dcafc66661d1aca64dec9e0d05df29592624c"; md5 = ""; - md5name = "ef5c336aacc1a079ff9262d6308d6c2a066dd4d2a905301c4adda9b354399033-freetype-2.12.0.tar.xz"; + md5name = "5ee23abd047636c24b2d43c6625dcafc66661d1aca64dec9e0d05df29592624c-freetype-2.13.0.tar.xz"; + } + { + name = "frozen-1.1.1.tar.gz"; + url = "https://dev-www.libreoffice.org/src/frozen-1.1.1.tar.gz"; + sha256 = "f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45"; + md5 = ""; + md5name = "f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45-frozen-1.1.1.tar.gz"; } { name = "glm-0.9.9.8.zip"; @@ -329,11 +301,11 @@ md5name = "b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc-graphite2-minimal-1.3.14.tgz"; } { - name = "harfbuzz-7.1.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/harfbuzz-7.1.0.tar.xz"; - sha256 = "f135a61cd464c9ed6bc9823764c188f276c3850a8dc904628de2a87966b7077b"; + name = "harfbuzz-8.0.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/harfbuzz-8.0.0.tar.xz"; + sha256 = "1f98b5e3d06a344fe667d7e8210094ced458791499839bddde98c167ce6a7c79"; md5 = ""; - md5name = "f135a61cd464c9ed6bc9823764c188f276c3850a8dc904628de2a87966b7077b-harfbuzz-7.1.0.tar.xz"; + md5name = "1f98b5e3d06a344fe667d7e8210094ced458791499839bddde98c167ce6a7c79-harfbuzz-8.0.0.tar.xz"; } { name = "hsqldb_1_8_0.zip"; @@ -343,11 +315,11 @@ md5name = "17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"; } { - name = "hunspell-1.7.0.tar.gz"; - url = "https://dev-www.libreoffice.org/src/hunspell-1.7.0.tar.gz"; - sha256 = "57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951"; + name = "hunspell-1.7.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/hunspell-1.7.2.tar.gz"; + sha256 = "11ddfa39afe28c28539fe65fc4f1592d410c1e9b6dd7d8a91ca25d85e9ec65b8"; md5 = ""; - md5name = "57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951-hunspell-1.7.0.tar.gz"; + md5name = "11ddfa39afe28c28539fe65fc4f1592d410c1e9b6dd7d8a91ca25d85e9ec65b8-hunspell-1.7.2.tar.gz"; } { name = "hyphen-2.8.8.tar.gz"; @@ -357,18 +329,18 @@ md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; } { - name = "icu4c-71_1-src.tgz"; - url = "https://dev-www.libreoffice.org/src/icu4c-71_1-src.tgz"; - sha256 = "67a7e6e51f61faf1306b6935333e13b2c48abd8da6d2f46ce6adca24b1e21ebf"; + name = "icu4c-73_2-src.tgz"; + url = "https://dev-www.libreoffice.org/src/icu4c-73_2-src.tgz"; + sha256 = "818a80712ed3caacd9b652305e01afc7fa167e6f2e94996da44b90c2ab604ce1"; md5 = ""; - md5name = "67a7e6e51f61faf1306b6935333e13b2c48abd8da6d2f46ce6adca24b1e21ebf-icu4c-71_1-src.tgz"; + md5name = "818a80712ed3caacd9b652305e01afc7fa167e6f2e94996da44b90c2ab604ce1-icu4c-73_2-src.tgz"; } { - name = "icu4c-71_1-data.zip"; - url = "https://dev-www.libreoffice.org/src/icu4c-71_1-data.zip"; - sha256 = "e3882b4fece6e5e039f22c3189b7ba224180fd26fdbfa9db284617455b93e804"; + name = "icu4c-73_2-data.zip"; + url = "https://dev-www.libreoffice.org/src/icu4c-73_2-data.zip"; + sha256 = "ca1ee076163b438461e484421a7679fc33a64cd0a54f9d4b401893fa1eb42701"; md5 = ""; - md5name = "e3882b4fece6e5e039f22c3189b7ba224180fd26fdbfa9db284617455b93e804-icu4c-71_1-data.zip"; + md5name = "ca1ee076163b438461e484421a7679fc33a64cd0a54f9d4b401893fa1eb42701-icu4c-73_2-data.zip"; } { name = "flow-engine-0.9.4.zip"; @@ -448,18 +420,18 @@ md5name = "39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"; } { - name = "libjpeg-turbo-2.1.2.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libjpeg-turbo-2.1.2.tar.gz"; - sha256 = "09b96cb8cbff9ea556a9c2d173485fd19488844d55276ed4f42240e1e2073ce5"; + name = "libjpeg-turbo-2.1.5.1.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libjpeg-turbo-2.1.5.1.tar.gz"; + sha256 = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf"; md5 = ""; - md5name = "09b96cb8cbff9ea556a9c2d173485fd19488844d55276ed4f42240e1e2073ce5-libjpeg-turbo-2.1.2.tar.gz"; + md5name = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf-libjpeg-turbo-2.1.5.1.tar.gz"; } { - name = "language-subtag-registry-2022-08-08.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2022-08-08.tar.bz2"; - sha256 = "e2d9224e0e50fc8ad12a3cf47396bbcadf45b2515839d4770432653a88972c00"; + name = "language-subtag-registry-2023-05-11.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2023-05-11.tar.bz2"; + sha256 = "9042b64cd473bf36073513b474046f13778107b57c2ac47fb2633104120d69da"; md5 = ""; - md5name = "e2d9224e0e50fc8ad12a3cf47396bbcadf45b2515839d4770432653a88972c00-language-subtag-registry-2022-08-08.tar.bz2"; + md5name = "9042b64cd473bf36073513b474046f13778107b57c2ac47fb2633104120d69da-language-subtag-registry-2023-05-11.tar.bz2"; } { name = "lcms2-2.12.tar.gz"; @@ -469,11 +441,11 @@ md5name = "18663985e864100455ac3e507625c438c3710354d85e5cbb7cd4043e11fe10f5-lcms2-2.12.tar.gz"; } { - name = "libassuan-2.5.5.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/libassuan-2.5.5.tar.bz2"; - sha256 = "8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4"; + name = "libassuan-2.5.6.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libassuan-2.5.6.tar.bz2"; + sha256 = "e9fd27218d5394904e4e39788f9b1742711c3e6b41689a31aa3380bd5aa4f426"; md5 = ""; - md5name = "8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4-libassuan-2.5.5.tar.bz2"; + md5name = "e9fd27218d5394904e4e39788f9b1742711c3e6b41689a31aa3380bd5aa4f426-libassuan-2.5.6.tar.bz2"; } { name = "libatomic_ops-7.6.8.tar.gz"; @@ -525,39 +497,39 @@ md5name = "5dcb4db3b2340f81f601ce86d8d76b69e34d70f84f804192c901e4b7f84d5fb0-libnumbertext-1.0.11.tar.xz"; } { - name = "ltm-1.0.zip"; - url = "https://dev-www.libreoffice.org/src/ltm-1.0.zip"; - sha256 = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483"; + name = "ltm-1.2.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/ltm-1.2.0.tar.xz"; + sha256 = "b7c75eecf680219484055fcedd686064409254ae44bc31a96c5032843c0e18b1"; md5 = ""; - md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip"; + md5name = "b7c75eecf680219484055fcedd686064409254ae44bc31a96c5032843c0e18b1-ltm-1.2.0.tar.xz"; } { - name = "libwebp-1.2.4.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libwebp-1.2.4.tar.gz"; - sha256 = "7bf5a8a28cc69bcfa8cb214f2c3095703c6b73ac5fba4d5480c205331d9494df"; + name = "libwebp-1.3.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libwebp-1.3.2.tar.gz"; + sha256 = "2a499607df669e40258e53d0ade8035ba4ec0175244869d1025d460562aa09b4"; md5 = ""; - md5name = "7bf5a8a28cc69bcfa8cb214f2c3095703c6b73ac5fba4d5480c205331d9494df-libwebp-1.2.4.tar.gz"; + md5name = "2a499607df669e40258e53d0ade8035ba4ec0175244869d1025d460562aa09b4-libwebp-1.3.2.tar.gz"; } { - name = "xmlsec1-1.2.34.tar.gz"; - url = "https://dev-www.libreoffice.org/src/xmlsec1-1.2.34.tar.gz"; - sha256 = "52ced4943f35bd7d0818a38298c1528ca4ac8a54440fd71134a07d2d1370a262"; + name = "xmlsec1-1.2.37.tar.gz"; + url = "https://dev-www.libreoffice.org/src/xmlsec1-1.2.37.tar.gz"; + sha256 = "5f8dfbcb6d1e56bddd0b5ec2e00a3d0ca5342a9f57c24dffde5c796b2be2871c"; md5 = ""; - md5name = "52ced4943f35bd7d0818a38298c1528ca4ac8a54440fd71134a07d2d1370a262-xmlsec1-1.2.34.tar.gz"; + md5name = "5f8dfbcb6d1e56bddd0b5ec2e00a3d0ca5342a9f57c24dffde5c796b2be2871c-xmlsec1-1.2.37.tar.gz"; } { - name = "libxml2-2.10.4.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libxml2-2.10.4.tar.xz"; - sha256 = "ed0c91c5845008f1936739e4eee2035531c1c94742c6541f44ee66d885948d45"; + name = "libxml2-2.11.4.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxml2-2.11.4.tar.xz"; + sha256 = "737e1d7f8ab3f139729ca13a2494fd17bf30ddb4b7a427cf336252cab57f57f7"; md5 = ""; - md5name = "ed0c91c5845008f1936739e4eee2035531c1c94742c6541f44ee66d885948d45-libxml2-2.10.4.tar.xz"; + md5name = "737e1d7f8ab3f139729ca13a2494fd17bf30ddb4b7a427cf336252cab57f57f7-libxml2-2.11.4.tar.xz"; } { - name = "libxslt-1.1.35.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libxslt-1.1.35.tar.xz"; - sha256 = "8247f33e9a872c6ac859aa45018bc4c4d00b97e2feac9eebc10c93ce1f34dd79"; + name = "libxslt-1.1.38.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxslt-1.1.38.tar.xz"; + sha256 = "1f32450425819a09acaff2ab7a5a7f8a2ec7956e505d7beeb45e843d0e1ecab1"; md5 = ""; - md5name = "8247f33e9a872c6ac859aa45018bc4c4d00b97e2feac9eebc10c93ce1f34dd79-libxslt-1.1.35.tar.xz"; + md5name = "1f32450425819a09acaff2ab7a5a7f8a2ec7956e505d7beeb45e843d0e1ecab1-libxslt-1.1.38.tar.xz"; } { name = "lp_solve_5.5.tar.gz"; @@ -581,11 +553,11 @@ md5name = "431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b-mariadb-connector-c-3.1.8-src.tar.gz"; } { - name = "mdds-2.0.3.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/mdds-2.0.3.tar.bz2"; - sha256 = "9771fe42e133443c13ca187253763e17c8bc96a1a02aec9e1e8893367ffa9ce5"; + name = "mdds-2.1.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/mdds-2.1.1.tar.xz"; + sha256 = "1483d90cefb8aa4563c4d0a85cb7b243aa95217d235d422e9ca6722fd5b97e56"; md5 = ""; - md5name = "9771fe42e133443c13ca187253763e17c8bc96a1a02aec9e1e8893367ffa9ce5-mdds-2.0.3.tar.bz2"; + md5name = "1483d90cefb8aa4563c4d0a85cb7b243aa95217d235d422e9ca6722fd5b97e56-mdds-2.1.1.tar.xz"; } { name = "mDNSResponder-878.200.35.tar.gz"; @@ -609,18 +581,18 @@ md5name = "e8750123a78d61b943cef78b7736c8a7f20bb0a649aa112402124fba794fc21c-libmwaw-0.3.21.tar.xz"; } { - name = "mythes-1.2.4.tar.gz"; - url = "https://dev-www.libreoffice.org/src/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"; - sha256 = "1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b0e0790a305f"; - md5 = "a8c2c5b8f09e7ede322d5c602ff6a4b6"; - md5name = "a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"; + name = "mythes-1.2.5.tar.xz"; + url = "https://dev-www.libreoffice.org/src/mythes-1.2.5.tar.xz"; + sha256 = "19279f70707bbe5ffa619f2dc319f888cec0c4a8d339dc0a21330517bd6f521d"; + md5 = ""; + md5name = "19279f70707bbe5ffa619f2dc319f888cec0c4a8d339dc0a21330517bd6f521d-mythes-1.2.5.tar.xz"; } { - name = "nss-3.88.1-with-nspr-4.35.tar.gz"; - url = "https://dev-www.libreoffice.org/src/nss-3.88.1-with-nspr-4.35.tar.gz"; - sha256 = "fcfa26d2738ec5b0cf72ab4be784eac832a75132cda2e295799c04d62a93607a"; + name = "nss-3.90-with-nspr-4.35.tar.gz"; + url = "https://dev-www.libreoffice.org/src/nss-3.90-with-nspr-4.35.tar.gz"; + sha256 = "f78ab1d911cae8bbc94758fb3bd0f731df4087423a4ff5db271ba65381f6b739"; md5 = ""; - md5name = "fcfa26d2738ec5b0cf72ab4be784eac832a75132cda2e295799c04d62a93607a-nss-3.88.1-with-nspr-4.35.tar.gz"; + md5name = "f78ab1d911cae8bbc94758fb3bd0f731df4087423a4ff5db271ba65381f6b739-nss-3.90-with-nspr-4.35.tar.gz"; } { name = "libodfgen-0.1.8.tar.xz"; @@ -644,25 +616,25 @@ md5name = "8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar"; } { - name = "openldap-2.4.59.tgz"; - url = "https://dev-www.libreoffice.org/src/openldap-2.4.59.tgz"; - sha256 = "99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34"; + name = "openldap-2.6.6.tgz"; + url = "https://dev-www.libreoffice.org/src/openldap-2.6.6.tgz"; + sha256 = "082e998cf542984d43634442dbe11da860759e510907152ea579bdc42fe39ea0"; md5 = ""; - md5name = "99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34-openldap-2.4.59.tgz"; + md5name = "082e998cf542984d43634442dbe11da860759e510907152ea579bdc42fe39ea0-openldap-2.6.6.tgz"; } { - name = "openssl-1.1.1t.tar.gz"; - url = "https://dev-www.libreoffice.org/src/openssl-1.1.1t.tar.gz"; - sha256 = "8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b"; + name = "openssl-3.0.10.tar.gz"; + url = "https://dev-www.libreoffice.org/src/openssl-3.0.10.tar.gz"; + sha256 = "1761d4f5b13a1028b9b6f3d4b8e17feb0cedc9370f6afe61d7193d2cdce83323"; md5 = ""; - md5name = "8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b-openssl-1.1.1t.tar.gz"; + md5name = "1761d4f5b13a1028b9b6f3d4b8e17feb0cedc9370f6afe61d7193d2cdce83323-openssl-3.0.10.tar.gz"; } { - name = "liborcus-0.17.2.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/liborcus-0.17.2.tar.bz2"; - sha256 = "2a86c405a5929f749b27637509596421d46805753364ab258b035fd01fbde143"; + name = "liborcus-0.18.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/liborcus-0.18.1.tar.xz"; + sha256 = "6006b9f1576315e313df715a7e72a17f3e0b17d7b6bd119cfa8a0b608ce971eb"; md5 = ""; - md5name = "2a86c405a5929f749b27637509596421d46805753364ab258b035fd01fbde143-liborcus-0.17.2.tar.bz2"; + md5name = "6006b9f1576315e313df715a7e72a17f3e0b17d7b6bd119cfa8a0b608ce971eb-liborcus-0.18.1.tar.xz"; } { name = "libpagemaker-0.0.4.tar.xz"; @@ -672,11 +644,11 @@ md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { - name = "pdfium-5058.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/pdfium-5058.tar.bz2"; - sha256 = "eaf4ce9fad32b5d951c524139df23119b66c67720057defb97acab2dfb2582ac"; + name = "pdfium-5778.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/pdfium-5778.tar.bz2"; + sha256 = "b1052ff24e9ffb11af017c444bb0f6ad508d64c9a0fb88cacb0e8210245dde06"; md5 = ""; - md5name = "eaf4ce9fad32b5d951c524139df23119b66c67720057defb97acab2dfb2582ac-pdfium-5058.tar.bz2"; + md5name = "b1052ff24e9ffb11af017c444bb0f6ad508d64c9a0fb88cacb0e8210245dde06-pdfium-5778.tar.bz2"; } { name = "pixman-0.42.2.tar.gz"; @@ -686,46 +658,46 @@ md5name = "ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e-pixman-0.42.2.tar.gz"; } { - name = "libpng-1.6.39.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libpng-1.6.39.tar.xz"; - sha256 = "1f4696ce70b4ee5f85f1e1623dc1229b210029fa4b7aee573df3e2ba7b036937"; + name = "libpng-1.6.40.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libpng-1.6.40.tar.xz"; + sha256 = "535b479b2467ff231a3ec6d92a525906fb8ef27978be4f66dbe05d3f3a01b3a1"; md5 = ""; - md5name = "1f4696ce70b4ee5f85f1e1623dc1229b210029fa4b7aee573df3e2ba7b036937-libpng-1.6.39.tar.xz"; + md5name = "535b479b2467ff231a3ec6d92a525906fb8ef27978be4f66dbe05d3f3a01b3a1-libpng-1.6.40.tar.xz"; } { - name = "tiff-4.5.0rc3.tar.xz"; - url = "https://dev-www.libreoffice.org/src/tiff-4.5.0rc3.tar.xz"; - sha256 = "dafac979c5e7b6c650025569c5a4e720995ba5f17bc17e6276d1f12427be267c"; + name = "tiff-4.5.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/tiff-4.5.1.tar.xz"; + sha256 = "3c080867114c26edab3129644a63b708028a90514b7fe3126e38e11d24f9f88a"; md5 = ""; - md5name = "dafac979c5e7b6c650025569c5a4e720995ba5f17bc17e6276d1f12427be267c-tiff-4.5.0rc3.tar.xz"; + md5name = "3c080867114c26edab3129644a63b708028a90514b7fe3126e38e11d24f9f88a-tiff-4.5.1.tar.xz"; } { - name = "poppler-22.12.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/poppler-22.12.0.tar.xz"; - sha256 = "d9aa9cacdfbd0f8e98fc2b3bb008e645597ed480685757c3e7bc74b4278d15c0"; + name = "poppler-23.06.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/poppler-23.06.0.tar.xz"; + sha256 = "d38c6b2f31c8f6f3727fb60a011a0e6c567ebf56ef1ccad36263ca9ed6448a65"; md5 = ""; - md5name = "d9aa9cacdfbd0f8e98fc2b3bb008e645597ed480685757c3e7bc74b4278d15c0-poppler-22.12.0.tar.xz"; + md5name = "d38c6b2f31c8f6f3727fb60a011a0e6c567ebf56ef1ccad36263ca9ed6448a65-poppler-23.06.0.tar.xz"; } { - name = "poppler-data-0.4.11.tar.gz"; - url = "https://dev-www.libreoffice.org/src/poppler-data-0.4.11.tar.gz"; - sha256 = "2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c"; + name = "poppler-data-0.4.12.tar.gz"; + url = "https://dev-www.libreoffice.org/src/poppler-data-0.4.12.tar.gz"; + sha256 = "c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74"; md5 = ""; - md5name = "2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c-poppler-data-0.4.11.tar.gz"; + md5name = "c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74-poppler-data-0.4.12.tar.gz"; } { - name = "postgresql-13.10.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/postgresql-13.10.tar.bz2"; - sha256 = "5bbcf5a56d85c44f3a8b058fb46862ff49cbc91834d07e295d02e6de3c216df2"; + name = "postgresql-13.11.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/postgresql-13.11.tar.bz2"; + sha256 = "4992ff647203566b670d4e54dc5317499a26856c93576d0ea951bdf6bee50bfb"; md5 = ""; - md5name = "5bbcf5a56d85c44f3a8b058fb46862ff49cbc91834d07e295d02e6de3c216df2-postgresql-13.10.tar.bz2"; + md5name = "4992ff647203566b670d4e54dc5317499a26856c93576d0ea951bdf6bee50bfb-postgresql-13.11.tar.bz2"; } { - name = "Python-3.8.16.tar.xz"; - url = "https://dev-www.libreoffice.org/src/Python-3.8.16.tar.xz"; - sha256 = "d85dbb3774132473d8081dcb158f34a10ccad7a90b96c7e50ea4bb61f5ce4562"; + name = "Python-3.8.18.tar.xz"; + url = "https://dev-www.libreoffice.org/src/Python-3.8.18.tar.xz"; + sha256 = "3ffb71cd349a326ba7b2fadc7e7df86ba577dd9c4917e52a8401adbda7405e3f"; md5 = ""; - md5name = "d85dbb3774132473d8081dcb158f34a10ccad7a90b96c7e50ea4bb61f5ce4562-Python-3.8.16.tar.xz"; + md5name = "3ffb71cd349a326ba7b2fadc7e7df86ba577dd9c4917e52a8401adbda7405e3f-Python-3.8.18.tar.xz"; } { name = "libqxp-0.0.2.tar.xz"; @@ -770,11 +742,11 @@ md5name = "798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"; } { - name = "skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz"; - url = "https://dev-www.libreoffice.org/src/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz"; - sha256 = "c094a6247e44104beaaa0d00c825beb6baf1a8e532dc22214747495317a65bd9"; + name = "skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz"; + url = "https://dev-www.libreoffice.org/src/skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz"; + sha256 = "0d08a99ed46cde43b5ad2672b5d8770c8eb85d0d26cb8f1f85fd9befe1e9ceb9"; md5 = ""; - md5name = "c094a6247e44104beaaa0d00c825beb6baf1a8e532dc22214747495317a65bd9-skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz"; + md5name = "0d08a99ed46cde43b5ad2672b5d8770c8eb85d0d26cb8f1f85fd9befe1e9ceb9-skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz"; } { name = "libstaroffice-0.0.7.tar.xz"; @@ -798,13 +770,6 @@ md5name = "82c818be771f242388457aa8c807e4b52aa84dc22b21c6c56184a6b4cbb085e6-twaindsm_2.4.1.orig.tar.gz"; } { - name = "ucpp-1.3.2.tar.gz"; - url = "https://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"; - sha256 = "983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776"; - md5 = "0168229624cfac409e766913506961a8"; - md5name = "0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"; - } - { name = "libvisio-0.1.7.tar.xz"; url = "https://dev-www.libreoffice.org/src/libvisio-0.1.7.tar.xz"; sha256 = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c"; @@ -819,11 +784,11 @@ md5name = "2465b0b662fdc5d4e3bebcdc9a79027713fb629ca2bff04a3c9251fdec42dd09-libwpd-0.10.3.tar.xz"; } { - name = "libwpg-0.3.3.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libwpg-0.3.3.tar.xz"; - sha256 = "99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c"; + name = "libwpg-0.3.4.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libwpg-0.3.4.tar.xz"; + sha256 = "b55fda9440d1e070630eb2487d8b8697cf412c214a27caee9df69cec7c004de3"; md5 = ""; - md5name = "99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c-libwpg-0.3.3.tar.xz"; + md5name = "b55fda9440d1e070630eb2487d8b8697cf412c214a27caee9df69cec7c004de3-libwpg-0.3.4.tar.xz"; } { name = "libwps-0.4.12.tar.xz"; @@ -854,10 +819,10 @@ md5name = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22-libzmf-0.0.2.tar.xz"; } { - name = "zxing-cpp-1.2.0.tar.gz"; - url = "https://dev-www.libreoffice.org/src/zxing-cpp-1.2.0.tar.gz"; - sha256 = "653d9e44195d86cf64a36af9ff3a1978ec5599df3882439fefa56e7064f55e8a"; + name = "zxing-cpp-2.0.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/zxing-cpp-2.0.0.tar.gz"; + sha256 = "12b76b7005c30d34265fc20356d340da179b0b4d43d2c1b35bcca86776069f76"; md5 = ""; - md5name = "653d9e44195d86cf64a36af9ff3a1978ec5599df3882439fefa56e7064f55e8a-zxing-cpp-1.2.0.tar.gz"; + md5name = "12b76b7005c30d34265fc20356d340da179b0b4d43d2c1b35bcca86776069f76-zxing-cpp-2.0.0.tar.gz"; } ] diff --git a/pkgs/applications/office/libreoffice/src-fresh/help.nix b/pkgs/applications/office/libreoffice/src-fresh/help.nix new file mode 100644 index 0000000000000..af319ca97a314 --- /dev/null +++ b/pkgs/applications/office/libreoffice/src-fresh/help.nix @@ -0,0 +1,4 @@ +{ + sha256 = "0j6idhdywnbl0qaimf1ahxaqvp9s0y2hfrbcbmw32c30g812gp3b"; + url = "https://download.documentfoundation.org/libreoffice/src/7.6.2/libreoffice-help-7.6.2.1.tar.xz"; +} diff --git a/pkgs/applications/office/libreoffice/src-fresh/main.nix b/pkgs/applications/office/libreoffice/src-fresh/main.nix new file mode 100644 index 0000000000000..52f29a206813b --- /dev/null +++ b/pkgs/applications/office/libreoffice/src-fresh/main.nix @@ -0,0 +1,4 @@ +{ + sha256 = "18lw5gnjihjwzdsk6xql7ax5lasykxxvg5bp40q4rqics0xp7lp5"; + url = "https://download.documentfoundation.org/libreoffice/src/7.6.2/libreoffice-7.6.2.1.tar.xz"; +} diff --git a/pkgs/applications/office/libreoffice/src-fresh/override.nix b/pkgs/applications/office/libreoffice/src-fresh/override.nix deleted file mode 100644 index 148c674f50710..0000000000000 --- a/pkgs/applications/office/libreoffice/src-fresh/override.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, kdeIntegration, ... }: -attrs: -{ - postConfigure = attrs.postConfigure + '' - sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/inc/swmodeltestbase.hxx' - sed -e '/CPPUNIT_ASSERT(!bRTL);/d' -i './vcl/qa/cppunit/text.cxx' - - sed -e '/CPPUNIT_ASSERT_EQUAL(0, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' - sed -e '/CPPUNIT_ASSERT_EQUAL(4, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' - sed -e '/CPPUNIT_ASSERT_EQUAL(11, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' - sed -e '/CPPUNIT_ASSERT_EQUAL(18, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' - - sed -e '/CPPUNIT_ASSERT_EQUAL(3, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' - sed -e '/CPPUNIT_ASSERT_EQUAL(9, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' - sed -e '/CPPUNIT_ASSERT_EQUAL(17, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' - sed -e '/CPPUNIT_ASSERT_EQUAL(22, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' - ''; - configureFlags = attrs.configureFlags ++ [ - "--without-system-dragonbox" - "--without-system-libfixmath" - ]; -} diff --git a/pkgs/applications/office/libreoffice/src-fresh/primary.nix b/pkgs/applications/office/libreoffice/src-fresh/primary.nix deleted file mode 100644 index e9dc428749bb8..0000000000000 --- a/pkgs/applications/office/libreoffice/src-fresh/primary.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ fetchurl }: - -rec { - fetchSrc = {name, hash}: fetchurl { - url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz"; - sha256 = hash; - }; - - major = "7"; - minor = "5"; - patch = "4"; - tweak = "1"; - - subdir = "${major}.${minor}.${patch}"; - - version = "${subdir}${if tweak == "" then "" else "."}${tweak}"; - - src = fetchurl { - url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - hash = "sha256-dWE7yXldkiEnsJOxfxyZ9p05eARqexgRRgNV158VVF4="; - }; - - # FIXME rename - translations = fetchSrc { - name = "translations"; - hash = "sha256-dv3L8DtdxZcwmeXnqtTtwIpOvwZg3aH3VvJBiiZzbh0="; - }; - - # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from - # it and LibreOffice can use these by pointing DICPATH environment variable at the hunspell directory - - help = fetchSrc { - name = "help"; - hash = "sha256-2CrGEyK5AQEAo1Qz1ACmvMH7BaOubW5BNLWv3fDEdOY="; - }; -} diff --git a/pkgs/applications/office/libreoffice/src-fresh/translations.nix b/pkgs/applications/office/libreoffice/src-fresh/translations.nix new file mode 100644 index 0000000000000..e48a731402f35 --- /dev/null +++ b/pkgs/applications/office/libreoffice/src-fresh/translations.nix @@ -0,0 +1,4 @@ +{ + sha256 = "02nnys853na9hwznxnf1h0pm5ymijvpyv9chg45v11vy2ak9y8sv"; + url = "https://download.documentfoundation.org/libreoffice/src/7.6.2/libreoffice-translations-7.6.2.1.tar.xz"; +} diff --git a/pkgs/applications/office/libreoffice/src-fresh/version.nix b/pkgs/applications/office/libreoffice/src-fresh/version.nix new file mode 100644 index 0000000000000..121156b199ed2 --- /dev/null +++ b/pkgs/applications/office/libreoffice/src-fresh/version.nix @@ -0,0 +1 @@ +"7.6.2.1" diff --git a/pkgs/applications/office/libreoffice/src-fresh/download.nix b/pkgs/applications/office/libreoffice/src-still/deps.nix index 345c30299f04c..5a13758ff1fcf 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/download.nix +++ b/pkgs/applications/office/libreoffice/src-still/deps.nix @@ -98,11 +98,11 @@ md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz"; } { - name = "curl-8.0.1.tar.xz"; - url = "https://dev-www.libreoffice.org/src/curl-8.0.1.tar.xz"; - sha256 = "0a381cd82f4d00a9a334438b8ca239afea5bfefcfa9a1025f2bf118e79e0b5f0"; + name = "curl-8.2.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/curl-8.2.1.tar.xz"; + sha256 = "dd322f6bd0a20e6cebdfd388f69e98c3d183bed792cf4713c8a7ef498cba4894"; md5 = ""; - md5name = "0a381cd82f4d00a9a334438b8ca239afea5bfefcfa9a1025f2bf118e79e0b5f0-curl-8.0.1.tar.xz"; + md5name = "dd322f6bd0a20e6cebdfd388f69e98c3d183bed792cf4713c8a7ef498cba4894-curl-8.2.1.tar.xz"; } { name = "libe-book-0.1.3.tar.xz"; @@ -273,11 +273,11 @@ md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz"; } { - name = "freetype-2.12.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/freetype-2.12.0.tar.xz"; - sha256 = "ef5c336aacc1a079ff9262d6308d6c2a066dd4d2a905301c4adda9b354399033"; + name = "freetype-2.13.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/freetype-2.13.0.tar.xz"; + sha256 = "5ee23abd047636c24b2d43c6625dcafc66661d1aca64dec9e0d05df29592624c"; md5 = ""; - md5name = "ef5c336aacc1a079ff9262d6308d6c2a066dd4d2a905301c4adda9b354399033-freetype-2.12.0.tar.xz"; + md5name = "5ee23abd047636c24b2d43c6625dcafc66661d1aca64dec9e0d05df29592624c-freetype-2.13.0.tar.xz"; } { name = "glm-0.9.9.8.zip"; @@ -427,11 +427,11 @@ md5name = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf-libjpeg-turbo-2.1.5.1.tar.gz"; } { - name = "language-subtag-registry-2022-08-08.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2022-08-08.tar.bz2"; - sha256 = "e2d9224e0e50fc8ad12a3cf47396bbcadf45b2515839d4770432653a88972c00"; + name = "language-subtag-registry-2023-05-11.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2023-05-11.tar.bz2"; + sha256 = "9042b64cd473bf36073513b474046f13778107b57c2ac47fb2633104120d69da"; md5 = ""; - md5name = "e2d9224e0e50fc8ad12a3cf47396bbcadf45b2515839d4770432653a88972c00-language-subtag-registry-2022-08-08.tar.bz2"; + md5name = "9042b64cd473bf36073513b474046f13778107b57c2ac47fb2633104120d69da-language-subtag-registry-2023-05-11.tar.bz2"; } { name = "lcms2-2.12.tar.gz"; @@ -504,11 +504,11 @@ md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip"; } { - name = "libwebp-1.3.0.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libwebp-1.3.0.tar.gz"; - sha256 = "64ac4614db292ae8c5aa26de0295bf1623dbb3985054cb656c55e67431def17c"; + name = "libwebp-1.3.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libwebp-1.3.2.tar.gz"; + sha256 = "2a499607df669e40258e53d0ade8035ba4ec0175244869d1025d460562aa09b4"; md5 = ""; - md5name = "64ac4614db292ae8c5aa26de0295bf1623dbb3985054cb656c55e67431def17c-libwebp-1.3.0.tar.gz"; + md5name = "2a499607df669e40258e53d0ade8035ba4ec0175244869d1025d460562aa09b4-libwebp-1.3.2.tar.gz"; } { name = "xmlsec1-1.2.37.tar.gz"; @@ -518,11 +518,11 @@ md5name = "5f8dfbcb6d1e56bddd0b5ec2e00a3d0ca5342a9f57c24dffde5c796b2be2871c-xmlsec1-1.2.37.tar.gz"; } { - name = "libxml2-2.10.4.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libxml2-2.10.4.tar.xz"; - sha256 = "ed0c91c5845008f1936739e4eee2035531c1c94742c6541f44ee66d885948d45"; + name = "libxml2-2.11.4.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxml2-2.11.4.tar.xz"; + sha256 = "737e1d7f8ab3f139729ca13a2494fd17bf30ddb4b7a427cf336252cab57f57f7"; md5 = ""; - md5name = "ed0c91c5845008f1936739e4eee2035531c1c94742c6541f44ee66d885948d45-libxml2-2.10.4.tar.xz"; + md5name = "737e1d7f8ab3f139729ca13a2494fd17bf30ddb4b7a427cf336252cab57f57f7-libxml2-2.11.4.tar.xz"; } { name = "libxslt-1.1.35.tar.xz"; @@ -588,11 +588,11 @@ md5name = "19279f70707bbe5ffa619f2dc319f888cec0c4a8d339dc0a21330517bd6f521d-mythes-1.2.5.tar.xz"; } { - name = "nss-3.88.1-with-nspr-4.35.tar.gz"; - url = "https://dev-www.libreoffice.org/src/nss-3.88.1-with-nspr-4.35.tar.gz"; - sha256 = "fcfa26d2738ec5b0cf72ab4be784eac832a75132cda2e295799c04d62a93607a"; + name = "nss-3.90-with-nspr-4.35.tar.gz"; + url = "https://dev-www.libreoffice.org/src/nss-3.90-with-nspr-4.35.tar.gz"; + sha256 = "f78ab1d911cae8bbc94758fb3bd0f731df4087423a4ff5db271ba65381f6b739"; md5 = ""; - md5name = "fcfa26d2738ec5b0cf72ab4be784eac832a75132cda2e295799c04d62a93607a-nss-3.88.1-with-nspr-4.35.tar.gz"; + md5name = "f78ab1d911cae8bbc94758fb3bd0f731df4087423a4ff5db271ba65381f6b739-nss-3.90-with-nspr-4.35.tar.gz"; } { name = "libodfgen-0.1.8.tar.xz"; @@ -623,11 +623,11 @@ md5name = "99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34-openldap-2.4.59.tgz"; } { - name = "openssl-3.0.8.tar.gz"; - url = "https://dev-www.libreoffice.org/src/openssl-3.0.8.tar.gz"; - sha256 = "6c13d2bf38fdf31eac3ce2a347073673f5d63263398f1f69d0df4a41253e4b3e"; + name = "openssl-3.0.10.tar.gz"; + url = "https://dev-www.libreoffice.org/src/openssl-3.0.10.tar.gz"; + sha256 = "1761d4f5b13a1028b9b6f3d4b8e17feb0cedc9370f6afe61d7193d2cdce83323"; md5 = ""; - md5name = "6c13d2bf38fdf31eac3ce2a347073673f5d63263398f1f69d0df4a41253e4b3e-openssl-3.0.8.tar.gz"; + md5name = "1761d4f5b13a1028b9b6f3d4b8e17feb0cedc9370f6afe61d7193d2cdce83323-openssl-3.0.10.tar.gz"; } { name = "liborcus-0.17.2.tar.bz2"; @@ -644,11 +644,11 @@ md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { - name = "pdfium-5408.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/pdfium-5408.tar.bz2"; - sha256 = "7db59b1e91f2bc0ab4c5e19d1a4f881e6a47dbb0d3b7e980a7358225b12a0f35"; + name = "pdfium-5778.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/pdfium-5778.tar.bz2"; + sha256 = "b1052ff24e9ffb11af017c444bb0f6ad508d64c9a0fb88cacb0e8210245dde06"; md5 = ""; - md5name = "7db59b1e91f2bc0ab4c5e19d1a4f881e6a47dbb0d3b7e980a7358225b12a0f35-pdfium-5408.tar.bz2"; + md5name = "b1052ff24e9ffb11af017c444bb0f6ad508d64c9a0fb88cacb0e8210245dde06-pdfium-5778.tar.bz2"; } { name = "pixman-0.42.2.tar.gz"; @@ -665,11 +665,11 @@ md5name = "1f4696ce70b4ee5f85f1e1623dc1229b210029fa4b7aee573df3e2ba7b036937-libpng-1.6.39.tar.xz"; } { - name = "tiff-4.5.0rc3.tar.xz"; - url = "https://dev-www.libreoffice.org/src/tiff-4.5.0rc3.tar.xz"; - sha256 = "dafac979c5e7b6c650025569c5a4e720995ba5f17bc17e6276d1f12427be267c"; + name = "tiff-4.5.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/tiff-4.5.1.tar.xz"; + sha256 = "3c080867114c26edab3129644a63b708028a90514b7fe3126e38e11d24f9f88a"; md5 = ""; - md5name = "dafac979c5e7b6c650025569c5a4e720995ba5f17bc17e6276d1f12427be267c-tiff-4.5.0rc3.tar.xz"; + md5name = "3c080867114c26edab3129644a63b708028a90514b7fe3126e38e11d24f9f88a-tiff-4.5.1.tar.xz"; } { name = "poppler-22.12.0.tar.xz"; @@ -693,11 +693,11 @@ md5name = "5bbcf5a56d85c44f3a8b058fb46862ff49cbc91834d07e295d02e6de3c216df2-postgresql-13.10.tar.bz2"; } { - name = "Python-3.8.16.tar.xz"; - url = "https://dev-www.libreoffice.org/src/Python-3.8.16.tar.xz"; - sha256 = "d85dbb3774132473d8081dcb158f34a10ccad7a90b96c7e50ea4bb61f5ce4562"; + name = "Python-3.8.18.tar.xz"; + url = "https://dev-www.libreoffice.org/src/Python-3.8.18.tar.xz"; + sha256 = "3ffb71cd349a326ba7b2fadc7e7df86ba577dd9c4917e52a8401adbda7405e3f"; md5 = ""; - md5name = "d85dbb3774132473d8081dcb158f34a10ccad7a90b96c7e50ea4bb61f5ce4562-Python-3.8.16.tar.xz"; + md5name = "3ffb71cd349a326ba7b2fadc7e7df86ba577dd9c4917e52a8401adbda7405e3f-Python-3.8.18.tar.xz"; } { name = "libqxp-0.0.2.tar.xz"; diff --git a/pkgs/applications/office/libreoffice/src-still/help.nix b/pkgs/applications/office/libreoffice/src-still/help.nix new file mode 100644 index 0000000000000..c2a5e643ab3a6 --- /dev/null +++ b/pkgs/applications/office/libreoffice/src-still/help.nix @@ -0,0 +1,4 @@ +{ + sha256 = "0lpgcwq03qxvhbl5b9ndaz0cwswd6jin1rfm6hv3kr8q4l52jgb3"; + url = "https://download.documentfoundation.org/libreoffice/src/7.5.7/libreoffice-help-7.5.7.1.tar.xz"; +} diff --git a/pkgs/applications/office/libreoffice/src-still/main.nix b/pkgs/applications/office/libreoffice/src-still/main.nix new file mode 100644 index 0000000000000..3f2f4d54da9be --- /dev/null +++ b/pkgs/applications/office/libreoffice/src-still/main.nix @@ -0,0 +1,4 @@ +{ + sha256 = "041bs79539w61yqmy971rfpf8qvfs4cl2m2fdjv7n1nqf6a2z4v5"; + url = "https://download.documentfoundation.org/libreoffice/src/7.5.7/libreoffice-7.5.7.1.tar.xz"; +} diff --git a/pkgs/applications/office/libreoffice/src-still/override.nix b/pkgs/applications/office/libreoffice/src-still/override.nix deleted file mode 100644 index 0a46cc3736459..0000000000000 --- a/pkgs/applications/office/libreoffice/src-still/override.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, kdeIntegration, commonsLogging, ... }: -attrs: -{ - postConfigure = attrs.postConfigure + '' - sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/inc/swmodeltestbase.hxx' - sed -e '/CPPUNIT_ASSERT(!bRTL);/d' -i './vcl/qa/cppunit/text.cxx' - - sed -e '/CPPUNIT_ASSERT_EQUAL(0, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' - sed -e '/CPPUNIT_ASSERT_EQUAL(4, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' - sed -e '/CPPUNIT_ASSERT_EQUAL(11, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' - sed -e '/CPPUNIT_ASSERT_EQUAL(18, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' - - sed -e '/CPPUNIT_ASSERT_EQUAL(3, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' - sed -e '/CPPUNIT_ASSERT_EQUAL(9, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' - sed -e '/CPPUNIT_ASSERT_EQUAL(17, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' - sed -e '/CPPUNIT_ASSERT_EQUAL(22, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' - ''; - configureFlags = attrs.configureFlags; - - patches = attrs.patches or []; -} diff --git a/pkgs/applications/office/libreoffice/src-still/primary.nix b/pkgs/applications/office/libreoffice/src-still/primary.nix deleted file mode 100644 index e0cbdc5da9af4..0000000000000 --- a/pkgs/applications/office/libreoffice/src-still/primary.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ fetchurl }: - -rec { - fetchSrc = {name, hash}: fetchurl { - url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz"; - inherit hash; - }; - - major = "7"; - minor = "4"; - patch = "7"; - tweak = "2"; - - subdir = "${major}.${minor}.${patch}"; - - version = "${subdir}${if tweak == "" then "" else "."}${tweak}"; - - src = fetchurl { - url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - hash = "sha256-dD2R8qE4png4D6eo7LWyQB2ZSwZ7MwdQ8DrY9SOi+yA="; - }; - - # FIXME rename - translations = fetchSrc { - name = "translations"; - hash = "sha256-7wea0EClmvwcPvgQDGagkOF7eBVvYTZScCEEpirdXnE="; - }; - - # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from - # it and LibreOffice can use these by pointing DICPATH environment variable at the hunspell directory - - help = fetchSrc { - name = "help"; - hash = "sha256-vcQWE3mBZx2sBQ9KzTh6zM7277mK9twfvyESTzTiII8="; - }; -} diff --git a/pkgs/applications/office/libreoffice/src-still/translations.nix b/pkgs/applications/office/libreoffice/src-still/translations.nix new file mode 100644 index 0000000000000..b9d465f146439 --- /dev/null +++ b/pkgs/applications/office/libreoffice/src-still/translations.nix @@ -0,0 +1,4 @@ +{ + sha256 = "1zxhnn8sslrlyb1cyg319slza2kn6mcc4h3li9ssnlfzkrzvxhc4"; + url = "https://download.documentfoundation.org/libreoffice/src/7.5.7/libreoffice-translations-7.5.7.1.tar.xz"; +} diff --git a/pkgs/applications/office/libreoffice/src-still/version.nix b/pkgs/applications/office/libreoffice/src-still/version.nix new file mode 100644 index 0000000000000..8324371b4e5a5 --- /dev/null +++ b/pkgs/applications/office/libreoffice/src-still/version.nix @@ -0,0 +1 @@ +"7.5.7.1" diff --git a/pkgs/applications/office/libreoffice/update.sh b/pkgs/applications/office/libreoffice/update.sh new file mode 100755 index 0000000000000..a04e668e8188f --- /dev/null +++ b/pkgs/applications/office/libreoffice/update.sh @@ -0,0 +1,74 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p python3 pup curl jq nix + +set -euo pipefail +echoerr() { echo "$@" 1>&2; } + +fname="$1" +echoerr got fname $fname +shift + +variant="$1" +# See comment near version_major variable +if [[ $variant == fresh ]]; then + head_tail=head +elif [[ $variant == still ]]; then + head_tail=tail +else + echoerr got unknown variant $variant + exit 3 +fi +echoerr got variant $variant +shift + +# Not totally needed, but makes it easy to run the update in case tis folder is +# deleted. +mkdir -p "$(dirname $fname)/src-$variant" +cd "$(dirname $fname)/src-$variant" + +# The pup command prints both fresh and still versions one after another, and +# we use either head -1 or tail -1 to get the right version, per the if elif +# above. +version_major="$(curl --silent https://www.libreoffice.org/download/download-libreoffice/ |\ + pup '.dl_version_number text{}' | $head_tail -1)" +echoerr got from website ${variant}_version $version_major +baseurl=https://download.documentfoundation.org/libreoffice/src/$version_major +tarballs=($(curl --silent $baseurl/ |\ + pup 'table json{}' |\ + jq --raw-output '.. | .href? | strings' |\ + grep "$version_major.*.tar.xz$")) + +full_version="$(echo ${tarballs[0]} | sed -e 's/^libreoffice-//' -e 's/.tar.xz$//')" +echoerr full version is $full_version +echo \"$full_version\" > version.nix + +for t in help translations; do + echo "{" > $t.nix + echo " sha256 = "\"$(nix-prefetch-url $baseurl/libreoffice-$t-$full_version.tar.xz)'";' >> $t.nix + echo " url = "\"$baseurl/libreoffice-$t-$full_version.tar.xz'";' >> $t.nix + echo "}" >> $t.nix +done + +# Out of loop nix-prefetch-url, because there is no $t, and we want the output +# path as well, to get the download.lst file from there afterwards. +main_path_hash=($(nix-prefetch-url --print-path $baseurl/libreoffice-$full_version.tar.xz)) +echo "{" > main.nix +echo " sha256 = "\"${main_path_hash[0]}'";' >> main.nix +echo " url = "\"$baseurl/libreoffice-$full_version.tar.xz'";' >> main.nix +echo "}" >> main.nix +echoerr got filename ${main_path_hash[1]} + +# Environment variable required by ../generate-libreoffice-srcs.py +export downloadList=/tmp/nixpkgs-libreoffice-update-download-$full_version.lst +# Need to extract the file only if it doesn't exist, otherwise spare time be +# skipping this. +if [[ ! -f "$downloadList" ]]; then + tar --extract \ + --file=${main_path_hash[1]} \ + libreoffice-$full_version/download.lst \ + -O > $downloadList +else + echoerr relying on previously downloaded downloadList file +fi +cd .. +python3 ./generate-libreoffice-srcs.py > src-$variant/deps.nix diff --git a/pkgs/applications/office/libreoffice/wrapper.nix b/pkgs/applications/office/libreoffice/wrapper.nix index 1f4059b2adfc6..b44fc71c3d84f 100644 --- a/pkgs/applications/office/libreoffice/wrapper.nix +++ b/pkgs/applications/office/libreoffice/wrapper.nix @@ -19,7 +19,9 @@ }: let - inherit (unwrapped.srcs.primary) major minor; + inherit (unwrapped) version; + major = lib.versions.major version; + minor = lib.versions.minor version; makeWrapperArgs = builtins.concatStringsSep " " ([ "--set" "GDK_PIXBUF_MODULE_FILE" "${librsvg}/${gdk-pixbuf.moduleDir}.cache" diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix index b64e15e29de31..f2bcd3b6a975a 100644 --- a/pkgs/applications/office/morgen/default.nix +++ b/pkgs/applications/office/morgen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { url = "https://download.todesktop.com/210203cqcj00tw1/morgen-${version}.deb"; - sha256 = "sha256-6d1KYUlXv+bHPITt2zs++AtyaAT8SSCG9T8ZsgOKDiw="; + sha256 = "sha256-lj+V5mntZzED2ZS62Uwlt/vTXwSuwzXeuEw8y/bA6og="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/pympress/default.nix b/pkgs/applications/office/pympress/default.nix index 397193c4e0db1..42ff825d36552 100644 --- a/pkgs/applications/office/pympress/default.nix +++ b/pkgs/applications/office/pympress/default.nix @@ -13,11 +13,12 @@ python3Packages.buildPythonApplication rec { pname = "pympress"; - version = "1.7.2"; + version = "1.8.4"; src = fetchPypi { - inherit pname version; - sha256 = "LFUzrGHr8jmUqoIcKokC0gNDVmW1EUZlj9eI+GDycvI="; + inherit version; + pname = "pympress"; + hash = "sha256-3cnCHGoKUX0gTzIx1khM+br6x9+g9WXh28SLhm99eN4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 5141ddc135bf8..67f0bbc0adeb5 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -19,14 +19,14 @@ let pname = "qownnotes"; appname = "QOwnNotes"; - version = "23.8.1"; + version = "23.10.0"; in stdenv.mkDerivation { inherit pname appname version; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz"; - hash = "sha256-ZS9OzC+pdtYY4xLQ3G31/Sw/xx4qgDjp+nAcPJdl0tk="; + hash = "sha256-wPZrKAWaWv88BeVu6e73b9/Ydo0ew4GLig46fyNSxtc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/roam-research/common.nix b/pkgs/applications/office/roam-research/common.nix new file mode 100644 index 0000000000000..8e63b111ad2af --- /dev/null +++ b/pkgs/applications/office/roam-research/common.nix @@ -0,0 +1,22 @@ +{ fetchurl }: +let + pname = "roam-research"; + version = "0.0.18"; +in +{ + inherit pname version; + sources = { + x86_64-darwin = fetchurl { + url = "https://roam-electron-deploy.s3.us-east-2.amazonaws.com/Roam+Research-${version}.dmg"; + hash = "sha256-jyFNH3qrgrsftExL/b2t8bY3W3fYVz+Gp11AuaIMxbg="; + }; + aarch64-darwin = fetchurl { + url = "https://roam-electron-deploy.s3.us-east-2.amazonaws.com/Roam+Research-${version}-arm64.dmg"; + hash = "sha256-AnyvFCbyUi6tcgxYQAj+zPLl4/kVh9ZeupetRhzH0PU="; + }; + x86_64-linux = fetchurl { + url = "https://roam-electron-deploy.s3.us-east-2.amazonaws.com/${pname}_${version}_amd64.deb"; + hash = "sha256-veDWBFZbODsdaO1UdfuC4w6oGCkeVBe+fqKn5XVHKDQ="; + }; + }; +} diff --git a/pkgs/applications/office/roam-research/darwin.nix b/pkgs/applications/office/roam-research/darwin.nix new file mode 100644 index 0000000000000..2c736c0c1a7fc --- /dev/null +++ b/pkgs/applications/office/roam-research/darwin.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, undmg, fetchurl }: +let + common = import ./common.nix { inherit fetchurl; }; + inherit (stdenv.hostPlatform) system; +in +stdenv.mkDerivation rec { + inherit (common) pname version; + src = common.sources.${system} or (throw "Source for ${pname} is not available for ${system}"); + + appName = "Roam Research"; + + sourceRoot = "."; + + nativeBuildInputs = [ undmg ]; + installPhase = '' + runHook preInstall + + mkdir -p "$out/Applications" + cp -R *.app "$out/Applications" + + mkdir -p $out/bin + ln -s "$out/Applications/${appName}.app/Contents/MacOS/${appName}" "$out/bin/${appName}" + runHook postInstall + ''; + + meta = with lib; { + description = "A note-taking tool for networked thought"; + homepage = "https://roamresearch.com/"; + maintainers = with lib.maintainers; [ dbalan ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + platforms = [ "x86_64-darwin" "aarch64-darwin" ]; + }; +} diff --git a/pkgs/applications/office/roam-research/default.nix b/pkgs/applications/office/roam-research/default.nix index e1ca9bb47e808..408f026bc57a1 100644 --- a/pkgs/applications/office/roam-research/default.nix +++ b/pkgs/applications/office/roam-research/default.nix @@ -1,81 +1,8 @@ -{ stdenv, lib, fetchurl, alsa-lib, atk, cairo, cups, dbus, dpkg, expat -, gdk-pixbuf, glib, gtk3, libX11, libXScrnSaver, libXcomposite, libXcursor -, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, libdrm -, libpulseaudio, libxcb, libxkbcommon, libxshmfence, mesa, nspr, nss, pango -, udev, }: - +{ stdenv, callPackage, ... }@args: let - libPath = lib.makeLibraryPath [ - alsa-lib - atk - cairo - cups - dbus - expat - gdk-pixbuf - glib - gtk3 - libX11 - libXcomposite - libXdamage - libXext - libXfixes - libXi - libXrandr - libdrm - libxcb - libxkbcommon - libxshmfence - mesa - nspr - nss - pango - stdenv.cc.cc - libXScrnSaver - libXcursor - libXrender - libXtst - libpulseaudio - udev - ]; -in stdenv.mkDerivation rec { - pname = "roam-research"; - version = "0.0.18"; - - src = fetchurl { - url = - "https://roam-electron-deploy.s3.us-east-2.amazonaws.com/${pname}_${version}_amd64.deb"; - sha256 = "sha256-veDWBFZbODsdaO1UdfuC4w6oGCkeVBe+fqKn5XVHKDQ="; - }; - - nativeBuildInputs = [ dpkg ]; - - unpackPhase = '' - mkdir pkg - dpkg-deb -x $src pkg - sourceRoot=pkg - ''; - - installPhase = '' - mkdir -p "$out/bin" - mv opt "$out/" - - ln -s "$out/opt/Roam Research/roam-research" "$out/bin/roam-research" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${libPath}:$out/opt/Roam Research:\$ORIGIN" "$out/opt/Roam Research/roam-research" - - mv usr/* "$out/" - - substituteInPlace $out/share/applications/roam-research.desktop \ - --replace "/opt/Roam Research/roam-research" "roam-research" - ''; - - dontPatchELF = true; - meta = with lib; { - description = "A note-taking tool for networked thought."; - homepage = "https://roamresearch.com/"; - maintainers = with lib.maintainers; [ dbalan ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; - }; -} + extraArgs = removeAttrs args [ "callPackage" ]; +in +if stdenv.isDarwin then + callPackage ./darwin.nix (extraArgs // { }) +else + callPackage ./linux.nix (extraArgs // { }) diff --git a/pkgs/applications/office/roam-research/linux.nix b/pkgs/applications/office/roam-research/linux.nix new file mode 100644 index 0000000000000..5873bcfdd190a --- /dev/null +++ b/pkgs/applications/office/roam-research/linux.nix @@ -0,0 +1,73 @@ +{ stdenv, lib, fetchurl, alsa-lib, atk, cairo, cups, dbus, dpkg, expat +, gdk-pixbuf, glib, gtk3, libX11, libXScrnSaver, libXcomposite, libXcursor +, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, libdrm +, libpulseaudio, libxcb, libxkbcommon, libxshmfence, mesa, nspr, nss, pango +, udev, }: + +let + common = import ./common.nix { inherit fetchurl; }; + inherit (stdenv.hostPlatform) system; + libPath = lib.makeLibraryPath [ + alsa-lib + atk + cairo + cups + dbus + expat + gdk-pixbuf + glib + gtk3 + libX11 + libXcomposite + libXdamage + libXext + libXfixes + libXi + libXrandr + libdrm + libxcb + libxkbcommon + libxshmfence + mesa + nspr + nss + pango + stdenv.cc.cc + libXScrnSaver + libXcursor + libXrender + libXtst + libpulseaudio + udev + ]; +in stdenv.mkDerivation rec { + inherit (common) pname version; + src = common.sources.${system} or (throw "Source for ${pname} is not available for ${system}"); + + nativeBuildInputs = [ dpkg ]; + + installPhase = '' + mkdir -p "$out/bin" + mv opt "$out/" + + ln -s "$out/opt/Roam Research/roam-research" "$out/bin/roam-research" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${libPath}:$out/opt/Roam Research:\$ORIGIN" "$out/opt/Roam Research/roam-research" + + mv usr/* "$out/" + + substituteInPlace $out/share/applications/roam-research.desktop \ + --replace "/opt/Roam Research/roam-research" "roam-research" + ''; + + # autoPatchelfHook/patchelf are not used because they cause the binary to coredump. + dontPatchELF = true; + + meta = with lib; { + description = "A note-taking tool for networked thought"; + homepage = "https://roamresearch.com/"; + maintainers = with lib.maintainers; [ dbalan ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/office/super-productivity/default.nix b/pkgs/applications/office/super-productivity/default.nix index c16c757836aab..1e5852b8cc830 100644 --- a/pkgs/applications/office/super-productivity/default.nix +++ b/pkgs/applications/office/super-productivity/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "super-productivity"; - version = "7.13.2"; + version = "7.14.3"; src = fetchurl { url = "https://github.com/johannesjo/super-productivity/releases/download/v${version}/superProductivity-${version}.AppImage"; - sha256 = "sha256-HwRJUrNaoAnNuIcDWgXOYA+PxLjOE6NXRJqINIbVxOw="; + sha256 = "sha256-wW72T1+RfejaI9LxSxa/g0lvIRmAeFa2ZaEa8K9mRcw="; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/office/timeular/default.nix b/pkgs/applications/office/timeular/default.nix index 6629c7f0ae3ea..2d9148b482139 100644 --- a/pkgs/applications/office/timeular/default.nix +++ b/pkgs/applications/office/timeular/default.nix @@ -5,12 +5,12 @@ }: let - version = "6.2.2"; + version = "6.3.0"; pname = "timeular"; src = fetchurl { url = "https://s3.amazonaws.com/timeular-desktop-packages/linux/production/Timeular-${version}.AppImage"; - sha256 = "sha256-i6VLKGHst6gykXOpkt+VFMkdm9RLAWVgAhQ2UZ7Lt5Y="; + sha256 = "sha256-axdkoqCLg0z1kLa/S0kS4d8yGFuKJRDPRte9c8PYniU="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/office/trilium/desktop.nix b/pkgs/applications/office/trilium/desktop.nix index 949e7505b8934..dd3f41df5230c 100644 --- a/pkgs/applications/office/trilium/desktop.nix +++ b/pkgs/applications/office/trilium/desktop.nix @@ -1,6 +1,7 @@ { stdenv, lib, unzip, autoPatchelfHook -, fetchurl, atomEnv, makeWrapper -, makeDesktopItem, copyDesktopItems, wrapGAppsHook, libxshmfence +, fetchurl, makeWrapper +, alsa-lib, mesa, nss, nspr, systemd +, makeDesktopItem, copyDesktopItems, wrapGAppsHook , metaCommon }: @@ -24,6 +25,7 @@ let src = fetchurl linuxSource; + # TODO: migrate off autoPatchelfHook and use nixpkgs' electron nativeBuildInputs = [ autoPatchelfHook makeWrapper @@ -31,7 +33,14 @@ let copyDesktopItems ]; - buildInputs = atomEnv.packages ++ [ libxshmfence ]; + buildInputs = [ + alsa-lib + mesa + nss + nspr + stdenv.cc.cc + systemd + ]; desktopItems = [ (makeDesktopItem { @@ -64,8 +73,9 @@ let ''; # LD_LIBRARY_PATH "shouldn't" be needed, remove when possible :) + # Error: libstdc++.so.6: cannot open shared object file: No such file or directory preFixup = '' - gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${atomEnv.libPath}) + gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath buildInputs}) ''; dontStrip = true; diff --git a/pkgs/applications/radio/direwolf/default.nix b/pkgs/applications/radio/direwolf/default.nix index d3c01aff7695d..e5af2fc0206a4 100644 --- a/pkgs/applications/radio/direwolf/default.nix +++ b/pkgs/applications/radio/direwolf/default.nix @@ -1,7 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, cmake, alsa-lib, espeak, gpsd -, hamlib, perl, python3, udev }: - -with lib; +{ lib +, stdenv +, fetchFromGitHub +, cmake +, alsa-lib +, gpsd +, gpsdSupport ? false +, hamlib +, hamlibSupport ? true +, perl +, python3 +, espeak +, udev +, extraScripts ? false +}: stdenv.mkDerivation rec { pname = "direwolf"; @@ -18,9 +29,14 @@ stdenv.mkDerivation rec { strictDeps = true; - buildInputs = [ - espeak gpsd hamlib perl python3 - ] ++ (optionals stdenv.isLinux [alsa-lib udev]); + buildInputs = lib.optionals stdenv.isLinux [ alsa-lib udev ] + ++ lib.optionals gpsdSupport [ gpsd ] + ++ lib.optionals hamlibSupport [ hamlib ] + ++ lib.optionals extraScripts [ python3 perl espeak ]; + + preConfigure = lib.optionals (!extraScripts) '' + echo "" > scripts/CMakeLists.txt + ''; postPatch = '' substituteInPlace conf/CMakeLists.txt \ @@ -31,21 +47,23 @@ stdenv.mkDerivation rec { substituteInPlace src/decode_aprs.c \ --replace /usr/share/direwolf/tocalls.txt $out/share/direwolf/tocalls.txt \ --replace /opt/local/share/direwolf/tocalls.txt $out/share/direwolf/tocalls.txt - patchShebangs scripts/dwespeak.sh - substituteInPlace scripts/dwespeak.sh \ - --replace espeak ${espeak}/bin/espeak substituteInPlace cmake/cpack/direwolf.desktop.in \ --replace 'Terminal=false' 'Terminal=true' \ --replace 'Exec=@APPLICATION_DESKTOP_EXEC@' 'Exec=direwolf' substituteInPlace src/dwgpsd.c \ --replace 'GPSD_API_MAJOR_VERSION > 11' 'GPSD_API_MAJOR_VERSION > 14' + '' + + lib.optionalString extraScripts '' + patchShebangs scripts/dwespeak.sh + substituteInPlace scripts/dwespeak.sh \ + --replace espeak ${espeak}/bin/espeak ''; - meta = { + meta = with lib; { description = "A Soundcard Packet TNC, APRS Digipeater, IGate, APRStt gateway"; homepage = "https://github.com/wb2osz/direwolf/"; license = licenses.gpl2; platforms = platforms.unix; - maintainers = with maintainers; [ lasandell ]; + maintainers = with maintainers; [ lasandell sarcasticadmin ]; }; } diff --git a/pkgs/applications/radio/flmsg/default.nix b/pkgs/applications/radio/flmsg/default.nix index e92c52a7e162d..d4b97e3a29dca 100644 --- a/pkgs/applications/radio/flmsg/default.nix +++ b/pkgs/applications/radio/flmsg/default.nix @@ -7,12 +7,12 @@ }: stdenv.mkDerivation rec { - version = "4.0.22"; + version = "4.0.23"; pname = "flmsg"; src = fetchurl { url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz"; - sha256 = "sha256-ueOkhmxrd4OT5g8z78TWUZuxT5SbF9300UWe7UByfD0="; + sha256 = "sha256-3eR0wrzkNjlqm5xW5dtgihs33cVUmZeS0/rf+xnPeRY="; }; buildInputs = [ diff --git a/pkgs/applications/radio/gnuradio/3.8.nix b/pkgs/applications/radio/gnuradio/3.8.nix index e10d3df374e22..3113915bce8d6 100644 --- a/pkgs/applications/radio/gnuradio/3.8.nix +++ b/pkgs/applications/radio/gnuradio/3.8.nix @@ -40,11 +40,7 @@ # If one wishes to use a different src or name for a very custom build , overrideSrc ? {} , pname ? "gnuradio" -, versionAttr ? { - major = "3.8"; - minor = "5"; - patch = "0"; -} +, version ? "3.8.5.0" }: let @@ -204,6 +200,11 @@ let gr-zeromq = { runtime = [ cppzmq ]; cmakeEnableFlag = "GR_ZEROMQ"; + pythonRuntime = [ + # Will compile without this, but it is required by tests, and by some + # gr blocks. + python.pkgs.pyzmq + ]; }; }; shared = (import ./shared.nix { @@ -214,7 +215,7 @@ let removeReferencesTo featuresInfo features - versionAttr + version sourceSha256 overrideSrc fetchFromGitHub @@ -222,23 +223,28 @@ let qt = qt5; gtk = gtk3; }); - inherit (shared) hasFeature; # function + inherit (shared.passthru) hasFeature; # function in -stdenv.mkDerivation { - inherit pname; - inherit (shared) - version - src - nativeBuildInputs - buildInputs - disallowedReferences - stripDebugList - doCheck - dontWrapPythonPrograms - dontWrapQtApps - meta - ; +stdenv.mkDerivation (finalAttrs: (shared // { + inherit pname version; + # Will still evaluate correctly if not used here. It only helps nix-update + # find the right file in which version is defined. + inherit (shared) src; + # Remove failing tests + preConfigure = (shared.preConfigure or "") + '' + # https://github.com/gnuradio/gnuradio/issues/3801 + rm gr-blocks/python/blocks/qa_cpp_py_binding.py + rm gr-blocks/python/blocks/qa_cpp_py_binding_set.py + rm gr-blocks/python/blocks/qa_ctrlport_probes.py + # Tests that fail due to numpy deprecations upstream hasn't accomodated to yet. + rm gr-fec/python/fec/qa_polar_decoder_sc.py + rm gr-fec/python/fec/qa_polar_decoder_sc_list.py + rm gr-fec/python/fec/qa_polar_decoder_sc_systematic.py + rm gr-fec/python/fec/qa_polar_encoder.py + rm gr-fec/python/fec/qa_polar_encoder_systematic.py + rm gr-filter/python/filter/qa_freq_xlating_fft_filter.py + ''; patches = [ # Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227 ./modtool-newmod-permissions.3_8.patch @@ -291,4 +297,4 @@ stdenv.mkDerivation { ${removeReferencesTo}/bin/remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake '' ; -} +})) diff --git a/pkgs/applications/radio/gnuradio/3.9.nix b/pkgs/applications/radio/gnuradio/3.9.nix index a393cd5528d57..4d10851b7e13a 100644 --- a/pkgs/applications/radio/gnuradio/3.9.nix +++ b/pkgs/applications/radio/gnuradio/3.9.nix @@ -42,11 +42,7 @@ # If one wishes to use a different src or name for a very custom build , overrideSrc ? {} , pname ? "gnuradio" -, versionAttr ? { - major = "3.9"; - minor = "8"; - patch = "0"; -} +, version ? "3.9.8.0" }: let @@ -231,6 +227,11 @@ let gr-zeromq = { runtime = [ cppzmq ]; cmakeEnableFlag = "GR_ZEROMQ"; + pythonRuntime = [ + # Will compile without this, but it is required by tests, and by some + # gr blocks. + python.pkgs.pyzmq + ]; }; gr-network = { cmakeEnableFlag = "GR_NETWORK"; @@ -250,7 +251,7 @@ let removeReferencesTo featuresInfo features - versionAttr + version sourceSha256 overrideSrc fetchFromGitHub @@ -258,24 +259,21 @@ let qt = qt5; gtk = gtk3; }); - inherit (shared) hasFeature; # function + inherit (shared.passthru) hasFeature; # function in -stdenv.mkDerivation { - inherit pname; - inherit (shared) - version - src - nativeBuildInputs - buildInputs - cmakeFlags - disallowedReferences - stripDebugList - doCheck - dontWrapPythonPrograms - dontWrapQtApps - meta - ; +stdenv.mkDerivation (finalAttrs: (shared // { + inherit pname version; + # Will still evaluate correctly if not used here. It only helps nix-update + # find the right file in which version is defined. + inherit (shared) src; + # Remove failing tests + preConfigure = (shared.preConfigure or "") + '' + # https://github.com/gnuradio/gnuradio/issues/3801 + rm gr-blocks/python/blocks/qa_cpp_py_binding.py + rm gr-blocks/python/blocks/qa_cpp_py_binding_set.py + rm gr-blocks/python/blocks/qa_ctrlport_probes.py + ''; patches = [ # Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227 ./modtool-newmod-permissions.patch @@ -303,4 +301,4 @@ stdenv.mkDerivation { ${removeReferencesTo}/bin/remove-references-to -t ${python.pkgs.pybind11} $out/lib/cmake/gnuradio/gnuradio-runtimeTargets.cmake '' ; -} +})) diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index a443aec53678f..d1f0a3fd6fb66 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -45,11 +45,7 @@ # If one wishes to use a different src or name for a very custom build , overrideSrc ? {} , pname ? "gnuradio" -, versionAttr ? { - major = "3.10"; - minor = "7"; - patch = "0"; -} +, version ? "3.10.7.0" }: let @@ -252,6 +248,11 @@ let gr-zeromq = { runtime = [ cppzmq ]; cmakeEnableFlag = "GR_ZEROMQ"; + pythonRuntime = [ + # Will compile without this, but it is required by tests, and by some + # gr blocks. + python.pkgs.pyzmq + ]; }; gr-network = { cmakeEnableFlag = "GR_NETWORK"; @@ -271,7 +272,7 @@ let removeReferencesTo featuresInfo features - versionAttr + version sourceSha256 overrideSrc fetchFromGitHub @@ -279,24 +280,14 @@ let qt = qt5; gtk = gtk3; }); - inherit (shared) hasFeature; # function + inherit (shared.passthru) hasFeature; # function in -stdenv.mkDerivation { - inherit pname; - inherit (shared) - version - src - nativeBuildInputs - buildInputs - cmakeFlags - disallowedReferences - stripDebugList - doCheck - dontWrapPythonPrograms - dontWrapQtApps - meta - ; +stdenv.mkDerivation (finalAttrs: (shared // { + inherit pname version; + # Will still evaluate correctly if not used here. It only helps nix-update + # find the right file in which version is defined. + inherit (shared) src; patches = [ # Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227 ./modtool-newmod-permissions.patch @@ -332,4 +323,4 @@ stdenv.mkDerivation { ${removeReferencesTo}/bin/remove-references-to -t ${python.pkgs.pybind11} $out/lib/cmake/gnuradio/gnuradio-runtimeTargets.cmake '' ; -} +})) diff --git a/pkgs/applications/radio/gnuradio/shared.nix b/pkgs/applications/radio/gnuradio/shared.nix index bdbc22cb787d3..fbb4960dc8fa2 100644 --- a/pkgs/applications/radio/gnuradio/shared.nix +++ b/pkgs/applications/radio/gnuradio/shared.nix @@ -5,7 +5,7 @@ , removeReferencesTo , featuresInfo , features -, versionAttr +, version , sourceSha256 # If overridden. No need to set default values, as they are given defaults in # the main expressions @@ -13,10 +13,21 @@ , fetchFromGitHub }: -rec { - version = builtins.concatStringsSep "." ( - lib.attrVals [ "major" "minor" "patch" ] versionAttr +let + # Check if a feature is enabled, while defaulting to true if feat is not + # specified. + hasFeature = feat: ( + if builtins.hasAttr feat features then + features.${feat} + else + true ); + versionAttr = { + major = builtins.concatStringsSep "." (lib.take 2 (lib.splitVersion version)); + minor = builtins.elemAt (lib.splitVersion version) 2; + patch = builtins.elemAt (lib.splitVersion version) 3; + }; +in { src = if overrideSrc != {} then overrideSrc else @@ -27,14 +38,6 @@ rec { sha256 = sourceSha256; } ; - # Check if a feature is enabled, while defaulting to true if feat is not - # specified. - hasFeature = feat: ( - if builtins.hasAttr feat features then - features.${feat} - else - true - ); nativeBuildInputs = lib.flatten (lib.mapAttrsToList ( feat: info: ( lib.optionals (hasFeature feat) ( @@ -109,9 +112,14 @@ rec { # Wrapping is done with an external wrapper dontWrapPythonPrograms = true; dontWrapQtApps = true; - # Tests should succeed, but it's hard to get LD_LIBRARY_PATH right in order - # for it to happen. - doCheck = false; + # On darwin, it requires playing with DYLD_FALLBACK_LIBRARY_PATH to make if + # find libgnuradio-runtim.3.*.dylib . + doCheck = !stdenv.isDarwin; + preCheck = '' + export HOME=$(mktemp -d) + export QT_QPA_PLATFORM=offscreen + export QT_PLUGIN_PATH="${qt.qtbase.bin}/${qt.qtbase.qtPluginPrefix}" + ''; meta = with lib; { description = "Software Defined Radio (SDR) software"; diff --git a/pkgs/applications/radio/kappanhang/default.nix b/pkgs/applications/radio/kappanhang/default.nix index 9146bfd781c9e..41037c5092197 100644 --- a/pkgs/applications/radio/kappanhang/default.nix +++ b/pkgs/applications/radio/kappanhang/default.nix @@ -8,14 +8,14 @@ buildGoModule rec { owner = "nonoo"; repo = pname; rev = "v${version}"; - sha256 = "1ycy8avq5s7zspfi0d9klqcwwkpmcaz742cigd7pmcnbbhspcicp"; + hash = "sha256-l0V2NVzLsnpPe5EJcr5i9U7OGaYzNRDd1f/ogrdCnvk="; }; + vendorHash = "sha256-CnZTUP2JBbhG8VUHbVX+vicfQJC9Y8endlwQHdmzMus="; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pulseaudio ]; - vendorSha256 = "1srjngcis42wfskwfqxxj101y9xyzrans1smy53bh1c9zm856xha"; - meta = with lib; { homepage = "https://github.com/nonoo/kappanhang"; description = "Remote control for Icom radio transceivers"; diff --git a/pkgs/applications/radio/pat/default.nix b/pkgs/applications/radio/pat/default.nix index 58eefd0dbcd0d..991df60b24bca 100644 --- a/pkgs/applications/radio/pat/default.nix +++ b/pkgs/applications/radio/pat/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +, libax25 +, installShellFiles +}: buildGoModule rec { pname = "pat"; @@ -15,10 +21,25 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; + nativeBuildInputs = [ + installShellFiles + ]; + + buildInputs = lib.optional stdenv.isLinux [ libax25 ]; + + # Needed by wl2k-go go module for libax25 to include support for Linux' AX.25 stack by linking against libax25. + # ref: https://github.com/la5nta/wl2k-go/blob/abe3ae5bf6a2eec670a21672d461d1c3e1d4c2f3/transport/ax25/ax25.go#L11-L17 + tags = lib.optionals stdenv.isLinux [ "libax25" ]; + + postInstall = '' + installManPage man/pat-configure.1 man/pat.1 + ''; + meta = with lib; { description = "Pat is a cross platform Winlink client written in Go."; homepage = "https://getpat.io/"; license = licenses.mit; - maintainers = with maintainers; [ dotemup ]; + maintainers = with maintainers; [ dotemup sarcasticadmin ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index 5cd8819445b3c..f55371fd689ae 100644 --- a/pkgs/applications/radio/sdrangel/default.nix +++ b/pkgs/applications/radio/sdrangel/default.nix @@ -52,13 +52,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sdrangel"; - version = "7.15.4"; + version = "7.16.0"; src = fetchFromGitHub { owner = "f4exb"; repo = "sdrangel"; rev = "v${finalAttrs.version}"; - hash = "sha256-oSFnoNmoXvdb5lpx/j3DVVhOfbsDZlGNZNcvud1w8Ks="; + hash = "sha256-k35TZ2H8GX3gSYyb27hTY6gHHnxPkFwp1v4OJXhvV7A="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/radio/soapysdr/default.nix b/pkgs/applications/radio/soapysdr/default.nix index 7e0c01c2f5f7c..ee03d67d59862 100644 --- a/pkgs/applications/radio/soapysdr/default.nix +++ b/pkgs/applications/radio/soapysdr/default.nix @@ -51,9 +51,7 @@ stdenv.mkDerivation (finalAttrs: { python.pkgs.numpy ]; - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" - ] ++ lib.optionals usePython [ + cmakeFlags = lib.optionals usePython [ "-DUSE_PYTHON_CONFIG=ON" ]; diff --git a/pkgs/applications/science/astronomy/siril/default.nix b/pkgs/applications/science/astronomy/siril/default.nix index db0411f1337ad..255927d893d28 100644 --- a/pkgs/applications/science/astronomy/siril/default.nix +++ b/pkgs/applications/science/astronomy/siril/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja +{ lib, stdenv, fetchFromGitLab, fetchpatch, pkg-config, meson, ninja, cmake , git, criterion, gtk3, libconfig, gnuplot, opencv, json-glib , fftwFloat, cfitsio, gsl, exiv2, librtprocess, wcslib, ffmpeg , libraw, libtiff, libpng, libjpeg, libheif, ffms, wrapGAppsHook @@ -6,17 +6,25 @@ stdenv.mkDerivation rec { pname = "siril"; - version = "1.0.6"; + version = "1.2.0"; src = fetchFromGitLab { owner = "free-astro"; - repo = pname; + repo = "siril"; rev = version; - sha256 = "sha256-KFCA3fUMVFHmh1BdKed5/dkq0EeYcmoWec97WX9ZHUc="; + hash = "sha256-lCoFQ7z6cZbyNPEm5s40DNdvTwFonHK3KCd8RniqQWs="; }; + patches = [ + (fetchpatch { + name = "siril-1.2-exiv2-0.28.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-astronomy/siril/files/siril-1.2-exiv2-0.28.patch?id=002882203ad6a2b08ce035a18b95844a9f4b85d0"; + hash = "sha256-R1yslW6hzvJHKo0/IqBxkCuqcX6VrdRSz68gpAExxVE="; + }) + ]; + nativeBuildInputs = [ - meson ninja pkg-config git criterion wrapGAppsHook + meson ninja cmake pkg-config git criterion wrapGAppsHook ]; buildInputs = [ @@ -26,6 +34,7 @@ stdenv.mkDerivation rec { # Necessary because project uses default build dir for flatpaks/snaps dontUseMesonConfigure = true; + dontUseCmakeConfigure = true; configureScript = '' ${meson}/bin/meson --buildtype release nixbld . diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index e2e1cda4c2592..d656c39d0bc06 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "stellarium"; - version = "23.2"; + version = "23.3"; src = fetchFromGitHub { owner = "Stellarium"; repo = "stellarium"; rev = "v${version}"; - hash = "sha256-8Iheb/9wjf0u10ZQRkLMLNN2s7P++Fqcr26iatiKcTo="; + hash = "sha256-bYvGmYu9jMHk2IUICz2kCVh56Ymz8JHqurdWV+xEdJY="; }; patches = [ @@ -92,6 +92,6 @@ stdenv.mkDerivation rec { homepage = "https://stellarium.org/"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ kilianar ]; }; } diff --git a/pkgs/applications/science/biology/dssp/default.nix b/pkgs/applications/science/biology/dssp/default.nix index 1281643fe7945..78f226350f604 100644 --- a/pkgs/applications/science/biology/dssp/default.nix +++ b/pkgs/applications/science/biology/dssp/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , cmake +, eigen , fetchFromGitHub , libcifpp , libmcfp @@ -8,24 +9,24 @@ }: let libcifpp' = libcifpp.overrideAttrs (oldAttrs: { - # dssp 4.3.1 requires specific version "5.1.0" of libcifpp - version = "5.1.0"; + # dssp 4.4.3 requires specific version "5.2.0" of libcifpp + version = "5.2.0"; src = fetchFromGitHub { inherit (oldAttrs.src) owner repo rev; - hash = "sha256-PUsi4T6huSqwaa6RnBP1Vj+0a1ePrvrHD0641Lkkc5s="; + hash = "sha256-Sj10j6HxUoUvQ66cd2B8CO7CVBRd7w9CTovxkwPDOvs="; }; }); in stdenv.mkDerivation (finalAttrs: { pname = "dssp"; - version = "4.4.2"; + version = "4.4.3"; src = fetchFromGitHub { owner = "PDB-REDO"; repo = "dssp"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-Gic/rE/G24P5g4Uhf2lcvVa6i/4KGQzCpK4KlpjXcS0="; + hash = "sha256-zPmRR7sxVNErwabLqA5CNMO4K1qHdmC9FBPjcx91KuM="; }; nativeBuildInputs = [ @@ -33,6 +34,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ + eigen libcifpp' libmcfp zlib diff --git a/pkgs/applications/science/biology/hmmer/default.nix b/pkgs/applications/science/biology/hmmer/default.nix index 2a4df9d21dbac..243e067ddec30 100644 --- a/pkgs/applications/science/biology/hmmer/default.nix +++ b/pkgs/applications/science/biology/hmmer/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "3.3.2"; + version = "3.4"; pname = "hmmer"; src = fetchurl { url = "http://eddylab.org/software/hmmer/${pname}-${version}.tar.gz"; - sha256 = "0s9wf6n0qanbx8qs6igfl3vyjikwbrvh4d9d6mv54yp3xysykzlj"; + sha256 = "sha256-ynDZT9DPJxvXBjQjqrsRbULeUzEXNDqbJ6ZcF/8G+/M="; }; meta = with lib; { @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { HMMER can be downloaded and installed as a command line tool on your own hardware, and now it is also more widely accessible to the scientific community via new search servers at the European Bioinformatics Institute. ''; homepage = "http://hmmer.org/"; + changelog = "https://github.com/EddyRivasLab/hmmer/blob/hmmer-${version}/release-notes/RELEASE-${version}.md"; license = licenses.gpl3; maintainers = [ maintainers.iimog ]; # at least SSE is *required* diff --git a/pkgs/applications/science/biology/nest/default.nix b/pkgs/applications/science/biology/nest/default.nix index 90fa698124737..5f0ad540f696e 100644 --- a/pkgs/applications/science/biology/nest/default.nix +++ b/pkgs/applications/science/biology/nest/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "nest"; - version = "3.5"; + version = "3.6"; src = fetchFromGitHub { owner = "nest"; repo = "nest-simulator"; rev = "v${version}"; - hash = "sha256-PPUIXlU6noJRAa/twNSKVxPgIvbWl0OillEJRDzt+4s="; + hash = "sha256-sXtF4JmHYoLp0t3o4KF6R2E0qLnKrzSPMXOxVJAm+sU="; }; postPatch = '' diff --git a/pkgs/applications/science/biology/neuron/default.nix b/pkgs/applications/science/biology/neuron/default.nix index 5b08fbfd6704c..6e5e4feb16fc6 100644 --- a/pkgs/applications/science/biology/neuron/default.nix +++ b/pkgs/applications/science/biology/neuron/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "neuron"; - version = "8.2.2"; + version = "8.2.3"; # format is for pythonModule conversion format = "other"; @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/neuronsimulator/nrn/releases/download/${version}/full-src-package-${version}.tar.gz"; - sha256 = "sha256-orGeBxu3pu4AyAW5P1EGJv8G0dOUZcSOjpUaloqicZU="; + sha256 = "sha256-k8+71BRfh+a73sZho6v0QFRxVmrfx6jqrgaqammdtDI="; }; meta = with lib; { diff --git a/pkgs/applications/science/biology/sortmerna/default.nix b/pkgs/applications/science/biology/sortmerna/default.nix index 6884e1955f75e..a529867aaa743 100644 --- a/pkgs/applications/science/biology/sortmerna/default.nix +++ b/pkgs/applications/science/biology/sortmerna/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { buildInputs = [ zlib rocksdb rapidjson ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DPORTABLE=off" "-DRAPIDJSON_HOME=${rapidjson}" "-DROCKSDB_HOME=${rocksdb}" diff --git a/pkgs/applications/science/biology/stacks/default.nix b/pkgs/applications/science/biology/stacks/default.nix index 04ef7c2e062ba..0a18c5f40fdaa 100644 --- a/pkgs/applications/science/biology/stacks/default.nix +++ b/pkgs/applications/science/biology/stacks/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "stacks"; - version = "2.62"; + version = "2.65"; src = fetchurl { url = "http://catchenlab.life.illinois.edu/stacks/source/${pname}-${version}.tar.gz"; - sha256 = "sha256-7uhQVLC/AEPAPUdm3+vABoIwG4uhNy/EngjsrZjT0Ts="; + sha256 = "sha256-/9a9PWKVq5yJzEUfOF03zR1Hp3AZw9MF8xICoriV4uo="; }; buildInputs = [ zlib ]; @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { homepage = "http://catchenlab.life.illinois.edu/stacks/"; maintainers = [ lib.maintainers.bzizou ]; license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/science/biology/trimmomatic/default.nix b/pkgs/applications/science/biology/trimmomatic/default.nix new file mode 100644 index 0000000000000..ad1dc45c5c26d --- /dev/null +++ b/pkgs/applications/science/biology/trimmomatic/default.nix @@ -0,0 +1,66 @@ +{ lib +, stdenv +, ant +, fetchFromGitHub +, jdk11_headless +, jre +, makeWrapper +}: + +stdenv.mkDerivation rec { + pname = "trimmomatic"; + version = "0.39"; + + src = fetchFromGitHub { + owner = "usadellab"; + repo = "Trimmomatic"; + rev = "v${version}"; + hash = "sha256-u+ubmacwPy/vsEi0YQCv0fTnVDesQvqeQDEwCbS8M6I="; + }; + + # Set source and target version to 11 + postPatch = '' + substituteInPlace ./build.xml \ + --replace 'source="1.5" target="1.5"' 'release="11"' + ''; + + nativeBuildInputs = [ jdk11_headless ant makeWrapper ]; + + buildPhase = '' + runHook preBuild + + ant + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share + cp dist/jar/trimmomatic-${version}.jar $out/share/ + cp -r adapters $out/share/ + makeWrapper ${jre}/bin/java $out/bin/trimmomatic \ + --add-flags "-cp $out/share/trimmomatic-${version}.jar org.usadellab.trimmomatic.Trimmomatic" + + runHook postInstall + ''; + + meta = { + description = "A flexible read trimming tool for Illumina NGS data"; + longDescription = '' + Trimmomatic performs a variety of useful trimming tasks for illumina + paired-end and single ended data: adapter trimming, quality trimming, + cropping to a specified length, length filtering, quality score + conversion. + ''; + homepage = "http://www.usadellab.org/cms/?page=trimmomatic"; + downloadPage = "https://github.com/usadellab/Trimmomatic/releases"; + license = lib.licenses.gpl3Only; + sourceProvenance = [ + lib.sourceTypes.fromSource + lib.sourceTypes.binaryBytecode # source bundles dependencies as jars + ]; + maintainers = [ lib.maintainers.kupac ]; + }; +} diff --git a/pkgs/applications/science/chemistry/cp2k/default.nix b/pkgs/applications/science/chemistry/cp2k/default.nix index 29b983cde5367..e34810a3982b7 100644 --- a/pkgs/applications/science/chemistry/cp2k/default.nix +++ b/pkgs/applications/science/chemistry/cp2k/default.nix @@ -73,7 +73,7 @@ in stdenv.mkDerivation rec { -ftree-vectorize -funroll-loops -msse2 \ -std=f2008 \ -fopenmp -ftree-vectorize -funroll-loops \ - -I${libxc}/include -I${libxsmm}/include \ + -I${lib.getDev libxc}/include -I${lib.getDev libxsmm}/include \ -I${libint}/include ${lib.optionalString enableElpa "$(pkg-config --variable=fcflags elpa)"} LIBS = -lfftw3 -lfftw3_threads \ -lscalapack -lblas -llapack \ @@ -106,6 +106,7 @@ in stdenv.mkDerivation rec { mkdir -p $out/bin $out/share/cp2k cp exe/${arch}/* $out/bin + rm $out/bin/*_unittest.* for i in cp2k cp2k_shell graph; do wrapProgram $out/bin/$i.${cp2kVersion} \ diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index 5745b87a777b9..f80085278e0aa 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -25,14 +25,14 @@ let }; in stdenv.mkDerivation rec { - version = "16.1.39"; + version = "16.1.41"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - hash = "sha256-8M24VXMi7zHkTPNM5zd8nV4J0mXb3/MNIqqxfmlRt9M="; + hash = "sha256-91vPipS5FTqCl7BUSu47aApIfq2e8dD1SW/LEGQWWio="; }; patchPhase = '' diff --git a/pkgs/applications/science/chemistry/mopac/default.nix b/pkgs/applications/science/chemistry/mopac/default.nix index d2b2b558bb78a..c0cdc4eff4106 100644 --- a/pkgs/applications/science/chemistry/mopac/default.nix +++ b/pkgs/applications/science/chemistry/mopac/default.nix @@ -12,13 +12,13 @@ assert blas.isILP64 == lapack.isILP64; stdenv.mkDerivation rec { pname = "mopac"; - version = "22.0.6"; + version = "22.1.0"; src = fetchFromGitHub { owner = "openmopac"; repo = pname; rev = "v${version}"; - hash = "sha256-j4AP3tki+Ep9Pv+pDg8TwCiJvpF2j5npW3Kpat+7gGg="; + hash = "sha256-4jQ0WCHK07CXWUPj5Z1zSXObKxnitMj+FJQbLDiS2Dc="; }; nativeBuildInputs = [ gfortran cmake ]; diff --git a/pkgs/applications/science/chemistry/nwchem/default.nix b/pkgs/applications/science/chemistry/nwchem/default.nix index 2a17be9f8a924..d5c97aa17f926 100644 --- a/pkgs/applications/science/chemistry/nwchem/default.nix +++ b/pkgs/applications/science/chemistry/nwchem/default.nix @@ -169,7 +169,6 @@ stdenv.mkDerivation rec { cp -r $NWCHEM_TOP/src/data $out/share/nwchem/ cp -r $NWCHEM_TOP/src/basis/libraries $out/share/nwchem/data cp -r $NWCHEM_TOP/src/nwpw/libraryps $out/share/nwchem/data - cp -r $NWCHEM_TOP/QA $out/share/nwchem wrapProgram $out/bin/nwchem \ --set-default NWCHEM_BASIS_LIBRARY $out/share/nwchem/data/libraries/ @@ -196,7 +195,7 @@ stdenv.mkDerivation rec { runHook preInstallCheck # run a simple water test - mpirun -np 2 $out/bin/nwchem $out/share/nwchem/QA/tests/h2o/h2o.nw > h2o.out + mpirun -np 2 $out/bin/nwchem $NWCHEM_TOP/QA/tests/h2o/h2o.nw > h2o.out grep "Total SCF energy" h2o.out | grep 76.010538 runHook postInstallCheck diff --git a/pkgs/applications/science/chemistry/openmolcas/default.nix b/pkgs/applications/science/chemistry/openmolcas/default.nix index 695d5502b5eb1..f8ebf5251fc0a 100644 --- a/pkgs/applications/science/chemistry/openmolcas/default.nix +++ b/pkgs/applications/science/chemistry/openmolcas/default.nix @@ -104,7 +104,7 @@ stdenv.mkDerivation { "-DTOOLS=ON" "-DHDF5=ON" "-DFDE=ON" - "-DEXTERNAL_LIBXC=${libxc}" + "-DEXTERNAL_LIBXC=${lib.getDev libxc}" "-DDMRG=ON" "-DNEVPT2=ON" "-DCMAKE_SKIP_BUILD_RPATH=ON" diff --git a/pkgs/applications/science/chemistry/wxmacmolplt/default.nix b/pkgs/applications/science/chemistry/wxmacmolplt/default.nix index 4e8dbb6f07683..13bcf2d1dc662 100644 --- a/pkgs/applications/science/chemistry/wxmacmolplt/default.nix +++ b/pkgs/applications/science/chemistry/wxmacmolplt/default.nix @@ -29,6 +29,8 @@ stdenv.mkDerivation rec { xorg.libX11.dev ]; + configureFlags = [ "LDFLAGS=-lGL" ]; + enableParallelBuilding = true; meta = with lib; { diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index fa9b770370382..3403e410cf85f 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -104,7 +104,6 @@ stdenv.mkDerivation rec { "-DKICAD_BUILD_QA_TESTS=OFF" ] ++ optionals (debug) [ - "-DCMAKE_BUILD_TYPE=Debug" "-DKICAD_STDLIB_DEBUG=ON" "-DKICAD_USE_VALGRIND=ON" ] @@ -115,6 +114,8 @@ stdenv.mkDerivation rec { "-DKICAD_SANITIZE_THREADS=ON" ]; + cmakeBuildType = if debug then "Debug" else "Release"; + nativeBuildInputs = [ cmake doxygen diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/applications/science/electronics/librepcb/default.nix index bd824ac288891..dfd679d4d5313 100644 --- a/pkgs/applications/science/electronics/librepcb/default.nix +++ b/pkgs/applications/science/electronics/librepcb/default.nix @@ -1,21 +1,22 @@ { stdenv, lib, fetchFromGitHub -, qtbase, qttools, cmake, wrapQtAppsHook +, qtbase, qttools, qtquickcontrols2, opencascade-occt, libGLU, libSM, freeimage, cmake, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "librepcb"; - version = "0.1.7"; + version = "1.0.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-zqvvc3CHqdRWVUFt4BkH5Vq50/FKNvMNW2NvGyfWwFM="; + sha256 = "sha256-2o2Gue/RnDWxe8jk/Ehx9CM+B3ac5rEQn0H7yodUEZ8="; fetchSubmodules = true; }; - nativeBuildInputs = [ cmake qttools wrapQtAppsHook ]; + nativeBuildInputs = [ cmake qttools wrapQtAppsHook qtquickcontrols2 opencascade-occt libGLU ]; buildInputs = [ qtbase ]; + propagatedBuildInputs = [ libSM freeimage ]; meta = with lib; { description = "A free EDA software to develop printed circuit boards"; diff --git a/pkgs/applications/science/electronics/openboardview/default.nix b/pkgs/applications/science/electronics/openboardview/default.nix index 715a99cf48972..a750001d05db7 100644 --- a/pkgs/applications/science/electronics/openboardview/default.nix +++ b/pkgs/applications/science/electronics/openboardview/default.nix @@ -39,7 +39,6 @@ stdenv.mkDerivation rec { ''; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DGLAD_REPRODUCIBLE=On" ]; diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix index ce084c1f4a733..eb7637f7f2fff 100644 --- a/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/pkgs/applications/science/logic/alt-ergo/default.nix @@ -1,47 +1,35 @@ -{ fetchFromGitHub, fetchpatch, lib, which, ocamlPackages }: +{ fetchurl, fetchpatch, lib, ocamlPackages }: let pname = "alt-ergo"; - version = "2.4.3"; + version = "2.5.1"; - configureScript = "ocaml unix.cma configure.ml"; - - src = fetchFromGitHub { - owner = "OCamlPro"; - repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-2XARGr8rLiPMOM0rBBoRv5tZvKYtkLkJctGqLYkMe7Q="; + src = fetchurl { + url = "https://github.com/OCamlPro/alt-ergo/releases/download/v${version}/alt-ergo-${version}.tbz"; + hash = "sha256-nPjWmg5FepObhquioYxhVPq6UdOHtCo2Hs5V0yndYB0="; }; in let alt-ergo-lib = ocamlPackages.buildDunePackage rec { pname = "alt-ergo-lib"; - inherit version src configureScript; - configureFlags = [ pname ]; - nativeBuildInputs = [ which ]; - buildInputs = with ocamlPackages; [ dune-configurator ]; - propagatedBuildInputs = with ocamlPackages; [ dune-build-info num ocplib-simplex seq stdlib-shims zarith ]; - preBuild = '' - substituteInPlace src/lib/util/version.ml --replace 'version="dev"' 'version="${version}"' - ''; + inherit version src; + buildInputs = with ocamlPackages; [ ppx_blob ]; + propagatedBuildInputs = with ocamlPackages; [ camlzip dolmen_loop dune-build-info fmt ocplib-simplex seq stdlib-shims zarith ]; }; in let alt-ergo-parsers = ocamlPackages.buildDunePackage rec { pname = "alt-ergo-parsers"; - inherit version src configureScript; - configureFlags = [ pname ]; - nativeBuildInputs = [ which ocamlPackages.menhir ]; - propagatedBuildInputs = [ alt-ergo-lib ] ++ (with ocamlPackages; [ camlzip psmt2-frontend ]); + inherit version src; + nativeBuildInputs = [ ocamlPackages.menhir ]; + propagatedBuildInputs = [ alt-ergo-lib ] ++ (with ocamlPackages; [ psmt2-frontend ]); }; in ocamlPackages.buildDunePackage { - inherit pname version src configureScript; - - configureFlags = [ pname ]; + inherit pname version src; - nativeBuildInputs = [ which ocamlPackages.menhir ]; - buildInputs = [ alt-ergo-parsers ocamlPackages.cmdliner ]; + nativeBuildInputs = [ ocamlPackages.menhir ]; + buildInputs = [ alt-ergo-parsers ] ++ (with ocamlPackages; [ cmdliner dune-site ]); meta = { description = "High-performance theorem prover and SMT solver"; diff --git a/pkgs/applications/science/logic/beluga/default.nix b/pkgs/applications/science/logic/beluga/default.nix index 3cb06c4e7b142..693be7f338866 100644 --- a/pkgs/applications/science/logic/beluga/default.nix +++ b/pkgs/applications/science/logic/beluga/default.nix @@ -2,13 +2,13 @@ ocamlPackages.buildDunePackage rec { pname = "beluga"; - version = "1.1"; + version = "1.1.1"; src = fetchFromGitHub { owner = "Beluga-lang"; repo = "Beluga"; rev = "refs/tags/v${version}"; - hash = "sha256-0E7rmiLmQPfOAQ1qKiqxeLdqviVl+Thkl6KfOWkGZRc="; + hash = "sha256-l/C77czLtlLnpadVx4d9ve9jv/e11jsOgzrbXt+Zo5s="; }; duneVersion = "3"; diff --git a/pkgs/applications/science/logic/cryptominisat/default.nix b/pkgs/applications/science/logic/cryptominisat/default.nix index c5e263c319e6c..0645fd29522fb 100644 --- a/pkgs/applications/science/logic/cryptominisat/default.nix +++ b/pkgs/applications/science/logic/cryptominisat/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "cryptominisat"; - version = "5.11.12"; + version = "5.11.14"; src = fetchFromGitHub { owner = "msoos"; repo = "cryptominisat"; rev = version; - hash = "sha256-1AJx8gPf+qDpAp0p4cfCObKZDWKDAKdGopllr2ajpHw="; + hash = "sha256-p/sVinjEh078PGtJ6JBRA8EmrJVcchBs9L3bRZvCHuo="; }; buildInputs = [ python3 boost ]; diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix index e9f04d2044dc7..1513c74779851 100644 --- a/pkgs/applications/science/logic/cvc4/default.nix +++ b/pkgs/applications/science/logic/cvc4/default.nix @@ -35,9 +35,8 @@ stdenv.mkDerivation rec { preConfigure = '' patchShebangs ./src/ ''; - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Production" - ]; + + cmakeBuildType = "Production"; meta = with lib; { description = "A high-performance theorem prover and SMT solver"; diff --git a/pkgs/applications/science/logic/cvc5/default.nix b/pkgs/applications/science/logic/cvc5/default.nix index 24bcb16df9d98..7c483ec185c7a 100644 --- a/pkgs/applications/science/logic/cvc5/default.nix +++ b/pkgs/applications/science/logic/cvc5/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cvc5"; - version = "1.0.7"; + version = "1.0.8"; src = fetchFromGitHub { owner = "cvc5"; repo = "cvc5"; rev = "cvc5-${version}"; - hash = "sha256-0uT2Lzz0ZbfNWZBptjaGI1fN0mMniBz41eEwipGc5fc="; + hash = "sha256-2sJKHD7Wzznut4hKOyxgc4LR4H+4u3m8Gq02+v+m5lM="; }; nativeBuildInputs = [ pkg-config cmake flex ]; @@ -21,8 +21,9 @@ stdenv.mkDerivation rec { patchShebangs ./src/ ''; + cmakeBuildType = "Production"; + cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Production" "-DBUILD_SHARED_LIBS=1" "-DANTLR3_JAR=${antlr3_4}/lib/antlr/antlr-3.4-complete.jar" ]; diff --git a/pkgs/applications/science/logic/easycrypt/default.nix b/pkgs/applications/science/logic/easycrypt/default.nix index abd2b0cb27581..32243455ae5f5 100644 --- a/pkgs/applications/science/logic/easycrypt/default.nix +++ b/pkgs/applications/science/logic/easycrypt/default.nix @@ -1,25 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, ocamlPackages, why3 }: +{ lib, stdenv, fetchFromGitHub, ocamlPackages, why3 }: stdenv.mkDerivation rec { pname = "easycrypt"; - version = "2022.04"; + version = "2023.09"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "r${version}"; - sha256 = "sha256:09rdwcj70lkamkhd895p284rfpz4bcnsf55mcimhiqncd2a21ml7"; + hash = "sha256-9xavU9jRisZekPqC87EyiLXtZCGu/9QeGzq6BJGt1+Y="; }; - patches = lib.lists.map fetchpatch [ - # Fix build with Why3 1.5 - { url = "https://github.com/EasyCrypt/easycrypt/commit/d226387432deb7f22738e1d5579346a2cbc9be7a.patch"; - hash = "sha256:1zvxij35fnr3h9b5wdl8ml17aqfx3a39rd4mgwmdvkapbg3pa4lm"; } - # Fix build with Why3 1.6 - { url = "https://github.com/EasyCrypt/easycrypt/commit/876f2ed50a0434afdf2fb20e7c50b8a3e26bb06e.patch"; - hash = "sha256-UycfLZWYHNsppb7qHSRaAF4Y0UnwoFueEG0wUcBUPYE="; } - ]; - nativeBuildInputs = with ocamlPackages; [ dune_3 findlib diff --git a/pkgs/applications/science/logic/klee/default.nix b/pkgs/applications/science/logic/klee/default.nix index 401b2f48a6eaa..68f68355f8160 100644 --- a/pkgs/applications/science/logic/klee/default.nix +++ b/pkgs/applications/science/logic/klee/default.nix @@ -72,10 +72,11 @@ in stdenv.mkDerivation rec { (lit.override { python = kleePython; }) ]; + cmakeBuildType = if debug then "Debug" else if !debug && includeDebugInfo then "RelWithDebInfo" else "MinSizeRel"; + cmakeFlags = let onOff = val: if val then "ON" else "OFF"; in [ - "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else if !debug && includeDebugInfo then "RelWithDebInfo" else "MinSizeRel"}" "-DKLEE_RUNTIME_BUILD_TYPE=${if debugRuntime then "Debug" else "Release"}" "-DLLVMCC=${clang}/bin/clang" "-DLLVMCXX=${clang}/bin/clang++" diff --git a/pkgs/applications/science/logic/lean4/default.nix b/pkgs/applications/science/logic/lean4/default.nix index 7509ca63c8044..12465ad9087f0 100644 --- a/pkgs/applications/science/logic/lean4/default.nix +++ b/pkgs/applications/science/logic/lean4/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "lean4"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "leanprover"; repo = "lean4"; rev = "v${version}"; - hash = "sha256-3Ni+NiD0iSsOruUyRpBd+aC0TZNYfOLhwqCpPHPruPg="; + hash = "sha256-6qbCafG0bL5KxQt2gL6hV4PFDsEMM0UXfldeOOqxsaE="; }; postPatch = '' diff --git a/pkgs/applications/science/logic/uhdm/default.nix b/pkgs/applications/science/logic/uhdm/default.nix index c1acd79dcab02..c611ccdf5b010 100644 --- a/pkgs/applications/science/logic/uhdm/default.nix +++ b/pkgs/applications/science/logic/uhdm/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "UHDM"; - version = "1.73"; + version = "1.74"; src = fetchFromGitHub { owner = "chipsalliance"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-VmRn51UrJTGEG4n2fi5kRv8khXakfGbqMtYPejsZCBI="; + hash = "sha256-DiwLo/3RcXY+wG2+7aDx4p6UuQm/eNX/kG35TJzIbe0="; fetchSubmodules = false; # we use all dependencies from nix }; diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix index 057b242e609b9..d9d12cbf388de 100644 --- a/pkgs/applications/science/math/ginac/default.nix +++ b/pkgs/applications/science/math/ginac/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ginac"; - version = "1.8.6"; + version = "1.8.7"; src = fetchurl { url = "https://www.ginac.de/ginac-${version}.tar.bz2"; - sha256 = "sha256-ALMgsRFsrlt7QzZNv/t5EkcdFx9ITYJ2RgXXFYWNl1s="; + sha256 = "sha256-cf9PLYoA5vB86P7mm3bcweu7cnvmdgtYfB+7XM97Yeo="; }; propagatedBuildInputs = [ cln ]; diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index f245e8745b4a0..ade614c89b0fb 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -1,19 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, intltool, autoreconfHook, pkg-config, libqalculate, gtk3, curl, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, intltool, autoreconfHook, pkg-config, libqalculate, gtk3, curl, wrapGAppsHook, desktopToDarwinBundle }: stdenv.mkDerivation (finalAttrs: { pname = "qalculate-gtk"; - version = "4.8.0"; + version = "4.8.1"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-GYy3Ot2vjXpCp89Rib3Ua0XeVGOOTejKcaqNZvPmxm0="; + sha256 = "sha256-bG0hui5GjHWHny/8Rq5sZGz3s5rYnYlpc+K8I/LwDto="; }; hardeningDisable = [ "format" ]; - nativeBuildInputs = [ intltool pkg-config autoreconfHook wrapGAppsHook ]; + nativeBuildInputs = [ intltool pkg-config autoreconfHook wrapGAppsHook ] + ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; buildInputs = [ libqalculate gtk3 curl ]; enableParallelBuilding = true; diff --git a/pkgs/applications/science/math/qalculate-qt/default.nix b/pkgs/applications/science/math/qalculate-qt/default.nix index 34d2d98171eb5..adc43b5f9dab2 100644 --- a/pkgs/applications/science/math/qalculate-qt/default.nix +++ b/pkgs/applications/science/math/qalculate-qt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qalculate-qt"; - version = "4.8.0"; + version = "4.8.1"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-qt"; rev = "v${finalAttrs.version}"; - hash = "sha256-7VlaoiY+HgHCMZCegUdy2wpgfx3fKaViMtkdNRleHaA="; + hash = "sha256-hH+orU+5PmPcrhkLKCdsDhVCrD8Mvxp2RPTGSlsUP7Y="; }; nativeBuildInputs = [ qmake intltool pkg-config qttools wrapQtAppsHook ]; diff --git a/pkgs/applications/science/math/sage/README.md b/pkgs/applications/science/math/sage/README.md index c4de5da45dbf0..35e8d0deeffba 100644 --- a/pkgs/applications/science/math/sage/README.md +++ b/pkgs/applications/science/math/sage/README.md @@ -2,7 +2,7 @@ Sage is a pretty complex package that depends on many other complex packages and patches some of those. As a result, the sage nix package is also quite complex. -Don't feel discouraged to fix, simplify or improve things though. The individual files have comments explaining their purpose. The most importent ones are `default.nix` linking everything together, `sage-src.nix` adding patches and `sagelib.nix` building the actual sage package. +Don't feel discouraged to fix, simplify or improve things though. The individual files have comments explaining their purpose. The most important ones are `default.nix` linking everything together, `sage-src.nix` adding patches and `sagelib.nix` building the actual sage package. ## The sage build is broken diff --git a/pkgs/applications/science/molecular-dynamics/lammps/default.nix b/pkgs/applications/science/molecular-dynamics/lammps/default.nix index f11e9bdeeb13e..7924d044c2ab7 100644 --- a/pkgs/applications/science/molecular-dynamics/lammps/default.nix +++ b/pkgs/applications/science/molecular-dynamics/lammps/default.nix @@ -44,15 +44,16 @@ }: stdenv.mkDerivation (finalAttrs: { - # LAMMPS has weird versioning converted to ISO 8601 format - version = "2Aug2023"; + # LAMMPS has weird versioning convention. Updates should go smoothly with: + # nix-update --commit lammps --version-regex 'stable_(.*)' + version = "2Aug2023_update1"; pname = "lammps"; src = fetchFromGitHub { owner = "lammps"; repo = "lammps"; rev = "stable_${finalAttrs.version}"; - hash = "sha256-6T4YAa4iN3pJpODGPW+faR16xxyYYdkHLavtiPUbZ4o="; + hash = "sha256-Zmn87a726qdidBfyvJlYleYv9jqyFAakxjGrg3lipc0="; }; preConfigure = '' cd cmake diff --git a/pkgs/applications/science/physics/elmerfem/default.nix b/pkgs/applications/science/physics/elmerfem/default.nix index 41a0e00ae7845..e63203a93f285 100644 --- a/pkgs/applications/science/physics/elmerfem/default.nix +++ b/pkgs/applications/science/physics/elmerfem/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, cmake, git, gfortran, mpi, blas, liblapack, pkg-config, libGL, libGLU, opencascade, libsForQt5, tbb, vtkWithQt5 }: +{ lib, stdenv, fetchFromGitHub, cmake, git, gfortran, mpi, blas, liblapack, pkg-config, libGL, libGLU, opencascade-occt, libsForQt5, tbb, vtkWithQt5 }: stdenv.mkDerivation rec { pname = "elmerfem"; - version = "unstable-2023-02-03"; + version = "unstable-2023-09-18"; src = fetchFromGitHub { owner = "elmercsc"; repo = pname; - rev = "39c8784b6e4543a6bf560b5d597e0eec1eb06343"; - hash = "sha256-yyxgFvlS+I4PouDL6eD4ZrXuONTDejCSYKq2AwQ0Iug="; + rev = "0fcced06f91c93f44557efd6a5f10b2da5c7066c"; + hash = "sha256-UuARDYW7D3a4dB6I86s2Ed5ecQxc+Y/es3YIeF2VyTc="; }; hardeningDisable = [ "format" ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { libsForQt5.qwt libGL libGLU - opencascade + opencascade-occt tbb vtkWithQt5 ]; diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix index 014304592b4b4..7e66aacf25c18 100644 --- a/pkgs/applications/system/glances/default.nix +++ b/pkgs/applications/system/glances/default.nix @@ -9,14 +9,14 @@ buildPythonApplication rec { pname = "glances"; - version = "3.4.0.2"; + version = "3.4.0.3"; disabled = isPyPy; src = fetchFromGitHub { owner = "nicolargo"; repo = "glances"; rev = "refs/tags/v${version}"; - sha256 = "sha256-mAhdablRr97DXNmwRk8cA9Q0rS9PsEocVvNc686Gco0="; + hash = "sha256-TakQqyHKuiFdBL73JQzflNUMYmBINyY0flqitqoIpmg="; }; # On Darwin this package segfaults due to mismatch of pure and impure diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix index ffa1780b5e7c2..3427852669cc6 100644 --- a/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -49,16 +49,16 @@ let in rustPlatform.buildRustPackage rec { pname = "alacritty"; - version = "0.12.2"; + version = "0.12.3"; src = fetchFromGitHub { owner = "alacritty"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-X3Z+f5r8surBW9FSsmWKZ/fr82ThXBUkS8fr/sTYR50="; + hash = "sha256-SUEI7DTgs6NYT4oiqaMBNCQ8gP1XoZjPFIKhob7tfsk="; }; - cargoHash = "sha256-JOmDmJl/y4WNsBnCixJykl4PgYgb5cSyo6MCdYmQAzQ="; + cargoHash = "sha256-iLhctiCDNpcTxoMrWwUWHBRc6X5rxSH9Jl2EDuktWmw="; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/terminal-emulators/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix index 23f059ed9a959..98934dc2ec4f9 100644 --- a/pkgs/applications/terminal-emulators/foot/default.nix +++ b/pkgs/applications/terminal-emulators/foot/default.nix @@ -102,6 +102,8 @@ stdenv.mkDerivation { hash = "sha256-jn/S0xjxZPnkGYpTRIpL3dKxGe7+Z+EmOGHiE0UkQqg="; }; + separateDebugInfo = true; + depsBuildBuild = [ pkg-config ]; diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index 1c1f87e1a4072..f120b5290ec15 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -29,20 +29,20 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.30.0"; + version = "0.30.1"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "refs/tags/v${version}"; - hash = "sha256-M6qFkeUp2rBudO2PiLN2VSrmut68c9mjjUr07WEX9VY="; + hash = "sha256-zjXwiRo6Jw3K0iDf05f04MCtg1qKABah7x07CwvW0/0="; }; goModules = (buildGoModule { pname = "kitty-go-modules"; inherit src version; - vendorHash = "sha256-53Y2S/P2fWT9STZFTdlkESxHNpoAggifZJ0+WXCzbkU="; + vendorHash = "sha256-KDqzcJbI2f91wlrjVWgUmut4nhXA/rO9q5q3FaDWnfc="; }).goModules; buildInputs = [ diff --git a/pkgs/applications/terminal-emulators/kitty/themes.nix b/pkgs/applications/terminal-emulators/kitty/themes.nix index 07563345bd1a0..6ca522e4090f4 100644 --- a/pkgs/applications/terminal-emulators/kitty/themes.nix +++ b/pkgs/applications/terminal-emulators/kitty/themes.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation rec { pname = "kitty-themes"; - version = "unstable-2023-06-01"; + version = "unstable-2023-09-15"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty-themes"; - rev = "f765eb1715d79c6cb3ad3d571342d612f21b810e"; - hash = "sha256-Y3N8cyqEsY/kB2xMIlPYnbuYUs8grzepPx/11maG4bo="; + rev = "c9c12d20f83b9536febb21e4b53e176c0ccccb51"; + hash = "sha256-dhzYTHaaTrbE5k+xEC01Y9jGb+ZmEyvWMb4a2WWKGCw="; }; dontConfigure = true; @@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/kovidgoyal/kitty-themes"; description = "Themes for the kitty terminal emulator"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ AndersonTorres nelsonjeppesen ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix index 7824fa2a814b8..ac2a5f09fb0f1 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "Change the urxvt font size on the fly"; homepage = "https://github.com/majutsushi/urxvt-font-size"; license = licenses.mit; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; platforms = with platforms; unix; }; } diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix index 9ecaffb185cc3..f30507483fac1 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { description = "Perl extensions for the rxvt-unicode terminal emulator"; homepage = "https://github.com/effigies/urxvt-perl"; license = licenses.gpl3; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; platforms = with platforms; unix; }; } diff --git a/pkgs/applications/version-management/commitizen/default.nix b/pkgs/applications/version-management/commitizen/default.nix index 9c38e05320a9e..178f6281c147c 100644 --- a/pkgs/applications/version-management/commitizen/default.nix +++ b/pkgs/applications/version-management/commitizen/default.nix @@ -5,19 +5,22 @@ , python3 , stdenv , installShellFiles +, nix-update-script , testers }: python3.pkgs.buildPythonApplication rec { pname = "commitizen"; - version = "3.7.0"; + version = "3.10.0"; format = "pyproject"; + disabled = python3.pythonOlder "3.8"; + src = fetchFromGitHub { owner = "commitizen-tools"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-KfPIGQ4kIjV/Vuza5wdzp0R62LUluJQ5tY6I8BPFmGk="; + hash = "sha256-faHZBH/JrCDRQqZT9v6hsj4C9/PbLQxIr+6hNFzsEcg="; }; pythonRelaxDeps = [ @@ -93,6 +96,7 @@ python3.pkgs.buildPythonApplication rec { ''; passthru = { + updateScript = nix-update-script { }; tests.version = testers.testVersion { package = commitizen; command = "cz version"; @@ -104,6 +108,7 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/commitizen-tools/commitizen"; changelog = "https://github.com/commitizen-tools/commitizen/blob/v${version}/CHANGELOG.md"; license = licenses.mit; + mainProgram = "cz"; maintainers = with maintainers; [ lovesegfault anthonyroussel ]; }; } diff --git a/pkgs/applications/version-management/delta/default.nix b/pkgs/applications/version-management/delta/default.nix index 79c511ec2c8c4..7038ed13dc890 100644 --- a/pkgs/applications/version-management/delta/default.nix +++ b/pkgs/applications/version-management/delta/default.nix @@ -54,5 +54,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/dandavison/delta/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ marsam zowoq SuperSandro2000 figsoda ]; + mainProgram = "delta"; }; } diff --git a/pkgs/applications/version-management/forgejo/default.nix b/pkgs/applications/version-management/forgejo/default.nix index e1d1c6638c0ac..9c896ec87652a 100644 --- a/pkgs/applications/version-management/forgejo/default.nix +++ b/pkgs/applications/version-management/forgejo/default.nix @@ -39,14 +39,14 @@ let in buildGoModule rec { pname = "forgejo"; - version = "1.20.4-0"; + version = "1.20.4-1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "forgejo"; repo = "forgejo"; rev = "v${version}"; - hash = "sha256-guKU3VG1Wyhr5p6w0asL/CopQ5b7HiNi26Tw8WCEpwE="; + hash = "sha256-Fxlj+ckw1LSgiQDex3ZizHakIKd52U6JcdTurJj8YWg="; }; vendorHash = "sha256-dgtZjsLBwblhdge3BvdbK/mN/TeZKps9K5dJbqomtjo="; diff --git a/pkgs/applications/version-management/gg/default.nix b/pkgs/applications/version-management/gg/default.nix index b94fea8da8582..ea701c6f07b35 100644 --- a/pkgs/applications/version-management/gg/default.nix +++ b/pkgs/applications/version-management/gg/default.nix @@ -20,7 +20,7 @@ in buildGoModule { owner = "gg-scm"; repo = "gg"; rev = "v${version}"; - sha256 = "e628aeddb94d2470de860df09ef65499f8c5493fb336bf3df8502842ee02487f"; + hash = "sha256-5iiu3blNJHDehg3wnvZUmfjFST+zNr89+FAoQu4CSH8="; }; postPatch = '' substituteInPlace cmd/gg/editor_unix.go \ @@ -33,7 +33,7 @@ in buildGoModule { "-X" "main.buildCommit=${commit}" ]; - vendorSha256 = "214dc073dad7b323ea449acf24c5b578d573432eeaa1506cf5761a2d7f5ce405"; + vendorHash = "sha256-IU3Ac9rXsyPqRJrPJMW1eNVzQy7qoVBs9XYaLX9c5AU="; nativeBuildInputs = [ pandoc installShellFiles makeWrapper ]; nativeCheckInputs = [ bash coreutils git ]; diff --git a/pkgs/applications/version-management/gh/default.nix b/pkgs/applications/version-management/gh/default.nix index 981b583817744..22edc08e65554 100644 --- a/pkgs/applications/version-management/gh/default.nix +++ b/pkgs/applications/version-management/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.35.0"; + version = "2.36.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - hash = "sha256-ddVszWyfu9BsP4yvOtVTHhZ51D8j4Vf1pdyahF0gjVk="; + hash = "sha256-ya+Iuhe+vXNqt6mfpZ3h8jq++82AGMj+Zd4ozGFjuqY="; }; - vendorHash = "sha256-iql/CEWwg6t5k8qOFEQotMUUJd4VQ/H4JcuL2Eunqg0="; + vendorHash = "sha256-tJDn3pyX5iTIa61OQXbErdBprqxu1N2LXqyJtpDQnBE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-cliff/default.nix b/pkgs/applications/version-management/git-cliff/default.nix index 5860d679db627..5e82daa496fd3 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.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "orhun"; repo = "git-cliff"; rev = "v${version}"; - hash = "sha256-HD/g9zXE7w9x8o0ERBym5OZvODQ6n4a/bkzf457QPxM="; + hash = "sha256-DzlCy8Y3OW3FiXO45wuUh3t87Za2jWQ4rnztZGRySYA="; }; - cargoHash = "sha256-tTH5FMlOHv+T9rd0C7O2WaPkp2nUTQ3Ulsi16WiwbdE="; + cargoHash = "sha256-+XyZqxjiOAIyc+FmnexIdV1RMzc+iqmo8nPahzUo43E="; # attempts to run the program on .git in src which is not deterministic doCheck = false; diff --git a/pkgs/applications/version-management/git-codereview/default.nix b/pkgs/applications/version-management/git-codereview/default.nix index 26c34e5830270..9606b9e15d073 100644 --- a/pkgs/applications/version-management/git-codereview/default.nix +++ b/pkgs/applications/version-management/git-codereview/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "git-codereview"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "golang"; repo = "review"; rev = "v${version}"; - hash = "sha256-Dy7gHT6WmZ1TjA5s+VmOUkaRvrA9v7mWQSLPscgBHgY="; + hash = "sha256-oHW73Y31z+0jOJdSJJa550mJYV8IP2fN+oNwT+3sySM="; }; vendorHash = null; diff --git a/pkgs/applications/version-management/git-hound/default.nix b/pkgs/applications/version-management/git-hound/default.nix index d2be44bc1a2f9..7a135b69a2e3b 100644 --- a/pkgs/applications/version-management/git-hound/default.nix +++ b/pkgs/applications/version-management/git-hound/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-HD5OK8HjnLDbyC/TmVI2HfBRIUCyyHTbA3JvKoeXV5E="; }; - vendorSha256 = null; #vendorSha256 = ""; + vendorHash = null; meta = with lib; { description = "Reconnaissance tool for GitHub code search"; diff --git a/pkgs/applications/version-management/git-mit/default.nix b/pkgs/applications/version-management/git-mit/default.nix index 16110a69bb416..7e7de848ecad3 100644 --- a/pkgs/applications/version-management/git-mit/default.nix +++ b/pkgs/applications/version-management/git-mit/default.nix @@ -10,7 +10,7 @@ }: let - version = "5.12.147"; + version = "5.12.155"; in rustPlatform.buildRustPackage { pname = "git-mit"; @@ -20,10 +20,10 @@ rustPlatform.buildRustPackage { owner = "PurpleBooth"; repo = "git-mit"; rev = "v${version}"; - hash = "sha256-TaYuxyezegPZPWlkYcZk+YhmHqQ/P1nO5D5JC3LN8bo="; + hash = "sha256-Hz/FGPnrY3EqlVuSks82UO6/7uHGEgnGgTddFKnj3AQ="; }; - cargoHash = "sha256-9oqw2rIAhdo5G2GsW7rwHMymgFASKE7OrVqO2ewfG2g="; + cargoHash = "sha256-SiYj05OMUWn0hpJeMLEz846QQLTJuv4dtiSG/ow2yHI="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index 62be45cba27ea..a5f6820342d3a 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.36.1"; + version = "2.37"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - hash = "sha256-jq9Frh3rufI9Q3auh2Qfoo89x+jKsbxBB8ojreVgmjc="; + hash = "sha256-6OAubRkNXIm1HaiDq4jzBPUhgbwQowSZXSqAzAe7Rv0="; }; # Fix 'NameError: name 'ssl' is not defined' diff --git a/pkgs/applications/version-management/git-subtrac/default.nix b/pkgs/applications/version-management/git-subtrac/default.nix index 4e9c3b7a5ccc0..c10a271024904 100644 --- a/pkgs/applications/version-management/git-subtrac/default.nix +++ b/pkgs/applications/version-management/git-subtrac/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "apenwarr"; repo = pname; rev = "v${version}"; - sha256 = "0p1n29k2a2rpznwxlwzkmx38ic6g041k9vx7msvick7cydn417fx"; + hash = "sha256-3Z1AbPPsTBa3rqfvNAMBz7CIRq/zc9q5/TcLJWYSNlw="; }; - vendorSha256 = "0m64grnmhjvfsw7a56474s894sgd24rvcp5kamhzzyc4q556hqny"; + vendorHash = "sha256-3mJoSsGE+f9hVbNctjMR7WmSkCaHmKIO125LWG1+xFQ="; doCheck = false; diff --git a/pkgs/applications/version-management/git-when-merged/default.nix b/pkgs/applications/version-management/git-when-merged/default.nix index d020f351fedf5..00c9bfa0ae4af 100644 --- a/pkgs/applications/version-management/git-when-merged/default.nix +++ b/pkgs/applications/version-management/git-when-merged/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "git-when-merged"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "mhagger"; repo = pname; rev = "v${version}"; - sha256 = "0sw98gmsnd4iki9fx455jga9m80bxvvfgys8i1r2fc7d5whc2qa6"; + sha256 = "sha256-Yp/GNzD+7EPlk/kzZnT1eiSNsSxpYEiZezRbUU3HfLc="; }; buildInputs = [ python3 ]; diff --git a/pkgs/applications/version-management/git-workspace/default.nix b/pkgs/applications/version-management/git-workspace/default.nix index e225d5b55cebf..e56e57201e57b 100644 --- a/pkgs/applications/version-management/git-workspace/default.nix +++ b/pkgs/applications/version-management/git-workspace/default.nix @@ -6,29 +6,33 @@ , Security , pkg-config , openssl +, nix-update-script , testers , git-workspace }: rustPlatform.buildRustPackage rec { pname = "git-workspace"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "orf"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Ppb42u31/iJd743vKX+5RdI7aITsWg9Jg0Aheguep5s="; + sha256 = "sha256-dtOYMZGBnFwas/k3yHSNnKlVwwLUOx7QseshJWY1X4o="; }; - cargoSha256 = "sha256-O0wyNdgY1meEBJh/tEHxwzjNQdzxbKn5Ji+gdd146vQ="; + cargoSha256 = "sha256-4zqbNhR8A0yPD/qIJgP6049bUunAKRyGmlNmC3yPc5Q="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; - passthru.tests.version = testers.testVersion { package = git-workspace; }; + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { package = git-workspace; }; + }; meta = with lib; { description = "Sync personal and work git repositories from multiple providers"; diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 423df13fbebb3..f21e58603368a 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -20,12 +20,12 @@ buildGoModule rec { pname = "gitea"; - version = "1.20.4"; + version = "1.20.5"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://dl.gitea.com/gitea/${version}/gitea-src-${version}.tar.gz"; - hash = "sha256-96LI7/4FZy17KED2xc4UFyW4e47DZMuSnMw7loYYB8c="; + hash = "sha256-cH/AHsFXOdvfSfj9AZUd3l/RlYE06o1ByZu0vvGQuXw="; }; vendorHash = null; diff --git a/pkgs/applications/version-management/gitlab/Remove-unsupported-database-names.patch b/pkgs/applications/version-management/gitlab/Remove-unsupported-database-names.patch index 7de1779f4a740..a87e7ac1618c2 100644 --- a/pkgs/applications/version-management/gitlab/Remove-unsupported-database-names.patch +++ b/pkgs/applications/version-management/gitlab/Remove-unsupported-database-names.patch @@ -1,15 +1,15 @@ -From 310245bad66048624e199000a1c7eb9d68ce2b5c Mon Sep 17 00:00:00 2001 +From 054e2e2092e3f20267a5d2046978df6d33c72712 Mon Sep 17 00:00:00 2001 From: Yaya <mak@nyantec.com> Date: Tue, 23 May 2023 13:49:18 +0000 Subject: [PATCH] Remove unsupported database names The only supported ones are main, ci, main_clusterwide. --- - config/database.yml.postgresql | 35 ---------------------------------- - 1 file changed, 35 deletions(-) + config/database.yml.postgresql | 37 ---------------------------------- + 1 file changed, 37 deletions(-) diff --git a/config/database.yml.postgresql b/config/database.yml.postgresql -index b210b9c412bc..900612080416 100644 +index da9f458ff..2d6d44e37 100644 --- a/config/database.yml.postgresql +++ b/config/database.yml.postgresql @@ -26,13 +26,6 @@ production: @@ -54,8 +54,8 @@ index b210b9c412bc..900612080416 100644 # Warning: The database defined as "test" will be erased and # re-generated from your development database when you run "rake". -@@ -117,17 +96,3 @@ test: &test - prepared_statements: false +@@ -119,19 +98,3 @@ test: &test + reaping_frequency: nil variables: statement_timeout: 15s - geo: @@ -65,6 +65,7 @@ index b210b9c412bc..900612080416 100644 - username: postgres - password: - host: localhost +- reaping_frequency: nil - embedding: - adapter: postgresql - encoding: unicode @@ -72,6 +73,7 @@ index b210b9c412bc..900612080416 100644 - username: postgres - password: - host: localhost +- reaping_frequency: nil -- -2.38.4 +2.40.1 diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 955edc421ac85..3566e85a27074 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "16.3.4", - "repo_hash": "sha256-VM3yH+6R8FyzwAhXtjbQsoMhPVALvDxQvmwyNZE0JCQ=", - "yarn_hash": "02g51sfpn065513n5ngcw6rqvzaws6yfq0y7gyj4lc4d8fhis088", + "version": "16.4.1", + "repo_hash": "sha256-gIoHv+Zt0WgxxL1GLz1iaK1g3uJNMbp+Umo6FbWEggY=", + "yarn_hash": "0106yyiy00cag36mgckiwfdvhz23fsnskigpd533kjrl32qr9d6l", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v16.3.4-ee", + "rev": "v16.4.1-ee", "passthru": { - "GITALY_SERVER_VERSION": "16.3.4", - "GITLAB_PAGES_VERSION": "16.3.4", - "GITLAB_SHELL_VERSION": "14.26.0", - "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.3.10", - "GITLAB_WORKHORSE_VERSION": "16.3.4" + "GITALY_SERVER_VERSION": "16.4.1", + "GITLAB_PAGES_VERSION": "16.4.1", + "GITLAB_SHELL_VERSION": "14.28.0", + "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.3.9", + "GITLAB_WORKHORSE_VERSION": "16.4.1" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 9d9f930e43bbe..f89f920c4c0b2 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -3,17 +3,10 @@ , fetchFromGitHub , buildGoModule , pkg-config - -# libgit2 + dependencies -, libgit2 -, http-parser -, openssl -, pcre -, zlib }: let - version = "16.3.4"; + version = "16.4.1"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -24,17 +17,16 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-5fNRoxWNBky7dJLFg+OyshfIcAqCAj41hvfrQRPIuzg="; + hash = "sha256-t3d72l/Na0qv+jezT/YhAUbG9DSSe9pyixQjTALTxvk="; }; - vendorHash = "sha256-abyouKgn31yO3+oeowtxZcuvS6mazVM8zOMEFsyw4C0="; + vendorHash = "sha256-Nlq1l1f389DC854rFznEu2Viv0T7Y1cD1Ht0o2N304o="; ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ]; - tags = [ "static,system_libgit2" ]; + tags = [ "static" ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libgit2 openssl zlib pcre http-parser ]; doCheck = false; }; @@ -42,7 +34,7 @@ let auxBins = buildGoModule ({ pname = "gitaly-aux"; - subPackages = [ "cmd/gitaly-hooks" "cmd/gitaly-ssh" "cmd/gitaly-git2go" "cmd/gitaly-lfs-smudge" "cmd/gitaly-gpg" ]; + subPackages = [ "cmd/gitaly-hooks" "cmd/gitaly-ssh" "cmd/gitaly-lfs-smudge" "cmd/gitaly-gpg" ]; } // commonOpts); in buildGoModule ({ diff --git a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix index 6bf44a1deae23..0cac9f890e782 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gitlab-container-registry"; - version = "3.83.0"; + version = "3.84.0"; rev = "v${version}-gitlab"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "container-registry"; inherit rev; - sha256 = "sha256-HYyPe4x8hwtKAr0r4dGUbIyiLRQKtlWQ4Pt2mtbQmZM="; + sha256 = "sha256-VdLovX3/y0fME74YlpPxjNPAwFpr1urAHJYO24VJ4AE="; }; - vendorHash = "sha256-OX8drOl8D30gYFnLzZe9i1whguXe0QFhsLpP9G9seuk="; + vendorHash = "sha256-ZFQixOgcB8GqgZPIbjMJEYOlg9cD+wAMZF7mwWaNSXI="; patches = [ ./Disable-inmemory-storage-driver-test.patch diff --git a/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix b/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix index 803f335ac197c..11e272e1bcc42 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gitlab-elasticsearch-indexer"; - version = "4.3.8"; + version = "4.3.9"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-elasticsearch-indexer"; rev = "v${version}"; - sha256 = "sha256-CePFRk+Dpndv4BtINUn8/Y4fhuO4sCyh4+erjfIHZvI="; + sha256 = "sha256-/jo44MlLWZCSUWFW2rJSqugNYZCXEs5pfj0f6fZs4zg="; }; - vendorHash = "sha256-SEYHROFFaR7m7K6l4+zipX0QNYWpbf8qI4pAp1pKAsY="; + vendorHash = "sha256-TQ6E5eckZNVL6zzaS9m0izWnQitqfpc4MAEoQOVasnA="; buildInputs = [ icu ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index 775889d83adeb..7810639eca74f 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "16.3.4"; + version = "16.4.1"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-hz5YCQi1O+/ana/Vpawh2nQj7fmcI6huvKFTG9rVDjw="; + hash = "sha256-aUpuzgFbxMJwKjTn+QAudOeMBSLtLTjaTmwe25f6qxg="; }; - vendorHash = "sha256-Pdb+bWsECe7chgvPKFGXxVAWb+AbGF6khVJSdDsHqKM="; + vendorHash = "sha256-ko0ycT8HlqVfXf7tck0xcs6rDJMpHxjSoI59gTLgqDQ="; subPackages = [ "." ]; meta = with lib; { diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index cc6100efc19e7..01b1193263969 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "gitlab-shell"; - version = "14.26.0"; + version = "14.28.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "sha256-nDnPldBQy4Zg0uZshxSmcEl0ggmqg6CyNWc/I3szonI="; + sha256 = "sha256-w/Td4J4t/xrkR5LmFTcAD5U9ZR3HDGqLNxpjkDC0pi4="; }; buildInputs = [ ruby libkrb5 ]; patches = [ ./remove-hardcoded-locations.patch ]; - vendorHash = "sha256-Lqo0fdrYEHOKjF/XT3c1VjVQc1YxeBy6yW69IxXZAow="; + vendorHash = "sha256-EIJSBUUsWvA93OAyBNey2WA2sV+7YSWbsC1RnWf6nrI="; postInstall = '' cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index adcd203be21ee..690af3a806d4c 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "16.3.4"; + version = "16.4.1"; src = fetchFromGitLab { owner = data.owner; @@ -16,7 +16,7 @@ buildGoModule rec { sourceRoot = "${src.name}/workhorse"; - vendorHash = "sha256-Gitap0cWRubtWLJcT8oVg9FKcN9FhXbVy/t2tgaZ93Q="; + vendorHash = "sha256-C6FVTOY3CdO2y6mKuvgEWDZnWevRTxeOefRF2EbXDv8="; buildInputs = [ git ]; ldflags = [ "-X main.Version=${version}" ]; doCheck = false; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index a31ae24ecbc3a..d9ee8a8ae714f 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -19,6 +19,8 @@ gem 'rails', '~> 7.0.6' gem 'activerecord-gitlab', path: 'gems/activerecord-gitlab' +gem 'vite_rails' + gem 'bootsnap', '~> 1.16.0', require: false gem 'openssl', '~> 3.0' @@ -36,10 +38,10 @@ gem 'responders', '~> 3.0' gem 'sprockets', '~> 3.7.0' -gem 'view_component', '~> 3.2.0' +gem 'view_component', '~> 3.5.0' # Supported DBs -gem 'pg', '~> 1.5.3' +gem 'pg', '~> 1.5.4' gem 'neighbor', '~> 0.2.3' @@ -58,7 +60,7 @@ gem 'devise-pbkdf2-encryptable', '~> 0.0.0', path: 'vendor/gems/devise-pbkdf2-en gem 'bcrypt', '~> 3.1', '>= 3.1.14' gem 'doorkeeper', '~> 5.6', '>= 5.6.6' gem 'doorkeeper-openid_connect', '~> 1.8', '>= 1.8.7' -gem 'rexml', '~> 3.2.5' +gem 'rexml', '~> 3.2.6' gem 'ruby-saml', '~> 1.15.0' gem 'omniauth', '~> 2.1.0' gem 'omniauth-auth0', '~> 3.1' @@ -91,7 +93,7 @@ gem 'timfel-krb5-auth', '~> 0.8', group: :kerberos # Spam and anti-bot protection gem 'recaptcha', '~> 5.12', require: 'recaptcha/rails' gem 'akismet', '~> 3.0' -gem 'invisible_captcha', '~> 2.0.0' +gem 'invisible_captcha', '~> 2.1.0' # Two-factor authentication gem 'devise-two-factor', '~> 4.0.2' @@ -99,7 +101,7 @@ gem 'rqrcode-rails3', '~> 0.1.7' gem 'attr_encrypted', '~> 3.2.4', path: 'vendor/gems/attr_encrypted' # GitLab Pages -gem 'validates_hostname', '~> 1.0.11' +gem 'validates_hostname', '~> 1.0.13' gem 'rubyzip', '~> 2.3.2', require: 'zip' # GitLab Pages letsencrypt support gem 'acme-client', '~> 2.0' @@ -111,7 +113,7 @@ gem 'browser', '~> 5.3.1' gem 'ohai', '~> 17.9' # GPG -gem 'gpgme', '~> 2.0.22' +gem 'gpgme', '~> 2.0.23' # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes @@ -122,13 +124,13 @@ gem 'net-ldap', '~> 0.17.1' # API gem 'grape', '~> 1.7.1' gem 'grape-entity', '~> 0.10.0' -gem 'rack-cors', '~> 1.1.1', require: 'rack/cors' +gem 'rack-cors', '~> 2.0.1', require: 'rack/cors' gem 'grape-swagger', '~> 1.6.1', group: [:development, :test] gem 'grape-swagger-entity', '~> 0.5.1', group: [:development, :test] # GraphQL API -gem 'graphql', '~> 1.13.12' -gem 'graphiql-rails', '~> 1.8' +gem 'graphql', '~> 1.13.19' +gem 'graphiql-rails', '~> 1.8.0' gem 'apollo_upload_server', '~> 2.1.0' gem 'graphql-docs', '~> 2.1.0', group: [:development, :test] gem 'graphlient', '~> 0.5.0' # Used by BulkImport feature (group::import) @@ -177,9 +179,6 @@ gem 'google-apis-serviceusage_v1', '~> 0.28.0' gem 'google-apis-sqladmin_v1beta4', '~> 0.41.0' gem 'google-apis-androidpublisher_v3', '~> 0.34.0' -# for aws storage -gem 'unf', '~> 0.1.4' - # Seed data gem 'seed-fu', '~> 2.3.7' @@ -187,15 +186,15 @@ gem 'seed-fu', '~> 2.3.7' gem 'elasticsearch-model', '~> 7.2' gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation' gem 'elasticsearch-api', '7.13.3' -gem 'aws-sdk-core', '~> 3.180.3' +gem 'aws-sdk-core', '~> 3.181.1' gem 'aws-sdk-cloudformation', '~> 1' -gem 'aws-sdk-s3', '~> 1.132.1' +gem 'aws-sdk-s3', '~> 1.134.0' gem 'faraday_middleware-aws-sigv4', '~>0.3.0' gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections # Markdown and HTML processing gem 'html-pipeline', '~> 2.14.3' -gem 'deckar01-task_list', '2.3.2' +gem 'deckar01-task_list', '2.3.3' gem 'gitlab-markup', '~> 1.9.0', require: 'github/markup' gem 'commonmarker', '~> 0.23.10' gem 'kramdown', '~> 2.3.1' @@ -225,7 +224,7 @@ gem 'rack', '~> 2.2.8' gem 'rack-timeout', '~> 0.6.3', require: 'rack/timeout/base' group :puma do - gem 'puma', '~> 6.3', require: false + gem 'puma', '~> 6.3', '>= 6.3.1', require: false gem 'sd_notify', '~> 0.1.0', require: false end @@ -245,7 +244,7 @@ gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', requir gem 'fugit', '~> 1.8.1' # HTTP requests -gem 'httparty', '~> 0.20.0' +gem 'httparty', '~> 0.21.0' # Colored output to console gem 'rainbow', '~> 3.0' @@ -254,7 +253,7 @@ gem 'rainbow', '~> 3.0' gem 'ruby-progressbar', '~> 1.10' # Linear-time regex library for untrusted regular expressions -gem 're2', '~> 1.7.0' +gem 're2', '2.0.0' # Misc @@ -302,16 +301,14 @@ gem 'ruby-openai', '~> 3.7' gem 'circuitbox', '2.0.0' # Sanitize user input -gem 'sanitize', '~> 6.0' +gem 'sanitize', '~> 6.0.2' gem 'babosa', '~> 2.0' # Sanitizes SVG input gem 'loofah', '~> 2.21.3' -# Working with license -# Detects the open source license the repository includes -# This version needs to be in sync with gitlab-org/gitaly -gem 'licensee', '~> 9.15' +# Used to provide license templates +gem 'licensee', '~> 9.16' # Detect and convert string character encoding gem 'charlock_holmes', '~> 0.7.7' @@ -320,13 +317,13 @@ gem 'charlock_holmes', '~> 0.7.7' gem 'ruby-magic', '~> 0.6' # Faster blank -gem 'fast_blank' +gem 'fast_blank', '~> 1.0.1' # Parse time & duration gem 'gitlab-chronic', '~> 0.10.5' -gem 'gitlab_chronic_duration', '~> 0.10.6.2' +gem 'gitlab_chronic_duration', '~> 0.11' -gem 'rack-proxy', '~> 0.7.6' +gem 'rack-proxy', '~> 0.7.7' gem 'sassc-rails', '~> 2.1.0' gem 'autoprefixer-rails', '10.2.5.1' @@ -334,7 +331,7 @@ gem 'terser', '1.0.2' gem 'click_house-client', path: 'gems/click_house-client', require: 'click_house/client' gem 'addressable', '~> 2.8' -gem 'tanuki_emoji', '~> 0.6' +gem 'tanuki_emoji', '~> 0.7' gem 'gon', '~> 6.4.0' gem 'request_store', '~> 1.5.1' gem 'base32', '~> 0.3.0' @@ -362,7 +359,6 @@ gem 'gitlab-labkit', '~> 0.34.0' gem 'thrift', '>= 0.16.0' # I18n -gem 'ruby_parser', '~> 3.20', require: false gem 'rails-i18n', '~> 7.0' gem 'gettext_i18n_rails', '~> 1.11.0' gem 'gettext_i18n_rails_js', '~> 1.3' @@ -381,7 +377,7 @@ gem 'snowplow-tracker', '~> 0.8.0' # Metrics gem 'webrick', '~> 1.8.1', require: false -gem 'prometheus-client-mmap', '~> 0.27', require: 'prometheus/client' +gem 'prometheus-client-mmap', '~> 0.28', require: 'prometheus/client' gem 'warning', '~> 1.3.0' @@ -447,7 +443,7 @@ group :development, :test do end group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 3.13.0', require: false + gem 'gitlab-dangerfiles', '~> 4.0.0', require: false end group :development, :test, :coverage do @@ -477,13 +473,13 @@ group :test do gem 'capybara', '~> 3.39', '>= 3.39.2' gem 'capybara-screenshot', '~> 1.0.26' - gem 'selenium-webdriver', '= 4.11.0' + gem 'selenium-webdriver', '= 4.12.0' gem 'graphlyte', '~> 1.0.0' gem 'shoulda-matchers', '~> 5.1.0', require: false gem 'email_spec', '~> 2.2.0' - gem 'webmock', '~> 3.18.1' + gem 'webmock', '~> 3.19.1' gem 'rails-controller-testing' gem 'concurrent-ruby', '~> 1.1' gem 'test-prof', '~> 1.2.2' @@ -494,10 +490,10 @@ group :test do # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527 gem 'derailed_benchmarks', require: false - gem 'gitlab_quality-test_tooling', '~> 0.9.3', require: false + gem 'gitlab_quality-test_tooling', '~> 1.0.0', require: false end -gem 'octokit', '~> 4.15' +gem 'octokit', '~> 6.0' gem 'gitlab-mail_room', '~> 0.0.23', require: 'mail_room' @@ -529,23 +525,23 @@ gem 'ssh_data', '~> 1.3' gem 'spamcheck', '~> 1.3.0' # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 16.2.0-rc4' +gem 'gitaly', '~> 16.3.0-rc1' # KAS GRPC protocol definitions gem 'kas-grpc', '~> 0.2.0' gem 'grpc', '~> 1.55.0' -gem 'google-protobuf', '~> 3.23', '>= 3.23.4' +gem 'google-protobuf', '~> 3.24', '>= 3.24.3' gem 'toml-rb', '~> 2.2.0' # Feature toggles -gem 'flipper', '~> 0.25.0' -gem 'flipper-active_record', '~> 0.25.0' -gem 'flipper-active_support_cache_store', '~> 0.25.0' +gem 'flipper', '~> 0.26.2' +gem 'flipper-active_record', '~> 0.26.2' +gem 'flipper-active_support_cache_store', '~> 0.26.2' gem 'unleash', '~> 3.2.2' -gem 'gitlab-experiment', '~> 0.7.1' +gem 'gitlab-experiment', '~> 0.8.0' # Structured logging gem 'lograge', '~> 0.5' @@ -575,7 +571,7 @@ gem 'mail-smtp_pool', '~> 0.1.0', path: 'vendor/gems/mail-smtp_pool', require: f gem 'microsoft_graph_mailer', '~> 0.1.0', path: 'vendor/gems/microsoft_graph_mailer' # File encryption -gem 'lockbox', '~> 1.1.1' +gem 'lockbox', '~> 1.3.0' # Email validation gem 'valid_email', '~> 0.1' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index cf94510e923ed..2a8f80bf3939e 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -100,7 +100,7 @@ PATH specs: mail-smtp_pool (0.1.0) connection_pool (~> 2.0) - mail (~> 2.7) + mail (~> 2.8) PATH remote: vendor/gems/microsoft_graph_mailer @@ -265,7 +265,7 @@ GEM aws-sdk-cloudformation (1.41.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.180.3) + aws-sdk-core (3.181.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) @@ -273,8 +273,8 @@ GEM aws-sdk-kms (1.64.0) aws-sdk-core (~> 3, >= 3.165.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.132.1) - aws-sdk-core (~> 3, >= 3.179.0) + aws-sdk-s3 (1.134.0) + aws-sdk-core (~> 3, >= 3.181.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.6) aws-sigv4 (1.6.0) @@ -389,18 +389,18 @@ GEM css_parser (1.14.0) addressable cvss-suite (3.0.1) - danger (8.6.1) + danger (9.3.1) claide (~> 1.0) claide-plugins (>= 0.9.2) colored2 (~> 3.1) cork (~> 0.1) - faraday (>= 0.9.0, < 2.0) + faraday (>= 0.9.0, < 3.0) faraday-http-cache (~> 2.0) - git (~> 1.7) + git (~> 1.13) kramdown (~> 2.3) kramdown-parser-gfm (~> 1.0) no_proxy_fix - octokit (~> 4.7) + octokit (~> 6.0) terminal-table (>= 1, < 4) danger-gitlab (8.0.0) danger @@ -409,7 +409,7 @@ GEM date (3.3.3) dead_end (3.1.1) debug_inspector (1.1.0) - deckar01-task_list (2.3.2) + deckar01-task_list (2.3.3) html-pipeline declarative (0.0.20) declarative_policy (1.1.0) @@ -459,6 +459,7 @@ GEM doorkeeper (>= 5.5, < 5.7) jwt (>= 2.5) dotenv (2.7.6) + dry-cli (1.0.0) dry-core (1.0.0) concurrent-ruby (~> 1.0) zeitwerk (~> 2.6) @@ -502,7 +503,7 @@ GEM escape_utils (1.2.1) et-orbi (1.2.7) tzinfo - ethon (0.15.0) + ethon (0.16.0) ffi (>= 1.15.0) excon (0.99.0) execjs (2.8.1) @@ -549,7 +550,7 @@ GEM faraday_middleware-multi_json (0.0.6) faraday_middleware multi_json - fast_blank (1.0.0) + fast_blank (1.0.1) fast_gettext (2.3.0) ffaker (2.10.0) ffi (1.15.5) @@ -560,13 +561,14 @@ GEM libyajl2 (>= 1.2) filelock (1.1.1) find_a_port (1.0.1) - flipper (0.25.0) - flipper-active_record (0.25.0) + flipper (0.26.2) + concurrent-ruby (< 2) + flipper-active_record (0.26.2) activerecord (>= 4.2, < 8) - flipper (~> 0.25.0) - flipper-active_support_cache_store (0.25.0) + flipper (~> 0.26.2) + flipper-active_support_cache_store (0.26.2) activesupport (>= 4.2, < 8) - flipper (~> 0.25.0) + flipper (~> 0.26.2) fog-aliyun (0.4.0) addressable (~> 2.8.0) aliyun-sdk (~> 0.8.0) @@ -632,20 +634,21 @@ GEM gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) - git (1.11.0) + git (1.18.0) + addressable (~> 2.8) rchardet (~> 1.8) - gitaly (16.2.0.pre.rc4) + gitaly (16.3.0.pre.rc1) grpc (~> 1.0) gitlab (4.19.0) httparty (~> 0.20) terminal-table (>= 1.5.1) gitlab-chronic (0.10.5) numerizer (~> 0.2) - gitlab-dangerfiles (3.13.0) - danger (>= 8.4.5) + gitlab-dangerfiles (4.0.0) + danger (>= 9.3.0) danger-gitlab (>= 8.0.0) rake - gitlab-experiment (0.7.1) + gitlab-experiment (0.8.0) activesupport (>= 3.0) request_store (>= 1.0) gitlab-fog-azure-rm (1.8.0) @@ -675,14 +678,14 @@ GEM rubocop-performance (~> 1.15) rubocop-rails (~> 2.17) rubocop-rspec (~> 2.22) - gitlab_chronic_duration (0.10.6.2) + gitlab_chronic_duration (0.11.0) numerizer (~> 0.2) gitlab_omniauth-ldap (2.2.0) net-ldap (~> 0.16) omniauth (>= 1.3, < 3) pyu-ruby-sasl (>= 0.0.3.3, < 0.1) rubyntlm (~> 0.5) - gitlab_quality-test_tooling (0.9.3) + gitlab_quality-test_tooling (1.0.0) activesupport (>= 6.1, < 7.1) gitlab (~> 4.19) http (~> 5.0) @@ -752,7 +755,7 @@ GEM google-cloud-core (~> 1.6) googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - google-protobuf (3.23.4) + google-protobuf (3.24.3) googleapis-common-protos (1.4.0) google-protobuf (~> 3.14) googleapis-common-protos-types (~> 1.2) @@ -766,7 +769,7 @@ GEM multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) - gpgme (2.0.22) + gpgme (2.0.23) mini_portile2 (~> 2.7) grape (1.7.1) activesupport @@ -799,7 +802,7 @@ GEM faraday_middleware graphql-client graphlyte (1.0.0) - graphql (1.13.12) + graphql (1.13.19) graphql-client (0.17.0) activesupport (>= 3.0) graphql (~> 1.10) @@ -867,11 +870,11 @@ GEM http-cookie (1.0.5) domain_name (~> 0.5) http-form_data (2.3.0) - httparty (0.20.0) - mime-types (~> 3.0) + httparty (0.21.0) + mini_mime (>= 1.0.0) multi_xml (>= 0.5.2) httpclient (2.8.3) - i18n (1.12.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) i18n_data (0.13.1) icalendar (2.8.0) @@ -880,8 +883,8 @@ GEM ice_nine (0.11.2) imagen (0.1.8) parser (>= 2.5, != 2.5.1.1) - invisible_captcha (2.0.0) - rails (>= 5.0) + invisible_captcha (2.1.0) + rails (>= 5.2) ipaddr (1.2.5) ipaddress (0.8.3) jaeger-client (1.1.0) @@ -959,10 +962,10 @@ GEM tomlrb (>= 1.3, < 2.1) with_env (= 1.1.0) xml-simple (~> 1.1.9) - licensee (9.15.2) + licensee (9.16.0) dotenv (~> 2.0) - octokit (~> 4.20) - reverse_markdown (~> 1.0) + octokit (>= 4.20, < 7.0) + reverse_markdown (>= 1, < 3) rugged (>= 0.24, < 2.0) thor (>= 0.19, < 2.0) listen (3.7.1) @@ -972,7 +975,7 @@ GEM ffi-compiler (~> 1.0) rake (~> 13.0) locale (2.1.3) - lockbox (1.1.1) + lockbox (1.3.0) lograge (0.11.2) actionpack (>= 4) activesupport (>= 4) @@ -1014,7 +1017,7 @@ GEM mini_histogram (0.3.1) mini_magick (4.10.1) mini_mime (1.1.2) - mini_portile2 (2.8.2) + mini_portile2 (2.8.4) minitest (5.11.3) mixlib-cli (2.1.8) mixlib-config (3.0.9) @@ -1072,7 +1075,7 @@ GEM rack (>= 1.2, < 4) snaky_hash (~> 2.0) version_gem (~> 1.1) - octokit (4.25.1) + octokit (6.1.1) faraday (>= 1, < 3) sawyer (~> 0.9) ohai (17.9.0) @@ -1189,7 +1192,7 @@ GEM tty-color (~> 0.5) peek (1.1.0) railties (>= 4.0.0) - pg (1.5.3) + pg (1.5.4) pg_query (4.2.3) google-protobuf (>= 3.22.3) plist (3.6.0) @@ -1207,7 +1210,7 @@ GEM coderay parser unparser - prometheus-client-mmap (0.27.0) + prometheus-client-mmap (0.28.0) rb_sys (~> 0.9) pry (0.14.2) coderay (~> 1.1) @@ -1222,7 +1225,7 @@ GEM tty-markdown tty-prompt public_suffix (5.0.0) - puma (6.3.0) + puma (6.3.1) nio4r (~> 2.0) pyu-ruby-sasl (0.0.3.3) raabro (1.4.0) @@ -1232,7 +1235,7 @@ GEM rack (>= 0.4) rack-attack (6.7.0) rack (>= 1.0, < 4) - rack-cors (1.1.1) + rack-cors (2.0.1) rack (>= 2.0.0) rack-oauth2 (1.21.3) activesupport @@ -1242,7 +1245,7 @@ GEM rack (>= 2.1.0) rack-protection (2.2.2) rack - rack-proxy (0.7.6) + rack-proxy (0.7.7) rack rack-test (2.1.0) rack (>= 1.3) @@ -1293,7 +1296,8 @@ GEM rbtree (0.4.6) rchardet (1.8.0) rdoc (6.3.2) - re2 (1.7.0) + re2 (2.0.0) + mini_portile2 (~> 2.8.4) recaptcha (5.12.3) json recursive-open-struct (1.1.3) @@ -1329,7 +1333,7 @@ GEM retriable (3.1.2) reverse_markdown (1.4.0) nokogiri - rexml (3.2.5) + rexml (3.2.6) rinku (2.0.0) rotp (6.2.0) rouge (4.1.3) @@ -1425,8 +1429,6 @@ GEM rexml ruby-statistics (3.0.0) ruby2_keywords (0.0.5) - ruby_parser (3.20.0) - sexp_processor (~> 4.16) rubyntlm (0.6.3) rubypants (0.2.0) rubyzip (2.3.2) @@ -1434,7 +1436,7 @@ GEM safe_yaml (1.0.4) safety_net_attestation (0.4.0) jwt (~> 2.0) - sanitize (6.0.0) + sanitize (6.0.2) crass (~> 1.0.2) nokogiri (>= 1.12.0) sass (3.5.5) @@ -1457,7 +1459,7 @@ GEM seed-fu (2.3.7) activerecord (>= 3.1) activesupport (>= 3.1) - selenium-webdriver (4.11.0) + selenium-webdriver (4.12.0) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) @@ -1476,7 +1478,6 @@ GEM sentry-ruby (~> 5.8.0) sidekiq (>= 3.0) set (1.0.2) - sexp_processor (4.16.1) shellany (0.0.1) shoulda-matchers (5.1.0) activesupport (>= 5.2.0) @@ -1567,7 +1568,7 @@ GEM ffi (~> 1.1) sysexits (1.2.0) table_print (1.5.7) - tanuki_emoji (0.6.0) + tanuki_emoji (0.7.0) telesign (2.2.4) net-http-persistent (>= 3.0.0, < 5.0) telesignenterprise (2.2.2) @@ -1659,12 +1660,12 @@ GEM validate_url (1.0.15) activemodel (>= 3.0.0) public_suffix - validates_hostname (1.0.11) + validates_hostname (1.0.13) activerecord (>= 3.0) activesupport (>= 3.0) version_gem (1.1.0) version_sorter (2.3.0) - view_component (3.2.0) + view_component (3.5.0) activesupport (>= 5.2.0, < 8.0) concurrent-ruby (~> 1.0) method_source (~> 1.0) @@ -1672,6 +1673,13 @@ GEM axiom-types (~> 0.1) coercible (~> 1.0) descendants_tracker (~> 0.0, >= 0.0.3) + vite_rails (3.0.15) + railties (>= 5.1, < 8) + vite_ruby (~> 3.0, >= 3.2.2) + vite_ruby (3.3.4) + dry-cli (>= 0.7, < 2) + rack-proxy (~> 0.6, >= 0.6.1) + zeitwerk (~> 2.2) vmstat (2.3.0) warden (1.2.9) rack (>= 2.0.9) @@ -1688,7 +1696,7 @@ GEM webfinger (1.2.0) activesupport httpclient (>= 2.4) - webmock (3.18.1) + webmock (3.19.1) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) @@ -1737,8 +1745,8 @@ DEPENDENCIES autoprefixer-rails (= 10.2.5.1) awesome_print aws-sdk-cloudformation (~> 1) - aws-sdk-core (~> 3.180.3) - aws-sdk-s3 (~> 1.132.1) + aws-sdk-core (~> 3.181.1) + aws-sdk-s3 (~> 1.134.0) axe-core-rspec babosa (~> 2.0) base32 (~> 0.3.0) @@ -1768,7 +1776,7 @@ DEPENDENCIES csv_builder! cvss-suite (~> 3.0.1) database_cleaner (~> 1.7.0) - deckar01-task_list (= 2.3.2) + deckar01-task_list (= 2.3.3) declarative_policy (~> 1.1.0) deprecation_toolkit (~> 1.5.1) derailed_benchmarks @@ -1793,11 +1801,11 @@ DEPENDENCIES factory_bot_rails (~> 6.2.0) faraday (~> 1.0) faraday_middleware-aws-sigv4 (~> 0.3.0) - fast_blank + fast_blank (~> 1.0.1) ffaker (~> 2.10) - flipper (~> 0.25.0) - flipper-active_record (~> 0.25.0) - flipper-active_support_cache_store (~> 0.25.0) + flipper (~> 0.26.2) + flipper-active_record (~> 0.26.2) + flipper-active_support_cache_store (~> 0.26.2) fog-aliyun (~> 0.4) fog-aws (~> 3.18) fog-core (= 2.1.0) @@ -1808,10 +1816,10 @@ DEPENDENCIES gettext (~> 3.3) gettext_i18n_rails (~> 1.11.0) gettext_i18n_rails_js (~> 1.3) - gitaly (~> 16.2.0.pre.rc4) + gitaly (~> 16.3.0.pre.rc1) gitlab-chronic (~> 0.10.5) - gitlab-dangerfiles (~> 3.13.0) - gitlab-experiment (~> 0.7.1) + gitlab-dangerfiles (~> 4.0.0) + gitlab-experiment (~> 0.8.0) gitlab-fog-azure-rm (~> 1.8.0) gitlab-labkit (~> 0.34.0) gitlab-license (~> 2.3) @@ -1824,9 +1832,9 @@ DEPENDENCIES gitlab-sidekiq-fetcher! gitlab-styles (~> 10.1.0) gitlab-utils! - gitlab_chronic_duration (~> 0.10.6.2) + gitlab_chronic_duration (~> 0.11) gitlab_omniauth-ldap (~> 2.2.0) - gitlab_quality-test_tooling (~> 0.9.3) + gitlab_quality-test_tooling (~> 1.0.0) gon (~> 6.4.0) google-apis-androidpublisher_v3 (~> 0.34.0) google-apis-cloudbilling_v1 (~> 0.21.0) @@ -1839,18 +1847,18 @@ DEPENDENCIES google-apis-serviceusage_v1 (~> 0.28.0) google-apis-sqladmin_v1beta4 (~> 0.41.0) google-cloud-storage (~> 1.44.0) - google-protobuf (~> 3.23, >= 3.23.4) - gpgme (~> 2.0.22) + google-protobuf (~> 3.24, >= 3.24.3) + gpgme (~> 2.0.23) grape (~> 1.7.1) grape-entity (~> 0.10.0) grape-path-helpers (~> 1.7.1) grape-swagger (~> 1.6.1) grape-swagger-entity (~> 0.5.1) grape_logging (~> 1.8) - graphiql-rails (~> 1.8) + graphiql-rails (~> 1.8.0) graphlient (~> 0.5.0) graphlyte (~> 1.0.0) - graphql (~> 1.13.12) + graphql (~> 1.13.19) graphql-docs (~> 2.1.0) grpc (~> 1.55.0) gssapi (~> 1.3.1) @@ -1862,9 +1870,9 @@ DEPENDENCIES health_check (~> 3.0) html-pipeline (~> 2.14.3) html2text - httparty (~> 0.20.0) + httparty (~> 0.21.0) icalendar - invisible_captcha (~> 2.0.0) + invisible_captcha (~> 2.1.0) ipaddr (~> 1.2.5) ipaddress (~> 0.8.3) ipynbdiff! @@ -1882,9 +1890,9 @@ DEPENDENCIES lefthook (~> 1.4.7) letter_opener_web (~> 2.0.0) license_finder (~> 7.0) - licensee (~> 9.15) + licensee (~> 9.16) listen (~> 3.7) - lockbox (~> 1.1.1) + lockbox (~> 1.3.0) lograge (~> 0.5) loofah (~> 2.21.3) lookbook (~> 2.0, >= 2.0.1) @@ -1904,7 +1912,7 @@ DEPENDENCIES net-protocol (~> 0.1.3) nokogiri (~> 1.15, >= 1.15.4) oauth2 (~> 2.0) - octokit (~> 4.15) + octokit (~> 6.0) ohai (~> 17.9) oj (~> 3.13.21) oj-introspect (~> 0.7) @@ -1934,20 +1942,20 @@ DEPENDENCIES parser (~> 3.2, >= 3.2.2.3) parslet (~> 1.8) peek (~> 1.1) - pg (~> 1.5.3) + pg (~> 1.5.4) pg_query (~> 4.2.3) png_quantizator (~> 0.2.1) premailer-rails (~> 1.10.3) - prometheus-client-mmap (~> 0.27) + prometheus-client-mmap (~> 0.28) pry-byebug pry-rails (~> 0.3.9) pry-shell (~> 0.6.4) - puma (~> 6.3) + puma (~> 6.3, >= 6.3.1) rack (~> 2.2.8) rack-attack (~> 6.7.0) - rack-cors (~> 1.1.1) + rack-cors (~> 2.0.1) rack-oauth2 (~> 1.21.3) - rack-proxy (~> 0.7.6) + rack-proxy (~> 0.7.7) rack-timeout (~> 0.6.3) rails (~> 7.0.6) rails-controller-testing @@ -1955,7 +1963,7 @@ DEPENDENCIES rainbow (~> 3.0) rbtrace (~> 0.4) rdoc (~> 6.3.2) - re2 (~> 1.7.0) + re2 (= 2.0.0) recaptcha (~> 5.12) redis (~> 4.8.0) redis-actionpack (~> 5.3.0) @@ -1963,7 +1971,7 @@ DEPENDENCIES request_store (~> 1.5.1) responders (~> 3.0) retriable (~> 3.1.2) - rexml (~> 3.2.5) + rexml (~> 3.2.6) rouge (~> 4.1.3) rqrcode-rails3 (~> 0.1.7) rspec-benchmark (~> 0.6.0) @@ -1979,14 +1987,13 @@ DEPENDENCIES ruby-openai (~> 3.7) ruby-progressbar (~> 1.10) ruby-saml (~> 1.15.0) - ruby_parser (~> 3.20) rubyzip (~> 2.3.2) rugged (~> 1.6) - sanitize (~> 6.0) + sanitize (~> 6.0.2) sassc-rails (~> 2.1.0) sd_notify (~> 0.1.0) seed-fu (~> 2.3.7) - selenium-webdriver (= 4.11.0) + selenium-webdriver (= 4.12.0) semver_dialects (~> 1.2.1) sentry-rails (~> 5.8.0) sentry-raven (~> 3.1) @@ -2012,7 +2019,7 @@ DEPENDENCIES stackprof (~> 0.2.25) state_machines-activerecord (~> 0.8.0) sys-filesystem (~> 1.4.3) - tanuki_emoji (~> 0.6) + tanuki_emoji (~> 0.7) telesignenterprise (~> 2.2) terser (= 1.0.2) test-prof (~> 1.2.2) @@ -2023,19 +2030,19 @@ DEPENDENCIES truncato (~> 0.7.12) typhoeus (~> 1.4.0) undercover (~> 0.4.4) - unf (~> 0.1.4) unleash (~> 3.2.2) valid_email (~> 0.1) - validates_hostname (~> 1.0.11) + validates_hostname (~> 1.0.13) version_sorter (~> 2.3) - view_component (~> 3.2.0) + view_component (~> 3.5.0) + vite_rails vmstat (~> 2.3.0) warning (~> 1.3.0) webauthn (~> 3.0) - webmock (~> 3.18.1) + webmock (~> 3.19.1) webrick (~> 1.8.1) wikicloth (= 0.8.1) yajl-ruby (~> 1.4.3) BUNDLED WITH - 2.4.18 + 2.4.19 diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 80fa1d87025d5..6dcac890ea76e 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -411,10 +411,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lc3j74v49b2akyimfnsx3vsgi1i3068cpchn358l0dv27aib6c2"; + sha256 = "1qnwh40d45pqm77dayvh1zdlb5xjbbj7hv29s8nhxj7c3qkl4bpb"; type = "gem"; }; - version = "3.180.3"; + version = "3.181.1"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -433,10 +433,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0iciakii0vcm16x0fivs5hwwhy3n8j1f9d7pimxr05yplnxizh6a"; + sha256 = "1fbz259as60xnf563z9byp8blq5fsc81h92h3wicai4bmz45w4r5"; type = "gem"; }; - version = "1.132.1"; + version = "1.134.0"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -1067,10 +1067,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n6zbkkinlv2hp4ig5c170d1ckbbdf8rgxmykfm3m3gn865vapnr"; + sha256 = "1x8xwn2l7avc6h08vgrkxyb6ga7slip5x8lynswmzd0y32ngnw4h"; type = "gem"; }; - version = "8.6.1"; + version = "9.3.1"; }; danger-gitlab = { dependencies = ["danger" "gitlab"]; @@ -1129,10 +1129,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01c8vv0xwbhlyhiagj93b1hlm2n0rmj4sw62nbc0jhyj90jhj6as"; + sha256 = "0n67q9rb4gsfs8k2fsd08xcfx13z7mcyyyrb9hi0sv0yz3rvm2li"; type = "gem"; }; - version = "2.3.2"; + version = "2.3.3"; }; declarative = { groups = ["default"]; @@ -1344,6 +1344,16 @@ src: }; version = "2.7.6"; }; + dry-cli = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1w39jms4bsggxvl23cxanhccv1ngb6nqxsqhi784v5bjz1lx3si8"; + type = "gem"; + }; + version = "1.0.0"; + }; dry-core = { dependencies = ["concurrent-ruby" "zeitwerk"]; groups = ["default" "development" "test"]; @@ -1570,10 +1580,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kd7c61f28f810fgxg480j7457nlvqarza9c2ra0zhav0dd80288"; + sha256 = "17ix0mijpsy3y0c6ywrk5ibarmvqzjsirjyprpsy3hwax8fdm85v"; type = "gem"; }; - version = "0.15.0"; + version = "0.16.0"; }; excon = { groups = ["default"]; @@ -1810,10 +1820,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16s1ilyvwzmkcgmklbrn0c2pch5n02vf921njx0bld4crgdr6z56"; + sha256 = "1shpmamyzyhyxmv95r96ja5rylzaw60r19647d0fdm7y2h2c77r6"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; fast_gettext = { groups = ["default"]; @@ -1888,14 +1898,15 @@ src: version = "1.0.1"; }; flipper = { + dependencies = ["concurrent-ruby"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pbsd7p9aij9ffw621wl841hj319vv677n69jk4qndxqa9kpgcnc"; + sha256 = "127ryr9107719rfk9k638fxk2p38cnbz23h9ghxxbckiv4474mvd"; type = "gem"; }; - version = "0.25.0"; + version = "0.26.2"; }; flipper-active_record = { dependencies = ["activerecord" "flipper"]; @@ -1903,10 +1914,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zxn7qp16xwk289xa3f8sqy4dg8difcsjc8rx44nmk72cnack9c5"; + sha256 = "1g10lck7p3776r2dshz185rd1hjzv47z95bhgpk7bxz2ikpsxpk1"; type = "gem"; }; - version = "0.25.0"; + version = "0.26.2"; }; flipper-active_support_cache_store = { dependencies = ["activesupport" "flipper"]; @@ -1914,10 +1925,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06skgdfb43g6i40b5rx61yqgq16wwd8knvswnrva1l889fcvz0kj"; + sha256 = "1c6j2frspzafqmha5wlkpv05n5vfzrglbprpgj1dxiz5s4x8ily2"; type = "gem"; }; - version = "0.25.0"; + version = "0.26.2"; }; fog-aliyun = { dependencies = ["addressable" "aliyun-sdk" "fog-core" "fog-json" "ipaddress" "xml-simple"]; @@ -2104,15 +2115,15 @@ src: version = "1.3.0"; }; git = { - dependencies = ["rchardet"]; + dependencies = ["addressable" "rchardet"]; groups = ["danger" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wd0rvz6cybqm9svcx427hgpcz804am64s0sxxrh72i9m16vm5by"; + sha256 = "0rf4603ffvdlvnzx1nmh2x5j8lic3p24115sm7bx6p2nwii09f69"; type = "gem"; }; - version = "1.11.0"; + version = "1.18.0"; }; gitaly = { dependencies = ["grpc"]; @@ -2120,10 +2131,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z2ilb738q3fbk91yzgz1z2y1ws80v17glxvh7abfdqmzdi6cx88"; + sha256 = "0hsccw9njvvsic0qn5x1aia0yz66sy4bsw1pixc5jf2g990wrnam"; type = "gem"; }; - version = "16.2.0.pre.rc4"; + version = "16.3.0.pre.rc1"; }; gitlab = { dependencies = ["httparty" "terminal-table"]; @@ -2153,10 +2164,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bd17qkjskzcrm406iz1a06s6hy1sy61xv7bz0kq8lqzzv3ym090"; + sha256 = "04j81xsasbfzc9xs0sgizc76qj26ka629yrcd9l6m3iqj0byiaz3"; type = "gem"; }; - version = "3.13.0"; + version = "4.0.0"; }; gitlab-experiment = { dependencies = ["activesupport" "request_store"]; @@ -2164,10 +2175,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "093q9b2nv010n10axlhz68gxdi0xs176hd9wm758nhl3marxsv8n"; + sha256 = "1yfk2w86nzw8mksahs70ai0d860kdj25lpvlka4xv77i18zggqml"; type = "gem"; }; - version = "0.7.1"; + version = "0.8.0"; }; gitlab-fog-azure-rm = { dependencies = ["azure-storage-blob" "azure-storage-common" "fog-core" "fog-json" "mime-types"]; @@ -2299,10 +2310,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yq5a4vs96xz5yxqkfwcvzw0riww7mf87j1s2s7rb6yagpz4rnkd"; + sha256 = "19jba5gxlb25mvd85rn3hfzyzsqw4cq7ml13mzq1y0x94hbj1zf2"; type = "gem"; }; - version = "0.10.6.2"; + version = "0.11.0"; }; gitlab_omniauth-ldap = { dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"]; @@ -2321,10 +2332,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1w408mlqkf430bm7g1slp7l5crwvvqbmbynhidc9jx3i9d8g6lcp"; + sha256 = "1nriqgy9rlnachzrq63xakskdgjg9b3bdgh2fb2b63kai8bbwc5h"; type = "gem"; }; - version = "0.9.3"; + version = "1.0.0"; }; globalid = { dependencies = ["activesupport"]; @@ -2572,10 +2583,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dq5lgkxhagqr8zjrwr10zi8rldbg2vhis2m5q86v5q9415ylfgj"; + sha256 = "0pcl4x4cw3snl5xzs99lm82m9xkfs8vm1a8dfrc34pwb77mwrwv3"; type = "gem"; }; - version = "3.23.4"; + version = "3.24.3"; }; googleapis-common-protos = { dependencies = ["google-protobuf" "googleapis-common-protos-types" "grpc"]; @@ -2616,10 +2627,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qn87vxdsaq1szcvq39rnz38cgqllncdxmiyghnbzl7x5aah8sbw"; + sha256 = "010wr6nnifi952bx4v5c49q25yx1g8lhib5wiv2sg7bip3yvlyy8"; type = "gem"; }; - version = "2.0.22"; + version = "2.0.23"; }; grape = { dependencies = ["activesupport" "builder" "dry-types" "mustermann-grape" "rack" "rack-accept"]; @@ -2724,10 +2735,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hvsv6ig6d8syr4vasa8vcc090kbawwflk5m1j6kl681y9n6d0hx"; + sha256 = "0njsbxx82vqi8hdn4nad62abmh0x0w3mis3mq79q3xr11srisn23"; type = "gem"; }; - version = "1.13.12"; + version = "1.13.19"; }; graphql-client = { dependencies = ["activesupport" "graphql"]; @@ -2985,15 +2996,15 @@ src: version = "2.3.0"; }; httparty = { - dependencies = ["mime-types" "multi_xml"]; + dependencies = ["mini_mime" "multi_xml"]; groups = ["danger" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rs8c5wga6f1acyaj90d2hlv307gh2flfpb8y48wdk2si812l3a9"; + sha256 = "050jzsa6fbfvy2rldhk7mf1sigildaqvbplfz2zs6c0zlzwppvq0"; type = "gem"; }; - version = "0.20.0"; + version = "0.21.0"; }; httpclient = { groups = ["default"]; @@ -3007,14 +3018,14 @@ src: }; i18n = { dependencies = ["concurrent-ruby"]; - groups = ["default" "development" "test"]; + groups = ["default" "development" "monorepo" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi"; + sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx"; type = "gem"; }; - version = "1.12.0"; + version = "1.14.1"; }; i18n_data = { groups = ["default"]; @@ -3074,10 +3085,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hn06njrwbxhxs2myr04fq3spqn38b8wm3irvkll91qv3p5yv0d3"; + sha256 = "07ibhphcvf9lfaar9g78cazbdrp03dzfks53bcaiss8vxgrm5d02"; type = "gem"; }; - version = "2.0.0"; + version = "2.1.0"; }; ipaddr = { groups = ["default"]; @@ -3394,10 +3405,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v9x94h19b20wc551vs9a0yvk44w2y3g9ng07fflk26s8jsmjsab"; + sha256 = "0i4hs0vbgp0w3pdddr37zhydm16af122rmr0w39v3nqrj1ir65kv"; type = "gem"; }; - version = "9.15.2"; + version = "9.16.0"; }; listen = { dependencies = ["rb-fsevent" "rb-inotify"]; @@ -3436,10 +3447,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h1a3h3rfv3094pn5zn7d3c066dmhx9i380mhqa1qyagqla6pw8a"; + sha256 = "1sm365iplg1iscizckjm6zy57zs0350czi9afqfnvig0wh35i3na"; type = "gem"; }; - version = "1.1.1"; + version = "1.3.0"; }; lograge = { dependencies = ["actionpack" "activesupport" "railties" "request_store"]; @@ -3642,14 +3653,14 @@ src: version = "1.1.2"; }; mini_portile2 = { - groups = ["default" "development" "test"]; + groups = ["default" "development" "monorepo" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z7f38iq37h376n9xbl4gajdrnwzq284c9v1py4imw3gri2d5cj6"; + sha256 = "02mj8mpd6ck5gpcnsimx5brzggw5h5mmmpq2djdypfq16wcw82qq"; type = "gem"; }; - version = "2.8.2"; + version = "2.8.4"; }; minitest = { groups = ["development" "test"]; @@ -4002,10 +4013,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15lvy06h276jryxg19258b2yqaykf0567sp0n16yipywhbp94860"; + sha256 = "1gxh0x910qvah2sm9fbxn8jjy3pgwskyd3gm703zf182hafll3lj"; type = "gem"; }; - version = "4.25.1"; + version = "6.1.1"; }; ohai = { dependencies = ["chef-config" "chef-utils" "ffi" "ffi-yajl" "ipaddress" "mixlib-cli" "mixlib-config" "mixlib-log" "mixlib-shellout" "plist" "train-core" "wmi-lite"]; @@ -4439,10 +4450,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zcvxmfa8hxkhpp59fhxyxy1arp70f11zi1jh9c7bsdfspifb7kb"; + sha256 = "0pfj771p5a29yyyw58qacks464sl86d5m3jxjl5rlqqw2m3v5xq4"; type = "gem"; }; - version = "1.5.3"; + version = "1.5.4"; }; pg_query = { dependencies = ["google-protobuf"]; @@ -4525,10 +4536,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rvh5xmvhzdm74g4n93ny3kg1xb4dki6l194xjrh1yp8aaimfvvi"; + sha256 = "0yyd1mvzbv64jc700d2vvdcr4cmb2gwf68368g0bwp1ybn64xqgk"; type = "gem"; }; - version = "0.27.0"; + version = "0.28.0"; }; pry = { dependencies = ["coderay" "method_source"]; @@ -4590,10 +4601,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v7fmv0n4bhdcwh60dgza44iqai5pg34f5pzm4vh4i5fwx7mpqxh"; + sha256 = "1x4dwx2shx0p7lsms97r85r7ji7zv57bjy3i1kmcpxc8bxvrr67c"; type = "gem"; }; - version = "6.3.0"; + version = "6.3.1"; }; pyu-ruby-sasl = { groups = ["default"]; @@ -4663,10 +4674,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jvs0mq8jrsz86jva91mgql16daprpa3qaipzzfvngnnqr5680j7"; + sha256 = "02lvkg1nb4z3zc2nry545dap7a64bb9h2k8waxfz0jkabkgnpimw"; type = "gem"; }; - version = "1.1.1"; + version = "2.0.1"; }; rack-oauth2 = { dependencies = ["activesupport" "attr_required" "httpclient" "json-jwt" "rack"]; @@ -4696,10 +4707,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1a62439xwn5v6hsl9s11hdk4wj58czhcbg7lminv23mnkc0ca147"; + sha256 = "12jw7401j543fj8cc83lmw72d8k6bxvkp9rvbifi88hh01blnsj4"; type = "gem"; }; - version = "0.7.6"; + version = "0.7.7"; }; rack-test = { dependencies = ["rack"]; @@ -4881,14 +4892,15 @@ src: version = "6.3.2"; }; re2 = { + dependencies = ["mini_portile2"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00yryimbkm1k85n99f81n7cripkmh14459c9pmb7prl9nbiikkqc"; + sha256 = "09c9f692ixym8sqk26f175jw53a00h2s4xad6z141axpi2mmy1q9"; type = "gem"; }; - version = "1.7.0"; + version = "2.0.0"; }; recaptcha = { dependencies = ["json"]; @@ -5071,14 +5083,14 @@ src: version = "1.4.0"; }; rexml = { - groups = ["danger" "default" "development" "test"]; + groups = ["coverage" "danger" "default" "development" "omnibus" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; type = "gem"; }; - version = "3.2.5"; + version = "3.2.6"; }; rinku = { groups = ["default"]; @@ -5446,17 +5458,6 @@ src: }; version = "0.0.5"; }; - ruby_parser = { - dependencies = ["sexp_processor"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1qybplg87pv6kxwyh4nkfn7pa4cisiajbfvh22dzkkbzxyxwil0p"; - type = "gem"; - }; - version = "3.20.0"; - }; rubyntlm = { groups = ["default"]; platforms = []; @@ -5524,10 +5525,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zq8pxmsd1abw18zz6mazsm2jfpwmbgdxbpawb7bmwvkb2c5yyc1"; + sha256 = "1kymrjdpbmn4yaml3aaqyj1dzj8gqmm9h030dc2rj5mvja7fpi28"; type = "gem"; }; - version = "6.0.0"; + version = "6.0.2"; }; sass = { dependencies = ["sass-listen"]; @@ -5611,10 +5612,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ws0mh230l1pvyxcrlcr48w01alfhprjs1jbd8yrn463drsr2yac"; + sha256 = "0jwll13m7bqph4lgl75m7vwd175k657znwa7qn9qkf5dcxdjkcjs"; type = "gem"; }; - version = "4.11.0"; + version = "4.12.0"; }; semver_dialects = { dependencies = ["pastel" "thor" "tty-command"]; @@ -5681,16 +5682,6 @@ src: }; version = "1.0.2"; }; - sexp_processor = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1p0r92dyffx6wkgazv3wi4m2yfm39kvvr9cjp2f57az5pgsdpajw"; - type = "gem"; - }; - version = "4.16.1"; - }; shellany = { groups = ["default" "test"]; platforms = []; @@ -6095,10 +6086,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0an1311bpyhd9kzak1qpd4jks336i47gbvx3zdrnn1rdxppimsac"; + sha256 = "11z9m8jcys8q8h8prqdr1frppm0mjdh8if7c1rm2qyq8v19g83fi"; type = "gem"; }; - version = "0.6.0"; + version = "0.7.0"; }; telesign = { dependencies = ["net-http-persistent"]; @@ -6580,10 +6571,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hxqza44pvk6x6vb91cvllhw71hqziby06dk1s94rh9f6khbl1nm"; + sha256 = "06fspma67flsvwl3gfyrv2572l15pjsmqsncz5yp4kqbriw03i7a"; type = "gem"; }; - version = "1.0.11"; + version = "1.0.13"; }; version_gem = { groups = ["default"]; @@ -6611,10 +6602,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08jc9k4qqazbf5frhdril5084adm90rs1lqbnqq3yfdm2dgaiyhx"; + sha256 = "1bz86m3bbnhy8j1gmpm76jcgqfyjafqwyxjdd1bk2f5jmgswvqy3"; type = "gem"; }; - version = "3.2.0"; + version = "3.5.0"; }; virtus = { dependencies = ["axiom-types" "coercible" "descendants_tracker"]; @@ -6627,6 +6618,28 @@ src: }; version = "2.0.0"; }; + vite_rails = { + dependencies = ["railties" "vite_ruby"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0q7qbi3npw47xza8spvd8ni0x0ahjb6lkd12y9a4pqppxn555v5q"; + type = "gem"; + }; + version = "3.0.15"; + }; + vite_ruby = { + dependencies = ["dry-cli" "rack-proxy" "zeitwerk"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "036qi8w4qzglhqrrrrkc0m7ivfzmagsdyj61r0h27p56hn1l6ph2"; + type = "gem"; + }; + version = "3.3.4"; + }; vmstat = { groups = ["default"]; platforms = []; @@ -6686,10 +6699,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1myj44wvbbqvv18ragv3ihl0h61acgnfwrnj3lccdgp49bgmbjal"; + sha256 = "0vfispr7wd2p1fs9ckn1qnby1yyp4i1dl7qz8n482iw977iyxrza"; type = "gem"; }; - version = "3.18.1"; + version = "3.19.1"; }; webrick = { groups = ["default" "development" "test"]; diff --git a/pkgs/applications/version-management/gitls/default.nix b/pkgs/applications/version-management/gitls/default.nix index 4cda10b380575..28fbba659f427 100644 --- a/pkgs/applications/version-management/gitls/default.nix +++ b/pkgs/applications/version-management/gitls/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { hash = "sha256-kLkH/nNidd1QNPKvo7fxZwMhTgd4AVB8Ofw0Wo0z6c0="; }; - vendorSha256 = null; + vendorHash = null; passthru.tests.version = testers.testVersion { package = gitls; diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix index 21f4d870894eb..64efc4731a17c 100644 --- a/pkgs/applications/version-management/gitoxide/default.nix +++ b/pkgs/applications/version-management/gitoxide/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "gitoxide"; - version = "0.29.0"; + version = "0.30.0"; src = fetchFromGitHub { owner = "Byron"; repo = "gitoxide"; rev = "v${version}"; - hash = "sha256-Ry5QvOoj4iSQZr1O+Y6qSHzhmm77nbkLjCcdPOhxR18="; + hash = "sha256-VJZwNLFePUNIRHEyiEr1tiLaB2tuL6Ah81LNuM/1H14="; }; - cargoHash = "sha256-WZctsAxGojrGufF8CwUiw1xWzn9qVZUphDE3KmGTGy4="; + cargoHash = "sha256-vEp0wLxmmmv33oRO7eOxOoOsV87/7DQ8db5RUfqUb88="; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/version-management/gql/default.nix b/pkgs/applications/version-management/gql/default.nix index f8fd65fb8d785..0c20b51fbc558 100644 --- a/pkgs/applications/version-management/gql/default.nix +++ b/pkgs/applications/version-management/gql/default.nix @@ -2,29 +2,29 @@ , rustPlatform , fetchFromGitHub , pkg-config -, libgit2_1_6 +, libgit2 , zlib }: rustPlatform.buildRustPackage rec { pname = "gql"; - version = "0.6.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "AmrDeveloper"; repo = "GQL"; rev = version; - hash = "sha256-eWupAfe2lOcOp8hC4sx8Wl1jaVZT4E99I5V9YsMcDZA="; + hash = "sha256-qNLVbhVXITbMRI2x/0q5enJgjL3EAcXBwqWeH6MPfZs="; }; - cargoHash = "sha256-O6Y+JOMpucrjvYAJZe2D97vODFXVysuiitXzMkfcSpI="; + cargoHash = "sha256-UrzJGEASGaDqKUrPiNcjldevCqCPaNXJXNYecbHodOc="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ - libgit2_1_6 + libgit2 zlib ]; diff --git a/pkgs/applications/version-management/gst/default.nix b/pkgs/applications/version-management/gst/default.nix index f0f347d14ca46..bf7abf12d7bfc 100644 --- a/pkgs/applications/version-management/gst/default.nix +++ b/pkgs/applications/version-management/gst/default.nix @@ -13,10 +13,10 @@ buildGoModule rec { owner = "uetchy"; repo = "gst"; rev = "v${version}"; - sha256 = "07cixz5wlzzb4cwcrncg2mz502wlhd3awql5js1glw9f6qfwc5in"; + hash = "sha256-NhbGHTYucfqCloVirkaDlAtQfhWP2cw4I+t/ysvvkR0="; }; - vendorSha256 = "0k5xl55vzpl64gwsgaff92jismpx6y7l2ia0kx7gamd1vklf0qwh"; + vendorHash = "sha256-kGPg6NyhVfVOn0BFQY83/VYdpUjOqaf5I4bev0uhvUw="; doCheck = false; diff --git a/pkgs/applications/version-management/jujutsu/default.nix b/pkgs/applications/version-management/jujutsu/default.nix index b9eb870b43adc..ed8e486681ec8 100644 --- a/pkgs/applications/version-management/jujutsu/default.nix +++ b/pkgs/applications/version-management/jujutsu/default.nix @@ -20,16 +20,16 @@ rustPlatform.buildRustPackage rec { pname = "jujutsu"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "martinvonz"; repo = "jj"; rev = "v${version}"; - sha256 = "sha256-5RN2xaH591/83iNXRcW9i/TyU5ndPZq3P/BesHM9I6w="; + hash = "sha256-LJW4Px3K5cz6RJ4sUbwUXsp2+rzEW5wowi+DALHajYA="; }; - cargoHash = "sha256-G4W3GeTWTuIZO1PupuZ0hACwhNoNBQhULyT9f6qVckg="; + cargoHash = "sha256-fs1cWhBFp2u3HiEx/mMnbwvgwKo97KmftA/sr4dGsiM="; buildNoDefaultFeatures = true; buildFeatures = [ diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index 4d3cea9c00c94..1ea92e333d5bb 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -1,6 +1,7 @@ { lib, stdenv , fetchCrate , rustPlatform +, installShellFiles , pkg-config , libsodium , openssl @@ -22,7 +23,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-mRi0NUETTdYE/oM+Jo7gW/zNby8dPAKl6XhzP0Qzsf0="; doCheck = false; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = [ openssl libsodium xxHash ] ++ (lib.optionals gitImportSupport [ libgit2 ]) ++ (lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ @@ -31,6 +32,13 @@ rustPlatform.buildRustPackage rec { buildFeatures = lib.optional gitImportSupport "git"; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd pijul \ + --bash <($out/bin/pijul completion bash) \ + --fish <($out/bin/pijul completion fish) \ + --zsh <($out/bin/pijul completion zsh) + ''; + meta = with lib; { description = "A distributed version control system"; homepage = "https://pijul.org"; diff --git a/pkgs/applications/version-management/sourcehut/update.sh b/pkgs/applications/version-management/sourcehut/update.sh index 239d767ed9b4c..54727e0317cb9 100755 --- a/pkgs/applications/version-management/sourcehut/update.sh +++ b/pkgs/applications/version-management/sourcehut/update.sh @@ -38,7 +38,7 @@ update_version() { (cd "$root" && update-source-version "sourcehut.python.pkgs.$1" "$version") - # Update vendorSha256 of Go modules + # Update vendorHash of Go modules retry=true while "$retry"; do retry=false; diff --git a/pkgs/applications/version-management/subgit/default.nix b/pkgs/applications/version-management/subgit/default.nix index a7288aa24e6e8..3aca6673589cd 100644 --- a/pkgs/applications/version-management/subgit/default.nix +++ b/pkgs/applications/version-management/subgit/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "subgit"; - version = "3.3.16"; + version = "3.3.17"; meta = { description = "A tool for a smooth, stress-free SVN to Git migration"; @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://subgit.com/download/subgit-${version}.zip"; - sha256 = "sha256-p7uBEG43N4Hed+8HYf3I9lQEvmYLV61oIyRrPHuGmUA="; + sha256 = "sha256-u8YhaF4zOlDpEYd/0VUN8k4X8E1G4PB+UkJjBfQKkJY="; }; } diff --git a/pkgs/applications/version-management/sublime-merge/common.nix b/pkgs/applications/version-management/sublime-merge/common.nix index 998b1793c187c..c3c7964b52a35 100644 --- a/pkgs/applications/version-management/sublime-merge/common.nix +++ b/pkgs/applications/version-management/sublime-merge/common.nix @@ -1,4 +1,4 @@ -{ buildVersion, x64sha256, dev ? false }: +{ buildVersion, aarch64sha256, x64sha256, dev ? false }: { fetchurl, lib, stdenv, xorg, glib, libGL, glibcLocales, gtk3, cairo, pango, libredirect, makeWrapper, wrapGAppsHook , pkexecPath ? "/run/wrappers/bin/pkexec" @@ -8,14 +8,23 @@ let pnameBase = "sublime-merge"; packageAttribute = "sublime-merge${lib.optionalString dev "-dev"}"; - binaries = [ "sublime_merge" "crash_reporter" "git-credential-sublime" "ssh-askpass-sublime" ]; + binaries = [ "sublime_merge" crashHandlerBinary "git-credential-sublime" "ssh-askpass-sublime" ]; primaryBinary = "sublime_merge"; primaryBinaryAliases = [ "smerge" ]; + crashHandlerBinary = if lib.versionAtLeast buildVersion "2086" then "crash_handler" else "crash_reporter"; downloadUrl = arch: "https://download.sublimetext.com/sublime_merge_build_${buildVersion}_${arch}.tar.xz"; versionUrl = "https://www.sublimemerge.com/${if dev then "dev" else "download"}"; versionFile = builtins.toString ./default.nix; - libPath = lib.makeLibraryPath [ xorg.libX11 glib gtk3 cairo pango curl ]; + neededLibraries = [ + xorg.libX11 + glib + gtk3 + cairo + pango + curl + ]; + redirects = [ "/usr/bin/pkexec=${pkexecPath}" "/bin/true=${coreutils}/bin/true" ]; in let binaryPackage = stdenv.mkDerivation rec { @@ -35,7 +44,7 @@ in let for binary in ${ builtins.concatStringsSep " " binaries }; do patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${libPath}:${libGL}/lib:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.is64bit "64"} \ + --set-rpath ${lib.makeLibraryPath neededLibraries}:${libGL}/lib:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.is64bit "64"} \ $binary done @@ -76,6 +85,10 @@ in let passthru = { sources = { + "aarch64-linux" = fetchurl { + url = downloadUrl "arm64"; + sha256 = aarch64sha256; + }; "x86_64-linux" = fetchurl { url = downloadUrl "x64"; sha256 = x64sha256; @@ -109,7 +122,7 @@ in stdenv.mkDerivation (rec { passthru = { updateScript = let - script = writeShellScript "${pnameBase}-update-script" '' + script = writeShellScript "${packageAttribute}-update-script" '' set -o errexit PATH=${lib.makeBinPath [ common-updater-scripts curl gnugrep ]} @@ -137,6 +150,6 @@ in stdenv.mkDerivation (rec { maintainers = with maintainers; [ zookatron ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - platforms = [ "x86_64-linux" ]; + platforms = [ "aarch64-linux" "x86_64-linux" ]; }; }) diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/pkgs/applications/version-management/sublime-merge/default.nix index 01bd8b3573ff0..84ddb35415d8e 100644 --- a/pkgs/applications/version-management/sublime-merge/default.nix +++ b/pkgs/applications/version-management/sublime-merge/default.nix @@ -4,13 +4,15 @@ let common = opts: callPackage (import ./common.nix opts); in { sublime-merge = common { - buildVersion = "2083"; - x64sha256 = "bWHbP8j228jUDr1XDLRciq7hcET6o6Udr/lLODXRudc="; + buildVersion = "2091"; + aarch64sha256 = "dkPKuuzQQtL3eZlaAPeL7e2p5PCxroFRSp6Rw5wHODc="; + x64sha256 = "T5g6gHgl9xGytEOsh3VuB08IrbDvMu24o/1edCGmfd4="; } {}; sublime-merge-dev = common { - buildVersion = "2085"; - x64sha256 = "40yI6EtP2l22aPP50an3ycvdEcAqJphhGhYYoOPyHw0="; + buildVersion = "2090"; + aarch64sha256 = "96nJn+7bVoLM6D14pFujlj3JOQL5PwdU1+SWzEjoYhU="; + x64sha256 = "bu51gsu0XxZBF8/HncPttcKiIRpC7qsKTgR9cktKOnI="; dev = true; } {}; } diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index 7d74f86975a6e..7e830e1077a5e 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -14,40 +14,51 @@ python3Packages.buildPythonApplication rec { sha256 = "sha256-Xbvg/FcuX/AL2reWsaM2oaFyLby3+HDCfYtRyswE7DA="; }; - # Extension point for when thg's mercurial is lagging behind mainline. - tortoiseMercurial = mercurial; - + nativeBuildInputs = [ + qt5.wrapQtAppsHook + ]; propagatedBuildInputs = with python3Packages; [ - tortoiseMercurial + mercurial + # The one from python3Packages qscintilla-qt5 iniparse ]; - nativeBuildInputs = [ qt5.wrapQtAppsHook ]; + buildInputs = [ + # Makes wrapQtAppsHook add these qt libraries to the wrapper search paths + qt5.qtwayland + ]; - doCheck = true; + # In order to spare double wrapping, we use: + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") + ''; + # Convenient alias postInstall = '' - mkdir -p $out/share/doc/tortoisehg - cp COPYING.txt $out/share/doc/tortoisehg/Copying.txt - # convenient alias ln -s $out/bin/thg $out/bin/tortoisehg - wrapQtApp $out/bin/thg ''; + # In python3Packages.buildPythonApplication doCheck is always true, and we + # override it to not run the default unittests checkPhase = '' - export QT_QPA_PLATFORM=offscreen - echo "test: thg smoke test" + runHook preCheck + + $out/bin/thg version | grep -q "${version}" + # Detect breakage of thg in case of out-of-sync mercurial update. In that + # case any thg subcommand just opens up an gui dialog with a description of + # version mismatch. + echo "thg smoke test" $out/bin/thg -h > help.txt & sleep 1s - if grep "list of commands" help.txt; then - echo "thg help output was captured. Seems like package in a working state." - exit 0 - else - echo "thg help output was not captured. Seems like package is broken." - exit 1 - fi + grep -q "list of commands" help.txt + + runHook postCheck ''; - passthru.mercurial = tortoiseMercurial; + passthru = { + # If at some point we'll override this argument, it might be useful to have + # access to it here. + inherit mercurial; + }; meta = { description = "Qt based graphical tool for working with Mercurial"; diff --git a/pkgs/applications/version-management/vcprompt/default.nix b/pkgs/applications/version-management/vcprompt/default.nix index d98f94477256e..d4a4889f4a3f9 100644 --- a/pkgs/applications/version-management/vcprompt/default.nix +++ b/pkgs/applications/version-management/vcprompt/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { about the current working directory for various version control systems ''; homepage = "http://hg.gerg.ca/vcprompt"; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; platforms = with platforms; linux ++ darwin; license = licenses.gpl2Plus; }; diff --git a/pkgs/applications/video/anilibria-winmaclinux/default.nix b/pkgs/applications/video/anilibria-winmaclinux/default.nix index 823dbfef97a94..f1c2b13d73a20 100644 --- a/pkgs/applications/video/anilibria-winmaclinux/default.nix +++ b/pkgs/applications/video/anilibria-winmaclinux/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "anilibria-winmaclinux"; - version = "1.2.9"; + version = "1.2.10"; src = fetchFromGitHub { owner = "anilibria"; repo = "anilibria-winmaclinux"; rev = version; - sha256 = "sha256-Fdj7i4jpKIDwaIBAch7SjIV/WnqMDnCfNYSiZLsamx8="; + sha256 = "sha256-mCDw8V/Uzewm32rj+mkkm5atS5nJAFJ3ry1boTn+gqI="; }; sourceRoot = "source/src"; diff --git a/pkgs/applications/video/bilibili/default.nix b/pkgs/applications/video/bilibili/default.nix index 093db899e4425..71d8ef75e213c 100644 --- a/pkgs/applications/video/bilibili/default.nix +++ b/pkgs/applications/video/bilibili/default.nix @@ -7,10 +7,10 @@ stdenv.mkDerivation rec { pname = "bilibili"; - version = "1.11.4-2"; + version = "1.12.0-2"; src = fetchurl { url = "https://github.com/msojocs/bilibili-linux/releases/download/v${version}/io.github.msojocs.bilibili_${version}_amd64.deb"; - hash = "sha256-nUixkNZPIqeMUdjJxaNrHODFbShDqHFHVoKRZKAVjyc="; + hash = "sha256-LnTRznIUXU7h0SyOCfVjfqhNv2OCRujNoM1PtGUVJeU="; }; unpackPhase = '' diff --git a/pkgs/applications/video/dmlive/default.nix b/pkgs/applications/video/dmlive/default.nix index 5c198ae0dcfa7..43e659bbfcc76 100644 --- a/pkgs/applications/video/dmlive/default.nix +++ b/pkgs/applications/video/dmlive/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "dmlive"; - version = "5.3.0"; + version = "5.3.1"; src = fetchFromGitHub { owner = "THMonster"; repo = pname; - rev = "92ce90163c3d84f0fab99e6dc192a65c616ffd81"; # no tag - hash = "sha256-3eRC/XmvZXe3DyXOqSkNpTbddtGr/lcaTaFYqZLZq+w="; + rev = "0a07fd1b831bc9e9d34e474284430297b63446c7"; # no tag + hash = "sha256-Jvxbdm9Swh8m03uZEMTkUhIHNfhE+N2a3w7j+liweKE="; }; - cargoHash = "sha256-TQTdz+ZC5cZxWhccnUmXnq+j2EYM5486mIjn6Poe5a8="; + cargoHash = "sha256-/84T7K6WUt2Bfx9qdZjyOHcJEGoquCfRX1ctQBuUjEc="; OPENSSL_NO_VENDOR = true; diff --git a/pkgs/applications/video/hyperion-ng/default.nix b/pkgs/applications/video/hyperion-ng/default.nix index a1eb4086e89c4..43bd337ae5002 100644 --- a/pkgs/applications/video/hyperion-ng/default.nix +++ b/pkgs/applications/video/hyperion-ng/default.nix @@ -49,7 +49,6 @@ stdenv.mkDerivation rec { '' ; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DENABLE_DEPLOY_DEPENDENCIES=OFF" "-DUSE_SYSTEM_FLATBUFFERS_LIBS=ON" "-DUSE_SYSTEM_PROTO_LIBS=ON" diff --git a/pkgs/applications/video/hypnotix/default.nix b/pkgs/applications/video/hypnotix/default.nix index c36478d3885b1..74d2389fce7b8 100644 --- a/pkgs/applications/video/hypnotix/default.nix +++ b/pkgs/applications/video/hypnotix/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , substituteAll , cinnamon +, circle-flags , gettext , gobject-introspection , mpv @@ -12,13 +13,13 @@ stdenv.mkDerivation rec { pname = "hypnotix"; - version = "3.6"; + version = "3.7"; src = fetchFromGitHub { owner = "linuxmint"; repo = "hypnotix"; rev = version; - hash = "sha256-hi3ppYDzFEp4FGZHlGgwEFqyOqzX+d0JK674EyibB/c="; + hash = "sha256-H8+KJ9+HLAorGIeljw8H3N8W3E2yYhAno1xy+jI54zM="; }; patches = [ @@ -31,6 +32,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace usr/lib/hypnotix/hypnotix.py \ --replace __DEB_VERSION__ ${version} \ + --replace /usr/share/circle-flags-svg ${circle-flags}/share/circle-flags-svg \ --replace /usr/share/hypnotix $out/share/hypnotix ''; diff --git a/pkgs/applications/video/jellyfin-media-player/default.nix b/pkgs/applications/video/jellyfin-media-player/default.nix index 5c26d20eda98f..47afaef81a636 100644 --- a/pkgs/applications/video/jellyfin-media-player/default.nix +++ b/pkgs/applications/video/jellyfin-media-player/default.nix @@ -72,7 +72,6 @@ mkDerivation rec { ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DQTROOT=${qtbase}" "-GNinja" ] ++ lib.optionals (!withDbus) [ diff --git a/pkgs/applications/video/lbry/default.nix b/pkgs/applications/video/lbry/default.nix index fa74f138608fe..afcec67d9134b 100644 --- a/pkgs/applications/video/lbry/default.nix +++ b/pkgs/applications/video/lbry/default.nix @@ -12,7 +12,7 @@ in appimageTools.wrapAppImage rec { src = fetchurl { url = "https://github.com/lbryio/lbry-desktop/releases/download/v${version}/LBRY_${version}.AppImage"; # Gotten from latest-linux.yml - sha512 = "WZB2pMzSuWGPj6uad+rIECOhuWEOxi0hVUQifOrhUrKj4SnBDws+oy7V2+NpDGkzbG+Kf3IO8rcWBD4wfFoo2Q=="; + hash = "sha512-WZB2pMzSuWGPj6uad+rIECOhuWEOxi0hVUQifOrhUrKj4SnBDws+oy7V2+NpDGkzbG+Kf3IO8rcWBD4wfFoo2Q=="; }; }; diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index da22e9a10f114..42f356aac46df 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -14,21 +14,21 @@ }: let - version = "1.17.4"; + version = "1.17.5"; # Using two URLs as the first one will break as soon as a new version is released src_bin = fetchurl { urls = [ "http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz" "http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz" ]; - sha256 = "68ebc6f9baba7be4429014b73bdf6da33516a399f011e9e535eb383aff97748b"; + sha256 = "ywCcMfaWAeL2bjFZJaCa0XW60EHyfFCW17Bt1QBN8E8="; }; src_oss = fetchurl { urls = [ "http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz" "http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz" ]; - sha256 = "70e3599dd0a120ababa00d44c93ec8d2d001aea93e902355786ed90a7360cc99"; + sha256 = "/C9LDcUxF6tJkn2aQV+nMILRpK5H3wxOMMxHEMTC/CI="; }; in mkDerivation { diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 45a23ca7deb66..70ed0976f7e9c 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -46,13 +46,13 @@ let in stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "78.0"; + version = "79.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "sha256-iImcpuGZsRlwBTPyPUsfHAOkOIhc8eYs6rinl8O78oU="; + sha256 = "sha256-M+CST7A/obfuGH4lyV68vrhmzEIFCa7DRgApKbPh/uQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/mpv/scripts/default.nix b/pkgs/applications/video/mpv/scripts/default.nix index 62c4e8bf9aa08..8b928e7085bc1 100644 --- a/pkgs/applications/video/mpv/scripts/default.nix +++ b/pkgs/applications/video/mpv/scripts/default.nix @@ -13,6 +13,7 @@ lib.recurseIntoAttrs inhibit-gnome = callPackage ./inhibit-gnome.nix { }; mpris = callPackage ./mpris.nix { }; mpv-playlistmanager = callPackage ./mpv-playlistmanager.nix { }; + mpv-webm = callPackage ./mpv-webm.nix { }; mpvacious = callPackage ./mpvacious.nix { }; quality-menu = callPackage ./quality-menu.nix { }; simple-mpv-webui = callPackage ./simple-mpv-webui.nix { }; diff --git a/pkgs/applications/video/mpv/scripts/mpv-webm.nix b/pkgs/applications/video/mpv/scripts/mpv-webm.nix new file mode 100644 index 0000000000000..983003d79d712 --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/mpv-webm.nix @@ -0,0 +1,36 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, luaPackages +}: + +stdenvNoCC.mkDerivation { + pname = "mpv-webm"; + version = "unstable-2023-02-23"; + + src = fetchFromGitHub { + owner = "ekisu"; + repo = "mpv-webm"; + rev = "a18375932e39e9b2a40d9c7ab52ea367b41e2558"; + hash = "sha256-aetkQ1gU/6Yys5FJS/N06ED9tCSvL6BAgUGdNmNmpbU="; + }; + + nativeBuildInputs = [ luaPackages.moonscript ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/mpv/scripts + install -m 644 build/webm.lua $out/share/mpv/scripts/ + runHook postInstall + ''; + + passthru.scriptName = "webm.lua"; + + meta = with lib; { + description = "Simple WebM maker for mpv, with no external dependencies"; + homepage = "https://github.com/ekisu/mpv-webm"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ pbsds ]; + }; +} diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index fd08ebb3bf0b0..8b3866d624bff 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -164,7 +164,7 @@ stdenv.mkDerivation rec { video content, efficiently ''; homepage = "https://obsproject.com"; - maintainers = with maintainers; [ jb55 MP2E V ]; + maintainers = with maintainers; [ jb55 MP2E V materus ]; license = licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; mainProgram = "obs"; diff --git a/pkgs/applications/video/obs-studio/fix-nix-plugin-path.patch b/pkgs/applications/video/obs-studio/fix-nix-plugin-path.patch index d2c08c308bce5..baf45104e6a89 100644 --- a/pkgs/applications/video/obs-studio/fix-nix-plugin-path.patch +++ b/pkgs/applications/video/obs-studio/fix-nix-plugin-path.patch @@ -1,5 +1,18 @@ +diff --git a/cmake/Modules/ObsDefaults_Linux.cmake b/cmake/Modules/ObsDefaults_Linux.cmake +index d1e58a083..a03c6b98e 100644 +--- a/cmake/Modules/ObsDefaults_Linux.cmake ++++ b/cmake/Modules/ObsDefaults_Linux.cmake +@@ -76,7 +76,7 @@ macro(setup_obs_project) + set(OBS_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/") + set(OBS_DATA_PATH "${OBS_DATA_DESTINATION}") + +- set(OBS_SCRIPT_PLUGIN_PATH "${CMAKE_INSTALL_PREFIX}/${OBS_SCRIPT_PLUGIN_DESTINATION}") ++ set(OBS_SCRIPT_PLUGIN_PATH "${OBS_SCRIPT_PLUGIN_DESTINATION}") + set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${OBS_LIBRARY_DESTINATION}") + else() + set(OBS_EXECUTABLE_DESTINATION "bin/${_ARCH_SUFFIX}bit") diff --git a/libobs/obs-nix.c b/libobs/obs-nix.c -index 36aac7097..801cec788 100644 +index b006a5598..531655eb3 100644 --- a/libobs/obs-nix.c +++ b/libobs/obs-nix.c @@ -56,7 +56,7 @@ const char *get_module_extension(void) diff --git a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix index 18338343abdf0..9ffa56533f321 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "obs-move-transition"; - version = "2.9.1"; + version = "2.9.4"; src = fetchFromGitHub { owner = "exeldro"; repo = "obs-move-transition"; rev = version; - sha256 = "sha256-8c+ifFESdNgND+93pOCwkNSvvPtzvNPtvQIp8oW6CQE="; + sha256 = "sha256-TY+sR7IaOlbFeeh7GL5dgM779pcpiCqzBo7VTK8Uz0E="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix b/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix index ea412261e0abe..195b2d6e17699 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "obs-shaderfilter"; - version = "v1.22"; + version = "2.0.0"; src = fetchFromGitHub { owner = "exeldro"; repo = "obs-shaderfilter"; rev = version; - sha256 = "sha256-CqqYzGRhlHO8Zva+so8uo9+EIlzTfoFVl3NzZMsE7Xc="; + sha256 = "sha256-CEe/NUIYhVdvs7/ZvrvuwKPRNofWE+WZxN6yN8RACs8="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/video/plex-media-player/default.nix b/pkgs/applications/video/plex-media-player/default.nix index 34b6eb9c28626..6a686d9d2c2a9 100644 --- a/pkgs/applications/video/plex-media-player/default.nix +++ b/pkgs/applications/video/plex-media-player/default.nix @@ -34,7 +34,9 @@ in mkDerivation rec { ln -s ${webClientTv} build/dependencies/web-client-tv-${webClientTvBuildId}.tar.xz ''; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=RelWithDebInfo" "-DQTROOT=${qtbase}" ]; + cmakeBuildType = "RelWithDebInfo"; + + cmakeFlags = [ "-DQTROOT=${qtbase}" ]; # plexmediaplayer currently segfaults under wayland qtWrapperArgs = [ "--set" "QT_QPA_PLATFORM" "xcb" ]; diff --git a/pkgs/applications/video/prism/default.nix b/pkgs/applications/video/prism/default.nix index 8cb6153b81113..8fa0c7b03762c 100644 --- a/pkgs/applications/video/prism/default.nix +++ b/pkgs/applications/video/prism/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "prism"; @@ -8,10 +8,10 @@ buildGoModule rec { owner = "muesli"; repo = pname; rev = "v${version}"; - sha256 = "0q7q7aj3fm45bnx6hgl9c1ll8na16x6p7qapr0c4a6dhxwd7n511"; + hash = "sha256-IRR7Gu+wGUUYyFfhc003QVlEaWCJPmi6XYVUN6Q6+GA="; }; - vendorSha256 = "1mkd1s9zgzy9agy2rjjk8wfdga7nzv9cmwgiarfi4xrqzj4mbaxq"; + vendorHash = "sha256-uKtVifw4dxJdVvHxytL+9qjXHEdTyiz8U8n/95MObdY="; meta = with lib; { description = "An RTMP stream recaster/splitter"; diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index 3fe81cb14c6da..07c9b4bb69d37 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -6,12 +6,12 @@ python3Packages.buildPythonApplication rec { pname = "streamlink"; - version = "6.2.0"; + version = "6.2.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-rq4beEhEb5CZjGIyTnEHyPQfjAgmbbxBm4HhzBs1VZo="; + hash = "sha256-64Jmkva7L0oaik1UcCTQlUricL2us+O5CEc6pVsgnRI="; }; nativeCheckInputs = with python3Packages; [ diff --git a/pkgs/applications/virtualization/catatonit/default.nix b/pkgs/applications/virtualization/catatonit/default.nix index 074015bb34530..5b66a59e5850f 100644 --- a/pkgs/applications/virtualization/catatonit/default.nix +++ b/pkgs/applications/virtualization/catatonit/default.nix @@ -1,26 +1,22 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, glibc, nixosTests }: +{ stdenv +, lib +, autoreconfHook +, fetchFromGitHub +, glibc +, nixosTests +}: stdenv.mkDerivation rec { pname = "catatonit"; - version = "0.1.7"; + version = "0.2.0"; src = fetchFromGitHub { owner = "openSUSE"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jX4fYC/rpfd3ro2UZ6OEu4kU5wpusOwmEVPWEjxwlW4="; + sha256 = "sha256-AqJURf4OrPHfTm5joA3oPXH4McE1k0ouvDXAF3jiwgk="; }; - patches = [ - # Pull the fix pending upstream inclusion to support automake-1.16.5: - # https://github.com/openSUSE/catatonit/pull/18 - (fetchpatch { - name = "automake-1.16.5.patch"; - url = "https://github.com/openSUSE/catatonit/commit/99bb9048f532257f3a2c3856cfa19fe957ab6cec.patch"; - sha256 = "sha256-ooxVjtWXJddQiBvO9I5aRyLeL8y3ecxW/Kvtfg/bpRA="; - }) - ]; - nativeBuildInputs = [ autoreconfHook ]; buildInputs = lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ]; @@ -37,7 +33,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A container init that is so simple it's effectively brain-dead"; homepage = "https://github.com/openSUSE/catatonit"; - license = licenses.gpl3Plus; + license = licenses.gpl2Plus; maintainers = with maintainers; [ erosennin ] ++ teams.podman.members; platforms = platforms.linux; }; diff --git a/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock b/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock index ee130b3774526..346e3f45f6335 100644 --- a/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock +++ b/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock @@ -5,9 +5,9 @@ version = 3 [[package]] name = "acpi_tables" version = "0.1.0" -source = "git+https://github.com/rust-vmm/acpi_tables?branch=main#05a609136387cc1cc9b499cee4320020325c263f" +source = "git+https://github.com/rust-vmm/acpi_tables?branch=main#1029d22777f07b04849234bbe756da34a6df2913" dependencies = [ - "zerocopy", + "zerocopy 0.6.1", ] [[package]] @@ -36,9 +36,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "api_client" @@ -133,7 +133,7 @@ dependencies = [ "async-lock", "async-task", "concurrent-queue", - "fastrand", + "fastrand 1.9.0", "futures-lite", "slab", ] @@ -164,7 +164,7 @@ dependencies = [ "log", "parking", "polling", - "rustix", + "rustix 0.37.21", "slab", "socket2", "waker-fn", @@ -192,7 +192,7 @@ dependencies = [ "cfg-if", "event-listener", "futures-lite", - "rustix", + "rustix 0.37.21", "signal-hook", "windows-sys 0.48.0", ] @@ -205,7 +205,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.31", ] [[package]] @@ -216,13 +216,13 @@ checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" [[package]] name = "async-trait" -version = "0.1.71" +version = "0.1.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a564d521dd56509c4c47480d00b80ee55f7e385ae48db5744c67ad50c92d2ebf" +checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.31", ] [[package]] @@ -314,7 +314,7 @@ dependencies = [ "async-lock", "async-task", "atomic-waker", - "fastrand", + "fastrand 1.9.0", "futures-lite", "log", ] @@ -333,9 +333,12 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] [[package]] name = "cfg-if" @@ -345,7 +348,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "cloud-hypervisor" -version = "34.0.0" +version = "35.0.0" dependencies = [ "anyhow", "api_client", @@ -385,18 +388,18 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03e69e28e9f7f77debdedbaafa2866e1de9ba56df55a8bd7cfc724c25a09987c" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" dependencies = [ "libc", ] [[package]] name = "crc32c" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dfea2db42e9927a3845fb268a10a72faed6d416065f77873f05e411457c363e" +checksum = "d8f48d60e5b4d2c53d5c2b1d8a58c849a70ae5e5509b08a48d047e3b65714a74" dependencies = [ "rustc_version", ] @@ -428,9 +431,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.1" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0558d22a7b463ed0241e993f76f09f30b126687447751a8638587b864e4b3944" +checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" dependencies = [ "darling_core", "darling_macro", @@ -438,27 +441,27 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.1" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab8bfa2e259f8ee1ce5e97824a3c55ec4404a0d772ca7fa96bf19f0752a046eb" +checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn 2.0.23", + "syn 2.0.31", ] [[package]] name = "darling_macro" -version = "0.20.1" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a" +checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core", "quote", - "syn 2.0.23", + "syn 2.0.31", ] [[package]] @@ -562,7 +565,7 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.31", ] [[package]] @@ -621,6 +624,7 @@ version = "0.1.0" dependencies = [ "flume", "libc", + "once_cell", "serde", "serde_json", ] @@ -635,6 +639,12 @@ dependencies = [ ] [[package]] +name = "fastrand" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" + +[[package]] name = "fdt" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -713,7 +723,7 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ - "fastrand", + "fastrand 1.9.0", "futures-core", "futures-io", "memchr", @@ -730,7 +740,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.31", ] [[package]] @@ -915,9 +925,9 @@ dependencies = [ [[package]] name = "io-uring" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b7b36074613a723279637061b40db993208908a94f10ccb14436ce735bc0f57" +checksum = "141a0f4546a50b2ed637c7a6df0d7dff45c9f41523254996764461c8ae0d9424" dependencies = [ "bitflags 1.3.2", "libc", @@ -934,13 +944,12 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi", - "io-lifetimes", - "rustix", + "rustix 0.38.8", "windows-sys 0.48.0", ] @@ -987,9 +996,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.144" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libssh2-sys" @@ -1007,9 +1016,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.9" +version = "1.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" +checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" dependencies = [ "cc", "libc", @@ -1019,9 +1028,9 @@ dependencies = [ [[package]] name = "linux-loader" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d3adb7b28e189741eca3b1a4a27de0bf15e0907c9d4b0c74bd2d7d84ef72e08" +checksum = "1db6a725c8000971f83fa93ed7ee1b600e55a1471a2a653379d3c84f72effdcf" dependencies = [ "vm-memory", ] @@ -1033,6 +1042,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] +name = "linux-raw-sys" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" + +[[package]] name = "lock_api" version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1075,7 +1090,7 @@ dependencies = [ [[package]] name = "micro_http" version = "0.1.0" -source = "git+https://github.com/firecracker-microvm/micro-http?branch=main#b538bf89e50be83b6fa9ab1896727ff61e02fa13" +source = "git+https://github.com/firecracker-microvm/micro-http?branch=main#0d0fdcd50ea10c1b4777f9a958873fc848a5b7bb" dependencies = [ "libc", "vmm-sys-util", @@ -1103,19 +1118,19 @@ dependencies = [ [[package]] name = "mshv-bindings" version = "0.1.1" -source = "git+https://github.com/rust-vmm/mshv?branch=main#a45fbeb4a3930a2d17142e5687fe2f667c2df529" +source = "git+https://github.com/rust-vmm/mshv?branch=main#c5a60508595dc504da469b89102b8b49e91714a9" dependencies = [ "libc", "serde", "serde_derive", "vmm-sys-util", - "zerocopy", + "zerocopy 0.7.1", ] [[package]] name = "mshv-ioctls" version = "0.1.1" -source = "git+https://github.com/rust-vmm/mshv?branch=main#a45fbeb4a3930a2d17142e5687fe2f667c2df529" +source = "git+https://github.com/rust-vmm/mshv?branch=main#c5a60508595dc504da469b89102b8b49e91714a9" dependencies = [ "libc", "mshv-bindings", @@ -1165,15 +1180,14 @@ dependencies = [ [[package]] name = "nix" -version = "0.26.2" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ "bitflags 1.3.2", "cfg-if", "libc", "memoffset", - "static_assertions", ] [[package]] @@ -1208,18 +1222,18 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "openssl-src" -version = "111.26.0+1.1.1u" +version = "300.1.3+3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efc62c9f12b22b8f5208c23a7200a442b2e5999f8bdf80233852122b5a4f6f37" +checksum = "cd2c101a165fff9935e34def4669595ab1c7847943c42be86e21503e482be107" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.90" +version = "0.9.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" +checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" dependencies = [ "cc", "libc", @@ -1361,14 +1375,14 @@ checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.31", ] [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" [[package]] name = "pin-utils" @@ -1384,9 +1398,9 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "pnet" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd959a8268165518e2bf5546ba84c7b3222744435616381df3c456fe8d983576" +checksum = "130c5b738eeda2dc5796fe2671e49027e6935e817ab51b930a36ec9e6a206a64" dependencies = [ "ipnetwork", "pnet_base", @@ -1398,18 +1412,18 @@ dependencies = [ [[package]] name = "pnet_base" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "872e46346144ebf35219ccaa64b1dffacd9c6f188cd7d012bd6977a2a838f42e" +checksum = "fe4cf6fb3ab38b68d01ab2aea03ed3d1132b4868fa4e06285f29f16da01c5f4c" dependencies = [ "no-std-net", ] [[package]] name = "pnet_datalink" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c302da22118d2793c312a35fb3da6846cb0fab6c3ad53fd67e37809b06cdafce" +checksum = "ad5854abf0067ebbd3967f7d45ebc8976ff577ff0c7bd101c4973ae3c70f98fe" dependencies = [ "ipnetwork", "libc", @@ -1420,30 +1434,30 @@ dependencies = [ [[package]] name = "pnet_macros" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a780e80005c2e463ec25a6e9f928630049a10b43945fea83207207d4a7606f4" +checksum = "688b17499eee04a0408aca0aa5cba5fc86401d7216de8a63fdf7a4c227871804" dependencies = [ "proc-macro2", "quote", "regex", - "syn 1.0.109", + "syn 2.0.31", ] [[package]] name = "pnet_macros_support" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d932134f32efd7834eb8b16d42418dac87086347d1bc7d142370ef078582bc" +checksum = "eea925b72f4bd37f8eab0f221bbe4c78b63498350c983ffa9dd4bcde7e030f56" dependencies = [ "pnet_base", ] [[package]] name = "pnet_packet" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bde678bbd85cb1c2d99dc9fc596e57f03aa725f84f3168b0eaf33eeccb41706" +checksum = "a9a005825396b7fe7a38a8e288dbc342d5034dac80c15212436424fef8ea90ba" dependencies = [ "glob", "pnet_base", @@ -1453,9 +1467,9 @@ dependencies = [ [[package]] name = "pnet_sys" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faf7a58b2803d818a374be9278a1fe8f88fce14b936afbe225000cfcd9c73f16" +checksum = "417c0becd1b573f6d544f73671070b039051e5ad819cc64aa96377b536128d00" dependencies = [ "libc", "winapi", @@ -1463,9 +1477,9 @@ dependencies = [ [[package]] name = "pnet_transport" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "813d1c0e4defbe7ee22f6fe1755f122b77bfb5abe77145b1b5baaf463cab9249" +checksum = "2637e14d7de974ee2f74393afccbc8704f3e54e6eb31488715e72481d1662cc3" dependencies = [ "libc", "pnet_base", @@ -1507,18 +1521,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.63" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" +checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.29" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -1605,9 +1619,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.3" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" +checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" dependencies = [ "aho-corasick", "memchr", @@ -1616,9 +1630,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "remain" @@ -1628,7 +1642,7 @@ checksum = "bce3a7139d2ee67d07538ee5dba997364fbc243e7e7143e96eb830c74bfaa082" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.31", ] [[package]] @@ -1662,7 +1676,20 @@ dependencies = [ "errno", "io-lifetimes", "libc", - "linux-raw-sys", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustix" +version = "0.38.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" +dependencies = [ + "bitflags 2.3.3", + "errno", + "libc", + "linux-raw-sys 0.4.5", "windows-sys 0.48.0", ] @@ -1689,35 +1716,35 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" [[package]] name = "serde" -version = "1.0.164" +version = "1.0.168" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" +checksum = "d614f89548720367ded108b3c843be93f3a341e22d5674ca0dd5cd57f34926af" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.164" +version = "1.0.168" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" +checksum = "d4fe589678c688e44177da4f27152ee2d190757271dc7f1d5b6b9f68d869d641" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.31", ] [[package]] name = "serde_json" -version = "1.0.96" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ "itoa", "ryu", @@ -1732,7 +1759,7 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.31", ] [[package]] @@ -1754,7 +1781,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.31", ] [[package]] @@ -1802,9 +1829,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "socket2" @@ -1862,9 +1889,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.23" +version = "2.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737" +checksum = "718fa2415bcb8d8bd775917a1bf12a7931b6dfa890753378538118181e0cb398" dependencies = [ "proc-macro2", "quote", @@ -1883,15 +1910,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.5.0" +version = "3.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" +checksum = "dc02fddf48964c42031a0b3fe0428320ecf3a73c401040fc0096f97794310651" dependencies = [ "cfg-if", - "fastrand", + "fastrand 2.0.0", "redox_syscall 0.3.5", - "rustix", - "windows-sys 0.45.0", + "rustix 0.38.8", + "windows-sys 0.48.0", ] [[package]] @@ -1935,7 +1962,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.31", ] [[package]] @@ -2005,7 +2032,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.31", ] [[package]] @@ -2090,7 +2117,7 @@ dependencies = [ [[package]] name = "vfio-bindings" version = "0.4.0" -source = "git+https://github.com/rust-vmm/vfio?branch=main#89f8e77dd1a2829197ecde65b686bafcc8a1def4" +source = "git+https://github.com/rust-vmm/vfio?branch=main#847b0aa504ac6367efe42ba7e96a2d050737d4f0" dependencies = [ "vmm-sys-util", ] @@ -2098,7 +2125,7 @@ dependencies = [ [[package]] name = "vfio-ioctls" version = "0.2.0" -source = "git+https://github.com/rust-vmm/vfio?branch=main#89f8e77dd1a2829197ecde65b686bafcc8a1def4" +source = "git+https://github.com/rust-vmm/vfio?branch=main#847b0aa504ac6367efe42ba7e96a2d050737d4f0" dependencies = [ "byteorder", "kvm-bindings", @@ -2116,7 +2143,7 @@ dependencies = [ [[package]] name = "vfio_user" version = "0.1.0" -source = "git+https://github.com/rust-vmm/vfio-user?branch=main#eef6bec4d421f08ed1688fe67c5ea33aabbf5069" +source = "git+https://github.com/rust-vmm/vfio-user?branch=main#2d96b90a7279547356ad8f83aaa3115ad5497302" dependencies = [ "bitflags 1.3.2", "libc", @@ -2132,8 +2159,9 @@ dependencies = [ [[package]] name = "vhost" -version = "0.7.0" -source = "git+https://github.com/rust-vmm/vhost?branch=main#bdc6f2ab2b3dbd3b9574100ac641a2f8e9667400" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61957aeb36daf0b00b87fff9c10dd28a161bd35ab157553d340d183b3d8756e6" dependencies = [ "bitflags 1.3.2", "libc", @@ -2143,9 +2171,9 @@ dependencies = [ [[package]] name = "vhost-user-backend" -version = "0.9.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5d3b7affe04f61d19b03c5db823287855789b687218fec139699a0c7f7f2790" +checksum = "ab069cdedaf18a0673766eb0a07a0f4ee3ed1b8e17fbfe4aafe5b988e2de1d01" dependencies = [ "libc", "log", @@ -2195,9 +2223,9 @@ dependencies = [ [[package]] name = "virtio-bindings" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b9084faf91b9aa9676ae2cac8f1432df2839d9566e6f19f29dbc13a8b831dff" +checksum = "c18d7b74098a946470ea265b5bacbbf877abc3373021388454de0d47735a5b98" [[package]] name = "virtio-devices" @@ -2235,9 +2263,9 @@ dependencies = [ [[package]] name = "virtio-queue" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91aebb1df33db33cbf04d4c2445e4f78d0b0c8e65acfd16a4ee95ef63ca252f8" +checksum = "35aca00da06841bd99162c381ec65893cace23ca0fb89254302cfe4bec4c300f" dependencies = [ "log", "virtio-bindings", @@ -2274,12 +2302,13 @@ source = "git+https://github.com/rust-vmm/vm-fdt?branch=main#77212bd0d62913e445c [[package]] name = "vm-memory" -version = "0.11.0" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6ea57fe00f9086c59eeeb68e102dd611686bc3c28520fa465996d4d4bdce07" +checksum = "9dc276f0d00c17b9aeb584da0f1e1c673df0d183cc2539e3636ec8cbc5eae99b" dependencies = [ "arc-swap", "libc", + "thiserror", "winapi", ] @@ -2316,9 +2345,11 @@ dependencies = [ "bitflags 2.3.3", "block", "blocking", + "cfg-if", "devices", "epoll", "event_monitor", + "flume", "futures", "gdbstub", "gdbstub_arch", @@ -2352,7 +2383,7 @@ dependencies = [ "vm-virtio", "vmm-sys-util", "zbus", - "zerocopy", + "zerocopy 0.6.1", ] [[package]] @@ -2409,7 +2440,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.31", "wasm-bindgen-shared", ] @@ -2431,7 +2462,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.31", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2697,7 +2728,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "332f188cc1bcf1fe1064b8c58d150f497e697f49774aa846f2dc949d9a25f236" dependencies = [ "byteorder", - "zerocopy-derive", + "zerocopy-derive 0.3.2", +] + +[[package]] +name = "zerocopy" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f00a66029e63d181fa590cc5694cf2afbc0974a4604824e80017b1789f99c07" +dependencies = [ + "byteorder", + "zerocopy-derive 0.7.1", ] [[package]] @@ -2712,6 +2753,17 @@ dependencies = [ ] [[package]] +name = "zerocopy-derive" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9c682f46403e5d567cb27b79f6279c145759528ba9450fe371f43b921b452bd" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.31", +] + +[[package]] name = "zvariant" version = "3.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/pkgs/applications/virtualization/cloud-hypervisor/default.nix index 7a0dc67dba280..d7182b8131070 100644 --- a/pkgs/applications/virtualization/cloud-hypervisor/default.nix +++ b/pkgs/applications/virtualization/cloud-hypervisor/default.nix @@ -2,27 +2,26 @@ rustPlatform.buildRustPackage rec { pname = "cloud-hypervisor"; - version = "34.0"; + version = "35.0"; src = fetchFromGitHub { owner = "cloud-hypervisor"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+uicO6tPLzwlA4/Fao2J8n82Qnt3C6OfqRxn1pVh7XE="; + sha256 = "sha256-HZt5xfsP9l18S6nPyVhLNAs5vgDSVYOMFwThzCCon7E="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "acpi_tables-0.1.0" = "sha256-OdtnF2fV6oun3NeCkXdaGU3U7ViBcgFKqHKdyZsRsPA="; + "acpi_tables-0.1.0" = "sha256-OGJX05yNwE7zZzATs8y0EZ714+lB+FgSia0TygRwWAU="; "kvm-bindings-0.6.0" = "sha256-wGdAuPwsgRIqx9dh0m+hC9A/Akz9qg9BM+p06Fi5ACM="; "kvm-ioctls-0.13.0" = "sha256-jHnFGwBWnAa2lRu4a5eRNy1Y26NX5MV8alJ86VR++QE="; - "micro_http-0.1.0" = "sha256-w2witqKXE60P01oQleujmHSnzMKxynUGKWyq5GEh1Ew="; - "mshv-bindings-0.1.1" = "sha256-9Q7IXznZ+qdf/d4gO7qVEjbNUUygQDNYLNxz2BECLHc="; + "micro_http-0.1.0" = "sha256-wX35VsrO1vxQcGbOrP+yZm9vG0gcTZLe7gH7xuAa12w="; + "mshv-bindings-0.1.1" = "sha256-8fEWawNeJ96CczFoJD3cqCsrROEvh8wJ4I0ForwzTJY="; "versionize_derive-0.1.4" = "sha256-oGuREJ5+FDs8ihmv99WmjIPpL2oPdOr4REk6+7cV/7o="; - "vfio-bindings-0.4.0" = "sha256-8zdpLD9e1TAwG+m6ifS7/Fh39fAs5VxtnS5gUj/eKmY="; - "vfio_user-0.1.0" = "sha256-b/gL6vPMW44O44lBIjqS+hgqVUUskBmttGk5UKIMgZk="; - "vhost-0.7.0" = "sha256-KdVROh44UzZJqtzxfM6gwAokzY6El8iDPfw2nnkmhiQ="; + "vfio-bindings-0.4.0" = "sha256-hGhfOE9q9sf/tzPuaAHOca+JKCutcm1Myu1Tt9spaIQ="; + "vfio_user-0.1.0" = "sha256-fAqvy3YTDKXQqtJR+R2nBCWIYe89zTwtbgvJfPLqs1Q="; "vm-fdt-0.2.0" = "sha256-lKW4ZUraHomSDyxgNlD5qTaBTZqM0Fwhhh/08yhrjyE="; }; }; @@ -46,6 +45,7 @@ rustPlatform.buildRustPackage rec { description = "Open source Virtual Machine Monitor (VMM) that runs on top of KVM"; changelog = "https://github.com/cloud-hypervisor/cloud-hypervisor/releases/tag/v${version}"; license = with licenses; [ asl20 bsd3 ]; + mainProgram = "cloud-hypervisor"; maintainers = with maintainers; [ offline qyliss ]; platforms = [ "aarch64-linux" "x86_64-linux" ]; }; diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix index 6a3da1f03a664..59cc830844c94 100644 --- a/pkgs/applications/virtualization/crosvm/default.nix +++ b/pkgs/applications/virtualization/crosvm/default.nix @@ -4,18 +4,18 @@ rustPlatform.buildRustPackage rec { pname = "crosvm"; - version = "116.1"; + version = "117.0"; src = fetchgit { url = "https://chromium.googlesource.com/chromiumos/platform/crosvm"; - rev = "97ac6ce38d8e5789c91fcc5bae6078d21a2afdb3"; - sha256 = "NssjHXorPGZBYqERPeLW3cqEzbXqyL9N4OnLLQMLALk="; + rev = "2ec6c2a0d6700b297bb53803c5065a50f8094c77"; + sha256 = "PFQc6DNbZ6zIXooYKNSHAkHlDvDk09tgRX5KYRiZ2nA="; fetchSubmodules = true; }; separateDebugInfo = true; - cargoHash = "sha256-mlXAlq62nAW6ZVxRav+k/iU1YDecfPDTCPp7FdJBO54="; + cargoHash = "sha256-yRujLgPaoKx/wkG3yMwQ5ndy9X5xDWSKtCr8DypXvEA="; nativeBuildInputs = [ pkg-config protobuf python3 rustPlatform.bindgenHook wayland-scanner @@ -38,6 +38,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A secure virtual machine monitor for KVM"; homepage = "https://chromium.googlesource.com/crosvm/crosvm/"; + mainProgram = "crosvm"; maintainers = with maintainers; [ qyliss ]; license = licenses.bsd3; platforms = [ "aarch64-linux" "x86_64-linux" ]; diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index 5ea6bdc8dd320..e33b860ddc9ae 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -39,13 +39,13 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "1.9"; + version = "1.9.2"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - hash = "sha256-1Ygr4tnMCRsskeJMUFv2XJxnNak8E30jZDZiLkXAQyg="; + hash = "sha256-C2VPEtHJyO7azDmvH74AoCnNaCeJ7XOLlIIe3nay4Po="; fetchSubmodules = true; }; diff --git a/pkgs/applications/virtualization/ddev/default.nix b/pkgs/applications/virtualization/ddev/default.nix index dab4033486eb0..0b4412432ab0e 100644 --- a/pkgs/applications/virtualization/ddev/default.nix +++ b/pkgs/applications/virtualization/ddev/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ddev"; - version = "1.22.2"; + version = "1.22.3"; src = fetchFromGitHub { owner = "ddev"; repo = "ddev"; rev = "v${version}"; - hash = "sha256-S3NesYJH66vqMSDSd2UKWyjOjrZYasY0sWqYMiQC7i0="; + hash = "sha256-KxBnnNs7dmNGZR048FSDoCZ7+P1IXnhH6iy7e0y+2f8="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/driver/win-virtio/default.nix b/pkgs/applications/virtualization/driver/win-virtio/default.nix index fbeb12989cb53..97fecfaeda36e 100644 --- a/pkgs/applications/virtualization/driver/win-virtio/default.nix +++ b/pkgs/applications/virtualization/driver/win-virtio/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "win-virtio"; - version = "0.1.229-1"; + version = "0.1.240-1"; src = fetchurl { url = "https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-${version}/virtio-win.iso"; - hash = "sha256-yIoN3jRgXq7mz4ifPioMKvPK65G130WhJcpPcBrLu+A="; + hash = "sha256-69SCWGaPf3jgJu0nbCip0Z2D4CD/oICtaZENyGu8vMY="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/virtualization/ignite/default.nix b/pkgs/applications/virtualization/ignite/default.nix index 9ab1d36fef522..89387e822d869 100644 --- a/pkgs/applications/virtualization/ignite/default.nix +++ b/pkgs/applications/virtualization/ignite/default.nix @@ -21,7 +21,7 @@ buildGoModule rec{ leaveDotGit = true; }; - vendorSha256 = null; + vendorHash = null; doCheck = false; diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix index 68e37fdbd7f89..5b27bb933dd84 100644 --- a/pkgs/applications/virtualization/nixpacks/default.nix +++ b/pkgs/applications/virtualization/nixpacks/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixpacks"; - version = "1.15.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iZOcpVvhHbf8u2NrnwAIg7jlTN/afeBi2+jbsNYKlz4="; + sha256 = "sha256-ulzSxS5yukkLCykdsxl9nNRnakQ1UitJAHlB9CwLhsM="; }; - cargoHash = "sha256-cysxQ4qc70zpEOpL5bccMHdEDGbdjzbGftTMb58RrYc="; + cargoHash = "sha256-nNnFbvHsew7jtTBpD3eKXgjkc1arzjWMZWwj96Qmgcw="; # skip test due FHS dependency doCheck = false; diff --git a/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix b/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix index 9d32d9864ac02..a174c3031227f 100644 --- a/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix +++ b/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix @@ -2,7 +2,7 @@ , glibc , fetchFromGitLab , makeWrapper -, buildGoPackage +, buildGoModule , linkFarm , writeShellScript , containerRuntimePath @@ -24,7 +24,7 @@ let fi ''; in -buildGoPackage rec { +buildGoModule rec { pname = "container-toolkit/container-toolkit"; version = "1.9.0"; @@ -32,20 +32,30 @@ buildGoPackage rec { owner = "nvidia"; repo = pname; rev = "v${version}"; - sha256 = "sha256-b4mybNB5FqizFTraByHk5SCsNO66JaISj18nLgLN7IA="; + hash = "sha256-b4mybNB5FqizFTraByHk5SCsNO66JaISj18nLgLN7IA="; }; - goPackagePath = "github.com/NVIDIA/nvidia-container-toolkit"; + vendorHash = null; + + postPatch = '' + # replace the default hookDefaultFilePath to the $out path + substituteInPlace cmd/nvidia-container-runtime/main.go \ + --replace '/usr/bin/nvidia-container-runtime-hook' '${placeholder "out"}/bin/nvidia-container-runtime-hook' + ''; ldflags = [ "-s" "-w" ]; nativeBuildInputs = [ makeWrapper ]; - preBuild = '' - # replace the default hookDefaultFilePath to the $out path - substituteInPlace go/src/github.com/NVIDIA/nvidia-container-toolkit/cmd/nvidia-container-runtime/main.go \ - --replace '/usr/bin/nvidia-container-runtime-hook' '${placeholder "out"}/bin/nvidia-container-runtime-hook' - ''; + checkFlags = + let + skippedTests = [ + # Disable tests executing nvidia-container-runtime command. + "TestGoodInput" + "TestDuplicateHook" + ]; + in + [ "-skip" "${builtins.concatStringsSep "|" skippedTests}" ]; postInstall = '' mkdir -p $out/etc/nvidia-container-runtime diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index 14f712a8f64ff..078c786ae23e1 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -39,18 +39,18 @@ , withX ? true }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "open-vm-tools"; version = "12.3.0"; src = fetchFromGitHub { owner = "vmware"; repo = "open-vm-tools"; - rev = "stable-${version}"; + rev = "stable-${finalAttrs.version}"; hash = "sha256-YVpWomLED5sBKXKdJtuDjb7/aKB2flVIm2ED3xSsccE="; }; - sourceRoot = "${src.name}/open-vm-tools"; + sourceRoot = "${finalAttrs.src.name}/open-vm-tools"; outputs = [ "out" "dev" ]; @@ -137,7 +137,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/vmware/open-vm-tools"; - changelog = "https://github.com/vmware/open-vm-tools/releases/tag/stable-${version}"; + changelog = "https://github.com/vmware/open-vm-tools/releases/tag/stable-${finalAttrs.version}"; description = "Set of tools for VMWare guests to improve host-guest interaction"; longDescription = '' A set of services and modules that enable several features in VMware products for @@ -147,4 +147,4 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; maintainers = with maintainers; [ joamaki kjeremy ]; }; -} +}) diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 128ab444073bf..c1fdc2977a78e 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -62,13 +62,13 @@ let in buildGoModule rec { pname = "podman"; - version = "4.6.2"; + version = "4.7.0"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - hash = "sha256-Zxzb7ORyugvN9mhxa0s8r0ch16Ndbm3Z1JCsQcwbF6g="; + hash = "sha256-xbU2F/QYtTKeZacTmwKDfIGuUg9VStEO/jkpChK0DyU="; }; patches = [ diff --git a/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch b/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch index db6455cab4c12..5663f5e8a018b 100644 --- a/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch +++ b/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch @@ -1,16 +1,19 @@ -diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go -index a118285f7..d775f0099 100644 ---- a/pkg/machine/qemu/machine.go -+++ b/pkg/machine/qemu/machine.go -@@ -1560,11 +1560,6 @@ func (v *MachineVM) waitAPIAndPrintInfo(forwardState machine.APIForwardingState, - case machine.NotInstalled: - fmt.Printf("\nThe system helper service is not installed; the default Docker API socket\n") - fmt.Printf("address can't be used by podman. ") -- if helper := findClaimHelper(); len(helper) > 0 { -- fmt.Printf("If you would like to install it run the\nfollowing commands:\n") -- fmt.Printf("\n\tsudo %s install\n", helper) -- fmt.Printf("\tpodman machine stop%s; podman machine start%s\n\n", suffix, suffix) -- } - case machine.MachineLocal: +diff --git a/pkg/machine/machine_common.go b/pkg/machine/machine_common.go +index 649748947..a981d93bf 100644 +--- a/pkg/machine/machine_common.go ++++ b/pkg/machine/machine_common.go +@@ -127,14 +127,6 @@ address can't be used by podman. ` + + if len(helper) < 1 { + fmt.Print(fmtString) +- } else { +- fmtString += `If you would like to install it run the\nfollowing commands: +- +- sudo %s install +- podman machine stop%[1]s; podman machine start%[1]s +- +- ` +- fmt.Printf(fmtString, helper, suffix) + } + case MachineLocal: fmt.Printf("\nAnother process was listening on the default Docker API socket address.\n") - case machine.ClaimUnsupported: diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 719b62f930085..24d2e8dc217bf 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -48,11 +48,11 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString xenSupport "-xen" + lib.optionalString hostCpuOnly "-host-cpu-only" + lib.optionalString nixosTestRunner "-for-vm-tests"; - version = "8.1.0"; + version = "8.1.1"; src = fetchurl { url = "https://download.qemu.org/qemu-${finalAttrs.version}.tar.xz"; - hash = "sha256-cQwQEZjjNNR2Lu9l9km8Q/qKXddTA1VLis/sPrJfDlU="; + hash = "sha256-N84u9eUA+3UvaBEXxotFEYMD6kmn4mvVQIDO1U+rfe8="; }; depsBuildBuild = [ buildPackages.stdenv.cc ] diff --git a/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix b/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix index 152bb056bc551..ddb06a97f162e 100644 --- a/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix +++ b/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix @@ -1,8 +1,9 @@ { lib , fetchFromGitHub -, makeRustPlatform , hostPlatform , targetPlatform +, cargo +, rustc , lld }: @@ -24,7 +25,12 @@ let }; }; - inherit (cross) rustPlatform; + # inherit (cross) rustPlatform; + # ^ breaks because we are doing a no_std embedded build with a custom sysroot, + # but the fast_cross rustc wrapper already passes a sysroot argument + rustPlatform = cross.makeRustPlatform { + inherit rustc cargo; + }; in diff --git a/pkgs/applications/virtualization/stratovirt/default.nix b/pkgs/applications/virtualization/stratovirt/default.nix index b9fbc191d9c17..75641547ad2e2 100644 --- a/pkgs/applications/virtualization/stratovirt/default.nix +++ b/pkgs/applications/virtualization/stratovirt/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "stratovirt"; - version = "2.2.0"; + version = "2.3.0"; src = fetchgit { url = "https://gitee.com/openeuler/stratovirt.git"; rev = "v${version}"; - sha256 = "sha256-K99CmaBrJu30/12FxnsNsDKsTyX4f2uQSO7cwHsPuDw="; + sha256 = "sha256-f5710f7Lz7ul1DYrC0CAfDR+7e1NrE9ESPdB8nlVUKw="; }; patches = [ ./micro_vm-allow-SYS_clock_gettime.patch ]; - cargoSha256 = "sha256-SFIOGGRzGkVWHIXkviVWuhDN29pa0uD3GqKh+G421xI="; + cargoSha256 = "sha256-prs7zkPAKQ99gjW7gy+4+CgEgGhaTTCLPTbLk/ZHdts="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/virtualization/stratovirt/micro_vm-allow-SYS_clock_gettime.patch b/pkgs/applications/virtualization/stratovirt/micro_vm-allow-SYS_clock_gettime.patch index 6aa0da30c44ac..11d2a0e88e194 100644 --- a/pkgs/applications/virtualization/stratovirt/micro_vm-allow-SYS_clock_gettime.patch +++ b/pkgs/applications/virtualization/stratovirt/micro_vm-allow-SYS_clock_gettime.patch @@ -1,4 +1,4 @@ -From af3001b1b2697ae3165e2fdf47a560fd9ab19a68 Mon Sep 17 00:00:00 2001 +From c5ef87eb831f7f77c0564dd1dce92a579e7c4747 Mon Sep 17 00:00:00 2001 From: Astro <astro@spaceboyz.net> Date: Sun, 18 Jun 2023 23:10:23 +0200 Subject: [PATCH] micro_vm: allow SYS_clock_gettime @@ -8,13 +8,13 @@ Subject: [PATCH] micro_vm: allow SYS_clock_gettime 1 file changed, 2 insertions(+) diff --git a/machine/src/micro_vm/syscall.rs b/machine/src/micro_vm/syscall.rs -index 89ce5c29..2a6aa0cc 100644 +index c37d3f4e..f9e7cce2 100644 --- a/machine/src/micro_vm/syscall.rs +++ b/machine/src/micro_vm/syscall.rs -@@ -128,6 +128,8 @@ pub fn syscall_whitelist() -> Vec<BpfRule> { - #[cfg(all(target_env = "gnu", target_arch = "x86_64"))] +@@ -125,6 +125,8 @@ pub fn syscall_whitelist() -> Vec<BpfRule> { BpfRule::new(libc::SYS_readlink), BpfRule::new(libc::SYS_getrandom), + BpfRule::new(libc::SYS_fallocate), + #[cfg(target_env = "gnu")] + BpfRule::new(libc::SYS_clock_gettime), madvise_rule(), diff --git a/pkgs/applications/virtualization/umoci/default.nix b/pkgs/applications/virtualization/umoci/default.nix index 6af9382d2b7df..627817139c8c4 100644 --- a/pkgs/applications/virtualization/umoci/default.nix +++ b/pkgs/applications/virtualization/umoci/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { sha256 = "0in8kyi4jprvbm3zsl3risbjj8b0ma62yl3rq8rcvcgypx0mn7d4"; }; - vendorSha256 = null; + vendorHash = null; doCheck = false; diff --git a/pkgs/applications/virtualization/vpcs/default.nix b/pkgs/applications/virtualization/vpcs/default.nix index 7c2424ef0f44a..c1bce1f9bc7f0 100644 --- a/pkgs/applications/virtualization/vpcs/default.nix +++ b/pkgs/applications/virtualization/vpcs/default.nix @@ -1,28 +1,49 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib +, stdenv +, fetchFromGitHub +, testers +, vpcs +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vpcs"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "GNS3"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-joEXRMtNZMQumkYDX1gdpGAV+XdNKiAMj3dh1GZxeqc="; + repo = "vpcs"; + rev = "v${finalAttrs.version}"; + hash = "sha256-OKi4sC4fmKtkJkkpHZ6OfeIDaBafVrJXGXh1R6gLPFY="; }; - buildPhase = ''( - cd src - ./mk.sh ${stdenv.buildPlatform.linuxArch} - )''; + sourceRoot = "${finalAttrs.src.name}/src"; + + buildPhase = '' + runHook preBuild + + MKOPT="CC=${stdenv.cc.targetPrefix}cc" ./mk.sh ${stdenv.buildPlatform.linuxArch} + + runHook postBuild + ''; installPhase = '' - install -D -m555 src/vpcs $out/bin/vpcs; - install -D -m444 man/vpcs.1 $out/share/man/man1/vpcs.1; + runHook preInstall + + install -D -m555 vpcs $out/bin/vpcs + install -D -m444 ../man/vpcs.1 $out/share/man/man1/vpcs.1 + + runHook postInstall ''; enableParallelBuilding = true; + passthru = { + tests.version = testers.testVersion { + package = vpcs; + command = "vpcs -v"; + }; + }; + meta = with lib; { description = "A simple virtual PC simulator"; longDescription = '' @@ -30,9 +51,10 @@ stdenv.mkDerivation rec { ping/traceroute them, or ping/traceroute the other hosts/routers from the VPCS when you study the Cisco routers in the dynamips. ''; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.bsd2; - platforms = platforms.linux; - maintainers = with maintainers; [ ]; + platforms = platforms.linux ++ platforms.darwin; + mainProgram = "vpcs"; + maintainers = with maintainers; [ anthonyroussel ]; }; -} +}) diff --git a/pkgs/applications/window-managers/fvwm/3.nix b/pkgs/applications/window-managers/fvwm/3.nix index 95532bde0f6bb..611749c7e9b38 100644 --- a/pkgs/applications/window-managers/fvwm/3.nix +++ b/pkgs/applications/window-managers/fvwm/3.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fvwm3"; - version = "1.0.7"; + version = "1.0.8"; src = fetchFromGitHub { owner = "fvwmorg"; repo = "fvwm3"; rev = finalAttrs.version; - hash = "sha256-CPEGwZuYDh0zDXVKLn806c4DfZZJVaMlmIsVAZl20S4="; + hash = "sha256-nIxFoKo2HTF2qCawxN0WySwfjaNqtfBg1BMo0P6ZY88="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/hyprland/default.nix index 9ee45ba883c25..14a38ec9effcf 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland/default.nix @@ -40,13 +40,13 @@ assert lib.assertMsg (!nvidiaPatches) "The option `nvidiaPatches` has been renam assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been removed. Please refer https://wiki.hyprland.org/Configuring/XWayland"; stdenv.mkDerivation (finalAttrs: { pname = "hyprland" + lib.optionalString debug "-debug"; - version = "0.29.1"; + version = "0.30.0"; src = fetchFromGitHub { owner = "hyprwm"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-j9ypIwZkotNZMyk8R/W002OzDHd0C0OHSKE7uOFpf2k="; + hash = "sha256-a0nqm82brOC0QroGOXxcIKxOMAfl9I6pfFOYjCeRzO0="; }; patches = [ diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix b/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix index b5651749c41c9..4188a13c34dac 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix @@ -42,8 +42,8 @@ wlroots.overrideAttrs domain = "gitlab.freedesktop.org"; owner = "wlroots"; repo = "wlroots"; - rev = "717ded9bb0191ea31bf4368be32e7a15fe1b8294"; - hash = "sha256-eBKkG7tMxg92NskEn8dHRFY245JwjirWRoOZzW6DnUw="; + rev = "98a745d926d8048bc30aef11b421df207a01c279"; + hash = "sha256-LEIUGXvKR5DYFQUTavC3yifcObvG4XZUUHfxXmu8nEM="; }; pname = diff --git a/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix b/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix index 73db7f0353fc1..17f53883424c5 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-k+rG5AZjz47Q6bpVcTK7r4s7Avg3O+1iw+skK+cn0rk="; }; - cmakeFlags = lib.optional debug "-DCMAKE_BUILD_TYPE=Debug"; + cmakeBuildType = if debug then "Debug" else "Release"; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix index dd0882edc2972..37c4bb03002ec 100644 --- a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix +++ b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix @@ -21,15 +21,15 @@ , hyprland , slurp }: -stdenv.mkDerivation { +stdenv.mkDerivation (self: { pname = "xdg-desktop-portal-hyprland"; - version = "unstable-2023-09-10"; + version = "1.1.0"; src = fetchFromGitHub { owner = "hyprwm"; repo = "xdg-desktop-portal-hyprland"; - rev = "aca51609d4c415b30e88b96c6f49f0142cbcdae7"; - hash = "sha256-RF6LXm4J6mBF3B8VcQuABuU4g4tCPHgMYJQSoJ3DW+8="; + rev = "v${self.version}"; + hash = "sha256-K1cqx+NP4lxPwRVPLEeSUfagaMI3m5hdYvQe7sZr7BU="; }; nativeBuildInputs = [ @@ -73,4 +73,4 @@ stdenv.mkDerivation { maintainers = with maintainers; [ fufexan ]; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix index 40666b2d20571..6c376fab2d4be 100644 --- a/pkgs/applications/window-managers/i3/status.nix +++ b/pkgs/applications/window-managers/i3/status.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { maintainers = [ ]; license = lib.licenses.bsd3; platforms = lib.platforms.all; + mainProgram = "i3status"; }; } diff --git a/pkgs/applications/window-managers/maui-shell/default.nix b/pkgs/applications/window-managers/maui-shell/default.nix index c4060a1e6f40e..215b871312a44 100644 --- a/pkgs/applications/window-managers/maui-shell/default.nix +++ b/pkgs/applications/window-managers/maui-shell/default.nix @@ -84,5 +84,7 @@ mkDerivation rec { license = licenses.lgpl3; maintainers = with maintainers; [ onny ]; platforms = platforms.linux; + # https://github.com/Nitrux/maui-shell/issues/56 + broken = true; }; } diff --git a/pkgs/applications/window-managers/notion/default.nix b/pkgs/applications/window-managers/notion/default.nix deleted file mode 100644 index d4ae41134ebcc..0000000000000 --- a/pkgs/applications/window-managers/notion/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config -, lua, gettext, which, groff, xmessage, xterm -, readline, fontconfig, libX11, libXext, libSM -, libXinerama, libXrandr, libXft -, makeWrapper -}: - -stdenv.mkDerivation rec { - pname = "notion"; - version = "4.0.2"; - - src = fetchFromGitHub { - owner = "raboof"; - repo = pname; - rev = version; - sha256 = "14swd0yqci8lxn259fkd9w92bgyf4rmjwgvgyqp78wlfix6ai4mv"; - }; - - # error: 'PATH_MAX' undeclared - postPatch = '' - sed 1i'#include <linux/limits.h>' -i mod_notionflux/notionflux/notionflux.c - ''; - - nativeBuildInputs = [ pkg-config makeWrapper groff ]; - buildInputs = [ lua gettext which readline fontconfig libX11 libXext libSM - libXinerama libXrandr libXft ]; - - buildFlags = [ "LUA_DIR=${lua}" "X11_PREFIX=/no-such-path" ]; - - makeFlags = [ "NOTION_RELEASE=${version}" "PREFIX=\${out}" ]; - - postInstall = '' - wrapProgram $out/bin/notion \ - --prefix PATH ":" "${xmessage}/bin:${xterm}/bin" \ - ''; - - meta = with lib; { - description = "Tiling tabbed window manager"; - homepage = "https://notionwm.net"; - license = licenses.lgpl21; - maintainers = with maintainers; [ jfb AndersonTorres raboof ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix index 3c2ff89a79cd3..ecf9450164f69 100644 --- a/pkgs/applications/window-managers/phosh/default.nix +++ b/pkgs/applications/window-managers/phosh/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { pname = "phosh"; - version = "0.27.0"; + version = "0.31.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { repo = pname; rev = "v${version}"; fetchSubmodules = true; # including gvc and libcall-ui which are designated as subprojects - sha256 = "sha256-dnSYeXn3aPwvxeIjjk+PsnOVKyuGlxXMXGWDdrRrIM0="; + sha256 = "sha256-ZdZKymmOzhlJtsFl+ix5kERnfgjCggDpvDhL4vzS4mc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/smallwm/default.nix b/pkgs/applications/window-managers/smallwm/default.nix deleted file mode 100644 index 9dd2a25e5cf35..0000000000000 --- a/pkgs/applications/window-managers/smallwm/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchFromGitHub -, doxygen, graphviz, libX11, libXrandr }: - -stdenv.mkDerivation rec { - - pname = "smallwm"; - version = "2020-02-28"; - - src = fetchFromGitHub { - owner = "adamnew123456"; - repo = "SmallWM"; - rev = "c2dc72afa87241bcf7e646630f4aae216ce78613"; - sha256 = "0cqhy81ymdcdyvgi55a401rr96h2akskcxi9ddzjbln4a71yjlz8"; - }; - - nativeBuildInputs = [ doxygen graphviz ]; - buildInputs = [ libX11 libXrandr ]; - - dontConfigure = true; - - makeFlags = [ "CC=${stdenv.cc}/bin/cc" "CXX=${stdenv.cc}/bin/c++" ]; - - buildFlags = [ "all" "doc" ]; - - installPhase = '' - install -dm755 $out/bin $out/share/doc/${pname}-${version} - install -m755 bin/smallwm -t $out/bin - cp -r README.markdown doc/html doc/latex $out/share/doc/${pname}-${version} - ''; - - meta = with lib;{ - description = "A small X window manager, extended from tinywm"; - homepage = "https://github.com/adamnew123456/SmallWM"; - license = licenses.bsd2; - maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/window-managers/spectrwm/default.nix b/pkgs/applications/window-managers/spectrwm/default.nix index 11ef2979afe00..7c4a1faddb319 100644 --- a/pkgs/applications/window-managers/spectrwm/default.nix +++ b/pkgs/applications/window-managers/spectrwm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "spectrwm"; - version = "3.4.1"; + version = "unstable-2023-05-07"; src = fetchFromGitHub { owner = "conformal"; repo = "spectrwm"; - rev = "SPECTRWM_3_4_1"; - sha256 = "0bf0d25yr0craksamczn2mdy6cjp27l88smihlw9bw4p6a2qhi41"; + rev = "06e3733175969c307a6fd47240a7a37b29d60513"; + sha256 = "QcEwFg9QTi+cCl2JghKOzEZ19LP/ZFMbZJAMJ0BLH9M="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index b70c5bda0a59b..e28c26c528742 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -78,6 +78,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.freedesktop.org/wayland/weston"; license = licenses.mit; # Expat version platforms = platforms.linux; + mainProgram = "weston"; maintainers = with maintainers; [ primeos qyliss ]; }; } diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index 0637964ca62fb..3afff79eaa23f 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -206,6 +206,7 @@ rec { libtool.lib # for Synfigstudio xorg.libxshmfence # for apple-music-electron at-spi2-core + pciutils # for FreeCAD ]; }; } diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix b/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix index 2c0c4a3d513a9..a6802f4ab544d 100644 --- a/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix +++ b/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix @@ -52,7 +52,7 @@ let # these match the host's architecture, glibc_multi is used for multilib # builds. glibcLocales must be before glibc or glibc_multi as otherwiese # the wrong LOCALE_ARCHIVE will be used where only C.UTF-8 is available. - basePkgs = with pkgs; [ + baseTargetPaths = with pkgs; [ glibcLocales (if isMultiBuild then glibc_multi else glibc) (toString gcc.cc.lib) @@ -71,7 +71,7 @@ let bzip2 xz ]; - baseMultiPkgs = with pkgsi686Linux; [ + baseMultiPaths = with pkgsi686Linux; [ (toString gcc.cc.lib) ]; @@ -132,7 +132,7 @@ let staticUsrProfileTarget = buildEnv { name = "${name}-usr-target"; # ldconfig wrapper must come first so it overrides the original ldconfig - paths = [ etcPkg ldconfig ] ++ basePkgs ++ targetPaths; + paths = [ etcPkg ldconfig ] ++ baseTargetPaths ++ targetPaths; extraOutputsToInstall = [ "out" "lib" "bin" ] ++ extraOutputsToInstall; ignoreCollisions = true; postBuild = '' @@ -168,7 +168,7 @@ let staticUsrProfileMulti = buildEnv { name = "${name}-usr-multi"; - paths = baseMultiPkgs ++ multiPaths; + paths = baseMultiPaths ++ multiPaths; extraOutputsToInstall = [ "out" "lib" ] ++ extraOutputsToInstall; ignoreCollisions = true; }; @@ -251,7 +251,7 @@ let in runCommandLocal "${name}-fhs" { passthru = { - inherit args multiPaths targetPaths ldconfig; + inherit args baseTargetPaths targetPaths baseMultiPaths multiPaths ldconfig; }; } '' mkdir -p $out diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix index 5e8894d7cb335..f4942290af4ba 100644 --- a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix @@ -31,7 +31,7 @@ assert (pname != null || version != null) -> (name == null && pname != null); # with builtins; let - pname = if args.name != null then args.name else args.pname; + pname = if args ? name && args.name != null then args.name else args.pname; versionStr = lib.optionalString (version != null) ("-" + version); name = pname + versionStr; diff --git a/pkgs/build-support/build-graalvm-native-image/default.nix b/pkgs/build-support/build-graalvm-native-image/default.nix index c3c4a7b1e57b2..7212ffa40dcb8 100644 --- a/pkgs/build-support/build-graalvm-native-image/default.nix +++ b/pkgs/build-support/build-graalvm-native-image/default.nix @@ -71,7 +71,5 @@ stdenv.mkDerivation ({ platforms = graalvmDrv.meta.platforms; # default to executable name mainProgram = executable; - # need to have native-image-installable-svm available - broken = !(builtins.any (p: (p.product or "") == "native-image-installable-svm") graalvmDrv.products); } // meta; } // extraArgs) diff --git a/pkgs/build-support/deterministic-uname/deterministic-uname.sh b/pkgs/build-support/deterministic-uname/deterministic-uname.sh index 5272bb5b3fe17..31772aeee3cc1 100644 --- a/pkgs/build-support/deterministic-uname/deterministic-uname.sh +++ b/pkgs/build-support/deterministic-uname/deterministic-uname.sh @@ -38,6 +38,10 @@ processor=0 hardware_platform=0 operating_system=0 +# With no OPTION, same as -s. +if [[ $# -eq 0 ]]; then + kernel_name=1 +fi @getopt@/bin/getopt --test > /dev/null && rc=$? || rc=$? if [[ $rc -ne 4 ]]; then @@ -54,11 +58,6 @@ else eval set -- "$PARSED" fi -# With no OPTION, same as -s. -if [[ $# -eq 0 ]]; then - kernel_name=1 -fi - # Process each argument, and set the appropriate flag if we recognize it. while [[ $# -ge 1 ]]; do case "$1" in @@ -132,44 +131,44 @@ fi # Darwin *nodename* 22.1.0 Darwin Kernel Version 22.1.0: Sun Oct 9 20:14:30 PDT 2022; root:xnu-8792.41.9~2/RELEASE_ARM64_T8103 arm64 arm Darwin # NixOS: # Linux *nodename* 6.0.13 #1-NixOS SMP PREEMPT_DYNAMIC Wed Dec 14 10:41:06 UTC 2022 x86_64 GNU/Linux +output=() if [[ "$all" = "1" ]]; then - echo -n "$KERNEL_NAME_VAL $NODENAME_VAL $KERNEL_RELEASE_VAL $KERNEL_VERSION_VAL $MACHINE_VAL " + output+=("$KERNEL_NAME_VAL" "$NODENAME_VAL" "$KERNEL_RELEASE_VAL" "$KERNEL_VERSION_VAL" "$MACHINE_VAL") # in help: except omit -p and -i if unknown. - #echo -n "$PROCESSOR_VAL $HARDWARE_PLATFORM_VAL\n" - echo -n "$OPERATING_SYSTEM_VAL" + # output+=($PROCESSOR_VAL $HARDWARE_PLATFORM_VAL) + output+=("$OPERATING_SYSTEM_VAL") fi if [[ "$kernel_name" = "1" ]]; then - echo -n "$KERNEL_NAME_VAL" + output+=("$KERNEL_NAME_VAL") fi if [[ "$nodename" = "1" ]]; then - echo -n "$NODENAME_VAL" + output+=("$NODENAME_VAL") fi if [[ "$kernel_release" = "1" ]]; then - echo -n "$KERNEL_RELEASE_VAL" + output+=("$KERNEL_RELEASE_VAL") fi if [[ "$kernel_version" = "1" ]]; then - echo -n "$KERNEL_VERSION_VAL" + output+=("$KERNEL_VERSION_VAL") fi if [[ "$machine" = "1" ]]; then - echo -n "$MACHINE_VAL" + output+=("$MACHINE_VAL") fi if [[ "$processor" = "1" ]]; then - echo -n "$PROCESSOR_VAL" + output+=("$PROCESSOR_VAL") fi if [[ "$hardware_platform" = "1" ]]; then - echo -n "$HARDWARE_PLATFORM_VAL" + output+=("$HARDWARE_PLATFORM_VAL") fi if [[ "$operating_system" = "1" ]]; then - echo -n "$OPERATING_SYSTEM_VAL" + output+=("$OPERATING_SYSTEM_VAL") fi -# for newline. -echo +echo "${output[@]}" diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index 6f46bb692a43e..6c1383c53304c 100644 --- a/pkgs/build-support/emacs/wrapper.nix +++ b/pkgs/build-support/emacs/wrapper.nix @@ -32,7 +32,7 @@ in customEmacsPackages.withPackages (epkgs: [ epkgs.evil epkgs.magit ]) */ -{ lib, lndir, makeWrapper, runCommand, gcc }: +{ lib, lndir, makeBinaryWrapper, runCommand, gcc }: self: let inherit (self) emacs; @@ -50,7 +50,7 @@ runCommand (lib.appendToName "with-packages" emacs).name { inherit emacs explicitRequires; - nativeBuildInputs = [ emacs lndir makeWrapper ]; + nativeBuildInputs = [ emacs lndir makeBinaryWrapper ]; preferLocalBuild = true; allowSubstitutes = false; @@ -201,6 +201,11 @@ runCommand --subst-var-by wrapperSiteLispNative "$deps/share/emacs/native-lisp" \ --subst-var prog chmod +x $out/bin/$progname + # Create a “NOP” binary wrapper for the pure sake of it becoming a + # non-shebang, actual binary. See the makeBinaryWrapper docs for rationale + # (summary: it allows you to use emacs as a shebang itself on Darwin, + # e.g. #!$ {emacs}/bin/emacs --script) + wrapProgramBinary $out/bin/$progname done # Wrap MacOS app @@ -220,6 +225,7 @@ runCommand --subst-var-by wrapperSiteLispNative "$deps/share/emacs/native-lisp" \ --subst-var-by prog "$emacs/Applications/Emacs.app/Contents/MacOS/Emacs" chmod +x $out/Applications/Emacs.app/Contents/MacOS/Emacs + wrapProgramBinary $out/Applications/Emacs.app/Contents/MacOS/Emacs fi mkdir -p $out/share diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 2a53fd94e7f2b..8e3fe456e6813 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -293,9 +293,6 @@ clone_user_rev() { local rev="${3:-HEAD}" if [ -n "$fetchLFS" ]; then - tmpHomePath="$(mktemp -d "${TMPDIR:-/tmp}/nix-prefetch-git-tmp-home-XXXXXXXXXX")" - exit_handlers+=(remove_tmpHomePath) - HOME="$tmpHomePath" clean_git lfs install fi @@ -417,6 +414,13 @@ if test -z "$branchName"; then branchName=fetchgit fi +tmpHomePath="$(mktemp -d "${TMPDIR:-/tmp}/nix-prefetch-git-tmp-home-XXXXXXXXXX")" +exit_handlers+=(remove_tmpHomePath) +HOME="$tmpHomePath" +ln -s /build/.netrc "$HOME/" +unset XDG_CONFIG_HOME +export GIT_CONFIG_NOSYSTEM=1 + if test -n "$builder"; then test -n "$out" -a -n "$url" -a -n "$rev" || usage mkdir -p "$out" diff --git a/pkgs/build-support/kernel/make-initrd-ng.nix b/pkgs/build-support/kernel/make-initrd-ng.nix index 2418838176ef3..f2f7aaa6d1b6d 100644 --- a/pkgs/build-support/kernel/make-initrd-ng.nix +++ b/pkgs/build-support/kernel/make-initrd-ng.nix @@ -54,7 +54,7 @@ in # guess may not align with u-boot's nomenclature correctly, so it can # be overridden. # See https://gitlab.denx.de/u-boot/u-boot/-/blob/9bfb567e5f1bfe7de8eb41f8c6d00f49d2b9a426/common/image.c#L81-106 for a list. -, uInitrdArch ? stdenvNoCC.hostPlatform.linuxArch +, uInitrdArch ? stdenvNoCC.hostPlatform.ubootArch # The name of the compression, as recognised by u-boot. # See https://gitlab.denx.de/u-boot/u-boot/-/blob/9bfb567e5f1bfe7de8eb41f8c6d00f49d2b9a426/common/image.c#L195-204 for a list. diff --git a/pkgs/build-support/node/fetch-yarn-deps/default.nix b/pkgs/build-support/node/fetch-yarn-deps/default.nix index d95b1078c162e..49c2f6cbfc982 100644 --- a/pkgs/build-support/node/fetch-yarn-deps/default.nix +++ b/pkgs/build-support/node/fetch-yarn-deps/default.nix @@ -3,7 +3,7 @@ let yarnpkg-lockfile-tar = fetchurl { url = "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz"; - sha512 = "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ=="; + hash = "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ=="; }; tests = callPackage ./tests {}; diff --git a/pkgs/build-support/node/fetch-yarn-deps/index.js b/pkgs/build-support/node/fetch-yarn-deps/index.js index 04f47362b10dc..de2a09ee90415 100755 --- a/pkgs/build-support/node/fetch-yarn-deps/index.js +++ b/pkgs/build-support/node/fetch-yarn-deps/index.js @@ -37,7 +37,9 @@ const downloadFileHttps = (fileName, url, expectedHash, hashType = 'sha1') => { res.on('end', () => { file.close() const h = hash.read() - if (h != expectedHash) return reject(new Error(`hash mismatch, expected ${expectedHash}, got ${h}`)) + if (expectedHash === undefined){ + console.log(`Warning: lockfile url ${url} doesn't end in "#<hash>" to validate against. Downloaded file had hash ${h}.`); + } else if (h != expectedHash) return reject(new Error(`hash mismatch, expected ${expectedHash}, got ${h}`)) resolve() }) res.on('error', e => reject(e)) diff --git a/pkgs/build-support/ocaml/topkg.nix b/pkgs/build-support/ocaml/topkg.nix new file mode 100644 index 0000000000000..73be5815e44c7 --- /dev/null +++ b/pkgs/build-support/ocaml/topkg.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchurl, ocaml, findlib, topkg, ocamlbuild, cmdliner, odoc, b0 +}: + +{ pname, version, nativeBuildInputs ? [ ], buildInputs ? [ ], ... }@args: + +lib.throwIf (args ? minimalOCamlVersion + && lib.versionOlder ocaml.version args.minimalOCamlVersion) +"${pname}-${version} is not available for OCaml ${ocaml.version}" + +stdenv.mkDerivation ({ + + dontAddStaticConfigureFlags = true; + configurePlatforms = [ ]; + strictDeps = true; + inherit (topkg) buildPhase installPhase; + +} // (builtins.removeAttrs args [ "minimalOCamlVersion" ]) // { + + name = "ocaml${ocaml.version}-${pname}-${version}"; + + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ] ++ nativeBuildInputs; + buildInputs = [ topkg ] ++ buildInputs; + + meta = (args.meta or { }) // { + platforms = args.meta.platforms or ocaml.meta.platforms; + }; + +}) diff --git a/pkgs/build-support/php/build-pecl.nix b/pkgs/build-support/php/build-pecl.nix index 389447e066fa2..6f38a668f3a34 100644 --- a/pkgs/build-support/php/build-pecl.nix +++ b/pkgs/build-support/php/build-pecl.nix @@ -8,10 +8,9 @@ , nativeBuildInputs ? [ ] , postPhpize ? "" , makeFlags ? [ ] -, src ? fetchurl { +, src ? fetchurl ({ url = "https://pecl.php.net/get/${pname}-${version}.tgz"; - inherit (args) sha256; - } + } // lib.filterAttrs (attrName: _: lib.elem attrName [ "sha256" "hash" ]) args) , passthru ? { } , ... }@args: diff --git a/pkgs/build-support/php/hooks/composer-install-hook.sh b/pkgs/build-support/php/hooks/composer-install-hook.sh index 86d17d0f50f79..b1b5e2ac553dc 100644 --- a/pkgs/build-support/php/hooks/composer-install-hook.sh +++ b/pkgs/build-support/php/hooks/composer-install-hook.sh @@ -22,13 +22,47 @@ composerInstallConfigureHook() { fi if [[ ! -f "composer.lock" ]]; then - echo "No composer.lock file found, consider adding one to your repository to ensure reproducible builds." + composer \ + --no-ansi \ + --no-install \ + --no-interaction \ + ${composerNoDev:+--no-dev} \ + ${composerNoPlugins:+--no-plugins} \ + ${composerNoScripts:+--no-scripts} \ + update + + mkdir -p $out + cp composer.lock $out/ + + echo + echo 'No composer.lock file found, consider adding one to your repository to ensure reproducible builds.' + echo "In the meantime, a composer.lock file has been generated for you in $out/composer.lock" + echo + echo 'To fix the issue:' + echo "1. Copy the composer.lock file from $out/composer.lock to the project's source:" + echo " cp $out/composer.lock <path>" + echo '2. Add the composerLock attribute, pointing to the copied composer.lock file:' + echo ' composerLock = ./composer.lock;' + echo - if [[ -f "${composerRepository}/composer.lock" ]]; then - cp ${composerRepository}/composer.lock composer.lock - fi + exit 1 + fi - echo "Using an autogenerated composer.lock file." + echo "Validating consistency between composer.lock and ${composerRepository}/composer.lock" + if [[! @diff@ composer.lock "${composerRepository}/composer.lock"]]; then + echo + echo "ERROR: vendorHash is out of date" + echo + echo "composer.lock is not the same in $composerRepository" + echo + echo "To fix the issue:" + echo '1. Set vendorHash to an empty string: `vendorHash = "";`' + echo '2. Build the derivation and wait for it to fail with a hash mismatch' + echo '3. Copy the "got: sha256-..." value back into the vendorHash field' + echo ' You should have: vendorHash = "sha256-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX=";' + echo + + exit 1 fi chmod +w composer.json composer.lock diff --git a/pkgs/build-support/php/hooks/composer-repository-hook.sh b/pkgs/build-support/php/hooks/composer-repository-hook.sh index 057acf1fcc30e..779f07347548a 100644 --- a/pkgs/build-support/php/hooks/composer-repository-hook.sh +++ b/pkgs/build-support/php/hooks/composer-repository-hook.sh @@ -17,7 +17,6 @@ composerRepositoryConfigureHook() { fi if [[ ! -f "composer.lock" ]]; then - echo "No composer.lock file found, consider adding one to your repository to ensure reproducible builds." composer \ --no-ansi \ --no-install \ @@ -26,7 +25,22 @@ composerRepositoryConfigureHook() { ${composerNoPlugins:+--no-plugins} \ ${composerNoScripts:+--no-scripts} \ update - echo "Using an autogenerated composer.lock file." + + mkdir -p $out + cp composer.lock $out/ + + echo + echo 'No composer.lock file found, consider adding one to your repository to ensure reproducible builds.' + echo "In the meantime, a composer.lock file has been generated for you in $out/composer.lock" + echo + echo 'To fix the issue:' + echo "1. Copy the composer.lock file from $out/composer.lock to the project's source:" + echo " cp $out/composer.lock <path>" + echo '2. Add the composerLock attribute, pointing to the copied composer.lock file:' + echo ' composerLock = ./composer.lock;' + echo + + exit 1 fi echo "Finished composerRepositoryConfigureHook" @@ -61,8 +75,8 @@ composerRepositoryInstallHook() { cp -ar repository/. $out/ - # Copy the composer.lock files to the output directory, in case it has been - # autogenerated. + # Copy the composer.lock files to the output directory, to be able to validate consistency with + # the src composer.lock file where this fixed-output derivation is used cp composer.lock $out/ echo "Finished composerRepositoryInstallHook" diff --git a/pkgs/build-support/php/hooks/default.nix b/pkgs/build-support/php/hooks/default.nix index e7de98647c397..c19bc757581f2 100644 --- a/pkgs/build-support/php/hooks/default.nix +++ b/pkgs/build-support/php/hooks/default.nix @@ -1,22 +1,29 @@ -{ makeSetupHook +{ lib +, makeSetupHook , jq , moreutils , makeBinaryWrapper , php +, cacert +, buildPackages }: { composerRepositoryHook = makeSetupHook { name = "composer-repository-hook.sh"; - propagatedBuildInputs = [ jq moreutils php ]; + propagatedBuildInputs = [ jq moreutils php cacert ]; substitutions = { }; } ./composer-repository-hook.sh; composerInstallHook = makeSetupHook { name = "composer-install-hook.sh"; - propagatedBuildInputs = [ jq makeBinaryWrapper moreutils php ]; - substitutions = { }; + propagatedBuildInputs = [ jq makeBinaryWrapper moreutils php cacert ]; + substitutions = { + # Specify the stdenv's `diff` by abspath to ensure that the user's build + # inputs do not cause us to find the wrong `diff`. + diff = "${lib.getBin buildPackages.diffutils}/bin/diff"; + }; } ./composer-install-hook.sh; } diff --git a/pkgs/build-support/php/pkgs/composer-local-repo-plugin.nix b/pkgs/build-support/php/pkgs/composer-local-repo-plugin.nix index f4f1cc1ff72ed..d81f30f4baa40 100644 --- a/pkgs/build-support/php/pkgs/composer-local-repo-plugin.nix +++ b/pkgs/build-support/php/pkgs/composer-local-repo-plugin.nix @@ -27,13 +27,13 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "composer-local-repo-plugin"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "nix-community"; repo = "composer-local-repo-plugin"; rev = finalAttrs.version; - hash = "sha256-L1DPAINlYiC/HdcgDpI72OI58v8LWfhZVuS1vtNDnEw="; + hash = "sha256-fLJlxcAQ7X28GDK8PVYKxJgTzbspfWxvgRmRK4NZRIA="; }; COMPOSER_CACHE_DIR = "/dev/null"; diff --git a/pkgs/build-support/php/pkgs/composer-phar.nix b/pkgs/build-support/php/pkgs/composer-phar.nix index 3efd9098d6df5..7269d3029b6b6 100644 --- a/pkgs/build-support/php/pkgs/composer-phar.nix +++ b/pkgs/build-support/php/pkgs/composer-phar.nix @@ -14,11 +14,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "composer-phar"; - version = "2.6.3"; + version = "2.6.4"; src = fetchurl { url = "https://github.com/composer/composer/releases/download/${finalAttrs.version}/composer.phar"; - hash = "sha256-5Yo5DKwN9FzPWj2VrpT6I57e2LeQf6LI91LwIDBPybE="; + hash = "sha256-Wjnz4s5bo5HuP+yyJ/ryE5D1t+1cVvFMq54cMEi8+Lg="; }; dontUnpack = true; diff --git a/pkgs/by-name/_4/_4th/package.nix b/pkgs/by-name/_4/_4th/package.nix index 18811f5b9bf7f..d965f8c5e07f0 100644 --- a/pkgs/by-name/_4/_4th/package.nix +++ b/pkgs/by-name/_4/_4th/package.nix @@ -23,7 +23,8 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "-C sources" - "CC=${stdenv.cc.targetPrefix}cc" + "CC:=$(CC)" + "AR:=$(AR)" ]; preInstall = '' diff --git a/pkgs/by-name/aa/aarch64-esr-decoder/package.nix b/pkgs/by-name/aa/aarch64-esr-decoder/package.nix new file mode 100644 index 0000000000000..72fb2da2e1329 --- /dev/null +++ b/pkgs/by-name/aa/aarch64-esr-decoder/package.nix @@ -0,0 +1,27 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "aarch64-esr-decoder"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "google"; + repo = "aarch64-esr-decoder"; + rev = version; + hash = "sha256-YdB/8EUeELcKBj8UMbeWFzJ8HeMHvDgrP2qlOJp2dXA="; + }; + + cargoHash = "sha256-P55DiHBUkr6mreGnWET4+TzLkKnVQJ0UwvrGp6BQ304="; + + meta = with lib; { + description = "A utility for decoding aarch64 ESR register values"; + homepage = "https://github.com/google/aarch64-esr-decoder"; + changelog = "https://github.com/google/aarch64-esr-decoder/blob/${src.rev}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ jmbaur ]; + mainProgram = "aarch64-esr-decoder"; + }; +} diff --git a/pkgs/applications/window-managers/afterstep/default.nix b/pkgs/by-name/af/afterstep/package.nix index e344bbdf558da..c91771fefe2da 100644 --- a/pkgs/applications/window-managers/afterstep/default.nix +++ b/pkgs/by-name/af/afterstep/package.nix @@ -1,26 +1,31 @@ -{ lib, stdenv, fetchurl, pkg-config -, libtiff -, fltk, gtk -, libICE, libSM -, dbus +{ lib +, stdenv +, fetchFromGitHub , fetchpatch +, dbus +, fltk13 +, gtk2 +, libICE +, libSM +, libtiff +, pkg-config }: -stdenv.mkDerivation rec { - +stdenv.mkDerivation (finalAttrs: { pname = "afterstep"; version = "2.2.12"; - sourceName = "AfterStep-${version}"; - src = fetchurl { - urls = [ "ftp://ftp.afterstep.org/stable/${sourceName}.tar.bz2" ]; - sha256 = "1j7vkx1ig4kzwffdxnkqv3kld9qi3sam4w2nhq18waqjsi8xl5gz"; + src = fetchFromGitHub { + owner = "afterstep"; + repo = "afterstep"; + rev = finalAttrs.version; + hash = "sha256-j1ADTRZ3Mxv9VNZWhWCFMnM/CJfkphdrgbw9Ca3bBw0="; }; patches = [ (fetchpatch { url = "https://salsa.debian.org/debian/afterstep/raw/master/debian/patches/44-Fix-build-with-gcc-5.patch"; - sha256 = "1vipy2lzzd2gqrsqk85pwgcdhargy815fxlbn57hsm45zglc3lj4"; + hash = "sha256-RNLB6PuFVA1PsYt2VwLyLyvY2OO3oIl1xk+0/6nwN+4="; }) # Fix pending upstream inclusion for binutils-2.36 support: @@ -28,7 +33,7 @@ stdenv.mkDerivation rec { (fetchpatch { name = "binutils-2.36.patch"; url = "https://github.com/afterstep/afterstep/commit/5e9e897cf8c455390dd6f5b27fec49707f6b9088.patch"; - sha256 = "1kk97max05r2p1a71pvpaza79ff0klz32rggik342p7ki3516qv8"; + hash = "sha256-aGMTyojzXEHGjO9lMT6dwLl01Fd333BUuCIX0FU9ac4="; }) ]; @@ -40,8 +45,22 @@ stdenv.mkDerivation rec { done ''; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libtiff fltk gtk libICE libSM dbus ]; + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + dbus + fltk13 + gtk2 + libICE + libSM + libtiff + ]; + + outputs = [ "out" "man" ]; + + strictDeps = true; # A strange type of bug: dbus is not immediately found by pkg-config preConfigure = '' @@ -66,20 +85,19 @@ stdenv.mkDerivation rec { # https://github.com/afterstep/afterstep/issues/8 enableParallelBuilding = false; - meta = with lib; { + meta = { + homepage = "http://www.afterstep.org/"; description = "A NEXTStep-inspired window manager"; longDescription = '' - AfterStep is a window manager for the Unix X Window - System. Originally based on the look and feel of the NeXTStep - interface, it provides end users with a consistent, clean, and - elegant desktop. The goal of AfterStep development is to provide - for flexibility of desktop configuration, improving aestetics, - and efficient use of system resources. + AfterStep is a window manager for the Unix X Window System. Originally + based on the look and feel of the NeXTStep interface, it provides end + users with a consistent, clean, and elegant desktop. The goal of AfterStep + development is to provide for flexibility of desktop configuration, + improving aestetics, and efficient use of system resources. ''; - homepage = "http://www.afterstep.org/"; - license = licenses.gpl2; - maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ AndersonTorres ]; + mainProgram = "afterstep"; + platforms = lib.platforms.linux; }; - -} +}) diff --git a/pkgs/by-name/al/algol68g/package.nix b/pkgs/by-name/al/algol68g/package.nix index 25d0d9f4c5186..a5dbf958e8a25 100644 --- a/pkgs/by-name/al/algol68g/package.nix +++ b/pkgs/by-name/al/algol68g/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "algol68g"; - version = "3.3.22"; + version = "3.3.24"; src = fetchurl { url = "https://jmvdveer.home.xs4all.nl/algol68g-${finalAttrs.version}.tar.gz"; - hash = "sha256-cSD6lngCy7SC2P7GyUCajk6i863a3vvCjtgZLF0TrIA="; + hash = "sha256-vSbj3YlyCs4bADpDqxAkcSC1VsoQZ2j+jIKe577WtDU="; }; outputs = [ "out" "man" ] ++ lib.optional withPDFDoc "doc"; diff --git a/pkgs/by-name/al/alt-tab-macos/package.nix b/pkgs/by-name/al/alt-tab-macos/package.nix new file mode 100644 index 0000000000000..d63dd91c05db3 --- /dev/null +++ b/pkgs/by-name/al/alt-tab-macos/package.nix @@ -0,0 +1,37 @@ +{ lib +, stdenvNoCC +, fetchurl +, unzip +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "alt-tab-macos"; + version = "6.61.0"; + + src = fetchurl { + url = "https://github.com/lwouis/alt-tab-macos/releases/download/v${finalAttrs.version}/AltTab-${finalAttrs.version}.zip"; + hash = "sha256-crmeYVeSmu5avNSd3dCbEeGnuqonh1HC5NnEOz8OB2U="; + }; + + sourceRoot = "."; + + nativeBuildInputs = [ unzip ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications + cp -r *.app $out/Applications + + runHook postInstall + ''; + + meta = with lib; { + description = "Windows alt-tab on macOS"; + homepage = "https://alt-tab-macos.netlify.app"; + license = licenses.gpl3Plus; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with maintainers; [ emilytrau Enzime ]; + platforms = platforms.darwin; + }; +}) diff --git a/pkgs/by-name/ar/arjun/package.nix b/pkgs/by-name/ar/arjun/package.nix new file mode 100644 index 0000000000000..bd98e1c1cb33b --- /dev/null +++ b/pkgs/by-name/ar/arjun/package.nix @@ -0,0 +1,43 @@ +{ lib +, python3 +, fetchFromGitHub +}: + +python3.pkgs.buildPythonApplication rec { + pname = "arjun"; + version = "2.2.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "s0md3v"; + repo = "Arjun"; + rev = "refs/tags/${version}"; + hash = "sha256-YxfUlD7aBwoYYsZE0zTZxoXg1TgU2yT1V+mglmsXtlo="; + }; + + nativeBuildInputs = with python3.pkgs; [ + setuptools + wheel + ]; + + propagatedBuildInputs = with python3.pkgs; [ + requests + dicttoxml + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "arjun" + ]; + + meta = with lib; { + description = "HTTP parameter discovery suite"; + homepage = "https://github.com/s0md3v/Arjun"; + changelog = "https://github.com/s0md3v/Arjun/blob/${version}/CHANGELOG.md"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ octodi ]; + mainProgram = "arjun"; + }; +} diff --git a/pkgs/by-name/ar/armbian-firmware/package.nix b/pkgs/by-name/ar/armbian-firmware/package.nix new file mode 100644 index 0000000000000..6e97c5908871e --- /dev/null +++ b/pkgs/by-name/ar/armbian-firmware/package.nix @@ -0,0 +1,33 @@ +{ stdenvNoCC, lib, fetchFromGitHub }: +stdenvNoCC.mkDerivation rec { + pname = "armbian-firmware"; + version = "unstable-2023-09-16"; + + src = fetchFromGitHub { + owner = "armbian"; + repo = "firmware"; + rev = "01f9809bb0c4bd60c0c84b9438486b02d58b03f7"; + hash = "sha256-ozKADff7lFjIT/Zf5dkNlCe8lOK+kwYb/60NaCJ8i2k="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/firmware + cp -a * $out/lib/firmware/ + + runHook postInstall + ''; + + # Firmware blobs do not need fixing and should not be modified + dontBuild = true; + dontFixup = true; + + meta = with lib; { + description = "Firmware from Armbian"; + homepage = "https://github.com/armbian/firmware"; + license = licenses.unfree; + platforms = platforms.all; + maintainers = with maintainers; [ zaldnoay ]; + }; +} diff --git a/pkgs/by-name/as/ast-grep/package.nix b/pkgs/by-name/as/ast-grep/package.nix new file mode 100644 index 0000000000000..3ac77c214afc2 --- /dev/null +++ b/pkgs/by-name/as/ast-grep/package.nix @@ -0,0 +1,47 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, stdenv +}: + +rustPlatform.buildRustPackage rec { + pname = "ast-grep"; + version = "0.12.4"; + + src = fetchFromGitHub { + owner = "ast-grep"; + repo = "ast-grep"; + rev = version; + hash = "sha256-rWfuPk8PWxOmy/WDXGnqBCuGPEI7tBwuOc0IP2FhAq8="; + }; + + cargoHash = "sha256-M3eNvY8UwsnV9mvkGD//u1zTiJzV1ce7ODyQjnDSZTo="; + + # error: linker `aarch64-linux-gnu-gcc` not found + postPatch = '' + rm .cargo/config.toml + ''; + + checkFlags = [ + # disable flaky test + "--skip=test::test_load_parser_mac" + + # BUG: Broke by 0.12.1 update (https://github.com/NixOS/nixpkgs/pull/257385) + # Please check if this is fixed in future updates of the package + "--skip=verify::test_case::tests::test_unmatching_id" + ] ++ lib.optionals (with stdenv.hostPlatform; (isDarwin && isx86_64) || (isLinux && isAarch64)) [ + # x86_64-darwin: source/benches/fixtures/json-mac.so\' (no such file), \'/private/tmp/nix-build-.../source/benches/fixtures/json-mac.so\' (mach-o file, but is an incompatible architecture (have \'arm64\', need \'x86_64h\' or \'x86_64\'))" }) + # aarch64-linux: /build/source/benches/fixtures/json-linux.so: cannot open shared object file: No such file or directory" + "--skip=test::test_load_parser" + "--skip=test::test_register_lang" + ]; + + meta = with lib; { + mainProgram = "sg"; + description = "A fast and polyglot tool for code searching, linting, rewriting at large scale"; + homepage = "https://ast-grep.github.io/"; + changelog = "https://github.com/ast-grep/ast-grep/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ montchr lord-valen cafkafk ]; + }; +} diff --git a/pkgs/by-name/aw/aws-azure-login/package.nix b/pkgs/by-name/aw/aws-azure-login/package.nix new file mode 100644 index 0000000000000..a32648fa321cb --- /dev/null +++ b/pkgs/by-name/aw/aws-azure-login/package.nix @@ -0,0 +1,76 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchYarnDeps +, makeWrapper +, nodejs +, prefetch-yarn-deps +, yarn +}: + +stdenv.mkDerivation rec { + pname = "aws-azure-login"; + version = "3.6.1"; + + src = fetchFromGitHub { + owner = "aws-azure-login"; + repo = "aws-azure-login"; + rev = "v${version}"; + hash = "sha256-PvPnqaKD98h3dCjEOwF+Uc86xCJzn2b9XNHHn13h/2Y="; + }; + + offlineCache = fetchYarnDeps { + yarnLock = "${src}/yarn.lock"; + hash = "sha256-SXQPRzF6b1FJl5HkyXNm3kGoNSDXux+0RYXBX93mOts="; + }; + + nativeBuildInputs = [ + makeWrapper + nodejs + prefetch-yarn-deps + yarn + ]; + + configurePhase = '' + runHook preConfigure + + export HOME=$(mktemp -d) + yarn config --offline set yarn-offline-mirror "$offlineCache" + fixup-yarn-lock yarn.lock + yarn --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive install + patchShebangs node_modules + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + yarn --offline build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + yarn --offline --production install + + mkdir -p "$out/lib/node_modules/aws-azure-login" + cp -r . "$out/lib/node_modules/aws-azure-login" + + makeWrapper "${nodejs}/bin/node" "$out/bin/aws-azure-login" \ + --add-flags "$out/lib/node_modules/aws-azure-login/lib/index.js" + + runHook postInstall + ''; + + meta = { + description = "Use Azure AD SSO to log into the AWS via CLI"; + homepage = "https://github.com/aws-azure-login/aws-azure-login"; + license = lib.licenses.mit; + mainProgram = "aws-azure-login"; + maintainers = with lib.maintainers; [ yurrriq ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/ba/backlight-auto/package.nix b/pkgs/by-name/ba/backlight-auto/package.nix new file mode 100644 index 0000000000000..5115ae2296735 --- /dev/null +++ b/pkgs/by-name/ba/backlight-auto/package.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, zig, libyuv, fetchFromGitHub }: +stdenv.mkDerivation (finalAttrs: { + pname = "backlight-auto"; + version = "0.0.1"; + + src = fetchFromGitHub { + owner = "lf94"; + repo = "backlight-auto"; + rev = finalAttrs.version; + hash = "sha256-QPymwlDrgKM/SXDzJdmfzWLSLU2D7egif1OIUE+SHoI="; + }; + + nativeBuildInputs = [ + zig.hook + ]; + + buildInputs = [ + libyuv + ]; + + meta = with lib; { + description = "Automatically set screen brightness with a webcam"; + homepage = "https://len.falken.directory/backlight-auto.html"; + license = licenses.mit; + maintainers = [ maintainers.lf- ]; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/by-name/ba/badger/package.nix b/pkgs/by-name/ba/badger/package.nix new file mode 100644 index 0000000000000..4c41b8f884962 --- /dev/null +++ b/pkgs/by-name/ba/badger/package.nix @@ -0,0 +1,30 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "badger"; + version = "4.2.0"; + + src = fetchFromGitHub { + owner = "dgraph-io"; + repo = "badger"; + rev = "v${version}"; + hash = "sha256-+b+VTGUGmqixB51f1U2QK+XfVra4zXybW19n/CeeoAQ="; + }; + + vendorHash = "sha256-YiSmxtRt8HtYcvPL9ZKMjb2ch/MZBjZp5pIIBdqQ7Nw="; + + subPackages = [ "badger" ]; + + doCheck = false; + + meta = with lib; { + description = "Fast key-value DB in Go"; + homepage = "https://github.com/dgraph-io/badger"; + license = licenses.asl20; + mainProgram = "badger"; + maintainers = with maintainers; [ farcaller ]; + }; +} diff --git a/pkgs/applications/window-managers/berry/default.nix b/pkgs/by-name/be/berry/package.nix index e044ce8485e5e..6d053c77fa596 100644 --- a/pkgs/applications/window-managers/berry/default.nix +++ b/pkgs/by-name/be/berry/package.nix @@ -13,14 +13,14 @@ , which }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "berry"; version = "0.1.12"; src = fetchFromGitHub { owner = "JLErvin"; - repo = pname; - rev = version; + repo = "berry"; + rev = finalAttrs.version; hash = "sha256-xMJRiLNtwVRQf9HiCF3ClLKEmdDNxcY35IYxe+L7+Hk="; }; @@ -39,8 +39,12 @@ stdenv.mkDerivation rec { freetype ]; + outputs = [ "out" "man" ]; + + strictDeps = true; + postPatch = '' - sed -i --regexp-extended 's/(pkg_verstr=").*(")/\1${version}\2/' configure + sed -i --regexp-extended 's/(pkg_verstr=").*(")/\1${finalAttrs.version}\2/' configure ''; preConfigure = '' @@ -49,16 +53,16 @@ stdenv.mkDerivation rec { desktopItems = [ (makeDesktopItem { - name = pname; + name = "berry"; exec = "berry"; - comment = meta.description; + comment = "A healthy, bite-sized window manager"; desktopName = "Berry Window Manager"; genericName = "Berry Window Manager"; categories = [ "Utility" ]; }) ]; - meta = with lib; { + meta = { homepage = "https://berrywm.org/"; description = "A healthy, bite-sized window manager"; longDescription = '' @@ -74,8 +78,9 @@ stdenv.mkDerivation rec { - Intuitively place new windows in unoccupied spaces. - Virtual desktops. ''; - license = licenses.mit; - maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.linux; + license = lib.licenses.mit; + mainProgram = "berry"; + maintainers = [ lib.maintainers.AndersonTorres ]; + inherit (libX11.meta) platforms; }; -} +}) diff --git a/pkgs/development/tools/build-managers/bmake/bootstrap-fix.patch b/pkgs/by-name/bm/bmake/001-bootstrap-fix.diff index 9b1267257ad16..9b1267257ad16 100644 --- a/pkgs/development/tools/build-managers/bmake/bootstrap-fix.patch +++ b/pkgs/by-name/bm/bmake/001-bootstrap-fix.diff diff --git a/pkgs/development/tools/build-managers/bmake/dont-test-while-installing.diff b/pkgs/by-name/bm/bmake/002-dont-test-while-installing.diff index ab9399920c242..ab9399920c242 100644 --- a/pkgs/development/tools/build-managers/bmake/dont-test-while-installing.diff +++ b/pkgs/by-name/bm/bmake/002-dont-test-while-installing.diff diff --git a/pkgs/development/tools/build-managers/bmake/fix-unexport-env-test.patch b/pkgs/by-name/bm/bmake/003-fix-unexport-env-test.diff index fbf7225a6d6f2..fbf7225a6d6f2 100644 --- a/pkgs/development/tools/build-managers/bmake/fix-unexport-env-test.patch +++ b/pkgs/by-name/bm/bmake/003-fix-unexport-env-test.diff diff --git a/pkgs/development/tools/build-managers/bmake/unconditional-ksh-test.patch b/pkgs/by-name/bm/bmake/004-unconditional-ksh-test.diff index 117b85da16d1d..117b85da16d1d 100644 --- a/pkgs/development/tools/build-managers/bmake/unconditional-ksh-test.patch +++ b/pkgs/by-name/bm/bmake/004-unconditional-ksh-test.diff diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/by-name/bm/bmake/package.nix index 4373e534bc58f..2626c45f0215e 100644 --- a/pkgs/development/tools/build-managers/bmake/default.nix +++ b/pkgs/by-name/bm/bmake/package.nix @@ -4,28 +4,29 @@ , fetchpatch , getopt , ksh +, bc , tzdata , pkgsMusl # for passthru.tests }: stdenv.mkDerivation (finalAttrs: { pname = "bmake"; - version = "20230723"; + version = "20230909"; src = fetchurl { url = "http://www.crufty.net/ftp/pub/sjg/bmake-${finalAttrs.version}.tar.gz"; - hash = "sha256-xCoNlRuiP3ZlMxMJ+74h7cARNqI8uUFoULQxW+X7WQQ="; + hash = "sha256-Hl5sdlQN/oEEQmzX/T9xXMZAT5A5ySA0RwErjy9re4Y="; }; patches = [ # make bootstrap script aware of the prefix in /nix/store - ./bootstrap-fix.patch + ./001-bootstrap-fix.diff + # decouple tests from build phase + ./002-dont-test-while-installing.diff # preserve PATH from build env in unit tests - ./fix-unexport-env-test.patch + ./003-fix-unexport-env-test.diff # Always enable ksh test since it checks in a impure location /bin/ksh - ./unconditional-ksh-test.patch - # decouple tests from build phase - ./dont-test-while-installing.diff + ./004-unconditional-ksh-test.diff ]; # Make tests work with musl @@ -68,18 +69,22 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; nativeCheckInputs = [ + bc tzdata ] ++ lib.optionals (stdenv.hostPlatform.libc != "musl") [ ksh ]; # Disabled tests: + # directive-export{,-gmake}: another failure related to TZ variables # opt-chdir: ofborg complains about it somehow # opt-keep-going-indirect: not yet known # varmod-localtime: musl doesn't support TZDIR and this test relies on impure, # implicit paths env.BROKEN_TESTS = builtins.concatStringsSep " " [ - "opt-chdir" + "directive-export" + "directive-export-gmake" + "opt-chdir" # works on my machine -- AndersonTorres "opt-keep-going-indirect" "varmod-localtime" ]; @@ -92,6 +97,8 @@ stdenv.mkDerivation (finalAttrs: { runHook postCheck ''; + strictDeps = true; + setupHook = ./setup-hook.sh; passthru.tests.bmakeMusl = pkgsMusl.bmake; @@ -100,9 +107,12 @@ stdenv.mkDerivation (finalAttrs: { homepage = "http://www.crufty.net/help/sjg/bmake.html"; description = "Portable version of NetBSD 'make'"; license = lib.licenses.bsd3; + mainProgram = "bmake"; maintainers = with lib.maintainers; [ thoughtpolice AndersonTorres ]; platforms = lib.platforms.unix; - broken = stdenv.isAarch64; # failure on gnulib-tests + # ofborg: x86_64-linux builds the musl package, aarch64-linux doesn't + broken = stdenv.targetPlatform.isMusl && stdenv.buildPlatform.isAarch64; }; }) # TODO: report the quirks and patches to bmake devteam (especially the Musl one) +# TODO: investigate Musl support diff --git a/pkgs/development/tools/build-managers/bmake/setup-hook.sh b/pkgs/by-name/bm/bmake/setup-hook.sh index a36d024b111e7..a36d024b111e7 100644 --- a/pkgs/development/tools/build-managers/bmake/setup-hook.sh +++ b/pkgs/by-name/bm/bmake/setup-hook.sh diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix new file mode 100644 index 0000000000000..4dfa1375ef7a2 --- /dev/null +++ b/pkgs/by-name/br/bruno/package.nix @@ -0,0 +1,61 @@ +{ lib +, stdenv +, fetchurl +, autoPatchelfHook +, dpkg +, wrapGAppsHook +, alsa-lib +, gtk3 +, mesa +, nspr +, nss +, systemd +, nix-update-script +}: + +stdenv.mkDerivation rec { + pname = "bruno"; + version = "0.17.0"; + + src = fetchurl { + url = "https://github.com/usebruno/bruno/releases/download/v${version}/bruno_${version}_amd64_linux.deb"; + hash = "sha256-4FF9SEgWuIPQSarOBTaEvgdgRTkR1caRYr/bjfFmTLE="; + }; + + nativeBuildInputs = [ autoPatchelfHook dpkg wrapGAppsHook ]; + + buildInputs = [ + alsa-lib + gtk3 + mesa + nspr + nss + ]; + + runtimeDependencies = [ (lib.getLib systemd) ]; + + installPhase = '' + runHook preInstall + mkdir -p "$out/bin" + cp -R opt $out + cp -R "usr/share" "$out/share" + ln -s "$out/opt/Bruno/bruno" "$out/bin/bruno" + chmod -R g-w "$out" + runHook postInstall + ''; + + postFixup = '' + substituteInPlace "$out/share/applications/bruno.desktop" \ + --replace "/opt/Bruno/bruno" "$out/bin/bruno" + ''; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Open-source IDE For exploring and testing APIs."; + homepage = "https://www.usebruno.com"; + license = licenses.mit; + maintainers = with maintainers; [ water-sucks lucasew ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/by-name/ca/cargo-bump/package.nix b/pkgs/by-name/ca/cargo-bump/package.nix new file mode 100644 index 0000000000000..76f21c1ca0270 --- /dev/null +++ b/pkgs/by-name/ca/cargo-bump/package.nix @@ -0,0 +1,36 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-bump"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "rustadopt"; + repo = "cargo-bump"; + rev = "v${version}"; + hash = "sha256-PhA7uC2gJcBnUQPWgZC51p/KTSxSGld3m+dd6BhW6q8="; + }; + + cargoHash = "sha256-mp2y5q0GYfSlB5aPC6MY9Go8a2JAiPKtVYL9SewfloI="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + meta = with lib; { + description = "Increments the version number of the current project."; + homepage = "https://github.com/wraithan/cargo-bump"; + license = with licenses; [ isc ]; + maintainers = with maintainers; [ cafkafk ]; + }; +} diff --git a/pkgs/by-name/ca/cargo-i18n/package.nix b/pkgs/by-name/ca/cargo-i18n/package.nix new file mode 100644 index 0000000000000..158d22f97b03a --- /dev/null +++ b/pkgs/by-name/ca/cargo-i18n/package.nix @@ -0,0 +1,34 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-i18n"; + version = "0.2.12"; + + src = fetchFromGitHub { + owner = "kellpossible"; + repo = "cargo-i18n"; + rev = "v${version}"; + hash = "sha256-ck0GYy9DLngOunpItGQ4+qrlzaWDk0zTnIzuRQt2/Gw="; + }; + + cargoHash = "sha256-nvZx2wJDs7PZQLCl8Hrf2blR+lNUBVr6k664VSVQ5iI="; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Foundation + ]; + + cargoTestFlags = [ "--lib" ]; + + meta = with lib; { + description = "Rust Cargo sub-command and libraries to extract and build localization resources to embed in your application/library"; + homepage = "https://github.com/kellpossible/cargo-i18n"; + license = licenses.mit; + maintainers = with maintainers; [ xrelkd ]; + mainProgram = "cargo-i18n"; + }; +} diff --git a/pkgs/by-name/ci/circle-flags/package.nix b/pkgs/by-name/ci/circle-flags/package.nix new file mode 100644 index 0000000000000..eed82fbdbb47a --- /dev/null +++ b/pkgs/by-name/ci/circle-flags/package.nix @@ -0,0 +1,36 @@ +{ stdenvNoCC +, lib +, fetchFromGitHub +, nix-update-script +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "circle-flags"; + version = "2.7.0"; + + src = fetchFromGitHub { + owner = "HatScripts"; + repo = "circle-flags"; + rev = "v${finalAttrs.version}"; + hash = "sha256-/+f5MDRW+tRH+jMtl3XuVPBShgy2PlD3NY+74mJa2Qk="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share + mv flags $out/share/circle-flags-svg + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + homepage = "https://github.com/HatScripts/circle-flags"; + description = "Collection of 400+ minimal circular SVG country and state flags"; + license = licenses.mit; + maintainers = with maintainers; [ bobby285271 ]; + platforms = platforms.all; + }; +}) diff --git a/pkgs/by-name/cl/clzip/package.nix b/pkgs/by-name/cl/clzip/package.nix new file mode 100644 index 0000000000000..84f485d39891a --- /dev/null +++ b/pkgs/by-name/cl/clzip/package.nix @@ -0,0 +1,22 @@ +{ lib +, stdenv +, fetchurl +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "clzip"; + version = "1.13"; + + src = fetchurl { + url = "mirror://savannah/lzip/clzip/clzip-${finalAttrs.version}.tar.gz"; + hash = "sha256-esn79QNr9Q+wtqIOhNIpPLDSTUBE6vM8vpdgu55/6no="; + }; + + meta = with lib; { + homepage = "https://www.nongnu.org/lzip/clzip.html"; + description = "C language version of lzip"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ rs0vere ]; + platforms = platforms.all; + }; +}) diff --git a/pkgs/by-name/cn/cntb/package.nix b/pkgs/by-name/cn/cntb/package.nix new file mode 100644 index 0000000000000..78e5f16f303c8 --- /dev/null +++ b/pkgs/by-name/cn/cntb/package.nix @@ -0,0 +1,30 @@ +{ buildGoModule +, lib +, fetchFromGitHub +}: buildGoModule rec { + pname = "cntb"; + version = "1.4.6"; + + src = fetchFromGitHub { + owner = "contabo"; + repo = "cntb"; + rev = "v${version}"; + hash = "sha256-bvWNcEUSSHEk8fwwPdowATGEHIAj+TN8Z+A156sPVtA="; + # docs contains two files with the same name but different cases, + # this leads to a different hash on case insensitive filesystems (e.g. darwin) + postFetch = '' + rm -rf $out/openapi/docs + ''; + }; + + subPackages = [ "." ]; + + vendorHash = "sha256-++y2C3jYuGZ0ovRFoxeqnx7S9EwoOZBJ5zxeLGWjkqc="; + + meta = with lib; { + description = "CLI tool for managing your products from Contabo like VPS and VDS"; + homepage = "https://github.com/contabo/cntb"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ aciceri ]; + }; +} diff --git a/pkgs/by-name/co/colorized-logs/package.nix b/pkgs/by-name/co/colorized-logs/package.nix new file mode 100644 index 0000000000000..9913d0d765bab --- /dev/null +++ b/pkgs/by-name/co/colorized-logs/package.nix @@ -0,0 +1,30 @@ +{ cmake +, fetchFromGitHub +, lib +, stdenv +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "colorized-logs"; + version = "2.6"; + + src = fetchFromGitHub { + owner = "kilobyte"; + repo = "colorized-logs"; + rev = "v${finalAttrs.version}"; + hash = "sha256-QiZeIYeIWA3C7wYi2G2EItdW+jLjVrCbIYllur/RtY8="; + }; + + nativeBuildInputs = [ + cmake + ]; + + meta = { + description = "Tools for logs with ANSI color"; + homepage = "https://github.com/kilobyte/colorized-logs"; + changelog = "https://github.com/kilobyte/colorized-logs/blob/v${finalAttrs.version}/ChangeLog"; + license = with lib.licenses; [ mit ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ CobaltCause ]; + }; +}) diff --git a/pkgs/by-name/co/comic-mandown/package.nix b/pkgs/by-name/co/comic-mandown/package.nix new file mode 100644 index 0000000000000..1e08eb28cb451 --- /dev/null +++ b/pkgs/by-name/co/comic-mandown/package.nix @@ -0,0 +1,17 @@ +{ lib +, python3Packages +, fetchFromGitHub + +, withGUI ? true +}: +let + mandown' = python3Packages.mandown.overrideAttrs (prev: { + propagatedBuildInputs = prev.propagatedBuildInputs ++ lib.optionals withGUI prev.passthru.optional-dependencies.gui; + }); + mandownApp = python3Packages.toPythonApplication mandown'; +in +mandownApp // { + meta = mandownApp.meta // { + mainProgram = "mandown"; + }; +} diff --git a/pkgs/by-name/co/composefs/package.nix b/pkgs/by-name/co/composefs/package.nix new file mode 100644 index 0000000000000..3908d14ef56eb --- /dev/null +++ b/pkgs/by-name/co/composefs/package.nix @@ -0,0 +1,101 @@ +{ lib +, stdenv +, fetchFromGitHub + +, autoreconfHook +, pandoc +, pkg-config +, openssl +, fuse3 +, yajl +, libcap +, libseccomp +, python3 +, which +, valgrind +, erofs-utils +, fsverity-utils +, nix-update-script +, testers + +, fuseSupport ? lib.meta.availableOn stdenv.hostPlatform fuse3 +, yajlSupport ? lib.meta.availableOn stdenv.hostPlatform yajl +, enableValgrindCheck ? false +, installExperimentalTools ? false +}: +# https://github.com/containers/composefs/issues/204 +assert installExperimentalTools -> (!stdenv.hostPlatform.isMusl); +stdenv.mkDerivation (finalAttrs: { + pname = "composefs"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "containers"; + repo = "composefs"; + rev = "v${finalAttrs.version}"; + hash = "sha256-OjayMhLc3otqQjHsbLN8nm9D9yGOifBcrSLixjnJmvE="; + }; + + strictDeps = true; + outputs = [ "out" "lib" "dev" ]; + + postPatch = lib.optionalString installExperimentalTools '' + sed -i "s/noinst_PROGRAMS +\?=/bin_PROGRAMS +=/g" tools/Makefile.am + ''; + + configureFlags = lib.optionals enableValgrindCheck [ + (lib.enableFeature true "valgrind-test") + ]; + + nativeBuildInputs = [ autoreconfHook pandoc pkg-config ]; + buildInputs = [ openssl ] + ++ lib.optional fuseSupport fuse3 + ++ lib.optional yajlSupport yajl + ++ lib.filter (lib.meta.availableOn stdenv.hostPlatform) ( + [ + libcap + libseccomp + ] + ); + + # yajl is required to read the test json files + doCheck = true; + nativeCheckInputs = [ python3 which ] + ++ lib.optional enableValgrindCheck valgrind + ++ lib.optional fuseSupport fuse3 + ++ lib.filter (lib.meta.availableOn stdenv.buildPlatform) [ erofs-utils fsverity-utils ]; + + preCheck = '' + patchShebangs --build tests/*dir tests/*.sh + substituteInPlace tests/*.sh \ + --replace " /tmp" " $TMPDIR" \ + --replace " /var/tmp" " $TMPDIR" + '' + lib.optionalString (stdenv.hostPlatform.isMusl || !yajlSupport) '' + # test relies on `composefs-from-json` tool + # MUSL: https://github.com/containers/composefs/issues/204 + substituteInPlace tests/Makefile \ + --replace " check-checksums" "" + '' + lib.optionalString (stdenv.hostPlatform.isMusl || enableValgrindCheck) '' + # seccomp sandbox breaks these tests + # MUSL: https://github.com/containers/composefs/issues/206 + substituteInPlace tests/test-checksums.sh \ + --replace "composefs-from-json" "composefs-from-json --no-sandbox" + ''; + + passthru = { + updateScript = nix-update-script { }; + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + + meta = { + description = "A file system for mounting container images"; + homepage = "https://github.com/containers/composefs"; + changelog = "https://github.com/containers/composefs/releases/tag/v${finalAttrs.version}"; + license = with lib.licenses; [ gpl3Plus lgpl21Plus ]; + maintainers = with lib.maintainers; [ kiskae ]; + mainProgram = "mkcomposefs"; + pkgConfigModules = [ "composefs" ]; + platforms = lib.platforms.unix; + badPlatforms = lib.platforms.darwin; + }; +}) diff --git a/pkgs/by-name/co/controku/package.nix b/pkgs/by-name/co/controku/package.nix new file mode 100644 index 0000000000000..a52d2e3264648 --- /dev/null +++ b/pkgs/by-name/co/controku/package.nix @@ -0,0 +1,4 @@ +{ python3Packages +}: + +with python3Packages; toPythonApplication (controku.override { buildApplication = true; }) diff --git a/pkgs/development/tools/convco/default.nix b/pkgs/by-name/co/convco/package.nix index 9b735d2af2158..4112246c743cb 100644 --- a/pkgs/development/tools/convco/default.nix +++ b/pkgs/by-name/co/convco/package.nix @@ -6,30 +6,30 @@ , libiconv , openssl , pkg-config -, Security +, darwin }: rustPlatform.buildRustPackage rec { pname = "convco"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "convco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RNUMLc4lY18tsOr2vmpkYdQ2poVOQxsSVl5PEuhzQxw="; + hash = "sha256-qf04mtxBqZy9kpFsqz8lVtyUzNtCYE8cNiVJVQ+sCn0="; }; - cargoHash = "sha256-ChB4w9qnSzuOGTPYfpAJS2icy9wi1RjONCsfT+3vlRo="; + cargoHash = "sha256-A1z8ccdsaBC9gY4rD/0NnuQHm7x4eVlMPBvkMKGHK54="; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; meta = with lib; { description = "A Conventional commit cli"; homepage = "https://github.com/convco/convco"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ hoverbear ]; + maintainers = with maintainers; [ hoverbear cafkafk ]; }; } diff --git a/pkgs/by-name/cr/create-react-app/package.nix b/pkgs/by-name/cr/create-react-app/package.nix new file mode 100644 index 0000000000000..16ee303ab3d63 --- /dev/null +++ b/pkgs/by-name/cr/create-react-app/package.nix @@ -0,0 +1,33 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "create-react-app"; + version = "5.0.1"; + + src = fetchFromGitHub { + owner = "facebook"; + repo = "create-react-app"; + rev = "v${version}"; + hash = "sha256-nUvJRxBZ98ogSkbw8ciFYtZRQNFD6pLThoEjeDMcGm0="; + }; + + npmDepsHash = "sha256-diGu53lJi+Fs7pTAQGCXoDtP7YyKZLIN/2Wo+e1Mzc4="; + + env.PUPPETEER_SKIP_DOWNLOAD = true; + + npmWorkspace = "packages/create-react-app"; + + dontNpmBuild = true; + + meta = { + changelog = "https://github.com/facebook/create-react-app/blob/${src.rev}/CHANGELOG.md"; + description = "Create React apps with no build configuration"; + homepage = "https://github.com/facebook/create-react-app"; + license = lib.licenses.mit; + mainProgram = "create-react-app"; + maintainers = with lib.maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/applications/terminal-emulators/ctx/0001-Make-arch-detection-optional-and-fix-targets.patch b/pkgs/by-name/ct/ctx/0001-fix-detections.diff index 5e4297ea70402..d2580d0fde1d5 100644 --- a/pkgs/applications/terminal-emulators/ctx/0001-Make-arch-detection-optional-and-fix-targets.patch +++ b/pkgs/by-name/ct/ctx/0001-fix-detections.diff @@ -1,78 +1,41 @@ -From 5c41e49b79ef85e7e23748fbeeaf65df8b769263 Mon Sep 17 00:00:00 2001 -From: Tobias Mayer <tobim@fastmail.fm> -Date: Sat, 10 Jun 2023 14:17:16 +0200 -Subject: [PATCH] Make arch detection optional and fix targets - ---- - Makefile | 6 +++--- - configure.sh | 22 +++++++++++++--------- - 2 files changed, 16 insertions(+), 12 deletions(-) - -diff --git a/Makefile b/Makefile -index d21c53bf..fe982b24 100644 ---- a/Makefile -+++ b/Makefile -@@ -205,8 +205,8 @@ stuff/%.o: stuff/%.c ctx.h stuff/*.h stuff/*.inc Makefile build.conf - libctx.a: itk.o deps.o $(CTX_OBJS) build.conf Makefile - $(AR) rcs $@ $(CTX_OBJS) deps.o itk.o - libctx.so: $(CTX_OBJS) deps.o itk.o build.conf Makefile -- $(LD) -shared $(LIBS) $(CTX_OBJS) deps.o itk.o $(CTX_LIBS) -o $@ -- #$(LD) --retain-symbols-file=symbols -shared $(LIBS) $? $(CTX_LIBS) -o $@ -+ $(CCC) -shared $(LIBS) $(CTX_OBJS) deps.o itk.o $(CTX_LIBS) -o $@ -+ #$(CCC) --retain-symbols-file=symbols -shared $(LIBS) $? $(CTX_LIBS) -o $@ - - ctx: main.c ctx.h build.conf Makefile $(TERMINAL_OBJS) $(MEDIA_HANDLERS_OBJS) libctx.a - $(CCC) main.c $(TERMINAL_OBJS) $(MEDIA_HANDLERS_OBJS) -o $@ $(CFLAGS) libctx.a $(LIBS) $(CTX_CFLAGS) $(OFLAGS_LIGHT) -lpthread $(CTX_LIBS) -@@ -276,5 +276,5 @@ itk/w3c-constants.h: itk/css.h Makefile squoze/squoze - for a in `cat itk/css.h | tr ';' ' ' | tr ',' ' ' | tr ')' ' '|tr ':' ' ' | tr '{' ' ' | tr ' ' '\n' | grep 'SQZ_[a-z][0-9a-zA-Z_]*'| sort | uniq`;do b=`echo $$a|tail -c+5|tr '_' '-'`;echo "#define $$a `./squoze/squoze -33 $$b`u // \"$$b\"";done \ - >> $@ - echo '#endif' >> $@ --static.inc: static/* static/*/* tools/gen_fs.sh -+static.inc: static/* tools/gen_fs.sh - ./tools/gen_fs.sh static > $@ -diff --git a/configure.sh b/configure.sh -index ad388a5d..fd9d3b96 100755 ---- a/configure.sh -+++ b/configure.sh -@@ -43,16 +43,20 @@ ENABLE_FAST_FILL_RECT=1 +diff -Naur --no-dereference ctx-source-old/configure.sh ctx-source-new/configure.sh +--- ctx-source-old/configure.sh 1969-12-31 21:00:01.000000000 -0300 ++++ ctx-source-new/configure.sh 2023-09-27 19:26:05.403569888 -0300 +@@ -42,15 +42,18 @@ ENABLE_SWITCH_DISPATCH=1 pkg-config sdl2 && HAVE_SDL=1 -pkg-config babl && HAVE_BABL=1 --pkg-config cairo && HAVE_CAIRO=1 --pkg-config libcurl && HAVE_LIBCURL=1 --pkg-config alsa && HAVE_ALSA=1 --pkg-config libdrm && HAVE_KMS=1 -+# https://github.com/GNOME/gimp/blob/828a8a7fe7ecd1825387f37a42922bc50fa32be9/meson.build#L349 ++ +pkg-config babl-0.1 && { HAVE_BABL=1; BABL_NAME=babl-0.1; } -+if [ $HAVE_BABL != 1 ];then -+ pkg-config babl && { HAVE_BABL=1; BABL_NAME=babl; } ++if [ $HAVE_BABL != 1 ]; then ++ pkg-config babl && { HAVE_BABL=1; BABL_NAME=babl; } +fi -+pkg-config cairo && HAVE_CAIRO=1 -+pkg-config libcurl && HAVE_LIBCURL=1 -+pkg-config alsa && HAVE_ALSA=1 -+pkg-config libdrm && HAVE_KMS=1 ++ + pkg-config libcurl && HAVE_LIBCURL=1 + pkg-config alsa && HAVE_ALSA=1 + pkg-config libdrm && HAVE_KMS=1 #pkg-config harfbuzz && HAVE_HARFBUZZ=1 - - +- +- -ARCH=`uname -m` +: "${ARCH:="$(uname -m)"}" case "$ARCH" in "x86_64") HAVE_SIMD=1 ;; -@@ -229,8 +233,8 @@ echo >> build.conf +@@ -224,8 +227,8 @@ if [ $HAVE_BABL = 1 ];then echo "#define CTX_BABL 1 " >> local.conf echo "#define CTX_ENABLE_CM 1 " >> local.conf - echo "CTX_CFLAGS+= `pkg-config babl --cflags`" >> build.conf - echo "CTX_LIBS+= `pkg-config babl --libs` " >> build.conf -+ echo "CTX_CFLAGS+= `pkg-config "$BABL_NAME" --cflags`" >> build.conf -+ echo "CTX_LIBS+= `pkg-config "$BABL_NAME" --libs` " >> build.conf ++ echo "CTX_CFLAGS+= `pkg-config "${BABL_NAME}" --cflags`" >> build.conf ++ echo "CTX_LIBS+= `pkg-config "${BABL_NAME}" --libs` " >> build.conf else echo "#define CTX_BABL 0 " >> local.conf echo "#define CTX_ENABLE_CM 0 " >> local.conf -@@ -348,7 +352,7 @@ echo "LIBS=$LIBS" >> build.conf +@@ -335,7 +338,7 @@ #echo "Generating build.deps" #make build.deps 2>/dev/null @@ -81,6 +44,24 @@ index ad388a5d..fd9d3b96 100755 [ $HAVE_SIMD = 1 ] && echo " SIMD multi-pass" echo "" echo "Backends:" --- -2.40.1 - +diff -Naur --no-dereference ctx-source-old/Makefile ctx-source-new/Makefile +--- ctx-source-old/Makefile 1969-12-31 21:00:01.000000000 -0300 ++++ ctx-source-new/Makefile 2023-09-27 19:37:23.779830320 -0300 +@@ -206,8 +206,8 @@ + libctx.a: itk.o deps.o $(CTX_OBJS) build.conf Makefile + $(AR) rcs $@ $(CTX_OBJS) deps.o itk.o + libctx.so: $(CTX_OBJS) deps.o itk.o build.conf Makefile +- $(LD) -shared $(LIBS) $(CTX_OBJS) deps.o itk.o $(CTX_LIBS) -o $@ +- #$(LD) --retain-symbols-file=symbols -shared $(LIBS) $? $(CTX_LIBS) -o $@ ++ $(CCC) -shared $(LIBS) $(CTX_OBJS) deps.o itk.o $(CTX_LIBS) -o $@ ++ #$(CCC) --retain-symbols-file=symbols -shared $(LIBS) $? $(CTX_LIBS) -o $@ + + ctx: main.c ctx.h build.conf Makefile $(TERMINAL_OBJS) $(MEDIA_HANDLERS_OBJS) libctx.a + $(CCC) main.c $(TERMINAL_OBJS) $(MEDIA_HANDLERS_OBJS) -o $@ $(CFLAGS) libctx.a $(LIBS) $(CTX_CFLAGS) $(OFLAGS_LIGHT) -lpthread $(CTX_LIBS) +@@ -277,5 +277,5 @@ + for a in `cat itk/css.h | tr ';' ' ' | tr ',' ' ' | tr ')' ' '|tr ':' ' ' | tr '{' ' ' | tr ' ' '\n' | grep 'SQZ_[a-z][0-9a-zA-Z_]*'| sort | uniq`;do b=`echo $$a|tail -c+5|tr '_' '-'`;echo "#define $$a `./squoze/squoze -33 $$b`u // \"$$b\"";done \ + >> $@ + echo '#endif' >> $@ +-static.inc: static/* static/*/* tools/gen_fs.sh ++static.inc: static/* tools/gen_fs.sh + ./tools/gen_fs.sh static > $@ diff --git a/pkgs/applications/terminal-emulators/ctx/default.nix b/pkgs/by-name/ct/ctx/package.nix index 47f0fd702fa35..b329fd221247b 100644 --- a/pkgs/applications/terminal-emulators/ctx/default.nix +++ b/pkgs/by-name/ct/ctx/package.nix @@ -1,42 +1,42 @@ { lib , stdenv , fetchgit -, pkg-config -, xxd , SDL2 , alsa-lib , babl , bash -, cairo , curl , libdrm # Not documented +, pkg-config +, xxd , enableFb ? false , nixosTests }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "ctx"; - version = "unstable-2023-06-05"; + version = "unstable-2023-09-03"; src = fetchgit { name = "ctx-source"; # because of a dash starting the directory url = "https://ctx.graphics/.git/"; - rev = "2eb3886919d0a0b8c305e4f9e18428dad5e73ca0"; - sha256 = "sha256-PLUyGArxLU742IKIgpzxdBdc94mWWSkHNFoXGW8L/Zo="; + rev = "1bac18c152eace3ca995b3c2b829a452085d46fb"; + hash = "sha256-fOcQJ2XCeomdtAUmy0A+vU7Vt325OSwrb1+ccW+gZ38="; }; patches = [ - ./0001-Make-arch-detection-optional-and-fix-targets.patch + # Many problematic things fixed - it should be upstreamed somehow: + # - babl changed its name in pkg-config files + # - arch detection made optional + # - LD changed to CCC + # - remove inexistent reference to static/*/* + ./0001-fix-detections.diff ]; postPatch = '' patchShebangs ./tools/gen_fs.sh ''; - strictDeps = true; - - env.ARCH = stdenv.hostPlatform.parsed.cpu.arch; - nativeBuildInputs = [ pkg-config xxd @@ -47,11 +47,14 @@ stdenv.mkDerivation { alsa-lib babl bash # for ctx-audioplayer - cairo curl libdrm ]; + strictDeps = true; + + env.ARCH = stdenv.hostPlatform.parsed.cpu.arch; + configureScript = "./configure.sh"; configureFlags = lib.optional enableFb "--enable-fb"; configurePlatforms = []; @@ -64,16 +67,16 @@ stdenv.mkDerivation { passthru.tests.test = nixosTests.terminal-emulators.ctx; - meta = with lib; { + meta = { homepage = "https://ctx.graphics/"; description = "Vector graphics terminal"; - longDescription= '' + longDescription = '' ctx is an interactive 2D vector graphics, audio, text- canvas and terminal, with escape sequences that enable a 2D vector drawing API using a vector graphics protocol. ''; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ AndersonTorres]; - platforms = platforms.unix; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/de/debianutils/package.nix b/pkgs/by-name/de/debianutils/package.nix index 053c667d2ad3c..97623aaeef363 100644 --- a/pkgs/by-name/de/debianutils/package.nix +++ b/pkgs/by-name/de/debianutils/package.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromGitLab , autoreconfHook +, perl , po4a }: @@ -19,6 +20,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ autoreconfHook + perl po4a ]; diff --git a/pkgs/by-name/dm/dmenu-bluetooth/package.nix b/pkgs/by-name/dm/dmenu-bluetooth/package.nix new file mode 100644 index 0000000000000..63a46f1e6e501 --- /dev/null +++ b/pkgs/by-name/dm/dmenu-bluetooth/package.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchFromGitHub +, makeWrapper +, bluez +, dmenu +, nix-update-script +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "dmenu-bluetooth"; + version = "unstable-2023-07-16"; + + src = fetchFromGitHub { + owner = "Layerex"; + repo = "dmenu-bluetooth"; + rev = "96e2e3e1dd7ea2d2ab0c20bf21746aba8d70cc46"; + hash = "sha256-0G2PXWq9/JsLHnbOIJWSWWqfnBgOxaA8N2VyCbTUGmI="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + install -D --target-directory=$out/bin/ ./dmenu-bluetooth + + wrapProgram $out/bin/dmenu-bluetooth \ + --prefix PATH ":" ${lib.makeBinPath [ dmenu bluez ] } + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "A script that generates a dmenu menu that uses bluetoothctl to connect to bluetooth devices and display status info"; + homepage = "https://github.com/Layerex/dmenu-bluetooth"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ ludovicopiero ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/do/dorion/package.nix b/pkgs/by-name/do/dorion/package.nix new file mode 100644 index 0000000000000..2aaefe75a6c82 --- /dev/null +++ b/pkgs/by-name/do/dorion/package.nix @@ -0,0 +1,65 @@ +{ lib +, stdenv +, fetchurl +, autoPatchelfHook +, dpkg +, glib-networking +, gst_all_1 +, libappindicator +, libayatana-appindicator +, webkitgtk +, wrapGAppsHook +}: + +stdenv.mkDerivation (finalAttrs: { + name = "dorion"; + version = "1.2.1"; + + src = fetchurl { + url = "https://github.com/SpikeHD/Dorion/releases/download/v${finalAttrs.version }/Dorion_${finalAttrs.version}_amd64.deb"; + hash = "sha256-FghJM34GMt8+4b6jsQQSsfmHIyua/pjRHKNErGyK/kw="; + }; + + unpackCmd = '' + dpkg -X $curSrc . + ''; + + runtimeDependencies = [ + glib-networking + libappindicator + libayatana-appindicator + ]; + + nativeBuildInputs = [ + autoPatchelfHook + dpkg + wrapGAppsHook + ]; + + buildInputs = [ + glib-networking + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + webkitgtk + ]; + + installPhase = '' + runHook preInstall + + mkdir -pv $out + mv -v {bin,lib,share} $out + + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/SpikeHD/Dorion"; + description = "Tiny alternative Discord client"; + license = lib.licenses.gpl3Only; + mainProgram = "dorion"; + maintainers = with lib.maintainers; [ ]; + platforms = lib.intersectLists (lib.platforms.linux) (lib.platforms.x86_64); + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +}) diff --git a/pkgs/by-name/dy/dyalog/dyalogscript.patch b/pkgs/by-name/dy/dyalog/dyalogscript.patch new file mode 100644 index 0000000000000..a65878b7adec5 --- /dev/null +++ b/pkgs/by-name/dy/dyalog/dyalogscript.patch @@ -0,0 +1,8 @@ +--- a/scriptbin/dyalogscript ++++ b/scriptbin/dyalogscript +@@ -5,1 +5,1 @@ +-INSTALLDIR="/opt/mdyalog/18.2/64/unicode" ++INSTALLDIR="@installdir@" +@@ -40,1 +40,1 @@ +-: ${SCRIPTDIR:=$INSTALLDIR} ++SCRIPTDIR="@scriptdir@" diff --git a/pkgs/by-name/dy/dyalog/mapl.patch b/pkgs/by-name/dy/dyalog/mapl.patch new file mode 100644 index 0000000000000..32424bea124ef --- /dev/null +++ b/pkgs/by-name/dy/dyalog/mapl.patch @@ -0,0 +1,31 @@ +diff --git a/mapl b/mapl +index c9d3727..de24c77 100755 +--- a/mapl ++++ b/mapl +@@ -20,26 +20,8 @@ SHORTVERSION=182U64 + LONGVERSION="18.2 64-bit Unicode" + REL="`echo "${LONGVERSION}" | sed 's/ .*$//'`" + +-# Find the Dyalog installation directory +-if [ "$(uname)" = Linux ]; then +- # this script location, canonical. +- THIS="$(readlink -f $0)" +-else +- # this script location. +- THIS="$0" +-fi +-export DYALOG=$(cd $(dirname $THIS) && pwd) +- + export APL_LANGUAGE_BAR_FILE=${DYALOG}/languagebar.json + +-if [ "$(uname)" = Linux ]; then +- if [ "x" = "x${LD_LIBRARY_PATH}" ]; then +- export LD_LIBRARY_PATH="${DYALOG}" +- else +- export LD_LIBRARY_PATH="${DYALOG}:${LD_LIBRARY_PATH}" +- fi +-fi +- + # Setup the configuration directory + MYCONFIGDIR=${HOME}/.dyalog + if [ ! -d "${MYCONFIGDIR}" ] ; then diff --git a/pkgs/by-name/dy/dyalog/package.nix b/pkgs/by-name/dy/dyalog/package.nix new file mode 100644 index 0000000000000..c8786d5d6baae --- /dev/null +++ b/pkgs/by-name/dy/dyalog/package.nix @@ -0,0 +1,225 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchurl + +, config +, acceptLicense ? config.dyalog.acceptLicense or false + +, autoPatchelfHook +, dpkg +, makeWrapper + +, copyDesktopItems +, makeDesktopItem + +, glib +, ncurses5 + +, dotnet-sdk_6 +, dotnetSupport ? false + +, alsa-lib +, gtk2 +, libXdamage +, libXtst +, libXScrnSaver +, nss +, htmlRendererSupport ? false + +, R +, rPackages +, rSupport ? false + +, unixODBC +, sqaplSupport ? false + +, zeroFootprintRideSupport ? false + +, enableDocs ? false +}: + +let + dyalogHome = "$out/lib/dyalog"; + + rscproxy = rPackages.buildRPackage { + name = "rscproxy"; + src = fetchFromGitHub { + owner = "Dyalog"; + repo = "rscproxy"; + rev = "31de3323fb8596ff5ecbf4bacd030e542cfd8133"; + hash = "sha256-SVoBoAWUmQ+jWaTG7hdmyRq6By4RnmmgWZXoua19/Kg="; + }; + }; + + makeWrapperArgs = [ + "--set DYALOG ${dyalogHome}" + # also needs to be set when the `-script` flag is used + "--add-flags DYALOG=${dyalogHome}" + # needed for default user commands to work + "--add-flags SESSION_FILE=${dyalogHome}/default.dse" + ] + ++ lib.optionals dotnetSupport [ + # needs to be set to run .NET Bridge + "--set DOTNET_ROOT ${dotnet-sdk_6}" + # .NET Bridge files are runtime dependencies, but cannot be patchelf'd + "--prefix LD_LIBRARY_PATH : ${dyalogHome}" + ] + ++ lib.optionals rSupport [ + # RConnect resolves R from PATH + "--prefix PATH : ${R}/bin" + # RConnect uses `ldd` to find `libR.so` + "--prefix LD_LIBRARY_PATH : ${R}/lib/R/lib" + # RConnect uses `rscproxy` to communicate with R + "--prefix R_LIBS_SITE : ${rscproxy}/library" + ]; + + licenseUrl = "https://www.dyalog.com/uploads/documents/Developer_Software_Licence.pdf"; + + licenseDisclaimer = '' + Dyalog is a licenced software. Dyalog licences do not include a licence to distribute Dyalog with your work. + For non-commercial purposes, a Basic Licence is granted when you accept the conditions and download a free copy of Dyalog. + + More details about the license can be found here: ${licenseUrl} + + If you agree to these terms, you can either override this package: + `dyalog.override { acceptLicense = true; }` + + or you can set the following nixpkgs config option: + `config.dyalog.acceptLicense = true;` + ''; +in +stdenv.mkDerivation (finalAttrs: { + pname = "dyalog"; + version = "18.2.45405"; + shortVersion = lib.versions.majorMinor finalAttrs.version; + + src = + assert !acceptLicense -> throw licenseDisclaimer; + fetchurl { + url = "https://download.dyalog.com/download.php?file=${finalAttrs.shortVersion}/linux_64_${finalAttrs.version}_unicode.x86_64.deb"; + sha256 = "sha256-pA/WGTA6YvwG4MgqbiPBLKSKPtLGQM7BzK6Bmyz5pmM="; + }; + + outputs = [ "out" ] ++ lib.optional enableDocs "doc"; + + postUnpack = '' + sourceRoot=$sourceRoot/opt/mdyalog/${finalAttrs.shortVersion}/64/unicode + ''; + + patches = [ ./dyalogscript.patch ./mapl.patch ]; + + postPatch = lib.optionalString dotnetSupport '' + # Patch to use .NET 6.0 instead of .NET Core 3.1 (can be removed when Dyalog 19.0 releases) + substituteInPlace Dyalog.Net.Bridge.*.json --replace "3.1" "6.0" + ''; + + nativeBuildInputs = [ + autoPatchelfHook + copyDesktopItems + dpkg + makeWrapper + ]; + + buildInputs = [ + glib # Used by Conga and .NET Bridge + ncurses5 # Used by the dyalog binary + ] + ++ lib.optionals htmlRendererSupport [ + alsa-lib + gtk2 + libXdamage + libXtst + libXScrnSaver + nss + ] + ++ lib.optionals sqaplSupport [ + unixODBC + ]; + + # See which files are not really important: `https://github.com/Dyalog/DyalogDocker/blob/master/rmfiles.sh` + installPhase = '' + runHook preInstall + + mkdir -p ${dyalogHome} + cp -r aplfmt aplkeys apltrans fonts Library PublicCACerts SALT StartupSession ${dyalogHome} + cp aplkeys.sh default.dse dyalog dyalog.rt dyalog.dcfg.template dyalog.ver.dcfg.template languagebar.json mapl startup.dyalog ${dyalogHome} + + mkdir ${dyalogHome}/lib + cp lib/{conga34_64.so,dyalog64.so,libconga34ssl64.so} ${dyalogHome}/lib + + # Only keep the most useful workspaces + mkdir ${dyalogHome}/ws + cp ws/{conga,dfns,isolate,loaddata,salt,sharpplot,util}.dws ${dyalogHome}/ws + '' + + lib.optionalString dotnetSupport '' + cp libnethost.so Dyalog.Net.Bridge.* ${dyalogHome} + '' + + lib.optionalString htmlRendererSupport '' + cp -r locales swiftshader ${dyalogHome} + cp libcef.so libEGL.so libGLESv2.so chrome-sandbox natives_blob.bin snapshot_blob.bin icudtl.dat v8_context_snapshot.bin *.pak ${dyalogHome} + cp lib/htmlrenderer.so ${dyalogHome}/lib + '' + + lib.optionalString rSupport '' + cp ws/rconnect.dws ${dyalogHome}/ws + '' + + lib.optionalString sqaplSupport '' + cp lib/cxdya64u64u.so ${dyalogHome}/lib + cp ws/sqapl.dws ${dyalogHome}/ws + cp odbc.ini.sample sqapl.err sqapl.ini ${dyalogHome} + '' + + lib.optionalString zeroFootprintRideSupport '' + cp -r RIDEapp ${dyalogHome} + '' + + lib.optionalString enableDocs '' + mkdir -p $doc/share/doc/dyalog + cp -r help/* $doc/share/doc/dyalog + ln -s $doc/share/doc/dyalog ${dyalogHome}/help + '' + + '' + install -Dm644 dyalog.svg $out/share/icons/hicolor/scalable/apps/dyalog.svg + + makeWrapper ${dyalogHome}/dyalog $out/bin/dyalog ${lib.concatStringsSep " " makeWrapperArgs} + makeWrapper ${dyalogHome}/mapl $out/bin/mapl ${lib.concatStringsSep " " makeWrapperArgs} + + install -Dm755 scriptbin/dyalogscript $out/bin/dyalogscript + substituteInPlace $out/bin/dyalogscript \ + --subst-var-by installdir ${dyalogHome} \ + --subst-var-by scriptdir $out/bin + + runHook postInstall + ''; + + preFixup = lib.optionalString htmlRendererSupport '' + # `libudev.so` is a runtime dependency of CEF + patchelf ${dyalogHome}/libcef.so --add-needed libudev.so + ''; + + desktopItems = [ + (makeDesktopItem { + name = "dyalog"; + desktopName = "Dyalog"; + exec = finalAttrs.meta.mainProgram; + comment = finalAttrs.meta.description; + icon = "dyalog"; + categories = [ "Development" ]; + genericName = "APL interpreter"; + terminal = true; + }) + ]; + + meta = { + changelog = "https://dyalog.com/dyalog/dyalog-versions/${lib.replaceStrings [ "." ] [ "" ] finalAttrs.shortVersion}.htm"; + description = "The Dyalog APL interpreter"; + homepage = "https://www.dyalog.com"; + license = { + fullName = "Dyalog License"; + url = licenseUrl; + free = false; + }; + mainProgram = "dyalog"; + maintainers = with lib.maintainers; [ tomasajt markus1189 ]; + platforms = [ "x86_64-linux" ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +}) diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/by-name/ek/eksctl/package.nix index cb66e6d9fd5a9..8b26b891829f2 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/by-name/ek/eksctl/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.157.0"; + version = "0.160.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - hash = "sha256-OTWCTpxVBTJHaVmnuiGQEmRezDLLUnJKKKWYo+J5fLk="; + hash = "sha256-fhsv4iiUO69TenK4MIGfQcVCBeYkKBcAEVZJPoNAixk="; }; - vendorHash = "sha256-gOQ//+DJXn+5Ip0Ii1j08LD+op5WgHaPg/Wqz8Nwt1w="; + vendorHash = "sha256-LiRzPJ7DBV0gsE9pJQ18l2grgk2WLkD8i83Fvr9asMM="; doCheck = false; diff --git a/pkgs/by-name/en/engage/package.nix b/pkgs/by-name/en/engage/package.nix index 8d58874557be8..ccfc963ab665f 100644 --- a/pkgs/by-name/en/engage/package.nix +++ b/pkgs/by-name/en/engage/package.nix @@ -6,7 +6,7 @@ let pname = "engage"; - version = "0.1.3"; + version = "0.2.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -15,10 +15,10 @@ rustPlatform.buildRustPackage { src = fetchgit { url = "https://or.computer.surgery/charles/${pname}"; rev = "v${version}"; - hash = "sha256-B7pDJDoQiigaxcia0LfG7zHEzYtvhCUNpbmfR2ny4ZE="; + hash = "sha256-niXh63xTpXSp9Wqwfi8hUBKJSClOUSvB+TPCTaqHfZk="; }; - cargoHash = "sha256-Akk7fh7/eyN8gyuh3y3aeeKD2STtrEx+trOm5ww9lgw="; + cargoHash = "sha256-CKe0nb5JHi5+1UlVOl01Q3qSXQLlpEBdat/IzRKfaz0="; nativeBuildInputs = [ installShellFiles @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage { + builtins.concatStringsSep " " (builtins.map - (shell: "--${shell} <($out/bin/${pname} self completions ${shell})") + (shell: "--${shell} <($out/bin/${pname} completions ${shell})") [ "bash" "fish" diff --git a/pkgs/tools/misc/eza/default.nix b/pkgs/by-name/ez/eza/package.nix index 47c4f40e4ead6..63eb8fbb62009 100644 --- a/pkgs/tools/misc/eza/default.nix +++ b/pkgs/by-name/ez/eza/package.nix @@ -7,7 +7,7 @@ , pandoc , pkg-config , zlib -, Security +, darwin , libiconv , installShellFiles # once eza upstream gets support for setting up a compatibilty symlink for exa, we should change @@ -17,20 +17,20 @@ rustPlatform.buildRustPackage rec { pname = "eza"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; rev = "v${version}"; - hash = "sha256-EvNdE9SYO8+DEJoIxJEh3Fy/+AbtoAyUrOnZtd23K7Q="; + hash = "sha256-T/3JUjeBw5r1E0hnMRWbMsuqKKHSVSC12HIgOAU0Gi4="; }; - cargoHash = "sha256-1QluALqSwu49/oz89m3KDDgGo91lqOj+WDP8erGmA/8="; + cargoHash = "sha256-Wao9J684kSZT/StCNtBDJCdx9tiWTlU+WxCYHD6oeqw="; nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] - ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; + ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; buildNoDefaultFeatures = true; buildFeatures = lib.optional gitSupport "git"; @@ -64,7 +64,7 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/eza-community/eza/releases/tag/v${version}"; license = licenses.mit; mainProgram = "eza"; - maintainers = with maintainers; [ cafkafk ]; + maintainers = with maintainers; [ cafkafk _9glenda ]; platforms = platforms.unix ++ platforms.windows; }; } diff --git a/pkgs/by-name/ga/game-rs/package.nix b/pkgs/by-name/ga/game-rs/package.nix new file mode 100644 index 0000000000000..127e06f7129ef --- /dev/null +++ b/pkgs/by-name/ga/game-rs/package.nix @@ -0,0 +1,32 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, steam-run +}: + +rustPlatform.buildRustPackage rec { + pname = "game-rs"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "amanse"; + repo = "game-rs"; + rev = "v${version}"; + hash = "sha256-M9/hFItoCL8fSrc0dFNn43unqkIaD179OGUdbXL6/Rs="; + }; + + cargoHash = "sha256-aq58sFK4/Zd8S4dOWjag+g5PmTeaVAK3FS3fW/YlCLs="; + + buildFeatures = [ "nixos" ]; + + propagatedBuildInputs = [ steam-run ]; + + meta = with lib; { + description = "Minimal CLI game launcher for linux"; + homepage = "https://github.com/amanse/game-rs"; + changelog = "https://github.com/Amanse/game-rs/releases/tag/v${version}"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ amanse ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/gh/gh-screensaver/package.nix b/pkgs/by-name/gh/gh-screensaver/package.nix new file mode 100644 index 0000000000000..b5466c791333d --- /dev/null +++ b/pkgs/by-name/gh/gh-screensaver/package.nix @@ -0,0 +1,28 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "gh-screensaver"; + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "vilmibm"; + repo = "gh-screensaver"; + rev = "v${version}"; + hash = "sha256-MqwaqXGP4E+46vpgftZ9bttmMyENuojBnS6bWacmYLE="; + }; + + vendorHash = "sha256-o9B6Q07GP/CFekG3av01boZA7FdZg4x8CsLC3lwhn2A="; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "gh extension with animated terminal screensavers"; + homepage = "https://github.com/vilmibm/gh-screensaver"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ foo-dogsquared ]; + mainProgram = "gh-screensaver"; + }; +} diff --git a/pkgs/by-name/gi/girouette/package.nix b/pkgs/by-name/gi/girouette/package.nix new file mode 100644 index 0000000000000..2c2a733c3117a --- /dev/null +++ b/pkgs/by-name/gi/girouette/package.nix @@ -0,0 +1,43 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, dbus +, openssl +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "girouette"; + version = "0.7.4"; + + src = fetchFromGitHub { + owner = "gourlaysama"; + repo = "girouette"; + rev = "v${version}"; + hash = "sha256-CROd44lCCXlWF8X/9HyjtTjSlCUFkyke+BjkD4uUqXo="; + }; + + cargoHash = "sha256-AkagcIewHGPBYrITzI1YNPSJIN13bViDU6tbC+IeakY="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + dbus + openssl + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + meta = with lib; { + description = "Show the weather in the terminal, in style"; + homepage = "https://github.com/gourlaysama/girouette"; + changelog = "https://github.com/gourlaysama/girouette/blob/${src.rev}/CHANGELOG.md"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ linuxissuper cafkafk ]; + mainProgram = "girouette"; + }; +} diff --git a/pkgs/by-name/gi/gitmoji-cli/package.nix b/pkgs/by-name/gi/gitmoji-cli/package.nix new file mode 100644 index 0000000000000..a6f23e10bce0b --- /dev/null +++ b/pkgs/by-name/gi/gitmoji-cli/package.nix @@ -0,0 +1,75 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchYarnDeps +, makeWrapper +, nodejs +, prefetch-yarn-deps +, yarn +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gitmoji-cli"; + version = "8.5.0"; + + src = fetchFromGitHub { + owner = "carloscuesta"; + repo = "gitmoji-cli"; + rev = "v${finalAttrs.version}"; + hash = "sha256-ZM6jOi0FnomkIZeK6ln1Z0d6R5cjav67qyly3yqR1HQ="; + }; + + offlineCache = fetchYarnDeps { + yarnLock = "${finalAttrs.src}/yarn.lock"; + hash = "sha256-HSAWFVOTlXlG7N5591hpfPAYaSrP413upW5u/HN9X2o="; + }; + + nativeBuildInputs = [ + makeWrapper + nodejs + prefetch-yarn-deps + yarn + ]; + + configurePhase = '' + runHook preConfigure + + export HOME=$(mktemp -d) + yarn config --offline set yarn-offline-mirror $offlineCache + fixup-yarn-lock yarn.lock + yarn --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive install + patchShebangs node_modules + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + yarn --offline build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + yarn --offline --production install + + mkdir -p "$out/lib/node_modules/gitmoji-cli" + cp -r lib node_modules "$out/lib/node_modules/gitmoji-cli" + + makeWrapper "${nodejs}/bin/node" "$out/bin/gitmoji" \ + --add-flags "$out/lib/node_modules/gitmoji-cli/lib/cli.js" + + runHook postInstall + ''; + + meta = { + description = "Gitmoji client for using emojis on commit messages"; + homepage = "https://github.com/carloscuesta/gitmoji-cli"; + license = lib.licenses.mit; + mainProgram = "gitmoji"; + maintainers = with lib.maintainers; [ nequissimus ]; + }; +}) diff --git a/pkgs/by-name/go/goat/package.nix b/pkgs/by-name/go/goat/package.nix new file mode 100644 index 0000000000000..7dfc187191032 --- /dev/null +++ b/pkgs/by-name/go/goat/package.nix @@ -0,0 +1,26 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: +buildGoModule { + pname = "goat"; + version = "unstable-2022-08-15"; # Upstream currently isn't doing tags/releases. + + src = fetchFromGitHub { + owner = "blampe"; + repo = "goat"; + rev = "07bb911fe3106cc3c1d1097318a9fffe816b59fe"; + hash = "sha256-gSSDp9Q2hGH85dkE7RoER5ig+Cz1oSOD0FNRBeTZM4U="; + }; + + vendorHash = "sha256-24YllmSUzRcqWbJ8NLyhsJaoGG2+yE8/eXX6teJ1nV8="; + + meta = with lib; { + description = "Go ASCII Tool. Render ASCII art as SVG diagrams"; + homepage = "https://github.com/blampe/goat"; + license = licenses.mit; + maintainers = with maintainers; [ katexochen ]; + mainProgram = "goat"; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/gr/grimblast/package.nix b/pkgs/by-name/gr/grimblast/package.nix new file mode 100644 index 0000000000000..c997f6205ef43 --- /dev/null +++ b/pkgs/by-name/gr/grimblast/package.nix @@ -0,0 +1,61 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, makeWrapper +, scdoc +, coreutils +, grim +, hyprland +, hyprpicker +, jq +, libnotify +, slurp +, wl-clipboard +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "grimblast"; + version = "unstable-2023-10-03"; + + src = fetchFromGitHub { + owner = "hyprwm"; + repo = "contrib"; + rev = "2e3f8ac2a3f1334fd2e211b07ed76b4215bb0542"; + hash = "sha256-rb954Rc+IyUiiXoIuQOJRp0//zH/WeMYZ3yJ5CccODA="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + makeWrapper + scdoc + ]; + + makeFlags = [ + "PREFIX=$(out)" + ]; + + sourceRoot = "${finalAttrs.src.name}/grimblast"; + + postInstall = '' + wrapProgram $out/bin/grimblast --prefix PATH ':' \ + "${lib.makeBinPath [ + coreutils + grim + hyprland + hyprpicker + jq + libnotify + slurp + wl-clipboard + ]}" + ''; + + meta = with lib; { + description = "A helper for screenshots within Hyprland, based on grimshot"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ donovanglover ]; + mainProgram = "grimblast"; + }; +}) diff --git a/pkgs/by-name/gu/guile-avahi/package.nix b/pkgs/by-name/gu/guile-avahi/package.nix new file mode 100644 index 0000000000000..3ad6ff9dd2c37 --- /dev/null +++ b/pkgs/by-name/gu/guile-avahi/package.nix @@ -0,0 +1,39 @@ +{ stdenv +, lib +, fetchgit +, avahi +, gmp +, autoreconfHook +, pkg-config +, texinfo +, guile +}: + +stdenv.mkDerivation rec { + pname = "guile-avahi"; + version = "0.4.1"; + + src = fetchgit { + url = "git://git.sv.gnu.org/guile-avahi.git"; + rev = "v${version}"; + hash = "sha256-Yr+OiqaGv6DgsjxSoc4sAjy4OO/D+Q50vdSTPEeIrV8="; + }; + + strictDeps = true; + nativeBuildInputs = [ autoreconfHook guile pkg-config texinfo ]; + buildInputs = [ guile ]; + propagatedBuildInputs = [ avahi gmp ]; + + doCheck = true; + makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-unused-function"; + + meta = with lib; { + description = "Bindings to Avahi for GNU Guile"; + homepage = "https://www.nongnu.org/guile-avahi/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ foo-dogsquared ]; + platforms = guile.meta.platforms; + }; +} + diff --git a/pkgs/by-name/gu/guile-goblins/package.nix b/pkgs/by-name/gu/guile-goblins/package.nix new file mode 100644 index 0000000000000..5b1b5a797927c --- /dev/null +++ b/pkgs/by-name/gu/guile-goblins/package.nix @@ -0,0 +1,34 @@ +{ lib +, stdenv +, fetchurl +, guile +, guile-fibers +, guile-gcrypt +, texinfo +, pkg-config +}: +stdenv.mkDerivation rec { + pname = "guile-goblins"; + version = "0.11.0"; + + src = fetchurl { + url = "https://spritely.institute/files/releases/guile-goblins/guile-goblins-${version}.tar.gz"; + hash = "sha256-1FD35xvayqC04oPdgts08DJl6PVnhc9K/Dr+NYtxhMU="; + }; + + strictDeps = true; + nativeBuildInputs = [ guile pkg-config texinfo ]; + buildInputs = [ guile guile-fibers guile-gcrypt ]; + makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; + + # tests hang on darwin, and fail randomly on aarch64-linux on ofborg + doCheck = !stdenv.isDarwin && !stdenv.isAarch64; + + meta = with lib; { + description = "Spritely Goblins for Guile"; + homepage = "https://spritely.institute/goblins/"; + license = licenses.asl20; + maintainers = with maintainers; [ offsetcyan ]; + platforms = guile.meta.platforms; + }; +} diff --git a/pkgs/by-name/gu/guile-lzma/package.nix b/pkgs/by-name/gu/guile-lzma/package.nix new file mode 100644 index 0000000000000..d9be1253acb6f --- /dev/null +++ b/pkgs/by-name/gu/guile-lzma/package.nix @@ -0,0 +1,37 @@ +{ stdenv +, lib +, fetchurl +, xz +, pkg-config +, guile +, scheme-bytestructures +}: + +stdenv.mkDerivation rec { + pname = "guile-lzma"; + version = "0.1.1"; + + src = fetchurl { + url = "https://files.ngyro.com/guile-lzma/guile-lzma-${version}.tar.gz"; + hash = "sha256-K4ZoltZy7U05AI9LUzZ1DXiXVgoGZ4Nl9cWnK9L8zl4="; + }; + + strictDeps = true; + nativeBuildInputs = [ + guile + pkg-config + scheme-bytestructures + ]; + buildInputs = [ guile ]; + propagatedBuildInputs = [ xz ]; + + doCheck = true; + + meta = with lib; { + homepage = "https://ngyro.com/software/guile-lzma.html"; + description = "Guile wrapper for lzma library"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ foo-dogsquared ]; + platforms = guile.meta.platforms; + }; +} diff --git a/pkgs/by-name/gu/guile-semver/package.nix b/pkgs/by-name/gu/guile-semver/package.nix new file mode 100644 index 0000000000000..ac2a95b09f1a2 --- /dev/null +++ b/pkgs/by-name/gu/guile-semver/package.nix @@ -0,0 +1,33 @@ +{ lib +, stdenv +, fetchurl +, autoreconfHook +, pkg-config +, texinfo +, guile +}: + +stdenv.mkDerivation rec { + pname = "guile-semver"; + version = "0.1.1"; + + src = fetchurl { + url = "https://files.ngyro.com/guile-semver/${pname}-${version}.tar.gz"; + hash = "sha256-T3kJGTdf6yBKjqLtqSopHZu03kyOscZ3Z4RYmoYlN4E="; + }; + + strictDeps = true; + nativeBuildInputs = [ autoreconfHook guile pkg-config texinfo ]; + buildInputs = [ guile ]; + + doCheck = true; + + meta = with lib; { + description = + "A GNU Guile library implementing Semantic Versioning 2.0.0"; + homepage = "https://ngyro.com/software/guile-semver.html"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ foo-dogsquared ]; + platforms = guile.meta.platforms; + }; +} diff --git a/pkgs/by-name/gu/guile-zlib/package.nix b/pkgs/by-name/gu/guile-zlib/package.nix new file mode 100644 index 0000000000000..a7559ebfbba58 --- /dev/null +++ b/pkgs/by-name/gu/guile-zlib/package.nix @@ -0,0 +1,39 @@ +{ stdenv +, lib +, fetchFromGitea +, autoreconfHook +, pkg-config +, guile +, texinfo +, zlib +}: + +stdenv.mkDerivation rec { + pname = "guile-zlib"; + version = "0.1.0"; + + src = fetchFromGitea { + domain = "notabug.org"; + owner = "guile-zlib"; + repo = "guile-zlib"; + rev = "v${version}"; + hash = "sha256-+5tdp4WcnVuhfMwkr8t3Jd6/U539X5Ys9Pgzy79F4cY="; + }; + + strictDeps = true; + nativeBuildInputs = [ autoreconfHook guile pkg-config texinfo ]; + buildInputs = [ guile ]; + propagatedBuildInputs = [ zlib ]; + makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; + + doCheck = true; + + meta = with lib; { + description = + "Guile-zlib is a GNU Guile library providing bindings to zlib"; + homepage = "https://notabug.org/guile-zlib/guile-zlib"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ foo-dogsquared ]; + platforms = guile.meta.platforms; + }; +} diff --git a/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix b/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix new file mode 100644 index 0000000000000..2087a5f410385 --- /dev/null +++ b/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix @@ -0,0 +1,41 @@ +{ lib +, python3 +, fetchFromGitHub +}: + +python3.pkgs.buildPythonApplication rec { + pname = "ha-mqtt-discoverable-cli"; + version = "0.2.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "unixorn"; + repo = "ha-mqtt-discoverable-cli"; + rev = "refs/tags/v${version}"; + hash = "sha256-miFlrBmxVuIJjpsyYnbQt+QAGSrS4sHlJpCmxouM2Wc="; + }; + + nativeBuildInputs = with python3.pkgs; [ + poetry-core + ]; + + propagatedBuildInputs = with python3.pkgs; [ + ha-mqtt-discoverable + ]; + + # Project has no real tests + doCheck = false; + + pythonImportsCheck = [ + "ha_mqtt_discoverable_cli" + ]; + + meta = with lib; { + description = "CLI for creating Home Assistant compatible MQTT entities that will be automatically discovered"; + homepage = "https://github.com/unixorn/ha-mqtt-discoverable-cli"; + changelog = "https://github.com/unixorn/ha-mqtt-discoverable-cli/releases/tag/v0.2.1"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + mainProgram = "hmd"; + }; +} diff --git a/pkgs/by-name/i3/i3bar-river/package.nix b/pkgs/by-name/i3/i3bar-river/package.nix new file mode 100644 index 0000000000000..e891fe01f31a5 --- /dev/null +++ b/pkgs/by-name/i3/i3bar-river/package.nix @@ -0,0 +1,32 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, pkg-config +, pango +}: + +rustPlatform.buildRustPackage rec { + pname = "i3bar-river"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "MaxVerevkin"; + repo = "i3bar-river"; + rev = "v${version}"; + hash = "sha256-c5R5V5J1ETBl6JAdNDSxa94OeMyqbTAUmJHJCo1B+WQ="; + }; + + cargoHash = "sha256-D/WKv8rhb/ZGuVEZDp83PZxJydHbnZUQp+kVNlMBUCs="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ pango ]; + + meta = with lib; { + description = "A port of i3bar for river"; + homepage = "https://github.com/MaxVerevkin/i3bar-river"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ nicegamer7 ]; + mainProgram = "i3bar-river"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/by-name/ic/icewm/package.nix index 9e2041be1a472..4bf4d2293c421 100644 --- a/pkgs/applications/window-managers/icewm/default.nix +++ b/pkgs/by-name/ic/icewm/package.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "icewm"; - version = "3.4.1"; + version = "3.4.2"; src = fetchFromGitHub { owner = "ice-wm"; repo = "icewm"; rev = finalAttrs.version; - hash = "sha256-KgdCgKR3KqDf9GONCBRkLpNLoOycE0y4UXxHxBqNudk="; + hash = "sha256-s1gupU5AOQOMqz8YRMIBc2Oe7DMnlGgXitcq7CFWwSE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ju/justbuild/package.nix b/pkgs/by-name/ju/justbuild/package.nix new file mode 100644 index 0000000000000..3403edcaaccfc --- /dev/null +++ b/pkgs/by-name/ju/justbuild/package.nix @@ -0,0 +1,186 @@ +{ + gccStdenv, + fetchFromGitHub, + fetchurl, + + fmt_10, + nlohmann_json, + cli11, + microsoft-gsl, + libgit2, + openssl, + + pkg-config, + protobuf3_23, + grpc, + pandoc, + python3, + unzip, + wget, + lib, + jq, + + curl, + libarchive, +}: +let stdenv = gccStdenv; +in +stdenv.mkDerivation rec { + pname = "justbuild"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "just-buildsystem"; + repo = "justbuild"; + rev = "v${version}"; + sha256 = "sha256-36njngcGmRtYh/U3wkZUAU6ivPQ8qP8zVj1JzI9TuDY="; + + # The source contains both test/end-to-end/targets and + # test/end-to-end/TARGETS, causing issues on case-insensitive filesystems. + # Remove them, since we're not running end-to-end tests. + postFetch = '' + rm -rf $out/test/end-to-end/targets $out/test/end-to-end/TARGETS + ''; + }; + + bazelapi = fetchurl { + url = "https://github.com/bazelbuild/remote-apis/archive/e1fe21be4c9ae76269a5a63215bb3c72ed9ab3f0.tar.gz"; + sha256 = "7421abd5352ccf927c2050453a4dbfa1f7b1c7170ec3e8702b6fe2d39b8805fe"; + }; + + googleapi = fetchurl { + url = "https://github.com/googleapis/googleapis/archive/2f9af297c84c55c8b871ba4495e01ade42476c92.tar.gz"; + sha256 = "5bb6b0253ccf64b53d6c7249625a7e3f6c3bc6402abd52d3778bfa48258703a0"; + }; + + nativeBuildInputs = + [ + # Tools for the bootstrap process + jq + pkg-config + python3 + unzip + wget + + # Dependencies of just + cli11 + # Using fmt 10 because this is the same version upstream currently + # uses for bundled builds + # For future updates: The currently used version can be found in the file + # etc/repos.json: https://github.com/just-buildsystem/justbuild/blob/master/etc/repos.json + # under the key .repositories.fmt + fmt_10 + microsoft-gsl + nlohmann_json + + # Dependencies of the compiled just-mr + curl + libarchive + ]; + + buildInputs = [ + grpc + libgit2 + openssl + # Using protobuf 23 because this is the same version upstream currently + # uses for bundled builds + # For future updates: The currently used version can be found in the file + # etc/repos.json: https://github.com/just-buildsystem/justbuild/blob/master/etc/repos.json + # under the key .repositories.protobuf + protobuf3_23 + python3 + ]; + + postPatch = '' + sed -ie 's|\./bin/just-mr.py|${python3}/bin/python3 ./bin/just-mr.py|' bin/bootstrap.py + sed -ie 's|#!/usr/bin/env python3|#!${python3}/bin/python3|' bin/parallel-bootstrap-traverser.py + jq '.repositories.protobuf.pkg_bootstrap.local_path = "${protobuf3_23}"' etc/repos.json > etc/repos.json.patched + mv etc/repos.json.patched etc/repos.json + jq '.repositories.com_github_grpc_grpc.pkg_bootstrap.local_path = "${grpc}"' etc/repos.json > etc/repos.json.patched + mv etc/repos.json.patched etc/repos.json + jq '.unknown.PATH = []' etc/toolchain/CC/TARGETS > etc/toolchain/CC/TARGETS.patched + mv etc/toolchain/CC/TARGETS.patched etc/toolchain/CC/TARGETS + '' + lib.optionalString stdenv.isDarwin '' + sed -ie 's|-Wl,-z,stack-size=8388608|-Wl,-stack_size,0x800000|' bin/bootstrap.py + ''; + + /* The build phase follows the bootstrap procedure that is explained in + https://github.com/just-buildsystem/justbuild/blob/master/INSTALL.md + + The bootstrap of the just binary depends on two proto libraries, which are + supplied as external distfiles. + + The microsoft-gsl library does not provide a pkg-config file, so one is + created here. In case also the GNU Scientific Library would be used (which + has also the pkg-config name gsl) this would cause a conflict. However, it + is very unlikely that a build tool will ever depend on a GPL math library. + + The extra build flags (ADD_CFLAGS and ADD_CXXFLAGS) are only needed in the + current version of just, the next release will contain a fix from upstream. + https://github.com/just-buildsystem/justbuild/commit/5abcd4140a91236c7bda1c21ce69e76a28da7c8a + + */ + + buildPhase = '' + runHook preBuild + + mkdir .distfiles + ln -s ${bazelapi} .distfiles/e1fe21be4c9ae76269a5a63215bb3c72ed9ab3f0.tar.gz + ln -s ${googleapi} .distfiles/2f9af297c84c55c8b871ba4495e01ade42476c92.tar.gz + + mkdir .pkgconfig + cat << __EOF__ > .pkgconfig/gsl.pc + Name: gsl + Version: n/a + Description: n/a + URL: n/a + Cflags: -I${microsoft-gsl}/include + __EOF__ + export PKG_CONFIG_PATH=`pwd`/.pkgconfig''${PKG_CONFIG_PATH:+:}$PKG_CONFIG_PATH + + + # Bootstrap just + export PACKAGE=YES + export NON_LOCAL_DEPS='[ "google_apis", "bazel_remote_apis" ]' + export JUST_BUILD_CONF=`echo $PATH | jq -R '{ ENV: { PATH: . }, "ADD_CFLAGS": ["-Wno-error=pedantic"], "ADD_CXXFLAGS": ["-Wno-error=pedantic", "-D__unix__", "-DFMT_HEADER_ONLY"], "ARCH": "'$(uname -m)'" }'` + + mkdir ../build + python3 ./bin/bootstrap.py `pwd` ../build "`pwd`/.distfiles" + + # Build compiled just-mr + mkdir ../build-root + ../build/out/bin/just install 'installed just-mr' -c ../build/build-conf.json -C ../build/repo-conf.json --output-dir ../build/out --local-build-root ../build-root + + # convert man pages from Markdown to man + find "./share/man" -name "*.md" -exec sh -c '${pandoc}/bin/pandoc --standalone --to man -o "''${0%.md}.man" "''${0}"' {} \; + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p "$out/bin" + + + install -m 755 -Dt "$out/bin" "../build/out/bin/just" + install -m 755 -Dt "$out/bin" "../build/out/bin/just-mr" + install -m 755 -DT "bin/just-import-git.py" "$out/bin/just-import-git" + + mkdir -p "$out/share/bash-completion/completions" + install -m 0644 ./share/just_complete.bash "$out/share/bash-completion/completions/just" + + mkdir -p "$out/share/man/"{man1,man5} + install -m 0644 -t "$out/share/man/man1" ./share/man/*.1.man + install -m 0644 -t "$out/share/man/man5" ./share/man/*.5.man + + runHook postInstall + ''; + + meta = with lib; { + broken = stdenv.isDarwin; + description = "a generic build tool"; + homepage = "https://github.com/just-buildsystem/justbuild"; + license = licenses.asl20; + maintainers = with maintainers; [clkamp]; + }; +} diff --git a/pkgs/by-name/ka/katriawm/package.nix b/pkgs/by-name/ka/katriawm/package.nix index aef32a4d380c3..85116255e24f0 100644 --- a/pkgs/by-name/ka/katriawm/package.nix +++ b/pkgs/by-name/ka/katriawm/package.nix @@ -16,8 +16,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-IWviLboZz421/Amz/QG4o8jYaG8Y/l5PvmvXfK5nzJE="; }; - sourceRoot = "${finalAttrs.src.name}/src"; - nativeBuildInputs = [ pkg-config ]; @@ -32,8 +30,15 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; + makeFlags = [ "-C" "src" ]; + installFlags = [ "prefix=$(out)" ]; + postPatch = '' + substituteInPlace src/config.mk \ + --replace pkg-config "$PKG_CONFIG" + ''; + meta = { homepage = "https://www.uninformativ.de/git/katriawm/file/README.html"; description = "A non-reparenting, dynamic window manager with decorations"; diff --git a/pkgs/by-name/kt/ktfmt/package.nix b/pkgs/by-name/kt/ktfmt/package.nix new file mode 100644 index 0000000000000..8417d6a0d0d69 --- /dev/null +++ b/pkgs/by-name/kt/ktfmt/package.nix @@ -0,0 +1,38 @@ +{ lib, fetchFromGitHub, jre_headless, makeWrapper, maven }: + +maven.buildMavenPackage rec { + pname = "ktfmt"; + version = "0.46"; + + src = fetchFromGitHub { + owner = "facebook"; + repo = "ktfmt"; + rev = "refs/tags/v${version}"; + hash = "sha256-OIbJ+J5LX6SPv5tuAiY66v/edeM7nFPHj90GXV6zaxw="; + }; + + mvnHash = "sha256-pzMjkkdkbVqVxZPW2I0YWPl5/l6+SyNkhd6gkm9Uoyc="; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + install -Dm644 core/target/ktfmt-*-jar-with-dependencies.jar $out/share/ktfmt/ktfmt.jar + + makeWrapper ${jre_headless}/bin/java $out/bin/ktfmt \ + --add-flags "-jar $out/share/ktfmt/ktfmt.jar" + + runHook postInstall + ''; + + meta = with lib; { + description = "A program that reformats Kotlin source code to comply with the common community standard for Kotlin code conventions."; + homepage = "https://github.com/facebook/ktfmt"; + license = licenses.apsl20; + mainProgram = "ktfmt"; + maintainers = with maintainers; [ ghostbuster91 ]; + inherit (jre_headless.meta) platforms; + }; +} diff --git a/pkgs/by-name/ku/kubectl-neat/package.nix b/pkgs/by-name/ku/kubectl-neat/package.nix new file mode 100644 index 0000000000000..c0ce31abb9261 --- /dev/null +++ b/pkgs/by-name/ku/kubectl-neat/package.nix @@ -0,0 +1,29 @@ +{ lib, buildGoModule, fetchFromGitHub, bash }: + +buildGoModule rec { + pname = "kubectl-neat"; + version = "2.0.3"; + + src = fetchFromGitHub { + owner = "itaysk"; + repo = "kubectl-neat"; + rev = "v${version}"; + hash = "sha256-j8v0zJDBqHzmLamIZPW9UvMe9bv/m3JUQKY+wsgMTFk="; + }; + + vendorHash = "sha256-vGXoYR0DT9V1BD/FN/4szOal0clsLlqReTFkAd2beMw="; + + postBuild = '' + # Replace path to bash in a script + # Without this change, there's a problem when running tests + sed 's,#!/bin/bash,#!${bash}/bin/bash,' -i test/kubectl-stub + ''; + + meta = with lib; { + description = "Clean up Kubernetes yaml and json output to make it readable"; + homepage = "https://github.com/itaysk/kubectl-neat"; + changelog = "https://github.com/itaysk/kubectl-neat/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = [ maintainers.koralowiec ]; + }; +} diff --git a/pkgs/applications/window-managers/labwc/default.nix b/pkgs/by-name/la/labwc/package.nix index 07a1e1d54c35c..3aca61e97da3b 100644 --- a/pkgs/applications/window-managers/labwc/default.nix +++ b/pkgs/by-name/la/labwc/package.nix @@ -2,21 +2,23 @@ , stdenv , fetchFromGitHub , cairo +, gettext , glib , libdrm , libinput +, libpng +, librsvg , libxcb , libxkbcommon , libxml2 -, gettext , meson , ninja , pango , pkg-config , scdoc -, wayland-scanner , wayland , wayland-protocols +, wayland-scanner , wlroots , xcbutilwm , xwayland @@ -24,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "labwc"; - version = "0.6.4"; + version = "0.6.5"; src = fetchFromGitHub { owner = "labwc"; repo = "labwc"; rev = finalAttrs.version; - hash = "sha256-8FMC0tq5Gp5qDPUmoJTCrHEergDMUbiTco17jPTJUgE="; + hash = "sha256-nQLxE2Q4GiLUjkag/yqctzmkKKWFw1XNFjotE8MMgBA="; }; nativeBuildInputs = [ @@ -47,6 +49,8 @@ stdenv.mkDerivation (finalAttrs: { glib libdrm libinput + libpng + librsvg libxcb libxkbcommon libxml2 @@ -58,16 +62,20 @@ stdenv.mkDerivation (finalAttrs: { xwayland ]; + outputs = [ "out" "man" ]; + + strictDeps = true; + mesonFlags = [ (lib.mesonEnable "xwayland" true) ]; - meta = with lib; { + meta = { homepage = "https://github.com/labwc/labwc"; - description = "A Wayland stacking compositor, similar to Openbox"; + description = "A Wayland stacking compositor, inspired by Openbox"; changelog = "https://raw.githubusercontent.com/labwc/labwc/${finalAttrs.version}/NEWS.md"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ AndersonTorres ]; inherit (wayland.meta) platforms; }; }) diff --git a/pkgs/by-name/le/lemminx/package.nix b/pkgs/by-name/le/lemminx/package.nix new file mode 100644 index 0000000000000..fe078ba84acf3 --- /dev/null +++ b/pkgs/by-name/le/lemminx/package.nix @@ -0,0 +1,104 @@ +{ lib +, fetchFromGitHub +, makeWrapper +, jre +, maven +, writeScript +, lemminx +}: + +maven.buildMavenPackage rec { + pname = "lemminx"; + version = "0.27.0"; + + src = fetchFromGitHub { + owner = "eclipse"; + repo = "lemminx"; + rev = version; + hash = "sha256-VWYTkYlPziNRyxHdvIWVuDlABpKdzhC/F6BUBj/opks="; + # Lemminx reads this git information at runtime from a git.properties + # file on the classpath + leaveDotGit = true; + postFetch = '' + cat > $out/org.eclipse.lemminx/src/main/resources/git.properties << EOF + git.build.version=${version} + git.commit.id.abbrev=$(git -C $out rev-parse --short HEAD) + git.commit.message.short=$(git -C $out log -1 --pretty=format:%s) + git.branch=main + EOF + rm -rf $out/.git + ''; + }; + + manualMvnArtifacts = [ + "org.apache.maven.surefire:surefire-junit-platform:3.1.2" + "org.junit.platform:junit-platform-launcher:1.10.0" + ]; + + mvnHash = "sha256-sIiCp1AorVQXt13Tq0vw9jGioG3zcQMqqKS/Q0Tf4MQ="; + + buildOffline = true; + + # disable gitcommitid plugin which needs a .git folder which we + # don't have + mvnDepsParameters = "-Dmaven.gitcommitid.skip=true"; + + # disable failing tests which either need internet access or are flaky + mvnParameters = lib.escapeShellArgs [ + "-Dmaven.gitcommitid.skip=true" + "-Dtest=!XMLValidationCommandTest, + !XMLValidationExternalResourcesBasedOnDTDTest, + !XMLSchemaPublishDiagnosticsTest, + !PlatformTest, + !XMLValidationExternalResourcesBasedOnXSDTest, + !XMLExternalTest, + !XMLSchemaCompletionExtensionsTest, + !XMLSchemaDiagnosticsTest, + !MissingChildElementCodeActionTest, + !XSDValidationExternalResourcesTest, + !DocumentLifecycleParticipantTest" + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share + install -Dm644 org.eclipse.lemminx/target/org.eclipse.lemminx-uber.jar \ + $out/share + + makeWrapper ${jre}/bin/java $out/bin/lemminx \ + --add-flags "-jar $out/share/org.eclipse.lemminx-uber.jar" + + runHook postInstall + ''; + + nativeBuildInputs = [ makeWrapper ]; + + passthru.updateScript = writeScript "update-lemminx" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl pcre common-updater-scripts jq gnused + set -eu -o pipefail + + LATEST_TAG=$(curl https://api.github.com/repos/eclipse/lemminx/tags | \ + jq -r '[.[] | select(.name | test("^[0-9]"))] | sort_by(.name | split(".") | + map(tonumber)) | reverse | .[0].name') + update-source-version lemminx "$LATEST_TAG" + sed -i '0,/mvnHash *= *"[^"]*"/{s/mvnHash = "[^"]*"/mvnHash = ""/}' ${lemminx} + + echo -e "\nFetching all mvn dependencies to calculate the mvnHash. This may take a while ..." + nix-build -A lemminx.fetchedMavenDeps 2> lemminx-stderr.log || true + + NEW_MVN_HASH=$(cat lemminx-stderr.log | grep "got:" | awk '{print ''$2}') + rm lemminx-stderr.log + # escaping double quotes looks ugly but is needed for variable substitution + # use # instead of / as separator because the sha256 might contain the / character + sed -i "0,/mvnHash *= *\"[^\"]*\"/{s#mvnHash = \"[^\"]*\"#mvnHash = \"$NEW_MVN_HASH\"#}" ${lemminx} + ''; + + meta = with lib; { + description = "XML Language Server"; + homepage = "https://github.com/eclipse/lemminx"; + license = licenses.epl20; + maintainers = with maintainers; [ tricktron ]; + }; +} diff --git a/pkgs/by-name/li/linux-wallpaperengine/package.nix b/pkgs/by-name/li/linux-wallpaperengine/package.nix new file mode 100644 index 0000000000000..02838ccb83cc2 --- /dev/null +++ b/pkgs/by-name/li/linux-wallpaperengine/package.nix @@ -0,0 +1,76 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, ffmpeg +, freeglut +, freeimage +, glew +, glfw +, glm +, libGL +, libpulseaudio +, libX11 +, libXau +, libXdmcp +, libXext +, libXpm +, libXrandr +, libXxf86vm +, lz4 +, mpv +, pkg-config +, SDL2 +, SDL2_mixer +, zlib +}: + +stdenv.mkDerivation { + pname = "linux-wallpaperengine"; + version = "unstable-2023-09-23"; + + src = fetchFromGitHub { + owner = "Almamu"; + repo = "linux-wallpaperengine"; + # upstream lacks versioned releases + rev = "21c38d9fd1d3d89376c870cec5c5e5dc7086bc3c"; + hash = "sha256-bZlMHlNKSydh9eGm5cFSEtv/RV9sA5ABs99uurblBZY="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + ffmpeg + freeglut + freeimage + glew + glfw + glm + libGL + libpulseaudio + libX11 + libXau + libXdmcp + libXext + libXrandr + libXpm + libXxf86vm + mpv + lz4 + SDL2 + SDL2_mixer.all + zlib + ]; + + meta = { + description = "Wallpaper Engine backgrounds for Linux"; + homepage = "https://github.com/Almamu/linux-wallpaperengine"; + license = lib.licenses.gpl3Only; + mainProgram = "linux-wallpaperengine"; + maintainers = with lib.maintainers; [ eclairevoyant ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/lu/luastatus/package.nix b/pkgs/by-name/lu/luastatus/package.nix new file mode 100644 index 0000000000000..5bac2809ccf4d --- /dev/null +++ b/pkgs/by-name/lu/luastatus/package.nix @@ -0,0 +1,88 @@ +{ lib +, stdenv +, fetchFromGitHub +# Native Build Inputs +, cmake +, pkg-config +, makeWrapper +# Dependencies +, yajl +, alsa-lib +, libpulseaudio +, glib +, libnl +, udev +, libXau +, libXdmcp +, pcre2 +, pcre +, util-linux +, libselinux +, libsepol +, lua5 +, docutils +, libxcb +, libX11 +, xcbutil +, xcbutilwm +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "luastatus"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "shdown"; + repo = "luastatus"; + rev = "v${finalAttrs.version}"; + hash = "sha256-whO5pjUPaCwEb2GDCIPnTk39MejSQOoRRQ5kdYEQ0Pc="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + makeWrapper + ]; + + buildInputs = [ + libxcb + libX11 + xcbutil + xcbutilwm + libXdmcp + libXau + libpulseaudio + libnl + libselinux + libsepol + yajl + alsa-lib + glib + udev + pcre2 + pcre + util-linux + lua5 + docutils + ]; + + postInstall = '' + wrapProgram $out/bin/luastatus-stdout-wrapper \ + --prefix LUASTATUS : $out/bin/luastatus + + wrapProgram $out/bin/luastatus-i3-wrapper \ + --prefix LUASTATUS : $out/bin/luastatus + + wrapProgram $out/bin/luastatus-lemonbar-launcher \ + --prefix LUASTATUS : $out/bin/luastatus + ''; + + meta = with lib; { + description = "Universal status bar content generator"; + homepage = "https://github.com/shdown/luastatus"; + changelog = "https://github.com/shdown/luastatus/releases/tag/${finalAttrs.version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ kashw2 ]; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/by-name/ma/matrix-commander-rs/package.nix b/pkgs/by-name/ma/matrix-commander-rs/package.nix new file mode 100644 index 0000000000000..1eba5cf03562e --- /dev/null +++ b/pkgs/by-name/ma/matrix-commander-rs/package.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, darwin +, fetchFromGitHub +, openssl +, pkg-config +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "matrix-commander-rs"; + version = "0.1.32"; + + src = fetchFromGitHub { + owner = "8go"; + repo = "matrix-commander-rs"; + rev = "refs/tags/v${version}"; + hash = "sha256-Bp4bP77nWi0XLhI4/wsry6fEW2BR90Y+XqV/WCinwJo="; + }; + + cargoHash = "sha256-HPkpCnlSZ9sY40gc4dLOdcBhATvJVeqk7GJ0+XqjHVk="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + meta = with lib; { + description = "CLI-based Matrix client app for sending and receiving"; + homepage = "https://github.com/8go/matrix-commander-rs"; + changelog = "https://github.com/8go/matrix-commander-rs/releases/tag/v${version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ fab ]; + mainProgram = "matrix-commander-rs"; + }; +} diff --git a/pkgs/by-name/me/mermaid-cli/package.nix b/pkgs/by-name/me/mermaid-cli/package.nix new file mode 100644 index 0000000000000..a42fe9754ff5f --- /dev/null +++ b/pkgs/by-name/me/mermaid-cli/package.nix @@ -0,0 +1,80 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchYarnDeps +, makeWrapper +, nodejs +, prefetch-yarn-deps +, yarn +, chromium +}: + +stdenv.mkDerivation rec { + pname = "mermaid-cli"; + version = "10.4.0"; + + src = fetchFromGitHub { + owner = "mermaid-js"; + repo = "mermaid-cli"; + rev = version; + hash = "sha256-mzBN/Hg/03+jYyoAHvjx33HC46ZA6dtHmiSnaExCRR0="; + }; + + offlineCache = fetchYarnDeps { + yarnLock = "${src}/yarn.lock"; + hash = "sha256-RQsRGzkuPgGVuEpF5lzv26XKMPLX2NrsjVkGMMkCbO4="; + }; + + nativeBuildInputs = [ + makeWrapper + nodejs + prefetch-yarn-deps + yarn + ]; + + configurePhase = '' + runHook preConfigure + + export HOME=$(mktemp -d) + yarn config --offline set yarn-offline-mirror "$offlineCache" + fixup-yarn-lock yarn.lock + yarn --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive install + patchShebangs node_modules + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + yarn --offline prepare + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + yarn --offline --production install + + mkdir -p "$out/lib/node_modules/@mermaid-js/mermaid-cli" + cp -r . "$out/lib/node_modules/@mermaid-js/mermaid-cli" + + makeWrapper "${nodejs}/bin/node" "$out/bin/mmdc" \ + '' + lib.optionalString (lib.meta.availableOn stdenv.targetPlatform chromium) '' + --set PUPPETEER_EXECUTABLE_PATH '${lib.getExe chromium}' \ + '' + '' + --add-flags "$out/lib/node_modules/@mermaid-js/mermaid-cli/src/cli.js" + + runHook postInstall + ''; + + meta = { + description = "Generation of diagrams from text in a similar manner as markdown"; + homepage = "https://github.com/mermaid-js/mermaid-cli"; + license = lib.licenses.mit; + mainProgram = "mmdc"; + maintainers = with lib.maintainers; [ ysndr ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/mi/millipixels/package.nix b/pkgs/by-name/mi/millipixels/package.nix new file mode 100644 index 0000000000000..26c275fc5d9f3 --- /dev/null +++ b/pkgs/by-name/mi/millipixels/package.nix @@ -0,0 +1,70 @@ +{ lib +, stdenv +, fetchFromGitLab +, glib +, meson +, ninja +, pkg-config +, rustc +, libbsd +, libcamera +, gtk3 +, libtiff +, zbar +, libjpeg +, libexif +, libraw +, libpulseaudio +, ffmpeg-headless +, v4l-utils +, makeWrapper +, python3 +}: + +stdenv.mkDerivation rec { + pname = "millipixels"; + version = "0.22.0"; + + src = fetchFromGitLab { + owner = "Librem5"; + repo = pname; + rev = "v${version}"; + domain = "source.puri.sm"; + hash = "sha256-pRREQRYyD9+dpRvcfsNiNthFy08Yeup9xDn+x+RWDrE="; + }; + + nativeBuildInputs = [ + glib + meson + ninja + pkg-config + rustc + makeWrapper + ]; + + buildInputs = [ + libbsd + libcamera + gtk3 + libtiff + zbar + libpulseaudio + libraw + libexif + libjpeg + python3 + ]; + + postInstall = '' + wrapProgram $out/bin/millipixels \ + --prefix PATH : ${lib.makeBinPath [ v4l-utils ffmpeg-headless ]} + ''; + + meta = with lib; { + description = "Camera application for the Librem 5"; + homepage = "https://source.puri.sm/Librem5/millipixels"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ _999eagle ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/ml/mlx42/mlx42.pc b/pkgs/by-name/ml/mlx42/mlx42.pc new file mode 100644 index 0000000000000..f0ca081cfed71 --- /dev/null +++ b/pkgs/by-name/ml/mlx42/mlx42.pc @@ -0,0 +1,10 @@ +prefix=@out@ +exec_prefix=${prefix} +libdir=${prefix}/lib +includedir=${prefix}/include + +Name: mlx42 +Description: A simple cross-platform graphics library that uses GLFW and OpenGL +Version: @version@ +Libs: -L${libdir} -lmlx42 +Cflags: -I${includedir} diff --git a/pkgs/by-name/ml/mlx42/package.nix b/pkgs/by-name/ml/mlx42/package.nix new file mode 100644 index 0000000000000..0f7447ed8f3f7 --- /dev/null +++ b/pkgs/by-name/ml/mlx42/package.nix @@ -0,0 +1,62 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, glfw +, darwin +, enableShared ? !stdenv.hostPlatform.isStatic +, enableDebug ? false +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "mlx42"; + version = "2.3.2"; + + src = fetchFromGitHub { + owner = "codam-coding-college"; + repo = "MLX42"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-JCBV8NWibSugqXkbgP0v3gDfaaMNFYztWpBRfHJUG8E="; + }; + + patches = [ + (fetchpatch { + name = "add-cmake-install.patch"; + url = "https://github.com/codam-coding-college/MLX42/commit/a51ca8e0ec3fb793fa96d710696dcee8a4fe57d6.patch"; + hash = "sha256-i+0yHZVvfTG19BGVrz7GuEuBw3B7lylCPEvx07il23M="; + }) + ]; + + postPatch = '' + patchShebangs ./tools + '' + + lib.optionalString enableShared '' + substituteInPlace CMakeLists.txt \ + --replace "mlx42 STATIC" "mlx42 SHARED" + ''; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ glfw ] + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ OpenGL Cocoa IOKit ]); + + cmakeFlags = [ "-DDEBUG=${toString enableDebug}" ]; + + postInstall = '' + mkdir -p $out/lib/pkgconfig + substituteAll ${./mlx42.pc} $out/lib/pkgconfig/mlx42.pc + + # This file was removed after 2.3.2, so the used patch doesn't copy this file + # This line can be removed after the next release + cp $src/include/MLX42/MLX42_Input.h $out/include/MLX42 + ''; + + meta = { + description = "A simple cross-platform graphics library that uses GLFW and OpenGL"; + homepage = "https://github.com/codam-coding-college/MLX42"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ tomasajt ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/tools/networking/netproc/default.nix b/pkgs/by-name/ne/netproc/package.nix index 851f71fcaab9d..3f5bd8cbd86bb 100644 --- a/pkgs/tools/networking/netproc/default.nix +++ b/pkgs/by-name/ne/netproc/package.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, ncurses }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "netproc"; - version = "unstable-2022-02-11"; + version = "0.6.6"; src = fetchFromGitHub { owner = "berghetti"; repo = "netproc"; - rev = "87a10ce31ae150847674ad87ef84ef2fd374b420"; - sha256 = "sha256-YSKDOvqWLCrnP1qjmzMuRgjXiXZ9D4AuxXm/3xzS4gc="; + rev = finalAttrs.version; + sha256 = "sha256-OQWlFwCga33rTseLeO8rAd+pkLHbSNf3YI5OSwrdIyk="; }; buildInputs = [ ncurses ]; @@ -17,9 +17,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tool to monitor network traffic based on processes"; - license = licenses.gpl3; homepage = "https://github.com/berghetti/netproc"; - platforms = platforms.linux; + license = licenses.gpl3; + mainProgram = "netproc"; maintainers = [ maintainers.azuwis ]; + platforms = platforms.linux; }; -} +}) diff --git a/pkgs/by-name/no/notion/package.nix b/pkgs/by-name/no/notion/package.nix new file mode 100644 index 0000000000000..9ee84b130bf46 --- /dev/null +++ b/pkgs/by-name/no/notion/package.nix @@ -0,0 +1,86 @@ +{ lib +, stdenv +, fetchFromGitHub +, fontconfig +, gettext +, groff +, libSM +, libX11 +, libXext +, libXft +, libXinerama +, libXrandr +, lua +, makeWrapper +, pkg-config +, readline +, which +, xmessage +, xterm +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "notion"; + version = "4.0.2"; + + src = fetchFromGitHub { + owner = "raboof"; + repo = "notion"; + rev = finalAttrs.version; + hash = "sha256-u5KoTI+OcnQu9m8/Lmsmzr8lEk9tulSE7RRFhj1oXJM="; + }; + + # error: 'PATH_MAX' undeclared + postPatch = '' + sed 1i'#include <linux/limits.h>' -i mod_notionflux/notionflux/notionflux.c + ''; + + nativeBuildInputs = [ + gettext + groff + lua + makeWrapper + pkg-config + which + ]; + + buildInputs = [ + fontconfig + libSM + libX11 + libXext + libXft + libXinerama + libXrandr + lua + readline + ]; + + outputs = [ "out" "man" ]; + + strictDeps = true; + + buildFlags = [ + "LUA_DIR=${lua}" + "X11_PREFIX=/no-such-path" + ]; + + makeFlags = [ + "NOTION_RELEASE=${finalAttrs.version}" + "PREFIX=${placeholder "out"}" + ]; + + postInstall = '' + wrapProgram $out/bin/notion \ + --prefix PATH ":" "${lib.makeBinPath [ xmessage xterm ]}" \ + ''; + + meta = { + description = "Tiling tabbed window manager"; + homepage = "https://notionwm.net"; + license = lib.licenses.lgpl21; + mainProgram = "notion"; + maintainers = with lib.maintainers; [ jfb AndersonTorres raboof ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/nu/nuget/package.nix b/pkgs/by-name/nu/nuget/package.nix new file mode 100644 index 0000000000000..ff262c68ff646 --- /dev/null +++ b/pkgs/by-name/nu/nuget/package.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchFromGitHub, makeWrapper, mono, lib }: + +stdenv.mkDerivation (attrs: { + pname = "Nuget"; + version = "6.6.1.2"; + + src = fetchFromGitHub { + owner = "mono"; + repo = "linux-packaging-nuget"; + rev = "upstream/${attrs.version}.bin"; + sha256 = "sha256-9/dSeVshHbpYIgGE/8OzrB4towrWVB3UxDi8Esmbu7Y="; + }; + + nativeBuildInputs = [ + makeWrapper + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/${attrs.pname} + cp -r . $out/lib/${attrs.pname}/ + + mkdir -p $out/bin + makeWrapper \ + "${mono}/bin/mono" \ + "$out/bin/nuget" \ + --add-flags "$out/lib/${attrs.pname}/nuget.exe" + + runHook postInstall + ''; + + meta = with lib; { + description = "A package manager for the .NET platform"; + homepage = "https://www.mono-project.com/"; + longDescription = '' + NuGet is the package manager for the .NET platform. + This derivation bundles the Mono NuGet CLI, which is mostly used by + older projects based on .NET Framework. + + Newer .NET projects can use the dotnet CLI, which has most of this + packages functionality built-in. + ''; + # https://learn.microsoft.com/en-us/nuget/resources/nuget-faq#what-is-the-license-for-nuget-exe- + license = licenses.mit; + sourceProvenance = [ sourceTypes.binaryBytecode ]; + maintainers = [ maintainers.mdarocha ]; + platforms = [ "x86_64-linux" ]; + }; +}) diff --git a/pkgs/by-name/oe/oelint-adv/package.nix b/pkgs/by-name/oe/oelint-adv/package.nix new file mode 100644 index 0000000000000..357772d5f8ece --- /dev/null +++ b/pkgs/by-name/oe/oelint-adv/package.nix @@ -0,0 +1,40 @@ +{ lib +, nix-update-script +, python3 +, fetchPypi +}: + +python3.pkgs.buildPythonApplication rec { + pname = "oelint-adv"; + version = "3.25.0"; + format = "setuptools"; + + src = fetchPypi { + inherit version; + pname = "oelint_adv"; + hash = "sha256-dhTS2DZ7Usb1jgBv9Wm86w8CCMt64aHyBrxucLZUQjs="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + anytree + colorama + oelint-parser + urllib3 + ]; + + pythonRelaxDeps = [ "urllib3" ]; + pythonImportsCheck = [ "oelint_adv" ]; + + # Fail to run inside the code the build. + doCheck = false; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Advanced bitbake-recipe linter"; + homepage = "https://github.com/priv-kweihmann/oelint-adv"; + changelog = "https://github.com/priv-kweihmann/oelint-adv/releases/tag/v${version}"; + license = licenses.bsd2; + maintainers = with maintainers; [ otavio ]; + }; +} diff --git a/pkgs/by-name/op/openpgl/package.nix b/pkgs/by-name/op/openpgl/package.nix new file mode 100644 index 0000000000000..6c94e9edfe50d --- /dev/null +++ b/pkgs/by-name/op/openpgl/package.nix @@ -0,0 +1,41 @@ +{ lib +, cmake +, fetchFromGitHub +, ninja +, stdenv +, tbb +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "openpgl"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "OpenPathGuidingLibrary"; + repo = finalAttrs.pname; + rev = "v${finalAttrs.version}"; + hash = "sha256-dbHmGGiHQkU0KPpQYpY/o0uCWdb3L5namETdOcOREgs="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + tbb + ]; + + cmakeFlags = [ + "-DOPENPGL_BUILD_STATIC=OFF" + "-DTBB_ROOT=${tbb.out}" + ]; + + meta = { + description = "Intel Open Path Guiding Library"; + homepage = "https://github.com/OpenPathGuidingLibrary/openpgl"; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.amarshall ]; + license = lib.licenses.asl20; + }; +}) diff --git a/pkgs/by-name/or/orchard/package.nix b/pkgs/by-name/or/orchard/package.nix new file mode 100644 index 0000000000000..17220ed79299b --- /dev/null +++ b/pkgs/by-name/or/orchard/package.nix @@ -0,0 +1,55 @@ +{ lib, fetchFromGitHub, buildGoModule, installShellFiles }: + +buildGoModule rec { + pname = "orchard"; + version = "0.13.1"; + + src = fetchFromGitHub { + owner = "cirruslabs"; + repo = pname; + rev = version; + hash = "sha256-b9AHsyMiR3gTXGRbmIUX9uSd7u3dFoUZ/CtKrYpuzno="; + # populate values that require us to use git. By doing this in postFetch we + # can delete .git afterwards and maintain better reproducibility of the src. + leaveDotGit = true; + postFetch = '' + cd "$out" + git rev-parse HEAD > $out/COMMIT + find "$out" -name .git -print0 | xargs -0 rm -rf + ''; + }; + + vendorHash = "sha256-BrzS+QtpGUHcYNNmSI6FlBtcYwNFri7R6nlVvFihdb4="; + + nativeBuildInputs = [ installShellFiles ]; + + ldflags = [ + "-w" + "-s" + "-X github.com/cirruslabs/orchard/internal/version.Version=${version}" + ]; + + # ldflags based on metadata from git and source + preBuild = '' + ldflags+=" -X github.com/cirruslabs/orchard/internal/version.Commit=$(cat COMMIT)" + ''; + + subPackages = [ "cmd/orchard" ]; + + postInstall = '' + export HOME="$(mktemp -d)" + installShellCompletion --cmd orchard \ + --bash <($out/bin/orchard completion bash) \ + --zsh <($out/bin/orchard completion zsh) \ + --fish <($out/bin/orchard completion fish) + ''; + + meta = with lib; { + mainProgram = "orchard"; + description = + "Orchestrator for running Tart Virtual Machines on a cluster of Apple Silicon devices"; + homepage = "https://github.com/cirruslabs/orchard"; + license = licenses.fairsource09; + maintainers = with maintainers; [ techknowlogick ]; + }; +} diff --git a/pkgs/by-name/pd/pdepend/composer.lock b/pkgs/by-name/pd/pdepend/composer.lock new file mode 100644 index 0000000000000..66c12d8ec02bb --- /dev/null +++ b/pkgs/by-name/pd/pdepend/composer.lock @@ -0,0 +1,2094 @@ +{ + "_readme": [ + "This file locks the dependencies of your project to a known state", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", + "This file is @generated automatically" + ], + "content-hash": "5e64a6db62881c86d7bcc23b1d82dfb0", + "packages": [ + { + "name": "psr/container", + "version": "1.1.2", + "source": { + "type": "git", + "url": "https://github.com/php-fig/container.git", + "reference": "513e0666f7216c7459170d56df27dfcefe1689ea" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea", + "reference": "513e0666f7216c7459170d56df27dfcefe1689ea", + "shasum": "" + }, + "require": { + "php": ">=7.4.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Psr\\Container\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common Container Interface (PHP FIG PSR-11)", + "homepage": "https://github.com/php-fig/container", + "keywords": [ + "PSR-11", + "container", + "container-interface", + "container-interop", + "psr" + ], + "support": { + "issues": "https://github.com/php-fig/container/issues", + "source": "https://github.com/php-fig/container/tree/1.1.2" + }, + "time": "2021-11-05T16:50:12+00:00" + }, + { + "name": "symfony/config", + "version": "v4.4.44", + "source": { + "type": "git", + "url": "https://github.com/symfony/config.git", + "reference": "ed42f8f9da528d2c6cae36fe1f380b0c1d8f0658" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/config/zipball/ed42f8f9da528d2c6cae36fe1f380b0c1d8f0658", + "reference": "ed42f8f9da528d2c6cae36fe1f380b0c1d8f0658", + "shasum": "" + }, + "require": { + "php": ">=7.1.3", + "symfony/filesystem": "^3.4|^4.0|^5.0", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-php80": "^1.16", + "symfony/polyfill-php81": "^1.22" + }, + "conflict": { + "symfony/finder": "<3.4" + }, + "require-dev": { + "symfony/event-dispatcher": "^3.4|^4.0|^5.0", + "symfony/finder": "^3.4|^4.0|^5.0", + "symfony/messenger": "^4.1|^5.0", + "symfony/service-contracts": "^1.1|^2", + "symfony/yaml": "^3.4|^4.0|^5.0" + }, + "suggest": { + "symfony/yaml": "To use the yaml reference dumper" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Config\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/config/tree/v4.4.44" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-07-20T09:59:04+00:00" + }, + { + "name": "symfony/dependency-injection", + "version": "v4.4.37", + "source": { + "type": "git", + "url": "https://github.com/symfony/dependency-injection.git", + "reference": "c00a23904b42f140087d36e1d22c88801bb39689" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/c00a23904b42f140087d36e1d22c88801bb39689", + "reference": "c00a23904b42f140087d36e1d22c88801bb39689", + "shasum": "" + }, + "require": { + "php": ">=7.1.3", + "psr/container": "^1.0", + "symfony/polyfill-php80": "^1.16", + "symfony/service-contracts": "^1.1.6|^2" + }, + "conflict": { + "symfony/config": "<4.3|>=5.0", + "symfony/finder": "<3.4", + "symfony/proxy-manager-bridge": "<3.4", + "symfony/yaml": "<3.4" + }, + "provide": { + "psr/container-implementation": "1.0", + "symfony/service-implementation": "1.0|2.0" + }, + "require-dev": { + "symfony/config": "^4.3", + "symfony/expression-language": "^3.4|^4.0|^5.0", + "symfony/yaml": "^4.4|^5.0" + }, + "suggest": { + "symfony/config": "", + "symfony/expression-language": "For using expressions in service container configuration", + "symfony/finder": "For using double-star glob patterns or when GLOB_BRACE portability is required", + "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them", + "symfony/yaml": "" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\DependencyInjection\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Allows you to standardize and centralize the way objects are constructed in your application", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/dependency-injection/tree/v4.4.37" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-01-24T17:17:45+00:00" + }, + { + "name": "symfony/deprecation-contracts", + "version": "v3.3.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/deprecation-contracts.git", + "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/7c3aff79d10325257a001fcf92d991f24fc967cf", + "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.4-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "files": [ + "function.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "A generic function and convention to trigger deprecation notices", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.3.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-05-23T14:45:45+00:00" + }, + { + "name": "symfony/filesystem", + "version": "v5.4.25", + "source": { + "type": "git", + "url": "https://github.com/symfony/filesystem.git", + "reference": "0ce3a62c9579a53358d3a7eb6b3dfb79789a6364" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/0ce3a62c9579a53358d3a7eb6b3dfb79789a6364", + "reference": "0ce3a62c9579a53358d3a7eb6b3dfb79789a6364", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-mbstring": "~1.8", + "symfony/polyfill-php80": "^1.16" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Filesystem\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides basic utilities for the filesystem", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/filesystem/tree/v5.4.25" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-05-31T13:04:02+00:00" + }, + { + "name": "symfony/polyfill-ctype", + "version": "v1.28.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-ctype.git", + "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", + "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "provide": { + "ext-ctype": "*" + }, + "suggest": { + "ext-ctype": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.28-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Ctype\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Gert de Pagter", + "email": "BackEndTea@gmail.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for ctype functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "ctype", + "polyfill", + "portable" + ], + "support": { + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-01-26T09:26:14+00:00" + }, + { + "name": "symfony/polyfill-mbstring", + "version": "v1.28.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "42292d99c55abe617799667f454222c54c60e229" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229", + "reference": "42292d99c55abe617799667f454222c54c60e229", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "provide": { + "ext-mbstring": "*" + }, + "suggest": { + "ext-mbstring": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.28-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for the Mbstring extension", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "mbstring", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-07-28T09:04:16+00:00" + }, + { + "name": "symfony/polyfill-php80", + "version": "v1.28.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php80.git", + "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/6caa57379c4aec19c0a12a38b59b26487dcfe4b5", + "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.28-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php80\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ion Bazan", + "email": "ion.bazan@gmail.com" + }, + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php80/tree/v1.28.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-01-26T09:26:14+00:00" + }, + { + "name": "symfony/polyfill-php81", + "version": "v1.28.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php81.git", + "reference": "7581cd600fa9fd681b797d00b02f068e2f13263b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/7581cd600fa9fd681b797d00b02f068e2f13263b", + "reference": "7581cd600fa9fd681b797d00b02f068e2f13263b", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.28-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php81\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php81/tree/v1.28.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-01-26T09:26:14+00:00" + }, + { + "name": "symfony/service-contracts", + "version": "v2.5.2", + "source": { + "type": "git", + "url": "https://github.com/symfony/service-contracts.git", + "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c", + "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "psr/container": "^1.1", + "symfony/deprecation-contracts": "^2.1|^3" + }, + "conflict": { + "ext-psr": "<1.1|>=2" + }, + "suggest": { + "symfony/service-implementation": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "2.5-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\Service\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Generic abstractions related to writing services", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "support": { + "source": "https://github.com/symfony/service-contracts/tree/v2.5.2" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-05-30T19:17:29+00:00" + } + ], + "packages-dev": [ + { + "name": "doctrine/instantiator", + "version": "1.5.0", + "source": { + "type": "git", + "url": "https://github.com/doctrine/instantiator.git", + "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b", + "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0" + }, + "require-dev": { + "doctrine/coding-standard": "^9 || ^11", + "ext-pdo": "*", + "ext-phar": "*", + "phpbench/phpbench": "^0.16 || ^1", + "phpstan/phpstan": "^1.4", + "phpstan/phpstan-phpunit": "^1", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "vimeo/psalm": "^4.30 || ^5.4" + }, + "type": "library", + "autoload": { + "psr-4": { + "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com", + "homepage": "https://ocramius.github.io/" + } + ], + "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", + "homepage": "https://www.doctrine-project.org/projects/instantiator.html", + "keywords": [ + "constructor", + "instantiate" + ], + "support": { + "issues": "https://github.com/doctrine/instantiator/issues", + "source": "https://github.com/doctrine/instantiator/tree/1.5.0" + }, + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator", + "type": "tidelift" + } + ], + "time": "2022-12-30T00:15:36+00:00" + }, + { + "name": "easy-doc/easy-doc", + "version": "1.4.1", + "source": { + "type": "git", + "url": "https://github.com/kylekatarnls/php-easy-doc.git", + "reference": "194433f262ca2ba65089e095b574b7b81891f27b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/kylekatarnls/php-easy-doc/zipball/194433f262ca2ba65089e095b574b7b81891f27b", + "reference": "194433f262ca2ba65089e095b574b7b81891f27b", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0", + "simple-cli/simple-cli": "^1.4.1" + }, + "require-dev": { + "erusev/parsedown": "^1.7", + "phpunit/phpunit": "^7.5.18", + "symfony/process": "^4.4 || ^5.0" + }, + "bin": [ + "bin/easy-doc" + ], + "type": "library", + "autoload": { + "psr-4": { + "EasyDoc\\": "src/EasyDoc/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "KyleK", + "email": "kylekatarnls@gmail.com" + } + ], + "description": "An easy way to generate a static website from HTML/Markdown/RST/Pug/anything sources", + "support": { + "issues": "https://github.com/kylekatarnls/php-easy-doc/issues", + "source": "https://github.com/kylekatarnls/php-easy-doc/tree/master" + }, + "funding": [ + { + "url": "https://github.com/kylekatarnls", + "type": "github" + }, + { + "url": "https://opencollective.com/Carbon", + "type": "open_collective" + }, + { + "url": "https://tidelift.com/funding/github/packagist/nesbot/carbon", + "type": "tidelift" + } + ], + "time": "2020-05-24T10:15:11+00:00" + }, + { + "name": "gregwar/rst", + "version": "v1.0.6", + "target-dir": "Gregwar/RST", + "source": { + "type": "git", + "url": "https://github.com/Gregwar/RST.git", + "reference": "93c630ae18c47d8f7503230fa6ca39a79ad3c598" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Gregwar/RST/zipball/93c630ae18c47d8f7503230fa6ca39a79ad3c598", + "reference": "93c630ae18c47d8f7503230fa6ca39a79ad3c598", + "shasum": "" + }, + "require": { + "php": ">=5.3.0", + "symfony/polyfill-mbstring": "^1.12" + }, + "require-dev": { + "phpunit/phpunit": "^6.4" + }, + "type": "library", + "autoload": { + "psr-0": { + "Gregwar\\RST": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Grégoire Passault", + "email": "g.passault@gmail.com", + "homepage": "http://www.gregwar.com/" + } + ], + "description": "PHP library to parse reStructuredText documents", + "homepage": "https://github.com/Gregwar/RST", + "keywords": [ + "markup", + "parser", + "rst" + ], + "support": { + "issues": "https://github.com/Gregwar/RST/issues", + "source": "https://github.com/Gregwar/RST/tree/v1.0.6" + }, + "time": "2020-04-09T08:09:05+00:00" + }, + { + "name": "phpdocumentor/reflection-docblock", + "version": "2.0.5", + "source": { + "type": "git", + "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", + "reference": "e6a969a640b00d8daa3c66518b0405fb41ae0c4b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/e6a969a640b00d8daa3c66518b0405fb41ae0c4b", + "reference": "e6a969a640b00d8daa3c66518b0405fb41ae0c4b", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.0" + }, + "suggest": { + "dflydev/markdown": "~1.0", + "erusev/parsedown": "~1.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "psr-0": { + "phpDocumentor": [ + "src/" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Mike van Riel", + "email": "mike.vanriel@naenius.com" + } + ], + "support": { + "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/release/2.x" + }, + "time": "2016-01-25T08:17:30+00:00" + }, + { + "name": "phpspec/prophecy", + "version": "v1.5.0", + "source": { + "type": "git", + "url": "https://github.com/phpspec/prophecy.git", + "reference": "4745ded9307786b730d7a60df5cb5a6c43cf95f7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4745ded9307786b730d7a60df5cb5a6c43cf95f7", + "reference": "4745ded9307786b730d7a60df5cb5a6c43cf95f7", + "shasum": "" + }, + "require": { + "doctrine/instantiator": "^1.0.2", + "phpdocumentor/reflection-docblock": "~2.0", + "sebastian/comparator": "~1.1" + }, + "require-dev": { + "phpspec/phpspec": "~2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4.x-dev" + } + }, + "autoload": { + "psr-0": { + "Prophecy\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Konstantin Kudryashov", + "email": "ever.zet@gmail.com", + "homepage": "http://everzet.com" + }, + { + "name": "Marcello Duarte", + "email": "marcello.duarte@gmail.com" + } + ], + "description": "Highly opinionated mocking framework for PHP 5.3+", + "homepage": "https://github.com/phpspec/prophecy", + "keywords": [ + "Double", + "Dummy", + "fake", + "mock", + "spy", + "stub" + ], + "support": { + "issues": "https://github.com/phpspec/prophecy/issues", + "source": "https://github.com/phpspec/prophecy/tree/master" + }, + "time": "2015-08-13T10:07:40+00:00" + }, + { + "name": "phpunit/php-code-coverage", + "version": "2.2.4", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-code-coverage.git", + "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/eabf68b476ac7d0f73793aada060f1c1a9bf8979", + "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "phpunit/php-file-iterator": "~1.3", + "phpunit/php-text-template": "~1.2", + "phpunit/php-token-stream": "~1.3", + "sebastian/environment": "^1.3.2", + "sebastian/version": "~1.0" + }, + "require-dev": { + "ext-xdebug": ">=2.1.4", + "phpunit/phpunit": "~4" + }, + "suggest": { + "ext-dom": "*", + "ext-xdebug": ">=2.2.1", + "ext-xmlwriter": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.2.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", + "homepage": "https://github.com/sebastianbergmann/php-code-coverage", + "keywords": [ + "coverage", + "testing", + "xunit" + ], + "support": { + "irc": "irc://irc.freenode.net/phpunit", + "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/2.2" + }, + "time": "2015-10-06T15:47:00+00:00" + }, + { + "name": "phpunit/php-file-iterator", + "version": "1.4.5", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-file-iterator.git", + "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4", + "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "FilterIterator implementation that filters files based on a list of suffixes.", + "homepage": "https://github.com/sebastianbergmann/php-file-iterator/", + "keywords": [ + "filesystem", + "iterator" + ], + "support": { + "irc": "irc://irc.freenode.net/phpunit", + "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", + "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/1.4.5" + }, + "time": "2017-11-27T13:52:08+00:00" + }, + { + "name": "phpunit/php-text-template", + "version": "1.2.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-text-template.git", + "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686", + "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Simple template engine.", + "homepage": "https://github.com/sebastianbergmann/php-text-template/", + "keywords": [ + "template" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-text-template/issues", + "source": "https://github.com/sebastianbergmann/php-text-template/tree/1.2.1" + }, + "time": "2015-06-21T13:50:34+00:00" + }, + { + "name": "phpunit/php-timer", + "version": "1.0.8", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-timer.git", + "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/38e9124049cf1a164f1e4537caf19c99bf1eb260", + "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4|~5" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Utility class for timing", + "homepage": "https://github.com/sebastianbergmann/php-timer/", + "keywords": [ + "timer" + ], + "support": { + "irc": "irc://irc.freenode.net/phpunit", + "issues": "https://github.com/sebastianbergmann/php-timer/issues", + "source": "https://github.com/sebastianbergmann/php-timer/tree/master" + }, + "time": "2016-05-12T18:03:57+00:00" + }, + { + "name": "phpunit/php-token-stream", + "version": "1.4.12", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-token-stream.git", + "reference": "1ce90ba27c42e4e44e6d8458241466380b51fa16" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/1ce90ba27c42e4e44e6d8458241466380b51fa16", + "reference": "1ce90ba27c42e4e44e6d8458241466380b51fa16", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Wrapper around PHP's tokenizer extension.", + "homepage": "https://github.com/sebastianbergmann/php-token-stream/", + "keywords": [ + "tokenizer" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-token-stream/issues", + "source": "https://github.com/sebastianbergmann/php-token-stream/tree/1.4" + }, + "abandoned": true, + "time": "2017-12-04T08:55:13+00:00" + }, + { + "name": "phpunit/phpunit", + "version": "4.8.36", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/phpunit.git", + "reference": "46023de9a91eec7dfb06cc56cb4e260017298517" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/46023de9a91eec7dfb06cc56cb4e260017298517", + "reference": "46023de9a91eec7dfb06cc56cb4e260017298517", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-json": "*", + "ext-pcre": "*", + "ext-reflection": "*", + "ext-spl": "*", + "php": ">=5.3.3", + "phpspec/prophecy": "^1.3.1", + "phpunit/php-code-coverage": "~2.1", + "phpunit/php-file-iterator": "~1.4", + "phpunit/php-text-template": "~1.2", + "phpunit/php-timer": "^1.0.6", + "phpunit/phpunit-mock-objects": "~2.3", + "sebastian/comparator": "~1.2.2", + "sebastian/diff": "~1.2", + "sebastian/environment": "~1.3", + "sebastian/exporter": "~1.2", + "sebastian/global-state": "~1.0", + "sebastian/version": "~1.0", + "symfony/yaml": "~2.1|~3.0" + }, + "suggest": { + "phpunit/php-invoker": "~1.1" + }, + "bin": [ + "phpunit" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.8.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "The PHP Unit Testing framework.", + "homepage": "https://phpunit.de/", + "keywords": [ + "phpunit", + "testing", + "xunit" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/phpunit/issues", + "source": "https://github.com/sebastianbergmann/phpunit/tree/4.8.36" + }, + "time": "2017-06-21T08:07:12+00:00" + }, + { + "name": "phpunit/phpunit-mock-objects", + "version": "2.3.8", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", + "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/ac8e7a3db35738d56ee9a76e78a4e03d97628983", + "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983", + "shasum": "" + }, + "require": { + "doctrine/instantiator": "^1.0.2", + "php": ">=5.3.3", + "phpunit/php-text-template": "~1.2", + "sebastian/exporter": "~1.2" + }, + "require-dev": { + "phpunit/phpunit": "~4.4" + }, + "suggest": { + "ext-soap": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.3.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Mock Object library for PHPUnit", + "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/", + "keywords": [ + "mock", + "xunit" + ], + "support": { + "irc": "irc://irc.freenode.net/phpunit", + "issues": "https://github.com/sebastianbergmann/phpunit-mock-objects/issues", + "source": "https://github.com/sebastianbergmann/phpunit-mock-objects/tree/2.3" + }, + "abandoned": true, + "time": "2015-10-02T06:51:40+00:00" + }, + { + "name": "sebastian/comparator", + "version": "1.2.4", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/comparator.git", + "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2b7424b55f5047b47ac6e5ccb20b2aea4011d9be", + "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "sebastian/diff": "~1.2", + "sebastian/exporter": "~1.2 || ~2.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.2.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@2bepublished.at" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides the functionality to compare PHP values for equality", + "homepage": "http://www.github.com/sebastianbergmann/comparator", + "keywords": [ + "comparator", + "compare", + "equality" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/comparator/issues", + "source": "https://github.com/sebastianbergmann/comparator/tree/1.2" + }, + "time": "2017-01-29T09:50:25+00:00" + }, + { + "name": "sebastian/diff", + "version": "1.4.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/diff.git", + "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e", + "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.8" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Kore Nordmann", + "email": "mail@kore-nordmann.de" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Diff implementation", + "homepage": "https://github.com/sebastianbergmann/diff", + "keywords": [ + "diff" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/diff/issues", + "source": "https://github.com/sebastianbergmann/diff/tree/master" + }, + "time": "2015-12-08T07:14:41+00:00" + }, + { + "name": "sebastian/environment", + "version": "1.3.7", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/environment.git", + "reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/4e8f0da10ac5802913afc151413bc8c53b6c2716", + "reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.3.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides functionality to handle HHVM/PHP environments", + "homepage": "http://www.github.com/sebastianbergmann/environment", + "keywords": [ + "Xdebug", + "environment", + "hhvm" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/environment/issues", + "source": "https://github.com/sebastianbergmann/environment/tree/1.3.7" + }, + "time": "2016-05-17T03:18:57+00:00" + }, + { + "name": "sebastian/exporter", + "version": "1.2.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/exporter.git", + "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/42c4c2eec485ee3e159ec9884f95b431287edde4", + "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "sebastian/recursion-context": "~1.0" + }, + "require-dev": { + "ext-mbstring": "*", + "phpunit/phpunit": "~4.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.3.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@2bepublished.at" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" + } + ], + "description": "Provides the functionality to export PHP variables for visualization", + "homepage": "http://www.github.com/sebastianbergmann/exporter", + "keywords": [ + "export", + "exporter" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/exporter/issues", + "source": "https://github.com/sebastianbergmann/exporter/tree/master" + }, + "time": "2016-06-17T09:04:28+00:00" + }, + { + "name": "sebastian/global-state", + "version": "1.1.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/global-state.git", + "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4", + "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.2" + }, + "suggest": { + "ext-uopz": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Snapshotting of global state", + "homepage": "http://www.github.com/sebastianbergmann/global-state", + "keywords": [ + "global state" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/global-state/issues", + "source": "https://github.com/sebastianbergmann/global-state/tree/1.1.1" + }, + "time": "2015-10-12T03:26:01+00:00" + }, + { + "name": "sebastian/recursion-context", + "version": "1.0.5", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/recursion-context.git", + "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/b19cc3298482a335a95f3016d2f8a6950f0fbcd7", + "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" + } + ], + "description": "Provides functionality to recursively process PHP variables", + "homepage": "http://www.github.com/sebastianbergmann/recursion-context", + "support": { + "issues": "https://github.com/sebastianbergmann/recursion-context/issues", + "source": "https://github.com/sebastianbergmann/recursion-context/tree/master" + }, + "time": "2016-10-03T07:41:43+00:00" + }, + { + "name": "sebastian/version", + "version": "1.0.6", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/version.git", + "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6", + "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6", + "shasum": "" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library that helps with managing the version number of Git-hosted PHP projects", + "homepage": "https://github.com/sebastianbergmann/version", + "support": { + "issues": "https://github.com/sebastianbergmann/version/issues", + "source": "https://github.com/sebastianbergmann/version/tree/1.0.6" + }, + "time": "2015-06-21T13:59:46+00:00" + }, + { + "name": "simple-cli/simple-cli", + "version": "1.6.0", + "source": { + "type": "git", + "url": "https://github.com/kylekatarnls/simple-cli.git", + "reference": "47055c9a172ab032e33a498001d2978c9800fd59" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/kylekatarnls/simple-cli/zipball/47055c9a172ab032e33a498001d2978c9800fd59", + "reference": "47055c9a172ab032e33a498001d2978c9800fd59", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "^2.15.0", + "phan/phan": "^2.3", + "phpmd/phpmd": "dev-master", + "phpstan/phpstan": "^0.12", + "phpunit/phpunit": "^7", + "squizlabs/php_codesniffer": "^3.0", + "vimeo/psalm": "^3.6" + }, + "bin": [ + "bin/simple-cli" + ], + "type": "library", + "autoload": { + "psr-4": { + "SimpleCli\\": "src/SimpleCli/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "KyleK", + "email": "kylekatarnls@gmail.com" + } + ], + "description": "A simple command line framework", + "support": { + "issues": "https://github.com/kylekatarnls/simple-cli/issues", + "source": "https://github.com/kylekatarnls/simple-cli/tree/1.6.0" + }, + "funding": [ + { + "url": "https://tidelift.com/funding/github/packagist/simple-cli/simple-cli", + "type": "tidelift" + } + ], + "time": "2020-11-18T22:40:00+00:00" + }, + { + "name": "squizlabs/php_codesniffer", + "version": "2.9.2", + "source": { + "type": "git", + "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", + "reference": "2acf168de78487db620ab4bc524135a13cfe6745" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/2acf168de78487db620ab4bc524135a13cfe6745", + "reference": "2acf168de78487db620ab4bc524135a13cfe6745", + "shasum": "" + }, + "require": { + "ext-simplexml": "*", + "ext-tokenizer": "*", + "ext-xmlwriter": "*", + "php": ">=5.1.2" + }, + "require-dev": { + "phpunit/phpunit": "~4.0" + }, + "bin": [ + "scripts/phpcs", + "scripts/phpcbf" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.x-dev" + } + }, + "autoload": { + "classmap": [ + "CodeSniffer.php", + "CodeSniffer/CLI.php", + "CodeSniffer/Exception.php", + "CodeSniffer/File.php", + "CodeSniffer/Fixer.php", + "CodeSniffer/Report.php", + "CodeSniffer/Reporting.php", + "CodeSniffer/Sniff.php", + "CodeSniffer/Tokens.php", + "CodeSniffer/Reports/", + "CodeSniffer/Tokenizers/", + "CodeSniffer/DocGenerators/", + "CodeSniffer/Standards/AbstractPatternSniff.php", + "CodeSniffer/Standards/AbstractScopeSniff.php", + "CodeSniffer/Standards/AbstractVariableSniff.php", + "CodeSniffer/Standards/IncorrectPatternException.php", + "CodeSniffer/Standards/Generic/Sniffs/", + "CodeSniffer/Standards/MySource/Sniffs/", + "CodeSniffer/Standards/PEAR/Sniffs/", + "CodeSniffer/Standards/PSR1/Sniffs/", + "CodeSniffer/Standards/PSR2/Sniffs/", + "CodeSniffer/Standards/Squiz/Sniffs/", + "CodeSniffer/Standards/Zend/Sniffs/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Greg Sherwood", + "role": "lead" + } + ], + "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", + "homepage": "http://www.squizlabs.com/php-codesniffer", + "keywords": [ + "phpcs", + "standards" + ], + "support": { + "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues", + "source": "https://github.com/squizlabs/PHP_CodeSniffer", + "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki" + }, + "time": "2018-11-07T22:31:41+00:00" + }, + { + "name": "symfony/yaml", + "version": "v3.4.47", + "source": { + "type": "git", + "url": "https://github.com/symfony/yaml.git", + "reference": "88289caa3c166321883f67fe5130188ebbb47094" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/yaml/zipball/88289caa3c166321883f67fe5130188ebbb47094", + "reference": "88289caa3c166321883f67fe5130188ebbb47094", + "shasum": "" + }, + "require": { + "php": "^5.5.9|>=7.0.8", + "symfony/polyfill-ctype": "~1.8" + }, + "conflict": { + "symfony/console": "<3.4" + }, + "require-dev": { + "symfony/console": "~3.4|~4.0" + }, + "suggest": { + "symfony/console": "For validating YAML files using the lint command" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Yaml\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Yaml Component", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/yaml/tree/v3.4.47" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-10-24T10:57:07+00:00" + } + ], + "aliases": [], + "minimum-stability": "stable", + "stability-flags": [], + "prefer-stable": false, + "prefer-lowest": false, + "platform": { + "php": ">=5.3.7" + }, + "platform-dev": [], + "plugin-api-version": "2.6.0" +} diff --git a/pkgs/by-name/pd/pdepend/package.nix b/pkgs/by-name/pd/pdepend/package.nix index 1ecbbe70e0c94..b14752c38cb33 100644 --- a/pkgs/by-name/pd/pdepend/package.nix +++ b/pkgs/by-name/pd/pdepend/package.nix @@ -2,15 +2,16 @@ php.buildComposerProject (finalAttrs: { pname = "pdepend"; - version = "2.14.0"; + version = "2.15.1"; src = fetchFromGitHub { owner = "pdepend"; repo = "pdepend"; rev = finalAttrs.version; - hash = "sha256-ZmgMuOpUsx5JWTcPRS6qKbTWZvuOrBVOVdPMcvvTV20="; + hash = "sha256-tVWOR0rKMnQDeHk3MHhEVOjn+dSpoMx+Ln+AwFRMwYs="; }; + composerLock = ./composer.lock; vendorHash = "sha256-MWm8urRB9IujqrIl22x+JFFCRR+nINLQqnHUywT2pi0="; meta = { diff --git a/pkgs/applications/window-managers/pekwm/default.nix b/pkgs/by-name/pe/pekwm/package.nix index dcd2bb27a71d5..b6baed455925c 100644 --- a/pkgs/applications/window-managers/pekwm/default.nix +++ b/pkgs/by-name/pe/pekwm/package.nix @@ -2,10 +2,8 @@ , stdenv , fetchFromGitHub , awk -, grep -, sed -, runtimeShell , cmake +, grep , libXext , libXft , libXinerama @@ -14,6 +12,8 @@ , libjpeg , libpng , pkg-config +, runtimeShell +, sed }: stdenv.mkDerivation (finalAttrs: { @@ -32,13 +32,6 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - cmakeFlags = [ - "-DAWK=${awk}/bin/awk" - "-DGREP=${grep}/bin/grep" - "-DSED=${sed}/bin/sed" - "-DSH=${runtimeShell}" - ]; - buildInputs = [ libXext libXft @@ -49,6 +42,17 @@ stdenv.mkDerivation (finalAttrs: { libpng ]; + outputs = [ "out" "man" ]; + + strictDeps = true; + + cmakeFlags = [ + "-DAWK=${lib.getBin awk}/bin/awk" + "-DGREP=${lib.getBin grep}/bin/grep" + "-DSED=${lib.getBin sed}/bin/sed" + "-DSH=${runtimeShell}" + ]; + meta = { homepage = "https://www.pekwm.se/"; description = "A lightweight window manager"; @@ -67,6 +71,7 @@ stdenv.mkDerivation (finalAttrs: { ''; changelog = "https://raw.githubusercontent.com/pekwm/pekwm/release-${finalAttrs.version}/NEWS.md"; license = lib.licenses.gpl2Plus; + mainProgram = "pekwm"; maintainers = [ lib.maintainers.AndersonTorres ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/pe/pesign/package.nix b/pkgs/by-name/pe/pesign/package.nix new file mode 100644 index 0000000000000..b39db9cd430b7 --- /dev/null +++ b/pkgs/by-name/pe/pesign/package.nix @@ -0,0 +1,52 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, nss +, efivar +, util-linux +, popt +, nspr +, mandoc +}: + +stdenv.mkDerivation rec { + pname = "pesign"; + version = "116"; + + src = fetchFromGitHub { + owner = "rhboot"; + repo = "pesign"; + rev = version; + hash = "sha256-cuOSD/ZHkilgguDFJviIZCG8kceRWw2JgssQuWN02Do="; + }; + + # nss-util is missing because it is already contained in nss + # Red Hat seems to be shipping a separate nss-util: + # https://centos.pkgs.org/7/centos-x86_64/nss-util-devel-3.44.0-4.el7_7.x86_64.rpm.html + # containing things we already have in `nss`. + # We can ignore all the errors pertaining to a missing + # nss-util.pc I suppose. + buildInputs = [ efivar util-linux nss popt nspr mandoc ]; + nativeBuildInputs = [ pkg-config ]; + + makeFlags = [ "INSTALLROOT=$(out)" ]; + + postInstall = '' + mv $out/usr/bin $out/bin + mv $out/usr/share $out/share + + rm -rf $out/usr + rm -rf $out/etc + rm -rf $out/run + ''; + + meta = with lib; { + description = "Signing tools for PE-COFF binaries. Compliant with the PE and Authenticode specifications."; + homepage = "https://github.com/rhboot/pesign"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ raitobezarius ]; + # efivar is currently Linux-only. + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/po/poethepoet/package.nix b/pkgs/by-name/po/poethepoet/package.nix new file mode 100644 index 0000000000000..7505fb4531d59 --- /dev/null +++ b/pkgs/by-name/po/poethepoet/package.nix @@ -0,0 +1,43 @@ +{ lib +, python3 +, fetchFromGitHub +}: + +python3.pkgs.buildPythonApplication rec { + pname = "poethepoet"; + version = "0.24.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "nat-n"; + repo = "poethepoet"; + rev = "v${version}"; + hash = "sha256-fW457R8DvkHdgNcPatEf1nJNjMYTmliiRHrYyAAoZuo="; + }; + + nativeBuildInputs = [ + python3.pkgs.poetry-core + ]; + + propagatedBuildInputs = with python3.pkgs; [ + pastel + tomli + ]; + + passthru.optional-dependencies = with python3.pkgs; { + poetry_plugin = [ + poetry + ]; + }; + + pythonImportsCheck = [ "poethepoet" ]; + + meta = with lib; { + description = "A task runner that works well with poetry"; + homepage = "https://github.com/nat-n/poethepoet"; + changelog = "https://github.com/nat-n/poethepoet/releases/tag/${src.rev}"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "poe"; + }; +} diff --git a/pkgs/by-name/px/pxder/package.nix b/pkgs/by-name/px/pxder/package.nix new file mode 100644 index 0000000000000..96760f7f66921 --- /dev/null +++ b/pkgs/by-name/px/pxder/package.nix @@ -0,0 +1,66 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchYarnDeps +, makeWrapper +, prefetch-yarn-deps +, yarn +, nodejs +}: + +stdenv.mkDerivation rec { + pname = "pxder"; + version = "2.12.8"; + + src = fetchFromGitHub { + owner = "Tsuk1ko"; + repo = "pxder"; + rev = "v${version}"; + hash = "sha256-+WZbs10+id+nohTZzLjEofb6k8PMGd73YhY3FUTXx5Q="; + }; + + offlineCache = fetchYarnDeps { + yarnLock = "${src}/yarn.lock"; + hash = "sha256-++MqWIUntXQwOYpgAJ3nhAtZ5nxmEreioVHQokYkw7w="; + }; + + nativeBuildInputs = [ + makeWrapper + prefetch-yarn-deps + yarn + ]; + + configurePhase = '' + runHook preConfigure + + export HOME=$(mktemp -d) + yarn config --offline set yarn-offline-mirror "$offlineCache" + fixup-yarn-lock yarn.lock + yarn --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive install + + runHook postConfigure + ''; + + installPhase = '' + runHook preInstall + + yarn --offline --production install + + mkdir -p "$out/lib/node_modules/pxder" + cp -r . "$out/lib/node_modules/pxder" + + makeWrapper "${nodejs}/bin/node" "$out/bin/pxder" \ + --add-flags "$out/lib/node_modules/pxder/bin/pxder" + + runHook postInstall + ''; + + meta = { + description = "Download illusts from pixiv.net"; + homepage = "https://github.com/Tsuk1ko/pxder"; + license = lib.licenses.gpl3Plus; + mainProgram = "pxder"; + maintainers = with lib.maintainers; [ vanilla ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/applications/window-managers/ratpoison/default.nix b/pkgs/by-name/ra/ratpoison/package.nix index 472707bf35c09..6a2f63159f652 100644 --- a/pkgs/applications/window-managers/ratpoison/default.nix +++ b/pkgs/by-name/ra/ratpoison/package.nix @@ -1,42 +1,71 @@ -{ lib, stdenv, fetchurl, pkg-config, perl, autoconf, automake -, libX11, xorgproto, libXt, libXpm, libXft, libXtst, libXi -, libXrandr, fontconfig, freetype, readline +{ lib +, stdenv +, fetchurl +, autoreconfHook +, fontconfig +, freetype +, libX11 +, libXft +, libXi +, libXpm +, libXrandr +, libXt +, libXtst +, perl +, pkg-config +, readline +, texinfo +, xorgproto }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ratpoison"; version = "1.4.9"; src = fetchurl { - url = "mirror://savannah/ratpoison/${pname}-${version}.tar.xz"; - sha256 = "1wfir1gvh5h7izgvx2kd1pr2k7wlncd33zq7qi9s9k2y0aza93yr"; + url = "mirror://savannah/ratpoison/ratpoison-${finalAttrs.version}.tar.xz"; + hash = "sha256-2Y+kvgJezKRTxAf/MRqzlJ8p8g1tir7fjwcWuF/I0fE="; }; + nativeBuildInputs = [ + autoreconfHook + pkg-config + texinfo + ]; + + buildInputs = [ + fontconfig + freetype + libX11 + libXft + libXi + libXpm + libXrandr + libXt + libXtst + perl + readline + xorgproto + ]; + outputs = [ "out" "contrib" "man" "doc" "info" ]; + strictDeps = true; + configureFlags = [ # >=1.4.9 requires this even with readline in inputs "--enable-history" ]; - nativeBuildInputs = [ pkg-config autoconf automake ]; - - buildInputs = - [ perl - libX11 xorgproto libXt libXpm libXft libXtst libXi libXrandr - fontconfig freetype readline ]; - postInstall = '' mkdir -p $contrib/{bin,share} mv $out/bin/rpws $contrib/bin mv $out/share/ratpoison $contrib/share ''; - meta = with lib; { + meta = { homepage = "https://www.nongnu.org/ratpoison/"; description = "Simple mouse-free tiling window manager"; - license = licenses.gpl2Plus; - longDescription = '' Ratpoison is a simple window manager with no fat library dependencies, no fancy graphics, no window decorations, and no @@ -51,8 +80,9 @@ stdenv.mkDerivation rec { Ratpoison has a prefix map to minimize the key clobbering that cripples Emacs and other quality pieces of software. ''; - - platforms = platforms.unix; - maintainers = [ maintainers.AndersonTorres ]; + license = lib.licenses.gpl2Plus; + mainProgram = "ratpoison"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + inherit (libX11.meta) platforms; }; -} +}) diff --git a/pkgs/by-name/re/rectangle-pro/package.nix b/pkgs/by-name/re/rectangle-pro/package.nix index 26b39da655eee..710ec7121c980 100644 --- a/pkgs/by-name/re/rectangle-pro/package.nix +++ b/pkgs/by-name/re/rectangle-pro/package.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "rectangle-pro"; - version = "3.0.9"; + version = "3.0.11"; src = fetchurl { url = "https://rectangleapp.com/pro/downloads/Rectangle%20Pro%20${finalAttrs.version}.dmg"; - hash = "sha256-wD8yi2Pbgrn1fW/xrocepDcpzSMsQH5yjB/Jv90PuGQ="; + hash = "sha256-Hs2eRO5DpYoY0rLfcmGZRHjmg+wddz/+LE0u4E9gCTk="; }; sourceRoot = "."; diff --git a/pkgs/by-name/sa/samrewritten/package.nix b/pkgs/by-name/sa/samrewritten/package.nix new file mode 100644 index 0000000000000..de0c4e9857273 --- /dev/null +++ b/pkgs/by-name/sa/samrewritten/package.nix @@ -0,0 +1,47 @@ +{ lib +, stdenv +, fetchFromGitHub +, unstableGitUpdater +, curl +, gtkmm3 +, glibmm +, gnutls +, yajl +, pkg-config +}: +stdenv.mkDerivation (finalAttrs: { + pname = "samrewritten"; + version = "unstable-2023-05-23"; + + src = fetchFromGitHub { + owner = "PaulCombal"; + repo = "SamRewritten"; + # The latest release is too old, use latest commit instead + rev = "39d524a72678a226bf9140db6b97641f554563c3"; + hash = "sha256-sS/lVY5EWXdTOg7cDWPbi/n5TNt+pRAF1x7ZEaYG4wM="; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + curl + gtkmm3 + glibmm + gnutls + yajl + ]; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + description = "Steam Achievement Manager For Linux. Rewritten in C++"; + homepage = "https://github.com/PaulCombal/SamRewritten"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ ludovicopiero ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/sc/screentest/package.nix b/pkgs/by-name/sc/screentest/package.nix index 0c76eaa2d8a82..d64f3300256f8 100644 --- a/pkgs/by-name/sc/screentest/package.nix +++ b/pkgs/by-name/sc/screentest/package.nix @@ -18,13 +18,18 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-TJ47c77vQ/aRBJ2uEiFLuAR4dd4CMEo+iAAx0HCFbmA="; }; + strictDeps = true; + nativeBuildInputs = [ autoreconfHook intltool pkg-config + gtk2 # for autoconf macros ]; - buildInputs = [ gtk2 ]; + buildInputs = [ + gtk2 + ]; meta = with lib; { description = "A simple screen testing tool"; diff --git a/pkgs/by-name/sh/shepherd/package.nix b/pkgs/by-name/sh/shepherd/package.nix new file mode 100644 index 0000000000000..4cd45aaea0b38 --- /dev/null +++ b/pkgs/by-name/sh/shepherd/package.nix @@ -0,0 +1,77 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchYarnDeps +, makeWrapper +, nodejs +, prefetch-yarn-deps +, yarn +}: + +stdenv.mkDerivation rec { + pname = "shepherd"; + version = "1.16.0"; + + src = fetchFromGitHub { + owner = "NerdWalletOSS"; + repo = "shepherd"; + rev = "v${version}"; + hash = "sha256-LY8Vde4YpGuKnQ5UnSOpsQDY7AOyZRziUrfZb5dRiX4="; + }; + + offlineCache = fetchYarnDeps { + yarnLock = "${src}/yarn.lock"; + hash = "sha256-tJXJ8ePr5ArAV+0JcuJsTo/B2PUcgsXfZrSDCpna/9k="; + }; + + nativeBuildInputs = [ + makeWrapper + nodejs + prefetch-yarn-deps + yarn + ]; + + configurePhase = '' + runHook preConfigure + + export HOME=$(mktemp -d) + yarn config --offline set yarn-offline-mirror "$offlineCache" + fixup-yarn-lock yarn.lock + yarn --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive install + patchShebangs node_modules + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + yarn --offline build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + yarn --offline --production install + + mkdir -p "$out/lib/node_modules/@nerdwallet/shepherd" + cp -r . "$out/lib/node_modules/@nerdwallet/shepherd" + + makeWrapper "${nodejs}/bin/node" "$out/bin/shepherd" \ + --add-flags "$out/lib/node_modules/@nerdwallet/shepherd/lib/cli.js" + + runHook postInstall + ''; + + meta = { + changelog = "https://github.com/NerdWalletOSS/shepherd/blob/${src.rev}/CHANGELOG.md"; + description = "A utility for applying code changes across many repositories"; + homepage = "https://github.com/NerdWalletOSS/shepherd"; + license = lib.licenses.asl20; + mainProgram = "shepherd"; + maintainers = with lib.maintainers; [ dbirks ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/tools/misc/shopware-cli/default.nix b/pkgs/by-name/sh/shopware-cli/package.nix index c04ae27e99194..adbe013805ea4 100644 --- a/pkgs/tools/misc/shopware-cli/default.nix +++ b/pkgs/by-name/sh/shopware-cli/package.nix @@ -9,18 +9,18 @@ buildGoModule rec { pname = "shopware-cli"; - version = "0.2.8"; + version = "0.3.4"; src = fetchFromGitHub { repo = "shopware-cli"; owner = "FriendsOfShopware"; rev = version; - hash = "sha256-ThjSp7WBAWBUXDRN0mJvIb7uWTjYtVa53b+BoWCPuvo="; + hash = "sha256-1lOcr3XiQCh1T07iYRlGwMzsmQx1QYgkrStWlUM1XCo="; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; - nativeCheckInputs = [ git ]; + nativeCheckInputs = [ git dart-sass ]; - vendorHash = "sha256-JRzF2eYHnFO/2Tqnc4DMMGSV8gDKDiu8ZjELcn/Wur0="; + vendorHash = "sha256-j133hlcfRKTkIcNdZQmGn5yiWfKHp/5UVwLAs1njNdM="; postInstall = '' export HOME="$(mktemp -d)" diff --git a/pkgs/by-name/si/simplex-chat-desktop/package.nix b/pkgs/by-name/si/simplex-chat-desktop/package.nix new file mode 100644 index 0000000000000..0e1d3d8abcc4f --- /dev/null +++ b/pkgs/by-name/si/simplex-chat-desktop/package.nix @@ -0,0 +1,46 @@ +{ lib +, appimageTools +, fetchurl +}: + +let + pname = "simplex-chat-desktop"; + version = "5.3.1"; + + src = fetchurl { + url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage"; + hash = "sha256-vykdi7SXKKsjYE/yixGrKQoWuUIOAjofLUn/fsdmLMc="; + }; + + appimageContents = appimageTools.extract { + inherit pname version src; + }; +in appimageTools.wrapType2 { + inherit pname version src; + + extraPkgs = pkgs: with pkgs; [ + makeWrapper + ]; + + extraBwrapArgs = [ + "--setenv _JAVA_AWT_WM_NONREPARENTING 1" + ]; + + extraInstallCommands = '' + mv $out/bin/${pname}-${version} $out/bin/${pname} + + install --mode=444 -D ${appimageContents}/chat.simplex.app.desktop --target-directory=$out/share/applications + substituteInPlace $out/share/applications/chat.simplex.app.desktop \ + --replace 'Exec=simplex' 'Exec=${pname}' + cp -r ${appimageContents}/usr/share/icons $out/share + ''; + + meta = with lib; { + description = "Desktop application for SimpleX Chat"; + homepage = "https://simplex.chat"; + changelog = "https://github.com/simplex-chat/simplex-chat/releases/tag/v${version}"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ yuu ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/by-name/sl/slurm-nm/package.nix b/pkgs/by-name/sl/slurm-nm/package.nix new file mode 100644 index 0000000000000..5e9fa47127fc1 --- /dev/null +++ b/pkgs/by-name/sl/slurm-nm/package.nix @@ -0,0 +1,32 @@ +{ stdenv +, lib +, fetchFromGitHub +, pkg-config +, meson +, ncurses +, ninja +}: + +stdenv.mkDerivation rec { + pname = "slurm-nm"; + version = "0.4.4"; + + src = fetchFromGitHub { + owner = "mattthias"; + repo = "slurm"; + rev = "upstream/${version}"; + hash = "sha256-w77SIXFctMwwNw9cQm0HQaEaMs/5NXQjn1LpvkpCCB8="; + }; + + nativeBuildInputs = [ pkg-config meson ninja ]; + buildInputs = [ ncurses ]; + + meta = with lib; { + description = "A generic network load monitor"; + homepage = "https://github.com/mattthias/slurm"; + license = licenses.gpl2Plus; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ mikaelfangel ]; + mainProgram = "slurm"; + }; +} diff --git a/pkgs/by-name/sm/smallwm/package.nix b/pkgs/by-name/sm/smallwm/package.nix new file mode 100644 index 0000000000000..ceee59a326fac --- /dev/null +++ b/pkgs/by-name/sm/smallwm/package.nix @@ -0,0 +1,60 @@ +{ lib +, stdenv +, fetchFromGitHub +, doxygen +, graphviz +, libX11 +, libXrandr +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "smallwm"; + version = "unstable-2020-02-28"; + + src = fetchFromGitHub { + owner = "adamnew123456"; + repo = "SmallWM"; + rev = "c2dc72afa87241bcf7e646630f4aae216ce78613"; + hash = "sha256-6FPpw1HE0iV/ayl2NvVUApqUcwBElRLf9o216gPyEDM="; + }; + + nativeBuildInputs = [ + doxygen + graphviz + ]; + + buildInputs = [ + libX11 + libXrandr + ]; + + strictDeps = true; + + dontConfigure = true; + + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "CXX=${stdenv.cc.targetPrefix}c++" + ]; + + buildFlags = [ "all" "doc" ]; + + installPhase = '' + runHook preInstall + + install -dm755 $out/bin $out/share/doc/smallwm-${finalAttrs.version} + install -m755 bin/smallwm -t $out/bin + cp -r README.markdown doc/html doc/latex $out/share/doc/smallwm-${finalAttrs.version} + + runHook postInstall + ''; + + meta = { + description = "A small X window manager, extended from tinywm"; + homepage = "https://github.com/adamnew123456/SmallWM"; + license = lib.licenses.bsd2; + mainProgram = "smallwm"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + inherit (libX11.meta) platforms; + }; +}) diff --git a/pkgs/by-name/st/static-server/package.nix b/pkgs/by-name/st/static-server/package.nix new file mode 100644 index 0000000000000..3a5f0748f9687 --- /dev/null +++ b/pkgs/by-name/st/static-server/package.nix @@ -0,0 +1,56 @@ +{ lib +, buildGo121Module +, fetchFromGitHub +, curl +, stdenv +, testers +, static-server +, substituteAll +}: + +buildGo121Module rec { + pname = "static-server"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "eliben"; + repo = "static-server"; + rev = "v${version}"; + hash = "sha256-AZcNh/kF6IdAceA7qe+nhRlwU4yGh19av/S1Zt7iKIs="; + }; + + vendorHash = "sha256-1p3dCLLo+MTPxf/Y3zjxTagUi+tq7nZSj4ZB/aakJGY="; + + patches = [ + # patch out debug.ReadBuidlInfo since version information is not available with buildGoModule + (substituteAll { + src = ./version.patch; + inherit version; + }) + ]; + + nativeCheckInputs = [ + curl + ]; + + ldflags = [ "-s" "-w" ]; + + # tests sometimes fail with SIGQUIT on darwin + doCheck = !stdenv.isDarwin; + + passthru.tests = { + version = testers.testVersion { + package = static-server; + }; + }; + + __darwinAllowLocalNetworking = true; + + meta = with lib; { + description = "A simple, zero-configuration HTTP server CLI for serving static files"; + homepage = "https://github.com/eliben/static-server"; + license = licenses.unlicense; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "static-server"; + }; +} diff --git a/pkgs/by-name/st/static-server/version.patch b/pkgs/by-name/st/static-server/version.patch new file mode 100644 index 0000000000000..c92d7e482ed49 --- /dev/null +++ b/pkgs/by-name/st/static-server/version.patch @@ -0,0 +1,23 @@ +--- a/internal/server/server.go ++++ b/internal/server/server.go +@@ -15,7 +15,6 @@ import ( + "net" + "net/http" + "os" +- "runtime/debug" + "strings" + ) + +@@ -50,11 +49,7 @@ func Main() int { + flags.Parse(os.Args[1:]) + + if *versionFlag { +- if buildInfo, ok := debug.ReadBuildInfo(); ok { +- fmt.Printf("%v %v\n", programName, buildInfo.Main.Version) +- } else { +- errorLog.Printf("version info unavailable! run 'go version -m %v'", programName) +- } ++ fmt.Printf("%v %v\n", programName, "@version@") + os.Exit(0) + } + diff --git a/pkgs/tools/X11/sunpaper/default.nix b/pkgs/by-name/su/sunpaper/package.nix index 116b0225ab0f9..54d8d3d871ac6 100644 --- a/pkgs/tools/X11/sunpaper/default.nix +++ b/pkgs/by-name/su/sunpaper/package.nix @@ -5,33 +5,37 @@ , wallutils }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "sunpaper"; version = "2.0"; src = fetchFromGitHub { owner = "hexive"; repo = "sunpaper"; - rev = "v${version}"; - sha256 = "sha256-8s7SS79wCS0nRR7IpkshP5QWJqqKEeBu6EtFPDM+2cM="; + rev = "v${finalAttrs.version}"; + hash = "sha256-8s7SS79wCS0nRR7IpkshP5QWJqqKEeBu6EtFPDM+2cM="; }; buildInputs = [ - wallutils sunwait + wallutils ]; postPatch = '' substituteInPlace sunpaper.sh \ - --replace "sunwait" "${sunwait}/bin/sunwait" \ - --replace "setwallpaper" "${wallutils}/bin/setwallpaper" \ + --replace "sunwait" "${lib.getExe sunwait}" \ + --replace "setwallpaper" "${lib.getExe' wallutils "setwallpaper"}" \ --replace '$HOME/sunpaper/images/' "$out/share/sunpaper/images/" ''; installPhase = '' - mkdir -p "$out/bin" "$out/share/sunpaper/images" - cp sunpaper.sh $out/bin/sunpaper + runHook preInstall + + install -Dm555 sunpaper.sh $out/bin/sunpaper + mkdir -p "$out/share/sunpaper/images" cp -R images $out/share/sunpaper/ + + runHook postInstall ''; doInstallCheck = true; @@ -40,11 +44,12 @@ stdenvNoCC.mkDerivation rec { $out/bin/sunpaper --help > /dev/null ''; - meta = with lib; { + meta = { description = "A utility to change wallpaper based on local weather, sunrise and sunset times"; homepage = "https://github.com/hexive/sunpaper"; - license = lib.licenses.unfree; - maintainers = with maintainers; [ jevy ]; - platforms = platforms.unix; + license = lib.licenses.asl20; + mainProgram = "sunpaper"; + maintainers = with lib.maintainers; [ eclairevoyant jevy ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/sy/symbolicator/Cargo.lock b/pkgs/by-name/sy/symbolicator/Cargo.lock index 4a0cb402dfd6f..25fa9ef7959e8 100644 --- a/pkgs/by-name/sy/symbolicator/Cargo.lock +++ b/pkgs/by-name/sy/symbolicator/Cargo.lock @@ -3044,7 +3044,7 @@ dependencies = [ [[package]] name = "process-event" -version = "23.9.0" +version = "23.9.1" dependencies = [ "anyhow", "clap", @@ -4314,7 +4314,7 @@ dependencies = [ [[package]] name = "symbolicator" -version = "23.9.0" +version = "23.9.1" dependencies = [ "anyhow", "axum", @@ -4350,7 +4350,7 @@ dependencies = [ [[package]] name = "symbolicator-crash" -version = "23.9.0" +version = "23.9.1" dependencies = [ "bindgen", "cmake", @@ -4358,7 +4358,7 @@ dependencies = [ [[package]] name = "symbolicator-service" -version = "23.9.0" +version = "23.9.1" dependencies = [ "anyhow", "apple-crash-report-parser", @@ -4415,7 +4415,7 @@ dependencies = [ [[package]] name = "symbolicator-sources" -version = "23.9.0" +version = "23.9.1" dependencies = [ "anyhow", "aws-types", @@ -4430,7 +4430,7 @@ dependencies = [ [[package]] name = "symbolicator-stress" -version = "23.9.0" +version = "23.9.1" dependencies = [ "anyhow", "axum", @@ -4450,7 +4450,7 @@ dependencies = [ [[package]] name = "symbolicator-test" -version = "23.9.0" +version = "23.9.1" dependencies = [ "axum", "humantime", @@ -4468,7 +4468,7 @@ dependencies = [ [[package]] name = "symbolicli" -version = "23.9.0" +version = "23.9.1" dependencies = [ "anyhow", "clap", @@ -4491,7 +4491,7 @@ dependencies = [ [[package]] name = "symsorter" -version = "23.9.0" +version = "23.9.1" dependencies = [ "anyhow", "chrono", @@ -5239,7 +5239,7 @@ checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "wasm-split" -version = "23.9.0" +version = "23.9.1" dependencies = [ "anyhow", "clap", diff --git a/pkgs/by-name/sy/symbolicator/package.nix b/pkgs/by-name/sy/symbolicator/package.nix index a7ac6aacc495b..15114ccff239a 100644 --- a/pkgs/by-name/sy/symbolicator/package.nix +++ b/pkgs/by-name/sy/symbolicator/package.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "symbolicator"; - version = "23.9.0"; + version = "23.9.1"; src = fetchFromGitHub { owner = "getsentry"; repo = "symbolicator"; rev = version; - hash = "sha256-odlxslhSsalWbgouzq/1Gyn/5hekoW0dtgshz1vxsg8="; + hash = "sha256-QsU9hxBF7Te3vO6in/nWn6hYbovI1jOWYXB6PcqWGTA="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/th/thud/package.nix b/pkgs/by-name/th/thud/package.nix new file mode 100644 index 0000000000000..f007174df8608 --- /dev/null +++ b/pkgs/by-name/th/thud/package.nix @@ -0,0 +1,43 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, installShellFiles +}: + +rustPlatform.buildRustPackage rec { + pname = "thud"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "donovanglover"; + repo = "thud"; + rev = version; + hash = "sha256-3MxmVKs0huXPnL9mqDniaIarkAvJmwSOMii2ntXtOos="; + }; + + cargoHash = "sha256-Hk3HlcA253FAA9hw5p9W+Mvec84zLo7bEmM2/BbmjiM="; + + nativeBuildInputs = [ + installShellFiles + ]; + + postInstall = '' + install -Dm644 assets/thud.thumbnailer $out/share/thumbnailers/thud.thumbnailer + substituteInPlace $out/share/thumbnailers/thud.thumbnailer --replace "thud" "$out/bin/thud" + + installManPage man/thud.1 + + installShellCompletion --cmd thud \ + --bash <(cat completions/thud.bash) \ + --fish <(cat completions/thud.fish) \ + --zsh <(cat completions/_thud) + ''; + + meta = with lib; { + description = "Generate directory thumbnails for GTK-based file browsers from images inside them"; + homepage = "https://github.com/donovanglover/thud"; + license = licenses.mit; + maintainers = with maintainers; [ donovanglover ]; + mainProgram = "thud"; + }; +} diff --git a/pkgs/applications/window-managers/tinywm/default.nix b/pkgs/by-name/ti/tinywm/package.nix index 903502db50151..03b6db11c5653 100644 --- a/pkgs/applications/window-managers/tinywm/default.nix +++ b/pkgs/by-name/ti/tinywm/package.nix @@ -1,36 +1,49 @@ -{ lib, stdenv, fetchFromGitHub -, libX11 }: +{ lib +, stdenv +, fetchFromGitHub +, libX11 +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tinywm"; - version = "2014-04-22"; + version = "1.1-unstable-2014-04-22"; src = fetchFromGitHub { owner = "mackstann"; - repo = pname; + repo = "tinywm"; rev = "9d05612f41fdb8bc359f1fd9cc930bf16315abb1"; - sha256 = "1s7r4f2d3lk1i8h089v2vyrr02hh0y9i3ihl9kqgk9s87hqw8q5b"; + hash = "sha256-q2DEMTxIp/nwTBTGEZMHEAqQs99iJwQgimHS0YQj+eg="; }; buildInputs = [ libX11 ]; + strictDeps = true; + dontConfigure = true; buildPhase = '' + runHook preBuild + $CC -Wall -pedantic -I${libX11}/include tinywm.c -L${libX11}/lib -lX11 -o tinywm + + runHook postBuild ''; installPhase = '' - install -dm755 $out/bin $out/share/doc/${pname}-${version} + runHook preInstall + + install -dm755 $out/bin $out/share/doc/tinywm-${finalAttrs.version} install -m755 tinywm -t $out/bin/ # The annotated source code is a piece of documentation - install -m644 annotated.c README -t $out/share/doc/${pname}-${version} + install -m644 annotated.c README -t $out/share/doc/tinywm-${finalAttrs.version} + + runHook postInstall ''; - meta = with lib;{ + meta = { + homepage = "http://incise.org/tinywm.html"; description = "A tiny window manager for X11"; longDescription = '' - TinyWM is a tiny window manager that I created as an exercise in minimalism. It is also maybe helpful in learning some of the very basics of creating a window manager. It is only around 50 lines of C. There is @@ -44,9 +57,9 @@ stdenv.mkDerivation rec { keybinding in there somewhere) - Focus windows with the mouse pointer (X does this on its own) ''; - homepage = "http://incise.org/tinywm.html"; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = libX11.meta.platforms; - license = licenses.publicDomain; + license = lib.licenses.publicDomain; + mainProgram = "tinywm"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + inherit (libX11.meta) platforms; }; -} +}) diff --git a/pkgs/by-name/tm/tmuxifier/package.nix b/pkgs/by-name/tm/tmuxifier/package.nix new file mode 100644 index 0000000000000..ef0be1687f43b --- /dev/null +++ b/pkgs/by-name/tm/tmuxifier/package.nix @@ -0,0 +1,56 @@ +{ lib, stdenv, fetchFromGitHub, installShellFiles }: + +stdenv.mkDerivation rec { + pname = "tmuxifier"; + version = "0.13.0"; + + src = fetchFromGitHub { + owner = "jimeh"; + repo = "tmuxifier"; + rev = "v${version}"; + hash = "sha256-7TvJnvtZEo5h45PcSy3tJN09UblswV0mQbTaKjgLyqw="; + }; + + nativeBuildInputs = [ installShellFiles ]; + + dontBuild = true; + + installPhase = '' + runHook preInstall + + sed -i "s@set -e@TMUXIFIER=$out\nTMUXIFIER_LAYOUT_PATH=\"\''${TMUXIFIER_LAYOUT_PATH:-\$HOME/.tmux-layouts}\"\nset -e@" \ + bin/tmuxifier + sed -i "s@\$TMUXIFIER/lib/@\$TMUXIFIER/lib/tmuxifier/@g" \ + bin/tmuxifier libexec/* lib/* + sed -i "s@\$TMUXIFIER/templates/@\$TMUXIFIER/share/tmuxifier/templates/@g; s@\$TMUXIFIER/init.@\$TMUXIFIER/share/tmuxifier/init/init.@g" \ + libexec/* + sed -i "s@\$TMUXIFIER/completion/tmuxifier.bash@\$TMUXIFIER/share/bash-completion/completions/tmuxifier.bash@g; s@\$TMUXIFIER/completion/tmuxifier.zsh@\$TMUXIFIER/share/zsh/site-functions/_tmuxifier@g" \ + init.sh + sed -i "s@\$TMUXIFIER/completion/tmuxifier.tcsh@\$TMUXIFIER/share/tmuxifier/completion/tmuxifier.tcsh@g" \ + init.tcsh + sed -i "s@\$TMUXIFIER/completion/tmuxifier.fish@\$TMUXIFIER/share/fish/vendor_completions.d/tmuxifier.fish@g" \ + init.fish + + install -t $out/bin -Dm555 bin/tmuxifier + install -t $out/share/tmuxifier/init -Dm444 init.fish init.sh init.tcsh + install -t $out/share/tmuxifier/templates -Dm444 templates/* + install -t $out/lib/tmuxifier -Dm444 lib/* + cp -r libexec $out + installShellCompletion --cmd tmuxifier \ + --bash completion/tmuxifier.bash \ + --fish completion/tmuxifier.fish \ + --zsh completion/tmuxifier.zsh + install -t $out/share/tmuxifier/completion -Dm444 completion/tmuxifier.tcsh + + runHook postInstall + ''; + + meta = with lib; { + description = "Powerful session, window & pane management for Tmux"; + homepage = "https://github.com/jimeh/tmuxifier"; + license = licenses.mit; + mainProgram = "tmuxifier"; + maintainers = with maintainers; [ wigust ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix index 8ba9ebb7957d7..1a9d5569f2351 100644 --- a/pkgs/by-name/tr/trealla/package.nix +++ b/pkgs/by-name/tr/trealla/package.nix @@ -17,13 +17,13 @@ assert lib.elem lineEditingLibrary [ "isocline" "readline" ]; stdenv.mkDerivation (finalAttrs: { pname = "trealla"; - version = "2.27.15"; + version = "2.28.12"; src = fetchFromGitHub { owner = "trealla-prolog"; repo = "trealla"; rev = "v${finalAttrs.version}"; - hash = "sha256-b6OIp0UTBGl463wgwVCyTbC3Id0mgEIUnla+U3qv738="; + hash = "sha256-uWCpCjYFtK2pNeHHZWhWI6YZ+cllQpkKz//nHracl5s="; }; postPatch = '' diff --git a/pkgs/by-name/tu/tuxmux/package.nix b/pkgs/by-name/tu/tuxmux/package.nix new file mode 100644 index 0000000000000..9714c63696ab6 --- /dev/null +++ b/pkgs/by-name/tu/tuxmux/package.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, openssl +, pkg-config +, installShellFiles +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "tuxmux"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "edeneast"; + repo = pname; + rev = "v${version}"; + hash = "sha256-QySDC/aEU9Fo0UbRUNvgBQLfESYzENGfS8Tl/ycn1YY="; + }; + + cargoHash = "sha256-MlLTaN+KMeF0A1hh0oujLYWqjwrbmoNzoRoXjeCUf7I="; + + buildInputs = [ openssl ] ++ (lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]); + nativeBuildInputs = [ pkg-config installShellFiles ]; + + postInstall = '' + installShellCompletion $releaseDir/../completions/tm.{bash,fish} + installShellCompletion --zsh $releaseDir/../completions/_tm + + installManPage $releaseDir/../man/* + ''; + + meta = with lib; { + description = "Tmux session manager"; + homepage = "https://github.com/edeneast/tuxmux"; + license = licenses.apsl20; + maintainers = with maintainers; [ edeneast ]; + mainProgram = "tm"; + }; +} diff --git a/pkgs/by-name/ui/uiua/package.nix b/pkgs/by-name/ui/uiua/package.nix new file mode 100644 index 0000000000000..9f405a88f7ea6 --- /dev/null +++ b/pkgs/by-name/ui/uiua/package.nix @@ -0,0 +1,54 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + audioSupport ? true, + darwin, + alsa-lib, + pkg-config +}: +rustPlatform.buildRustPackage { + pname = "uiua"; + version = "unstable-2023-09-28"; + + src = fetchFromGitHub { + owner = "uiua-lang"; + repo = "uiua"; + rev = "9b8c65332396f521f170b0ed3ce104b7a8bcf7c0"; + hash = "sha256-+pleCEEwgRj+p+k9oKIvbsGUWC49qByV/juv76ZdBcc="; + }; + + cargoHash = "sha256-L8TCMe6eHS3QRy6HuTc1WvMfzsDhKx9YYupAkNeBwpk="; + + nativeBuildInputs = lib.optionals stdenv.isDarwin [ + rustPlatform.bindgenHook + ] ++ lib.optionals audioSupport [ + pkg-config + ]; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreServices + ] ++ lib.optionals (audioSupport && stdenv.isDarwin) [ + darwin.apple_sdk.frameworks.AudioUnit + ] ++ lib.optionals (audioSupport && stdenv.isLinux) [ + alsa-lib + ]; + + buildFeatures = lib.optional audioSupport "audio"; + + doCheck = true; + + meta = with lib; { + description = "A stack-oriented array programming language with a focus on simplicity, beauty, and tacit code"; + longDescription = '' + Uiua combines the stack-oriented and array-oriented paradigms in a single + language. Combining these already terse paradigms results in code with a very + high information density and little syntactic noise. + ''; + homepage = "https://www.uiua.org/"; + license = licenses.mit; + mainProgram = "uiua"; + maintainers = with maintainers; [ cafkafk ]; + }; +} diff --git a/pkgs/by-name/un/unbook/package.nix b/pkgs/by-name/un/unbook/package.nix new file mode 100644 index 0000000000000..b567cad5dc5f9 --- /dev/null +++ b/pkgs/by-name/un/unbook/package.nix @@ -0,0 +1,34 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, makeWrapper +, calibre +}: + +rustPlatform.buildRustPackage rec { + pname = "unbook"; + version = "0.7.3"; + + src = fetchFromGitHub { + owner = "ludios"; + repo = "unbook"; + rev = version; + hash = "sha256-KYnSIT/zIrbDFRWIaQRto0sPPmpJC8V7f00j4t/AsGQ="; + }; + + cargoHash = "sha256-AjyeTFgjl3XLplo8w9jne5FyKd2EciwbAKKiaDshpcA="; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $out/bin/unbook --prefix PATH : ${lib.makeBinPath [ calibre ]} + ''; + + meta = with lib; { + description = "An ebook to self-contained-HTML converter"; + homepage = "https://unbook.ludios.org"; + license = licenses.cc0; + maintainers = with maintainers; [ jmbaur ]; + mainProgram = "unbook"; + }; +} diff --git a/pkgs/applications/window-managers/waybox/default.nix b/pkgs/by-name/wa/waybox/package.nix index cf85b9ea06a83..3274660b07529 100644 --- a/pkgs/applications/window-managers/waybox/default.nix +++ b/pkgs/by-name/wa/waybox/package.nix @@ -1,62 +1,65 @@ { lib , stdenv , fetchFromGitHub -, pkg-config -, meson , cmake -, ninja +, libGL , libxkbcommon +, libxml2 +, mesa +, meson +, ninja +, pixman +, pkg-config +, udev , wayland -, wayland-scanner , wayland-protocols +, wayland-scanner , wlroots -, pixman -, udev -, libGL -, libxml2 -, mesa }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "waybox"; version = "0.2.0"; src = fetchFromGitHub { owner = "wizbright"; - repo = pname; - rev = version; + repo = "waybox"; + rev = finalAttrs.version; hash = "sha256-G8dRa4hgev3x58uqp5To5OzF3zcPSuT3NL9MPnWf2M8="; }; nativeBuildInputs = [ - pkg-config - meson cmake + meson ninja + pkg-config wayland-scanner ]; - dontUseCmakeConfigure = true; - buildInputs = [ + libGL libxkbcommon libxml2 + mesa # for libEGL + pixman + udev wayland wayland-protocols wlroots - pixman - udev - libGL - mesa # for libEGL ]; + strictDeps = true; + + dontUseCmakeConfigure = true; + passthru.providedSessions = [ "waybox" ]; - meta = with lib; { + meta = { homepage = "https://github.com/wizbright/waybox"; description = "An openbox clone on Wayland"; - license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.linux; + license = lib.licenses.mit; + mainProgram = "waybox"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + inherit (wayland.meta) platforms; }; -} +}) diff --git a/pkgs/tools/text/xml/xmldiff/default.nix b/pkgs/by-name/xm/xmldiff/package.nix index d9dbd70b6483c..05911ad2acd15 100644 --- a/pkgs/tools/text/xml/xmldiff/default.nix +++ b/pkgs/by-name/xm/xmldiff/package.nix @@ -1,29 +1,27 @@ { lib -, buildPythonApplication +, python3 , fetchFromGitHub -, lxml -, setuptools -, six }: -buildPythonApplication rec { - pname = "xmldiff"; - version = "2.4"; - +let + version = "2.6.3"; src = fetchFromGitHub { owner = "Shoobx"; - repo = pname; + repo = "xmldiff"; rev = version; - hash = "sha256-xqudHYfwOce2C0pcFzId0JDIIC6R5bllmVKsH+CvTdE="; + hash = "sha256-qn8gGultTSNKPUro6Ap4xJGcbpxV+lKgZFpKvyPdhtc="; }; +in +python3.pkgs.buildPythonApplication { + pname = "xmldiff"; + inherit version src; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3.pkgs; [ lxml setuptools - six ]; - meta = with lib; { + meta = { homepage = "https://xmldiff.readthedocs.io/en/stable/"; description = "A library and command line utility for diffing xml"; longDescription = '' @@ -37,7 +35,7 @@ buildPythonApplication rec { would not be be readable by a human. xmldiff provides tools to make human readable diffs in those situations. ''; - license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres anpryl ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ AndersonTorres anpryl ]; }; } diff --git a/pkgs/applications/window-managers/yeahwm/default.nix b/pkgs/by-name/ye/yeahwm/package.nix index f1a6635b362a2..975c9e0b139d5 100644 --- a/pkgs/applications/window-managers/yeahwm/default.nix +++ b/pkgs/by-name/ye/yeahwm/package.nix @@ -1,40 +1,63 @@ -{ lib, stdenv, fetchurl +{ lib +, stdenv +, fetchurl +, installShellFiles , lesstif -, libX11, libXext, libXmu, libXinerama }: - -stdenv.mkDerivation rec { +, libX11 +, libXext +, libXinerama +, libXmu +}: +stdenv.mkDerivation (finalAttrs: { pname = "yeahwm"; version = "0.3.5"; src = fetchurl { - url = "http://phrat.de/${pname}_${version}.tar.gz"; - sha256 = "01gfzjvb40n16m2ja4238nk08k4l203y6a61cydqvf68924fjb69"; + url = "http://phrat.de/yeahwm_${finalAttrs.version}.tar.gz"; + hash = "sha256-ySzpiEjIuI2bZ8Eo4wcQlEwEpkVDECVFNcECsrb87gU="; }; - buildInputs = [ lesstif libX11 libXext libXinerama libXmu ]; + nativeBuildInputs = [ + installShellFiles + ]; + + buildInputs = [ + lesstif + libX11 + libXext + libXinerama + libXmu + ]; - dontConfigure = true; + strictDeps = true; - preBuild = '' + preBuild = let + includes = builtins.concatStringsSep " " + (builtins.map (l: "-I${lib.getDev l}/include") + finalAttrs.buildInputs); + ldpath = builtins.concatStringsSep " " + (builtins.map (l: "-L${lib.getLib l}/lib") + finalAttrs.buildInputs); + in '' makeFlagsArray+=( CC="${stdenv.cc}/bin/cc" \ XROOT="${libX11}" \ - INCLUDES="-I${libX11.dev}/include -I${libXext.dev}/include -I${libXinerama.dev}/include -I${libXmu.dev}/include" \ - LDPATH="-L${libX11}/lib -L${libXext}/lib -L${libXinerama}/lib -L${libXmu}/lib" \ + INCLUDES="${includes}" \ + LDPATH="${ldpath}" \ prefix="${placeholder "out"}" ) ''; - # Workaround build failure on -fno-common toolchains like upstream - # gcc-10. Otherwise build fails as: + # Workaround build failure on -fno-common toolchains like upstream gcc-10. + # Otherwise build fails as: # ld: screen.o:(.bss+0x40): multiple definition of `fg'; client.o:(.bss+0x40): first defined here env.NIX_CFLAGS_COMPILE = "-fcommon"; postInstall = '' - gzip -9 --stdout yeahwm.1 > yeahwm.1.gz - install -m644 yeahwm.1.gz ${placeholder "out"}/share/man/man1/ + installManPage yeahwm.1 ''; - meta = with lib;{ + meta = { + homepage = "http://phrat.de/index.html"; description = "An X window manager based on evilwm and aewm"; longDescription = '' YeahWM is a h* window manager for X based on evilwm and aewm. @@ -55,9 +78,10 @@ stdenv.mkDerivation rec { - Little resource usage. - It's slick. ''; - homepage = "http://phrat.de/index.html"; - license = licenses.isc; - maintainers = [ maintainers.AndersonTorres ]; - platforms = libX11.meta.platforms; + changelog = "http://phrat.de/README"; + license = lib.licenses.isc; + mainProgram = "yeahwm"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + inherit (libX11.meta) platforms; }; -} +}) diff --git a/pkgs/by-name/yt/ytui-music/package.nix b/pkgs/by-name/yt/ytui-music/package.nix new file mode 100644 index 0000000000000..3c460082b27ed --- /dev/null +++ b/pkgs/by-name/yt/ytui-music/package.nix @@ -0,0 +1,68 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +, sqlite +, stdenv +, darwin +, mpv +, youtube-dl +, makeBinaryWrapper +}: + +rustPlatform.buildRustPackage rec { + pname = "ytui-music"; + version = "2.0.0-rc1"; + + src = fetchFromGitHub { + owner = "sudipghimire533"; + repo = "ytui-music"; + rev = "v${version}"; + hash = "sha256-f/23PVk4bpUCvcQ25iNI/UVXqiPBzPKWq6OohVF41p8="; + }; + + cargoHash = "sha256-766Wev2/R/9LLlWWxOPl6y4CBRUU4hUrTDlVVuoJ8C8="; + + checkFlags = [ + "--skip=tests::display_config_path" + "--skip=tests::inspect_server_list" + ]; + + nativeBuildInputs = [ + pkg-config + makeBinaryWrapper + ]; + + buildInputs = [ + openssl + sqlite + mpv + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreFoundation + darwin.apple_sdk.frameworks.Security + ]; + + postInstall = '' + wrapProgram $out/bin/ytui_music \ + --prefix PATH : ${lib.makeBinPath [ youtube-dl ]} + ''; + + doInstallCheck = true; + + installCheckPhase = '' + runHook preInstallCheck + + $out/bin/ytui_music help + + runHook postInstallCheck + ''; + + meta = with lib; { + description = "Youtube client in terminal for music"; + homepage = "https://github.com/sudipghimire533/ytui-music"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ kashw2 ]; + mainProgram = "ytui_music"; + }; +} diff --git a/pkgs/by-name/zi/zitadel/console.nix b/pkgs/by-name/zi/zitadel/console.nix new file mode 100644 index 0000000000000..f2e1f26f3b879 --- /dev/null +++ b/pkgs/by-name/zi/zitadel/console.nix @@ -0,0 +1,51 @@ +{ generateProtobufCode +, version +, zitadelRepo +}: + +{ mkYarnPackage +, fetchYarnDeps +, lib +}: + +let + protobufGenerated = generateProtobufCode { + pname = "zitadel-console"; + workDir = "console"; + bufArgs = "../proto --include-imports --include-wkt"; + outputPath = "src/app/proto"; + hash = "sha256-s0dzmcjKd8ot7t+KlRlNVA9oiIDKVMnGOT/HjdaUjGI="; + }; +in +mkYarnPackage rec { + name = "zitadel-console"; + inherit version; + + src = "${zitadelRepo}/console"; + + packageJSON = ./package.json; + offlineCache = fetchYarnDeps { + yarnLock = "${src}/yarn.lock"; + hash = "sha256-48IC4LxqbkH+95k7rCmhRWT+qAlJ9CDXWwRjbric9no="; + }; + + postPatch = '' + substituteInPlace src/styles.scss \ + --replace "/node_modules/flag-icons" "flag-icons" + + substituteInPlace angular.json \ + --replace "./node_modules/tinycolor2" "../../node_modules/tinycolor2" + ''; + + buildPhase = '' + mkdir deps/console/src/app/proto + cp -r ${protobufGenerated}/* deps/console/src/app/proto/ + yarn --offline build + ''; + + installPhase = '' + cp -r deps/console/dist/console $out + ''; + + doDist = false; +} diff --git a/pkgs/by-name/zi/zitadel/package.json b/pkgs/by-name/zi/zitadel/package.json new file mode 100644 index 0000000000000..0add6d2556b18 --- /dev/null +++ b/pkgs/by-name/zi/zitadel/package.json @@ -0,0 +1,88 @@ +{ + "name": "console", + "version": "0.0.0", + "scripts": { + "ng": "ng", + "start": "node prebuild.development.js && ng serve", + "build": "ng build --configuration production --base-href=/ui/console/", + "prelint": "npm run generate", + "lint": "ng lint && prettier --check src", + "lint:fix": "prettier --write src", + "generate": "buf generate ../proto --include-imports --include-wkt" + }, + "private": true, + "dependencies": { + "@angular/animations": "^16.2.0", + "@angular/cdk": "^16.2.0", + "@angular/common": "^16.2.0", + "@angular/compiler": "^16.2.0", + "@angular/core": "^16.2.0", + "@angular/forms": "^16.2.0", + "@angular/material": "^16.2.0", + "@angular/material-moment-adapter": "^16.2.0", + "@angular/platform-browser": "^16.2.0", + "@angular/platform-browser-dynamic": "^16.2.0", + "@angular/router": "^16.2.0", + "@angular/service-worker": "^16.2.0", + "@ctrl/ngx-codemirror": "^6.1.0", + "@grpc/grpc-js": "^1.8.14", + "@ngx-translate/core": "^14.0.0", + "angular-oauth2-oidc": "^15.0.1", + "angularx-qrcode": "^16.0.0", + "buffer": "^6.0.3", + "codemirror": "^5.65.8", + "cors": "^2.8.5", + "file-saver": "^2.0.5", + "flag-icons": "^6.7.0", + "google-proto-files": "^3.0.3", + "google-protobuf": "^3.21.2", + "grpc-web": "^1.4.1", + "i18n-iso-countries": "^7.6.0", + "libphonenumber-js": "^1.10.30", + "material-design-icons-iconfont": "^6.1.1", + "moment": "^2.29.4", + "opentype.js": "^1.3.4", + "ngx-color": "^9.0.0", + "rxjs": "~7.8.0", + "tinycolor2": "^1.6.0", + "tslib": "^2.4.1", + "uuid": "^9.0.0", + "zone.js": "~0.13.1" + }, + "devDependencies": { + "@angular-devkit/build-angular": "^16.2.0", + "@angular-eslint/builder": "16.1.0", + "@angular-eslint/eslint-plugin": "16.1.0", + "@angular-eslint/eslint-plugin-template": "16.1.0", + "@angular-eslint/schematics": "16.1.0", + "@angular-eslint/template-parser": "16.1.0", + "@angular/cli": "^16.2.0", + "@angular/compiler-cli": "^16.2.0", + "@angular/language-service": "^16.2.0", + "@bufbuild/buf": "^1.23.1", + "@types/file-saver": "^2.0.2", + "@types/google-protobuf": "^3.15.3", + "@types/jasmine": "~4.3.3", + "@types/jasminewd2": "~2.0.10", + "@types/jsonwebtoken": "^9.0.1", + "@types/node": "^18.15.11", + "@types/opentype.js": "^1.3.4", + "@types/qrcode": "^1.5.0", + "@types/uuid": "^9.0.2", + "@typescript-eslint/eslint-plugin": "^5.59.11", + "@typescript-eslint/parser": "^5.60.1", + "codelyzer": "^6.0.2", + "eslint": "^8.44.0", + "jasmine-core": "~4.6.0", + "jasmine-spec-reporter": "~7.0.0", + "karma": "^6.4.2", + "karma-chrome-launcher": "^3.2.0", + "karma-coverage-istanbul-reporter": "^3.0.3", + "karma-jasmine": "^5.1.0", + "karma-jasmine-html-reporter": "^2.1.0", + "prettier": "^2.8.7", + "prettier-plugin-organize-imports": "^3.2.2", + "protractor": "~7.0.0", + "typescript": "^4.9.5" + } +} diff --git a/pkgs/by-name/zi/zitadel/package.nix b/pkgs/by-name/zi/zitadel/package.nix new file mode 100644 index 0000000000000..cd4780965e138 --- /dev/null +++ b/pkgs/by-name/zi/zitadel/package.nix @@ -0,0 +1,150 @@ +{ stdenv +, buildGo121Module +, callPackage +, fetchFromGitHub +, lib + +, buf +, cacert +, grpc-gateway +, protoc-gen-go +, protoc-gen-go-grpc +, protoc-gen-validate +, sass +, statik +}: + +let + version = "2.37.2"; + zitadelRepo = fetchFromGitHub { + owner = "zitadel"; + repo = "zitadel"; + rev = "v${version}"; + hash = "sha256-iWEL7R7eNDV4c1CZhmxxiHHI9ExwU6gnmHI6ildaXWY="; + }; + goModulesHash = "sha256-lk4jEiI85EKk0G4JCHvCazqBBTfiNJqSfzvrJgDZ1Nc="; + + buildZitadelProtocGen = name: + buildGo121Module { + pname = "protoc-gen-${name}"; + inherit version; + + src = zitadelRepo; + + proxyVendor = true; + vendorHash = goModulesHash; + + buildPhase = '' + go install internal/protoc/protoc-gen-${name}/main.go + ''; + + postInstall = '' + mv $out/bin/main $out/bin/protoc-gen-${name} + ''; + }; + + protoc-gen-authoption = buildZitadelProtocGen "authoption"; + protoc-gen-zitadel = buildZitadelProtocGen "zitadel"; + + # Buf downloads dependencies from an external repo - there doesn't seem to + # really be any good way around it. We'll use a fixed-output derivation so it + # can download what it needs, and output the relevant generated code for use + # during the main build. + generateProtobufCode = + { pname + , nativeBuildInputs ? [ ] + , bufArgs ? "" + , workDir ? "." + , outputPath + , hash + }: + stdenv.mkDerivation { + name = "${pname}-buf-generated"; + + src = zitadelRepo; + + nativeBuildInputs = nativeBuildInputs ++ [ buf ]; + + buildPhase = '' + cd ${workDir} + export SSL_CERT_FILE="${cacert}/etc/ssl/certs/ca-bundle.crt" + HOME=$TMPDIR buf generate ${bufArgs} + ''; + + installPhase = '' + cp -r ${outputPath} $out + ''; + + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = hash; + }; + + protobufGenerated = generateProtobufCode { + pname = "zitadel"; + nativeBuildInputs = [ + grpc-gateway + protoc-gen-authoption + protoc-gen-go + protoc-gen-go-grpc + protoc-gen-validate + protoc-gen-zitadel + ]; + outputPath = ".artifacts"; + hash = "sha256-+9UFBWBuSYNbfimKwJUSoiUh+8bDHGnPdx1MKDul1U4="; + }; +in +buildGo121Module rec { + name = "zitadel"; + inherit version; + + src = zitadelRepo; + + nativeBuildInputs = [ sass statik ]; + + proxyVendor = true; + vendorHash = goModulesHash; + + # Adapted from Makefile in repo, with dependency fetching and protobuf codegen + # bits removed + buildPhase = '' + mkdir -p pkg/grpc + cp -r ${protobufGenerated}/grpc/github.com/zitadel/zitadel/pkg/grpc/* pkg/grpc + mkdir -p openapi/v2/zitadel + cp -r ${protobufGenerated}/grpc/zitadel/ openapi/v2/zitadel + + go generate internal/api/ui/login/static/resources/generate.go + go generate internal/api/ui/login/statik/generate.go + go generate internal/notification/statik/generate.go + go generate internal/statik/generate.go + + mkdir -p docs/apis/assets + go run internal/api/assets/generator/asset_generator.go -directory=internal/api/assets/generator/ -assets=docs/apis/assets/assets.md + + cp -r ${passthru.console}/* internal/api/ui/console/static + CGO_ENABLED=0 go build -o zitadel -v -ldflags="-s -w -X 'github.com/zitadel/zitadel/cmd/build.version=${version}'" + ''; + + installPhase = '' + mkdir -p $out/bin + install -Dm755 zitadel $out/bin/ + ''; + + passthru = { + console = callPackage + (import ./console.nix { + inherit generateProtobufCode version zitadelRepo; + }) + { }; + }; + + meta = with lib; { + description = "Identity and access management platform"; + homepage = "https://zitadel.com/"; + downloadPage = "https://github.com/zitadel/zitadel/releases"; + platforms = platforms.linux ++ platforms.darwin; + license = licenses.asl20; + sourceProvenance = [ sourceTypes.fromSource ]; + maintainers = with maintainers; [ Sorixelle ]; + }; +} diff --git a/pkgs/by-name/zp/zpaqfranz/package.nix b/pkgs/by-name/zp/zpaqfranz/package.nix index 6bbfdce48f392..26fa5ec670704 100644 --- a/pkgs/by-name/zp/zpaqfranz/package.nix +++ b/pkgs/by-name/zp/zpaqfranz/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "zpaqfranz"; - version = "58.9"; + version = "58.10"; src = fetchFromGitHub { owner = "fcorbelli"; repo = "zpaqfranz"; rev = finalAttrs.version; - hash = "sha256-R7LA7gu2q2Kk+FPCLZedwrlICk6OUao/EJHEvxA1+Nc="; + hash = "sha256-eBokpah7j3QQChprvjeigt2/sEpkq6ZS4rQhIP5cAYo="; }; nativeBuildInputs = [ diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index 525d3d027d822..7d8adf6cc018a 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -17,28 +17,22 @@ let isQt5 = lib.versions.major qtbase.version == "5"; + in stdenv.mkDerivation (finalAttrs: { pname = "zeal"; - version = "0.6.1.20230907"; # unstable-date format not suitable for cmake + version = "0.7.0"; src = fetchFromGitHub { owner = "zealdocs"; repo = "zeal"; - rev = "20249153077964d01c7c36b9f4042a40e8c8fbf1"; - hash = "sha256-AyfpMq0R0ummTGvyUHOh/XBUeVfkFwo1VyyLSGoTN8w="; + rev = "v${finalAttrs.version}"; + hash = "sha256-s1FaazHVtWE697BO0hIOgZVowdkq68R9x327ZnJRnlo="; }; - # we only need this if we are using a version that hasn't been released. We - # could also match on the "VERSION x.y.z" bit but then it would have to be - # updated based on whatever is the latest release, so instead just rewrite the - # line. postPatch = '' - sed -i CMakeLists.txt \ - -e 's@^project.*@project(Zeal VERSION ${finalAttrs.version})@' - '' + lib.optionalString (!isQt5) '' - substituteInPlace src/app/CMakeLists.txt \ - --replace "COMPONENTS Widgets" "COMPONENTS Widgets QmlIntegration" + substituteInPlace CMakeLists.txt \ + --replace 'ZEAL_VERSION_SUFFIX "-dev"' 'ZEAL_VERSION_SUFFIX ""' ''; nativeBuildInputs = [ diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index dc7d132884c4e..b8dc77e940989 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -33,7 +33,6 @@ in stdenv.mkDerivation rec { meta = { inherit (iosevka.meta) homepage downloadPage description license platforms; maintainers = with lib.maintainers; [ - cstrahan montchr ]; }; diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index 83dca92451617..0fa8bdb8f8185 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -55,16 +55,16 @@ assert (extraParameters != null) -> set != null; buildNpmPackage rec { pname = if set != null then "iosevka-${set}" else "iosevka"; - version = "27.0.0"; + version = "27.1.0"; src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; rev = "v${version}"; - hash = "sha256-LXQ7F+hEsPfve9yKEYav1O+ZN7uZqK8YmMT0Pr5FQpc="; + hash = "sha256-KXF+ePMEwEUh0fs0cOELRmxOp9hHibDLfRdbffLcZDs="; }; - npmDepsHash = "sha256-SAdKtX+BuU0/me4ECzrKLRJRW6LzGZO2ehAB9iWRVF8="; + npmDepsHash = "sha256-NfR7OUVguMZVmeumf8oRaQK28G42zy6p6K+Hx4e1Kgw="; nativeBuildInputs = [ remarshal @@ -136,7 +136,6 @@ buildNpmPackage rec { license = licenses.ofl; platforms = platforms.all; maintainers = with maintainers; [ - cstrahan jfrankenau ttuegel babariviere diff --git a/pkgs/data/fonts/sarasa-gothic/default.nix b/pkgs/data/fonts/sarasa-gothic/default.nix index 8d56554939f6d..631904942b3cc 100644 --- a/pkgs/data/fonts/sarasa-gothic/default.nix +++ b/pkgs/data/fonts/sarasa-gothic/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "sarasa-gothic"; - version = "0.41.10"; + version = "0.42.1"; src = fetchurl { # Use the 'ttc' files here for a smaller closure size. # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.) url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"; - hash = "sha256-RxXLjlWJEWaWph8jz1L1zZABYOm75MoxcI0cZJGBDvg="; + hash = "sha256-e6ig+boWzYiOzENkIsj/z9FFt2pZc+T0dYoFoeONMFM="; }; sourceRoot = "."; diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index dda2b3f5bcb4a..7784f4ac8c2ba 100644 --- a/pkgs/data/fonts/unifont/default.nix +++ b/pkgs/data/fonts/unifont/default.nix @@ -4,16 +4,16 @@ stdenv.mkDerivation rec { pname = "unifont"; - version = "15.0.04"; + version = "15.1.02"; - ttf = fetchurl { - url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.ttf"; - hash = "sha256-kkSbEvWBrvcnBgHDdKJjpSYF6BJDEwmYSxVQbPkQ6so="; + otf = fetchurl { + url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.otf"; + hash = "sha256-fmhm74zc6wJK2f5XkDq/BRc5Lv+rCvcDRodgHCSiUQA="; }; pcf = fetchurl { url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.pcf.gz"; - hash = "sha256-rdzJuOkXYojgm5VfpshtJuCJYM0/iS+HnWMXEDsLQPg="; + hash = "sha256-cCDXjSbpCe1U+Fx/xH/9NXWg6bkdRBV5AawFR0NyOHM="; }; nativeBuildInputs = [ libfaketime xorg.fonttosfnt xorg.mkfontscale ]; @@ -33,9 +33,9 @@ stdenv.mkDerivation rec { install -m 644 -D unifont.otb "$out/share/fonts/unifont.otb" mkfontdir "$out/share/fonts" - # install pcf and ttf fonts + # install pcf and otf fonts install -m 644 -D ${pcf} $out/share/fonts/unifont.pcf.gz - install -m 644 -D ${ttf} $out/share/fonts/truetype/unifont.ttf + install -m 644 -D ${otf} $out/share/fonts/opentype/unifont.otf cd "$out/share/fonts" mkfontdir mkfontscale diff --git a/pkgs/data/fonts/unifont_upper/default.nix b/pkgs/data/fonts/unifont_upper/default.nix index 892ed5be24004..33ed947ae6904 100644 --- a/pkgs/data/fonts/unifont_upper/default.nix +++ b/pkgs/data/fonts/unifont_upper/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "unifont_upper"; - version = "15.0.04"; + version = "15.1.02"; src = fetchurl { - url = "mirror://gnu/unifont/unifont-${version}/${pname}-${version}.ttf"; - hash = "sha256-7iRcyKfGpv2rjVLPRNchxpXwj0KA5jlgDnCfG7byLLI="; + url = "mirror://gnu/unifont/unifont-${version}/${pname}-${version}.otf"; + hash = "sha256-OTIwWA2p+7ldqEB5O6J18zU5RVoswC0t1G72fFeCKpU="; }; dontUnpack = true; @@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec { installPhase = '' runHook preInstall - install -Dm644 $src $out/share/fonts/truetype/unifont_upper.ttf + install -Dm644 $src $out/share/fonts/opentype/unifont_upper.otf runHook postInstall ''; diff --git a/pkgs/data/icons/vanilla-dmz/default.nix b/pkgs/data/icons/vanilla-dmz/default.nix index 22b66b1c65dcb..6e391aa19ef01 100644 --- a/pkgs/data/icons/vanilla-dmz/default.nix +++ b/pkgs/data/icons/vanilla-dmz/default.nix @@ -56,6 +56,6 @@ stdenvNoCC.mkDerivation rec { description = "A style neutral scalable cursor theme"; platforms = platforms.all; license = licenses.cc-by-sa-30; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/data/icons/whitesur-cursors/default.nix b/pkgs/data/icons/whitesur-cursors/default.nix new file mode 100644 index 0000000000000..c16efa996d345 --- /dev/null +++ b/pkgs/data/icons/whitesur-cursors/default.nix @@ -0,0 +1,31 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +}: + +stdenvNoCC.mkDerivation { + pname = "whitesur-cursors"; + version = "unstable-2022-06-17"; + + src = fetchFromGitHub { + owner = "vinceliuice"; + repo = "WhiteSur-cursors"; + rev = "5c94e8c22de067282f4cf6d782afd7b75cdd08c8"; + sha256 = "sha256-CFse0XZzJu+PWDcqmvIXvue+3cKX47oavZU9HYRDAg0="; + }; + + installPhase = '' + runHook preInstall + install -dm 755 $out/share/icons/WhiteSur-cursors + cp -r dist/* $out/share/icons/WhiteSur-cursors + runHook postInstall + ''; + + meta = { + description = "An x-cursor theme inspired by macOS and based on capitaine-cursors"; + homepage = "https://github.com/vinceliuice/WhiteSur-cursors"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ tomasajt ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/data/misc/clash-geoip/default.nix b/pkgs/data/misc/clash-geoip/default.nix index 3488bfc0a5f9e..b94137ccf4e6d 100644 --- a/pkgs/data/misc/clash-geoip/default.nix +++ b/pkgs/data/misc/clash-geoip/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "clash-geoip"; - version = "20230812"; + version = "20230912"; src = fetchurl { url = "https://github.com/Dreamacro/maxmind-geoip/releases/download/${version}/Country.mmdb"; - sha256 = "sha256-yO8zSQjNYGxaSXcOhFOIE4HsiMnCm3ZVYfVZg5xO96s="; + sha256 = "sha256-MyNlgsa+8OS7vkMq74KKmUVzBhmDpF4ED2Xdgl3GIS4="; }; dontUnpack = true; diff --git a/pkgs/data/misc/dbip-country-lite/default.nix b/pkgs/data/misc/dbip-country-lite/default.nix index e620280edbbb7..8774f812ecefc 100644 --- a/pkgs/data/misc/dbip-country-lite/default.nix +++ b/pkgs/data/misc/dbip-country-lite/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbip-country-lite"; - version = "2023-09"; + version = "2023-10"; src = fetchurl { url = "https://download.db-ip.com/free/dbip-country-lite-${finalAttrs.version}.mmdb.gz"; - hash = "sha256-3Mapa4qxUEMGUeqzoyzhatL43l1PPmw+Aye4bX92CAA="; + hash = "sha256-PQn8dyx4l3r7N52rv/Woth6J61+WvVL+SHKMkVVtFsw="; }; dontUnpack = true; diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix index efb3f021ec5ae..52e6c59285af6 100644 --- a/pkgs/data/misc/ddccontrol-db/default.nix +++ b/pkgs/data/misc/ddccontrol-db/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "ddccontrol-db"; - version = "20230821"; + version = "20230911"; src = fetchFromGitHub { owner = "ddccontrol"; repo = pname; rev = version; - sha256 = "sha256-R+DXpT9Tgt311G/OtmKp3sqN0ex/rlLt3JuSK7kciC0="; + sha256 = "sha256-3lGzQ95ZS9yr9dX+wCTmX6Q+IsbMCfBa4zhcyxsG4+w="; }; nativeBuildInputs = [ autoreconfHook intltool ]; diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 7ccfd59396bff..55df79358bae6 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "69066b0daf2bbb4ca6f2b6de0bc9b8f27fffe4bc", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/69066b0daf2bbb4ca6f2b6de0bc9b8f27fffe4bc.tar.gz", - "sha256": "16ij50f7cx8gl3ypzwy50f5dr68y6m6n732sa1hwsng5db4vqzv7", - "msg": "Update from Hackage at 2023-08-17T07:12:25Z" + "commit": "ad59313651a92d9b7356f616268c7a3d80f52886", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/ad59313651a92d9b7356f616268c7a3d80f52886.tar.gz", + "sha256": "0s66dx6daxfkdm40fcqvlh3h9bcjx1cydrmgxd7dxrlmqqgwn4lc", + "msg": "Update from Hackage at 2023-09-13T23:29:30Z" } diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix index 211ee414750fe..8fe5f108fa019 100644 --- a/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,12 +3,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20230913074035"; + version = "20230926092720"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - hash = "sha256-A1401KSNkGoVEbiX2MyepesnyF0qVWZ7tuKLtoKUA/k="; + hash = "sha256-S6bd8C9TuKj/FaTmMyCcEVi/4LBgseWWxr/XlEhc45Y="; }; vendorHash = "sha256-dYaGR5ZBORANKAYuPAi9i+KQn2OAGDGTZxdyVjkcVi8="; meta = with lib; { diff --git a/pkgs/data/themes/adw-gtk3/default.nix b/pkgs/data/themes/adw-gtk3/default.nix index b7c1444411044..27811203c86e0 100644 --- a/pkgs/data/themes/adw-gtk3/default.nix +++ b/pkgs/data/themes/adw-gtk3/default.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation rec { pname = "adw-gtk3"; - version = "4.5"; + version = "4.9"; src = fetchFromGitHub { owner = "lassekongo83"; repo = pname; rev = "v${version}"; - sha256 = "sha256-x6ul5NZDWqEQfLzmpR7X5HgUmHNSbpuTnCquVEHFHL8="; + sha256 = "sha256-ni1u6696jrwjYZ4gppF9yD1RAum0+D7WxQgu09cxVGg="; }; nativeBuildInputs = [ diff --git a/pkgs/data/themes/catppuccin-gtk/default.nix b/pkgs/data/themes/catppuccin-gtk/default.nix index 4bda31746622e..6459f50fe7865 100644 --- a/pkgs/data/themes/catppuccin-gtk/default.nix +++ b/pkgs/data/themes/catppuccin-gtk/default.nix @@ -28,13 +28,13 @@ lib.checkListOfEnum "${pname}: tweaks" validTweaks tweaks stdenvNoCC.mkDerivation rec { inherit pname; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "catppuccin"; repo = "gtk"; rev = "v${version}"; - sha256 = "sha256-b03V/c2do5FSm4Q0yN7V0RuoQX1fYsBd//Hj3R5MESI="; + hash = "sha256-J1iLN2FF3Ml/3zmntXYlfkv6dZcwl62A9X4ruAH1ll4="; }; nativeBuildInputs = [ gtk3 sassc ]; @@ -53,9 +53,12 @@ stdenvNoCC.mkDerivation rec { ''; postPatch = '' - patchShebangs --build colloid/clean-old-theme.sh colloid/install.sh + patchShebangs --build colloid/install.sh ''; + dontConfigure = true; + dontBuild = true; + installPhase = '' runHook preInstall @@ -76,6 +79,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/catppuccin/gtk"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = [ maintainers.fufexan ]; + maintainers = with maintainers; [ fufexan PlayerNameHere ]; }; } diff --git a/pkgs/data/themes/kwin-decorations/sierra-breeze-enhanced/default.nix b/pkgs/data/themes/kwin-decorations/sierra-breeze-enhanced/default.nix index 6e9db943c91c5..46d6af5f24c42 100644 --- a/pkgs/data/themes/kwin-decorations/sierra-breeze-enhanced/default.nix +++ b/pkgs/data/themes/kwin-decorations/sierra-breeze-enhanced/default.nix @@ -23,7 +23,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX=$out" - "-DCMAKE_BUILD_TYPE=Release" "-DBUILD_TESTING=OFF" "-DKDE_INSTALL_USE_QT_SYS_PATHS=ON" ]; diff --git a/pkgs/data/themes/sweet-nova/default.nix b/pkgs/data/themes/sweet-nova/default.nix index 5c89964eeaf6d..22a16fa9284dc 100644 --- a/pkgs/data/themes/sweet-nova/default.nix +++ b/pkgs/data/themes/sweet-nova/default.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation { pname = "sweet-nova"; - version = "unstable-2023-04-02"; + version = "unstable-2023-09-30"; src = fetchFromGitHub { owner = "EliverLara"; repo = "Sweet"; - rev = "8a5d5a7d975567b5ae101b9f9d436fb1db2d9b24"; - hash = "sha256-FVcXBxcS5oFsvAUDcwit7EIfgIQznl8AYYxqQ797ddU="; + rev = "6e82150d7c3bb1e30ed9bd64de4d2ddd8e113205"; + hash = "sha256-vy4SO1j4y/cUmbQJNqW1/EPJljEtaRrigYIg4yMKXr4="; }; buildPhase = '' diff --git a/pkgs/data/themes/vimix/default.nix b/pkgs/data/themes/vimix/default.nix index 5bd01621ed36a..1a49b5cff8978 100644 --- a/pkgs/data/themes/vimix/default.nix +++ b/pkgs/data/themes/vimix/default.nix @@ -24,13 +24,13 @@ lib.checkListOfEnum "${pname}: tweaks" [ "flat" "grey" "mix" "translucent" ] twe stdenvNoCC.mkDerivation rec { inherit pname; - version = "2023-06-21"; + version = "2023-09-09"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "/LZj7iVWJI4U66XC15TuLnqXVEIF/lOlV+Jujf54NV0="; + sha256 = "dfdPEJnSmD0eqzx4ysiGPp77Beo32l2Tz1qSrbShLlc="; }; nativeBuildInputs = [ diff --git a/pkgs/data/themes/where-is-my-sddm-theme/default.nix b/pkgs/data/themes/where-is-my-sddm-theme/default.nix index 8151ca0cc1333..13ea576b3fbf8 100644 --- a/pkgs/data/themes/where-is-my-sddm-theme/default.nix +++ b/pkgs/data/themes/where-is-my-sddm-theme/default.nix @@ -23,13 +23,13 @@ in stdenvNoCC.mkDerivation rec { pname = "where-is-my-sddm-theme"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "stepanzubkov"; repo = pname; rev = "v${version}"; - hash = "sha256-kW6W8DELi9Xqn9xWLlcKmxk4tO5FKdApaYTZimQ+7B0="; + hash = "sha256-T6b+rxjlxZCQ/KDaxBM8ZryA3n6a+3jo+J2nETBYslM="; }; propagatedUserEnvPkgs = [ qtgraphicaleffects ]; diff --git a/pkgs/data/themes/whitesur/default.nix b/pkgs/data/themes/whitesur/default.nix index c01c8e08166e7..518bf72d5bdde 100644 --- a/pkgs/data/themes/whitesur/default.nix +++ b/pkgs/data/themes/whitesur/default.nix @@ -33,13 +33,13 @@ lib.checkListOfEnum "${pname}: panel size" [ "default" "smaller" "bigger" ] (sin stdenv.mkDerivation rec { pname = "whitesur-gtk-theme"; - version = "2023-02-07"; + version = "2023-06-30"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "sha256-RGYD2+ZTUTPyFbaHvXU9VD3W6WTNeg3ifY+DAR3MmtI="; + sha256 = "sha256-ctEaS+zWkmiVoq0WVA3ecHc2rm8LFQC/kqi/KEXAyXw="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/budgie/budgie-desktop/default.nix b/pkgs/desktops/budgie/budgie-desktop/default.nix index 43a68e54beed9..1066aec81e8bd 100644 --- a/pkgs/desktops/budgie/budgie-desktop/default.nix +++ b/pkgs/desktops/budgie/budgie-desktop/default.nix @@ -37,14 +37,14 @@ stdenv.mkDerivation rec { pname = "budgie-desktop"; - version = "10.8"; + version = "10.8.1"; src = fetchFromGitHub { owner = "BuddiesOfBudgie"; repo = pname; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-fOsTBnKtwBGQSPkBBrzwHEB3+OcJYtPIdvZsV31oi6g="; + hash = "sha256-KhCQ5v6R6sS5Vjl10QhSuAxAPTDDAvJ6uu6VKTdX7m4="; }; patches = [ diff --git a/pkgs/desktops/budgie/budgie-desktop/plugins.patch b/pkgs/desktops/budgie/budgie-desktop/plugins.patch index ca23edc42ceea..9fa40adaa5dcc 100644 --- a/pkgs/desktops/budgie/budgie-desktop/plugins.patch +++ b/pkgs/desktops/budgie/budgie-desktop/plugins.patch @@ -1,5 +1,5 @@ diff --git a/meson.build b/meson.build -index 48aeeb38..31e4c24b 100644 +index 6c6e473e..9b8fb73a 100644 --- a/meson.build +++ b/meson.build @@ -88,11 +88,6 @@ datadir = join_paths(prefix, get_option('datadir')) @@ -43,7 +43,7 @@ index 48aeeb38..31e4c24b 100644 with_bluetooth = get_option('with-bluetooth') if with_bluetooth == true diff --git a/src/config/budgie-config.c b/src/config/budgie-config.c -index fc531f59..0a21b690 100644 +index 3ffe3632..da53e054 100644 --- a/src/config/budgie-config.c +++ b/src/config/budgie-config.c @@ -11,7 +11,6 @@ @@ -51,14 +51,13 @@ index fc531f59..0a21b690 100644 #ifndef CONFIG_H_INCLUDED #include "config.h" -#include <stdbool.h> + #include <stddef.h> /** - * All this is to keep Vala happy & configured.. -@@ -20,21 +19,6 @@ const char* BUDGIE_MODULE_DIRECTORY = MODULEDIR; - const char* BUDGIE_MODULE_DATA_DIRECTORY = MODULE_DATA_DIR; +@@ -22,20 +21,6 @@ const char* BUDGIE_MODULE_DATA_DIRECTORY = MODULE_DATA_DIR; const char* BUDGIE_RAVEN_PLUGIN_LIBDIR = RAVEN_PLUGIN_LIBDIR; const char* BUDGIE_RAVEN_PLUGIN_DATADIR = RAVEN_PLUGIN_DATADIR; -- + -#ifdef HAS_SECONDARY_PLUGIN_DIRS -const bool BUDGIE_HAS_SECONDARY_PLUGIN_DIRS = true; -const char* BUDGIE_MODULE_DIRECTORY_SECONDARY = MODULEDIR_SECONDARY; @@ -68,28 +67,27 @@ index fc531f59..0a21b690 100644 -#else -const bool BUDGIE_HAS_SECONDARY_PLUGIN_DIRS = false; -const char* BUDGIE_MODULE_DIRECTORY_SECONDARY = NULL; --const char* BUDGIE_MODULE_DATA_DIRECTORY = NULL; --const char* BUDGIE_RAVEN_PLUGIN_LIBDIR = NULL; --const char* BUDGIE_RAVEN_PLUGIN_DATADIR = NULL; +-const char* BUDGIE_MODULE_DATA_DIRECTORY_SECONDARY = NULL; +-const char* BUDGIE_RAVEN_PLUGIN_LIBDIR_SECONDARY = NULL; +-const char* BUDGIE_RAVEN_PLUGIN_DATADIR_SECONDARY = NULL; -#endif - const char* BUDGIE_DATADIR = DATADIR; const char* BUDGIE_VERSION = PACKAGE_VERSION; const char* BUDGIE_WEBSITE = PACKAGE_URL; diff --git a/src/config/budgie-config.h b/src/config/budgie-config.h -index 720379a5..c5774820 100644 +index b7581203..11df4347 100644 --- a/src/config/budgie-config.h +++ b/src/config/budgie-config.h -@@ -12,8 +12,6 @@ +@@ -12,7 +12,6 @@ #ifndef _BUDGIE_CONFIG_H_ #define _BUDGIE_CONFIG_H_ -#include <stdbool.h> -- - /* i.e. /usr/lib/budgie-desktop */ - extern const char* BUDGIE_MODULE_DIRECTORY; + #include <stddef.h> -@@ -26,12 +24,6 @@ extern const char* BUDGIE_RAVEN_PLUGIN_LIBDIR; + /* i.e. /usr/lib/budgie-desktop */ +@@ -27,12 +26,6 @@ extern const char* BUDGIE_RAVEN_PLUGIN_LIBDIR; /* i.e. /usr/share/budgie-desktop/raven-plugins */ extern const char* BUDGIE_RAVEN_PLUGIN_DATADIR; @@ -129,7 +127,7 @@ index 5eb445d1..7d27e348 100644 public extern const string DATADIR; diff --git a/src/panel/plugin_manager.vala b/src/panel/plugin_manager.vala -index f4f2e4da..9d569bd1 100644 +index f4f2e4da..3dfee49a 100644 --- a/src/panel/plugin_manager.vala +++ b/src/panel/plugin_manager.vala @@ -40,13 +40,26 @@ namespace Budgie { @@ -146,16 +144,16 @@ index f4f2e4da..9d569bd1 100644 + } else { + debug("BUDGIE_PLUGIN_LIBDIR is unset, defaulting to %s", Budgie.MODULE_DIRECTORY); + libdir = Budgie.MODULE_DIRECTORY; - } - ++ } ++ + var datadir = Environment.get_variable("BUDGIE_PLUGIN_DATADIR"); + if (datadir != null) { + debug("BUDGIE_PLUGIN_DATADIR is set to %s", datadir); + } else { + debug("BUDGIE_PLUGIN_DATADIR is unset, defaulting to %s", Budgie.MODULE_DATA_DIRECTORY); + datadir = Budgie.MODULE_DATA_DIRECTORY; -+ } -+ + } + + engine.add_search_path(libdir, datadir); + /* User path */ @@ -164,7 +162,7 @@ index f4f2e4da..9d569bd1 100644 var hdata = Path.build_path(Path.DIR_SEPARATOR_S, dir, "budgie-desktop", "data"); engine.add_search_path(user_mod, hdata); diff --git a/src/raven/plugin_manager.vala b/src/raven/plugin_manager.vala -index 01f32553..d671109a 100644 +index 01f32553..2826b7e5 100644 --- a/src/raven/plugin_manager.vala +++ b/src/raven/plugin_manager.vala @@ -51,13 +51,26 @@ namespace Budgie { @@ -181,16 +179,16 @@ index 01f32553..d671109a 100644 + } else { + debug("RAVEN_PLUGIN_LIBDIR is unset, defaulting to %s", Budgie.RAVEN_PLUGIN_LIBDIR); + libdir = Budgie.RAVEN_PLUGIN_LIBDIR; -+ } -+ + } + + var datadir = Environment.get_variable("RAVEN_PLUGIN_DATADIR"); + if (datadir != null) { + debug("RAVEN_PLUGIN_DATADIR is set to %s", datadir); + } else { + debug("RAVEN_PLUGIN_DATADIR is unset, defaulting to %s", Budgie.RAVEN_PLUGIN_DATADIR); + datadir = Budgie.RAVEN_PLUGIN_DATADIR; - } - ++ } ++ + engine.add_search_path(libdir, datadir); + /* User path */ diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix index f82c00f4a9d13..61266bb871006 100644 --- a/pkgs/desktops/cinnamon/nemo/default.nix +++ b/pkgs/desktops/cinnamon/nemo/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "nemo"; - version = "5.8.4"; + version = "5.8.5"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-WjgQXQe8iCzkc4pmeTIx6mSlsg88xy3FTPMokJWo3fg="; + sha256 = "sha256-Nl/T+8mmQdCTHo3qAUd+ATflSDXiGCQfGb1gXzvLuAc="; }; patches = [ diff --git a/pkgs/desktops/deepin/apps/deepin-compressor/default.nix b/pkgs/desktops/deepin/apps/deepin-compressor/default.nix index ae628827a2b6c..3094c1e8c699e 100644 --- a/pkgs/desktops/deepin/apps/deepin-compressor/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-compressor/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "deepin-compressor"; - version = "5.12.17"; + version = "5.12.18"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-eg9JcuBTKoaEuoph0rvy0VRH28sFOdYWN9sGbduUwcM="; + hash = "sha256-oHJOqfvrIQTspsTTnVyruiIAdh0kX12LzgGgSCYXfLE="; }; postPatch = '' diff --git a/pkgs/desktops/deepin/apps/deepin-terminal/default.nix b/pkgs/desktops/deepin/apps/deepin-terminal/default.nix index 1aa9ffdf0855f..54a06d446c6f3 100644 --- a/pkgs/desktops/deepin/apps/deepin-terminal/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-terminal/default.nix @@ -1,12 +1,10 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , nixosTests , dtkwidget , qt5integration , qt5platform-plugins -, dde-qt-dbus-factory , cmake , qtbase , qtsvg @@ -14,7 +12,6 @@ , qtx11extras , pkg-config , wrapQtAppsHook -, at-spi2-core , libsecret , chrpath , lxqt @@ -22,13 +19,13 @@ stdenv.mkDerivation rec { pname = "deepin-terminal"; - version = "6.0.6"; + version = "6.0.7"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-LzCbh+BErgh7Ojbw314oHB8QvyS6UeJkDUkNngzVm+A="; + hash = "sha256-vXykC/x9F+cPTSqKTWimUhnr+IsfoeQncdj75sXG4/g="; }; cmakeFlags = [ "-DVERSION=${version}" ]; @@ -47,9 +44,7 @@ stdenv.mkDerivation rec { qtbase qtsvg dtkwidget - dde-qt-dbus-factory qtx11extras - at-spi2-core libsecret chrpath ]; diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 2adc897d085d6..76cb60f9f5f1b 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -44,7 +44,7 @@ lib.makeScope pkgs.newScope (self: with self; { } // lib.optionalAttrs config.allowAliases { inherit (pkgs) # GTK Libs - glib glibmm atk atkmm cairo pango pangomm gdk_pixbuf gtkmm2 libcanberra-gtk2 + glib glibmm atk atkmm cairo pango pangomm gtkmm2 libcanberra-gtk2 # Included for backwards compatibility libsoup libwnck2 gtk-doc gnome-doc-utils diff --git a/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix index 8be9575b6de38..addf2f1f92ba0 100644 --- a/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix +++ b/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix @@ -45,6 +45,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { + homepage = "https://gitlab.gnome.org/GNOME/adwaita-icon-theme"; platforms = with platforms; linux ++ darwin; maintainers = teams.gnome.members; license = licenses.cc-by-sa-30; diff --git a/pkgs/desktops/gnome/core/gnome-session/default.nix b/pkgs/desktops/gnome/core/gnome-session/default.nix index dcafff9e0ecf9..3b33d289ddb0e 100644 --- a/pkgs/desktops/gnome/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome/core/gnome-session/default.nix @@ -1,4 +1,5 @@ { fetchurl +, fetchpatch , lib , stdenv , substituteAll @@ -47,6 +48,12 @@ stdenv.mkDerivation rec { dbusLaunch = "${dbus.lib}/bin/dbus-launch"; bash = "${bash}/bin/bash"; }) + # See #226355. Can be removed on update to v45. + (fetchpatch { + name = "fix-gnome-boxes-crash.patch"; + url = "https://gitlab.gnome.org/GNOME/gnome-session/commit/fab1a3b91677035d541de2c141f8073c4057342c.patch"; + hash = "sha256-2xeoNgV8UDexkufXDqimAplX0GC99tUWUqjw3kfN+5Q="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/extensions/extensionRenames.nix b/pkgs/desktops/gnome/extensions/extensionRenames.nix index 864a2096ded30..32cb0feaed021 100644 --- a/pkgs/desktops/gnome/extensions/extensionRenames.nix +++ b/pkgs/desktops/gnome/extensions/extensionRenames.nix @@ -120,7 +120,6 @@ "EasyScreenCast@iacopodeenosee.gmail.com" = "easyScreenCast"; # extensionPortalSlug is "easyscreencast" "gnome-fuzzy-app-search@gnome-shell-extensions.Czarlie.gitlab.com" = "fuzzy-app-search"; # extensionPortalSlug is "gnome-fuzzy-app-search" "TopIcons@phocean.net" = "topicons-plus"; # extensionPortalSlug is "topicons" - "paperwm@hedning:matrix.org" = "paperwm"; # is not on extensions.gnome.org "no-title-bar@jonaspoehler.de" = "no-title-bar"; # extensionPortalSlug is "no-title-bar-forked" # These extensions are automatically packaged at the moment. We preserve the old attribute name # for backwards compatibility. diff --git a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix index 80a71dd2cde34..6e8da3840f086 100644 --- a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix +++ b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix @@ -9,7 +9,6 @@ "icon-hider@kalnitsky.org" = callPackage ./icon-hider { }; "impatience@gfxmonk.net" = callPackage ./impatience { }; "no-title-bar@jonaspoehler.de" = callPackage ./no-title-bar { }; - "paperwm@hedning:matrix.org" = callPackage ./paperwm { }; "pidgin@muffinmad" = callPackage ./pidgin-im-integration { }; "pop-shell@system76.com" = callPackage ./pop-shell { }; "sound-output-device-chooser@kgshank.net" = callPackage ./sound-output-device-chooser { }; diff --git a/pkgs/desktops/gnome/extensions/paperwm/default.nix b/pkgs/desktops/gnome/extensions/paperwm/default.nix deleted file mode 100644 index 9bfa5f0761b8a..0000000000000 --- a/pkgs/desktops/gnome/extensions/paperwm/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, gitUpdater -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "gnome-shell-extension-paperwm"; - version = "44.3.1"; - - src = fetchFromGitHub { - owner = "paperwm"; - repo = "PaperWM"; - rev = "v${finalAttrs.version}"; - hash = "sha256-oGBnQGtx2ku4cfgZkZ3OdHlVuiYR8hy1eYDWDZP3fn4="; - }; - - dontConfigure = true; - dontBuild = true; - - installPhase = '' - runHook preInstall - - mkdir -p "$out/share/gnome-shell/extensions/paperwm@hedning:matrix.org" - cp -r . "$out/share/gnome-shell/extensions/paperwm@hedning:matrix.org" - - runHook postInstall - ''; - - passthru.updateScript = gitUpdater { url = finalAttrs.meta.homepage; }; - - meta = { - homepage = "https://github.com/paperwm/PaperWM"; - description = "Tiled scrollable window management for Gnome Shell"; - changelog = "https://github.com/paperwm/PaperWM/releases/tag/${finalAttrs.src.rev}"; - license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ hedning AndersonTorres cab404 ]; - platforms = lib.platforms.all; - }; - - passthru.extensionUuid = "paperwm@hedning:matrix.org"; -}) diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix index e274604857505..66042844d8b46 100644 --- a/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -16,7 +16,6 @@ , meson , ninja , pkg-config -, python3 , vala , polkit , wrapGAppsHook @@ -24,13 +23,13 @@ stdenv.mkDerivation rec { pname = "appcenter"; - version = "7.3.0"; + version = "7.4.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-Lj3j812XaCIN+TFSDAvIgtl49n5jG4fVlAFvrWqngpM="; + sha256 = "sha256-L6MGbzzujr4tEB2Cpd7IU+3mOtSCt2hLPw4mOfZ4TkQ="; }; nativeBuildInputs = [ @@ -38,7 +37,6 @@ stdenv.mkDerivation rec { meson ninja pkg-config - python3 vala wrapGAppsHook ]; @@ -65,11 +63,6 @@ stdenv.mkDerivation rec { "-Dcurated=false" ]; - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - passthru = { updateScript = nix-update-script { }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index 4716d217c261b..12d0740c4384b 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pkg-config , meson @@ -14,7 +13,6 @@ , libgee , libhandy , granite -, libnotify , pango , elementary-dock , bamf @@ -28,7 +26,7 @@ stdenv.mkDerivation rec { pname = "elementary-files"; - version = "6.5.0"; + version = "6.5.2"; outputs = [ "out" "dev" ]; @@ -36,18 +34,9 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = "files"; rev = version; - sha256 = "sha256-E1e2eXGpycl2VXEUvUir5G3MRLz/4TQMvmOuWgU9JNc="; + sha256 = "sha256-YwXyqZ0exwQ3Qx+VWWyTTmhqCVr6be8tqzS1k3Luo8o="; }; - patches = [ - # meson: Don't run gtk-update-icon-cache - # https://github.com/elementary/files/pull/2294 - (fetchpatch { - url = "https://github.com/elementary/files/commit/758ece9fb29eb4a25f47065710dad4ac547ca2ce.patch"; - hash = "sha256-+OASDsOPH0g5Cyxw4JmVxA70zQHhcpqLMKKYP4VLTO0="; - }) - ]; - nativeBuildInputs = [ desktop-file-utils meson @@ -68,7 +57,6 @@ stdenv.mkDerivation rec { libgee libgit2-glib libhandy - libnotify pango sqlite systemd diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix index d5bb01cecb9b8..3e89aa38189df 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , substituteAll , pkg-config @@ -18,24 +17,15 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-network"; - version = "7.0.1"; + version = "7.0.2"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-pz2sWN33d20/fMByR+XrNz2lxPdgCA6vxism3E/Fh/I="; + sha256 = "sha256-PqTnopacT1/Ctx8VH6b35tiVI+3ZlrdFcRsDpAWm4a0="; }; - patches = [ - # PopoverWidget: fix flowbox child focus - # https://github.com/elementary/wingpanel-indicator-network/pull/288 - (fetchpatch { - url = "https://github.com/elementary/wingpanel-indicator-network/commit/88db9004249334e1316321e0373a3065900fe6f1.patch"; - sha256 = "sha256-rpAULo4qVPO3yr7cBVeKyT7L43zHVEdYLJD4x0ukBs4="; - }) - ]; - nativeBuildInputs = [ meson ninja diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix index fc69dec69a56b..921fa48d81c54 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-notifications"; - version = "7.0.0"; + version = "7.1.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-HEkuNJgG0WEOKO6upwQgXg4huA7dNyz73U1nyOjQiTs="; + sha256 = "sha256-vm+wMHyWWtOWM0JyiesfpzC/EmkTNbprXaBgVUDQvDg="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix index 05adf949afa6d..af5edc2f7d019 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix @@ -148,6 +148,12 @@ mkDerivation { patches = [ ./0001-startkde.patch ./0002-absolute-wallpaper-install-dir.patch + + # Backport patch for cleaner shutdowns + (fetchpatch { + url = "https://invent.kde.org/plasma/plasma-workspace/-/commit/6ce8f434139f47e6a71bf0b68beae92be8845ce4.patch"; + hash = "sha256-cYw/4/9tSnCbArLr72O8F8V0NLkVXdCVnJGoGxSzZMg="; + }) ]; # QT_INSTALL_BINS refers to qtbase, and qdbus is in qttools diff --git a/pkgs/desktops/xfce/applications/gigolo/default.nix b/pkgs/desktops/xfce/applications/gigolo/default.nix index c23abc1d561e3..393e6a8c5b244 100644 --- a/pkgs/desktops/xfce/applications/gigolo/default.nix +++ b/pkgs/desktops/xfce/applications/gigolo/default.nix @@ -3,10 +3,10 @@ mkXfceDerivation { category = "apps"; pname = "gigolo"; - version = "0.5.2"; + version = "0.5.3"; odd-unstable = false; - sha256 = "sha256-8UDb4H3zxRKx2y+MRsozQoR3es0fs5ooR/5wBIE11bY="; + sha256 = "sha256-dxaFuKbSqhj/l5JV31cI+XzgdghfbcVwVtwmRiZeff8="; buildInputs = [ gtk3 glib ]; diff --git a/pkgs/desktops/xfce/core/xfce4-panel/default.nix b/pkgs/desktops/xfce/core/xfce4-panel/default.nix index d45eb2f6afb43..fe7306deb4833 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-panel/default.nix @@ -16,9 +16,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-panel"; - version = "4.18.4"; + version = "4.18.5"; - sha256 = "sha256-OEU9NzvgWn6zJGdK9Te2qBbARlwvRrLHuaUocNyGd/g="; + sha256 = "sha256-1oh9C2ZlpcUulqhxUEPLhX22R7tko0rMmDixgkgaU9o="; nativeBuildInputs = [ gobject-introspection diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix index 1af46fd5182aa..16f08da23deb6 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix @@ -1,12 +1,35 @@ -{ lib, mkXfceDerivation, libXtst, libxfce4ui, xfce4-panel, xfconf }: +{ lib +, mkXfceDerivation +, glib +, gtk3 +, libX11 +, libXtst +, libxfce4ui +, libxfce4util +, qrencode +, xfce4-panel +, xfconf +, wayland +}: mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-clipman-plugin"; - version = "1.6.4"; - sha256 = "sha256-N/e97C6xWyF1GUg7gMN0Wcw35awypflMmA+Pdg6alEw="; + version = "1.6.5"; + sha256 = "sha256-aKcIwlNlaJEHgIq0S7+VG/os49+zRqkZXsQVse4B9oE="; - buildInputs = [ libXtst libxfce4ui xfce4-panel xfconf ]; + buildInputs = [ + glib + gtk3 + libX11 + libXtst + libxfce4ui + libxfce4util + qrencode + xfce4-panel + xfconf + wayland + ]; meta = with lib; { description = "Clipboard manager for Xfce panel"; diff --git a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix index 475fe4564eee9..a8b172f4eb5d2 100644 --- a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix +++ b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix @@ -11,15 +11,17 @@ let # than we do. We don't just use theirs because ours are less ambiguous and # some builds need that clarity. # - # FIXME: - # There's some dragons here. Build host and target concepts are being mixed up. - ndkInfoFun = { config, ... }: { + ndkBuildInfoFun = { config, ... }: { x86_64-apple-darwin = { double = "darwin-x86_64"; }; x86_64-unknown-linux-gnu = { double = "linux-x86_64"; }; + }.${config} or + (throw "Android NDK doesn't support building on ${config}, as far as we know"); + + ndkTargetInfoFun = { config, ... }: { i686-unknown-linux-android = { triple = "i686-linux-android"; arch = "x86"; @@ -37,11 +39,10 @@ let triple = "aarch64-linux-android"; }; }.${config} or - (throw "Android NDK doesn't support ${config}, as far as we know"); + (throw "Android NDK doesn't support targetting ${config}, as far as we know"); - buildInfo = ndkInfoFun stdenv.buildPlatform; - hostInfo = ndkInfoFun stdenv.hostPlatform; - targetInfo = ndkInfoFun stdenv.targetPlatform; + buildInfo = ndkBuildInfoFun stdenv.buildPlatform; + targetInfo = ndkTargetInfoFun stdenv.targetPlatform; inherit (stdenv.targetPlatform) sdkVer; suffixSalt = lib.replaceStrings ["-" "."] ["_" "_"] stdenv.targetPlatform.config; diff --git a/pkgs/development/androidndk-pkgs/default.nix b/pkgs/development/androidndk-pkgs/default.nix index a7001ce1d4a66..8aa7eefe4215e 100644 --- a/pkgs/development/androidndk-pkgs/default.nix +++ b/pkgs/development/androidndk-pkgs/default.nix @@ -29,7 +29,7 @@ # these two really are the same. buildAndroidndk = buildAndroidComposition.ndk-bundle; androidndk = androidComposition.ndk-bundle; - targetAndroidndkPkgs = targetPackages.androidndkPkgs_21; + targetAndroidndkPkgs = if targetPackages ? androidndkPkgs_21 then targetPackages.androidndkPkgs_21 else throw "androidndkPkgs_21: no targetPackages, use `buildPackages.androidndkPkgs_21"; }; "23b" = @@ -59,7 +59,7 @@ # these two really are the same. buildAndroidndk = buildAndroidComposition.ndk-bundle; androidndk = androidComposition.ndk-bundle; - targetAndroidndkPkgs = targetPackages.androidndkPkgs_23b; + targetAndroidndkPkgs = if targetPackages ? androidndkPkgs_23b then targetPackages.androidndkPkgs_23b else throw "androidndkPkgs_23b: no targetPackages, use `buildPackages.androidndkPkgs_23b"; }; "24" = @@ -89,7 +89,7 @@ # these two really are the same. buildAndroidndk = buildAndroidComposition.ndk-bundle; androidndk = androidComposition.ndk-bundle; - targetAndroidndkPkgs = targetPackages.androidndkPkgs_24; + targetAndroidndkPkgs = if targetPackages ? androidndkPkgs_24 then targetPackages.androidndkPkgs_24 else throw "androidndkPkgs_24: no targetPackages, use `buildPackages.androidndkPkgs_24"; }; } diff --git a/pkgs/development/beam-modules/elixir-ls/default.nix b/pkgs/development/beam-modules/elixir-ls/default.nix index 949331f2fe48e..3240a8eebc371 100644 --- a/pkgs/development/beam-modules/elixir-ls/default.nix +++ b/pkgs/development/beam-modules/elixir-ls/default.nix @@ -49,6 +49,10 @@ mixRelease { substitute release/language_server.sh $out/bin/elixir-ls \ --replace 'exec "''${dir}/launch.sh"' "exec $out/lib/launch.sh" chmod +x $out/bin/elixir-ls + + substitute release/debugger.sh $out/bin/elixir-debugger \ + --replace 'exec "''${dir}/launch.sh"' "exec $out/lib/launch.sh" + chmod +x $out/bin/elixir-debugger # prepare the launcher substituteInPlace $out/lib/launch.sh \ --replace "ERL_LIBS=\"\$SCRIPTPATH:\$ERL_LIBS\"" \ diff --git a/pkgs/development/compilers/chicken/5/deps.toml b/pkgs/development/compilers/chicken/5/deps.toml index e54ac4691c709..4a6a39ce71853 100644 --- a/pkgs/development/compilers/chicken/5/deps.toml +++ b/pkgs/development/compilers/chicken/5/deps.toml @@ -9,9 +9,9 @@ version = "1.30" [F-operator] dependencies = ["utf8", "miscmacros", "datatype", "box"] license = "bsd" -sha256 = "15szkh26l6yv4b8vlwa9j9fq4ypgawm8dq8n7hmyk6iqhrqamwld" +sha256 = "1zhfvcv8628s9sria1i63sdp88h5gpm96iv023qvm07g9z9qv5dv" synopsis = "Shift/Reset Control Operators" -version = "4.1.2" +version = "4.1.3" [abnf] dependencies = ["srfi-1", "utf8", "lexgen"] @@ -107,16 +107,16 @@ version = "0.6" [apropos] dependencies = ["srfi-1", "utf8", "string-utils", "symbol-utils", "check-errors"] license = "bsd" -sha256 = "0njkdxwd9122l9vql64nqm7dy3lggikr2bzwidwk7i8yz3nm3g6w" +sha256 = "01zdifhqc0jfm810106sh87w0fmpchf4dph0k8v1lyjzbj1ivmi4" synopsis = "CHICKEN apropos" -version = "3.8.1" +version = "3.8.3" [arcadedb] dependencies = ["uri-common", "medea"] license = "zlib-acknowledgement" -sha256 = "1s370xms0kf1z6a4pbg5lp931zr8yl0r5szwg3lji99cdm87cjij" +sha256 = "1w2iqylz0wfn7is8vss5dkwmi3pxhbh2h7ywzg39x45z2c91sd28" synopsis = "An ArcadeDB database driver for CHICKEN Scheme." -version = "0.6" +version = "0.7" [args] dependencies = ["srfi-1", "srfi-13", "srfi-37"] @@ -548,9 +548,9 @@ version = "1.2.2" [comic-snarfer] dependencies = ["anaphora", "brev-separate", "define-options", "http-client", "html-parser", "mathh", "srfi-42", "sxpath", "strse", "uri-generic"] license = "gplv3" -sha256 = "1047v7mk836mf4g6ba5a90lmgqql1ss1ap9kgk0mhzrffznjipgn" +sha256 = "1pa566vfgwxl5nr56brn7rwkj63m2mgpqw1ma2228g4wyya7c8qn" synopsis = "Download files (such as web comic images) by recursing on XPath" -version = "1.21" +version = "1.23" [commands] dependencies = [] @@ -784,11 +784,11 @@ synopsis = "Dynamic (dense) vectors based on SRFI-43." version = "2.1" [dynamic-import] -dependencies = ["srfi-1"] -license = "bsd" -sha256 = "0ph862kms254d8jndxyixsj6m1l32mxk4qq3b0xijly2110yssdw" +dependencies = [] +license = "public-domain" +sha256 = "17n0z551p7kr83afpjhg3q93q10nlwf7rjc3qmff1g026yhxnvwc" synopsis = "Dynamic Import" -version = "0.0.3" +version = "1.0.2" [edn] dependencies = ["r7rs", "srfi-69", "srfi-1", "chalk"] @@ -1073,9 +1073,9 @@ version = "0.0.7" [generics] dependencies = ["simple-cells"] license = "bsd" -sha256 = "0jmaky5q18y7982njmcf48cj4zy72y1qd43i8jjr4c1izmqavi4k" +sha256 = "1fklbb5yjg8j56cvqbijirb2d0h5jqscp7219f67aln3lpq06dz6" synopsis = "an implementation of generic functions and a lot of helpers" -version = "2.0.2" +version = "2.0.3" [geo-utils] dependencies = ["srfi-1", "vector-lib", "mathh", "check-errors", "symbol-utils"] @@ -1094,9 +1094,9 @@ version = "1.21" [getopt-utils] dependencies = ["utf8", "srfi-1", "getopt-long"] license = "bsd" -sha256 = "0c61ngrrsayaxf3jswaggpp89y36670manwhl2mcl81whl7wwdr4" +sha256 = "0jbzv8s0b3pnlqzl4vls0fssw56ivz1g9afdj90kxaxlxv1b1l0k" synopsis = "Utilities for getopt-long" -version = "1.0.1" +version = "1.1.0" [git] dependencies = ["srfi-69", "foreigners", "module-declarations", "srfi-1"] @@ -1353,9 +1353,9 @@ version = "1.2" [intarweb] dependencies = ["srfi-1", "srfi-13", "srfi-14", "defstruct", "uri-common", "base64"] license = "bsd" -sha256 = "1lh0zclv3i56iv508ckv33hvx91pw8vmrcy8flbwgin00sxk0hf3" +sha256 = "1vpdrbrmjsdbl4cb3c82iqcvyn9318jzapg6bl00dkbn6ykyisr3" synopsis = "A more convenient HTTP library" -version = "2.0.2" +version = "2.0.3" [integer-map] dependencies = ["srfi-1", "srfi-128", "srfi-143", "srfi-158"] @@ -1451,9 +1451,9 @@ version = "7.0" [json-rpc] dependencies = ["r7rs", "srfi-1", "srfi-18", "srfi-69", "srfi-180"] license = "mit" -sha256 = "18qnp9ryp3s0i8363ny5c2v16csqq416smnzd3pls103zn47p44v" +sha256 = "09ydq35aaap14vxw0533mnxvqq9c8yir1dc7bn61q4l7vzfl44k8" synopsis = "A JSON RPC library for R7RS scheme." -version = "0.4.0" +version = "0.4.2" [json-utils] dependencies = ["utf8", "srfi-1", "srfi-69", "vector-lib", "miscmacros", "moremacros"] @@ -1556,9 +1556,9 @@ version = "1.2.1" [list-utils] dependencies = ["utf8", "srfi-1", "check-errors"] license = "bsd" -sha256 = "0sbd04kmiahk7mbw1cy64n1qjz2rpldjx66aj41r964kjscm6izv" +sha256 = "1llnf0qrssw4vpwvp17ir7558q0d1xyyb14zydcrnb9nhbzly5jr" synopsis = "list-utils" -version = "2.5.1" +version = "2.6.0" [live-define] dependencies = ["matchable"] @@ -1703,9 +1703,9 @@ version = "0.3.4" [mathh] dependencies = [] license = "public-domain" -sha256 = "0v0jkgf1bsnj0gk0s4kph1169h87ssf34v3p8y184na00zy4mr4v" -synopsis = "ISO C math functions and constants" -version = "4.5.1" +sha256 = "1zdm58a950vslyjkw4w04c70vhjwf5bdxw79mp3cq65ik474gi8d" +synopsis = "ISO C math functions, miscellaneous math utilities, and constants" +version = "4.6.4" [matrico] dependencies = [] @@ -1826,6 +1826,13 @@ sha256 = "0xs8ksnbpxm0a1s2bcqybliaqpr5agin4ksn3hyjwniqhzx4qzg8" synopsis = "Various helper macros" version = "1.0" +[mistie] +dependencies = [] +license = "bsd" +sha256 = "0j5cqkqqfmq3g0brws02vsvn7c68rdw4k0i17gm7pbsjwjb6qggw" +synopsis = "A programmable filter" +version = "1.6" + [modular-arithmetic] dependencies = ["srfi-1", "matchable"] license = "bsd" @@ -1857,9 +1864,9 @@ version = "4.0.1" [moremacros] dependencies = ["srfi-69", "miscmacros", "check-errors"] license = "bsd" -sha256 = "0zyir1c24wdjfrxj983pgvzil2zyzhdb0bd33cp5qfb65yp5kz56" +sha256 = "09kc4wmhwkdhspk8g0i357qdq9mp1xcalgnqi8z9yasfy2k6gk1h" synopsis = "More miscellaneous macros" -version = "2.4.0" +version = "2.5.0" [mpd-client] dependencies = ["regex", "srfi-1"] @@ -2508,9 +2515,9 @@ version = "1.9.1" [sequences-utils] dependencies = ["srfi-1", "srfi-69", "sequences"] license = "bsd" -sha256 = "1c0yq4bzq6lkax4pwky5vyb2gl0yw88r7fzsbx37xsw14lb4fl64" +sha256 = "1r3wbvi502wm82zn78a2kw2dv1ya0msphhx42gb9wllxdhzz0d6l" synopsis = "(More) Generic sequence operators" -version = "0.5.0" +version = "0.5.1" [sequences] dependencies = ["fast-generic", "srfi-42"] @@ -3030,6 +3037,13 @@ sha256 = "14m763qmx7xdsqv5gkf4xqxvi0nnr5ykwhn3g9mmgazab5g32i0s" synopsis = "SRFI-173 Hooks" version = "0.1" +[srfi-174] +dependencies = ["r7rs", "srfi-19"] +license = "mit" +sha256 = "0kl9x7q1wcy7jzjkajmqpf748aqfjysh0ygdvnbvg5bxzdfs4gh9" +synopsis = "srfi-174" +version = "1.0.2" + [srfi-178] dependencies = ["srfi-151", "srfi-160", "srfi-141"] license = "mit" @@ -3066,11 +3080,11 @@ synopsis = "SRFI 189: Maybe and Either" version = "1.0.3" [srfi-19] -dependencies = ["srfi-1", "utf8", "srfi-18", "srfi-29", "srfi-69", "miscmacros", "locale", "record-variants", "check-errors"] +dependencies = ["srfi-1", "utf8", "srfi-18", "srfi-29", "miscmacros", "locale", "record-variants", "check-errors"] license = "bsd" -sha256 = "0mq9nd1ck1qq9bs415xw4sqlbw1jcrg9n1vrh8kiqy197xbymh0h" +sha256 = "1m2pyp5mv09inli9jq7fm9q55nhg2xwp50f7s6cgndpp2w2kb38v" synopsis = "Time Data Types and Procedures" -version = "4.7.5" +version = "4.9.5" [srfi-193] dependencies = [] @@ -3152,9 +3166,9 @@ version = "1.3" [srfi-27] dependencies = ["srfi-1", "vector-lib", "timed-resource", "miscmacros", "check-errors"] license = "bsd" -sha256 = "0px2czn3ssw39q3v15isyxhi32wrf2pj9r1vrxlfyvyfv1ir84gb" +sha256 = "11hb0hxhm74yjg7d95nj1wxjpi3hgkns7zy64as3xl3jbq3wlh60" synopsis = "Sources of Random Bits" -version = "4.2.2" +version = "4.2.3" [srfi-29] dependencies = ["srfi-1", "srfi-69", "utf8", "locale", "posix-utils", "condition-utils", "check-errors"] @@ -3352,6 +3366,13 @@ sha256 = "0fcpsh9rgibkz807jwr062bcjzz7x93pv5x9xniycpjp6i3s5r2x" synopsis = "Provides LIFO queue (stack) operations" version = "3.1.0" +[stalin] +dependencies = [] +license = "gpl-2" +sha256 = "034mc1rgmp6r44bycknja6c4snvs3li75f1kr686g0lgzg1n0jjq" +synopsis = "An aggressively optimizing Scheme->C compiler" +version = "0.11.11" + [states] dependencies = ["advice"] license = "public-domain" @@ -3404,9 +3425,9 @@ version = "1.1" [string-utils] dependencies = ["utf8", "srfi-1", "srfi-13", "srfi-69", "miscmacros", "check-errors"] license = "bsd" -sha256 = "0ra6baymbdw6ikbvha453fjrx0ahqvchlfbpm9656hryar23dclq" +sha256 = "0f9m63flywcx7b6rhb7d562v26xilnxl0zcd8c6c4rfjsr0bdgjr" synopsis = "String Utilities" -version = "2.7.2" +version = "2.7.3" [strse] dependencies = ["matchable", "srfi-13", "miscmacros"] @@ -3488,9 +3509,9 @@ version = "1.0" [symbol-utils] dependencies = ["utf8"] license = "bsd" -sha256 = "05b3m1iwg4rhv044l2njyxwkyp4k1xjikwa0f4aynjg6dlkhsf9z" -synopsis = "symbol-utils" -version = "2.4.0" +sha256 = "0mxcdlf1i0xn70h9l5grgx1yvkbgq9rcvil02gdp9by5qqcqmklh" +synopsis = "Symbol Utilities" +version = "2.5.0" [synch] dependencies = ["srfi-18", "check-errors"] @@ -3649,9 +3670,9 @@ version = "2.0" [transducers] dependencies = ["srfi-1", "srfi-128", "srfi-133", "srfi-143", "srfi-146", "srfi-160", "check-errors", "r7rs"] license = "mit" -sha256 = "162f0xvk69jha55sszdkgm47q18k3x5bc2g6psn2107im4ma45fi" +sha256 = "080lwlgvqpwdlqjdb71c1i657wq6ax2v4r9117fh83wr8bs3h1j9" synopsis = "Transducers for working with foldable data types." -version = "0.4.2" +version = "0.5.1" [transmission] dependencies = ["http-client", "intarweb", "medea", "r7rs", "srfi-1", "srfi-189", "uri-common"] diff --git a/pkgs/development/compilers/chicken/5/overrides.nix b/pkgs/development/compilers/chicken/5/overrides.nix index 29bfaec62d2e4..270384565a4fd 100644 --- a/pkgs/development/compilers/chicken/5/overrides.nix +++ b/pkgs/development/compilers/chicken/5/overrides.nix @@ -55,6 +55,8 @@ in leveldb = addToBuildInputs pkgs.leveldb; magic = addToBuildInputs pkgs.file; mdh = addToBuildInputs pkgs.pcre; + # missing dependency in upstream egg + mistie = addToPropagatedBuildInputs (with chickenEggs; [ srfi-1 ]); nanomsg = addToBuildInputs pkgs.nanomsg; ncurses = addToBuildInputsWithPkgConfig [ pkgs.ncurses ]; opencl = addToBuildInputs ([ pkgs.opencl-headers pkgs.ocl-icd ] diff --git a/pkgs/development/compilers/circt/default.nix b/pkgs/development/compilers/circt/default.nix index c6f787078b670..f8eaae9a04017 100644 --- a/pkgs/development/compilers/circt/default.nix +++ b/pkgs/development/compilers/circt/default.nix @@ -14,12 +14,12 @@ let in stdenv.mkDerivation rec { pname = "circt"; - version = "1.54.0"; + version = "1.56.1"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - sha256 = "sha256-jHDQl6UJTyNGZ4PUTEiZCIN/RSRbBxlaVutkwrWbK9M="; + sha256 = "sha256-MOwjfSUd5Dvlvek763AMZWK29dUoc2fblb5qtByTqLA="; fetchSubmodules = true; }; @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { description = "Circuit IR compilers and tools"; homepage = "https://circt.org/"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ sharzy ]; + maintainers = with lib.maintainers; [ sharzy pineapplehunter ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/development/compilers/cudatoolkit/redist/extension.nix b/pkgs/development/compilers/cudatoolkit/redist/extension.nix index 58f2b205dd598..ea6fd581cde4f 100644 --- a/pkgs/development/compilers/cudatoolkit/redist/extension.nix +++ b/pkgs/development/compilers/cudatoolkit/redist/extension.nix @@ -89,9 +89,9 @@ let in { # features : Attr Set (String PackageFeatureAttrs) - features = processManifest ./manifests/redistrib_features_${fullCudaVersion}.json; + features = processManifest (./manifests + "/redistrib_features_${fullCudaVersion}.json"); # manifest : Attr Set (String PackageAttrs) - manifest = processManifest ./manifests/redistrib_${fullCudaVersion}.json; + manifest = processManifest (./manifests + "/redistrib_${fullCudaVersion}.json"); }; # Function to build a single redist package diff --git a/pkgs/development/compilers/djgpp/default.nix b/pkgs/development/compilers/djgpp/default.nix index 25d1e0773cc04..d6f645f3a31a7 100644 --- a/pkgs/development/compilers/djgpp/default.nix +++ b/pkgs/development/compilers/djgpp/default.nix @@ -92,6 +92,6 @@ stdenv.mkDerivation rec { homepage = "https://www.delorie.com/djgpp/"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ hughobrien ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/development/compilers/dotnet/update.sh b/pkgs/development/compilers/dotnet/update.sh index 9fa296842ef6e..da1c1e2c6e221 100755 --- a/pkgs/development/compilers/dotnet/update.sh +++ b/pkgs/development/compilers/dotnet/update.sh @@ -23,7 +23,7 @@ release_platform_attr () { local platform="$2" local attr="$3" - jq -r '.[] | select(.rid == "'"$platform"'") | ."'"$attr"'"' <<< "$release_files" + jq -r '.[] | select((.rid == "'"$platform"'") and (.name | contains("composite") | not)) | ."'"$attr"'"' <<< "$release_files" } platform_sources () { @@ -116,12 +116,18 @@ aspnetcore_packages () { "Microsoft.AspNetCore.App.Runtime.linux-musl-x64" \ "Microsoft.AspNetCore.App.Runtime.linux-x64" \ "Microsoft.AspNetCore.App.Runtime.osx-x64" \ - "Microsoft.AspNetCore.App.Runtime.win-arm" \ "Microsoft.AspNetCore.App.Runtime.win-arm64" \ "Microsoft.AspNetCore.App.Runtime.win-x64" \ "Microsoft.AspNetCore.App.Runtime.win-x86" \ ) + # These packages are currently broken on .NET 8 + if version_older "$version" "8"; then + pkgs+=( \ + "Microsoft.AspNetCore.App.Runtime.win-arm" \ + ) + fi + # Packages that only apply to .NET 6 and up if ! version_older "$version" "6"; then pkgs+=( \ @@ -166,7 +172,6 @@ sdk_packages () { "Microsoft.NETCore.App.Host.linux-musl-x64" \ "Microsoft.NETCore.App.Host.linux-x64" \ "Microsoft.NETCore.App.Host.osx-x64" \ - "Microsoft.NETCore.App.Host.win-arm" \ "Microsoft.NETCore.App.Host.win-arm64" \ "Microsoft.NETCore.App.Host.win-x64" \ "Microsoft.NETCore.App.Host.win-x86" \ @@ -176,7 +181,6 @@ sdk_packages () { "Microsoft.NETCore.App.Runtime.linux-musl-x64" \ "Microsoft.NETCore.App.Runtime.linux-x64" \ "Microsoft.NETCore.App.Runtime.osx-x64" \ - "Microsoft.NETCore.App.Runtime.win-arm" \ "Microsoft.NETCore.App.Runtime.win-arm64" \ "Microsoft.NETCore.App.Runtime.win-x64" \ "Microsoft.NETCore.App.Runtime.win-x86" \ @@ -212,10 +216,6 @@ sdk_packages () { "runtime.win-arm64.Microsoft.NETCore.DotNetHost" \ "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy" \ "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver" \ - "runtime.win-arm.Microsoft.NETCore.DotNetAppHost" \ - "runtime.win-arm.Microsoft.NETCore.DotNetHost" \ - "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy" \ - "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver" \ "runtime.win-x64.Microsoft.NETCore.DotNetAppHost" \ "runtime.win-x64.Microsoft.NETCore.DotNetHost" \ "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy" \ @@ -224,7 +224,6 @@ sdk_packages () { "runtime.win-x86.Microsoft.NETCore.DotNetHost" \ "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy" \ "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" \ - "Microsoft.NETCore.App.Composite" \ "Microsoft.NETCore.App.Host.linux-musl-arm" \ "Microsoft.NETCore.App.Host.osx-arm64" \ "Microsoft.NETCore.App.Runtime.linux-musl-arm" \ @@ -256,9 +255,22 @@ sdk_packages () { "Microsoft.NETCore.App.Crossgen2.osx-arm64" ) + # These packages are currently broken on .NET 8 + # When .NET 8 officialy launches, these should be checked and added back if fixed + if version_older "$version" "8"; then + pkgs+=( \ + "Microsoft.NETCore.App.Host.win-arm" \ + "Microsoft.NETCore.App.Runtime.win-arm" \ + "runtime.win-arm.Microsoft.NETCore.DotNetAppHost" \ + "runtime.win-arm.Microsoft.NETCore.DotNetHost" \ + "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy" \ + "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver" \ + "Microsoft.NETCore.App.Composite" \ + ) + fi + # Packages that only apply to .NET 7 and up if ! version_older "$version" "7"; then - # ILCompiler requires nixpkgs#181373 to be fixed to work properly pkgs+=( \ "runtime.linux-arm64.Microsoft.DotNet.ILCompiler" \ "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler" \ diff --git a/pkgs/development/compilers/dotnet/versions/6.0.nix b/pkgs/development/compilers/dotnet/versions/6.0.nix index 2d26a843a9fe6..ee63a6a241d99 100644 --- a/pkgs/development/compilers/dotnet/versions/6.0.nix +++ b/pkgs/development/compilers/dotnet/versions/6.0.nix @@ -3,177 +3,177 @@ # v6.0 (active) { aspnetcore_6_0 = buildAspNetCore { - version = "6.0.21"; + version = "6.0.22"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/56d44b17-03c2-4d9e-bdbc-a598ca34fc01/8fcc1e19dfd3c86b09beb68460db6e85/aspnetcore-runtime-6.0.21-linux-x64.tar.gz"; - sha512 = "3a74b52e340653822ad5120ec87e00e4bc0217e8ce71020ad9c4a0903b87d221b538c3841949be2ca129a45f8105def0ea5152e44e7cef8858958ae04fa0dd65"; + url = "https://download.visualstudio.microsoft.com/download/pr/a936856b-96f0-4525-8f74-b96b792c3664/2da9be398c92985d3f95c3336361d1ba/aspnetcore-runtime-6.0.22-linux-x64.tar.gz"; + sha512 = "a42f600823e19611ddb202bde1a8da8d0e9dadb22262cb2122f8c85af12bddee8793524d9e2096c188b267bdd852ef90bf93533c2d4f2f3151742cfc20fdc244"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/1f8d7d02-581b-42f8-b74a-bf523099ab5c/29da812824f1a8cdfbe452aa5bc0ebc3/aspnetcore-runtime-6.0.21-linux-arm64.tar.gz"; - sha512 = "3d39f458831c2e2167c06eb85205a764e9aa497ccc26cb19968f03cb3102daaafde391a707f08c3010bff95cfc0e9586ea97c0fe7d8ef885b4aae009748591c8"; + url = "https://download.visualstudio.microsoft.com/download/pr/000ddf12-2c8b-4d97-9b3d-f76c8fef461e/c2dfb5a82b7952cb272c0f5dbeb7fcb1/aspnetcore-runtime-6.0.22-linux-arm64.tar.gz"; + sha512 = "bd3dc49cd2b637edc3797206a0b6b07b40f774a25c3c6932bc86d345cfb90f4af7c0927e1b39cf4fc638ce67a5291b0ab7a5bfb030c629f8e4e0d9ce76715532"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/4eece21f-af5c-4bdd-8e5b-5e300f0cbc6d/5290c217803341cb2a51628e8ea0dd9e/aspnetcore-runtime-6.0.21-osx-x64.tar.gz"; - sha512 = "b7d604bc11224b32960f11ed2332cfe5cd595655dad5c2cae1fba40e73ec637f9f6e4246659296d90f544d7aa7c5248b0c7999cf82b4a325acef7368416c1dde"; + url = "https://download.visualstudio.microsoft.com/download/pr/447de6fd-79ad-4a1d-a7ea-48f57a8e1280/27c1a55772876bf109b7c2caa5038d9d/aspnetcore-runtime-6.0.22-osx-x64.tar.gz"; + sha512 = "c899865b0c3b409273fc9d4eec1e0d37406021acbc40d34aea8566fbd1cdce541bf0f1011a625ec0f61798ae334d244f72874943da790dc3d4b98611b140a954"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/a6bf9946-7321-452d-8dfb-120ea0911a6a/9d77b20bb6802d0e8a4cdeda58fddaee/aspnetcore-runtime-6.0.21-osx-arm64.tar.gz"; - sha512 = "bd1cf2252d61ab88e39d7cf6e7b57168363f599de7e2aafafa9f2373976c97653e83cbfff5d1708276b6503f8a21f60af8c8601835c4d6e0b603b3c4bb90902f"; + url = "https://download.visualstudio.microsoft.com/download/pr/4f2055fb-f5f2-4953-8341-4c56ae1f2893/52d66998e9326c7172d77a706e752861/aspnetcore-runtime-6.0.22-osx-arm64.tar.gz"; + sha512 = "c39e137d351125fefc078882311eb7de37ec8188444767a15b56d6f242bf5855e0e79cfb205a45c5083e86f039b5e7202727a1f8eaab92706e5c705ba782aafb"; }; }; }; runtime_6_0 = buildNetRuntime { - version = "6.0.21"; + version = "6.0.22"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/25fc0412-b2ff-4868-9920-c087b8a75c55/a95292a725fc37c909c4432c74ecdb43/dotnet-runtime-6.0.21-linux-x64.tar.gz"; - sha512 = "9b1573f7a42d6c918447b226fda4173b7db891a7290b51ce36cf1c1583f05643a3dda8a13780b5996caa2af36719a910377e71149f538a6fa30c624b8926e0cd"; + url = "https://download.visualstudio.microsoft.com/download/pr/f812da49-53de-4f59-93d2-742a61229149/35ff2eb90bf2583d21ad25146c291fe4/dotnet-runtime-6.0.22-linux-x64.tar.gz"; + sha512 = "c24ed83cd8299963203b3c964169666ed55acaa55e547672714e1f67e6459d8d6998802906a194fc59abcfd1504556267a839c116858ad34c56a2a105dc18d3d"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/934fe9da-efb0-47e4-8db2-4d2153c7fe0c/e382d2a3169ac6a8288f09c9077868c3/dotnet-runtime-6.0.21-linux-arm64.tar.gz"; - sha512 = "f34e1319ded1e1115ceb63eab16a4ac7096e36e3236f8117f61ec9f0e19dd50adb473e1213a1018abfaedc4da57519b85058e7b14187a33e0b91e79af4dabf63"; + url = "https://download.visualstudio.microsoft.com/download/pr/1cd7db66-695f-48d8-9e79-d61df9774345/4c363363f91445c542e8a997e3568ac4/dotnet-runtime-6.0.22-linux-arm64.tar.gz"; + sha512 = "bef57f12a8f9ad3c41767b85158f76c996f38db56bd4b8d800d9ccd107be3e1d47a3d2917a252bdd937e3c30547e431dfbc295c7ffce8eb4ab072ade426c53f4"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/af927c74-8c04-4aac-9597-3b56902a812a/47139a25bbc5e58b24fff42f6af0da7c/dotnet-runtime-6.0.21-osx-x64.tar.gz"; - sha512 = "f34a597910eccb84eec683f75f3ea8b6bdfc33a81388face050e33df679863465c905c0c99cdbfc54b3eb2b2a58733f7185a18234e562b1af5c925fa44dcb84c"; + url = "https://download.visualstudio.microsoft.com/download/pr/b1dc97bc-8a17-4211-831f-8dd2c01399ce/9972b4153b37a16773b13ea0dcd12268/dotnet-runtime-6.0.22-osx-x64.tar.gz"; + sha512 = "cea7d3de081cdc6053861398700211561e2c7990be2e8d982b007f485321c5b6255622069d4c4adf2c0ddaefbd2438625617b10294d7c05dcd36d283bae40567"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/4c3bd8fc-abdb-458d-a675-aac97584babb/35b8a258af87daac35bab7db1af0ff9b/dotnet-runtime-6.0.21-osx-arm64.tar.gz"; - sha512 = "e5a853ee04890e0466489fc46e3cfb8c665aeaacda8646b6958337cb16aeb0edbcf6d4131d31510b12852262fdb466f4d9352e0818a7ecb7e00e4e3a5e5755e1"; + url = "https://download.visualstudio.microsoft.com/download/pr/48cddb0a-2a08-4d83-b571-00772a73d05e/5489b285d12781a983a0f17f26973369/dotnet-runtime-6.0.22-osx-arm64.tar.gz"; + sha512 = "5038b29e5794271284d8316cbc454c8b1f1e54c30fd15305051008ff005a79ae22367bb2a50b03ffa4ce00228d1d82a3361d675a1a1a2c8ffaee3dffdd7c4eac"; }; }; }; sdk_6_0 = buildNetSdk { - version = "6.0.413"; + version = "6.0.414"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/8eed69b0-0f3a-4d43-a47d-37dd67ece54d/0f2a9e86ff24fbd7bbc129b2c18851fe/dotnet-sdk-6.0.413-linux-x64.tar.gz"; - sha512 = "ee0a77d54e6d4917be7310ff0abb3bad5525bfb4beb1db0c215e65f64eb46511f5f12d6c7ff465a1d4ab38577e6a1950fde479ee94839c50e627020328a702de"; + url = "https://download.visualstudio.microsoft.com/download/pr/d97d1625-d7ed-444c-a7e9-e7b469842960/d8b97220d0d79119e3026da2b956854e/dotnet-sdk-6.0.414-linux-x64.tar.gz"; + sha512 = "79bb0576df990bb1bdb2008756587fbf6068562887b67787f639fa51cf1a73d06a7272a244ef34de627dee4bb82377f91f49de9994cbaeb849412df4e711db40"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/82132239-803b-4800-971e-ded613cc280a/67d0025a0a54566657c3e6dfeb90253e/dotnet-sdk-6.0.413-linux-arm64.tar.gz"; - sha512 = "7f05a9774d79e694da5a6115d9916abf87a65e40bd6bdaa5dca1f705795436bc8e764242f7045207386a86732ef5519f60bdb516a3860e4860bca7ee91a21759"; + url = "https://download.visualstudio.microsoft.com/download/pr/a2afb4da-478b-4ffa-aeeb-a37a313d6fc8/0897a8456d42f306519de9a15b1e14ef/dotnet-sdk-6.0.414-linux-arm64.tar.gz"; + sha512 = "225367725fa2af00240654863c4dbe2370b95542d8c411a78017e37e13031a67049bcf570b94d9fdc9f61b1d13db7bf7ff9772bceccb70f43dd468302a47016c"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/398d17e1-bdee-419a-b50e-e0a1841c8a3c/2e8177e8c2c46af1f34094369f2219be/dotnet-sdk-6.0.413-osx-x64.tar.gz"; - sha512 = "605b28135dbc8c34f257ea1d10d02edb16569957e554ecc49c2a9fbb4200960b2fe21a06f2b770a9907fa915ebef0e6260704cc9e05a81af931f10dce7f46165"; + url = "https://download.visualstudio.microsoft.com/download/pr/25ec70da-5c05-4d55-9f1c-fe103417da1d/afcf8ecac02c9e8a927c128c9a72ec1f/dotnet-sdk-6.0.414-osx-x64.tar.gz"; + sha512 = "399c9fcef1ac858685f67d33079a49fd814d90926d47161680eda23820281acbd3b0a98fc7dffedeb9e2072f68880d74de3e4ff4d369046af157817dce61d5a1"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/6152c11b-e65d-4b60-8fc0-3c506a6199d2/c9f1ce3f1fc5bc6fa758fac505845232/dotnet-sdk-6.0.413-osx-arm64.tar.gz"; - sha512 = "e3a24cdcb80b2e283cd93ebb0af4ad891ecb5f2002d56b82a379d5d99b934a58f5ae60d07d21052360f525692fcf7bfde0c678c5d7f9908101fdd2096bea4458"; + url = "https://download.visualstudio.microsoft.com/download/pr/72bd5609-d0bd-4fb5-a563-6f426038a7d9/01507b650934aab36c340284d0819ba3/dotnet-sdk-6.0.414-osx-arm64.tar.gz"; + sha512 = "02c65256834ed5cb947089ae4f0b2f5ad0bda44fd3abd06d9f5003e2090017a384a569ef08fa7f4abfdb368345c34242569cb81980c0463529469e522e742042"; }; }; packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.21"; sha256 = "012bssj7v9g9zg0k3zj29h9221shy579xn2zzjpxniwlgrvjalkn"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.21"; sha256 = "0sq67slr4fqq0g9nv0bqbf8jv0fyjlf29c2xgqids67gq22k7cak"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "6.0.21"; sha256 = "01zs924jfnkz77y50r9pwx0mklvf67c6r765vy154d2ffrqj8dws"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "6.0.21"; sha256 = "1hcinwd9wz9lm4rg9lacic4810khmq8g53vfhn9fpm0cx7v0scqp"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.21"; sha256 = "109g3x9djfpjb9fkwyjn6rg151n7n01iyh3q8yd0wl178blwzs4b"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.21"; sha256 = "1f3jqi9zd913grq1bk53np7zdirjj0rhq7s4pip9bgdn7yihmc3g"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "6.0.21"; sha256 = "1x5v12gfssja2hlxv1wnv7s2cc28mrm06g4wsc2jgg01fgs58qi5"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "6.0.21"; sha256 = "0rafj2750hw54wj2y67cnq1d8ji419x3cc83i9x3py0i2bxfs20d"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.21"; sha256 = "1mrjv4rkgfwk0c30wsqdy259lqyrlzpymrl7i0gzsg89wvz77jid"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "6.0.21"; sha256 = "1yqxjnxlipm4camw59k1rizw11hfgz3rvxdi8saqk2vfc2rzh1pl"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.21"; sha256 = "054d7nmajgxq65ksv99k8swhr18yzwvb7gzkryg4n2msp6akgsbk"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "6.0.21"; sha256 = "0i6wf3kivl8lqrbq9lwnlwhnng2md415yg4wxnyyqz4a2mrj38qa"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.21"; sha256 = "0bc5zf1zyzi9cdrnpcr9li658pj2lv9b7fbcfavrmp22jlk81z1c"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.21"; sha256 = "1p1jgcxs4231fi5vzdibrp2vnxxnzh56f3my9fp8kcn7zp2pzp5n"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.21"; sha256 = "0c3xm07zyglb38g3kqfza92zkpjsg7k7mxr3hq3jwxbfzspxxv6f"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "6.0.21"; sha256 = "09vnwfwwwa0agb2i88ya8bdwlryjz5p4jrpc7qn0dx3dwzbpkxq2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "6.0.21"; sha256 = "17rbp1hb1yl3vw27yqa5zbrfmgnxd2p49hg6qswwc4rlb3zfrjkl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.21"; sha256 = "1mqkdv56qycp1l7bza9rvzaghvd8rm3z863s6w73i21f3y0xnixa"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.21"; sha256 = "0grfr8v5j5g77smqpysqxr6glrw3d13gqj241pynzih5j6v0rz51"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "6.0.21"; sha256 = "0ssq95ymx7rg4b85hrxb1vfkdq8c41f464w029f1k9c21dd06ra7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "6.0.21"; sha256 = "1f7n63argwj3vw1y36pb8nj93ami8j1ff4ibp7h19555j96dnpwp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.21"; sha256 = "1qr5pkjgy1z4asa2mmkc0fzycmg4a60zy5ib3f3hpdq7416k838q"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "6.0.21"; sha256 = "18dsq2n8sxwxmg3rblj5wgm6c3cvdmdll31lbwknbwjdp20c543h"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.21"; sha256 = "1q7na94z30hd3xam802izb3mi9nl5l6s4akah5a62jqjxrjb76l4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.21"; sha256 = "1widhp61a7qxnjgjqavqi0d7z36drjkvi2g0r39y2sbk0a9hwsml"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "6.0.21"; sha256 = "1cwq84i6xd4h2ddl4yjzd6pbf3cm3g2kids0xkgjcafx3qjiqg4b"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "6.0.21"; sha256 = "0pgc2rzsr1ag8hk1g75w1sm3p0qabr7fddckfsfk4sk54gwdr14k"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.21"; sha256 = "13f65051h35hbvrz2g26vsvi9c1fbrc1hkjsxvx2ys7s1qddddqw"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.21"; sha256 = "0y9dwb9fpycff0jh3c7gqmz9vrbg52p1bs4d437b73sfl7yj6s0x"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "6.0.21"; sha256 = "1hww6k853nk8i620d9gmldbaj9ylawwqhzcjfmzpkmpj1hij80jd"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "6.0.21"; sha256 = "0ihsszn9s3dsk31rr4qvh3kvlf3dwrzcb0s91dblcgi40gyczqb3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.21"; sha256 = "1vj58wmhy6rib7y87qg44brvaqqmgnhy69w1icjq2dw0xki5gkcr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "6.0.21"; sha256 = "1dk61kz88mhss6x83za34xm0q5nrfv4pdp0mvjqsf448g7c3ndiy"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "6.0.21"; sha256 = "0rfa7lrhkslws7j31h51bii9y0bghiq8ar6drljyi45hzmp046rd"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "6.0.21"; sha256 = "1pq884vc9hs34giwbj2awzbc3z168hv201871ivbj8scaxnbga5h"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.21"; sha256 = "0cm5h80dix7ca16bhxsnm63jvcxi52iy76v0dlzbnpr8f85i4368"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "6.0.21"; sha256 = "0i1qgjwk7ghl1ajdyynl334ncv51nr774fk9xdsylz0qid7nk3qq"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.21"; sha256 = "1x75lhjwpcvh1qrfkzv20blr8kvjpjs79zwn7i39m4dns39bfqyh"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.21"; sha256 = "1a6r36g6sgx64faahgysm21za6hjnk62bp445xb8jxd35vbzqk2s"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.21"; sha256 = "160hyyawl7zz5kwlzwhk6lh5hsnjzsx4h1vkiixg201y24dknim0"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.21"; sha256 = "07b1f5iafhbgmvyxbfbax14wwyyrph89wfbq5bigsibg0j2275nk"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.21"; sha256 = "1585phixq77p44w7kiq3ynf8shfimkgh0raq6shpbp3pv6ayw2ji"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.21"; sha256 = "1ql6kbnav8g9gfc6pv347pcxf853n3q70r2w6l889zizidgvhwpn"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.21"; sha256 = "0zai12wv98sxm51axg474c393p8z22dml8pxl9680hf8z0idi1zh"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.21"; sha256 = "1lf3g9m60kzrysrsbbys9nwf5vy089lkdrpaix4wb8v7qz35z7bf"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.21"; sha256 = "0k9xy7hz3rxcgg0n4jzgbsg7gwah2xz48i2zzy8msqffp46d7gja"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.21"; sha256 = "0bci8z2p4akkf74cyd9x7x2kbyjxr3cik3yyajzc6v6p3pda2cmy"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.21"; sha256 = "1s1cpfj86yl7y7009zvpyjxadyji4pvbjvfmzi1abgyqrq570gba"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.21"; sha256 = "113jyq5ag1qsdxxzz2wk8frnzhybycmqzd945i5lz63hpsm64vmr"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.21"; sha256 = "1jrwjddqb0sqz3n1lsv3inx5119dcjkj4hsarbzj32l81zi6id85"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.21"; sha256 = "13df176z04p6byf0msjyfw9rwmvicbnidrznvdg9njvdni3yxrk2"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.21"; sha256 = "0nyxxqzsgfp3p8mcw258big603fmkqn8xxwgngz9ywbcz2vgm57w"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.21"; sha256 = "0nf3wm66hr4f35dbfvg4qy5wbvc15maiw1dicwzwj4p6w2yxl5hx"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.21"; sha256 = "1rqsms2wm64cwcvc644z3vrs0jfb0gf1my781mshp7cp95z466z9"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.21"; sha256 = "1rga4gy7yna1rdkvbc07hm107kvmygkpwrdbrwbqlw1z4rvg8qs5"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.21"; sha256 = "08msw4lbklmz0yy749fljmiwh3na5zkmjgihcyg19wi8b5rcqi4c"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.21"; sha256 = "1vbz73aj4f9a4if9mckj7rjqfqk0bgwnwj77vlx6rshcc8fsngwp"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.21"; sha256 = "0134c4xzbh3g5ags2ahxrjkwmicmybvyjnl18y06f77r4bnh81gp"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.21"; sha256 = "0ck919lw68xh4x6klqzsc8hshn65ykb9nd4jpk17r7crmxj8jk4n"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.21"; sha256 = "0rz5rn84irzf2k03dcp5qghhmgi9sji6a5l9l2hdjjr8j8pq9dw4"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.21"; sha256 = "1vv0paimjpc3bacv5cz39y4gd5cpc9k9863iil8crmm2rkiy611i"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.21"; sha256 = "1x42nrh4bjf7q2m193dziks543g72cyf4gfylhsyd397kp940sh5"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.21"; sha256 = "0sqxzfirdmaj2r6nc1yc83qb1sbgsl1r0qcjidrwi7dlc5zamrvd"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.21"; sha256 = "0jffm6yxn78l14x7j53hl9729s9vyyv604w8zdk9npdf8sgaxiwm"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.21"; sha256 = "14hbzh401vmfsngvnmc4c1g8hv41h0za0kh8g6ya3lsfylmzdr06"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.21"; sha256 = "120qv0z7jhiplabsqal1ldriillqbbyk0qfrc51yrfp5p7ycc8sl"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.21"; sha256 = "066fn8ncybkfpfssrr0pg0adhrskknn5agqf3bd0fdhwg45k3gh7"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.21"; sha256 = "1bsax9akfrxkj7nyx20hnw98028y3fbawq9k728ldpf8znsk3j0a"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.21"; sha256 = "0pl4yskax24y75mfd6rkwa9cahyv0a1h1836yr7nb3dks6a9npf0"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.21"; sha256 = "1dq1dq27fi4jacrq86xdwfwx49y7mgxxaaqz00na3afaaya2c2xv"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.21"; sha256 = "1k5ajk31rr9bgy9rrlj67czlqpbj5n5iycmf1hvg7knczaraihss"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.21"; sha256 = "1qa1hhbmlb4brnbrx0g3ap9b7ss1f9ddmigjsxgh9z20i0y8pybz"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.21"; sha256 = "01cfpcbds831w51k9ajwbbca6nj05f5cgqswjv5h5hiz85w23yc7"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "6.0.21"; sha256 = "08yx4m92fd9sxmfx4r2i1qma9m5jf7rvf35kqv1g6r4pplvm3pzz"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "6.0.21"; sha256 = "0kgh9wnx4h6vv9jnbpyzfn8ra2vrzcrza6h44vy4qxbcaavfrqgw"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.21"; sha256 = "05cp30bkyfxiqfx6v1nr8rc08jc9br22n0klf1y1xxvnb5xh9c49"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.21"; sha256 = "01gcn5dh86rjybl1g972id3p5zwiisb6ba9w6bmzybh5pbp2a3sm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "6.0.21"; sha256 = "0yhx9gdilrlpzzm5s97y248kr3qw26nmc4b9qzqix1diyln52z2i"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "6.0.21"; sha256 = "1krvn76iq6y89k8vyxvrvb1x098j4bmf12va32hn9iidkyr656zj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.21"; sha256 = "122nl7llv198m8fih940icjkapk8jxd32ih19cck9cb0bkk0zcqc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "6.0.21"; sha256 = "0agjdrz2qy3qmc6r23bnqa4k8fj1kffzb7bibw7yhbz3xvvyxd9k"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.21"; sha256 = "11x18rqwis4459mqgdqhwzmqjbj0h87dpypn6cnxqp38x683zcwv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.21"; sha256 = "113p8mql4lfz9cdbfhn1ahd53kwc3d240m1l3z9nlmlbajz9y9xa"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "6.0.21"; sha256 = "1b52v5rn5i989vlg92r3magxsq6svmvap409g5f9yks3v8cwndp9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "6.0.21"; sha256 = "1mhrrdc6vvvv7qq1qlkfx6w34zzlxv77jlyz5qznhpdklfhdh9f8"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "6.0.21"; sha256 = "0r19id7qy44lm4xlxi5ycn0msxpab5wga94iy5s3sch6vh66r53z"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "6.0.21"; sha256 = "1hwf4scm9s0ml477r4iilw8z7q69g87d15hq7v75dglpacikm4mp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "6.0.21"; sha256 = "1mf7axx2qw0g9sgiqy302287jz6ir9lxw14qd2hafqy83hryzl81"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "6.0.21"; sha256 = "11krayn5c82yicw2xkl2y0yhmjvdi5zc6383lsiv6zr1imk0iy6c"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "6.0.21"; sha256 = "1ljzi3vrx0lbhvp02d1fm3hws06phqgrsav1yg6hwk9abp2q44p6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "6.0.21"; sha256 = "11vjprx73v65khddghqh7r5x5zij04w9yjr9njhhi6x3zb42q0cd"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.21"; sha256 = "1rcsk1j7n1r5i57gr8q60wbc9wdkz09y2w1dl02pi7w5pf8a3j1g"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.21"; sha256 = "06fhwpf5hrz8w4fjsb8hqzlpmc24jmggvp7fk10vvp4gy4jqc7ja"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.21"; sha256 = "1xa6c30whip8m40m208y2za9b854fhwgl9jhzigny431f15nsf56"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.21"; sha256 = "19zmawr6zihk6al746gmrw4sgjf5hkl3n5baaj0h3h177vprh7yx"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.21"; sha256 = "1pxycv7ssawlqsh192qsg40z3q3c1a4jqpwillng3kjq54j0kqac"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.21"; sha256 = "1swcj7v4ryk6sk6nil7g4nzd1zfss470ic7cgxkwpzlnb720rbiw"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.21"; sha256 = "12chbi12vnvsfw2yrm4pj8hnba66cq6y83fwzjxpidca4disl34v"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.21"; sha256 = "0q36jbmhwrpvrnbpckq7qaipwg82ic9gb02xgjizh18cpnr9xkgv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "6.0.21"; sha256 = "0j1f59qa7bc5lnrya39qbwsb9q9w6rvbhlzkjyal8k6cjdvlcwhy"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "6.0.21"; sha256 = "1aq51kbaa6hz21qy0hxflqrdkp8fdj4x9xwqnrl9vg7zmqzjd9yk"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "6.0.21"; sha256 = "0za904fcz2ckhnbqabavd6gm7pifl7ap9jzxakk11f9ym98d8ls1"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "6.0.21"; sha256 = "0y25m7mc0nnwik9f30i9iwhw5rdhaacamiy51w15jz6dilm7m4m3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "6.0.21"; sha256 = "0qanqrbrpzjippga0awcp815052z2al1nrgf7sa2f91325b2yjx6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "6.0.21"; sha256 = "1ivymplxwvb78mc2m1v14p4gj2l8lpbrk90j1aq5ipqkikh7r0bc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "6.0.21"; sha256 = "1g4mf424mw3rww3rmybmzap1p9bhi0anmz6khd8ynprigshchccp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "6.0.21"; sha256 = "1nv9ynkblg1d77gplnpvyvbnym2jc9l7rdfgi24hwmw5w9fxdv99"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.22"; sha256 = "0naka2szh9yxbqh99b4hswmxdspknckxm1dc7y56b8685gpwj202"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.22"; sha256 = "1xvqqc7bzj764g3scp0saqxlfiv866crgi8chz57vhjp9sgd61jw"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "6.0.22"; sha256 = "0nwnrchpajsllg2gxnxgyxgdbdamsnvpav1yv746bdjh0anb4yr0"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "6.0.22"; sha256 = "0ss0avj940d47pykh7sqsks6g15ny0qwp67kcbzb9nc5h6gi4p18"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.22"; sha256 = "1gcv99y295fnhy12fyx8wqvbhbj6mz8p5bm66ppwdxb3zykjg2l8"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.22"; sha256 = "026r38a7by7wdfd3virjdaah3y2sjjmnabgf5l25vdnwpwc7c31d"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "6.0.22"; sha256 = "1bfff1342735kp4d9rhmwf8jflj40dvpy1gb3gvd7dri8vqhk3fg"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "6.0.22"; sha256 = "1d58anf2ws7gs52fyjj3i0fr62dva9va605vswl95d4w8av5bgnj"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.22"; sha256 = "0ygdqsd312kqpykwb0k2942n45q1w3yn1nia6m1ahf7b74926qb5"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "6.0.22"; sha256 = "075z4rn6nx5jqgxksdcr743mrbd6lw8hvsxkbmyg5ikqxfwqa1ny"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.22"; sha256 = "0fqpl1fr213b4fb3c6xw3fy6669yxqcp1bzcnayw80yrskw8lpxs"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "6.0.22"; sha256 = "04xvsm3kjh04d0cbw524f021kliylgi2ghcm7w0bm38p29022jh0"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.22"; sha256 = "1ib0x1w33wqy7lgzjf14dvgx981xpjffjqd800d7wgxisgmakrmr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.22"; sha256 = "10dah19xqs4qkvirjj921hrkyrkv3a6gis562f4grqggmr6kb9a4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.22"; sha256 = "0gri1gqznm5c8fsb6spqb3j88a3b0br0iy50y66fh4hz9wc4fwzm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "6.0.22"; sha256 = "04b1p8whw3jqxdxck1z5m5zpa56jfqrzspa7ahaq9xqqfacsfnzx"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "6.0.22"; sha256 = "170d8md31m3cfxwbanpv2amr5cmd1kkl9wl2w0jz9ggiwykc81nz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.22"; sha256 = "0k1i74wn6j7nq0bd8m6jrpl65wda6qc9pglppvz4ybk0n2ab1rbi"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.22"; sha256 = "038bjwk201p2kzs3jflrkhlnszf7cwalafq0nvs2v8bp7jlnx5ib"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "6.0.22"; sha256 = "0pvab3a6h8cv1qjwkl90n44jh9z3aajgwq5dyq11hckxq5iga09n"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "6.0.22"; sha256 = "0h1jr5lacsxqw4dx4fclxfbn711vvdkj7j7l2wq2iqhfkdj6r7d7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.22"; sha256 = "1bjy3zmrmaq97xp0f3nzs3ax330ji632avrfpg8xz4vc5p8s1xpc"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "6.0.22"; sha256 = "1g190wngdz8758knb5ckgzip6hw6a72cjwiqgszmyh6hfisi553r"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.22"; sha256 = "0px26kil779qjcram05smv4lq600l35r0klwh4qrwlrjq4pj2250"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.22"; sha256 = "01gbl9dgky4h7ijxryz3527l39v23lkcvk4fs4w91ra4pris2n8p"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "6.0.22"; sha256 = "0qplswzqx17xa649mpr3cvlap926hlylvk1hh77cpqyrx5wz7855"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "6.0.22"; sha256 = "03nbcav8if0yjkxfkkk5sknc0zdl9nk3lhd847qa602dsigabaz9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.22"; sha256 = "09gfqdxbh36bjx20fw9k94b9qa9bwffhrq0ldwn834mx31bgrfs8"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.22"; sha256 = "1sq1ygsrpv2sl85wrs8382wgkjic0zylaj1y8kcvhczcmkpk3wr5"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "6.0.22"; sha256 = "0svzrwz3zi40xab1v1fd1rk2vcmxj1y6a4q6ap5hx0y7pck3xlcr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "6.0.22"; sha256 = "0596z83qqgrjvih2sqzjhm2i6ww8s3c4dhjfjl35d5a676j44n31"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.22"; sha256 = "1nn254xv1hi5c4rg38fbfkln3031vv545lv9f4df31i8c1yfzz24"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "6.0.22"; sha256 = "06hswqx0p4gdvb4r1ff77kwcmwsswhc0h79dffnmfdrll0a10yca"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "6.0.22"; sha256 = "0rii1mcsrbz6j0mcnbak51rm7afbxhilkvlfgxqvipgdg0xq0nyv"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "6.0.22"; sha256 = "15k8187hcs54l1wjh5qd3w48sjcpad0z2dn2ng92kmay74jl1yjy"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.22"; sha256 = "0nwcbkmxpjqafpbi7i1lrw3k235jn8a3g5aimnvppfi2plpys8f0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "6.0.22"; sha256 = "11cgpvhrq80r2fra1fqpcarp02nfn69v27av4svmglkv0gqc0fvw"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.22"; sha256 = "1x37zyxhv830480kdn96k1w6lh2yby31dpdh6w9yj475fh5na3dn"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.22"; sha256 = "0l7whkm7lidyq2qdbrrvwi3qjk19w2712g9ks1mr4zgqcc29cipx"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.22"; sha256 = "1sj3a6g1l7g1w4c7wrxnswqz1n7kk7f0m63zx2jmqhvx5igpnnvw"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.22"; sha256 = "1c25fmcb0x2alhnhlfclh5vk4b2rrd675vm21wh4jyjv56vls6js"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.22"; sha256 = "04k53x0vc7zwlzxc8n5qg12wxg2r7nppp19sp9q4qfampyr92r2z"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.22"; sha256 = "0pgjn0mkgwrwam03zwyi0f9vz7msnnblw2wxg67wwij1azmjnb20"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.22"; sha256 = "0p0xga68ms5m4a0f89jgja8r79ps03d3ka4m9ni9z7yzhq83fq6n"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.22"; sha256 = "17hr4fpl6a8nq3qphhg7m8z5ad0l5az4whh9dk28n0yis76dy5fn"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.22"; sha256 = "0qvqnz9b4cljffmms8yms9rijyfc18igbvg5l0qa4y50416r6i1i"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.22"; sha256 = "1m56r3admq89lwp4cxsinzcrr8hdl6rr87vj439p9xkpc8yw83a2"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.22"; sha256 = "0zwl7c2vjwwifqb9rfl5s3xfffhhlzffh12zjgd0lzhx7y6fn8iw"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.22"; sha256 = "14h04a5skmdlqd2yr00h3ybgw9mnvyv9zlpg7vij7qgdvq4zz8p9"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.22"; sha256 = "1gw9wmg6nqgahgk04g04rfg3v9d8rs4qfhiz6g4n4h6v8lxwirjw"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.22"; sha256 = "12wscn8jkpbgcj1kwwipyin0b61i99r0z6pwg5wrgrirvv0a9jnh"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.22"; sha256 = "1pl1g7s58ay6dryc1mk1haw3g2ywv1iakqv9wazk9cd8d5ls1mpp"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.22"; sha256 = "0inrily1l901723j2ak983i79vl8ppb01khrpwvfnibcycj8l2d5"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.22"; sha256 = "0vawg1744bxbjxcb5jaqkxcz59bgpg5c231qckjiza2ycrw5nfhk"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.22"; sha256 = "1xywy4lipml6ifi7w8aghnrbp8br421iqjfni8pr25d9fri83rk9"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.22"; sha256 = "0smyxwpihifgbyx8kpqbynp9az0m86k1s1ikdbinahglhj9bxca6"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.22"; sha256 = "1ixmmhyq37s8v76fsj35ffpgvab5lzh9wf4z3x0kkp9v561knh05"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.22"; sha256 = "172wq4gdf64ri5qs9s33wyca5rg2mm9vbfzljf6dszy47847n5yd"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.22"; sha256 = "0iginfaq7smfipidp8vr2jjw0i4xq8fq8km1ki3z6gkxp8p2w3i8"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.22"; sha256 = "1mb10yml3spgamwllqsxx0n7gimj8nac0lc7cz5yq56fipp4i14g"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.22"; sha256 = "1bj7rkqiiy1wrfyiq47h671n5igphzd7xrpda7myzh0xcsvqhxab"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.22"; sha256 = "10yxzymgg8cxhymqhrcr9vqg102fyvh5dc2zrdaqxsf64hv469g6"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.22"; sha256 = "0yv8jv3gbsji81pn72jx6is60gy4v4f657kbp4kk7f1q78vx1046"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.22"; sha256 = "1jsnywr0vd4lkwi6gr6s06pv2bl8dsjhj4q6vxk276i6bfxss5jd"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.22"; sha256 = "02g350h6537fnv9zsw6i4anbaq5f4mrfsqlrsindxbfmqapnbm5w"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.22"; sha256 = "0ipl5zjcmlzm0ia00hkqgzc20f6k7bsk68rr1yc3rzzmp6gcjgml"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.22"; sha256 = "19dqa1s2gz2rfbqsqsnzxxybbkd2y412ck19y06vzbjwc3r5v358"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.22"; sha256 = "1mn6zmgc0n7lbc6vxvnyxf5znvdzsqhvkyfhpfga67npj2i8w7fc"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.22"; sha256 = "0razqiq1hhzrf46m71vx8n8gvraavndig5119g8wh7rlxhrrdwk0"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.22"; sha256 = "14v8vrfx3ncclki3nfhg83p01d7abwqsfmgqyjwka2slhjrapgpn"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.22"; sha256 = "1pqdmbcs3scxa1xqw4sa7y9dky9nd5z4vzzx5frjxx3255f8zcm9"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.22"; sha256 = "0yabmsv8lnrvsylxvs96vswwky4slp3h9c0gn7x0agpwh7wzhwg5"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.22"; sha256 = "18zhyrldffv5scvwvc6v9p0dg606d204m1rdijr2sx1g4sg3gplg"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "6.0.22"; sha256 = "032zmbhry64pzk9vlmgk8pc1bwz0jcx8dnbz1w34wp8wwx8f0cdz"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "6.0.22"; sha256 = "0gcfaki5mf40x3yw97dci8dwlsyhjvjy0ysbid1g80ag9mkjqh4b"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.22"; sha256 = "08057y5d4sjk77f24lnsiv8dbn2axgz8mp5sfzvmaqzzig3w3j3v"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.22"; sha256 = "1zx164azcsrss62m8dk8g8nkl9kq8z7n1mn756jskdrdmdslqxjz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "6.0.22"; sha256 = "0i9gw5d7gqjbir7ip9904zj6n3sr81xv8lf290xbr163l2f181iq"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "6.0.22"; sha256 = "1si0dmcjdwdm4z6x412hvyq35jps0rv1y483s83wkv22b0j7l3in"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.22"; sha256 = "0166gwarhhnary19lf80ff33bkx00mkm24f17bc8j6v7g3a7zvq6"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "6.0.22"; sha256 = "0g2sc6359k3z3f6h2pqg8np2cbk57gpzbyqyn5ixlv34gv3pfhfc"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.22"; sha256 = "1x7wclv93q8wp7rip5nwnsxbqcami92yilvzbp0yn42ddkw177ds"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.22"; sha256 = "0km8184kma8kgz7iyl3j6apj1n7vskzdhzmq3myy3y36ysqrb4wf"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "6.0.22"; sha256 = "0nhd7q0piy6frfv7fx00lf7hdd0l6mpj3bb5w2c1ijfqlcny88ww"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "6.0.22"; sha256 = "0vhpqbywilqkyyvlra6sq94vc5p76da962g550lmw18yfkzk5i1q"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "6.0.22"; sha256 = "05yyssk0vin5s7r5cs43il19ki424ikpcifw1nrglw5ar700pw50"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "6.0.22"; sha256 = "09if60d7175yaraf1ljg47lcxg3wpnm3yd33a68g60zd3qi80har"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "6.0.22"; sha256 = "10bq9y4vmw09a5apyzqa8zgn8r1i0wysrqaj0rw7bjjl3iz4vifv"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "6.0.22"; sha256 = "1l56sx3rjmdq8i5cwdzd90vkbx5nyzbbc7rzckmbw7lbi92ys8lc"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "6.0.22"; sha256 = "0gqv5n9kb8avfn9hqn50ybm12hxxrz35gvvfrppdwdqain13ypca"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "6.0.22"; sha256 = "04kkaxkqxw67cn58h46li5kxv0axkdh9f2mr22n4llysbfamzcd1"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.22"; sha256 = "10rlwyacci7l8j028n486a1icbsx4lvfq92k88a4h75ys5iy9r63"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.22"; sha256 = "1n313j4lrdsr7yw8r0kxcd1137w4kqmsypjjadcdcq3wm1c8207p"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.22"; sha256 = "126sn9p98shb8pbf4wd5vf94fl2jbmvshdkdmq4knyn8n6bg3kvf"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.22"; sha256 = "1wav33bqfz7237cr55x3l27f06ybdrm9zl2dnapjp79ipp73vqj7"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.22"; sha256 = "07p1gccdwhq7rsvlniwvy8ja4dbxisv4822yawffkwwmpnh94byj"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.22"; sha256 = "09q14pyk13ki8wc29wy87adq393g35aanfsp4bdag8gb68qlq847"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.22"; sha256 = "0hvjnnviv8rc3hgw9ypzvx9b19riyb0kyq34g9sg2y3bamhahd86"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.22"; sha256 = "1zjdfjp161n48s8x4jx1f957j49x4g10f61p2b721cc616wfpvik"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "6.0.22"; sha256 = "1qcv9286f4c035naqfjmscqn11hid1ak5qw4lv51i0qijd6bkqad"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "6.0.22"; sha256 = "141zgcsw9v8pyf0cgg6g433ba1xg87343gpcy9mpnj2jpczhh0cr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "6.0.22"; sha256 = "0cm4bv0izfyh6ynr9zdjy2gn6c6vsqfrc9b0pjmadgf07mw9sns8"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "6.0.22"; sha256 = "1jci3jmzxjqi0h2fwmxqh8vss3cnfw0nv6bw7s13a4jzx1127cxi"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "6.0.22"; sha256 = "1yx5y4s9ihdgk7pmc2il516w790d6rkklsqlxj5w4yy9vmj16mk6"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "6.0.22"; sha256 = "19jrak7w0dbyn2jrvxqzjizafglw1w6v84qfqywbbqkhplr6km3a"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "6.0.22"; sha256 = "0pdzn9s2qdw8ngk2ygnj6xil544h801xhxi0lz0d80dws2w8440f"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "6.0.22"; sha256 = "1savfrhbcalhdfkc3z6008d7rx0hzr4ry3nvcw7kchx6mxf2pkxf"; }) ]; }; } diff --git a/pkgs/development/compilers/dotnet/versions/7.0.nix b/pkgs/development/compilers/dotnet/versions/7.0.nix index 0e839f606ea62..a9ab7b4a6cb79 100644 --- a/pkgs/development/compilers/dotnet/versions/7.0.nix +++ b/pkgs/development/compilers/dotnet/versions/7.0.nix @@ -3,184 +3,184 @@ # v7.0 (active) { aspnetcore_7_0 = buildAspNetCore { - version = "7.0.10"; + version = "7.0.11"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/08af0433-9ec3-4604-9d1c-85e3922a4524/396b340b4ee38765d7462e2fc61a5e3c/aspnetcore-runtime-7.0.10-linux-x64.tar.gz"; - sha512 = "580fdda88824bde6b2d5c09eb009fef64e89705a8aa096dc71338a549969842dff8d9f6d4bb4651e60b38e44ed0910ec18982a062b471ace18c2e22348de11ab"; + url = "https://download.visualstudio.microsoft.com/download/pr/dc2c0a53-85a8-4fda-a283-fa28adb5fbe2/8ccade5bc400a5bb40cd9240f003b45c/aspnetcore-runtime-7.0.11-linux-x64.tar.gz"; + sha512 = "a5691a53a1be91751bea5c1f6faa2e93d19f5be61dc5a4953a6d6ce33359f78126873022fa1a25e2694dd85ef9671b566bf8b6c5f399f1eb017ae26833867019"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/712946ec-0b43-436c-abfb-3abab81f6cad/c83ba8df4dab39957ffa5e93604f0b32/aspnetcore-runtime-7.0.10-linux-arm64.tar.gz"; - sha512 = "83d3fc657328f127ea8881844dda2f91fa03f2157f5c76acda64cd091e430fa7d812b3984b803ac624b171f18a5eab3c7b5791a02baa68eddcaf7498709f982d"; + url = "https://download.visualstudio.microsoft.com/download/pr/cd1c8c35-921d-44dd-8296-f76126a73e86/5c7c20fb1df66c7b1853f77ffe858d1c/aspnetcore-runtime-7.0.11-linux-arm64.tar.gz"; + sha512 = "e8864d261487d3077b0637e710d9348209dd7fe19a0cdd60edde2e43d238f1e534b9485282230c8b1cea0faf4bff1887f07dc919dbeb9ea7f97d4b26b9c7aa91"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/d10c9d59-a624-4175-9069-4a13fcf9a1c4/427bb8da02c7907bc2f3115144c1515f/aspnetcore-runtime-7.0.10-osx-x64.tar.gz"; - sha512 = "1f1fbfb0851d62538aa6feacb5c38c14289e7b2d19be62c0e240da6d3c9336f3223eaa2f3e64559e6d8f599a33d9f8dd3d138998386ee9532854139b3275812a"; + url = "https://download.visualstudio.microsoft.com/download/pr/6df3136e-ba50-43e8-a68f-93e347c63693/e1b7ad4c0009723ab3a83db65969d0b7/aspnetcore-runtime-7.0.11-osx-x64.tar.gz"; + sha512 = "c0925ba2ff686438a40e5b61b660dca48103b37ad42f30828a1bf20ac2f9750a0f2643beb533eef877519f56757f3d4c50ccc5c1c172527883981b0d7974677f"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/516a672c-9216-4592-be66-a628a166b583/fec0aa593bc700a5f5d3860abf1a4af8/aspnetcore-runtime-7.0.10-osx-arm64.tar.gz"; - sha512 = "95c987c38b80b1083016ff360c957ac4cbc2aad406f87095f7350704de8b9a23ae060e551166c396cadeb54f39f176d5a1bbf77704edaf0c0a308d87ca29b838"; + url = "https://download.visualstudio.microsoft.com/download/pr/f7ea90e7-5d92-44d8-9b55-211182814710/af6bbc87d7505be5d4b22f130076a65d/aspnetcore-runtime-7.0.11-osx-arm64.tar.gz"; + sha512 = "799460d18543a4e3fcb0b0ed824bbc248afd9374bf74142d12a65d422aa8eb939914c870f3d575ad121d035c19adcf4423815a34e24969b9eda15a2048de8b68"; }; }; }; runtime_7_0 = buildNetRuntime { - version = "7.0.10"; + version = "7.0.11"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/e9cd1834-1370-4458-98f6-d0d035dcd41e/6d2ca4b900398e717287ad0e75eb9a3e/dotnet-runtime-7.0.10-linux-x64.tar.gz"; - sha512 = "f15b6bf0ef0ce48901880bd89a5fa4b3ae6f6614ab416b23451567844448f2510cf5beeeef6c2ac33400ea013cda7b6d2a4477e7aa0f36461b94741161424c3e"; + url = "https://download.visualstudio.microsoft.com/download/pr/948e3f45-a2c8-4d34-954e-a360851b7ff2/aad7d4a9b73242625bc33b0e9c124478/dotnet-runtime-7.0.11-linux-x64.tar.gz"; + sha512 = "110db17f1bc9e5577488e7f5425c6c639851af68c8d7dd17b0616469755c27d3c8a78ab01aaab13ed4849c676230bfeef9113f1dc4cda34c5be7aa1d199e7d57"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/023e4544-e6f6-4d2a-ab91-ff63eff97db5/26c02c09fe3a5d57248caa0a0d9e8254/dotnet-runtime-7.0.10-linux-arm64.tar.gz"; - sha512 = "e90b68b272d5db7cf8665bf052fb0300d50a69818d70675442dc891654d140f7f84527b849860589bf152de1d00aa55dc15ee32f5678d46ea0069210fd002b03"; + url = "https://download.visualstudio.microsoft.com/download/pr/6079be92-f70b-447f-bdbb-ee85e5b04d14/249738ad78341a40f9765599281579da/dotnet-runtime-7.0.11-linux-arm64.tar.gz"; + sha512 = "567b39c4b8ff278349fa76522351e6f399eadd9a86189150a312fa7a4d365c60ccad8a06564ff4b8acaaeb907222d6b154b711e324989f7f6c234dc5a85ea0da"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/b6caa3ca-cb18-4891-b188-aa661741ec01/5df34b59b10e79714bac97cfdd6e86db/dotnet-runtime-7.0.10-osx-x64.tar.gz"; - sha512 = "6b992fbbc673d5005f2412839c632f772f6576c9ff95d44afaca478a79597601b306e1f1c496836549474a2c35238943ba27eef5749b1a2bbdd8f36553ad145d"; + url = "https://download.visualstudio.microsoft.com/download/pr/ffaab50c-bc8e-4b4a-a1e1-7bd859a3e7dc/5e6a62a33021d44df7807e3fcca4d111/dotnet-runtime-7.0.11-osx-x64.tar.gz"; + sha512 = "5e714641c1693abe2662ee71f6aae7ddb35a8a3869939f024f63666d7e90fdf2e5e25af5d7e53c81fab293706640c391ce6be4f737df3fe2a0d769bdf443178c"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/fd4660d9-e747-42b7-abe9-eaedff0356ca/8a6f41f5ee23ed510c442d1350bda8d3/dotnet-runtime-7.0.10-osx-arm64.tar.gz"; - sha512 = "f578e00d5bd144c51e5d71adbd8e0ecc97f7e8ea06263c585785b41ffbb590537f5a18b63a78e45e90e798cd66fa45285059226b1904f4c2d4e2ea40c2c71bbd"; + url = "https://download.visualstudio.microsoft.com/download/pr/6120c903-2058-4ea6-a62a-6b246750c2c9/28d586c9ecacc7fe95a65f98dc6acd6d/dotnet-runtime-7.0.11-osx-arm64.tar.gz"; + sha512 = "546ec5050ebc70ed17252d401cc43c9bd628fbaa40a6a764a4ca567fb37d0db14a6c0e28a190bdd74254e886aff9fed542830224f0dbaea32792235386648ea8"; }; }; }; sdk_7_0 = buildNetSdk { - version = "7.0.400"; + version = "7.0.401"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/dbfe6cc7-dd82-4cec-b267-31ed988b1652/c60ab4793c3714be878abcb9aa834b63/dotnet-sdk-7.0.400-linux-x64.tar.gz"; - sha512 = "4cfeedb8e99ffd423da7a99159ee3f31535fd142711941b8206542acb6be26638fbd9a184a5d904084ffdbd8362c83b6b2acf9d193b2cd38bf7f061443439e3c"; + url = "https://download.visualstudio.microsoft.com/download/pr/61f29db0-10a5-4816-8fd8-ca2f71beaea3/e15fb7288eb5bc0053b91ea7b0bfd580/dotnet-sdk-7.0.401-linux-x64.tar.gz"; + sha512 = "2544f58c7409b1fd8fe2c7f600f6d2b6a1929318071f16789bd6abf6deea00bd496dd6ba7f2573bbf17c891c4f56a372a073e57712acfd3e80ea3eb1b3f9c3d0"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/16b0b1af-6eab-4f9e-b9a4-9b29f6a1d681/4624e54b61cae05b1025211482f9c5e9/dotnet-sdk-7.0.400-linux-arm64.tar.gz"; - sha512 = "474879abcf40d4a06d54e02997a3fb93dd10c8d5f0dfd5acbf7e1a6f493a6d3421e426431d512b482c62cda92d7cda4eddd8bab80f923d0d2da583edaa8905e8"; + url = "https://download.visualstudio.microsoft.com/download/pr/799b3459-f1de-4c88-ae38-fd1aa76c2d73/db275a0fe9776b55cf0f81cb0788b6a9/dotnet-sdk-7.0.401-linux-arm64.tar.gz"; + sha512 = "7c6ba2047998c906353f8e8d7fa73589867f46cbc2d4ece6cc7ee4ca3402b6a18717089b98002c7d15e16ca6fd5b11e42037b5fb0e25aff39075d67d8be49e25"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/1a603c4a-7e79-44ef-8e09-426a2c1c6e60/eb3dea0e50d73fbf28edf88aa8378e38/dotnet-sdk-7.0.400-osx-x64.tar.gz"; - sha512 = "e705c7466c9aa0c1203e0795ced23c6b794285ef60c8f7e1d199a09e596c20180901c2ec9c24483afa6302afb46a6b87ce18533283e2223a2161776f25421f61"; + url = "https://download.visualstudio.microsoft.com/download/pr/7190497a-9e02-4369-ba8a-29e7a4acc69e/45af3f104e254cc37cf48227bc8e464c/dotnet-sdk-7.0.401-osx-x64.tar.gz"; + sha512 = "7c0ffdc756e13606982a58f21e8fe6fb4a0cfe0210ffba925e81f70b0266715f17d2dd9efeac72c23d552f099c173b04c1c31d07a050151ffc65578ba2d922aa"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/3df92af2-c066-403b-ae65-10b7ec879b32/a4a5a807d92510d5b74ee8fef9b2babd/dotnet-sdk-7.0.400-osx-arm64.tar.gz"; - sha512 = "134f764680336481a67ded13af8f9ce9e89e29937c7998d8e6a3695593dd1246b8d9407649f125032a3057c138b9739aef3bf8e3acdf0220224417c2036bf159"; + url = "https://download.visualstudio.microsoft.com/download/pr/4246aa3e-4c90-4022-b3d2-5bf36547bfa6/8f75268f923723fb2c4a44b271dbc042/dotnet-sdk-7.0.401-osx-arm64.tar.gz"; + sha512 = "64878c33a80a13eeff58304832b8a00bdea7da088d8683903c4adbf9f6aaab4ea9bd55f5148c76518526d483ee43ab8a76f07afd60da5fc8081456f0448ac3ed"; }; }; packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "7.0.10"; sha256 = "089cpjkfwcwn2ifzbv4dspm84drcn3r3ck9mzxbyyz5vnvppbd0d"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "7.0.10"; sha256 = "0jfy3kjb7q8dsm8k3mnm81n08zfsk0ifjj1i40r71yglfsp8xkzd"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "7.0.10"; sha256 = "00lqqp5h2f4kv6l7jy5zs8l9mqjrqziw86kyf4fghldcpb2g7nmk"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "7.0.10"; sha256 = "1hcxbb0s3v510c64i8jz3dmszvyjyisrn4m3qvnlx6cjcfwpgy4i"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "7.0.10"; sha256 = "1g353xlq04fr7vwm6c4xzpi2mr8w544drch3mh8jz3bpb3km1ms1"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "7.0.10"; sha256 = "1mjg5i643dbzkan6bi9b32w1csn24cy7c3zdzn4i2d0jzmfnqzs8"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "7.0.10"; sha256 = "1cbhjqzl836qsagc6lb63vgc2qp7kmi5bdhr8p9spm5kgixw905q"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "7.0.10"; sha256 = "00n5024l9nh3pvip7xc4zrqrfj7yfnc5lr3crv4cyzf513cxi13f"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "7.0.10"; sha256 = "086lrqyd3csrczmi2rwn8hfjva11zmxbs56kgz1hlyyy34007bgc"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "7.0.10"; sha256 = "13kj7b7h8pigcgkmzqzcg148bazxw8440lr7srz27prfkhlj4h70"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "7.0.10"; sha256 = "0dvajqgfb4pcsddgsb6adiaai181a4rfw3gii8nlr9alv38mr1bc"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "7.0.10"; sha256 = "0d3fywij0sinnn4qxjyn9b8nvhmw06c3nqk712f9b4qz6wxhlv3m"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "7.0.10"; sha256 = "0gs7qbwwlp91hb35x2jhr0zpigjpib8bhp9gwc4hfprw7f8431b0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "7.0.10"; sha256 = "19h0cnar01w5f5p50k02z5a1mv4m7ixwaq7dpmb7y4dca56mjx00"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "7.0.10"; sha256 = "130jg9r19dchk8xmxbspcyj8zl3qvikz62ck4bql2biv362alhqn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "7.0.10"; sha256 = "1mi0xmscdix325hzxmqrv3fjnxfanvby7qpq1a3kkkspaijsrlrv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "7.0.10"; sha256 = "0c5rwllrvzwybz47r6pibv9r0bxmx9yplxs6ki0zl8gcx0rvxfzq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "7.0.10"; sha256 = "1nkjw5aw38aah1w750vi5bjvly6c0303nydjfqzwc2ws4c71qdln"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "7.0.10"; sha256 = "04hcs6bq12zqnijp15fwwiqxz447bnsz649h77qvl11hsnqp7k8h"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "7.0.10"; sha256 = "0ggk9zlb16pl2126n78lq0j25z8z45wvhb561872mdy8y29hkb6m"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "7.0.10"; sha256 = "1h8wajbb2dz6ms510v8nj9bp5zx9j5vkrs6yv5amyzi4545fd33a"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "7.0.10"; sha256 = "01y8wkqjnl6z5dmaz74iw5vgk6jjs9vd7kap6k547irbiy9svhxm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "7.0.10"; sha256 = "18cnvbdgzcm2wg361pwsbzymn8n6lsip9gqh52wcjzf9sjwd177h"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "7.0.10"; sha256 = "115g0igv91ysnhsr7pvspma6nyyhjylpppm7aailqn4w3kz1c54f"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "7.0.10"; sha256 = "1q4xfaszjwrrvkrnhagmihlixwqgdk28n5wggn9q6l82md2va4ri"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "7.0.10"; sha256 = "0pw90dlbh9pnry98ryr100fvmxrf1ry6y28zjhvga0ig3ql8yc51"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "7.0.10"; sha256 = "11bd713na563dvp10qm1haj4mr4hdhh1bqg8bimfjcgns858pi96"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "7.0.10"; sha256 = "1ldz6gib1hzpbpkh1j48asyx2w73bw1i6chxg5gy5fvig1syajkc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "7.0.10"; sha256 = "0salk1da71sqr85kbqzprjjs1zqfrdfq1fy9il4yajhhk6py3ql8"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "7.0.10"; sha256 = "02kb83ipvynf3qd5sb4dwcv2rslngb22091fiqr1b5da5vmmjiwa"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "7.0.10"; sha256 = "11v74j7615z1ir59424aifyfgvc096f7lqip6zkdfbbxqrghjj1a"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "7.0.10"; sha256 = "0k4hk176vxf6i8pv9m4564yqc47nav8f1z2fb9br3cw5i1cvzmmg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "7.0.10"; sha256 = "0fj136zcqaybzbhp599i6g63w1xwshl5241lig2v5njb42k4a1c7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "7.0.10"; sha256 = "0bwb00hijg1ca597li1i1gsyw5vzmqxjaqypdrybsdrqph0d12fp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "7.0.10"; sha256 = "17jkfcy29x24kxcf28g89m6mxb33rg5pnhs3ygr7lrg6da9k96xi"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.10"; sha256 = "0fldpcg7n07nqzyhajm361sp5y7j44g1lm4f4rky6ccjsd2jhzx6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "7.0.10"; sha256 = "10rqr8706y0jgwk0ng5q6v8lssz7yms3fmbzyz8kmm0b0lskwr1w"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.10"; sha256 = "1f8bhw15nsv4z92q4fcyadbdrzw31iribgni5mv8xphjqwms22x3"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.10"; sha256 = "0kkzah9ha1pfjhd7f06vchndnfzw1cbqrqfizfv7y75is9j24d1k"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.10"; sha256 = "0rxgrd0bv8i0asyxxrvsfbg4qsx2zh47jgn7livrprfs1ih0vfc0"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.10"; sha256 = "05hfkilgm5yv2iw05nwqwp0kv1f2pllkw1hwf73fiqxhc5yi4gzn"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.10"; sha256 = "0x7m0rhslsnqnml5syg98vlrimw5ih7zzgr6c12661i1hcqwpj9h"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.10"; sha256 = "0l698rpwqpa4k1l6ykb0q86j3r9v1j2kibw9yxynkbr61mrnmhqm"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.10"; sha256 = "0265zsc9fwslcr8197gil0s4xsh6ascrllgnjdpy28v26cki0cc9"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.10"; sha256 = "086xnk6i1a7bxczgxb0g6b9jx7qigkkwdbsfrb99wx9hq7bry8qg"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.10"; sha256 = "14y4j9r12dm86qgmhnr6ff289fdh6nigpcg9lya2avfm57p7qang"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.10"; sha256 = "0f3axfrshdr9gcdwyaf24czwfd7nw8py2z14inyzsp79bw87c3w7"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.10"; sha256 = "0jnxwp6xvc0djcwrmsk8xxicxhl82hd9fvmxy9gxw62gsvfzqavh"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.10"; sha256 = "0b5hxgzzjsqfwzqzf2wzbhwv8yr6s05qxcmjlxy92fvn98ywrymv"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.10"; sha256 = "19v459vdsadly3jgwm8qsa2z2qqspjk9n02k39j46m76a72j60hx"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.10"; sha256 = "1cl22hgj2ig4dq80l84ia9nmmrlq3rmns7mvjy2w9gk35qca2534"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.10"; sha256 = "1hj75k6ar3bznaak0m6hadzkp93q96dnhghzqn5lzniqzbxh4cr5"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.10"; sha256 = "02i2jrdkq01zzlx2j925svlsj2fp9wxpyx3q9cvx2r4n4c9qjv6p"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.10"; sha256 = "0s5i1irjnmp9kmn3wcz7j5ppb39lajm6r1ip90vp5677f20r5i3p"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.10"; sha256 = "08mygly5bppfk1sc6v3ff366796cas6ngz30vb1fhkqvdi5mkxkv"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.10"; sha256 = "0wznldd70f4iybkaar23342xm9nfh3g9lqankbrv1bvy7nbrrl47"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.10"; sha256 = "05bb0h54a3k9fjkwzcj4kky9xfv7li3p7lfp35f7cv1mab21yqhv"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.10"; sha256 = "0pdyf0m2jvxzp4qp6r9sbxxssnrpbcw9vv3yhjqiajg4zv537g8f"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.10"; sha256 = "0a3caj9x9lk942kwr6pr6flxbgrjagnn7h9f5hspsb59q08hya8c"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.10"; sha256 = "0zzppp00mvj6y6jfc5ivz6816ab524q8h9h38r4ggrhlswfdqapx"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.10"; sha256 = "0y9kcx7pd1swjhb4skhhj35g11mi0gcm9hfmy0v1llk3cwap95nl"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.10"; sha256 = "19rn0glqnnip0iybcnk48z1rxb2r1nnpka0cskv3phq1aachyh46"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.10"; sha256 = "1skysk6c4flz9x7q7y3vrnwg2hyq7cap0f86qvvw1bgpsf3iqp85"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.10"; sha256 = "1vyyhwmz9996igq74cbivr27xl4gnxnrpd64zgykrxdmiz7wrrh8"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.10"; sha256 = "112i3pbcp6hbjaisz0qwqkq12hpf2xrhv70l06ifgxz6ndpi91s6"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.10"; sha256 = "0bq4x765vglp84l0sak1xzzazj4kcgqjb1l30ywqy6rfylb2ppz5"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.10"; sha256 = "1zpm26zd654jhl1a12dcsq1ml0nc0nl3w9ff3inp5l6da82cd6rz"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.10"; sha256 = "0jxnicdqqkbm32wbyfm7d4c6i522701jagjpl6vsdv9q3i5a44vg"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.10"; sha256 = "1wz04jh2nphs9yvi8zcm0m787wjxgpss3bc8zpmihw17qxwsx9dz"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.10"; sha256 = "1q6k2wa6xknh7v097gl7wx7k1jw6s86fcrl04zxbm4n2s4av59wx"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.10"; sha256 = "15nnv3q2zbqn8jyj3sr97ms31kiwg7660bzdzmch62hagbqggjjj"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.10"; sha256 = "0ajsb8dzidmrhch2j6wdv30c9k79q46lr7zy4v41336423rw867h"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.10"; sha256 = "0dba0d4c2ays2vnk14wd0y2dl72vvqqx99ld2h3ihv38l37idv9z"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "7.0.10"; sha256 = "1467pgxdbm6mnf0nqdcf0sarfcwsp0zdazxbk49lcriid87kiyih"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "7.0.10"; sha256 = "164irrjzcnjzkz0lx5j9hi21mgmp4v4cmb26k961wha68v1z4xcg"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.10"; sha256 = "06bkz36xj5gn3djllbzmzccqagawib988b092gghngibg9fxshlw"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.10"; sha256 = "1s7rjmlvj1j2cy0hd3bvxc8h49vi1vmcm7a00qkv09qdll8varac"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "7.0.10"; sha256 = "11xczi5f9b52hsi0004wx6f5sj2rc2x5kdh5g3ngg3qj3bcqki8r"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "7.0.10"; sha256 = "06m28k55v8zjxj2jql38c3j2qsmr0ykgrpv5rf7yvb5v83v7l6js"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "7.0.10"; sha256 = "0idli8p2n1xs5d1d31c692bmmxxkxc3rmywhak6y2kq29d5lrd2i"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "7.0.10"; sha256 = "1qr5l2zcv0m9w8xwm2jsk32xzfmszz5v3g6w6px8k5v6cxysaq69"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "7.0.10"; sha256 = "0jm1kmpy5d45svdzn8a29jaxjvw767j338vda2prmnyf2gngikw7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "7.0.10"; sha256 = "1apbhxqq6xnzs3ag8gflwzymb9g6rs19i1kdbds0pp08hviy7gmp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "7.0.10"; sha256 = "14dj7ybbmks7qdih6l7ph052v1yjx7hk6c3s42vwnccvpg06sj1l"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "7.0.10"; sha256 = "16s4c1ix3sqqgdc6f2v0ldlw442l2k1c2ybjhkbsspq6pp9xsshj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "7.0.10"; sha256 = "1bms1r0g7acrg7698zws61qswv80n4d79wjxa4r3v6552w4mriwr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "7.0.10"; sha256 = "0yiffw2rcbi9014ngjzqnkp0969gsxnmn9csd921dacrls31fc9h"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "7.0.10"; sha256 = "16zifcd3c5xwipvfx3lfva6zk45g6119anlmjlybn8p0i6vgdfly"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "7.0.10"; sha256 = "0bk0hmys42l5wsk6zvgjcj7aynmdymlvc7fmwmffg3z53i4crz0i"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "7.0.10"; sha256 = "0y3c6nq9i8d5brsx1wm355bhhcs1kha4aln1aa76bqaj2rhh0j76"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "7.0.10"; sha256 = "16z135yy8xlbbxi2kcmxcqa5s2haysc9f0d998xmwvm3lgpxb76q"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.10"; sha256 = "058vcvc61pidfrpj6zi1hy04ywfrdmczgsrigih23irlhsr7pdh8"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.10"; sha256 = "1hpx1pav1kdlk8asvkskhzqkq47ys0mq8m0bk5vs22ccb9iqkr7m"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.10"; sha256 = "01gigb8p5m85jmp3hc94mb3nmy3bvw0hpjbsls42rxai3v4sx73g"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.10"; sha256 = "1xlzpfzzg4vna9dh75ifli8x5g4jfj6kqkisqx13f0hdzzcj69hx"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.10"; sha256 = "0m4fy8q94ssrsfx3ww9k0rqic9rk8dir7iryrlsbxhqvmp4gwvdh"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.10"; sha256 = "039k2aaaadqr90gpih74mzws8v00ravaz77fy6lp6c37wqqs47sa"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.10"; sha256 = "0zayq28xgj2461h10vrj7mp8qmsffzajj8rr1whkx1kkbw9qb54r"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.10"; sha256 = "01xprbf02jkb50k0r198q12924nya5s60j4v089436yhxy6g48jf"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "7.0.10"; sha256 = "096dcwdj68sma7b9kf0wvpxli3w746hl56i2vjwdhgf83hr3g6k3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "7.0.10"; sha256 = "1jh5mfjybj2z1wn8pf1fm0bllanlmd8khipz965pgxzwarfv3n43"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "7.0.10"; sha256 = "0rwdz654c4yd20rnk8hqhai4d7v4xybyigs84qyyxk4w0kp2bz1g"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "7.0.10"; sha256 = "0qyqxp46mv695aiq27vvlwjz71mcsavagnlzmfbpn0310y285bnh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "7.0.10"; sha256 = "0y5b4vrnyxg87v64yypbcbcmj4mqmxvqc4nriqck7ssc022l5rgz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "7.0.10"; sha256 = "1bw2d400qdk2v969w8rl2y1r0090m8h5bzx1r48mn6lpz6wvs6ld"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "7.0.10"; sha256 = "0rnj3jl6yzpg08aw7802qs5s7bfw1vqx24604aizhkhbscf8f4f3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "7.0.10"; sha256 = "06cydadly53jaslvaa9q7jzsyc9fqbd68a2av3ncybl1cngawz9i"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.10"; sha256 = "1kr2ib8kskdp94ckx9bfahwhj6wv48bhck6xy8wgb5d8j8q9mqam"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.10"; sha256 = "1mi8yn7gfv3i01iqgrrsnf7cni1jip13j0b51lrl752pkzv3lynv"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.10"; sha256 = "15ar1vz3wq2pncv964dkcci5mlc1kf2pw8zbyr7ayjyfjhr2nxrj"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.10"; sha256 = "120c4nalbj046bs0q2wg7pxsjgdwazbbjnrs76v0sscwzzaylc01"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.10"; sha256 = "03q8z4lrm538wrsv4isfhzwlxffcngykv45wp58gbg338gxh4ngw"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.10"; sha256 = "1gcqrsindn2avrp4r3lj0bsi4hda0zimmwhicihkh2ykq5xxjyj3"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.10"; sha256 = "1nlkr2yf1rxb0jca5li44br4n95hsmbaxg3wf2nz0iyh4n7b65kw"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "7.0.11"; sha256 = "1l9vydgqzsl8mcx2b58gwkiqy46v14by5fh6im0ibcpv1l8raijj"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "7.0.11"; sha256 = "0hmsqy4yc3023mcp5rg0h59yv3f8cnjhxw1g4i8md67vm5y04lfv"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "7.0.11"; sha256 = "0dazipajzj78i4x8f7m8c7sa890il4b46pxzfyz2vq21jb2g9lv9"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "7.0.11"; sha256 = "0d6ny4i84fxzadvxamicr5qlmpnb1d6zndw8rkrqsaskpl57l0dm"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "7.0.11"; sha256 = "18sk9wka8z5354ca77q43hi0615yjssdjbyi0hqq92w6zmg43vgc"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "7.0.11"; sha256 = "0wxw7vgygg6hqzq479n0pfjizr69wq7ja03a0qh8bma8b9q2mn6f"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "7.0.11"; sha256 = "1lvjhrv6c4mmqa645ml4rfj29ardpgxq7rw2jsnxr4qyv1d8iba4"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "7.0.11"; sha256 = "0fmnfq59454vc4jsynvqf768m8qzzbnl9gv8w4q15wz1aqy02789"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "7.0.11"; sha256 = "05ywwfn5lzx6y999f7gwmablkxi2zvska4sg20ihmjzp3xakcmk0"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "7.0.11"; sha256 = "0b3sqvy48477yxzh1jfwjz69nrpnhpmy063zb5qj69birpcqriyk"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "7.0.11"; sha256 = "07i1axzlpkprd9imiqxvaxwwxzdrmq8s9vd8k22gdv742wysf5pn"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "7.0.11"; sha256 = "1i9z9q6b4zna1vg53cz2zxp4fv09jsr521nab4yvavzn2khsb32l"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "7.0.11"; sha256 = "1j0zbd4rmmd3ylgixsvyj145g2r6px6b9d9k4yxxg6d61x90c165"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "7.0.11"; sha256 = "0jc8gq3p0qhd5ws9cwwrjghvqbxb5p0chp43na9knkw6m0wxdxdz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "7.0.11"; sha256 = "03nkxjn4wq30rw0163rqi8sngfxmcvwgm0wg7sgyb1cdh0q1ai68"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "7.0.11"; sha256 = "0azkiy2r6zbgbcgv8ymdlhwydmap79fw4ws1svyl2yy6ws3mynfk"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "7.0.11"; sha256 = "0wsy6m1i8znx4y2jf04fnzr6kwzrbqyqvzj6inmdpdnk845lfcw5"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "7.0.11"; sha256 = "12hh69sr4wf8sjcw3q71vky51sn854ffahbq6rgz3njzvbvc0dbj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "7.0.11"; sha256 = "1j1k735gkwba93n5yck87wppfpsbny979hppcygwrk81myf3fv03"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "7.0.11"; sha256 = "0hj29pn703vmhkr5x5rx1a0g91f0dx4h7synn1zk4fyzdc5bvj02"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "7.0.11"; sha256 = "1wrwzn4zg5fh00pbiv1s4b8fbcz99vv4x2w0m192k1pz84ywgw8w"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "7.0.11"; sha256 = "0ifshdx19bgnbgynbk6iy6gybnxmp63nylrn7068x66hvcavh7kh"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "7.0.11"; sha256 = "0px0ha4a256rawssqmzsi2grmydxzi31r9xxqdq2sn8dfpvdshzk"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "7.0.11"; sha256 = "14159534yavrgrw04r63rcgvdnfv83xcplvb8h2nhrjgsl2kmabk"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "7.0.11"; sha256 = "1gzwc96fs222ddia0k1924cn7gxm2a4anqgcxhmavx56x76wsy6f"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "7.0.11"; sha256 = "1mfyq49hcjpj93zhxvy48hh3xji8jfj1hc8caf5wap4jna9rn2dx"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "7.0.11"; sha256 = "0s3jx6gmjh907kzcqmd26202vl0knbxqbkf55m4wsk7ar3mgc8m8"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "7.0.11"; sha256 = "0vxza49wwiia0d3m887yiaprp3xnax2bgzhj5bf080b4ayapzkf9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "7.0.11"; sha256 = "018qf23b0jixfh3fm74zqaakk01qx6yq21gk2mdn68b0xhnvlzma"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "7.0.11"; sha256 = "06x84avjby7q10shqgfzw6z9d2smgwibg51vfw0dzaw648x9mh0a"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "7.0.11"; sha256 = "0i7x1da6drv8wl2ml9cpzbdalnmlkz86l50wgkirgnwczh3ia054"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "7.0.11"; sha256 = "12xmw2kcpf5rh8sv4y0mqzp917f7q8g4mfh5navqw4jmnxyb26qq"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "7.0.11"; sha256 = "17n1m76ac0i10vkp3y04fd8wyxf2ywjwc6m9a8z1gxgwbmfajs8h"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "7.0.11"; sha256 = "08flk8ygkyzys0iwv447gndnmfqf9b02api0dcqnzq7zhbgvhxyr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "7.0.11"; sha256 = "1x9pbqldaz0h2zmw363q68a9zxp5d8xw45s1i40fb2nwl19qqvk8"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.11"; sha256 = "1x1n63nav3x1is0v6glzjy8wbk343ns7n34q831hw98l4v4gs8c7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "7.0.11"; sha256 = "1lpyhwb27fk0d07ibq05fyvhx5lis7gzy3fb2wk617vbwa4aj5vn"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.11"; sha256 = "1yzjid5v639xa91l2hk7kxj2a9nszq4qbydxwlw0z1c1vgzx6lzd"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.11"; sha256 = "10k58ncj2q9d2aszwbqldyprficbg0dlv7vy874h8ws1ds43hgpk"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.11"; sha256 = "1cbzcxwm5q51sd3ba3cfnkmwf72blqy01j98j3p94xj0fp44s82q"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.11"; sha256 = "0k7xdk2k7jrrlas8g6yw0jbmm6gch6ay2vgnayb4nay0l82zczrs"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.11"; sha256 = "1nyj6d3ys9c0ffhy2vjgvkbc7z7qa4p7j0z1w76zrawmiikj0j9p"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.11"; sha256 = "02faahlcq4bl2v0rkbpf1gv0a45vk4xcazbcb28iybdnqmz0jb7v"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.11"; sha256 = "1nksv1xyss8nhin1ac179w05dfn1181amkk4mb340r1zc348qm6j"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.11"; sha256 = "031n5cmmz6z01z7gwq249xc1rysgzvvy0s7jznn9mfbyk7b3f3cz"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.11"; sha256 = "1f8s6y4pyxj0w8l3hbvsyph776c4j0w51h7y7bfb6ldpaa4rf7fz"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.11"; sha256 = "1njk2rc9b1vv9i5v098iycgfsc1wq752x0dj0qpiz5ahmknwgjn0"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.11"; sha256 = "0bgdv0j8mhqsvw7zv225n4x4dlbhassl5klga9zhxxh1dnhfhnv0"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.11"; sha256 = "02pkvvpib02rv0i00abygckw0q5rr5ykv2ffn1f15lvfcakssmzf"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.11"; sha256 = "1spyrjrb5nbawj3npa4xjjl3yq5d2fd1z77bqc2kjnsvmspqcwdn"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.11"; sha256 = "16ddj8gdwhnbynwdfrk56pk1nh38zs7amibpw156iqc0plwpilgc"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.11"; sha256 = "04shzps9lbqwm2njzp8p8iay9b4spj62rgnz79qnjk10drbf4f35"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.11"; sha256 = "0szgfr0r9zqkmbbmcvjnylyvkz9ppfbx1k1dnib6wyxfaiapnl69"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.11"; sha256 = "0gpprrzbvv89kxg9k4sa6j7b16i153zy53ailnr3gqaxw3lvp8ra"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.11"; sha256 = "1gz3g8gvj5gyazlr24x9cxg81rq6wlzy42zc77dxsrlivxx2jwpb"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.11"; sha256 = "0m9h8f9vjpwkf7rcfriqfga11gchv28r7g6w22kc3gxdrba87vzz"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.11"; sha256 = "09zmxhxsjbp9qwjhwc6qlckavi62iqqqa0xhd7cd0x834c2v7jag"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.11"; sha256 = "1hb45sddw3fxlh7yajj2z2s5zzw3sz117p2qi5ihqb0p7chpibv1"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.11"; sha256 = "1x7n2pgxaj2iq6piqav7vfb24n49szrdyalxa31ypkwb4b47s3lp"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.11"; sha256 = "1qznwkwrcl098xwzp9hj0qrz0ch69g0mbg332md94pnzw70wjg1g"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.11"; sha256 = "060hg3kiy679h8n71vx7vn6wsrcb10cvnr9yzkr9j060rdiz1jw3"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.11"; sha256 = "0mjqsvqd8basizxfjrwj1a5ibjajpm1n9xg800cnfi8m7i9gm9wn"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.11"; sha256 = "010icnyhwfxz7gv5s28p88zvg20lsm1fxlgwdcwgns7swiv6vj75"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.11"; sha256 = "0ccyrh87fl4bsxr3a6h54cbnxpm7igm32jfh87s6if1ikb9wp09x"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.11"; sha256 = "1mgi1gl3gvd5rirj91rar32s2ww6f3hf82xpbc3w8bjn6dlnd541"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.11"; sha256 = "0sck1d3dgk78rr6dmsdyrqibp8sk4k61286zvc9h2lzl3fdxizj9"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.11"; sha256 = "017x7dyjvizddd1fq87hijjw9n4dq9naqqksj25pc591f7zr181m"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.11"; sha256 = "1ajc5ipw7wjw0c07zpf2bjx3sch3d72njpdwg2j561a6v76cj8vx"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.11"; sha256 = "0mkjr1shvvrh5rx3q76dp2jrk040ivy1k34bkirms4kh8y680jx4"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.11"; sha256 = "1ni1q83679hchrsmbr15ylj1kcbmaw3lsgfp3ml8m2xig1x2hngw"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.11"; sha256 = "0ivy2mi36wgmpm0m3rwmiirzbvfypdm63sh4nw6cwkhfzcy7ngif"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.11"; sha256 = "0j1ywgpg2m6pcq9c5cnmac0shjwq6y6lr0p05hzrrkl9amsbgl10"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.11"; sha256 = "0bnm6nq7y93z3q33hgsw112ch1kz39bkw46yn6bl3gs2vwl7pjxs"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "7.0.11"; sha256 = "1n31igwjmjsl5rdzyamcr3hr7qgj4950z3ki78adfgcl0z1a98kf"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "7.0.11"; sha256 = "16cvmpkiaah393pxrl955gd31b9pc3z5pm3wd74r6sd687irgi20"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.11"; sha256 = "1had0cfkfr9jpbl4lf53dn43c1yccsns9wh45di87in58sr52k1w"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.11"; sha256 = "0xr7anzg7hazhczm5kh28l2lvagzxk4y56rb2xlmmmdjs6y32rpw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "7.0.11"; sha256 = "0knl5q76l171fnc3q8yl5f81vv5bkg5m67xm6h0c2szal6s2492c"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "7.0.11"; sha256 = "0cxw0ck22ngw3l4d7v2yswqiy7rbcrxgbjf2d98s1k73vrpv4czv"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "7.0.11"; sha256 = "01km0wqrga2bd2mir9syh2qiglrp5y233ahyf5vhf5crb9m01g2f"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "7.0.11"; sha256 = "040zkvkgyx0cdzgr21x6ysm4m1nb3y64yn80ffbkr7rlfqfyd2rn"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "7.0.11"; sha256 = "15b62hxrpfy19xvyxlyligixxpa9sysfgi47xi4imx5055fhwphh"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "7.0.11"; sha256 = "0i8h7ifrni8hnawg59wkicrnz4xz7ihidnd7s9xz1iwigaq3q65l"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "7.0.11"; sha256 = "0a8fa0758i1gqb44n2v7ha5mzqp9n7rnwc0f9vac11glkvjwba0c"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "7.0.11"; sha256 = "0g16xzqqdzzrk22dqvn0wf55lh3rk77v8m2kmk7ac9ha77pm5a09"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "7.0.11"; sha256 = "1ddhka5hpwbfqmz7gklg7w8vy6vy8kja1wxbfyvcx806wj4z6zzh"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "7.0.11"; sha256 = "0gjmkkgd85vbd6zj69hr81jn2cbj9zlhxkskmhjsm70k6x9iwbxj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "7.0.11"; sha256 = "0avrzj53p512565m904v54x72xmkvznr3jp5r7psjvs4hvbdg26b"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "7.0.11"; sha256 = "0f1fimz923ahxw6cgz6fkz2m1b3clzi9k9yb08y8zc6dc5jc9kav"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "7.0.11"; sha256 = "1hsp6kyw0l88f2i2r9xsyri907v7n0m9ncpr8j4kbwr0ibqnnnxv"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "7.0.11"; sha256 = "1shdz0sx66vjv26hlyqvyakh8swmq0238w74lwpihpml1bz2bafd"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.11"; sha256 = "1zd472n2831hmpb14zzcqc5p0rdwkpm1qzw3ciqs3rcapna3bzs1"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.11"; sha256 = "1ngxsy9fcsx8rjk71skx9ih1lrj3hp809si2i0rykp8sk95gihvi"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.11"; sha256 = "0s5cslrzmv9i2755s251bcf0hpkr8kh5kfad89pympryl0snqc6z"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.11"; sha256 = "151h7vkpd86psgh3ykxfnfj74sccbvzii07mb1p6ia52l9jihx2p"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.11"; sha256 = "0k0x4v8rhp6hv30r15g2bny46zx2d32dlf4a5xlrz7va7n95ld86"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.11"; sha256 = "0cdj4sp2z7gh861m5w98hr64inrf1pr302h0dhabipkj8891rp7q"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.11"; sha256 = "1xbvxv7qhgyxl1a1w9jm46zrkia54r8liw5ssjj4kg9cagdxml4m"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.11"; sha256 = "1gh9wxaldind6xfq6ychizaq18s2kf5n377h6wbxra8055nr96gs"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "7.0.11"; sha256 = "1iy49hg0drhcrqfn6wrvk9cywdbv9hz061yz3216kih02pfs3hv5"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "7.0.11"; sha256 = "0bxcmi9zx1cqwxf1bzk3n9cmigm7flhid4qr7nzkmlpczdbnk2w7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "7.0.11"; sha256 = "0vhqzbispsdcwywqzz7wvbmm9sr66j2d67nhbvcm283s9ms6wcdj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "7.0.11"; sha256 = "08aib3f9rid6h04r7wk8129qmhs9fcz2qav6bmmjd9gjf9i8iz9y"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "7.0.11"; sha256 = "18r221rvnx66n56yxqlwh7lddis1zg6z0qajnraf430k8ilbjwj1"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "7.0.11"; sha256 = "04wg0nvq7yl7llk0gc7jc29iv7bw8ablaajw3hrzv0yx6kkhbb4z"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "7.0.11"; sha256 = "036vlbafkjnlkqml7h04wbf6qkxnhshl6m9a8x4kdf9w19bcs0k9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "7.0.11"; sha256 = "1c336daa0871l42lwwq7jgh7mkbdbc877dw864wwv2i638rdbnp9"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.11"; sha256 = "1mzr6qxz2vnc0zy3gs87ignrq7yiid61b3v22ifv9cpz4x6vdd72"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.11"; sha256 = "1y41fwdkski1hl93x1lgkdg81jnjf2k57n5adnl8faqb0ybdbijc"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.11"; sha256 = "155qq0kls43bigrn7iikpw7zn0am51zaf7nya4gb3ayy9cy6s35n"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.11"; sha256 = "1yzlmivfm66m6axqlxv99yw8iffl6kn4bamxzzy7wwwvh25y8440"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.11"; sha256 = "1qd1rm707kiwdp5kbp8vqnspvgjdd93x3iny6pjhaavjk0mpbrwg"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.11"; sha256 = "12341d3xya1icjphf8vscnygcnd3ydb5c1b2k5gq7nfpdsdcxym5"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.11"; sha256 = "1b1qhysd110a0l8p97yvwgl3q837h2bw56xmqxfsrk4qvnp9n4il"; }) ]; }; } diff --git a/pkgs/development/compilers/dotnet/versions/8.0.nix b/pkgs/development/compilers/dotnet/versions/8.0.nix index 6ac6805f4205c..e7bcfdbdd8c4f 100644 --- a/pkgs/development/compilers/dotnet/versions/8.0.nix +++ b/pkgs/development/compilers/dotnet/versions/8.0.nix @@ -1,186 +1,178 @@ { buildAspNetCore, buildNetRuntime, buildNetSdk }: -# v8.0 (preview) +# v8.0 (go-live) { aspnetcore_8_0 = buildAspNetCore { - version = "8.0.0-preview.5.23302.2"; + version = "8.0.0-rc.1.23421.29"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/b95d1c31-20bb-43ad-a6e3-7d14e955f759/003b3b17dbbc72ac8ee66c54aef85c04/aspnetcore-runtime-8.0.0-preview.5.23302.2-linux-x64.tar.gz"; - sha512 = "e9d570ceb193ab9a3e0b2ec3549bd1b67555ed4a333a6654ca8e4020bc38f42eadf3a690f996669c24af428222a6bf989b17b8cc0f7f276db928b2a40a7bc049"; + url = "https://download.visualstudio.microsoft.com/download/pr/02f4c6c2-c137-448d-a189-9ee3a3f6f99f/192f2c750089fa0194f04f5a805bd21e/aspnetcore-runtime-8.0.0-rc.1.23421.29-linux-x64.tar.gz"; + sha512 = "d5f9e7bffbf2b48b26a317dd1d78bc866973b4a2cda448cd7a7ee64c0ffaf98fa3c4b8584d32528026674bdfd99f602f0fdac8242176815705e080df83825efa"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/3a1b9bf4-f6b5-47ed-b325-38e31af9f60d/dfa9cbb848ab710dc162b5cff1f26f2d/aspnetcore-runtime-8.0.0-preview.5.23302.2-linux-arm64.tar.gz"; - sha512 = "b54203fc664d4390441278e1917fec13466df174672622740509ca973811cfa178a851ac930c6d0cb03410bab8f630f4dd21609d2d8706f8b64bc23fb88a1836"; + url = "https://download.visualstudio.microsoft.com/download/pr/de4037e0-6e5e-4a40-9c83-555d30d9c21f/f607c58db3f81aea2c7e56b0ddbf9ac6/aspnetcore-runtime-8.0.0-rc.1.23421.29-linux-arm64.tar.gz"; + sha512 = "ba8035da535cb3bffa720e962e6f9e0f88b36e1221b588f2a126ee4b43c02e4d8c27958017d29e5ab68121fab6a564fe0a27099c4103ee3d527f8554b4ab495e"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/c588c5f1-58e5-4cfe-b1a7-622458123783/42b3f9e884a7e995da49ad847ee8ffe6/aspnetcore-runtime-8.0.0-preview.5.23302.2-osx-x64.tar.gz"; - sha512 = "76da6d5bfaee0779aab41eaf2ca5759e2f0de919f89446883f6d8d46d4e1643fc9aed2b6095e00aa81ad05dc49c76ba2dc3ab09ae4fbccc7596b6977e5765ea2"; + url = "https://download.visualstudio.microsoft.com/download/pr/c3612fc1-f335-4b1c-a08a-08267100ff43/dd06c8e7021c27becdfed27838be253f/aspnetcore-runtime-8.0.0-rc.1.23421.29-osx-x64.tar.gz"; + sha512 = "28c2cc2b1b32a3d4b287f2ceec42ac7fce59870bd6a72f6767d347fa0a9c53210c5328e4d747ce010512dad149109ff072840c9da9301c8bd66a178169458518"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/e1fe9f3b-448e-4ed8-85f1-9ab58c51438d/823051b4bdaff6e19c7b78bfbaa1101f/aspnetcore-runtime-8.0.0-preview.5.23302.2-osx-arm64.tar.gz"; - sha512 = "ead98dd5d81efaf8b80f2c9223f55557a54c30f32118c778258ece80e6ff3d63cb55af85e4a1e463d88f356f54d790af35148b9025a9b86147bb6c4a3153b950"; + url = "https://download.visualstudio.microsoft.com/download/pr/6dbd02b7-f3e8-46b5-a3e9-ea482762a02d/430b0d87ec687b4a9968ca143ea95789/aspnetcore-runtime-8.0.0-rc.1.23421.29-osx-arm64.tar.gz"; + sha512 = "dadb90494fb36a1d38b12d2903a385b76ee7325eba59d44acf4e10c3019bcfd636cf0b9a7c3070516325c6be4f5421c11fad7a2293ccc2b1c7a5d3c62bbf07e1"; }; }; }; runtime_8_0 = buildNetRuntime { - version = "8.0.0-preview.5.23280.8"; + version = "8.0.0-rc.1.23419.4"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/bbdc7ec0-d87e-4b6b-bb3f-9dbe5db3078e/6cda9733bbedf8f4fb9e18829e301051/dotnet-runtime-8.0.0-preview.5.23280.8-linux-x64.tar.gz"; - sha512 = "0fa3d9bef5300533b4f266fc1983c7bc8eb55c6c9e8ddf86978a3adb911663a2069c9ed9e428f8d2361558a40edef5bfad6ef75ea2a728cf700a23cd38e7bbcc"; + url = "https://download.visualstudio.microsoft.com/download/pr/8cac1522-acbe-4052-9f6a-19341a8f9dae/1cf1396b382e22cb1ba21a27f3b79725/dotnet-runtime-8.0.0-rc.1.23419.4-linux-x64.tar.gz"; + sha512 = "53938ec3aa4353cfb760d22faa850821b54a53fdd864c4969f48caa6b718ba207162b04a196e85543947acb7d3e719982edad1420b76198562051846f51b1b5c"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/c5c38c9e-775f-48e1-93db-bdeaccf15876/be5113d9c28eaa96d6317bc6e38e9528/dotnet-runtime-8.0.0-preview.5.23280.8-linux-arm64.tar.gz"; - sha512 = "e53ea13c70b4d358b3a313b3edb6e160a3453d62eee76b13c9f4bbb01c79eaf5a1aea9afa3b565ae9adb74f3f674fb5db9135dfe6cbc1be03b34a8d6288b3965"; + url = "https://download.visualstudio.microsoft.com/download/pr/78e40734-8864-48f7-8c03-971ee500d93a/4b2fd807bb790d9ac3cd8585ff8cb6ad/dotnet-runtime-8.0.0-rc.1.23419.4-linux-arm64.tar.gz"; + sha512 = "6f5ca722ec2c4a400b9c19b17a3d9a10cf92b265c90c1e1b4822c12117580c286e99134f7c223f3dcd71171d5799e1498d38129dbd1bdff606fd64fe451458ba"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/07613650-5f43-4792-b975-10fb0dd512b6/966e29340d90ab182f7e73925cf46d28/dotnet-runtime-8.0.0-preview.5.23280.8-osx-x64.tar.gz"; - sha512 = "190b316c22a833339d0af75b80699a50049cdb4ba0d3f0b0c5e2eed28900930ad7d6043f884ec01cc4406c620504f30cabaf3e3e30bb266e591eb34f22876ed1"; + url = "https://download.visualstudio.microsoft.com/download/pr/29e68c3a-f37a-4dea-b7dc-bb1890b28d48/3ee60668c4ccd17ea565d6c204ef1f64/dotnet-runtime-8.0.0-rc.1.23419.4-osx-x64.tar.gz"; + sha512 = "ffb0a22c0e4b9cbefc99a1e016683987dc4046abd9f49f5e48bbb93d0434e818c66274422728b328c97ca1dcd6419c7fbb88ba747edff6a8e92213141ce42bc6"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/620a82a4-38d2-4967-9076-388de70cefaa/9ae3a2b33a9df5b312861995b0bcb08b/dotnet-runtime-8.0.0-preview.5.23280.8-osx-arm64.tar.gz"; - sha512 = "7c9a2086b05a8fa90b6077d3627d1afcddfd0977d3203759a66da3b0784cccdd88f1cc3c559b30f18d4892ee7cf9957cd0ec61eeb30a30532988a78146fa6bd0"; + url = "https://download.visualstudio.microsoft.com/download/pr/59ecb50d-0abc-4bd1-ae81-8a252027d3e0/43ed857eea3316732b1a5cb0c68eaa50/dotnet-runtime-8.0.0-rc.1.23419.4-osx-arm64.tar.gz"; + sha512 = "f5810ed4c8ce565f1eb3505b7994e54ddf6d87f8903f739016daafc01ba532caa1b84e39e4e42b73f392703af973dfcaa2165b4630301a859fb49ba411d6ecdb"; }; }; }; sdk_8_0 = buildNetSdk { - version = "8.0.100-preview.5.23303.2"; + version = "8.0.100-rc.1.23455.8"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/07b027f8-4ef8-48cb-becc-132652c625bb/441ef662adfe931013745df24d53b26d/dotnet-sdk-8.0.100-preview.5.23303.2-linux-x64.tar.gz"; - sha512 = "dfe2085a92854a5cee84cb7be9344368f5dcb6333c4ca215375a34b862f3a3ee66c953b9957f7b46f6cd710992ee038f6b4c2bd16464b4a216a1785868e86f7c"; + url = "https://download.visualstudio.microsoft.com/download/pr/8cccb582-1956-422a-8655-fad2fa12c247/4e86a676860c2ced06228a5c8d21718d/dotnet-sdk-8.0.100-rc.1.23455.8-linux-x64.tar.gz"; + sha512 = "b182c4d496f1e3d6ff109c304972f5011a343750ed11ed8ab273ad0bd2d1441b7393fbc20968b54f61acacd8c372528f9a91a7a956362787a362b4821a434d81"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/93db1aea-6913-4cdc-8129-23e3e3de8dd1/4a942a2fbbb6ca6667c01ec414096ee0/dotnet-sdk-8.0.100-preview.5.23303.2-linux-arm64.tar.gz"; - sha512 = "13c6c559646c359ce07584328ef2e5cf5cb70371197deea9d31caee249c45b07ec1b874bcc5e3cb3b601b5ae280883cda555fd4cd2bf4a255d3be431574e46d6"; + url = "https://download.visualstudio.microsoft.com/download/pr/7f0829c2-839e-4882-9e21-fa4fc6bac32d/5ade892179b687046b1252638b8cde01/dotnet-sdk-8.0.100-rc.1.23455.8-linux-arm64.tar.gz"; + sha512 = "686a10b89217fd5d28e4b587dc231d0bb2630fe7dfc7423611406fae8812ce1b53aae3e079b924280fe589686153919272f4b5ba0c0292d68ae50a75530d015a"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/47115ea7-dffc-436d-a0ac-e7445a932d12/b59ac26284ffa2162139c21052feaed9/dotnet-sdk-8.0.100-preview.5.23303.2-osx-x64.tar.gz"; - sha512 = "f4f42021b88abe1adae7aed539ad0b31ad524a7f2af79a974030bfc50aa8b2e9424fd5f38cb25f40277eb9b0a76f68255e7a97058bac49c30c20a72ddc59d0bf"; + url = "https://download.visualstudio.microsoft.com/download/pr/17670d0d-05c3-4e4b-8d72-5e31bb7f7000/44395256cb038899393d7958db2bf2e8/dotnet-sdk-8.0.100-rc.1.23455.8-osx-x64.tar.gz"; + sha512 = "184a845b4b395f4c00b3c9e846977a2af446686ac0e4c916f2736f3e891d3045341a8f391517a19f50900ed262ca4999d28e872bd6d0faa0729f6a5c4ad183bd"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/078ed12c-82d5-486c-85b2-5f4ed34ddf34/a314372565e2e62d8de3497118a41888/dotnet-sdk-8.0.100-preview.5.23303.2-osx-arm64.tar.gz"; - sha512 = "2b3c95d41fca29b6c3812d47561b14d312d270b599e88a8c02918695ec285d171ab69233567c11820bdc16fe03dabd33d23fd6fd8a987ae36f33f87e59b89f27"; + url = "https://download.visualstudio.microsoft.com/download/pr/91a1c0c5-ab26-4dfc-8aee-6c0cb2354774/7e12ab1e86fbabc3417eb4036d955f67/dotnet-sdk-8.0.100-rc.1.23455.8-osx-arm64.tar.gz"; + sha512 = "a658e0dd633175ac5c7d7c1481cdc44f431e85094e29d0f21f5632f447469a452f5fcf5cf6e42cd4d0053fabca6bb4a7e5cc0f859f09cecbd062301c24cfaf79"; }; }; packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "8.0.0-preview.5.23302.2"; sha256 = "1944ynm8cygvnffrrinpdk3xpa7dg4kzknhgjncrmydcz82chv6b"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "8.0.0-preview.5.23302.2"; sha256 = "0i1aifdn4zig99gj7v4113sg7igmd3n44p42nf91m0gpsxb79gmc"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "8.0.0-preview.5.23302.2"; sha256 = "1dqmj5ahlrqn4vymmww6lsca4kpr8a3pihddh78rwxwhgd0dg683"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "8.0.0-preview.5.23302.2"; sha256 = "168zcrhcyxgbmjk64ggg28c3j55fj1hrzdihprq4w5cncmi0qgsx"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "8.0.0-preview.5.23302.2"; sha256 = "061ss2psdhfmn4wh7i5cghk49bawa4qsw9qhlaiqg2815k2l3rr0"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "8.0.0-preview.5.23302.2"; sha256 = "1jm2gqmyk86qppbrr5sl9nf7wh7wgw832p3nmsd0l8by3dnz3cwb"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "8.0.0-preview.5.23302.2"; sha256 = ""; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "8.0.0-preview.5.23302.2"; sha256 = "0pwbbjcwvim69maj8981fnf4v6kmd5ql47a3kadj7y7c1whcg41x"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "8.0.0-preview.5.23302.2"; sha256 = "1cnryxcs0dwzgxpfir3ibi762xrpjlzgxjsagzsmda5y766xkx8j"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "8.0.0-preview.5.23302.2"; sha256 = "1g66zixb90y1qnlayw8cjqdlj6n8s6d4b3y97bl7khrdpp0dn99y"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "8.0.0-preview.5.23302.2"; sha256 = "132fc74r5cviz2057bqpwpk56nwjykh6flliavx2lr5dpcclk78j"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "8.0.0-preview.5.23302.2"; sha256 = "0m0b5lppvsy5d76zj5gigmssiv5yl36xb84f7hn0wzn4idg0zc97"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "8.0.0-preview.5.23302.2"; sha256 = "1g92v7axzr9lm2zl29hpcdjas9yvqpwjx8r5zs18w20iykjz7dhy"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "8.0.0-preview.5.23280.8"; sha256 = "1p8xk4jsf82fnlfn92fg0mxmrvh6fhnv04vbvwl8p2145sqgzlr4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "8.0.0-preview.5.23280.8"; sha256 = "154njplr7vqh3arfg4ygn05z8cwyl5fdr635n704h7p6585dw7xr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "8.0.0-preview.5.23280.8"; sha256 = "0zika3kzi18xj37sy3vs99ypigqxrsvqykrrk8gjnls1dfrgk1gz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "8.0.0-preview.5.23280.8"; sha256 = "0c34kp92s522f3x2fwyvixrnpmm92wc3giw9da9f0ihga4kxs62q"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "8.0.0-preview.5.23280.8"; sha256 = "183lndsg4x0agi0c0jvk88dv122l4hm23fy8wy082iprbdjdfmvw"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "8.0.0-preview.5.23280.8"; sha256 = "0i5kl7gkhn7zpx70f3sygcmbz945f71d9ama9ikb0bd8w316657b"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "8.0.0-preview.5.23280.8"; sha256 = ""; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "8.0.0-preview.5.23280.8"; sha256 = "0if1jkyj5zzsj3v8xramk18hl1arwv14yz17sylac0zi92fa1hy0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "8.0.0-preview.5.23280.8"; sha256 = "15h588yv53panbc1gbslizqr4144g9a5bfjyqcksi5qdh70q0wcd"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "8.0.0-preview.5.23280.8"; sha256 = "16m670bnlql1fd3v9xkd72fh8gjdm5gdxflbg0bka17cdbsl6c3w"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "8.0.0-preview.5.23280.8"; sha256 = "1p2cf5cbb6rqnsrb1ncaw2rxydg3f4ldcyv40h0d8lqypymlxkfb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "8.0.0-preview.5.23280.8"; sha256 = "1lvk6ysazcb6jd51mpwqbwqj05w0rknbwr78wdwi1bfsqkj850n3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "8.0.0-preview.5.23280.8"; sha256 = "1101b3hl12v0p4hxciylb4sx817cjhwlkibyrvq0rcc59ph9r3bi"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "8.0.0-preview.5.23280.8"; sha256 = "1cyvbp2shb8jcm9vcwn9ipgqsbqvwizny40yq12lqis6l2kjxdlk"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.0-preview.5.23280.8"; sha256 = "0qkmy9p708f31yyqmc4przb6vldraasilivpgp4ci55fgv7gqphm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "8.0.0-preview.5.23280.8"; sha256 = "1ijv96vgfidkxcfx8yi2wyf63srld7gjb7d73h8rhimfa6sg3fa2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "8.0.0-preview.5.23280.8"; sha256 = ""; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "8.0.0-preview.5.23280.8"; sha256 = "0azd1hdhnirgqc3q06qrqjxhidk9zj9jqj8nlqddp06r2ql8jki8"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "8.0.0-preview.5.23280.8"; sha256 = "0293dg11f5kbsapp6mq5bkqfv2jpsrv7xw62qvmdn0ky3zfjxls6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "8.0.0-preview.5.23280.8"; sha256 = "1d5z1facifk0q3yk7kx56y91a4gqs94q79myxlrc6zxs204gfywp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.5.23280.8"; sha256 = "1r754iznmx0mz99qifxzm2asm76j8ykmjxiqxbj1y7i525s838im"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.5.23280.8"; sha256 = "1zgyav841b3nwdy2shlda26r1zizprzjrjj731c78drr1ihp0iga"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.5.23280.8"; sha256 = "0ri3fqfrgsl95ya08c99in1ig48m60p326i2dj929hfj9yikzwly"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.5.23280.8"; sha256 = "1k8vzl18g8hclpgd7sy2s5n3ixfnv17csp9akf7nis0y493s1gbf"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.5.23280.8"; sha256 = "0am2i1k527887qqyipwzg0idss5sscah57zr3fvldfb3hxx5xm0m"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.5.23280.8"; sha256 = "08ghakmfzjjn2s4b3s73zrr6g6akxfib4lx0740481abzq985d8x"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.5.23280.8"; sha256 = "1n8ip4zc6sljknl3pk8gkw4rg8ajmnc3qcrivs0jlz79kr95vxds"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.5.23280.8"; sha256 = "02n6psqh8y70v5hgw4k6w823dx4k8iqfp137i1xgxwjmijm7c0sm"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.5.23280.8"; sha256 = "02wgvv0gvhgp1z41rmb4g5d4ld0b8anwahz7514c7bqlk3gvmhaq"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.5.23280.8"; sha256 = "17sm055xml4xfzdbr5cxi546n9gfacz1q5mjznzvng290ds9y34l"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.5.23280.8"; sha256 = "1xr3plgr99423psql74hs038lckf4h32ngphsa2748c6fhck7a43"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.5.23280.8"; sha256 = "08qg0b05wlg6q414fha9qgxsby00mm9qs5r4i2lr250klxih0vbm"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.5.23280.8"; sha256 = "1562mlps4z2n3vjmvvw9q2chxay8chi45ggsfkj2bdg6fmsns8j1"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.5.23280.8"; sha256 = "0rd3wxdmlcj9h5n2jlvmbk2y8qf93wy4f85z6amlzsqkk6pgjxqv"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.5.23280.8"; sha256 = "1s02wwn7jc0a3fa73qyx3hxvzy3f93jknsmqs26frg5bwnj7sz79"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.5.23280.8"; sha256 = "0abyyqcx4ix4xw7f67dhhdj2dpiddsfb6qpd4qqicfd481nvp6yd"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.5.23280.8"; sha256 = "0bfgvcrhgzj78chnnapg5mzkzwyl5m3z5arrk4h31vg041xiamx1"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.5.23280.8"; sha256 = "01dlxshx6riqj03j8cyy9w5i20dkzq2zbvh7av977d465rnyzvak"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.5.23280.8"; sha256 = "1p1xvc15fvvqmmyc55xz3plmdc8j7zvr2z61ngzr6y82grm782j0"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.5.23280.8"; sha256 = "0rva3jjas2fiz643fgc4nhl82l79gws92jwipp7dxq4p7psn93m2"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.5.23280.8"; sha256 = "1xl6ydjv0icj6707a074qc8b2rh2gfq1pibplvnpr3j04hvi3wcc"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.5.23280.8"; sha256 = "1swijczxc4g3rw49ki3ll3b5czm3pahx4x2893sdigrc54xhcyj3"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.5.23280.8"; sha256 = "1gc9rvscpcbv7x2v5j3bvjsikldkzhwhz1d0zszq4ha0wccijqgf"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.5.23280.8"; sha256 = "13g0vkws6acsbg9nq7y7jcmw0p21w8vsj5clw1r0qfwhbypx3gwy"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.5.23280.8"; sha256 = "1nwg176lj8nahsqzffdn3wjirbzfqkjkh940i2jcv621318x1c5a"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.5.23280.8"; sha256 = "1kwd8c67wnv2xl62vaa5fd6dpxdcf32f1bhmzqpk2j4xddjp81p6"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.5.23280.8"; sha256 = "015xh2077rd65lmg2a21x8dd67mqbmxna3jn0fvkhjir31sga18y"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.5.23280.8"; sha256 = "19694r5gr0l5ks1wa76ip9jk8kwbmppc4dk9jv5ppm82ya30mjdv"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.5.23280.8"; sha256 = "0c1yrywmndbb0ckda5nl69xq2mpkmlsz146s55mbd9hil8s4sr9n"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.5.23280.8"; sha256 = "0sx5kyvhgwm05djwqglccwjqnwjglwn3lbh81q8nhxx0m2l07x7w"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.5.23280.8"; sha256 = "1xffjvnc64p23fm7alxsmgrga13xx20ixmllrgv0gnxqbbd192im"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.5.23280.8"; sha256 = "1lw0dj4gpd668mw2aw880zq76yxnz3d74whx3dlz8r4119r6xp54"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.5.23280.8"; sha256 = ""; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.5.23280.8"; sha256 = ""; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.5.23280.8"; sha256 = ""; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.5.23280.8"; sha256 = ""; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.5.23280.8"; sha256 = "11f12zcrj9hif65ai1ifmrxy6in49fyjvf30xh42iv8zzp4b2fp5"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.5.23280.8"; sha256 = "1avarzaaidy2bw44cd3vr9yzjfc6d4i2h8ar8z57bj0y69c7sfbn"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.5.23280.8"; sha256 = "0vblvvs0blsajd01zhzgyxpfdxjz96715r1saz7n66k2v3n22qrf"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.5.23280.8"; sha256 = "054d7gqm4w1svfg6g90gnlzijmj4410q845a095lcs8arg5fdw7i"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.5.23280.8"; sha256 = "00hk4zp2cccxzw87fw1qn59ikd6276wsi46qagg93lsrvm5i2b7p"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.5.23280.8"; sha256 = "10g16wjyl7dzx1al0jhxc65fywbqs84b0m2gzbcwp84q7fn2ap3k"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.5.23280.8"; sha256 = "0j4876vm3jws5ndyg5cp3qlrlpwgv31aijaxcw8nymrxhm0afiz9"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.5.23280.8"; sha256 = "1wz5pvisa22wd2gbd5s70mfnyvrj8jcaz7bi7i9lblsbac63vs34"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "8.0.0-preview.5.23280.8"; sha256 = "18mrbqsawj4r2vw2z7w21vl5m27dwx8zbd4qj58yjv9fcw8lnjgz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "8.0.0-preview.5.23280.8"; sha256 = "1a5mil8zzp6jrjpjj15mcz2mahpj6h7mlqbqygzc7ky5gdzfx7kk"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "8.0.0-preview.5.23280.8"; sha256 = "0z73n85psbmcm2gd5fxicr0zb3nz8hgbs2g961zn9bf92668bp0s"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "8.0.0-preview.5.23280.8"; sha256 = "1qz78a9d5jcfrkcb1ifid65p91h1xxkn32ssbmqprzzx394qnj56"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "8.0.0-preview.5.23280.8"; sha256 = "1d9nzpn3rg8rc3j1hgyafsqjnq5iigwf57waqa4v07vhwv94l2gr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "8.0.0-preview.5.23280.8"; sha256 = "15zwam01k50f2hcy8aj3kj9wvgdvpccvmkin8lq4a5c1hll8867m"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "8.0.0-preview.5.23280.8"; sha256 = "1fswvdzw646lim6z1sj5nf4ccmzv10b6kdywrmxfdbdbc5q31672"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "8.0.0-preview.5.23280.8"; sha256 = "09vd8j32qhflwy2s0xb8mrkidbq1bvkfysb59js7wbjn6fbaqi55"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "8.0.0-preview.5.23280.8"; sha256 = "1sq4rvvwd616vsdw8slpg06lkkdp0cb55g67zz0p8bbiqfzclwc3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "8.0.0-preview.5.23280.8"; sha256 = "0pgsh0qg2hb99hjcxfkvj238g81w16lh3dxl1qvcw9ldi87raskm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "8.0.0-preview.5.23280.8"; sha256 = "1frc2m51qk7ymmygg5dqwp2jfnj0x0qsflmasvwx69w21ncsjp9n"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "8.0.0-preview.5.23280.8"; sha256 = "0zps8ackfk4g07395ywybcr2bsfcfz0asc3ps50hwv8mrfxavfcp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "8.0.0-preview.5.23280.8"; sha256 = "16jack7jcy4vg05949l5j2ykc5g12r2nbcgkrkim094a6cdfnnci"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "8.0.0-preview.5.23280.8"; sha256 = "0r9xl99m3h88l8xmsh4lb4wmf5n9kbdhv2q98rl6r6ggdcb1rwz1"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.5.23280.8"; sha256 = "0v7n2a035ipylqadcm9xnxsnx1lbiwip6m4mwl2gl5b7ibx9n509"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.5.23280.8"; sha256 = "0h176skavpcqfa68l4vk3yy9axq24sc661azcb7i6cpjb0scdcb6"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.5.23280.8"; sha256 = "06lbqcig7grq3g93a754q3bnlrmg4mqr3wi6xxhm0x7k0sxa71hk"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.5.23280.8"; sha256 = "0b68cjjpja582xfwm3dk722sjj88ri5vyawvgrn8lkdkarpcmjna"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-preview.5.23280.8"; sha256 = "1l4pmphc50kciz40w9pggmjsmh3bzfbla76fp5p0ppms0xafkr1y"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-preview.5.23280.8"; sha256 = "13iavci8n0ahsl5k1xasribk93gmkxd3s67xgagasc1gzpkxm8q2"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-preview.5.23280.8"; sha256 = "16aa6sgblm4l1fzsgllmxsxn57qnx430z12n6hm3m08qrlmcpyd9"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-preview.5.23280.8"; sha256 = "05k0h0p6yc02np4m7jdhmc8c2105b22wdldbsklx4rl3jqy7m6p3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "8.0.0-preview.5.23280.8"; sha256 = "1yvaiqblqmsrydbf9gr18rp6d9rqqpzahzxhc62hixfh59l55mi7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "8.0.0-preview.5.23280.8"; sha256 = "06i72xhd0ji755wj8bczv8x8mynyf2kxhx7ysn70crrkk0b7921h"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "8.0.0-preview.5.23280.8"; sha256 = "02ks9j1mybb3f34mjky09nw22la6nhfmkjj5g5gczspqfcc6a2dw"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "8.0.0-preview.5.23280.8"; sha256 = "15plhhljfyaj0cdpsqyq3n0q747p90nvl5kwj6amccadkcy7ahnk"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "8.0.0-preview.5.23280.8"; sha256 = "09vvjm9a7nh6bd8ldf1f0vz1iafp4v77q5d78382hfqan8r505id"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "8.0.0-preview.5.23280.8"; sha256 = "1p21siacj11nbba5czcg4ppk7wny2p3rc2wxg30vs1jj45qvf82c"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "8.0.0-preview.5.23280.8"; sha256 = "1h6xrjvgn0bl615bwmr5l5gpw4qxhbzsqd7sb57m8597cjqc8m35"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "8.0.0-preview.5.23280.8"; sha256 = "0fymmvixx0wh1qa5hrazfr27n0hr3dj1gppipy3mslm325m1zdf4"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-preview.5.23280.8"; sha256 = "0z6cny0jzbwd7skgc3lji00j1z061j4yacrjbhysnq5z5g563r75"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-preview.5.23280.8"; sha256 = "0f72algnr7kknbvw1b17vlw6wvkghw8v4n9fji7ppwbrd8g8i8b0"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-preview.5.23280.8"; sha256 = "1bcps96s8n5iwshxjqwbdvhhr5nkh1f1hn4k79gw1q8ic1c4giq9"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-preview.5.23280.8"; sha256 = "1zixz057s0c282v404l8v3da2dag1cwk79phfv5ps83n4mypzpfb"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-preview.5.23280.8"; sha256 = "12wia5n3kakcdqgj9r3hb9qxbrlcrpdfvmy0yml23cxhqsy8ny92"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-preview.5.23280.8"; sha256 = "0r95iysm08cplqwxh7mm81ji13414nd0shgi7jskspqd2cjmcknk"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-preview.5.23280.8"; sha256 = "1w1jzv64d4ijr6g3sb9w5im11jxxssyqwzas6hycvzvjyxb8f3q9"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "8.0.0-rc.1.23421.29"; sha256 = "0ws54phj14833xz9w53frr3pnq6ps0pfrbz173i9gj5xkhjf3mpb"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "8.0.0-rc.1.23421.29"; sha256 = "1sz6skh1ddvdcib8ydi6km593ah3cchgz2fs61kj03z6jg2vz9la"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "8.0.0-rc.1.23421.29"; sha256 = "1r8681ixjxyixznhwakwb19cs8hnwq7pq87n4dpzqpm531jmjkcm"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "8.0.0-rc.1.23421.29"; sha256 = "1hmza9icxnxj6dcdivxmngpvrg2ncri1gh849rbfzk04swylp6f5"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "8.0.0-rc.1.23421.29"; sha256 = "1m6a47bnrl8n9ahnh01mg2fkc20lmfjjg3f7xzbdngnikm6vzcxv"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "8.0.0-rc.1.23421.29"; sha256 = "0ygb60mpk1rkz67v1d9vf3f7zfvdzg5a4ckc1yqcfb2n4a64rdbv"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "8.0.0-rc.1.23421.29"; sha256 = "027xhd1r4my8952fajl0smpdikj4ndn1j5gkyhwrg4z45xx35q18"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "8.0.0-rc.1.23421.29"; sha256 = "0cir3vy94ki9v0zzkm49f33mxmp25i2v0c3gp4fhmnhpsfn0x7rb"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "8.0.0-rc.1.23421.29"; sha256 = "1ydhf3l9c7grakdr1qsqdgbdvp0zqrc4b66xj7imgpx1k92i2m2c"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "8.0.0-rc.1.23421.29"; sha256 = "1mpha730nn451zp3j7h72a4jiwmgq4sqx4r9943v60yzn93j9nhm"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "8.0.0-rc.1.23421.29"; sha256 = "1r8y9ra1qc0jx04jdkqcqnwaqlkr9ah081c68qslj7a2izhz1sbp"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "8.0.0-rc.1.23421.29"; sha256 = "16vy79c7byrqwd9f7vm0xbah3k4y6yis0flm9jkfk0hp4bb0y0js"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "8.0.0-rc.1.23419.4"; sha256 = "1q8dsj0l622jxwxxmasmwcp1mdxi6fxyr5swhw9pd0vq3i8y13m5"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "8.0.0-rc.1.23419.4"; sha256 = "1254rvx06wjblf0y2msh1zdg0fky861l8x5f5w7hm5l14ys1firb"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "8.0.0-rc.1.23419.4"; sha256 = "1q258zk3kkc3qk39yyfvqw3vlcmz4nf4wxdwg79dfp7i6wcny72v"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "8.0.0-rc.1.23419.4"; sha256 = "0r5f54vyj38b7simbk0481zfawxr3z5q7sivfm23nmfwxpir80ma"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "8.0.0-rc.1.23419.4"; sha256 = "10kjms0wx5iialcvd0fp64vriv4cyk7k22wqh3km9mh43i620px7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "8.0.0-rc.1.23419.4"; sha256 = "03sgkb2ar63wllisx8rmpc3yrngl61yhlmqinwbc5bhyaxpmqnk5"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "8.0.0-rc.1.23419.4"; sha256 = "0b747vkvsapy5p4sgv0nw1hs1hak04pbnsqysj4r7ypf4f9bnrhs"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "8.0.0-rc.1.23419.4"; sha256 = "0lnxq6risl59ig9svhra6papn0i9rs2pr4zgnysnbfg7gvd3fiwh"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "8.0.0-rc.1.23419.4"; sha256 = "1h8xa2kvg6pl8fc1js9lgbvcckh12c496j5hqjiclj6cbsfr3i2g"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "8.0.0-rc.1.23419.4"; sha256 = "0hrxbkqp97mqp6rjpm3azcpvmkkaxz37jl7ybv1bh2m3f0zk66jy"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "8.0.0-rc.1.23419.4"; sha256 = "1x5pq1y4gn1gwnqmq9mj02wki5yncidlnmaf2przz8yingfw0hq6"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "8.0.0-rc.1.23419.4"; sha256 = "1855npscp1ziab6a50fh0vzv8j4z0sarp94cl3c1myk9ndnkzksn"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "8.0.0-rc.1.23419.4"; sha256 = "03ib84r9xjfzifr5g0b7hifyb5nc6ynk5s3pjifcsplhfhr7hhvq"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.0-rc.1.23419.4"; sha256 = "1arzm0mqdj0hnlsfcki8z3zbbp5mpv73133wc8yxpymh6f000bv2"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "8.0.0-rc.1.23419.4"; sha256 = "0f403j2sis8p7y1w2nkbp03xq8qq06f7q94d8clm9c98vppw75sj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "8.0.0-rc.1.23419.4"; sha256 = "1ngwm0hpg00z8hi9kfrc4p8ii51piymn1kkgkbh5wcdz2rmfayc4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "8.0.0-rc.1.23419.4"; sha256 = "00whfl9s9qd43jv68rff5g6da0k6y11yc2pg6v681967fnq31jqp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "8.0.0-rc.1.23419.4"; sha256 = "0rbyh9a41wvygzfja0wm305bqisnsqxhlfhynvb8p5yv1dsg7w4w"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "1s8f5mrwnb66azhbrxpy3ab1b7crr3zj1q8fvsym80kl6xapzwva"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "13a7z8m4izwjd0qh3p01kxadxagq59klw173dqn5l57wzzj8vsxs"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.1.23419.4"; sha256 = "059c21fq6kql04kn56yq5ahm5wc3321b12q50hsg5lk6w3w7xgj7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.1.23419.4"; sha256 = "110aymhj4rj39vpvbkyph9mdx347xydkdcfsdvw1ablfya1p933f"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "0kynd77v947b6lxhjwynm9yvz5mp6wb4d4jbl8ccqzw0f4g57qxq"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "1ix7jjpqzxjyjqfac2csv2j8zr0xai601m14r5swqs3fy1cpm8zg"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.1.23419.4"; sha256 = "19g1awn1ywnmwm6z547011d3q1k2wn58sbg4dm5y4pinmcfm37wm"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.1.23419.4"; sha256 = "0wyafqqjxksrp052rqvwxaqc3m6yzhj095w8myqbjnxwyfzsikcr"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "183lwi2xm45699zhynw7zgd4sa3zpap6p8h2036i94kfr24ir61n"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "041n6jrvwlchdvy7xnmwk0khvf4ybmyq5lvwaiav1xxw0a1dyn3h"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.1.23419.4"; sha256 = "1k6011bq71b3whz9lg7kc8lgf19jn221qzj694m6qqlzrbb3g2s2"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.1.23419.4"; sha256 = "0qkdinyq87rfgiasjgwaggid86xw6kcbjx97w183z4fb65l561mh"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "08h2djggfpjh0q38bq2hjqk5xf48iz343352n6yvsa40rmn7p0fv"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "1j4gw5c2p0fvjdhnyg2fcwlfvdgh4sk0v1w3w004xkf9j5jv1sf1"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.1.23419.4"; sha256 = "0hh73hk9iq15i46k0h2c1y6ixpi5w0i38f8sk5cijbvkpb1cahwc"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.1.23419.4"; sha256 = "0n3qcyyd0qdnv63ym0rlrw5gvq4g4s65qq6qr5nxpn46iwgz9p07"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "1grdchbc8cw94ly9ihnz675c6kg0rnwzdkciwsspnkixfmr8n4wb"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "0ndrih51r1ggdbgbjn2gyvwarl0i6qkzp9ravvx92jn02k4bb5yg"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.1.23419.4"; sha256 = "13x9gnxzk6k6ipijgmi9bivkj4ibqlsb04fs1c0ag0vsdacpwm4d"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.1.23419.4"; sha256 = "0rfkyclsv8451xm8hh8hd55sw9vbr8i60wi67dnjbip61ydl0sfz"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "1bp2aixzvmvmzkaqq4diqw78azg82751s64s2wn2zkjb9big5d2g"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "1mycvp040slw87cl1cnzcfaxmrdjj728sw6dnhyc9z6x75prn7sv"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.1.23419.4"; sha256 = "0a0c3adk3v7qcrxw5wizqxmbkj3fs57r3a0179c8s92vhh4y31l8"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.1.23419.4"; sha256 = "1dgy2n8acl6kcjpaa6s869v52rvvpkra9wrh6af0zy3z7lrjw3za"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "18rzizk0db8ivbl6hm80r5lzyz2i1gjj1k32nsbhh6x6x57b9a05"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "0a8cnaalpb7v09ijm38anh9wyvkd2sza5q87ggmhc0ji10gdlsrr"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.1.23419.4"; sha256 = "1qfyiwpvh1lw48h3jhry2vkk3qq42avgzfq58xspc87g4km7nq45"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.1.23419.4"; sha256 = "0mnpsvlnw2h4ggw6h3y7cb58a0255p4501m7d2k9jyx2fvkrbiqc"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "15h0vxsg91v0yprbg8yf7ny9h0xdy93s4xp7i1x8vqfxizh89l4x"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "0wiqmcib5cwxfsyvhf7gq6r76caycmyns08q8hifqksj6lfbi64d"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.1.23419.4"; sha256 = "0qcnaz0slz50lzpdhghr6gxck5x8ljyhc4p8apsk52ir66cb9sfw"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.1.23419.4"; sha256 = "0x1bgi69ylpr280ayzj60dxbirqab4ysxjwzqfwglbjdvqkkwn38"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "0fdng2vpzljjpdqjnz2pr8naznlx0vgkbypigjfdkpcrmmdhq004"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "0bwbyzcqcbqnaybkb106sq68035vh7kl8i1zlfq6hgd7rsbc5xnx"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.1.23419.4"; sha256 = "060bkh4viwpc1fkhxkpisbxwvfcld1lbm7wjlyl69p84nikyllnf"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.1.23419.4"; sha256 = "0ma4h0bbham9z57i9fdgf3arz6x5cvc5mmcwr0zm7bzyrc049mdd"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "0m95wrq9q8d965yxjkx1mxjnhq35kqhlc868nfkw7i0bgshizaqf"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "0bk9wb7vmb5d8pr2lh1zg0gqkx013b760b6mdhpfc0qp3jfqza5j"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.1.23419.4"; sha256 = "0s5yrj4hgamn6r69z5a8phm8v2wcq4f725jzlpfa90wnys09qn64"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.1.23419.4"; sha256 = "17mla05aq6ab4amw6arq068i3vf3f56gdzhm1s9k2298gfjk71c3"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "8.0.0-rc.1.23419.4"; sha256 = "059v72l55w71i4410jifilgzv9f08mkal7yq87smm5pfmqnl2v35"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "8.0.0-rc.1.23419.4"; sha256 = "0qxnryxvmn6rd8aa1v8knsh974v99n7pqz7lzhyln5f5dr0rpr1s"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "8.0.0-rc.1.23419.4"; sha256 = "024blpk2224i4mvkkdmjrk2zlb7kh1shahkbbk71l7rniagyd2aa"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "8.0.0-rc.1.23419.4"; sha256 = "04k93say7b842bvh2x853skj5ymxsq3b11vf6rkfcqz6b7hvn7pj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "8.0.0-rc.1.23419.4"; sha256 = "139j4mdjhqnysgal1zifnhwpmnhd8i6a0x46bjxcwskqm3n85c2y"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "8.0.0-rc.1.23419.4"; sha256 = "08mfzspgv3sjcvc2smcsab4q35mbj7cn6ky08nr5clvmf32ddkbd"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "8.0.0-rc.1.23419.4"; sha256 = "1wq65zww0ng7w8078bi10km23s7wf1fr2srmzzsk2ailhwhp0ky2"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "8.0.0-rc.1.23419.4"; sha256 = "1285632nhb4gqnxqy1rknfzsqn6cg2xaz1p0chdiqdjlw6n8456x"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "8.0.0-rc.1.23419.4"; sha256 = "0q5pkl6bji11bskxhgnimbbl9zzv3ly335h169qdi98xig7npv2s"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "8.0.0-rc.1.23419.4"; sha256 = "0998hg6n48j7zrhkx7kyn5hk0axf7h9g61qh4gbfpn353zf6ajbx"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "8.0.0-rc.1.23419.4"; sha256 = "1s1i1xlszd7rfrg76m616rlwg96zsap81wcjvj68nijfmv563snz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "8.0.0-rc.1.23419.4"; sha256 = "0aif2k51bxc59rskjivcp7lwdnmdw7dnh5gw5aj0hgd1shljms9y"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "8.0.0-rc.1.23419.4"; sha256 = "1j5l7zqr8jkj4bgrnmf9ay0zfc43m47q78f8xkiv96pa2bxp9b29"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "0aklq0jrjcqgihc6l7cn1j5swz3kxsq02zrvl745a197k2jr10hm"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "17ffbsy4cfplaw8cdly3gqfgkzqxmbgrbwnqca6b7lak1ab53mr3"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.1.23419.4"; sha256 = "0kk6w9sid9hkqggxxnmzmz3ng14qq049qhz06zq40lhcgbyik96h"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.1.23419.4"; sha256 = "14s7gxqid5yrlja1aimaq3r40bj2p5karn8ma80368m3zlslm1dw"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "0k24km7x79kxy4blmgzclvqw4m8smlprb0hyi279s1ddg0vpplc4"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "1davz97niy36wpsim42yrjm77k6sflcsc0sy5nb6lq9kxj02hypy"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.1.23419.4"; sha256 = "00xw4yjkvdl0x1c60cbbh5gf51cmax2laplhlgilkyazjzrbf3xr"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.1.23419.4"; sha256 = "08yqn96i057lfdrs7xjbambw7sr2aalhskkblvyhqykf8sw24ckb"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "8.0.0-rc.1.23419.4"; sha256 = "1w5p3lngqmp5yqwh96kjdhdlzszik5vw9nx7snsfysjwyhgbr8b0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "8.0.0-rc.1.23419.4"; sha256 = "0zwvkqg0nf981gr6wff2ci2dhb6rc9girg3s0gqz7ysldbxnznsd"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "8.0.0-rc.1.23419.4"; sha256 = "0kc57i32xqmrjif82czr7ivsrzf41wmdc0zjkk3qak3j8s0j629f"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "8.0.0-rc.1.23419.4"; sha256 = "1l8mz0l6g4zv2qnrfsj85miknhq230942l8xvw62bzw4rv89lcp1"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "8.0.0-rc.1.23419.4"; sha256 = "1d7m6zgiakdqi6ga0xdaamqjk6y8bxd2fxirmrgzpr0l57zqwhc3"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "8.0.0-rc.1.23419.4"; sha256 = "084pm2qnh8mn5cpf4zs7drqs5zifbph0s6m9h62xgrixw3jv4i6x"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "8.0.0-rc.1.23419.4"; sha256 = "0szyl8qyc5yc2ah9if4xk20wgny5cbr7hmdl2mzqpbpn5fcm36b6"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "8.0.0-rc.1.23419.4"; sha256 = "1mavnwcgnzx1dn7h0cg172p0yv00xdaspi6vk34df1s6d4cc35vh"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-rc.1.23419.4"; sha256 = "0xqxz80rr7h1qlgw6ax2pqj33ngv31xbzljhpd60iv229lfzdvia"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-rc.1.23419.4"; sha256 = "1k6ivz7pcwk7w7fq283q2n88bm0rw7acfl8w9nj8iyag8gi7rpyp"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-rc.1.23419.4"; sha256 = "0al490xcj68xp13q2xl15wd03zld1l3qf88sd651q6jixgwrzbm6"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-rc.1.23419.4"; sha256 = "0wan79hagmkh2in263lbpsydr96l4s6i48qylpgn3fzwdv24idb3"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-rc.1.23419.4"; sha256 = "0jb3gx2ydf4jq0szk071g4l4286alffa6hc4xhy3zqax4vggyakz"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-rc.1.23419.4"; sha256 = "0v4g1bva86vxvkhfcimmr30i5d7xm0r9sknf84az2b450b5vfgpm"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-rc.1.23419.4"; sha256 = "0944c1j5gd3hvw7aij5y8wydbv70zb7dw8gs4qpavwjg8vcbs9cx"; }) ]; }; } diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index 3a039014db842..d34ae7b8143e6 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -2,6 +2,7 @@ , clangStdenv , fetchFromGitHub , fetchpatch +, runCommand , libuuid , python3 , bc @@ -28,9 +29,9 @@ buildType = if stdenv.isDarwin then else "GCC5"; -edk2 = stdenv.mkDerivation { +edk2 = stdenv.mkDerivation rec { pname = "edk2"; - version = "202305"; + version = "202308"; patches = [ # pass targetPrefix as an env var @@ -40,15 +41,24 @@ edk2 = stdenv.mkDerivation { }) ]; - # submodules - src = fetchFromGitHub { + srcWithVendoring = fetchFromGitHub { owner = "tianocore"; repo = "edk2"; rev = "edk2-stable${edk2.version}"; fetchSubmodules = true; - hash = "sha256-htOvV43Hw5K05g0SF3po69HncLyma3BtgpqYSdzRG4s="; + hash = "sha256-Eoi1xf/hw/Knr7n0f0rgVof7wTgrHkmvV4eJjJV1NhM="; }; + # We don't want EDK2 to keep track of OpenSSL, + # they're frankly bad at it. + src = runCommand "edk2-unvendored-src" { } '' + cp --no-preserve=mode -r ${srcWithVendoring} $out + rm -rf $out/CryptoPkg/Library/OpensslLib/openssl + mkdir -p $out/CryptoPkg/Library/OpensslLib/openssl + tar --strip-components=1 -xf ${buildPackages.openssl.src} -C $out/CryptoPkg/Library/OpensslLib/openssl + chmod -R +w $out/ + ''; + nativeBuildInputs = [ pythonEnv ]; depsBuildBuild = [ buildPackages.stdenv.cc buildPackages.util-linux buildPackages.bash ]; strictDeps = true; @@ -58,7 +68,9 @@ edk2 = stdenv.mkDerivation { makeFlags = [ "-C BaseTools" ]; - env.NIX_CFLAGS_COMPILE = "-Wno-return-type" + lib.optionalString (stdenv.cc.isGNU) " -Wno-error=stringop-truncation"; + env.NIX_CFLAGS_COMPILE = "-Wno-return-type" + + lib.optionalString (stdenv.cc.isGNU) " -Wno-error=stringop-truncation" + + lib.optionalString (stdenv.isDarwin) " -Wno-error=macro-redefined"; hardeningDisable = [ "format" "fortify" ]; @@ -69,6 +81,7 @@ edk2 = stdenv.mkDerivation { # patchShebangs fails to see these when cross compiling for i in $out/BaseTools/BinWrappers/PosixLike/*; do substituteInPlace $i --replace '/usr/bin/env bash' ${buildPackages.bash}/bin/bash + chmod +x "$i" done ''; diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index b96bd24deddbd..296c815e31f6e 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -247,6 +247,7 @@ in lib.makeScope pkgs.newScope (self: with self; { # see upstream issue https://github.com/dillonkearns/elm-pages/issues/305 for dealing with the read-only problem preFixup = '' patch $out/lib/node_modules/elm-pages/generator/src/codegen.js ${./packages/elm-pages-fix-read-only.patch} + patch $out/lib/node_modules/elm-pages/generator/src/init.js ${./packages/elm-pages-fix-init-read-only.patch} ''; postFixup = '' diff --git a/pkgs/development/compilers/elm/packages/elm-pages-fix-init-read-only.patch b/pkgs/development/compilers/elm/packages/elm-pages-fix-init-read-only.patch new file mode 100644 index 0000000000000..9704ef9f7c088 --- /dev/null +++ b/pkgs/development/compilers/elm/packages/elm-pages-fix-init-read-only.patch @@ -0,0 +1,39 @@ +diff --git a/generator/src/init.js b/generator/src/init.js +index 06386ff..7127dae 100644 +--- a/generator/src/init.js ++++ b/generator/src/init.js +@@ -6,6 +6,20 @@ import { fileURLToPath } from "url"; + const __filename = fileURLToPath(import.meta.url); + const __dirname = path.dirname(__filename); + ++let walknDo = function(somePath, doStuff) { ++ doStuff(somePath, true); ++ const dir = fs.readdirSync(somePath) ++ dir.forEach((i) => { ++ let p = path.join(somePath, i); ++ const s = fs.statSync(p) ++ if (s.isDirectory()) { ++ walknDo(p, doStuff) ++ } else { ++ doStuff(p); ++ } ++ }); ++} ++ + /** + * @param {string} name + */ +@@ -18,6 +32,13 @@ export async function run(name) { + if (!fs.existsSync(name)) { + try { + await fsExtra.copy(template, appRoot); ++ walknDo(appRoot, (file, isDir) => { ++ if (isDir) { ++ fs.chmodSync(file, 0o755); ++ } else { ++ fs.chmodSync(file, 0o644); ++ } ++ }); + fs.renameSync( + path.resolve(appRoot, "gitignore"), + path.resolve(appRoot, ".gitignore") diff --git a/pkgs/development/compilers/elm/packages/elm-pages-fix-read-only.patch b/pkgs/development/compilers/elm/packages/elm-pages-fix-read-only.patch index ed9657f91151c..547f89f86f69c 100644 --- a/pkgs/development/compilers/elm/packages/elm-pages-fix-read-only.patch +++ b/pkgs/development/compilers/elm/packages/elm-pages-fix-read-only.patch @@ -1,18 +1,11 @@ diff --git a/generator/src/codegen.js b/generator/src/codegen.js -index a0ef8806e..fe00ac904 100644 +index baf5368..e5edf4d 100644 --- a/generator/src/codegen.js +++ b/generator/src/codegen.js -@@ -20,33 +20,33 @@ async function generate(basePath) { +@@ -37,9 +37,9 @@ export async function generate(basePath) { + copyToBoth("SiteConfig.elm"), - const uiFileContent = elmPagesUiFile(); - await Promise.all([ -- fs.promises.copyFile( -- path.join(__dirname, `./Page.elm`), -- `./.elm-pages/Page.elm` -+ fs.promises.writeFile( -+ `./.elm-pages/Page.elm`, -+ fs.readFileSync(path.join(__dirname, `./Page.elm`)) - ), + fs.promises.writeFile("./.elm-pages/Pages.elm", uiFileContent), - fs.promises.copyFile( - path.join(__dirname, `./elm-application.json`), - `./elm-stuff/elm-pages/elm-application.json` @@ -20,40 +13,27 @@ index a0ef8806e..fe00ac904 100644 + `./elm-stuff/elm-pages/elm-application.json`, + fs.readFileSync(path.join(__dirname, `./elm-application.json`)) ), -- fs.promises.copyFile( -- path.join(__dirname, `./Page.elm`), -- `./elm-stuff/elm-pages/.elm-pages/Page.elm` -+ fs.promises.writeFile( -+ `./elm-stuff/elm-pages/.elm-pages/Page.elm`, -+ fs.readFileSync(path.join(__dirname, `./Page.elm`)) - ), -- fs.promises.copyFile( -- path.join(__dirname, `./SharedTemplate.elm`), -- `./.elm-pages/SharedTemplate.elm` -+ fs.promises.writeFile( -+ `./.elm-pages/SharedTemplate.elm`, -+ fs.readFileSync(path.join(__dirname, `./SharedTemplate.elm`)) - ), -- fs.promises.copyFile( -- path.join(__dirname, `./SharedTemplate.elm`), -- `./elm-stuff/elm-pages/.elm-pages/SharedTemplate.elm` -+ fs.promises.writeFile( -+ `./elm-stuff/elm-pages/.elm-pages/SharedTemplate.elm`, -+ fs.readFileSync(path.join(__dirname, `./SharedTemplate.elm`)) - ), -- fs.promises.copyFile( -- path.join(__dirname, `./SiteConfig.elm`), -- `./.elm-pages/SiteConfig.elm` -+ fs.promises.writeFile( -+ `./.elm-pages/SiteConfig.elm`, -+ fs.readFileSync(path.join(__dirname, `./SiteConfig.elm`)) - ), -- fs.promises.copyFile( -- path.join(__dirname, `./SiteConfig.elm`), -- `./elm-stuff/elm-pages/.elm-pages/SiteConfig.elm` -+ fs.promises.writeFile( -+ `./elm-stuff/elm-pages/.elm-pages/SiteConfig.elm`, -+ fs.readFileSync(path.join(__dirname, `./SiteConfig.elm`)) - ), - fs.promises.writeFile("./.elm-pages/Pages.elm", uiFileContent), // write `Pages.elm` with cli interface + fs.promises.writeFile( +@@ -82,9 +82,9 @@ function writeFetcherModules(basePath, fetcherData) { + } + + async function newCopyBoth(modulePath) { +- await fs.promises.copyFile( +- path.join(__dirname, modulePath), +- path.join(`./elm-stuff/elm-pages/client/.elm-pages/`, modulePath) ++ await fs.promises.writeFile( ++ path.join(`./elm-stuff/elm-pages/client/.elm-pages/`, modulePath), ++ fs.readFileSync(path.join(__dirname, modulePath)) + ); + } + +@@ -197,7 +197,7 @@ async function copyFileEnsureDir(from, to) { + await fs.promises.mkdir(path.dirname(to), { + recursive: true, + }); +- await fs.promises.copyFile(from, to); ++ await fs.promises.writeFile(to, fs.readFileSync(from)); + } + + /** diff --git a/pkgs/development/compilers/elm/packages/elm-srcs.nix b/pkgs/development/compilers/elm/packages/elm-srcs.nix index 0d4523b8b0982..708d81455d693 100644 --- a/pkgs/development/compilers/elm/packages/elm-srcs.nix +++ b/pkgs/development/compilers/elm/packages/elm-srcs.nix @@ -5,9 +5,14 @@ version = "1.0.0"; }; - "elm/json" = { - sha256 = "1a107nmm905dih4w4mjjkkpdcjbgaf5qjvr7fl30kkpkckfjjnrw"; - version = "1.1.2"; + "elm/browser" = { + sha256 = "1zlmx672glg7fdgkvh5jm47y85pv7pdfr5mkhg6x7ar6k000vyka"; + version = "1.0.1"; + }; + + "elm/core" = { + sha256 = "1l0qdbczw91kzz8sx5d5zwz9x662bspy7p21dsr3f2rigxiix2as"; + version = "1.0.2"; }; "elm/html" = { @@ -15,9 +20,14 @@ version = "1.0.0"; }; - "elm/svg" = { - sha256 = "1cwcj73p61q45wqwgqvrvz3aypjyy3fw732xyxdyj6s256hwkn0k"; - version = "1.0.1"; + "elm/http" = { + sha256 = "008bs76mnp48b4dw8qwjj4fyvzbxvlrl4xpa2qh1gg2kfwyw56v1"; + version = "2.0.0"; + }; + + "elm/json" = { + sha256 = "1a107nmm905dih4w4mjjkkpdcjbgaf5qjvr7fl30kkpkckfjjnrw"; + version = "1.1.2"; }; "elm/project-metadata-utils" = { @@ -25,21 +35,11 @@ version = "1.0.0"; }; - "elm/browser" = { - sha256 = "1zlmx672glg7fdgkvh5jm47y85pv7pdfr5mkhg6x7ar6k000vyka"; + "elm/svg" = { + sha256 = "1cwcj73p61q45wqwgqvrvz3aypjyy3fw732xyxdyj6s256hwkn0k"; version = "1.0.1"; }; - "elm/core" = { - sha256 = "1l0qdbczw91kzz8sx5d5zwz9x662bspy7p21dsr3f2rigxiix2as"; - version = "1.0.2"; - }; - - "elm/http" = { - sha256 = "008bs76mnp48b4dw8qwjj4fyvzbxvlrl4xpa2qh1gg2kfwyw56v1"; - version = "2.0.0"; - }; - "elm/bytes" = { sha256 = "040d7irrawcbnq9jxhzx8p9qacdlw5bncy6lgndd6inm53rvvwbp"; version = "1.0.7"; @@ -55,13 +55,13 @@ version = "1.1.0"; }; - "elm/url" = { - sha256 = "0av8x5syid40sgpl5vd7pry2rq0q4pga28b4yykn9gd9v12rs3l4"; + "elm/time" = { + sha256 = "0vch7i86vn0x8b850w1p69vplll1bnbkp8s383z7pinyg94cm2z1"; version = "1.0.0"; }; - "elm/time" = { - sha256 = "0vch7i86vn0x8b850w1p69vplll1bnbkp8s383z7pinyg94cm2z1"; + "elm/url" = { + sha256 = "0av8x5syid40sgpl5vd7pry2rq0q4pga28b4yykn9gd9v12rs3l4"; version = "1.0.0"; }; diff --git a/pkgs/development/compilers/elm/packages/elm.nix b/pkgs/development/compilers/elm/packages/elm.nix index e24ece00ffef8..a0c248af17bb3 100644 --- a/pkgs/development/compilers/elm/packages/elm.nix +++ b/pkgs/development/compilers/elm/packages/elm.nix @@ -1,12 +1,11 @@ { mkDerivation, ansi-terminal, ansi-wl-pprint, base, binary , bytestring, containers, directory, edit-distance, fetchgit , file-embed, filelock, filepath, ghc-prim, haskeline, HTTP -, http-client, http-client-tls, http-types, language-glsl, mtl +, http-client, http-client-tls, http-types, language-glsl, lib, mtl , network, parsec, process, raw-strings-qq, scientific, SHA -, snap-core, snap-server, lib, template-haskell, time +, snap-core, snap-server, template-haskell, time , unordered-containers, utf8-string, vector, zip-archive }: - mkDerivation { pname = "elm"; version = "0.19.1"; @@ -29,4 +28,5 @@ mkDerivation { homepage = "https://elm-lang.org"; description = "The `elm` command line interface"; license = lib.licenses.bsd3; + mainProgram = "elm"; } diff --git a/pkgs/development/compilers/elm/packages/node-packages.nix b/pkgs/development/compilers/elm/packages/node-packages.nix index f102e468f14cd..a30c6ac53d959 100644 --- a/pkgs/development/compilers/elm/packages/node-packages.nix +++ b/pkgs/development/compilers/elm/packages/node-packages.nix @@ -4,6 +4,15 @@ let sources = { + "@adobe/css-tools-4.2.0" = { + name = "_at_adobe_slash_css-tools"; + packageName = "@adobe/css-tools"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.2.0.tgz"; + sha512 = "E09FiIft46CmH5Qnjb0wsW54/YQd69LsxeKUOWawmws1XWvyFGURnAChH0mlr7YPFR1ofwvUQfcL0J3lMxXqPA=="; + }; + }; "@babel/cli-7.12.10" = { name = "_at_babel_slash_cli"; packageName = "@babel/cli"; @@ -22,22 +31,22 @@ let sha512 = "OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA=="; }; }; - "@babel/code-frame-7.21.4" = { + "@babel/code-frame-7.22.13" = { name = "_at_babel_slash_code-frame"; packageName = "@babel/code-frame"; - version = "7.21.4"; + version = "7.22.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.21.4.tgz"; - sha512 = "LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g=="; + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz"; + sha512 = "XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w=="; }; }; - "@babel/compat-data-7.21.7" = { + "@babel/compat-data-7.22.20" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.21.7"; + version = "7.22.20"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.21.7.tgz"; - sha512 = "KYMqFYTaenzMK4yUtf4EW9wc4N9ef80FsbMtkwool5zpwl4YrT1SdWYSTRcT94KO4hannogdS+LxY7L+arP3gA=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.20.tgz"; + sha512 = "BQYjKbpXjoXwFW5jGqiizJQQT/aC7pFm9Ok1OWssonuguICi264lbgMzRp2ZMmRSlfkX6DsWDDcsrctK8Rwfiw=="; }; }; "@babel/core-7.12.10" = { @@ -49,238 +58,238 @@ let sha512 = "eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w=="; }; }; - "@babel/generator-7.21.5" = { + "@babel/generator-7.23.0" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.21.5"; + version = "7.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.21.5.tgz"; - sha512 = "SrKK/sRv8GesIW1bDagf9cCG38IOMYZusoe1dfg0D8aiUe3Amvoj1QtjTPAWcfrZFvIwlleLb0gxzQidL9w14w=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz"; + sha512 = "lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g=="; }; }; - "@babel/helper-annotate-as-pure-7.18.6" = { + "@babel/helper-annotate-as-pure-7.22.5" = { name = "_at_babel_slash_helper-annotate-as-pure"; packageName = "@babel/helper-annotate-as-pure"; - version = "7.18.6"; + version = "7.22.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz"; - sha512 = "duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA=="; + url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz"; + sha512 = "LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg=="; }; }; - "@babel/helper-builder-binary-assignment-operator-visitor-7.21.5" = { + "@babel/helper-builder-binary-assignment-operator-visitor-7.22.15" = { name = "_at_babel_slash_helper-builder-binary-assignment-operator-visitor"; packageName = "@babel/helper-builder-binary-assignment-operator-visitor"; - version = "7.21.5"; + version = "7.22.15"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.21.5.tgz"; - sha512 = "uNrjKztPLkUk7bpCNC0jEKDJzzkvel/W+HguzbN8krA+LPfC1CEobJEvAvGka2A/M+ViOqXdcRL0GqPUJSjx9g=="; + url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz"; + sha512 = "QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw=="; }; }; - "@babel/helper-compilation-targets-7.21.5" = { + "@babel/helper-compilation-targets-7.22.15" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.21.5"; + version = "7.22.15"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.21.5.tgz"; - sha512 = "1RkbFGUKex4lvsB9yhIfWltJM5cZKUftB2eNajaDv3dCMEp49iBG0K14uH8NnX9IPux2+mK7JGEOB0jn48/J6w=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz"; + sha512 = "y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw=="; }; }; - "@babel/helper-create-class-features-plugin-7.21.8" = { + "@babel/helper-create-class-features-plugin-7.22.15" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.21.8"; + version = "7.22.15"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.21.8.tgz"; - sha512 = "+THiN8MqiH2AczyuZrnrKL6cAxFRRQDKW9h1YkBvbgKmAm6mwiacig1qT73DHIWMGo40GRnsEfN3LA+E6NtmSw=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.15.tgz"; + sha512 = "jKkwA59IXcvSaiK2UN45kKwSC9o+KuoXsBDvHvU/7BecYIp8GQ2UwrVvFgJASUT+hBnwJx6MhvMCuMzwZZ7jlg=="; }; }; - "@babel/helper-create-regexp-features-plugin-7.21.8" = { + "@babel/helper-create-regexp-features-plugin-7.22.15" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.21.8"; + version = "7.22.15"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.21.8.tgz"; - sha512 = "zGuSdedkFtsFHGbexAvNuipg1hbtitDLo2XE8/uf6Y9sOQV1xsYX/2pNbtedp/X0eU1pIt+kGvaqHCowkRbS5g=="; + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz"; + sha512 = "29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w=="; }; }; - "@babel/helper-environment-visitor-7.21.5" = { + "@babel/helper-environment-visitor-7.22.20" = { name = "_at_babel_slash_helper-environment-visitor"; packageName = "@babel/helper-environment-visitor"; - version = "7.21.5"; + version = "7.22.20"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.21.5.tgz"; - sha512 = "IYl4gZ3ETsWocUWgsFZLM5i1BYx9SoemminVEXadgLBa9TdeorzgLKm8wWLA6J1N/kT3Kch8XIk1laNzYoHKvQ=="; + url = "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz"; + sha512 = "zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA=="; }; }; - "@babel/helper-function-name-7.21.0" = { + "@babel/helper-function-name-7.23.0" = { name = "_at_babel_slash_helper-function-name"; packageName = "@babel/helper-function-name"; - version = "7.21.0"; + version = "7.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz"; - sha512 = "HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg=="; + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz"; + sha512 = "OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw=="; }; }; - "@babel/helper-hoist-variables-7.18.6" = { + "@babel/helper-hoist-variables-7.22.5" = { name = "_at_babel_slash_helper-hoist-variables"; packageName = "@babel/helper-hoist-variables"; - version = "7.18.6"; + version = "7.22.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz"; - sha512 = "UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q=="; + url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz"; + sha512 = "wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw=="; }; }; - "@babel/helper-member-expression-to-functions-7.21.5" = { + "@babel/helper-member-expression-to-functions-7.23.0" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.21.5"; + version = "7.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.21.5.tgz"; - sha512 = "nIcGfgwpH2u4n9GG1HpStW5Ogx7x7ekiFHbjjFRKXbn5zUvqO9ZgotCO4x1aNbKn/x/xOUaXEhyNHCwtFCpxWg=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz"; + sha512 = "6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA=="; }; }; - "@babel/helper-module-imports-7.21.4" = { + "@babel/helper-module-imports-7.22.15" = { name = "_at_babel_slash_helper-module-imports"; packageName = "@babel/helper-module-imports"; - version = "7.21.4"; + version = "7.22.15"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.21.4.tgz"; - sha512 = "orajc5T2PsRYUN3ZryCEFeMDYwyw09c/pZeaQEZPH0MpKzSvn3e0uXsDBu3k03VI+9DBiRo+l22BfKTpKwa/Wg=="; + url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz"; + sha512 = "0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w=="; }; }; - "@babel/helper-module-transforms-7.21.5" = { + "@babel/helper-module-transforms-7.23.0" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.21.5"; + version = "7.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.21.5.tgz"; - sha512 = "bI2Z9zBGY2q5yMHoBvJ2a9iX3ZOAzJPm7Q8Yz6YeoUjU/Cvhmi2G4QyTNyPBqqXSgTjUxRg3L0xV45HvkNWWBw=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.0.tgz"; + sha512 = "WhDWw1tdrlT0gMgUJSlX0IQvoO1eN279zrAUbVB+KpV2c3Tylz8+GnKOLllCS6Z/iZQEyVYxhZVUdPTqs2YYPw=="; }; }; - "@babel/helper-optimise-call-expression-7.18.6" = { + "@babel/helper-optimise-call-expression-7.22.5" = { name = "_at_babel_slash_helper-optimise-call-expression"; packageName = "@babel/helper-optimise-call-expression"; - version = "7.18.6"; + version = "7.22.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz"; - sha512 = "HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA=="; + url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz"; + sha512 = "HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw=="; }; }; - "@babel/helper-plugin-utils-7.21.5" = { + "@babel/helper-plugin-utils-7.22.5" = { name = "_at_babel_slash_helper-plugin-utils"; packageName = "@babel/helper-plugin-utils"; - version = "7.21.5"; + version = "7.22.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.21.5.tgz"; - sha512 = "0WDaIlXKOX/3KfBK/dwP1oQGiPh6rjMkT7HIRv7i5RR2VUMwrx5ZL0dwBkKx7+SW1zwNdgjHd34IMk5ZjTeHVg=="; + url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz"; + sha512 = "uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg=="; }; }; - "@babel/helper-remap-async-to-generator-7.18.9" = { + "@babel/helper-remap-async-to-generator-7.22.20" = { name = "_at_babel_slash_helper-remap-async-to-generator"; packageName = "@babel/helper-remap-async-to-generator"; - version = "7.18.9"; + version = "7.22.20"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz"; - sha512 = "dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA=="; + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz"; + sha512 = "pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw=="; }; }; - "@babel/helper-replace-supers-7.21.5" = { + "@babel/helper-replace-supers-7.22.20" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.21.5"; + version = "7.22.20"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.21.5.tgz"; - sha512 = "/y7vBgsr9Idu4M6MprbOVUfH3vs7tsIfnVWv/Ml2xgwvyH6LTngdfbf5AdsKwkJy4zgy1X/kuNrEKvhhK28Yrg=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz"; + sha512 = "qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw=="; }; }; - "@babel/helper-simple-access-7.21.5" = { + "@babel/helper-simple-access-7.22.5" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; - version = "7.21.5"; + version = "7.22.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.21.5.tgz"; - sha512 = "ENPDAMC1wAjR0uaCUwliBdiSl1KBJAVnMTzXqi64c2MG8MPR6ii4qf7bSXDqSFbr4W6W028/rf5ivoHop5/mkg=="; + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz"; + sha512 = "n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w=="; }; }; - "@babel/helper-skip-transparent-expression-wrappers-7.20.0" = { + "@babel/helper-skip-transparent-expression-wrappers-7.22.5" = { name = "_at_babel_slash_helper-skip-transparent-expression-wrappers"; packageName = "@babel/helper-skip-transparent-expression-wrappers"; - version = "7.20.0"; + version = "7.22.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz"; - sha512 = "5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg=="; + url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz"; + sha512 = "tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q=="; }; }; - "@babel/helper-split-export-declaration-7.18.6" = { + "@babel/helper-split-export-declaration-7.22.6" = { name = "_at_babel_slash_helper-split-export-declaration"; packageName = "@babel/helper-split-export-declaration"; - version = "7.18.6"; + version = "7.22.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz"; - sha512 = "bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA=="; + url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz"; + sha512 = "AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g=="; }; }; - "@babel/helper-string-parser-7.21.5" = { + "@babel/helper-string-parser-7.22.5" = { name = "_at_babel_slash_helper-string-parser"; packageName = "@babel/helper-string-parser"; - version = "7.21.5"; + version = "7.22.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.21.5.tgz"; - sha512 = "5pTUx3hAJaZIdW99sJ6ZUUgWq/Y+Hja7TowEnLNMm1VivRgZQL3vpBY3qUACVsvw+yQU6+YgfBVmcbLaZtrA1w=="; + url = "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz"; + sha512 = "mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw=="; }; }; - "@babel/helper-validator-identifier-7.19.1" = { + "@babel/helper-validator-identifier-7.22.20" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; - version = "7.19.1"; + version = "7.22.20"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz"; - sha512 = "awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="; + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz"; + sha512 = "Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A=="; }; }; - "@babel/helper-validator-option-7.21.0" = { + "@babel/helper-validator-option-7.22.15" = { name = "_at_babel_slash_helper-validator-option"; packageName = "@babel/helper-validator-option"; - version = "7.21.0"; + version = "7.22.15"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz"; - sha512 = "rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ=="; + url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz"; + sha512 = "bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA=="; }; }; - "@babel/helper-wrap-function-7.20.5" = { + "@babel/helper-wrap-function-7.22.20" = { name = "_at_babel_slash_helper-wrap-function"; packageName = "@babel/helper-wrap-function"; - version = "7.20.5"; + version = "7.22.20"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.20.5.tgz"; - sha512 = "bYMxIWK5mh+TgXGVqAtnu5Yn1un+v8DDZtqyzKRLUzrh70Eal2O3aZ7aPYiMADO4uKlkzOiRiZ6GX5q3qxvW9Q=="; + url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz"; + sha512 = "pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw=="; }; }; - "@babel/helpers-7.21.5" = { + "@babel/helpers-7.23.1" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.21.5"; + version = "7.23.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.21.5.tgz"; - sha512 = "BSY+JSlHxOmGsPTydUkPf1MdMQ3M81x5xGCOVgWM3G8XH77sJ292Y2oqcp0CbbgxhqBuI46iUz1tT7hqP7EfgA=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.1.tgz"; + sha512 = "chNpneuK18yW5Oxsr+t553UZzzAs3aZnFm4bxhebsNTeshrC95yA7l5yl7GBAG+JG1rF0F7zzD2EixK9mWSDoA=="; }; }; - "@babel/highlight-7.18.6" = { + "@babel/highlight-7.22.20" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.18.6"; + version = "7.22.20"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz"; - sha512 = "u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz"; + sha512 = "dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg=="; }; }; - "@babel/parser-7.21.8" = { + "@babel/parser-7.23.0" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.21.8"; + version = "7.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.21.8.tgz"; - sha512 = "6zavDGdzG3gUqAdWvlLFfk+36RilI+Pwyuuh7HItyeScCWP3k6i8vKclAQ0bM/0y/Kz/xiwvxhMv9MgTJP5gmA=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz"; + sha512 = "vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw=="; }; }; "@babel/plugin-proposal-async-generator-functions-7.20.7" = { @@ -508,229 +517,229 @@ let sha512 = "hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw=="; }; }; - "@babel/plugin-transform-arrow-functions-7.21.5" = { + "@babel/plugin-transform-arrow-functions-7.22.5" = { name = "_at_babel_slash_plugin-transform-arrow-functions"; packageName = "@babel/plugin-transform-arrow-functions"; - version = "7.21.5"; + version = "7.22.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.21.5.tgz"; - sha512 = "wb1mhwGOCaXHDTcsRYMKF9e5bbMgqwxtqa2Y1ifH96dXJPwbuLX9qHy3clhrxVqgMz7nyNXs8VkxdH8UBcjKqA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz"; + sha512 = "26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw=="; }; }; - "@babel/plugin-transform-async-to-generator-7.20.7" = { + "@babel/plugin-transform-async-to-generator-7.22.5" = { name = "_at_babel_slash_plugin-transform-async-to-generator"; packageName = "@babel/plugin-transform-async-to-generator"; - version = "7.20.7"; + version = "7.22.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.20.7.tgz"; - sha512 = "Uo5gwHPT9vgnSXQxqGtpdufUiWp96gk7yiP4Mp5bm1QMkEmLXBO7PAGYbKoJ6DhAwiNkcHFBol/x5zZZkL/t0Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz"; + sha512 = "b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ=="; }; }; - "@babel/plugin-transform-block-scoped-functions-7.18.6" = { + "@babel/plugin-transform-block-scoped-functions-7.22.5" = { name = "_at_babel_slash_plugin-transform-block-scoped-functions"; packageName = "@babel/plugin-transform-block-scoped-functions"; - version = "7.18.6"; + version = "7.22.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz"; - sha512 = "ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz"; + sha512 = "tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA=="; }; }; - "@babel/plugin-transform-block-scoping-7.21.0" = { + "@babel/plugin-transform-block-scoping-7.23.0" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.21.0"; + version = "7.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.21.0.tgz"; - sha512 = "Mdrbunoh9SxwFZapeHVrwFmri16+oYotcZysSzhNIVDwIAb1UV+kvnxULSYq9J3/q5MDG+4X6w8QVgD1zhBXNQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.0.tgz"; + sha512 = "cOsrbmIOXmf+5YbL99/S49Y3j46k/T16b9ml8bm9lP6N9US5iQ2yBK7gpui1pg0V/WMcXdkfKbTb7HXq9u+v4g=="; }; }; - "@babel/plugin-transform-classes-7.21.0" = { + "@babel/plugin-transform-classes-7.22.15" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.21.0"; + version = "7.22.15"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.21.0.tgz"; - sha512 = "RZhbYTCEUAe6ntPehC4hlslPWosNHDox+vAs4On/mCLRLfoDVHf6hVEd7kuxr1RnHwJmxFfUM3cZiZRmPxJPXQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.15.tgz"; + sha512 = "VbbC3PGjBdE0wAWDdHM9G8Gm977pnYI0XpqMd6LrKISj8/DJXEsWqgRuTYaNE9Bv0JGhTZUzHDlMk18IpOuoqw=="; }; }; - "@babel/plugin-transform-computed-properties-7.21.5" = { + "@babel/plugin-transform-computed-properties-7.22.5" = { name = "_at_babel_slash_plugin-transform-computed-properties"; packageName = "@babel/plugin-transform-computed-properties"; - version = "7.21.5"; + version = "7.22.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.21.5.tgz"; - sha512 = "TR653Ki3pAwxBxUe8srfF3e4Pe3FTA46uaNHYyQwIoM4oWKSoOZiDNyHJ0oIoDIUPSRQbQG7jzgVBX3FPVne1Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz"; + sha512 = "4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg=="; }; }; - "@babel/plugin-transform-destructuring-7.21.3" = { + "@babel/plugin-transform-destructuring-7.23.0" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.21.3"; + version = "7.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.21.3.tgz"; - sha512 = "bp6hwMFzuiE4HqYEyoGJ/V2LeIWn+hLVKc4pnj++E5XQptwhtcGmSayM029d/j2X1bPKGTlsyPwAubuU22KhMA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.0.tgz"; + sha512 = "vaMdgNXFkYrB+8lbgniSYWHsgqK5gjaMNcc84bMIOMRLH0L9AqYq3hwMdvnyqj1OPqea8UtjPEuS/DCenah1wg=="; }; }; - "@babel/plugin-transform-dotall-regex-7.18.6" = { + "@babel/plugin-transform-dotall-regex-7.22.5" = { name = "_at_babel_slash_plugin-transform-dotall-regex"; packageName = "@babel/plugin-transform-dotall-regex"; - version = "7.18.6"; + version = "7.22.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz"; - sha512 = "6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz"; + sha512 = "5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw=="; }; }; - "@babel/plugin-transform-duplicate-keys-7.18.9" = { + "@babel/plugin-transform-duplicate-keys-7.22.5" = { name = "_at_babel_slash_plugin-transform-duplicate-keys"; packageName = "@babel/plugin-transform-duplicate-keys"; - version = "7.18.9"; + version = "7.22.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz"; - sha512 = "d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz"; + sha512 = "dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw=="; }; }; - "@babel/plugin-transform-exponentiation-operator-7.18.6" = { + "@babel/plugin-transform-exponentiation-operator-7.22.5" = { name = "_at_babel_slash_plugin-transform-exponentiation-operator"; packageName = "@babel/plugin-transform-exponentiation-operator"; - version = "7.18.6"; + version = "7.22.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz"; - sha512 = "wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz"; + sha512 = "vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g=="; }; }; - "@babel/plugin-transform-for-of-7.21.5" = { + "@babel/plugin-transform-for-of-7.22.15" = { name = "_at_babel_slash_plugin-transform-for-of"; packageName = "@babel/plugin-transform-for-of"; - version = "7.21.5"; + version = "7.22.15"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.21.5.tgz"; - sha512 = "nYWpjKW/7j/I/mZkGVgHJXh4bA1sfdFnJoOXwJuj4m3Q2EraO/8ZyrkCau9P5tbHQk01RMSt6KYLCsW7730SXQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.15.tgz"; + sha512 = "me6VGeHsx30+xh9fbDLLPi0J1HzmeIIyenoOQHuw2D4m2SAU3NrspX5XxJLBpqn5yrLzrlw2Iy3RA//Bx27iOA=="; }; }; - "@babel/plugin-transform-function-name-7.18.9" = { + "@babel/plugin-transform-function-name-7.22.5" = { name = "_at_babel_slash_plugin-transform-function-name"; packageName = "@babel/plugin-transform-function-name"; - version = "7.18.9"; + version = "7.22.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz"; - sha512 = "WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz"; + sha512 = "UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg=="; }; }; - "@babel/plugin-transform-literals-7.18.9" = { + "@babel/plugin-transform-literals-7.22.5" = { name = "_at_babel_slash_plugin-transform-literals"; packageName = "@babel/plugin-transform-literals"; - version = "7.18.9"; + version = "7.22.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz"; - sha512 = "IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz"; + sha512 = "fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g=="; }; }; - "@babel/plugin-transform-member-expression-literals-7.18.6" = { + "@babel/plugin-transform-member-expression-literals-7.22.5" = { name = "_at_babel_slash_plugin-transform-member-expression-literals"; packageName = "@babel/plugin-transform-member-expression-literals"; - version = "7.18.6"; + version = "7.22.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz"; - sha512 = "qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz"; + sha512 = "RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew=="; }; }; - "@babel/plugin-transform-modules-amd-7.20.11" = { + "@babel/plugin-transform-modules-amd-7.23.0" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.20.11"; + version = "7.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.20.11.tgz"; - sha512 = "NuzCt5IIYOW0O30UvqktzHYR2ud5bOWbY0yaxWZ6G+aFzOMJvrs5YHNikrbdaT15+KNO31nPOy5Fim3ku6Zb5g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.0.tgz"; + sha512 = "xWT5gefv2HGSm4QHtgc1sYPbseOyf+FFDo2JbpE25GWl5BqTGO9IMwTYJRoIdjsF85GE+VegHxSCUt5EvoYTAw=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.21.5" = { + "@babel/plugin-transform-modules-commonjs-7.23.0" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.21.5"; + version = "7.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.21.5.tgz"; - sha512 = "OVryBEgKUbtqMoB7eG2rs6UFexJi6Zj6FDXx+esBLPTCxCNxAY9o+8Di7IsUGJ+AVhp5ncK0fxWUBd0/1gPhrQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.0.tgz"; + sha512 = "32Xzss14/UVc7k9g775yMIvkVK8xwKE0DPdP5JTapr3+Z9w4tzeOuLNY6BXDQR6BdnzIlXnCGAzsk/ICHBLVWQ=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.20.11" = { + "@babel/plugin-transform-modules-systemjs-7.23.0" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.20.11"; + version = "7.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.20.11.tgz"; - sha512 = "vVu5g9BPQKSFEmvt2TA4Da5N+QVS66EX21d8uoOihC+OCpUoGvzVsXeqFdtAEfVa5BILAeFt+U7yVmLbQnAJmw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.0.tgz"; + sha512 = "qBej6ctXZD2f+DhlOC9yO47yEYgUh5CZNz/aBoH4j/3NOlRfJXJbY7xDQCqQVf9KbrqGzIWER1f23doHGrIHFg=="; }; }; - "@babel/plugin-transform-modules-umd-7.18.6" = { + "@babel/plugin-transform-modules-umd-7.22.5" = { name = "_at_babel_slash_plugin-transform-modules-umd"; packageName = "@babel/plugin-transform-modules-umd"; - version = "7.18.6"; + version = "7.22.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz"; - sha512 = "dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz"; + sha512 = "+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ=="; }; }; - "@babel/plugin-transform-named-capturing-groups-regex-7.20.5" = { + "@babel/plugin-transform-named-capturing-groups-regex-7.22.5" = { name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.20.5"; + version = "7.22.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.20.5.tgz"; - sha512 = "mOW4tTzi5iTLnw+78iEq3gr8Aoq4WNRGpmSlrogqaiCBoR1HFhpU4JkpQFOHfeYx3ReVIFWOQJS4aZBRvuZ6mA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz"; + sha512 = "YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ=="; }; }; - "@babel/plugin-transform-new-target-7.18.6" = { + "@babel/plugin-transform-new-target-7.22.5" = { name = "_at_babel_slash_plugin-transform-new-target"; packageName = "@babel/plugin-transform-new-target"; - version = "7.18.6"; + version = "7.22.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz"; - sha512 = "DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz"; + sha512 = "AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw=="; }; }; - "@babel/plugin-transform-object-super-7.18.6" = { + "@babel/plugin-transform-object-super-7.22.5" = { name = "_at_babel_slash_plugin-transform-object-super"; packageName = "@babel/plugin-transform-object-super"; - version = "7.18.6"; + version = "7.22.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz"; - sha512 = "uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz"; + sha512 = "klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw=="; }; }; - "@babel/plugin-transform-parameters-7.21.3" = { + "@babel/plugin-transform-parameters-7.22.15" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.21.3"; + version = "7.22.15"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.21.3.tgz"; - sha512 = "Wxc+TvppQG9xWFYatvCGPvZ6+SIUxQ2ZdiBP+PHYMIjnPXD+uThCshaz4NZOnODAtBjjcVQQ/3OKs9LW28purQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.15.tgz"; + sha512 = "hjk7qKIqhyzhhUvRT683TYQOFa/4cQKwQy7ALvTpODswN40MljzNDa0YldevS6tGbxwaEKVn502JmY0dP7qEtQ=="; }; }; - "@babel/plugin-transform-property-literals-7.18.6" = { + "@babel/plugin-transform-property-literals-7.22.5" = { name = "_at_babel_slash_plugin-transform-property-literals"; packageName = "@babel/plugin-transform-property-literals"; - version = "7.18.6"; + version = "7.22.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz"; - sha512 = "cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz"; + sha512 = "TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ=="; }; }; - "@babel/plugin-transform-regenerator-7.21.5" = { + "@babel/plugin-transform-regenerator-7.22.10" = { name = "_at_babel_slash_plugin-transform-regenerator"; packageName = "@babel/plugin-transform-regenerator"; - version = "7.21.5"; + version = "7.22.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.21.5.tgz"; - sha512 = "ZoYBKDb6LyMi5yCsByQ5jmXsHAQDDYeexT1Szvlmui+lADvfSecr5Dxd/PkrTC3pAD182Fcju1VQkB4oCp9M+w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.10.tgz"; + sha512 = "F28b1mDt8KcT5bUyJc/U9nwzw6cV+UmTeRlXYIl2TNqMMJif0Jeey9/RQ3C4NOd2zp0/TRsDns9ttj2L523rsw=="; }; }; - "@babel/plugin-transform-reserved-words-7.18.6" = { + "@babel/plugin-transform-reserved-words-7.22.5" = { name = "_at_babel_slash_plugin-transform-reserved-words"; packageName = "@babel/plugin-transform-reserved-words"; - version = "7.18.6"; + version = "7.22.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz"; - sha512 = "oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz"; + sha512 = "DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA=="; }; }; "@babel/plugin-transform-runtime-7.12.10" = { @@ -742,67 +751,67 @@ let sha512 = "xOrUfzPxw7+WDm9igMgQCbO3cJKymX7dFdsgRr1eu9n3KjjyU4pptIXbXPseQDquw+W+RuJEJMHKHNsPNNm3CA=="; }; }; - "@babel/plugin-transform-shorthand-properties-7.18.6" = { + "@babel/plugin-transform-shorthand-properties-7.22.5" = { name = "_at_babel_slash_plugin-transform-shorthand-properties"; packageName = "@babel/plugin-transform-shorthand-properties"; - version = "7.18.6"; + version = "7.22.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz"; - sha512 = "eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz"; + sha512 = "vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA=="; }; }; - "@babel/plugin-transform-spread-7.20.7" = { + "@babel/plugin-transform-spread-7.22.5" = { name = "_at_babel_slash_plugin-transform-spread"; packageName = "@babel/plugin-transform-spread"; - version = "7.20.7"; + version = "7.22.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.20.7.tgz"; - sha512 = "ewBbHQ+1U/VnH1fxltbJqDeWBU1oNLG8Dj11uIv3xVf7nrQu0bPGe5Rf716r7K5Qz+SqtAOVswoVunoiBtGhxw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz"; + sha512 = "5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg=="; }; }; - "@babel/plugin-transform-sticky-regex-7.18.6" = { + "@babel/plugin-transform-sticky-regex-7.22.5" = { name = "_at_babel_slash_plugin-transform-sticky-regex"; packageName = "@babel/plugin-transform-sticky-regex"; - version = "7.18.6"; + version = "7.22.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz"; - sha512 = "kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz"; + sha512 = "zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw=="; }; }; - "@babel/plugin-transform-template-literals-7.18.9" = { + "@babel/plugin-transform-template-literals-7.22.5" = { name = "_at_babel_slash_plugin-transform-template-literals"; packageName = "@babel/plugin-transform-template-literals"; - version = "7.18.9"; + version = "7.22.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz"; - sha512 = "S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz"; + sha512 = "5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA=="; }; }; - "@babel/plugin-transform-typeof-symbol-7.18.9" = { + "@babel/plugin-transform-typeof-symbol-7.22.5" = { name = "_at_babel_slash_plugin-transform-typeof-symbol"; packageName = "@babel/plugin-transform-typeof-symbol"; - version = "7.18.9"; + version = "7.22.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz"; - sha512 = "SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz"; + sha512 = "bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA=="; }; }; - "@babel/plugin-transform-unicode-escapes-7.21.5" = { + "@babel/plugin-transform-unicode-escapes-7.22.10" = { name = "_at_babel_slash_plugin-transform-unicode-escapes"; packageName = "@babel/plugin-transform-unicode-escapes"; - version = "7.21.5"; + version = "7.22.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.21.5.tgz"; - sha512 = "LYm/gTOwZqsYohlvFUe/8Tujz75LqqVC2w+2qPHLR+WyWHGCZPN1KBpJCJn+4Bk4gOkQy/IXKIge6az5MqwlOg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.10.tgz"; + sha512 = "lRfaRKGZCBqDlRU3UIFovdp9c9mEvlylmpod0/OatICsSfuQ9YFthRo1tpTkGsklEefZdqlEFdY4A2dwTb6ohg=="; }; }; - "@babel/plugin-transform-unicode-regex-7.18.6" = { + "@babel/plugin-transform-unicode-regex-7.22.5" = { name = "_at_babel_slash_plugin-transform-unicode-regex"; packageName = "@babel/plugin-transform-unicode-regex"; - version = "7.18.6"; + version = "7.22.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz"; - sha512 = "gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz"; + sha512 = "028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg=="; }; }; "@babel/preset-env-7.12.10" = { @@ -814,13 +823,13 @@ let sha512 = "Gz9hnBT/tGeTE2DBNDkD7BiWRELZt+8lSysHuDwmYXUIvtwZl0zI+D6mZgXZX0u8YBlLS4tmai9ONNY9tjRgRA=="; }; }; - "@babel/preset-modules-0.1.5" = { + "@babel/preset-modules-0.1.6" = { name = "_at_babel_slash_preset-modules"; packageName = "@babel/preset-modules"; - version = "0.1.5"; + version = "0.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz"; - sha512 = "A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA=="; + url = "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6.tgz"; + sha512 = "ID2yj6K/4lKfhuU3+EX4UvNbIt7eACFbHmNUjzA+ep+B5971CknnA/9DEWKbRokfbbtblxxxXFJJrH47UEAMVg=="; }; }; "@babel/regjsgen-0.8.0" = { @@ -841,31 +850,427 @@ let sha512 = "plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg=="; }; }; - "@babel/template-7.20.7" = { + "@babel/template-7.22.15" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; - version = "7.20.7"; + version = "7.22.15"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz"; - sha512 = "8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw=="; + url = "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz"; + sha512 = "QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w=="; }; }; - "@babel/traverse-7.21.5" = { + "@babel/traverse-7.23.0" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.21.5"; + version = "7.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.5.tgz"; - sha512 = "AhQoI3YjWi6u/y/ntv7k48mcrCXmus0t79J9qPNlk/lAsFlCiJ047RmbfMOawySTHtywXhbXgpx/8nXMYd+oFw=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.0.tgz"; + sha512 = "t/QaEvyIoIkwzpiZ7aoSKK8kObQYeF7T2v+dazAYCb8SXtp58zEVkWW7zAnju8FNKNdr4ScAOEDmMItbyOmEYw=="; }; }; - "@babel/types-7.21.5" = { + "@babel/types-7.23.0" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.21.5"; + version = "7.23.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz"; + sha512 = "0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg=="; + }; + }; + "@esbuild/android-arm-0.17.19" = { + name = "_at_esbuild_slash_android-arm"; + packageName = "@esbuild/android-arm"; + version = "0.17.19"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.19.tgz"; + sha512 = "rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A=="; + }; + }; + "@esbuild/android-arm-0.18.20" = { + name = "_at_esbuild_slash_android-arm"; + packageName = "@esbuild/android-arm"; + version = "0.18.20"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz"; + sha512 = "fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw=="; + }; + }; + "@esbuild/android-arm64-0.17.19" = { + name = "_at_esbuild_slash_android-arm64"; + packageName = "@esbuild/android-arm64"; + version = "0.17.19"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.19.tgz"; + sha512 = "KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA=="; + }; + }; + "@esbuild/android-arm64-0.18.20" = { + name = "_at_esbuild_slash_android-arm64"; + packageName = "@esbuild/android-arm64"; + version = "0.18.20"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz"; + sha512 = "Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ=="; + }; + }; + "@esbuild/android-x64-0.17.19" = { + name = "_at_esbuild_slash_android-x64"; + packageName = "@esbuild/android-x64"; + version = "0.17.19"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.19.tgz"; + sha512 = "uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww=="; + }; + }; + "@esbuild/android-x64-0.18.20" = { + name = "_at_esbuild_slash_android-x64"; + packageName = "@esbuild/android-x64"; + version = "0.18.20"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz"; + sha512 = "8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg=="; + }; + }; + "@esbuild/darwin-arm64-0.17.19" = { + name = "_at_esbuild_slash_darwin-arm64"; + packageName = "@esbuild/darwin-arm64"; + version = "0.17.19"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.19.tgz"; + sha512 = "80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg=="; + }; + }; + "@esbuild/darwin-arm64-0.18.20" = { + name = "_at_esbuild_slash_darwin-arm64"; + packageName = "@esbuild/darwin-arm64"; + version = "0.18.20"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz"; + sha512 = "bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA=="; + }; + }; + "@esbuild/darwin-x64-0.17.19" = { + name = "_at_esbuild_slash_darwin-x64"; + packageName = "@esbuild/darwin-x64"; + version = "0.17.19"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.19.tgz"; + sha512 = "IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw=="; + }; + }; + "@esbuild/darwin-x64-0.18.20" = { + name = "_at_esbuild_slash_darwin-x64"; + packageName = "@esbuild/darwin-x64"; + version = "0.18.20"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz"; + sha512 = "pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ=="; + }; + }; + "@esbuild/freebsd-arm64-0.17.19" = { + name = "_at_esbuild_slash_freebsd-arm64"; + packageName = "@esbuild/freebsd-arm64"; + version = "0.17.19"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.19.tgz"; + sha512 = "pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ=="; + }; + }; + "@esbuild/freebsd-arm64-0.18.20" = { + name = "_at_esbuild_slash_freebsd-arm64"; + packageName = "@esbuild/freebsd-arm64"; + version = "0.18.20"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz"; + sha512 = "yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw=="; + }; + }; + "@esbuild/freebsd-x64-0.17.19" = { + name = "_at_esbuild_slash_freebsd-x64"; + packageName = "@esbuild/freebsd-x64"; + version = "0.17.19"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.19.tgz"; + sha512 = "4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ=="; + }; + }; + "@esbuild/freebsd-x64-0.18.20" = { + name = "_at_esbuild_slash_freebsd-x64"; + packageName = "@esbuild/freebsd-x64"; + version = "0.18.20"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz"; + sha512 = "tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ=="; + }; + }; + "@esbuild/linux-arm-0.17.19" = { + name = "_at_esbuild_slash_linux-arm"; + packageName = "@esbuild/linux-arm"; + version = "0.17.19"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.19.tgz"; + sha512 = "cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA=="; + }; + }; + "@esbuild/linux-arm-0.18.20" = { + name = "_at_esbuild_slash_linux-arm"; + packageName = "@esbuild/linux-arm"; + version = "0.18.20"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz"; + sha512 = "/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg=="; + }; + }; + "@esbuild/linux-arm64-0.17.19" = { + name = "_at_esbuild_slash_linux-arm64"; + packageName = "@esbuild/linux-arm64"; + version = "0.17.19"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.19.tgz"; + sha512 = "ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg=="; + }; + }; + "@esbuild/linux-arm64-0.18.20" = { + name = "_at_esbuild_slash_linux-arm64"; + packageName = "@esbuild/linux-arm64"; + version = "0.18.20"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz"; + sha512 = "2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA=="; + }; + }; + "@esbuild/linux-ia32-0.17.19" = { + name = "_at_esbuild_slash_linux-ia32"; + packageName = "@esbuild/linux-ia32"; + version = "0.17.19"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.19.tgz"; + sha512 = "w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ=="; + }; + }; + "@esbuild/linux-ia32-0.18.20" = { + name = "_at_esbuild_slash_linux-ia32"; + packageName = "@esbuild/linux-ia32"; + version = "0.18.20"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz"; + sha512 = "P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA=="; + }; + }; + "@esbuild/linux-loong64-0.17.19" = { + name = "_at_esbuild_slash_linux-loong64"; + packageName = "@esbuild/linux-loong64"; + version = "0.17.19"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.19.tgz"; + sha512 = "2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ=="; + }; + }; + "@esbuild/linux-loong64-0.18.20" = { + name = "_at_esbuild_slash_linux-loong64"; + packageName = "@esbuild/linux-loong64"; + version = "0.18.20"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz"; + sha512 = "nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg=="; + }; + }; + "@esbuild/linux-mips64el-0.17.19" = { + name = "_at_esbuild_slash_linux-mips64el"; + packageName = "@esbuild/linux-mips64el"; + version = "0.17.19"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.19.tgz"; + sha512 = "LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A=="; + }; + }; + "@esbuild/linux-mips64el-0.18.20" = { + name = "_at_esbuild_slash_linux-mips64el"; + packageName = "@esbuild/linux-mips64el"; + version = "0.18.20"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.21.5.tgz"; - sha512 = "m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q=="; + url = "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz"; + sha512 = "d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ=="; + }; + }; + "@esbuild/linux-ppc64-0.17.19" = { + name = "_at_esbuild_slash_linux-ppc64"; + packageName = "@esbuild/linux-ppc64"; + version = "0.17.19"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.19.tgz"; + sha512 = "/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg=="; + }; + }; + "@esbuild/linux-ppc64-0.18.20" = { + name = "_at_esbuild_slash_linux-ppc64"; + packageName = "@esbuild/linux-ppc64"; + version = "0.18.20"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz"; + sha512 = "WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA=="; + }; + }; + "@esbuild/linux-riscv64-0.17.19" = { + name = "_at_esbuild_slash_linux-riscv64"; + packageName = "@esbuild/linux-riscv64"; + version = "0.17.19"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.19.tgz"; + sha512 = "FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA=="; + }; + }; + "@esbuild/linux-riscv64-0.18.20" = { + name = "_at_esbuild_slash_linux-riscv64"; + packageName = "@esbuild/linux-riscv64"; + version = "0.18.20"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz"; + sha512 = "WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A=="; + }; + }; + "@esbuild/linux-s390x-0.17.19" = { + name = "_at_esbuild_slash_linux-s390x"; + packageName = "@esbuild/linux-s390x"; + version = "0.17.19"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.19.tgz"; + sha512 = "IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q=="; + }; + }; + "@esbuild/linux-s390x-0.18.20" = { + name = "_at_esbuild_slash_linux-s390x"; + packageName = "@esbuild/linux-s390x"; + version = "0.18.20"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz"; + sha512 = "+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ=="; + }; + }; + "@esbuild/linux-x64-0.17.19" = { + name = "_at_esbuild_slash_linux-x64"; + packageName = "@esbuild/linux-x64"; + version = "0.17.19"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.19.tgz"; + sha512 = "68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw=="; + }; + }; + "@esbuild/linux-x64-0.18.20" = { + name = "_at_esbuild_slash_linux-x64"; + packageName = "@esbuild/linux-x64"; + version = "0.18.20"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz"; + sha512 = "UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w=="; + }; + }; + "@esbuild/netbsd-x64-0.17.19" = { + name = "_at_esbuild_slash_netbsd-x64"; + packageName = "@esbuild/netbsd-x64"; + version = "0.17.19"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.19.tgz"; + sha512 = "CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q=="; + }; + }; + "@esbuild/netbsd-x64-0.18.20" = { + name = "_at_esbuild_slash_netbsd-x64"; + packageName = "@esbuild/netbsd-x64"; + version = "0.18.20"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz"; + sha512 = "iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A=="; + }; + }; + "@esbuild/openbsd-x64-0.17.19" = { + name = "_at_esbuild_slash_openbsd-x64"; + packageName = "@esbuild/openbsd-x64"; + version = "0.17.19"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.19.tgz"; + sha512 = "cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g=="; + }; + }; + "@esbuild/openbsd-x64-0.18.20" = { + name = "_at_esbuild_slash_openbsd-x64"; + packageName = "@esbuild/openbsd-x64"; + version = "0.18.20"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz"; + sha512 = "e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg=="; + }; + }; + "@esbuild/sunos-x64-0.17.19" = { + name = "_at_esbuild_slash_sunos-x64"; + packageName = "@esbuild/sunos-x64"; + version = "0.17.19"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.19.tgz"; + sha512 = "vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg=="; + }; + }; + "@esbuild/sunos-x64-0.18.20" = { + name = "_at_esbuild_slash_sunos-x64"; + packageName = "@esbuild/sunos-x64"; + version = "0.18.20"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz"; + sha512 = "kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ=="; + }; + }; + "@esbuild/win32-arm64-0.17.19" = { + name = "_at_esbuild_slash_win32-arm64"; + packageName = "@esbuild/win32-arm64"; + version = "0.17.19"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.19.tgz"; + sha512 = "yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag=="; + }; + }; + "@esbuild/win32-arm64-0.18.20" = { + name = "_at_esbuild_slash_win32-arm64"; + packageName = "@esbuild/win32-arm64"; + version = "0.18.20"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz"; + sha512 = "ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg=="; + }; + }; + "@esbuild/win32-ia32-0.17.19" = { + name = "_at_esbuild_slash_win32-ia32"; + packageName = "@esbuild/win32-ia32"; + version = "0.17.19"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.19.tgz"; + sha512 = "eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw=="; + }; + }; + "@esbuild/win32-ia32-0.18.20" = { + name = "_at_esbuild_slash_win32-ia32"; + packageName = "@esbuild/win32-ia32"; + version = "0.18.20"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz"; + sha512 = "Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g=="; + }; + }; + "@esbuild/win32-x64-0.17.19" = { + name = "_at_esbuild_slash_win32-x64"; + packageName = "@esbuild/win32-x64"; + version = "0.17.19"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.19.tgz"; + sha512 = "lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA=="; + }; + }; + "@esbuild/win32-x64-0.18.20" = { + name = "_at_esbuild_slash_win32-x64"; + packageName = "@esbuild/win32-x64"; + version = "0.18.20"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz"; + sha512 = "kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ=="; }; }; "@hapi/address-2.1.4" = { @@ -913,6 +1318,15 @@ let sha512 = "tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ=="; }; }; + "@isaacs/cliui-8.0.2" = { + name = "_at_isaacs_slash_cliui"; + packageName = "@isaacs/cliui"; + version = "8.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz"; + sha512 = "O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA=="; + }; + }; "@jridgewell/gen-mapping-0.3.3" = { name = "_at_jridgewell_slash_gen-mapping"; packageName = "@jridgewell/gen-mapping"; @@ -922,13 +1336,13 @@ let sha512 = "HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ=="; }; }; - "@jridgewell/resolve-uri-3.1.0" = { + "@jridgewell/resolve-uri-3.1.1" = { name = "_at_jridgewell_slash_resolve-uri"; packageName = "@jridgewell/resolve-uri"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz"; - sha512 = "F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w=="; + url = "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz"; + sha512 = "dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA=="; }; }; "@jridgewell/set-array-1.1.2" = { @@ -940,22 +1354,13 @@ let sha512 = "xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw=="; }; }; - "@jridgewell/source-map-0.3.3" = { + "@jridgewell/source-map-0.3.5" = { name = "_at_jridgewell_slash_source-map"; packageName = "@jridgewell/source-map"; - version = "0.3.3"; + version = "0.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.3.tgz"; - sha512 = "b+fsZXeLYi9fEULmfBrhxn4IrPlINf8fiNarzTof004v3lFdntdwa9PF7vFJqm3mg7s+ScJMxXaE3Acp1irZcg=="; - }; - }; - "@jridgewell/sourcemap-codec-1.4.14" = { - name = "_at_jridgewell_slash_sourcemap-codec"; - packageName = "@jridgewell/sourcemap-codec"; - version = "1.4.14"; - src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz"; - sha512 = "XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="; + url = "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz"; + sha512 = "UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ=="; }; }; "@jridgewell/sourcemap-codec-1.4.15" = { @@ -967,13 +1372,13 @@ let sha512 = "eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="; }; }; - "@jridgewell/trace-mapping-0.3.18" = { + "@jridgewell/trace-mapping-0.3.19" = { name = "_at_jridgewell_slash_trace-mapping"; packageName = "@jridgewell/trace-mapping"; - version = "0.3.18"; + version = "0.3.19"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz"; - sha512 = "w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA=="; + url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz"; + sha512 = "kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw=="; }; }; "@kwsites/file-exists-1.1.1" = { @@ -1039,6 +1444,15 @@ let sha512 = "oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="; }; }; + "@npmcli/fs-3.1.0" = { + name = "_at_npmcli_slash_fs"; + packageName = "@npmcli/fs"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.0.tgz"; + sha512 = "7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w=="; + }; + }; "@sindresorhus/is-0.14.0" = { name = "_at_sindresorhus_slash_is"; packageName = "@sindresorhus/is"; @@ -1084,6 +1498,15 @@ let sha512 = "4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w=="; }; }; + "@tootallnate/once-2.0.0" = { + name = "_at_tootallnate_slash_once"; + packageName = "@tootallnate/once"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz"; + sha512 = "XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A=="; + }; + }; "@types/cacheable-request-6.0.3" = { name = "_at_types_slash_cacheable-request"; packageName = "@types/cacheable-request"; @@ -1147,22 +1570,22 @@ let sha512 = "h4lTMgMJctJybDp8CQrxTUiiYmedihHWkjnF/8Pxseu2S6Nlfcy8kwboQ8yejh456rP2yWoEVm1sS/FVsfM48w=="; }; }; - "@types/http-cache-semantics-4.0.1" = { + "@types/http-cache-semantics-4.0.2" = { name = "_at_types_slash_http-cache-semantics"; packageName = "@types/http-cache-semantics"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz"; - sha512 = "SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ=="; + url = "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.2.tgz"; + sha512 = "FD+nQWA2zJjh4L9+pFXqWOi0Hs1ryBCfI+985NjluQ1p8EYtoLvjLOKidXBtZ4/IcxDX4o8/E8qDS3540tNliw=="; }; }; - "@types/http-proxy-1.17.11" = { + "@types/http-proxy-1.17.12" = { name = "_at_types_slash_http-proxy"; packageName = "@types/http-proxy"; - version = "1.17.11"; + version = "1.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.11.tgz"; - sha512 = "HC8G7c1WmaF2ekqpnFq626xd3Zz0uvaqFmBJNRZCGEZCXkvSdJoNFn/8Ygbd9fKNQj8UzLdCETaI0UWPAjK7IA=="; + url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.12.tgz"; + sha512 = "kQtujO08dVtQ2wXAuSFfk9ASy3sug4+ogFR8Kd8UgP8PEuc1/G/8yjYRmp//PcDNJEUKOza/MrQu15bouEUCiw=="; }; }; "@types/jest-27.5.2" = { @@ -1174,13 +1597,13 @@ let sha512 = "mpT8LJJ4CMeeahobofYWIjFo0xonRS/HfxnVEPMPFSQdGUt1uHCnoPT7Zhb+sjDU2wz0oKV0OLUR0WzrHNgfeA=="; }; }; - "@types/json-schema-7.0.11" = { + "@types/json-schema-7.0.13" = { name = "_at_types_slash_json-schema"; packageName = "@types/json-schema"; - version = "7.0.11"; + version = "7.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz"; - sha512 = "wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ=="; + url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.13.tgz"; + sha512 = "RbSSoHliUbnXj3ny0CNFOoxrIDV6SUGyStHsvDqosw6CkdPV8TtWGlfecuK4ToyMEAql6pzNxgCFKanovUzlgQ=="; }; }; "@types/keyv-3.1.4" = { @@ -1192,13 +1615,13 @@ let sha512 = "BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg=="; }; }; - "@types/lodash-4.14.194" = { + "@types/lodash-4.14.199" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.194"; + version = "4.14.199"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.194.tgz"; - sha512 = "r22s9tAS7imvBt2lyHC9B8AGwWnXaYb1tY09oyLkXDs4vArpYJzw09nj8MLx5VfciBPGIb+ZwG0ssYnEPJxn/g=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.199.tgz"; + sha512 = "Vrjz5N5Ia4SEzWWgIVwnHNEnb1UE1XMkvY5DGXrAeOGE9imk0hgTHh5GyDjLDJi9OTCn9oo9dXH1uToK1VRfrg=="; }; }; "@types/minimatch-5.1.2" = { @@ -1219,13 +1642,13 @@ let sha512 = "U5icWpv7YnZYGsN4/cmh3WD2onMY0aJIiTE6+51TwJCttdHvtCYmkBNOobHlXwrJRL0nkH9jH4kD+1FAdMN4Tg=="; }; }; - "@types/node-18.16.3" = { + "@types/node-20.8.2" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "18.16.3"; + version = "20.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.16.3.tgz"; - sha512 = "OPs5WnnT1xkCBiuQrZA4+YAV4HEJejmHneyraIaxsbev5yCEr6KMwINNFP9wQeFIw8FWcoTqF3vQsa5CDaI+8Q=="; + url = "https://registry.npmjs.org/@types/node/-/node-20.8.2.tgz"; + sha512 = "Vvycsc9FQdwhxE3y3DzeIxuEJbWGDsnrxvMADzTDF/lcdR9/K+AQIeAghTQsHtotg/q0j3WEOYS/jQgSdWue3w=="; }; }; "@types/node-8.10.66" = { @@ -1246,22 +1669,22 @@ let sha512 = "//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="; }; }; - "@types/q-1.5.5" = { + "@types/q-1.5.6" = { name = "_at_types_slash_q"; packageName = "@types/q"; - version = "1.5.5"; + version = "1.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/q/-/q-1.5.5.tgz"; - sha512 = "L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ=="; + url = "https://registry.npmjs.org/@types/q/-/q-1.5.6.tgz"; + sha512 = "IKjZ8RjTSwD4/YG+2gtj7BPFRB/lNbWKTiSj3M7U/TD2B7HfYCxvp2Zz6xA2WIY7pAuL1QOUPw8gQRbUrrq4fQ=="; }; }; - "@types/responselike-1.0.0" = { + "@types/responselike-1.0.1" = { name = "_at_types_slash_responselike"; packageName = "@types/responselike"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz"; - sha512 = "85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA=="; + url = "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.1.tgz"; + sha512 = "TiGnitEDxj2X0j+98Eqk5lv/Cij8oHd32bU4D/Yw6AOq7vvTk0gSD2GPj0G/HkvhMoVsdlhYF4yqqlyPBTM6Sg=="; }; }; "@types/rimraf-2.0.5" = { @@ -1273,22 +1696,22 @@ let sha512 = "YyP+VfeaqAyFmXoTh3HChxOQMyjByRMsHU7kc5KOJkSlXudhMhQIALbYV7rHh/l8d2lX3VUQzprrcAgWdRuU8g=="; }; }; - "@types/source-list-map-0.1.2" = { + "@types/source-list-map-0.1.3" = { name = "_at_types_slash_source-list-map"; packageName = "@types/source-list-map"; - version = "0.1.2"; + version = "0.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz"; - sha512 = "K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA=="; + url = "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.3.tgz"; + sha512 = "I9R/7fUjzUOyDy6AFkehCK711wWoAXEaBi80AfjZt1lIkbe6AcXKd3ckQc3liMvQExWvfOeh/8CtKzrfUFN5gA=="; }; }; - "@types/tapable-1.0.8" = { + "@types/tapable-1.0.9" = { name = "_at_types_slash_tapable"; packageName = "@types/tapable"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.8.tgz"; - sha512 = "ipixuVrh2OdNmauvtT51o3d8z12p6LtFW9in7U79der/kwejjdNchQC5UMn5u/KxNoM7VHHOs/l8KS8uHxhODQ=="; + url = "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.9.tgz"; + sha512 = "fOHIwZua0sRltqWzODGUM6b4ffZrf/vzGUmNXdR+4DzuJP42PMbM5dLKcdzlYvv8bMJ3GALOzkk1q7cDm2zPyA=="; }; }; "@types/tmp-0.0.33" = { @@ -1300,31 +1723,31 @@ let sha512 = "gVC1InwyVrO326wbBZw+AO3u2vRXz/iRWq9jYhpG4W8LXyIgDv3ZmcLQ5Q4Gs+gFMyqx+viFoFT+l3p61QFCmQ=="; }; }; - "@types/uglify-js-3.17.1" = { + "@types/uglify-js-3.17.2" = { name = "_at_types_slash_uglify-js"; packageName = "@types/uglify-js"; - version = "3.17.1"; + version = "3.17.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.17.1.tgz"; - sha512 = "GkewRA4i5oXacU/n4MA9+bLgt5/L3F1mKrYvFGm7r2ouLXhRKjuWwo9XHNnbx6WF3vlGW21S3fCvgqxvxXXc5g=="; + url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.17.2.tgz"; + sha512 = "9SjrHO54LINgC/6Ehr81NjAxAYvwEZqjUHLjJYvC4Nmr9jbLQCIZbWSvl4vXQkkmR1UAuaKDycau3O1kWGFyXQ=="; }; }; - "@types/webpack-4.41.33" = { + "@types/webpack-4.41.34" = { name = "_at_types_slash_webpack"; packageName = "@types/webpack"; - version = "4.41.33"; + version = "4.41.34"; src = fetchurl { - url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.33.tgz"; - sha512 = "PPajH64Ft2vWevkerISMtnZ8rTs4YmRbs+23c402J0INmxDKCrhZNvwZYtzx96gY2wAtXdrK1BS2fiC8MlLr3g=="; + url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.34.tgz"; + sha512 = "CN2aOGrR3zbMc2v+cKqzaClYP1ldkpPOgtdNvgX+RmlWCSWxHxpzz6WSCVQZRkF8D60ROlkRzAoEpgjWQ+bd2g=="; }; }; - "@types/webpack-sources-3.2.0" = { + "@types/webpack-sources-3.2.1" = { name = "_at_types_slash_webpack-sources"; packageName = "@types/webpack-sources"; - version = "3.2.0"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-3.2.0.tgz"; - sha512 = "Ft7YH3lEVRQ6ls8k4Ff1oB4jN6oy/XmU6tQISKdhfh+1mR+viZFphS6WL0IrtDOzvefmJg5a0s7ZQoRXwqTEFg=="; + url = "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-3.2.1.tgz"; + sha512 = "iLC3Fsx62ejm3ST3PQ8vBMC54Rb3EoCprZjeJGI5q+9QjfDLGt9jeg/k245qz1G9AQnORGk0vqPicJFPT1QODQ=="; }; }; "@webassemblyjs/ast-1.9.0" = { @@ -1534,13 +1957,13 @@ let sha512 = "XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ=="; }; }; - "acorn-8.8.2" = { + "acorn-8.10.0" = { name = "acorn"; packageName = "acorn"; - version = "8.8.2"; + version = "8.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz"; - sha512 = "xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw=="; + url = "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz"; + sha512 = "F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw=="; }; }; "address-1.0.3" = { @@ -1552,6 +1975,33 @@ let sha512 = "z55ocwKBRLryBs394Sm3ushTtBeg6VAeuku7utSoSnsJKvKcnXFIyC6vh27n3rXyxSgkJBBCAvyOn7gSUcTYjg=="; }; }; + "agent-base-6.0.2" = { + name = "agent-base"; + packageName = "agent-base"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz"; + sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="; + }; + }; + "agentkeepalive-4.5.0" = { + name = "agentkeepalive"; + packageName = "agentkeepalive"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.5.0.tgz"; + sha512 = "5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew=="; + }; + }; + "aggregate-error-3.1.0" = { + name = "aggregate-error"; + packageName = "aggregate-error"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz"; + sha512 = "4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA=="; + }; + }; "ajv-6.12.6" = { name = "ajv"; packageName = "ajv"; @@ -1669,6 +2119,15 @@ let sha512 = "quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="; }; }; + "ansi-regex-6.0.1" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz"; + sha512 = "n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA=="; + }; + }; "ansi-styles-2.2.1" = { name = "ansi-styles"; packageName = "ansi-styles"; @@ -1705,6 +2164,15 @@ let sha512 = "Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="; }; }; + "ansi-styles-6.2.1" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "6.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz"; + sha512 = "bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug=="; + }; + }; "anymatch-2.0.0" = { name = "anymatch"; packageName = "anymatch"; @@ -1867,13 +2335,22 @@ let sha512 = "SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ=="; }; }; - "array.prototype.reduce-1.0.5" = { + "array.prototype.reduce-1.0.6" = { name = "array.prototype.reduce"; packageName = "array.prototype.reduce"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.5.tgz"; - sha512 = "kDdugMl7id9COE8R7MHF5jWk7Dqt/fs4Pv+JXoICnYwqpjjjbUurz6w5fT5IG6brLdJhv6/VoHB0H7oyIBXd+Q=="; + url = "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.6.tgz"; + sha512 = "UW+Mz8LG/sPSU8jRDCjVr6J/ZKAGpHfwrZ6kWTG5qCxIEiXdVshqGnu5vEZA8S1y6X4aCSbQZ0/EEsfvEvBiSg=="; + }; + }; + "arraybuffer.prototype.slice-1.0.2" = { + name = "arraybuffer.prototype.slice"; + packageName = "arraybuffer.prototype.slice"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz"; + sha512 = "yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw=="; }; }; "asap-2.0.6" = { @@ -1903,13 +2380,13 @@ let sha512 = "+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA=="; }; }; - "assert-1.5.0" = { + "assert-1.5.1" = { name = "assert"; packageName = "assert"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz"; - sha512 = "EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA=="; + url = "https://registry.npmjs.org/assert/-/assert-1.5.1.tgz"; + sha512 = "zzw1uCAgLbsKwBfFc8CX78DDg+xZeBksSO3vwVIDDN5i94eOrPsSSyiVhmsSABFDM/OcpE2aagCat9dnWQLG1A=="; }; }; "assert-plus-1.0.0" = { @@ -2425,13 +2902,13 @@ let sha512 = "VBorw+tgpOtZ1BYhrVSVTzTt/3+vSE3eFUh0N2GCFK1HffceOaf32YS/bs6WiFhjDAblAFrx85jMy3BG9fBK2Q=="; }; }; - "browserslist-4.21.5" = { + "browserslist-4.22.1" = { name = "browserslist"; packageName = "browserslist"; - version = "4.21.5"; + version = "4.22.1"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.21.5.tgz"; - sha512 = "tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz"; + sha512 = "FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ=="; }; }; "buffer-4.9.2" = { @@ -2506,6 +2983,15 @@ let sha512 = "HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ=="; }; }; + "busboy-1.6.0" = { + name = "busboy"; + packageName = "busboy"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz"; + sha512 = "8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA=="; + }; + }; "bytes-3.0.0" = { name = "bytes"; packageName = "bytes"; @@ -2551,6 +3037,15 @@ let sha512 = "a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ=="; }; }; + "cacache-17.1.4" = { + name = "cacache"; + packageName = "cacache"; + version = "17.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/cacache/-/cacache-17.1.4.tgz"; + sha512 = "/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A=="; + }; + }; "cache-base-1.0.1" = { name = "cache-base"; packageName = "cache-base"; @@ -2587,13 +3082,13 @@ let sha512 = "Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg=="; }; }; - "cacheable-request-7.0.2" = { + "cacheable-request-7.0.4" = { name = "cacheable-request"; packageName = "cacheable-request"; - version = "7.0.2"; + version = "7.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.2.tgz"; - sha512 = "pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew=="; + url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.4.tgz"; + sha512 = "v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg=="; }; }; "call-bind-1.0.2" = { @@ -2695,13 +3190,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001482" = { + "caniuse-lite-1.0.30001546" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001482"; + version = "1.0.30001546"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001482.tgz"; - sha512 = "F1ZInsg53cegyjroxLNW9DmrEQ1SuGRTO1QlpA0o2/6OpQ0gFeDRoq1yFmnr8Sakn9qwwt9DmbxHB6w167OSuQ=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001546.tgz"; + sha512 = "zvtSJwuQFpewSyRrI3AsftF6rM0X80mZkChIt1spBGEvRglCrjTniXvinc8JKRoqTwXAgvqTImaN9igfSMtUBw=="; }; }; "case-sensitive-paths-webpack-plugin-2.3.0" = { @@ -2839,15 +3334,6 @@ let sha512 = "IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A=="; }; }; - "chokidar-3.5.2" = { - name = "chokidar"; - packageName = "chokidar"; - version = "3.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz"; - sha512 = "ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ=="; - }; - }; "chokidar-3.5.3" = { name = "chokidar"; packageName = "chokidar"; @@ -2911,6 +3397,15 @@ let sha512 = "EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A=="; }; }; + "clean-stack-2.2.0" = { + name = "clean-stack"; + packageName = "clean-stack"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz"; + sha512 = "4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A=="; + }; + }; "cli-cursor-2.1.0" = { name = "cli-cursor"; packageName = "cli-cursor"; @@ -2929,13 +3424,13 @@ let sha512 = "I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw=="; }; }; - "cli-spinners-2.9.0" = { + "cli-spinners-2.9.1" = { name = "cli-spinners"; packageName = "cli-spinners"; - version = "2.9.0"; + version = "2.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.0.tgz"; - sha512 = "4/aL9X3Wh0yiMQlE+eeRhWP6vclO3QRtw1JHKIT0FFUs5FjpFmESqtMvYZ0+lbzBw900b95mS0hohy+qn2VK/g=="; + url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.1.tgz"; + sha512 = "jHgecW0pxkonBJdrKsqxgRX9AcG+u/5k0Q7WPDfi8AogLAdwxEkyYYNWwZ5GvVFoFx2uiY1eNcSK00fh+1+FyQ=="; }; }; "cli-table-0.3.4" = { @@ -3127,6 +3622,15 @@ let sha512 = "LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w=="; }; }; + "commander-10.0.1" = { + name = "commander"; + packageName = "commander"; + version = "10.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz"; + sha512 = "y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug=="; + }; + }; "commander-2.14.1" = { name = "commander"; packageName = "commander"; @@ -3181,15 +3685,6 @@ let sha512 = "U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA=="; }; }; - "commander-8.3.0" = { - name = "commander"; - packageName = "commander"; - version = "8.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz"; - sha512 = "OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww=="; - }; - }; "commander-9.5.0" = { name = "commander"; packageName = "commander"; @@ -3388,6 +3883,24 @@ let sha512 = "QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="; }; }; + "cookie-signature-1.2.1" = { + name = "cookie-signature"; + packageName = "cookie-signature"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.2.1.tgz"; + sha512 = "78KWk9T26NhzXtuL26cIJ8/qNHANyJ/ZYrmEXFzUmhZdjpBv+DlWlOANRTGBt48YcyslsLrj0bMLFTmXvLRCOw=="; + }; + }; + "copy-anything-2.0.6" = { + name = "copy-anything"; + packageName = "copy-anything"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.6.tgz"; + sha512 = "1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw=="; + }; + }; "copy-concurrently-1.0.5" = { name = "copy-concurrently"; packageName = "copy-concurrently"; @@ -3424,13 +3937,13 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-compat-3.30.1" = { + "core-js-compat-3.33.0" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.30.1"; + version = "3.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.30.1.tgz"; - sha512 = "d690npR7MC6P0gq4npTl5n2VQeNAmUrJ90n+MHiKS7W2+xno4o3F5GDEuylSdi6EJ3VssibSGXOa1r3YXD3Mhw=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.33.0.tgz"; + sha512 = "0w4LcLXsVEuNkIqwjjf9rjCoPhK8uqA4tMRh4Ge26vfLtUutshn+aRJU21I9LCJlh2QQHfisNToLjw1XEJLTWw=="; }; }; "core-util-is-1.0.2" = { @@ -3739,13 +4252,13 @@ let sha512 = "TVF6svNzeQCOpjCqsy0/CSy8VgObG3wXusJ73xW2GbG5rGx7lC8zxDSURicsXI2UsGdi2L0QNRCi745/wUDvsA=="; }; }; - "cyclist-1.0.1" = { + "cyclist-1.0.2" = { name = "cyclist"; packageName = "cyclist"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz"; - sha512 = "NJGVKPS81XejHcLhaLJS7plab0fK3slPh11mESeeDq2W4ZI5kUKK/LRRdVDvjJseojbPB7ZwjnyOybg3Igea/A=="; + url = "https://registry.npmjs.org/cyclist/-/cyclist-1.0.2.tgz"; + sha512 = "0sVXIohTfLqVIW3kb/0n6IiWF3Ifj5nm2XaSrLq2DI6fKIGa2fYAZdk917rUneaeLVpYfFcyXE2ft0fe3remsA=="; }; }; "d-1.0.1" = { @@ -3901,13 +4414,22 @@ let sha512 = "4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg=="; }; }; - "define-properties-1.2.0" = { + "define-data-property-1.1.0" = { + name = "define-data-property"; + packageName = "define-data-property"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.0.tgz"; + sha512 = "UzGwzcjyv3OtAvolTj1GoyNYzfFR+iqbGjcnBEENZVCpM4/Ng1yhGNvS3lR/xDS74Tb2wGG9WzNSNIOS9UVb2g=="; + }; + }; + "define-properties-1.2.1" = { name = "define-properties"; packageName = "define-properties"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz"; - sha512 = "xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA=="; + url = "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz"; + sha512 = "8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg=="; }; }; "define-property-0.2.5" = { @@ -3982,13 +4504,13 @@ let sha512 = "g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="; }; }; - "des.js-1.0.1" = { + "des.js-1.1.0" = { name = "des.js"; packageName = "des.js"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz"; - sha512 = "Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA=="; + url = "https://registry.npmjs.org/des.js/-/des.js-1.1.0.tgz"; + sha512 = "r17GxjhUCjSRy8aiJpr8/UadFIzMzJGexI3Nmz4ADi9LYSFx4gTBp80+NaX/YsXWWLhpZ7v/v/ubEc/bCNfKwg=="; }; }; "destroy-1.0.4" = { @@ -4009,6 +4531,15 @@ let sha512 = "2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="; }; }; + "detect-libc-1.0.3" = { + name = "detect-libc"; + packageName = "detect-libc"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz"; + sha512 = "pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg=="; + }; + }; "detect-node-2.1.0" = { name = "detect-node"; packageName = "detect-node"; @@ -4234,6 +4765,15 @@ let sha512 = "07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g=="; }; }; + "eastasianwidth-0.2.0" = { + name = "eastasianwidth"; + packageName = "eastasianwidth"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz"; + sha512 = "I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA=="; + }; + }; "ecc-jsbn-0.1.2" = { name = "ecc-jsbn"; packageName = "ecc-jsbn"; @@ -4252,13 +4792,13 @@ let sha512 = "WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="; }; }; - "electron-to-chromium-1.4.382" = { + "electron-to-chromium-1.4.542" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.382"; + version = "1.4.542"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.382.tgz"; - sha512 = "czMavlW52VIPgutbVL9JnZIZuFijzsG1ww/1z2Otu1r1q+9Qe2bTsH3My3sZarlvwyqHM6+mnZfEnt2Vr4dsIg=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.542.tgz"; + sha512 = "6+cpa00G09N3sfh2joln4VUXHquWrOFx3FLZqiVQvl45+zS9DskDBTPvob+BhvFRmTBkyDSk0vvLMMRo/qc6mQ=="; }; }; "elliptic-6.5.4" = { @@ -4360,13 +4900,13 @@ let sha512 = "5GV3WkJ8R/faOP1hwElQdNuCt8tKx2+1lsMrdeIYWSFz01Kp9gJl/R6zGtp4QUyrUtO8KnHsxjHrQNUf2CHkrg=="; }; }; - "elm-tooling-1.14.0" = { + "elm-tooling-1.15.0" = { name = "elm-tooling"; packageName = "elm-tooling"; - version = "1.14.0"; + version = "1.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/elm-tooling/-/elm-tooling-1.14.0.tgz"; - sha512 = "cIbK3gfYWK086HsqOIGM4reIYcV/FF2R/8jIJ6ZUy1/RSkYFUv2BgPTGYYZo1Io9oymmbwoCWWleNtw7LgGL2w=="; + url = "https://registry.npmjs.org/elm-tooling/-/elm-tooling-1.15.0.tgz"; + sha512 = "quRE5LGJyrkPBoJ3MvFQ5RGgf80J0L0d3NkduStvXh4TmZuMXNC3Z/l2ZRoq2UTUaNWeYfO1Zx5wns1AvsTrnw=="; }; }; "elm-webpack-loader-6.0.1" = { @@ -4405,6 +4945,15 @@ let sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="; }; }; + "emoji-regex-9.2.2" = { + name = "emoji-regex"; + packageName = "emoji-regex"; + version = "9.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz"; + sha512 = "L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="; + }; + }; "emojis-list-2.1.0" = { name = "emojis-list"; packageName = "emojis-list"; @@ -4468,6 +5017,15 @@ let sha512 = "Ds/TEoZjwggRoz/Q2O7SE3i4Jm66mqTDfmdHdq/7DKVk3bro9Q8h6WdXKdPqFLMoqxrDK5SVRzHVPOS6uuGtrg=="; }; }; + "err-code-2.0.3" = { + name = "err-code"; + packageName = "err-code"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz"; + sha512 = "2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="; + }; + }; "errno-0.1.8" = { name = "errno"; packageName = "errno"; @@ -4486,13 +5044,13 @@ let sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; }; }; - "es-abstract-1.21.2" = { + "es-abstract-1.22.2" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.21.2"; + version = "1.22.2"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.2.tgz"; - sha512 = "y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.2.tgz"; + sha512 = "YoxfFcDmhjOgWPWsV13+2RNjq1F6UQnfs+8TftwNqtzlmFzEXvlUwdrNrYeaizfjQzRMxkZ6ElWMOJIFKdVqwA=="; }; }; "es-array-method-boxes-properly-1.0.0" = { @@ -4558,6 +5116,24 @@ let sha512 = "NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA=="; }; }; + "esbuild-0.17.19" = { + name = "esbuild"; + packageName = "esbuild"; + version = "0.17.19"; + src = fetchurl { + url = "https://registry.npmjs.org/esbuild/-/esbuild-0.17.19.tgz"; + sha512 = "XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw=="; + }; + }; + "esbuild-0.18.20" = { + name = "esbuild"; + packageName = "esbuild"; + version = "0.18.20"; + src = fetchurl { + url = "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz"; + sha512 = "ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA=="; + }; + }; "escalade-3.1.1" = { name = "escalade"; packageName = "escalade"; @@ -4873,13 +5449,13 @@ let sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; }; }; - "fast-diff-1.2.0" = { + "fast-diff-1.3.0" = { name = "fast-diff"; packageName = "fast-diff"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz"; - sha512 = "xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w=="; + url = "https://registry.npmjs.org/fast-diff/-/fast-diff-1.3.0.tgz"; + sha512 = "VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw=="; }; }; "fast-glob-2.2.7" = { @@ -4891,13 +5467,13 @@ let sha512 = "g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw=="; }; }; - "fast-glob-3.2.12" = { + "fast-glob-3.3.1" = { name = "fast-glob"; packageName = "fast-glob"; - version = "3.2.12"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz"; - sha512 = "DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w=="; + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz"; + sha512 = "kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg=="; }; }; "fast-json-stable-stringify-2.1.0" = { @@ -4909,15 +5485,6 @@ let sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; }; }; - "fast-levenshtein-3.0.0" = { - name = "fast-levenshtein"; - packageName = "fast-levenshtein"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-3.0.0.tgz"; - sha512 = "hKKNajm46uNmTlhHSyZkmToAc56uZJwYq7yrciZjqOxnlfQwERDQJmHPUp7m1m9wx8vgOe8IaCKZ5Kv2k1DdCQ=="; - }; - }; "fastest-levenshtein-1.0.16" = { name = "fastest-levenshtein"; packageName = "fastest-levenshtein"; @@ -5197,13 +5764,13 @@ let sha512 = "SDgHBgV+RCjrYs8aUwCb9rTgbTVuSdzvFmLaChsLre1yf+D64khCW++VYciaByZ8Rm0uKF8R/XEpXuTRSGUM1A=="; }; }; - "follow-redirects-1.15.2" = { + "follow-redirects-1.15.3" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.15.2"; + version = "1.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz"; - sha512 = "VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz"; + sha512 = "1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q=="; }; }; "for-each-0.3.3" = { @@ -5224,6 +5791,15 @@ let sha512 = "7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ=="; }; }; + "foreground-child-3.1.1" = { + name = "foreground-child"; + packageName = "foreground-child"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz"; + sha512 = "TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg=="; + }; + }; "forever-agent-0.6.1" = { name = "forever-agent"; packageName = "forever-agent"; @@ -5251,13 +5827,13 @@ let sha512 = "buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="; }; }; - "fraction.js-4.2.0" = { + "fraction.js-4.3.6" = { name = "fraction.js"; packageName = "fraction.js"; - version = "4.2.0"; + version = "4.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz"; - sha512 = "MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA=="; + url = "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.6.tgz"; + sha512 = "n2aZ9tNfYDwaHhvFTkhFErqOMIb8uyzSQ+vGJBjZyanAKZVbGUQ1sngfk9FdkBw7G26O7AgNjLcecLffD1c7eg=="; }; }; "fragment-cache-0.2.1" = { @@ -5287,13 +5863,13 @@ let sha512 = "OMcX/4IC/uqEPVgGeyfN22LJk6AZrMkRZHxcHBMBvHScDGgwTm2GT2Wkgtocyd3JfZffjj2kYUDXXII0Fk9W0g=="; }; }; - "fs-extra-10.1.0" = { + "fs-extra-11.1.1" = { name = "fs-extra"; packageName = "fs-extra"; - version = "10.1.0"; + version = "11.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz"; - sha512 = "oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ=="; + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz"; + sha512 = "MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ=="; }; }; "fs-extra-2.0.0" = { @@ -5377,6 +5953,24 @@ let sha512 = "V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg=="; }; }; + "fs-minipass-3.0.3" = { + name = "fs-minipass"; + packageName = "fs-minipass"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz"; + sha512 = "XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw=="; + }; + }; + "fs-monkey-1.0.5" = { + name = "fs-monkey"; + packageName = "fs-monkey"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.5.tgz"; + sha512 = "8uMbBjrhzW76TYgEV27Y5E//W2f/lTFmx78P2w19FZSxarhI/798APGQyuGCwmkNxgwGRhrLfvWyLBvNtuOmew=="; + }; + }; "fs-readdir-recursive-1.1.0" = { name = "fs-readdir-recursive"; packageName = "fs-readdir-recursive"; @@ -5422,13 +6016,13 @@ let sha512 = "Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ=="; }; }; - "fsevents-2.3.2" = { + "fsevents-2.3.3" = { name = "fsevents"; packageName = "fsevents"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz"; - sha512 = "xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA=="; + url = "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz"; + sha512 = "5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw=="; }; }; "function-bind-1.1.1" = { @@ -5440,13 +6034,13 @@ let sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; }; }; - "function.prototype.name-1.1.5" = { + "function.prototype.name-1.1.6" = { name = "function.prototype.name"; packageName = "function.prototype.name"; - version = "1.1.5"; + version = "1.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz"; - sha512 = "uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA=="; + url = "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz"; + sha512 = "Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg=="; }; }; "functions-have-names-1.2.3" = { @@ -5485,13 +6079,13 @@ let sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; }; }; - "get-intrinsic-1.2.0" = { + "get-intrinsic-1.2.1" = { name = "get-intrinsic"; packageName = "get-intrinsic"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz"; - sha512 = "L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q=="; + url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz"; + sha512 = "2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw=="; }; }; "get-own-enumerable-property-symbols-3.0.2" = { @@ -5584,6 +6178,15 @@ let sha512 = "0pcXixfRCfLXdkwC/FJxiYEg5sYnbqYqtMmtXRzlKrStI9tLev7G/PDuFH2GmySJQ3ix5YUPRN/OJEuFD827EA=="; }; }; + "glob-10.3.10" = { + name = "glob"; + packageName = "glob"; + version = "10.3.10"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz"; + sha512 = "fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g=="; + }; + }; "glob-7.1.4" = { name = "glob"; packageName = "glob"; @@ -5674,22 +6277,22 @@ let sha512 = "sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA=="; }; }; - "globby-11.0.4" = { + "globby-11.1.0" = { name = "globby"; packageName = "globby"; - version = "11.0.4"; + version = "11.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz"; - sha512 = "9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg=="; + url = "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz"; + sha512 = "jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g=="; }; }; - "globby-11.1.0" = { + "globby-13.1.4" = { name = "globby"; packageName = "globby"; - version = "11.1.0"; + version = "13.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz"; - sha512 = "jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g=="; + url = "https://registry.npmjs.org/globby/-/globby-13.1.4.tgz"; + sha512 = "iui/IiiW+QrJ1X1hKH5qwlMQyv34wJAYwH1vrf8b9kBA4sNiif3gKsMHa+BrdnOpEudWjpotfa7LrTzB1ERS/g=="; }; }; "globby-6.1.0" = { @@ -5809,13 +6412,13 @@ let sha512 = "nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w=="; }; }; - "has-1.0.3" = { + "has-1.0.4" = { name = "has"; packageName = "has"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz"; - sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; + url = "https://registry.npmjs.org/has/-/has-1.0.4.tgz"; + sha512 = "qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ=="; }; }; "has-ansi-2.0.0" = { @@ -6160,6 +6763,15 @@ let sha512 = "7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ=="; }; }; + "http-proxy-agent-5.0.0" = { + name = "http-proxy-agent"; + packageName = "http-proxy-agent"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz"; + sha512 = "n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w=="; + }; + }; "http-proxy-middleware-0.19.1" = { name = "http-proxy-middleware"; packageName = "http-proxy-middleware"; @@ -6205,6 +6817,15 @@ let sha512 = "J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg=="; }; }; + "https-proxy-agent-5.0.1" = { + name = "https-proxy-agent"; + packageName = "https-proxy-agent"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz"; + sha512 = "dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA=="; + }; + }; "human-signals-2.1.0" = { name = "human-signals"; packageName = "human-signals"; @@ -6214,6 +6835,15 @@ let sha512 = "B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="; }; }; + "humanize-ms-1.2.1" = { + name = "humanize-ms"; + packageName = "humanize-ms"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz"; + sha512 = "Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ=="; + }; + }; "i-0.3.7" = { name = "i"; packageName = "i"; @@ -6241,6 +6871,15 @@ let sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; }; }; + "iconv-lite-0.6.3" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz"; + sha512 = "4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="; + }; + }; "icss-utils-4.1.1" = { name = "icss-utils"; packageName = "icss-utils"; @@ -6286,6 +6925,15 @@ let sha512 = "MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ=="; }; }; + "image-size-0.5.5" = { + name = "image-size"; + packageName = "image-size"; + version = "0.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz"; + sha512 = "6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ=="; + }; + }; "immer-1.7.2" = { name = "immer"; packageName = "immer"; @@ -6295,6 +6943,15 @@ let sha512 = "4Urocwu9+XLDJw4Tc6ZCg7APVjjLInCFvO4TwGsAYV5zT6YYSor14dsZR0+0tHlDIN92cFUOq+i7fC00G5vTxA=="; }; }; + "immutable-4.3.4" = { + name = "immutable"; + packageName = "immutable"; + version = "4.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/immutable/-/immutable-4.3.4.tgz"; + sha512 = "fsXeu4J4i6WNWSikpI88v/PcVflZz+6kMhUfIwc5SY+poQRPnaf5V7qds6SUyUN3cVxEzuCab7QIoLOQ+DQ1wA=="; + }; + }; "import-fresh-2.0.0" = { name = "import-fresh"; packageName = "import-fresh"; @@ -6331,6 +6988,15 @@ let sha512 = "JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="; }; }; + "indent-string-4.0.0" = { + name = "indent-string"; + packageName = "indent-string"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz"; + sha512 = "EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg=="; + }; + }; "indexes-of-1.0.1" = { name = "indexes-of"; packageName = "indexes-of"; @@ -6358,15 +7024,6 @@ let sha512 = "k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA=="; }; }; - "inherits-2.0.1" = { - name = "inherits"; - packageName = "inherits"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; - sha512 = "8nWq2nLTAwd02jTqJExUYFSD/fKq6VH9Y/oG2accc/kdI0V98Bag8d5a4gi3XHz73rDWa2PvTtvcWYquKqSENA=="; - }; - }; "inherits-2.0.3" = { name = "inherits"; packageName = "inherits"; @@ -6439,6 +7096,15 @@ let sha512 = "PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg=="; }; }; + "ip-2.0.0" = { + name = "ip"; + packageName = "ip"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz"; + sha512 = "WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ=="; + }; + }; "ip-regex-2.1.0" = { name = "ip-regex"; packageName = "ip-regex"; @@ -6592,13 +7258,13 @@ let sha512 = "H1U8Vz0cfXNujrJzEcvvwMDW9Ra+biSYA3ThdQvAnMLJkEHQXn6bWzLkxHtVYJ+Sdbx0b6finn3jZiaVe7MAHA=="; }; }; - "is-core-module-2.12.0" = { + "is-core-module-2.13.0" = { name = "is-core-module"; packageName = "is-core-module"; - version = "2.12.0"; + version = "2.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.0.tgz"; - sha512 = "RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ=="; + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz"; + sha512 = "Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ=="; }; }; "is-data-descriptor-0.1.4" = { @@ -6745,6 +7411,15 @@ let sha512 = "2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w=="; }; }; + "is-lambda-1.0.1" = { + name = "is-lambda"; + packageName = "is-lambda"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz"; + sha512 = "z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ=="; + }; + }; "is-negative-zero-2.0.2" = { name = "is-negative-zero"; packageName = "is-negative-zero"; @@ -6934,13 +7609,13 @@ let sha512 = "C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg=="; }; }; - "is-typed-array-1.1.10" = { + "is-typed-array-1.1.12" = { name = "is-typed-array"; packageName = "is-typed-array"; - version = "1.1.10"; + version = "1.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz"; - sha512 = "PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A=="; + url = "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz"; + sha512 = "Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg=="; }; }; "is-typedarray-1.0.0" = { @@ -6988,6 +7663,15 @@ let sha512 = "qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ=="; }; }; + "is-what-3.14.1" = { + name = "is-what"; + packageName = "is-what"; + version = "3.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz"; + sha512 = "sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA=="; + }; + }; "is-windows-1.0.2" = { name = "is-windows"; packageName = "is-windows"; @@ -7078,6 +7762,15 @@ let sha512 = "1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w=="; }; }; + "jackspeak-2.3.6" = { + name = "jackspeak"; + packageName = "jackspeak"; + version = "2.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz"; + sha512 = "N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ=="; + }; + }; "jest-diff-27.5.1" = { name = "jest-diff"; packageName = "jest-diff"; @@ -7330,13 +8023,13 @@ let sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA=="; }; }; - "keyv-4.5.2" = { + "keyv-4.5.3" = { name = "keyv"; packageName = "keyv"; - version = "4.5.2"; + version = "4.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/keyv/-/keyv-4.5.2.tgz"; - sha512 = "5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g=="; + url = "https://registry.npmjs.org/keyv/-/keyv-4.5.3.tgz"; + sha512 = "QCiSav9WaX1PgETJ+SpNnx2PRRapJ/oRSXM4VO5OGYGSjrxbKPVFVhB3l2OCbLCk329N8qyAtsJjSjvVBWzEug=="; }; }; "killable-1.0.1" = { @@ -7447,6 +8140,105 @@ let sha512 = "YiGkH6EnGrDGqLMITnGjXtGmNtjoXw9SVUzcaos8RBi7Ps0VBylkq+vOcY9QE5poLasPCR849ucFUkl0UzUyOw=="; }; }; + "less-4.2.0" = { + name = "less"; + packageName = "less"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/less/-/less-4.2.0.tgz"; + sha512 = "P3b3HJDBtSzsXUl0im2L7gTO5Ubg8mEN6G8qoTS77iXxXX4Hvu4Qj540PZDvQ8V6DmX6iXo98k7Md0Cm1PrLaA=="; + }; + }; + "lightningcss-1.22.0" = { + name = "lightningcss"; + packageName = "lightningcss"; + version = "1.22.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lightningcss/-/lightningcss-1.22.0.tgz"; + sha512 = "+z0qvwRVzs4XGRXelnWRNwqsXUx8k3bSkbP8vD42kYKSk3z9OM2P3e/gagT7ei/gwh8DTS80LZOFZV6lm8Z8Fg=="; + }; + }; + "lightningcss-darwin-arm64-1.22.0" = { + name = "lightningcss-darwin-arm64"; + packageName = "lightningcss-darwin-arm64"; + version = "1.22.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.22.0.tgz"; + sha512 = "aH2be3nNny+It5YEVm8tBSSdRlBVWQV8m2oJ7dESiYRzyY/E/bQUe2xlw5caaMuhlM9aoTMtOH25yzMhir0qPg=="; + }; + }; + "lightningcss-darwin-x64-1.22.0" = { + name = "lightningcss-darwin-x64"; + packageName = "lightningcss-darwin-x64"; + version = "1.22.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.22.0.tgz"; + sha512 = "9KHRFA0Y6mNxRHeoQMp0YaI0R0O2kOgUlYPRjuasU4d+pI8NRhVn9bt0yX9VPs5ibWX1RbDViSPtGJvYYrfVAQ=="; + }; + }; + "lightningcss-freebsd-x64-1.22.0" = { + name = "lightningcss-freebsd-x64"; + packageName = "lightningcss-freebsd-x64"; + version = "1.22.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.22.0.tgz"; + sha512 = "xaYL3xperGwD85rQioDb52ozF3NAJb+9wrge3jD9lxGffplu0Mn35rXMptB8Uc2N9Mw1i3Bvl7+z1evlqVl7ww=="; + }; + }; + "lightningcss-linux-arm-gnueabihf-1.22.0" = { + name = "lightningcss-linux-arm-gnueabihf"; + packageName = "lightningcss-linux-arm-gnueabihf"; + version = "1.22.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.22.0.tgz"; + sha512 = "epQGvXIjOuxrZpMpMnRjK54ZqzhiHhCPLtHvw2fb6NeK2kK9YtF0wqmeTBiQ1AkbWfnnXGTstYaFNiadNK+StQ=="; + }; + }; + "lightningcss-linux-arm64-gnu-1.22.0" = { + name = "lightningcss-linux-arm64-gnu"; + packageName = "lightningcss-linux-arm64-gnu"; + version = "1.22.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.22.0.tgz"; + sha512 = "AArGtKSY4DGTA8xP8SDyNyKtpsUl1Rzq6FW4JomeyUQ4nBrR71uPChksTpj3gmWuGhZeRKLeCUI1DBid/zhChg=="; + }; + }; + "lightningcss-linux-arm64-musl-1.22.0" = { + name = "lightningcss-linux-arm64-musl"; + packageName = "lightningcss-linux-arm64-musl"; + version = "1.22.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.22.0.tgz"; + sha512 = "RRraNgP8hnBPhInTTUdlFm+z16C/ghbxBG51Sw00hd7HUyKmEUKRozyc5od+/N6pOrX/bIh5vIbtMXIxsos0lg=="; + }; + }; + "lightningcss-linux-x64-gnu-1.22.0" = { + name = "lightningcss-linux-x64-gnu"; + packageName = "lightningcss-linux-x64-gnu"; + version = "1.22.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.22.0.tgz"; + sha512 = "grdrhYGRi2KrR+bsXJVI0myRADqyA7ekprGxiuK5QRNkv7kj3Yq1fERDNyzZvjisHwKUi29sYMClscbtl+/Zpw=="; + }; + }; + "lightningcss-linux-x64-musl-1.22.0" = { + name = "lightningcss-linux-x64-musl"; + packageName = "lightningcss-linux-x64-musl"; + version = "1.22.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.22.0.tgz"; + sha512 = "t5f90X+iQUtIyR56oXIHMBUyQFX/zwmPt72E6Dane3P8KNGlkijTg2I75XVQS860gNoEFzV7Mm5ArRRA7u5CAQ=="; + }; + }; + "lightningcss-win32-x64-msvc-1.22.0" = { + name = "lightningcss-win32-x64-msvc"; + packageName = "lightningcss-win32-x64-msvc"; + version = "1.22.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.22.0.tgz"; + sha512 = "64HTDtOOZE9PUCZJiZZQpyqXBbdby1lnztBccnqh+NtbKxjnGzP92R2ngcgeuqMPecMNqNWxgoWgTGpC+yN5Sw=="; + }; + }; "lines-and-columns-1.2.4" = { name = "lines-and-columns"; packageName = "lines-and-columns"; @@ -7645,6 +8437,15 @@ let sha512 = "tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA=="; }; }; + "lru-cache-10.0.1" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "10.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.1.tgz"; + sha512 = "IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g=="; + }; + }; "lru-cache-4.1.5" = { name = "lru-cache"; packageName = "lru-cache"; @@ -7672,6 +8473,15 @@ let sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; }; }; + "lru-cache-7.18.3" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "7.18.3"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz"; + sha512 = "jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA=="; + }; + }; "make-dir-1.3.0" = { name = "make-dir"; packageName = "make-dir"; @@ -7699,6 +8509,15 @@ let sha512 = "g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw=="; }; }; + "make-fetch-happen-11.1.1" = { + name = "make-fetch-happen"; + packageName = "make-fetch-happen"; + version = "11.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz"; + sha512 = "rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w=="; + }; + }; "map-cache-0.2.2" = { name = "map-cache"; packageName = "map-cache"; @@ -7762,6 +8581,15 @@ let sha512 = "dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="; }; }; + "memfs-3.6.0" = { + name = "memfs"; + packageName = "memfs"; + version = "3.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/memfs/-/memfs-3.6.0.tgz"; + sha512 = "EGowvkkgbMcIChjMTMkESFDbZeSh8xZ7kNSF0hAiAN4Jh6jgHCRS0Ga/+C8y6Au+oqpezRHCfPsmJ2+DwAgiwQ=="; + }; + }; "memory-fs-0.4.1" = { name = "memory-fs"; packageName = "memory-fs"; @@ -8014,6 +8842,15 @@ let sha512 = "lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g=="; }; }; + "minimatch-9.0.3" = { + name = "minimatch"; + packageName = "minimatch"; + version = "9.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz"; + sha512 = "RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg=="; + }; + }; "minimist-1.2.0" = { name = "minimist"; packageName = "minimist"; @@ -8068,6 +8905,60 @@ let sha512 = "3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ=="; }; }; + "minipass-7.0.4" = { + name = "minipass"; + packageName = "minipass"; + version = "7.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz"; + sha512 = "jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ=="; + }; + }; + "minipass-collect-1.0.2" = { + name = "minipass-collect"; + packageName = "minipass-collect"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz"; + sha512 = "6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA=="; + }; + }; + "minipass-fetch-3.0.4" = { + name = "minipass-fetch"; + packageName = "minipass-fetch"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.4.tgz"; + sha512 = "jHAqnA728uUpIaFm7NWsCnqKT6UqZz7GcI/bDpPATuwYyKwJwW0remxSCxUlKiEty+eopHGa3oc8WxgQ1FFJqg=="; + }; + }; + "minipass-flush-1.0.5" = { + name = "minipass-flush"; + packageName = "minipass-flush"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz"; + sha512 = "JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw=="; + }; + }; + "minipass-pipeline-1.2.4" = { + name = "minipass-pipeline"; + packageName = "minipass-pipeline"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz"; + sha512 = "xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A=="; + }; + }; + "minipass-sized-1.0.3" = { + name = "minipass-sized"; + packageName = "minipass-sized"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz"; + sha512 = "MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g=="; + }; + }; "minizlib-1.3.3" = { name = "minizlib"; packageName = "minizlib"; @@ -8248,13 +9139,13 @@ let sha512 = "nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="; }; }; - "nan-2.17.0" = { + "nan-2.18.0" = { name = "nan"; packageName = "nan"; - version = "2.17.0"; + version = "2.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz"; - sha512 = "2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ=="; + url = "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz"; + sha512 = "W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w=="; }; }; "nanoid-3.3.6" = { @@ -8284,6 +9175,15 @@ let sha512 = "akBX7I5X9KQDDWmYYgQlLbVbjkveTje2mioZjhLLrVt09akSZcoqXWE5LEn1E2fu8T7th1PZYGfewQsTkTLTmQ=="; }; }; + "needle-3.2.0" = { + name = "needle"; + packageName = "needle"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/needle/-/needle-3.2.0.tgz"; + sha512 = "oUvzXnyLiVyVGoianLijF9O/RecZUf7TkBfimjGrLM4eQhXyeJwM6GeAWccwfQ9aa4gMCZKqhAOuLaMIcQxajQ=="; + }; + }; "negotiator-0.6.3" = { name = "negotiator"; packageName = "negotiator"; @@ -8365,13 +9265,13 @@ let sha512 = "PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA=="; }; }; - "node-gyp-build-4.6.0" = { + "node-gyp-build-4.6.1" = { name = "node-gyp-build"; packageName = "node-gyp-build"; - version = "4.6.0"; + version = "4.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.0.tgz"; - sha512 = "NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ=="; + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.1.tgz"; + sha512 = "24vnklJmyRS8ViBNI8KbtK/r/DmXQMRiOMXTNz2nrTnAYUwjmEEbnnpB/+kt+yWRv73bPsSPRFddrcIbAxSiMQ=="; }; }; "node-libs-browser-2.2.1" = { @@ -8392,13 +9292,13 @@ let sha512 = "rB1DUFUNAN4Gn9keO2K1efO35IDK7yKHCdCaIMvFO7yUYmmZYeDjnGKle26G4rwj+LKRQpjyUUvMkPglwGCYNQ=="; }; }; - "node-releases-2.0.10" = { + "node-releases-2.0.13" = { name = "node-releases"; packageName = "node-releases"; - version = "2.0.10"; + version = "2.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.10.tgz"; - sha512 = "5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz"; + sha512 = "uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ=="; }; }; "node-watch-0.5.5" = { @@ -8572,15 +9472,6 @@ let sha512 = "79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ=="; }; }; - "object-hash-2.2.0" = { - name = "object-hash"; - packageName = "object-hash"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object-hash/-/object-hash-2.2.0.tgz"; - sha512 = "gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw=="; - }; - }; "object-inspect-1.12.3" = { name = "object-inspect"; packageName = "object-inspect"; @@ -8626,22 +9517,22 @@ let sha512 = "1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ=="; }; }; - "object.entries-1.1.6" = { + "object.entries-1.1.7" = { name = "object.entries"; packageName = "object.entries"; - version = "1.1.6"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz"; - sha512 = "leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w=="; + url = "https://registry.npmjs.org/object.entries/-/object.entries-1.1.7.tgz"; + sha512 = "jCBs/0plmPsOnrKAfFQXRG2NFjlhZgjjcBLSmTnEhU8U6vVTsVe8ANeQJCHTl3gSsI4J+0emOoCgoKlmQPMgmA=="; }; }; - "object.getownpropertydescriptors-2.1.6" = { + "object.getownpropertydescriptors-2.1.7" = { name = "object.getownpropertydescriptors"; packageName = "object.getownpropertydescriptors"; - version = "2.1.6"; + version = "2.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.6.tgz"; - sha512 = "lq+61g26E/BgHv0ZTFgRvi7NMEPuAxLkFU7rukXjc/AlwH4Am5xXVnIXy3un1bg/JPbXHrixRkK1itUzzPiIjQ=="; + url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.7.tgz"; + sha512 = "PrJz0C2xJ58FNn11XV2lr4Jt5Gzl94qpy9Lu0JlfEj14z88sqbSBJCBEzdlNUCzY2gburhbrwOZ5BHCmuNUy0g=="; }; }; "object.pick-1.3.0" = { @@ -8653,13 +9544,13 @@ let sha512 = "tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ=="; }; }; - "object.values-1.1.6" = { + "object.values-1.1.7" = { name = "object.values"; packageName = "object.values"; - version = "1.1.6"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz"; - sha512 = "FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw=="; + url = "https://registry.npmjs.org/object.values/-/object.values-1.1.7.tgz"; + sha512 = "aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng=="; }; }; "obuf-1.1.2" = { @@ -8923,6 +9814,15 @@ let sha512 = "y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw=="; }; }; + "p-map-4.0.0" = { + name = "p-map"; + packageName = "p-map"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz"; + sha512 = "/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ=="; + }; + }; "p-retry-3.0.1" = { name = "p-retry"; packageName = "p-retry"; @@ -9040,6 +9940,15 @@ let sha512 = "ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg=="; }; }; + "parse-node-version-1.0.1" = { + name = "parse-node-version"; + packageName = "parse-node-version"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz"; + sha512 = "3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA=="; + }; + }; "parse-passwd-1.0.0" = { name = "parse-passwd"; packageName = "parse-passwd"; @@ -9076,13 +9985,13 @@ let sha512 = "XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw=="; }; }; - "password-prompt-1.1.2" = { + "password-prompt-1.1.3" = { name = "password-prompt"; packageName = "password-prompt"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/password-prompt/-/password-prompt-1.1.2.tgz"; - sha512 = "bpuBhROdrhuN3E7G/koAju0WjVw9/uQOG5Co5mokNj0MiOSBVZS1JTwM4zl55hu0WFmIEFvO9cU9sJQiBIYeIA=="; + url = "https://registry.npmjs.org/password-prompt/-/password-prompt-1.1.3.tgz"; + sha512 = "HkrjG2aJlvF0t2BMH0e2LB/EHf3Lcq3fNMzy4GYHcQblAvOl+QQji1Lx7WRBMqpVK8p+KR7bCg7oqAMXtdgqyw=="; }; }; "path-browserify-0.0.1" = { @@ -9175,6 +10084,15 @@ let sha512 = "LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="; }; }; + "path-scurry-1.10.1" = { + name = "path-scurry"; + packageName = "path-scurry"; + version = "1.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz"; + sha512 = "MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ=="; + }; + }; "path-to-regexp-0.1.7" = { name = "path-to-regexp"; packageName = "path-to-regexp"; @@ -9400,13 +10318,13 @@ let sha512 = "yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="; }; }; - "postcss-8.4.23" = { + "postcss-8.4.31" = { name = "postcss"; packageName = "postcss"; - version = "8.4.23"; + version = "8.4.31"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.23.tgz"; - sha512 = "bQ3qMcpF6A/YjR55xtoTr0jGOlnPOKAIMdOWiv0EIT6HVPEaJiJB4NLljSbiHoC2RX7DN5Uvjtpbg1NPdwv1oA=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz"; + sha512 = "PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ=="; }; }; "postcss-calc-7.0.5" = { @@ -9706,13 +10624,13 @@ let sha512 = "h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA=="; }; }; - "postcss-selector-parser-6.0.12" = { + "postcss-selector-parser-6.0.13" = { name = "postcss-selector-parser"; packageName = "postcss-selector-parser"; - version = "6.0.12"; + version = "6.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.12.tgz"; - sha512 = "NdxGCAZdRrwVI1sy59+Wzrh+pMMHxapGnpfenDVlMEXoOcvt4pGE0JLK9YY2F5dLxcFYA/YbVQKhcGU+FtSYQg=="; + url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz"; + sha512 = "EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ=="; }; }; "postcss-svgo-4.0.3" = { @@ -9841,6 +10759,15 @@ let sha512 = "6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g=="; }; }; + "promise-retry-2.0.1" = { + name = "promise-retry"; + packageName = "promise-retry"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz"; + sha512 = "y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g=="; + }; + }; "prompt-1.0.0" = { name = "prompt"; packageName = "prompt"; @@ -9940,15 +10867,6 @@ let sha512 = "oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ=="; }; }; - "punycode-1.3.2" = { - name = "punycode"; - packageName = "punycode"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"; - sha512 = "RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw=="; - }; - }; "punycode-1.4.1" = { name = "punycode"; packageName = "punycode"; @@ -9985,6 +10903,15 @@ let sha512 = "MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q=="; }; }; + "qs-6.11.2" = { + name = "qs"; + packageName = "qs"; + version = "6.11.2"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz"; + sha512 = "tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA=="; + }; + }; "qs-6.5.1" = { name = "qs"; packageName = "qs"; @@ -10021,15 +10948,6 @@ let sha512 = "O2XLNDBIg1DnTOa+2XrIwSiXEV8h2KImXUnjhhn2+UsvZ+Es2uyd5CCRTNQlDGbzUQOW3aYCBx9rVA6dzsiY7Q=="; }; }; - "querystring-0.2.0" = { - name = "querystring"; - packageName = "querystring"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz"; - sha512 = "X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g=="; - }; - }; "querystring-es3-0.2.1" = { name = "querystring-es3"; packageName = "querystring-es3"; @@ -10282,13 +11200,13 @@ let sha512 = "zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="; }; }; - "regenerate-unicode-properties-10.1.0" = { + "regenerate-unicode-properties-10.1.1" = { name = "regenerate-unicode-properties"; packageName = "regenerate-unicode-properties"; - version = "10.1.0"; + version = "10.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz"; - sha512 = "d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ=="; + url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz"; + sha512 = "X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q=="; }; }; "regenerator-runtime-0.11.1" = { @@ -10318,13 +11236,13 @@ let sha512 = "D0Y/JJ4VhusyMOd/o25a3jdUqN/bC85EFsaoL9Oqmy/O4efCh+xhp7yj2EEOsj974qvMkcW8AwUzJ1jB/MbxCw=="; }; }; - "regenerator-transform-0.15.1" = { + "regenerator-transform-0.15.2" = { name = "regenerator-transform"; packageName = "regenerator-transform"; - version = "0.15.1"; + version = "0.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.1.tgz"; - sha512 = "knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg=="; + url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz"; + sha512 = "hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg=="; }; }; "regex-not-1.0.2" = { @@ -10336,13 +11254,13 @@ let sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A=="; }; }; - "regexp.prototype.flags-1.5.0" = { + "regexp.prototype.flags-1.5.1" = { name = "regexp.prototype.flags"; packageName = "regexp.prototype.flags"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz"; - sha512 = "0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA=="; + url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz"; + sha512 = "sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg=="; }; }; "regexpu-core-5.3.2" = { @@ -10444,6 +11362,15 @@ let sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw=="; }; }; + "request-light-0.7.0" = { + name = "request-light"; + packageName = "request-light"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request-light/-/request-light-0.7.0.tgz"; + sha512 = "lMbBMrDoxgsyO+yB3sDcrDuX85yYt7sS8BfQd11jtbW/z5ZWgLZRcEGLsLoYw7I0WSUGQBs8CC8ScIxkTX1+6Q=="; + }; + }; "request-promise-4.2.6" = { name = "request-promise"; packageName = "request-promise"; @@ -10507,13 +11434,13 @@ let sha512 = "KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="; }; }; - "resolve-1.22.3" = { + "resolve-1.22.6" = { name = "resolve"; packageName = "resolve"; - version = "1.22.3"; + version = "1.22.6"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.22.3.tgz"; - sha512 = "P8ur/gp/AmbEzjr729bZnLjXK5Z+4P0zhIJgBgzqRih7hL7BOukHGtSTA3ACMY467GRFz3duQsi0bDZdR7DKdw=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.22.6.tgz"; + sha512 = "njhxM7mV12JfufShqGy3Rz8j11RPdLy4xi15UurGJeoHLfJpVXKdh3ueuOqbYUcDZnffr6X739JBo5LzyahEsw=="; }; }; "resolve-alpn-1.2.1" = { @@ -10678,6 +11605,15 @@ let sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="; }; }; + "rimraf-5.0.5" = { + name = "rimraf"; + packageName = "rimraf"; + version = "5.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-5.0.5.tgz"; + sha512 = "CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A=="; + }; + }; "ripemd160-2.0.2" = { name = "ripemd160"; packageName = "ripemd160"; @@ -10687,6 +11623,15 @@ let sha512 = "ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA=="; }; }; + "rollup-3.29.4" = { + name = "rollup"; + packageName = "rollup"; + version = "3.29.4"; + src = fetchurl { + url = "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz"; + sha512 = "oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw=="; + }; + }; "run-async-2.4.1" = { name = "run-async"; packageName = "run-async"; @@ -10723,13 +11668,13 @@ let sha512 = "hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ=="; }; }; - "safe-array-concat-1.0.0" = { + "safe-array-concat-1.0.1" = { name = "safe-array-concat"; packageName = "safe-array-concat"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz"; - sha512 = "9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ=="; + url = "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.1.tgz"; + sha512 = "6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q=="; }; }; "safe-buffer-5.1.1" = { @@ -10795,6 +11740,15 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; + "sass-1.68.0" = { + name = "sass"; + packageName = "sass"; + version = "1.68.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sass/-/sass-1.68.0.tgz"; + sha512 = "Lmj9lM/fef0nQswm1J2HJcEsBUba4wgNx2fea6yJHODREoMFnwRpZydBnX/RjyXw2REIwdkbqE4hrTo4qfDBUA=="; + }; + }; "sax-1.2.4" = { name = "sax"; packageName = "sax"; @@ -10804,6 +11758,15 @@ let sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; }; }; + "sax-1.3.0" = { + name = "sax"; + packageName = "sax"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sax/-/sax-1.3.0.tgz"; + sha512 = "0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA=="; + }; + }; "schema-utils-0.4.7" = { name = "schema-utils"; packageName = "schema-utils"; @@ -10831,13 +11794,13 @@ let sha512 = "SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg=="; }; }; - "schema-utils-3.1.2" = { + "schema-utils-3.3.0" = { name = "schema-utils"; packageName = "schema-utils"; - version = "3.1.2"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.2.tgz"; - sha512 = "pvjEHOgWc9OWA/f/DE3ohBWTD6EleVLf7iFUkoSwAxttdBhB9QUebQgxER2kWueOvRJXPHNnyrvvh9eZINB8Eg=="; + url = "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz"; + sha512 = "pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg=="; }; }; "section-matter-1.0.0" = { @@ -10867,31 +11830,31 @@ let sha512 = "lkjaiAye+wBZDCBsu5BGi0XiLRxeUlsGod5ZP924CRSEoGuZAw/f7y9RKu28rwTfiHVhdavhB0qH0INV6P1lEA=="; }; }; - "semver-5.7.1" = { + "semver-5.7.2" = { name = "semver"; packageName = "semver"; - version = "5.7.1"; + version = "5.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"; - sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; + url = "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz"; + sha512 = "cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="; }; }; - "semver-6.3.0" = { + "semver-6.3.1" = { name = "semver"; packageName = "semver"; - version = "6.3.0"; + version = "6.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"; - sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; + url = "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz"; + sha512 = "BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="; }; }; - "semver-7.5.0" = { + "semver-7.5.4" = { name = "semver"; packageName = "semver"; - version = "7.5.0"; + version = "7.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz"; - sha512 = "+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA=="; + url = "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz"; + sha512 = "1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA=="; }; }; "semver-regex-3.1.4" = { @@ -11002,6 +11965,15 @@ let sha512 = "KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="; }; }; + "set-function-name-2.0.1" = { + name = "set-function-name"; + packageName = "set-function-name"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz"; + sha512 = "tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA=="; + }; + }; "set-value-2.0.1" = { name = "set-value"; packageName = "set-value"; @@ -11128,13 +12100,22 @@ let sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="; }; }; - "simple-git-3.18.0" = { + "signal-exit-4.1.0" = { + name = "signal-exit"; + packageName = "signal-exit"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz"; + sha512 = "bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw=="; + }; + }; + "simple-git-3.20.0" = { name = "simple-git"; packageName = "simple-git"; - version = "3.18.0"; + version = "3.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-3.18.0.tgz"; - sha512 = "Yt0GJ5aYrpPci3JyrYcsPz8Xc05Hi4JPSOb+Sgn/BmPX35fn/6Fp9Mef8eMBCrL2siY5w4j49TA5Q+bxPpri1Q=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-3.20.0.tgz"; + sha512 = "ozK8tl2hvLts8ijTs18iFruE+RoqmC/mqZhjs/+V7gS5W68JpJ3+FCTmLVqmR59MaUQ52MfGQuWsIqfsTbbJ0Q=="; }; }; "simple-swizzle-0.2.2" = { @@ -11182,6 +12163,15 @@ let sha512 = "g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="; }; }; + "slash-4.0.0" = { + name = "slash"; + packageName = "slash"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz"; + sha512 = "3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew=="; + }; + }; "slice-ansi-4.0.0" = { name = "slice-ansi"; packageName = "slice-ansi"; @@ -11191,6 +12181,15 @@ let sha512 = "qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ=="; }; }; + "smart-buffer-4.2.0" = { + name = "smart-buffer"; + packageName = "smart-buffer"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz"; + sha512 = "94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg=="; + }; + }; "snapdragon-0.8.2" = { name = "snapdragon"; packageName = "snapdragon"; @@ -11245,6 +12244,24 @@ let sha512 = "5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g=="; }; }; + "socks-2.7.1" = { + name = "socks"; + packageName = "socks"; + version = "2.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz"; + sha512 = "7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ=="; + }; + }; + "socks-proxy-agent-7.0.0" = { + name = "socks-proxy-agent"; + packageName = "socks-proxy-agent"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz"; + sha512 = "Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww=="; + }; + }; "sort-keys-1.1.2" = { name = "sort-keys"; packageName = "sort-keys"; @@ -11353,13 +12370,13 @@ let sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; }; }; - "spdx-license-ids-3.0.13" = { + "spdx-license-ids-3.0.15" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; - version = "3.0.13"; + version = "3.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz"; - sha512 = "XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w=="; + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.15.tgz"; + sha512 = "lpT8hSQp9jAKp9mhtBU4Xjon8LPGBvLIuBiSVhMEtmLecTh2mO0tlqrAMp47tBXzMr13NJMQ2lf7RpQGLJ3HsQ=="; }; }; "spdy-4.0.2" = { @@ -11416,6 +12433,15 @@ let sha512 = "/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ=="; }; }; + "ssri-10.0.5" = { + name = "ssri"; + packageName = "ssri"; + version = "10.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ssri/-/ssri-10.0.5.tgz"; + sha512 = "bSf16tAFkGeRlUNDjXu8FzaMQt6g2HZJrun7mtMbIPOddxt3GLMSz5VWUWcqTJUPfLEaDIepGxv+bYQW49596A=="; + }; + }; "ssri-5.3.0" = { name = "ssri"; packageName = "ssri"; @@ -11533,6 +12559,15 @@ let sha512 = "AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ=="; }; }; + "streamsearch-1.1.0" = { + name = "streamsearch"; + packageName = "streamsearch"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz"; + sha512 = "Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg=="; + }; + }; "strict-uri-encode-1.1.0" = { name = "strict-uri-encode"; packageName = "strict-uri-encode"; @@ -11587,31 +12622,49 @@ let sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; }; }; - "string.prototype.trim-1.2.7" = { + "string-width-5.1.2" = { + name = "string-width"; + packageName = "string-width"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz"; + sha512 = "HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA=="; + }; + }; + "string-width-cjs-4.2.3" = { + name = "string-width-cjs"; + packageName = "string-width-cjs"; + version = "4.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"; + sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; + }; + }; + "string.prototype.trim-1.2.8" = { name = "string.prototype.trim"; packageName = "string.prototype.trim"; - version = "1.2.7"; + version = "1.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz"; - sha512 = "p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg=="; + url = "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz"; + sha512 = "lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ=="; }; }; - "string.prototype.trimend-1.0.6" = { + "string.prototype.trimend-1.0.7" = { name = "string.prototype.trimend"; packageName = "string.prototype.trimend"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz"; - sha512 = "JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ=="; + url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz"; + sha512 = "Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA=="; }; }; - "string.prototype.trimstart-1.0.6" = { + "string.prototype.trimstart-1.0.7" = { name = "string.prototype.trimstart"; packageName = "string.prototype.trimstart"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz"; - sha512 = "omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA=="; + url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz"; + sha512 = "NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg=="; }; }; "string_decoder-0.10.31" = { @@ -11695,6 +12748,24 @@ let sha512 = "Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="; }; }; + "strip-ansi-7.1.0" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "7.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz"; + sha512 = "iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ=="; + }; + }; + "strip-ansi-cjs-6.0.1" = { + name = "strip-ansi-cjs"; + packageName = "strip-ansi-cjs"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"; + sha512 = "Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="; + }; + }; "strip-bom-2.0.0" = { name = "strip-bom"; packageName = "strip-bom"; @@ -11767,6 +12838,15 @@ let sha512 = "7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g=="; }; }; + "stylus-0.60.0" = { + name = "stylus"; + packageName = "stylus"; + version = "0.60.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stylus/-/stylus-0.60.0.tgz"; + sha512 = "j2pBgEwzCu05yCuY4cmyp0FtPQQFBBAGB7TY7QaNl7eztiHwkxzwvIp5vjZJND/a1JNOka+ZW9ewVPFZpI3pcA=="; + }; + }; "sudo-prompt-8.2.5" = { name = "sudo-prompt"; packageName = "sudo-prompt"; @@ -11776,6 +12856,15 @@ let sha512 = "rlBo3HU/1zAJUrkY6jNxDOC9eVYliG6nS4JA8u8KAshITd07tafMc/Br7xQwCSseXwJ2iCcHCE8SNWX3q8Z+kw=="; }; }; + "sugarss-4.0.1" = { + name = "sugarss"; + packageName = "sugarss"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sugarss/-/sugarss-4.0.1.tgz"; + sha512 = "WCjS5NfuVJjkQzK10s8WOBY+hhDxxNt/N6ZaGwxFZ+wN3/lKKFSaaKUNecULcTTvE4urLcKaZFQD8vO0mOZujw=="; + }; + }; "sums-0.2.4" = { name = "sums"; packageName = "sums"; @@ -11884,13 +12973,13 @@ let sha512 = "a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA=="; }; }; - "tar-6.1.14" = { + "tar-6.2.0" = { name = "tar"; packageName = "tar"; - version = "6.1.14"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-6.1.14.tgz"; - sha512 = "piERznXu0U7/pW7cdSn7hjqySIVTYT6F76icmFk7ptU7dDYlXTm5r9A6K04R2vU3olYgoKeo1Cg3eeu5nhftAw=="; + url = "https://registry.npmjs.org/tar/-/tar-6.2.0.tgz"; + sha512 = "/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ=="; }; }; "temp-0.9.0" = { @@ -11929,13 +13018,13 @@ let sha512 = "4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw=="; }; }; - "terser-5.17.1" = { + "terser-5.21.0" = { name = "terser"; packageName = "terser"; - version = "5.17.1"; + version = "5.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.17.1.tgz"; - sha512 = "hVl35zClmpisy6oaoKALOpS0rDYLxRFLHhRuDlEGTKey9qHjS1w9GMORjuwIMt70Wan4lwsLYyWDVnWgF+KUEw=="; + url = "https://registry.npmjs.org/terser/-/terser-5.21.0.tgz"; + sha512 = "WtnFKrxu9kaoXuiZFSGrcAvvBqAdmKx0SFNmVNYdJamMu9yyN3I/QF0FbH4QcqJQ+y1CJnzxGIKH0cSj+FGYRw=="; }; }; "terser-5.3.8" = { @@ -12208,22 +13297,22 @@ let sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; }; }; - "tslib-2.5.0" = { + "tslib-2.6.2" = { name = "tslib"; packageName = "tslib"; - version = "2.5.0"; + version = "2.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz"; - sha512 = "336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="; + url = "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz"; + sha512 = "AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="; }; }; - "tsyringe-4.7.0" = { + "tsyringe-4.8.0" = { name = "tsyringe"; packageName = "tsyringe"; - version = "4.7.0"; + version = "4.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/tsyringe/-/tsyringe-4.7.0.tgz"; - sha512 = "ncFDM1jTLsok4ejMvSW5jN1VGPQD48y2tfAR0pdptWRKYX4bkbqPt92k7KJ5RFJ1KV36JEs/+TMh7I6OUgj74g=="; + url = "https://registry.npmjs.org/tsyringe/-/tsyringe-4.8.0.tgz"; + sha512 = "YB1FG+axdxADa3ncEtRnQCFq/M0lALGLxSZeVNbTU8NqhOVc51nnv2CISTcvc1kyv6EGPtXVr0v6lWeDxiijOA=="; }; }; "tty-browserify-0.0.0" = { @@ -12298,6 +13387,33 @@ let sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; }; }; + "typed-array-buffer-1.0.0" = { + name = "typed-array-buffer"; + packageName = "typed-array-buffer"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz"; + sha512 = "Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw=="; + }; + }; + "typed-array-byte-length-1.0.0" = { + name = "typed-array-byte-length"; + packageName = "typed-array-byte-length"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz"; + sha512 = "Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA=="; + }; + }; + "typed-array-byte-offset-1.0.0" = { + name = "typed-array-byte-offset"; + packageName = "typed-array-byte-offset"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz"; + sha512 = "RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg=="; + }; + }; "typed-array-length-1.0.4" = { name = "typed-array-length"; packageName = "typed-array-length"; @@ -12388,15 +13504,6 @@ let sha512 = "61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw=="; }; }; - "undici-4.16.0" = { - name = "undici"; - packageName = "undici"; - version = "4.16.0"; - src = fetchurl { - url = "https://registry.npmjs.org/undici/-/undici-4.16.0.tgz"; - sha512 = "tkZSECUYi+/T1i4u+4+lwZmQgLXd4BLGlrc7KZPcLIW7Jpq99+Xpc30ONv7nS6F5UNOxp/HBZSSL9MafUrvJbw=="; - }; - }; "unicode-canonical-property-names-ecmascript-2.0.0" = { name = "unicode-canonical-property-names-ecmascript"; packageName = "unicode-canonical-property-names-ecmascript"; @@ -12469,6 +13576,15 @@ let sha512 = "Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ=="; }; }; + "unique-filename-3.0.0" = { + name = "unique-filename"; + packageName = "unique-filename"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz"; + sha512 = "afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g=="; + }; + }; "unique-slug-2.0.2" = { name = "unique-slug"; packageName = "unique-slug"; @@ -12478,6 +13594,15 @@ let sha512 = "zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w=="; }; }; + "unique-slug-4.0.0" = { + name = "unique-slug"; + packageName = "unique-slug"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz"; + sha512 = "WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ=="; + }; + }; "universalify-0.1.2" = { name = "universalify"; packageName = "universalify"; @@ -12550,13 +13675,13 @@ let sha512 = "1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w=="; }; }; - "update-browserslist-db-1.0.11" = { + "update-browserslist-db-1.0.13" = { name = "update-browserslist-db"; packageName = "update-browserslist-db"; - version = "1.0.11"; + version = "1.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz"; - sha512 = "dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA=="; + url = "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz"; + sha512 = "xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg=="; }; }; "upgrade-1.1.0" = { @@ -12586,13 +13711,13 @@ let sha512 = "Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg=="; }; }; - "url-0.11.0" = { + "url-0.11.3" = { name = "url"; packageName = "url"; - version = "0.11.0"; + version = "0.11.3"; src = fetchurl { - url = "https://registry.npmjs.org/url/-/url-0.11.0.tgz"; - sha512 = "kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ=="; + url = "https://registry.npmjs.org/url/-/url-0.11.3.tgz"; + sha512 = "6hxOLGfZASQK/cijlZnZJTq8OXAkt/3YGfQX45vvMYXpZoo8NdWZcY73K108Jf759lS1Bv/8wXnHDTSz17dSRw=="; }; }; "url-loader-4.1.1" = { @@ -12649,13 +13774,13 @@ let sha512 = "Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ=="; }; }; - "util-0.10.3" = { + "util-0.10.4" = { name = "util"; packageName = "util"; - version = "0.10.3"; + version = "0.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/util/-/util-0.10.3.tgz"; - sha512 = "5KiHfsmkqacuKjkRkdV7SsfDJ2EGiPsK92s2MhNSY0craxjTdKTtqKsJaCWp4LW33ZZ0OPUv1WO/TFvNQRiQxQ=="; + url = "https://registry.npmjs.org/util/-/util-0.10.4.tgz"; + sha512 = "0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A=="; }; }; "util-0.11.1" = { @@ -12757,6 +13882,15 @@ let sha512 = "ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw=="; }; }; + "vite-4.4.11" = { + name = "vite"; + packageName = "vite"; + version = "4.4.11"; + src = fetchurl { + url = "https://registry.npmjs.org/vite/-/vite-4.4.11.tgz"; + sha512 = "ksNZJlkcU9b0lBwAGZGGaZHCMqHsc8OpgtoYhsQ4/I2v5cnpmmmqe5pM4nv/4Hn6G/2GhTdj0DhZh2e+Er1q5A=="; + }; + }; "vm-browserify-1.1.2" = { name = "vm-browserify"; packageName = "vm-browserify"; @@ -12811,13 +13945,13 @@ let sha512 = "SYU4z1dL0PyIMd4Vj8YOqFvHu7Hz/enbWtpfnVbJHU4Nd1YNYx8u0ennumc6h48GQNeOLxmwySmnADouT/AuZA=="; }; }; - "vscode-uri-3.0.7" = { + "vscode-uri-3.0.8" = { name = "vscode-uri"; packageName = "vscode-uri"; - version = "3.0.7"; + version = "3.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.7.tgz"; - sha512 = "eOpPHogvorZRobNqJGhapa0JdwaxpjVvyBp0QIUMRMSf8ZAlqOdEquKuRmw9Qwu0qXtJIWqFtMkmvJjUZmMjVA=="; + url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.8.tgz"; + sha512 = "AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw=="; }; }; "watchpack-1.7.5" = { @@ -12991,6 +14125,15 @@ let sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; }; }; + "which-3.0.1" = { + name = "which"; + packageName = "which"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/which/-/which-3.0.1.tgz"; + sha512 = "XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg=="; + }; + }; "which-boxed-primitive-1.0.2" = { name = "which-boxed-primitive"; packageName = "which-boxed-primitive"; @@ -13018,13 +14161,13 @@ let sha512 = "iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ=="; }; }; - "which-typed-array-1.1.9" = { + "which-typed-array-1.1.11" = { name = "which-typed-array"; packageName = "which-typed-array"; - version = "1.1.9"; + version = "1.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz"; - sha512 = "w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA=="; + url = "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz"; + sha512 = "qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew=="; }; }; "winston-2.1.1" = { @@ -13216,6 +14359,24 @@ let sha512 = "r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA=="; }; }; + "wrap-ansi-8.1.0" = { + name = "wrap-ansi"; + packageName = "wrap-ansi"; + version = "8.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz"; + sha512 = "si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ=="; + }; + }; + "wrap-ansi-cjs-7.0.0" = { + name = "wrap-ansi-cjs"; + packageName = "wrap-ansi-cjs"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"; + sha512 = "YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="; + }; + }; "wrappy-1.0.2" = { name = "wrappy"; packageName = "wrappy"; @@ -13807,7 +14968,7 @@ in sources."rimraf-2.6.3" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."set-blocking-2.0.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" @@ -13834,7 +14995,7 @@ in sources."json-schema-traverse-1.0.0" ]; }) - sources."tar-6.1.14" + sources."tar-6.2.0" sources."temp-0.9.0" sources."through-2.3.8" sources."tmp-0.0.33" @@ -13947,15 +15108,16 @@ in sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."fs.realpath-1.0.0" - sources."fsevents-2.3.2" + sources."fsevents-2.3.3" sources."function-bind-1.1.1" - sources."get-intrinsic-1.2.0" + sources."get-intrinsic-1.2.1" sources."get-stream-4.1.0" sources."glob-7.2.3" sources."glob-parent-5.1.2" sources."got-9.6.0" - sources."has-1.0.3" + sources."has-1.0.4" sources."has-flag-4.0.0" + sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."http-cache-semantics-4.1.1" sources."http-errors-2.0.0" @@ -13986,7 +15148,7 @@ in sources."minimist-1.2.8" sources."ms-2.0.0" sources."negotiator-0.6.3" - sources."node-gyp-build-4.6.0" + sources."node-gyp-build-4.6.1" sources."normalize-path-3.0.0" sources."normalize-url-4.5.1" sources."object-inspect-1.12.3" @@ -14014,7 +15176,7 @@ in sources."rimraf-2.7.1" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."semver-6.3.0" + sources."semver-6.3.1" (sources."send-0.18.0" // { dependencies = [ sources."ms-2.1.3" @@ -14064,10 +15226,10 @@ in "@elm-tooling/elm-language-server" = nodeEnv.buildNodePackage { name = "_at_elm-tooling_slash_elm-language-server"; packageName = "@elm-tooling/elm-language-server"; - version = "2.7.0"; + version = "2.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/@elm-tooling/elm-language-server/-/elm-language-server-2.7.0.tgz"; - sha512 = "EIPf/plACx7GmY4GBxfri4JsYYIqq5whAIpVBtcz9yhE+z5L6RqnH6ZLJkTmA5Z+d74lO6oz5CZ5JZS8tzdb6w=="; + url = "https://registry.npmjs.org/@elm-tooling/elm-language-server/-/elm-language-server-2.7.3.tgz"; + sha512 = "V6X0cqgyc+ZCA2eRA8eU33nNrWmM78uvKhhNUl8OMrdGecA9nOsk1lmoWAhOmyD1ZSbgvvNQiBGnbmziemM6CA=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -14082,11 +15244,11 @@ in sources."dir-glob-3.0.1" sources."escape-string-regexp-4.0.0" sources."execa-5.1.1" - sources."fast-diff-1.2.0" - sources."fast-glob-3.2.12" + sources."fast-diff-1.3.0" + sources."fast-glob-3.3.1" sources."fastq-1.15.0" sources."fill-range-7.0.1" - sources."fsevents-2.3.2" + sources."fsevents-2.3.3" sources."get-stream-6.0.1" sources."glob-parent-5.1.2" sources."globby-11.1.0" @@ -14112,6 +15274,7 @@ in sources."queue-microtask-1.2.3" sources."readdirp-3.6.0" sources."reflect-metadata-0.1.13" + sources."request-light-0.7.0" sources."reusify-1.0.4" sources."run-parallel-1.2.0" sources."shebang-command-2.0.0" @@ -14122,13 +15285,13 @@ in sources."to-regex-range-5.0.1" sources."ts-debounce-4.0.0" sources."tslib-1.14.1" - sources."tsyringe-4.7.0" + sources."tsyringe-4.8.0" sources."vscode-jsonrpc-8.1.0" sources."vscode-languageserver-8.1.0" sources."vscode-languageserver-protocol-3.17.3" sources."vscode-languageserver-textdocument-1.0.8" sources."vscode-languageserver-types-3.17.3" - sources."vscode-uri-3.0.7" + sources."vscode-uri-3.0.8" sources."web-tree-sitter-0.20.8" sources."which-2.0.2" ]; @@ -14184,9 +15347,9 @@ in }) sources."fill-range-7.0.1" sources."finalhandler-1.1.2" - sources."follow-redirects-1.15.2" + sources."follow-redirects-1.15.3" sources."fresh-0.5.2" - sources."fsevents-2.3.2" + sources."fsevents-2.3.3" sources."get-stream-4.1.0" sources."glob-parent-5.1.2" sources."has-ansi-2.0.0" @@ -14225,7 +15388,7 @@ in sources."range-parser-1.2.1" sources."readdirp-3.6.0" sources."requires-port-1.0.0" - sources."semver-5.7.1" + sources."semver-5.7.2" (sources."send-0.17.1" // { dependencies = [ sources."mime-1.6.0" @@ -14313,7 +15476,7 @@ in sources."next-tick-1.1.0" sources."nice-try-1.0.5" sources."node-elm-compiler-5.0.5" - sources."node-gyp-build-4.6.0" + sources."node-gyp-build-4.6.1" sources."normalize-path-3.0.0" sources."once-1.4.0" sources."path-is-absolute-1.0.1" @@ -14321,7 +15484,7 @@ in sources."picomatch-2.3.1" sources."readdirp-3.4.0" sources."rimraf-2.6.3" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."source-map-0.7.4" @@ -14375,7 +15538,7 @@ in sources."elm-solve-deps-wasm-1.0.2" sources."fill-range-7.0.1" sources."fs.realpath-1.0.0" - sources."fsevents-2.3.2" + sources."fsevents-2.3.3" sources."glob-8.1.0" sources."glob-parent-5.1.2" sources."graceful-fs-4.2.11" @@ -14425,12 +15588,12 @@ in sources."@sindresorhus/is-2.1.1" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.3" - sources."@types/http-cache-semantics-4.0.1" + sources."@types/http-cache-semantics-4.0.2" sources."@types/keyv-3.1.4" - sources."@types/node-18.16.3" - sources."@types/responselike-1.0.0" + sources."@types/node-20.8.2" + sources."@types/responselike-1.0.1" sources."cacheable-lookup-2.0.1" - sources."cacheable-request-7.0.2" + sources."cacheable-request-7.0.4" sources."caw-2.0.1" (sources."clone-response-1.0.3" // { dependencies = [ @@ -14456,7 +15619,7 @@ in sources."isurl-1.0.0" sources."json-buffer-3.0.1" sources."jsonfile-4.0.0" - sources."keyv-4.5.2" + sources."keyv-4.5.3" sources."lowercase-keys-2.0.0" sources."lru-cache-6.0.0" sources."mimic-response-2.1.0" @@ -14473,7 +15636,7 @@ in sources."responselike-2.0.1" sources."safe-buffer-5.2.1" sources."safename-1.0.2" - sources."semver-7.5.0" + sources."semver-7.5.4" sources."to-readable-stream-2.1.0" sources."tunnel-agent-0.6.0" sources."type-fest-0.10.0" @@ -14642,7 +15805,7 @@ in sources."rimraf-2.7.1" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."set-blocking-2.0.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" @@ -14710,11 +15873,11 @@ in sources."process-nextick-args-2.0.1" sources."readable-stream-2.3.8" sources."safe-buffer-5.1.2" - sources."semver-6.3.0" + sources."semver-6.3.1" sources."semver-regex-3.1.4" (sources."semver-sort-1.0.0" // { dependencies = [ - sources."semver-5.7.1" + sources."semver-5.7.2" ]; }) sources."string_decoder-1.1.1" @@ -14743,47 +15906,47 @@ in }; dependencies = [ sources."@babel/cli-7.12.10" - sources."@babel/code-frame-7.21.4" - sources."@babel/compat-data-7.21.7" + sources."@babel/code-frame-7.22.13" + sources."@babel/compat-data-7.22.20" sources."@babel/core-7.12.10" - sources."@babel/generator-7.21.5" - sources."@babel/helper-annotate-as-pure-7.18.6" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.21.5" - (sources."@babel/helper-compilation-targets-7.21.5" // { + sources."@babel/generator-7.23.0" + sources."@babel/helper-annotate-as-pure-7.22.5" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.22.15" + (sources."@babel/helper-compilation-targets-7.22.15" // { dependencies = [ - sources."semver-6.3.0" + sources."semver-6.3.1" ]; }) - (sources."@babel/helper-create-class-features-plugin-7.21.8" // { + (sources."@babel/helper-create-class-features-plugin-7.22.15" // { dependencies = [ - sources."semver-6.3.0" + sources."semver-6.3.1" ]; }) - (sources."@babel/helper-create-regexp-features-plugin-7.21.8" // { + (sources."@babel/helper-create-regexp-features-plugin-7.22.15" // { dependencies = [ - sources."semver-6.3.0" + sources."semver-6.3.1" ]; }) - sources."@babel/helper-environment-visitor-7.21.5" - sources."@babel/helper-function-name-7.21.0" - sources."@babel/helper-hoist-variables-7.18.6" - sources."@babel/helper-member-expression-to-functions-7.21.5" - sources."@babel/helper-module-imports-7.21.4" - sources."@babel/helper-module-transforms-7.21.5" - sources."@babel/helper-optimise-call-expression-7.18.6" - sources."@babel/helper-plugin-utils-7.21.5" - sources."@babel/helper-remap-async-to-generator-7.18.9" - sources."@babel/helper-replace-supers-7.21.5" - sources."@babel/helper-simple-access-7.21.5" - sources."@babel/helper-skip-transparent-expression-wrappers-7.20.0" - sources."@babel/helper-split-export-declaration-7.18.6" - sources."@babel/helper-string-parser-7.21.5" - sources."@babel/helper-validator-identifier-7.19.1" - sources."@babel/helper-validator-option-7.21.0" - sources."@babel/helper-wrap-function-7.20.5" - sources."@babel/helpers-7.21.5" - sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.21.8" + sources."@babel/helper-environment-visitor-7.22.20" + sources."@babel/helper-function-name-7.23.0" + sources."@babel/helper-hoist-variables-7.22.5" + sources."@babel/helper-member-expression-to-functions-7.23.0" + sources."@babel/helper-module-imports-7.22.15" + sources."@babel/helper-module-transforms-7.23.0" + sources."@babel/helper-optimise-call-expression-7.22.5" + sources."@babel/helper-plugin-utils-7.22.5" + sources."@babel/helper-remap-async-to-generator-7.22.20" + sources."@babel/helper-replace-supers-7.22.20" + sources."@babel/helper-simple-access-7.22.5" + sources."@babel/helper-skip-transparent-expression-wrappers-7.22.5" + sources."@babel/helper-split-export-declaration-7.22.6" + sources."@babel/helper-string-parser-7.22.5" + sources."@babel/helper-validator-identifier-7.22.20" + sources."@babel/helper-validator-option-7.22.15" + sources."@babel/helper-wrap-function-7.22.20" + sources."@babel/helpers-7.23.1" + sources."@babel/highlight-7.22.20" + sources."@babel/parser-7.23.0" sources."@babel/plugin-proposal-async-generator-functions-7.20.7" sources."@babel/plugin-proposal-class-properties-7.18.6" sources."@babel/plugin-proposal-dynamic-import-7.18.6" @@ -14809,83 +15972,79 @@ in sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" sources."@babel/plugin-syntax-top-level-await-7.14.5" - sources."@babel/plugin-transform-arrow-functions-7.21.5" - sources."@babel/plugin-transform-async-to-generator-7.20.7" - sources."@babel/plugin-transform-block-scoped-functions-7.18.6" - sources."@babel/plugin-transform-block-scoping-7.21.0" - sources."@babel/plugin-transform-classes-7.21.0" - sources."@babel/plugin-transform-computed-properties-7.21.5" - sources."@babel/plugin-transform-destructuring-7.21.3" - sources."@babel/plugin-transform-dotall-regex-7.18.6" - sources."@babel/plugin-transform-duplicate-keys-7.18.9" - sources."@babel/plugin-transform-exponentiation-operator-7.18.6" - sources."@babel/plugin-transform-for-of-7.21.5" - sources."@babel/plugin-transform-function-name-7.18.9" - sources."@babel/plugin-transform-literals-7.18.9" - sources."@babel/plugin-transform-member-expression-literals-7.18.6" - sources."@babel/plugin-transform-modules-amd-7.20.11" - sources."@babel/plugin-transform-modules-commonjs-7.21.5" - sources."@babel/plugin-transform-modules-systemjs-7.20.11" - sources."@babel/plugin-transform-modules-umd-7.18.6" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.20.5" - sources."@babel/plugin-transform-new-target-7.18.6" - sources."@babel/plugin-transform-object-super-7.18.6" - sources."@babel/plugin-transform-parameters-7.21.3" - sources."@babel/plugin-transform-property-literals-7.18.6" - sources."@babel/plugin-transform-regenerator-7.21.5" - sources."@babel/plugin-transform-reserved-words-7.18.6" + sources."@babel/plugin-transform-arrow-functions-7.22.5" + sources."@babel/plugin-transform-async-to-generator-7.22.5" + sources."@babel/plugin-transform-block-scoped-functions-7.22.5" + sources."@babel/plugin-transform-block-scoping-7.23.0" + sources."@babel/plugin-transform-classes-7.22.15" + sources."@babel/plugin-transform-computed-properties-7.22.5" + sources."@babel/plugin-transform-destructuring-7.23.0" + sources."@babel/plugin-transform-dotall-regex-7.22.5" + sources."@babel/plugin-transform-duplicate-keys-7.22.5" + sources."@babel/plugin-transform-exponentiation-operator-7.22.5" + sources."@babel/plugin-transform-for-of-7.22.15" + sources."@babel/plugin-transform-function-name-7.22.5" + sources."@babel/plugin-transform-literals-7.22.5" + sources."@babel/plugin-transform-member-expression-literals-7.22.5" + sources."@babel/plugin-transform-modules-amd-7.23.0" + sources."@babel/plugin-transform-modules-commonjs-7.23.0" + sources."@babel/plugin-transform-modules-systemjs-7.23.0" + sources."@babel/plugin-transform-modules-umd-7.22.5" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.22.5" + sources."@babel/plugin-transform-new-target-7.22.5" + sources."@babel/plugin-transform-object-super-7.22.5" + sources."@babel/plugin-transform-parameters-7.22.15" + sources."@babel/plugin-transform-property-literals-7.22.5" + sources."@babel/plugin-transform-regenerator-7.22.10" + sources."@babel/plugin-transform-reserved-words-7.22.5" sources."@babel/plugin-transform-runtime-7.12.10" - sources."@babel/plugin-transform-shorthand-properties-7.18.6" - sources."@babel/plugin-transform-spread-7.20.7" - sources."@babel/plugin-transform-sticky-regex-7.18.6" - sources."@babel/plugin-transform-template-literals-7.18.9" - sources."@babel/plugin-transform-typeof-symbol-7.18.9" - sources."@babel/plugin-transform-unicode-escapes-7.21.5" - sources."@babel/plugin-transform-unicode-regex-7.18.6" + sources."@babel/plugin-transform-shorthand-properties-7.22.5" + sources."@babel/plugin-transform-spread-7.22.5" + sources."@babel/plugin-transform-sticky-regex-7.22.5" + sources."@babel/plugin-transform-template-literals-7.22.5" + sources."@babel/plugin-transform-typeof-symbol-7.22.5" + sources."@babel/plugin-transform-unicode-escapes-7.22.10" + sources."@babel/plugin-transform-unicode-regex-7.22.5" sources."@babel/preset-env-7.12.10" - sources."@babel/preset-modules-0.1.5" + sources."@babel/preset-modules-0.1.6" sources."@babel/regjsgen-0.8.0" sources."@babel/runtime-7.12.5" - sources."@babel/template-7.20.7" - sources."@babel/traverse-7.21.5" - sources."@babel/types-7.21.5" + sources."@babel/template-7.22.15" + sources."@babel/traverse-7.23.0" + sources."@babel/types-7.23.0" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" sources."@hapi/hoek-8.5.1" sources."@hapi/joi-15.1.1" sources."@hapi/topo-3.1.6" sources."@jridgewell/gen-mapping-0.3.3" - sources."@jridgewell/resolve-uri-3.1.0" + sources."@jridgewell/resolve-uri-3.1.1" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" - (sources."@jridgewell/trace-mapping-0.3.18" // { - dependencies = [ - sources."@jridgewell/sourcemap-codec-1.4.14" - ]; - }) + sources."@jridgewell/trace-mapping-0.3.19" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/glob-7.2.0" sources."@types/html-minifier-terser-5.1.2" - sources."@types/http-proxy-1.17.11" - sources."@types/json-schema-7.0.11" + sources."@types/http-proxy-1.17.12" + sources."@types/json-schema-7.0.13" sources."@types/minimatch-5.1.2" - sources."@types/node-18.16.3" + sources."@types/node-20.8.2" sources."@types/parse-json-4.0.0" - sources."@types/q-1.5.5" - sources."@types/source-list-map-0.1.2" - sources."@types/tapable-1.0.8" - (sources."@types/uglify-js-3.17.1" // { + sources."@types/q-1.5.6" + sources."@types/source-list-map-0.1.3" + sources."@types/tapable-1.0.9" + (sources."@types/uglify-js-3.17.2" // { dependencies = [ sources."source-map-0.6.1" ]; }) - (sources."@types/webpack-4.41.33" // { + (sources."@types/webpack-4.41.34" // { dependencies = [ sources."source-map-0.6.1" ]; }) - (sources."@types/webpack-sources-3.2.0" // { + (sources."@types/webpack-sources-3.2.1" // { dependencies = [ sources."source-map-0.7.4" ]; @@ -14936,7 +16095,8 @@ in sources."array-union-1.0.2" sources."array-uniq-1.0.3" sources."array-unique-0.3.2" - sources."array.prototype.reduce-1.0.5" + sources."array.prototype.reduce-1.0.6" + sources."arraybuffer.prototype.slice-1.0.2" sources."asap-2.0.6" sources."asn1-0.2.6" (sources."asn1.js-5.4.1" // { @@ -14944,10 +16104,10 @@ in sources."bn.js-4.12.0" ]; }) - (sources."assert-1.5.0" // { + (sources."assert-1.5.1" // { dependencies = [ - sources."inherits-2.0.1" - sources."util-0.10.3" + sources."inherits-2.0.3" + sources."util-0.10.4" ]; }) sources."assert-plus-1.0.0" @@ -14970,7 +16130,7 @@ in (sources."babel-loader-8.2.2" // { dependencies = [ sources."make-dir-3.1.0" - sources."semver-6.3.0" + sources."semver-6.3.1" ]; }) sources."babel-plugin-syntax-object-rest-spread-6.13.0" @@ -15023,7 +16183,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.21.5" + sources."browserslist-4.22.1" sources."buffer-4.9.2" sources."buffer-from-1.1.2" sources."buffer-indexof-1.1.1" @@ -15040,7 +16200,7 @@ in sources."camel-case-4.1.2" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001482" + sources."caniuse-lite-1.0.30001546" sources."case-sensitive-paths-webpack-plugin-2.3.0" sources."caseless-0.12.0" (sources."chalk-2.4.2" // { @@ -15139,7 +16299,7 @@ in ]; }) sources."core-js-2.6.12" - sources."core-js-compat-3.30.1" + sources."core-js-compat-3.33.0" sources."core-util-is-1.0.3" sources."cosmiconfig-5.2.1" (sources."create-ecdh-4.0.4" // { @@ -15166,7 +16326,7 @@ in sources."lru-cache-6.0.0" sources."picocolors-0.2.1" sources."postcss-7.0.39" - sources."semver-7.5.0" + sources."semver-7.5.4" sources."source-map-0.6.1" sources."yallist-4.0.0" ]; @@ -15212,14 +16372,15 @@ in ]; }) sources."cycle-1.0.3" - sources."cyclist-1.0.1" + sources."cyclist-1.0.2" sources."dashdash-1.14.1" sources."debug-4.3.4" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.2" sources."deep-equal-0.2.2" sources."default-gateway-4.2.0" - sources."define-properties-1.2.0" + sources."define-data-property-1.1.0" + sources."define-properties-1.2.1" sources."define-property-2.0.2" (sources."del-4.1.1" // { dependencies = [ @@ -15232,7 +16393,7 @@ in }) sources."delayed-stream-1.0.0" sources."depd-2.0.0" - sources."des.js-1.0.1" + sources."des.js-1.1.0" sources."destroy-1.2.0" sources."detect-node-2.1.0" (sources."detect-port-alt-1.1.6" // { @@ -15263,7 +16424,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.382" + sources."electron-to-chromium-1.4.542" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -15301,7 +16462,7 @@ in sources."entities-2.2.0" sources."errno-0.1.8" sources."error-ex-1.3.2" - sources."es-abstract-1.21.2" + sources."es-abstract-1.22.2" sources."es-array-method-boxes-properly-1.0.0" sources."es-set-tostringtag-2.0.1" sources."es-to-primitive-1.2.1" @@ -15409,7 +16570,7 @@ in (sources."file-loader-6.2.0" // { dependencies = [ sources."loader-utils-2.0.4" - sources."schema-utils-3.1.2" + sources."schema-utils-3.3.0" ]; }) sources."file-uri-to-path-1.0.0" @@ -15424,20 +16585,20 @@ in (sources."find-cache-dir-3.3.2" // { dependencies = [ sources."make-dir-3.1.0" - sources."semver-6.3.0" + sources."semver-6.3.1" ]; }) sources."find-elm-dependencies-2.0.4" sources."find-up-4.1.0" sources."firstline-1.3.1" sources."flush-write-stream-1.1.1" - sources."follow-redirects-1.15.2" + sources."follow-redirects-1.15.3" sources."for-each-0.3.3" sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."forwarded-0.2.0" - sources."fraction.js-4.2.0" + sources."fraction.js-4.3.6" sources."fragment-cache-0.2.1" sources."fresh-0.5.2" sources."from2-2.3.0" @@ -15445,13 +16606,13 @@ in sources."fs-readdir-recursive-1.1.0" sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" - sources."fsevents-2.3.2" + sources."fsevents-2.3.3" sources."function-bind-1.1.1" - sources."function.prototype.name-1.1.5" + sources."function.prototype.name-1.1.6" sources."functions-have-names-1.2.3" sources."gensync-1.0.0-beta.2" sources."get-caller-file-1.0.3" - sources."get-intrinsic-1.2.0" + sources."get-intrinsic-1.2.1" sources."get-own-enumerable-property-symbols-3.0.2" sources."get-stream-4.1.0" sources."get-symbol-description-1.0.0" @@ -15488,7 +16649,7 @@ in sources."handle-thing-2.0.1" sources."har-schema-2.0.0" sources."har-validator-5.1.5" - sources."has-1.0.3" + sources."has-1.0.4" sources."has-bigints-1.0.2" sources."has-flag-3.0.0" sources."has-property-descriptors-1.0.0" @@ -15587,7 +16748,7 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.7" sources."is-color-stop-1.1.0" - sources."is-core-module-2.12.0" + sources."is-core-module-2.13.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.5" sources."is-descriptor-1.0.2" @@ -15613,7 +16774,7 @@ in sources."is-stream-1.1.0" sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.10" + sources."is-typed-array-1.1.12" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" sources."is-weakref-1.0.2" @@ -15707,7 +16868,7 @@ in sources."multicast-dns-6.2.3" sources."multicast-dns-service-types-1.1.0" sources."mute-stream-0.0.8" - sources."nan-2.17.0" + sources."nan-2.18.0" sources."nanoid-3.3.6" sources."nanomatch-1.2.13" sources."ncp-1.0.1" @@ -15730,7 +16891,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-2.0.10" + sources."node-releases-2.0.13" sources."normalize-package-data-2.5.0" sources."normalize-path-3.0.0" sources."normalize-range-0.1.2" @@ -15762,10 +16923,10 @@ in sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.assign-4.1.4" - sources."object.entries-1.1.6" - sources."object.getownpropertydescriptors-2.1.6" + sources."object.entries-1.1.7" + sources."object.getownpropertydescriptors-2.1.7" sources."object.pick-1.3.0" - sources."object.values-1.1.6" + sources."object.values-1.1.7" sources."obuf-1.1.2" sources."on-finished-2.4.1" sources."on-headers-1.0.2" @@ -15838,7 +16999,7 @@ in ]; }) sources."posix-character-classes-0.1.1" - sources."postcss-8.4.23" + sources."postcss-8.4.31" (sources."postcss-calc-7.0.5" // { dependencies = [ sources."picocolors-0.2.1" @@ -15906,8 +17067,8 @@ in sources."parse-json-5.2.0" sources."path-type-4.0.0" sources."resolve-from-4.0.0" - sources."schema-utils-3.1.2" - sources."semver-7.5.0" + sources."schema-utils-3.3.0" + sources."semver-7.5.4" sources."yallist-4.0.0" ]; }) @@ -16083,7 +17244,7 @@ in ]; }) sources."postcss-safe-parser-5.0.2" - sources."postcss-selector-parser-6.0.12" + sources."postcss-selector-parser-6.0.13" (sources."postcss-svgo-4.0.3" // { dependencies = [ sources."picocolors-0.2.1" @@ -16127,7 +17288,6 @@ in sources."q-1.5.1" sources."qs-6.5.3" sources."query-string-4.3.4" - sources."querystring-0.2.0" sources."querystring-es3-0.2.1" sources."querystringify-2.2.0" sources."randombytes-2.1.0" @@ -16191,11 +17351,11 @@ in ]; }) sources."regenerate-1.4.2" - sources."regenerate-unicode-properties-10.1.0" + sources."regenerate-unicode-properties-10.1.1" sources."regenerator-runtime-0.13.11" - sources."regenerator-transform-0.15.1" + sources."regenerator-transform-0.15.2" sources."regex-not-1.0.2" - sources."regexp.prototype.flags-1.5.0" + sources."regexp.prototype.flags-1.5.1" sources."regexpu-core-5.3.2" (sources."regjsparser-0.9.1" // { dependencies = [ @@ -16216,7 +17376,7 @@ in sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."requires-port-1.0.0" - sources."resolve-1.22.3" + sources."resolve-1.22.6" sources."resolve-cwd-2.0.0" sources."resolve-dir-1.0.1" sources."resolve-from-3.0.0" @@ -16236,7 +17396,7 @@ in sources."tslib-1.14.1" ]; }) - (sources."safe-array-concat-1.0.0" // { + (sources."safe-array-concat-1.0.1" // { dependencies = [ sources."isarray-2.0.5" ]; @@ -16249,7 +17409,7 @@ in sources."schema-utils-2.7.1" sources."select-hose-2.0.0" sources."selfsigned-1.10.14" - sources."semver-5.7.1" + sources."semver-5.7.2" (sources."send-0.18.0" // { dependencies = [ (sources."debug-2.6.9" // { @@ -16274,6 +17434,7 @@ in }) sources."serve-static-1.15.0" sources."set-blocking-2.0.0" + sources."set-function-name-2.0.1" (sources."set-value-2.0.1" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -16349,7 +17510,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.13" + sources."spdx-license-ids-3.0.15" sources."spdy-4.0.2" (sources."spdy-transport-3.0.0" // { dependencies = [ @@ -16392,9 +17553,9 @@ in sources."strip-ansi-6.0.1" ]; }) - sources."string.prototype.trim-1.2.7" - sources."string.prototype.trimend-1.0.6" - sources."string.prototype.trimstart-1.0.6" + sources."string.prototype.trim-1.2.8" + sources."string.prototype.trimend-1.0.7" + sources."string.prototype.trimstart-1.0.7" sources."string_decoder-1.1.1" (sources."stringify-object-3.3.0" // { dependencies = [ @@ -16476,11 +17637,14 @@ in sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" sources."tough-cookie-2.5.0" - sources."tslib-2.5.0" + sources."tslib-2.6.2" sources."tty-browserify-0.0.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" + sources."typed-array-buffer-1.0.0" + sources."typed-array-byte-length-1.0.0" + sources."typed-array-byte-offset-1.0.0" sources."typed-array-length-1.0.4" sources."typedarray-0.0.6" (sources."uglify-es-3.3.10" // { @@ -16536,18 +17700,19 @@ in ]; }) sources."upath-1.2.0" - sources."update-browserslist-db-1.0.11" + sources."update-browserslist-db-1.0.13" sources."uri-js-4.4.1" sources."urix-0.1.0" - (sources."url-0.11.0" // { + (sources."url-0.11.3" // { dependencies = [ - sources."punycode-1.3.2" + sources."punycode-1.4.1" + sources."qs-6.11.2" ]; }) (sources."url-loader-4.1.1" // { dependencies = [ sources."loader-utils-2.0.4" - sources."schema-utils-3.1.2" + sources."schema-utils-3.3.0" ]; }) sources."url-parse-1.5.10" @@ -16643,7 +17808,7 @@ in sources."readdirp-2.2.1" sources."require-main-filename-2.0.0" sources."schema-utils-1.0.0" - sources."semver-6.3.0" + sources."semver-6.3.1" (sources."string-width-3.1.0" // { dependencies = [ sources."ansi-regex-4.1.1" @@ -16681,7 +17846,7 @@ in sources."which-2.0.2" sources."which-boxed-primitive-1.0.2" sources."which-module-1.0.0" - sources."which-typed-array-1.1.9" + sources."which-typed-array-1.1.11" (sources."winston-2.1.1" // { dependencies = [ sources."async-1.0.0" @@ -16799,7 +17964,7 @@ in sources."pretty-format-27.5.1" sources."react-is-17.0.2" sources."rimraf-2.6.3" - sources."semver-5.7.1" + sources."semver-5.7.2" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."supports-color-7.2.0" @@ -16822,46 +17987,81 @@ in elm-pages = nodeEnv.buildNodePackage { name = "elm-pages"; packageName = "elm-pages"; - version = "2.1.12"; + version = "3.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/elm-pages/-/elm-pages-2.1.12.tgz"; - sha512 = "uC6XZAmakIcRYJlqywgHsnVNlwzQZxVqPo8fsFCJWBYwwjWhD/uYSFGdFwB29wyxaI6BgRi8Rm745VU1oCortg=="; + url = "https://registry.npmjs.org/elm-pages/-/elm-pages-3.0.8.tgz"; + sha512 = "ls6ZI5CMlFji/P2yg1A+Krv6A1zjm4Q1+gpkMjZsAcmg2gABjN6R4ZATbD6/+hosSaAvsnZ1rRUTCPRsncYg+w=="; }; dependencies = [ + sources."@adobe/css-tools-4.2.0" + sources."@esbuild/android-arm-0.17.19" + sources."@esbuild/android-arm64-0.17.19" + sources."@esbuild/android-x64-0.17.19" + sources."@esbuild/darwin-arm64-0.17.19" + sources."@esbuild/darwin-x64-0.17.19" + sources."@esbuild/freebsd-arm64-0.17.19" + sources."@esbuild/freebsd-x64-0.17.19" + sources."@esbuild/linux-arm-0.17.19" + sources."@esbuild/linux-arm64-0.17.19" + sources."@esbuild/linux-ia32-0.17.19" + sources."@esbuild/linux-loong64-0.17.19" + sources."@esbuild/linux-mips64el-0.17.19" + sources."@esbuild/linux-ppc64-0.17.19" + sources."@esbuild/linux-riscv64-0.17.19" + sources."@esbuild/linux-s390x-0.17.19" + sources."@esbuild/linux-x64-0.17.19" + sources."@esbuild/netbsd-x64-0.17.19" + sources."@esbuild/openbsd-x64-0.17.19" + sources."@esbuild/sunos-x64-0.17.19" + sources."@esbuild/win32-arm64-0.17.19" + sources."@esbuild/win32-ia32-0.17.19" + sources."@esbuild/win32-x64-0.17.19" + sources."@isaacs/cliui-8.0.2" sources."@jridgewell/gen-mapping-0.3.3" - sources."@jridgewell/resolve-uri-3.1.0" + sources."@jridgewell/resolve-uri-3.1.1" sources."@jridgewell/set-array-1.1.2" - sources."@jridgewell/source-map-0.3.3" + sources."@jridgewell/source-map-0.3.5" sources."@jridgewell/sourcemap-codec-1.4.15" - (sources."@jridgewell/trace-mapping-0.3.18" // { - dependencies = [ - sources."@jridgewell/sourcemap-codec-1.4.14" - ]; - }) + sources."@jridgewell/trace-mapping-0.3.19" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" + (sources."@npmcli/fs-3.1.0" // { + dependencies = [ + sources."lru-cache-6.0.0" + sources."semver-7.5.4" + ]; + }) sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" + sources."@tootallnate/once-2.0.0" sources."@types/configstore-2.1.1" sources."@types/debug-0.0.30" sources."@types/get-port-3.2.0" sources."@types/glob-5.0.38" - sources."@types/lodash-4.14.194" + sources."@types/lodash-4.14.199" sources."@types/minimatch-5.1.2" sources."@types/mkdirp-0.5.2" sources."@types/node-8.10.66" sources."@types/rimraf-2.0.5" sources."@types/tmp-0.0.33" sources."accepts-1.3.8" - sources."acorn-8.8.2" - sources."ansi-escapes-3.2.0" + sources."acorn-8.10.0" + (sources."agent-base-6.0.2" // { + dependencies = [ + sources."debug-4.3.4" + sources."ms-2.1.2" + ]; + }) + sources."agentkeepalive-4.5.0" + sources."aggregate-error-3.1.0" + sources."ansi-escapes-4.3.2" + sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."anymatch-3.1.3" sources."application-config-path-0.1.1" sources."argparse-1.0.10" sources."array-flatten-1.1.1" - sources."array-union-2.1.0" sources."async-limiter-1.0.1" sources."balanced-match-1.0.2" sources."batch-0.6.1" @@ -16875,7 +18075,16 @@ in sources."braces-3.0.2" sources."buffer-from-1.1.2" sources."bufferutil-4.0.7" + sources."busboy-1.6.0" sources."bytes-3.1.2" + (sources."cacache-17.1.4" // { + dependencies = [ + sources."brace-expansion-2.0.1" + sources."glob-10.3.10" + sources."minimatch-9.0.3" + sources."minipass-7.0.4" + ]; + }) (sources."cacheable-request-6.1.0" // { dependencies = [ sources."get-stream-5.2.0" @@ -16884,25 +18093,33 @@ in }) sources."call-bind-1.0.2" sources."chalk-3.0.0" - sources."chokidar-3.5.2" + sources."chokidar-3.5.3" + sources."chownr-2.0.0" + sources."clean-stack-2.2.0" sources."clone-response-1.0.3" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."command-exists-1.2.9" - sources."commander-8.3.0" + sources."commander-10.0.1" sources."concat-map-0.0.1" sources."connect-3.7.0" sources."content-disposition-0.5.4" sources."content-type-1.0.5" sources."cookie-0.5.0" - sources."cookie-signature-1.0.6" - sources."cross-spawn-7.0.3" + sources."cookie-signature-1.2.1" + sources."copy-anything-2.0.6" + (sources."cross-spawn-7.0.3" // { + dependencies = [ + sources."which-2.0.2" + ]; + }) sources."debug-2.6.9" sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."defer-to-connect-1.1.3" sources."depd-2.0.0" sources."destroy-1.2.0" + sources."detect-libc-1.0.3" (sources."devcert-1.2.2" // { dependencies = [ sources."debug-3.2.7" @@ -16911,6 +18128,7 @@ in }) sources."dir-glob-3.0.1" sources."duplexer3-0.1.5" + sources."eastasianwidth-0.2.0" sources."ee-first-1.1.1" (sources."elm-doc-preview-5.0.5" // { dependencies = [ @@ -16919,14 +18137,19 @@ in ]; }) sources."elm-hot-1.1.6" + sources."emoji-regex-9.2.2" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."eol-0.9.1" + sources."err-code-2.0.3" + sources."errno-0.1.8" + sources."esbuild-0.17.19" sources."escape-html-1.0.3" sources."esprima-4.0.1" sources."etag-1.8.1" (sources."express-4.18.2" // { dependencies = [ + sources."cookie-signature-1.0.6" sources."finalhandler-1.2.0" sources."on-finished-2.4.1" sources."statuses-2.0.1" @@ -16938,27 +18161,35 @@ in ]; }) sources."extend-shallow-2.0.1" - sources."fast-glob-3.2.12" + sources."fast-glob-3.3.1" sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."finalhandler-1.1.2" + sources."foreground-child-3.1.1" sources."forwarded-0.2.0" sources."fresh-0.5.2" - sources."fs-extra-10.1.0" + sources."fs-extra-11.1.1" + (sources."fs-minipass-3.0.3" // { + dependencies = [ + sources."minipass-7.0.4" + ]; + }) + sources."fs-monkey-1.0.5" sources."fs.realpath-1.0.0" - sources."fsevents-2.3.2" + sources."fsevents-2.3.3" sources."function-bind-1.1.1" - sources."get-intrinsic-1.2.0" + sources."get-intrinsic-1.2.1" sources."get-port-3.2.0" sources."get-stream-4.1.0" sources."glob-7.2.3" sources."glob-parent-5.1.2" - sources."globby-11.0.4" + sources."globby-13.1.4" sources."got-9.6.0" sources."graceful-fs-4.2.11" sources."gray-matter-4.0.3" - sources."has-1.0.3" + sources."has-1.0.4" sources."has-flag-4.0.0" + sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."http-cache-semantics-4.1.1" (sources."http-errors-2.0.0" // { @@ -16966,21 +18197,43 @@ in sources."statuses-2.0.1" ]; }) + (sources."http-proxy-agent-5.0.0" // { + dependencies = [ + sources."debug-4.3.4" + sources."ms-2.1.2" + ]; + }) + (sources."https-proxy-agent-5.0.1" // { + dependencies = [ + sources."debug-4.3.4" + sources."ms-2.1.2" + ]; + }) + sources."humanize-ms-1.2.1" sources."iconv-lite-0.4.24" sources."ignore-5.2.4" + sources."image-size-0.5.5" + sources."immutable-4.3.4" + sources."imurmurhash-0.1.4" + sources."indent-string-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" + sources."ip-2.0.0" sources."ipaddr.js-1.9.1" sources."is-binary-path-2.1.0" sources."is-docker-2.2.1" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" + sources."is-lambda-1.0.1" sources."is-number-7.0.0" sources."is-valid-domain-0.1.6" + sources."is-what-3.14.1" sources."is-wsl-2.2.0" sources."isexe-2.0.0" + sources."jackspeak-2.3.6" sources."js-yaml-3.14.1" sources."jsesc-3.0.2" sources."json-buffer-3.0.0" @@ -16989,9 +18242,32 @@ in sources."kind-of-6.0.3" sources."kleur-4.1.5" sources."latest-version-5.1.0" + (sources."less-4.2.0" // { + dependencies = [ + sources."tslib-2.6.2" + ]; + }) + sources."lightningcss-1.22.0" + sources."lightningcss-darwin-arm64-1.22.0" + sources."lightningcss-darwin-x64-1.22.0" + sources."lightningcss-freebsd-x64-1.22.0" + sources."lightningcss-linux-arm-gnueabihf-1.22.0" + sources."lightningcss-linux-arm64-gnu-1.22.0" + sources."lightningcss-linux-arm64-musl-1.22.0" + sources."lightningcss-linux-x64-gnu-1.22.0" + sources."lightningcss-linux-x64-musl-1.22.0" + sources."lightningcss-win32-x64-msvc-1.22.0" sources."lodash-4.17.21" sources."lowercase-keys-1.0.1" + sources."lru-cache-7.18.3" + (sources."make-dir-2.1.0" // { + dependencies = [ + sources."semver-5.7.2" + ]; + }) + sources."make-fetch-happen-11.1.1" sources."media-typer-0.3.0" + sources."memfs-3.6.0" sources."merge-descriptors-1.0.1" sources."merge2-1.4.1" sources."methods-1.1.2" @@ -17002,42 +18278,79 @@ in sources."mimic-response-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.8" + sources."minipass-5.0.0" + (sources."minipass-collect-1.0.2" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) + (sources."minipass-fetch-3.0.4" // { + dependencies = [ + sources."minipass-7.0.4" + ]; + }) + (sources."minipass-flush-1.0.5" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) + (sources."minipass-pipeline-1.2.4" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) + (sources."minipass-sized-1.0.3" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) + (sources."minizlib-2.1.2" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) sources."mkdirp-0.5.6" sources."ms-2.0.0" + sources."nanoid-3.3.6" + (sources."needle-3.2.0" // { + dependencies = [ + sources."debug-3.2.7" + sources."iconv-lite-0.6.3" + sources."ms-2.1.3" + ]; + }) sources."negotiator-0.6.3" - sources."nice-try-1.0.5" - sources."node-gyp-build-4.6.0" + sources."node-gyp-build-4.6.1" sources."normalize-path-3.0.0" sources."normalize-url-4.5.1" - sources."object-hash-2.2.0" sources."object-inspect-1.12.3" sources."on-finished-2.3.0" sources."once-1.4.0" sources."open-7.4.2" sources."os-tmpdir-1.0.2" sources."p-cancelable-1.1.0" - (sources."package-json-6.5.0" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) + sources."p-map-4.0.0" + sources."package-json-6.5.0" + sources."parse-node-version-1.0.1" sources."parseurl-1.3.3" - (sources."password-prompt-1.1.2" // { + sources."password-prompt-1.1.3" + sources."path-is-absolute-1.0.1" + sources."path-key-3.1.1" + (sources."path-scurry-1.10.1" // { dependencies = [ - sources."cross-spawn-6.0.5" - sources."path-key-2.0.1" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."which-1.3.1" + sources."lru-cache-10.0.1" ]; }) - sources."path-is-absolute-1.0.1" - sources."path-key-3.1.1" sources."path-to-regexp-0.1.7" sources."path-type-4.0.0" + sources."picocolors-1.0.0" sources."picomatch-2.3.1" + sources."pify-4.0.1" + sources."postcss-8.4.31" sources."prepend-http-2.0.0" + sources."promise-retry-2.0.1" sources."proxy-addr-2.0.7" + sources."prr-1.0.1" sources."pump-3.0.0" sources."punycode-2.3.0" sources."qs-6.11.0" @@ -17049,13 +18362,17 @@ in sources."registry-auth-token-4.2.2" sources."registry-url-5.1.0" sources."responselike-1.0.2" + sources."retry-0.12.0" sources."reusify-1.0.4" sources."rimraf-2.7.1" + sources."rollup-3.29.4" sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" + sources."sass-1.68.0" + sources."sax-1.3.0" sources."section-matter-1.0.0" - sources."semver-5.7.1" + sources."semver-6.3.1" (sources."send-0.18.0" // { dependencies = [ sources."ms-2.1.3" @@ -17076,16 +18393,64 @@ in sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."side-channel-1.0.4" - sources."slash-3.0.0" + sources."signal-exit-4.1.0" + sources."slash-4.0.0" + sources."smart-buffer-4.2.0" + sources."socks-2.7.1" + (sources."socks-proxy-agent-7.0.0" // { + dependencies = [ + sources."debug-4.3.4" + sources."ms-2.1.2" + ]; + }) sources."source-map-0.6.1" + sources."source-map-js-1.0.2" sources."source-map-support-0.5.21" sources."sprintf-js-1.0.3" + (sources."ssri-10.0.5" // { + dependencies = [ + sources."minipass-7.0.4" + ]; + }) sources."statuses-1.5.0" + sources."streamsearch-1.1.0" + sources."string-width-5.1.2" + (sources."string-width-cjs-4.2.3" // { + dependencies = [ + sources."emoji-regex-8.0.0" + sources."strip-ansi-6.0.1" + ]; + }) + (sources."strip-ansi-7.1.0" // { + dependencies = [ + sources."ansi-regex-6.0.1" + ]; + }) + sources."strip-ansi-cjs-6.0.1" sources."strip-bom-string-1.0.0" sources."strip-json-comments-2.0.1" + (sources."stylus-0.60.0" // { + dependencies = [ + sources."debug-4.3.4" + sources."ms-2.1.2" + sources."sax-1.2.4" + sources."source-map-0.7.4" + ]; + }) sources."sudo-prompt-8.2.5" + sources."sugarss-4.0.1" sources."supports-color-7.2.0" - (sources."terser-5.17.1" // { + (sources."tar-6.2.0" // { + dependencies = [ + (sources."fs-minipass-2.1.0" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) + sources."mkdirp-1.0.4" + ]; + }) + (sources."terser-5.21.0" // { dependencies = [ sources."commander-2.20.3" ]; @@ -17095,17 +18460,60 @@ in sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" sources."tslib-1.14.1" + sources."type-fest-0.21.3" sources."type-is-1.6.18" - sources."undici-4.16.0" + sources."unique-filename-3.0.0" + sources."unique-slug-4.0.0" sources."universalify-2.0.0" sources."unpipe-1.0.0" sources."url-parse-lax-3.0.0" sources."utf-8-validate-5.0.10" sources."utils-merge-1.0.1" sources."vary-1.1.2" - sources."which-2.0.2" + (sources."vite-4.4.11" // { + dependencies = [ + sources."@esbuild/android-arm-0.18.20" + sources."@esbuild/android-arm64-0.18.20" + sources."@esbuild/android-x64-0.18.20" + sources."@esbuild/darwin-arm64-0.18.20" + sources."@esbuild/darwin-x64-0.18.20" + sources."@esbuild/freebsd-arm64-0.18.20" + sources."@esbuild/freebsd-x64-0.18.20" + sources."@esbuild/linux-arm-0.18.20" + sources."@esbuild/linux-arm64-0.18.20" + sources."@esbuild/linux-ia32-0.18.20" + sources."@esbuild/linux-loong64-0.18.20" + sources."@esbuild/linux-mips64el-0.18.20" + sources."@esbuild/linux-ppc64-0.18.20" + sources."@esbuild/linux-riscv64-0.18.20" + sources."@esbuild/linux-s390x-0.18.20" + sources."@esbuild/linux-x64-0.18.20" + sources."@esbuild/netbsd-x64-0.18.20" + sources."@esbuild/openbsd-x64-0.18.20" + sources."@esbuild/sunos-x64-0.18.20" + sources."@esbuild/win32-arm64-0.18.20" + sources."@esbuild/win32-ia32-0.18.20" + sources."@esbuild/win32-x64-0.18.20" + sources."@types/node-20.8.2" + sources."esbuild-0.18.20" + ]; + }) + sources."which-3.0.1" + (sources."wrap-ansi-8.1.0" // { + dependencies = [ + sources."ansi-styles-6.2.1" + ]; + }) + (sources."wrap-ansi-cjs-7.0.0" // { + dependencies = [ + sources."emoji-regex-8.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" + ]; + }) sources."wrappy-1.0.2" sources."ws-7.5.9" + sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -17120,21 +18528,28 @@ in elm-review = nodeEnv.buildNodePackage { name = "elm-review"; packageName = "elm-review"; - version = "2.10.1"; + version = "2.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/elm-review/-/elm-review-2.10.1.tgz"; - sha512 = "uEc4McppMqmWEaRo+jo5RowbDyfcBr0MTFN0kZt9gWrmmK6hPilTJJGtRmoH+K/aJtq4ZPDDF97oAFdkylD1gg=="; + url = "https://registry.npmjs.org/elm-review/-/elm-review-2.10.3.tgz"; + sha512 = "9gBqLc5Xm3v9Ncpf8y2haEaBZZyMX25vmwQkrNqSIaNYQ2vdGOIx1eyqRtt1xwX5O8pZdqU8IWC/ENyTrOTKbw=="; }; dependencies = [ + (sources."@isaacs/cliui-8.0.2" // { + dependencies = [ + sources."ansi-styles-6.2.1" + sources."strip-ansi-7.1.0" + sources."wrap-ansi-8.1.0" + ]; + }) sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.3" - sources."@types/http-cache-semantics-4.0.1" + sources."@types/http-cache-semantics-4.0.2" sources."@types/keyv-3.1.4" - sources."@types/node-18.16.3" - sources."@types/responselike-1.0.0" + sources."@types/node-20.8.2" + sources."@types/responselike-1.0.1" sources."ansi-escapes-4.3.2" - sources."ansi-regex-5.0.1" + sources."ansi-regex-6.0.1" sources."ansi-styles-4.3.0" sources."anymatch-3.1.3" sources."at-least-node-1.0.0" @@ -17146,11 +18561,11 @@ in sources."braces-3.0.2" sources."buffer-5.7.1" sources."cacheable-lookup-5.0.4" - sources."cacheable-request-7.0.2" + sources."cacheable-request-7.0.4" sources."chalk-4.1.2" sources."chokidar-3.5.3" sources."cli-cursor-3.1.0" - sources."cli-spinners-2.9.0" + sources."cli-spinners-2.9.1" sources."clone-1.0.4" sources."clone-response-1.0.3" sources."color-convert-2.0.1" @@ -17165,17 +18580,22 @@ in }) sources."defaults-1.0.4" sources."defer-to-connect-2.0.1" - sources."elm-tooling-1.14.0" - sources."emoji-regex-8.0.0" + sources."eastasianwidth-0.2.0" + sources."elm-tooling-1.15.0" + sources."emoji-regex-9.2.2" sources."end-of-stream-1.4.4" - sources."fast-levenshtein-3.0.0" sources."fastest-levenshtein-1.0.16" sources."fill-range-7.0.1" sources."find-up-4.1.0" sources."folder-hash-3.3.3" + (sources."foreground-child-3.1.1" // { + dependencies = [ + sources."signal-exit-4.1.0" + ]; + }) sources."fs-extra-9.1.0" sources."fs.realpath-1.0.0" - sources."fsevents-2.3.2" + sources."fsevents-2.3.3" sources."get-stream-5.2.0" (sources."glob-7.2.3" // { dependencies = [ @@ -17199,18 +18619,20 @@ in sources."is-number-7.0.0" sources."is-unicode-supported-0.1.0" sources."isexe-2.0.0" + sources."jackspeak-2.3.6" sources."json-buffer-3.0.1" sources."jsonfile-6.1.0" - sources."keyv-4.5.2" + sources."keyv-4.5.3" sources."kleur-3.0.3" sources."locate-path-5.0.0" sources."log-symbols-4.1.0" sources."lowercase-keys-2.0.0" + sources."lru-cache-10.0.1" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.8" sources."minimist-1.2.8" - sources."mkdirp-0.5.6" + sources."minipass-7.0.4" sources."ms-2.1.2" sources."normalize-path-3.0.0" sources."normalize-url-6.1.0" @@ -17224,6 +18646,7 @@ in sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" + sources."path-scurry-1.10.1" sources."picomatch-2.3.1" sources."prompts-2.4.2" sources."pump-3.0.0" @@ -17233,18 +18656,41 @@ in sources."resolve-alpn-1.2.1" sources."responselike-2.0.1" sources."restore-cursor-3.1.0" - sources."rimraf-2.6.3" + (sources."rimraf-5.0.5" // { + dependencies = [ + sources."brace-expansion-2.0.1" + sources."glob-10.3.10" + sources."minimatch-9.0.3" + ]; + }) sources."safe-buffer-5.2.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-3.0.7" sources."sisteransi-1.0.5" - sources."string-width-4.2.3" + (sources."string-width-5.1.2" // { + dependencies = [ + sources."strip-ansi-7.1.0" + ]; + }) + (sources."string-width-cjs-4.2.3" // { + dependencies = [ + sources."emoji-regex-8.0.0" + ]; + }) sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.1" + (sources."strip-ansi-6.0.1" // { + dependencies = [ + sources."ansi-regex-5.0.1" + ]; + }) + (sources."strip-ansi-cjs-6.0.1" // { + dependencies = [ + sources."ansi-regex-5.0.1" + ]; + }) sources."supports-color-7.2.0" sources."supports-hyperlinks-2.3.0" - sources."temp-0.9.4" sources."terminal-link-2.1.1" sources."to-regex-range-5.0.1" sources."type-fest-0.21.3" @@ -17252,7 +18698,18 @@ in sources."util-deprecate-1.0.2" sources."wcwidth-1.0.1" sources."which-2.0.2" - sources."wrap-ansi-6.2.0" + (sources."wrap-ansi-6.2.0" // { + dependencies = [ + sources."emoji-regex-8.0.0" + sources."string-width-4.2.3" + ]; + }) + (sources."wrap-ansi-cjs-7.0.0" // { + dependencies = [ + sources."emoji-regex-8.0.0" + sources."string-width-4.2.3" + ]; + }) sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; @@ -17280,8 +18737,8 @@ in sources."git-clone-able-0.1.2" sources."lru-cache-6.0.0" sources."ms-2.1.2" - sources."semver-7.5.0" - sources."simple-git-3.18.0" + sources."semver-7.5.4" + sources."simple-git-3.20.0" sources."upath-2.0.1" sources."yallist-4.0.0" ]; diff --git a/pkgs/development/compilers/elm/registry.dat b/pkgs/development/compilers/elm/registry.dat index 14fcb12a74600..248a1503a3c00 100644 --- a/pkgs/development/compilers/elm/registry.dat +++ b/pkgs/development/compilers/elm/registry.dat Binary files differdiff --git a/pkgs/development/compilers/erg/default.nix b/pkgs/development/compilers/erg/default.nix index 1c86e6363ae79..fd1a8d48391b6 100644 --- a/pkgs/development/compilers/erg/default.nix +++ b/pkgs/development/compilers/erg/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "erg"; - version = "0.6.20"; + version = "0.6.21"; src = fetchFromGitHub { owner = "erg-lang"; repo = "erg"; rev = "v${version}"; - hash = "sha256-xu6lbCdXUf5fqGoEGui44tVpVXlSOdfNFTyAurFRsDA="; + hash = "sha256-NS9LpnCAYmninAcliwdEXPSYqqQZ8impaaK2eceoi3k="; }; - cargoHash = "sha256-pRuruqBXnSkTzEPTyZlX130z5IJPxEqWB2/38B7aCeI="; + cargoHash = "sha256-JJPbArXb3Hmf7bDRlYM0ZOnaolYnDtc41EFazFtApWc="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/development/compilers/gcc/common/pre-configure.nix b/pkgs/development/compilers/gcc/common/pre-configure.nix index 5cb2f186fd1d5..88a0bda3d0c66 100644 --- a/pkgs/development/compilers/gcc/common/pre-configure.nix +++ b/pkgs/development/compilers/gcc/common/pre-configure.nix @@ -3,12 +3,14 @@ , version, buildPlatform, hostPlatform, targetPlatform , gnat-bootstrap ? null , langAda ? false +, langFortran , langJava ? false , langJit ? false , langGo , withoutTargetLibc , enableShared , enableMultilib +, pkgsBuildTarget }: assert langJava -> lib.versionOlder version "7"; @@ -27,6 +29,15 @@ in lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' export PATH=${gnat-bootstrap}/bin:$PATH '' +# For a cross-built native compiler, i.e. build!=(host==target), the +# bundled libgfortran needs a gfortran which can run on the +# buildPlatform and emit code for the targetPlatform. The compiler +# which is built alongside gfortran in this configuration doesn't +# meet that need: it runs on the hostPlatform. ++ lib.optionalString (langFortran && (with stdenv; buildPlatform != hostPlatform && hostPlatform == targetPlatform)) '' + export GFORTRAN_FOR_TARGET=${pkgsBuildTarget.gfortran}/bin/${stdenv.targetPlatform.config}-gfortran +'' + # On x86_64-darwin, the gnat-bootstrap bootstrap compiler that we need to build a # native GCC with Ada support emits assembly that is accepted by the Clang # integrated assembler, but not by the GNU assembler in cctools-port that Nix @@ -108,7 +119,10 @@ in lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' # gcc->clang "cross"-compilation manages to evade it: there # hostPlatform != targetPlatform, hostPlatform.config == targetPlatform.config. # We explicitly inhibit libc headers use in this case as well. -+ lib.optionalString (targetPlatform != hostPlatform && withoutTargetLibc) '' ++ lib.optionalString (targetPlatform != hostPlatform && + withoutTargetLibc && + targetPlatform.config == hostPlatform.config && + (stdenv.cc.isClang || stdenv.targetPlatform.useLLVM)) '' export inhibit_libc=true '' diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix index fdc79b575515d..eb77b6f365241 100644 --- a/pkgs/development/compilers/gcc/default.nix +++ b/pkgs/development/compilers/gcc/default.nix @@ -27,6 +27,7 @@ , gnused ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places , buildPackages +, pkgsBuildTarget , libxcrypt , disableGdbPlugin ? !enablePlugin , nukeReferences @@ -176,6 +177,7 @@ let inherit version; nukeReferences patchelf perl + pkgsBuildTarget profiledCompiler reproducibleBuild staticCompiler diff --git a/pkgs/development/compilers/ghc/9.2.4.nix b/pkgs/development/compilers/ghc/9.2.4.nix index e34f33e9ca332..6aa87a152015e 100644 --- a/pkgs/development/compilers/ghc/9.2.4.nix +++ b/pkgs/development/compilers/ghc/9.2.4.nix @@ -15,7 +15,7 @@ , useLLVM ? !(stdenv.targetPlatform.isx86 || stdenv.targetPlatform.isPower || stdenv.targetPlatform.isSparc - || (stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin)) + || stdenv.targetPlatform.isAarch64) , # LLVM is conceptually a run-time-only dependency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a # build-time dependency too. diff --git a/pkgs/development/compilers/ghc/9.2.5.nix b/pkgs/development/compilers/ghc/9.2.5.nix index abbb42b631fe7..c5aa5897761e9 100644 --- a/pkgs/development/compilers/ghc/9.2.5.nix +++ b/pkgs/development/compilers/ghc/9.2.5.nix @@ -15,7 +15,7 @@ , useLLVM ? !(stdenv.targetPlatform.isx86 || stdenv.targetPlatform.isPower || stdenv.targetPlatform.isSparc - || (stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin)) + || stdenv.targetPlatform.isAarch64) , # LLVM is conceptually a run-time-only dependency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a # build-time dependency too. diff --git a/pkgs/development/compilers/ghc/9.2.6.nix b/pkgs/development/compilers/ghc/9.2.6.nix index 53ee00f7b373c..651ff1e7d44b9 100644 --- a/pkgs/development/compilers/ghc/9.2.6.nix +++ b/pkgs/development/compilers/ghc/9.2.6.nix @@ -15,7 +15,7 @@ , useLLVM ? !(stdenv.targetPlatform.isx86 || stdenv.targetPlatform.isPower || stdenv.targetPlatform.isSparc - || (stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin)) + || stdenv.targetPlatform.isAarch64) , # LLVM is conceptually a run-time-only dependency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a # build-time dependency too. diff --git a/pkgs/development/compilers/ghc/9.2.7.nix b/pkgs/development/compilers/ghc/9.2.7.nix index dcde1b65a5689..74c0088473b85 100644 --- a/pkgs/development/compilers/ghc/9.2.7.nix +++ b/pkgs/development/compilers/ghc/9.2.7.nix @@ -15,7 +15,7 @@ , useLLVM ? !(stdenv.targetPlatform.isx86 || stdenv.targetPlatform.isPower || stdenv.targetPlatform.isSparc - || (stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin)) + || stdenv.targetPlatform.isAarch64) , # LLVM is conceptually a run-time-only dependency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a # build-time dependency too. diff --git a/pkgs/development/compilers/ghc/9.2.8.nix b/pkgs/development/compilers/ghc/9.2.8.nix index 443526a0b7196..973e62f955396 100644 --- a/pkgs/development/compilers/ghc/9.2.8.nix +++ b/pkgs/development/compilers/ghc/9.2.8.nix @@ -15,7 +15,7 @@ , useLLVM ? !(stdenv.targetPlatform.isx86 || stdenv.targetPlatform.isPower || stdenv.targetPlatform.isSparc - || (stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin)) + || stdenv.targetPlatform.isAarch64) , # LLVM is conceptually a run-time-only dependency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a # build-time dependency too. diff --git a/pkgs/development/compilers/ghc/9.4.2.nix b/pkgs/development/compilers/ghc/9.4.2.nix index afe78cbb87c06..3c51fb981afdc 100644 --- a/pkgs/development/compilers/ghc/9.4.2.nix +++ b/pkgs/development/compilers/ghc/9.4.2.nix @@ -17,7 +17,7 @@ , useLLVM ? !(stdenv.targetPlatform.isx86 || stdenv.targetPlatform.isPower || stdenv.targetPlatform.isSparc - || (stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin)) + || stdenv.targetPlatform.isAarch64) , # LLVM is conceptually a run-time-only dependency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a # build-time dependency too. diff --git a/pkgs/development/compilers/ghc/9.4.3.nix b/pkgs/development/compilers/ghc/9.4.3.nix index a2ae0cf400c7a..87ce19f66054b 100644 --- a/pkgs/development/compilers/ghc/9.4.3.nix +++ b/pkgs/development/compilers/ghc/9.4.3.nix @@ -17,7 +17,7 @@ , useLLVM ? !(stdenv.targetPlatform.isx86 || stdenv.targetPlatform.isPower || stdenv.targetPlatform.isSparc - || (stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin)) + || stdenv.targetPlatform.isAarch64) , # LLVM is conceptually a run-time-only dependency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a # build-time dependency too. diff --git a/pkgs/development/compilers/ghc/9.4.4.nix b/pkgs/development/compilers/ghc/9.4.4.nix index 13d01a3426377..fa184a6fe1716 100644 --- a/pkgs/development/compilers/ghc/9.4.4.nix +++ b/pkgs/development/compilers/ghc/9.4.4.nix @@ -17,7 +17,7 @@ , useLLVM ? !(stdenv.targetPlatform.isx86 || stdenv.targetPlatform.isPower || stdenv.targetPlatform.isSparc - || (stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin)) + || stdenv.targetPlatform.isAarch64) , # LLVM is conceptually a run-time-only dependency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a # build-time dependency too. diff --git a/pkgs/development/compilers/ghc/9.4.5.nix b/pkgs/development/compilers/ghc/9.4.5.nix index da333a6138003..91032cb03d6ec 100644 --- a/pkgs/development/compilers/ghc/9.4.5.nix +++ b/pkgs/development/compilers/ghc/9.4.5.nix @@ -17,7 +17,7 @@ , useLLVM ? !(stdenv.targetPlatform.isx86 || stdenv.targetPlatform.isPower || stdenv.targetPlatform.isSparc - || (stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin)) + || stdenv.targetPlatform.isAarch64) , # LLVM is conceptually a run-time-only dependency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a # build-time dependency too. diff --git a/pkgs/development/compilers/ghc/9.4.6.nix b/pkgs/development/compilers/ghc/9.4.6.nix index 95cb31a411ff1..3b0bef212a068 100644 --- a/pkgs/development/compilers/ghc/9.4.6.nix +++ b/pkgs/development/compilers/ghc/9.4.6.nix @@ -17,7 +17,7 @@ , useLLVM ? !(stdenv.targetPlatform.isx86 || stdenv.targetPlatform.isPower || stdenv.targetPlatform.isSparc - || (stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin)) + || stdenv.targetPlatform.isAarch64) , # LLVM is conceptually a run-time-only dependency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a # build-time dependency too. diff --git a/pkgs/development/compilers/ghc/9.6.3.nix b/pkgs/development/compilers/ghc/9.6.3.nix new file mode 100644 index 0000000000000..35bbf020acbfc --- /dev/null +++ b/pkgs/development/compilers/ghc/9.6.3.nix @@ -0,0 +1,4 @@ +import ./common-hadrian.nix rec { + version = "9.6.3"; + sha256 = "1xbpxchmvm9gswrwwz1rsvx9kjaxhc2q3fx9l6wa0l5599xydkfz"; +} diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index 94755f1beec8a..c7b4aa1f87836 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -39,7 +39,7 @@ , useLLVM ? !(stdenv.targetPlatform.isx86 || stdenv.targetPlatform.isPower || stdenv.targetPlatform.isSparc - || (stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin) + || stdenv.targetPlatform.isAarch64 || stdenv.targetPlatform.isGhcjs) , # LLVM is conceptually a run-time-only dependency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a diff --git a/pkgs/development/compilers/ghdl/default.nix b/pkgs/development/compilers/ghdl/default.nix index 0e11c703d7b6c..e00294cf18456 100644 --- a/pkgs/development/compilers/ghdl/default.nix +++ b/pkgs/development/compilers/ghdl/default.nix @@ -11,26 +11,17 @@ assert backend == "mcode" || backend == "llvm"; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ghdl-${backend}"; - version = "2.0.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "ghdl"; repo = "ghdl"; - rev = "v${version}"; - sha256 = "sha256-B/G3FGRzYy4Y9VNNB8yM3FohiIjPJhYSVbqsTN3cL5k="; + rev = "v${finalAttrs.version}"; + hash = "sha256-94RNtHbOpbC2q/Z+PsQplrLxXmpS3LXOCXyTBB+n9c4="; }; - patches = [ - # https://github.com/ghdl/ghdl/issues/2056 - (fetchpatch { - name = "fix-build-gcc-12.patch"; - url = "https://github.com/ghdl/ghdl/commit/f8b87697e8b893b6293ebbfc34670c32bfb49397.patch"; - hash = "sha256-tVbMm8veFkNPs6WFBHvaic5Jkp1niyg0LfFufa+hT/E="; - }) - ]; - LIBRARY_PATH = "${stdenv.cc.libc}/lib"; nativeBuildInputs = [ @@ -59,8 +50,6 @@ stdenv.mkDerivation rec { "--with-llvm-config=${llvm.dev}/bin/llvm-config" ]; - hardeningDisable = [ "format" ]; - enableParallelBuilding = true; passthru = { @@ -72,11 +61,12 @@ stdenv.mkDerivation rec { }; }; - meta = with lib; { + meta = { homepage = "https://github.com/ghdl/ghdl"; description = "VHDL 2008/93/87 simulator"; - maintainers = with maintainers; [ lucus16 thoughtpolice ]; - platforms = platforms.linux; - license = licenses.gpl2; + license = lib.licenses.gpl2Plus; + mainProgram = "ghdl"; + maintainers = with lib.maintainers; [ eclairevoyant lucus16 thoughtpolice ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index ea82d72a481a4..496999c36ad31 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/development/compilers/gleam/default.nix @@ -12,13 +12,13 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "0.30.5"; + version = "0.31.0"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-DOQhuSNIyP6K+M9a/uM8Cn6gyzpaH23+n4fux8otPWQ="; + hash = "sha256-MLR7gY4NPb223NiPvTih88DQO2LvaYHsduWSH9QQa6M="; }; nativeBuildInputs = [ git pkg-config ]; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ]; - cargoHash = "sha256-CkMUconCw94Jvy7FhrOZvBbA8DAi91Ae5GFxGFBcEew="; + cargoHash = "sha256-I+5Vrpy5/9wFMB2dQYH9aqf/VonkDyIAyJmSHm5S6mk="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/development/compilers/go/1.21.nix b/pkgs/development/compilers/go/1.21.nix index 6fca091f24d20..e0562ad32b98d 100644 --- a/pkgs/development/compilers/go/1.21.nix +++ b/pkgs/development/compilers/go/1.21.nix @@ -64,6 +64,10 @@ stdenv.mkDerivation (finalAttrs: { depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows threadsCross.package; + postPatch = '' + patchShebangs . + ''; + patches = [ (substituteAll { src = ./iana-etc-1.17.patch; @@ -88,6 +92,8 @@ stdenv.mkDerivation (finalAttrs: { GOOS = stdenv.targetPlatform.parsed.kernel.name; GOARCH = goarch stdenv.targetPlatform; # GOHOSTOS/GOHOSTARCH must match the building system, not the host system. + # Go will nevertheless build a for host system that we will copy over in + # the install phase. GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name; GOHOSTARCH = goarch stdenv.buildPlatform; @@ -110,16 +116,14 @@ stdenv.mkDerivation (finalAttrs: { GOROOT_BOOTSTRAP = if useGccGoBootstrap then goBootstrap else "${goBootstrap}/share/go"; - # Note that we use distpack to avoid moving around cross-compiled binaries. - # The paths are slightly different when buildPlatform != hostPlatform and - # distpack handles assembling outputs in the right place, same as the official - # Go binary releases. See also https://pkg.go.dev/cmd/distpack buildPhase = '' runHook preBuild export GOCACHE=$TMPDIR/go-cache # this is compiled into the binary export GOROOT_FINAL=$out/share/go + export PATH=$(pwd)/bin:$PATH + ${lib.optionalString isCross '' # Independent from host/target, CC should produce code for the building system. # We only set it when cross-compiling. @@ -128,16 +132,34 @@ stdenv.mkDerivation (finalAttrs: { ulimit -a pushd src - bash make.bash -no-banner -distpack + ./make.bash popd runHook postBuild ''; + preInstall = '' + # Contains the wrong perl shebang when cross compiling, + # since it is not used for anything we can deleted as well. + rm src/regexp/syntax/make_perl_groups.pl + '' + (if (stdenv.buildPlatform.system != stdenv.hostPlatform.system) then '' + mv bin/*_*/* bin + rmdir bin/*_* + ${lib.optionalString (!(finalAttrs.GOHOSTARCH == finalAttrs.GOARCH && finalAttrs.GOOS == finalAttrs.GOHOSTOS)) '' + rm -rf pkg/${finalAttrs.GOHOSTOS}_${finalAttrs.GOHOSTARCH} pkg/tool/${finalAttrs.GOHOSTOS}_${finalAttrs.GOHOSTARCH} + ''} + '' else lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system) '' + rm -rf bin/*_* + ${lib.optionalString (!(finalAttrs.GOHOSTARCH == finalAttrs.GOARCH && finalAttrs.GOOS == finalAttrs.GOHOSTOS)) '' + rm -rf pkg/${finalAttrs.GOOS}_${finalAttrs.GOARCH} pkg/tool/${finalAttrs.GOOS}_${finalAttrs.GOARCH} + ''} + ''); + installPhase = '' runHook preInstall - mkdir -p $out/{share,bin} - tar -C $out/share -x -z -f "pkg/distpack/go${finalAttrs.version}.$GOOS-$GOARCH.tar.gz" - ln -s $out/share/go/bin/* $out/bin + mkdir -p $GOROOT_FINAL + cp -a bin pkg src lib misc api doc go.env $GOROOT_FINAL + mkdir -p $out/bin + ln -s $GOROOT_FINAL/bin/* $out/bin runHook postInstall ''; diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix index a3236c14a084f..7d62411f57401 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix @@ -7,20 +7,23 @@ , darwin , fontconfig , glib +, glibc , gtk3 , makeWrapper +, musl +, runCommandCC , setJavaClassPath , unzip , xorg , zlib # extra params -, javaVersion -, meta ? { } -, products ? [ ] +, extraCLibs ? [ ] , gtkSupport ? stdenv.isLinux +, useMusl ? false , ... } @ args: +assert useMusl -> stdenv.isLinux; let extraArgs = builtins.removeAttrs args [ "lib" @@ -32,24 +35,56 @@ let "darwin" "fontconfig" "glib" + "glibc" "gtk3" "makeWrapper" + "musl" + "runCommandCC" "setJavaClassPath" "unzip" "xorg" "zlib" - "javaVersion" - "meta" - "products" + "extraCLibs" "gtkSupport" + "useMusl" + "passthru" + "meta" ]; + + cLibs = lib.optionals stdenv.isLinux ( + [ glibc zlib.static ] + ++ lib.optionals (!useMusl) [ glibc.static ] + ++ lib.optionals useMusl [ musl ] + ++ extraCLibs + ); + + # GraalVM 21.3.0+ expects musl-gcc as <system>-musl-gcc + musl-gcc = (runCommandCC "musl-gcc" { } '' + mkdir -p $out/bin + ln -s ${lib.getDev musl}/bin/musl-gcc $out/bin/${stdenv.hostPlatform.system}-musl-gcc + ''); + # GraalVM 23.0.0+ (i.e.: JDK 21.0.0+) clean-up the environment inside darwin + # So we need to re-added some env vars to make everything work correctly again + darwin-cc = (runCommandCC "darwin-cc" + { + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ darwin.apple_sdk.frameworks.Foundation zlib ]; + } '' + makeWrapper ${stdenv.cc}/bin/cc $out/bin/cc \ + --prefix NIX_CFLAGS_COMPILE_${stdenv.cc.suffixSalt} : "$NIX_CFLAGS_COMPILE" \ + --prefix NIX_LDFLAGS_${stdenv.cc.suffixSalt} : "$NIX_LDFLAGS" + ''); + binPath = lib.makeBinPath ( + lib.optionals stdenv.isDarwin [ darwin-cc ] + ++ lib.optionals useMusl [ musl-gcc ] + ++ [ stdenv.cc ] + ); + runtimeLibraryPath = lib.makeLibraryPath ([ cups ] ++ lib.optionals gtkSupport [ cairo glib gtk3 ]); - mapProducts = key: default: (map (p: p.graalvmPhases.${key} or default) products); - concatProducts = key: lib.concatStringsSep "\n" (mapProducts key ""); - graalvmXXX-ce = stdenv.mkDerivation ({ - pname = "graalvm${javaVersion}-ce"; + graalvm-ce = stdenv.mkDerivation ({ + pname = "graalvm-ce"; unpackPhase = '' runHook preUnpack @@ -71,22 +106,16 @@ let # Sanity check if [ ! -d "$out/bin" ]; then - echo "The `bin` is directory missing after extracting the graalvm" - echo "tarball, please compare the directory structure of the" - echo "tarball with what happens in the unpackPhase (in particular" - echo "with regards to the `--strip-components` flag)." - exit 1 + echo "The `bin` is directory missing after extracting the graalvm" + echo "tarball, please compare the directory structure of the" + echo "tarball with what happens in the unpackPhase (in particular" + echo "with regards to the `--strip-components` flag)." + exit 1 fi runHook postUnpack ''; - postUnpack = '' - for product in ${toString products}; do - cp -Rv $product/* $out - done - ''; - dontStrip = true; nativeBuildInputs = [ unzip makeWrapper ] @@ -106,7 +135,6 @@ let xorg.libXtst ]; - preInstall = concatProducts "preInstall"; postInstall = '' # jni.h expects jni_md.h to be in the header search path. ln -sf $out/include/linux/*_md.h $out/include/ @@ -115,52 +143,72 @@ let # Set JAVA_HOME automatically. mkdir -p $out/nix-support cat > $out/nix-support/setup-hook << EOF - if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi + if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi EOF - '' + concatProducts "postInstall"; + + wrapProgram $out/bin/native-image \ + --prefix PATH : ${binPath} \ + ${toString (map (l: "--add-flags '-H:CLibraryPath=${l}/lib'") cLibs)} + ''; preFixup = lib.optionalString (stdenv.isLinux) '' for bin in $(find "$out/bin" -executable -type f); do wrapProgram "$bin" --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}" done - '' + concatProducts "preFixup"; - postFixup = concatProducts "postFixup"; + ''; doInstallCheck = true; installCheckPhase = '' runHook preInstallCheck ${# broken in darwin - lib.optionalString stdenv.isLinux '' + lib.optionalString stdenv.isLinux '' echo "Testing Jshell" echo '1 + 1' | $out/bin/jshell ''} - echo ${ - lib.escapeShellArg '' - public class HelloWorld { - public static void main(String[] args) { - System.out.println("Hello World"); - } + echo ${lib.escapeShellArg '' + public class HelloWorld { + public static void main(String[] args) { + System.out.println("Hello World"); } - '' - } > HelloWorld.java + } + ''} > HelloWorld.java $out/bin/javac HelloWorld.java # run on JVM with Graal Compiler echo "Testing GraalVM" $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld | fgrep 'Hello World' - ${concatProducts "installCheckPhase"} + echo "Ahead-Of-Time compilation" + $out/bin/native-image -H:+UnlockExperimentalVMOptions -H:-CheckToolchain -H:+ReportExceptionStackTraces HelloWorld + ./helloworld | fgrep 'Hello World' + + ${# --static is only available in Linux + lib.optionalString (stdenv.isLinux && !useMusl) '' + echo "Ahead-Of-Time compilation with -H:+StaticExecutableWithDynamicLibC" + $out/bin/native-image -H:+UnlockExperimentalVMOptions -H:+StaticExecutableWithDynamicLibC HelloWorld + ./helloworld | fgrep 'Hello World' + + echo "Ahead-Of-Time compilation with --static" + $out/bin/native-image --static HelloWorld + ./helloworld | fgrep 'Hello World' + ''} + + ${# --static is only available in Linux + lib.optionalString (stdenv.isLinux && useMusl) '' + echo "Ahead-Of-Time compilation with --static and --libc=musl" + $out/bin/native-image --static HelloWorld --libc=musl + ./helloworld | fgrep 'Hello World' + ''} runHook postInstallCheck ''; passthru = { - inherit products; - home = graalvmXXX-ce; - updateScript = ./update.sh; - }; + home = graalvm-ce; + updateScript = [ ./update.sh "graalvm-ce" ]; + } // (args.passhtru or { }); meta = with lib; ({ homepage = "https://www.graalvm.org/"; @@ -169,7 +217,7 @@ let sourceProvenance = with sourceTypes; [ binaryNativeCode ]; mainProgram = "java"; maintainers = with maintainers; teams.graalvm-ce.members ++ [ ]; - } // meta); + } // (args.meta or { })); } // extraArgs); in -graalvmXXX-ce +graalvm-ce diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix index a9eb04cdb3c93..579e405808020 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix @@ -1,20 +1,15 @@ { lib , stdenv , autoPatchelfHook +, darwin , graalvm-ce , makeWrapper -, perl -, unzip , zlib , libxcrypt-legacy # extra params , product -, javaVersion , extraBuildInputs ? [ ] , extraNativeBuildInputs ? [ ] -, graalvmPhases ? { } -, meta ? { } -, passthru ? { } , ... } @ args: @@ -23,24 +18,21 @@ let "lib" "stdenv" "autoPatchelfHook" + "darwin" "graalvm-ce" + "libxcrypt-legacy" "makeWrapper" - "perl" - "unzip" "zlib" "product" - "javaVersion" "extraBuildInputs" "extraNativeBuildInputs" - "graalvmPhases" "meta" - "passthru" ]; in stdenv.mkDerivation ({ - pname = "${product}-java${javaVersion}"; + pname = product; - nativeBuildInputs = [ perl unzip makeWrapper ] + nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isLinux autoPatchelfHook ++ extraNativeBuildInputs; @@ -48,61 +40,37 @@ stdenv.mkDerivation ({ stdenv.cc.cc.lib # libstdc++.so.6 zlib libxcrypt-legacy # libcrypt.so.1 (default is .2 now) - ] ++ extraBuildInputs; + ] + ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Foundation + ++ extraBuildInputs; unpackPhase = '' runHook preUnpack - unpack_jar() { - local jar="$1" - unzip -q -o "$jar" -d "$out" - perl -ne 'use File::Path qw(make_path); - use File::Basename qw(dirname); - if (/^(.+) = (.+)$/) { - make_path dirname("$ENV{out}/$1"); - symlink $2, "$ENV{out}/$1"; - }' "$out/META-INF/symlinks" - perl -ne 'if (/^(.+) = ([r-])([w-])([x-])([r-])([w-])([x-])([r-])([w-])([x-])$/) { - my $mode = ($2 eq 'r' ? 0400 : 0) + ($3 eq 'w' ? 0200 : 0) + ($4 eq 'x' ? 0100 : 0) + - ($5 eq 'r' ? 0040 : 0) + ($6 eq 'w' ? 0020 : 0) + ($7 eq 'x' ? 0010 : 0) + - ($8 eq 'r' ? 0004 : 0) + ($9 eq 'w' ? 0002 : 0) + ($10 eq 'x' ? 0001 : 0); - chmod $mode, "$ENV{out}/$1"; - }' "$out/META-INF/permissions" - rm -rf "$out/META-INF" - } + mkdir -p "$out" - unpack_jar "$src" + tar xf "$src" -C "$out" --strip-components=1 - runHook postUnpack - ''; - - # Allow autoPatchelf to automatically fix lib references between products - fixupPhase = '' - runHook preFixup + # Sanity check + if [ ! -d "$out/bin" ]; then + echo "The `bin` is directory missing after extracting the graalvm" + echo "tarball, please compare the directory structure of the" + echo "tarball with what happens in the unpackPhase (in particular" + echo "with regards to the `--strip-components` flag)." + exit 1 + fi - mkdir -p $out/lib - shopt -s globstar - ln -s $out/languages/**/lib/*.so $out/lib - - runHook postFixup + runHook postUnpack ''; - dontInstall = true; - dontBuild = true; dontStrip = true; passthru = { - inherit product javaVersion; - # build phases that are going to run during GraalVM derivation build, - # since they depend in having the fully setup GraalVM environment - # e.g.: graalvmPhases.installCheckPhase will run the checks only after - # GraalVM+products is build - # see buildGraalvm.nix file for the available phases - inherit graalvmPhases; - } // passthru; + updateScript = [ ./update.sh product ]; + } // (args.passhtru or { }); - meta = with lib; ({ + meta = ({ inherit (graalvm-ce.meta) homepage license sourceProvenance maintainers platforms; description = "High-Performance Polyglot VM (Product: ${product})"; - } // meta); + } // (args.meta or { })); } // extraArgs) diff --git a/pkgs/development/compilers/graalvm/community-edition/default.nix b/pkgs/development/compilers/graalvm/community-edition/default.nix index 2bc6c0590137c..a29a81783c9cf 100644 --- a/pkgs/development/compilers/graalvm/community-edition/default.nix +++ b/pkgs/development/compilers/graalvm/community-edition/default.nix @@ -4,237 +4,20 @@ , fetchurl }: -let +{ buildGraalvm = callPackage ./buildGraalvm.nix; - buildGraalvmProduct = callPackage ./buildGraalvmProduct.nix; - javaPlatform = { - "aarch64-linux" = "linux-aarch64"; - "x86_64-linux" = "linux-amd64"; - "aarch64-darwin" = "darwin-aarch64"; - "x86_64-darwin" = "darwin-amd64"; - }; - javaPlatformVersion = javaVersion: - "${javaVersion}-${javaPlatform.${stdenv.system} or (throw "Unsupported platform: ${stdenv.system}")}"; - source = product: javaVersion: (import ./hashes.nix).${product}.${javaPlatformVersion javaVersion} - or (throw "Unsupported product combination: product=${product} java=${javaVersion} system=${stdenv.system}"); - -in -rec { - inherit buildGraalvm buildGraalvmProduct; - - ### Java 11 ### - - # Mostly available for build purposes, not to be exposed at the top level - graalvm11-ce-bare = buildGraalvm rec { - version = "22.3.1"; - javaVersion = "11"; - src = fetchurl (source "graalvm-ce" javaVersion); - meta.platforms = builtins.attrNames javaPlatform; - products = [ ]; - }; - - graalvm11-ce = graalvm11-ce-bare.override { - products = [ native-image-installable-svm-java11 ]; - }; - - # Mostly available for testing, not to be exposed at the top level - graalvm11-ce-full = graalvm11-ce-bare.override { - products = [ - js-installable-svm-java11 - llvm-installable-svm-java11 - native-image-installable-svm-java11 - nodejs-installable-svm-java11 - python-installable-svm-java11 - ruby-installable-svm-java11 - wasm-installable-svm-java11 - ]; - }; - - js-installable-svm-java11 = callPackage ./js-installable-svm.nix rec { - javaVersion = "11"; - version = "22.3.1"; - src = fetchurl (source "js-installable-svm" javaVersion); - }; - - llvm-installable-svm-java11 = callPackage ./llvm-installable-svm.nix rec { - javaVersion = "11"; - version = "22.3.1"; - src = fetchurl (source "llvm-installable-svm" javaVersion); - }; - - native-image-installable-svm-java11 = callPackage ./native-image-installable-svm.nix rec { - javaVersion = "11"; - version = "22.3.1"; - src = fetchurl (source "native-image-installable-svm" javaVersion); - }; - - nodejs-installable-svm-java11 = callPackage ./nodejs-installable-svm.nix rec { - javaVersion = "11"; - version = "22.3.1"; - src = fetchurl (source "nodejs-installable-svm" javaVersion); - graalvm-ce = graalvm11-ce-bare; - }; - - python-installable-svm-java11 = callPackage ./python-installable-svm.nix rec { - javaVersion = "11"; - version = "22.3.1"; - src = fetchurl (source "python-installable-svm" javaVersion); - }; - - ruby-installable-svm-java11 = callPackage ./ruby-installable-svm.nix rec { - javaVersion = "11"; - version = "22.3.1"; - src = fetchurl (source "ruby-installable-svm" javaVersion); - llvm-installable-svm = llvm-installable-svm-java11; - }; - - wasm-installable-svm-java11 = callPackage ./wasm-installable-svm.nix rec { - javaVersion = "11"; - version = "22.3.1"; - src = fetchurl (source "wasm-installable-svm" javaVersion); - }; - - ### Java 17 ### - - # Mostly available for build purposes, not to be exposed at the top level - graalvm17-ce-bare = buildGraalvm rec { - version = "22.3.1"; - javaVersion = "17"; - src = fetchurl (source "graalvm-ce" javaVersion); - meta.platforms = builtins.attrNames javaPlatform; - products = [ ]; - }; - graalvm17-ce = graalvm17-ce-bare.override { - products = [ native-image-installable-svm-java17 ]; - }; - - # Mostly available for testing, not to be exposed at the top level - graalvm17-ce-full = graalvm17-ce-bare.override { - products = [ - js-installable-svm-java17 - llvm-installable-svm-java17 - native-image-installable-svm-java17 - nodejs-installable-svm-java17 - python-installable-svm-java17 - ruby-installable-svm-java17 - wasm-installable-svm-java17 - ]; - }; - - js-installable-svm-java17 = callPackage ./js-installable-svm.nix rec { - javaVersion = "17"; - version = "22.3.1"; - src = fetchurl (source "js-installable-svm" javaVersion); - }; - - llvm-installable-svm-java17 = callPackage ./llvm-installable-svm.nix rec { - javaVersion = "17"; - version = "22.3.1"; - src = fetchurl (source "llvm-installable-svm" javaVersion); - }; - - native-image-installable-svm-java17 = callPackage ./native-image-installable-svm.nix rec { - javaVersion = "17"; - version = "22.3.1"; - src = fetchurl (source "native-image-installable-svm" javaVersion); - }; - - nodejs-installable-svm-java17 = callPackage ./nodejs-installable-svm.nix rec { - javaVersion = "17"; - version = "22.3.1"; - src = fetchurl (source "nodejs-installable-svm" javaVersion); - graalvm-ce = graalvm17-ce-bare; - }; - - python-installable-svm-java17 = callPackage ./python-installable-svm.nix rec { - javaVersion = "17"; - version = "22.3.1"; - src = fetchurl (source "python-installable-svm" javaVersion); - }; - - ruby-installable-svm-java17 = callPackage ./ruby-installable-svm.nix rec { - javaVersion = "17"; - version = "22.3.1"; - src = fetchurl (source "ruby-installable-svm" javaVersion); - llvm-installable-svm = llvm-installable-svm-java17; - }; - - wasm-installable-svm-java17 = callPackage ./wasm-installable-svm.nix rec { - javaVersion = "17"; - version = "22.3.1"; - src = fetchurl (source "wasm-installable-svm" javaVersion); - }; - - ### Java 19 ### - - # Mostly available for build purposes, not to be exposed at the top level - graalvm19-ce-bare = buildGraalvm rec { - version = "22.3.1"; - javaVersion = "19"; - src = fetchurl (source "graalvm-ce" javaVersion); - meta.platforms = builtins.attrNames javaPlatform; - products = [ ]; - }; - - graalvm19-ce = graalvm19-ce-bare.override { - products = [ native-image-installable-svm-java19 ]; - }; - - # Mostly available for testing, not to be exposed at the top level - graalvm19-ce-full = graalvm19-ce-bare.override { - products = [ - js-installable-svm-java19 - llvm-installable-svm-java19 - native-image-installable-svm-java19 - nodejs-installable-svm-java19 - python-installable-svm-java19 - ruby-installable-svm-java19 - wasm-installable-svm-java19 - ]; - }; - - js-installable-svm-java19 = callPackage ./js-installable-svm.nix rec { - javaVersion = "19"; - version = "22.3.1"; - src = fetchurl (source "js-installable-svm" javaVersion); - }; + buildGraalvmProduct = callPackage ./buildGraalvmProduct.nix; - llvm-installable-svm-java19 = callPackage ./llvm-installable-svm.nix rec { - javaVersion = "19"; - version = "22.3.1"; - src = fetchurl (source "llvm-installable-svm" javaVersion); - }; + graalvm-ce = callPackage ./graalvm-ce { }; - native-image-installable-svm-java19 = callPackage ./native-image-installable-svm.nix rec { - javaVersion = "19"; - version = "22.3.1"; - src = fetchurl (source "native-image-installable-svm" javaVersion); - }; + graalvm-ce-musl = callPackage ./graalvm-ce { useMusl = true; }; - nodejs-installable-svm-java19 = callPackage ./nodejs-installable-svm.nix rec { - javaVersion = "19"; - version = "22.3.1"; - src = fetchurl (source "nodejs-installable-svm" javaVersion); - graalvm-ce = graalvm19-ce-bare; - }; + graaljs = callPackage ./graaljs { }; - python-installable-svm-java19 = callPackage ./python-installable-svm.nix rec { - javaVersion = "19"; - version = "22.3.1"; - src = fetchurl (source "python-installable-svm" javaVersion); - }; + graalnodejs = callPackage ./graalnodejs { }; - ruby-installable-svm-java19 = callPackage ./ruby-installable-svm.nix rec { - javaVersion = "19"; - version = "22.3.1"; - src = fetchurl (source "ruby-installable-svm" javaVersion); - llvm-installable-svm = llvm-installable-svm-java19; - }; + graalpy = callPackage ./graalpy { }; - wasm-installable-svm-java19 = callPackage ./wasm-installable-svm.nix rec { - javaVersion = "19"; - version = "22.3.1"; - src = fetchurl (source "wasm-installable-svm" javaVersion); - }; + truffleruby = callPackage ./truffleruby { }; } diff --git a/pkgs/development/compilers/graalvm/community-edition/graaljs/default.nix b/pkgs/development/compilers/graalvm/community-edition/graaljs/default.nix new file mode 100644 index 0000000000000..0a7f04052bb60 --- /dev/null +++ b/pkgs/development/compilers/graalvm/community-edition/graaljs/default.nix @@ -0,0 +1,17 @@ +{ stdenv +, fetchurl +, graalvmCEPackages +}: + +graalvmCEPackages.buildGraalvmProduct { + src = fetchurl (import ./hashes.nix).hashes.${stdenv.system}; + version = (import ./hashes.nix).version; + + product = "js-installable-svm"; + + doInstallCheck = true; + installCheckPhase = '' + echo "Testing GraalJS" + echo '1 + 1' | $out/bin/js + ''; +} diff --git a/pkgs/development/compilers/graalvm/community-edition/graaljs/hashes.nix b/pkgs/development/compilers/graalvm/community-edition/graaljs/hashes.nix new file mode 100644 index 0000000000000..268a9743a0254 --- /dev/null +++ b/pkgs/development/compilers/graalvm/community-edition/graaljs/hashes.nix @@ -0,0 +1,22 @@ +# Generated by update.sh script +{ + "version" = "23.1.0"; + "hashes" = { + "aarch64-linux" = { + sha256 = "09q88nsbz0lrl866x3hqxm3hb5wpn4x5rp6pk69x1v6xzl58wzq2"; + url = "https://github.com/oracle/graaljs/releases/download/graal-23.1.0/graaljs-community-23.1.0-linux-aarch64.tar.gz"; + }; + "x86_64-linux" = { + sha256 = "0zlk0gpxwjkh4wxsc310kl80ipgk5si1lmyx0q2hqsw9lm98n41g"; + url = "https://github.com/oracle/graaljs/releases/download/graal-23.1.0/graaljs-community-23.1.0-linux-amd64.tar.gz"; + }; + "x86_64-darwin" = { + sha256 = "1y5mc92yync85ywcahvq8x9jlla0rzjd4g7cm6q7p21wvfwp4d5q"; + url = "https://github.com/oracle/graaljs/releases/download/graal-23.1.0/graaljs-community-23.1.0-macos-amd64.tar.gz"; + }; + "aarch64-darwin" = { + sha256 = "0ph3c6jgbvm3cliyqlccd2l292a7p0051l3sv7yf3318r6zrrk7m"; + url = "https://github.com/oracle/graaljs/releases/download/graal-23.1.0/graaljs-community-23.1.0-macos-aarch64.tar.gz"; + }; + }; +} diff --git a/pkgs/development/compilers/graalvm/community-edition/graalnodejs/default.nix b/pkgs/development/compilers/graalvm/community-edition/graalnodejs/default.nix new file mode 100644 index 0000000000000..fb6d1595bbf37 --- /dev/null +++ b/pkgs/development/compilers/graalvm/community-edition/graalnodejs/default.nix @@ -0,0 +1,17 @@ +{ stdenv +, fetchurl +, graalvmCEPackages +}: + +graalvmCEPackages.buildGraalvmProduct { + src = fetchurl (import ./hashes.nix).hashes.${stdenv.system}; + version = (import ./hashes.nix).version; + + product = "nodejs-installable-svm"; + + doInstallCheck = true; + installCheckPhase = '' + echo "Testing NodeJS" + $out/bin/npx --help + ''; +} diff --git a/pkgs/development/compilers/graalvm/community-edition/graalnodejs/hashes.nix b/pkgs/development/compilers/graalvm/community-edition/graalnodejs/hashes.nix new file mode 100644 index 0000000000000..3546a11c2fc83 --- /dev/null +++ b/pkgs/development/compilers/graalvm/community-edition/graalnodejs/hashes.nix @@ -0,0 +1,22 @@ +# Generated by update.sh script +{ + "version" = "23.1.0"; + "hashes" = { + "aarch64-linux" = { + sha256 = "056x616pp0b25wsryzrfrfnjaxr3444fc3hmv8jspl4pjxjrais2"; + url = "https://github.com/oracle/graaljs/releases/download/graal-23.1.0/graalnodejs-community-23.1.0-linux-aarch64.tar.gz"; + }; + "x86_64-linux" = { + sha256 = "1si2ifwihszv06sqd25mswibiqbxhxgj6yw829f8zrdhs0sra2nz"; + url = "https://github.com/oracle/graaljs/releases/download/graal-23.1.0/graalnodejs-community-23.1.0-linux-amd64.tar.gz"; + }; + "x86_64-darwin" = { + sha256 = "1ffkdavrs92h3f5yil15v3i7r9aggkpfqd13gl5ipqlrk6pykhr7"; + url = "https://github.com/oracle/graaljs/releases/download/graal-23.1.0/graalnodejs-community-23.1.0-macos-amd64.tar.gz"; + }; + "aarch64-darwin" = { + sha256 = "1g6pql0pdxhxwpjqyfkaq07dar8sx2wipsyrjc7hmz3z7pjxcf5i"; + url = "https://github.com/oracle/graaljs/releases/download/graal-23.1.0/graalnodejs-community-23.1.0-macos-aarch64.tar.gz"; + }; + }; +} diff --git a/pkgs/development/compilers/graalvm/community-edition/graalpy/default.nix b/pkgs/development/compilers/graalvm/community-edition/graalpy/default.nix new file mode 100644 index 0000000000000..e2b28500f7fe4 --- /dev/null +++ b/pkgs/development/compilers/graalvm/community-edition/graalpy/default.nix @@ -0,0 +1,18 @@ +{ stdenv +, fetchurl +, graalvmCEPackages +}: + +graalvmCEPackages.buildGraalvmProduct { + src = fetchurl (import ./hashes.nix).hashes.${stdenv.system}; + version = (import ./hashes.nix).version; + + product = "graalpy"; + + doInstallCheck = true; + installCheckPhase = '' + echo "Testing GraalPy" + $out/bin/graalpy -c 'print(1 + 1)' + echo '1 + 1' | $out/bin/graalpy + ''; +} diff --git a/pkgs/development/compilers/graalvm/community-edition/graalpy/hashes.nix b/pkgs/development/compilers/graalvm/community-edition/graalpy/hashes.nix new file mode 100644 index 0000000000000..da582e3ea1925 --- /dev/null +++ b/pkgs/development/compilers/graalvm/community-edition/graalpy/hashes.nix @@ -0,0 +1,22 @@ +# Generated by update.sh script +{ + "version" = "23.1.0"; + "hashes" = { + "aarch64-linux" = { + sha256 = "0n0zz86h7jsqgdiyj6vj7qw57ny40jpmfvylyxq70riy86a4zp67"; + url = "https://github.com/oracle/graalpython/releases/download/graal-23.1.0/graalpy-community-23.1.0-linux-aarch64.tar.gz"; + }; + "x86_64-linux" = { + sha256 = "0nnv255f2bqc4l88iw48f71874ryjn16bb8qn1yk7daj1pck80vj"; + url = "https://github.com/oracle/graalpython/releases/download/graal-23.1.0/graalpy-community-23.1.0-linux-amd64.tar.gz"; + }; + "x86_64-darwin" = { + sha256 = "16kp66l0176sbd8jzvq3y3z7d9zvkqzdaw8vrvnk2qkipa136n0k"; + url = "https://github.com/oracle/graalpython/releases/download/graal-23.1.0/graalpy-community-23.1.0-macos-amd64.tar.gz"; + }; + "aarch64-darwin" = { + sha256 = "17clq7n1n5ww22rh9gp5h9ljhjvggcik8amhd70pwl4cjgv9mhsv"; + url = "https://github.com/oracle/graalpython/releases/download/graal-23.1.0/graalpy-community-23.1.0-macos-aarch64.tar.gz"; + }; + }; +} diff --git a/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/default.nix b/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/default.nix new file mode 100644 index 0000000000000..b7f7db61097f2 --- /dev/null +++ b/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/default.nix @@ -0,0 +1,12 @@ +{ stdenv +, fetchurl +, graalvmCEPackages +, useMusl ? false +}: + +graalvmCEPackages.buildGraalvm { + inherit useMusl; + src = fetchurl (import ./hashes.nix).hashes.${stdenv.system}; + version = (import ./hashes.nix).version; + meta.platforms = builtins.attrNames (import ./hashes.nix).hashes; +} diff --git a/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix b/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix new file mode 100644 index 0000000000000..377a05426c9b5 --- /dev/null +++ b/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix @@ -0,0 +1,22 @@ +# Generated by update.sh script +{ + "version" = "21.0.0"; + "hashes" = { + "aarch64-linux" = { + sha256 = "199h3d6zayw28xlyggldap6nafh5fnpfbshs0rsf94dfgv7r4kmv"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.0/graalvm-community-jdk-21.0.0_linux-aarch64_bin.tar.gz"; + }; + "x86_64-linux" = { + sha256 = "06dkb1yimk5q3yzjk6kjsrs2pkbjxgz9jr5vj6wfb2y5ri0jjhkc"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.0/graalvm-community-jdk-21.0.0_linux-x64_bin.tar.gz"; + }; + "x86_64-darwin" = { + sha256 = "1qbz3xfxj7nwb01cy99hd22k3pim8j43blcdcys48l8xcb234nlk"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.0/graalvm-community-jdk-21.0.0_macos-x64_bin.tar.gz"; + }; + "aarch64-darwin" = { + sha256 = "0dqgsp0bhqvv07b9kb0cxqm5cw47kapzbfbw13570ydgc0gfg3f5"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.0/graalvm-community-jdk-21.0.0_macos-aarch64_bin.tar.gz"; + }; + }; +} diff --git a/pkgs/development/compilers/graalvm/community-edition/hashes.nix b/pkgs/development/compilers/graalvm/community-edition/hashes.nix deleted file mode 100644 index b8d157a2399cc..0000000000000 --- a/pkgs/development/compilers/graalvm/community-edition/hashes.nix +++ /dev/null @@ -1,391 +0,0 @@ -# Generated by pkgs/development/compilers/graalvm/community-edition/update.sh script -{ - "llvm-installable-svm" = { - "11-linux-aarch64" = { - sha256 = "0h8xkvsixcwak5dymkj3jgjv11w3ivnd6d45v5pdbymd0m2ifia8"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java11-linux-aarch64-22.3.1.jar"; - }; - "17-linux-aarch64" = { - sha256 = "1zww45z7m3mvzg47fwc3jgqz3hkra220isf4ih8sv6kjg1jc4y14"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java17-linux-aarch64-22.3.1.jar"; - }; - "19-linux-aarch64" = { - sha256 = "13gg5hqg3pzn3qprl76i2wpmfagf5zw4w9hl18993ing21k5d0kq"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java19-linux-aarch64-22.3.1.jar"; - }; - "11-linux-amd64" = { - sha256 = "133m9vg9rlp2xkndh3d6b8ybq8vwch99rj1b50xr6bz8r6306ara"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java11-linux-amd64-22.3.1.jar"; - }; - "17-linux-amd64" = { - sha256 = "0nz09idp8wawm3yinsplzvxhld8yav06l1nqj02gxrc1kxd5nsr1"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java17-linux-amd64-22.3.1.jar"; - }; - "19-linux-amd64" = { - sha256 = "1b5jsazjxkqlswl0h5yx7nx16zjjlvw967i6kypp4js80zg79s8m"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java19-linux-amd64-22.3.1.jar"; - }; - "11-darwin-aarch64" = { - sha256 = "0ngcm3ara7g1xz4kh515igpyrjhr1k5z9nf4vsaw4lpa5sqljv7z"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java11-darwin-aarch64-22.3.1.jar"; - }; - "17-darwin-aarch64" = { - sha256 = "1lr8kk82c3l9hx7wc5hqmpqfgvpk72xg1h07b6cgibry1bm6baj6"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java17-darwin-aarch64-22.3.1.jar"; - }; - "19-darwin-aarch64" = { - sha256 = "0mdiiag4hkddfgjamqn8y63s7xrfhq1wjvc7rw2sldykg7x0813i"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java19-darwin-aarch64-22.3.1.jar"; - }; - "11-darwin-amd64" = { - sha256 = "058pzrd90xx4yi7mm2fvs2npqcdkb2nzhqfwfz5v202038igi61g"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java11-darwin-amd64-22.3.1.jar"; - }; - "17-darwin-amd64" = { - sha256 = "10rfz8ddq82zpf6cy2y0gx1bx0zhjzm3gwwdb1j7mll0hvwp84sg"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java17-darwin-amd64-22.3.1.jar"; - }; - "19-darwin-amd64" = { - sha256 = "0h5sf99ypwz0bafq4jm71ynszfgsrlnhmcjh0kl6sy5g1q8ij0jf"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java19-darwin-amd64-22.3.1.jar"; - }; - }; - "nodejs-installable-svm" = { - "11-linux-aarch64" = { - sha256 = "0slzvbmxwa4a6m9c0hbdp8ryh9crfq7mv6y2j4hik5m457jq98cp"; - url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java11-linux-aarch64-22.3.1.jar"; - }; - "17-linux-aarch64" = { - sha256 = "1ldivy5hmq2mxmzh40hglzngylahnzyqh9rav73nicl5mz8hk4l2"; - url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java17-linux-aarch64-22.3.1.jar"; - }; - "19-linux-aarch64" = { - sha256 = "12chjbfz530kyp46bya8wcwciwlhp873hc6mvsjcf5swa3g7cwcl"; - url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java19-linux-aarch64-22.3.1.jar"; - }; - "11-linux-amd64" = { - sha256 = "1p1y52b4lky2fbkml5vqy7dn9vqzj19jq5f3c90mgsfk4c7xhi66"; - url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java11-linux-amd64-22.3.1.jar"; - }; - "17-linux-amd64" = { - sha256 = "0j1gkpszklzm069bccm6wgq8iq0k41bcrca0kf8pbl2y11hwywpc"; - url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java17-linux-amd64-22.3.1.jar"; - }; - "19-linux-amd64" = { - sha256 = "1gdkn0srkh8bn7c81f8s7ykd12pnz5r75rif76zhzdllhx63nn5v"; - url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java19-linux-amd64-22.3.1.jar"; - }; - "11-darwin-aarch64" = { - sha256 = "1fbqc3a7i91as1sbwg2yr1zx0wz4jsaxcz9pfqy8a0z88m8vivbs"; - url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java11-darwin-aarch64-22.3.1.jar"; - }; - "17-darwin-aarch64" = { - sha256 = "1swzkp0imcv30fxfwblgad57fvpsvhfpv93s8zj1lwrbarggl2y3"; - url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java17-darwin-aarch64-22.3.1.jar"; - }; - "19-darwin-aarch64" = { - sha256 = "11kpgd6vxc8dm9z5ihkwbjbbspk53m3k9b550zf0zs3as9yjbp22"; - url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java19-darwin-aarch64-22.3.1.jar"; - }; - "11-darwin-amd64" = { - sha256 = "0n3hm8dd0ya86hxbxv07sfp22y02vhhzahkxk2j2162n9hcdmkwk"; - url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java11-darwin-amd64-22.3.1.jar"; - }; - "17-darwin-amd64" = { - sha256 = "0xkjqcch22bm32mczj6xs8rzsl2n6vy9hmzwfy9a71w1kpkbjn3a"; - url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java17-darwin-amd64-22.3.1.jar"; - }; - "19-darwin-amd64" = { - sha256 = "1yrh6iahai3aw7lpz89mrq782b1bysqqr9vkqdgcv00by1a7yd10"; - url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java19-darwin-amd64-22.3.1.jar"; - }; - }; - "wasm-installable-svm" = { - "11-linux-aarch64" = { - sha256 = "1d67jm41psypkhpy77cb2l00smhni3pgkybwx79z7dzcyid7p2l1"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java11-linux-aarch64-22.3.1.jar"; - }; - "17-linux-aarch64" = { - sha256 = "1cg9zxyjirfl0afr9cppg2h17j8qdidi4llbal2g5w1p2v9zq78b"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java17-linux-aarch64-22.3.1.jar"; - }; - "19-linux-aarch64" = { - sha256 = "1vaqf3ilp3kg280adynww4l07sbcd5hih86akpd25rbxn45khz9s"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java19-linux-aarch64-22.3.1.jar"; - }; - "11-linux-amd64" = { - sha256 = "19v7jqhvijmzzb0i9q6hbvrmqnmmzbyvai3il9f357qvv6r6lylb"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java11-linux-amd64-22.3.1.jar"; - }; - "17-linux-amd64" = { - sha256 = "0sfnsy0r4qf7ni9mh437dad1d8sidajcra2azsmy5qdmh091zhj5"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java17-linux-amd64-22.3.1.jar"; - }; - "19-linux-amd64" = { - sha256 = "1k7jqsh5wg7c7a6mhqgxghn20qwx70bky49p2a6imcsygnilqgim"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java19-linux-amd64-22.3.1.jar"; - }; - "11-darwin-amd64" = { - sha256 = "0764d97mla5cii4iyvyb43v62dk8ff3plqjmdc69qqxx8mdzpwqv"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java11-darwin-amd64-22.3.1.jar"; - }; - "17-darwin-amd64" = { - sha256 = "1ip6ybm7p28bs2lifxqhq6fyvfm3wmacv6dqziyl2v7v7yl0iw4i"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java17-darwin-amd64-22.3.1.jar"; - }; - "19-darwin-amd64" = { - sha256 = "14d3djmacj81rj5sqf30z060iywndn6kw1n58kg12jvmgipbm3iq"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java19-darwin-amd64-22.3.1.jar"; - }; - }; - "js-installable-svm" = { - "11-linux-aarch64" = { - sha256 = "1b8vnjjsa548c6j3dycxp57i9xmyvndiz2xhv7fm10izcplyspxq"; - url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java11-linux-aarch64-22.3.1.jar"; - }; - "17-linux-aarch64" = { - sha256 = "1kcy3mjk908zs7f3k95awp6294cwr06hand4cbw1lsnfvp0qwhk7"; - url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java17-linux-aarch64-22.3.1.jar"; - }; - "19-linux-aarch64" = { - sha256 = "1mk8qzdfsbjhfx0ds8rk9jm2g6g2lv8bppmnwpgrkm232c8i0dgw"; - url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java19-linux-aarch64-22.3.1.jar"; - }; - "11-linux-amd64" = { - sha256 = "0sq80a4nnvik560whgv5vwlsszi8z02idvpd92p0caf03bra9x2b"; - url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java11-linux-amd64-22.3.1.jar"; - }; - "17-linux-amd64" = { - sha256 = "0fd160yxsi09m97z7vqh5kwf1g0p0hn4niy48glj9jhirfqzzw0c"; - url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java17-linux-amd64-22.3.1.jar"; - }; - "19-linux-amd64" = { - sha256 = "0ghx41aldb30yjd0sdrfm89i7d6q0aca18bm7j1qyg9gnmkvxnmn"; - url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java19-linux-amd64-22.3.1.jar"; - }; - "11-darwin-aarch64" = { - sha256 = "18g0xixzk45yrxv3zfs7qrdyj0b3ksp59jhbcis0vwy9gx8094wq"; - url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java11-darwin-aarch64-22.3.1.jar"; - }; - "17-darwin-aarch64" = { - sha256 = "0cf4iivkniilvbqyniqxcz1qf49cs4lxi0axjsk9sz1zmxcq0bnk"; - url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java17-darwin-aarch64-22.3.1.jar"; - }; - "19-darwin-aarch64" = { - sha256 = "03wxaim069rp69njh4gdchsm3b9s7crxihbk1arvz2cpgy9x1zvc"; - url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java19-darwin-aarch64-22.3.1.jar"; - }; - "11-darwin-amd64" = { - sha256 = "0ibcz6ivx068ndf45j9pghm8qwq287glqxf0xx08kjxnhms67p52"; - url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java11-darwin-amd64-22.3.1.jar"; - }; - "17-darwin-amd64" = { - sha256 = "16q7whnvdrk8lb4fp96qr3p567kggyk9q5iqcn081qk8xjkbx0zv"; - url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java17-darwin-amd64-22.3.1.jar"; - }; - "19-darwin-amd64" = { - sha256 = "13nx6kwcx100166ba4h7h97ravw4hyiqnvhszqbdffn54y0x5dwl"; - url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java19-darwin-amd64-22.3.1.jar"; - }; - }; - "python-installable-svm" = { - "11-linux-aarch64" = { - sha256 = "1yl36x5svld7qnm3m6vmacm2n4d6l9vhdxhaypvlv2bbfbnym3c5"; - url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java11-linux-aarch64-22.3.1.jar"; - }; - "17-linux-aarch64" = { - sha256 = "0ggx5rwz3qnnxgz407r8yx12556pcbirhnc44972l77r320rdmqc"; - url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java17-linux-aarch64-22.3.1.jar"; - }; - "19-linux-aarch64" = { - sha256 = "1d0a7didgzgn45q7zg4iidmy2gckhaf796mbraqz5hjlig4vscr7"; - url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java19-linux-aarch64-22.3.1.jar"; - }; - "11-linux-amd64" = { - sha256 = "11c19a20v3ff83dxzs9hf1z89kh0qich41b03gx8mancf12jfwnl"; - url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java11-linux-amd64-22.3.1.jar"; - }; - "17-linux-amd64" = { - sha256 = "0pga44whhvm98d8j2v2bpl9rkbvr9bv947rc4imlbf01cyxjwl71"; - url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java17-linux-amd64-22.3.1.jar"; - }; - "19-linux-amd64" = { - sha256 = "0nwa1nrclh3p12cacp98wbx9p3zhs44b8srbr27vqgc10z78c1wz"; - url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java19-linux-amd64-22.3.1.jar"; - }; - "11-darwin-aarch64" = { - sha256 = "0qnh8i9nazrv25jhn13wp7qqm9wwhcz4kpp2ygvsdmf9s3d2f5lf"; - url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java11-darwin-aarch64-22.3.1.jar"; - }; - "17-darwin-aarch64" = { - sha256 = "0j13xvy9d19glipz4wdma2y02g0cnksg1iij4247fjhpqh0axkdz"; - url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java17-darwin-aarch64-22.3.1.jar"; - }; - "19-darwin-aarch64" = { - sha256 = "0n7vx5lxbgpjvzv0y1fqsrk0j61vrzjm2ksh0lkdnz1zrr5mqgsh"; - url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java19-darwin-aarch64-22.3.1.jar"; - }; - "11-darwin-amd64" = { - sha256 = "1ny5664h7pibvskmm51mlxrxkbbj2dvxsv2yqbq6v51a57wm1yzn"; - url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java11-darwin-amd64-22.3.1.jar"; - }; - "17-darwin-amd64" = { - sha256 = "01jjncx8jm1yrps2nj217vgcmjaqclmpb27rdp3qn7k64w5wzipg"; - url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java17-darwin-amd64-22.3.1.jar"; - }; - "19-darwin-amd64" = { - sha256 = "00agpvp1yw884lm6d88d2l8629qpbpdlik2g621yz4vf9y7qki83"; - url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java19-darwin-amd64-22.3.1.jar"; - }; - }; - "native-image-installable-svm" = { - "11-linux-aarch64" = { - sha256 = "0z9rbmci6yz7f7mqd3xzsxc5ih4hq72lyzqfchan7fr6mh38d6gw"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java11-linux-aarch64-22.3.1.jar"; - }; - "17-linux-aarch64" = { - sha256 = "03v20fc9famlnbrznpasnd5gdl5k9nl4dlj3pp6bad4y6l7rqnx5"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java17-linux-aarch64-22.3.1.jar"; - }; - "19-linux-aarch64" = { - sha256 = "13gg1zj7ivzrgwvyvsbwbrchryjqmi00km7jxajjjbr1k7jkdc5v"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java19-linux-aarch64-22.3.1.jar"; - }; - "11-linux-amd64" = { - sha256 = "1yb7kpbs7hrzlysvrqjzgfz678p1hbg6237jzb35zmwdaczav51n"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java11-linux-amd64-22.3.1.jar"; - }; - "17-linux-amd64" = { - sha256 = "00fbyqsj4xj9ay8bki1190lf59bgrzvla8lzzq51p53a1bdrhhmv"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java17-linux-amd64-22.3.1.jar"; - }; - "19-linux-amd64" = { - sha256 = "1ayx0ag00i9868xz5xzc9fmwipkhz5qsldfmxk16cxp5vi71yhb1"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java19-linux-amd64-22.3.1.jar"; - }; - "11-darwin-aarch64" = { - sha256 = "1kaqvkbhj3iifq6asyrpy225a89y7klzbh7an1ycnvc2hvqkv4nz"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java11-darwin-aarch64-22.3.1.jar"; - }; - "17-darwin-aarch64" = { - sha256 = "09l7x4x8yanq55v6y6wpfx94mvsq1bpbnihknjc6dnq3vcrci77n"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java17-darwin-aarch64-22.3.1.jar"; - }; - "19-darwin-aarch64" = { - sha256 = "0dfddqgkz9b5akpgfw7sj4sl9wwknmh7qzk3pq2dpvf6892168wb"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java19-darwin-aarch64-22.3.1.jar"; - }; - "11-darwin-amd64" = { - sha256 = "036w9dmdcs46kmjqr3086mg389fgr3h1zysavfq8cbh199x0ibia"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java11-darwin-amd64-22.3.1.jar"; - }; - "17-darwin-amd64" = { - sha256 = "1hvjfvcn878bzvi944v3x23sby72hbfvg5s3zzspyc37l5cdpqi3"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java17-darwin-amd64-22.3.1.jar"; - }; - "19-darwin-amd64" = { - sha256 = "1829fnyz62gcnj0664hl9w3vjyb3xfc84gpnblhhdx77c9y8gf6b"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java19-darwin-amd64-22.3.1.jar"; - }; - }; - "graalvm-ce" = { - "11-linux-aarch64" = { - sha256 = "1g4a3z9993pq52j3jf25pbcq9rvl8jz1yar8c859jw5chaf3ysml"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java11-linux-aarch64-22.3.1.tar.gz"; - }; - "17-linux-aarch64" = { - sha256 = "06288dwbql943nii74i9mngzb38h2nzrxzzgs346mgk2965gwm59"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java17-linux-aarch64-22.3.1.tar.gz"; - }; - "19-linux-aarch64" = { - sha256 = "03bakx00rl2c0hyvp5skfha57cijlpvmsnfgv2ancn3ypyqx1c4m"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java19-linux-aarch64-22.3.1.tar.gz"; - }; - "11-linux-amd64" = { - sha256 = "1f6xkdnxn6xsm24sqw24rsca72wm7v6q96m23l5fng5ym0jpfm2m"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java11-linux-amd64-22.3.1.tar.gz"; - }; - "17-linux-amd64" = { - sha256 = "0aci9i28rq5nk2qya9dcg5hxr3sgsbv7f5x8679hrjrqmrclmkrs"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java17-linux-amd64-22.3.1.tar.gz"; - }; - "19-linux-amd64" = { - sha256 = "0byxf2d4c3vwygjg5rbwwi22k1pv0yqjz03n8m67v2vsbs09vnbw"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java19-linux-amd64-22.3.1.tar.gz"; - }; - "11-darwin-aarch64" = { - sha256 = "0cbcm9d211m4b6g1bkpfksma917lzqkl4kx38vm1nrwjkll357y5"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java11-darwin-aarch64-22.3.1.tar.gz"; - }; - "17-darwin-aarch64" = { - sha256 = "1qbw3hlmqcrmd70xk56463scdxr50n66z2n3c24h68qlwwlpqc73"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java17-darwin-aarch64-22.3.1.tar.gz"; - }; - "19-darwin-aarch64" = { - sha256 = "09n9qz58lfwl2ag8s3n6dm11p5nnbz6gfralfyfj72wwfghcsckc"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java19-darwin-aarch64-22.3.1.tar.gz"; - }; - "11-darwin-amd64" = { - sha256 = "0a12rzf99x5l29f6bwm6myk18dgnrx2c9rwmii2pm864y7azlnij"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java11-darwin-amd64-22.3.1.tar.gz"; - }; - "17-darwin-amd64" = { - sha256 = "02lclv2j3v850izh84wdvksi3d3xmgpfl7x85vzifhgsvagm6sz4"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java17-darwin-amd64-22.3.1.tar.gz"; - }; - "19-darwin-amd64" = { - sha256 = "1b3r43jpgip12if1fld41qiigqgn32zqs6992ji206dxq6xwli23"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java19-darwin-amd64-22.3.1.tar.gz"; - }; - }; - "ruby-installable-svm" = { - "11-linux-aarch64" = { - sha256 = "10wm1sq7smywy63mzlsbn21kzd65yaqj8yismpq8bz19h9skas7w"; - url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java11-linux-aarch64-22.3.1.jar"; - }; - "17-linux-aarch64" = { - sha256 = "0kh1w49yp3kpfvhqw19bbx51ay1wgzq80gsrfqax4zm5ixz4wsbz"; - url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java17-linux-aarch64-22.3.1.jar"; - }; - "19-linux-aarch64" = { - sha256 = "1c3xw9h85g3p5w12zrlvl036ay3218g5405hkh7qaah00affgx5l"; - url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java19-linux-aarch64-22.3.1.jar"; - }; - "11-linux-amd64" = { - sha256 = "0avsawgfkqbgqc2hm8zmz37qg9ag3ddni3my8g73kvzfkghsdabh"; - url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java11-linux-amd64-22.3.1.jar"; - }; - "17-linux-amd64" = { - sha256 = "1ib00pqdhzl24y97j16mm86qwrijqjnmhjmk3g5vdhyhh099vjp1"; - url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java17-linux-amd64-22.3.1.jar"; - }; - "19-linux-amd64" = { - sha256 = "1j42y6gwf84xgjnawwqymxv4702gsy0vriwdfd09nbp600sjzga5"; - url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java19-linux-amd64-22.3.1.jar"; - }; - "11-darwin-aarch64" = { - sha256 = "1im75qad89xa2nbl80csnwn56k6n11zv5g91xlkqq4xk300v1saj"; - url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java11-darwin-aarch64-22.3.1.jar"; - }; - "17-darwin-aarch64" = { - sha256 = "1pfzsisf4sgzxmk3r1p4apzqkwipjpf8naly3v94i5v3b5gbnczx"; - url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java17-darwin-aarch64-22.3.1.jar"; - }; - "19-darwin-aarch64" = { - sha256 = "0xysf43q0zpin3lmffmb3n7y4rsm1zm19ndys1vrn8szz4jcxpsq"; - url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java19-darwin-aarch64-22.3.1.jar"; - }; - "11-darwin-amd64" = { - sha256 = "1jfls71y92hw09s869v2qw8pypgl1fciqz3m9zcd2602hikysq6c"; - url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java11-darwin-amd64-22.3.1.jar"; - }; - "17-darwin-amd64" = { - sha256 = "03x2h4sw72l05xxg73xj9mzzkxffbjpv8hdi59rgxxljnz0ai6rx"; - url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java17-darwin-amd64-22.3.1.jar"; - }; - "19-darwin-amd64" = { - sha256 = "02nkjlv306wyms7swibn5rz0w8sx6pwvh1lilgvv4xnbj7wps2q7"; - url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java19-darwin-amd64-22.3.1.jar"; - }; - }; -} diff --git a/pkgs/development/compilers/graalvm/community-edition/js-installable-svm.nix b/pkgs/development/compilers/graalvm/community-edition/js-installable-svm.nix deleted file mode 100644 index 45cf50e90feef..0000000000000 --- a/pkgs/development/compilers/graalvm/community-edition/js-installable-svm.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ lib -, stdenv -, graalvmCEPackages -, javaVersion -, src -, version -}: - -graalvmCEPackages.buildGraalvmProduct rec { - inherit src javaVersion version; - product = "js-installable-svm"; - - graalvmPhases.installCheckPhase = '' - echo "Testing GraalJS" - echo '1 + 1' | $out/bin/js - ''; -} diff --git a/pkgs/development/compilers/graalvm/community-edition/llvm-installable-svm.nix b/pkgs/development/compilers/graalvm/community-edition/llvm-installable-svm.nix deleted file mode 100644 index 9fc8fb3db95ed..0000000000000 --- a/pkgs/development/compilers/graalvm/community-edition/llvm-installable-svm.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib -, stdenv -, graalvmCEPackages -, javaVersion -, src -, version -}: - -graalvmCEPackages.buildGraalvmProduct rec { - inherit src javaVersion version; - product = "llvm-installable-svm"; - - # TODO: improve this test - graalvmPhases.installCheckPhase = '' - echo "Testing llvm" - $out/bin/lli --help - ''; -} diff --git a/pkgs/development/compilers/graalvm/community-edition/native-image-installable-svm.nix b/pkgs/development/compilers/graalvm/community-edition/native-image-installable-svm.nix deleted file mode 100644 index 427c5ffef5b5e..0000000000000 --- a/pkgs/development/compilers/graalvm/community-edition/native-image-installable-svm.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ lib -, stdenv -, graalvmCEPackages -, gcc -, glibc -, javaVersion -, musl -, src -, version -, writeShellScriptBin -, zlib -, useMusl ? false -, extraCLibs ? [ ] -}: - -assert useMusl -> stdenv.isLinux; -let - cLibs = [ glibc zlib.static ] - ++ lib.optionals (!useMusl) [ glibc.static ] - ++ lib.optionals useMusl [ musl ] - ++ extraCLibs; - # GraalVM 21.3.0+ expects musl-gcc as <system>-musl-gcc - musl-gcc = (writeShellScriptBin "${stdenv.hostPlatform.system}-musl-gcc" ''${lib.getDev musl}/bin/musl-gcc "$@"''); - binPath = lib.makeBinPath ([ gcc ] ++ lib.optionals useMusl [ musl-gcc ]); -in -graalvmCEPackages.buildGraalvmProduct rec { - inherit src javaVersion version; - product = "native-image-installable-svm"; - - graalvmPhases.postInstall = lib.optionalString stdenv.isLinux '' - wrapProgram $out/bin/native-image \ - --prefix PATH : ${binPath} \ - ${lib.concatStringsSep " " - (map (l: "--add-flags '-H:CLibraryPath=${l}/lib'") cLibs)} - ''; - - graalvmPhases.installCheckPhase = '' - echo "Ahead-Of-Time compilation" - $out/bin/native-image -H:-CheckToolchain -H:+ReportExceptionStackTraces HelloWorld - ./helloworld | fgrep 'Hello World' - - ${# --static is only available in Linux - lib.optionalString (stdenv.isLinux && !useMusl) '' - echo "Ahead-Of-Time compilation with -H:+StaticExecutableWithDynamicLibC" - $out/bin/native-image -H:+StaticExecutableWithDynamicLibC HelloWorld - ./helloworld | fgrep 'Hello World' - - echo "Ahead-Of-Time compilation with --static" - $out/bin/native-image --static HelloWorld - ./helloworld | fgrep 'Hello World' - ''} - - ${# --static is only available in Linux - lib.optionalString (stdenv.isLinux && useMusl) '' - echo "Ahead-Of-Time compilation with --static and --libc=musl" - $out/bin/native-image --static HelloWorld --libc=musl - ./helloworld | fgrep 'Hello World' - ''} - ''; -} diff --git a/pkgs/development/compilers/graalvm/community-edition/nodejs-installable-svm.nix b/pkgs/development/compilers/graalvm/community-edition/nodejs-installable-svm.nix deleted file mode 100644 index 022ac0a44fe18..0000000000000 --- a/pkgs/development/compilers/graalvm/community-edition/nodejs-installable-svm.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib -, stdenv -, graalvmCEPackages -, graalvm-ce -, javaVersion -, src -, version -}: - -graalvmCEPackages.buildGraalvmProduct rec { - inherit src javaVersion version; - product = "nodejs-installable-svm"; - - extraNativeBuildInputs = [ graalvm-ce ]; - - # TODO: improve test - graalvmPhases.installCheckPhase = '' - echo "Testing NodeJS" - $out/bin/npx --help - ''; -} diff --git a/pkgs/development/compilers/graalvm/community-edition/python-installable-svm.nix b/pkgs/development/compilers/graalvm/community-edition/python-installable-svm.nix deleted file mode 100644 index 43d6e85ef5603..0000000000000 --- a/pkgs/development/compilers/graalvm/community-edition/python-installable-svm.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib -, stdenv -, graalvmCEPackages -, javaVersion -, src -, version -}: - -graalvmCEPackages.buildGraalvmProduct rec { - inherit src javaVersion version; - product = "python-installable-svm"; - - graalvmPhases.installCheckPhase = '' - echo "Testing GraalPython" - $out/bin/graalpy -c 'print(1 + 1)' - echo '1 + 1' | $out/bin/graalpy - ''; -} diff --git a/pkgs/development/compilers/graalvm/community-edition/ruby-installable-svm.nix b/pkgs/development/compilers/graalvm/community-edition/truffleruby/default.nix index 30d0739b4b1d7..95e9c56fc23cc 100644 --- a/pkgs/development/compilers/graalvm/community-edition/ruby-installable-svm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/truffleruby/default.nix @@ -1,29 +1,30 @@ { lib , stdenv +, fetchurl , graalvmCEPackages -, llvm-installable-svm +, libyaml , openssl -, javaVersion -, src -, version }: -graalvmCEPackages.buildGraalvmProduct rec { - inherit src javaVersion version; - product = "ruby-installable-svm"; +graalvmCEPackages.buildGraalvmProduct { + src = fetchurl (import ./hashes.nix).hashes.${stdenv.system}; + version = (import ./hashes.nix).version; + + product = "truffleruby"; extraBuildInputs = [ - llvm-installable-svm + libyaml openssl ]; preFixup = lib.optionalString stdenv.isLinux '' - patchelf $out/languages/ruby/lib/mri/openssl.so \ + patchelf $out/lib/mri/openssl.so \ --replace-needed libssl.so.10 libssl.so \ --replace-needed libcrypto.so.10 libcrypto.so ''; - graalvmPhases.installCheckPhase = '' + doInstallCheck = true; + installCheckPhase = '' echo "Testing TruffleRuby" # Fixup/silence warnings about wrong locale export LANG=C diff --git a/pkgs/development/compilers/graalvm/community-edition/truffleruby/hashes.nix b/pkgs/development/compilers/graalvm/community-edition/truffleruby/hashes.nix new file mode 100644 index 0000000000000..addd6749e7d64 --- /dev/null +++ b/pkgs/development/compilers/graalvm/community-edition/truffleruby/hashes.nix @@ -0,0 +1,22 @@ +# Generated by update.sh script +{ + "version" = "23.1.0"; + "hashes" = { + "aarch64-linux" = { + sha256 = "05q0xqm7qa9mw7v4kwyhbqsx27x19msf9rbbzq60dinp5724r721"; + url = "https://github.com/oracle/truffleruby/releases/download/graal-23.1.0/truffleruby-community-23.1.0-linux-aarch64.tar.gz"; + }; + "x86_64-linux" = { + sha256 = "0bfcqcax9424vsdqzr18mxkhi2wpzc4xaji98anm8mcjkyl1r89q"; + url = "https://github.com/oracle/truffleruby/releases/download/graal-23.1.0/truffleruby-community-23.1.0-linux-amd64.tar.gz"; + }; + "x86_64-darwin" = { + sha256 = "1yj9nk670hgh9104s1j207mqldagfvvvscj4bfgf3jlbcq5hvlhn"; + url = "https://github.com/oracle/truffleruby/releases/download/graal-23.1.0/truffleruby-community-23.1.0-macos-amd64.tar.gz"; + }; + "aarch64-darwin" = { + sha256 = "1nmqyn4vzwjsvq7dly8qn1xx973jg027xfbs988vf3nljnhkpq5l"; + url = "https://github.com/oracle/truffleruby/releases/download/graal-23.1.0/truffleruby-community-23.1.0-macos-aarch64.tar.gz"; + }; + }; +} diff --git a/pkgs/development/compilers/graalvm/community-edition/update.sh b/pkgs/development/compilers/graalvm/community-edition/update.sh index ad523fbd6b33c..65d36514bcd01 100755 --- a/pkgs/development/compilers/graalvm/community-edition/update.sh +++ b/pkgs/development/compilers/graalvm/community-edition/update.sh @@ -1,10 +1,23 @@ #!/usr/bin/env nix-shell #!nix-shell -p coreutils curl.out nix jq gnused -i bash +# Usage: +# ./update.sh [PRODUCT] +# +# Examples: +# $ ./update.sh graalvm-ce # will generate ./graalvm-ce/hashes.nix +# $ ./update.sh # same as above +# $ ./update.sh graalpy # will generate ./graalpy/hashes.nix +# +# Environment variables: +# FORCE=1 to force the update of a product (e.g.: skip up-to-date checks) +# VERSION=xx.xx will assume that xx.xx is the new version + set -eou pipefail cd "$(dirname "${BASH_SOURCE[0]}")" tmpfile="$(mktemp --suffix=.nix)" +readonly tmpfile trap 'rm -rf "$tmpfile"' EXIT @@ -16,92 +29,102 @@ verlte() { [ "$1" = "$(echo -e "$1\n$2" | sort -V | head -n1)" ] } -readonly hashes_nix="hashes.nix" +readonly product="${1:-graalvm-ce}" +readonly hashes_nix="$product/hashes.nix" readonly nixpkgs=../../../../.. -readonly current_version="$(nix-instantiate "$nixpkgs" --eval --strict -A graalvm-ce.version --json | jq -r)" +mkdir -p "$product" + +declare -r -A update_urls=( + [graalvm-ce]="https://api.github.com/repos/graalvm/graalvm-ce-builds/releases/latest" + [graaljs]="https://api.github.com/repos/oracle/graaljs/releases/latest" + [graalnodejs]="https://api.github.com/repos/oracle/graaljs/releases/latest" + [graalpy]="https://api.github.com/repos/oracle/graalpython/releases/latest" + [truffleruby]="https://api.github.com/repos/oracle/truffleruby/releases/latest" +) -if [[ -z "${1:-}" ]]; then - readonly gh_version="$(curl \ +current_version="$(nix-instantiate "$nixpkgs" --eval --strict -A "graalvmCEPackages.${product}.version" --json | jq -r)" +readonly current_version + +if [[ -z "${VERSION:-}" ]]; then + gh_version="$(curl \ ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ - -s https://api.github.com/repos/graalvm/graalvm-ce-builds/releases/latest | \ + -s "${update_urls[$product]}" | \ jq --raw-output .tag_name)" - readonly new_version="${gh_version//vm-/}" + new_version="${gh_version//jdk-/}" + new_version="${new_version//graal-/}" else - readonly new_version="$1" + new_version="$VERSION" fi +readonly new_version info "Current version: $current_version" info "New version: $new_version" if verlte "$new_version" "$current_version"; then - info "graalvm-ce $current_version is up-to-date." + info "$product $current_version is up-to-date." [[ -z "${FORCE:-}" ]] && exit 0 else - info "graalvm-ce $current_version is out-of-date. Updating..." + info "$product $current_version is out-of-date. Updating..." fi +# Make sure to get the `-community` versions! declare -r -A products_urls=( - [graalvm-ce]="https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${new_version}/graalvm-ce-java@platform@-${new_version}.tar.gz" - [js-installable-svm]="https://github.com/graalvm/graaljs/releases/download/vm-${new_version}/js-installable-svm-java@platform@-${new_version}.jar" - [llvm-installable-svm]="https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${new_version}/llvm-installable-svm-java@platform@-${new_version}.jar" - [native-image-installable-svm]="https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${new_version}/native-image-installable-svm-java@platform@-${new_version}.jar" - [nodejs-installable-svm]="https://github.com/graalvm/graaljs/releases/download/vm-${new_version}/nodejs-installable-svm-java@platform@-${new_version}.jar" - [python-installable-svm]="https://github.com/graalvm/graalpython/releases/download/vm-${new_version}/python-installable-svm-java@platform@-${new_version}.jar" - [ruby-installable-svm]="https://github.com/oracle/truffleruby/releases/download/vm-${new_version}/ruby-installable-svm-java@platform@-${new_version}.jar" - [wasm-installable-svm]="https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${new_version}/wasm-installable-svm-java@platform@-${new_version}.jar" + [graalvm-ce]="https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-${new_version}/graalvm-community-jdk-${new_version}_@platform@_bin.tar.gz" + [graaljs]="https://github.com/oracle/graaljs/releases/download/graal-${new_version}/graaljs-community-${new_version}-@platform@.tar.gz" + [graalnodejs]="https://github.com/oracle/graaljs/releases/download/graal-${new_version}/graalnodejs-community-${new_version}-@platform@.tar.gz" + [graalpy]="https://github.com/oracle/graalpython/releases/download/graal-${new_version}/graalpy-community-${new_version}-@platform@.tar.gz" + [truffleruby]="https://github.com/oracle/truffleruby/releases/download/graal-${new_version}/truffleruby-community-${new_version}-@platform@.tar.gz" ) -readonly platforms=( - "11-linux-aarch64" - "17-linux-aarch64" - "19-linux-aarch64" - "11-linux-amd64" - "17-linux-amd64" - "19-linux-amd64" - "11-darwin-aarch64" - "17-darwin-aarch64" - "19-darwin-aarch64" - "11-darwin-amd64" - "17-darwin-amd64" - "19-darwin-amd64" -) +# Argh, this is really inconsistent... +if [[ "$product" == "graalvm-ce" ]]; then + declare -r -A platforms=( + [aarch64-linux]="linux-aarch64" + [x86_64-linux]="linux-x64" + [aarch64-darwin]="macos-aarch64" + [x86_64-darwin]="macos-x64" + ) +else + declare -r -A platforms=( + [aarch64-linux]="linux-aarch64" + [x86_64-linux]="linux-amd64" + [aarch64-darwin]="macos-aarch64" + [x86_64-darwin]="macos-amd64" + ) +fi -info "Generating '$hashes_nix' file for 'graalvm-ce' $new_version. This will take a while..." +info "Generating '$hashes_nix' file for '$product' $new_version. This will take a while..." # Indentation of `echo_file` function is on purpose to make it easier to visualize the output -echo_file "# Generated by $0 script" +echo_file "# Generated by $(basename $0) script" echo_file "{" -for product in "${!products_urls[@]}"; do - url="${products_urls["${product}"]}" -echo_file " \"$product\" = {" - for platform in "${platforms[@]}"; do - args=("${url//@platform@/$platform}") - # Get current hashes to skip derivations already in /nix/store to reuse cache when the version is the same - # e.g.: when adding a new product and running this script with FORCE=1 - if [[ "$current_version" == "$new_version" ]] && \ - previous_hash="$(nix-instantiate --eval "$hashes_nix" -A "$product.$platform.sha256" --json | jq -r)"; then - args+=("$previous_hash" "--type" "sha256") - else - info "Hash in '$product' for '$platform' not found. Re-downloading it..." - fi - if hash="$(nix-prefetch-url "${args[@]}")"; then -echo_file " \"$platform\" = {" +echo_file " \"version\" = \"$new_version\";" +url="${products_urls["${product}"]}" +echo_file " \"hashes\" = {" +for nix_platform in "${!platforms[@]}"; do + product_platform="${platforms[$nix_platform]}" + args=("${url//@platform@/$product_platform}") + # Get current hashes to skip derivations already in /nix/store to reuse cache when the version is the same + # e.g.: when adding a new product and running this script with FORCE=1 + if [[ "$current_version" == "$new_version" ]] && \ + previous_hash="$(nix-instantiate --eval "$hashes_nix" -A "hashes.$nix_platform.sha256" --json | jq -r)"; then + args+=("$previous_hash" "--type" "sha256") + else + info "Hash in '$product' for '$nix_platform' not found. Re-downloading it..." + fi + if hash="$(nix-prefetch-url "${args[@]}")"; then +echo_file " \"$nix_platform\" = {" echo_file " sha256 = \"$hash\";" -echo_file " url = \"${url//@platform@/${platform}}\";" +echo_file " url = \"${url//@platform@/${product_platform}}\";" echo_file " };" - else - info "Error while downloading '$product' for '$platform'. Skipping it..." - fi - done -echo_file " };" + else + info "Error while downloading '$product' for '$nix_platform'. Skipping it..." + fi done +echo_file " };" echo_file "}" -info "Updating graalvm-ce version..." -# update-source-version does not work here since it expects src attribute -sed "s|$current_version|$new_version|" -i default.nix - -info "Moving the temporary file to hashes.nix" +info "Moving the temporary file to '$hashes_nix'" mv "$tmpfile" "$hashes_nix" info "Done!" diff --git a/pkgs/development/compilers/graalvm/community-edition/wasm-installable-svm.nix b/pkgs/development/compilers/graalvm/community-edition/wasm-installable-svm.nix deleted file mode 100644 index 9a5bef7c1e35c..0000000000000 --- a/pkgs/development/compilers/graalvm/community-edition/wasm-installable-svm.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib -, stdenv -, graalvm-ce -, graalvmCEPackages -, javaVersion -, src -, version -}: - -graalvmCEPackages.buildGraalvmProduct rec { - inherit src javaVersion version; - product = "wasm-installable-svm"; - - # TODO: improve this test - graalvmPhases.installCheckPhase = '' - echo "Testing wasm" - $out/bin/wasm --help - ''; - - # Not supported in aarch64-darwin yet as GraalVM 22.3.1 release - meta.platforms = builtins.filter (p: p != "aarch64-darwin") graalvm-ce.meta.platforms; -} diff --git a/pkgs/development/compilers/intel-graphics-compiler/default.nix b/pkgs/development/compilers/intel-graphics-compiler/default.nix index d2093ccb6c68e..b2a5561dcf4dc 100644 --- a/pkgs/development/compilers/intel-graphics-compiler/default.nix +++ b/pkgs/development/compilers/intel-graphics-compiler/default.nix @@ -5,7 +5,7 @@ , runCommandLocal , bison , flex -, llvmPackages_11 +, llvmPackages_14 , opencl-clang , python3 , spirv-tools @@ -19,32 +19,29 @@ let vc_intrinsics_src = fetchFromGitHub { owner = "intel"; repo = "vc-intrinsics"; - rev = "v0.11.0"; - sha256 = "sha256-74JBW7qU8huSqwqgxNbvbGj1DlJJThgGhb3owBYmhvI="; + rev = "v0.13.0"; + hash = "sha256-A9G1PH0WGdxU2u/ODrou53qF9kvrmE0tJSl9cFIOus0="; }; - llvmPkgs = llvmPackages_11 // { - spirv-llvm-translator = spirv-llvm-translator.override { llvm = llvm; }; - } // lib.optionalAttrs buildWithPatches opencl-clang; - - inherit (llvmPackages_11) lld llvm; - inherit (llvmPkgs) clang libclang spirv-llvm-translator; + inherit (llvmPackages_14) lld llvm; + inherit (if buildWithPatches then opencl-clang else llvmPackages_14) clang libclang; + spirv-llvm-translator' = spirv-llvm-translator.override { inherit llvm; }; in stdenv.mkDerivation rec { pname = "intel-graphics-compiler"; - version = "1.0.12812.26"; + version = "1.0.14828.8"; src = fetchFromGitHub { owner = "intel"; repo = "intel-graphics-compiler"; rev = "igc-${version}"; - sha256 = "sha256-KpaDaDYVp40H7OscDGUpzEMgIOIk397ANi+8sDk4Wow="; + hash = "sha256-BGmZVBEw7XlgbQcWgRK+qbJS9U4Sm9G8g9m0GRUhmCI="; }; - nativeBuildInputs = [ cmake bison flex python3 ]; + nativeBuildInputs = [ bison cmake flex python3 ]; - buildInputs = [ spirv-headers spirv-tools spirv-llvm-translator llvm lld ]; + buildInputs = [ lld llvm spirv-headers spirv-llvm-translator' spirv-tools ]; strictDeps = true; @@ -52,15 +49,6 @@ stdenv.mkDerivation rec { doCheck = false; postPatch = '' - substituteInPlace external/SPIRV-Tools/CMakeLists.txt \ - --replace '$'''{SPIRV-Tools_DIR}../../..' \ - '${spirv-tools}' \ - --replace 'SPIRV-Headers_INCLUDE_DIR "/usr/include"' \ - 'SPIRV-Headers_INCLUDE_DIR "${spirv-headers}/include"' \ - --replace 'set_target_properties(SPIRV-Tools' \ - 'set_target_properties(SPIRV-Tools-shared' \ - --replace 'IGC_BUILD__PROJ__SPIRV-Tools SPIRV-Tools' \ - 'IGC_BUILD__PROJ__SPIRV-Tools SPIRV-Tools-shared' substituteInPlace IGC/AdaptorOCL/igc-opencl.pc.in \ --replace '/@CMAKE_INSTALL_INCLUDEDIR@' "/include" \ --replace '/@CMAKE_INSTALL_LIBDIR@' "/lib" @@ -71,24 +59,20 @@ stdenv.mkDerivation rec { prebuilds = runCommandLocal "igc-cclang-prebuilds" { } '' mkdir $out ln -s ${clang}/bin/clang $out/ - ln -s clang $out/clang-${lib.versions.major (lib.getVersion clang)} ln -s ${opencl-clang}/lib/* $out/ ln -s ${lib.getLib libclang}/lib/clang/${lib.getVersion clang}/include/opencl-c.h $out/ ln -s ${lib.getLib libclang}/lib/clang/${lib.getVersion clang}/include/opencl-c-base.h $out/ ''; cmakeFlags = [ - "-Wno-dev" "-DVC_INTRINSICS_SRC=${vc_intrinsics_src}" - "-DIGC_OPTION__SPIRV_TOOLS_MODE=Prebuilds" "-DCCLANG_BUILD_PREBUILDS=ON" "-DCCLANG_BUILD_PREBUILDS_DIR=${prebuilds}" - "-DIGC_PREFERRED_LLVM_VERSION=${lib.getVersion llvm}" + "-DIGC_OPTION__SPIRV_TOOLS_MODE=Prebuilds" + "-DIGC_OPTION__VC_INTRINSICS_MODE=Source" + "-Wno-dev" ]; - # causes redefinition of _FORTIFY_SOURCE - hardeningDisable = [ "fortify3" ]; - meta = with lib; { homepage = "https://github.com/intel/intel-graphics-compiler"; description = "LLVM-based compiler for OpenCL targeting Intel Gen graphics hardware"; diff --git a/pkgs/development/compilers/ldc/generic.nix b/pkgs/development/compilers/ldc/generic.nix index b124becf6348a..b68500f4ee591 100644 --- a/pkgs/development/compilers/ldc/generic.nix +++ b/pkgs/development/compilers/ldc/generic.nix @@ -68,7 +68,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DD_FLAGS=-d-version=TZDatabaseDir;-d-version=LibcurlPath;-J${pathConfig}" - "-DCMAKE_BUILD_TYPE=Release" ]; postConfigure = '' diff --git a/pkgs/development/compilers/ligo/default.nix b/pkgs/development/compilers/ligo/default.nix index 8257eab56aa23..ccba9ca3a1b23 100644 --- a/pkgs/development/compilers/ligo/default.nix +++ b/pkgs/development/compilers/ligo/default.nix @@ -15,31 +15,28 @@ ocamlPackages.buildDunePackage rec { pname = "ligo"; - version = "0.72.0"; + version = "1.0.0"; src = fetchFromGitLab { owner = "ligolang"; repo = "ligo"; rev = version; - sha256 = "sha256-DQ3TxxLxi8/W1+uBX7NEBIsVXBKnJBa6YNRBFleNrEA="; + sha256 = "sha256-tHIIA1JE7mzDIf2v9IEZt1pjVQEA89zjTsmqhzTn3Wc="; fetchSubmodules = true; }; postPatch = '' - substituteInPlace "vendors/tezos-ligo/src/lib_hacl/hacl.ml" \ + substituteInPlace "vendors/tezos-ligo/dune-project" \ --replace \ - "Hacl.NaCl.Noalloc.Easy.secretbox ~pt:msg ~n:nonce ~key ~ct:cmsg" \ - "Hacl.NaCl.Noalloc.Easy.secretbox ~pt:msg ~n:nonce ~key ~ct:cmsg ()" \ + "(using ctypes 0.1)" \ + "(using ctypes 0.3)" \ --replace \ - "Hacl.NaCl.Noalloc.Easy.box_afternm ~pt:msg ~n:nonce ~ck:k ~ct:cmsg" \ - "Hacl.NaCl.Noalloc.Easy.box_afternm ~pt:msg ~n:nonce ~ck:k ~ct:cmsg ()" + "(lang dune 3.0)" \ + "(lang dune 3.7)" - substituteInPlace "vendors/tezos-ligo/src/lib_crypto/crypto_box.ml" \ + substituteInPlace "src/coq/dune" \ --replace \ - "secretbox_open ~key ~nonce ~cmsg ~msg" \ - "secretbox_open ~key ~nonce ~cmsg ~msg ()" \ - --replace \ - "Box.box_open ~k ~nonce ~cmsg ~msg" \ - "Box.box_open ~k ~nonce ~cmsg ~msg ()" + "(name ligo_coq)" \ + "(name ligo_coq)(mode vo)" ''; # The build picks this up for ligo --version @@ -48,8 +45,6 @@ ocamlPackages.buildDunePackage rec { # This is a hack to work around the hack used in the dune files OPAM_SWITCH_PREFIX = "${tezos-rust-libs}"; - duneVersion = "3"; - strictDeps = true; nativeBuildInputs = [ @@ -93,6 +88,8 @@ ocamlPackages.buildDunePackage rec { parse-argv hacl-star prometheus + lwt_ppx + msgpck # lsp linol linol-lwt diff --git a/pkgs/development/compilers/llvm/10/llvm/default.nix b/pkgs/development/compilers/llvm/10/llvm/default.nix index 6f8ef0b575127..c4e6f2827e82b 100644 --- a/pkgs/development/compilers/llvm/10/llvm/default.nix +++ b/pkgs/development/compilers/llvm/10/llvm/default.nix @@ -204,6 +204,8 @@ in stdenv.mkDerivation (rec { ln -sv $PWD/lib $out ''; + cmakeBuildType = if debugVersion then "Debug" else "Release"; + cmakeFlags = with stdenv; let # These flags influence llvm-config's BuildVariables.inc in addition to the # general build. We need to make sure these are also passed via @@ -219,7 +221,6 @@ in stdenv.mkDerivation (rec { "-DLLVM_LINK_LLVM_DYLIB=ON" ]; in flagsForLlvmConfig ++ [ - "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc "-DLLVM_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" "-DLLVM_ENABLE_FFI=ON" diff --git a/pkgs/development/compilers/llvm/11/llvm/default.nix b/pkgs/development/compilers/llvm/11/llvm/default.nix index a5078ef3b76d4..01e6483ad6408 100644 --- a/pkgs/development/compilers/llvm/11/llvm/default.nix +++ b/pkgs/development/compilers/llvm/11/llvm/default.nix @@ -212,6 +212,8 @@ in stdenv.mkDerivation (rec { # E.g. mesa.drivers use the build-id as a cache key (see #93946): LDFLAGS = optionalString (enableSharedLibraries && !stdenv.isDarwin) "-Wl,--build-id=sha1"; + cmakeBuildType = if debugVersion then "Debug" else "Release"; + cmakeFlags = with stdenv; let # These flags influence llvm-config's BuildVariables.inc in addition to the # general build. We need to make sure these are also passed via @@ -227,7 +229,6 @@ in stdenv.mkDerivation (rec { "-DLLVM_LINK_LLVM_DYLIB=ON" ]; in flagsForLlvmConfig ++ [ - "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc "-DLLVM_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" "-DLLVM_ENABLE_FFI=ON" diff --git a/pkgs/development/compilers/llvm/12/llvm/default.nix b/pkgs/development/compilers/llvm/12/llvm/default.nix index 3c724e07bd166..97d8f27672e3d 100644 --- a/pkgs/development/compilers/llvm/12/llvm/default.nix +++ b/pkgs/development/compilers/llvm/12/llvm/default.nix @@ -202,6 +202,8 @@ in stdenv.mkDerivation (rec { # E.g. mesa.drivers use the build-id as a cache key (see #93946): LDFLAGS = optionalString (enableSharedLibraries && !stdenv.isDarwin) "-Wl,--build-id=sha1"; + cmakeBuildType = if debugVersion then "Debug" else "Release"; + cmakeFlags = with stdenv; let # These flags influence llvm-config's BuildVariables.inc in addition to the # general build. We need to make sure these are also passed via @@ -217,7 +219,6 @@ in stdenv.mkDerivation (rec { "-DLLVM_LINK_LLVM_DYLIB=ON" ]; in flagsForLlvmConfig ++ [ - "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc "-DLLVM_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" "-DLLVM_ENABLE_FFI=ON" diff --git a/pkgs/development/compilers/llvm/13/llvm/default.nix b/pkgs/development/compilers/llvm/13/llvm/default.nix index 827e528581cfd..2a7c1c1867cb3 100644 --- a/pkgs/development/compilers/llvm/13/llvm/default.nix +++ b/pkgs/development/compilers/llvm/13/llvm/default.nix @@ -164,6 +164,8 @@ in stdenv.mkDerivation (rec { # E.g. mesa.drivers use the build-id as a cache key (see #93946): LDFLAGS = optionalString (enableSharedLibraries && !stdenv.isDarwin) "-Wl,--build-id=sha1"; + cmakeBuildType = if debugVersion then "Debug" else "Release"; + cmakeFlags = with stdenv; let # These flags influence llvm-config's BuildVariables.inc in addition to the # general build. We need to make sure these are also passed via @@ -179,7 +181,6 @@ in stdenv.mkDerivation (rec { "-DLLVM_LINK_LLVM_DYLIB=ON" ]; in flagsForLlvmConfig ++ [ - "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc "-DLLVM_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" "-DLLVM_ENABLE_FFI=ON" diff --git a/pkgs/development/compilers/llvm/14/llvm/default.nix b/pkgs/development/compilers/llvm/14/llvm/default.nix index 06b5499835273..081c84c04e06c 100644 --- a/pkgs/development/compilers/llvm/14/llvm/default.nix +++ b/pkgs/development/compilers/llvm/14/llvm/default.nix @@ -162,6 +162,8 @@ in stdenv.mkDerivation (rec { # E.g. mesa.drivers use the build-id as a cache key (see #93946): LDFLAGS = optionalString (enableSharedLibraries && !stdenv.isDarwin) "-Wl,--build-id=sha1"; + cmakeBuildType = if debugVersion then "Debug" else "Release"; + cmakeFlags = with stdenv; let # These flags influence llvm-config's BuildVariables.inc in addition to the # general build. We need to make sure these are also passed via @@ -177,7 +179,6 @@ in stdenv.mkDerivation (rec { "-DLLVM_LINK_LLVM_DYLIB=ON" ]; in flagsForLlvmConfig ++ [ - "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc "-DLLVM_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" "-DLLVM_ENABLE_FFI=ON" diff --git a/pkgs/development/compilers/llvm/15/llvm/default.nix b/pkgs/development/compilers/llvm/15/llvm/default.nix index 7742fc0a186cf..e6f339ff6d6d3 100644 --- a/pkgs/development/compilers/llvm/15/llvm/default.nix +++ b/pkgs/development/compilers/llvm/15/llvm/default.nix @@ -298,6 +298,8 @@ in stdenv.mkDerivation (rec { # E.g. mesa.drivers use the build-id as a cache key (see #93946): LDFLAGS = optionalString (enableSharedLibraries && !stdenv.isDarwin) "-Wl,--build-id=sha1"; + cmakeBuildType = if debugVersion then "Debug" else "Release"; + cmakeFlags = with stdenv; let # These flags influence llvm-config's BuildVariables.inc in addition to the # general build. We need to make sure these are also passed via @@ -313,7 +315,6 @@ in stdenv.mkDerivation (rec { "-DLLVM_LINK_LLVM_DYLIB=ON" ]; in flagsForLlvmConfig ++ [ - "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc "-DLLVM_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" "-DLLVM_ENABLE_FFI=ON" diff --git a/pkgs/development/compilers/llvm/16/llvm/default.nix b/pkgs/development/compilers/llvm/16/llvm/default.nix index 8e676f5ad46d6..c70f9d37a562c 100644 --- a/pkgs/development/compilers/llvm/16/llvm/default.nix +++ b/pkgs/development/compilers/llvm/16/llvm/default.nix @@ -286,6 +286,8 @@ in # E.g. mesa.drivers use the build-id as a cache key (see #93946): LDFLAGS = optionalString (enableSharedLibraries && !stdenv.isDarwin) "-Wl,--build-id=sha1"; + cmakeBuildType = if debugVersion then "Debug" else "Release"; + cmakeFlags = with stdenv; let # These flags influence llvm-config's BuildVariables.inc in addition to the # general build. We need to make sure these are also passed via @@ -301,7 +303,6 @@ in "-DLLVM_LINK_LLVM_DYLIB=ON" ]; in flagsForLlvmConfig ++ [ - "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc "-DLLVM_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" "-DLLVM_ENABLE_FFI=ON" diff --git a/pkgs/development/compilers/llvm/5/llvm/default.nix b/pkgs/development/compilers/llvm/5/llvm/default.nix index 219ae190e955b..74523490244ff 100644 --- a/pkgs/development/compilers/llvm/5/llvm/default.nix +++ b/pkgs/development/compilers/llvm/5/llvm/default.nix @@ -141,6 +141,8 @@ stdenv.mkDerivation (rec { ln -sv $PWD/lib $out ''; + cmakeBuildType = if debugVersion then "Debug" else "Release"; + cmakeFlags = with stdenv; let # These flags influence llvm-config's BuildVariables.inc in addition to the # general build. We need to make sure these are also passed via @@ -156,7 +158,6 @@ stdenv.mkDerivation (rec { "-DLLVM_LINK_LLVM_DYLIB=ON" ]; in flagsForLlvmConfig ++ [ - "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc "-DLLVM_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" "-DLLVM_ENABLE_FFI=ON" diff --git a/pkgs/development/compilers/llvm/6/llvm/default.nix b/pkgs/development/compilers/llvm/6/llvm/default.nix index 1c75660c20f52..72e43ba8d1faa 100644 --- a/pkgs/development/compilers/llvm/6/llvm/default.nix +++ b/pkgs/development/compilers/llvm/6/llvm/default.nix @@ -161,6 +161,8 @@ stdenv.mkDerivation (rec { ln -sv $PWD/lib $out ''; + cmakeBuildType = if debugVersion then "Debug" else "Release"; + cmakeFlags = with stdenv; let # These flags influence llvm-config's BuildVariables.inc in addition to the # general build. We need to make sure these are also passed via @@ -176,7 +178,6 @@ stdenv.mkDerivation (rec { "-DLLVM_LINK_LLVM_DYLIB=ON" ]; in flagsForLlvmConfig ++ [ - "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc "-DLLVM_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" "-DLLVM_ENABLE_FFI=ON" diff --git a/pkgs/development/compilers/llvm/7/llvm/default.nix b/pkgs/development/compilers/llvm/7/llvm/default.nix index 7bfaef7d00b0c..97ac428a7f550 100644 --- a/pkgs/development/compilers/llvm/7/llvm/default.nix +++ b/pkgs/development/compilers/llvm/7/llvm/default.nix @@ -179,6 +179,8 @@ in stdenv.mkDerivation (rec { ln -sv $PWD/lib $out ''; + cmakeBuildType = if debugVersion then "Debug" else "Release"; + cmakeFlags = with stdenv; let # These flags influence llvm-config's BuildVariables.inc in addition to the # general build. We need to make sure these are also passed via @@ -194,7 +196,6 @@ in stdenv.mkDerivation (rec { "-DLLVM_LINK_LLVM_DYLIB=ON" ]; in flagsForLlvmConfig ++ [ - "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc "-DLLVM_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" "-DLLVM_ENABLE_FFI=ON" diff --git a/pkgs/development/compilers/llvm/8/llvm/default.nix b/pkgs/development/compilers/llvm/8/llvm/default.nix index f95cefb9addd6..8a0fea85e260d 100644 --- a/pkgs/development/compilers/llvm/8/llvm/default.nix +++ b/pkgs/development/compilers/llvm/8/llvm/default.nix @@ -178,6 +178,8 @@ in stdenv.mkDerivation (rec { ln -sv $PWD/lib $out ''; + cmakeBuildType = if debugVersion then "Debug" else "Release"; + cmakeFlags = with stdenv; let # These flags influence llvm-config's BuildVariables.inc in addition to the # general build. We need to make sure these are also passed via @@ -193,7 +195,6 @@ in stdenv.mkDerivation (rec { "-DLLVM_LINK_LLVM_DYLIB=ON" ]; in flagsForLlvmConfig ++ [ - "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc "-DLLVM_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" "-DLLVM_ENABLE_FFI=ON" diff --git a/pkgs/development/compilers/llvm/9/llvm/default.nix b/pkgs/development/compilers/llvm/9/llvm/default.nix index b7259ac191503..526030d6b34d8 100644 --- a/pkgs/development/compilers/llvm/9/llvm/default.nix +++ b/pkgs/development/compilers/llvm/9/llvm/default.nix @@ -193,6 +193,8 @@ in stdenv.mkDerivation (rec { ln -sv $PWD/lib $out ''; + cmakeBuildType = if debugVersion then "Debug" else "Release"; + cmakeFlags = with stdenv; let # These flags influence llvm-config's BuildVariables.inc in addition to the # general build. We need to make sure these are also passed via @@ -208,7 +210,6 @@ in stdenv.mkDerivation (rec { "-DLLVM_LINK_LLVM_DYLIB=ON" ]; in flagsForLlvmConfig ++ [ - "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc "-DLLVM_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" "-DLLVM_ENABLE_FFI=ON" diff --git a/pkgs/development/compilers/llvm/git/llvm/default.nix b/pkgs/development/compilers/llvm/git/llvm/default.nix index 634cd78295334..66b0a7438cefc 100644 --- a/pkgs/development/compilers/llvm/git/llvm/default.nix +++ b/pkgs/development/compilers/llvm/git/llvm/default.nix @@ -283,6 +283,8 @@ in stdenv.mkDerivation (rec { # E.g. mesa.drivers use the build-id as a cache key (see #93946): LDFLAGS = optionalString (enableSharedLibraries && !stdenv.isDarwin) "-Wl,--build-id=sha1"; + cmakeBuildType = if debugVersion then "Debug" else "Release"; + cmakeFlags = with stdenv; let # These flags influence llvm-config's BuildVariables.inc in addition to the # general build. We need to make sure these are also passed via @@ -298,7 +300,6 @@ in stdenv.mkDerivation (rec { "-DLLVM_LINK_LLVM_DYLIB=ON" ]; in flagsForLlvmConfig ++ [ - "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc "-DLLVM_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" "-DLLVM_ENABLE_FFI=ON" diff --git a/pkgs/development/compilers/lobster/default.nix b/pkgs/development/compilers/lobster/default.nix index 357401aaf43b0..573712b6772bf 100644 --- a/pkgs/development/compilers/lobster/default.nix +++ b/pkgs/development/compilers/lobster/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "lobster"; - version = "2023.11"; + version = "2023.12"; src = fetchFromGitHub { owner = "aardappel"; repo = "lobster"; rev = "v${version}"; - sha256 = "sha256-c0EElDvoFzIZvYZpjWd9az+KUxDXTETOp89I/tRCrQ0="; + sha256 = "sha256-0hEcbLq8thlgMtCcWt8SR5XsNgQfNH4+qdE0cHfRveo="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/compilers/lunarml/default.nix b/pkgs/development/compilers/lunarml/default.nix index d520328443b1f..104b7ce688bc9 100644 --- a/pkgs/development/compilers/lunarml/default.nix +++ b/pkgs/development/compilers/lunarml/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation { pname = "lunarml"; - version = "unstable-2023-09-16"; + version = "unstable-2023-09-21"; src = fetchFromGitHub { owner = "minoki"; repo = "LunarML"; - rev = "0fe97ebed71d6aa24c9e80436d45af1b3ef6abd3"; - sha256 = "KSLQva4Lv+hZWrx2cMbLOj82ldodiGn/9j8ksB1FN+s="; + rev = "c6e23ae68149bda550ddb75c0df9f422aa379b3a"; + sha256 = "DY4gOCXfGV1OVdGXd6GGvbHlQdWWxMg5TZzkceeOu9o="; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/development/compilers/mercury/default.nix b/pkgs/development/compilers/mercury/default.nix index 573c18cd9284e..d2e15dc6fc233 100644 --- a/pkgs/development/compilers/mercury/default.nix +++ b/pkgs/development/compilers/mercury/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "mercury"; - version = "22.01.7"; + version = "22.01.8"; src = fetchurl { url = "https://dl.mercurylang.org/release/mercury-srcdist-${version}.tar.gz"; - sha256 = "sha256-PctyVKlV2cnHoBSAXjMTSPvWY7op9D6kIMypYDRgvGw="; + sha256 = "sha256-oJfozI7KAVLtlSfByvc+XJyD9q2h0xOiW4D+eQcvutg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/compilers/minimacy/default.nix b/pkgs/development/compilers/minimacy/default.nix index 7e14f9a91de4e..00b3db5ef06d2 100644 --- a/pkgs/development/compilers/minimacy/default.nix +++ b/pkgs/development/compilers/minimacy/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "minimacy"; - version = "1.1.0"; + version = "1.1.2"; src = fetchFromGitHub { owner = "ambermind"; repo = pname; rev = version; - hash = "sha256-VqcMdlptoMJEsPTny/E6ly7/xmHKcljIsSeZDzaA+ig="; + hash = "sha256-WBmpinMnGr7Tmf1jLhdq5DXdR+ohOY0CpOBJ6fewKFU="; }; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/development/compilers/mlkit/default.nix b/pkgs/development/compilers/mlkit/default.nix index c02aff4be2c0c..831c8182b910e 100644 --- a/pkgs/development/compilers/mlkit/default.nix +++ b/pkgs/development/compilers/mlkit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mlkit"; - version = "4.7.3"; + version = "4.7.4"; src = fetchFromGitHub { owner = "melsman"; repo = "mlkit"; rev = "v${version}"; - sha256 = "sha256-sJY2w1+hv5KrRunf6Dfwc+eY6X9HYghVyAlWLlHvv+E="; + sha256 = "sha256-ASWPINMxR5Rlly1C0yB3llfhju/dDW2HBbHSIF4ecR8="; }; nativeBuildInputs = [ autoreconfHook mlton ]; diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index f18671242130f..f0ffa4309f9fe 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -3,7 +3,7 @@ { lib, callPackage, buildPackages, stdenv, fetchurl, fetchgit, fetchFromGitHub , makeWrapper, openssl, pcre, readline, boehmgc, sqlite, Security, nim-unwrapped -, nim-unwrapped-2, nimble-unwrapped, nim }: +, nim-unwrapped-2, nim }: let parseCpu = platform: @@ -163,6 +163,7 @@ in { url = "https://nim-lang.org/download/nim-${version}.tar.xz"; hash = "sha256-vWEB2EADb7eOk6ad9s8/n9DCHNdUtpX/hKO0rdjtCvc="; }; + patches = [ ./NIM_CONFIG_DIR.patch # Override compiler configuration via an environmental variable @@ -172,48 +173,14 @@ in { ./extra-mangling.patch # Mangle store paths of modules to prevent runtime dependence. + + ./openssl.patch + # dlopen is widely used by Python, Ruby, Perl, ... what you're really telling me here is that your OS is fundamentally broken. That might be news for you, but it isn't for me. ]; }); - nimble-unwrapped = stdenv.mkDerivation rec { - pname = "nimble-unwrapped"; - version = "0.14.2"; - strictDeps = true; - - src = fetchFromGitHub { - owner = "nim-lang"; - repo = "nimble"; - rev = "v${version}"; - hash = "sha256-8b5yKvEl7c7wA/8cpdaN2CSvawQJzuRce6mULj3z/mI="; - }; - - depsBuildBuild = [ nim-unwrapped ]; - buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; - - nimFlags = [ "--cpu:${nimHost.cpu}" "--os:${nimHost.os}" "-d:release" ]; - - buildPhase = '' - runHook preBuild - HOME=$NIX_BUILD_TOP nim c $nimFlags src/nimble - runHook postBuild - ''; - - installPhase = '' - runHook preBuild - install -Dt $out/bin src/nimble - runHook postBuild - ''; - - meta = with lib; { - description = "Package manager for the Nim programming language"; - homepage = "https://github.com/nim-lang/nimble"; - license = licenses.bsd3; - maintainers = with maintainers; [ ehmry ]; - mainProgram = "nimble"; - }; - }; } // (let - wrapNim = { nim', nimble', patches }: + wrapNim = { nim', patches }: let targetPlatformConfig = stdenv.targetPlatform.config; self = stdenv.mkDerivation (finalAttrs: { @@ -328,20 +295,11 @@ in { $wrapperArgs ln -s $out/bin/${targetPlatformConfig}-testament $out/bin/testament - '' + lib.strings.optionalString (nimble' != null) '' - makeWrapper \ - ${nimble'}/bin/nimble $out/bin/${targetPlatformConfig}-nimble \ - --suffix PATH : $out/bin - ln -s $out/bin/${targetPlatformConfig}-nimble $out/bin/nimble - '' + '' runHook postInstall ''; - passthru = { - nim = nim'; - nimble = nimble'; - }; + passthru = { nim = nim'; }; meta = nim'.meta // { description = nim'.meta.description @@ -356,13 +314,12 @@ in { nim = wrapNim { nim' = buildPackages.nim-unwrapped; - nimble' = buildPackages.nimble-unwrapped; patches = [ ./nim.cfg.patch ]; }; nim2 = wrapNim { nim' = buildPackages.nim-unwrapped-2; - nimble' = null; patches = [ ./nim2.cfg.patch ]; }; + }) diff --git a/pkgs/development/compilers/nim/openssl.patch b/pkgs/development/compilers/nim/openssl.patch new file mode 100644 index 0000000000000..8cbc2a4cf26e1 --- /dev/null +++ b/pkgs/development/compilers/nim/openssl.patch @@ -0,0 +1,458 @@ +commit 9d7d15533d52971601b738335c40a4f01353c369 +Author: Emery Hemingway <ehmry@posteo.net> +Date: 2023-09-30 11:11:05 +0100 + + Do not load openssl with dlopen + +diff --git a/lib/wrappers/openssl.nim b/lib/wrappers/openssl.nim +index e659746ee..dfb2d3cf2 100644 +--- a/lib/wrappers/openssl.nim ++++ b/lib/wrappers/openssl.nim +@@ -105,8 +105,11 @@ else: + + import dynlib + +-{.pragma: lcrypto, cdecl, dynlib: DLLUtilName, importc.} +-{.pragma: lssl, cdecl, dynlib: DLLSSLName, importc.} ++{.passL: "-lcrypto".} ++{.passL: "-lssl".} ++ ++{.pragma: lcrypto, cdecl, importc.} ++{.pragma: lssl, cdecl, importc.} + + type + SslStruct {.final, pure.} = object +@@ -274,7 +277,7 @@ const + BIO_C_DO_STATE_MACHINE = 101 + BIO_C_GET_SSL = 110 + +-proc TLSv1_method*(): PSSL_METHOD{.cdecl, dynlib: DLLSSLName, importc.} ++proc TLSv1_method*(): PSSL_METHOD{.cdecl, importc.} + + # TLS_method(), TLS_server_method(), TLS_client_method() are introduced in 1.1.0 + # and support SSLv3, TLSv1, TLSv1.1 and TLSv1.2 +@@ -286,26 +289,26 @@ when useStaticLink: + # Static linking + + when defined(openssl10): +- proc SSL_library_init*(): cint {.cdecl, dynlib: DLLSSLName, importc, discardable.} +- proc SSL_load_error_strings*() {.cdecl, dynlib: DLLSSLName, importc.} +- proc SSLv23_method*(): PSSL_METHOD {.cdecl, dynlib: DLLSSLName, importc.} +- proc SSLeay(): culong {.cdecl, dynlib: DLLUtilName, importc.} ++ proc SSL_library_init*(): cint {.cdecl, importc, discardable.} ++ proc SSL_load_error_strings*() {.cdecl, importc.} ++ proc SSLv23_method*(): PSSL_METHOD {.cdecl, importc.} ++ proc SSLeay(): culong {.cdecl, importc.} + + proc getOpenSSLVersion*(): culong = + SSLeay() + +- proc ERR_load_BIO_strings*() {.cdecl, dynlib: DLLUtilName, importc.} ++ proc ERR_load_BIO_strings*() {.cdecl, gimportc.} + else: +- proc OPENSSL_init_ssl*(opts: uint64, settings: uint8): cint {.cdecl, dynlib: DLLSSLName, importc, discardable.} ++ proc OPENSSL_init_ssl*(opts: uint64, settings: uint8): cint {.cdecl, gimportc, discardable.} + proc SSL_library_init*(): cint {.discardable.} = + ## Initialize SSL using OPENSSL_init_ssl for OpenSSL >= 1.1.0 + return OPENSSL_init_ssl(0.uint64, 0.uint8) + +- proc TLS_method*(): PSSL_METHOD {.cdecl, dynlib: DLLSSLName, importc.} ++ proc TLS_method*(): PSSL_METHOD {.cdecl, gimportc.} + proc SSLv23_method*(): PSSL_METHOD = + TLS_method() + +- proc OpenSSL_version_num(): culong {.cdecl, dynlib: DLLUtilName, importc.} ++ proc OpenSSL_version_num(): culong {.cdecl, gimportc.} + + proc getOpenSSLVersion*(): culong = + ## Return OpenSSL version as unsigned long +@@ -321,19 +324,19 @@ when useStaticLink: + discard + + when defined(libressl) or defined(openssl10): +- proc SSL_state(ssl: SslPtr): cint {.cdecl, dynlib: DLLSSLName, importc.} ++ proc SSL_state(ssl: SslPtr): cint {.cdecl, gimportc.} + proc SSL_in_init*(ssl: SslPtr): cint {.inline.} = + SSL_state(ssl) and SSL_ST_INIT + else: +- proc SSL_in_init*(ssl: SslPtr): cint {.cdecl, dynlib: DLLSSLName, importc.} +- proc SSL_CTX_set_ciphersuites*(ctx: SslCtx, str: cstring): cint {.cdecl, dynlib: DLLSSLName, importc.} ++ proc SSL_in_init*(ssl: SslPtr): cint {.cdecl, gimportc.} ++ proc SSL_CTX_set_ciphersuites*(ctx: SslCtx, str: cstring): cint {.cdecl, importc.} + + template OpenSSL_add_all_algorithms*() = discard + +- proc SSLv23_client_method*(): PSSL_METHOD {.cdecl, dynlib: DLLSSLName, importc.} +- proc SSLv2_method*(): PSSL_METHOD {.cdecl, dynlib: DLLSSLName, importc.} +- proc SSLv3_method*(): PSSL_METHOD {.cdecl, dynlib: DLLSSLName, importc.} +- proc CRYPTO_set_mem_functions(a,b,c: pointer){.cdecl, dynlib: DLLUtilName, importc.} ++ proc SSLv23_client_method*(): PSSL_METHOD {.cdecl, importc.} ++ proc SSLv2_method*(): PSSL_METHOD {.cdecl, importc.} ++ proc SSLv3_method*(): PSSL_METHOD {.cdecl, importc.} ++ proc CRYPTO_set_mem_functions(a,b,c: pointer){.cdecl, gimportc.} + + else: + # Here we're trying to stay compatible between openssl versions. Some +@@ -472,54 +475,52 @@ else: + theProc = cast[typeof(theProc)](sslSymThrows("SSL_CTX_set_ciphersuites")) + result = theProc(ctx, str) + +-proc SSL_new*(context: SslCtx): SslPtr{.cdecl, dynlib: DLLSSLName, importc.} +-proc SSL_free*(ssl: SslPtr){.cdecl, dynlib: DLLSSLName, importc.} +-proc SSL_get_SSL_CTX*(ssl: SslPtr): SslCtx {.cdecl, dynlib: DLLSSLName, importc.} +-proc SSL_set_SSL_CTX*(ssl: SslPtr, ctx: SslCtx): SslCtx {.cdecl, dynlib: DLLSSLName, importc.} +-proc SSL_CTX_set_session_id_context*(context: SslCtx, sid_ctx: string, sid_ctx_len: int){.cdecl, dynlib: DLLSSLName, importc.} +-proc SSL_get0_verified_chain*(ssl: SslPtr): PSTACK {.cdecl, dynlib: DLLSSLName, ++proc SSL_new*(context: SslCtx): SslPtr{.cdecl, importc.} ++proc SSL_free*(ssl: SslPtr){.cdecl, importc.} ++proc SSL_get_SSL_CTX*(ssl: SslPtr): SslCtx {.cdecl, importc.} ++proc SSL_set_SSL_CTX*(ssl: SslPtr, ctx: SslCtx): SslCtx {.cdecl, importc.} ++proc SSL_CTX_set_session_id_context*(context: SslCtx, sid_ctx: string, sid_ctx_len: int){.cdecl, importc.} ++proc SSL_get0_verified_chain*(ssl: SslPtr): PSTACK {.cdecl, + importc.} + proc SSL_CTX_new*(meth: PSSL_METHOD): SslCtx{.cdecl, +- dynlib: DLLSSLName, importc.} ++ importc.} + proc SSL_CTX_load_verify_locations*(ctx: SslCtx, CAfile: cstring, +- CApath: cstring): cint{.cdecl, dynlib: DLLSSLName, importc.} +-proc SSL_CTX_free*(arg0: SslCtx){.cdecl, dynlib: DLLSSLName, importc.} +-proc SSL_CTX_set_verify*(s: SslCtx, mode: int, cb: proc (a: int, b: pointer): int {.cdecl.}){.cdecl, dynlib: DLLSSLName, importc.} ++ CApath: cstring): cint{.cdecl, importc.} ++proc SSL_CTX_free*(arg0: SslCtx){.cdecl, importc.} ++proc SSL_CTX_set_verify*(s: SslCtx, mode: int, cb: proc (a: int, b: pointer): int {.cdecl.}){.cdecl, importc.} + proc SSL_get_verify_result*(ssl: SslPtr): int{.cdecl, +- dynlib: DLLSSLName, importc.} ++ importc.} + +-proc SSL_CTX_set_cipher_list*(s: SslCtx, ciphers: cstring): cint{.cdecl, dynlib: DLLSSLName, importc.} +-proc SSL_CTX_use_certificate_file*(ctx: SslCtx, filename: cstring, typ: cint): cint{. +- stdcall, dynlib: DLLSSLName, importc.} +-proc SSL_CTX_use_certificate_chain_file*(ctx: SslCtx, filename: cstring): cint{. +- stdcall, dynlib: DLLSSLName, importc.} ++proc SSL_CTX_set_cipher_list*(s: SslCtx, ciphers: cstring): cint{.cdecl, importc.} ++proc SSL_CTX_use_certificate_file*(ctx: SslCtx, filename: cstring, typ: cint): cint{.stdcall, importc.} ++proc SSL_CTX_use_certificate_chain_file*(ctx: SslCtx, filename: cstring): cint{.stdcall, importc.} + proc SSL_CTX_use_PrivateKey_file*(ctx: SslCtx, +- filename: cstring, typ: cint): cint{.cdecl, dynlib: DLLSSLName, importc.} +-proc SSL_CTX_check_private_key*(ctx: SslCtx): cint{.cdecl, dynlib: DLLSSLName, ++ filename: cstring, typ: cint): cint{.cdecl, importc.} ++proc SSL_CTX_check_private_key*(ctx: SslCtx): cint{.cdecl, + importc.} + +-proc SSL_CTX_get_ex_new_index*(argl: clong, argp: pointer, new_func: pointer, dup_func: pointer, free_func: pointer): cint {.cdecl, dynlib: DLLSSLName, importc.} +-proc SSL_CTX_set_ex_data*(ssl: SslCtx, idx: cint, arg: pointer): cint {.cdecl, dynlib: DLLSSLName, importc.} +-proc SSL_CTX_get_ex_data*(ssl: SslCtx, idx: cint): pointer {.cdecl, dynlib: DLLSSLName, importc.} ++proc SSL_CTX_get_ex_new_index*(argl: clong, argp: pointer, new_func: pointer, dup_func: pointer, free_func: pointer): cint {.cdecl, importc.} ++proc SSL_CTX_set_ex_data*(ssl: SslCtx, idx: cint, arg: pointer): cint {.cdecl, importc.} ++proc SSL_CTX_get_ex_data*(ssl: SslCtx, idx: cint): pointer {.cdecl, importc.} + +-proc SSL_set_fd*(ssl: SslPtr, fd: SocketHandle): cint{.cdecl, dynlib: DLLSSLName, importc.} ++proc SSL_set_fd*(ssl: SslPtr, fd: SocketHandle): cint{.cdecl, importc.} + +-proc SSL_shutdown*(ssl: SslPtr): cint{.cdecl, dynlib: DLLSSLName, importc.} +-proc SSL_set_shutdown*(ssl: SslPtr, mode: cint) {.cdecl, dynlib: DLLSSLName, importc: "SSL_set_shutdown".} +-proc SSL_get_shutdown*(ssl: SslPtr): cint {.cdecl, dynlib: DLLSSLName, importc: "SSL_get_shutdown".} +-proc SSL_connect*(ssl: SslPtr): cint{.cdecl, dynlib: DLLSSLName, importc.} +-proc SSL_read*(ssl: SslPtr, buf: pointer, num: int): cint{.cdecl, dynlib: DLLSSLName, importc.} +-proc SSL_write*(ssl: SslPtr, buf: cstring, num: int): cint{.cdecl, dynlib: DLLSSLName, importc.} +-proc SSL_get_error*(s: SslPtr, ret_code: cint): cint{.cdecl, dynlib: DLLSSLName, importc.} +-proc SSL_accept*(ssl: SslPtr): cint{.cdecl, dynlib: DLLSSLName, importc.} +-proc SSL_pending*(ssl: SslPtr): cint{.cdecl, dynlib: DLLSSLName, importc.} ++proc SSL_shutdown*(ssl: SslPtr): cint{.cdecl, importc.} ++proc SSL_set_shutdown*(ssl: SslPtr, mode: cint) {.cdecl, importc: "SSL_set_shutdown".} ++proc SSL_get_shutdown*(ssl: SslPtr): cint {.cdecl, importc: "SSL_get_shutdown".} ++proc SSL_connect*(ssl: SslPtr): cint{.cdecl, importc.} ++proc SSL_read*(ssl: SslPtr, buf: pointer, num: int): cint{.cdecl, importc.} ++proc SSL_write*(ssl: SslPtr, buf: cstring, num: int): cint{.cdecl, importc.} ++proc SSL_get_error*(s: SslPtr, ret_code: cint): cint{.cdecl, importc.} ++proc SSL_accept*(ssl: SslPtr): cint{.cdecl, importc.} ++proc SSL_pending*(ssl: SslPtr): cint{.cdecl, importc.} + + proc BIO_new_mem_buf*(data: pointer, len: cint): BIO{.cdecl, +- dynlib: DLLUtilName, importc.} ++ importc.} + proc BIO_new_ssl_connect*(ctx: SslCtx): BIO{.cdecl, +- dynlib: DLLSSLName, importc.} ++ importc.} + proc BIO_ctrl*(bio: BIO, cmd: cint, larg: int, arg: cstring): int{.cdecl, +- dynlib: DLLUtilName, importc.} ++ importc.} + proc BIO_get_ssl*(bio: BIO, ssl: ptr SslPtr): int = + return BIO_ctrl(bio, BIO_C_GET_SSL, 0, cast[cstring](ssl)) + proc BIO_set_conn_hostname*(bio: BIO, name: cstring): int = +@@ -529,30 +530,30 @@ proc BIO_do_handshake*(bio: BIO): int = + proc BIO_do_connect*(bio: BIO): int = + return BIO_do_handshake(bio) + +-proc BIO_read*(b: BIO, data: cstring, length: cint): cint{.cdecl, dynlib: DLLUtilName, importc.} +-proc BIO_write*(b: BIO, data: cstring, length: cint): cint{.cdecl, dynlib: DLLUtilName, importc.} ++proc BIO_read*(b: BIO, data: cstring, length: cint): cint{.cdecl, importc.} ++proc BIO_write*(b: BIO, data: cstring, length: cint): cint{.cdecl, importc.} + +-proc BIO_free*(b: BIO): cint{.cdecl, dynlib: DLLUtilName, importc.} ++proc BIO_free*(b: BIO): cint{.cdecl, importc.} + +-proc ERR_print_errors_fp*(fp: File){.cdecl, dynlib: DLLUtilName, importc.} ++proc ERR_print_errors_fp*(fp: File){.cdecl, importc.} + + proc ERR_error_string*(e: culong, buf: cstring): cstring{.cdecl, +- dynlib: DLLUtilName, importc.} +-proc ERR_get_error*(): culong{.cdecl, dynlib: DLLUtilName, importc.} +-proc ERR_peek_last_error*(): culong{.cdecl, dynlib: DLLUtilName, importc.} ++ importc.} ++proc ERR_get_error*(): culong{.cdecl, importc.} ++proc ERR_peek_last_error*(): culong{.cdecl, importc.} + +-proc OPENSSL_config*(configName: cstring){.cdecl, dynlib: DLLUtilName, importc.} ++proc OPENSSL_config*(configName: cstring){.cdecl, importc.} + +-proc OPENSSL_sk_num*(stack: PSTACK): int {.cdecl, dynlib: DLLSSLName, importc.} ++proc OPENSSL_sk_num*(stack: PSTACK): int {.cdecl, importc.} + + proc OPENSSL_sk_value*(stack: PSTACK, index: int): pointer {.cdecl, +- dynlib: DLLSSLName, importc.} ++ importc.} + + proc d2i_X509*(px: ptr PX509, i: ptr ptr uint8, len: cint): PX509 {.cdecl, +- dynlib: DLLUtilName, importc.} ++ importc.} + + proc i2d_X509*(cert: PX509; o: ptr ptr uint8): cint {.cdecl, +- dynlib: DLLUtilName, importc.} ++ importc.} + + proc d2i_X509*(b: string): PX509 = + ## decode DER/BER bytestring into X.509 certificate struct +@@ -591,24 +592,21 @@ else: + proc CRYPTO_malloc_init*() = + discard + +-proc SSL_CTX_ctrl*(ctx: SslCtx, cmd: cint, larg: clong, parg: pointer): clong{. +- cdecl, dynlib: DLLSSLName, importc.} ++proc SSL_CTX_ctrl*(ctx: SslCtx, cmd: cint, larg: clong, parg: pointer): clong{.cdecl, importc.} + +-proc SSL_CTX_callback_ctrl(ctx: SslCtx, typ: cint, fp: PFunction): int{. +- cdecl, dynlib: DLLSSLName, importc.} ++proc SSL_CTX_callback_ctrl(ctx: SslCtx, typ: cint, fp: PFunction): int{.cdecl, importc.} + + proc SSLCTXSetMode*(ctx: SslCtx, mode: int): int = + result = SSL_CTX_ctrl(ctx, SSL_CTRL_MODE, clong mode, nil) + +-proc SSL_ctrl*(ssl: SslPtr, cmd: cint, larg: int, parg: pointer): int{. +- cdecl, dynlib: DLLSSLName, importc.} ++proc SSL_ctrl*(ssl: SslPtr, cmd: cint, larg: int, parg: pointer): int{.cdecl, importc.} + + proc SSL_set_tlsext_host_name*(ssl: SslPtr, name: cstring): int = + ## Set the SNI server name extension to be used in a client hello. + ## Returns 1 if SNI was set, 0 if current SSL configuration doesn't support SNI. + result = SSL_ctrl(ssl, SSL_CTRL_SET_TLSEXT_HOSTNAME, TLSEXT_NAMETYPE_host_name, name) + +-proc SSL_get_servername*(ssl: SslPtr, typ: cint = TLSEXT_NAMETYPE_host_name): cstring {.cdecl, dynlib: DLLSSLName, importc.} ++proc SSL_get_servername*(ssl: SslPtr, typ: cint = TLSEXT_NAMETYPE_host_name): cstring {.cdecl, importc.} + ## Retrieve the server name requested in the client hello. This can be used + ## in the callback set in `SSL_CTX_set_tlsext_servername_callback` to + ## implement virtual hosting. May return `nil`. +@@ -635,16 +633,16 @@ type + PskServerCallback* = proc (ssl: SslPtr; + identity: cstring; psk: ptr uint8; max_psk_len: cint): cuint {.cdecl.} + +-proc SSL_CTX_set_psk_client_callback*(ctx: SslCtx; callback: PskClientCallback) {.cdecl, dynlib: DLLSSLName, importc.} ++proc SSL_CTX_set_psk_client_callback*(ctx: SslCtx; callback: PskClientCallback) {.cdecl, importc.} + ## Set callback called when OpenSSL needs PSK (for client). + +-proc SSL_CTX_set_psk_server_callback*(ctx: SslCtx; callback: PskServerCallback) {.cdecl, dynlib: DLLSSLName, importc.} ++proc SSL_CTX_set_psk_server_callback*(ctx: SslCtx; callback: PskServerCallback) {.cdecl, importc.} + ## Set callback called when OpenSSL needs PSK (for server). + +-proc SSL_CTX_use_psk_identity_hint*(ctx: SslCtx; hint: cstring): cint {.cdecl, dynlib: DLLSSLName, importc.} ++proc SSL_CTX_use_psk_identity_hint*(ctx: SslCtx; hint: cstring): cint {.cdecl, importc.} + ## Set PSK identity hint to use. + +-proc SSL_get_psk_identity*(ssl: SslPtr): cstring {.cdecl, dynlib: DLLSSLName, importc.} ++proc SSL_get_psk_identity*(ssl: SslPtr): cstring {.cdecl, importc.} + ## Get PSK identity. + + proc SSL_CTX_set_ecdh_auto*(ctx: SslCtx, onoff: cint): cint {.inline.} = +@@ -656,62 +654,62 @@ proc SSL_CTX_set_ecdh_auto*(ctx: SslCtx, onoff: cint): cint {.inline.} = + else: + result = 1 + +-proc bioNew*(b: PBIO_METHOD): BIO{.cdecl, dynlib: DLLUtilName, importc: "BIO_new".} +-proc bioFreeAll*(b: BIO){.cdecl, dynlib: DLLUtilName, importc: "BIO_free_all".} +-proc bioSMem*(): PBIO_METHOD{.cdecl, dynlib: DLLUtilName, importc: "BIO_s_mem".} +-proc bioCtrlPending*(b: BIO): cint{.cdecl, dynlib: DLLUtilName, importc: "BIO_ctrl_pending".} ++proc bioNew*(b: PBIO_METHOD): BIO{.cdecl, importc: "BIO_new".} ++proc bioFreeAll*(b: BIO){.cdecl, importc: "BIO_free_all".} ++proc bioSMem*(): PBIO_METHOD{.cdecl, importc: "BIO_s_mem".} ++proc bioCtrlPending*(b: BIO): cint{.cdecl, importc: "BIO_ctrl_pending".} + proc bioRead*(b: BIO, Buf: cstring, length: cint): cint{.cdecl, +- dynlib: DLLUtilName, importc: "BIO_read".} ++ importc: "BIO_read".} + proc bioWrite*(b: BIO, Buf: cstring, length: cint): cint{.cdecl, +- dynlib: DLLUtilName, importc: "BIO_write".} ++ importc: "BIO_write".} + + proc sslSetConnectState*(s: SslPtr) {.cdecl, +- dynlib: DLLSSLName, importc: "SSL_set_connect_state".} ++ importc: "SSL_set_connect_state".} + proc sslSetAcceptState*(s: SslPtr) {.cdecl, +- dynlib: DLLSSLName, importc: "SSL_set_accept_state".} ++ importc: "SSL_set_accept_state".} + + proc sslRead*(ssl: SslPtr, buf: cstring, num: cint): cint{.cdecl, +- dynlib: DLLSSLName, importc: "SSL_read".} ++ importc: "SSL_read".} + proc sslPeek*(ssl: SslPtr, buf: cstring, num: cint): cint{.cdecl, +- dynlib: DLLSSLName, importc: "SSL_peek".} ++ importc: "SSL_peek".} + proc sslWrite*(ssl: SslPtr, buf: cstring, num: cint): cint{.cdecl, +- dynlib: DLLSSLName, importc: "SSL_write".} ++ importc: "SSL_write".} + + proc sslSetBio*(ssl: SslPtr, rbio, wbio: BIO) {.cdecl, +- dynlib: DLLSSLName, importc: "SSL_set_bio".} ++ importc: "SSL_set_bio".} + + proc sslDoHandshake*(ssl: SslPtr): cint {.cdecl, +- dynlib: DLLSSLName, importc: "SSL_do_handshake".} ++ importc: "SSL_do_handshake".} + + +-proc ErrClearError*(){.cdecl, dynlib: DLLUtilName, importc: "ERR_clear_error".} +-proc ErrFreeStrings*(){.cdecl, dynlib: DLLUtilName, importc: "ERR_free_strings".} +-proc ErrRemoveState*(pid: cint){.cdecl, dynlib: DLLUtilName, importc: "ERR_remove_state".} ++proc ErrClearError*(){.cdecl, importc: "ERR_clear_error".} ++proc ErrFreeStrings*(){.cdecl, importc: "ERR_free_strings".} ++proc ErrRemoveState*(pid: cint){.cdecl, importc: "ERR_remove_state".} + + proc PEM_read_bio_RSA_PUBKEY*(bp: BIO, x: ptr PRSA, pw: pem_password_cb, u: pointer): PRSA {.cdecl, +- dynlib: DLLUtilName, importc.} ++ importc.} + proc PEM_read_RSA_PUBKEY*(fp: pointer; x: ptr PRSA; cb: pem_password_cb, u: pointer): PRSA {.cdecl, +- dynlib: DLLUtilName, importc.} ++ importc.} + proc RSA_verify*(kind: cint, origMsg: pointer, origMsgLen: cuint, signature: pointer, +- signatureLen: cuint, rsa: PRSA): cint {.cdecl, dynlib: DLLUtilName, importc.} ++ signatureLen: cuint, rsa: PRSA): cint {.cdecl, importc.} + proc PEM_read_RSAPrivateKey*(fp: pointer; x: ptr PRSA; cb: pem_password_cb, u: pointer): PRSA {.cdecl, +- dynlib: DLLUtilName, importc.} ++ importc.} + proc PEM_read_RSAPublicKey*(fp: pointer; x: ptr PRSA; cb: pem_password_cb, u: pointer): PRSA {.cdecl, +- dynlib: DLLUtilName, importc.} ++ importc.} + proc PEM_read_bio_RSAPublicKey*(bp: BIO, x: ptr PRSA, cb: pem_password_cb, u: pointer): PRSA {.cdecl, +- dynlib: DLLUtilName, importc.} ++ importc.} + proc PEM_read_bio_RSAPrivateKey*(bp: BIO, x: ptr PRSA, cb: pem_password_cb, u: pointer): PRSA {.cdecl, +- dynlib: DLLUtilName, importc.} ++ importc.} + proc RSA_private_encrypt*(flen: cint, fr: ptr uint8, to: ptr uint8, rsa: PRSA, padding: PaddingType): cint {.cdecl, +- dynlib: DLLUtilName, importc.} ++ importc.} + proc RSA_public_encrypt*(flen: cint, fr: ptr uint8, to: ptr uint8, rsa: PRSA, padding: PaddingType): cint {.cdecl, +- dynlib: DLLUtilName, importc.} ++ importc.} + proc RSA_private_decrypt*(flen: cint, fr: ptr uint8, to: ptr uint8, rsa: PRSA, padding: PaddingType): cint {.cdecl, +- dynlib: DLLUtilName, importc.} ++ importc.} + proc RSA_public_decrypt*(flen: cint, fr: ptr uint8, to: ptr uint8, rsa: PRSA, padding: PaddingType): cint {.cdecl, +- dynlib: DLLUtilName, importc.} +-proc RSA_free*(rsa: PRSA) {.cdecl, dynlib: DLLUtilName, importc.} +-proc RSA_size*(rsa: PRSA): cint {.cdecl, dynlib: DLLUtilName, importc.} ++ importc.} ++proc RSA_free*(rsa: PRSA) {.cdecl, importc.} ++proc RSA_size*(rsa: PRSA): cint {.cdecl, importc.} + + # sha types + proc EVP_md_null*(): EVP_MD {.lcrypto.} +@@ -753,9 +751,9 @@ when defined(macosx) or defined(windows): + proc EVP_MD_CTX_cleanup*(ctx: EVP_MD_CTX): cint {.lcrypto.} + else: + # some times you will need this instead: +- proc EVP_MD_CTX_create*(): EVP_MD_CTX {.cdecl, importc: "EVP_MD_CTX_new", dynlib: DLLUtilName.} +- proc EVP_MD_CTX_destroy*(ctx: EVP_MD_CTX) {.cdecl, importc: "EVP_MD_CTX_free", dynlib: DLLUtilName.} +- proc EVP_MD_CTX_cleanup*(ctx: EVP_MD_CTX): cint {.cdecl, importc: "EVP_MD_CTX_cleanup", dynlib: DLLUtilName.} ++ proc EVP_MD_CTX_create*(): EVP_MD_CTX {.cdecl, importc: "EVP_MD_CTX_new".} ++ proc EVP_MD_CTX_destroy*(ctx: EVP_MD_CTX) {.cdecl, importc: "EVP_MD_CTX_free".} ++ proc EVP_MD_CTX_cleanup*(ctx: EVP_MD_CTX): cint {.cdecl, importc: "EVP_MD_CTX_cleanup".} + + # <openssl/md5.h> + type +@@ -770,7 +768,7 @@ type + data: array[MD5_LBLOCK, MD5_LONG] + num: cuint + +-{.push callconv:cdecl, dynlib:DLLUtilName.} ++{.push callconv:cdecl.} + proc md5_Init*(c: var MD5_CTX): cint{.importc: "MD5_Init".} + proc md5_Update*(c: var MD5_CTX; data: pointer; len: csize_t): cint{.importc: "MD5_Update".} + proc md5_Final*(md: cstring; c: var MD5_CTX): cint{.importc: "MD5_Final".} +@@ -835,11 +833,11 @@ when not defined(nimDisableCertificateValidation) and not defined(windows): + # SSL_get_peer_certificate removed in 3.0 + # SSL_get1_peer_certificate added in 3.0 + when useOpenssl3: +- proc SSL_get1_peer_certificate*(ssl: SslCtx): PX509 {.cdecl, dynlib: DLLSSLName, importc.} ++ proc SSL_get1_peer_certificate*(ssl: SslCtx): PX509 {.cdecl, importc.} + proc SSL_get_peer_certificate*(ssl: SslCtx): PX509 = + SSL_get1_peer_certificate(ssl) + elif useStaticLink: +- proc SSL_get_peer_certificate*(ssl: SslCtx): PX509 {.cdecl, dynlib: DLLSSLName, importc.} ++ proc SSL_get_peer_certificate*(ssl: SslCtx): PX509 {.cdecl, importc.} + else: + proc SSL_get_peer_certificate*(ssl: SslCtx): PX509 = + let methodSym = sslSymNullable("SSL_get_peer_certificate", "SSL_get1_peer_certificate") +@@ -848,26 +846,24 @@ when not defined(nimDisableCertificateValidation) and not defined(windows): + let method2Proc = cast[proc(ssl: SslCtx): PX509 {.cdecl, gcsafe, raises: [].}](methodSym) + return method2Proc(ssl) + +- proc X509_get_subject_name*(a: PX509): PX509_NAME{.cdecl, dynlib: DLLSSLName, importc.} ++ proc X509_get_subject_name*(a: PX509): PX509_NAME{.cdecl, importc.} + +- proc X509_get_issuer_name*(a: PX509): PX509_NAME{.cdecl, dynlib: DLLUtilName, importc.} ++ proc X509_get_issuer_name*(a: PX509): PX509_NAME{.cdecl, importc.} + +- proc X509_NAME_oneline*(a: PX509_NAME, buf: cstring, size: cint): cstring {. +- cdecl, dynlib:DLLSSLName, importc.} ++ proc X509_NAME_oneline*(a: PX509_NAME, buf: cstring, size: cint): cstring {.cdecl, importc.} + +- proc X509_NAME_get_text_by_NID*(subject:cstring, NID: cint, buf: cstring, size: cint): cint{. +- cdecl, dynlib:DLLSSLName, importc.} ++ proc X509_NAME_get_text_by_NID*(subject:cstring, NID: cint, buf: cstring, size: cint): cint{.cdecl, importc.} + +- proc X509_check_host*(cert: PX509, name: cstring, namelen: cint, flags:cuint, peername: cstring): cint {.cdecl, dynlib: DLLSSLName, importc.} ++ proc X509_check_host*(cert: PX509, name: cstring, namelen: cint, flags:cuint, peername: cstring): cint {.cdecl, importc.} + +- proc X509_free*(cert: PX509) {.cdecl, dynlib: DLLSSLName, importc.} ++ proc X509_free*(cert: PX509) {.cdecl, importc.} + + # Certificates store + + type PX509_STORE* = SslPtr + type PX509_OBJECT* = SslPtr + +- {.push callconv:cdecl, dynlib:DLLUtilName, importc.} ++ {.push callconv:cdecl, importc.} + + proc X509_OBJECT_new*(): PX509_OBJECT + proc X509_OBJECT_free*(a: PX509_OBJECT) +@@ -897,12 +893,12 @@ when not defined(nimDisableCertificateValidation) and not defined(windows): + # Available in at least OpenSSL 1.1.1 and later, not sure if earlier + # --Iced Quinn + +-proc SSL_CTX_set_alpn_protos*(ctx: SslCtx; protos: cstring; protos_len: cuint): cint {.cdecl, dynlib: DLLSSLName, importc.} +-proc SSL_set_alpn_protos*(ssl: SslPtr; protos: cstring; protos_len: cuint): cint {.cdecl, dynlib: DLLSSLName, importc.} +-proc SSL_CTX_set_alpn_select_cb*(ctx: SslCtx; cb: proc(ssl: SslPtr; out_proto: ptr cstring; outlen: cstring; in_proto: cstring; inlen: cuint; arg: pointer): cint {.cdecl.}; arg: pointer): cint {.cdecl, dynlib: DLLSSLName, importc.} +-proc SSL_get0_alpn_selected*(ssl: SslPtr; data: ptr cstring; len: ptr cuint) {.cdecl, dynlib: DLLSSLName, importc.} +-proc SSL_CTX_set_next_protos_advertised_cb*(ctx: SslCtx; cb: proc(ssl: SslPtr; out_proto: ptr cstring; outlen: ptr cuint; arg: pointer): cint {.cdecl.}; arg: pointer) {.cdecl, dynlib: DLLSSLName, importc.} +-proc SSL_CTX_set_next_proto_select_cb*(ctx: SslCtx; cb: proc(s: SslPtr; out_proto: cstring; outlen: cstring; in_proto: cstring; inlen: cuint; arg: pointer): cint {.cdecl.}; arg: pointer) {.cdecl, dynlib: DLLSSLName, importc.} +-proc SSL_select_next_proto*(out_proto: ptr cstring; outlen: cstring; server: cstring; server_len: cuint; client: cstring; client_len: cuint): cint {.cdecl, dynlib: DLLSSLName, importc.} +-proc SSL_get0_next_proto_negotiated*(s: SslPtr; data: ptr cstring; len: ptr cuint) {.cdecl, dynlib: DLLSSLName, importc.} ++proc SSL_CTX_set_alpn_protos*(ctx: SslCtx; protos: cstring; protos_len: cuint): cint {.cdecl, importc.} ++proc SSL_set_alpn_protos*(ssl: SslPtr; protos: cstring; protos_len: cuint): cint {.cdecl, importc.} ++proc SSL_CTX_set_alpn_select_cb*(ctx: SslCtx; cb: proc(ssl: SslPtr; out_proto: ptr cstring; outlen: cstring; in_proto: cstring; inlen: cuint; arg: pointer): cint {.cdecl.}; arg: pointer): cint {.cdecl, importc.} ++proc SSL_get0_alpn_selected*(ssl: SslPtr; data: ptr cstring; len: ptr cuint) {.cdecl, importc.} ++proc SSL_CTX_set_next_protos_advertised_cb*(ctx: SslCtx; cb: proc(ssl: SslPtr; out_proto: ptr cstring; outlen: ptr cuint; arg: pointer): cint {.cdecl.}; arg: pointer) {.cdecl, importc.} ++proc SSL_CTX_set_next_proto_select_cb*(ctx: SslCtx; cb: proc(s: SslPtr; out_proto: cstring; outlen: cstring; in_proto: cstring; inlen: cuint; arg: pointer): cint {.cdecl.}; arg: pointer) {.cdecl, importc.} ++proc SSL_select_next_proto*(out_proto: ptr cstring; outlen: cstring; server: cstring; server_len: cuint; client: cstring; client_len: cuint): cint {.cdecl, importc.} ++proc SSL_get0_next_proto_negotiated*(s: SslPtr; data: ptr cstring; len: ptr cuint) {.cdecl, importc.} + diff --git a/pkgs/development/compilers/openjdk/darwin/17.nix b/pkgs/development/compilers/openjdk/darwin/17.nix index 3034e164e640e..49b23b440e230 100644 --- a/pkgs/development/compilers/openjdk/darwin/17.nix +++ b/pkgs/development/compilers/openjdk/darwin/17.nix @@ -11,20 +11,20 @@ let dist = { x86_64-darwin = { arch = "x64"; - zuluVersion = "17.44.15"; - jdkVersion = "17.0.8"; + zuluVersion = "17.44.53"; + jdkVersion = "17.0.8.1"; hash = - if enableJavaFX then "sha256-gmDku/AkWzO+eDRitezM9wCtTYDrUMtXyMulxqi9tNI=" - else "sha256-Ci18gBkAv/UUIQw9KlnfibcQMXwQRGx6K7L/NBB7b7Q="; + if enableJavaFX then "sha256-9U0XYZRA+LZTQ7eHrT5SWhgcxv43ajC9n9Tj3qPPLWA=" + else "sha256-ZART6K/o/+D7Tc60U1+1DbnCg8ZGZe67C6aLGeZfSx8="; }; aarch64-darwin = { arch = "aarch64"; - zuluVersion = "17.44.15"; - jdkVersion = "17.0.8"; + zuluVersion = "17.44.53"; + jdkVersion = "17.0.8.1"; hash = - if enableJavaFX then "sha256-mvyfqpnAoA05HJB9EBewW2MDuhQBOvp6svzyayV1irI=" - else "sha256-8b81QY6DGXVOsTKM8QDzJnYjXV0ipCbYWaaz6oF2A6k="; + if enableJavaFX then "sha256-udYW3nOADclWqVcVtS9dgjSY0w6xf2nsBpLzPmQCYlI=" + else "sha256-MUsEVo7Arps2ugPJy9Qq3J4SZfdGeJI7GSl9ZuuE3Mo="; }; }."${stdenv.hostPlatform.system}"; diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix index 872f16549d8b9..4b25058f39d49 100644 --- a/pkgs/development/compilers/purescript/purescript/default.nix +++ b/pkgs/development/compilers/purescript/purescript/default.nix @@ -15,7 +15,7 @@ let in stdenv.mkDerivation rec { pname = "purescript"; - version = "0.15.10"; + version = "0.15.11"; # These hashes can be updated automatically by running the ./update.sh script. src = @@ -25,17 +25,17 @@ in stdenv.mkDerivation rec { then fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos-arm64.tar.gz"; - sha256 = "1pk6mkjy09qvh8lsygb5gb77i2fqwjzz8jdjkxlyzynp3wpkcjp7"; + sha256 = "1ffhcwzb4cazxviqdl9zwg0jnbhsisg2pbxkqbk63zj2grjcpg86"; } else fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz"; - sha256 = "14yd00v3dsnnwj2f645vy0apnp1843ms9ffd2ccv7bj5p4kxsdzg"; + sha256 = "0h923269zb9hwlifcv8skz17zlggh8hsxhrgf33h2inl1midvgq5"; }) else fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz"; - sha256 = "03p5f2m5xvrqgiacs4yfc2dgz6frlxy90h6z1nm6wan40p2vd41r"; + sha256 = "0vrbgmgmmwbyxl969k59zkfrq5dxshspnzskx8zmhcy4flamz8av"; }; diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index 675c50142a9b7..12e58b6739ad9 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-reason"; - version = "3.9.0"; + version = "3.10.0"; src = fetchurl { url = "https://github.com/reasonml/reason/releases/download/${version}/reason-${version}.tbz"; - hash = "sha256-vPAIHs89Bc5o6Ch2obwqSEl8eCJbizEPLPJLM/NWhBY="; + hash = "sha256-F+rUwoZK9yc/VtCtYsRWS+Lq3nbT2oex04HtW0T0Zss="; }; strictDeps = true; diff --git a/pkgs/development/compilers/reason/tests/hello/default.nix b/pkgs/development/compilers/reason/tests/hello/default.nix index 9b551a0a1ee59..3def42ec08f78 100644 --- a/pkgs/development/compilers/reason/tests/hello/default.nix +++ b/pkgs/development/compilers/reason/tests/hello/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, reason }: +{ buildDunePackage, ppxlib, reason }: buildDunePackage rec { pname = "helloreason"; @@ -6,9 +6,12 @@ buildDunePackage rec { src = ./.; - useDune2 = true; + nativeBuildInputs = [ + reason + ]; buildInputs = [ + ppxlib reason ]; diff --git a/pkgs/development/compilers/reason/tests/hello/dune-project b/pkgs/development/compilers/reason/tests/hello/dune-project new file mode 100644 index 0000000000000..2f602c3083f40 --- /dev/null +++ b/pkgs/development/compilers/reason/tests/hello/dune-project @@ -0,0 +1 @@ +(lang dune 3.10) diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 869dd15df0be9..0cf5020962cf1 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -263,7 +263,7 @@ in stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.rust-lang.org/"; description = "A safe, concurrent, practical language"; - maintainers = with maintainers; [ cstrahan globin havvy ] ++ teams.rust.members; + maintainers = with maintainers; [ globin havvy ] ++ teams.rust.members; license = [ licenses.mit licenses.asl20 ]; platforms = [ # Platforms with host tools from diff --git a/pkgs/development/compilers/sbcl/2.x.nix b/pkgs/development/compilers/sbcl/2.x.nix index cfd6166d04565..a4de7b8b876fa 100644 --- a/pkgs/development/compilers/sbcl/2.x.nix +++ b/pkgs/development/compilers/sbcl/2.x.nix @@ -19,12 +19,12 @@ let sha256 = "189gjqzdz10xh3ybiy4ch1r98bsmkcb4hpnrmggd4y2g5kqnyx4y"; }; - "2.3.7" = { - sha256 = "sha256-aYFE+4BaMZGaYQ3pmauYOR1S62mK2qjKGbKPxu0Nmfc="; - }; "2.3.8" = { sha256 = "sha256-QhVxsqyRbli+jrzqXvSr+NeQKGPbah0KXvqVAK3KDSk="; }; + "2.3.9" = { + sha256 = "sha256-fSiakSMgIgKL8BKJAMMr8A5MVDDDLyivBZTIpZKphlQ="; + }; }; in with versionMap.${version}; diff --git a/pkgs/development/compilers/spirv-llvm-translator/default.nix b/pkgs/development/compilers/spirv-llvm-translator/default.nix index 19fa928a4d0e7..c5e8ee5a6214e 100644 --- a/pkgs/development/compilers/spirv-llvm-translator/default.nix +++ b/pkgs/development/compilers/spirv-llvm-translator/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , cmake , pkg-config , lit @@ -14,7 +15,11 @@ let # ROCm will always be at the latest version branch = - if llvmMajor == "15" || isROCm then rec { + if llvmMajor == "16" then rec { + version = "16.0.0"; + rev = "v${version}"; + hash = "sha256-EUabcYqSjXshbPmcs1DRLvCSL1nd9rEdpqELBrItCW8="; + } else if llvmMajor == "15" || isROCm then rec { version = "15.0.0"; rev = "v${version}"; hash = "sha256-OsDohXRxovtEXaWiRGp8gJ0dXmoALyO+ZimeSO8aPVI="; @@ -38,6 +43,14 @@ stdenv.mkDerivation { inherit (branch) rev hash; }; + patches = lib.optionals (llvmMajor == "16")[ + # Fixes builds that link against external LLVM dynamic library + (fetchpatch { + url = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator/commit/f3b9b604d7eda18d0d1029d94a6eebd33aa3a3fe.patch"; + hash = "sha256-opDjyZcy7O4wcSfm/A51NCIiDyIvbcmbv9ns1njdJbc="; + }) + ]; + nativeBuildInputs = [ pkg-config cmake spirv-tools ] ++ (if isROCm then [ llvm ] else [ llvm.dev ]); @@ -62,6 +75,9 @@ stdenv.mkDerivation { postInstall = '' install -D tools/llvm-spirv/llvm-spirv $out/bin/llvm-spirv + '' + lib.optionalString stdenv.isDarwin '' + install_name_tool $out/bin/llvm-spirv \ + -change @rpath/libLLVMSPIRVLib.dylib $out/lib/libLLVMSPIRVLib.dylib ''; meta = with lib; { diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/development/compilers/unison/default.nix index bcb259c60cf96..fbbfba7ae1a56 100644 --- a/pkgs/development/compilers/unison/default.nix +++ b/pkgs/development/compilers/unison/default.nix @@ -11,17 +11,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "unison-code-manager"; - version = "M5e"; + version = "M5g"; src = if stdenv.isDarwin then fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos.tar.gz"; - hash = "sha256-jg8/DmIJru2OKZu5WfA7fatKcburPiXnoALifxL26kc="; + hash = "sha256-4E/8CfWmD+IVeXBqcTE74k2HZtk9dt/4G9GqBjVhtWo="; } else fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-linux.tar.gz"; - hash = "sha256-+2dIxqf9b8DfoTUakxA6Qrpb7cAQKCventxDS1sFxjM="; + hash = "sha256-Gl447CSuLgEPPHzgxPTIC8QXGgk/1moNqFU+Phv6e/U="; }; # The tarball is just the prebuilt binary, in the archive root. diff --git a/pkgs/development/coq-modules/serapi/default.nix b/pkgs/development/coq-modules/serapi/default.nix index acb7b11c4c347..ca50f35646b0b 100644 --- a/pkgs/development/coq-modules/serapi/default.nix +++ b/pkgs/development/coq-modules/serapi/default.nix @@ -89,7 +89,7 @@ in then [ ./janestreet-0.15.patch ] - else if version == "8.17.0+0.17.0" + else if version == "8.16.0+0.16.3" || version == "8.17.0+0.17.0" then [ ./janestreet-0.16.patch ] diff --git a/pkgs/development/embedded/arduino/arduino-cli/default.nix b/pkgs/development/embedded/arduino/arduino-cli/default.nix index 6e762699bcdb2..c41f884d4fe16 100644 --- a/pkgs/development/embedded/arduino/arduino-cli/default.nix +++ b/pkgs/development/embedded/arduino/arduino-cli/default.nix @@ -4,13 +4,13 @@ let pkg = buildGoModule rec { pname = "arduino-cli"; - version = "0.33.0"; + version = "0.34.2"; src = fetchFromGitHub { owner = "arduino"; repo = pname; rev = version; - hash = "sha256-iwVxaNkz4AgLXPRjzD3vNJ7k+whWvpQUl66nSmRFW+U="; + hash = "sha256-X7vrcaJkVqzZoaIFLWJhhdlgRpckLG69uVmUUZd/XXY="; }; nativeBuildInputs = [ @@ -23,7 +23,7 @@ let subPackages = [ "." ]; - vendorHash = "sha256-efZnuxXbC31u7FciULGYvpaWiCm9boQRLUpxW9evyJQ="; + vendorHash = "sha256-cr5D7QDh65xWZJ4gq32ehklwrHWyQEWW/FZZ4gPTJBk="; postPatch = let skipTests = [ diff --git a/pkgs/development/embedded/fpga/apio/default.nix b/pkgs/development/embedded/fpga/apio/default.nix index b201ca169d4dc..1ca1e3cd200d5 100644 --- a/pkgs/development/embedded/fpga/apio/default.nix +++ b/pkgs/development/embedded/fpga/apio/default.nix @@ -10,13 +10,14 @@ , scons , setuptools , tinyprog +, flit-core , pytestCheckHook }: buildPythonApplication rec { pname = "apio"; version = "0.8.1"; - format = "flit"; + format = "pyproject"; src = fetchFromGitHub { owner = "FPGAwars"; @@ -47,6 +48,10 @@ buildPythonApplication rec { 'version = semantic_version.Version(pkg_version.replace(".dev", "-dev"))' ''; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ click semantic-version diff --git a/pkgs/development/embedded/svdtools/default.nix b/pkgs/development/embedded/svdtools/default.nix index ce55ed1bfd1b1..199845598acbc 100644 --- a/pkgs/development/embedded/svdtools/default.nix +++ b/pkgs/development/embedded/svdtools/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "svdtools"; - version = "0.3.0"; + version = "0.3.3"; src = fetchCrate { inherit version pname; - hash = "sha256-B+G2HIGbuKeiys3bLR2U+P40TD8YpqzAb4oENNb8gYg="; + hash = "sha256-pZufVz7m91MiD1TfzTzS6mL0eBxawcr43GAfvDJVqfU="; }; - cargoHash = "sha256-W6/LZE98V1teiv9Wp9tsIqlY18MoMiNZ+fqTJ567xrg="; + cargoHash = "sha256-FAJZ/3eNhxPvIKXnE9lpejQuMi+yeBaA5ra9Peb2yIM="; meta = with lib; { description = "Tools to handle vendor-supplied, often buggy SVD files"; diff --git a/pkgs/development/embedded/wch-isp/default.nix b/pkgs/development/embedded/wch-isp/default.nix index a08afa5729af7..4bc2e06157241 100644 --- a/pkgs/development/embedded/wch-isp/default.nix +++ b/pkgs/development/embedded/wch-isp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wch-isp"; - version = "0.2.5"; + version = "0.3.0"; src = fetchFromGitHub { owner = "jmaselbas"; repo = pname; rev = "v${version}"; - hash = "sha256-JF1g2Qb1gG93lSaDQvltT6jCYk/dKntsIJPkQXYUvX4="; + hash = "sha256-cbQJgHZAdSfzRsf/srMlRd+QgGUPpP5r3kBTNCgINDw="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/guile-modules/guile-gnutls/default.nix b/pkgs/development/guile-modules/guile-gnutls/default.nix index 8fe69b2684084..91ffe90b0435f 100644 --- a/pkgs/development/guile-modules/guile-gnutls/default.nix +++ b/pkgs/development/guile-modules/guile-gnutls/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "guile-gnutls"; - version = "3.7.12"; + version = "4.0.0"; src = fetchurl { url = "mirror://gnu/gnutls/guile-gnutls-${version}.tar.gz"; - hash = "sha256-XTrxFXMJPeWfJYQVhy4sWxTMqd0lGosuwWQ9bpf+4zY="; + hash = "sha256-W0y5JgMgduw0a7XAvA0CMflo/g9WWRPMFpNLt5Ovsjk="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix index 2678bcb2c058c..75e45b00d4e75 100644 --- a/pkgs/development/guile-modules/guile-lib/default.nix +++ b/pkgs/development/guile-modules/guile-lib/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, autoreconfHook , guile , pkg-config , texinfo @@ -16,6 +17,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + autoreconfHook pkg-config ]; buildInputs = [ @@ -23,6 +25,12 @@ stdenv.mkDerivation rec { texinfo ]; + postPatch = '' + substituteInPlace configure.ac \ + --replace 'SITEDIR="$datadir/guile-lib"' 'SITEDIR=$datadir/guile/site/$GUILE_EFFECTIVE_VERSION' \ + --replace 'SITECCACHEDIR="$libdir/guile-lib/guile/$GUILE_EFFECTIVE_VERSION/site-ccache"' 'SITECCACHEDIR="$libdir/guile/$GUILE_EFFECTIVE_VERSION/site-ccache"' + ''; + makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; doCheck = !stdenv.isDarwin; @@ -43,7 +51,7 @@ stdenv.mkDerivation rec { for Guile". ''; license = licenses.gpl3Plus; - maintainers = with maintainers; [ vyp ]; + maintainers = with maintainers; [ vyp foo-dogsquared ]; platforms = guile.meta.platforms; }; } diff --git a/pkgs/development/guile-modules/guile-ssh/default.nix b/pkgs/development/guile-modules/guile-ssh/default.nix index e7654b747c3a1..a1928c78ce752 100644 --- a/pkgs/development/guile-modules/guile-ssh/default.nix +++ b/pkgs/development/guile-modules/guile-ssh/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , guile , libssh , autoreconfHook @@ -9,43 +10,57 @@ , which }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "guile-ssh"; version = "0.16.3"; src = fetchFromGitHub { owner = "artyom-poptsov"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-P29U88QrCjoyl/wdTPZbiMoykd/v6ul6CW/IJn9UAyw="; + repo = "guile-ssh"; + rev = "v${finalAttrs.version}"; + hash = "sha256-P29U88QrCjoyl/wdTPZbiMoykd/v6ul6CW/IJn9UAyw="; }; - configureFlags = [ "--with-guilesitedir=\${out}/${guile.siteDir}" ]; + patches = [ + (fetchpatch { + url = "https://github.com/artyom-poptsov/guile-ssh/pull/31/commits/38636c978f257d5228cd065837becabf5da16854.patch"; + hash = "sha256-J+TDgdjihKoEjhbeH+BzqrHhjpVlGdscRj3L/GAFgKg="; + }) + ]; - postFixup = '' - for f in $out/${guile.siteDir}/ssh/**.scm; do \ - substituteInPlace $f \ - --replace "libguile-ssh" "$out/lib/libguile-ssh"; \ - done - ''; + strictDeps = true; nativeBuildInputs = [ - autoreconfHook pkg-config texinfo which + autoreconfHook + guile + pkg-config + texinfo + which ]; + buildInputs = [ guile ]; + propagatedBuildInputs = [ libssh ]; enableParallelBuilding = true; + # FAIL: server-client.scm + doCheck = !stdenv.isDarwin; + + postInstall = '' + mv $out/bin/*.scm $out/share/guile-ssh + rmdir $out/bin + ''; + meta = with lib; { description = "Bindings to Libssh for GNU Guile"; homepage = "https://github.com/artyom-poptsov/guile-ssh"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ethancedwards8 ]; + maintainers = with maintainers; [ ethancedwards8 foo-dogsquared ]; platforms = guile.meta.platforms; }; -} +}) diff --git a/pkgs/development/haskell-modules/HACKING.md b/pkgs/development/haskell-modules/HACKING.md index 12afee84b156c..d41957f403b8c 100644 --- a/pkgs/development/haskell-modules/HACKING.md +++ b/pkgs/development/haskell-modules/HACKING.md @@ -137,7 +137,7 @@ following will happen: This is a list of Haskell packages that are known to be broken. - [`hackage-packages.nix`](hackage-packages.nix) will be regenerated. This - will mark all Haskell pacakges in `configuration-hackage2nix/broken.yaml` + will mark all Haskell packages in `configuration-hackage2nix/broken.yaml` as `broken`. - The diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c5aef8b2b1312..69723242dff54 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -316,7 +316,12 @@ self: super: { # Overriding the version pandoc dependency uses as the latest release has version bounds # defined as >= 3.1 && < 3.2, can be removed once pandoc gets bumped by Stackage. - patat = super.patat.override { pandoc = self.pandoc_3_1_6_1; }; + # + # The patch can be removed once the commit being pulled is in a release. + patat = appendPatch (fetchpatch { + url = "https://github.com/jaspervdj/patat/pull/143/commits/cb5d5b6439204b5bd52939e42a11518ac81139fe.patch"; + sha256 = "sha256-EPiyxziPtn2fAExKknI2uKUGahWCFnv7K8bpVkAgezQ="; + }) (super.patat.override { pandoc = self.pandoc_3_1_8; }); # http2 also overridden in all-packages.nix for mailctl. # twain is currently only used by mailctl, so the .overrideScope shouldn't @@ -347,7 +352,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "0fg3q7apdijnlgyb0yps1znjjd2nv3016r9cyxyw209sqn3whnx5"; + sha256 = "sha256-+buXiG9auq46+reMrs2rBWoxHgPkHmP8BY5BugooU+Q="; # delete android and Android directories which cause issues on # darwin (case insensitive directory). Since we don't need them # during the build process, we can delete it to prevent a hash @@ -391,15 +396,7 @@ self: super: { # https://github.com/awakesecurity/nix-graph/issues/5 nix-graph = doJailbreak super.nix-graph; - cachix = self.generateOptparseApplicativeCompletions [ "cachix" ] - # Adds a workaround to the API changes in the versions library - # Should be dropped by the next release - # https://github.com/cachix/cachix/pull/556 - (appendPatch (fetchpatch { - url = "https://github.com/cachix/cachix/commit/078d2d2212d7533a6a4db000958bfc4373c4deeb.patch"; - hash = "sha256-xfJaO2CuZWFHivq4gqbkNnTOWPiyFVjlwOPV6yibKH4="; - stripLen = 1; - }) super.cachix); + cachix = self.generateOptparseApplicativeCompletions [ "cachix" ] super.cachix; # https://github.com/froozen/kademlia/issues/2 kademlia = dontCheck super.kademlia; @@ -526,13 +523,8 @@ self: super: { # https://github.com/ekmett/structures/issues/3 structures = dontCheck super.structures; - jacinda = appendPatches [ - (pkgs.fetchpatch { - name = "jacinda-alex-3.3.patch"; - url = "https://github.com/vmchale/jacinda/commit/b8e18871900402e6ab0addae2e41a0f360682ae3.patch"; - sha256 = "0c1b9hp9j44zafzjidp301dz0m54vplgfisqvb1zrh1plk6vsxsa"; - }) - ] (overrideCabal { revision = null; editedCabalFile = null; } super.jacinda); + # Requires alex >= 3.4 + jacinda = super.jacinda.override { alex = self.alex_3_4_0_0; }; # Disable test suites to fix the build. acme-year = dontCheck super.acme-year; # http://hydra.cryp.to/build/497858/log/raw @@ -1476,31 +1468,6 @@ self: super: { }); }; - jsaddle-webkit2gtk = - appendPatches [ - (pkgs.fetchpatch { - name = "jsaddle-webkit2gtk-ghc-9.2.patch"; - url = "https://github.com/ghcjs/jsaddle/commit/d2ce9e6be1dcba0ab417314a0b848012d1a47e03.diff"; - stripLen = 1; - includes = [ "jsaddle-webkit2gtk.cabal" ]; - sha256 = "16pcs3l7s8shhcnrhi80bwjgy7w23csd9b8qpmc5lnxn4wxr4c2r"; - }) - (pkgs.fetchpatch { - name = "jsaddle-webkit2gtk-ghc-9.6.patch"; - url = "https://github.com/ghcjs/jsaddle/commit/99b23dac8b4c5b23f5ed7963e681a46c1abdd1a5.patch"; - sha256 = "02rdifap9vzf6bhjp5siw68ghjrxh2phzd0kwjihf3hxi4a2xlp3"; - stripLen = 1; - includes = [ "jsaddle-webkit2gtk.cabal" ]; - }) - ] - (overrideCabal (old: { - postPatch = old.postPatch or "" + '' - sed -i 's/aeson.*,/aeson,/' jsaddle-webkit2gtk.cabal - sed -i 's/text.*,/text,/' jsaddle-webkit2gtk.cabal - ''; - }) - super.jsaddle-webkit2gtk); - # 2022-03-16: lens bound can be loosened https://github.com/ghcjs/jsaddle-dom/issues/19 jsaddle-dom = overrideCabal (old: { postPatch = old.postPatch or "" + '' @@ -1869,15 +1836,6 @@ self: super: { vivid-osc = dontCheck super.vivid-osc; vivid-supercollider = dontCheck super.vivid-supercollider; - # while waiting for a new release: https://github.com/brendanhay/amazonka/pull/572 - amazonka = appendPatches [ - (fetchpatch { - relative = "amazonka"; - url = "https://github.com/brendanhay/amazonka/commit/43ddd87b1ebd6af755b166e16336259ec025b337.patch"; - sha256 = "sha256-9Ed3qrLGRaNCdvqWMyg8ydAnqDkFqWKLLoObv/5jG54="; - }) - ] (doJailbreak super.amazonka); - # Test suite does not compile. feed = dontCheck super.feed; @@ -1923,23 +1881,27 @@ self: super: { inherit (let pandoc-cli-overlay = self: super: { # pandoc-cli requires pandoc >= 3.1 - pandoc = self.pandoc_3_1_6_1; + pandoc = self.pandoc_3_1_8; # pandoc depends on crypton-connection, which requires tls >= 1.7 - tls = self.tls_1_7_1; + tls = self.tls_1_9_0; crypton-connection = unmarkBroken super.crypton-connection; # pandoc depends on http-client-tls, which only starts depending # on crypton-connection in http-client-tls-0.3.6.2. http-client-tls = self.http-client-tls_0_3_6_3; + + # pandoc depends on skylighting >= 0.14 + skylighting = self.skylighting_0_14; + skylighting-core = self.skylighting-core_0_14; }; in { pandoc-cli = super.pandoc-cli.overrideScope pandoc-cli-overlay; - pandoc_3_1_6_1 = doDistribute (super.pandoc_3_1_6_1.overrideScope pandoc-cli-overlay); + pandoc_3_1_8 = doDistribute (super.pandoc_3_1_8.overrideScope pandoc-cli-overlay); pandoc-lua-engine = super.pandoc-lua-engine.overrideScope pandoc-cli-overlay; }) pandoc-cli - pandoc_3_1_6_1 + pandoc_3_1_8 pandoc-lua-engine ; @@ -2144,27 +2106,6 @@ self: super: { sha256 = "sha256-AVQLvul3ufxGQyoXud05qauclNanf6kunip0oJ/9lWQ="; }) (dontCheck super.yi-language); - # 2022-03-16: Upstream is not bumping bounds https://github.com/ghcjs/jsaddle/issues/123 - # 2023-07-14: Upstream is also not releasing fixes. - jsaddle = appendPatch - (fetchpatch { - name = "jsaddle-casemapping.patch"; - url = "https://github.com/ghcjs/jsaddle/commit/f90df85fec84fcc4927bfb67452e31342f5aec1f.patch"; - sha256 = "sha256-xCtDxpjZbus8VSeBUEV0OnJlcQKjeL1PbYSHnhpFuyI="; - relative = "jsaddle"; - }) - (overrideCabal (drv: { - # lift conditional version constraint on ref-tf - postPatch = '' - sed -i 's/ref-tf.*,/ref-tf,/' jsaddle.cabal - sed -i 's/attoparsec.*,/attoparsec,/' jsaddle.cabal - sed -i 's/time.*,/time,/' jsaddle.cabal - sed -i 's/vector.*,/vector,/' jsaddle.cabal - sed -i 's/(!name)/(! name)/' src/Language/Javascript/JSaddle/Object.hs - '' + (drv.postPatch or ""); - }) - (doJailbreak super.jsaddle)); - # 2022-03-22: Jailbreak for base bound: https://github.com/reflex-frp/reflex-dom/pull/433 reflex-dom = assert super.reflex-dom.version == "0.6.1.1"; doJailbreak super.reflex-dom; @@ -2765,6 +2706,7 @@ self: super: { # Tests fail due to the newly-build fourmolu not being in PATH # https://github.com/fourmolu/fourmolu/issues/231 + fourmolu_0_14_0_0 = dontCheck super.fourmolu_0_14_0_0; fourmolu_0_13_1_0 = dontCheck super.fourmolu_0_13_1_0; # Merged upstream, but never released. Allows both intel and aarch64 darwin to build. @@ -2781,4 +2723,9 @@ self: super: { # The hackage source is somehow missing a file present in the repo (tests/ListStat.hs). sym = dontCheck super.sym; + + # Too strict bounds on base, ghc-prim, primitive + # https://github.com/kowainik/typerep-map/pull/128 + typerep-map = doJailbreak super.typerep-map; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index 182a259df31c9..098a856f78e49 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -65,7 +65,7 @@ self: super: { # Version deviations from Stackage LTS # - doctest = doDistribute super.doctest_0_22_0; + doctest = doDistribute super.doctest_0_22_1; http-api-data = doDistribute self.http-api-data_0_6; # allows base >= 4.18 some = doDistribute self.some_1_0_5; th-abstraction = doDistribute self.th-abstraction_0_6_0_0; @@ -88,7 +88,7 @@ self: super: { ghc-lib = doDistribute self.ghc-lib_9_6_2_20230523; ghc-lib-parser = doDistribute self.ghc-lib-parser_9_6_2_20230523; - ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_6_0_1; + ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_6_0_2; # v0.1.6 forbids base >= 4.18 singleton-bool = doDistribute super.singleton-bool_0_1_7; @@ -176,7 +176,7 @@ self: super: { }; fourmolu = super.fourmolu_0_13_1_0; - ormolu = super.ormolu_0_7_1_0; + ormolu = self.generateOptparseApplicativeCompletions [ "ormolu" ] (enableSeparateBinOutput super.ormolu_0_7_2_0); stylish-haskell = super.stylish-haskell_0_14_5_0; # Newer version of servant required for GHC 9.6 @@ -272,4 +272,12 @@ self: super: { # The curl executable is required for withApplication tests. warp_3_3_28 = addTestToolDepend pkgs.curl super.warp_3_3_28; + + # The NCG backend for aarch64 generates invalid jumps in some situations, + # the workaround on 9.6 is to revert to the LLVM backend (which is used + # for these sorts of situations even on 9.2 and 9.4). + # https://gitlab.haskell.org/ghc/ghc/-/issues/23746#note_525318 + tls = appendConfigureFlags + (lib.optionals pkgs.stdenv.hostPlatform.isAarch64 [ "--ghc-option=-fllvm" ]) + super.tls; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix index d8e1e9d7320b4..4588933abc13a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -78,10 +78,4 @@ self: super: { # Break out of "yaml >=0.10.4.0 && <0.11": https://github.com/commercialhaskell/stack/issues/4485 stack = doJailbreak super.stack; - - # https://github.com/fpco/inline-c/pull/131 - # and/or https://gitlab.haskell.org/ghc/ghc/-/merge_requests/7739 - inline-c-cpp = - (if isDarwin then appendConfigureFlags ["--ghc-option=-fcompact-unwind"] else x: x) - super.inline-c-cpp; } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index acf19176b95e8..d610dd360fd0c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -139,11 +139,11 @@ broken-packages: - altfloat # failure in job https://hydra.nixos.org/build/233197874 at 2023-09-02 - alure # failure in job https://hydra.nixos.org/build/233230238 at 2023-09-02 - amazon-emailer # failure in job https://hydra.nixos.org/build/233220018 at 2023-09-02 - - amazonka # failure in job https://hydra.nixos.org/build/233220743 at 2023-09-02 - amazonka-iam-policy # failure in job https://hydra.nixos.org/build/233233098 at 2023-09-02 - amazon-products # failure in job https://hydra.nixos.org/build/233193877 at 2023-09-02 - AMI # failure in job https://hydra.nixos.org/build/233232505 at 2023-09-02 - amqp-conduit # failure in job https://hydra.nixos.org/build/233228080 at 2023-09-02 + - amqp-worker # failure in job https://hydra.nixos.org/build/236675859 at 2023-10-04 - analyze # failure in job https://hydra.nixos.org/build/233251441 at 2023-09-02 - anansi-pandoc # failure in job https://hydra.nixos.org/build/233252389 at 2023-09-02 - android-activity # failure in job https://hydra.nixos.org/build/233203400 at 2023-09-02 @@ -333,11 +333,13 @@ broken-packages: - basement-cd # failure in job https://hydra.nixos.org/build/233191991 at 2023-09-02 - basen # failure in job https://hydra.nixos.org/build/233210680 at 2023-09-02 - basex-client # failure in job https://hydra.nixos.org/build/233214592 at 2023-09-02 + - basics # failure in job https://hydra.nixos.org/build/236678238 at 2023-10-04 - basic-sop # failure in job https://hydra.nixos.org/build/233253357 at 2023-09-02 - baskell # failure in job https://hydra.nixos.org/build/233246705 at 2023-09-02 - battlenet # failure in job https://hydra.nixos.org/build/233260076 at 2023-09-02 - battleplace # failure in job https://hydra.nixos.org/build/233230199 at 2023-09-02 - bazel-coverage-report-renderer # failure in job https://hydra.nixos.org/build/233243746 at 2023-09-02 + - bbcode # failure in job https://hydra.nixos.org/build/236693854 at 2023-10-04 - BCMtools # failure in job https://hydra.nixos.org/build/233250221 at 2023-09-02 - bdd # failure in job https://hydra.nixos.org/build/233248150 at 2023-09-02 - bdelta # failure in job https://hydra.nixos.org/build/233214765 at 2023-09-02 @@ -413,7 +415,6 @@ broken-packages: - bindings-wlc # failure in job https://hydra.nixos.org/build/233332720 at 2023-09-02 - bind-marshal # failure in job https://hydra.nixos.org/build/233196758 at 2023-09-02 - binembed # failure in job https://hydra.nixos.org/build/233219100 at 2023-09-02 - - binrep # failure in job https://hydra.nixos.org/build/233208877 at 2023-09-02 - binsm # failure in job https://hydra.nixos.org/build/233232355 at 2023-09-02 - biocore # failure in job https://hydra.nixos.org/build/233229466 at 2023-09-02 - bio # failure in job https://hydra.nixos.org/build/233225273 at 2023-09-02 @@ -530,6 +531,7 @@ broken-packages: - bv-sized-lens # failure in job https://hydra.nixos.org/build/233237486 at 2023-09-02 - byline # failure in job https://hydra.nixos.org/build/233231017 at 2023-09-02 - bytearray-parsing # failure in job https://hydra.nixos.org/build/233244355 at 2023-09-02 + - bytepatch # failure in job https://hydra.nixos.org/build/236678340 at 2023-10-04 - bytestring-arbitrary # failure in job https://hydra.nixos.org/build/233195013 at 2023-09-02 - bytestring-class # failure in job https://hydra.nixos.org/build/233230793 at 2023-09-02 - bytestring-conversion # failure in job https://hydra.nixos.org/build/233211464 at 2023-09-02 @@ -1295,6 +1297,7 @@ broken-packages: - dump-core # failure in job https://hydra.nixos.org/build/233244428 at 2023-09-02 - dunai-core # failure in job https://hydra.nixos.org/build/233255804 at 2023-09-02 - Dung # failure in job https://hydra.nixos.org/build/233206343 at 2023-09-02 + - dupIO # failure in job https://hydra.nixos.org/build/236688265 at 2023-10-04 - duplo # failure in job https://hydra.nixos.org/build/233237341 at 2023-09-02 - dura # failure in job https://hydra.nixos.org/build/233210320 at 2023-09-02 - duration # failure in job https://hydra.nixos.org/build/233207705 at 2023-09-02 @@ -1434,6 +1437,7 @@ broken-packages: - etc # failure in job https://hydra.nixos.org/build/233199192 at 2023-09-02 - ethereum-rlp # failure in job https://hydra.nixos.org/build/233236392 at 2023-09-02 - eurofxref # failure in job https://hydra.nixos.org/build/233230942 at 2023-09-02 + - evdev # failure in job https://hydra.nixos.org/build/236692293 at 2023-10-04 - eve-cli # failure in job https://hydra.nixos.org/build/233254555 at 2023-09-02 - eved # failure in job https://hydra.nixos.org/build/233194319 at 2023-09-02 - event-driven # failure in job https://hydra.nixos.org/build/233233946 at 2023-09-02 @@ -1704,6 +1708,7 @@ broken-packages: - fused-effects-resumable # failure in job https://hydra.nixos.org/build/233242479 at 2023-09-02 - fused-effects-th # failure in job https://hydra.nixos.org/build/233192186 at 2023-09-02 - fusion # failure in job https://hydra.nixos.org/build/233204359 at 2023-09-02 + - futhark # failure in job https://hydra.nixos.org/build/236673091 at 2023-10-04 - futhask # failure in job https://hydra.nixos.org/build/233229281 at 2023-09-02 - futun # failure in job https://hydra.nixos.org/build/233245115 at 2023-09-02 - future # failure in job https://hydra.nixos.org/build/233224844 at 2023-09-02 @@ -2381,6 +2386,7 @@ broken-packages: - hlibBladeRF # failure in job https://hydra.nixos.org/build/233237204 at 2023-09-02 - hlibev # failure in job https://hydra.nixos.org/build/233256218 at 2023-09-02 - hlibfam # failure in job https://hydra.nixos.org/build/233244702 at 2023-09-02 + - hlint-plugin # failure in job https://hydra.nixos.org/build/236693381 at 2023-10-04 - HList # failure in job https://hydra.nixos.org/build/233193236 at 2023-09-02 - hlivy # failure in job https://hydra.nixos.org/build/233222495 at 2023-09-02 - hlogger # failure in job https://hydra.nixos.org/build/233197314 at 2023-09-02 @@ -2473,6 +2479,7 @@ broken-packages: - hpasteit # failure in job https://hydra.nixos.org/build/233197680 at 2023-09-02 - HPath # failure in job https://hydra.nixos.org/build/233257819 at 2023-09-02 - hpc-coveralls # failure in job https://hydra.nixos.org/build/233255685 at 2023-09-02 + - hpdft # failure in job https://hydra.nixos.org/build/236675535 at 2023-10-04 - hpg # failure in job https://hydra.nixos.org/build/233243212 at 2023-09-02 - HPi # failure in job https://hydra.nixos.org/build/233257411 at 2023-09-02 - hpio # failure in job https://hydra.nixos.org/build/233215789 at 2023-09-02 @@ -2486,6 +2493,7 @@ broken-packages: - hpyrg # failure in job https://hydra.nixos.org/build/233225042 at 2023-09-02 - hquantlib-time # failure in job https://hydra.nixos.org/build/233192009 at 2023-09-02 - hquery # failure in job https://hydra.nixos.org/build/233203709 at 2023-09-02 + - h-raylib # failure in job https://hydra.nixos.org/build/236686375 at 2023-10-04 - hreq-core # failure in job https://hydra.nixos.org/build/233259937 at 2023-09-02 - hRESP # failure in job https://hydra.nixos.org/build/233229961 at 2023-09-02 - h-reversi # failure in job https://hydra.nixos.org/build/233235617 at 2023-09-02 @@ -2592,6 +2600,7 @@ broken-packages: - hsrelp # failure in job https://hydra.nixos.org/build/233255841 at 2023-09-02 - hs-rqlite # failure in job https://hydra.nixos.org/build/233191478 at 2023-09-02 - hs-rs-notify # failure in job https://hydra.nixos.org/build/233253577 at 2023-09-02 + - hs-samtools # failure in job https://hydra.nixos.org/build/236688025 at 2023-10-04 - hs-scrape # failure in job https://hydra.nixos.org/build/233244221 at 2023-09-02 - hsseccomp # failure in job https://hydra.nixos.org/build/233194411 at 2023-09-02 - hsshellscript # failure in job https://hydra.nixos.org/build/233197858 at 2023-09-02 @@ -2937,6 +2946,7 @@ broken-packages: - json-rpc-server # failure in job https://hydra.nixos.org/build/233201284 at 2023-09-02 - jsonrpc-tinyclient # failure in job https://hydra.nixos.org/build/233214174 at 2023-09-02 - jsonschema-gen # failure in job https://hydra.nixos.org/build/233225063 at 2023-09-02 + - json-spec # failure in job https://hydra.nixos.org/build/236684808 at 2023-10-04 - jsonsql # failure in job https://hydra.nixos.org/build/233255704 at 2023-09-02 - json-syntax # failure in job https://hydra.nixos.org/build/233250639 at 2023-09-02 - json-tools # failure in job https://hydra.nixos.org/build/233247019 at 2023-09-02 @@ -3040,6 +3050,7 @@ broken-packages: - Lambdajudge # failure in job https://hydra.nixos.org/build/233227016 at 2023-09-02 - LambdaNet # failure in job https://hydra.nixos.org/build/233197999 at 2023-09-02 - lambda-sampler # failure in job https://hydra.nixos.org/build/233205734 at 2023-09-02 + - lambdasound # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237027557 at 2023-10-04 - lambdatex # failure in job https://hydra.nixos.org/build/233215389 at 2023-09-02 - lambda-toolbox # failure in job https://hydra.nixos.org/build/233194921 at 2023-09-02 - lambdatwit # failure in job https://hydra.nixos.org/build/233219603 at 2023-09-02 @@ -3171,6 +3182,7 @@ broken-packages: - linda # failure in job https://hydra.nixos.org/build/233249512 at 2023-09-02 - linden # failure in job https://hydra.nixos.org/build/233198590 at 2023-09-02 - linear-algebra-cblas # failure in job https://hydra.nixos.org/build/233239710 at 2023-09-02 + - linearmap-category # failure in job https://hydra.nixos.org/build/236690982 at 2023-10-04 - linear-maps # failure in job https://hydra.nixos.org/build/233258332 at 2023-09-02 - linear-opengl # failure in job https://hydra.nixos.org/build/233237268 at 2023-09-02 - linearscan # failure in job https://hydra.nixos.org/build/233257541 at 2023-09-02 @@ -3767,7 +3779,6 @@ broken-packages: - numtype # failure in job https://hydra.nixos.org/build/233219211 at 2023-09-02 - numtype-tf # failure in job https://hydra.nixos.org/build/233243483 at 2023-09-02 - Nutri # failure in job https://hydra.nixos.org/build/233244244 at 2023-09-02 - - nvfetcher # failure in job https://hydra.nixos.org/build/233598212 at 2023-09-02 - NXTDSL # failure in job https://hydra.nixos.org/build/233193483 at 2023-09-02 - nylas # failure in job https://hydra.nixos.org/build/233193540 at 2023-09-02 - oanda-rest-api # failure in job https://hydra.nixos.org/build/233250190 at 2023-09-02 @@ -4183,6 +4194,7 @@ broken-packages: - polysemy-req # failure in job https://hydra.nixos.org/build/233224435 at 2023-09-02 - polysemy-several # failure in job https://hydra.nixos.org/build/233216921 at 2023-09-02 - polysemy-socket # failure in job https://hydra.nixos.org/build/233195754 at 2023-09-02 + - polysemy-test # failure in job https://hydra.nixos.org/build/236686974 at 2023-10-04 - polyseq # failure in job https://hydra.nixos.org/build/233191210 at 2023-09-02 - polytypeable # failure in job https://hydra.nixos.org/build/233211797 at 2023-09-02 - polyvariadic # failure in job https://hydra.nixos.org/build/233250822 at 2023-09-02 @@ -4830,6 +4842,7 @@ broken-packages: - servant-pandoc # failure in job https://hydra.nixos.org/build/233203008 at 2023-09-02 - servant-polysemy # failure in job https://hydra.nixos.org/build/233218670 at 2023-09-02 - servant-pool # failure in job https://hydra.nixos.org/build/233208935 at 2023-09-02 + - servant-prometheus # failure in job https://hydra.nixos.org/build/236685165 at 2023-10-04 - servant-purescript # failure in job https://hydra.nixos.org/build/233598080 at 2023-09-02 - servant-py # failure in job https://hydra.nixos.org/build/233598104 at 2023-09-02 - servant-quickcheck # failure in job https://hydra.nixos.org/build/233236741 at 2023-09-02 @@ -5116,6 +5129,7 @@ broken-packages: - stan # failure in job https://hydra.nixos.org/build/233200000 at 2023-09-02 - starling # failure in job https://hydra.nixos.org/build/233255468 at 2023-09-02 - starter # failure in job https://hydra.nixos.org/build/233208799 at 2023-09-02 + - starter-snake-haskell # failure in job https://hydra.nixos.org/build/236685019 at 2023-10-04 - stash # failure in job https://hydra.nixos.org/build/233193110 at 2023-09-02 - Stasis # failure in job https://hydra.nixos.org/build/233209365 at 2023-09-02 - state-bag # failure in job https://hydra.nixos.org/build/233222753 at 2023-09-02 @@ -5278,6 +5292,7 @@ broken-packages: - Sysmon # failure in job https://hydra.nixos.org/build/233224152 at 2023-09-02 - system-canonicalpath # failure in job https://hydra.nixos.org/build/233254297 at 2023-09-02 - system-command # failure in job https://hydra.nixos.org/build/233239356 at 2023-09-02 + - systemd-ntfy # failure in job https://hydra.nixos.org/build/236686880 at 2023-10-04 - system-extra # failure in job https://hydra.nixos.org/build/233203137 at 2023-09-02 - system-inotify # failure in job https://hydra.nixos.org/build/233206871 at 2023-09-02 - system-lifted # failure in job https://hydra.nixos.org/build/233236013 at 2023-09-02 @@ -5319,6 +5334,7 @@ broken-packages: - tasty-autocollect # failure in job https://hydra.nixos.org/build/233256957 at 2023-09-02 - tasty-auto # failure in job https://hydra.nixos.org/build/233220008 at 2023-09-02 - tasty-fail-fast # failure in job https://hydra.nixos.org/build/233200040 at 2023-09-02 + - tasty-grading-system # failure in job https://hydra.nixos.org/build/236673021 at 2023-10-04 - tasty-hedgehog-coverage # failure in job https://hydra.nixos.org/build/233231332 at 2023-09-02 - tasty-mgolden # failure in job https://hydra.nixos.org/build/233248196 at 2023-09-02 - tasty-stats # failure in job https://hydra.nixos.org/build/233228752 at 2023-09-02 @@ -5607,6 +5623,7 @@ broken-packages: - TypeCompose # failure in job https://hydra.nixos.org/build/233212999 at 2023-09-02 - typed-digits # failure in job https://hydra.nixos.org/build/233198266 at 2023-09-02 - typed-encoding # failure in job https://hydra.nixos.org/build/233208093 at 2023-09-02 + - typed-process-effectful # failure in job https://hydra.nixos.org/build/236684332 at 2023-10-04 - typedquery # failure in job https://hydra.nixos.org/build/233215307 at 2023-09-02 - typed-spreadsheet # failure in job https://hydra.nixos.org/build/233248967 at 2023-09-02 - typed-time # failure in job https://hydra.nixos.org/build/233246930 at 2023-09-02 @@ -5617,6 +5634,7 @@ broken-packages: - type-indexed-queues # failure in job https://hydra.nixos.org/build/233197833 at 2023-09-02 - type-interpreter # failure in job https://hydra.nixos.org/build/233192182 at 2023-09-02 - type-int # failure in job https://hydra.nixos.org/build/233245978 at 2023-09-02 + - typelet # failure in job https://hydra.nixos.org/build/236691051 at 2023-10-04 - type-level-bst # failure in job https://hydra.nixos.org/build/233202030 at 2023-09-02 - type-level-natural-number-induction # failure in job https://hydra.nixos.org/build/233259499 at 2023-09-02 - type-level-natural-number-operations # failure in job https://hydra.nixos.org/build/233198314 at 2023-09-02 @@ -5629,7 +5647,6 @@ broken-packages: - type-operators # failure in job https://hydra.nixos.org/build/233232802 at 2023-09-02 - typeparams # failure in job https://hydra.nixos.org/build/233192078 at 2023-09-02 - type-prelude # failure in job https://hydra.nixos.org/build/233221195 at 2023-09-02 - - typerep-map # failure in job https://hydra.nixos.org/build/233202720 at 2023-09-02 - type-safe-avl # failure in job https://hydra.nixos.org/build/233203946 at 2023-09-02 - types-compat # failure in job https://hydra.nixos.org/build/233249850 at 2023-09-02 - type-settheory # failure in job https://hydra.nixos.org/build/233209513 at 2023-09-02 @@ -5652,6 +5669,7 @@ broken-packages: - uhttpc # failure in job https://hydra.nixos.org/build/233232481 at 2023-09-02 - ui-command # failure in job https://hydra.nixos.org/build/233223762 at 2023-09-02 - ukrainian-phonetics-basic-array-bytestring # failure in job https://hydra.nixos.org/build/233228787 at 2023-09-02 + - unac-bindings # failure in job https://hydra.nixos.org/build/236686523 at 2023-10-04 - unamb-custom # failure in job https://hydra.nixos.org/build/233197458 at 2023-09-02 - unbeliever # failure in job https://hydra.nixos.org/build/233221256 at 2023-09-02 - unbounded-delays-units # failure in job https://hydra.nixos.org/build/233200989 at 2023-09-02 @@ -5858,6 +5876,7 @@ broken-packages: - wai-static-cache # failure in job https://hydra.nixos.org/build/233228597 at 2023-09-02 - waitfree # failure in job https://hydra.nixos.org/build/233222583 at 2023-09-02 - wai-throttler # failure in job https://hydra.nixos.org/build/233231002 at 2023-09-02 + - wai-token-bucket-ratelimiter # failure in job https://hydra.nixos.org/build/236682758 at 2023-10-04 - waitra # failure in job https://hydra.nixos.org/build/233222291 at 2023-09-02 - wakame # failure in job https://hydra.nixos.org/build/233254673 at 2023-09-02 - wallpaper # failure in job https://hydra.nixos.org/build/233219027 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 030ed98a64065..8f6af23747f39 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -45,11 +45,15 @@ default-package-overrides: # breaking change was introduced in implicit-hie-0.1.3.0. # https://github.com/haskell/haskell-language-server/blob/feb596592de95f09cf4ee885f3e74178161919f1/ghcide/ghcide.cabal#L107-L111 - implicit-hie < 0.1.3 + - hie-bios < 0.13 # 2023-07-06: newer versions of stylish-haskell require # ghc-lib-parser-ex >= 9.6, but LTS-21 contains ghc-lib-parser-ex-9.4 - stylish-haskell < 0.14.5.0 + # 2023-09-17: reflex-dom 0.6.3.0 is broken https://github.com/reflex-frp/reflex-dom/issues/462 + - reflex-dom < 0.6.2.0 + # Only an older version of dependent-sum-template is compatible with ghc 9.4 # https://github.com/obsidiansystems/dependent-sum-template/issues/5 - dependent-sum-template < 0.1.2 @@ -121,6 +125,7 @@ extra-packages: - ormolu == 0.5.2.0 # 2023-08-08: for hls on ghc 9.0 and 9.2 - fourmolu == 0.9.0.0 # 2022-09-21: for hls on ghc 8.10 - fourmolu == 0.10.1.0 # 2023-04-18: for hls on ghc 9.0 and 9.2 + - fourmolu == 0.13.* # 2023-09-16: latest version compatible with hls 2.2.* on ghc 9.6 - mod == 0.1.2.2 # needed for hls on ghc 8.10 - pantry == 0.5.2.1 # needed for stack-2.7.3 - path == 0.9.0 # 2021-12-03: path version building with stackage genvalidity and GHC 9.0.2 @@ -128,6 +133,7 @@ extra-packages: - sbv == 7.13 # required for pkgs.petrinizer - stylish-haskell == 0.14.3.0 # 2022-09-19: needed for hls on ghc 8.8 - tasty-hspec == 1.1.6 # 2022-04-07: Needed for elm-format + - text == 2.0.2 # 2023-09-14: Needed for elm (which is currently on ghc-8.10) - th-abstraction < 0.6 # 2023-09-11: needed for aeson-2.2.0.0 - vty == 5.35.1 # 2022-07-08: needed for glirc-2.39.0.1 - weeder == 2.2.* # 2022-02-21: preserve for GHC 8.10.7 @@ -656,7 +662,7 @@ unsupported-platforms: Raincat: [ platforms.darwin ] reactive-balsa: [ platforms.darwin ] # depends on alsa-core reflex-dom-fragment-shader-canvas: [ platforms.darwin, aarch64-linux ] - reflex-dom: [ platforms.darwin, aarch64-linux ] + reflex-dom: [ platforms.darwin ] reflex-localize-dom: [ platforms.darwin, aarch64-linux ] rtlsdr: [ platforms.darwin ] rubberband: [ platforms.darwin ] @@ -682,7 +688,7 @@ unsupported-platforms: webkit2gtk3-javascriptcore: [ platforms.darwin ] wiringPi: [ aarch64-darwin ] xattr: [ platforms.darwin ] - xgboost-haskell: [ aarch64-linux, armv7l-linux ] + xgboost-haskell: [ aarch64-linux, armv7l-linux, platforms.darwin ] xmobar: [ platforms.darwin ] xmonad-extras: [ platforms.darwin ] xmonad-volume: [ platforms.darwin ] @@ -707,6 +713,7 @@ supported-platforms: evdev: [ platforms.linux ] evdev-streamly: [ platforms.linux ] geomancy: [ platforms.x86 ] # x86 intrinsics + geomancy-layout: [ platforms.x86 ] # x86 intrinsics gi-gtkosxapplication: [ platforms.darwin ] gtk-mac-integration: [ platforms.darwin ] gtk3-mac-integration: [ platforms.darwin ] diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index aad7f3182909f..9f46ba60bdfec 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 21.7 +# Stackage LTS 21.11 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -16,12 +16,12 @@ default-package-overrides: - adjunctions ==4.4.2 - adler32 ==0.1.2.0 - advent-of-code-api ==0.2.8.4 - - aern2-mp ==0.2.15.0 + - aern2-mp ==0.2.15.1 - aern2-real ==0.2.15 - aeson ==2.1.2.1 - aeson-attoparsec ==0.0.0 - aeson-casing ==0.2.0.0 - - aeson-combinators ==0.1.0.1 + - aeson-combinators ==0.1.1.0 - aeson-diff ==1.1.0.13 - aeson-extra ==0.5.1.2 - aeson-generic-compat ==0.0.1.3 @@ -54,7 +54,7 @@ default-package-overrides: - ALUT ==2.4.0.3 - amqp ==0.22.1 - amqp-utils ==0.6.3.2 - - annotated-exception ==0.2.0.4 + - annotated-exception ==0.2.0.5 - annotated-wl-pprint ==0.7.0 - ansi-terminal ==0.11.5 - ansi-terminal-game ==1.9.1.3 @@ -92,7 +92,7 @@ default-package-overrides: - asn1-encoding ==0.9.6 - asn1-parse ==0.9.5 - asn1-types ==0.3.4 - - assert-failure ==0.1.2.6 + - assert-failure ==0.1.3.0 - assoc ==1.1 - astro ==0.4.3.0 - async ==2.2.4 @@ -195,7 +195,7 @@ default-package-overrides: - bits ==0.6 - bitset-word8 ==0.1.1.2 - bits-extra ==0.0.2.3 - - bitvec ==1.1.4.0 + - bitvec ==1.1.5.0 - bitwise-enum ==1.0.1.2 - blake2 ==0.3.0 - Blammo ==1.1.2.1 @@ -206,7 +206,7 @@ default-package-overrides: - blas-ffi ==0.1 - blas-hs ==0.1.1.0 - blaze-bootstrap ==0.1.0.1 - - blaze-builder ==0.4.2.2 + - blaze-builder ==0.4.2.3 - blaze-colonnade ==1.2.2.1 - blaze-html ==0.9.1.2 - blaze-markup ==0.8.2.8 @@ -233,7 +233,7 @@ default-package-overrides: - boundingboxes ==0.2.3 - box ==0.9.2.0 - boxes ==0.1.5 - - breakpoint ==0.1.2.1 + - breakpoint ==0.1.2.2 - brick ==1.9 - broadcast-chan ==0.2.1.2 - brotli ==0.0.0.1 @@ -294,7 +294,7 @@ default-package-overrides: - ca-province-codes ==1.0.0.0 - cardano-coin-selection ==1.0.1 - carray ==0.1.6.8 - - casa-client ==0.0.1 + - casa-client ==0.0.2 - casa-types ==0.0.2 - cased ==0.1.0.0 - case-insensitive ==1.2.1.0 @@ -326,9 +326,9 @@ default-package-overrides: - checkers ==0.6.0 - checksum ==0.0.0.1 - chimera ==0.3.3.0 - - choice ==0.2.2 + - choice ==0.2.3 - chronologique ==0.3.1.3 - - chronos ==1.1.5 + - chronos ==1.1.5.1 - chronos-bench ==0.2.0.2 - chunked-data ==0.3.1 - cipher-aes ==0.2.11 @@ -347,7 +347,7 @@ default-package-overrides: - closed ==0.2.0.2 - clumpiness ==0.17.0.2 - ClustalParser ==1.3.0 - - cmark-gfm ==0.2.5 + - cmark-gfm ==0.2.6 - cmdargs ==0.10.22 - codec-beam ==0.2.0 - code-conjure ==0.5.2 @@ -391,7 +391,7 @@ default-package-overrides: - concise ==0.1.0.1 - concurrency ==1.11.0.3 - concurrent-extra ==0.7.0.12 - - concurrent-output ==1.10.18 + - concurrent-output ==1.10.19 - concurrent-split ==0.0.1.1 - cond ==0.4.1.1 - conduino ==0.2.2.0 @@ -484,7 +484,7 @@ default-package-overrides: - curl ==1.3.8 - curl-runnings ==0.17.0 - currency ==0.2.0.0 - - currycarbon ==0.2.1.1 + - currycarbon ==0.2.1.2 - cursor ==0.3.2.0 - cursor-brick ==0.1.0.1 - cursor-fuzzy-time ==0.0.0.0 @@ -560,7 +560,7 @@ default-package-overrides: - deriving-compat ==0.6.5 - deriving-trans ==0.5.2.0 - detour-via-sci ==1.0.0 - - df1 ==0.4.1 + - df1 ==0.4.2 - dhall ==1.41.2 - dhall-bash ==1.0.40 - dhall-json ==1.7.11 @@ -586,7 +586,7 @@ default-package-overrides: - digits ==0.3.1 - di-handle ==1.0.1 - dimensional ==1.5 - - di-monad ==1.3.1 + - di-monad ==1.3.2 - directory-tree ==0.12.1 - direct-sqlite ==2.3.28 - dirichlet ==0.1.0.7 @@ -599,7 +599,7 @@ default-package-overrides: - distributive ==0.6.2.1 - diversity ==0.8.1.0 - djinn-lib ==0.0.1.4 - - dl-fedora ==0.9.5.1 + - dl-fedora ==0.9.6 - dlist ==1.0 - dlist-instances ==0.1.1.1 - dlist-nonempty ==0.1.3 @@ -637,7 +637,7 @@ default-package-overrides: - dual ==0.1.1.1 - dual-tree ==0.2.3.1 - dublincore-xml-conduit ==0.1.0.3 - - dunai ==0.11.1 + - dunai ==0.11.2 - duration ==0.2.0.0 - dvorak ==0.1.0.0 - dynamic-state ==0.3.1 @@ -700,7 +700,7 @@ default-package-overrides: - errors ==2.3.0 - errors-ext ==0.4.2 - ersatz ==0.4.13 - - esqueleto ==3.5.10.1 + - esqueleto ==3.5.10.3 - event-list ==0.1.2 - eventstore ==1.4.2 - every ==0.0.1 @@ -709,7 +709,7 @@ default-package-overrides: - exact-pi ==0.5.0.2 - exception-hierarchy ==0.1.0.8 - exception-mtl ==0.4.0.2 - - exception-transformers ==0.4.0.11 + - exception-transformers ==0.4.0.12 - executable-hash ==0.2.0.4 - executable-path ==0.0.3.1 - exinst ==0.9 @@ -894,8 +894,8 @@ default-package-overrides: - ghci-hexcalc ==0.1.1.0 - ghcjs-codemirror ==0.0.0.2 - ghcjs-perch ==0.3.3.3 - - ghc-lib ==9.4.6.20230808 - - ghc-lib-parser ==9.4.6.20230808 + - ghc-lib ==9.4.7.20230826 + - ghc-lib-parser ==9.4.7.20230826 - ghc-lib-parser-ex ==9.4.0.0 - ghc-paths ==0.1.0.12 - ghc-prof ==1.4.1.12 @@ -984,7 +984,7 @@ default-package-overrides: - hackage-security ==0.6.2.3 - haddock-library ==1.11.0 - haha ==0.3.1.1 - - hakyll ==4.16.0.0 + - hakyll ==4.16.1.0 - hal ==1.0.0.1 - half ==0.3.1 - hall-symbols ==0.1.0.6 @@ -1026,7 +1026,7 @@ default-package-overrides: - hasql-interpolate ==0.1.0.4 - hasql-listen-notify ==0.1.0 - hasql-migration ==0.3.0 - - hasql-notifications ==0.2.0.5 + - hasql-notifications ==0.2.0.6 - hasql-optparse-applicative ==0.7 - hasql-pool ==0.9.0.1 - hasql-queue ==1.2.0.2 @@ -1080,7 +1080,7 @@ default-package-overrides: - hkd-default ==1.1.0.0 - hkgr ==0.4.3.1 - hledger ==1.30.1 - - hledger-interest ==1.6.5 + - hledger-interest ==1.6.6 - hledger-lib ==1.30 - hledger-stockquotes ==0.1.2.1 - hledger-ui ==1.30 @@ -1114,7 +1114,7 @@ default-package-overrides: - HPDF ==1.6.1 - hpp ==0.6.5 - hpqtypes ==1.11.1.1 - - hpqtypes-extras ==1.16.4.3 + - hpqtypes-extras ==1.16.4.4 - hreader ==1.1.0 - hreader-lens ==0.1.3.0 - hruby ==0.5.0.0 @@ -1196,7 +1196,7 @@ default-package-overrides: - HTTP ==4000.4.1 - http-api-data ==0.5 - http-api-data-qq ==0.1.0.0 - - http-client ==0.7.13.1 + - http-client ==0.7.14 - http-client-openssl ==0.3.3 - http-client-overrides ==0.1.1.0 - http-client-restricted ==0.0.5 @@ -1209,7 +1209,7 @@ default-package-overrides: - httpd-shed ==0.4.1.1 - http-io-streams ==0.1.6.2 - http-link-header ==1.2.1 - - http-media ==0.8.0.0 + - http-media ==0.8.1.0 - http-query ==0.1.3 - http-reverse-proxy ==0.6.0.1 - http-streams ==0.8.9.8 @@ -1318,7 +1318,7 @@ default-package-overrides: - io-storage ==0.3 - io-streams ==1.5.2.2 - io-streams-haproxy ==1.0.1.0 - - ip ==1.7.6 + - ip ==1.7.7 - ip6addr ==1.0.3 - iproute ==1.7.12 - IPv6Addr ==2.0.5.1 @@ -1420,7 +1420,7 @@ default-package-overrides: - leapseconds-announced ==2017.1.0.1 - learn-physics ==0.6.5 - leb128-cereal ==1.2 - - lens ==5.2.2 + - lens ==5.2.3 - lens-action ==0.2.6 - lens-aeson ==1.2.3 - lens-csv ==0.1.1.0 @@ -1546,12 +1546,12 @@ default-package-overrides: - mfsolve ==0.3.2.2 - microaeson ==0.1.0.1 - microlens ==0.4.13.1 - - microlens-aeson ==2.5.0 + - microlens-aeson ==2.5.1 - microlens-contra ==0.1.0.3 - microlens-ghc ==0.4.14.1 - microlens-mtl ==0.2.0.3 - microlens-platform ==0.4.3.3 - - microlens-th ==0.4.3.13 + - microlens-th ==0.4.3.14 - microspec ==0.2.1.3 - microstache ==1.0.2.3 - midair ==0.2.0.1 @@ -1584,7 +1584,7 @@ default-package-overrides: - mock-time ==0.1.0 - mod ==0.2.0.1 - model ==0.5 - - modern-uri ==0.3.6.0 + - modern-uri ==0.3.6.1 - modular ==0.1.0.8 - monad-chronicle ==1.0.1 - monad-control ==1.0.3.1 @@ -1618,7 +1618,7 @@ default-package-overrides: - mongoDB ==2.7.1.2 - monoidal-containers ==0.6.4.0 - monoid-extras ==0.6.2 - - monoid-subclasses ==1.2.3 + - monoid-subclasses ==1.2.4 - monoid-transformer ==0.0.4 - mono-traversable ==1.0.15.3 - mono-traversable-instances ==0.1.1.0 @@ -1645,7 +1645,7 @@ default-package-overrides: - multi-containers ==0.2 - multimap ==1.2.1 - multipart ==0.2.1 - - MultipletCombiner ==0.0.4 + - MultipletCombiner ==0.0.6 - multiset ==0.3.4.3 - murmur3 ==1.0.5 - murmur-hash ==0.1.0.10 @@ -1711,7 +1711,7 @@ default-package-overrides: - NoHoed ==0.1.1 - nonce ==1.0.7 - nondeterminism ==1.5 - - non-empty ==0.3.3 + - non-empty ==0.3.4 - nonempty-containers ==0.3.4.4 - nonemptymap ==0.0.6.0 - non-empty-sequence ==0.2.0.4 @@ -1852,7 +1852,7 @@ default-package-overrides: - pem ==0.2.4 - percent-format ==0.0.4 - perfect-hash-generator ==1.0.0 - - persistent ==2.14.5.1 + - persistent ==2.14.5.2 - persistent-discover ==0.1.0.6 - persistent-documentation ==0.1.0.4 - persistent-iproute ==0.2.5 @@ -1872,7 +1872,7 @@ default-package-overrides: - pg-harness-client ==0.6.0 - pgp-wordlist ==0.1.0.3 - pg-transact ==0.3.2.0 - - phantom-state ==0.2.1.2 + - phantom-state ==0.2.1.3 - phatsort ==0.6.0.0 - picosat ==0.1.6 - pid1 ==0.1.3.1 @@ -1908,7 +1908,7 @@ default-package-overrides: - poly-arity ==0.1.0 - polynomials-bernstein ==1.1.2 - polyparse ==1.13 - - polysemy ==1.9.1.0 + - polysemy ==1.9.1.1 - polysemy-fs ==0.1.0.0 - polysemy-plugin ==0.4.5.0 - polysemy-webserver ==0.2.1.2 @@ -1991,7 +1991,7 @@ default-package-overrides: - pulse-simple ==0.1.14 - pureMD5 ==2.1.4 - purescript-bridge ==0.15.0.0 - - pusher-http-haskell ==2.1.0.15 + - pusher-http-haskell ==2.1.0.16 - pvar ==1.0.0.0 - pwstore-fast ==2.4.4 - PyF ==0.11.1.1 @@ -2052,7 +2052,6 @@ default-package-overrides: - rawstring-qm ==0.2.3.0 - raw-strings-qq ==1.1 - rcu ==0.2.7 - - rdf ==0.1.0.7 - rdtsc ==1.3.0.1 - re2 ==0.3 - reactive-balsa ==0.4.0.1 @@ -2064,14 +2063,14 @@ default-package-overrides: - read-editor ==0.1.0.2 - read-env-var ==1.0.0.0 - rebase ==1.19 - - rec-def ==0.2.1 + - rec-def ==0.2.2 - record-dot-preprocessor ==0.2.16 - record-hasfield ==1.0 - recursion-schemes ==5.2.2.4 - recv ==0.1.0 - redact ==0.5.0.0 - reddit-scrape ==0.0.1 - - redis-glob ==0.1.0.5 + - redis-glob ==0.1.0.6 - reducers ==3.12.4 - refact ==0.3.0.2 - ref-fd ==0.5.0.1 @@ -2123,7 +2122,7 @@ default-package-overrides: - riak-protobuf ==0.25.0.0 - rio ==0.1.22.0 - rio-orphans ==0.1.2.0 - - rio-prettyprint ==0.1.4.0 + - rio-prettyprint ==0.1.5.0 - rng-utils ==0.3.1 - rocksdb-haskell ==1.0.1 - rocksdb-haskell-jprupp ==2.1.4 @@ -2158,7 +2157,7 @@ default-package-overrides: - safe-exceptions-checked ==0.1.0 - safe-foldable ==0.1.0.0 - safe-gen ==1.0.1 - - safeio ==0.0.5.0 + - safeio ==0.0.6.0 - safe-json ==1.1.4.0 - safe-money ==0.9.1 - SafeSemaphore ==0.10.1 @@ -2266,7 +2265,7 @@ default-package-overrides: - shared-memory ==0.2.0.1 - shell-conduit ==5.0.0 - shell-escape ==0.2.0 - - shelltestrunner ==1.9 + - shelltestrunner ==1.9.0.1 - shell-utility ==0.1 - shellwords ==0.1.3.1 - shelly ==1.12.1 @@ -2307,7 +2306,7 @@ default-package-overrides: - skylighting ==0.13.4.1 - skylighting-core ==0.13.4.1 - skylighting-format-ansi ==0.1 - - skylighting-format-blaze-html ==0.1.1 + - skylighting-format-blaze-html ==0.1.1.1 - skylighting-format-context ==0.1.0.2 - skylighting-format-latex ==0.1 - slack-progressbar ==0.1.0.1 @@ -2360,7 +2359,7 @@ default-package-overrides: - srtree ==1.0.0.5 - stache ==2.3.4 - stack-all ==0.4.1 - - stack-clean-old ==0.4.6 + - stack-clean-old ==0.4.8 - stack-templatizer ==0.1.1.0 - state-codes ==0.1.3 - stateref ==0.3 @@ -2400,7 +2399,6 @@ default-package-overrides: - streaming-commons ==0.2.2.6 - streaming-wai ==0.1.1 - streamly ==0.9.0 - - streamly-bytestring ==0.2.0 - streamly-core ==0.1.0 - streamly-examples ==0.1.3 - streamly-process ==0.3.0 @@ -2440,7 +2438,7 @@ default-package-overrides: - SVGFonts ==1.8.0.1 - svg-tree ==0.6.2.4 - swagger2 ==2.8.7 - - swish ==0.10.4.0 + - swish ==0.10.5.0 - syb ==0.7.2.4 - sydtest ==0.15.1.0 - sydtest-aeson ==0.1.0.0 @@ -2546,12 +2544,12 @@ default-package-overrides: - test-fun ==0.1.0.0 - testing-feat ==1.1.1.1 - testing-type-modifiers ==0.1.0.1 - - texmath ==0.12.8 + - texmath ==0.12.8.2 - text-ansi ==0.2.1.1 - text-binary ==0.2.1.1 - text-builder ==0.6.7 - text-builder-dev ==0.3.3.2 - - text-builder-linear ==0.1.1 + - text-builder-linear ==0.1.1.1 - text-conversions ==0.3.1.1 - text-format ==0.3.2.1 - text-icu ==0.8.0.2 @@ -2609,7 +2607,7 @@ default-package-overrides: - time-lens ==0.4.0.2 - time-locale-compat ==0.1.1.5 - time-locale-vietnamese ==1.0.0.0 - - time-manager ==0.0.0 + - time-manager ==0.0.1 - time-parsers ==0.2 - timerep ==2.1.0.0 - timers-tick ==0.5.0.4 @@ -2634,7 +2632,7 @@ default-package-overrides: - token-bucket ==0.1.0.1 - toml-reader ==0.2.1.0 - toml-reader-parse ==0.1.1.1 - - tophat ==1.0.6.0 + - tophat ==1.0.6.1 - topograph ==1.0.0.2 - torrent ==10000.1.3 - torsor ==0.1 @@ -2687,7 +2685,7 @@ default-package-overrides: - type-rig ==0.1 - type-spec ==0.4.0.0 - typography-geometry ==1.0.1.0 - - typst-symbols ==0.1.2 + - typst-symbols ==0.1.4 - tz ==0.1.3.6 - tzdata ==0.2.20230322.0 - tztime ==0.1.0.0 @@ -2705,7 +2703,7 @@ default-package-overrides: - unexceptionalio-trans ==0.5.1 - unfork ==1.0.0.1 - unicode ==0.0.1.1 - - unicode-collation ==0.1.3.4 + - unicode-collation ==0.1.3.5 - unicode-data ==0.4.0.1 - unicode-show ==0.1.1.1 - unicode-transforms ==0.4.0.1 @@ -2803,7 +2801,7 @@ default-package-overrides: - void ==0.7.3 - vty ==5.38 - wai ==3.2.3 - - wai-app-static ==3.1.7.4 + - wai-app-static ==3.1.8 - wai-cli ==0.2.3 - wai-conduit ==3.0.0.4 - wai-control ==0.2.0.0 @@ -2875,7 +2873,7 @@ default-package-overrides: - word-wrap ==0.5 - world-peace ==1.0.2.0 - wrap ==0.0.0 - - wreq ==0.5.4.1 + - wreq ==0.5.4.2 - wreq-stringless ==0.5.9.1 - writer-cps-exceptions ==0.1.0.1 - writer-cps-mtl ==0.1.1.6 @@ -2933,7 +2931,7 @@ default-package-overrides: - yesod-core ==1.6.24.4 - yesod-eventsource ==1.6.0.1 - yesod-fb ==0.6.1 - - yesod-form ==1.7.4 + - yesod-form ==1.7.6 - yesod-form-bootstrap4 ==3.0.1.1 - yesod-gitrepo ==0.3.0 - yesod-gitrev ==0.2.2 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 92800986c9713..2d33f3f2c1e36 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -482,9 +482,6 @@ dont-distribute-packages: - alsa-seq-tests - alto - amazon-emailer-client-snap - - amazonka-contrib-rds-utils - - amazonka-s3-encryption - - amazonka-s3-streaming - amby - ampersand - amqp-streamly @@ -500,17 +497,11 @@ dont-distribute-packages: - anonymous-sums-tests - antagonist - anticiv - - antiope-athena - antiope-contract - antiope-core - antiope-dynamodb - - antiope-es - - antiope-messages - - antiope-optparse-applicative - antiope-s3 - antiope-shell - - antiope-sns - - antiope-sqs - antlrc - apecs-gloss - apecs-physics-gloss @@ -587,7 +578,6 @@ dont-distribute-packages: - aws-configuration-tools - aws-dynamodb-conduit - aws-dynamodb-streams - - aws-easy - aws-elastic-transcoder - aws-kinesis - aws-kinesis-client @@ -596,9 +586,7 @@ dont-distribute-packages: - aws-mfa-credentials - aws-sdk - aws-sdk-xml-unordered - - aws-ses-easy - aws-sign4 - - aws-simple - aws-sns - axel - axiom @@ -698,7 +686,6 @@ dont-distribute-packages: - blink1 - blip - blogination - - bloodhound-amazonka-auth - bloxorz - blubber - bluetile @@ -741,7 +728,6 @@ dont-distribute-packages: - bytable - bytehash - bytelog - - bytepatch - bytestring-builder-varword - bytestring-read - ca @@ -773,7 +759,6 @@ dont-distribute-packages: - cao - cap - capnp - - caps - captcha-2captcha - captcha-capmonster - captcha-core @@ -899,8 +884,6 @@ dont-distribute-packages: - cmv - cnc-spec-compiler - co-feldspar - - co-log - - co-log-polysemy-formatting - cobot-io - codec - codec-libevent @@ -1003,8 +986,6 @@ dont-distribute-packages: - craftwerk-cairo - craftwerk-gtk - craze - - credentials - - credentials-cli - crf-chain1 - crf-chain1-constrained - crf-chain2-generic @@ -1205,11 +1186,9 @@ dont-distribute-packages: - dynamic-pipeline - dynamic-plot - dynamic-pp - - dynamodb-simple - dynobud - easytensor - easytensor-vulkan - - ec2-unikernel - ecdsa - edenskel - edentv @@ -1227,7 +1206,6 @@ dont-distribute-packages: - egison-tutorial - ekg - ekg-carbon - - ekg-cloudwatch - ekg-wai - elasticsearch-interchange - electrs-client @@ -1468,6 +1446,7 @@ dont-distribute-packages: - gargoyle-postgresql - gargoyle-postgresql-connect - gargoyle-postgresql-nix + - gbs-downloader - gbu - gdax - gdiff-ig @@ -1783,7 +1762,6 @@ dont-distribute-packages: - gridland - grisette - grisette-monad-coroutine - - groot - gross - groundhog-converters - groundhog-inspector @@ -2024,7 +2002,6 @@ dont-distribute-packages: - heavy-logger-instances - hecc - hedgehog-checkers-lens - - hedgehog-gen - hedgehog-gen-json - hedis-pile - heist-aeson @@ -2210,6 +2187,8 @@ dont-distribute-packages: - http-client-rustls - http-client-tls_0_3_6_3 - http-enumerator + - http-exchange + - http-exchange-instantiations - http-io-streams - http-response-decoder - http2-client-exe @@ -2230,7 +2209,6 @@ dont-distribute-packages: - hurl-xml - huzzy - hw-all - - hw-aws-sqs-conduit - hw-json - hw-json-demo - hw-json-lens @@ -2283,7 +2261,6 @@ dont-distribute-packages: - imj-base - imj-game-hamazed - imj-measure-stdout - - imm - imparse - imperative-edsl - imperative-edsl-vhdl @@ -2291,6 +2268,7 @@ dont-distribute-packages: - imprevu-happstack - improve - inch + - incipit - incremental-computing - incremental-maps - increments @@ -2391,7 +2369,8 @@ dont-distribute-packages: - json-query - json-rpc-client - json-schema - - json-spec + - json-spec-elm + - json-spec-elm-servant - json-spec-openapi - json-togo - json-tokens @@ -2833,7 +2812,7 @@ dont-distribute-packages: - nero-wai - nero-warp - nested-routes - - net-mqtt_0_8_5_0 + - net-mqtt_0_8_6_0 - net-spider - net-spider-cli - net-spider-pangraph @@ -2865,6 +2844,7 @@ dont-distribute-packages: - neuron - newsletter-mailgun - newsynth + - ngx-export-distribution - ngx-export-tools-extra - nikepub - nirum @@ -3082,6 +3062,8 @@ dont-distribute-packages: - polysemy-RandomFu - polysemy-account - polysemy-account-api + - polysemy-chronos + - polysemy-conc - polysemy-db - polysemy-extra - polysemy-fskvstore @@ -3089,12 +3071,16 @@ dont-distribute-packages: - polysemy-hasql-test - polysemy-http - polysemy-kvstore-jsonfile + - polysemy-log - polysemy-log-co + - polysemy-log-di - polysemy-methodology - polysemy-methodology-co-log - polysemy-methodology-composite - polysemy-path + - polysemy-resume - polysemy-scoped-fs + - polysemy-time - polysemy-uncontrolled - polysemy-video - polysemy-vinyl @@ -3123,7 +3109,6 @@ dont-distribute-packages: - potoki-conduit - potoki-hasql - potoki-zlib - - powerqueue-sqs - pqueue-mtl - practice-room - pred-set @@ -3168,9 +3153,6 @@ dont-distribute-packages: - proton - psc-ide - psql - - ptera - - ptera-core - - ptera-th - puffytools - pugs-compat - pugs-hsregex @@ -3267,6 +3249,7 @@ dont-distribute-packages: - rbr - rc - rdioh + - react - react-flux-servant - reactive - reactive-banana-sdl @@ -3579,6 +3562,7 @@ dont-distribute-packages: - shady-gen - shady-graphics - shake-bindist + - shake-futhark - shake-minify-css - shakebook - shaker @@ -3733,7 +3717,6 @@ dont-distribute-packages: - sql-simple-postgresql - sql-simple-sqlite - sqlite-simple-typed - - sqsd-local - squeal-postgresql - squeal-postgresql-ltree - squeal-postgresql-uuid-ossp @@ -3752,12 +3735,10 @@ dont-distribute-packages: - stackage - stackage-build-plan - stackage-cabal - - stackage-curator - stackage-query - stackage-sandbox - stackage-setup - stackage-upload - - stackage2nix - stackctl - starrover2 - stateful-mtl @@ -3847,6 +3828,7 @@ dont-distribute-packages: - tagsoup-navigate - tagstew - tahoe-chk + - tahoe-directory - tahoe-great-black-swamp - tahoe-ssk - tak-ai @@ -3918,11 +3900,6 @@ dont-distribute-packages: - tip-haskell-frontend - tip-lib - titan - - tlex - - tlex-core - - tlex-debug - - tlex-encoding - - tlex-th - tls-extra - tmpl - tn @@ -4317,6 +4294,7 @@ dont-distribute-packages: - zerobin - zeromq3-conduit - zeroth + - zeugma - zifter-cabal - zifter-git - zifter-google-java-format diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 6242b5af6f4f2..c0e514aed8c3d 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1070,29 +1070,29 @@ self: super: builtins.intersectAttrs super { domaindriven-core = dontCheck super.domaindriven-core; cachix-api = overrideCabal (drv: { - version = "1.6"; + version = "1.6.1"; src = pkgs.fetchFromGitHub { owner = "cachix"; repo = "cachix"; - rev = "v1.6"; - sha256 = "sha256-54ujAZYNigAn1oJAfupUtZHa0WRQbCQGLEfLmkw8iFc="; + rev = "v1.6.1"; + sha256 = "sha256-6S8EOs7bGTyY4eDXGuTbJMTlaz0n1JYIAPKIB2cVYxg="; }; postUnpack = "sourceRoot=$sourceRoot/cachix-api"; postPatch = '' - sed -i 's/1.5/1.6/' cachix-api.cabal + sed -i 's/1.6/1.6.1/' cachix-api.cabal ''; }) super.cachix-api; cachix = overrideCabal (drv: { - version = "1.6"; + version = "1.6.1"; src = pkgs.fetchFromGitHub { owner = "cachix"; repo = "cachix"; - rev = "v1.6"; - sha256 = "sha256-54ujAZYNigAn1oJAfupUtZHa0WRQbCQGLEfLmkw8iFc="; + rev = "v1.6.1"; + sha256 = "sha256-6S8EOs7bGTyY4eDXGuTbJMTlaz0n1JYIAPKIB2cVYxg="; }; postUnpack = "sourceRoot=$sourceRoot/cachix"; postPatch = '' - sed -i 's/1.5/1.6/' cachix.cabal + sed -i 's/1.6/1.6.1/' cachix.cabal ''; }) (lib.pipe (super.cachix.override { @@ -1102,7 +1102,7 @@ self: super: builtins.intersectAttrs super { [ (addBuildTool self.hercules-ci-cnix-store.nixPackage) (addBuildTool pkgs.pkg-config) - (addBuildDepend self.ascii-progress) + (addBuildDepend self.immortal) ] ); diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d6cc9f68a0914..f7749e4094a90 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2165,8 +2165,8 @@ self: { }: mkDerivation { pname = "BlogLiterately-diagrams"; - version = "0.3"; - sha256 = "0l9h8anjbvm49fg1niy4sg8cxr3fl1kvmqfb1lfdi5vypdgqqwms"; + version = "0.3.1"; + sha256 = "0yjdlwkgqz0788f57ddlkzmxdlxsnmzxy4456l4ni8610v220njj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -3575,8 +3575,8 @@ self: { }: mkDerivation { pname = "ConClusion"; - version = "0.2.1"; - sha256 = "095ygqh0si6ahv41hjkwnwfxwkz16pgriwwnw0v53bvbryjqfvja"; + version = "0.2.2"; + sha256 = "1zcminavp0yxj514mnvncyc78gqf1x0pcsj2pqxg5znbqjsp09qa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -6750,10 +6750,8 @@ self: { ({ mkDerivation, base, base-compat, GLUT, OpenGL, random }: mkDerivation { pname = "FunGEn"; - version = "1.1.1"; - sha256 = "167bf5p4qcb9wj89x5i5zjjx1f7pmi6s5xbbh43ljhp1f25s9147"; - revision = "2"; - editedCabalFile = "1dffca6qm0x5j0b2rii6r9ilsbvsg3ilsv4a05kzmpdsd94b5j16"; + version = "1.2"; + sha256 = "0hr5rx6b80ra4sndsdag3q2gjnwb01fwnsk39fyd0l9cca8p1s82"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -11288,8 +11286,8 @@ self: { pname = "HsYAML"; version = "0.2.1.1"; sha256 = "0a7nbvpl4p8kwbbjfn1dj6s3fif5k8zhbckdvyz1k74pj3yb8ns6"; - revision = "4"; - editedCabalFile = "1ai0y5jmj68q1rami0hdg34rflammpagb96sww4fkbr127cbdwhx"; + revision = "5"; + editedCabalFile = "018lvykffss0mmip9qr9bhqrmxvsznxwfyqi8jqi85r5vjy97n6h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -13207,6 +13205,8 @@ self: { pname = "ListLike"; version = "4.7.8.1"; sha256 = "10i1ynfhafnmiw0ka9w0v05y5dcdcifsh0kx5f8py1k5ax1ha4by"; + revision = "1"; + editedCabalFile = "1kalhs60wszshvni5awwnmr7bzbz0j602z76lik44arcxghf3ck8"; libraryHaskellDepends = [ array base bytestring containers deepseq dlist fmlist text utf8-string vector @@ -14024,6 +14024,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "MissingH_1_6_0_1" = callPackage + ({ mkDerivation, array, base, containers, directory, filepath + , hslogger, HUnit, mtl, network, network-bsd, old-locale, old-time + , parsec, process, regex-compat, time, unix + }: + mkDerivation { + pname = "MissingH"; + version = "1.6.0.1"; + sha256 = "0f5d7ws2vqm1vpwjab9cp691jn5j3dxycfn4w5p1rb4aim504aa9"; + libraryHaskellDepends = [ + array base containers directory filepath hslogger mtl network + network-bsd old-locale old-time parsec process regex-compat time + unix + ]; + testHaskellDepends = [ + base containers directory filepath HUnit old-time parsec + regex-compat time unix + ]; + description = "Large utility library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "MissingK" = callPackage ({ mkDerivation, base, glib, template-haskell }: mkDerivation { @@ -14498,12 +14521,25 @@ self: { ({ mkDerivation, base, HUnit }: mkDerivation { pname = "MultipletCombiner"; - version = "0.0.4"; - sha256 = "13sps65mxr4jczw8b08civylzvsqdh1zy8h2miz27c9lr2wxmqj8"; + version = "0.0.6"; + sha256 = "18kfn355zib3mhssm4zqnr3ily4snxsjnkxhca453vhhs6n8fca2"; + libraryHaskellDepends = [ base HUnit ]; + testHaskellDepends = [ base HUnit ]; + description = "A Haskell implementation for combining SU(n) multiplets"; + license = lib.licenses.bsd3; + }) {}; + + "MultipletCombiner_0_0_7" = callPackage + ({ mkDerivation, base, HUnit }: + mkDerivation { + pname = "MultipletCombiner"; + version = "0.0.7"; + sha256 = "19x0dw5jisxzbb739z8l5mh8kbd3nixqn0x3q10qzlgvczh91hj2"; libraryHaskellDepends = [ base HUnit ]; testHaskellDepends = [ base HUnit ]; description = "A Haskell implementation for combining SU(n) multiplets"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "Munkres" = callPackage @@ -18524,6 +18560,8 @@ self: { pname = "STMonadTrans"; version = "0.4.7"; sha256 = "1x83f48wbzx6rzbls6h8walfayzdv4j3j1mqbk8lfnkdqff9ri5d"; + revision = "1"; + editedCabalFile = "01zfv7jdqf8wfmgxx2gdb1nik93iqvkmblrd18py5hy5mpbxp9dy"; libraryHaskellDepends = [ array base mtl transformers ]; testHaskellDepends = [ array base tasty tasty-hunit tasty-quickcheck transformers @@ -25381,8 +25419,8 @@ self: { }: mkDerivation { pname = "aern2-mp"; - version = "0.2.15.0"; - sha256 = "04kjjd86q2hj13y8dvnqfir6dhqy2n5nx6xr7q19f0j0sc0654vl"; + version = "0.2.15.1"; + sha256 = "1s1znj80frx9dqwqp294jzafyqrg9p0pkdqhhcgzzqi9f2iqxhmv"; libraryHaskellDepends = [ base cdar-mBound collect-errors deepseq hspec integer-logarithms mixed-types-num QuickCheck reflection regex-tdfa template-haskell @@ -25624,8 +25662,8 @@ self: { }: mkDerivation { pname = "aeson-combinators"; - version = "0.1.0.1"; - sha256 = "1vpsw29336xcybr87xj3k573qf2j7qxgv9wd7fccpcahgixpp2db"; + version = "0.1.1.0"; + sha256 = "09cig73947z1z76m572s2cs8kjz6lj3h923rcpmysi36f8hn8q9f"; libraryHaskellDepends = [ aeson base bytestring containers fail scientific text time time-compat unordered-containers uuid-types vector void @@ -28054,6 +28092,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "allen" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , mtl, QuickCheck, text, vector + }: + mkDerivation { + pname = "allen"; + version = "0.1.0.0"; + sha256 = "04kj463151iy5b9gsvhi2q9jx7iwbiad6azckzccnr6jzrg8jfpd"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers mtl vector ]; + executableHaskellDepends = [ + aeson base bytestring containers mtl text vector + ]; + testHaskellDepends = [ base containers mtl QuickCheck vector ]; + benchmarkHaskellDepends = [ base containers criterion mtl vector ]; + description = "A monadic way of calculating relations between intervals of time"; + license = lib.licenses.bsd3; + mainProgram = "allen-calculator"; + }) {}; + "allocated-processor" = callPackage ({ mkDerivation, base, vector-space }: mkDerivation { @@ -28620,8 +28679,6 @@ self: { ]; description = "Comprehensive Amazon Web Services SDK"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "amazonka-accessanalyzer" = callPackage @@ -30010,7 +30067,6 @@ self: { ]; description = "A Haskell equivalent of \"aws rds generate-db-auth-token\""; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; mainProgram = "generate-db-auth-token"; }) {}; @@ -33587,27 +33643,25 @@ self: { ]; description = "Amazon Simple Storage Service SDK - Client-Side Encryption"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; }) {}; "amazonka-s3-streaming" = callPackage - ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, async, base - , bytestring, conduit, dlist, exceptions, http-client, lens, mmorph - , mtl + ({ mkDerivation, amazonka, amazonka-s3, async, base, bytestring + , conduit, deepseq, exceptions, http-client, http-client-tls + , resourcet, text, transformers }: mkDerivation { pname = "amazonka-s3-streaming"; - version = "1.1.0.0"; - sha256 = "0w5jqqc6m1cnhwdhyfb2k5kc9fzn499y2s9jkpsfqxpqynsivlwa"; + version = "2.0.0.0"; + sha256 = "1kfysyh0g8m2d2c6dmsxam3s9crrlg9dgwvw11b4py7i3vkmx495"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - amazonka amazonka-core amazonka-s3 async base bytestring conduit - dlist exceptions http-client lens mmorph mtl + amazonka amazonka-s3 async base bytestring conduit deepseq + exceptions http-client http-client-tls resourcet text transformers ]; description = "Provides conduits to upload data to S3 using the Multipart API"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "amazonka-s3outposts" = callPackage @@ -34929,6 +34983,8 @@ self: { pname = "amqp-utils"; version = "0.6.3.2"; sha256 = "1qdhp96zqcjd8yd2hmg7c2cl9gdvywp1p3v1xjcax9si5pr83w1i"; + revision = "1"; + editedCabalFile = "062l0xawak87hp6xni7mz4w5dr9za30nm1shzpc88jm7618hndl9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -34964,33 +35020,33 @@ self: { }) {}; "amqp-worker" = callPackage - ({ mkDerivation, aeson, amqp, base, bytestring, data-default - , exceptions, monad-control, monad-loops, mtl, resource-pool - , server, split, text, transformers-base + ({ mkDerivation, aeson, amqp, base, bytestring, exceptions + , monad-loops, mtl, resource-pool, text }: mkDerivation { pname = "amqp-worker"; - version = "0.3.2"; - sha256 = "0w6nz5crrvr8wb0ylszl3ckxc17pll03swr30zvpqaz855pqriw3"; + version = "2.0.0"; + sha256 = "0jnyrd7xmk66qi5kkmjc8r57zck064yfkrmgddnw288qzcq5051d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson amqp base bytestring data-default exceptions monad-control - monad-loops mtl resource-pool split text transformers-base + aeson amqp base bytestring exceptions monad-loops mtl resource-pool + text ]; executableHaskellDepends = [ - aeson amqp base bytestring data-default exceptions monad-control - monad-loops mtl resource-pool split text transformers-base + aeson amqp base bytestring exceptions monad-loops mtl resource-pool + text ]; testHaskellDepends = [ - aeson amqp base bytestring data-default exceptions monad-control - monad-loops mtl resource-pool server split text transformers-base + aeson amqp base bytestring exceptions monad-loops mtl resource-pool + text ]; + description = "Type-safe AMQP workers"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "example"; broken = true; - }) {server = null;}; + }) {}; "amrun" = callPackage ({ mkDerivation, base, deepseq, parsec }: @@ -35485,8 +35541,8 @@ self: { }: mkDerivation { pname = "annotated-exception"; - version = "0.2.0.4"; - sha256 = "090mv2a0k4mrhspa7wj62krl5m9y3c33nnr5m39qqdhgys37qrmb"; + version = "0.2.0.5"; + sha256 = "1gxmnd4qffybh2fpx8kns4y7figf2zfwgckhcfcvwqpb040k8i3g"; libraryHaskellDepends = [ base containers safe-exceptions text unliftio-core ]; @@ -35832,7 +35888,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "antiope-contract" = callPackage @@ -35916,7 +35971,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "antiope-messages" = callPackage @@ -35941,7 +35995,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "antiope-optparse-applicative" = callPackage @@ -35963,7 +36016,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "antiope-s3" = callPackage @@ -36046,7 +36098,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "antiope-sqs" = callPackage @@ -36073,7 +36124,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "antiope-swf" = callPackage @@ -37786,24 +37836,25 @@ self: { }) {}; "arbtt" = callPackage - ({ mkDerivation, aeson, array, attoparsec, base, binary, bytestring - , bytestring-progress, conduit, containers, deepseq, directory - , exceptions, filepath, mtl, parsec, pcre-light, process-extras - , resourcet, strict, tasty, tasty-golden, tasty-hunit - , terminal-progress-bar, text, time, transformers, tz, unix - , unliftio-core, utf8-string, X11 + ({ mkDerivation, aeson, array, attoparsec, attoparsec-aeson, base + , binary, bytestring, bytestring-progress, conduit, containers + , deepseq, directory, exceptions, filepath, mtl, parsec, pcre-light + , process-extras, resourcet, strict, tasty, tasty-golden + , tasty-hunit, terminal-progress-bar, text, time, transformers, tz + , unix, unliftio-core, utf8-string, X11 }: mkDerivation { pname = "arbtt"; - version = "0.12.0.2"; - sha256 = "022jb9bi9jxqiv3f2cfkpi1m6zwp719x9xnq2xnhy2hysz3x1ss6"; + version = "0.12.0.3"; + sha256 = "1wgc17fwnsqff8amwvv6jymhwjqrw653simv6gyxx89s1cla954d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson array attoparsec base binary bytestring bytestring-progress - conduit containers deepseq directory exceptions filepath mtl parsec - pcre-light resourcet strict terminal-progress-bar text time - transformers tz unix unliftio-core utf8-string X11 + aeson array attoparsec attoparsec-aeson base binary bytestring + bytestring-progress conduit containers deepseq directory exceptions + filepath mtl parsec pcre-light resourcet strict + terminal-progress-bar text time transformers tz unix unliftio-core + utf8-string X11 ]; testHaskellDepends = [ base binary bytestring containers deepseq directory mtl parsec @@ -37859,6 +37910,8 @@ self: { pname = "arch-hs"; version = "0.11.1.0"; sha256 = "1f50id3xplp8zwi379n6xi4in01gms97qbqnfxnsqzrv47xszwj4"; + revision = "1"; + editedCabalFile = "1kpjz5x3f0g1jz0bkji0xnysgzbvg4livjgg4bbq3r1123d3rryy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38627,8 +38680,8 @@ self: { }: mkDerivation { pname = "array-builder"; - version = "0.1.3.0"; - sha256 = "1al32j1akh83lsmzppkv0290xz42qndfsqnyyx568v8q0lfgw605"; + version = "0.1.4.0"; + sha256 = "03ry85miknhj8r21wbnmdixg114l5jg7dssvalnlykr8m6p0h3lf"; libraryHaskellDepends = [ array-chunks base bytebuild byteslice bytestring natural-arithmetic primitive run-st text-short @@ -38644,10 +38697,8 @@ self: { }: mkDerivation { pname = "array-chunks"; - version = "0.1.3.0"; - sha256 = "0alf0d4ifla7i47pl7xqmrhcwsky56rp4b76qgmh19kji8mfcq5z"; - revision = "1"; - editedCabalFile = "1vv5lsn44aq48yinl9ljm433g00cj44laldd3bdv08v979qjzs3j"; + version = "0.1.4.0"; + sha256 = "0m2719qyfpv5d9sm5wyyxcaq48fyggabjya9m5zx7idh94sqqm3p"; libraryHaskellDepends = [ base primitive run-st ]; testHaskellDepends = [ base primitive QuickCheck quickcheck-classes tasty tasty-hunit @@ -39632,8 +39683,8 @@ self: { ({ mkDerivation, base, pretty-show, text }: mkDerivation { pname = "assert-failure"; - version = "0.1.2.6"; - sha256 = "198bvr7wgshwmbl8gcgq91hz7d87ar6gkqhhp1xgsg1mqikqi02z"; + version = "0.1.3.0"; + sha256 = "0lbx22agc2rq119yf2d0fy5cchfbgvjln1w147iiwgvrqd0xgyff"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base pretty-show text ]; description = "Syntactic sugar improving 'assert' and 'error'"; @@ -42509,7 +42560,6 @@ self: { ]; description = "Helper function and types for working with amazonka"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "aws-easy-demo"; }) {}; @@ -42999,7 +43049,6 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Wrapper over Amazonka's SES"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "aws-sign4" = callPackage @@ -43041,7 +43090,6 @@ self: { ]; description = "Dead simple bindings to commonly used AWS Services"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "aws-sns" = callPackage @@ -44164,6 +44212,25 @@ self: { mainProgram = "barley"; }) {}; + "barlow-lens" = callPackage + ({ mkDerivation, base, first-class-families, generic-lens, lens + , profunctors, tasty, tasty-hunit + }: + mkDerivation { + pname = "barlow-lens"; + version = "0.1.0.2"; + sha256 = "1gw3r1hwk5j147lpz0pvhv92fd2kyfp7kdvw60dpnv4j5hhw6s24"; + libraryHaskellDepends = [ + base first-class-families generic-lens lens profunctors + ]; + testHaskellDepends = [ + base first-class-families generic-lens lens profunctors tasty + tasty-hunit + ]; + description = "lens via string literals"; + license = lib.licenses.bsd3; + }) {}; + "barrie" = callPackage ({ mkDerivation, base, containers, filepath, glib, gtk }: mkDerivation { @@ -44185,8 +44252,8 @@ self: { pname = "barrier"; version = "0.1.1"; sha256 = "1n8yx66lvyn90ixyvpjafrmhpgnznnqj9il5rixlr651xq0xm5b3"; - revision = "1"; - editedCabalFile = "167akvi72l47gcqbq5609m24469pq0xmv0kjbmivnrxs796gh890"; + revision = "2"; + editedCabalFile = "0b0va208hc9blny6pbzk2a7mc834xkafaza07a5liaccniach3m3"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -45050,6 +45117,29 @@ self: { broken = true; }) {}; + "basics" = callPackage + ({ mkDerivation, base, bifunctors, bytestring, primitive + , primitive-unlifted, quickcheck-instances, tasty, tasty-hunit + , tasty-quickcheck, text-short, transformers, wide-word + }: + mkDerivation { + pname = "basics"; + version = "0.2.0.0"; + sha256 = "1yf1lcb462h33whxq5x0zc2smbq5mvb6wj7r5x2ll4rgyzv5sv4r"; + libraryHaskellDepends = [ + base bifunctors bytestring primitive primitive-unlifted text-short + wide-word + ]; + testHaskellDepends = [ + base primitive quickcheck-instances tasty tasty-hunit + tasty-quickcheck transformers + ]; + description = "Modules for primitive types"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "baskell" = callPackage ({ mkDerivation, base, containers, mtl, parsec, pretty, unix }: mkDerivation { @@ -45389,6 +45479,26 @@ self: { mainProgram = "bazel-runfiles-exe"; }) {}; + "bbcode" = callPackage + ({ mkDerivation, base, containers, lens, megaparsec, mtl, text + , transformers + }: + mkDerivation { + pname = "bbcode"; + version = "0.1.0.2"; + sha256 = "1bnmjca7gjv4df5hbyniiy4s6n8llshiwxxc0pknc73wjjb8nmm8"; + libraryHaskellDepends = [ + base containers lens megaparsec mtl text transformers + ]; + testHaskellDepends = [ + base containers lens megaparsec mtl text transformers + ]; + description = "Library for parsing, constructing, and printing BBCode"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "bbdb" = callPackage ({ mkDerivation, base, hspec, parsec }: mkDerivation { @@ -45856,8 +45966,8 @@ self: { }: mkDerivation { pname = "bearriver"; - version = "0.14.3"; - sha256 = "1qndif1gl9qdg2mhp2w419g4p7nz3khjlhhycm66dzb47rf0scaq"; + version = "0.14.4"; + sha256 = "0bdz64rq6vri2kri5c6rja6x3dn4k62d0id462ar2dxwqaj8cqjc"; libraryHaskellDepends = [ base deepseq dunai MonadRandom mtl simple-affine-space transformers ]; @@ -48492,32 +48602,36 @@ self: { }) {}; "binrep" = callPackage - ({ mkDerivation, aeson, base, bytestring, either, flatparse - , generic-random, hspec, hspec-discover, mason, megaparsec - , QuickCheck, quickcheck-instances, refined, strongweak, text - , text-icu, vector, vector-sized + ({ mkDerivation, aeson, base, bytestring, deepseq, flatparse, gauge + , generic-data-functions, generic-random, hspec, hspec-discover + , mason, megaparsec, parser-combinators, QuickCheck + , quickcheck-instances, refined1, strongweak, text, text-icu + , vector, vector-sized }: mkDerivation { pname = "binrep"; - version = "0.3.1"; - sha256 = "01adzragxiick3l2q4cm0x1xd2pmrxw9xl8m39ysk9l8d15b0n4n"; - revision = "1"; - editedCabalFile = "17l5x2vpdwdp6x14n1wayh6751cpsxsywj205n94khnm1cgcfp1a"; + version = "0.5.0"; + sha256 = "069038cx1b0ch2g0jf94l1wp8f09zrcr1xlzflrgpk2ka1y5rr3c"; libraryHaskellDepends = [ - aeson base bytestring either flatparse mason megaparsec refined - strongweak text text-icu vector vector-sized + aeson base bytestring deepseq flatparse generic-data-functions + mason megaparsec parser-combinators refined1 strongweak text + text-icu vector vector-sized ]; testHaskellDepends = [ - aeson base bytestring either flatparse generic-random hspec mason - megaparsec QuickCheck quickcheck-instances refined strongweak text - text-icu vector vector-sized + aeson base bytestring deepseq flatparse generic-data-functions + generic-random hspec mason megaparsec parser-combinators QuickCheck + quickcheck-instances refined1 strongweak text text-icu vector + vector-sized ]; testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + aeson base bytestring deepseq flatparse gauge + generic-data-functions mason megaparsec parser-combinators refined1 + strongweak text text-icu vector vector-sized + ]; description = "Encode precise binary representations directly in types"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.raehik ]; - broken = true; }) {}; "bins" = callPackage @@ -49834,29 +49948,6 @@ self: { }: mkDerivation { pname = "bitvec"; - version = "1.1.4.0"; - sha256 = "1a2ljisd7m6c3qr0m0nnfrpnsigcz8hkcyzlmvg8pjh42vhb3w38"; - libraryHaskellDepends = [ - base bytestring deepseq ghc-bignum primitive vector - ]; - testHaskellDepends = [ - base ghc-bignum primitive quickcheck-classes - quickcheck-classes-base tasty tasty-quickcheck vector - ]; - benchmarkHaskellDepends = [ - base containers ghc-bignum random tasty tasty-bench vector - ]; - description = "Space-efficient bit vectors"; - license = lib.licenses.bsd3; - }) {}; - - "bitvec_1_1_5_0" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, ghc-bignum - , primitive, quickcheck-classes, quickcheck-classes-base, random - , tasty, tasty-bench, tasty-quickcheck, vector - }: - mkDerivation { - pname = "bitvec"; version = "1.1.5.0"; sha256 = "1ifyz0lsmgqz8yjyx4887m1wnm7ar389k6gkvcnk9mg1bgp7rll3"; libraryHaskellDepends = [ @@ -49871,7 +49962,6 @@ self: { ]; description = "Space-efficient bit vectors"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "bitwise" = callPackage @@ -50196,8 +50286,8 @@ self: { pname = "blank-canvas"; version = "0.7.3"; sha256 = "1g10959ly5nv2xfhax4pamzxnxkqbniahplc5za8k5r4nq1vjrm2"; - revision = "14"; - editedCabalFile = "0gh51aadihnssbqs146l10vajbgkj92cb0wfi1kjrlyknljy39rg"; + revision = "16"; + editedCabalFile = "1kkc6m89sk0xjhpji416wjpk8672w32m5l2pvd3386v1yvd1x7vj"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base-compat-batteries base64-bytestring bytestring @@ -50367,10 +50457,8 @@ self: { }: mkDerivation { pname = "blaze-builder"; - version = "0.4.2.2"; - sha256 = "0rxg6vjr0ji6g1nngrqpl4k1q9w66fwkhld9cqm5yfhx0a69kp1c"; - revision = "1"; - editedCabalFile = "026vxh94h2hwncy1mn51xzfpnhj8ijp5xc8fpq7dwc63fkrps0gh"; + version = "0.4.2.3"; + sha256 = "0fvh8sfhnkpwbl4l9ysxhsi26jj1mvfkqgh3mfnl4wvb4ds1hab6"; libraryHaskellDepends = [ base bytestring deepseq ghc-prim text ]; testHaskellDepends = [ base bytestring HUnit QuickCheck test-framework @@ -50455,8 +50543,8 @@ self: { pname = "blaze-html"; version = "0.9.1.2"; sha256 = "0k1r1hddjgqighazcazxrx6xfhvy2gm8il8l82ainv3cai13yl30"; - revision = "3"; - editedCabalFile = "1ra30mpah5k275cb4h9bin80z0nhlkdr7imq7yapl8g399wl11av"; + revision = "4"; + editedCabalFile = "0l645sbq8igqgvqnjdq89kys0vv8zf8l0x895w9742rj50wash1f"; libraryHaskellDepends = [ base blaze-builder blaze-markup bytestring text ]; @@ -50652,8 +50740,8 @@ self: { }: mkDerivation { pname = "blazeT"; - version = "0.0.5"; - sha256 = "14bh3sck4s2hyrd4s943y8sc13n5k1dg6xlzz67blqha2615ill1"; + version = "0.0.6"; + sha256 = "1ggyjg2rd5rwlpfv4djc7dmbiap6lda3w1yj949fc7ic7iq0icfb"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base blaze-builder blaze-html blaze-markup bytestring mtl text @@ -50773,13 +50861,13 @@ self: { }) {}; "blizzard-html" = callPackage - ({ mkDerivation, base, blaze-html, text }: + ({ mkDerivation, base, text }: mkDerivation { pname = "blizzard-html"; - version = "0.4.0.1"; - sha256 = "11k9pdr5f8vxypk05c2aysqkl3199ywvkh2dk9jf5rgkpf2j221p"; - libraryHaskellDepends = [ base blaze-html text ]; - description = "An HTML renderer for Haskell"; + version = "0.5.0.0"; + sha256 = "0i5nbwpm9p25jb1iykrsjvf0y505l9vdhqdm7yfnj633fpqq5bv4"; + libraryHaskellDepends = [ base text ]; + description = "An HTML generator for Haskell"; license = lib.licenses.mit; }) {}; @@ -51001,7 +51089,6 @@ self: { ]; description = "Adds convenient Amazon ElasticSearch Service authentication to Bloodhound"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "bloomfilter" = callPackage @@ -51287,8 +51374,8 @@ self: { pname = "bm"; version = "0.2.0.0"; sha256 = "17dnv1vdsh43nc8b0p92d01nz1zvxd9bfcghlz0w6c8wc5yflg31"; - revision = "1"; - editedCabalFile = "1fz82dk7hmpnwf0s2z1xcs9l2fm4gcqz35m9v15f4lmyd967l8bv"; + revision = "2"; + editedCabalFile = "0nrppsjb43pf4ifng35gp7wrn62ss6c6rkc843gllhr6ac74pj06"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -51953,17 +52040,18 @@ self: { "boomwhacker" = callPackage ({ mkDerivation, array, base, containers, event-list, filepath - , HPDF, midi, optparse-applicative, utility-ht + , HPDF, midi, non-empty, optparse-applicative, shell-utility + , utility-ht }: mkDerivation { pname = "boomwhacker"; - version = "0.0"; - sha256 = "0755v8315g03fhhh9a12jnczdapz6gs1my4gvz1y9arbyc3xngym"; + version = "0.0.1"; + sha256 = "1vzjw89warn3rr6vdggfmisj4ki5c4fdxrrrs4f7l9k9n3b4rggv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - array base containers event-list filepath HPDF midi - optparse-applicative utility-ht + array base containers event-list filepath HPDF midi non-empty + optparse-applicative shell-utility utility-ht ]; description = "Convert MIDI file to play-along boomwhacker animation"; license = lib.licenses.bsd3; @@ -52348,8 +52436,8 @@ self: { pname = "bounded-array"; version = "0.1.0.0"; sha256 = "0zv5a82rm6hwikgls2hw9d18igvfgw655s5pw5h1xbwcv1d8d0ji"; - revision = "3"; - editedCabalFile = "1m0kmns9my73idfkp5n5qix7w0lzrqbq96p4hhxa3702z5cvqkpf"; + revision = "4"; + editedCabalFile = "1fagylzqlzrz5dmxnnfbcqswzl32yyv7ndyrjy93mq2810r1m903"; libraryHaskellDepends = [ array base ]; description = "Arrays with a value for every index"; license = lib.licenses.bsd3; @@ -52721,17 +52809,17 @@ self: { }) {}; "breakpoint" = callPackage - ({ mkDerivation, ansi-terminal, base, containers, ghc, haskeline - , mtl, pretty-simple, tasty, tasty-hunit, template-haskell, text - , transformers + ({ mkDerivation, ansi-terminal, base, containers, deepseq, ghc + , haskeline, mtl, pretty-simple, tasty, tasty-hunit + , template-haskell, text, transformers }: mkDerivation { pname = "breakpoint"; - version = "0.1.2.1"; - sha256 = "1bj3bccmrk5c7zxb29rwzz39l0ph6qk0crw1vdhhsrcybmdc96h5"; + version = "0.1.2.2"; + sha256 = "02x2hak0kf9fg5fgr0365fjrnlbfkp3mqdpvkmxfvfp5hmvpa6mm"; libraryHaskellDepends = [ - ansi-terminal base containers ghc haskeline mtl pretty-simple - template-haskell text transformers + ansi-terminal base containers deepseq ghc haskeline mtl + pretty-simple template-haskell text transformers ]; testHaskellDepends = [ base containers tasty tasty-hunit ]; description = "Set breakpoints using a GHC plugin"; @@ -52829,6 +52917,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "brick_1_10" = callPackage + ({ mkDerivation, base, bimap, bytestring, config-ini, containers + , data-clist, deepseq, directory, exceptions, filepath, microlens + , microlens-mtl, microlens-th, mtl, QuickCheck, stm + , template-haskell, text, text-zipper, unix, vector, vty, word-wrap + }: + mkDerivation { + pname = "brick"; + version = "1.10"; + sha256 = "13s5vy5q450v4aynf35sdhl9idnyy96gz27x869yfrqpghb0q6br"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bimap bytestring config-ini containers data-clist deepseq + directory exceptions filepath microlens microlens-mtl microlens-th + mtl stm template-haskell text text-zipper unix vector vty word-wrap + ]; + testHaskellDepends = [ + base containers microlens QuickCheck vector vty + ]; + description = "A declarative terminal user interface library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "brick-dropdownmenu" = callPackage ({ mkDerivation, base, brick, containers, microlens, microlens-ghc , microlens-th, pointedlist, vector, vty @@ -52889,8 +53002,8 @@ self: { ({ mkDerivation, base, brick, containers, microlens, vector }: mkDerivation { pname = "brick-list-skip"; - version = "0.1.1.4"; - sha256 = "09f6w8m0wpljfxksm4d09014jhf4hh0ngr5cgp3616nf7mp3cazr"; + version = "0.1.1.5"; + sha256 = "18113bfyak9bsn7fwjx01511g4v3qls8w5qls1q407gx3dafhyw2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base brick containers microlens vector ]; @@ -52962,8 +53075,8 @@ self: { }: mkDerivation { pname = "brick-tabular-list"; - version = "2.2.0.2"; - sha256 = "19kk4rr5h5a6cis2k6qvh7c8l7hixx3lmx79ax2qzfb1vps5ri5g"; + version = "2.2.0.3"; + sha256 = "1f299fss8p7111wr56a8346zqkl02b7pcp9n6pri7wh2zrc4lw8i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -53380,8 +53493,8 @@ self: { pname = "brotli"; version = "0.0.0.1"; sha256 = "0fp8vhqzl6i1vvb4fw4zya6cgkzmj0yaaw94jdf2kggm3gn8zwfc"; - revision = "3"; - editedCabalFile = "00n7r8wwn40qbd6qvqzmkdf374nzd703rbsmn1szdwiw0zyp6ipa"; + revision = "4"; + editedCabalFile = "1p6zr2yr1hd6k9vkpgwdidrkiykv09av2q77f37bfg0985b0xwpx"; libraryHaskellDepends = [ base bytestring transformers ]; libraryPkgconfigDepends = [ brotli ]; testHaskellDepends = [ @@ -53975,6 +54088,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "bugsnag-hs_0_2_0_12" = callPackage + ({ mkDerivation, aeson, base, bytestring, hedgehog, http-client + , text, time, unordered-containers + }: + mkDerivation { + pname = "bugsnag-hs"; + version = "0.2.0.12"; + sha256 = "0850a02jy023wn3vipj409wmys2caxq3bf60j90yhh52f75skis8"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring http-client text time unordered-containers + ]; + testHaskellDepends = [ aeson base bytestring hedgehog ]; + description = "A Bugsnag client for Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "bugsnag-wai" = callPackage ({ mkDerivation, base, bugsnag, bytestring, case-insensitive, hspec , http-types, iproute, network, text, unordered-containers, wai @@ -54940,6 +55071,7 @@ self: { hydraPlatforms = lib.platforms.none; mainProgram = "bytepatch"; maintainers = [ lib.maintainers.raehik ]; + broken = true; }) {}; "bytes" = callPackage @@ -54951,6 +55083,8 @@ self: { pname = "bytes"; version = "0.17.3"; sha256 = "1ir9v4gjw7zgm9f55wa3y8wgn4zfpi71pvbsdmjgjk9dh02wy2ni"; + revision = "1"; + editedCabalFile = "1jj5fk23wvvvlbkxcpvgp69gglbf719ard5g795irbcx11zkhjd2"; libraryHaskellDepends = [ base binary binary-orphans bytestring cereal containers hashable scientific text time transformers transformers-compat @@ -55127,6 +55261,8 @@ self: { pname = "bytestring-conversion"; version = "0.3.2"; sha256 = "0ls1jqf4r2hk0mcxmlviw6vgs0cn1db99w2fggsg6x39pi31rk8c"; + revision = "1"; + editedCabalFile = "08j18kk0pg8h35vi1m7sb2hr190byyhnhjc39ixdbqbq27p08s0m"; libraryHaskellDepends = [ attoparsec base bytestring case-insensitive double-conversion text ]; @@ -56929,8 +57065,8 @@ self: { }: mkDerivation { pname = "cabal-plan-bounds"; - version = "0.1.3.1"; - sha256 = "0cyvmzgfzw6x2rl9jsswqgzxcvffjzc0px48ia22852vqa9qw1ax"; + version = "0.1.5"; + sha256 = "0585mjv6vj8iggkazc53ccl8nvv35vk6m9r2y0zs47ifijdzl2f5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -58895,7 +59031,6 @@ self: { testHaskellDepends = [ base mtl tasty tasty-hunit ]; description = "Monadic capabilities with late binding"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "captcha-2captcha" = callPackage @@ -59298,27 +59433,6 @@ self: { "casa-client" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring - , bytestring, casa-types, conduit, conduit-extra, cryptonite - , exceptions, http-conduit, http-types, memory, network-uri - , resourcet, template-haskell, text, th-lift, unliftio-core - , unordered-containers - }: - mkDerivation { - pname = "casa-client"; - version = "0.0.1"; - sha256 = "1l8lhk7bbrpjip693a3p6kp92aryajb6aw1w4ycak7nrb947dvjw"; - libraryHaskellDepends = [ - aeson attoparsec base base16-bytestring bytestring casa-types - conduit conduit-extra cryptonite exceptions http-conduit http-types - memory network-uri resourcet template-haskell text th-lift - unliftio-core unordered-containers - ]; - description = "Client for Casa"; - license = lib.licenses.bsd3; - }) {}; - - "casa-client_0_0_2" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , bytestring, casa-types, conduit, conduit-extra, crypton , exceptions, http-conduit, http-types, memory, network-uri , resourcet, template-haskell, text, th-lift, unliftio-core @@ -59336,7 +59450,6 @@ self: { ]; description = "Client for Casa"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "casa-types" = callPackage @@ -59827,8 +59940,8 @@ self: { pname = "cassava"; version = "0.5.3.0"; sha256 = "1gp954w05bj83z4i6isq2qxi1flqwppsgxxrp1f75mrs8cglbj5l"; - revision = "3"; - editedCabalFile = "192y0bwxyn290rf1zh4snsb2x6nk3siz3rac265cddd087c6zkg8"; + revision = "4"; + editedCabalFile = "0iabyfiwj08gfzrllaz836n28gx2jybszw45jcsy7y333wwcsg7q"; configureFlags = [ "-f-bytestring--lt-0_10_4" ]; libraryHaskellDepends = [ array attoparsec base bytestring containers deepseq hashable Only @@ -60019,18 +60132,12 @@ self: { }) {}; "castagnoli" = callPackage - ({ mkDerivation, base, byteslice, bytestring, primitive - , primitive-unlifted, text - }: + ({ mkDerivation, base, byteslice, bytestring, primitive, text }: mkDerivation { pname = "castagnoli"; - version = "0.2.0.0"; - sha256 = "1k7nlr0aq7rsm73ivxcfrxb1pl0hl51ahpk8k0b0n66jrhwksqnz"; - revision = "1"; - editedCabalFile = "0p6p4jgir9f11vg4mpwc43diyc5bsjx50yp3qfcaimdk4iyyd3cb"; - libraryHaskellDepends = [ - base byteslice primitive primitive-unlifted - ]; + version = "0.2.0.1"; + sha256 = "02kpplvfgiq7qlsd5xq9a5bnvjza3n8zalaakz2y9wxilajsnfp4"; + libraryHaskellDepends = [ base byteslice primitive ]; testHaskellDepends = [ base bytestring primitive text ]; description = "Portable CRC-32C"; license = lib.licenses.bsd3; @@ -61701,21 +61808,18 @@ self: { "chart-svg" = callPackage ({ mkDerivation, adjunctions, attoparsec, base, bytestring, Color - , containers, cubicbezier, flatparse, foldl, formatn, mtl, numhask - , numhask-array, numhask-space, optics-core, random - , string-interpolate, tasty, tasty-golden, text, time, tree-diff + , containers, cubicbezier, flatparse, foldl, formatn, markup-parse + , mtl, numhask, numhask-array, numhask-space, optics-core, random + , string-interpolate, text, time }: mkDerivation { pname = "chart-svg"; - version = "0.4.1.1"; - sha256 = "198b817pq673fsxi24v9llnf90vrpy16j4qlbhij88mknmhx2cr3"; + version = "0.5.1.1"; + sha256 = "1jvlqp1cdszc0hrlma01kx34wvdmh1pz4gkavd20w76v0p7485rb"; libraryHaskellDepends = [ adjunctions attoparsec base bytestring Color containers cubicbezier - flatparse foldl formatn mtl numhask numhask-array numhask-space - optics-core random string-interpolate text time tree-diff - ]; - testHaskellDepends = [ - base bytestring flatparse tasty tasty-golden tree-diff + flatparse foldl formatn markup-parse mtl numhask numhask-array + numhask-space optics-core random string-interpolate text time ]; description = "Charting library targetting SVGs"; license = lib.licenses.bsd3; @@ -62458,23 +62562,11 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "choice"; - version = "0.2.2"; - sha256 = "0qcyf6nqi0nyhbf3xwyib95y29j5ir94d5vg449mkpr92crf8ryk"; - libraryHaskellDepends = [ base ]; - description = "A solution to boolean blindness"; - license = lib.licenses.publicDomain; - }) {}; - - "choice_0_2_3" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "choice"; version = "0.2.3"; sha256 = "15nls2azmhwi3nnf5rkl954pa0bjgi231ff74hgw8r3nb5axrgrn"; libraryHaskellDepends = [ base ]; description = "A solution to boolean blindness"; license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; }) {}; "choose" = callPackage @@ -62779,10 +62871,8 @@ self: { }: mkDerivation { pname = "chronos"; - version = "1.1.5"; - sha256 = "0q81i9zwhsmik3j0zlgf61y48s4zhqs4d77ad4yxwvqqm8312gqi"; - revision = "2"; - editedCabalFile = "10f7a2r5y71cycx8m74swpplvd68s736fi3b48a48f5vvdgvwdfa"; + version = "1.1.5.1"; + sha256 = "0nld5xfqgihqf2lichd5ym60knwsfp40l4mn8qg6pxvydgwdcsw8"; libraryHaskellDepends = [ aeson attoparsec base bytebuild byteslice bytesmith bytestring deepseq hashable natural-arithmetic primitive semigroups text @@ -63076,8 +63166,8 @@ self: { }: mkDerivation { pname = "cimple"; - version = "0.0.16"; - sha256 = "02pxk1r076j0vkn0vhny9nxzf0dlql1hcn8sdw0nili8mb41pbj4"; + version = "0.0.17"; + sha256 = "0brzkxa09b5ammfm6qlkxffmhlgxfnf115lzdx3xvbq5ciar902x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -65849,8 +65939,8 @@ self: { }: mkDerivation { pname = "cmark-gfm"; - version = "0.2.5"; - sha256 = "0la4sd0cmv3zmn0kygbd77dknyh55h0b0qx5jg883hqnvnhaq721"; + version = "0.2.6"; + sha256 = "0sd8q42j51ba7ymyxk5360mhvhbnirsd371d3sggl6sbslxzp34m"; libraryHaskellDepends = [ base bytestring text ]; testHaskellDepends = [ base HUnit text ]; benchmarkHaskellDepends = [ @@ -66280,7 +66370,6 @@ self: { testHaskellDepends = [ base co-log-core doctest Glob hedgehog ]; description = "Composable Contravariant Comonadic Logging Library"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; }) {}; "co-log-concurrent" = callPackage @@ -66363,7 +66452,6 @@ self: { ]; description = "A Polysemy logging effect for high quality (unstructured) logs"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "example"; }) {}; @@ -68239,6 +68327,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "commonmark-extensions_0_2_3_6" = callPackage + ({ mkDerivation, base, commonmark, containers, emojis, filepath + , network-uri, parsec, tasty, tasty-bench, tasty-hunit, text + , transformers + }: + mkDerivation { + pname = "commonmark-extensions"; + version = "0.2.3.6"; + sha256 = "0b26h9fmr5pqv0d66az3af38ha07jkxrf5874m0k7i9ymaxwbckg"; + libraryHaskellDepends = [ + base commonmark containers emojis filepath network-uri parsec text + transformers + ]; + testHaskellDepends = [ + base commonmark parsec tasty tasty-hunit text + ]; + benchmarkHaskellDepends = [ base commonmark tasty-bench text ]; + description = "Pure Haskell commonmark parser"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "commonmark-pandoc" = callPackage ({ mkDerivation, base, commonmark, commonmark-extensions , pandoc-types, text @@ -70063,8 +70173,8 @@ self: { }: mkDerivation { pname = "concurrent-output"; - version = "1.10.18"; - sha256 = "1nxc7wl37hsyz8axzy99gy40qsa6065z6m9a9pfjkgfq4s4k7a5p"; + version = "1.10.19"; + sha256 = "16g749ghsqp0n6xqk9z3hj8di97r09gvw0dfk7jfq5crc02b69j2"; libraryHaskellDepends = [ ansi-terminal async base directory exceptions process stm terminal-size text transformers unix @@ -73267,8 +73377,8 @@ self: { }: mkDerivation { pname = "copilot"; - version = "3.16"; - sha256 = "119b8bqk3x14wmd9xzk9y3zv6walm982n0bjzc0f64fkjaqgqhsr"; + version = "3.16.1"; + sha256 = "1rbr9wq2ag8qzq696i833qzqhnl634dkssvvnz3ig0i0c8qai2c7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73289,8 +73399,8 @@ self: { }: mkDerivation { pname = "copilot-c99"; - version = "3.16"; - sha256 = "00rh4x9jc5dzrp5k2nhl0203kbyfpdrkn8sqc9fyzfnpw4hvxgjk"; + version = "3.16.1"; + sha256 = "028alpcppzcpj6vhbqmay9jvpw7p2ycw5ck92330zjh03iky51lf"; libraryHaskellDepends = [ base copilot-core directory filepath language-c99 language-c99-simple mtl pretty @@ -73328,8 +73438,8 @@ self: { }: mkDerivation { pname = "copilot-core"; - version = "3.16"; - sha256 = "0zw2xxf1c9ri0npcxjhb3iws01vnlhbkqjpsyvixvz564lzpiksm"; + version = "3.16.1"; + sha256 = "09z4ar0rip79gzf7a8bm6l2lx71y4cvh1dxpr4qjvys2mql7kb1k"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit QuickCheck test-framework test-framework-hunit @@ -73363,8 +73473,8 @@ self: { }: mkDerivation { pname = "copilot-interpreter"; - version = "3.16"; - sha256 = "1l512bnkdhldg3qy02pp84c83zd08jc7nfvqqnbsl9a446qwlmic"; + version = "3.16.1"; + sha256 = "0lklzprscm02dhd78ny5i34c7820571k78abjblcbjnwrkd6hm8h"; libraryHaskellDepends = [ base copilot-core pretty ]; testHaskellDepends = [ base copilot-core copilot-prettyprinter pretty QuickCheck @@ -73382,8 +73492,8 @@ self: { }: mkDerivation { pname = "copilot-language"; - version = "3.16"; - sha256 = "0a0r6pkkpbmjwfqlwgr0f652g8h5764q2vx1crw1j0ilk4j09c0v"; + version = "3.16.1"; + sha256 = "0yvc23x49ajc0mzcxcsxkx3gyqx3jivlhcsh8898c9wf1rqkwb51"; libraryHaskellDepends = [ array base containers copilot-core copilot-interpreter copilot-theorem data-reify mtl @@ -73401,8 +73511,8 @@ self: { ({ mkDerivation, base, containers, copilot-language, mtl, parsec }: mkDerivation { pname = "copilot-libraries"; - version = "3.16"; - sha256 = "14cmc623di13kz223mg07baxi2gwm2pwih7w9kvy2g7j4rbaip5l"; + version = "3.16.1"; + sha256 = "05admi6aiz96ly898wgpzxfp21h8s7q1x2fy2hb3ya5a1z6vz6r3"; libraryHaskellDepends = [ base containers copilot-language mtl parsec ]; @@ -73415,8 +73525,8 @@ self: { ({ mkDerivation, base, copilot-core, pretty }: mkDerivation { pname = "copilot-prettyprinter"; - version = "3.16"; - sha256 = "175vs3wc9igzf6fggb5b9lbvx9za80xng9k7clq28404rn6qn0mw"; + version = "3.16.1"; + sha256 = "1gacx9j3ngsv590qqx35la0n2y58898qki4hr3ynj4l63b7566m4"; libraryHaskellDepends = [ base copilot-core pretty ]; description = "A prettyprinter of Copilot Specifications"; license = lib.licenses.bsd3; @@ -73446,8 +73556,8 @@ self: { }: mkDerivation { pname = "copilot-theorem"; - version = "3.16"; - sha256 = "07vb547irkxgxpwzqajkwqacbxmi8az1vnp4fch0hpdhfsmwj4cm"; + version = "3.16.1"; + sha256 = "0j8pvc0w512cnh8af3vkcdf651nbz2g84frccam24aiy38ikvnmp"; libraryHaskellDepends = [ base bimap bv-sized containers copilot-core copilot-prettyprinter data-default directory libBF mtl panic parameterized-utils parsec @@ -75048,7 +75158,6 @@ self: { testHaskellDepends = [ base ]; description = "Secure Credentials Storage and Distribution"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "credentials-cli" = callPackage @@ -75073,7 +75182,6 @@ self: { ]; description = "Secure Credentials Administration"; license = "unknown"; - hydraPlatforms = lib.platforms.none; mainProgram = "credentials"; }) {}; @@ -75765,6 +75873,8 @@ self: { pname = "crypto-keys-ssh"; version = "0.1.0.0"; sha256 = "17r15w7rw6klcw5nlq6acka7rq3kba3vikwggb2fssr8x7wfrm5r"; + revision = "1"; + editedCabalFile = "1za578r04gdvmmanf4a458q7cdv6zpa6w4h9rzmj96aar95vgz83"; libraryHaskellDepends = [ base base64-bytestring binary bytestring ]; @@ -77650,8 +77760,8 @@ self: { }: mkDerivation { pname = "currycarbon"; - version = "0.2.1.1"; - sha256 = "07r6pzwihdmw1c7rp3lvhka5zcm2pk1knkp8z2nzlf8a3szm63kq"; + version = "0.2.1.2"; + sha256 = "0f2c4600058syw3qpy5c7jzxc2q0n2zvvjvad2ffv52zfbvysk20"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -81491,6 +81601,34 @@ self: { license = lib.licenses.asl20; }) {}; + "dbus_1_3_0" = callPackage + ({ mkDerivation, base, bytestring, cereal, conduit, containers + , criterion, deepseq, directory, exceptions, extra, filepath, lens + , network, parsec, process, QuickCheck, random, resourcet, split + , tasty, tasty-hunit, tasty-quickcheck, template-haskell, temporary + , text, th-lift, transformers, unix, vector, xml-conduit, xml-types + }: + mkDerivation { + pname = "dbus"; + version = "1.3.0"; + sha256 = "0qvlq4qaxvpyx9ckiaqlj210gm98fqbd9f7bwq021vwdm3xwzh3c"; + libraryHaskellDepends = [ + base bytestring cereal conduit containers deepseq exceptions + filepath lens network parsec random split template-haskell text + th-lift transformers unix vector xml-conduit xml-types + ]; + testHaskellDepends = [ + base bytestring cereal containers directory extra filepath network + parsec process QuickCheck random resourcet tasty tasty-hunit + tasty-quickcheck temporary text transformers unix vector + ]; + benchmarkHaskellDepends = [ base criterion ]; + doCheck = false; + description = "A client library for the D-Bus IPC system"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "dbus-client" = callPackage ({ mkDerivation, base, containers, dbus-core, monads-tf, text , transformers @@ -82040,10 +82178,10 @@ self: { }: mkDerivation { pname = "dear-imgui"; - version = "2.1.3"; - sha256 = "1czb3g51wh761r0s7d9v47fyx926r1prp3agi5cxpa34vwmghr9x"; - revision = "2"; - editedCabalFile = "08sif5iw24l329ikzfa2540f44667f95ck78a13ggl0wp7kjxzjx"; + version = "2.2.0"; + sha256 = "050xpwsx2ydpq8p81i3dc37a9f0p8z41i3vp84wr26psrqbnv6lx"; + revision = "1"; + editedCabalFile = "1x52qa09p3ql8sykcj3r46bln0gds5c6rix9sybf2vg39j14igfz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -84083,20 +84221,22 @@ self: { "desktop-portal" = callPackage ({ mkDerivation, base, binary, bytestring, containers - , data-default-class, dbus, hspec, hspec-discover - , hspec-expectations, modern-uri, process, random, text + , data-default-class, dbus, directory, hspec, hspec-discover + , hspec-expectations, modern-uri, network, process, random + , temporary, text, unix }: mkDerivation { pname = "desktop-portal"; - version = "0.2.1.0"; - sha256 = "0fa1d5fqvfixbvl50yrqhqiw1dc4wkjlh7qdd9iavn44iz4b06zq"; + version = "0.3.1.0"; + sha256 = "00pr8l4m1g5mcnxv8w8dab2iah1935fq79az7chsa6jgki6lflqf"; libraryHaskellDepends = [ - base binary bytestring containers data-default-class dbus - modern-uri random text + base binary bytestring containers data-default-class dbus directory + modern-uri network random text unix ]; testHaskellDepends = [ - base binary bytestring containers data-default-class dbus hspec - hspec-expectations modern-uri process random text + base binary bytestring containers data-default-class dbus directory + hspec hspec-expectations modern-uri network process random + temporary text unix ]; testToolDepends = [ hspec-discover ]; description = "Desktop Portal"; @@ -84274,8 +84414,8 @@ self: { }: mkDerivation { pname = "df1"; - version = "0.4.1"; - sha256 = "0fz9krv450kn4qymgggcgfkmrxgzcsgcbwbbfw2cqa0rvslw71g8"; + version = "0.4.2"; + sha256 = "038bk9qaa1qx4c7g2g7m5vqfbmcbpm0ybm64znhdc63dpyzninm8"; libraryHaskellDepends = [ attoparsec base bytestring containers text time ]; @@ -85406,14 +85546,15 @@ self: { "di-monad" = callPackage ({ mkDerivation, base, containers, di-core, exceptions, mtl, pipes - , stm, transformers + , stm, streaming, transformers, unliftio-core }: mkDerivation { pname = "di-monad"; - version = "1.3.1"; - sha256 = "190n6hwa7xs4b75bfvk4k2kn3rq8hkgs52f9plxfixlrl7jympgm"; + version = "1.3.2"; + sha256 = "1j8s44kg2r5s59vjy7g8d7pg14nkafpdsg4xn17p3v26jyfzcsmh"; libraryHaskellDepends = [ - base containers di-core exceptions mtl pipes stm transformers + base containers di-core exceptions mtl pipes stm streaming + transformers unliftio-core ]; description = "mtl flavoured typeful hierarchical structured logging for di-core"; license = lib.licenses.bsd3; @@ -85997,8 +86138,8 @@ self: { pname = "diagrams-solve"; version = "0.1.3"; sha256 = "09qqwcvbvd3a0j5fnp40dbzw0i3py9c7kgizj2aawajwbyjvpd17"; - revision = "1"; - editedCabalFile = "0dp61igq17l7hvhs3167skdi1vmlm773qrrmsqmj08951l4cgv0h"; + revision = "2"; + editedCabalFile = "08l6q5751lrpyrjiliig94a2s7ahlm2045bp5mngnl9nf6xr1rwb"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base deepseq tasty tasty-hunit tasty-quickcheck @@ -86518,6 +86659,8 @@ self: { pname = "digest"; version = "0.0.1.7"; sha256 = "02jzw0bsng87y1n2kgpy7vb30lvqsnpbfd8dpg4hmvbg9s06qgdj"; + revision = "1"; + editedCabalFile = "0wh34kyag2vhwvsdwv8qmvm13gy32nc94yfyqfdnl67nyc2sx8wl"; libraryHaskellDepends = [ base bytestring ]; libraryPkgconfigDepends = [ zlib ]; description = "Various hashes for bytestrings; CRC32 and Adler32 for now"; @@ -87563,8 +87706,8 @@ self: { }: mkDerivation { pname = "discord-haskell"; - version = "1.15.6"; - sha256 = "02vf4a9pz67s0l5y6il14vqsicifzj88ak8nw2sa758gccyjj6mv"; + version = "1.16.0"; + sha256 = "04zbpb5g9nanpzxnr94z6g0pr3jm74im4r70wz3lwyknl6r106bc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -88862,8 +89005,8 @@ self: { }: mkDerivation { pname = "dl-fedora"; - version = "0.9.5.1"; - sha256 = "1fiman4bwgc2rz1nwvcbzj6xflh9fr4l4fr32x2i8q8zxhisd541"; + version = "0.9.6"; + sha256 = "18i1vw4k50pavimhdz3ym9wh4ahn2s540i6p9qja05vgbh65wy7l"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -88884,6 +89027,8 @@ self: { pname = "dlist"; version = "1.0"; sha256 = "0581a60xw4gw7pmqlmg5w2hr4hm9yjgx4c2z6v63y5xv51rn6g8p"; + revision = "1"; + editedCabalFile = "0s758nqs16mzj3vn6dyg7lfsd3c65xzycbil4xvzqf761k96kzsm"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base QuickCheck ]; description = "Difference lists"; @@ -89788,30 +89933,30 @@ self: { mainProgram = "doctest"; }) {}; - "doctest_0_22_0" = callPackage - ({ mkDerivation, base, base-compat, code-page, deepseq, directory - , exceptions, filepath, ghc, ghc-paths, hspec, hspec-core - , hspec-discover, HUnit, mockery, process, QuickCheck, setenv - , silently, stringbuilder, syb, transformers + "doctest_0_22_1" = callPackage + ({ mkDerivation, base, code-page, deepseq, directory, exceptions + , filepath, ghc, ghc-paths, hspec, hspec-core, hspec-discover + , HUnit, mockery, process, QuickCheck, setenv, silently + , stringbuilder, syb, transformers }: mkDerivation { pname = "doctest"; - version = "0.22.0"; - sha256 = "1fkz2ygj3q88m2mf1b6c5yw29kmacip7r8xn3xq88yxxd39m6cvn"; + version = "0.22.1"; + sha256 = "0xszdclizmlf5gsnn4fwbvncjs6fbif9a5956pnxr50g5fxfi6xk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base base-compat code-page deepseq directory exceptions filepath - ghc ghc-paths process syb transformers + base code-page deepseq directory exceptions filepath ghc ghc-paths + process syb transformers ]; executableHaskellDepends = [ - base base-compat code-page deepseq directory exceptions filepath - ghc ghc-paths process syb transformers + base code-page deepseq directory exceptions filepath ghc ghc-paths + process syb transformers ]; testHaskellDepends = [ - base base-compat code-page deepseq directory exceptions filepath - ghc ghc-paths hspec hspec-core HUnit mockery process QuickCheck - setenv silently stringbuilder syb transformers + base code-page deepseq directory exceptions filepath ghc ghc-paths + hspec hspec-core HUnit mockery process QuickCheck setenv silently + stringbuilder syb transformers ]; testToolDepends = [ hspec-discover ]; description = "Test interactive Haskell examples"; @@ -90262,16 +90407,16 @@ self: { "domain-auth" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, attoparsec, base - , bytestring, containers, cryptonite, dns, doctest, iproute, memory - , network, pretty-simple, word8, x509 + , bytestring, containers, crypton, crypton-x509, dns, doctest + , iproute, memory, network, pretty-simple, word8 }: mkDerivation { pname = "domain-auth"; - version = "0.2.2"; - sha256 = "0ipmj209wdvqy8cncsq2bbnnms2ymd3n5kbiv2ydm8ahpiav5dhx"; + version = "0.2.3"; + sha256 = "1kwc7rgqcv5jyi8071cbfac5q3anhdd0jl1kq5x9bnync6lriv69"; libraryHaskellDepends = [ asn1-encoding asn1-types attoparsec base bytestring containers - cryptonite dns iproute memory network word8 x509 + crypton crypton-x509 dns iproute memory network word8 ]; testHaskellDepends = [ base doctest pretty-simple ]; description = "Domain authentication library"; @@ -91255,8 +91400,8 @@ self: { ({ mkDerivation, base, containers, hspec, QuickCheck }: mkDerivation { pname = "drawille"; - version = "0.1.2.0"; - sha256 = "1prpca2glkh8rwqwppjnqlqw71pba221hmcn9jbnih86gbl8w65q"; + version = "0.1.3.0"; + sha256 = "16wkxnlhfqc8lmnc5wg2by8vdj4r5varnbhdhyapxcajakfs2d2f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ]; @@ -91994,17 +92139,19 @@ self: { }) {}; "dunai" = callPackage - ({ mkDerivation, base, MonadRandom, simple-affine-space, tasty - , tasty-hunit, transformers, transformers-base + ({ mkDerivation, base, criterion, filepath, MonadRandom + , simple-affine-space, tasty, tasty-hunit, time, transformers + , transformers-base }: mkDerivation { pname = "dunai"; - version = "0.11.1"; - sha256 = "1cypw949jqf3m8xpic5niq385a23k61fr9p8kbys8vxnskykvj23"; + version = "0.11.2"; + sha256 = "0zyd1dx6g7i8d9iza2y1iljyz8xca1z3nfywjhmjnj2qsarlkw13"; libraryHaskellDepends = [ base MonadRandom simple-affine-space transformers transformers-base ]; testHaskellDepends = [ base tasty tasty-hunit transformers ]; + benchmarkHaskellDepends = [ base criterion filepath time ]; description = "Generalised reactive framework supporting classic, arrowized and monadic FRP"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.turion ]; @@ -92030,8 +92177,8 @@ self: { ({ mkDerivation, base, dunai, normaldistribution, QuickCheck }: mkDerivation { pname = "dunai-test"; - version = "0.11.1"; - sha256 = "19v5rqyfl3dany833bavl8893nzjj3l99dsly71bkwq26y0j9l82"; + version = "0.11.2"; + sha256 = "18f45db2n45khn2vxs1wpqsyapy6iivbmv86snx1d0hd2f9bfmx1"; libraryHaskellDepends = [ base dunai normaldistribution QuickCheck ]; @@ -92039,6 +92186,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "dupIO" = callPackage + ({ mkDerivation, base, ghc-prim, tasty, tasty-hunit }: + mkDerivation { + pname = "dupIO"; + version = "0.1.0"; + sha256 = "1j2xi1hskmgkknmg01fbkfa3ry2a1f7mzkvjhkqlsz27v3f3q4lm"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ghc-prim ]; + testHaskellDepends = [ base ghc-prim tasty tasty-hunit ]; + description = "Duplicate any closure"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "duplo" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base , base64-bytestring, bytestring, containers, directory @@ -92276,8 +92439,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "dwergaz"; - version = "0.2.0.5"; - sha256 = "0g88xm00j0b5k20rw7fdzmswn1migqs6sw3sm0yy9na4b5l1mf4p"; + version = "0.2.0.6"; + sha256 = "0cm4jb40iflg8vbnaplp2qbzhjdm53zfkigh0jgml5jjf1yzvc8p"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "A minimal testing library"; @@ -92693,7 +92856,6 @@ self: { ]; description = "Typesafe library for working with DynamoDB database"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "dynloader" = callPackage @@ -93260,7 +93422,6 @@ self: { ]; description = "A handy tool for uploading unikernels to Amazon's EC2"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "ec2-unikernel"; }) {}; @@ -93900,6 +94061,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "effectful_2_3_0_0" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , effectful-core, exceptions, lifted-base, primitive, process, stm + , tasty, tasty-bench, tasty-hunit, text, time, unix, unliftio + }: + mkDerivation { + pname = "effectful"; + version = "2.3.0.0"; + sha256 = "03yr8hr1aahqfm04jdn7nnfblvxpj1zgrv8c9ymgjnn6gxjvwhk7"; + libraryHaskellDepends = [ + async base bytestring directory effectful-core process stm time + unliftio + ]; + testHaskellDepends = [ + base containers effectful-core exceptions lifted-base primitive + tasty tasty-hunit unliftio + ]; + benchmarkHaskellDepends = [ + async base tasty-bench text unix unliftio + ]; + description = "An easy to use, performant extensible effects library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "effectful-core" = callPackage ({ mkDerivation, base, containers, exceptions, monad-control , primitive, transformers-base, unliftio-core @@ -93916,6 +94102,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "effectful-core_2_3_0_0" = callPackage + ({ mkDerivation, base, containers, exceptions, monad-control + , primitive, transformers-base, unliftio-core + }: + mkDerivation { + pname = "effectful-core"; + version = "2.3.0.0"; + sha256 = "1yrywdzys1fsg0403g5slg88a33hnk5cm0cshrb2idhsv77bfhkv"; + libraryHaskellDepends = [ + base containers exceptions monad-control primitive + transformers-base unliftio-core + ]; + description = "An easy to use, performant extensible effects library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "effectful-plugin" = callPackage ({ mkDerivation, base, containers, effectful-core, ghc }: mkDerivation { @@ -93928,6 +94131,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "effectful-plugin_1_1_0_2" = callPackage + ({ mkDerivation, base, containers, effectful-core, ghc }: + mkDerivation { + pname = "effectful-plugin"; + version = "1.1.0.2"; + sha256 = "1g4ic03aad2sc62jxspcq5zsisqmr03fs39ganzcklh86asmdb8h"; + libraryHaskellDepends = [ base containers effectful-core ghc ]; + testHaskellDepends = [ base effectful-core ]; + description = "A GHC plugin for improving disambiguation of effects"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "effectful-st" = callPackage ({ mkDerivation, base, effectful-core, primitive }: mkDerivation { @@ -94528,7 +94744,6 @@ self: { ]; description = "An ekg backend for Amazon Cloudwatch"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "ekg-core" = callPackage @@ -94907,6 +95122,8 @@ self: { pname = "eliminators"; version = "0.9.3"; sha256 = "0pmh4ds1xmk464988airlwdj47mbq9xzgvfmpsp7dw84k0226pyg"; + revision = "1"; + editedCabalFile = "0nxnc1y8lnwmbg1igd8mndkav0ilvb20pbs0d2yvxr032bi35jc4"; libraryHaskellDepends = [ base extra singleton-nats singletons-base template-haskell text th-abstraction th-desugar @@ -95902,20 +96119,20 @@ self: { , blaze-html, bytestring, commonmark, commonmark-extensions , commonmark-pandoc, commonmark-simple, commonmark-wikilink , containers, data-default, dependent-sum, deriving-aeson - , directory, ema, filepath, filepattern, fsnotify, hedgehog, heist - , heist-extra, hspec, hspec-hedgehog, ixset-typed, lvar, map-syntax - , megaparsec, monad-logger, monad-logger-extras, mtl + , directory, ema, feed, filepath, filepattern, fsnotify, hedgehog + , heist, heist-extra, hspec, hspec-hedgehog, ixset-typed, lvar + , map-syntax, megaparsec, monad-logger, monad-logger-extras, mtl , neat-interpolation, optics-core, optics-th, optparse-applicative - , pandoc, pandoc-link-context, pandoc-types, parsec, path-tree - , process-extras, profunctors, relude, shower, some, stm, tagged - , tagtree, tailwind, text, time, tomland, unionmount, unliftio - , unordered-containers, uri-encode, url-slug, uuid, which - , with-utf8, xmlhtml, yaml + , pandoc, pandoc-link-context, pandoc-lua-engine, pandoc-types + , parsec, path-tree, process-extras, profunctors, relude, shower + , some, stm, tagged, tagtree, tailwind, text, time, tomland + , unionmount, unliftio, unordered-containers, uri-encode, url-slug + , uuid, which, with-utf8, xmlhtml, yaml }: mkDerivation { pname = "emanote"; - version = "1.0.2.0"; - sha256 = "0g6mla1izms1i4l08kzg0js56gz54z87458k0k3w7fnj5f1576y7"; + version = "1.2.0.0"; + sha256 = "1797n6s86dx64wpvng9zvzpww6qw70i4a2l06bzvvw8xsdr031qh"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -95923,43 +96140,43 @@ self: { aeson aeson-extra aeson-optics async base blaze-html bytestring commonmark commonmark-extensions commonmark-pandoc commonmark-simple commonmark-wikilink containers data-default - dependent-sum deriving-aeson directory ema filepath filepattern - fsnotify hedgehog heist heist-extra hspec hspec-hedgehog - ixset-typed lvar map-syntax megaparsec monad-logger + dependent-sum deriving-aeson directory ema feed filepath + filepattern fsnotify hedgehog heist heist-extra hspec + hspec-hedgehog ixset-typed lvar map-syntax megaparsec monad-logger monad-logger-extras mtl neat-interpolation optics-core optics-th - optparse-applicative pandoc pandoc-link-context pandoc-types parsec - path-tree process-extras profunctors relude shower some stm tagged - tagtree tailwind text time tomland unionmount unliftio - unordered-containers uri-encode url-slug uuid which with-utf8 - xmlhtml yaml + optparse-applicative pandoc pandoc-link-context pandoc-lua-engine + pandoc-types parsec path-tree process-extras profunctors relude + shower some stm tagged tagtree tailwind text time tomland + unionmount unliftio unordered-containers uri-encode url-slug uuid + which with-utf8 xmlhtml yaml ]; executableHaskellDepends = [ aeson aeson-extra aeson-optics async base blaze-html bytestring commonmark commonmark-extensions commonmark-pandoc commonmark-simple commonmark-wikilink containers data-default - dependent-sum deriving-aeson directory ema filepath filepattern - fsnotify hedgehog heist heist-extra hspec hspec-hedgehog - ixset-typed lvar map-syntax megaparsec monad-logger + dependent-sum deriving-aeson directory ema feed filepath + filepattern fsnotify hedgehog heist heist-extra hspec + hspec-hedgehog ixset-typed lvar map-syntax megaparsec monad-logger monad-logger-extras mtl neat-interpolation optics-core optics-th - optparse-applicative pandoc pandoc-link-context pandoc-types parsec - path-tree process-extras profunctors relude shower some stm tagged - tagtree tailwind text time tomland unionmount unliftio - unordered-containers uri-encode url-slug uuid which with-utf8 - xmlhtml yaml + optparse-applicative pandoc pandoc-link-context pandoc-lua-engine + pandoc-types parsec path-tree process-extras profunctors relude + shower some stm tagged tagtree tailwind text time tomland + unionmount unliftio unordered-containers uri-encode url-slug uuid + which with-utf8 xmlhtml yaml ]; testHaskellDepends = [ aeson aeson-extra aeson-optics async base blaze-html bytestring commonmark commonmark-extensions commonmark-pandoc commonmark-simple commonmark-wikilink containers data-default - dependent-sum deriving-aeson directory ema filepath filepattern - fsnotify hedgehog heist heist-extra hspec hspec-hedgehog - ixset-typed lvar map-syntax megaparsec monad-logger + dependent-sum deriving-aeson directory ema feed filepath + filepattern fsnotify hedgehog heist heist-extra hspec + hspec-hedgehog ixset-typed lvar map-syntax megaparsec monad-logger monad-logger-extras mtl neat-interpolation optics-core optics-th - optparse-applicative pandoc pandoc-link-context pandoc-types parsec - path-tree process-extras profunctors relude shower some stm tagged - tagtree tailwind text time tomland unionmount unliftio - unordered-containers uri-encode url-slug uuid which with-utf8 - xmlhtml yaml + optparse-applicative pandoc pandoc-link-context pandoc-lua-engine + pandoc-types parsec path-tree process-extras profunctors relude + shower some stm tagged tagtree tailwind text time tomland + unionmount unliftio unordered-containers uri-encode url-slug uuid + which with-utf8 xmlhtml yaml ]; description = "Emanate a structured view of your plain-text notes"; license = lib.licenses.agpl3Only; @@ -97092,8 +97309,8 @@ self: { }: mkDerivation { pname = "epub-tools"; - version = "3.0"; - sha256 = "0wgylv4jsd9c7bpfnh82yh05vgli907c9fgldvv207lj4bhmdvsz"; + version = "3.1"; + sha256 = "10xzdj59axw2bxv4zanx5ykrbaj6vrs90dp4fycywv7mz0jd2r63"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -97433,12 +97650,16 @@ self: { }) {}; "error-codes" = callPackage - ({ mkDerivation, base, primitive, primitive-unlifted }: + ({ mkDerivation, base, bytestring, primitive, primitive-unlifted + , text, text-short + }: mkDerivation { pname = "error-codes"; - version = "0.1.1.0"; - sha256 = "0sz2wr2aa87nj8k3izrqcwzgl7cqfa5qsyghny8iv1sp4xhpvpwn"; - libraryHaskellDepends = [ base primitive primitive-unlifted ]; + version = "0.1.2.0"; + sha256 = "1ylbbanzwxh2ggqj1f4c4mib91swvvp3mk5cxn1d2ppkkssx7h8z"; + libraryHaskellDepends = [ + base bytestring primitive primitive-unlifted text text-short + ]; testHaskellDepends = [ base ]; description = "Error code functions"; license = lib.licenses.bsd3; @@ -97891,8 +98112,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "3.5.10.1"; - sha256 = "09lwrvlxr6isfk1b9qkhsg268grbnjw7lqh3fxjpks84yq7ymc2y"; + version = "3.5.10.3"; + sha256 = "0amvg1857gnqi4g8x3dcig3l1mfvqxsfm4l61kjixbfb7zfksn0i"; libraryHaskellDepends = [ aeson attoparsec base blaze-html bytestring conduit containers monad-logger persistent resourcet tagged template-haskell text time @@ -98615,26 +98836,28 @@ self: { "evdev" = callPackage ({ mkDerivation, base, bytestring, c2hs, containers, extra - , filepath-bytestring, libevdev, monad-loops, rawfilepath, tasty - , tasty-hunit, tasty-quickcheck, time, unix + , filepath-bytestring, libevdev, monad-loops, mtl, rawfilepath + , tasty, tasty-hunit, tasty-quickcheck, time, unix }: mkDerivation { pname = "evdev"; - version = "2.2.0"; - sha256 = "128i0rlxdskd63jjz887c0mjrrcm0v4xac8k2m0csglp7jap1cb7"; + version = "2.3.1.1"; + sha256 = "1jq7ayi4rv8v02wyxva9776iqymv0ac1h7jbfxf96gmk5ifwyinf"; libraryHaskellDepends = [ base bytestring containers extra filepath-bytestring monad-loops - rawfilepath time unix + mtl rawfilepath time unix ]; libraryPkgconfigDepends = [ libevdev ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base bytestring containers extra filepath-bytestring monad-loops - rawfilepath tasty tasty-hunit tasty-quickcheck time unix + mtl rawfilepath tasty tasty-hunit tasty-quickcheck time unix ]; description = "Bindings to libevdev"; license = lib.licenses.bsd3; platforms = lib.platforms.linux; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) libevdev;}; "evdev-streamly" = callPackage @@ -99622,8 +99845,8 @@ self: { }: mkDerivation { pname = "exception-transformers"; - version = "0.4.0.11"; - sha256 = "1zmd2s40m86c9mhv32l5bvvf5r52cgpxvb4v5phyc3pjwlr7m8g5"; + version = "0.4.0.12"; + sha256 = "11qlr78hlp1ivsx2l06sac56wj900l6diwh6dv7jfzgary8dax4k"; libraryHaskellDepends = [ base fail transformers transformers-compat ]; @@ -99639,8 +99862,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "exception-via"; - version = "0.1.0.0"; - sha256 = "046f787jw3v1c61q9c9canq0m266wv39rsk0613fyrhl96sss66m"; + version = "0.2.0.0"; + sha256 = "1nxg0ckvh5ibhbh2pjfc7qid0qlvmacw8lrsyl7akrnxazr2s5md"; libraryHaskellDepends = [ base template-haskell ]; description = "DerivingVia for your hierarchical exceptions"; license = lib.licenses.bsd3; @@ -100235,8 +100458,8 @@ self: { }: mkDerivation { pname = "exon"; - version = "1.4.0.0"; - sha256 = "1xmpbr53yrdhx9dfh6b6al9r146pdm4cv17l2apr7xxqy0capsy7"; + version = "1.5.0.0"; + sha256 = "0j3l228ygb8gg8lgfmmajq78hv2y6078rqlmps8gs62vvbfrsnri"; libraryHaskellDepends = [ base flatparse generics-sop ghc-hs-meta incipit-base template-haskell @@ -100245,7 +100468,7 @@ self: { base hedgehog incipit-base tasty tasty-hedgehog template-haskell ]; benchmarkHaskellDepends = [ base criterion incipit-base ]; - description = "Customizable Quasiquote Interpolation"; + description = "Customizable quasiquote interpolation"; license = "BSD-2-Clause-Patent"; }) {}; @@ -100255,8 +100478,8 @@ self: { }: mkDerivation { pname = "exotic-list-monads"; - version = "1.0.1"; - sha256 = "0nazyvsyh4721nq81pl6kmlwc0wxlfhxjp77l38s86prg0iwpvz0"; + version = "1.1.0"; + sha256 = "155h7zl431j5dr0qgds2dlavm2mqg1xjadp8pknrjbfyh8sz95g3"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec hspec-core QuickCheck ]; testToolDepends = [ hspec-discover ]; @@ -101057,8 +101280,8 @@ self: { }: mkDerivation { pname = "extism"; - version = "0.3.0"; - sha256 = "1yb7s7ryaph8qpnbmkrx3xlhc6anli8d1gifmjmh1k67zq0isiyc"; + version = "0.5.0"; + sha256 = "1yb0lw7bpinnnqllkjxad83g1lh2gx68w9c63jplkivygws800n2"; libraryHaskellDepends = [ base bytestring extism-manifest json ]; librarySystemDepends = [ extism ]; testHaskellDepends = [ base bytestring HUnit ]; @@ -101072,8 +101295,8 @@ self: { ({ mkDerivation, base, base64-bytestring, bytestring, json }: mkDerivation { pname = "extism-manifest"; - version = "0.2.0"; - sha256 = "1rhs949c7bmdcz209f0ms482dvc3l789hbmd3ywrps8fhbny4hc4"; + version = "0.3.0"; + sha256 = "0cfp8akz64ama88ls5885dvvxfswy1w709gl2h9qp0ga6fvkx0xf"; libraryHaskellDepends = [ base base64-bytestring bytestring json ]; description = "Extism manifest bindings"; license = lib.licenses.bsd3; @@ -102785,8 +103008,8 @@ self: { pname = "fclabels"; version = "2.0.5.1"; sha256 = "0g4ca5pm2bafsnpari7wqhy79i5qs8njb3kdknk0xsrazdsl174k"; - revision = "1"; - editedCabalFile = "03df1mvfsnm4zbppvig7y49y935qxvkz4b5y24b17hsdj4l1nnyk"; + revision = "2"; + editedCabalFile = "1my11j22fayfcm28h676mjrvnjyd4xsd8lpsc3pdc7jna7zh1hhf"; libraryHaskellDepends = [ base base-orphans mtl template-haskell transformers ]; @@ -105211,23 +105434,28 @@ self: { }) {}; "fits-parse" = callPackage - ({ mkDerivation, base, binary, bytestring, data-default - , fast-logger, JuicyPixels, megaparsec, optparse-applicative - , parser-combinators, statistics, text, text-latin1, vector + ({ mkDerivation, base, binary, bytestring, containers, fast-logger + , JuicyPixels, megaparsec, microlens, microlens-th, mtl + , optparse-applicative, statistics, tasty, tasty-hunit, text + , text-latin1, vector }: mkDerivation { pname = "fits-parse"; - version = "0.0.1"; - sha256 = "13a072ribpn10hfiiqkx2bkns8rjcsf32zx4lsvxzfhm7p24p499"; + version = "0.3.4"; + sha256 = "0kahw1bciy793wabn5v0xzxzr2csy99byycls7g3f3q0hly2y293"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base binary bytestring data-default megaparsec parser-combinators + base binary bytestring containers megaparsec microlens microlens-th text text-latin1 ]; executableHaskellDepends = [ - base bytestring fast-logger JuicyPixels optparse-applicative - statistics vector + base bytestring fast-logger JuicyPixels microlens microlens-th + optparse-applicative statistics vector + ]; + testHaskellDepends = [ + base bytestring containers megaparsec microlens microlens-th mtl + tasty tasty-hunit text ]; description = "Parse FITS files"; license = lib.licenses.bsd2; @@ -108255,8 +108483,8 @@ self: { ({ mkDerivation, ansi-terminal, base, doctest, hspec, text }: mkDerivation { pname = "fortytwo"; - version = "1.0.6"; - sha256 = "1jms8a39i6vvvdcs5ichzjcglz3dhmswldczd25gnpx5ahkl1d4r"; + version = "2.0.0"; + sha256 = "0yq3gl0pm1yafa0bc1i9pplz147i1ddsafh4r5lhcyr7rg2a0jq1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-terminal base text ]; @@ -108541,6 +108769,41 @@ self: { mainProgram = "fourmolu"; }) {}; + "fourmolu_0_14_0_0" = callPackage + ({ mkDerivation, aeson, ansi-terminal, array, base, binary + , bytestring, Cabal-syntax, containers, deepseq, Diff, directory + , file-embed, filepath, ghc-lib-parser, hspec, hspec-discover + , hspec-megaparsec, megaparsec, MemoTrie, mtl, optparse-applicative + , path, path-io, pretty, process, QuickCheck, scientific, syb + , temporary, text, th-env, yaml + }: + mkDerivation { + pname = "fourmolu"; + version = "0.14.0.0"; + sha256 = "1mnszw3lak3vmjcgp40xskjmzd526rw5rs06mnix2fahz8nkrrys"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal array base binary bytestring Cabal-syntax + containers deepseq Diff directory file-embed filepath + ghc-lib-parser megaparsec MemoTrie mtl scientific syb text yaml + ]; + executableHaskellDepends = [ + base Cabal-syntax containers directory filepath ghc-lib-parser + optparse-applicative text th-env yaml + ]; + testHaskellDepends = [ + base bytestring Cabal-syntax containers Diff directory filepath + ghc-lib-parser hspec hspec-megaparsec megaparsec path path-io + pretty process QuickCheck temporary text yaml + ]; + testToolDepends = [ hspec-discover ]; + description = "A formatter for Haskell source code"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "fourmolu"; + }) {}; + "fp-ieee" = callPackage ({ mkDerivation, base, doctest, ghc-bignum, hspec, hspec-core , integer-logarithms, QuickCheck, random, tasty-bench @@ -108931,8 +109194,8 @@ self: { }: mkDerivation { pname = "freckle-app"; - version = "1.9.2.1"; - sha256 = "1rpdfl09v88g5lliilhd5y6rkbq30dz3b899r5yj4cmqi16kbjb5"; + version = "1.9.4.0"; + sha256 = "0z2hra1vc7ky1q5l6bjrnf78cdadf6dml5xzqqq085px4bcy4ca3"; libraryHaskellDepends = [ aeson aws-xray-client-persistent aws-xray-client-wai base Blammo bugsnag bytestring case-insensitive cassava conduit conduit-extra @@ -109888,8 +110151,8 @@ self: { ({ mkDerivation, base, casing, hspec, hspec-discover, text }: mkDerivation { pname = "from-env"; - version = "0.1.2.0"; - sha256 = "0xpqzk9vc9nsqimjh35w6xjhgkxxj2arzyj038nxv199045ffn1q"; + version = "0.1.3.0"; + sha256 = "01bav8kcm8cirk4q4kywzn9njsl4znakzars0rl0k0pgkiqb9f35"; libraryHaskellDepends = [ base casing text ]; testHaskellDepends = [ base hspec ]; testToolDepends = [ hspec-discover ]; @@ -111344,8 +111607,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.25.2"; - sha256 = "1mnpcagqvq37rlcf2a1pliajl7yjn0r6b3nq8n9fi3m95ngv11vq"; + version = "0.25.3"; + sha256 = "0vqww2fmn2ksnxwrkzmxizgcnd0k20dgq9v20fqnn3xkyi7a5das"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -111368,7 +111631,9 @@ self: { ]; description = "An optimising compiler for a functional, array-oriented language"; license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; mainProgram = "futhark"; + broken = true; }) {}; "futhark-data" = callPackage @@ -112252,6 +112517,44 @@ self: { license = lib.licenses.bsd3; }) {}; + "gbs-downloader" = callPackage + ({ mkDerivation, aeson, asn1-encoding, asn1-types, async, base + , base32, base64-bytestring, binary, bytestring, connection + , containers, crypto-api, cryptonite, data-default-class + , exceptions, hedgehog, http-client, http-client-tls, http-types + , megaparsec, memory, network-uri, servant-client + , servant-client-core, tahoe-chk, tahoe-directory + , tahoe-great-black-swamp, tahoe-ssk, tasty, tasty-hedgehog + , tasty-hunit, text, x509, yaml + }: + mkDerivation { + pname = "gbs-downloader"; + version = "0.1.0.0"; + sha256 = "1x873y2vvj4ddyyf4lhnz5b717xgprdhhip3l4fjwz6wbf47rc19"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base base32 base64-bytestring binary bytestring + connection containers data-default-class exceptions http-client + http-client-tls http-types network-uri servant-client + servant-client-core tahoe-chk tahoe-directory + tahoe-great-black-swamp tahoe-ssk text yaml + ]; + executableHaskellDepends = [ + aeson base bytestring containers megaparsec tahoe-chk + tahoe-directory tahoe-ssk text yaml + ]; + testHaskellDepends = [ + asn1-encoding asn1-types base base32 binary bytestring containers + crypto-api cryptonite data-default-class hedgehog http-client + http-types memory servant-client servant-client-core tahoe-chk + tahoe-ssk tasty tasty-hedgehog tasty-hunit text x509 yaml + ]; + description = "A library for downloading data from a Great Black Swamp server"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "gbu" = callPackage ({ mkDerivation, base, containers, fgl, Graphalyze, haskell98, mtl , regex-posix @@ -114933,6 +115236,18 @@ self: { platforms = lib.platforms.x86; }) {}; + "geomancy-layout" = callPackage + ({ mkDerivation, base, geomancy, gl-block }: + mkDerivation { + pname = "geomancy-layout"; + version = "0.1"; + sha256 = "0pwd35cydwgp6vv31dz8lwvgqdpa2jjm2lv0cnkgcfgl5lpc22wc"; + libraryHaskellDepends = [ base geomancy gl-block ]; + description = "Geometry and matrix manipulation"; + license = lib.licenses.bsd3; + platforms = lib.platforms.x86; + }) {}; + "geos" = callPackage ({ mkDerivation, base, bytestring, cassava, geos, hspec, mtl , transformers, vector @@ -115887,6 +116202,8 @@ self: { pname = "ghc-hs-meta"; version = "0.1.2.0"; sha256 = "13i4fcc3wfx94n75cxp00p62mnm0raf2xqj2afrzcw3q6mc0l0y4"; + revision = "1"; + editedCabalFile = "18wp54bnfx7ks9zvsjpykpkpr7gwqql6bq8n85mydgx9zm5638dz"; libraryHaskellDepends = [ base bytestring ghc ghc-boot template-haskell ]; @@ -116021,8 +116338,8 @@ self: { }: mkDerivation { pname = "ghc-lib"; - version = "9.4.6.20230808"; - sha256 = "1dyz7cby2ap4nii1g32f31hcqlxri880h33vr30sixms5zzy400j"; + version = "9.4.7.20230826"; + sha256 = "161ibbb4fyqahamykbdrfrw6zx9djk57vqj785bhrrqxys4k29d5"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -116104,8 +116421,8 @@ self: { }: mkDerivation { pname = "ghc-lib-parser"; - version = "9.4.6.20230808"; - sha256 = "1s3lmmaj9aw1ykccqf7rdfnmsgbcilxavwgqm9xkhpfnzri06mqq"; + version = "9.4.7.20230826"; + sha256 = "0hnpalndf087mda3hirws31cxjxvgh0h618fc18y2bhmf5hy10gl"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -116197,14 +116514,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-lib-parser-ex_9_6_0_1" = callPackage + "ghc-lib-parser-ex_9_6_0_2" = callPackage ({ mkDerivation, base, bytestring, containers, directory, extra , filepath, ghc-lib-parser, tasty, tasty-hunit, uniplate }: mkDerivation { pname = "ghc-lib-parser-ex"; - version = "9.6.0.1"; - sha256 = "0a9dmn5qhy0h1zxkq03mv6w9a2g1a1difxwvg55ix8ig1r6mbr0g"; + version = "9.6.0.2"; + sha256 = "1fr653b4hgwxz12mvbf9wd93r83qk3qdajplrdmw85hk0f9qfq9a"; libraryHaskellDepends = [ base bytestring containers ghc-lib-parser uniplate ]; @@ -116848,8 +117165,8 @@ self: { ({ mkDerivation, base, containers, ghc, transformers }: mkDerivation { pname = "ghc-tcplugin-api"; - version = "0.10.0.0"; - sha256 = "0ynn4acij7n3vfmsm02chdi6j4m3p3cyz9f7vhhi7z9aqzawxd0l"; + version = "0.11.0.0"; + sha256 = "0k0hr9l3w3xf60var20by5xp0wqfcwv8x4lfcag94f9bn60cnvra"; libraryHaskellDepends = [ base containers ghc transformers ]; description = "An API for type-checker plugins"; license = lib.licenses.bsd3; @@ -117262,8 +117579,8 @@ self: { }: mkDerivation { pname = "ghcide"; - version = "2.1.0.0"; - sha256 = "1886k12lad3gm5848380q6s08hb0fmfhhbsr0azi3n2vcycc1mcy"; + version = "2.2.0.0"; + sha256 = "0rsai3xk50qxr234vwz6rmh1na9jxnacjibx71c3qj6pnh60ynl4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -117653,8 +117970,8 @@ self: { }: mkDerivation { pname = "ghcup"; - version = "0.1.19.2"; - sha256 = "1230hs209w7j427pkibzw4x9skcji4fhsmhjxlks4c6amanianmj"; + version = "0.1.19.5"; + sha256 = "1cx93721jz0laakhy8krxbk51l8wxvi3wk0cpdwdcmb4jmzpivxi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -117673,13 +117990,14 @@ self: { cabal-plan containers deepseq directory filepath haskus-utils-types haskus-utils-variant libarchive megaparsec mtl optparse-applicative pretty pretty-terminal process resourcet safe safe-exceptions - tagsoup template-haskell temporary text unix unordered-containers - uri-bytestring utf8-string vector versions yaml-streamly + tagsoup template-haskell temporary text time unix + unordered-containers uri-bytestring utf8-string vector versions + yaml-streamly ]; testHaskellDepends = [ base bytestring containers directory filepath generic-arbitrary hspec hspec-golden-aeson QuickCheck quickcheck-arbitrary-adt - streamly text unix uri-bytestring versions + streamly text time unix uri-bytestring versions ]; testToolDepends = [ hspec-discover ]; description = "ghc toolchain installer"; @@ -118315,8 +118633,8 @@ self: { }: mkDerivation { pname = "gi-gst"; - version = "1.0.28"; - sha256 = "00svvri3ckpr9c12kx6081sq17vhgbij6dzr3d674p7cq1853dqj"; + version = "1.0.29"; + sha256 = "1cfyrvkgdhdpgmpxl5dg9s5slz3pqbg9gb9dp1alzjjf8n1fg39h"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -119460,8 +119778,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "10.20230802"; - sha256 = "05vjc3wg7yxh37pwffc9afjrbmza3yjc8yzy4kcid5fbkpnrrs67"; + version = "10.20230828"; + sha256 = "0pb6834dwjs9kdki977rfkdyg58dfzy8wfwvswrz3n7h6bcnjd0b"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -119519,8 +119837,8 @@ self: { }: mkDerivation { pname = "git-brunch"; - version = "1.6.0.0"; - sha256 = "1crpcv68lpfl0cs6cxmi7mcd1vawmif6qz1n0j2in49ypr75qkdk"; + version = "1.7.2.0"; + sha256 = "0v11y1ashifgcgyfrm58940sckzcfamgnszgv1c6lcjn9yvglvf0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -121574,8 +121892,8 @@ self: { }: mkDerivation { pname = "glualint"; - version = "1.25.0"; - sha256 = "042j1dpndzxdmskvnc8hsna6hnws1xk0klyxnkn5c5ammva4hhgv"; + version = "1.26.0"; + sha256 = "1ywvffzmpk4igzj46f2bck938hlim8kfbf5nh2mv4jv80k0535g5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -124732,8 +125050,8 @@ self: { }: mkDerivation { pname = "google-server-api"; - version = "0.4.1.0"; - sha256 = "1l0cgj8z210a9b4xa4y6rvnfgmxzj2pjpk0r6hxkb2qwjkrnbs8h"; + version = "0.4.1.1"; + sha256 = "06vbkf17dqss5cv9gfkqcgsnrx6hwx511ygc21w8h3jz3djsgf56"; libraryHaskellDepends = [ aeson aeson-casing base base64-bytestring bytestring HsOpenSSL http-api-data http-client http-client-tls http-media mime-mail @@ -126996,7 +127314,6 @@ self: { ]; description = "Command line utility to manage AWS ECS resources"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; mainProgram = "groot"; }) {}; @@ -128440,8 +128757,8 @@ self: { }: mkDerivation { pname = "h-raylib"; - version = "4.6.0.6"; - sha256 = "0hq60qb10izjgc8d44762cj5fvnb93qs4ajaqcmjn11kj01z8a8q"; + version = "4.6.0.7"; + sha256 = "0spgwi9d33srx8r04jfv0x73xakc9s6489w8zgig0gqm40ry9zdm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers exceptions lens ]; @@ -128451,6 +128768,8 @@ self: { description = "Raylib bindings for Haskell"; license = lib.licenses.asl20; badPlatforms = lib.platforms.darwin; + hydraPlatforms = lib.platforms.none; + broken = true; }) {c = null; inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXcursor; inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXi; inherit (pkgs.xorg) libXinerama; @@ -129549,8 +129868,8 @@ self: { pname = "hackage-cli"; version = "0.1.0.1"; sha256 = "023gnhdxwn36k3pd74j5jcykqbrj7nvp131mg761h8913h9ldw1r"; - revision = "3"; - editedCabalFile = "10sy9bf7kqibqmpjdhh6lbbqs7yyzlpim7za76v8pkm638hvn56x"; + revision = "4"; + editedCabalFile = "0vg0l95gri3kynmzvnbq3nw7pwg08mmia28k26pa3nvlcj8xlqjh"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ @@ -129743,8 +130062,8 @@ self: { pname = "hackage-security"; version = "0.6.2.3"; sha256 = "0rm0avcc1k247qbrajhzi3vz92cgcc4nr3kbhhfmfm8rjxv0bvjj"; - revision = "5"; - editedCabalFile = "031x30yn0wbbniy4ykfnxcxyha0v6d9lk8290fcpm5p89qrr6n1f"; + revision = "6"; + editedCabalFile = "1999rc45cq04gf4c28zn8hylx47kxhij7q9p1wzgd706f0l6c33q"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring Cabal Cabal-syntax containers cryptohash-sha256 directory ed25519 @@ -130443,17 +130762,17 @@ self: { "haggle" = callPackage ({ mkDerivation, base, containers, deepseq, fgl, hashable, HUnit - , monad-primitive, primitive, QuickCheck, ref-tf, test-framework + , primitive, QuickCheck, ref-tf, test-framework , test-framework-hunit, test-framework-quickcheck2, vector , vector-th-unbox }: mkDerivation { pname = "haggle"; - version = "0.2"; - sha256 = "1n7rg63bz283d938vr2w7ghza2qmljw04bg1wr4zhpylw6jjy2b7"; + version = "0.3"; + sha256 = "0cnl62w8fwb033gyx473ghbawnj0vpmjpjnlpv0wsvh3qhlax4hj"; libraryHaskellDepends = [ - base containers deepseq hashable monad-primitive primitive ref-tf - vector vector-th-unbox + base containers deepseq hashable primitive ref-tf vector + vector-th-unbox ]; testHaskellDepends = [ base containers fgl HUnit QuickCheck test-framework @@ -130795,28 +131114,26 @@ self: { ({ mkDerivation, aeson, base, binary, blaze-html, blaze-markup , bytestring, containers, data-default, deepseq, directory , file-embed, filepath, fsnotify, hashable, http-conduit - , http-types, lifted-async, lrucache, mtl, network-uri - , optparse-applicative, pandoc, parsec, process, QuickCheck, random - , regex-tdfa, resourcet, scientific, tagsoup, tasty, tasty-golden - , tasty-hunit, tasty-quickcheck, template-haskell, text, time + , http-types, lrucache, mtl, network-uri, optparse-applicative + , pandoc, parsec, process, QuickCheck, random, regex-tdfa + , resourcet, scientific, tagsoup, tasty, tasty-golden, tasty-hunit + , tasty-quickcheck, template-haskell, text, time , time-locale-compat, unordered-containers, util-linux, vector, wai , wai-app-static, warp, yaml }: mkDerivation { pname = "hakyll"; - version = "4.16.0.0"; - sha256 = "1cxhi1k2fzxzgx6wvplq90jx7mqdzpnab0qjf763s8ih8bf6zck4"; - revision = "1"; - editedCabalFile = "1lwfhzxg74fqzf5g61bldhwfdh3dhls3mxf02rrd32vgv6c60hk8"; + version = "4.16.1.0"; + sha256 = "0w1x2m1395a47b0712v4j8qjhha8sjqlmxdmfbxnr65nz36340jj"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base binary blaze-html blaze-markup bytestring containers data-default deepseq directory file-embed filepath fsnotify - hashable http-conduit http-types lifted-async lrucache mtl - network-uri optparse-applicative pandoc parsec process random - regex-tdfa resourcet scientific tagsoup template-haskell text time + hashable http-conduit http-types lrucache mtl network-uri + optparse-applicative pandoc parsec process random regex-tdfa + resourcet scientific tagsoup template-haskell text time time-locale-compat unordered-containers vector wai wai-app-static warp yaml ]; @@ -131022,8 +131339,8 @@ self: { pname = "hakyll-convert"; version = "0.3.0.4"; sha256 = "09fqr05mvs0qs53psq97kn1s4axinwn1vr5d6af4sqj3zc5k6k39"; - revision = "3"; - editedCabalFile = "1nmcmc4vs4kwb521qvpxirgi1ykg8d6cx76d1v98prmrjnk2i9s5"; + revision = "4"; + editedCabalFile = "0lqh8dijpzw1piy3b8j2haqkkx0cqlpfs0i7x7636y2r9yl0kxl7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -133360,8 +133677,8 @@ self: { }: mkDerivation { pname = "hasbolt-extras"; - version = "0.0.2.2"; - sha256 = "169xcvnf0qyxhzv3ji3vncaxm7zn69jmgxrzij7fr9byvkvpxqdh"; + version = "0.0.3.0"; + sha256 = "0cvbwybvxzy5bq6y6sh9pvjjr0s5pslz32a0ip9bklg7ivvpd8f7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -135167,8 +135484,8 @@ self: { }: mkDerivation { pname = "haskell-language-server"; - version = "2.1.0.0"; - sha256 = "0i8fwc4m0rc5dzs1rp14g20cz2awm2x9pc46rhkcql3x89kn6knf"; + version = "2.2.0.0"; + sha256 = "0896ji6drjkmpsgzhq64ls3wgk2fg8imr3hdxyjlb8izkrq1vvmy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -137583,7 +137900,7 @@ self: { license = lib.licenses.mit; }) {}; - "haskoin-store-data_1_0_1" = callPackage + "haskoin-store-data_1_0_2" = callPackage ({ mkDerivation, aeson, base, binary, bytes, bytestring, cereal , containers, data-default, deepseq, hashable, haskoin-core, hspec , hspec-discover, http-client, http-types, lens, mtl, network @@ -137592,8 +137909,8 @@ self: { }: mkDerivation { pname = "haskoin-store-data"; - version = "1.0.1"; - sha256 = "19jax9bz68qakjrx54fbsqz5h1jiad4cmn3g7xln8q1qaq0pyl08"; + version = "1.0.2"; + sha256 = "1h5barixyfvjaqdk9k14l4n4nz6gaxn37zhwydd296gbzzg6fg0y"; libraryHaskellDepends = [ aeson base binary bytes bytestring cereal containers data-default deepseq hashable haskoin-core http-client http-types lens mtl @@ -138706,6 +139023,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "hasql-interpolate_0_2_1_0" = callPackage + ({ mkDerivation, aeson, array, base, bytestring, containers + , haskell-src-meta, hasql, megaparsec, mtl, scientific, tasty + , tasty-hunit, template-haskell, text, time, tmp-postgres + , transformers, uuid, vector + }: + mkDerivation { + pname = "hasql-interpolate"; + version = "0.2.1.0"; + sha256 = "1gmi552pkjbsxxqjprnq6696xqzh1swcib73p6892q65irgnhd5x"; + libraryHaskellDepends = [ + aeson array base bytestring containers haskell-src-meta hasql + megaparsec mtl scientific template-haskell text time transformers + uuid vector + ]; + testHaskellDepends = [ + base hasql tasty tasty-hunit template-haskell text tmp-postgres + ]; + description = "QuasiQuoter that supports expression interpolation for hasql"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hasql-listen-notify" = callPackage ({ mkDerivation, base, bytestring, hasql, mtl, postgresql-libpq , text @@ -138749,8 +139089,8 @@ self: { }: mkDerivation { pname = "hasql-notifications"; - version = "0.2.0.5"; - sha256 = "1vxd896q3br75132swyab8lm7zhlc8c5bggc1ks2m883df4lmsc7"; + version = "0.2.0.6"; + sha256 = "0ykwvmfhv3x4a6b58crxp1akndz9n7rkr4wbbl6dnikc7rzggh8j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -141611,7 +141951,6 @@ self: { ]; description = "Customizable Gen for ADT using Generics"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hedgehog-gen-json" = callPackage @@ -142014,8 +142353,8 @@ self: { pname = "heist"; version = "1.1.1.1"; sha256 = "0s6ydncib0g4mdmx4vzwmp1cnbvxrb2pngvkd5jc5kn5vb3g929l"; - revision = "2"; - editedCabalFile = "0xgigspz2wbszs1vmx8ykp6b7j87j2r346pay0wdrpx8hqyzzjfl"; + revision = "3"; + editedCabalFile = "0lqh0qjphsfv65k8jgjrgnfln7c7wh8gqzmn9qa8s5m4viz6fkqs"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder blaze-html bytestring containers directory directory-tree dlist filepath hashable @@ -142917,23 +143256,23 @@ self: { }) {}; "hermes-json" = callPackage - ({ mkDerivation, aeson, attoparsec, attoparsec-iso8601, base - , bytestring, containers, deepseq, dlist, hedgehog, primitive - , scientific, system-cxx-std-lib, tasty, tasty-hedgehog, text, time - , time-compat, transformers, vector + ({ mkDerivation, aeson, base, bytestring, containers, deepseq + , dlist, hedgehog, integer-conversion, primitive, scientific + , system-cxx-std-lib, tasty, tasty-hedgehog, tasty-hunit, text + , text-iso8601, time, time-compat, transformers, vector }: mkDerivation { pname = "hermes-json"; - version = "0.5.0.0"; - sha256 = "0d0vy74z0m9vcs5rngigsqd6642dfx40a8bzh5finwrwgjb9k2dk"; + version = "0.6.1.0"; + sha256 = "05xxc3r9gbicrdc2jfhxv556n3y46alafkcfks7dz31kq9mz619g"; libraryHaskellDepends = [ - attoparsec attoparsec-iso8601 base bytestring containers deepseq - dlist primitive scientific system-cxx-std-lib text time time-compat - transformers vector + base bytestring containers deepseq dlist integer-conversion + primitive scientific system-cxx-std-lib text text-iso8601 time + time-compat transformers vector ]; testHaskellDepends = [ aeson base bytestring containers hedgehog scientific tasty - tasty-hedgehog text time vector + tasty-hedgehog tasty-hunit text time vector ]; description = "Fast JSON decoding via simdjson C++ bindings"; license = lib.licenses.mit; @@ -144419,6 +144758,8 @@ self: { pname = "hgmp"; version = "0.1.2.1"; sha256 = "08w0b6yla086vk802xqcqslpkqpjx2h2hc6l3jyymms77qyn70f6"; + revision = "1"; + editedCabalFile = "01mgxv6gchzxkd8aqzl97mbs4bidnpvkb6462pz7s96c5kgm0z2q"; libraryHaskellDepends = [ base ghc-bignum ghc-prim ]; testHaskellDepends = [ base QuickCheck ]; description = "Haskell interface to GMP"; @@ -144838,6 +145179,41 @@ self: { mainProgram = "hie-bios"; }) {}; + "hie-bios_0_13_0" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , co-log-core, conduit, conduit-extra, cryptohash-sha1, deepseq + , directory, exceptions, extra, file-embed, filepath, ghc + , optparse-applicative, prettyprinter, tasty + , tasty-expected-failure, tasty-hunit, template-haskell, temporary + , text, time, transformers, unix-compat, unordered-containers, yaml + }: + mkDerivation { + pname = "hie-bios"; + version = "0.13.0"; + sha256 = "0gv2ip6zlrfcxngv7kh1a6ah4avj6y2n406h0i66wnc9l11l9mvb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring co-log-core conduit + conduit-extra cryptohash-sha1 deepseq directory exceptions extra + file-embed filepath ghc prettyprinter template-haskell temporary + text time transformers unix-compat unordered-containers yaml + ]; + executableHaskellDepends = [ + base co-log-core directory filepath optparse-applicative + prettyprinter + ]; + testHaskellDepends = [ + aeson base co-log-core directory extra filepath ghc prettyprinter + tasty tasty-expected-failure tasty-hunit temporary transformers + yaml + ]; + description = "Set up a GHC API session"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "hie-bios"; + }) {}; + "hie-compat" = callPackage ({ mkDerivation, array, base, bytestring, containers, directory , filepath, ghc, ghc-boot, transformers @@ -146411,8 +146787,8 @@ self: { }: mkDerivation { pname = "hix"; - version = "0.5.8"; - sha256 = "0x1yaj99ss7wmzfad51zj36n9qahqap970pkbxxc72s295y0prbx"; + version = "0.6.1"; + sha256 = "15961xpyw5zibqqr8svix1d96njvgzxh464ahx5fyprmznxwkj59"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -146874,8 +147250,8 @@ self: { pname = "hledger"; version = "1.30.1"; sha256 = "0ri8zg1pq011cbry5cxj2rc5g19vgl3rjcl5b2qk4bhdgxy7na98"; - revision = "2"; - editedCabalFile = "10r6ywfipsahxdbpnpg9cki5i201wglvdga3snhf7218wpr8rbrp"; + revision = "3"; + editedCabalFile = "1qsy6axbldm2az2bnxgklnd9hhyhdlrkb395zpgrli9sla2mqdfv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -146910,6 +147286,54 @@ self: { ]; }) {}; + "hledger_1_31" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs + , containers, data-default, Decimal, Diff, directory, extra + , filepath, githash, hashable, haskeline, hledger-lib, lucid + , math-functions, megaparsec, microlens, mtl, process, regex-tdfa + , safe, shakespeare, split, tabular, tasty, temporary, terminfo + , text, text-ansi, time, timeit, transformers, unordered-containers + , utf8-string, utility-ht, wizards + }: + mkDerivation { + pname = "hledger"; + version = "1.31"; + sha256 = "0pzzllcd6g1sg0ax3287k5dsrf537al4zz36nw70awdpb24ij8h3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal base bytestring cmdargs containers data-default + Decimal Diff directory extra filepath githash hashable haskeline + hledger-lib lucid math-functions megaparsec microlens mtl process + regex-tdfa safe shakespeare split tabular tasty temporary terminfo + text text-ansi time timeit transformers unordered-containers + utf8-string utility-ht wizards + ]; + executableHaskellDepends = [ + aeson ansi-terminal base bytestring cmdargs containers data-default + Decimal directory extra filepath githash haskeline hledger-lib + math-functions megaparsec microlens mtl process regex-tdfa safe + shakespeare split tabular tasty temporary terminfo text text-ansi + time timeit transformers unordered-containers utf8-string + utility-ht wizards + ]; + testHaskellDepends = [ + aeson ansi-terminal base bytestring cmdargs containers data-default + Decimal directory extra filepath githash haskeline hledger-lib + math-functions megaparsec microlens mtl process regex-tdfa safe + shakespeare split tabular tasty temporary terminfo text text-ansi + time timeit transformers unordered-containers utf8-string + utility-ht wizards + ]; + description = "Command-line interface for the hledger accounting system"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + mainProgram = "hledger"; + maintainers = [ + lib.maintainers.maralorn lib.maintainers.sternenseemann + ]; + }) {}; + "hledger-api" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, data-default , Decimal, docopt, either, hledger, hledger-lib, microlens @@ -147012,6 +147436,8 @@ self: { pname = "hledger-iadd"; version = "1.3.18"; sha256 = "0j2p785hxjzmisz2yi5841zdfyl1sqjwzacm7ijz9px8gx812kbc"; + revision = "2"; + editedCabalFile = "0833bg0awc4sr3hlslirbivrcvy0varmhdklx0dwx0mz1gikyp9r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -147042,10 +147468,10 @@ self: { }: mkDerivation { pname = "hledger-interest"; - version = "1.6.5"; - sha256 = "0znrypimfcr4immy3x5651cfkny1n8yi8isfh72mv2px70994pm1"; - revision = "2"; - editedCabalFile = "0qfvbs25dir3xra9pgi5fd41vm0hji666ws8sikb01ik4w5mmj7z"; + version = "1.6.6"; + sha256 = "0hklpg9sgghrcvkrgz7kfr8jc6kwsv8zzpbbg0c3idhbdxwg74d8"; + revision = "1"; + editedCabalFile = "17l6skwg9s598r7k8y6fmqa44vmk2yqrbgkf3g39xiygf1hn6ags"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -147093,8 +147519,47 @@ self: { pname = "hledger-lib"; version = "1.30"; sha256 = "0qyhkx1bhrmnwwxqbqa4pqghg7j2vn63829j5s2zdn8ys2mm8s64"; - revision = "2"; - editedCabalFile = "136j2f4wyqcaihkpisxnw3afn2v953zl4fx9w2hdvavqpv99yj0m"; + revision = "3"; + editedCabalFile = "0v1pfx3mzd4zhygadf1hd51v7qfq9zj0q5yh515d1ly6xqgilbv5"; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal array base base-compat + blaze-markup bytestring call-stack cassava cassava-megaparsec + cmdargs colour containers data-default Decimal deepseq directory + doclayout extra file-embed filepath Glob hashtables megaparsec + microlens microlens-th mtl pager parser-combinators pretty-simple + regex-tdfa safe tabular tasty tasty-hunit template-haskell + terminal-size text text-ansi time timeit transformers uglymemo + unordered-containers utf8-string + ]; + testHaskellDepends = [ + aeson aeson-pretty ansi-terminal array base base-compat + blaze-markup bytestring call-stack cassava cassava-megaparsec + cmdargs colour containers data-default Decimal deepseq directory + doclayout doctest extra file-embed filepath Glob hashtables + megaparsec microlens microlens-th mtl pager parser-combinators + pretty-simple regex-tdfa safe tabular tasty tasty-hunit + template-haskell terminal-size text text-ansi time timeit + transformers uglymemo unordered-containers utf8-string + ]; + description = "A reusable library providing the core functionality of hledger"; + license = lib.licenses.gpl3Only; + }) {}; + + "hledger-lib_1_31" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array, base + , base-compat, blaze-markup, bytestring, call-stack, cassava + , cassava-megaparsec, cmdargs, colour, containers, data-default + , Decimal, deepseq, directory, doclayout, doctest, extra + , file-embed, filepath, Glob, hashtables, megaparsec, microlens + , microlens-th, mtl, pager, parser-combinators, pretty-simple + , regex-tdfa, safe, tabular, tasty, tasty-hunit, template-haskell + , terminal-size, text, text-ansi, time, timeit, transformers + , uglymemo, unordered-containers, utf8-string + }: + mkDerivation { + pname = "hledger-lib"; + version = "1.31"; + sha256 = "16lhcjbm6nkpdiawwj71d5y4g3k2l3674g30sc7mv5qckfwhxaal"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal array base base-compat blaze-markup bytestring call-stack cassava cassava-megaparsec @@ -147117,6 +147582,7 @@ self: { ]; description = "A reusable library providing the core functionality of hledger"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; }) {}; "hledger-makeitso" = callPackage @@ -147184,8 +147650,8 @@ self: { pname = "hledger-ui"; version = "1.30"; sha256 = "1il3849rn8zimn79d7b81v6yb916w5w8lp4ykxkyc3fwwyjcc2q5"; - revision = "1"; - editedCabalFile = "05h4adyf7h48fgihpq9swp92j255s4dhgp0q5fg2kdis78i24p7d"; + revision = "2"; + editedCabalFile = "1a4hnkn45qic4arrna20kfzdp2yhhw66dmhma7zagbrf2ljwl1jj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -147200,6 +147666,32 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; + "hledger-ui_1_31" = callPackage + ({ mkDerivation, ansi-terminal, async, base, brick, cmdargs + , containers, data-default, directory, doclayout, extra, filepath + , fsnotify, hledger, hledger-lib, megaparsec, microlens + , microlens-platform, mtl, process, safe, split, text, text-zipper + , time, transformers, unix, vector, vty + }: + mkDerivation { + pname = "hledger-ui"; + version = "1.31"; + sha256 = "14rflgkmx2b7gl0c3c30chqqm12lhwc4kaqja3cy6fcwyl0dz9yb"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ansi-terminal async base brick cmdargs containers data-default + directory doclayout extra filepath fsnotify hledger hledger-lib + megaparsec microlens microlens-platform mtl process safe split text + text-zipper time transformers unix vector vty + ]; + description = "Curses-style terminal interface for the hledger accounting system"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + mainProgram = "hledger-ui"; + maintainers = [ lib.maintainers.maralorn ]; + }) {}; + "hledger-vty" = callPackage ({ mkDerivation, base, cmdargs, hledger, hledger-lib, HUnit, safe , time, vty @@ -147235,8 +147727,8 @@ self: { pname = "hledger-web"; version = "1.30"; sha256 = "0lcw8qigh1507hn287zwmp00vsccsm6lw6r87c5rp0ikxsxmwbds"; - revision = "2"; - editedCabalFile = "0cixs5p93f2dx82w7krki4znsgdkl6hi2rqqdj0yx2xlp5m4jzq5"; + revision = "3"; + editedCabalFile = "1fclgmqidsmz7is5kksr5f9icnrvyhjyks3hak1cc3hxsd2gz3k2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -147259,6 +147751,44 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; + "hledger-web_1_31" = callPackage + ({ mkDerivation, aeson, base, base64, blaze-html, blaze-markup + , bytestring, case-insensitive, clientsession, cmdargs, conduit + , conduit-extra, containers, data-default, Decimal, directory + , extra, filepath, hjsmin, hledger, hledger-lib, hspec, http-client + , http-conduit, http-types, megaparsec, mtl, network, shakespeare + , template-haskell, text, time, transformers, unix-compat + , unordered-containers, utf8-string, wai, wai-cors, wai-extra + , wai-handler-launch, warp, yaml, yesod, yesod-core, yesod-form + , yesod-static, yesod-test + }: + mkDerivation { + pname = "hledger-web"; + version = "1.31"; + sha256 = "0g5cc5bscxqrj6lij9gyh7sbl39s968ksm3xglccszg2pzgsnl90"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base64 blaze-html blaze-markup bytestring + case-insensitive clientsession cmdargs conduit conduit-extra + containers data-default Decimal directory extra filepath hjsmin + hledger hledger-lib hspec http-client http-conduit http-types + megaparsec mtl network shakespeare template-haskell text time + transformers unix-compat unordered-containers utf8-string wai + wai-cors wai-extra wai-handler-launch warp yaml yesod yesod-core + yesod-form yesod-static yesod-test + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base hledger hledger-lib hspec text yesod yesod-test + ]; + description = "Web-based user interface for the hledger accounting system"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + mainProgram = "hledger-web"; + maintainers = [ lib.maintainers.maralorn ]; + }) {}; + "hlex" = callPackage ({ mkDerivation, base, HUnit, regex-tdfa }: mkDerivation { @@ -147476,6 +148006,19 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; + "hlint-plugin" = callPackage + ({ mkDerivation, base, containers, ghc, hlint }: + mkDerivation { + pname = "hlint-plugin"; + version = "1.0.1"; + sha256 = "1npzxf380wq24zmvrxid318afh6g41nl5pb7bqldf4y6m9wamp1k"; + libraryHaskellDepends = [ base containers ghc hlint ]; + description = "GHC plugin for hlint"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "hlint-test" = callPackage ({ mkDerivation, base, hlint }: mkDerivation { @@ -147615,8 +148158,8 @@ self: { }: mkDerivation { pname = "hls-alternate-number-format-plugin"; - version = "2.1.0.0"; - sha256 = "0zp5y6k5hk9xkc45nz64w550af2a881jbzpl3nwif9w3qx7q0966"; + version = "2.2.0.0"; + sha256 = "05jz7nf4mp0z0bag0ym42c511c05w0hx3ai18kwamavin68a41kb"; libraryHaskellDepends = [ aeson base containers extra ghc-boot-th ghcide hie-compat hls-graph hls-plugin-api lens lsp mtl regex-tdfa syb text @@ -147644,15 +148187,16 @@ self: { "hls-cabal-fmt-plugin" = callPackage ({ mkDerivation, base, directory, filepath, ghcide, hls-plugin-api - , hls-test-utils, lens, lsp-types, mtl, process, text, transformers + , hls-test-utils, lens, lsp-types, mtl, process-extras, text + , transformers }: mkDerivation { pname = "hls-cabal-fmt-plugin"; - version = "2.1.0.0"; - sha256 = "0qrjflj02y600y8793gwhkz13hgnl8dv1nmgv5ajlr59md0r8gvf"; + version = "2.2.0.0"; + sha256 = "1lmf1cni6kclcdvwd70n40n14hd6b3din6apnmbwbdh84i7z43s6"; libraryHaskellDepends = [ base directory filepath ghcide hls-plugin-api lens lsp-types mtl - process text transformers + process-extras text transformers ]; testHaskellDepends = [ base directory filepath hls-test-utils ]; description = "Integration with the cabal-fmt code formatter"; @@ -147668,8 +148212,8 @@ self: { }: mkDerivation { pname = "hls-cabal-plugin"; - version = "2.1.0.0"; - sha256 = "1qv70vj4znn5yswnsr41h313y8p6zx006hzqc7fzk3f2khz079rp"; + version = "2.2.0.0"; + sha256 = "0pl5zn09vbbfklkf49azd447353rb4x6mr95kswlckvk8qvxcb5n"; libraryHaskellDepends = [ base bytestring Cabal-syntax containers deepseq directory extra filepath ghcide hashable hls-graph hls-plugin-api lens lsp @@ -147692,8 +148236,8 @@ self: { }: mkDerivation { pname = "hls-call-hierarchy-plugin"; - version = "2.1.0.0"; - sha256 = "1rlnx62y6271mfka1qp48fhfkv89dz4qbhiz6n7sh9mp5bplkkbh"; + version = "2.2.0.0"; + sha256 = "0ng0567z3fpsxzkxx60jhk6d3a1cllcgrdscijcndqknr38c97jk"; libraryHaskellDepends = [ aeson base containers extra ghcide hiedb hls-plugin-api lens lsp sqlite-simple text unordered-containers @@ -147713,8 +148257,8 @@ self: { }: mkDerivation { pname = "hls-change-type-signature-plugin"; - version = "2.1.0.0"; - sha256 = "1hv0hdgqxkxs3lad29ikpswal08gvql4bd9qwsq3p94brc59c6nz"; + version = "2.2.0.0"; + sha256 = "0vpv87mnbk7d18vxl01r6f7pyz94107v9mc4mnbb2z2fmq6bcsfj"; libraryHaskellDepends = [ base containers ghcide hls-plugin-api lsp-types regex-tdfa syb text transformers unordered-containers @@ -147734,8 +148278,8 @@ self: { }: mkDerivation { pname = "hls-class-plugin"; - version = "2.1.0.0"; - sha256 = "0m3aprgv1inmj9lq85g1vrngrqvgrq9r39jq2vy4rlm14cqlgjk2"; + version = "2.2.0.0"; + sha256 = "042z92xjdxjp5f6zig692nq2f8dk1m5rhhjqqczn3zkw0zs9v96v"; libraryHaskellDepends = [ aeson base containers deepseq extra ghc ghc-boot-th ghc-exactprint ghcide hls-graph hls-plugin-api lens lsp mtl text transformers @@ -147756,8 +148300,8 @@ self: { }: mkDerivation { pname = "hls-code-range-plugin"; - version = "2.1.0.0"; - sha256 = "1jqh37gd5hqznx4gjvbx0k077bryic1j15b843l02vy9iymsmaj5"; + version = "2.2.0.0"; + sha256 = "0w6hh36szkjgpvxx07cckjr3jnrk80y2ib2mfga7xmw55pmcvrg8"; libraryHaskellDepends = [ aeson base containers deepseq extra ghcide hashable hls-plugin-api lens lsp mtl semigroupoids text transformers vector @@ -147782,8 +148326,8 @@ self: { }: mkDerivation { pname = "hls-eval-plugin"; - version = "2.1.0.0"; - sha256 = "1ic1giwwndmijbnbnani2xxfmxwpp66jh03l614wphvlxqchgf67"; + version = "2.2.0.0"; + sha256 = "05ap5rzrr8qjqn18l5gyn598iksmjf563f6ksg9mv5hkpzbiin1j"; libraryHaskellDepends = [ aeson base bytestring containers data-default deepseq Diff directory dlist extra filepath ghc ghc-boot-th ghc-paths ghcide @@ -147824,8 +148368,8 @@ self: { }: mkDerivation { pname = "hls-explicit-fixity-plugin"; - version = "2.1.0.0"; - sha256 = "12kv301kwl84xd30fz7s3mmcyf51kypwfl7nhcqx7829xjrsxkbb"; + version = "2.2.0.0"; + sha256 = "00mpdx9szdmbgh5glfi9lbwfb8qdqqi7jyi61d5fcppmniy51vcl"; libraryHaskellDepends = [ base containers deepseq extra ghc ghcide hashable hls-plugin-api lsp text transformers @@ -147843,8 +148387,8 @@ self: { }: mkDerivation { pname = "hls-explicit-imports-plugin"; - version = "2.1.0.0"; - sha256 = "12aj8px0sbi5qh9q4381rmh3p9nyk2x5mk91i0mm5m9as4gwbk4k"; + version = "2.2.0.0"; + sha256 = "0gh2vxdnyxhxhldfnrsj41p099jd113z1a8qnn4p4d0ba7j2qsic"; libraryHaskellDepends = [ aeson base containers deepseq ghc ghcide hls-graph hls-plugin-api lens lsp mtl text transformers unordered-containers @@ -147857,17 +148401,18 @@ self: { }) {}; "hls-explicit-record-fields-plugin" = callPackage - ({ mkDerivation, base, containers, filepath, ghc-boot-th, ghcide - , hls-graph, hls-plugin-api, hls-test-utils, lens, lsp, lsp-test - , syb, text, transformers, unordered-containers + ({ mkDerivation, aeson, base, containers, filepath, ghc + , ghc-boot-th, ghcide, hls-graph, hls-plugin-api, hls-test-utils + , lens, lsp, lsp-test, syb, text, transformers + , unordered-containers }: mkDerivation { pname = "hls-explicit-record-fields-plugin"; - version = "2.1.0.0"; - sha256 = "0bnvc7sd6sn98m9y1kszlm7ca8ddwjl9106c895j28yq5pjxarff"; + version = "2.2.0.0"; + sha256 = "1xhc2zb56q1bziiypdll0898nz26pvwgmqfwps3dh8agixfpvn15"; libraryHaskellDepends = [ - base containers ghc-boot-th ghcide hls-graph hls-plugin-api lens - lsp syb text transformers unordered-containers + aeson base containers ghc ghc-boot-th ghcide hls-graph + hls-plugin-api lens lsp syb text transformers unordered-containers ]; testHaskellDepends = [ base filepath hls-test-utils lsp-test text @@ -147882,8 +148427,8 @@ self: { }: mkDerivation { pname = "hls-floskell-plugin"; - version = "2.1.0.0"; - sha256 = "13igdc86qpk7j9cbc9cpfyhpahi8wcnxar45wl81piaqahqpn581"; + version = "2.2.0.0"; + sha256 = "1kj1f7k0fdcj1mqijng56qax42y9aywkd3gi2pvivdsfd7rnc9dr"; libraryHaskellDepends = [ base floskell ghcide hls-plugin-api lsp-types mtl text transformers ]; @@ -147899,8 +148444,8 @@ self: { }: mkDerivation { pname = "hls-fourmolu-plugin"; - version = "2.1.0.0"; - sha256 = "0lrm6f1npqplf1sw5a3pc7qyzd3clys5dylbywh6m66h2bns96yf"; + version = "2.2.0.0"; + sha256 = "16i26nk6zrjgrz1yf7xariygiin2h8xa0sqwfnm81nybzszr50h6"; libraryHaskellDepends = [ base filepath fourmolu ghc ghc-boot-th ghcide hls-plugin-api lens lsp mtl process-extras text transformers @@ -147922,8 +148467,8 @@ self: { }: mkDerivation { pname = "hls-gadt-plugin"; - version = "2.1.0.0"; - sha256 = "1lb5zk21gx620ywz1wb2034jvq4mc9amp2zmydfc1lwg5ad1my0b"; + version = "2.2.0.0"; + sha256 = "1pbqy9ndxkcn57lpwfgd2y38gs8vq55sqxhw44rdfsw6gjpmw1xj"; libraryHaskellDepends = [ aeson base containers extra ghc ghc-boot-th ghc-exactprint ghcide hls-plugin-api hls-refactor-plugin lens lsp mtl text transformers @@ -147945,8 +148490,8 @@ self: { }: mkDerivation { pname = "hls-graph"; - version = "2.1.0.0"; - sha256 = "0gsi7a2qpi9qybaig2manbd7pggg429hzwbiwlfjrlnmd4apvs6x"; + version = "2.2.0.0"; + sha256 = "0c306fb54kylj8bg6l4nm0f5fw88hyyk59nzps4w16gciqbdjlw1"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson async base bytestring containers deepseq directory exceptions @@ -147967,8 +148512,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "hls-haddock-comments-plugin"; - version = "2.1.0.0"; - sha256 = "0xf38ikm0r0sx4b25g3ns8q421swmy7an4fbs5dmv86r4pr3999m"; + version = "2.2.0.0"; + sha256 = "0wp8hk5hwl43z5mjcas332z92y3zv9g8wrc5zhzli8pa37ab6r8x"; description = "Haddock comments plugin for Haskell Language Server"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; @@ -147985,8 +148530,8 @@ self: { }: mkDerivation { pname = "hls-hlint-plugin"; - version = "2.1.0.0"; - sha256 = "1z96hry723n236v8v05yzjrs5nxaxh58vqm2ixmkldpgf1i5qklq"; + version = "2.2.0.0"; + sha256 = "0qrygjvgm5x88j7cjw9dhzli38by0gzmda8f8bkqi8v1qx09ny76"; libraryHaskellDepends = [ aeson apply-refact base binary bytestring containers data-default deepseq Diff directory extra filepath ghc-exactprint ghc-lib-parser @@ -148009,8 +148554,8 @@ self: { }: mkDerivation { pname = "hls-module-name-plugin"; - version = "2.1.0.0"; - sha256 = "1h34cy75mbpdzv4a63k3kcwds7d0c0k87a5fcvgyxbi6a0pkchps"; + version = "2.2.0.0"; + sha256 = "1z3iiqw7h08cpz99wciaqwdcsrnvpxff95jswidzk696lnlzyvbh"; libraryHaskellDepends = [ aeson base containers directory filepath ghcide hls-plugin-api lsp text transformers unordered-containers @@ -148027,8 +148572,8 @@ self: { }: mkDerivation { pname = "hls-ormolu-plugin"; - version = "2.1.0.0"; - sha256 = "0ianjskwbvh3lshp74mwddc3b3k472zn8gpa1fwglhcixv1i4d92"; + version = "2.2.0.0"; + sha256 = "0c6kj7870q5fi00cgx3z4cpvldsdvn4brjg4v7vv32grfj7nwdc1"; libraryHaskellDepends = [ base extra filepath ghc ghc-boot-th ghcide hls-plugin-api lens lsp mtl ormolu text @@ -148048,8 +148593,8 @@ self: { }: mkDerivation { pname = "hls-overloaded-record-dot-plugin"; - version = "2.1.0.0"; - sha256 = "1x575xdqlynghnirqik6w8mm84jdwlm8wvaigkhhnqw2fqii991i"; + version = "2.2.0.0"; + sha256 = "1cllpyqnwfy7kk2h17igzv2ly71qm1k76mm2wjjgpy3qfh3fz7wm"; libraryHaskellDepends = [ aeson base containers deepseq ghc-boot-th ghcide hls-graph hls-plugin-api lens lsp syb text transformers unordered-containers @@ -148074,8 +148619,8 @@ self: { }: mkDerivation { pname = "hls-plugin-api"; - version = "2.1.0.0"; - sha256 = "0s2pnvakmvahwrxm7mvdrs5gmhds0i3yak6axfw8ng0f139lglhx"; + version = "2.2.0.0"; + sha256 = "0j95g116vv92wx7mm7anjifx3w494f4bycw0ad7wxf57qrb063l1"; libraryHaskellDepends = [ aeson base co-log-core containers data-default dependent-map dependent-sum Diff dlist extra filepath ghc hashable hls-graph @@ -148101,8 +148646,8 @@ self: { }: mkDerivation { pname = "hls-pragmas-plugin"; - version = "2.1.0.0"; - sha256 = "1ny20jpzf7qhvc80pz80drjpkljr07nbriy5f9nfd5izhdkdbjp6"; + version = "2.2.0.0"; + sha256 = "07dy9r63ixvzf5isbw8nl9vfpym17h66vzmxn79kgnh8xkx11rgm"; libraryHaskellDepends = [ base containers extra fuzzy ghc ghcide hls-plugin-api lens lsp text transformers unordered-containers @@ -148121,8 +148666,8 @@ self: { }: mkDerivation { pname = "hls-qualify-imported-names-plugin"; - version = "2.1.0.0"; - sha256 = "1lcc2ga264p79shd26rpl961rqr583p4ncgb38f1wx6c6jl7r251"; + version = "2.2.0.0"; + sha256 = "0viam4zzkbbi8lv4c86bqhy3r00x7qjrbwwaqakdgfhn4l8d97r6"; libraryHaskellDepends = [ aeson base containers deepseq dlist ghc ghcide hls-graph hls-plugin-api lens lsp text transformers unordered-containers @@ -148144,8 +148689,8 @@ self: { }: mkDerivation { pname = "hls-refactor-plugin"; - version = "2.1.0.0"; - sha256 = "0v96fgsx2hh45xiby0q9jxg2px927v7rynl4qq0mcrsidfwrwaqd"; + version = "2.2.0.0"; + sha256 = "0c7b00kx4imxvs4ydbr1g409ikl6lh0r9wl1m749xzx5dhblmwbh"; libraryHaskellDepends = [ aeson base bytestring containers data-default deepseq dlist extra ghc ghc-boot ghc-exactprint ghcide hls-graph hls-plugin-api lens @@ -148192,8 +148737,8 @@ self: { }: mkDerivation { pname = "hls-rename-plugin"; - version = "2.1.0.0"; - sha256 = "07bnc1d05hd8pjwxgxhrkrxaiqg2f082vzvh0c942ri2knpf6f2g"; + version = "2.2.0.0"; + sha256 = "094kk4fi2bih43gqr9ndp7vfqbmsw0gzsgpmpbh6k2ad00csj5w6"; libraryHaskellDepends = [ base containers extra ghc ghc-exactprint ghcide hashable hie-compat hiedb hls-plugin-api hls-refactor-plugin lens lsp lsp-types mod mtl @@ -148215,8 +148760,8 @@ self: { }: mkDerivation { pname = "hls-retrie-plugin"; - version = "2.1.0.0"; - sha256 = "1lq1bb73cp8sp846ib3apynk6iy3v1qn47hlj8spiq4lx7wa2an9"; + version = "2.2.0.0"; + sha256 = "0ssx703pphm0m9930cjklwr02hx0y9qnrh6936ws55zvkpgq81fa"; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory extra ghc ghcide hashable hls-plugin-api hls-refactor-plugin lens lsp lsp-types mtl @@ -148264,8 +148809,8 @@ self: { }: mkDerivation { pname = "hls-splice-plugin"; - version = "2.1.0.0"; - sha256 = "03b4l49g8c3z45c3my0b50m0960snip17w3p3r6wa04afm9r6g6f"; + version = "2.2.0.0"; + sha256 = "0vzawa9zq6bjb81847my2a62n091vm4292miq0jynbi1g075jgh5"; libraryHaskellDepends = [ aeson base containers dlist extra foldl ghc ghc-exactprint ghcide hls-plugin-api hls-refactor-plugin lens lsp mtl retrie syb text @@ -148282,8 +148827,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "hls-stan-plugin"; - version = "2.1.0.0"; - sha256 = "0azlvn5mibmsj3w5pwfkgaydji58bb88bvhzyc49y7gzg24cm23s"; + version = "2.2.0.0"; + sha256 = "0y4s6m3kw4ab0g6h7dgbsxjm61ryk1i7skdvr8h8w5m39lm46hkw"; description = "Stan integration plugin with Haskell Language Server"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; @@ -148297,8 +148842,8 @@ self: { }: mkDerivation { pname = "hls-stylish-haskell-plugin"; - version = "2.1.0.0"; - sha256 = "025g6laxsffdp5alvilpq71slqkybwfak5ayr3m8h2ymylhf4vy3"; + version = "2.2.0.0"; + sha256 = "0rgkk4kfcwnzl2xvvj9v184xniapsn3lcbrxfzqw41qpl59k21xk"; libraryHaskellDepends = [ base directory filepath ghc ghc-boot-th ghcide hls-plugin-api lsp-types mtl stylish-haskell text @@ -148312,8 +148857,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "hls-tactics-plugin"; - version = "2.1.0.0"; - sha256 = "0mry1y7p26lraina8ynsrnm441wprrrp4wcl5ys6xs6z860kxaqf"; + version = "2.2.0.0"; + sha256 = "05rgapkpr3giln245aswlcgwqpfglifsjq1n8sgwgi04bn2w6vng"; description = "Wingman plugin for Haskell Language Server"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; @@ -148329,8 +148874,8 @@ self: { }: mkDerivation { pname = "hls-test-utils"; - version = "2.1.0.0"; - sha256 = "1dmnbnlz4yk8w1ln6dc2gqv10gsjb8mkzv89lv3h3vc5q6pqimpw"; + version = "2.2.0.0"; + sha256 = "1pn87ba17x1fbd80nw7a2klgf8yh2swj037j36ljm5c4b07xbj3b"; libraryHaskellDepends = [ aeson async base blaze-markup bytestring containers data-default directory extra filepath ghcide hls-graph hls-plugin-api lens lsp @@ -150060,10 +150605,8 @@ self: { }: mkDerivation { pname = "homotuple"; - version = "0.2.0.0"; - sha256 = "17vr2g8jv71k2bwv5x973xjjxacr5br4xlngxjpzbq6xk9n37laf"; - revision = "1"; - editedCabalFile = "02l2bna56psk6zlpa1wxcvizh7y1rrwsm8mgnzv77kvym80d92cy"; + version = "0.2.1.1"; + sha256 = "1zmi1lwlk7h38s8zvl152k5m0bzwdjgcdvy0f261axlm66yh0p4z"; setupHaskellDepends = [ base Cabal directory ]; libraryHaskellDepends = [ base OneTuple Only single-tuple ]; description = "Homotuple, all whose elements are the same type"; @@ -150976,6 +151519,8 @@ self: { pname = "horizontal-rule"; version = "0.6.0.0"; sha256 = "03rh58znaghcf1gicbwbxkx5ya4lv7qi8b2lq5nawi35ljars02x"; + revision = "2"; + editedCabalFile = "064dg5g0ya8bsmb7rid80lmlvnn12ry0plza6vxgqlhif0ihnhry"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base terminal-size text ]; @@ -151126,6 +151671,41 @@ self: { broken = true; }) {}; + "hotel-california" = callPackage + ({ mkDerivation, base, bytestring, hs-opentelemetry-api + , hs-opentelemetry-exporter-otlp, hs-opentelemetry-propagator-w3c + , hs-opentelemetry-sdk, hs-opentelemetry-utils-exceptions + , hs-opentelemetry-vendor-honeycomb, http-types + , optparse-applicative, text, time, typed-process, unliftio + }: + mkDerivation { + pname = "hotel-california"; + version = "0.0.1.0"; + sha256 = "11l3pkdnkyya5sr4v00wjv7p1shikvmcc75g74l5a2b7n7p7ill1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring hs-opentelemetry-api hs-opentelemetry-exporter-otlp + hs-opentelemetry-propagator-w3c hs-opentelemetry-sdk + hs-opentelemetry-utils-exceptions hs-opentelemetry-vendor-honeycomb + http-types optparse-applicative text time typed-process unliftio + ]; + executableHaskellDepends = [ + base bytestring hs-opentelemetry-api hs-opentelemetry-exporter-otlp + hs-opentelemetry-propagator-w3c hs-opentelemetry-sdk + hs-opentelemetry-utils-exceptions hs-opentelemetry-vendor-honeycomb + http-types optparse-applicative text time typed-process unliftio + ]; + testHaskellDepends = [ + base bytestring hs-opentelemetry-api hs-opentelemetry-exporter-otlp + hs-opentelemetry-propagator-w3c hs-opentelemetry-sdk + hs-opentelemetry-utils-exceptions hs-opentelemetry-vendor-honeycomb + http-types optparse-applicative text time typed-process unliftio + ]; + license = lib.licenses.bsd3; + mainProgram = "hotel"; + }) {}; + "hothasktags" = callPackage ({ mkDerivation, array, base, containers, cpphs, filemanip , filepath, Glob, haskell-src-exts, optparse-applicative, split @@ -151389,7 +151969,7 @@ self: { mainProgram = "hpack"; }) {}; - "hpack_0_35_4" = callPackage + "hpack_0_35_5" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal , containers, crypton, deepseq, directory, filepath, Glob, hspec , hspec-discover, http-client, http-client-tls, http-types, HUnit @@ -151399,8 +151979,8 @@ self: { }: mkDerivation { pname = "hpack"; - version = "0.35.4"; - sha256 = "13zz10c3nc9lfr6n7xjb4j05vin9r3mg1aribpz26sx6y83lpy7y"; + version = "0.35.5"; + sha256 = "1qm7fam54b2910nxg3xgv8bpqnkl06szl0gd7wvd6gi9ar8h3nr0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -151869,28 +152449,28 @@ self: { "hpdft" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring, containers , directory, file-embed, memory, optparse-applicative, parsec - , regex-base, regex-compat-tdfa, semigroups, text, utf8-string - , zlib + , regex-base, regex-tdfa, semigroups, text, utf8-string, zlib }: mkDerivation { pname = "hpdft"; - version = "0.1.1.1"; - sha256 = "1klpm1p19pixi051a7ld5hp6qbwvcbbiwy6zgf39n5zx3hi9yxx0"; + version = "0.1.1.3"; + sha256 = "13k9948xaxm3vgfzksqy9djx6fj4npip6wsiz3488dvrfknxhzmx"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ attoparsec base binary bytestring containers directory file-embed - memory optparse-applicative parsec regex-compat-tdfa semigroups - text utf8-string zlib + memory optparse-applicative parsec semigroups text utf8-string zlib ]; executableHaskellDepends = [ - base bytestring memory optparse-applicative regex-base - regex-compat-tdfa semigroups text utf8-string + base bytestring memory optparse-applicative regex-base regex-tdfa + semigroups text utf8-string ]; description = "A tool for looking through PDF file using Haskell"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "hpdft"; + broken = true; }) {}; "hpg" = callPackage @@ -152069,16 +152649,16 @@ self: { "hpqtypes-extras" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, containers - , cryptohash, deepseq, exceptions, extra, hpqtypes, log-base, mtl - , tasty, tasty-bench, tasty-hunit, text, text-show, uuid-types + , crypton, deepseq, exceptions, extra, hpqtypes, log-base, memory + , mtl, tasty, tasty-bench, tasty-hunit, text, text-show, uuid-types }: mkDerivation { pname = "hpqtypes-extras"; - version = "1.16.4.3"; - sha256 = "0xb9igkwmkcqjv7a8mvsjcsgglbd4jgwn4cbw4s1frsb7bnibm4w"; + version = "1.16.4.4"; + sha256 = "1qi17ssciafb341ihhf1nkk3xb8vh6h3f0ymx3y409w8ckfm3kg5"; libraryHaskellDepends = [ - base base16-bytestring bytestring containers cryptohash exceptions - extra hpqtypes log-base mtl text text-show + base base16-bytestring bytestring containers crypton exceptions + extra hpqtypes log-base memory mtl text text-show ]; testHaskellDepends = [ base containers exceptions hpqtypes log-base tasty tasty-hunit text @@ -153149,8 +153729,8 @@ self: { }: mkDerivation { pname = "hs-opentelemetry-api"; - version = "0.0.3.8"; - sha256 = "1p36z8vsna5xr3ff9ggy1mkx7yn4n9ypg2gv4a15694vmqy74h8y"; + version = "0.1.0.0"; + sha256 = "1bi0qzlwn5k9x5j9lvv97m85ckmpvywigy3jajw2rxi8zi84v9s2"; libraryHaskellDepends = [ async attoparsec base binary bytestring charset clock containers ghc-prim hashable http-types memory mtl template-haskell text @@ -153188,12 +153768,23 @@ self: { license = lib.licenses.mit; }) {}; + "hs-opentelemetry-exporter-handle" = callPackage + ({ mkDerivation, base, hs-opentelemetry-api, text }: + mkDerivation { + pname = "hs-opentelemetry-exporter-handle"; + version = "0.0.1.1"; + sha256 = "11b89q6xm2kln4acib26g3bgkqiw3ilpf8vd88kch7zmgprhvccl"; + libraryHaskellDepends = [ base hs-opentelemetry-api text ]; + testHaskellDepends = [ base hs-opentelemetry-api text ]; + license = lib.licenses.bsd3; + }) {}; + "hs-opentelemetry-exporter-in-memory" = callPackage ({ mkDerivation, async, base, hs-opentelemetry-api, unagi-chan }: mkDerivation { pname = "hs-opentelemetry-exporter-in-memory"; - version = "0.0.1.2"; - sha256 = "18f0wv1drlbyp1vm4za2a4l1vyi8hwd34imz6m81n4kqz3sdabf3"; + version = "0.0.1.3"; + sha256 = "0hb8hcq9dhqpnv5v6k48vmlc3d56v24maxj8jqp0w5yakhw59zir"; libraryHaskellDepends = [ async base hs-opentelemetry-api unagi-chan ]; @@ -153211,8 +153802,8 @@ self: { }: mkDerivation { pname = "hs-opentelemetry-exporter-otlp"; - version = "0.0.1.4"; - sha256 = "08xjpv451mfx4gfahp6w8m49da9mzvcj59g9fq6p0k85fl9ybva2"; + version = "0.0.1.5"; + sha256 = "10da3cxdab4iiw3a7n1wkajw7rqip0wm5sni82ph1i7k0mf83ycv"; libraryHaskellDepends = [ base bytestring case-insensitive clock hs-opentelemetry-api hs-opentelemetry-otlp http-client http-conduit http-types microlens @@ -153230,20 +153821,23 @@ self: { "hs-opentelemetry-instrumentation-cloudflare" = callPackage ({ mkDerivation, base, case-insensitive, hs-opentelemetry-api , hs-opentelemetry-instrumentation-conduit - , hs-opentelemetry-instrumentation-wai, http-types, text, wai + , hs-opentelemetry-instrumentation-wai, http-types, text + , unordered-containers, wai }: mkDerivation { pname = "hs-opentelemetry-instrumentation-cloudflare"; - version = "0.1.0.0"; - sha256 = "06y13lh1f6nad7rvkrgxmqm6rhaxfi97dgwqrjj5kv3cdi3rdl5m"; + version = "0.2.0.0"; + sha256 = "0hynk3sicxnrnnh0lfr0xl4ksw9yynygpz6z6fsyhq0mn7li8404"; libraryHaskellDepends = [ base case-insensitive hs-opentelemetry-api - hs-opentelemetry-instrumentation-wai http-types text wai + hs-opentelemetry-instrumentation-wai http-types text + unordered-containers wai ]; testHaskellDepends = [ base case-insensitive hs-opentelemetry-api hs-opentelemetry-instrumentation-conduit - hs-opentelemetry-instrumentation-wai http-types text wai + hs-opentelemetry-instrumentation-wai http-types text + unordered-containers wai ]; license = lib.licenses.bsd3; }) {}; @@ -153252,8 +153846,8 @@ self: { ({ mkDerivation, base, conduit, hs-opentelemetry-api, text }: mkDerivation { pname = "hs-opentelemetry-instrumentation-conduit"; - version = "0.0.1.1"; - sha256 = "1gc93nnkdbm5drqwg20w317x3n4n7fjp61j3kdy7x7q1qd55khfn"; + version = "0.1.0.0"; + sha256 = "1ai8pcag30d64qfiq3vm6pa9knlcn61baxgvx7r453ryyyj283rg"; libraryHaskellDepends = [ base conduit hs-opentelemetry-api text ]; testHaskellDepends = [ base conduit hs-opentelemetry-api text ]; license = lib.licenses.bsd3; @@ -153265,8 +153859,8 @@ self: { }: mkDerivation { pname = "hs-opentelemetry-instrumentation-hspec"; - version = "0.0.1.0"; - sha256 = "0ya2s4x37fz8zzdik1mbxv5j69rz8m4gv9viizcgp5wcknjs818z"; + version = "0.0.1.1"; + sha256 = "06hxr45pf8jy9dhl2q2ffaqfypacqvbcns1pj450qybc8rv2n0ay"; libraryHaskellDepends = [ base hs-opentelemetry-api hspec hspec-core mtl resourcet text unliftio vault @@ -153282,40 +153876,42 @@ self: { ({ mkDerivation, aeson, base, bytestring, case-insensitive, conduit , hs-opentelemetry-api, hs-opentelemetry-instrumentation-conduit , http-client, http-client-tls, http-conduit, http-types, text - , unliftio + , unliftio, unordered-containers }: mkDerivation { pname = "hs-opentelemetry-instrumentation-http-client"; - version = "0.0.2.0"; - sha256 = "1miw1p8dzwsnmdl63jyrbw8lygb5gk1j76dix9pmpsjp2520977j"; + version = "0.1.0.0"; + sha256 = "0hm29fhp1q1qy6dc9iadms5wvwr5ixh96kz7zizi2p2b9p4iqypd"; libraryHaskellDepends = [ aeson base bytestring case-insensitive conduit hs-opentelemetry-api hs-opentelemetry-instrumentation-conduit http-client http-client-tls http-conduit http-types text unliftio + unordered-containers ]; testHaskellDepends = [ aeson base bytestring case-insensitive conduit hs-opentelemetry-api hs-opentelemetry-instrumentation-conduit http-client http-client-tls http-conduit http-types text unliftio + unordered-containers ]; license = lib.licenses.bsd3; }) {}; "hs-opentelemetry-instrumentation-persistent" = callPackage - ({ mkDerivation, base, hs-opentelemetry-api, mtl, persistent - , resourcet, text, unliftio, vault + ({ mkDerivation, base, clock, hs-opentelemetry-api, mtl, persistent + , resourcet, text, unliftio, unordered-containers, vault }: mkDerivation { pname = "hs-opentelemetry-instrumentation-persistent"; - version = "0.0.1.0"; - sha256 = "0windpdg269g376mhza26swsvl32pfsfzqjrd9psybp9mdsw1lwq"; + version = "0.1.0.0"; + sha256 = "1z47mna0n39iqss9s9ddbqa6nqjcdf6zadqmfdhbsybdr71l738j"; libraryHaskellDepends = [ - base hs-opentelemetry-api mtl persistent resourcet text unliftio - vault + base clock hs-opentelemetry-api mtl persistent resourcet text + unliftio unordered-containers vault ]; testHaskellDepends = [ - base hs-opentelemetry-api mtl persistent resourcet text unliftio - vault + base clock hs-opentelemetry-api mtl persistent resourcet text + unliftio unordered-containers vault ]; license = lib.licenses.bsd3; }) {}; @@ -153323,18 +153919,21 @@ self: { "hs-opentelemetry-instrumentation-postgresql-simple" = callPackage ({ mkDerivation, base, bytestring, hs-opentelemetry-api, iproute , network, postgresql-libpq, postgresql-simple, text, unliftio + , unordered-containers }: mkDerivation { pname = "hs-opentelemetry-instrumentation-postgresql-simple"; - version = "0.0.1.0"; - sha256 = "1rz2gdaq1dwrnghbmrx58nza2g9h6z2pi5rnl6hzv6n1sm6i80rx"; + version = "0.1.0.0"; + sha256 = "011g3m0gqmrkrcvfa0y5zq0zbwwz33wwwmypi9g2b3a5b2qrgy4x"; libraryHaskellDepends = [ base bytestring hs-opentelemetry-api iproute network postgresql-libpq postgresql-simple text unliftio + unordered-containers ]; testHaskellDepends = [ base bytestring hs-opentelemetry-api iproute network postgresql-libpq postgresql-simple text unliftio + unordered-containers ]; license = lib.licenses.bsd3; }) {}; @@ -153345,8 +153944,8 @@ self: { }: mkDerivation { pname = "hs-opentelemetry-instrumentation-wai"; - version = "0.0.1.4"; - sha256 = "1g45pwl0fsc3i6s3wwxnn469xgivn4wmnay9w6xrfhq8c5ha6b2z"; + version = "0.1.0.0"; + sha256 = "161xasgy82c0vzk38dz8441f5h90w05jjb1v3yzaarhkj6zm29cb"; libraryHaskellDepends = [ base bytestring hs-opentelemetry-api http-types iproute network text vault wai @@ -153362,19 +153961,22 @@ self: { "hs-opentelemetry-instrumentation-yesod" = callPackage ({ mkDerivation, base, hs-opentelemetry-api , hs-opentelemetry-instrumentation-wai, microlens, mtl - , template-haskell, text, unliftio, wai, yesod-core + , template-haskell, text, unliftio, unordered-containers, wai + , yesod-core }: mkDerivation { pname = "hs-opentelemetry-instrumentation-yesod"; - version = "0.0.1.3"; - sha256 = "1222hkn0zjxd1bdclsridbz2bpr699k78fdvpcybgqvr2yazhyxa"; + version = "0.1.0.0"; + sha256 = "1m3ph1g2rkg0a45zrfq5781gqjc5nk5ppg107b1lqsnngb3r659r"; libraryHaskellDepends = [ base hs-opentelemetry-api hs-opentelemetry-instrumentation-wai - microlens mtl template-haskell text unliftio wai yesod-core + microlens mtl template-haskell text unliftio unordered-containers + wai yesod-core ]; testHaskellDepends = [ base hs-opentelemetry-api hs-opentelemetry-instrumentation-wai - microlens mtl template-haskell text unliftio wai yesod-core + microlens mtl template-haskell text unliftio unordered-containers + wai yesod-core ]; description = "Yesod middleware for providing OpenTelemetry instrumentation"; license = lib.licenses.bsd3; @@ -153397,8 +153999,8 @@ self: { }: mkDerivation { pname = "hs-opentelemetry-propagator-b3"; - version = "0.0.1.0"; - sha256 = "0ibca4xc19hc77wwi8z5cb86rwrj7ali2fzm8pp2qa6hrrrcy83g"; + version = "0.0.1.1"; + sha256 = "0ncv85hsal7vqhfb0z4il0x8lwjibjji22japsi45w9fkkqhs8wd"; libraryHaskellDepends = [ attoparsec base bytestring hs-opentelemetry-api http-types memory primitive text @@ -153417,8 +154019,8 @@ self: { }: mkDerivation { pname = "hs-opentelemetry-propagator-w3c"; - version = "0.0.1.2"; - sha256 = "1z4f7hsdbp6gr2ymbrvfkb0ynzy8kxfwpcyl2718qib7m2qjyysz"; + version = "0.0.1.3"; + sha256 = "0n99kmy2ka3rmwhn56dqzsszhpv7phgcmkqng7drvr6qi5jzlfpz"; libraryHaskellDepends = [ attoparsec base bytestring hs-opentelemetry-api http-types text ]; @@ -153433,27 +154035,26 @@ self: { ({ mkDerivation, async, base, bytestring, clock , hs-opentelemetry-api, hs-opentelemetry-exporter-otlp , hs-opentelemetry-propagator-b3, hs-opentelemetry-propagator-w3c - , hspec, http-types, mwc-random, network-bsd, random - , random-bytestring, stm, text, transformers, unagi-chan, unix - , unordered-containers, vector, vector-builder + , hspec, http-types, network-bsd, random, stm, text, transformers + , unagi-chan, unix, unordered-containers, vector, vector-builder }: mkDerivation { pname = "hs-opentelemetry-sdk"; - version = "0.0.3.5"; - sha256 = "1h0fvhhxdgbb9jgs9g8snbnmv00iwr2xzb70q35087yy2476sdab"; + version = "0.0.3.6"; + sha256 = "042cb38dilf965dmyapv6c09v70520lrl389yv98yk1wwflkyrhi"; libraryHaskellDepends = [ async base bytestring hs-opentelemetry-api hs-opentelemetry-exporter-otlp hs-opentelemetry-propagator-b3 - hs-opentelemetry-propagator-w3c http-types mwc-random network-bsd - random random-bytestring stm text transformers unagi-chan unix - unordered-containers vector vector-builder + hs-opentelemetry-propagator-w3c http-types network-bsd random stm + text transformers unagi-chan unix unordered-containers vector + vector-builder ]; testHaskellDepends = [ async base bytestring clock hs-opentelemetry-api hs-opentelemetry-exporter-otlp hs-opentelemetry-propagator-b3 - hs-opentelemetry-propagator-w3c hspec http-types mwc-random - network-bsd random random-bytestring stm text transformers - unagi-chan unix unordered-containers vector vector-builder + hs-opentelemetry-propagator-w3c hspec http-types network-bsd random + stm text transformers unagi-chan unix unordered-containers vector + vector-builder ]; description = "OpenTelemetry SDK for use in applications"; license = lib.licenses.bsd3; @@ -153465,8 +154066,8 @@ self: { }: mkDerivation { pname = "hs-opentelemetry-utils-exceptions"; - version = "0.1.0.0"; - sha256 = "0syz50by1n5818pwfap58rj6d76frwvhk14aqxk1x3mx2ddsz0yc"; + version = "0.2.0.0"; + sha256 = "1jcczl8q78d1fz32s0sb6g8qr4s70zdwn13p789w7m5xvycjdvrg"; libraryHaskellDepends = [ base exceptions hs-opentelemetry-api hs-opentelemetry-sdk text ]; @@ -153678,6 +154279,27 @@ self: { broken = true; }) {notifier = null;}; + "hs-samtools" = callPackage + ({ mkDerivation, ascii, attoparsec, base, bitvec, bytestring + , containers, crypton, generic-deriving, hspec, pcre-heavy + , regex-tdfa, streamly, streamly-bytestring, streamly-core + }: + mkDerivation { + pname = "hs-samtools"; + version = "0.6.0.1"; + sha256 = "0i3klgjjai1ax8nyijb3qrach93d6r2pmsxbf2vq56cg3d8j3ym7"; + libraryHaskellDepends = [ + ascii attoparsec base bitvec bytestring containers crypton + generic-deriving pcre-heavy regex-tdfa streamly streamly-bytestring + streamly-core + ]; + testHaskellDepends = [ base hspec ]; + description = "Read and write SAM, BAM, and CRAM files"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "hs-scrape" = callPackage ({ mkDerivation, base, bytestring, containers, data-default , exceptions, hspec, html-conduit, lens, retry, safe, tasty @@ -155017,6 +155639,23 @@ self: { mainProgram = "HsColour"; }) {}; + "hscolour_1_25" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "hscolour"; + version = "1.25"; + sha256 = "0z679khnmb6as1zcdb44n9qjk7in32jpm4ldscpqg7jrapd31kjl"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base containers ]; + executableHaskellDepends = [ base containers ]; + description = "Colourise Haskell code"; + license = "LGPL"; + hydraPlatforms = lib.platforms.none; + mainProgram = "HsColour"; + }) {}; + "hscope" = callPackage ({ mkDerivation, base, bytestring, cereal, cpphs, deepseq , directory, haskell-src-exts, mtl, process, pure-cdb, test-simple @@ -155283,8 +155922,8 @@ self: { }: mkDerivation { pname = "hsendxmpp"; - version = "0.1.3"; - sha256 = "01zwrq37877jb39yji622ibmb8nmgqhgflb9bbl7pnf7ck7cj0aq"; + version = "0.1.3.1"; + sha256 = "0vcrh15p479x7yl4npr85wqalgkzs76h4smqwlsrp9m4w4lgaskz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -157053,6 +157692,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "hspec-hedgehog_0_1_0_0" = callPackage + ({ mkDerivation, base, hedgehog, hspec, hspec-core, QuickCheck + , splitmix + }: + mkDerivation { + pname = "hspec-hedgehog"; + version = "0.1.0.0"; + sha256 = "0jlz6niac56v4x3dxd56cmgzxhirsabgyicc39b8iv7b97lc1pkm"; + libraryHaskellDepends = [ + base hedgehog hspec hspec-core QuickCheck splitmix + ]; + testHaskellDepends = [ base hedgehog hspec ]; + description = "Integrate Hedgehog and Hspec!"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hspec-jenkins" = callPackage ({ mkDerivation, base, blaze-markup, hspec }: mkDerivation { @@ -157648,8 +158304,8 @@ self: { }: mkDerivation { pname = "hspray"; - version = "0.1.2.0"; - sha256 = "0x85ya24w47qh38w0rndnik2niy3mh0n2zamxfvzshbj3zqdip5d"; + version = "0.1.3.0"; + sha256 = "167kg2qcjr9r1yqiq9cjz20bvwwj1z2msdjp7n6mfc2q9266294l"; libraryHaskellDepends = [ base containers hashable numeric-prelude text unordered-containers ]; @@ -159376,10 +160032,8 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.7.13.1"; - sha256 = "09qfmakjk285jz2rnb53c1m9c764fg8vngfq43ipga1g72h8d3n9"; - revision = "1"; - editedCabalFile = "168nbb80kcxyz59sz4mnaydpag5flq32y9ikfxa1jygj8j8p9034"; + version = "0.7.14"; + sha256 = "0hgrzy05ynivip7l2lv788y8prma2cb99007jrl6q3hph3w3cbi2"; libraryHaskellDepends = [ array async base base64-bytestring blaze-builder bytestring case-insensitive containers cookie deepseq exceptions filepath @@ -159983,6 +160637,53 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "http-exchange" = callPackage + ({ mkDerivation, base, byteslice, bytesmith, bytestring + , http-interchange, primitive, tasty, tasty-hunit, text + }: + mkDerivation { + pname = "http-exchange"; + version = "0.1.1.0"; + sha256 = "0v3zgl324f6xinjiymlc90w7s22yir49rdn3nvrj1lrixrvkdgv9"; + libraryHaskellDepends = [ + base byteslice bytesmith http-interchange primitive text + ]; + testHaskellDepends = [ + base byteslice bytestring http-interchange primitive tasty + tasty-hunit + ]; + doHaddock = false; + description = "Perform HTTP Requests"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "http-exchange-instantiations" = callPackage + ({ mkDerivation, base, byteslice, bytestring, data-default + , error-codes, http-exchange, http-interchange, network + , network-unexceptional, pretty-show, stm, tls + }: + mkDerivation { + pname = "http-exchange-instantiations"; + version = "0.1.1.0"; + sha256 = "0fvkmhd8571r4k548l9x8n3ybdnlh9b8rczkcxv3f32xim0k9rx9"; + revision = "1"; + editedCabalFile = "1rn4yfwlxv1j4d917v0fggdl1qy47vl8dhibvvdma1v2554dgrcv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base byteslice bytestring error-codes http-exchange + http-interchange network network-unexceptional stm tls + ]; + executableHaskellDepends = [ + base data-default http-interchange network pretty-show tls + ]; + doHaddock = false; + description = "Instantiations of http-exchange"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "http-grammar" = callPackage ({ mkDerivation, attoparsec, base, bytestring }: mkDerivation { @@ -160143,24 +160844,43 @@ self: { "http-media" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers - , QuickCheck, test-framework, test-framework-quickcheck2 - , utf8-string + , QuickCheck, tasty, tasty-quickcheck, utf8-string }: mkDerivation { pname = "http-media"; - version = "0.8.0.0"; - sha256 = "0lww5cxrc9jlvzsysjv99lca33i4rb7cll66p3c0rdpmvz8pk0ir"; - revision = "8"; - editedCabalFile = "08r5iq0hi1y4y1b6vdi4kp52blvxzmd9gxa38xwzz86xnz84xvzl"; + version = "0.8.1.0"; + sha256 = "1ydrs7iichc06mfj65x1f3g1piy06b7gbjidjf1lf3jp325k2him"; + revision = "1"; + editedCabalFile = "119vhcwlgra8s097jwxvkp51grr3kabjfy7a60jpqybrsncfjn0a"; + libraryHaskellDepends = [ + base bytestring case-insensitive containers utf8-string + ]; + testHaskellDepends = [ + base bytestring case-insensitive containers QuickCheck tasty + tasty-quickcheck utf8-string + ]; + description = "Processing HTTP Content-Type and Accept headers"; + license = lib.licenses.mit; + }) {}; + + "http-media_0_8_1_1" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , QuickCheck, tasty, tasty-quickcheck, utf8-string + }: + mkDerivation { + pname = "http-media"; + version = "0.8.1.1"; + sha256 = "10zi0c6v0vngxadlbzfp1y1fgyx1ac5gvyvl0gv6gl8m3grss80r"; libraryHaskellDepends = [ base bytestring case-insensitive containers utf8-string ]; testHaskellDepends = [ - base bytestring case-insensitive containers QuickCheck - test-framework test-framework-quickcheck2 utf8-string + base bytestring case-insensitive containers QuickCheck tasty + tasty-quickcheck utf8-string ]; description = "Processing HTTP Content-Type and Accept headers"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "http-mock" = callPackage @@ -161740,7 +162460,6 @@ self: { testHaskellDepends = [ base ]; description = "AWS SQS conduit"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hw-balancedparens" = callPackage @@ -165186,8 +165905,8 @@ self: { ({ mkDerivation, base, ghc, ghc-tcplugin-api }: mkDerivation { pname = "if-instance"; - version = "0.4.0.0"; - sha256 = "09q3l2fz2ym89cpah6gm3db47i2m7cwzz0wgz2c6sfycxfq6vzp8"; + version = "0.5.1.0"; + sha256 = "1gl6m7schrca8kqz10ia8qz3kad4h21ijjrqcarl7r0ipvpc9hz8"; libraryHaskellDepends = [ base ghc ghc-tcplugin-api ]; testHaskellDepends = [ base ghc ]; doHaddock = false; @@ -166070,7 +166789,6 @@ self: { ]; description = "Execute arbitrary actions for each item from RSS/Atom feeds"; license = lib.licenses.cc0; - hydraPlatforms = lib.platforms.none; }) {}; "immortal_0_2_2_1" = callPackage @@ -166627,6 +167345,7 @@ self: { ]; description = "A Prelude for Polysemy"; license = "BSD-2-Clause-Patent"; + hydraPlatforms = lib.platforms.none; }) {}; "incipit-base" = callPackage @@ -168534,8 +169253,8 @@ self: { ({ mkDerivation, base, posix-timer, streaming, unix }: mkDerivation { pname = "intel-powermon"; - version = "0"; - sha256 = "036g1lm3n5zm67yr151xvwq8134a0n6wbfzp3avqkjpn478khiyq"; + version = "0.0.1"; + sha256 = "0ld1rfmvm73d81v3cc1kfb9v1wm09lvg8a75djsfkaz7xkpx2kdn"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base posix-timer streaming unix ]; @@ -168696,6 +169415,8 @@ self: { pname = "intern"; version = "0.9.5"; sha256 = "0jsylr86vlwn7pqzpkbja84br6i2r7d4a1vgqb3zcl92n306wzln"; + revision = "1"; + editedCabalFile = "0vhn9sxi0fbkh0f9340vlckpbdflsp9j02as5hxs7yh5vvnp9sz4"; libraryHaskellDepends = [ array base bytestring hashable text unordered-containers ]; @@ -169770,10 +170491,8 @@ self: { }: mkDerivation { pname = "ip"; - version = "1.7.6"; - sha256 = "11ckl62w9005pww467ydx38imadzwrn36ww21c535x3jhhbic3a9"; - revision = "1"; - editedCabalFile = "0j9zs161awzvcbnc72prs6byzcy65gqg3q2m3hsi70hxbvpkm0zk"; + version = "1.7.7"; + sha256 = "0yhhmy51s2sbm1qlbx2z9h6bizswi2ck15fxxl76vc3dzbd7gj27"; libraryHaskellDepends = [ aeson attoparsec base bytebuild byteslice bytesmith bytestring deepseq hashable natural-arithmetic primitive text text-short @@ -171723,10 +172442,8 @@ self: { }: mkDerivation { pname = "jacinda"; - version = "1.2.0.0"; - sha256 = "11xgbxhbhd6j974invscbmc1r41f4synjqhc2499kdknjfvnvnv5"; - revision = "1"; - editedCabalFile = "03rj2ygqman0ynr9ns7w8z42x5xbvqkxgr2x6skldlipqamj9pb2"; + version = "2.0.1.0"; + sha256 = "0ydpaj6mjdmprshfqa9p9gwlkn4v02zm97pq3g5lhbi6jlfx6f3w"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -171736,13 +172453,9 @@ self: { transformers vector ]; libraryToolDepends = [ alex happy ]; - executableHaskellDepends = [ - base bytestring optparse-applicative - ]; - testHaskellDepends = [ base bytestring tasty tasty-hunit ]; - benchmarkHaskellDepends = [ - base bytestring criterion deepseq silently - ]; + executableHaskellDepends = [ base optparse-applicative text ]; + testHaskellDepends = [ base bytestring tasty tasty-hunit text ]; + benchmarkHaskellDepends = [ base criterion deepseq silently text ]; doHaddock = false; description = "Functional, expression-oriented data processing language"; license = lib.licenses.agpl3Only; @@ -173216,8 +173929,8 @@ self: { }: mkDerivation { pname = "jsaddle"; - version = "0.9.8.2"; - sha256 = "17xffxyl4h8fbb608gzhflli89qxhrzf38bp9l8n2w2bwix7w01i"; + version = "0.9.8.3"; + sha256 = "03d89cyhkwcvk3xjac3hgp7nfg8bq6lkig7y98yyha0chda1206w"; libraryHaskellDepends = [ aeson attoparsec base base-compat base64-bytestring bytestring containers deepseq exceptions filepath ghc-prim http-types lens @@ -173234,8 +173947,8 @@ self: { }: mkDerivation { pname = "jsaddle-clib"; - version = "0.9.8.2"; - sha256 = "0nbsjmn52dr0rfslz6c7f16z7brc76ljq78bkkbq3aj8ljadh0p6"; + version = "0.9.8.3"; + sha256 = "1ss1f7nlmkpby4xfcviq1lmw5x8mvqq5zs406lyp3bksxgkvs6vj"; libraryHaskellDepends = [ aeson base base-compat bytestring data-default jsaddle text ]; @@ -173283,25 +173996,21 @@ self: { }) {}; "jsaddle-warp" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, deepseq - , doctest, exceptions, filepath, foreign-store, ghc-prim - , http-types, jsaddle, lens, network, primitive, process - , QuickCheck, random, ref-tf, stm, text, time, transformers - , unliftio-core, wai, wai-websockets, warp, webdriver, websockets + ({ mkDerivation, aeson, base, bytestring, containers, directory + , foreign-store, hspec, http-types, jsaddle, lens, mtl, process + , stm, text, time, transformers, wai, wai-websockets, warp + , websockets }: mkDerivation { pname = "jsaddle-warp"; - version = "0.9.8.2"; - sha256 = "12914i4l7hkwvwvzf25vr7zywc6xp9cq0mfzr57kzw6ga1y3gvxb"; + version = "0.9.8.3"; + sha256 = "1hdcaxspazd8yxk6f6a0jcdr3hwwr2xwrmp40qarbklx33b9ajqa"; libraryHaskellDepends = [ aeson base bytestring containers foreign-store http-types jsaddle stm text time transformers wai wai-websockets warp websockets ]; testHaskellDepends = [ - aeson base bytestring containers deepseq doctest exceptions - filepath foreign-store ghc-prim http-types jsaddle lens network - primitive process QuickCheck random ref-tf stm text time - transformers unliftio-core wai wai-websockets warp webdriver + base bytestring directory hspec jsaddle lens mtl process text warp websockets ]; description = "Interface for JavaScript that works with GHCJS and GHC"; @@ -173318,8 +174027,8 @@ self: { }: mkDerivation { pname = "jsaddle-webkit2gtk"; - version = "0.9.8.2"; - sha256 = "0cqn013dzn5wwap74i5j9kd6maxsqxb84zys6p80kjl5vnk5pvxh"; + version = "0.9.8.4"; + sha256 = "1aky8lczbvhm11s6hhn5vnmssq8sdhd3nx93dihhsvlma1gg8gs3"; libraryHaskellDepends = [ aeson base bytestring directory gi-gio gi-glib gi-gtk gi-javascriptcore gi-webkit2 haskell-gi-base haskell-gi-overloading @@ -173353,8 +174062,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "jsaddle-wkwebview"; - version = "0.9.8.2"; - sha256 = "07qba7bnygnsy3yg4mk8bn8wfzca43cd7mzzjp5b4yracchvljqj"; + version = "0.9.8.3"; + sha256 = "0lh613ws0lgrw298p1sbq1jdj1ka5nzn1ijpg2zwwr5wc2g5ha4w"; description = "Interface for JavaScript that works with GHCJS and GHC"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -174095,23 +174804,70 @@ self: { }) {}; "json-spec" = callPackage - ({ mkDerivation, aeson, base, bytestring, hspec, lens, openapi3 + ({ mkDerivation, aeson, base, bytestring, containers, hspec , scientific, text, time, vector }: mkDerivation { pname = "json-spec"; - version = "0.1.0.0"; - sha256 = "0cm2k50vi2ys9p24ziwfw0f4sky9gq07ibf3s5hw22cz4gpf47ys"; + version = "0.2.1.1"; + sha256 = "0p8hyl06cprribjh6p1zdhkamyfxlv8s6az3k5jax4xazzm6rji8"; libraryHaskellDepends = [ - aeson base bytestring lens openapi3 scientific text time vector + aeson base containers scientific text time vector ]; testHaskellDepends = [ - aeson base bytestring hspec lens openapi3 scientific text time - vector + aeson base bytestring containers hspec scientific text time vector ]; description = "Type-level JSON specification"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "json-spec-elm" = callPackage + ({ mkDerivation, base, bound, containers, directory, elm-syntax + , hspec, json-spec, mtl, prettyprinter, process, text + , unordered-containers + }: + mkDerivation { + pname = "json-spec-elm"; + version = "0.3.0.2"; + sha256 = "0g1y6kfrysnpyha7b752y5vk8mxvbwqw3bhag8g0ylnl4wbl00xf"; + libraryHaskellDepends = [ + base bound containers elm-syntax json-spec mtl prettyprinter text + unordered-containers + ]; + testHaskellDepends = [ + base bound containers directory elm-syntax hspec json-spec mtl + prettyprinter process text unordered-containers + ]; + description = "Elm code generate for `json-spec`"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + + "json-spec-elm-servant" = callPackage + ({ mkDerivation, aeson, base, binary, bound, bytestring, containers + , cookie, directory, elm-syntax, hspec, http-types, json-spec + , json-spec-elm, mtl, prettyprinter, process, servant, text, time + , unordered-containers, uuid + }: + mkDerivation { + pname = "json-spec-elm-servant"; + version = "0.3.1.1"; + sha256 = "07k7ccn2j0jyfslzpq6nvvkc0yng9xwkly6jzrgmcbidd2gc831k"; + libraryHaskellDepends = [ + base bound containers directory elm-syntax http-types json-spec + json-spec-elm mtl prettyprinter process servant text + unordered-containers + ]; + testHaskellDepends = [ + aeson base binary bound bytestring containers cookie directory + elm-syntax hspec http-types json-spec json-spec-elm mtl + prettyprinter process servant text time unordered-containers uuid + ]; + description = "Generated elm code for servant APIs"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "json-spec-openapi" = callPackage @@ -174998,6 +175754,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "junit-xml_0_1_0_3" = callPackage + ({ mkDerivation, base, filepath, tasty, tasty-golden, temporary + , text, xml-conduit + }: + mkDerivation { + pname = "junit-xml"; + version = "0.1.0.3"; + sha256 = "1iwa8x0nbap2q6kjybxnrsyay64z77dlsm83nq2l6818jwgiji5r"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base text xml-conduit ]; + testHaskellDepends = [ + base filepath tasty tasty-golden temporary + ]; + description = "Producing JUnit-style XML test reports"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "jupyter" = callPackage ({ mkDerivation, aeson, async, base, bytestring, cereal, containers , directory, exceptions, extra, filepath, monad-control, mtl @@ -175519,8 +176293,8 @@ self: { pname = "kansas-comet"; version = "0.4.1"; sha256 = "1j54rsqna8xrw1si8i74v0c9k4jjv8a2q001aa8sx4rxb7d1qbzy"; - revision = "7"; - editedCabalFile = "15i4wiqpxhmx80n5wavwgyvwlv8sn6z8xiq3h61rksjlacjq05jw"; + revision = "8"; + editedCabalFile = "02b9q0s45wlrszr623mzv5zx7vya61ix697w6f2mjnicip9hga90"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base containers data-default-class scotty stm text time @@ -176647,7 +177421,7 @@ self: { "keid-core" = callPackage ({ mkDerivation, base, binary, bytestring, containers , cryptohash-md5, derive-storable, derive-storable-plugin - , file-embed, foldl, geomancy, GLFW-b, ktx-codec + , file-embed, foldl, geomancy, geomancy-layout, GLFW-b, ktx-codec , neat-interpolation, optparse-applicative, optparse-simple , resourcet, rio, rio-app, serialise, spirv-reflect-ffi , spirv-reflect-types, StateVar, tagged, template-haskell, text @@ -176656,15 +177430,18 @@ self: { }: mkDerivation { pname = "keid-core"; - version = "0.1.8.0"; - sha256 = "1lybgxmvyx74ib9mlg8dx5vgliskrww3810p06ni2wcpg1malycm"; + version = "0.1.9.0"; + sha256 = "0gx8hgn52a3hsirna09zn3j8amplp6kp5r8y4wzdr1fz03abas7d"; + revision = "1"; + editedCabalFile = "0wk745437iyyd247q3b8kgdqnysbzcsikbf60cvf3x2ycs8hlb4m"; libraryHaskellDepends = [ base binary bytestring containers cryptohash-md5 derive-storable - derive-storable-plugin file-embed foldl geomancy GLFW-b ktx-codec - neat-interpolation optparse-applicative optparse-simple resourcet - rio rio-app serialise spirv-reflect-ffi spirv-reflect-types - StateVar tagged template-haskell text transformers unagi-chan - unliftio vector vulkan vulkan-utils VulkanMemoryAllocator zstd + derive-storable-plugin file-embed foldl geomancy geomancy-layout + GLFW-b ktx-codec neat-interpolation optparse-applicative + optparse-simple resourcet rio rio-app serialise spirv-reflect-ffi + spirv-reflect-types StateVar tagged template-haskell text + transformers unagi-chan unliftio vector vulkan vulkan-utils + VulkanMemoryAllocator zstd ]; description = "Core parts of Keid engine"; license = lib.licenses.bsd3; @@ -176672,15 +177449,16 @@ self: { }) {}; "keid-frp-banana" = callPackage - ({ mkDerivation, base, geomancy, keid-core, reactive-banana - , resourcet, rio, these, vulkan + ({ mkDerivation, base, geomancy, geomancy-layout, keid-core + , reactive-banana, resourcet, rio, these, vulkan }: mkDerivation { pname = "keid-frp-banana"; - version = "0.1.1.0"; - sha256 = "0m62bj6cc9xl5rricmc1xxs8q8vlbn7ablcrx923289bynyiir0i"; + version = "0.1.2.0"; + sha256 = "1yaj6mjwqwa99v74bkn42r06l8gxw7cfydwyi013jfgxrjk0kn4l"; libraryHaskellDepends = [ - base geomancy keid-core reactive-banana resourcet rio these vulkan + base geomancy geomancy-layout keid-core reactive-banana resourcet + rio these vulkan ]; description = "Reactive Banana integration for Keid engine"; license = lib.licenses.bsd3; @@ -176705,19 +177483,20 @@ self: { "keid-render-basic" = callPackage ({ mkDerivation, aeson, base, bytestring, derive-storable - , derive-storable-plugin, file-embed, geomancy, keid-core - , keid-geometry, neat-interpolation, resourcet, rio, tagged, text - , unliftio, vector, vulkan, vulkan-utils + , derive-storable-plugin, file-embed, geomancy, geomancy-layout + , gl-block, keid-core, keid-geometry, neat-interpolation, resourcet + , rio, tagged, text, unliftio, vector, vulkan, vulkan-utils }: mkDerivation { pname = "keid-render-basic"; - version = "0.1.8.0"; - sha256 = "071f7dxfar0r4al3v74h2shb0hgkw1dnw7nbwpahqh6gm5x96ynl"; + version = "0.1.9.0"; + sha256 = "1iz6ciyi5qn4garrpr3xvl2bwvcvrjl8diyzw3cnd49p6zgs0kh3"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring derive-storable derive-storable-plugin - file-embed geomancy keid-core keid-geometry neat-interpolation - resourcet rio tagged text unliftio vector vulkan vulkan-utils + file-embed geomancy geomancy-layout gl-block keid-core + keid-geometry neat-interpolation resourcet rio tagged text unliftio + vector vulkan vulkan-utils ]; description = "Basic rendering programs for Keid engine"; license = lib.licenses.bsd3; @@ -176727,15 +177506,16 @@ self: { }) {}; "keid-resource-gltf" = callPackage - ({ mkDerivation, base, bytestring, containers, geomancy, gltf-codec - , keid-core, rio + ({ mkDerivation, base, bytestring, containers, geomancy, gl-block + , gltf-codec, keid-core, rio, vector }: mkDerivation { pname = "keid-resource-gltf"; - version = "0.1.0.1"; - sha256 = "1b5bsarlgwgdwmkv9s5ma9lmqmanxr20zdd6dlz3z0akgakzl4h8"; + version = "0.1.0.2"; + sha256 = "1z11nsjzzgrlbkmv6r2j7x6fwn22hw7x029yxjam20nnf4lqmzg6"; libraryHaskellDepends = [ - base bytestring containers geomancy gltf-codec keid-core rio + base bytestring containers geomancy gl-block gltf-codec keid-core + rio vector ]; description = "GLTF loader for Keid engine"; license = lib.licenses.bsd3; @@ -177722,8 +178502,8 @@ self: { }: mkDerivation { pname = "knead"; - version = "0.5"; - sha256 = "07j0sw10qs0zpz5hgxmrhs3rrwhnxf6441jasyagl96724svxq21"; + version = "1.0"; + sha256 = "144x124wqdywrn158d3jzrhja09gzakfsfgvwvb9p67vzns7nv42"; libraryHaskellDepends = [ base bool8 comfort-array fixed-length llvm-dsl llvm-extra llvm-tf prelude-compat storable-enum storable-record tagged tfp @@ -179469,6 +180249,32 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "lambdasound" = callPackage + ({ mkDerivation, ansi-terminal, base, binary, bytestring + , bytestring-to-vector, deepseq, directory, falsify, filepath + , hashable, hashtables, massiv, proteaaudio-sdl, random, tasty + , tasty-bench, tasty-hunit, text, transformers, vector, wave, zlib + }: + mkDerivation { + pname = "lambdasound"; + version = "1.0.1"; + sha256 = "0g98gg397srwg5mcx4x56sgnmz5lm9jr1qd505i7r6maiq05v539"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base binary bytestring bytestring-to-vector deepseq + directory filepath hashable hashtables massiv proteaaudio-sdl + random text transformers vector wave zlib + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base falsify massiv tasty tasty-hunit ]; + benchmarkHaskellDepends = [ base massiv tasty tasty-bench ]; + description = "A libary for generating low-level sounds with high-level combinators"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "lambdatex" = callPackage ({ mkDerivation, async, base, containers, directory, filepath , HaTeX, hspec, mtl, QuickCheck, quickcheck-text, text @@ -179887,8 +180693,8 @@ self: { ({ mkDerivation, base, language-c99, language-c99-util, mtl }: mkDerivation { pname = "language-c99-simple"; - version = "0.2.2"; - sha256 = "16va8nd3xa4a8nfdpazcnrl0192cpdc7z06ixcx0ya04sycc9cx9"; + version = "0.2.3"; + sha256 = "0myjz09psk7snv4366qxdx1wn4a4xc50vnp97yg6bgmasl8kibz3"; libraryHaskellDepends = [ base language-c99 language-c99-util mtl ]; @@ -182950,10 +183756,10 @@ self: { }: mkDerivation { pname = "lens"; - version = "5.2.2"; - sha256 = "1qvnzxa8z3jk7kcrc394cd6drckcncpqd1jq3kk8dg9m372mhp45"; + version = "5.2.3"; + sha256 = "0kcr1dqvnjmi05yd9m9ylipk5210jwd7d00c9scq9n49vnl8q7nz"; revision = "1"; - editedCabalFile = "0dc47dfby74lmw5y436yhqi0pkgmw7vs12d14c7vhi9n2wr5f7g0"; + editedCabalFile = "0bbycnw01xxiidjjwg902wbla9mp0m17a2lpm5qw0za1gsnyl4q1"; libraryHaskellDepends = [ array assoc base base-orphans bifunctors bytestring call-stack comonad containers contravariant distributive exceptions filepath @@ -183033,8 +183839,8 @@ self: { pname = "lens-aeson"; version = "1.2.3"; sha256 = "00ac8anw6a3alwlqqvbr1vp7brajrdp66ximl7ylvj28wbznmg3v"; - revision = "1"; - editedCabalFile = "1h3y26a6z9dxifqm1ndqhlnwa41gb8majr3rqs7i93xnyp8y20b6"; + revision = "2"; + editedCabalFile = "1mw2ijrdkkpazgnfb1msahgf1dlygrcl2i3hi4g7vqf8b95knwss"; libraryHaskellDepends = [ aeson base bytestring lens scientific text text-short unordered-containers vector @@ -183376,15 +184182,15 @@ self: { "lens-toml-parser" = callPackage ({ mkDerivation, base, containers, dwergaz, hlint, lens-family - , profunctors, text, time, toml-parser + , profunctors, time, toml-parser }: mkDerivation { pname = "lens-toml-parser"; - version = "0.1.0.4"; - sha256 = "01gxm5p7bhylp1mkad4mng5rkh3wn2cvjcxkqp11pc51f4mkkqml"; - libraryHaskellDepends = [ base profunctors text time toml-parser ]; + version = "0.2.0.0"; + sha256 = "09fihza44jksq1lqx6ks68aqi1z0ks0338f8qz1zlzmnnfp32gfw"; + libraryHaskellDepends = [ base profunctors time toml-parser ]; testHaskellDepends = [ - base containers dwergaz hlint lens-family text toml-parser + base containers dwergaz hlint lens-family toml-parser ]; description = "Lenses for toml-parser"; license = lib.licenses.isc; @@ -183505,6 +184311,8 @@ self: { pname = "lentil"; version = "1.5.6.0"; sha256 = "0sjhhvrw3xbisg8mi1g67yj5r43wzyhqav61wm0ynb1wakc7das1"; + revision = "2"; + editedCabalFile = "1075p06xxahc00pqvk6025axvbcfyzw41cqgrhizj1kbrs1alrlb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -183967,13 +184775,12 @@ self: { ({ mkDerivation, base, bytestring, c2hs, Cabal, chs-cabal , composition-prelude, cpphs, criterion, deepseq, dir-traverse , directory, dlist, filepath, hspec, libarchive, mtl - , pathological-bytestrings, tar, tar-conduit, temporary - , unix-compat + , pathological-bytestrings, tar, temporary, unix-compat }: mkDerivation { pname = "libarchive"; - version = "3.0.3.2"; - sha256 = "000yq98nm151p0j95nm6dy2pp4g0dz8sh704ga3gcsp2dhk3vrji"; + version = "3.0.4.2"; + sha256 = "1jzpp4sn3lchp68c6wrcfvg4yr8g1fhhki1s2qp2a15nyzljpq8i"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal chs-cabal ]; @@ -183989,7 +184796,7 @@ self: { ]; testToolDepends = [ cpphs ]; benchmarkHaskellDepends = [ - base bytestring criterion tar tar-conduit temporary + base bytestring criterion tar temporary ]; description = "Haskell interface to libarchive"; license = lib.licenses.bsd3; @@ -186158,6 +186965,8 @@ self: { ]; description = "Native, complete-ish, matrix-free linear algebra"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "linearscan" = callPackage @@ -187466,10 +188275,8 @@ self: { }: mkDerivation { pname = "list-tuple"; - version = "0.1.3.0"; - sha256 = "1qd5pr7i9xsym09ly6am3a0id3cwbb8w4xphbsjkv3wrlfv9z9v0"; - revision = "1"; - editedCabalFile = "1xmim80y3mcj81ak2xh3mpy1g2kqwqy4q7rh8n69ipbwsldqcfwg"; + version = "0.1.4.1"; + sha256 = "1xikv5wq6xqq8wcxw9vjp5s5ci9qqyw2kxbxp03madzaawdqq0g6"; setupHaskellDepends = [ base Cabal directory ]; libraryHaskellDepends = [ base OneTuple Only single-tuple ]; testHaskellDepends = [ @@ -187682,8 +188489,8 @@ self: { pname = "literatex"; version = "0.3.0.0"; sha256 = "0ph3s26hxvnkdqc3s09d3ka1p224zmgwc3k6zi7jmma0sgrmnm9x"; - revision = "1"; - editedCabalFile = "1nn5manl4133hl3r2xnk1m36kb43j7k1vaw5v71pn5krdnx9ygkp"; + revision = "3"; + editedCabalFile = "0k1b9pbdlrz9n4aaj07arbzbzz4l4dy0srh3x8px3d0rjpvwyld7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -187965,15 +188772,16 @@ self: { "llvm-dsl" = callPackage ({ mkDerivation, base, bool8, llvm-extra, llvm-tf, numeric-prelude , prelude-compat, storable-enum, storable-record, tfp, transformers - , utility-ht + , unsafe, utility-ht, vault }: mkDerivation { pname = "llvm-dsl"; - version = "0.0"; - sha256 = "0ij2y3q8c46z731b1hlqcjgrkmzsj066mnb0rpnwkn70caai3vz8"; + version = "0.1"; + sha256 = "1x3br3g227gh7hydfllzwjp3lv9lgq9p1rnrh09sw4whcv4crhbb"; libraryHaskellDepends = [ base bool8 llvm-extra llvm-tf numeric-prelude prelude-compat - storable-enum storable-record tfp transformers utility-ht + storable-enum storable-record tfp transformers unsafe utility-ht + vault ]; description = "Support for writing an EDSL with LLVM-JIT as target"; license = lib.licenses.bsd3; @@ -188000,17 +188808,15 @@ self: { }) {}; "llvm-extra" = callPackage - ({ mkDerivation, base, base-orphans, bool8, containers, enumset - , fixed-length, llvm-tf, non-empty, prelude-compat, QuickCheck - , storable-enum, storable-record, tagged, tfp, transformers - , utility-ht + ({ mkDerivation, base, base-orphans, bool8, containers + , doctest-exitcode-stdio, enumset, fixed-length, llvm-tf, non-empty + , prelude-compat, QuickCheck, storable-enum, storable-record + , tagged, tfp, transformers, utility-ht }: mkDerivation { pname = "llvm-extra"; - version = "0.10.1"; - sha256 = "0m8fxip4345k92nq5n0dqdbjyahah0nind6lrwa5r7f9ff9j8gc9"; - revision = "1"; - editedCabalFile = "12b7icp5vk26nwl5q8jhsrcqp10h0w72yxqsw9dzr3lzca4g6wl2"; + version = "0.11"; + sha256 = "1ck6cama0l89rgjcqhnasvzzy1pacr9h2z6v32pi7xci3h7ijhy2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -188019,7 +188825,8 @@ self: { transformers utility-ht ]; testHaskellDepends = [ - base llvm-tf QuickCheck storable-record tfp utility-ht + base doctest-exitcode-stdio llvm-tf QuickCheck storable-record tfp + transformers utility-ht ]; doHaddock = false; description = "Utility functions for the llvm interface"; @@ -188322,8 +189129,8 @@ self: { }: mkDerivation { pname = "llvm-tf"; - version = "12.0.0.1"; - sha256 = "0l576wi605lqj8lgvqz1a4kd99bk93fi09gpppifbizw1vgihhy1"; + version = "12.1"; + sha256 = "0p285ssw0wii8pn1ml110wjpzd6hb8h1yb0zff0hyhzs8k23pm7a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -190506,22 +191313,23 @@ self: { "lsp" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , co-log-core, containers, data-default, directory, exceptions - , filepath, hashable, hspec, hspec-discover, lens, lsp-types, mtl - , prettyprinter, random, row-types, sorted-list, stm, temporary - , text, text-rope, transformers, unliftio-core + , filepath, hashable, hspec, hspec-discover, lens, lens-aeson + , lsp-types, mtl, prettyprinter, random, row-types, sorted-list + , stm, temporary, text, text-rope, transformers, unliftio-core , unordered-containers, uuid }: mkDerivation { pname = "lsp"; - version = "2.1.0.0"; - sha256 = "03gk98fgf32blywdds0fc5351bmcbbfrnqwlg33l2ih75nwa59y8"; + version = "2.2.0.0"; + sha256 = "0nqxkx7vjzvn5ysalk9nd1aqwzfxjj39g3g91qr01hdzydfjsajr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson async attoparsec base bytestring co-log-core containers - data-default directory exceptions filepath hashable lens lsp-types - mtl prettyprinter random row-types sorted-list stm temporary text - text-rope transformers unliftio-core unordered-containers uuid + data-default directory exceptions filepath hashable lens lens-aeson + lsp-types mtl prettyprinter random row-types sorted-list stm + temporary text text-rope transformers unliftio-core + unordered-containers uuid ]; testHaskellDepends = [ base containers hspec row-types sorted-list text text-rope @@ -190563,18 +191371,20 @@ self: { ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, co-log-core, conduit, conduit-parse, containers , data-default, Diff, directory, exceptions, extra, filepath, Glob - , hspec, lens, lsp, lsp-types, mtl, parser-combinators, process - , row-types, some, text, time, transformers, unix, unliftio + , hspec, lens, lens-aeson, lsp, lsp-types, mtl, parser-combinators + , process, row-types, some, text, time, transformers, unix + , unliftio }: mkDerivation { pname = "lsp-test"; - version = "0.15.0.1"; - sha256 = "1n3sqmb41kzczyqpz9ddqi3wmkpdwdjvgzldjn3pncs4lfxfjnxd"; + version = "0.16.0.0"; + sha256 = "0a2xv9nqz84ymmbz7yyhxkrxhghafgpmma9iqz32jwr8wqn6g9hf"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal async base bytestring co-log-core conduit conduit-parse containers data-default Diff directory - exceptions filepath Glob lens lsp lsp-types mtl parser-combinators - process row-types some text time transformers unix + exceptions filepath Glob lens lens-aeson lsp lsp-types mtl + parser-combinators process row-types some text time transformers + unix ]; testHaskellDepends = [ aeson base co-log-core containers data-default directory filepath @@ -190613,20 +191423,24 @@ self: { "lsp-types" = callPackage ({ mkDerivation, aeson, base, binary, containers, data-default , deepseq, Diff, directory, dlist, exceptions, file-embed, filepath - , hashable, hspec, hspec-discover, lens, mod, mtl, network-uri - , prettyprinter, QuickCheck, quickcheck-instances, regex, row-types - , safe, some, template-haskell, text, unordered-containers + , hashable, hspec, hspec-discover, indexed-traversable + , indexed-traversable-instances, lens, lens-aeson, mod, mtl + , network-uri, prettyprinter, QuickCheck, quickcheck-instances + , regex, row-types, safe, some, template-haskell, text + , unordered-containers }: mkDerivation { pname = "lsp-types"; - version = "2.0.1.1"; - sha256 = "0g5z28iy4ar96x5fmj1v8g60wz3drp39393161f2hjyp3kq8nfh0"; + version = "2.0.2.0"; + sha256 = "0s895x3b8fpcj2b0ia3d4dmwk4vhg6h2anmzffkpr3drsq5bi1j6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base binary containers data-default deepseq Diff dlist - exceptions file-embed filepath hashable lens mod mtl network-uri - row-types safe some template-haskell text unordered-containers + exceptions file-embed filepath hashable indexed-traversable + indexed-traversable-instances lens lens-aeson mod mtl network-uri + prettyprinter row-types safe some template-haskell text + unordered-containers ]; executableHaskellDepends = [ base containers directory filepath mtl prettyprinter regex text @@ -191019,8 +191833,8 @@ self: { ({ mkDerivation, base, lucid, servant, text }: mkDerivation { pname = "lucid-htmx"; - version = "0.1.0.6"; - sha256 = "0jd0igz4hymx5fnjsgx2y97440djfz416phnczz52g2vw7amgqjw"; + version = "0.1.0.7"; + sha256 = "16dm2p5p9ng83xhgpxi7jai48ddi5pvg5q23rq7gv1378pfypc2w"; libraryHaskellDepends = [ base lucid servant text ]; testHaskellDepends = [ base lucid servant text ]; description = "Use htmx in your lucid templates"; @@ -193822,6 +194636,31 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "markup-parse" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, flatparse + , html-parse, optparse-applicative, perf, string-interpolate, tasty + , tasty-golden, text, these, tree-diff + }: + mkDerivation { + pname = "markup-parse"; + version = "0.1.1"; + sha256 = "1ybmppxd4hpqjr2lnb1x9jk96fkd8snq6l2p0fzpr7q6bq09wx0a"; + revision = "1"; + editedCabalFile = "1p9hba5fcfbv9qm4aqg9hn5bamw6slyr1sxz5pzg3hnj1c8npzl6"; + libraryHaskellDepends = [ + base bytestring containers deepseq flatparse string-interpolate + tasty tasty-golden these tree-diff + ]; + testHaskellDepends = [ + base bytestring string-interpolate tasty tasty-golden tree-diff + ]; + benchmarkHaskellDepends = [ + base bytestring flatparse html-parse optparse-applicative perf text + ]; + description = "A markup parser"; + license = lib.licenses.bsd3; + }) {}; + "markup-preview" = callPackage ({ mkDerivation, base, cmdargs, directory, glib, gtk , gtk2hs-buildtools, MissingH, mtl, pandoc, temporary, text @@ -195452,8 +196291,8 @@ self: { }: mkDerivation { pname = "mealy"; - version = "0.4.3"; - sha256 = "1p5dn0phbvz5jfkhfifppdzz3jphcmifcqmrv9nxklw4cfcbgl6w"; + version = "0.4.4"; + sha256 = "1pji7gkfni3h5db1jlmgxkfwnih1954nd224lb45n0v7ihmjkpsi"; libraryHaskellDepends = [ adjunctions base containers mwc-probability numhask numhask-array primitive profunctors tdigest text vector vector-algorithms @@ -195828,15 +196667,15 @@ self: { license = lib.licenses.bsd2; }) {}; - "megaparsec_9_4_1" = callPackage + "megaparsec_9_5_0" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , criterion, deepseq, mtl, parser-combinators, scientific, text , transformers, weigh }: mkDerivation { pname = "megaparsec"; - version = "9.4.1"; - sha256 = "0a8s4i2vi1q9l75nf65jdjfkf25dhra4ij9y35a5fi5vk9848sf1"; + version = "9.5.0"; + sha256 = "0lnsqdphr3fnxvn87z2ni110wzq60pq6fl407ihddpyavpb0hw38"; libraryHaskellDepends = [ base bytestring case-insensitive containers deepseq mtl parser-combinators scientific text transformers @@ -195874,25 +196713,22 @@ self: { license = lib.licenses.bsd2; }) {}; - "megaparsec-tests_9_4_1" = callPackage + "megaparsec-tests_9_5_0" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers - , hspec, hspec-discover, hspec-expectations, hspec-megaparsec - , megaparsec, mtl, parser-combinators, QuickCheck, scientific - , temporary, text, transformers + , hspec, hspec-discover, hspec-megaparsec, megaparsec, mtl + , QuickCheck, scientific, temporary, text, transformers }: mkDerivation { pname = "megaparsec-tests"; - version = "9.4.1"; - sha256 = "08lvya4c1vbwyi1130rhm3xd8aq4x1m3wnyphwzal2p556hzlr2g"; + version = "9.5.0"; + sha256 = "18ishnklylaiphkz6dd9rfbxnqlrb4fqqd8pr5mk9qb5j0fkbv13"; libraryHaskellDepends = [ - base bytestring containers hspec hspec-expectations - hspec-megaparsec megaparsec mtl QuickCheck text transformers + base bytestring containers hspec hspec-megaparsec megaparsec mtl + QuickCheck text transformers ]; testHaskellDepends = [ - base bytestring case-insensitive containers hspec - hspec-expectations hspec-megaparsec megaparsec mtl - parser-combinators QuickCheck scientific temporary text - transformers + base bytestring case-insensitive containers hspec hspec-megaparsec + megaparsec mtl QuickCheck scientific temporary text transformers ]; testToolDepends = [ hspec-discover ]; description = "Test utilities and the test suite of Megaparsec"; @@ -197313,8 +198149,8 @@ self: { pname = "microaeson"; version = "0.1.0.1"; sha256 = "0rx5gm7apazc0sm65v687ab5106ximka9khizxq1lbckd2x0cq3q"; - revision = "6"; - editedCabalFile = "0m32nnlldj2q261p6hwya9f9jqv6w33ws8wkizar4p2c1mv7lf2k"; + revision = "7"; + editedCabalFile = "01skh5580zxf1032b25wm410jr52kaxq822jz6n568sfx90hmfl7"; libraryHaskellDepends = [ array base bytestring containers deepseq fail text ]; @@ -197448,26 +198284,6 @@ self: { }: mkDerivation { pname = "microlens-aeson"; - version = "2.5.0"; - sha256 = "0h5q0b2b4y28llhq28mb28kpdv2iifz0qkbbhmrwrz2bs6arr3d2"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring hashable microlens scientific text - vector - ]; - testHaskellDepends = [ - aeson base bytestring hashable microlens tasty tasty-hunit text - vector - ]; - description = "Law-abiding lenses for Aeson, using microlens"; - license = lib.licenses.mit; - }) {}; - - "microlens-aeson_2_5_1" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, hashable - , microlens, scientific, tasty, tasty-hunit, text, vector - }: - mkDerivation { - pname = "microlens-aeson"; version = "2.5.1"; sha256 = "02p5qk1d7rn6h7vfvj0rzi05swd6fp04mhri60nysm6dv135qxgp"; libraryHaskellDepends = [ @@ -197480,7 +198296,6 @@ self: { ]; description = "Law-abiding lenses for Aeson, using microlens"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "microlens-contra" = callPackage @@ -197578,8 +198393,8 @@ self: { }: mkDerivation { pname = "microlens-th"; - version = "0.4.3.13"; - sha256 = "1g41wb61k2l99xxy23yp2zqk0wanskgdypbjhib71ji0y1dcsfz7"; + version = "0.4.3.14"; + sha256 = "0sjvzywcar5fxmpbdj5ili4m4pcz77hnk27i99qsdrxjzmmwkycj"; libraryHaskellDepends = [ base containers microlens template-haskell th-abstraction transformers @@ -199371,8 +200186,8 @@ self: { pname = "mmark-ext"; version = "0.2.1.5"; sha256 = "1dy3xnzpbbnp03k3r04q8y10pcj2r708dk8bff0pxzkvypm75g88"; - revision = "2"; - editedCabalFile = "0kz0389rrjd4wy6a5m89w7a4pcd4765kah7rwa7i649l8h5a5asm"; + revision = "3"; + editedCabalFile = "0yxl2wpxmvjnhn0qy8p1ajmi61hpkfqqfj206dl7q1xn9kmkg3fc"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base foldl ghc-syntax-highlighter lucid microlens mmark modern-uri @@ -199721,8 +200536,8 @@ self: { }: mkDerivation { pname = "mmzk-typeid"; - version = "0.4.0.0"; - sha256 = "1311xy49fs6psciks8sii2k9agqr6pnvykvvxqjlmwp9gkys6rjc"; + version = "0.5.0.0"; + sha256 = "00q7rmbjkjjabs9a4cfhqb0d37g124j0j4jb64qbi77m0pa7l9dv"; libraryHaskellDepends = [ aeson array base binary bytestring entropy hashable random text time uuid uuid-types @@ -199970,28 +200785,25 @@ self: { }) {}; "modern-uri" = callPackage - ({ mkDerivation, base, bytestring, containers, contravariant - , criterion, deepseq, exceptions, hashable, hspec, hspec-discover - , hspec-megaparsec, megaparsec, mtl, profunctors, QuickCheck - , reflection, tagged, template-haskell, text, weigh + ({ mkDerivation, base, bytestring, containers, criterion, deepseq + , exceptions, hashable, hspec, hspec-discover, hspec-megaparsec + , megaparsec, mtl, profunctors, QuickCheck, reflection, tagged + , template-haskell, text, weigh }: mkDerivation { pname = "modern-uri"; - version = "0.3.6.0"; - sha256 = "1lj3il9wg7v88l1hj08k07g3f76xas0gz20l2wy8z6xbpcn5ng6g"; - revision = "1"; - editedCabalFile = "0bfg0m3iynx41am17l9gb8di3kaldz9129s34vsc1qx5y13dnwl3"; + version = "0.3.6.1"; + sha256 = "1sag8l91qd7xs56rlx8r6dz9zxxmqsnfw0v47az7l8nirv7zjih2"; libraryHaskellDepends = [ - base bytestring containers contravariant deepseq exceptions - hashable megaparsec mtl profunctors QuickCheck reflection tagged - template-haskell text + base bytestring containers deepseq exceptions hashable megaparsec + mtl profunctors QuickCheck reflection tagged template-haskell text ]; testHaskellDepends = [ base bytestring hspec hspec-megaparsec megaparsec QuickCheck text ]; testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ - base bytestring criterion deepseq megaparsec text weigh + base bytestring criterion megaparsec text weigh ]; description = "Modern library for working with URIs"; license = lib.licenses.bsd3; @@ -201991,14 +202803,14 @@ self: { license = lib.licenses.bsd2; }) {}; - "monadology_0_2" = callPackage + "monadology_0_3" = callPackage ({ mkDerivation, base, constraints, invariant, tasty, tasty-hunit , text, transformers, type-rig, witness }: mkDerivation { pname = "monadology"; - version = "0.2"; - sha256 = "0ad15iz8na5dm34p8gcy2jz9h6ayanfarzi4maiy263949vhm9pv"; + version = "0.3"; + sha256 = "1nfx9hl6vimqwr7dv3nlvf0c5brjppznjzrqr0kqdxjz7mvjmvy1"; libraryHaskellDepends = [ base constraints invariant transformers type-rig witness ]; @@ -202461,8 +203273,8 @@ self: { }: mkDerivation { pname = "monoid-subclasses"; - version = "1.2.3"; - sha256 = "1pfha97ww3wic7sb2fk005q0s17yi4j0kfg7imv2djxrp9447hgy"; + version = "1.2.4"; + sha256 = "1ycxv01hf7svhaczsdprklh1r96300zdlkhar8dxwggajs9njyjn"; libraryHaskellDepends = [ base bytestring commutative-semigroups containers primes text vector @@ -202634,20 +203446,20 @@ self: { }) {inherit (pkgs) glew;}; "monomer-flatpak-example" = callPackage - ({ mkDerivation, base, containers, data-default-class, dbus - , desktop-portal, directory, modern-uri, monomer, monomer-hagrid - , random, text + ({ mkDerivation, base, bytestring, containers, data-default-class + , dbus, desktop-portal, directory, modern-uri, monomer + , monomer-hagrid, random, text }: mkDerivation { pname = "monomer-flatpak-example"; - version = "0.0.9.0"; - sha256 = "1cvvqhc86q0589yh6g1p1pgvcp5dzvjnqbbln8pkq4fqcl4n7cwd"; + version = "0.0.12.0"; + sha256 = "185vv9ihrjssncpkhfh7gchw6whx0ll951y7j4pznnn6s0b3k2yk"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - base containers data-default-class dbus desktop-portal directory - modern-uri monomer monomer-hagrid random text + base bytestring containers data-default-class dbus desktop-portal + directory modern-uri monomer monomer-hagrid random text ]; description = "Monomer Flatpak Example Application"; license = lib.licenses.mit; @@ -207242,8 +208054,8 @@ self: { }: mkDerivation { pname = "mysql-haskell"; - version = "1.1.2"; - sha256 = "10mscgpml293kpjj9f6cap55pqxjcbp7hspigmdpm806ir6119ga"; + version = "1.1.3"; + sha256 = "1bq2yhnbglfdhvax5bnk3h87j840bmi0ls9qhanbv92ly2zsi48j"; libraryHaskellDepends = [ base binary blaze-textual bytestring bytestring-lexing crypton crypton-x509 crypton-x509-store crypton-x509-system @@ -208474,8 +209286,8 @@ self: { pname = "natural-transformation"; version = "0.4"; sha256 = "1by8xwjc23l6pa9l4iv7zp82dykpll3vc3hgxk0pgva724n8xhma"; - revision = "10"; - editedCabalFile = "18d14fasp1l5xdfgp8swgcyyjd3irqj19cn298ksx9wiw43j818p"; + revision = "11"; + editedCabalFile = "1j4gmkamz6r7xggyfyb3by8lbmaah164haqakbxi2kb7y0v4kl24"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base containers quickcheck-instances tasty tasty-quickcheck @@ -209105,36 +209917,39 @@ self: { license = lib.licenses.bsd3; }) {}; - "net-mqtt_0_8_5_0" = callPackage + "net-mqtt_0_8_6_0" = callPackage ({ mkDerivation, async, attoparsec, attoparsec-binary, base, binary , bytestring, checkers, conduit, conduit-extra, containers - , crypton-connection, deepseq, HUnit, network-conduit-tls - , network-uri, optparse-applicative, QuickCheck, stm, tasty - , tasty-hunit, tasty-quickcheck, text, websockets + , crypton-connection, deepseq, HUnit, lens, monad-loops, mtl + , network-conduit-tls, network-uri, optparse-applicative + , QuickCheck, stm, tasty, tasty-discover, tasty-hunit + , tasty-quickcheck, text, time, websockets }: mkDerivation { pname = "net-mqtt"; - version = "0.8.5.0"; - sha256 = "1k66ljcskk26kqf0dhrrh4f5fc23rlfdlisgsifqjyppfqfnxfkc"; + version = "0.8.6.0"; + sha256 = "1pfwlx4g02x1nniihpz8q10zzy4i51jij2p3vhlxaps7hx2dh8p2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ async attoparsec attoparsec-binary base binary bytestring conduit - conduit-extra containers crypton-connection deepseq - network-conduit-tls network-uri QuickCheck stm text websockets + conduit-extra containers crypton-connection deepseq monad-loops + network-conduit-tls network-uri QuickCheck stm text time websockets ]; executableHaskellDepends = [ async attoparsec attoparsec-binary base binary bytestring conduit - conduit-extra containers crypton-connection deepseq + conduit-extra containers crypton-connection deepseq monad-loops network-conduit-tls network-uri optparse-applicative QuickCheck stm - text websockets + text time websockets ]; testHaskellDepends = [ async attoparsec attoparsec-binary base binary bytestring checkers conduit conduit-extra containers crypton-connection deepseq HUnit - network-conduit-tls network-uri QuickCheck stm tasty tasty-hunit - tasty-quickcheck text websockets + lens monad-loops mtl network-conduit-tls network-uri QuickCheck stm + tasty tasty-discover tasty-hunit tasty-quickcheck text time + websockets ]; + testToolDepends = [ tasty-discover ]; description = "An MQTT Protocol Implementation"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -210676,6 +211491,8 @@ self: { pname = "network-transport"; version = "0.5.6"; sha256 = "10ichr66j06w2sdx5523rjvwf17cxhl5iw6izw7l066lrbzkr270"; + revision = "1"; + editedCabalFile = "1fmlpfya9qakzyqwgiiw1gssz919yrm5fbbf6d9rzqdvmar5g2n8"; libraryHaskellDepends = [ base binary bytestring deepseq hashable transformers ]; @@ -210831,15 +211648,15 @@ self: { "network-unexceptional" = callPackage ({ mkDerivation, base, byteslice, bytestring, error-codes, network - , posix-api, primitive, primitive-addr + , posix-api, primitive, primitive-addr, stm }: mkDerivation { pname = "network-unexceptional"; - version = "0.1.1.0"; - sha256 = "17dmifcv7cwg875yk02r0r5npjk9zw1c03fmpk4l1qa3x7ziyj2x"; + version = "0.1.3.1"; + sha256 = "0g99931i44f07byxv14a89d2rda12ibzv1b3vxi6rkwqikrh3jk3"; libraryHaskellDepends = [ base byteslice bytestring error-codes network posix-api primitive - primitive-addr + primitive-addr stm ]; description = "Network functions that do not throw exceptions"; license = lib.licenses.bsd3; @@ -211504,8 +212321,8 @@ self: { }: mkDerivation { pname = "ngx-export"; - version = "1.7.5"; - sha256 = "0n94r5q3awf5imx08fwmx5c2vm44jc2apnakw8q91bwlg0gfa0iq"; + version = "1.7.7.1"; + sha256 = "1ynsqhyb8y0rqj2bzwl4pffbwv2cdfxc133ic2lpprjy2hrz5pz5"; libraryHaskellDepends = [ async base binary bytestring deepseq monad-loops template-haskell unix @@ -211515,32 +212332,40 @@ self: { }) {}; "ngx-export-distribution" = callPackage - ({ mkDerivation, base, Cabal, directory, filepath }: + ({ mkDerivation, ansi-terminal, base, Cabal, cabal-plan, containers + , directory, filepath, parsec, text + }: mkDerivation { pname = "ngx-export-distribution"; - version = "0.4.0.0"; - sha256 = "027av6pzd3w6c1kvfps1vf7jzvdd2hx159f7chykgy6n1zmybgxy"; + version = "0.5.0.3"; + sha256 = "1czpf9sjsqzzzf78aqvp8n3ja0bdhchwj3i79qzf3mvhhkcfqj3i"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base Cabal directory filepath ]; + executableHaskellDepends = [ + ansi-terminal base Cabal cabal-plan containers directory filepath + parsec text + ]; description = "Build custom libraries for Nginx haskell module"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "nhm-tool"; }) {}; "ngx-export-healthcheck" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , enclosed-exceptions, http-client, http-client-brread-timeout - , http-types, ngx-export, safe, snap-core, snap-server, text, time - , vector + , http-client-tls, http-types, ngx-export, safe, snap-core + , snap-server, text, time, vector }: mkDerivation { pname = "ngx-export-healthcheck"; - version = "1.5"; - sha256 = "00qzkyfxzh8c0hmj0xzsisncvww1ar2k9a6ngkrgaypl96abbkln"; - revision = "1"; - editedCabalFile = "05yhi77x339byxln8b2mvkslrkmw7jpflaj1ma8jc8gbxbk868lp"; + version = "1.6"; + sha256 = "0haz3md5hx6rs9apdqd4ivm3f0vqvxa099ig3liw4mjjqnzmhdhy"; libraryHaskellDepends = [ aeson async base bytestring containers enclosed-exceptions - http-client http-client-brread-timeout http-types ngx-export safe - snap-core snap-server text time vector + http-client http-client-brread-timeout http-client-tls http-types + ngx-export safe snap-core snap-server text time vector ]; description = "Active health checks and monitoring of Nginx upstreams"; license = lib.licenses.bsd3; @@ -211582,22 +212407,22 @@ self: { ({ mkDerivation, aeson, array, async, base, base64, binary , bytestring, case-insensitive, containers, ede , enclosed-exceptions, http-client, http-client-brread-timeout - , http-types, network, ngx-export, ngx-export-tools, pcre-heavy - , pcre-light, prettyprinter, resolv, safe, safe-exceptions - , snap-core, snap-server, template-haskell, text, time, trifecta - , unordered-containers + , http-client-tls, http-types, network, ngx-export + , ngx-export-tools, pcre-heavy, pcre-light, prettyprinter, resolv + , safe, safe-exceptions, snap-core, snap-server, template-haskell + , text, time, trifecta, unordered-containers }: mkDerivation { pname = "ngx-export-tools-extra"; - version = "1.2.3"; - sha256 = "16j7sjqrbd1f4hlblgf381b3ds0iwyi5r3czm90h4i5higa0r7cm"; + version = "1.2.4"; + sha256 = "1phxcz622yz2als564ab0bs425lz44lbp9q0nmxgnp03bxlcn9gs"; libraryHaskellDepends = [ aeson array async base base64 binary bytestring case-insensitive containers ede enclosed-exceptions http-client - http-client-brread-timeout http-types network ngx-export - ngx-export-tools pcre-heavy pcre-light prettyprinter resolv safe - safe-exceptions snap-core snap-server template-haskell text time - trifecta unordered-containers + http-client-brread-timeout http-client-tls http-types network + ngx-export ngx-export-tools pcre-heavy pcre-light prettyprinter + resolv safe safe-exceptions snap-core snap-server template-haskell + text time trifecta unordered-containers ]; description = "More extra tools for Nginx haskell module"; license = lib.licenses.bsd3; @@ -212785,8 +213610,8 @@ self: { }: mkDerivation { pname = "non-empty"; - version = "0.3.3"; - sha256 = "01vhkj9xgggml51zmrj3hngxxnzrcd4zs0a7yjg69i6z518mh0pg"; + version = "0.3.4"; + sha256 = "0x88vi1llky86fdrzgvfilgl724jp3kfj8mn8zf9vwjbilap5qy1"; libraryHaskellDepends = [ base containers deepseq QuickCheck utility-ht ]; @@ -214334,6 +215159,17 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "numerical-integration" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "numerical-integration"; + version = "0.1.0.2"; + sha256 = "0vg9pdlqv5wl84q7jcjgd3g6hir1kkd5acmplivpn2gq9hdf8mwi"; + libraryHaskellDepends = [ base ]; + description = "Numerical integration"; + license = lib.licenses.bsd3; + }) {}; + "numericpeano" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -214357,12 +215193,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "numhask_0_11_0_2" = callPackage + "numhask_0_11_1_0" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "numhask"; - version = "0.11.0.2"; - sha256 = "1km9lnkiswgf5xiy4wzcsgpnirjxbcrvj2vgr8rjj1hwfzrnwksw"; + version = "0.11.1.0"; + sha256 = "1fnav552f99hbc83vsxvjccak06pqil8kyg8fhbgsllmsbhbzpqq"; libraryHaskellDepends = [ base QuickCheck ]; description = "A numeric class hierarchy"; license = lib.licenses.bsd3; @@ -214615,41 +215451,40 @@ self: { , binary-instances, bytestring, containers, data-default, extra , free, hspec, hspec-discover, microlens, microlens-th , neat-interpolation, optparse-simple, parsec, prettyprinter - , regex-tdfa, shake, stm, text, tomland, transformers, unliftio + , regex-tdfa, shake, stm, text, toml-reader, transformers, unliftio , unordered-containers, validation-selective }: mkDerivation { pname = "nvfetcher"; - version = "0.6.1.0"; - sha256 = "1899x279x236h71infk6h6cxw6sckhzh2z15frq92wpl6viq9qwz"; + version = "0.6.2.0"; + sha256 = "0lgbnam9gb9sdgmbxc5iznzbyv13s27j7s74fnrp09xdij0fgq3q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty base binary binary-instances bytestring containers data-default extra free microlens microlens-th neat-interpolation optparse-simple parsec prettyprinter regex-tdfa - shake text tomland transformers unordered-containers + shake text toml-reader transformers unordered-containers ]; executableHaskellDepends = [ aeson aeson-pretty base binary binary-instances bytestring containers data-default extra free microlens microlens-th neat-interpolation optparse-simple parsec prettyprinter regex-tdfa - shake text tomland transformers unordered-containers + shake text toml-reader transformers unordered-containers validation-selective ]; testHaskellDepends = [ aeson aeson-pretty async base binary binary-instances bytestring containers data-default extra free hspec microlens microlens-th neat-interpolation optparse-simple parsec prettyprinter regex-tdfa - shake stm text tomland transformers unliftio unordered-containers + shake stm text toml-reader transformers unliftio + unordered-containers ]; testToolDepends = [ hspec-discover ]; description = "Generate nix sources expr for the latest version of packages"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "nvfetcher"; maintainers = [ lib.maintainers.berberman ]; - broken = true; }) {}; "nvim-hs" = callPackage @@ -216033,8 +216868,8 @@ self: { }: mkDerivation { pname = "om-http"; - version = "0.3.0.1"; - sha256 = "1fp2sm2phc7ij108v466ah8dbjgr2js3yl7yil6dcayh90z6yvd0"; + version = "0.3.0.4"; + sha256 = "0rwq81m251hdqs9l5zkkq8z3yd7gnpjx9cl999gs3n12s469bc0z"; libraryHaskellDepends = [ async base bytestring directory filepath http-types mime-types monad-logger network om-show safe-exceptions servant @@ -218355,6 +219190,8 @@ self: { pname = "optics-operators"; version = "0.1.0.1"; sha256 = "09518gnk6a83fn1b0y46vzg1y7l4c17nkip2qiz286y9p8g4w1j7"; + revision = "1"; + editedCabalFile = "1rbdfml4iyblxcdmcjzdsx7b530jqnggf4avpgaa39wby820yvjx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl optics-core ]; @@ -218611,6 +219448,8 @@ self: { pname = "optparse-applicative"; version = "0.17.1.0"; sha256 = "1vx5w03vvfr3hdk79lvl34x8bxj5xbx0xh53mmnmxi9r05scnyfi"; + revision = "1"; + editedCabalFile = "1mhyjlmb1hylmhv77w6gq663drpyiqd09w1x1vy4d63lr46mypyb"; libraryHaskellDepends = [ ansi-wl-pprint base process transformers transformers-compat ]; @@ -219442,7 +220281,7 @@ self: { mainProgram = "ormolu"; }) {}; - "ormolu_0_7_1_0" = callPackage + "ormolu_0_7_2_0" = callPackage ({ mkDerivation, ansi-terminal, array, base, binary, bytestring , Cabal-syntax, containers, deepseq, Diff, directory, file-embed , filepath, ghc-lib-parser, hspec, hspec-discover, hspec-megaparsec @@ -219451,8 +220290,8 @@ self: { }: mkDerivation { pname = "ormolu"; - version = "0.7.1.0"; - sha256 = "175pjxbys6l94rzm9bzwymvh5fhclxwq9vj592m8zcga4bcaa6iv"; + version = "0.7.2.0"; + sha256 = "1nbgm12fif9yzmkrbsqsgfsbgbgdkc5xnhwp5dy35zpgbyx9bz81"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -220125,8 +220964,8 @@ self: { pname = "package-version"; version = "0.3"; sha256 = "01d0345qs5c02gmh3ccsl0xbmiqwcbdpzlqgx2pwj6iv9vvjrf5l"; - revision = "1"; - editedCabalFile = "1s0s4vlzmxg1fzdjs3d0ya54sifwbnfwbbsgya62hknkyk6mzg0h"; + revision = "2"; + editedCabalFile = "0gx7di73yl8a83ba1fmqgkcqwdjvm27y6i0vffb9893b7248495h"; libraryHaskellDepends = [ base bytestring deepseq prettyprinter safe-exceptions template-haskell text @@ -220827,7 +221666,7 @@ self: { ]; }) {}; - "pandoc_3_1_6_1" = callPackage + "pandoc_3_1_8" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, attoparsec, base , base64, binary, blaze-html, blaze-markup, bytestring , case-insensitive, citeproc, commonmark, commonmark-extensions @@ -220846,8 +221685,8 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "3.1.6.1"; - sha256 = "0lihc1bgis8dmmbd06i2chk0c5wwj3hp6mr4nqxcc2mp3kwh7hma"; + version = "3.1.8"; + sha256 = "0yr4lkc50ygwvv9kv6f9s5bclar4syvbcrf9lzdvf3450x00brva"; configureFlags = [ "-f-trypandoc" ]; enableSeparateDataOutput = true; libraryHaskellDepends = [ @@ -221305,8 +222144,10 @@ self: { }: mkDerivation { pname = "pandoc-lua-engine"; - version = "0.2.1.1"; - sha256 = "0f0zd54qkrx7m6h2xll3ln788w939gwbz1ak25c4jvnya12sm23f"; + version = "0.2.1.2"; + sha256 = "06m546261r2bwrrhg04qzbwaxqsrfxh301z0pmrs6ic3qxsmlzgv"; + revision = "1"; + editedCabalFile = "1n4pzfaiqyfxsnv5svh756ras9c86xn1p82z8qf94n80sgla3bb2"; libraryHaskellDepends = [ aeson base bytestring citeproc containers data-default doclayout doctemplates exceptions hslua hslua-module-doclayout @@ -221510,8 +222351,8 @@ self: { }: mkDerivation { pname = "pandoc-server"; - version = "0.1.0.2"; - sha256 = "0cd7dmg9hsm8j9jrh181331rwqlng1hkvpf8ksfh394j99dkjj0h"; + version = "0.1.0.3"; + sha256 = "0g7a5yb3cdh1jaj5z3mhcp1jka5fm138d6176jkg08jh74vdydga"; libraryHaskellDepends = [ aeson base base64 bytestring containers data-default doctemplates pandoc pandoc-types servant-server skylighting text @@ -221977,10 +222818,10 @@ self: { license = lib.licenses.bsd3; }) {}; - "pantry_0_9_1" = callPackage + "pantry_0_9_2" = callPackage ({ mkDerivation, aeson, aeson-warning-parser, ansi-terminal, base , bytestring, Cabal, casa-client, casa-types, companion, conduit - , conduit-extra, containers, cryptonite, cryptonite-conduit, digest + , conduit-extra, containers, crypton, crypton-conduit, digest , exceptions, filelock, generic-deriving, hackage-security , hedgehog, hpack, hspec, hspec-discover, http-client , http-client-tls, http-conduit, http-download, http-types, memory @@ -221992,14 +222833,14 @@ self: { }: mkDerivation { pname = "pantry"; - version = "0.9.1"; - sha256 = "05rn8ib4215rdsh5jzi9a0s920zp7i4vq47af4zvmaji17bn6nnp"; + version = "0.9.2"; + sha256 = "1bn323lpsrjygxp4g0vm4ni8cxrnj2zmhlhqw798b90zv1bz5711"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-warning-parser ansi-terminal base bytestring Cabal casa-client casa-types companion conduit conduit-extra containers - cryptonite cryptonite-conduit digest filelock generic-deriving + crypton crypton-conduit digest filelock generic-deriving hackage-security hpack http-client http-client-tls http-conduit http-download http-types memory mtl network-uri path path-io persistent persistent-sqlite persistent-template primitive @@ -222010,14 +222851,13 @@ self: { testHaskellDepends = [ aeson aeson-warning-parser ansi-terminal base bytestring Cabal casa-client casa-types companion conduit conduit-extra containers - cryptonite cryptonite-conduit digest exceptions filelock - generic-deriving hackage-security hedgehog hpack hspec http-client - http-client-tls http-conduit http-download http-types memory mtl - network-uri path path-io persistent persistent-sqlite - persistent-template primitive QuickCheck raw-strings-qq resourcet - rio rio-orphans rio-prettyprint static-bytes tar-conduit text - text-metrics time transformers unix-compat unliftio - unordered-containers vector yaml zip-archive + crypton crypton-conduit digest exceptions filelock generic-deriving + hackage-security hedgehog hpack hspec http-client http-client-tls + http-conduit http-download http-types memory mtl network-uri path + path-io persistent persistent-sqlite persistent-template primitive + QuickCheck raw-strings-qq resourcet rio rio-orphans rio-prettyprint + static-bytes tar-conduit text text-metrics time transformers + unix-compat unliftio unordered-containers vector yaml zip-archive ]; testToolDepends = [ hspec-discover ]; doHaddock = false; @@ -223411,6 +224251,8 @@ self: { pname = "parsers"; version = "0.12.11"; sha256 = "068k7fm0s13z0jkkffc149cqcxnzpk1m066lp4ccdfcb41km1zwi"; + revision = "1"; + editedCabalFile = "11slps7yccraacb67c862g2iv1sh7m09dnvbafhyw134krch0i5v"; libraryHaskellDepends = [ attoparsec base base-orphans binary charset containers mtl parsec scientific text transformers unordered-containers @@ -223499,29 +224341,22 @@ self: { }) {}; "parsley" = callPackage - ({ mkDerivation, array, attoparsec, base, bytestring, containers - , criterion, deepseq, happy, megaparsec, mtl, parsec, parsley-core - , parsley-garnish, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, text, th-test-utils + ({ mkDerivation, base, containers, cpphs, deepseq, parsley-core + , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text + , th-test-utils }: mkDerivation { pname = "parsley"; - version = "2.0.0.0"; - sha256 = "0h6msk2a11bq4bzl5gs3aq0sqd1z13smp2n8bxsr49vm51hmd1qh"; - revision = "1"; - editedCabalFile = "112643pvn60a0146d6804pafv5n1na2fn6awdivpdkxxngvy7xji"; + version = "2.0.0.1"; + sha256 = "0rczc2p0qpmzsy5rpaxq4xshkn4w32x2961xc3pjkvs6994ydsnz"; libraryHaskellDepends = [ base parsley-core template-haskell text ]; testHaskellDepends = [ - base deepseq parsley-core parsley-garnish tasty tasty-hunit + base containers deepseq parsley-core tasty tasty-hunit tasty-quickcheck template-haskell th-test-utils ]; - benchmarkHaskellDepends = [ - array attoparsec base bytestring containers criterion deepseq - megaparsec mtl parsec parsley-garnish template-haskell text - ]; - benchmarkToolDepends = [ happy ]; + testToolDepends = [ cpphs ]; description = "A fast parser combinator library backed by Typed Template Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -223530,16 +224365,17 @@ self: { "parsley-core" = callPackage ({ mkDerivation, array, base, bytestring, containers, cpphs , deepseq, dependent-map, dependent-sum, ghc-prim, hashable, mtl - , pretty-terminal, rangeset, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, text, th-test-utils, unordered-containers + , pretty-terminal, rangeset, syb, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, text, th-test-utils + , unordered-containers }: mkDerivation { pname = "parsley-core"; - version = "2.2.0.1"; - sha256 = "11wa1kkjpdiyg007llic926zpfc3bal9rl3i6hhmrh2w4pf13a7g"; + version = "2.3.0.0"; + sha256 = "15l90d6bq4il1qj9136mlwj07hncv185vmgj0mn6qjj16bqalp40"; libraryHaskellDepends = [ array base bytestring containers dependent-map dependent-sum - ghc-prim hashable mtl pretty-terminal rangeset template-haskell + ghc-prim hashable mtl pretty-terminal rangeset syb template-haskell text unordered-containers ]; libraryToolDepends = [ cpphs ]; @@ -223872,6 +224708,8 @@ self: { pname = "password"; version = "3.0.2.1"; sha256 = "03fnl95g99sy2agwmpwfmkdd308qwq95s582zkhn7bkg2smzqdg9"; + revision = "1"; + editedCabalFile = "0a4avz0g6nwr293718h63mpqkxhxsjmmfnyk2wfcfkb4pbm1q0y8"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base64 bytestring cryptonite memory password-types @@ -224034,8 +224872,8 @@ self: { }: mkDerivation { pname = "patat"; - version = "0.8.9.0"; - sha256 = "1lis3ifji30vxhgaw211z8g6v0sjag4fpsnh2x8zw20h2phiwdm0"; + version = "0.9.0.0"; + sha256 = "1g7i2mjrppnvz4c7v0w4a4c3s30b74s1adnssi1rmahm4qf1cqmn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -224047,7 +224885,8 @@ self: { ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base directory QuickCheck tasty tasty-hunit tasty-quickcheck text + base directory pandoc QuickCheck tasty tasty-hunit tasty-quickcheck + text ]; description = "Terminal-based presentations using Pandoc"; license = lib.licenses.gpl2Only; @@ -224092,26 +224931,24 @@ self: { }) {}; "patch-image" = callPackage - ({ mkDerivation, array, base, bool8, bytestring, carray, cassava - , comfort-array, containers, dsp, enumset, explicit-exception, fft - , filepath, JuicyPixels, knead, llvm-extra, llvm-tf, non-empty - , pqueue, prelude-compat, semigroups, shell-utility - , storable-complex, storable-record, tfp, unordered-containers - , utility-ht, vector + ({ mkDerivation, array, base, bool8, bytestring, cassava + , comfort-array, comfort-fftw, containers, dsp, enumset + , explicit-exception, filepath, JuicyPixels, knead, llvm-extra + , llvm-tf, netlib-ffi, non-empty, pqueue, prelude-compat + , semigroups, shell-utility, storable-complex, storable-record, tfp + , unordered-containers, utility-ht, vector }: mkDerivation { pname = "patch-image"; - version = "0.3.3.1"; - sha256 = "0nvp2y2f5cb29vzk2a9bvr3mgf17j70ir0nhb648pzfa0h1xj76k"; - revision = "1"; - editedCabalFile = "0l21xqwh95v5jdv46qbmaw6d4rfbmn1yx3zraq0srxawc1fgdfgx"; + version = "0.3.3.2"; + sha256 = "1kbd19vaizhbrpb4pa3py125kaw313yn3aq70yr7wygk1kk6v7ql"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - array base bool8 bytestring carray cassava comfort-array containers - dsp enumset explicit-exception fft filepath JuicyPixels knead - llvm-extra llvm-tf non-empty pqueue prelude-compat semigroups - shell-utility storable-complex storable-record tfp + array base bool8 bytestring cassava comfort-array comfort-fftw + containers dsp enumset explicit-exception filepath JuicyPixels + knead llvm-extra llvm-tf netlib-ffi non-empty pqueue prelude-compat + semigroups shell-utility storable-complex storable-record tfp unordered-containers utility-ht vector ]; description = "Compose a big image from overlapping parts"; @@ -224958,6 +225795,20 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) pcre;}; + "pcre-light_0_4_1_2" = callPackage + ({ mkDerivation, base, bytestring, containers, HUnit, mtl, pcre }: + mkDerivation { + pname = "pcre-light"; + version = "0.4.1.2"; + sha256 = "0fmdb1kv7fyjvcii788cg95zb2bzrg851h42x5pgdcgp3m3lm4p4"; + libraryHaskellDepends = [ base bytestring ]; + librarySystemDepends = [ pcre ]; + testHaskellDepends = [ base bytestring containers HUnit mtl ]; + description = "Portable regex library for Perl 5 compatible regular expressions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) pcre;}; + "pcre-light-extra" = callPackage ({ mkDerivation, base, bytestring, pcre-light }: mkDerivation { @@ -226263,26 +227114,26 @@ self: { }) {}; "persistent" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base64-bytestring - , blaze-html, bytestring, conduit, containers, criterion, deepseq - , fast-logger, file-embed, hspec, http-api-data, lift-type - , monad-logger, mtl, path-pieces, QuickCheck, quickcheck-instances - , resource-pool, resourcet, scientific, shakespeare, silently - , template-haskell, text, th-lift-instances, time, transformers - , unliftio, unliftio-core, unordered-containers, vault, vector + ({ mkDerivation, aeson, attoparsec, attoparsec-aeson, base + , base64-bytestring, blaze-html, bytestring, conduit, containers + , criterion, deepseq, fast-logger, file-embed, hspec, http-api-data + , lift-type, monad-logger, mtl, path-pieces, QuickCheck + , quickcheck-instances, resource-pool, resourcet, scientific + , shakespeare, silently, template-haskell, text, th-lift-instances + , time, transformers, unliftio, unliftio-core, unordered-containers + , vault, vector }: mkDerivation { pname = "persistent"; - version = "2.14.5.1"; - sha256 = "0sv4naw17rdg9mh1q2jba5qdjcx296z6nf409d1i3ihw8r31xq5w"; - revision = "1"; - editedCabalFile = "0in8mijqrrnzlr11640nwwgm836xw9v6lyw4iaqi3qf7zpdlf8zr"; - libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring blaze-html bytestring - conduit containers deepseq fast-logger http-api-data lift-type - monad-logger mtl path-pieces resource-pool resourcet scientific - silently template-haskell text th-lift-instances time transformers - unliftio unliftio-core unordered-containers vault vector + version = "2.14.5.2"; + sha256 = "13j9aawkdiy5wqx8q4xbnskjr35g0pgx1l0iv3ir0z60xfl717gz"; + libraryHaskellDepends = [ + aeson attoparsec attoparsec-aeson base base64-bytestring blaze-html + bytestring conduit containers deepseq fast-logger http-api-data + lift-type monad-logger mtl path-pieces resource-pool resourcet + scientific silently template-haskell text th-lift-instances time + transformers unliftio unliftio-core unordered-containers vault + vector ]; testHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html bytestring @@ -226710,8 +227561,8 @@ self: { }: mkDerivation { pname = "persistent-mysql-pure"; - version = "1.0.1"; - sha256 = "1kw51ijhwd5iv8kaz16yxrmfmdfakng3qdvd9yhj3dvjjz07d9g7"; + version = "1.0.2"; + sha256 = "0aaw7w52ba57r27mjmjkrwpv0949aiad5515ypckkqpi0i2cj4n5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -227591,8 +228442,8 @@ self: { ({ mkDerivation, base, criterion, transformers, vector }: mkDerivation { pname = "phantom-state"; - version = "0.2.1.2"; - sha256 = "049q1ii8rgwwjli16hxs9ak813x2lw5k8y8l7zjsks8hx2cfyy7r"; + version = "0.2.1.3"; + sha256 = "0wqjjghsxjhqj4z6snqcc0lkx84d84qnxlpkc5nignxywksbka8x"; libraryHaskellDepends = [ base transformers ]; benchmarkHaskellDepends = [ base criterion transformers vector ]; description = "Phantom State Transformer. Like State Monad, but without values."; @@ -227658,8 +228509,8 @@ self: { pname = "phatsort"; version = "0.6.0.0"; sha256 = "1cjmamla9383fk9715jxzlw87qnd26hpkcqhk4vvgld51nraf2pl"; - revision = "1"; - editedCabalFile = "0ivqjrahwjg6bl6k2nwb58avvyz7643js3zprabla1znlss36alv"; + revision = "2"; + editedCabalFile = "0k8yadhps2dgfc0ba016il0lv4idfb9phz492ah6z0k42i0grffa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -229148,8 +229999,8 @@ self: { pname = "ping"; version = "0.1.0.5"; sha256 = "11zcdrji1m1b9rhi10fv4pr2cs488c13qb5nggi7abhkavzvxbzb"; - revision = "1"; - editedCabalFile = "1pa4zdvn5579vl6084ai3zf236rac5hd2lb5jn6hyfyd7ma566i5"; + revision = "3"; + editedCabalFile = "1aig7pbc8gfz8kzf958qsj85gjsypljfabq6980l92bk99jna2hm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -232456,8 +233307,8 @@ self: { pname = "polyparse"; version = "1.13"; sha256 = "0yvhg718dlksiw3v27m2d8m1sn4r4f5s0p56zq3lynhy1sc74k0w"; - revision = "8"; - editedCabalFile = "0gb5cdf46rh5vbxssj6zc3l85fmyg5b44hzjrls1p8rl1l1p3pda"; + revision = "9"; + editedCabalFile = "0abzqic0askffn6nmh1f08d9rd9fykdlcdd9gj1c7p1ykp9zlq29"; libraryHaskellDepends = [ base bytestring text ]; description = "A variety of alternative parser combinator libraries"; license = "LGPL"; @@ -232471,8 +233322,8 @@ self: { }: mkDerivation { pname = "polysemy"; - version = "1.9.1.0"; - sha256 = "0jqxxnsmlhjvdfwplvw4m6y6a04glsgmrdhnrjfcvj4mvla48cvv"; + version = "1.9.1.1"; + sha256 = "0k6nq182lx5yca3c7i24byq1aik1f09ydy6g34nfd27lraa31w2b"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ async base containers first-class-families mtl stm syb @@ -232595,6 +233446,7 @@ self: { ]; description = "Polysemy effects for Chronos"; license = "BSD-2-Clause-Patent"; + hydraPlatforms = lib.platforms.none; }) {}; "polysemy-conc" = callPackage @@ -232618,6 +233470,7 @@ self: { ]; description = "Polysemy effects for concurrency"; license = "BSD-2-Clause-Patent"; + hydraPlatforms = lib.platforms.none; }) {}; "polysemy-db" = callPackage @@ -232831,6 +233684,7 @@ self: { ]; description = "Polysemy effects for logging"; license = "BSD-2-Clause-Patent"; + hydraPlatforms = lib.platforms.none; }) {}; "polysemy-log-co" = callPackage @@ -232873,6 +233727,7 @@ self: { ]; description = "Di adapters for Polysemy.Log"; license = "BSD-2-Clause-Patent"; + hydraPlatforms = lib.platforms.none; }) {}; "polysemy-managed" = callPackage @@ -233099,6 +233954,7 @@ self: { ]; description = "Polysemy error tracking"; license = "BSD-2-Clause-Patent"; + hydraPlatforms = lib.platforms.none; }) {}; "polysemy-scoped-fs" = callPackage @@ -233156,9 +234012,8 @@ self: { }: mkDerivation { pname = "polysemy-test"; - version = "0.7.0.0"; - sha256 = "0s6p163hydh20bwn4k3pjhgl27jbdd9kfgj8xs89kdi1pa65icyl"; - enableSeparateDataOutput = true; + version = "0.8.0.0"; + sha256 = "1i4nsl7vml8m2nca357bsp9yy92h74zl9k80jdv4kab5bk7l1avd"; libraryHaskellDepends = [ base hedgehog incipit-core path path-io polysemy tasty tasty-hedgehog transformers @@ -233166,8 +234021,10 @@ self: { testHaskellDepends = [ base hedgehog incipit-core path polysemy tasty ]; - description = "Polysemy Effects for Testing"; + description = "Polysemy effects for testing"; license = "BSD-2-Clause-Patent"; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "polysemy-time" = callPackage @@ -233186,6 +234043,7 @@ self: { ]; description = "Polysemy effects for time"; license = "BSD-2-Clause-Patent"; + hydraPlatforms = lib.platforms.none; }) {}; "polysemy-uncontrolled" = callPackage @@ -233534,14 +234392,64 @@ self: { license = lib.licenses.bsd3; }) {}; + "pontarius-xmpp_0_5_6_8" = callPackage + ({ mkDerivation, async, attoparsec, base, base64-bytestring, binary + , bytestring, Cabal, conduit, containers, criterion, crypto-api + , cryptohash, cryptohash-cryptoapi, crypton-x509-system + , data-default, dns, exceptions, generic-arbitrary, hslogger, hspec + , hspec-expectations, iproute, lens, lens-family, lifted-base, mtl + , network, profunctors, pureMD5, QuickCheck, quickcheck-instances + , random, ranges, resourcet, smallcheck, split, stm, stringprep + , tasty, tasty-hspec, tasty-hunit, tasty-quickcheck, tasty-th + , template-haskell, text, tls, transformers, unbounded-delays, void + , xml-conduit, xml-picklers, xml-types + }: + mkDerivation { + pname = "pontarius-xmpp"; + version = "0.5.6.8"; + sha256 = "1mylrcnpcwrj9zgfy6plydqyvl34s6xwzsrj6sf7xgxy1zqg0px7"; + libraryHaskellDepends = [ + attoparsec base base64-bytestring binary bytestring conduit + containers crypto-api cryptohash cryptohash-cryptoapi + crypton-x509-system data-default dns exceptions hslogger iproute + lens lens-family lifted-base mtl network profunctors pureMD5 random + resourcet split stm stringprep template-haskell text tls + transformers unbounded-delays void xml-conduit xml-picklers + xml-types + ]; + testHaskellDepends = [ + async attoparsec base base64-bytestring binary bytestring Cabal + conduit containers crypto-api cryptohash cryptohash-cryptoapi + crypton-x509-system data-default dns exceptions generic-arbitrary + hslogger hspec hspec-expectations iproute lens lens-family + lifted-base mtl network profunctors pureMD5 QuickCheck + quickcheck-instances random ranges resourcet smallcheck split stm + stringprep tasty tasty-hspec tasty-hunit tasty-quickcheck tasty-th + template-haskell text tls transformers unbounded-delays void + xml-conduit xml-picklers xml-types + ]; + benchmarkHaskellDepends = [ + attoparsec base base64-bytestring binary bytestring conduit + containers criterion crypto-api cryptohash cryptohash-cryptoapi + crypton-x509-system data-default dns exceptions hslogger iproute + lens lens-family lifted-base mtl network profunctors pureMD5 random + resourcet split stm stringprep template-haskell text tls + transformers unbounded-delays void xml-conduit xml-picklers + xml-types + ]; + description = "An XMPP client library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "pontarius-xmpp-extras" = callPackage ({ mkDerivation, base, data-default, pontarius-xmpp, text, time , xml-types }: mkDerivation { pname = "pontarius-xmpp-extras"; - version = "0.1.0.8"; - sha256 = "0ybbzbyv7zmzrz1bnx61aax1s4ckv55pmyf2rmba8gf4gf5kqj79"; + version = "0.1.0.9"; + sha256 = "1pbwbhymdfqcpmpgcx1473fqaygr9mchlpqhr4i7hqbvhndwvqnl"; libraryHaskellDepends = [ base data-default pontarius-xmpp text time xml-types ]; @@ -234174,8 +235082,8 @@ self: { }: mkDerivation { pname = "posit"; - version = "2022.0.1.4"; - sha256 = "0sqs9ya0jvviwcd7ggclz09amzgkdkvakkr2pszmd6zh96q07nnw"; + version = "2022.1.0.0"; + sha256 = "19ahwh40n2kl3dm4pj7290x6xs37whfafr0lydvccg9vdydavywj"; libraryHaskellDepends = [ base data-dword deepseq random scientific ]; @@ -234243,11 +235151,11 @@ self: { }: mkDerivation { pname = "posix-api"; - version = "0.6.1.0"; - sha256 = "0dplxy3zv9n239c8w7ja95qv2f343sz4n83ji42f0f8v00ryghys"; + version = "0.7.0.0"; + sha256 = "1wza7flfy2v5c44a0w1mr486ljba6n6wp2gn79zhknq8m0hd3q50"; libraryHaskellDepends = [ base byte-order byteslice primitive primitive-addr primitive-offset - primitive-unlifted run-st text-short + run-st text-short ]; testHaskellDepends = [ base primitive primitive-unlifted tasty tasty-hunit @@ -234385,8 +235293,8 @@ self: { }: mkDerivation { pname = "posplyu"; - version = "0.1.0.2"; - sha256 = "091cwg07wzhqcrbm285n6yzgp0sa19a0q0y2f5q52zdq815wc96x"; + version = "0.1.0.3"; + sha256 = "1b02i7c6kjmkd8naazfdr7fjy19rd0p2hyrhjgf3q60h09ipi15g"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -235897,7 +236805,6 @@ self: { ]; description = "A Amazon SQS backend for powerqueue"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "ppm" = callPackage @@ -237038,16 +237945,16 @@ self: { "prettychart" = callPackage ({ mkDerivation, async, base, box, bytestring, chart-svg - , containers, flatparse, formatn, lucid, mealy, numhask-space - , optics-core, profunctors, text, time, web-rep + , containers, markup-parse, numhask-space, optics-core, text, time + , web-rep }: mkDerivation { pname = "prettychart"; - version = "0.1.1.0"; - sha256 = "1cdxdin7k4rswph61h625lkf57669xiid67c09a7libqdq6yya98"; + version = "0.1.2.0"; + sha256 = "117ak0mjyfgs5g3qr9prrg5wkbv5i9k9f218gs27czhb10xxhahs"; libraryHaskellDepends = [ - async base box bytestring chart-svg containers flatparse formatn - lucid mealy numhask-space optics-core profunctors text time web-rep + async base box bytestring chart-svg containers markup-parse + numhask-space optics-core text time web-rep ]; description = "Pretty print charts from ghci"; license = lib.licenses.bsd3; @@ -237415,8 +238322,10 @@ self: { }: mkDerivation { pname = "primecount"; - version = "0.1.0.0"; - sha256 = "16ls5fb8z0mpnggs9c1sjksgzpj558gdp9fk3wrv55z41pch53r0"; + version = "0.1.0.1"; + sha256 = "113cyvmm5yg4ybmxdp6m2adlmfdsk3mja3nzkgr6hdywyy94jczs"; + revision = "1"; + editedCabalFile = "0sb7pfc68f3cbx4086k3zld8mnp8b9lmr7mnfy4yb75ynp0p6qm9"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ primecount ]; testHaskellDepends = [ base silently tasty tasty-hunit ]; @@ -237476,6 +238385,8 @@ self: { pname = "primitive"; version = "0.8.0.0"; sha256 = "0pwr5g3bra5m2zjm14pj98klqj2qrjcfasgd3rcrp7vq98dw4lsm"; + revision = "1"; + editedCabalFile = "0w1nf0rabgyk5q7ccw7va1mj6k50lswvikhi6vr2myb1dvx4bzyh"; libraryHaskellDepends = [ base deepseq template-haskell transformers ]; @@ -240600,76 +241511,72 @@ self: { "ptera" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, containers, doctest - , enummapset-th, hspec, hspec-discover, membership, ptera-core + , enummapset, hspec, hspec-discover, membership, ptera-core , QuickCheck, unordered-containers }: mkDerivation { pname = "ptera"; - version = "0.3.0.0"; - sha256 = "1zbs7h8lvq9m8qw4267kpp3lr5q2yd3v4jsw4ghrgpa6xwhji7z4"; + version = "0.4.0.0"; + sha256 = "1jf77wr3dfahlsz77iavb519zzvzg208bbyzlzwirwahz3czpc6p"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - base containers enummapset-th membership ptera-core + base containers enummapset membership ptera-core unordered-containers ]; testHaskellDepends = [ - base containers doctest enummapset-th hspec membership ptera-core + base containers doctest enummapset hspec membership ptera-core QuickCheck unordered-containers ]; testToolDepends = [ hspec-discover ]; description = "A parser generator"; license = "(Apache-2.0 OR MPL-2.0)"; - hydraPlatforms = lib.platforms.none; }) {}; "ptera-core" = callPackage ({ mkDerivation, array, base, Cabal, cabal-doctest, containers - , doctest, enummapset-th, hashable, hspec, hspec-discover - , membership, QuickCheck, transformers, unordered-containers + , doctest, enummapset, hashable, hspec, hspec-discover, membership + , QuickCheck, transformers, unordered-containers }: mkDerivation { pname = "ptera-core"; - version = "0.1.0.0"; - sha256 = "1bpgnd68c070i1azig6r0ck843hvxjcg17yhmy3nizm1bx4nppk1"; + version = "0.2.0.0"; + sha256 = "1sp0xwmfg0nspwhzp9li3hw0yszdzhy6rzzahvs91hhvbjc3ia55"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - array base containers enummapset-th hashable membership - transformers unordered-containers + array base containers enummapset hashable membership transformers + unordered-containers ]; testHaskellDepends = [ - array base containers doctest enummapset-th hashable hspec - membership QuickCheck transformers unordered-containers + array base containers doctest enummapset hashable hspec membership + QuickCheck transformers unordered-containers ]; testToolDepends = [ hspec-discover ]; description = "A parser generator"; license = "(Apache-2.0 OR MPL-2.0)"; - hydraPlatforms = lib.platforms.none; }) {}; "ptera-th" = callPackage ({ mkDerivation, array, base, Cabal, cabal-doctest, containers - , doctest, enummapset-th, ghc-prim, hspec, hspec-discover - , membership, ptera, ptera-core, QuickCheck, template-haskell + , doctest, enummapset, ghc-prim, hspec, hspec-discover, membership + , ptera, ptera-core, QuickCheck, template-haskell , unordered-containers }: mkDerivation { pname = "ptera-th"; - version = "0.6.1.0"; - sha256 = "19hw98iz0crdyl3yiv3v39mn7j8nz0vx7vfyw6qky62rp8njrnc9"; + version = "0.7.0.0"; + sha256 = "1w9i0gzrbphg2jvrkvlxhzkdgz64c01hms8rw0g5nbd6xhk01lby"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - array base containers enummapset-th ghc-prim membership ptera + array base containers enummapset ghc-prim membership ptera ptera-core template-haskell unordered-containers ]; testHaskellDepends = [ - array base containers doctest enummapset-th ghc-prim hspec - membership ptera ptera-core QuickCheck template-haskell - unordered-containers + array base containers doctest enummapset ghc-prim hspec membership + ptera ptera-core QuickCheck template-haskell unordered-containers ]; testToolDepends = [ hspec-discover ]; description = "A parser generator"; license = "(Apache-2.0 OR MPL-2.0)"; - hydraPlatforms = lib.platforms.none; }) {}; "pthread" = callPackage @@ -241742,8 +242649,8 @@ self: { }: mkDerivation { pname = "pusher-http-haskell"; - version = "2.1.0.15"; - sha256 = "1h88xbx9wvbay5pg82329amsrbkgmm8whf96jknzjk3gd6h952fg"; + version = "2.1.0.16"; + sha256 = "10220z3mg2dqvywsqg8jbgpq5yzwlnv0gc8yv1xwibf8ilwd5km6"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cryptonite hashable http-client http-client-tls http-types memory text time @@ -242735,6 +243642,8 @@ self: { pname = "quantification"; version = "0.7.0"; sha256 = "1aj0pxafcjzgc6akxyh7bbin1jfp66y24afgg546gqqyc2hj45xc"; + revision = "1"; + editedCabalFile = "1sfccf4hgsqkh0wpy1cwkx3lq2grsnr1zbv73k9gj4m66mkijkhh"; libraryHaskellDepends = [ aeson base binary containers hashable path-pieces text unordered-containers vector @@ -243100,8 +244009,8 @@ self: { }: mkDerivation { pname = "quic"; - version = "0.1.3"; - sha256 = "0n6l559q5y31jwr8bba3jav7ghsg76y3w0rbi7lz9jsrh0i4l7bh"; + version = "0.1.5"; + sha256 = "1zpic6v03432hld44jldxh0j1fmb226qkgmjrydyybaxihkkkvj4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -243295,12 +244204,17 @@ self: { }) {}; "quickcheck-dynamic" = callPackage - ({ mkDerivation, base, containers, mtl, QuickCheck, random }: + ({ mkDerivation, base, containers, mtl, QuickCheck, random, stm + , tasty, tasty-quickcheck + }: mkDerivation { pname = "quickcheck-dynamic"; - version = "3.1.1"; - sha256 = "0vpf98a2zqqrn96cdwfbgjlf61grn6rb5aylm7ywjwcqmi3bwzkn"; + version = "3.3.1"; + sha256 = "1xh1s80aynhyfkdcg5w4fy5fibhkh19zlidr2zwsiignxbqv0dgl"; libraryHaskellDepends = [ base containers mtl QuickCheck random ]; + testHaskellDepends = [ + base containers mtl QuickCheck stm tasty tasty-quickcheck + ]; description = "A library for stateful property-based testing"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; @@ -246248,6 +247162,19 @@ self: { license = lib.licenses.asl20; }) {}; + "rawfilepath_1_1_0" = callPackage + ({ mkDerivation, base, bytestring, unix }: + mkDerivation { + pname = "rawfilepath"; + version = "1.1.0"; + sha256 = "08jaqppvfqgpbv3h89rk63a6h8pby6hgvyskkfsjhnb66ai93lrp"; + libraryHaskellDepends = [ base bytestring unix ]; + testHaskellDepends = [ base bytestring ]; + description = "Use RawFilePath instead of FilePath"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "rawr" = callPackage ({ mkDerivation, base, criterion, deepseq, doctest, ghc-datasize , ghc-prim, lens, tasty, tasty-hunit, template-haskell @@ -246564,6 +247491,22 @@ self: { license = lib.licenses.mit; }) {inherit (pkgs) re2;}; + "react" = callPackage + ({ mkDerivation, base, containers, jsaddle, jsaddle-warp, mtl + , template-haskell, text + }: + mkDerivation { + pname = "react"; + version = "0.1.0.0"; + sha256 = "1kddqb8s7nx4v40b89wzdjyf72z5niy23xjvwa94glq30v9xqpcp"; + libraryHaskellDepends = [ + base containers jsaddle jsaddle-warp mtl template-haskell text + ]; + description = "Create React components in Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "react-flux" = callPackage ({ mkDerivation, aeson, base, bytestring, deepseq, mtl , template-haskell, text, time, unordered-containers @@ -247474,8 +248417,8 @@ self: { }: mkDerivation { pname = "rec-def"; - version = "0.2.1"; - sha256 = "13d8bij2r6zxyygi2rk3jdrk6s7srj8lpsx1k9qn14sq401yjqpa"; + version = "0.2.2"; + sha256 = "0hrca7v3visyppzzszilydhmrpkwc7hmhm0ld8ha2dd9ijvgrd22"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base concurrency containers dejafu doctest QuickCheck random tasty @@ -247976,6 +248919,8 @@ self: { pname = "redact"; version = "0.5.0.0"; sha256 = "0f9nfkli9spbcidfwq81z4ryjnlyqf4snj1dmhsngpcp0x2am798"; + revision = "1"; + editedCabalFile = "1sc16ap5mlfhwp903h8jb0xcjrlkmqrn6qzmdykalipy05knfdnf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-terminal base text ]; @@ -248066,8 +249011,8 @@ self: { }: mkDerivation { pname = "redis-glob"; - version = "0.1.0.5"; - sha256 = "1qj95mwywlhpb6g284gnxwv1fy367ck3kd5vk2mkwpg1wrkkrqkd"; + version = "0.1.0.6"; + sha256 = "1kz4klvp84my3z6zpsrvn8kwna1dhix51v40zjf1cxvg81mvya5k"; libraryHaskellDepends = [ ascii-char base bytestring megaparsec ]; testHaskellDepends = [ ascii-char ascii-superset base bytestring hspec QuickCheck @@ -248257,8 +249202,8 @@ self: { pname = "reducers"; version = "3.12.4"; sha256 = "0hsycdir52jdijnnvc77jj971fjrrc722v952wr62ivrvx2zarn0"; - revision = "4"; - editedCabalFile = "13wxljk7mn8bna1xv2965lnbizjh6c7cz813jk8r62msskn4xkbj"; + revision = "5"; + editedCabalFile = "18b7vr5gzj2739wlxdb0qyzl2sd5y67mmwvkm27vlzvzbff61lxn"; libraryHaskellDepends = [ array base bytestring containers fingertree hashable semigroupoids text transformers unordered-containers @@ -248739,7 +249684,27 @@ self: { ]; description = "Functional Reactive Web Apps with Reflex"; license = lib.licenses.bsd3; - badPlatforms = [ "aarch64-linux" ] ++ lib.platforms.darwin; + badPlatforms = lib.platforms.darwin; + maintainers = [ lib.maintainers.maralorn ]; + }) {}; + + "reflex-dom_0_6_3_1" = callPackage + ({ mkDerivation, base, bytestring, jsaddle-webkit2gtk, reflex + , reflex-dom-core, text + }: + mkDerivation { + pname = "reflex-dom"; + version = "0.6.3.1"; + sha256 = "162nnk5vk115p06mlf0d3bsr295814jk6d61hi58k97axgrlb6sn"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring jsaddle-webkit2gtk reflex reflex-dom-core text + ]; + description = "Functional Reactive Web Apps with Reflex"; + license = lib.licenses.bsd3; + badPlatforms = lib.platforms.darwin; + hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.maralorn ]; }) {}; @@ -249908,8 +250873,8 @@ self: { pname = "regex-pcre-builtin"; version = "0.95.2.3.8.44"; sha256 = "0pn55ssrwr05c9sa9jvp0knvzjksz04wn3pmzf5dz4xgbyjadkna"; - revision = "4"; - editedCabalFile = "1gzczx15v4yjxm2b787qjgc64n284d2jx33vn484j6cndjfjx58r"; + revision = "5"; + editedCabalFile = "0lsciwi4akvk6s6h69ga359lj7cnn6p2i6dmqsy5nvar8m22i0cn"; libraryHaskellDepends = [ array base bytestring containers regex-base text ]; @@ -250025,6 +250990,8 @@ self: { pname = "regex-tdfa"; version = "1.3.2.2"; sha256 = "1dvmplkhma32y68v4vvpbwmjbg3hzd7qhsyq6pim1fs68b2xaglk"; + revision = "1"; + editedCabalFile = "03jwla88hxzf7mpp1pimjcfwfbm0icr3wbp4cjibl10853v65x6d"; libraryHaskellDepends = [ array base bytestring containers mtl parsec regex-base text ]; @@ -252440,8 +253407,8 @@ self: { pname = "resolv"; version = "0.2.0.2"; sha256 = "0jz798kliih4lb16s9bjk7sa9034x1qhyrr8z9sp6ahkz4yjh3c8"; - revision = "1"; - editedCabalFile = "0ijx9vlchgq7prbsk49hbr25aar3vc1m8xcgfbs95nvq6i3llax4"; + revision = "2"; + editedCabalFile = "1pcprxb456s7l654l7rh2mx7ahxn0fjj8hqq1rjl08b29f50am8k"; libraryHaskellDepends = [ base base16-bytestring binary bytestring containers ]; @@ -254417,8 +255384,8 @@ self: { }: mkDerivation { pname = "rio-prettyprint"; - version = "0.1.4.0"; - sha256 = "0dagrbs9ssqh5mcr9fcaiqhc8vyr3aqxwxxpcd4j0bqvfcjhkbkz"; + version = "0.1.5.0"; + sha256 = "03aihavij5i0r1h5wvc9q1bdqzpc4kd7cz8rklvhwgblr8fzxnxw"; libraryHaskellDepends = [ aeson annotated-wl-pprint ansi-terminal array base Cabal colour mtl path rio text @@ -255093,6 +256060,27 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) rocksdb;}; + "rocksdb-haskell-jprupp_2_1_6" = callPackage + ({ mkDerivation, base, bytestring, data-default, directory, hspec + , QuickCheck, resourcet, rocksdb, unliftio + }: + mkDerivation { + pname = "rocksdb-haskell-jprupp"; + version = "2.1.6"; + sha256 = "0hr7wzhhbbhcvghjbc80c1kba62xkja5ghar7sd0grckzan7maq7"; + libraryHaskellDepends = [ + base bytestring data-default directory resourcet unliftio + ]; + librarySystemDepends = [ rocksdb ]; + testHaskellDepends = [ + base bytestring data-default directory hspec QuickCheck resourcet + unliftio + ]; + description = "Haskell bindings for RocksDB"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) rocksdb;}; + "rocksdb-query" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, data-default , hspec, resourcet, rocksdb-haskell-jprupp, unliftio @@ -256972,20 +257960,23 @@ self: { }) {}; "rzk" = callPackage - ({ mkDerivation, aeson, array, base, bifunctors, bytestring - , doctest, Glob, mtl, optparse-generic, QuickCheck + ({ mkDerivation, aeson, alex, array, base, bifunctors, bytestring + , doctest, Glob, happy, mtl, optparse-generic, QuickCheck , template-haskell, text }: mkDerivation { pname = "rzk"; - version = "0.5.3"; - sha256 = "1k9y8w00cw84k67lp425q3akci5qkvhm7lmr3jspsmhihfyif6lq"; + version = "0.5.4"; + sha256 = "1zyvhlncvibk50cm80wa9y6yrwk3wj50y80xhp7fjz5h88wvv04x"; + revision = "1"; + editedCabalFile = "193n0ix496s5jqha633n5siawmawskch5wil2jlls4kx97krw109"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson array base bifunctors bytestring mtl optparse-generic template-haskell text ]; + libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ aeson array base bifunctors bytestring mtl optparse-generic template-haskell text @@ -257358,8 +258349,8 @@ self: { pname = "safe-json"; version = "1.1.4.0"; sha256 = "01dr0fyqyjbg9cw9g1wgh8bl7y1gfjbzl6qza6lf2s4iisacb06p"; - revision = "2"; - editedCabalFile = "0aq81lqcg2ic6ncxw1rivyspxhcima3vss1ilh8iapbd05lyjbvs"; + revision = "3"; + editedCabalFile = "1d49dp1f00b865x8jfi1ynjp32yagjssf1ws9x3ci7qa8hsy1kxl"; libraryHaskellDepends = [ aeson base bytestring containers dlist hashable scientific tasty tasty-hunit tasty-quickcheck text time unordered-containers @@ -257374,6 +258365,31 @@ self: { license = lib.licenses.mit; }) {}; + "safe-json_1_2_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, dlist + , hashable, quickcheck-instances, scientific, tasty, tasty-hunit + , tasty-quickcheck, temporary, text, time, unordered-containers + , uuid, uuid-types, vector + }: + mkDerivation { + pname = "safe-json"; + version = "1.2.0.0"; + sha256 = "0534kxg66ha106y9xp4jbv4lyd8cjgj7qbfcbqiahdi2sd9cyfhg"; + libraryHaskellDepends = [ + aeson base bytestring containers dlist hashable scientific tasty + tasty-hunit tasty-quickcheck text time unordered-containers + uuid-types vector + ]; + testHaskellDepends = [ + aeson base bytestring containers dlist hashable + quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck + temporary text time unordered-containers uuid uuid-types vector + ]; + description = "Automatic JSON format versioning"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "safe-lazy-io" = callPackage ({ mkDerivation, base, extensible-exceptions, parallel, strict-io }: @@ -257607,8 +258623,8 @@ self: { pname = "safecopy"; version = "0.10.4.2"; sha256 = "0r2mf0p82gf8vnldx477b5ykrj1x7hyg13nqfn6gzb50japs6h3i"; - revision = "6"; - editedCabalFile = "0ii5cdg4l4ww81p7gd5m3z2jdqrs2hvqhwzrlz267nzxbws00x0b"; + revision = "7"; + editedCabalFile = "1haylxnkj7if9q2kmhp5cvb7xi68fk00q0nqjvfc0giih9mjr1ck"; libraryHaskellDepends = [ array base bytestring cereal containers generic-data old-time template-haskell text time transformers vector @@ -257687,21 +258703,20 @@ self: { "safeio" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-combinators - , directory, exceptions, filepath, HUnit, resourcet, test-framework - , test-framework-hunit, test-framework-th, unix + , directory, exceptions, filepath, HUnit, resourcet, tasty + , tasty-hunit, tasty-th, unix }: mkDerivation { pname = "safeio"; - version = "0.0.5.0"; - sha256 = "04g3070cbjdqj0h9l9ii6470xcbn40xfv4fr89a8yvnkdim9nyfm"; + version = "0.0.6.0"; + sha256 = "0dbkk6ia7acil45b2dbvlnfdssyy1azlj0c8gg7pyp3x5fm67v13"; libraryHaskellDepends = [ base bytestring conduit conduit-combinators directory exceptions filepath resourcet unix ]; testHaskellDepends = [ base bytestring conduit conduit-combinators directory exceptions - filepath HUnit resourcet test-framework test-framework-hunit - test-framework-th unix + filepath HUnit resourcet tasty tasty-hunit tasty-th unix ]; description = "Write output to disk atomically"; license = lib.licenses.mit; @@ -258333,6 +259348,50 @@ self: { license = lib.licenses.bsd3; }) {}; + "sandwich_0_1_5_1" = callPackage + ({ mkDerivation, aeson, ansi-terminal, async, base, brick + , bytestring, colour, containers, deepseq, directory, exceptions + , filepath, free, haskell-src-exts, lifted-async, microlens + , microlens-th, monad-control, monad-logger, mtl + , optparse-applicative, pretty-show, process, safe, safe-exceptions + , stm, string-interpolate, template-haskell, text, time + , transformers, transformers-base, unix, unliftio-core, vector, vty + }: + mkDerivation { + pname = "sandwich"; + version = "0.1.5.1"; + sha256 = "1a4frv835zvflycbnbasj6pygzbnnvpsxl3ahp247zxap7v9gkch"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal async base brick bytestring colour containers + deepseq directory exceptions filepath free haskell-src-exts + lifted-async microlens microlens-th monad-control monad-logger mtl + optparse-applicative pretty-show process safe safe-exceptions stm + string-interpolate template-haskell text time transformers + transformers-base unix unliftio-core vector vty + ]; + executableHaskellDepends = [ + aeson ansi-terminal async base brick bytestring colour containers + deepseq directory exceptions filepath free haskell-src-exts + lifted-async microlens microlens-th monad-control monad-logger mtl + optparse-applicative pretty-show process safe safe-exceptions stm + string-interpolate template-haskell text time transformers + transformers-base unix unliftio-core vector vty + ]; + testHaskellDepends = [ + aeson ansi-terminal async base brick bytestring colour containers + deepseq directory exceptions filepath free haskell-src-exts + lifted-async microlens microlens-th monad-control monad-logger mtl + optparse-applicative pretty-show process safe safe-exceptions stm + string-interpolate template-haskell text time transformers + transformers-base unix unliftio-core vector vty + ]; + description = "Yet another test framework for Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "sandwich-hedgehog" = callPackage ({ mkDerivation, base, free, hedgehog, monad-control, mtl , safe-exceptions, sandwich, string-interpolate, text, time, vty @@ -258449,6 +259508,51 @@ self: { mainProgram = "sandwich-webdriver-exe"; }) {}; + "sandwich-webdriver_0_2_3_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, data-default + , directory, exceptions, filepath, http-client, http-client-tls + , http-conduit, lifted-base, microlens, microlens-aeson + , monad-control, monad-logger, mtl, network, process, random + , regex-compat, retry, safe, safe-exceptions, sandwich + , string-interpolate, temporary, text, time, transformers, unix + , unliftio, unordered-containers, vector, webdriver + }: + mkDerivation { + pname = "sandwich-webdriver"; + version = "0.2.3.1"; + sha256 = "15zpdv8mmzmgrr07m8as4alwxx2xw54vj8y39f5f3z58wg1q767c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers data-default directory exceptions + filepath http-client http-client-tls http-conduit lifted-base + microlens microlens-aeson monad-control monad-logger mtl network + process random regex-compat retry safe safe-exceptions sandwich + string-interpolate temporary text time transformers unix + unordered-containers vector webdriver + ]; + executableHaskellDepends = [ + aeson base bytestring containers data-default directory exceptions + filepath http-client http-client-tls http-conduit lifted-base + microlens microlens-aeson monad-control monad-logger mtl network + process random regex-compat retry safe safe-exceptions sandwich + string-interpolate temporary text time transformers unix + unordered-containers vector webdriver + ]; + testHaskellDepends = [ + aeson base bytestring containers data-default directory exceptions + filepath http-client http-client-tls http-conduit lifted-base + microlens microlens-aeson monad-control monad-logger mtl network + process random regex-compat retry safe safe-exceptions sandwich + string-interpolate temporary text time transformers unix unliftio + unordered-containers vector webdriver + ]; + description = "Sandwich integration with Selenium WebDriver"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "sandwich-webdriver-exe"; + }) {}; + "sarasvati" = callPackage ({ mkDerivation, base, deepseq, portaudio }: mkDerivation { @@ -258855,7 +259959,7 @@ self: { license = lib.licenses.mit; }) {}; - "sbp_5_0_0" = callPackage + "sbp_5_0_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base , base64-bytestring, basic-prelude, binary, binary-conduit , bytestring, cmdargs, conduit, conduit-extra, data-binary-ieee754 @@ -258864,8 +259968,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "5.0.0"; - sha256 = "13wdxgiby4axb02x2n32hlija2k5aw6z2fcn1g5795bz1gyv81k2"; + version = "5.0.1"; + sha256 = "0nld66iq1jdi5zj9zzixvs2mmdkw3drq5pgmwhnw4rfhwdz0vkc4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -265115,6 +266219,35 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "servant-prometheus" = callPackage + ({ mkDerivation, aeson, base, clock, containers, ghc-prim, hashable + , hspec, hspec-discover, hspec-expectations-pretty-diff + , http-client, http-types, process, prometheus-client, servant + , servant-client, servant-server, text, wai, warp + }: + mkDerivation { + pname = "servant-prometheus"; + version = "1.0.0"; + sha256 = "1m4kb6k4idlr9j1p72w041inhx9c3srxxxrnfj8fpywji6adxili"; + libraryHaskellDepends = [ + base clock ghc-prim hashable http-types prometheus-client servant + text wai + ]; + testHaskellDepends = [ + aeson base containers hspec hspec-expectations-pretty-diff + http-client prometheus-client servant servant-client servant-server + text wai warp + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base process servant-server text wai warp + ]; + description = "Helpers for using prometheus with servant"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "servant-proto-lens" = callPackage ({ mkDerivation, async, base, bytestring, data-default-class , http-client, http-media, HUnit, lens, proto-lens @@ -266950,8 +268083,8 @@ self: { pname = "setlocale"; version = "1.0.0.10"; sha256 = "19rv89jkhq5ic7j5rzpygnmsbzim2mn8ip0m292za613q88gywir"; - revision = "3"; - editedCabalFile = "1ich9zjmwc73ilblmbakl627mqpncyd79vnpkflms65qylqj6dvk"; + revision = "4"; + editedCabalFile = "0lpr3lrn28ig0q2cd5xgggzgf917xdpx1zq2q523r0qin6vbb44n"; libraryHaskellDepends = [ base ]; description = "Haskell bindings to setlocale"; license = lib.licenses.bsd3; @@ -267743,6 +268876,7 @@ self: { ]; description = "Dependency tracking for Futhark"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "shake-google-closure-compiler" = callPackage @@ -268008,6 +269142,33 @@ self: { maintainers = [ lib.maintainers.psibi ]; }) {}; + "shakespeare_2_1_0_1" = callPackage + ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring + , containers, directory, exceptions, file-embed, ghc-prim, hspec + , HUnit, parsec, process, scientific, template-haskell, text + , th-lift, time, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "shakespeare"; + version = "2.1.0.1"; + sha256 = "0byj0zhxi1pr8l5f18phzkwcf7z38lyk2zznz8hbkqadfgrmbdkc"; + libraryHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring containers directory + exceptions file-embed ghc-prim parsec process scientific + template-haskell text th-lift time transformers + unordered-containers vector + ]; + testHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring containers directory + exceptions ghc-prim hspec HUnit parsec process template-haskell + text time transformers + ]; + description = "A toolkit for making compile-time interpolated templates"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.psibi ]; + }) {}; + "shakespeare-babel" = callPackage ({ mkDerivation, base, classy-prelude, data-default, directory , process, shakespeare, template-haskell @@ -268447,8 +269608,8 @@ self: { }: mkDerivation { pname = "shellify"; - version = "0.10.0.3"; - sha256 = "0kgyhyvjsryda03b93nvi07q47mcyqz8rfy0awgr8nbi0gv0d8jd"; + version = "0.11.0.0"; + sha256 = "0wb8v86x26mi6phz5vkklv1fm0v6j99qqc8zlhapha67jxs1v8x2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -268459,7 +269620,7 @@ self: { testHaskellDepends = [ base hspec hspec-core raw-strings-qq text ]; description = "A tool for generating shell.nix files"; license = lib.licenses.asl20; - mainProgram = "shellify"; + mainProgram = "nix-shellify"; maintainers = [ lib.maintainers.danielrolls ]; }) {}; @@ -268558,10 +269719,8 @@ self: { }: mkDerivation { pname = "shelltestrunner"; - version = "1.9"; - sha256 = "1a5kzqbwg6990249ypw0cx6cqj6663as1kbj8nzblcky8j6kbi6b"; - revision = "1"; - editedCabalFile = "148yc2b81dm2lwwrrqhxfdh6ww5k2hgvj4vpq67w0ax09l3rphn5"; + version = "1.9.0.1"; + sha256 = "1a2sn69hmmyw6v2cvaf3pdv160qwing2cgrsfrxbfsqcc85g7mqj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -268574,6 +269733,29 @@ self: { mainProgram = "shelltest"; }) {}; + "shelltestrunner_1_10" = callPackage + ({ mkDerivation, base, cmdargs, Diff, directory, filemanip + , filepath, hspec, hspec-contrib, hspec-core, HUnit, parsec + , pretty-show, process, regex-tdfa, safe, test-framework + , test-framework-hunit, utf8-string + }: + mkDerivation { + pname = "shelltestrunner"; + version = "1.10"; + sha256 = "1c6bjyxqa4mgnh3w4pqp6sbr5cf160n7jf9i1b4b9sdxzdjk7g87"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base cmdargs Diff directory filemanip filepath hspec hspec-contrib + hspec-core HUnit parsec pretty-show process regex-tdfa safe + test-framework test-framework-hunit utf8-string + ]; + description = "Easy, repeatable testing of CLI programs/commands"; + license = "GPL"; + hydraPlatforms = lib.platforms.none; + mainProgram = "shelltest"; + }) {}; + "shellwords" = callPackage ({ mkDerivation, base, hspec, megaparsec, text }: mkDerivation { @@ -271060,8 +272242,10 @@ self: { }: mkDerivation { pname = "single-tuple"; - version = "0.1.2.0"; - sha256 = "1dxrdddfdvs69icv6ixjv5crfznllxvg8sjiw9xwyn26f36g2mw8"; + version = "0.1.3.0"; + sha256 = "1axr5bv92pc9261mpcjq8wn0871i4n18hn9qpk8gpqj6zvh9gjcc"; + revision = "1"; + editedCabalFile = "0lcg7rjy51rja8f4575cssrhyb86f03w13aw440mqs85mnzx75km"; libraryHaskellDepends = [ base ghc-prim OneTuple Only ]; testHaskellDepends = [ base ghc-prim hspec OneTuple Only ]; testToolDepends = [ hspec-discover ]; @@ -272008,6 +273192,33 @@ self: { mainProgram = "skylighting"; }) {}; + "skylighting_0_14" = callPackage + ({ mkDerivation, base, binary, blaze-html, bytestring, containers + , pretty-show, skylighting-core, skylighting-format-ansi + , skylighting-format-blaze-html, skylighting-format-context + , skylighting-format-latex, text + }: + mkDerivation { + pname = "skylighting"; + version = "0.14"; + sha256 = "19vwmrpi4r93a7ic9wrf8nl4bh5pzhgpbr84kg7mklj5ls9wv9pz"; + configureFlags = [ "-fexecutable" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary containers skylighting-core skylighting-format-ansi + skylighting-format-blaze-html skylighting-format-context + skylighting-format-latex + ]; + executableHaskellDepends = [ + base blaze-html bytestring containers pretty-show text + ]; + description = "syntax highlighting library"; + license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; + mainProgram = "skylighting"; + }) {}; + "skylighting-core" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary , bytestring, case-insensitive, colour, containers, criterion, Diff @@ -272038,6 +273249,37 @@ self: { license = lib.licenses.bsd3; }) {}; + "skylighting-core_0_14" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary + , bytestring, case-insensitive, colour, containers, criterion, Diff + , directory, filepath, mtl, pretty-show, QuickCheck, safe, tasty + , tasty-golden, tasty-hunit, tasty-quickcheck, text, transformers + , utf8-string, xml-conduit + }: + mkDerivation { + pname = "skylighting-core"; + version = "0.14"; + sha256 = "14fbx07h9lrkz9a4z4w4v5b9hi3hpsxqw71pvfcbv39fim8bs8qj"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring binary bytestring + case-insensitive colour containers directory filepath mtl safe text + transformers utf8-string xml-conduit + ]; + testHaskellDepends = [ + aeson base bytestring containers Diff directory filepath + pretty-show QuickCheck tasty tasty-golden tasty-hunit + tasty-quickcheck text + ]; + benchmarkHaskellDepends = [ + base containers criterion filepath text + ]; + description = "syntax highlighting library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "skylighting-extensions" = callPackage ({ mkDerivation, base, containers, skylighting, skylighting-modding , text @@ -272078,8 +273320,8 @@ self: { }: mkDerivation { pname = "skylighting-format-blaze-html"; - version = "0.1.1"; - sha256 = "04zg92x1jnzv6hac6wdgksgma7gi5g82x2kdxk8r7pk9yd6rn4xi"; + version = "0.1.1.1"; + sha256 = "14ap85ss2ad21vjs0jmczw66m1nqzyk86fvxi31f3r1mhpmq5v4f"; libraryHaskellDepends = [ base blaze-html containers skylighting-core text ]; @@ -273608,6 +274850,27 @@ self: { license = lib.licenses.cc0; }) {}; + "snail" = callPackage + ({ mkDerivation, base, containers, hspec, hspec-discover, HUnit + , megaparsec, mtl, QuickCheck, raw-strings-qq, text, text-display + }: + mkDerivation { + pname = "snail"; + version = "0.1.2.1"; + sha256 = "00s193k1iv0gcv98aic3ab47vjdy9z14vcc1ywrmsf2llwra323x"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base containers megaparsec mtl QuickCheck text text-display + ]; + testHaskellDepends = [ + base containers hspec hspec-discover HUnit megaparsec mtl + QuickCheck raw-strings-qq text text-display + ]; + testToolDepends = [ hspec-discover ]; + description = "A programming language with no semantics"; + license = lib.licenses.mit; + }) {}; + "snake" = callPackage ({ mkDerivation, base, random, split, terminal-size }: mkDerivation { @@ -277925,8 +279188,8 @@ self: { }: mkDerivation { pname = "sqids"; - version = "0.1.2.1"; - sha256 = "06m1vsmfgzn80r9gc8pgnzj4496lyyhk78gka63jzqzqi61cs7rh"; + version = "0.1.4.0"; + sha256 = "0nw5g8azgh4mw8nvvrryy8ck37xyv92p36rvpa73ickn5a20bp06"; libraryHaskellDepends = [ base containers mtl text transformers ]; testHaskellDepends = [ base containers hspec mtl split text ]; description = "A small library that lets you generate YouTube-looking IDs from numbers"; @@ -278208,7 +279471,6 @@ self: { testHaskellDepends = [ base ]; description = "Initial project template from stack"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; mainProgram = "sqsd-local"; }) {}; @@ -278240,8 +279502,8 @@ self: { }: mkDerivation { pname = "squeal-postgresql"; - version = "0.9.1.0"; - sha256 = "0jy2324j4jrv8nc7dks4286vmr2llbb8v7b32zqlrwndgyy41kkp"; + version = "0.9.1.3"; + sha256 = "1rj6pbfpdypcrxapm1hcha7nxczv5h3wan86lv6cfaijfbi733yy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -278276,8 +279538,8 @@ self: { }: mkDerivation { pname = "squeal-postgresql-ltree"; - version = "0.1.0.1"; - sha256 = "1dm5605p5rmh9gxjb84zn78jsqlakp1n9jcgagjmkmng8gnp49l9"; + version = "0.1.0.2"; + sha256 = "1rg71z9h3bw921m7cv8r8s85ilnga8cmsc5jw22xfa1n48pqbfmy"; libraryHaskellDepends = [ base bytestring generics-sop mtl postgresql-binary postgresql-libpq squeal-postgresql text @@ -279029,8 +280291,8 @@ self: { }: mkDerivation { pname = "stack-clean-old"; - version = "0.4.6"; - sha256 = "0ymzri4pxs0dvqbs3nyrc6hq2lp6y6glva1kbjzpkzgk9r93x3kn"; + version = "0.4.8"; + sha256 = "0jyy6dnycycqqna8ihwvb6czcvb2yrfcg3dhj28xbn7dzpxbc197"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -279041,6 +280303,26 @@ self: { mainProgram = "stack-clean-old"; }) {}; + "stack-clean-old_0_5" = callPackage + ({ mkDerivation, base, directory, extra, filemanip, filepath + , simple-cmd, simple-cmd-args, simple-prompt + }: + mkDerivation { + pname = "stack-clean-old"; + version = "0.5"; + sha256 = "1d2hgn6f39iy4sw4zqalzc804f2463y99j9p8vzlr6bckan2krx3"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory extra filemanip filepath simple-cmd simple-cmd-args + simple-prompt + ]; + description = "Clean away old stack build artifacts"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "stack-clean-old"; + }) {}; + "stack-fix" = callPackage ({ mkDerivation, base, options, text, turtle }: mkDerivation { @@ -279485,7 +280767,6 @@ self: { ]; description = "Tools for curating Stackage bundles"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "stackage-install" = callPackage @@ -279728,7 +281009,6 @@ self: { ]; description = "Convert Stack files into Nix build instructions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "stackage2nix"; }) {}; @@ -279765,15 +281045,15 @@ self: { , amazonka-cloudformation, amazonka-core, amazonka-ec2 , amazonka-lambda, amazonka-sso, amazonka-sts, base, Blammo , bytestring, cfn-flip, conduit, containers, envparse, errors - , exceptions, extra, filepath, Glob, hspec, lens, lens-aeson - , monad-logger, mtl, optparse-applicative, QuickCheck, resourcet - , rio, semigroups, text, time, transformers, typed-process - , unliftio, unliftio-core, unordered-containers, uuid, yaml + , exceptions, extra, filepath, Glob, hspec, hspec-golden, lens + , lens-aeson, monad-logger, mtl, optparse-applicative, QuickCheck + , resourcet, rio, semigroups, text, time, transformers + , typed-process, unliftio, unordered-containers, uuid, yaml }: mkDerivation { pname = "stackctl"; - version = "1.4.2.1"; - sha256 = "1amvvw7za305rqz3cm9svqb4r0x6h096yw6p8w3wims1vq831a99"; + version = "1.5.0.0"; + sha256 = "1q60gi10aqr1f3baa02lg0r39gvvgqfdjr25pk2sy11n6dbcw19q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -279783,11 +281063,12 @@ self: { envparse errors exceptions extra filepath Glob lens lens-aeson monad-logger mtl optparse-applicative QuickCheck resourcet rio semigroups text time transformers typed-process unliftio - unliftio-core unordered-containers uuid yaml + unordered-containers uuid yaml ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - aeson base bytestring hspec mtl QuickCheck yaml + aeson base bytestring filepath Glob hspec hspec-golden mtl + QuickCheck yaml ]; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -280016,6 +281297,24 @@ self: { broken = true; }) {}; + "starter-snake-haskell" = callPackage + ({ mkDerivation, aeson, base, containers, scotty, text }: + mkDerivation { + pname = "starter-snake-haskell"; + version = "1.1.0"; + sha256 = "12sk4bkl79gpiyygfcwq897gbr2fqfrmf3wf5adqg2sm57fvxnf7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ aeson base containers scotty text ]; + executableHaskellDepends = [ aeson base containers scotty text ]; + testHaskellDepends = [ aeson base containers scotty text ]; + description = "A Haskell Battlesnake starter"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "starter-snake-haskell-exe"; + broken = true; + }) {}; + "stash" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, directory , hashable, text, vector @@ -280576,6 +281875,25 @@ self: { license = lib.licenses.mit; }) {}; + "statsd-rupp" = callPackage + ({ mkDerivation, base, bytestring, hspec, network, QuickCheck + , unliftio, unordered-containers, vector + }: + mkDerivation { + pname = "statsd-rupp"; + version = "0.4.0.4"; + sha256 = "1y1c7ln8fany6inshxkmz6dz2g9wpcrrijkgqgfabhvg8nqqgi9w"; + libraryHaskellDepends = [ + base bytestring network unliftio unordered-containers vector + ]; + testHaskellDepends = [ + base bytestring hspec network QuickCheck unliftio + unordered-containers vector + ]; + description = "Simple StatsD Client"; + license = lib.licenses.bsd3; + }) {}; + "statsdi" = callPackage ({ mkDerivation, base, bytestring, dequeue, ether, hashable, hspec , network, random, stm, tasty, tasty-hspec, template-haskell, time @@ -281099,6 +282417,8 @@ self: { pname = "stm-conduit"; version = "4.0.1"; sha256 = "0hhlxvpp7mah8dcvkknh6skx44jfk3092zz2w52zlr255bkmn3p8"; + revision = "1"; + editedCabalFile = "1iyk2wfkpyq3jn0lybgf21b95rmkzgpvr8m066j06z4xngcvab36"; libraryHaskellDepends = [ async base cereal cereal-conduit conduit conduit-extra directory exceptions monad-loops resourcet stm stm-chans transformers @@ -283281,10 +284601,8 @@ self: { ({ mkDerivation, base, bytestring, tagged, text }: mkDerivation { pname = "string-class"; - version = "0.1.7.0"; - sha256 = "1s0bj0wvwriw4516za6ar7w7zsz5mmnf1dba0ch239n27rb00nwf"; - revision = "1"; - editedCabalFile = "1z3cq57j6gjkz8q0wn9y222qw8lg560372na0nn7fcbf54yc749r"; + version = "0.1.7.1"; + sha256 = "0hbh4ccd3zlwnkczgvfg76h537gxs1rcci0p689i5v833n67zygy"; libraryHaskellDepends = [ base bytestring tagged text ]; description = "String class library"; license = lib.licenses.bsd3; @@ -283380,8 +284698,8 @@ self: { pname = "string-fromto"; version = "1.0.0.0"; sha256 = "0vnf500vahgccbbg7zvxqjxllvyq3jxzf2difqwh46fp62jfqwmx"; - revision = "1"; - editedCabalFile = "0dxfcfxr5yr7k39cm0d7j86milmn7nlb2ciwdy076k9dp2fhgb1r"; + revision = "2"; + editedCabalFile = "0h6w39bx4vvrzyg3bbcr3s78g427akzg7nykxa6zwdxk9sq67fsp"; libraryHaskellDepends = [ base bytestring memory text ]; description = "Conversions between common string types, as well as Base16/Base32/Base64"; license = lib.licenses.bsd3; @@ -286075,46 +287393,49 @@ self: { }) {inherit (pkgs) tokyocabinet;}; "swarm" = callPackage - ({ mkDerivation, aeson, array, base, brick, bytestring, clock - , containers, criterion, directory, dotgen, either, extra, filepath - , fused-effects, fused-effects-lens, githash, hashable, hsnoise - , http-client, http-client-tls, http-types, lens, linear, lsp - , megaparsec, minimorph, mtl, murmur3, natural-sort - , optparse-applicative, parser-combinators, prettyprinter - , QuickCheck, random, servant, servant-server, simple-enumeration - , split, stm, syb, tagged, tasty, tasty-expected-failure - , tasty-hunit, tasty-quickcheck, template-haskell, text, text-rope - , text-zipper, time, transformers, unification-fd - , unordered-containers, vector, vty, wai, warp, witch, word-wrap - , yaml + ({ mkDerivation, aeson, array, base, blaze-html, boolexpr, brick + , brick-list-skip, bytestring, clock, colour, commonmark + , commonmark-extensions, containers, criterion, directory, dotgen + , either, extra, filepath, fused-effects, fused-effects-lens, fuzzy + , githash, hashable, hsnoise, http-client, http-client-tls + , http-types, lens, linear, lsp, megaparsec, minimorph, mtl + , murmur3, natural-sort, optparse-applicative, parser-combinators + , prettyprinter, QuickCheck, random, servant, servant-docs + , servant-server, SHA, simple-enumeration, split, stm, syb, tagged + , tasty, tasty-expected-failure, tasty-hunit, tasty-quickcheck + , template-haskell, text, text-rope, text-zipper, time + , transformers, unification-fd, unordered-containers, vector, vty + , wai, warp, witch, witherable, word-wrap, yaml }: mkDerivation { pname = "swarm"; - version = "0.3.0.1"; - sha256 = "0b0ji08csj07ragr8sabn84l1zzlchvm0nz8rd7541fwm5b3jb5f"; + version = "0.4"; + sha256 = "150hblxkv8wkx02wxifiyl0k76a7y8fikkx2wxz6ldd223d1yvqa"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson array base brick bytestring clock containers directory dotgen - either extra filepath fused-effects fused-effects-lens githash - hashable hsnoise http-client http-client-tls http-types lens linear - lsp megaparsec minimorph mtl murmur3 natural-sort - parser-combinators prettyprinter random servant servant-server - simple-enumeration split stm syb tagged template-haskell text - text-rope text-zipper time unification-fd unordered-containers - vector vty wai warp witch word-wrap yaml + aeson array base blaze-html boolexpr brick brick-list-skip + bytestring clock colour commonmark commonmark-extensions containers + directory dotgen either extra filepath fused-effects + fused-effects-lens fuzzy githash hashable hsnoise http-client + http-client-tls http-types lens linear lsp megaparsec minimorph mtl + murmur3 natural-sort parser-combinators prettyprinter random + servant servant-docs servant-server SHA simple-enumeration split + stm syb tagged template-haskell text text-rope text-zipper time + transformers unification-fd unordered-containers vector vty wai + warp witch witherable word-wrap yaml ]; executableHaskellDepends = [ base githash optparse-applicative text ]; testHaskellDepends = [ - aeson base containers directory filepath hashable lens linear mtl - QuickCheck tasty tasty-expected-failure tasty-hunit - tasty-quickcheck text transformers witch yaml + aeson base boolexpr containers directory filepath fused-effects + hashable lens linear mtl QuickCheck tasty tasty-expected-failure + tasty-hunit tasty-quickcheck text time transformers vty witch yaml ]; benchmarkHaskellDepends = [ - base criterion lens linear mtl random text + base containers criterion lens linear mtl random text ]; description = "2D resource gathering game with programmable robots"; license = lib.licenses.bsd3; @@ -286205,8 +287526,8 @@ self: { }: mkDerivation { pname = "swish"; - version = "0.10.4.0"; - sha256 = "0p5xs17lzgsqgwnpglqav89ysnaagz532lz279cr7pyl3i5z2zdw"; + version = "0.10.5.0"; + sha256 = "0q642rv2mcb228b99qc7l94m8hrdw5zqby14jzblr6c4wwcahh5a"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -287823,18 +289144,17 @@ self: { }) {UniqueLogicNP = null;}; "synthesizer-llvm" = callPackage - ({ mkDerivation, base, containers, event-list, llvm-dsl, llvm-extra - , llvm-tf, midi, non-empty, non-negative, numeric-prelude, pathtype - , QuickCheck, random, semigroups, sox, storable-record - , storablevector, synthesizer-core, synthesizer-midi, tfp - , transformers, unsafe, utility-ht, vault + ({ mkDerivation, base, containers, doctest-exitcode-stdio + , event-list, llvm-dsl, llvm-extra, llvm-tf, midi, non-empty + , non-negative, numeric-prelude, pathtype, QuickCheck, random + , semigroups, sox, storable-record, storablevector + , synthesizer-core, synthesizer-midi, tfp, transformers, unsafe + , utility-ht, vault }: mkDerivation { pname = "synthesizer-llvm"; - version = "0.9"; - sha256 = "0bqncysaq164235792657yyf1ngkr7gm9vkzkbiqy6f7g7a62shd"; - revision = "2"; - editedCabalFile = "1p9wr4i1q8mv3ghnw46k4dzfagid1f7sx45zbam3ja68ksq1da99"; + version = "1.0"; + sha256 = "1kkn0rdwidwrrx27bzj3d6hk273fl1v88c6bdqvw0hy3lqmrfvzb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -287844,8 +289164,9 @@ self: { synthesizer-midi tfp transformers unsafe utility-ht vault ]; testHaskellDepends = [ - base llvm-extra llvm-tf numeric-prelude QuickCheck random - storablevector synthesizer-core tfp utility-ht + base doctest-exitcode-stdio llvm-dsl llvm-extra llvm-tf + numeric-prelude QuickCheck random storablevector synthesizer-core + tfp unsafe utility-ht ]; doHaddock = false; description = "Efficient signal processing using runtime compilation"; @@ -288283,6 +289604,27 @@ self: { hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) systemd;}; + "systemd-ntfy" = callPackage + ({ mkDerivation, base, bytestring, containers, dbus, dbus-th + , optparse-applicative, safe, wreq + }: + mkDerivation { + pname = "systemd-ntfy"; + version = "0.1.0"; + sha256 = "14xwx9h01x1hryc0mvxpmm81z3nw58pmsarfninb8rxrsl230b2n"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring containers dbus dbus-th optparse-applicative safe + wreq + ]; + description = "Send notifications for systemd units to ntfy.sh"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + mainProgram = "systemd-ntfy"; + broken = true; + }) {}; + "systemd-socket-activation" = callPackage ({ mkDerivation, base, containers, network, quaalude, text , transformers, unix @@ -289189,6 +290531,28 @@ self: { mainProgram = "tahoe-chk-encrypt"; }) {}; + "tahoe-directory" = callPackage + ({ mkDerivation, base, bytestring, hedgehog, megaparsec + , tahoe-capabilities, tahoe-chk, tahoe-ssk, tasty, tasty-hedgehog + , tasty-hunit, text + }: + mkDerivation { + pname = "tahoe-directory"; + version = "0.1.0.0"; + sha256 = "1659q860y776bx39nw3x7afqdazs5b31b5p9asc3g7al697xl6li"; + libraryHaskellDepends = [ + base bytestring megaparsec tahoe-capabilities tahoe-chk tahoe-ssk + text + ]; + testHaskellDepends = [ + base bytestring hedgehog megaparsec tahoe-capabilities tasty + tasty-hedgehog tasty-hunit text + ]; + description = "Tahoe-LAFS directory-like abstraction for collections of data objects"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "tahoe-great-black-swamp" = callPackage ({ mkDerivation, aeson, async, base, base32, base32string , base64-bytestring, binary, bytestring, cborg, cborg-json @@ -289978,6 +291342,23 @@ self: { license = lib.licenses.mit; }) {}; + "tasty_1_5" = callPackage + ({ mkDerivation, ansi-terminal, base, containers + , optparse-applicative, stm, tagged, transformers, unix + }: + mkDerivation { + pname = "tasty"; + version = "1.5"; + sha256 = "1b19s0kf61z3zp7qx9m3j3iqmjvwvqsfwryf9lfnj3i15a2zfp6a"; + libraryHaskellDepends = [ + ansi-terminal base containers optparse-applicative stm tagged + transformers unix + ]; + description = "Modern and extensible testing framework"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "tasty-ant-xml" = callPackage ({ mkDerivation, base, containers, directory, filepath , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers @@ -290088,6 +291469,21 @@ self: { license = lib.licenses.mit; }) {}; + "tasty-bench_0_3_5" = callPackage + ({ mkDerivation, base, containers, deepseq, ghc-prim, tasty }: + mkDerivation { + pname = "tasty-bench"; + version = "0.3.5"; + sha256 = "1xldjnm4wa16mcrrp09gi75c8n9b0pq9va3zf50m1smylhfh1hfw"; + revision = "1"; + editedCabalFile = "1q8yx3lm8wb75yn81rmxwi6d30xqcjkxdjjicfv5ipyb8xx0hnc6"; + libraryHaskellDepends = [ base containers deepseq ghc-prim tasty ]; + benchmarkHaskellDepends = [ base ]; + description = "Featherlight benchmark framework"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "tasty-bench-fit" = callPackage ({ mkDerivation, base, containers, deepseq, infinite-list , regression-simple, tasty, tasty-bench, tasty-expected-failure @@ -290129,6 +291525,17 @@ self: { license = lib.licenses.isc; }) {}; + "tasty-coverage" = callPackage + ({ mkDerivation, base, filepath, hpc, tasty }: + mkDerivation { + pname = "tasty-coverage"; + version = "0.1.2.0"; + sha256 = "1d302a16n06x61hlbi3654c808rij74rczpzarjq1mrna07fnh1f"; + libraryHaskellDepends = [ base filepath hpc tasty ]; + description = "Ingredient for tasty which generates per-test coverage reports"; + license = lib.licenses.bsd3; + }) {}; + "tasty-dejafu" = callPackage ({ mkDerivation, base, dejafu, random, tagged, tasty }: mkDerivation { @@ -290140,6 +291547,18 @@ self: { license = lib.licenses.mit; }) {}; + "tasty-dejafu_2_1_0_1" = callPackage + ({ mkDerivation, base, dejafu, random, tagged, tasty }: + mkDerivation { + pname = "tasty-dejafu"; + version = "2.1.0.1"; + sha256 = "0rzlqn6176mdaj3yybw2hjjx3lrx621jvh7vvxkkmh655jbkmjhb"; + libraryHaskellDepends = [ base dejafu random tagged tasty ]; + description = "Deja Fu support for the Tasty test framework"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "tasty-discover" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , Glob, hedgehog, hspec, hspec-core, tasty, tasty-golden @@ -290245,21 +291664,20 @@ self: { "tasty-grading-system" = callPackage ({ mkDerivation, aeson, base, containers, directory, filepath - , generic-deriving, mtl, stm, tagged, tasty, tasty-hunit, text + , generic-deriving, mtl, stm, tagged, tasty, text }: mkDerivation { pname = "tasty-grading-system"; - version = "0.1.0.0"; - sha256 = "1r72gbylmv466naxkqsf56wlkp5kzhvyq0w3k7g47hs1rlslllmp"; - revision = "4"; - editedCabalFile = "1h80pf2p13f33gl803xyg6znf1ychci9jqcl13xdxai1asb331hq"; + version = "0.2.0.0"; + sha256 = "0yag9m637j29hs66cvmy5jp01am3k7g7wacf82nlgk7x5bzfyvfl"; libraryHaskellDepends = [ aeson base containers directory filepath generic-deriving mtl stm tagged tasty text ]; - testHaskellDepends = [ aeson base tasty tasty-hunit ]; description = "Grade your tasty-testsuite"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "tasty-groundhog-converters" = callPackage @@ -290307,6 +291725,8 @@ self: { pname = "tasty-hedgehog"; version = "1.4.0.2"; sha256 = "0lki03z0p38x0dkqx5cqga30zy5m31gxn1saqylja9bi6bbq8d25"; + revision = "1"; + editedCabalFile = "1mwg576azkwzv13rk72cnbag4823hwpr8zgcfcrvx8wx5ha2r55p"; libraryHaskellDepends = [ base hedgehog tagged tasty ]; testHaskellDepends = [ base hedgehog tasty tasty-expected-failure @@ -290443,6 +291863,18 @@ self: { license = lib.licenses.mit; }) {}; + "tasty-hunit_0_10_1" = callPackage + ({ mkDerivation, base, call-stack, tasty }: + mkDerivation { + pname = "tasty-hunit"; + version = "0.10.1"; + sha256 = "10r05j6cl5clxzi2y2gxg9y4izxpa17l6hwb7f4lrc2qs8xl5sww"; + libraryHaskellDepends = [ base call-stack tasty ]; + description = "HUnit support for the Tasty test framework"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "tasty-hunit-adapter" = callPackage ({ mkDerivation, base, HUnit, tasty, tasty-hunit }: mkDerivation { @@ -290720,6 +292152,25 @@ self: { license = lib.licenses.mit; }) {}; + "tasty-quickcheck_0_10_3" = callPackage + ({ mkDerivation, base, optparse-applicative, pcre-light, QuickCheck + , random, tagged, tasty, tasty-hunit + }: + mkDerivation { + pname = "tasty-quickcheck"; + version = "0.10.3"; + sha256 = "02lw6gk83b6wc9dwd3shin58zqy9isgx4zh7z0whs0wkzwzkpyyg"; + revision = "1"; + editedCabalFile = "0rk57yzsrw8lbzjwcsd3pnfwic12cvnpv245g2dsw50dvqd2922k"; + libraryHaskellDepends = [ + base optparse-applicative QuickCheck random tagged tasty + ]; + testHaskellDepends = [ base pcre-light tasty tasty-hunit ]; + description = "QuickCheck support for the Tasty test framework"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "tasty-quickcheck-laws" = callPackage ({ mkDerivation, base, QuickCheck, tasty, tasty-quickcheck }: mkDerivation { @@ -290754,6 +292205,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "tasty-rerun_1_1_19" = callPackage + ({ mkDerivation, base, containers, mtl, optparse-applicative, split + , stm, tagged, tasty, transformers + }: + mkDerivation { + pname = "tasty-rerun"; + version = "1.1.19"; + sha256 = "0dbj5jyms4rkb241dw2vgkzk442zga58zhg8mmw0ksi4yw0z8gbg"; + libraryHaskellDepends = [ + base containers mtl optparse-applicative split stm tagged tasty + transformers + ]; + description = "Rerun only tests which failed in a previous test run"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "tasty-silver" = callPackage ({ mkDerivation, ansi-terminal, async, base, bytestring, containers , deepseq, directory, filepath, mtl, optparse-applicative, process @@ -290764,6 +292232,8 @@ self: { pname = "tasty-silver"; version = "3.3.1.1"; sha256 = "13j0zs0ciijv9q2nncna1gbgsgw2g7xc228hzmqic1750n3ybz9m"; + revision = "1"; + editedCabalFile = "0bnpygmlz5qbjymyngcn19bnhn57m2p6m62f0r8pmrs1q7h4l7aq"; libraryHaskellDepends = [ ansi-terminal async base bytestring containers deepseq directory filepath mtl optparse-applicative process process-extras regex-tdfa @@ -290777,6 +292247,30 @@ self: { license = lib.licenses.mit; }) {}; + "tasty-silver_3_3_1_2" = callPackage + ({ mkDerivation, ansi-terminal, async, base, bytestring, containers + , deepseq, directory, filepath, mtl, optparse-applicative, process + , process-extras, regex-tdfa, silently, stm, tagged, tasty + , tasty-hunit, temporary, text, transformers + }: + mkDerivation { + pname = "tasty-silver"; + version = "3.3.1.2"; + sha256 = "11smy3kwr8w4m4xk229lch6s17h7jp55nzx4pw51rx1xmqfgfx14"; + libraryHaskellDepends = [ + ansi-terminal async base bytestring containers deepseq directory + filepath mtl optparse-applicative process process-extras regex-tdfa + silently stm tagged tasty temporary text transformers + ]; + testHaskellDepends = [ + base directory filepath process silently tasty tasty-hunit + temporary transformers + ]; + description = "A fancy test runner, including support for golden tests"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "tasty-smallcheck" = callPackage ({ mkDerivation, base, optparse-applicative, smallcheck, tagged , tasty @@ -293260,8 +294754,8 @@ self: { pname = "test-lib"; version = "0.4"; sha256 = "0jp0k27vvdz4lfrdi7874j7gnnn051kvqfn1k3zg1ap4m9jzyb45"; - revision = "2"; - editedCabalFile = "1l3xfmwhpvzixwx3s2zhc1ah9bjnp0yjr7d2cymhfnlpwv5jc47q"; + revision = "3"; + editedCabalFile = "03gcbf1yrmvn5sprrf4idwmmyr4lz3j6rmbdnnajpq7c8fibvjcf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -293698,8 +295192,8 @@ self: { }: mkDerivation { pname = "texmath"; - version = "0.12.8"; - sha256 = "1i15hqzmvb00rhwiz7yiqbccg7zknk7rrx9xk16arf6rf43g0kq3"; + version = "0.12.8.2"; + sha256 = "0g004qg97wyvaw3zd47mlb1xclf8jniwgfmvd1q8m3y958np81qp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -293766,6 +295260,36 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "text_2_1" = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers + , deepseq, directory, filepath, ghc-prim, QuickCheck + , system-cxx-std-lib, tasty, tasty-bench, tasty-hunit + , tasty-inspection-testing, tasty-quickcheck, template-haskell + , transformers + }: + mkDerivation { + pname = "text"; + version = "2.1"; + sha256 = "1j5nc8h6njdqrqi6swd278jwsqyw6gpca6ad6vga35lal825prnb"; + libraryHaskellDepends = [ + array base binary bytestring deepseq ghc-prim system-cxx-std-lib + template-haskell + ]; + testHaskellDepends = [ + base bytestring deepseq directory ghc-prim QuickCheck tasty + tasty-hunit tasty-inspection-testing tasty-quickcheck + template-haskell transformers + ]; + benchmarkHaskellDepends = [ + base bytestring containers deepseq directory filepath tasty-bench + transformers + ]; + doCheck = false; + description = "An efficient packed Unicode text type"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "text-all" = callPackage ({ mkDerivation, base, bytestring, text, text-format, utf8-string }: @@ -293888,8 +295412,8 @@ self: { }: mkDerivation { pname = "text-builder-linear"; - version = "0.1.1"; - sha256 = "17p3g7v724180vhq3fmzaip0b0jadhg7pm5if9ygk5cf8g70in9k"; + version = "0.1.1.1"; + sha256 = "0yrl0qr8zyfgrn4h618lkk5jv68ij0kzn39bgv3pi05v9dj8rnzm"; libraryHaskellDepends = [ base bytestring quote-quot text ]; testHaskellDepends = [ base tasty tasty-quickcheck text ]; benchmarkHaskellDepends = [ @@ -294547,6 +296071,8 @@ self: { pname = "text-show"; version = "3.10.4"; sha256 = "0kjpl9wbvn5zcpwjyrvdnkcp260rizff598cmqh4py8225fl5bmz"; + revision = "1"; + editedCabalFile = "0ac5v51am20ni6ddkppzzhzynlnyn0d51gwxc47rmy8dsh22y72a"; libraryHaskellDepends = [ array base base-compat-batteries bifunctors bytestring bytestring-builder containers generic-deriving ghc-boot-th ghc-prim @@ -296065,8 +297591,8 @@ self: { }: mkDerivation { pname = "thread-utils-context"; - version = "0.3.0.3"; - sha256 = "116rl39pv7nlnpw5snw0qns59fj3k34jgp9wnj69w6glnd5s7gyr"; + version = "0.3.0.4"; + sha256 = "1z40qlr40iylms4623bhz9m54zln05vrh9iamypy7d2l5fb4y556"; libraryHaskellDepends = [ base containers ghc-prim thread-utils-finalizers ]; @@ -297130,19 +298656,6 @@ self: { }) {}; "time-manager" = callPackage - ({ mkDerivation, auto-update, base }: - mkDerivation { - pname = "time-manager"; - version = "0.0.0"; - sha256 = "1nzwj0fxz370ks6vr1sylcidx33rnqq45y3q9yv9n4dj43nid9lh"; - revision = "1"; - editedCabalFile = "1hwcns6rnh27nngq616cl9x2pl6lm4zzrsbbv5vq6hl0a60qhqjv"; - libraryHaskellDepends = [ auto-update base ]; - description = "Scalable timer"; - license = lib.licenses.mit; - }) {}; - - "time-manager_0_0_1" = callPackage ({ mkDerivation, auto-update, base, unliftio }: mkDerivation { pname = "time-manager"; @@ -297151,7 +298664,6 @@ self: { libraryHaskellDepends = [ auto-update base unliftio ]; description = "Scalable timer"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "time-out" = callPackage @@ -297485,8 +298997,8 @@ self: { pname = "timeline"; version = "0.1.0.0"; sha256 = "0ya56j51vgg380yylpakfgr5srv20ybiyy7yhfyxz21sdgz7f168"; - revision = "3"; - editedCabalFile = "1mr593bg9wahgwf1xx3qms9x7zyyjd6lgkclq5s7jz2r9z1z7l9g"; + revision = "4"; + editedCabalFile = "0ahcy6rl6zgfmp6k0rcrbbbrvd1wwaf59az8r4rhq3bz7naaispj"; libraryHaskellDepends = [ base containers hedgehog indexed-traversable semigroupoids template-haskell text th-compat time @@ -298392,117 +299904,110 @@ self: { "tlex" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, containers, doctest - , enummapset-th, hspec, hspec-discover, QuickCheck, tlex-core + , enummapset, hspec, hspec-discover, QuickCheck, tlex-core }: mkDerivation { pname = "tlex"; - version = "0.3.0.0"; - sha256 = "1sbs6zxa6x2isxvynlqjf8rgy0y1syr6svvgb22bj43qsg3p3vnx"; + version = "0.4.0.0"; + sha256 = "0pwjgi2l1q5q61s7xvvfn1z4l4jwvxvsqm22lmqsdmav4j9asnsi"; setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base containers enummapset-th tlex-core - ]; + libraryHaskellDepends = [ base containers enummapset tlex-core ]; testHaskellDepends = [ - base containers doctest enummapset-th hspec QuickCheck tlex-core + base containers doctest enummapset hspec QuickCheck tlex-core ]; testToolDepends = [ hspec-discover ]; description = "A lexer generator"; license = "(Apache-2.0 OR MPL-2.0)"; - hydraPlatforms = lib.platforms.none; }) {}; "tlex-core" = callPackage ({ mkDerivation, array, base, Cabal, cabal-doctest, containers - , doctest, enummapset-th, hashable, hspec, hspec-discover - , QuickCheck, transformers, unordered-containers + , doctest, enummapset, hashable, hspec, hspec-discover, QuickCheck + , transformers, unordered-containers }: mkDerivation { pname = "tlex-core"; - version = "0.3.0.0"; - sha256 = "0nmxy35xxz6d2i7hcci68cwv9fm1ffsg00n9minaqgkwcyrk2qba"; + version = "0.4.0.0"; + sha256 = "0ibbsbgd4s3klha35pjpkmp6hkqdvdwb6wwgp0q36h72flmw47rc"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - array base containers enummapset-th hashable transformers + array base containers enummapset hashable transformers unordered-containers ]; testHaskellDepends = [ - array base containers doctest enummapset-th hashable hspec - QuickCheck transformers unordered-containers + array base containers doctest enummapset hashable hspec QuickCheck + transformers unordered-containers ]; testToolDepends = [ hspec-discover ]; description = "A lexer generator"; license = "(Apache-2.0 OR MPL-2.0)"; - hydraPlatforms = lib.platforms.none; }) {}; "tlex-debug" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, containers, doctest - , enummapset-th, hspec, hspec-discover, QuickCheck, tlex, tlex-core + , enummapset, hspec, hspec-discover, QuickCheck, tlex, tlex-core , unordered-containers }: mkDerivation { pname = "tlex-debug"; - version = "0.3.0.0"; - sha256 = "012554saxmnqfm1rvgjgzn7aakvp1ai95xpavr6b3h1pqy63md6s"; + version = "0.4.0.0"; + sha256 = "0ssvhqcgv3gxbzjldx13rg2h31vcbk57nlagvw2rb562kagw9dqb"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - base containers enummapset-th tlex tlex-core unordered-containers + base containers enummapset tlex tlex-core unordered-containers ]; testHaskellDepends = [ - base containers doctest enummapset-th hspec QuickCheck tlex - tlex-core unordered-containers + base containers doctest enummapset hspec QuickCheck tlex tlex-core + unordered-containers ]; testToolDepends = [ hspec-discover ]; description = "Debug utilities for Tlex"; license = "(Apache-2.0 OR MPL-2.0)"; - hydraPlatforms = lib.platforms.none; }) {}; "tlex-encoding" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, charset, containers - , doctest, enummapset-th, hspec, hspec-discover, QuickCheck, tlex + , doctest, enummapset, hspec, hspec-discover, QuickCheck, tlex , tlex-core }: mkDerivation { pname = "tlex-encoding"; - version = "0.3.0.0"; - sha256 = "1ip1zfjfn5jw817i4q8cav98d261jq7h00qaxfsmkcv7kqiqzbac"; + version = "0.4.0.0"; + sha256 = "08wqky2ccmhajb8dcc3nxgrbw6q5jikz5cihz7scc8cn6s49drcz"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - base charset containers enummapset-th tlex tlex-core + base charset containers enummapset tlex tlex-core ]; testHaskellDepends = [ - base charset containers doctest enummapset-th hspec QuickCheck tlex + base charset containers doctest enummapset hspec QuickCheck tlex tlex-core ]; testToolDepends = [ hspec-discover ]; description = "Encoding plugin for Tlex"; license = "(Apache-2.0 OR MPL-2.0)"; - hydraPlatforms = lib.platforms.none; }) {}; "tlex-th" = callPackage ({ mkDerivation, array, base, Cabal, cabal-doctest, containers - , doctest, enummapset-th, ghc-prim, hspec, hspec-discover - , QuickCheck, template-haskell, tlex, tlex-core + , doctest, enummapset, ghc-prim, hspec, hspec-discover, QuickCheck + , template-haskell, tlex, tlex-core }: mkDerivation { pname = "tlex-th"; - version = "0.3.0.0"; - sha256 = "1fhp2md3v2n51irivgdij5zdql1lx8iay9yvsrmj9nhvlfjq2b4g"; + version = "0.4.1.0"; + sha256 = "1dy7q0kfk02h9cf31mv30q3r31sl9yqrlmd23vc3f545c0q6hpxs"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - array base containers enummapset-th ghc-prim template-haskell tlex + array base containers enummapset ghc-prim template-haskell tlex tlex-core ]; testHaskellDepends = [ - array base containers doctest enummapset-th ghc-prim hspec - QuickCheck template-haskell tlex tlex-core + array base containers doctest enummapset ghc-prim hspec QuickCheck + template-haskell tlex tlex-core ]; testToolDepends = [ hspec-discover ]; description = "TemplateHaskell plugin for Tlex"; license = "(Apache-2.0 OR MPL-2.0)"; - hydraPlatforms = lib.platforms.none; }) {}; "tls" = callPackage @@ -298532,7 +300037,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "tls_1_7_1" = callPackage + "tls_1_9_0" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring , cereal, crypton, crypton-x509, crypton-x509-store , crypton-x509-validation, data-default-class, gauge, hourglass @@ -298541,8 +300046,8 @@ self: { }: mkDerivation { pname = "tls"; - version = "1.7.1"; - sha256 = "0q277cp2dqp5cs7mmzqavi8sm0km7xbf2zgcqjp17491w7q5a687"; + version = "1.9.0"; + sha256 = "0gj3af9sqd0bw7dpcqfyvbslpxsk2ij00a77kl710fwhw35vj1an"; libraryHaskellDepends = [ asn1-encoding asn1-types async base bytestring cereal crypton crypton-x509 crypton-x509-store crypton-x509-validation @@ -299424,6 +300929,8 @@ self: { pname = "toml-reader"; version = "0.2.1.0"; sha256 = "1nq4f1a1gkm0xv1crq3fwp6xmr79kz6m4ls0nkj75mkcqk0mpd05"; + revision = "2"; + editedCabalFile = "13vd6wrm3nvlxnjyzlcqd7bylfznjxl5nv1f2b4yh004ii7vn7fk"; libraryHaskellDepends = [ base containers megaparsec parser-combinators text time ]; @@ -299504,13 +301011,16 @@ self: { }) {}; "tonalude" = callPackage - ({ mkDerivation, base, bytestring, doctest, Glob, rio, unliftio }: + ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, doctest + , rio, unliftio + }: mkDerivation { pname = "tonalude"; - version = "0.1.1.1"; - sha256 = "19pl0l0nz3nywhf31190qld7crbzry241h5dw0234w5qyiwf5h0h"; + version = "0.2.0.0"; + sha256 = "0ycp1n5g0l1mmsdb9p35vlccv8adn00gm9n5w9vzs7kmfz6zrl26"; + setupHaskellDepends = [ base Cabal cabal-doctest rio ]; libraryHaskellDepends = [ base bytestring rio unliftio ]; - testHaskellDepends = [ base bytestring doctest Glob rio unliftio ]; + testHaskellDepends = [ base bytestring doctest rio unliftio ]; description = "A standard library for Tonatona framework"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -299518,15 +301028,18 @@ self: { }) {}; "tonaparser" = callPackage - ({ mkDerivation, base, doctest, envy, Glob, rio, say, tonatona }: + ({ mkDerivation, base, Cabal, cabal-doctest, doctest, envy, rio + , say + }: mkDerivation { pname = "tonaparser"; - version = "0.1.0.1"; - sha256 = "1hhg8iil1gradmr2nr6rms5y8f1478splfw6q8n8548zgaqlrzig"; + version = "0.2.0.0"; + sha256 = "0xxwkmayfpg0ydcmqk2yccaapwx0sw2bsj9h7vgcv4mr75xdndc0"; isLibrary = true; isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest rio ]; libraryHaskellDepends = [ base envy rio say ]; - testHaskellDepends = [ base doctest envy Glob rio say tonatona ]; + testHaskellDepends = [ base doctest envy rio say ]; description = "Scalable way to pass runtime configurations for tonatona"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -299534,13 +301047,16 @@ self: { }) {}; "tonatona" = callPackage - ({ mkDerivation, base, doctest, Glob, rio, tonaparser }: + ({ mkDerivation, base, Cabal, cabal-doctest, doctest, rio + , tonaparser + }: mkDerivation { pname = "tonatona"; - version = "0.1.2.1"; - sha256 = "0995j5z87s5bq7ax3byhqrzq794fra5khswf1vj5ppymj6sgq9pf"; + version = "0.2.0.0"; + sha256 = "14bsqn7vc0h5wcb4ykfchxi0mm4a1zd1drnyq7w4a5g8hds8h7w8"; + setupHaskellDepends = [ base Cabal cabal-doctest rio ]; libraryHaskellDepends = [ base rio tonaparser ]; - testHaskellDepends = [ base doctest Glob rio tonaparser ]; + testHaskellDepends = [ base doctest rio tonaparser ]; description = "meta application framework"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -299570,32 +301086,37 @@ self: { }) {}; "tonatona-logger" = callPackage - ({ mkDerivation, base, doctest, Glob, rio, tonaparser, tonatona }: + ({ mkDerivation, base, Cabal, cabal-doctest, doctest, rio + , tonaparser, tonatona + }: mkDerivation { pname = "tonatona-logger"; - version = "0.2.0.2"; - sha256 = "047mhgzkk1jkyblbmh41ha56fifgsfccq6jzq3s0y6fx4sgc95nn"; + version = "0.3.0.0"; + sha256 = "1hv3lzi60z2vllwcnlinakv89jqn7ygzga490wjgii4njsp1a1mi"; + setupHaskellDepends = [ base Cabal cabal-doctest rio ]; libraryHaskellDepends = [ base rio tonaparser tonatona ]; - testHaskellDepends = [ base doctest Glob rio tonaparser tonatona ]; + testHaskellDepends = [ base doctest rio tonaparser tonatona ]; description = "tonatona plugin for logging"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; }) {}; "tonatona-persistent-postgresql" = callPackage - ({ mkDerivation, base, doctest, Glob, monad-logger, persistent - , persistent-postgresql, resource-pool, rio, tonaparser, tonatona + ({ mkDerivation, base, Cabal, cabal-doctest, doctest, monad-logger + , persistent, persistent-postgresql, resource-pool, rio, tonaparser + , tonatona }: mkDerivation { pname = "tonatona-persistent-postgresql"; - version = "0.1.0.2"; - sha256 = "1lib6akp6xnq7iqjgyxgd14l9mgswx8y61v0qpdj8q13xxs5m1si"; + version = "0.2.0.0"; + sha256 = "0wqnvqlg8v6wmix4nis0ymp3vbzm2cc180xslk8jiqpxmgk48lsm"; + setupHaskellDepends = [ base Cabal cabal-doctest rio ]; libraryHaskellDepends = [ base monad-logger persistent persistent-postgresql resource-pool rio tonaparser tonatona ]; testHaskellDepends = [ - base doctest Glob monad-logger persistent persistent-postgresql + base doctest monad-logger persistent persistent-postgresql resource-pool rio tonaparser tonatona ]; description = "tonatona plugin for accessing PostgreSQL database"; @@ -299604,19 +301125,21 @@ self: { }) {}; "tonatona-persistent-sqlite" = callPackage - ({ mkDerivation, base, doctest, Glob, monad-logger, persistent - , persistent-sqlite, resource-pool, rio, tonaparser, tonatona + ({ mkDerivation, base, Cabal, cabal-doctest, doctest, monad-logger + , persistent, persistent-sqlite, resource-pool, rio, tonaparser + , tonatona }: mkDerivation { pname = "tonatona-persistent-sqlite"; - version = "0.1.0.2"; - sha256 = "185bkhikkhk7m8l96rapcy6nwccw3js7kpnif7dlrniv0ckjdwzg"; + version = "0.2.0.0"; + sha256 = "0f807an7vqp057lwkn8jl1dzw018lvsz6rs1w031qv8smz88difk"; + setupHaskellDepends = [ base Cabal cabal-doctest rio ]; libraryHaskellDepends = [ base monad-logger persistent persistent-sqlite resource-pool rio tonaparser tonatona ]; testHaskellDepends = [ - base doctest Glob monad-logger persistent persistent-sqlite + base doctest monad-logger persistent persistent-sqlite resource-pool rio tonaparser tonatona ]; description = "tonatona plugin for accessing Sqlite database"; @@ -299625,22 +301148,24 @@ self: { }) {}; "tonatona-servant" = callPackage - ({ mkDerivation, base, data-default, doctest, exceptions, Glob - , http-types, monad-logger, rio, servant, servant-server - , tonaparser, tonatona, tonatona-logger, wai, wai-extra, warp + ({ mkDerivation, base, Cabal, cabal-doctest, data-default, doctest + , exceptions, http-types, monad-logger, rio, servant + , servant-server, tonaparser, tonatona, tonatona-logger, wai + , wai-extra, warp }: mkDerivation { pname = "tonatona-servant"; - version = "0.1.0.4"; - sha256 = "0zldxq7qygswa0pyxb82p1bbwap6lfr18dw2802ailv5y6gxsjg0"; + version = "0.2.0.0"; + sha256 = "156hh3vb5yw1y7w1ss8c76xnp45m2nqg55m8i8ylw5wpj0nyb6g7"; + setupHaskellDepends = [ base Cabal cabal-doctest rio ]; libraryHaskellDepends = [ base data-default exceptions http-types monad-logger rio servant servant-server tonaparser tonatona tonatona-logger wai wai-extra warp ]; testHaskellDepends = [ - base data-default doctest exceptions Glob http-types monad-logger - rio servant servant-server tonaparser tonatona tonatona-logger wai + base data-default doctest exceptions http-types monad-logger rio + servant servant-server tonaparser tonatona tonatona-logger wai wai-extra warp ]; description = "tonatona plugin for servant"; @@ -299783,6 +301308,8 @@ self: { pname = "topaz"; version = "0.7.0"; sha256 = "18l900v86m4dil4bvr6wcwqinbzls85fqz5bc5vvqhkx8vgglm7j"; + revision = "1"; + editedCabalFile = "0cpcngy2qc7bxxr8m01v0kyq4nx2jvb2p69dfzkjn0m3hcw58fig"; libraryHaskellDepends = [ aeson base binary hashable quantification vector ]; @@ -299795,8 +301322,8 @@ self: { ({ mkDerivation, base, filepath, hspec, profunctors, text }: mkDerivation { pname = "tophat"; - version = "1.0.6.0"; - sha256 = "0ijsd9af3p06q4dk02fckmyqxf9hrvmn98fmlzhykkzi3q22648j"; + version = "1.0.6.1"; + sha256 = "1ra0inamzcizadggjvzpan979bf6fkrmfwz9qggd34dl6fa203r1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base profunctors text ]; @@ -302476,8 +304003,8 @@ self: { pname = "ttc"; version = "1.2.1.0"; sha256 = "001r357h1szs86xsivikvm4h57g6f6p63c2r83y2kpiflnaap4as"; - revision = "1"; - editedCabalFile = "16z92hzk88w6gbhykjhhjy1zcvlnclmr94jz7rdqanbmbybqs4pg"; + revision = "3"; + editedCabalFile = "01jci5kh9jrj38n91ghfq6z4nb29k6w33hwyccq2cx8j2433kykr"; libraryHaskellDepends = [ base bytestring template-haskell text ]; testHaskellDepends = [ base bytestring tasty tasty-hunit template-haskell text @@ -304769,6 +306296,26 @@ self: { license = lib.licenses.mit; }) {}; + "typed-process-effectful" = callPackage + ({ mkDerivation, base, bytestring, effectful, effectful-core, tasty + , tasty-hunit, typed-process + }: + mkDerivation { + pname = "typed-process-effectful"; + version = "1.0.0.0"; + sha256 = "08rp0nycr0yp9zplxjdgslg4z8imvdprv10zwn4085n02y7z2bd9"; + libraryHaskellDepends = [ + base bytestring effectful effectful-core typed-process + ]; + testHaskellDepends = [ + base effectful effectful-core tasty tasty-hunit + ]; + description = "A binding of the @typed-process@ library for the @effectful@ effect system"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "typed-spreadsheet" = callPackage ({ mkDerivation, async, base, diagrams-cairo, diagrams-gtk , diagrams-lib, foldl, gtk, microlens, stm, text, transformers @@ -304946,6 +306493,8 @@ self: { testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; description = "Plugin to faciliate type-level let"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "typelevel" = callPackage @@ -305095,8 +306644,6 @@ self: { doHaddock = false; description = "Efficient implementation of a dependent map with types as keys"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "types-compat" = callPackage @@ -305313,10 +306860,8 @@ self: { }: mkDerivation { pname = "typst"; - version = "0.3.1.0"; - sha256 = "05jal4csacirg67f0lqmcs5z9sgv9wica24mgnj1rsk2j0jc7z3a"; - revision = "1"; - editedCabalFile = "16fyvpfcgdp3sqbsfc5p4014c14v0j4hiw5r8idhpcrfnviv1dlb"; + version = "0.3.2.0"; + sha256 = "00cg8p2isb40yzfh63qrr7rshv43cp0bpsn753glbxz49qmspy0x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -305336,8 +306881,8 @@ self: { ({ mkDerivation, base, text }: mkDerivation { pname = "typst-symbols"; - version = "0.1.2"; - sha256 = "1ax0rd5qqrig1ck5fprdfwk6cqbdi1v05ibd9m33vwygf4gcgrn2"; + version = "0.1.4"; + sha256 = "0kpb4fnw7hkj17mgwrlcbc1vs7pxqf73kc2z3yzdmj9hjjfiid6b"; libraryHaskellDepends = [ base text ]; description = "Symbol and emoji lookup for typst language"; license = lib.licenses.mit; @@ -305995,6 +307540,21 @@ self: { mainProgram = "una"; }) {}; + "unac-bindings" = callPackage + ({ mkDerivation, base, hspec, unac }: + mkDerivation { + pname = "unac-bindings"; + version = "0.1.0.0"; + sha256 = "1bd7isqsfs0fmaxmcjmhik4x7lw8sjzpf7gf5072yffs70jmk9n4"; + libraryHaskellDepends = [ base ]; + librarySystemDepends = [ unac ]; + testHaskellDepends = [ base hspec ]; + description = "Bindings for libunac(3)"; + license = lib.licenses.unlicense; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {unac = null;}; + "unagi-bloomfilter" = callPackage ({ mkDerivation, atomic-primops, base, bytestring, hashabler , primitive @@ -306583,8 +308143,8 @@ self: { }: mkDerivation { pname = "unicode-collation"; - version = "0.1.3.4"; - sha256 = "0afllqpds1ak3gailsn18r7pjdp1mqycdpwwcfifvmk9nadvx3dh"; + version = "0.1.3.5"; + sha256 = "0ya3a3s78hipzw95frw46ky2qv2a141gmwv2qvvgchplsl5f0a82"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -307911,18 +309471,20 @@ self: { license = lib.licenses.mit; }) {}; - "unix_2_8_1_1" = callPackage + "unix_2_8_2_0" = callPackage ({ mkDerivation, base, bytestring, filepath, tasty, tasty-hunit , time }: mkDerivation { pname = "unix"; - version = "2.8.1.1"; - sha256 = "1133y9wyhxznw9sizcybf0rcrm5pgsx8g4qriicz703w89cpca6c"; + version = "2.8.2.0"; + sha256 = "1z2dp2lakl07m2vjcxaljbb4p581b64r6w55lghpm2vsggqvf8fl"; revision = "1"; - editedCabalFile = "1nqriil1mrrijyfkhnfxcdsnvmcg7b6p2zpadj1vkqw0kbxl71dc"; + editedCabalFile = "1ljvvq4fc7nqiyk6zy5svqcds2xnb3lc419q266ivr2345hp59bj"; libraryHaskellDepends = [ base bytestring filepath time ]; - testHaskellDepends = [ base tasty tasty-hunit ]; + testHaskellDepends = [ + base bytestring filepath tasty tasty-hunit + ]; description = "POSIX functionality"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -308112,6 +309674,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "unix-time_0_4_11" = callPackage + ({ mkDerivation, base, binary, bytestring, hspec, hspec-discover + , old-locale, old-time, QuickCheck, template-haskell, time + }: + mkDerivation { + pname = "unix-time"; + version = "0.4.11"; + sha256 = "147hzx3gkqx1j2gr200fjgvl6dr2f9290dcimqyzrwscihbikmxb"; + libraryHaskellDepends = [ base binary bytestring old-time ]; + testHaskellDepends = [ + base bytestring hspec old-locale old-time QuickCheck + template-haskell time + ]; + testToolDepends = [ hspec-discover ]; + description = "Unix time parser/formatter and utilities"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "unjson" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , free, hashable, HUnit, invariant, pretty, primitive, scientific @@ -308185,8 +309766,8 @@ self: { ({ mkDerivation, base, bytestring, text-short }: mkDerivation { pname = "unlifted"; - version = "0.1.0.0"; - sha256 = "1b8ms0im0d9y1lv76ap6255hf3sp7p6hbi0glf3jq5fk601mc6sy"; + version = "0.2.1.0"; + sha256 = "1ypm4bwgcylphvj3f1vbc92xljj08dgdlwkwnnb617m0clc92cak"; libraryHaskellDepends = [ base bytestring text-short ]; description = "Unlifted and levity-polymorphic types"; license = lib.licenses.bsd3; @@ -309392,8 +310973,8 @@ self: { pname = "urlencoded"; version = "0.5.0.0"; sha256 = "0d1vj7w297cf9sk9x942za00f7ihqzcgbgjdbn7r9g0hz7qyl6nn"; - revision = "3"; - editedCabalFile = "05vdcb1ffy1i2xl87w3079ckkj5l7bw1bqj25308pkw8b85amhv6"; + revision = "4"; + editedCabalFile = "0i0r2l7dcd9g5wid0bj5pfvybaxcf4xws2ki053javcbcgrbamyj"; libraryHaskellDepends = [ base mtl network network-uri split ]; testHaskellDepends = [ base network network-uri QuickCheck ]; description = "Generate or process x-www-urlencoded data"; @@ -310314,8 +311895,8 @@ self: { ({ mkDerivation, base, Cabal, directory, filepath, HUnit, text }: mkDerivation { pname = "uusi"; - version = "0.4.2.0"; - sha256 = "0c7zcx594cnfng9sszm70fcfi81n7j54vvk32mvp8j52d7f812cb"; + version = "0.4.3.0"; + sha256 = "1ddmwkdwx1bq3j0gacp5i8j6i5f7hqllkxcf3azsazg63lpf8wpw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal text ]; @@ -311037,6 +312618,8 @@ self: { pname = "var-monad"; version = "0.2.0.1"; sha256 = "1k1v503ww56chlxy9a9vh3w5rh047l3q97si1bi3x1575b1sppm2"; + revision = "1"; + editedCabalFile = "1xqc9r3xjks6pg7wsj7nv09aqgkf6jvsy1b8lfp4cvp79w8kp2c3"; libraryHaskellDepends = [ base stm ]; description = "The VarMonad typeclass, generalizing types of references"; license = lib.licenses.asl20; @@ -313997,32 +315580,29 @@ self: { "wai-app-static" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, bytestring - , containers, cryptonite, directory, file-embed, filepath, hspec - , http-date, http-types, memory, mime-types, mockery, network - , old-locale, optparse-applicative, template-haskell, temporary - , text, time, transformers, unix-compat, unordered-containers, wai - , wai-extra, warp, zlib + , containers, crypton, directory, file-embed, filepath, hspec + , http-date, http-types, memory, mime-types, mockery, old-locale + , optparse-applicative, template-haskell, temporary, text, time + , transformers, unix-compat, unordered-containers, wai, wai-extra + , warp, zlib }: mkDerivation { pname = "wai-app-static"; - version = "3.1.7.4"; - sha256 = "1h8zy3dprqjxvlqxrids65yg5qf1h4f63ddspwxrbp0r9d28hwb4"; + version = "3.1.8"; + sha256 = "00ig077z3ipc7vwpwflcn0z3xvgkl2kyqh7whwym69fldc4q2w0s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base blaze-html blaze-markup bytestring containers cryptonite + base blaze-html blaze-markup bytestring containers crypton directory file-embed filepath http-date http-types memory mime-types old-locale optparse-applicative template-haskell text time transformers unix-compat unordered-containers wai wai-extra warp zlib ]; - executableHaskellDepends = [ - base bytestring containers directory mime-types text - ]; + executableHaskellDepends = [ base ]; testHaskellDepends = [ base bytestring filepath hspec http-date http-types mime-types - mockery network old-locale temporary text time transformers - unix-compat wai wai-extra zlib + mockery temporary text transformers unix-compat wai wai-extra zlib ]; description = "WAI application for static serving"; license = lib.licenses.mit; @@ -314257,6 +315837,27 @@ self: { mainProgram = "example-app"; }) {}; + "wai-feature-flags_0_1_0_7" = callPackage + ({ mkDerivation, aeson, base, bytestring, splitmix, text + , unordered-containers, wai, warp + }: + mkDerivation { + pname = "wai-feature-flags"; + version = "0.1.0.7"; + sha256 = "0pqi45lf7pzad3d2l10hizsxwpjpj06m0z8di43vblb150z6y3my"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring splitmix text unordered-containers wai + ]; + executableHaskellDepends = [ base wai warp ]; + description = "Feature flag support for WAI applications"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "example-app"; + }) {}; + "wai-frontend-monadcgi" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, cgi , containers, http-types, transformers, wai @@ -315255,8 +316856,8 @@ self: { pname = "wai-middleware-static"; version = "0.9.2"; sha256 = "1ynm0xcr3pj5bbph78p1kpyxvd0n3a0gfdbm6yb7i004ixaqf33c"; - revision = "2"; - editedCabalFile = "1dvvnfxb5p7d2rsapn826xcyy3pjd8s95sjzna55xg08dwlykr83"; + revision = "3"; + editedCabalFile = "055n8krn781qd7mb4lclkfkhw43flkvkg93bpljj1b23wnaaxxf9"; libraryHaskellDepends = [ base base16-bytestring bytestring containers cryptohash-sha1 directory expiring-cache-map filepath http-types mime-types @@ -315642,25 +317243,55 @@ self: { broken = true; }) {}; + "wai-saml2_0_5" = callPackage + ({ mkDerivation, base, base16-bytestring, base64-bytestring + , bytestring, c14n, containers, cryptonite, data-default-class + , filepath, http-types, mtl, network-uri, pretty-show, tasty + , tasty-golden, text, time, vault, wai, wai-extra, x509, x509-store + , xml-conduit, zlib + }: + mkDerivation { + pname = "wai-saml2"; + version = "0.5"; + sha256 = "1am7b933ipwphxzsxrbprx8fi2lk2z710sgsk6d66fd2l6axayki"; + libraryHaskellDepends = [ + base base16-bytestring base64-bytestring bytestring c14n containers + cryptonite data-default-class http-types mtl network-uri text time + vault wai wai-extra x509 x509-store xml-conduit zlib + ]; + testHaskellDepends = [ + base base16-bytestring base64-bytestring bytestring c14n containers + cryptonite data-default-class filepath http-types mtl network-uri + pretty-show tasty tasty-golden text time vault wai wai-extra x509 + x509-store xml-conduit zlib + ]; + description = "SAML2 assertion validation as WAI middleware"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "wai-secure-cookies" = callPackage - ({ mkDerivation, base, bytestring, cryptonite, hspec + ({ mkDerivation, base, bytestring, crypton, hspec, hspec-discover , hspec-expectations, hspec-wai, http-types, memory, random, split , wai, wai-extra }: mkDerivation { pname = "wai-secure-cookies"; - version = "0.1.0.6"; - sha256 = "02y2vw3mw3k6il7x6dfcs1fhzzbaslxk374nj4yqwzr6ax4nvrgb"; + version = "0.1.0.8"; + sha256 = "04h9vxinzwnfn45knjgs59kvkv3hwysavlh0h3ap95xxajbarsh2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring cryptonite http-types memory random split wai + base bytestring crypton http-types memory random split wai ]; - executableHaskellDepends = [ base bytestring cryptonite memory ]; + executableHaskellDepends = [ base bytestring crypton memory ]; testHaskellDepends = [ base bytestring hspec hspec-expectations hspec-wai http-types wai wai-extra ]; + testToolDepends = [ hspec-discover ]; + description = "WAI middleware to automatically encrypt and sign cookies"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; mainProgram = "waicookie-genkey"; @@ -315921,6 +317552,8 @@ self: { benchmarkHaskellDepends = [ async base criterion ]; description = "A request rate limiting middleware using token buckets"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "wai-transformers" = callPackage @@ -316170,7 +317803,7 @@ self: { license = lib.licenses.mit; }) {}; - "warp_3_3_28" = callPackage + "warp_3_3_29" = callPackage ({ mkDerivation, array, auto-update, base, bsb-http-chunked , bytestring, case-insensitive, containers, crypton-x509, directory , gauge, ghc-prim, hashable, hspec, hspec-discover, http-client @@ -316180,8 +317813,8 @@ self: { }: mkDerivation { pname = "warp"; - version = "3.3.28"; - sha256 = "1apijxvh4yi4qqcw102vgkm5gyavlv1m5lgdk3a58f00qjy7qy2h"; + version = "3.3.29"; + sha256 = "0dpp98in5ns85ix5lvxvbfy5wdpdbmy11bgbfzw69ajxdhcjk4q0"; libraryHaskellDepends = [ array auto-update base bsb-http-chunked bytestring case-insensitive containers crypton-x509 ghc-prim hashable http-date http-types @@ -316317,15 +317950,15 @@ self: { license = lib.licenses.mit; }) {}; - "warp-tls_3_4_1" = callPackage + "warp-tls_3_4_2" = callPackage ({ mkDerivation, base, bytestring, data-default-class, network , recv, streaming-commons, tls, tls-session-manager, unliftio, wai , warp }: mkDerivation { pname = "warp-tls"; - version = "3.4.1"; - sha256 = "0c4iz2dm12clcs1fqmi5c0qddzv09nqclfgfs6jhqdmygkvrkxs7"; + version = "3.4.2"; + sha256 = "0aarqazsfihz8qd2kjkg6b0g2li2k72423n7sb3ff8mdkblh7zri"; libraryHaskellDepends = [ base bytestring data-default-class network recv streaming-commons tls tls-session-manager unliftio wai warp @@ -316840,30 +318473,29 @@ self: { }) {}; "web-rep" = callPackage - ({ mkDerivation, async, attoparsec, base, bifunctors, box - , box-socket, clay, interpolatedstring-perl6, language-javascript - , lucid, mtl, optics-core, optics-extra, optparse-applicative - , profunctors, scotty, text, transformers, unordered-containers + ({ mkDerivation, async, base, bifunctors, box, box-socket + , bytestring, flatparse, markup-parse, mtl, optics-core + , optics-extra, optparse-applicative, profunctors, scotty + , string-interpolate, text, transformers, unordered-containers , wai-middleware-static, wai-websockets, websockets }: mkDerivation { pname = "web-rep"; - version = "0.10.2.0"; - sha256 = "1bph0zgns0kji4bhirffy4px1rddxyw2yiq6wa197pvl4wkpqn6y"; + version = "0.11.0.0"; + sha256 = "10ngga8s2xpkpm7lhdpn67rdwg1q9k5fa4fx0hkwv1z8lh7gb43w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - async attoparsec base bifunctors box box-socket clay - interpolatedstring-perl6 language-javascript lucid mtl optics-core - optics-extra profunctors scotty text transformers - unordered-containers wai-middleware-static wai-websockets - websockets + async base bifunctors box box-socket bytestring flatparse + markup-parse mtl optics-core optics-extra profunctors scotty + string-interpolate text transformers unordered-containers + wai-middleware-static wai-websockets websockets ]; executableHaskellDepends = [ - base box lucid optics-core optparse-applicative text + base box markup-parse optics-core optparse-applicative ]; description = "representations of a web page"; - license = lib.licenses.mit; + license = lib.licenses.bsd3; mainProgram = "web-rep-example"; }) {}; @@ -318206,29 +319838,29 @@ self: { }) {}; "weeder" = callPackage - ({ mkDerivation, aeson, algebraic-graphs, base, bytestring + ({ mkDerivation, aeson, algebraic-graphs, async, base, bytestring , containers, directory, filepath, generic-lens, ghc, hspec, lens - , mtl, optparse-applicative, process, regex-tdfa, silently, text + , mtl, optparse-applicative, parallel, process, regex-tdfa, text , toml-reader, transformers }: mkDerivation { pname = "weeder"; - version = "2.6.0"; - sha256 = "1ajn23fvdv93qx0kz3dnby1s06qpkypg5ln2cb15abfic0f5aabd"; + version = "2.7.0"; + sha256 = "042c4v7x91xfmams4v4kk8azvi6sh8l03rkkvyvi35jigkz74cbh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - algebraic-graphs base bytestring containers directory filepath - generic-lens ghc lens mtl optparse-applicative regex-tdfa text - toml-reader transformers + algebraic-graphs async base bytestring containers directory + filepath generic-lens ghc lens mtl optparse-applicative parallel + regex-tdfa text toml-reader transformers ]; executableHaskellDepends = [ base bytestring containers directory filepath ghc optparse-applicative transformers ]; testHaskellDepends = [ - aeson algebraic-graphs base directory filepath ghc hspec process - silently text toml-reader + aeson algebraic-graphs base containers directory filepath ghc hspec + process text toml-reader ]; description = "Detect dead code"; license = lib.licenses.bsd3; @@ -318273,8 +319905,8 @@ self: { }: mkDerivation { pname = "weierstrass-functions"; - version = "0.1.1.0"; - sha256 = "06iv19jnpy6za5lbskv1d5xvaic89p2j27nk64zqbsr6syxkc0gx"; + version = "0.1.3.1"; + sha256 = "191bs505r33yhzb07vqk9rq16a5cajsh5rkg9h7k2c15v81mdc8s"; libraryHaskellDepends = [ base elliptic-integrals gamma jacobi-theta ]; @@ -320409,44 +322041,6 @@ self: { }: mkDerivation { pname = "wreq"; - version = "0.5.4.1"; - sha256 = "0fn0cgr15i6zakg98mjkd1lik7r27ixxrg5iimfls154kwmxk8qs"; - isLibrary = true; - isExecutable = true; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - aeson attoparsec authenticate-oauth base base16-bytestring - bytestring case-insensitive containers cryptonite exceptions - ghc-prim hashable http-client http-client-tls http-types lens - lens-aeson memory mime-types psqueues template-haskell text time - time-locale-compat unordered-containers - ]; - testHaskellDepends = [ - aeson aeson-pretty base base64-bytestring bytestring - case-insensitive containers directory doctest filepath hashable - http-client http-types HUnit lens lens-aeson network-info - QuickCheck snap-core snap-server temporary test-framework - test-framework-hunit test-framework-quickcheck2 text time - transformers unix-compat unordered-containers uuid vector - ]; - description = "An easy-to-use HTTP client library"; - license = lib.licenses.bsd3; - }) {}; - - "wreq_0_5_4_2" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec - , authenticate-oauth, base, base16-bytestring, base64-bytestring - , bytestring, Cabal, cabal-doctest, case-insensitive, containers - , cryptonite, directory, doctest, exceptions, filepath, ghc-prim - , hashable, http-client, http-client-tls, http-types, HUnit, lens - , lens-aeson, memory, mime-types, network-info, psqueues - , QuickCheck, snap-core, snap-server, template-haskell, temporary - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , text, time, time-locale-compat, transformers, unix-compat - , unordered-containers, uuid, vector - }: - mkDerivation { - pname = "wreq"; version = "0.5.4.2"; sha256 = "016m5ij80nxnkz3hvdzx3g4w7yjk40bx47xrn54bx1ni9aq2h6wh"; isLibrary = true; @@ -320469,7 +322063,6 @@ self: { ]; description = "An easy-to-use HTTP client library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "wreq-helper" = callPackage @@ -321508,8 +323101,8 @@ self: { }: mkDerivation { pname = "xcffib"; - version = "1.4.0"; - sha256 = "08066j1rvinkifnak22w78p4lf7war607vfk1qj6j90glr0nzs45"; + version = "1.5.0"; + sha256 = "01labx0wjfks71xyvig7iwak3a6ijqxzsgdwjbzq7b2apbw4zasv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -321762,7 +323355,9 @@ self: { executableSystemDepends = [ xgboost ]; description = "XGBoost library for Haskell"; license = lib.licenses.mit; - badPlatforms = [ "aarch64-linux" "armv7l-linux" ]; + badPlatforms = [ + "aarch64-linux" "armv7l-linux" + ] ++ lib.platforms.darwin; mainProgram = "xgb-agaricus"; }) {inherit (pkgs) xgboost;}; @@ -322986,8 +324581,8 @@ self: { pname = "xmlhtml"; version = "0.2.5.4"; sha256 = "11aldkcd3lcxax42f4080127hqs1k95k84h5griwq27ig8gmbxdc"; - revision = "2"; - editedCabalFile = "1mmlm2hipqgcn2x3dw6bc83z5ffnsvi9aaxkw7rjj8c8mvm760qv"; + revision = "3"; + editedCabalFile = "0qfnwz5hfgzyw4a24jzgsshaipjm5bvybkz0gwpcw6zpid160p6n"; libraryHaskellDepends = [ base blaze-builder blaze-html blaze-markup bytestring bytestring-builder containers parsec text unordered-containers @@ -323067,8 +324662,8 @@ self: { }: mkDerivation { pname = "xmobar"; - version = "0.46"; - sha256 = "0glpiq7c0qwfcxnc2flgzj7afm5m1a9ghzwwcq7f8q27m21kddrd"; + version = "0.47.1"; + sha256 = "1l4vpa35nqljsn4kxg5nhwj2d5ns01zj8iikrxr6f8icdirgx4pz"; configureFlags = [ "-fwith_alsa" "-fwith_conduit" "-fwith_datezone" "-fwith_dbus" "-fwith_inotify" "-fwith_iwlib" "-fwith_mpd" "-fwith_mpris" @@ -323426,8 +325021,8 @@ self: { pname = "xor"; version = "0.0.1.2"; sha256 = "0c0a1zg0kwp3jdlgw6y1l6qp00680khxa3sizx5wafdv09rwmrxc"; - revision = "1"; - editedCabalFile = "10k9apdrb9dnkhhg3xw1x2ac57ink224l554w4j3yv5w43jybd7r"; + revision = "2"; + editedCabalFile = "160vvj5icka4i76b7x2qg3l9gvxib0shgs5zrvj27r587vd81rl5"; libraryHaskellDepends = [ base bytestring ghc-byteorder ]; testHaskellDepends = [ base bytestring ghc-byteorder QuickCheck tasty tasty-hunit @@ -324621,8 +326216,8 @@ self: { pname = "yampa-canvas"; version = "0.2.3"; sha256 = "0a1pq1psmc4490isr19z4prnqq1w3374vkfmzpw9s20s2p6k5y7r"; - revision = "11"; - editedCabalFile = "1pwk3g6ipzl94b74vgi34xjvkamm7ivwhs0ah52zg85jp8hr6qkc"; + revision = "12"; + editedCabalFile = "0j9n3xd4hxir1x46yrr8vwrbr8yziw5xfjzvn2j57jrx0qs9c0fb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base blank-canvas stm time Yampa ]; @@ -324924,8 +326519,8 @@ self: { pname = "yasi"; version = "0.2.0.1"; sha256 = "0j5g5h40qvz2rinka7mrb8nc7dzhnprdfpjmzc4pdlx1w8fzw8xy"; - revision = "3"; - editedCabalFile = "10zrj93hwsy7q0w239m3j65fi96cjiabgcl18w922p2abl65a9kb"; + revision = "4"; + editedCabalFile = "0hpyi5gypq20127axq2jx2hax6058036san9frm76zmp6c7l3r0f"; libraryHaskellDepends = [ base ghc-hs-meta template-haskell text text-display ]; @@ -326311,8 +327906,8 @@ self: { }: mkDerivation { pname = "yesod-form"; - version = "1.7.4"; - sha256 = "012w6pq0zznwqn19nx5h30rmd7dazcd0d75a6426d7brxvf9vn98"; + version = "1.7.6"; + sha256 = "1bskmz2d1nn192qirldrdfkhbqzjlq5wi7wlj8rcl4pnh5jxvqd8"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder blaze-html blaze-markup byteable bytestring containers data-default email-validate @@ -329090,6 +330685,7 @@ self: { ]; description = "Polysemy effects for testing"; license = "BSD-2-Clause-Patent"; + hydraPlatforms = lib.platforms.none; }) {}; "zifter" = callPackage @@ -330147,8 +331743,8 @@ self: { }: mkDerivation { pname = "zxcvbn-hs"; - version = "0.3.5"; - sha256 = "1vjdpzki02xdxva8a81qhdlzch79b8d87m52jc8kbxhniaf0fibk"; + version = "0.3.6"; + sha256 = "14bpsn5q6dsd7bn0rnhp8rsw6hqixn9ywckzlpg39ghld3yqi73h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ diff --git a/pkgs/development/interpreters/babashka/default.nix b/pkgs/development/interpreters/babashka/default.nix index b7d78892103d5..1ae30244b2051 100644 --- a/pkgs/development/interpreters/babashka/default.nix +++ b/pkgs/development/interpreters/babashka/default.nix @@ -15,7 +15,7 @@ buildGraalvmNativeImage rec { sha256 = "sha256-O3pLELYmuuB+Bf1vHTWQ+u7Ymi3qYiMRpCwvEq+GeBQ="; }; - graalvmDrv = graalvmCEPackages.graalvm19-ce; + graalvmDrv = graalvmCEPackages.graalvm-ce; executable = "bb"; @@ -38,7 +38,7 @@ buildGraalvmNativeImage rec { # As of v1.2.174, this will remove references to ${graalvmDrv}/conf/chronology, # not sure the implications of this but this file is not available in - # graalvm19-ce anyway. + # graalvm-ce anyway. postInstall = '' remove-references-to -t ${graalvmDrv} $out/bin/${executable} ''; diff --git a/pkgs/development/interpreters/cel-go/default.nix b/pkgs/development/interpreters/cel-go/default.nix index d6ce6c9cc68c7..d45abd4c0f4a3 100644 --- a/pkgs/development/interpreters/cel-go/default.nix +++ b/pkgs/development/interpreters/cel-go/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "cel-go"; - version = "0.18.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "google"; repo = "cel-go"; rev = "v${version}"; - hash = "sha256-+YGRcTlPKTdecMicW4UjupSnuuq5msfGKTP/bwOf7dw="; + hash = "sha256-eXltZkg5QjdCrL9sk2ngVtirSnjBBqk+OdNLY4QtVx4="; }; modRoot = "repl"; - vendorHash = "sha256-RSCZOR++WBoGffCQp114Sa1Dbms2tBa0xceVQ3skwR4="; + vendorHash = "sha256-kalTHpyMYrKZHayxNKLc8vtogiDKyyQLExOQhqp1MUY="; patches = [ # repl/go.mod and repl/go.sum are outdated diff --git a/pkgs/development/interpreters/clisp/bits_ipctypes_to_sys_ipc.patch b/pkgs/development/interpreters/clisp/bits_ipctypes_to_sys_ipc.patch deleted file mode 100644 index d6163022830da..0000000000000 --- a/pkgs/development/interpreters/clisp/bits_ipctypes_to_sys_ipc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru a/modules/bindings/glibc/linux.lisp b/modules/bindings/glibc/linux.lisp ---- a/modules/bindings/glibc/linux.lisp 2008-10-10 16:15:49.000000000 +0300 -+++ b/modules/bindings/glibc/linux.lisp 2012-12-04 01:01:35.000000000 +0200 -@@ -86,7 +86,7 @@ - - (def-c-type __key_t) ; int - --(c-lines "#include <bits/ipctypes.h>~%") -+(c-lines "#include <sys/ipc.h>~%") - (def-c-type __ipc_pid_t) ; ushort - - ; --------------------------- <sys/types.h> ----------------------------------- diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix index 58dd5b4570ddb..ac6257164cb7f 100644 --- a/pkgs/development/interpreters/clisp/default.nix +++ b/pkgs/development/interpreters/clisp/default.nix @@ -3,39 +3,59 @@ # - base (default): contains readline and i18n, regexp and syscalls modules # by default # - full: contains base plus modules in withModules -{ lib, stdenv, fetchurl, libsigsegv, gettext, ncurses, readline, libX11 -, libXau, libXt, pcre, zlib, libXpm, xorgproto, libXext +{ lib +, stdenv +, fetchFromGitLab +, autoconf269 +, automake +, libtool +, libsigsegv +, gettext +, ncurses +, pcre +, zlib +, readline , libffi , libffcall +, libX11 +, libXau +, libXt +, libXpm +, libXext +, xorgproto , coreutils # build options -, threadSupport ? stdenv.hostPlatform.isx86 -, x11Support ? stdenv.hostPlatform.isx86 +, threadSupport ? (stdenv.hostPlatform.isx86 && ! stdenv.hostPlatform.isDarwin) +, x11Support ? (stdenv.hostPlatform.isx86 && ! stdenv.hostPlatform.isDarwin) , dllSupport ? true , withModules ? [ "pcre" "rawsock" ] - ++ lib.optionals stdenv.isLinux [ "bindings/glibc" "zlib" "wildcard" ] + ++ lib.optionals stdenv.isLinux [ "bindings/glibc" "zlib" ] ++ lib.optional x11Support "clx/new-clx" }: assert x11Support -> (libX11 != null && libXau != null && libXt != null && libXpm != null && xorgproto != null && libXext != null); -stdenv.mkDerivation rec { - version = "2.49"; +let + ffcallAvailable = stdenv.isLinux && (libffcall != null); +in + +stdenv.mkDerivation { + version = "2.50pre20230112"; pname = "clisp"; - src = fetchurl { - url = "mirror://gnu/clisp/release/${version}/clisp-${version}.tar.bz2"; - sha256 = "8132ff353afaa70e6b19367a25ae3d5a43627279c25647c220641fed00f8e890"; + src = fetchFromGitLab { + owner = "gnu-clisp"; + repo = "clisp"; + rev = "bf72805c4dace982a6d3399ff4e7f7d5e77ab99a"; + hash = "sha256-sQoN2FUg9BPaCgvCF91lFsU/zLja1NrgWsEIr2cPiqo="; }; - inherit libsigsegv gettext coreutils; - - ffcallAvailable = stdenv.isLinux && (libffcall != null); - + strictDeps = true; + nativeBuildInputs = lib.optionals stdenv.isDarwin [ autoconf269 automake libtool ]; buildInputs = [libsigsegv] ++ lib.optional (gettext != null) gettext ++ lib.optional (ncurses != null) ncurses @@ -49,24 +69,31 @@ stdenv.mkDerivation rec { ]; patches = [ - ./bits_ipctypes_to_sys_ipc.patch # from Gentoo - # The cfree alias no longer exists since glibc 2.26 - ./remove-cfree-binding.patch + ./gnulib_aarch64.patch ]; # First, replace port 9090 (rather low, can be used) # with 64237 (much higher, IANA private area, not # anything rememberable). - # Also remove reference to a type that disappeared from recent glibc - # (seems the correct thing to do, found no reference to any solution) postPatch = '' sed -e 's@9090@64237@g' -i tests/socket.tst sed -i 's@/bin/pwd@${coreutils}&@' src/clisp-link.in find . -type f | xargs sed -e 's/-lICE/-lXau &/' -i - - substituteInPlace modules/bindings/glibc/linux.lisp --replace "(def-c-type __swblk_t)" "" ''; + preConfigure = lib.optionalString stdenv.isDarwin ('' + ( + cd src + autoreconf -f -i -I m4 -I glm4 + ) + '' + lib.concatMapStrings (x: '' + ( + root="$PWD" + cd modules/${x} + autoreconf -f -i -I "$root/src" -I "$root/src/m4" -I "$root/src/glm4" + ) + '') withModules); + configureFlags = [ "builddir" ] ++ lib.optional (!dllSupport) "--without-dynamic-modules" ++ lib.optional (readline != null) "--with-readline" @@ -74,35 +101,27 @@ stdenv.mkDerivation rec { ++ lib.optional (ffcallAvailable && (libffi != null)) "--with-dynamic-ffi" ++ lib.optional ffcallAvailable "--with-ffcall" ++ lib.optional (!ffcallAvailable) "--without-ffcall" - ++ builtins.map (x: "--with-module=" + x) withModules + ++ builtins.map (x: " --with-module=" + x) withModules ++ lib.optional threadSupport "--with-threads=POSIX_THREADS"; preBuild = '' sed -e '/avcall.h/a\#include "config.h"' -i src/foreign.d + sed -i -re '/ cfree /d' -i modules/bindings/glibc/linux.lisp cd builddir ''; - # Fails to build in parallel due to missing gnulib header dependency used in charstrg.d: - # ../src/charstrg.d:319:10: fatal error: uniwidth.h: No such file or directory - enableParallelBuilding = false; - postInstall = lib.optionalString (withModules != []) (''./clisp-link add "$out"/lib/clisp*/base "$(dirname "$out"/lib/clisp*/base)"/full'' + lib.concatMapStrings (x: " " + x) withModules); - env.NIX_CFLAGS_COMPILE = "-O0 ${lib.optionalString (!stdenv.is64bit) "-falign-functions=4"}"; - - # TODO : make mod-check fails - doCheck = false; + env.NIX_CFLAGS_COMPILE = "-O0 -falign-functions=${if stdenv.is64bit then "8" else "4"}"; meta = { description = "ANSI Common Lisp Implementation"; - homepage = "http://clisp.cons.org"; + homepage = "http://clisp.org"; maintainers = lib.teams.lisp.members; - platforms = lib.platforms.unix; - # problems on Darwin: https://github.com/NixOS/nixpkgs/issues/20062 - broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/development/interpreters/clisp/gnulib_aarch64.patch b/pkgs/development/interpreters/clisp/gnulib_aarch64.patch new file mode 100644 index 0000000000000..a0095835706a5 --- /dev/null +++ b/pkgs/development/interpreters/clisp/gnulib_aarch64.patch @@ -0,0 +1,13 @@ +diff --git a/src/gllib/vma-iter.c b/src/gllib/vma-iter.c +index 6045f21d7..d50a3a398 100644 +--- a/src/gllib/vma-iter.c ++++ b/src/gllib/vma-iter.c +@@ -1327,7 +1327,7 @@ vma_iterate (vma_iterate_callback_fn callback, void *data) + In 64-bit processes, we could use vm_region_64 or mach_vm_region. + I choose vm_region_64 because it uses the same types as vm_region, + resulting in less conditional code. */ +-# if defined __ppc64__ || defined __x86_64__ ++# if defined __aarch64__ || defined __ppc64__ || defined __x86_64__ + struct vm_region_basic_info_64 info; + mach_msg_type_number_t info_count = VM_REGION_BASIC_INFO_COUNT_64; + diff --git a/pkgs/development/interpreters/clisp/hg.nix b/pkgs/development/interpreters/clisp/hg.nix deleted file mode 100644 index 91602ad93786a..0000000000000 --- a/pkgs/development/interpreters/clisp/hg.nix +++ /dev/null @@ -1,98 +0,0 @@ -# there are the following linking sets: -# - boot (not installed): without modules, only used when building clisp -# - base (default): contains readline and i18n, regexp and syscalls modules -# by default -# - full: contains base plus modules in withModules -{ lib, stdenv, fetchhg, libsigsegv, gettext, ncurses, readline, libX11 -, libXau, libXt, pcre, zlib, libXpm, xorgproto, libXext -, libffi, libffcall, automake -, coreutils -# build options -, threadSupport ? stdenv.hostPlatform.isx86 -, x11Support ? stdenv.hostPlatform.isx86 -, dllSupport ? true -, withModules ? [ - "pcre" - "rawsock" - ] - ++ lib.optionals stdenv.isLinux [ "bindings/glibc" "zlib" ] - ++ lib.optional x11Support "clx/new-clx" -}: - -assert x11Support -> (libX11 != null && libXau != null && libXt != null - && libXpm != null && xorgproto != null && libXext != null); - -stdenv.mkDerivation rec { - version = "2.50pre20171114"; - pname = "clisp"; - - src = fetchhg { - url = "http://hg.code.sf.net/p/clisp/clisp"; - rev = "36df6dc59b8f"; - sha256 = "1pidiv1m55lvc4ln8vx0ylnnhlj95y6hrfdq96nrj14f4v8fkvmr"; - }; - - inherit libsigsegv gettext coreutils; - - ffcallAvailable = stdenv.isLinux && (libffcall != null); - - nativeBuildInputs = [ automake ]; # sometimes fails otherwise - buildInputs = [libsigsegv] - ++ lib.optional (gettext != null) gettext - ++ lib.optional (ncurses != null) ncurses - ++ lib.optional (pcre != null) pcre - ++ lib.optional (zlib != null) zlib - ++ lib.optional (readline != null) readline - ++ lib.optional (ffcallAvailable && (libffi != null)) libffi - ++ lib.optional ffcallAvailable libffcall - ++ lib.optionals x11Support [ - libX11 libXau libXt libXpm xorgproto libXext - ]; - - # First, replace port 9090 (rather low, can be used) - # with 64237 (much higher, IANA private area, not - # anything rememberable). - # Also remove reference to a type that disappeared from recent glibc - # (seems the correct thing to do, found no reference to any solution) - postPatch = '' - sed -e 's@9090@64237@g' -i tests/socket.tst - sed -i 's@/bin/pwd@${coreutils}&@' src/clisp-link.in - find . -type f | xargs sed -e 's/-lICE/-lXau &/' -i - - substituteInPlace modules/bindings/glibc/linux.lisp --replace "(def-c-type __swblk_t)" "" - ''; - - configureFlags = [ "builddir" ] - ++ lib.optional (!dllSupport) "--without-dynamic-modules" - ++ lib.optional (readline != null) "--with-readline" - # --with-dynamic-ffi can only exist with --with-ffcall - foreign.d does not compile otherwise - ++ lib.optional (ffcallAvailable && (libffi != null)) "--with-dynamic-ffi" - ++ lib.optional ffcallAvailable "--with-ffcall" - ++ lib.optional (!ffcallAvailable) "--without-ffcall" - ++ builtins.map (x: " --with-module=" + x) withModules - ++ lib.optional threadSupport "--with-threads=POSIX_THREADS"; - - preBuild = '' - sed -e '/avcall.h/a\#include "config.h"' -i src/foreign.d - sed -i -re '/ cfree /d' -i modules/bindings/glibc/linux.lisp - cd builddir - ''; - - postInstall = - lib.optionalString (withModules != []) - (''./clisp-link add "$out"/lib/clisp*/base "$(dirname "$out"/lib/clisp*/base)"/full'' - + lib.concatMapStrings (x: " " + x) withModules); - - env.NIX_CFLAGS_COMPILE = "-O0 ${lib.optionalString (!stdenv.is64bit) "-falign-functions=4"}"; - - # TODO : make mod-check fails - doCheck = false; - - meta = { - description = "ANSI Common Lisp Implementation"; - homepage = "http://clisp.cons.org"; - maintainers = lib.teams.lisp.members; - # problems on Darwin: https://github.com/NixOS/nixpkgs/issues/20062 - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/interpreters/clisp/remove-cfree-binding.patch b/pkgs/development/interpreters/clisp/remove-cfree-binding.patch deleted file mode 100644 index 4b570c3a46724..0000000000000 --- a/pkgs/development/interpreters/clisp/remove-cfree-binding.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/modules/bindings/glibc/linux.lisp b/modules/bindings/glibc/linux.lisp -index c40b4f8..1c8edca 100644 ---- a/modules/bindings/glibc/linux.lisp -+++ b/modules/bindings/glibc/linux.lisp -@@ -648,7 +648,6 @@ - (def-call-out calloc (:arguments (nmemb size_t) (size size_t)) - (:return-type c-pointer)) - (def-call-out free (:arguments (ptr c-pointer)) (:return-type nil)) --(def-call-out cfree (:arguments (ptr c-pointer)) (:return-type nil)) - (def-call-out valloc (:arguments (size size_t)) (:return-type c-pointer)) - - (def-call-out abort (:arguments) (:return-type nil)) diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 0008b181fec20..bc7ef5769986d 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -61,11 +61,12 @@ stdenv.mkDerivation (finalAttrs: { #!nix-shell -i bash -p curl common-updater-scripts jq set -euo pipefail + shopt -s inherit_errexit # `jq -r '.[0].name'` results in `v0.0` - readonly latest_version="$(curl \ + latest_version="$(curl \ ''${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ - -s "https://api.github.com/repos/clojure/brew-install/tags" \ + -fsL "https://api.github.com/repos/clojure/brew-install/tags" \ | jq -r '.[1].name')" update-source-version clojure "$latest_version" diff --git a/pkgs/development/interpreters/cyber/default.nix b/pkgs/development/interpreters/cyber/default.nix index c00bb175dd9e5..d71ec5648100a 100644 --- a/pkgs/development/interpreters/cyber/default.nix +++ b/pkgs/development/interpreters/cyber/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "cyber"; - version = "unstable-2023-09-07"; + version = "unstable-2023-09-19"; src = fetchFromGitHub { owner = "fubark"; repo = "cyber"; - rev = "98022d0b8d266ee4f9d8c524a42abad3ad4134c9"; - hash = "sha256-FEvNSHG/sMB1jBjbBaunGxb6/fSvKhKschFvghsW2Ls="; + rev = "f95cd189cf090d26542a87b1d2ced461e75fa1a7"; + hash = "sha256-ctEd8doXMKq3L9/T+jOcWqlBQN0pVhsu9DjBXsg/u/4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/interpreters/elixir/1.15.nix b/pkgs/development/interpreters/elixir/1.15.nix index a37c413e87245..77663266225bb 100644 --- a/pkgs/development/interpreters/elixir/1.15.nix +++ b/pkgs/development/interpreters/elixir/1.15.nix @@ -1,7 +1,7 @@ { mkDerivation }: mkDerivation { - version = "1.15.5"; - sha256 = "sha256-2M1xen5gwmtOu4ug0XkxYke6h+Bw89JkpQGMDhbtNa0="; + version = "1.15.6"; + sha256 = "sha256-eRwyqylldsJOsGAwm61m7jX1yrVDrTPS0qO23lJkcKc="; # https://hexdocs.pm/elixir/1.15.0/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp minimumOTPVersion = "24"; escriptPath = "lib/elixir/scripts/generate_app.escript"; diff --git a/pkgs/development/interpreters/erlang/26.nix b/pkgs/development/interpreters/erlang/26.nix index 99584be4e5e9c..5df6e999779c8 100644 --- a/pkgs/development/interpreters/erlang/26.nix +++ b/pkgs/development/interpreters/erlang/26.nix @@ -1,7 +1,7 @@ { lib, mkDerivation }: mkDerivation { - version = "26.0.2"; - sha256 = "sha256-GzF/cpTUe5hoocDK5aio/lo8oYFeTr+HkftTYpQnOdA="; + version = "26.1.1"; + sha256 = "sha256-Y0sArUFkGxlAAgrgUxn5Rjnd72geG08VO9FBxg/fJAg="; } diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix index bb711129ff951..3c44239dc2fa2 100644 --- a/pkgs/development/interpreters/janet/default.nix +++ b/pkgs/development/interpreters/janet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "janet"; - version = "1.30.0"; + version = "1.31.0"; src = fetchFromGitHub { owner = "janet-lang"; repo = pname; rev = "v${version}"; - hash = "sha256-tkXEi8m7eroie/yP1kW0V6Ld5SCLA0/KmtHHI0fIsRI="; + hash = "sha256-Dj2fj1dsdAMl/H0vNKTf9qjPB4GVRpgWPVR+PuZWZMc="; }; postPatch = '' diff --git a/pkgs/development/interpreters/lambda-lisp/default.nix b/pkgs/development/interpreters/lambda-lisp/default.nix new file mode 100644 index 0000000000000..f2979e7aa6795 --- /dev/null +++ b/pkgs/development/interpreters/lambda-lisp/default.nix @@ -0,0 +1,82 @@ +# Lambda Lisp has several backends, here we are using +# the blc one. Ideally, this should be made into several +# packages such as lambda-lisp-blc, lambda-lisp-lazyk, +# lambda-lisp-clamb, etc. + +{ lib +, gccStdenv +, fetchFromGitHub +, fetchurl +, runtimeShell +}: + +let + stdenv = gccStdenv; + s = import ./sources.nix { inherit fetchurl fetchFromGitHub; }; +in +stdenv.mkDerivation rec { + pname = "lambda-lisp-blc"; + version = s.lambdaLispVersion; + src = s.src; + flatSrc = s.flatSrc; + blcSrc = s.blcSrc; + + installPhase = '' + runHook preInstall + + mkdir -p ./build + cp $blcSrc ./build/Blc.S + cp $flatSrc ./build/flat.lds + cd build; + cat Blc.S | sed -e 's/#define.*TERMS.*//' > Blc.ext.S; + $CC -c -DTERMS=50000000 -o Blc.o Blc.ext.S + ld.bfd -o Blc Blc.o -T flat.lds + cd ..; + mv build/Blc ./bin + install -D -t $out/bin bin/Blc + install -D -t $out/lib bin/lambdalisp.blc + + cd build; + $CC ../tools/asc2bin.c -O2 -o asc2bin; + cd ..; + mv build/asc2bin ./bin; + chmod 755 ./bin/asc2bin; + install -D -t $out/bin bin/asc2bin + + echo -e "#!${runtimeShell}\n( cat $out/lib/lambdalisp.blc | $out/bin/asc2bin; cat ) | $out/bin/Blc" > lambda-lisp-blc + chmod +x lambda-lisp-blc + + install -D -t $out/bin lambda-lisp-blc + runHook postInstall + ''; + + doInstallCheck = true; + + installCheckPhase = '' + runHook preInstallCheck + + a=$(echo "(* (+ 1 2 3 4 5 6 7 8 9 10) 12020569 (- 2 5))" | $out/bin/lambda-lisp-blc | tr -d "> "); + test $a == -1983393885 + + runHook postInstallCheck + ''; + + meta = with lib; { + description = "A Lisp interpreter written in untyped lambda calculus"; + homepage = "https://github.com/woodrush/lambdalisp"; + longDescription = '' + LambdaLisp is a Lisp interpreter written as a closed untyped lambda calculus term. + It is written as a lambda calculus term LambdaLisp = λx. ... which takes a string + x as an input and returns a string as an output. The input x is the Lisp program + and the user's standard input, and the output is the standard output. Characters + are encoded into lambda term representations of natural numbers using the Church + encoding, and strings are encoded as a list of characters with lists expressed as + lambdas in the Mogensen-Scott encoding, so the entire computation process solely + consists of the beta-reduction of lambda terms, without introducing any + non-lambda-type object. + ''; + license = licenses.mit; + maintainers = with maintainers; [ cafkafk ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/interpreters/lambda-lisp/sources.nix b/pkgs/development/interpreters/lambda-lisp/sources.nix new file mode 100644 index 0000000000000..8dbda01b4e27c --- /dev/null +++ b/pkgs/development/interpreters/lambda-lisp/sources.nix @@ -0,0 +1,50 @@ +let + lambdaLispVersion = "2022-08-18"; + blcVersion = "2"; + # Archive of "https://justine.lol/lambda/"; + justineLolArchive = "https://web.archive.org/web/20230614065521if_/https://justine.lol/lambda/"; +in +{ fetchFromGitHub, fetchurl }: { + inherit blcVersion; + inherit lambdaLispVersion; + + src = fetchFromGitHub { + owner = "woodrush"; + repo = "lambdalisp"; + rev = "2119cffed1ab2005f08ab3cfca92028270f08725"; + hash = "sha256-ml2xQ8s8sux+6GwTw8mID3PEOcH6hn8tyc/UI5tFaO0="; + }; + + uniCSrc = fetchFromGitHub { + owner = "tromp"; + repo = "tromp.github.io"; + rev = "b4de12e566c1fb0fa3f3babe89bac885f4c966a4"; + hash = "sha256-JmbqQp2kkkkkkkkSWQmG3uBxdgyIu4r2Ch8bBGyQ4H4="; + }; + + # needed later + clambSrc = fetchFromGitHub { + owner = "irori"; + repo = "clamb"; + rev = "44c1208697f394e22857195be5ea73bfdd48ebd1"; + hash = "sha256-1lGg2NBoxAKDCSnnPn19r/hwBC5paAKUnlcsUv3dpNY="; + }; + + # needed later + lazykSrc = fetchFromGitHub { + owner = "irori"; + repo = "lazyk"; + rev = "5edb0b834d0af5f7413c484eb3795d47ec2e3894"; + hash = "sha256-1lGg2NBoxAKDCSnnPn19r/hwBC5paAKUnlcsUv3dpNY="; + }; + + blcSrc = fetchurl { + url = "${justineLolArchive}Blc.S?v=${blcVersion}"; + hash = "sha256-qt7vDtn9WvDoBaLESCyyscA0u74914e8ZKhLiUAN52A="; + }; + + flatSrc = fetchurl { + url = "${justineLolArchive}flat.lds"; + hash = "sha256-HxX+10rV86zPv+UtF+n72obtz3DosWLMIab+uskxIjA="; + }; +} diff --git a/pkgs/development/interpreters/luau/default.nix b/pkgs/development/interpreters/luau/default.nix index 5602f00e4a8b8..153f56d8633d1 100644 --- a/pkgs/development/interpreters/luau/default.nix +++ b/pkgs/development/interpreters/luau/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "luau"; - version = "0.594"; + version = "0.596"; src = fetchFromGitHub { owner = "Roblox"; repo = "luau"; rev = version; - hash = "sha256-GRdJlVCT1jRAuQHsDjV2oqk7mtBUNDpWt8JGlP31CVs="; + hash = "sha256-25SMgBW5Uqh0dGM8A9qCTcUPPP7wzH8wCGk4w+0wp/c="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/interpreters/micropython/default.nix b/pkgs/development/interpreters/micropython/default.nix index 52be0a412078e..a78b346be94b2 100644 --- a/pkgs/development/interpreters/micropython/default.nix +++ b/pkgs/development/interpreters/micropython/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "micropython"; - version = "1.19.1"; + version = "1.20.0"; src = fetchFromGitHub { owner = "micropython"; repo = "micropython"; rev = "v${version}"; - sha256 = "sha256-BoX3Z3Zr/AQqkgRrq+UVgdoDqNESDTNsY9AtrElpzfA="; + sha256 = "sha256-XTkw0M2an13xlRlDusyHYqwNeHqhq4mryRC5/pk+5Ko="; fetchSubmodules = true; }; @@ -33,7 +33,6 @@ stdenv.mkDerivation rec { doCheck = true; skippedTests = "" - + lib.optionalString (stdenv.isDarwin) " -e uasyncio_basic -e uasyncio_heaplock -e uasyncio_wait_task" + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) " -e ffi_callback" + lib.optionalString (stdenv.isLinux && stdenv.isAarch64) " -e float_parse" ; @@ -49,7 +48,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall mkdir -p $out/bin - install -Dm755 ports/unix/micropython -t $out/bin + install -Dm755 ports/unix/build-standard/micropython -t $out/bin runHook postInstall ''; diff --git a/pkgs/development/interpreters/nickel/Cargo.lock b/pkgs/development/interpreters/nickel/Cargo.lock index 73d8e2b515493..134dec047f28f 100644 --- a/pkgs/development/interpreters/nickel/Cargo.lock +++ b/pkgs/development/interpreters/nickel/Cargo.lock @@ -1601,7 +1601,7 @@ dependencies = [ [[package]] name = "nickel-lang-cli" -version = "1.2.1" +version = "1.2.2" dependencies = [ "clap 4.4.3", "clap_complete", @@ -1666,7 +1666,7 @@ dependencies = [ [[package]] name = "nickel-lang-lsp" -version = "1.2.1" +version = "1.2.2" dependencies = [ "anyhow", "assert_cmd", @@ -2046,7 +2046,7 @@ dependencies = [ [[package]] name = "pyckel" -version = "1.2.1" +version = "1.2.2" dependencies = [ "codespan-reporting", "nickel-lang-core", diff --git a/pkgs/development/interpreters/nickel/default.nix b/pkgs/development/interpreters/nickel/default.nix index d70146062ccc0..4d4be8601e6dc 100644 --- a/pkgs/development/interpreters/nickel/default.nix +++ b/pkgs/development/interpreters/nickel/default.nix @@ -8,13 +8,13 @@ rustPlatform.buildRustPackage rec { pname = "nickel"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "tweag"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-iHHZ2CXle8edJoJDIOMrUNucTdhyNZpSKfAPUmnt6eI="; + hash = "sha256-g7pRTwa2sniIOmgdYCxfYxGRtxnQP8zaVWuPjzEZTSg="; }; cargoLock = { diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index c8441cbae1fb8..9bb0a75b272a5 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -50,8 +50,7 @@ , makeWrapper # - Build Octave Qt GUI: , enableQt ? false -, qt5 -, qscintilla +, libsForQt5 , libiconv , darwin }: @@ -132,9 +131,9 @@ in stdenv.mkDerivation (finalAttrs: { gnuplot python3 ] ++ lib.optionals enableQt [ - qt5.qtbase - qt5.qtsvg - qscintilla + libsForQt5.qtbase + libsForQt5.qtsvg + libsForQt5.qscintilla ] ++ lib.optionals (enableJava) [ jdk ] ++ lib.optionals (!stdenv.isDarwin) [ @@ -149,9 +148,9 @@ in stdenv.mkDerivation (finalAttrs: { gfortran texinfo ] ++ lib.optionals enableQt [ - qt5.wrapQtAppsHook - qt5.qtscript - qt5.qttools + libsForQt5.wrapQtAppsHook + libsForQt5.qtscript + libsForQt5.qttools ]; doCheck = !stdenv.isDarwin; diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix index d5548087f3cd6..ed6f3d27157f8 100644 --- a/pkgs/development/interpreters/php/8.1.nix +++ b/pkgs/development/interpreters/php/8.1.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.1.23"; - hash = "sha256-kppieFF32okt3/ygdLqy8f9XhHOg1K25FcEvXz407Bs="; + version = "8.1.24"; + hash = "sha256-sK5YBKmtU6fijQoyYpSV+Bb5NbEIMMcfTsFYJxhac8k="; }); in diff --git a/pkgs/development/interpreters/php/8.2.nix b/pkgs/development/interpreters/php/8.2.nix index f5f553c5eba9a..a38b0d3957128 100644 --- a/pkgs/development/interpreters/php/8.2.nix +++ b/pkgs/development/interpreters/php/8.2.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.2.10"; - hash = "sha256-zJg06PG2E9dneviEPDZR6YKavKjr/pB5JR0Nhdmgqj4="; + version = "8.2.11"; + hash = "sha256-OBktrv+r9K9sQnvxesH4JWXZx1IuDb0yIVFilEQ0sos="; }); in diff --git a/pkgs/development/interpreters/php/8.3.nix b/pkgs/development/interpreters/php/8.3.nix index 2c529a3ec9657..2c48babf3baf3 100644 --- a/pkgs/development/interpreters/php/8.3.nix +++ b/pkgs/development/interpreters/php/8.3.nix @@ -2,12 +2,12 @@ let base = (callPackage ./generic.nix (_args // { - version = "8.3.0RC1"; + version = "8.3.0RC3"; hash = null; })).overrideAttrs (oldAttrs: { src = fetchurl { - url = "https://downloads.php.net/~jakub/php-8.3.0RC1.tar.xz"; - hash = "sha256-pWnkxSIhzKU8Cp+AiGzqhqRtWoJu+zBfCM45n2ugH7c="; + url = "https://downloads.php.net/~jakub/php-8.3.0RC3.tar.xz"; + hash = "sha256-64JwXVR7WzfeXhq5qOW0cqpzcX09G9t9R2daQyRyRMQ="; }; }); in diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 902015ecfb620..7bcd9db22b2ab 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -96,9 +96,9 @@ in { major = "3"; minor = "12"; patch = "0"; - suffix = "rc3"; + suffix = ""; }; - hash = "sha256-ljl+iR6YgCsdOZ3uPOrrm88KolZsinsczk0BlsJ3UGo="; + hash = "sha256-eVw09E30Wg6blxDIxxwVxnGHFSTNQSyhTe8hLozLFV0="; inherit (darwin) configd; inherit passthruFun; }; @@ -138,10 +138,10 @@ in { sourceVersion = { major = "7"; minor = "3"; - patch = "11"; + patch = "12"; }; - hash = "sha256-ERevtmgx2k6m852NIIR4enRon9AineC+MB+e2bJVCTw="; + hash = "sha256-3WHYjaJ0ws4s7HdmfUo9+aZSvMUOJvkJkdTdCvZrzPQ="; pythonVersion = "2.7"; db = db.override { dbmSupport = !stdenv.isDarwin; }; python = __splicedPackages.pythonInterpreters.pypy27_prebuilt; @@ -155,10 +155,10 @@ in { sourceVersion = { major = "7"; minor = "3"; - patch = "11"; + patch = "12"; }; - hash = "sha256-sPMWb7Klqt/VzrnbXN1feSmg7MygK0omwNrgSS98qOo="; + hash = "sha256-56IEbH5sJfw4aru1Ey6Sp8wkkeOTVpmpRstdy7NCwqo="; pythonVersion = "3.9"; db = db.override { dbmSupport = !stdenv.isDarwin; }; python = __splicedPackages.pypy27; @@ -167,28 +167,26 @@ in { inherit (darwin.apple_sdk.frameworks) Security; }; - pypy38 = __splicedPackages.pypy39.override { - self = __splicedPackages.pythonInterpreters.pypy38; - pythonVersion = "3.8"; - hash = "sha256-TWdpv8pzc06GZv1wUDt86wam4lkRDmFzMbs4mcpOYFg="; + pypy310 = __splicedPackages.pypy39.override { + self = __splicedPackages.pythonInterpreters.pypy310; + pythonVersion = "3.10"; + hash = "sha256-huTk6sw2BGxhgvQwGHllN/4zpg4dKizGuOf5Gl3LPkI="; }; - pypy37 = throw "pypy37 has been removed from nixpkgs since it is no longer supported upstream"; # Added 2023-01-04 - pypy27_prebuilt = callPackage ./pypy/prebuilt_2_7.nix { # Not included at top-level self = __splicedPackages.pythonInterpreters.pypy27_prebuilt; sourceVersion = { major = "7"; minor = "3"; - patch = "11"; + patch = "12"; }; hash = { - aarch64-linux = "sha256-6pJNod7+kyXvdg4oiwT5hGFOQFWA9TIetqXI9Tm9QVo="; - x86_64-linux = "sha256-uo7ZWKkFwHNaTP/yh1wlCJlU3AIOCH2YKw/6W52jFs0="; - aarch64-darwin = "sha256-zFaWq0+TzTSBweSZC13t17pgrAYC+hiQ02iImmxb93E="; - x86_64-darwin = "sha256-Vt7unCJkD1aGw1udZP2xzjq9BEWD5AePCxccov0qGY4="; + aarch64-linux = "sha256-4E3LYoantHJOw/DlDTzBuoWDMB3RZYwG1/N1meQgHFk="; + x86_64-linux = "sha256-GmGiV0t5Rm9gYBDymZormVvZbNCF+Rp46909XCxA6B0="; + aarch64-darwin = "sha256-a3R6oHauhZfklgPF3sTKWTWhoKEy10BKVZvpaiYNm/c="; + x86_64-darwin = "sha256-bon/3RVTfOT/zjFFtl7lfC6clSiSvZW5NAEtLwCfUDs="; }.${stdenv.system}; pythonVersion = "2.7"; inherit passthruFun; @@ -200,13 +198,13 @@ in { sourceVersion = { major = "7"; minor = "3"; - patch = "11"; + patch = "12"; }; hash = { - aarch64-linux = "sha256-CRddxlLtiV2Y6a1j0haBK/PufjmNkAqb+espBrqDArk="; - x86_64-linux = "sha256-1QYXLKEQcSdBdddOnFgcMWZDLQF5sDZHDjuejSDq5YE="; - aarch64-darwin = "sha256-ka11APGjlTHb76CzRaPc/5J/+ZcWVOjS6e98WuMR9X4="; - x86_64-darwin = "sha256-0z9AsgcJmHJYWv1xhzV1ym6mOKJ9gjvGISOMWuglQu0="; + aarch64-linux = "sha256-6TJ/ue2vKtkZNdW4Vj7F/yQZO92xdcGsqvdywCWvGCQ="; + x86_64-linux = "sha256-hMiblm+rK1j0UaSC7jDKf+wzUENb0LlhRhXGHcbaI5A="; + aarch64-darwin = "sha256-DooaNGi5eQxzSsaY9bAMwD/BaJnMxs6HZGX6wLg5gOM="; + x86_64-darwin = "sha256-ZPAI/6BwxAfl70bIJWsuAU3nGW6l2Fg4WGElTnlZ9Os="; }.${stdenv.system}; pythonVersion = "3.9"; inherit passthruFun; diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index 306c33a91fdd0..ba51c43822d47 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -45,15 +45,6 @@ in { propagatedBuildInputs = [ ]; } ./egg-unpack-hook.sh) {}; - flitBuildHook = callPackage ({ makePythonHook, flit }: - makePythonHook { - name = "flit-build-hook"; - propagatedBuildInputs = [ flit ]; - substitutions = { - inherit pythonInterpreter; - }; - } ./flit-build-hook.sh) {}; - pipBuildHook = callPackage ({ makePythonHook, pip, wheel }: makePythonHook { name = "pip-build-hook.sh"; @@ -66,7 +57,19 @@ in { pypaBuildHook = callPackage ({ makePythonHook, build, wheel }: makePythonHook { name = "pypa-build-hook.sh"; - propagatedBuildInputs = [ build wheel ]; + propagatedBuildInputs = [ wheel ]; + substitutions = { + inherit build; + }; + # A test to ensure that this hook never propagates any of its dependencies + # into the build environment. + # This prevents false positive alerts raised by catchConflictsHook. + # Such conflicts don't happen within the standard nixpkgs python package + # set, but in downstream projects that build packages depending on other + # versions of this hook's dependencies. + passthru.tests = import ./pypa-build-hook-tests.nix { + inherit pythonForBuild runCommand; + }; } ./pypa-build-hook.sh) { inherit (pythonForBuild.pkgs) build; }; diff --git a/pkgs/development/interpreters/python/hooks/flit-build-hook.sh b/pkgs/development/interpreters/python/hooks/flit-build-hook.sh deleted file mode 100644 index 45893aae00f4e..0000000000000 --- a/pkgs/development/interpreters/python/hooks/flit-build-hook.sh +++ /dev/null @@ -1,15 +0,0 @@ -# Setup hook for flit -echo "Sourcing flit-build-hook" - -flitBuildPhase () { - echo "Executing flitBuildPhase" - runHook preBuild - @pythonInterpreter@ -m flit build --format wheel - runHook postBuild - echo "Finished executing flitBuildPhase" -} - -if [ -z "${dontUseFlitBuild-}" ] && [ -z "${buildPhase-}" ]; then - echo "Using flitBuildPhase" - buildPhase=flitBuildPhase -fi diff --git a/pkgs/development/interpreters/python/hooks/pypa-build-hook-test.nix b/pkgs/development/interpreters/python/hooks/pypa-build-hook-test.nix new file mode 100644 index 0000000000000..d909e34241f16 --- /dev/null +++ b/pkgs/development/interpreters/python/hooks/pypa-build-hook-test.nix @@ -0,0 +1,32 @@ +{ pythonForBuild, runCommand }: { + dont-propagate-conflicting-deps = let + # customize a package so that its store paths differs + mkConflict = pkg: pkg.overrideAttrs { some_modification = true; }; + # minimal pyproject.toml for the example project + pyprojectToml = builtins.toFile "pyproject.toml" '' + [project] + name = "my-project" + version = "1.0.0" + ''; + # the source of the example project + projectSource = runCommand "my-project-source" {} '' + mkdir -p $out/src + cp ${pyprojectToml} $out/pyproject.toml + touch $out/src/__init__.py + ''; + in + # this build must never triger conflicts + pythonForBuild.pkgs.buildPythonPackage { + pname = "dont-propagate-conflicting-deps"; + version = "0.0.0"; + src = projectSource; + format = "pyproject"; + propagatedBuildInputs = [ + # At least one dependency of `build` should be included here to + # keep the test meaningful + (mkConflict pythonForBuild.pkgs.tomli) + # setuptools is also needed to build the example project + pythonForBuild.pkgs.setuptools + ]; + }; +} diff --git a/pkgs/development/interpreters/python/hooks/pypa-build-hook.sh b/pkgs/development/interpreters/python/hooks/pypa-build-hook.sh index 5d77613bf565f..dd49d935bcee7 100644 --- a/pkgs/development/interpreters/python/hooks/pypa-build-hook.sh +++ b/pkgs/development/interpreters/python/hooks/pypa-build-hook.sh @@ -6,7 +6,7 @@ pypaBuildPhase() { runHook preBuild echo "Creating a wheel..." - pyproject-build --no-isolation --outdir dist/ --wheel $pypaBuildFlags + @build@/bin/pyproject-build --no-isolation --outdir dist/ --wheel $pypaBuildFlags echo "Finished creating a wheel..." runHook postBuild diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index e9c783116b608..fbacf6bb23374 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -11,7 +11,6 @@ , namePrefix , update-python-libraries , setuptools -, flitBuildHook , pypaBuildHook , pypaInstallHook , pythonCatchConflictsHook @@ -90,7 +89,6 @@ # Several package formats are supported. # "setuptools" : Install a common setuptools/distutils based package. This builds a wheel. # "wheel" : Install from a pre-compiled wheel. -# "flit" : Install a flit package. This builds a wheel. # "pyproject": Install a package using a ``pyproject.toml`` file (PEP517). This builds a wheel. # "egg": Install a package from an egg. # "other" : Provide your own buildPhase and installPhase. @@ -122,7 +120,7 @@ let else "setuptools"; - withDistOutput = lib.elem format' ["pyproject" "setuptools" "flit" "wheel"]; + withDistOutput = lib.elem format' ["pyproject" "setuptools" "wheel"]; name_ = name; @@ -222,8 +220,6 @@ let unzip ] ++ lib.optionals (format' == "setuptools") [ setuptoolsBuildHook - ] ++ lib.optionals (format' == "flit") [ - flitBuildHook ] ++ lib.optionals (format' == "pyproject") [( if isBootstrapPackage then pypaBuildHook.override { diff --git a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix index e5f9c00b2fb22..d42e4e85c102d 100644 --- a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix @@ -98,12 +98,10 @@ , ... } @ attrs: -assert lib.assertMsg (format != "flit") "flit is not a supported Python 2 format"; - let inherit (python) stdenv; - withDistOutput = lib.elem format ["pyproject" "setuptools" "flit" "wheel"]; + withDistOutput = lib.elem format ["pyproject" "setuptools" "wheel"]; name_ = name; @@ -171,7 +169,7 @@ let nativeBuildInputs = [ python wrapPython - ensureNewerSourcesForZipFilesHook # move to wheel installer (pip) or builder (setuptools, flit, ...)? + ensureNewerSourcesForZipFilesHook # move to wheel installer (pip) or builder (setuptools, ...)? pythonRemoveTestsDirHook ] ++ lib.optionals catchConflicts [ pythonCatchConflictsHook diff --git a/pkgs/development/interpreters/python/tests.nix b/pkgs/development/interpreters/python/tests.nix index d2bab1b0c8d32..67670ceb6546a 100644 --- a/pkgs/development/interpreters/python/tests.nix +++ b/pkgs/development/interpreters/python/tests.nix @@ -8,7 +8,6 @@ { stdenv , python , runCommand -, substituteAll , lib , callPackage , pkgs @@ -60,7 +59,7 @@ let is_nixenv = "True"; is_virtualenv = "False"; }; - } // lib.optionalAttrs (python.isPy3k && (!python.isPyPy)) rec { + } // lib.optionalAttrs (python.isPy3k && (!python.isPyPy)) { # Venv built using plain Python # Python 2 does not support venv # TODO: PyPy executable name is incorrect, it should be pypy-c or pypy-3c instead of pypy and pypy3. @@ -109,7 +108,7 @@ let cpython-gdb = callPackage ./tests/test_cpython_gdb { interpreter = python; }; - } // lib.optionalAttrs (python.pythonAtLeast "3.7") rec { + } // lib.optionalAttrs (python.pythonAtLeast "3.7") { # Before the addition of NIX_PYTHONPREFIX mypy was broken with typed packages nix-pythonprefix-mypy = callPackage ./tests/test_nix_pythonprefix { interpreter = python; @@ -126,7 +125,7 @@ let extension = self: super: { foobar = super.numpy; }; - in { + in lib.optionalAttrs (python.isPy3k) ({ test-packageOverrides = let myPython = let self = python.override { @@ -150,7 +149,7 @@ let ]; }); in pkgs_.${python.pythonAttr}.pkgs.foo; - }; + }); condaTests = let requests = callPackage ({ @@ -178,7 +177,7 @@ let } ) {}; pythonWithRequests = requests.pythonModule.withPackages (ps: [ requests ]); - in lib.optionalAttrs stdenv.isLinux + in lib.optionalAttrs (python.isPy3k && stdenv.isLinux) { condaExamplePackage = runCommand "import-requests" {} '' ${pythonWithRequests.interpreter} -c "import requests" > $out diff --git a/pkgs/development/interpreters/self/default.nix b/pkgs/development/interpreters/self/default.nix deleted file mode 100644 index 0da843d3f1a3c..0000000000000 --- a/pkgs/development/interpreters/self/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, libX11, libXext, makeWrapper, ncurses, cmake }: - -stdenv.mkDerivation rec { - # The Self wrapper stores source in $XDG_DATA_HOME/self or ~/.local/share/self - # so that it can be written to when using the Self transposer. Running 'Self' - # after installation runs without an image. You can then build a Self image with: - # $ cd ~/.local/share/self/objects - # $ Self - # > 'worldBuilder.self' _RunScript - # - # This image can later be started with: - # $ Self -s myimage.snap - # - pname = "self"; - version = "2017.1"; - - src = fetchFromGitHub { - owner = "russellallen"; - repo = pname; - rev = version; - sha256 = "C/1Q6yFmoXx2F97xuvkm8DxFmmvuBS7uYZOxq/CRNog="; - }; - - nativeBuildInputs = [ cmake makeWrapper ]; - buildInputs = [ ncurses libX11 libXext ]; - - selfWrapper = ./self; - - installPhase = '' - mkdir -p "$out"/bin - cp ./vm/Self "$out"/bin/Self.wrapped - mkdir -p "$out"/share/self - cp -r ../objects "$out"/share/self/ - makeWrapper $selfWrapper $out/bin/Self \ - --set SELF_ROOT "$out" - ''; - - meta = with lib; { - description = "A prototype-based dynamic object-oriented programming language, environment, and virtual machine"; - homepage = "https://selflanguage.org/"; - license = licenses.bsd3; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/interpreters/self/self b/pkgs/development/interpreters/self/self deleted file mode 100755 index d504682086b08..0000000000000 --- a/pkgs/development/interpreters/self/self +++ /dev/null @@ -1,18 +0,0 @@ -#! /usr/bin/env bash - -export SELF_HOME="$HOME/.local/share/self" -if [ -n "$XDG_DATA_HOME" ] - then export SELF_HOME="$XDG_DATA_HOME/self" -fi - -if [ ! -d $SELF_HOME ]; then - mkdir -p $SELF_HOME -fi - -if [ ! -d $SELF_HOME/objects ]; then - mkdir -p $SELF_HOME/objects - cp -r $SELF_ROOT/share/self/objects/* $SELF_HOME/objects - chmod -R +w $SELF_HOME/objects -fi - -exec $SELF_ROOT/bin/Self.wrapped "$@" diff --git a/pkgs/development/interpreters/wasmer/default.nix b/pkgs/development/interpreters/wasmer/default.nix index ee9dcd66bc59d..22b26c5345f03 100644 --- a/pkgs/development/interpreters/wasmer/default.nix +++ b/pkgs/development/interpreters/wasmer/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "wasmer"; - version = "4.2.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "wasmerio"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-7E/of0WP28VM7ceDCBsSCb6ot3FEYUZkHVk0H/LcbGk="; + hash = "sha256-GROw9TYKC53ECJUeYhCez8f2jImPla/lGgsP91tTGjQ="; }; - cargoHash = "sha256-1YlwYgnZzkYjY2yQlSZTs3JrUnIeZgpCDZBevqlj4WM="; + cargoHash = "sha256-JE7FDF4MWhqJbL7ZP+yzfV7/Z79x0NuQLYNwWwMjAao="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index 9bc8523d7d4a9..408830aa91561 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "12.0.1"; + version = "13.0.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - hash = "sha256-4h+c5ke4MZuIMiCaLBt6RsRe9PWAn6VqW2Z6Wnh7X30="; + hash = "sha256-D8Osn/vlPr9eg5F8O0K/eC/M0prHQM7U96k8Cx9D1/4="; fetchSubmodules = true; }; - cargoHash = "sha256-SG/SFskr6ywCtJu2WVWTJC9GUKJJB0fUb+hZUaxag0M="; + cargoHash = "sha256-nFKk6T3S86lPxn/JCEid2Xd9c5zQPOMFcKTi6eM89uE="; cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ]; cargoPatches = [ diff --git a/pkgs/development/interpreters/yabasic/default.nix b/pkgs/development/interpreters/yabasic/default.nix index 9ede197c8144d..ee4cb47b68290 100644 --- a/pkgs/development/interpreters/yabasic/default.nix +++ b/pkgs/development/interpreters/yabasic/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "yabasic"; - version = "2.90.3"; + version = "2.90.4"; src = fetchurl { url = "http://www.yabasic.de/download/yabasic-${finalAttrs.version}.tar.gz"; - hash = "sha256-ItmlkraNUE0qlq1RghUJcDq4MHb6HRKNoIRylugjboA="; + hash = "sha256-td54SC1LnO3z07m3BsVDpiAsmokzB4xn4dbVdfeYH8M="; }; buildInputs = [ diff --git a/pkgs/development/libraries/abseil-cpp/202308.nix b/pkgs/development/libraries/abseil-cpp/202308.nix index dbde04e6679f0..7ec0ac8a775f9 100644 --- a/pkgs/development/libraries/abseil-cpp/202308.nix +++ b/pkgs/development/libraries/abseil-cpp/202308.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "abseil-cpp"; - version = "20230802.0"; + version = "20230802.1"; src = fetchFromGitHub { owner = "abseil"; repo = "abseil-cpp"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-yILAsAERUDMbRWh8t4o6W74YiswvGIHSyBAIuLVbzxY="; + hash = "sha256-uNGrTNg5G5xFGtc+BSWE389x0tQ/KxJQLHfebNWas/k="; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix index efebd3034cdad..bbccb9d66a20a 100644 --- a/pkgs/development/libraries/amdvlk/default.nix +++ b/pkgs/development/libraries/amdvlk/default.nix @@ -25,13 +25,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2023.Q3.1"; + version = "2023.Q3.2"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "W+igZbdQG1L62oGJa2Rz0n8YkTsZFqSm7w8VFfPu8k0="; + sha256 = "/1D2BbT1gnMLvIHfpkxLkeo1pjbG9LkTx9Zl5+gGU/M="; }; buildInputs = [ diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix index 9d57891905afb..ec2d5561570e7 100644 --- a/pkgs/development/libraries/assimp/default.nix +++ b/pkgs/development/libraries/assimp/default.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation rec { pname = "assimp"; - version = "5.2.5"; + version = "5.3.1"; outputs = [ "out" "lib" "dev" ]; src = fetchFromGitHub { owner = "assimp"; repo = "assimp"; rev = "v${version}"; - hash = "sha256-vQx+PaET5mlvvIGHk6pEnZvM3qw8DiC3hd1Po6OAHxQ="; + hash = "sha256-/1A8n7oe9WsF3FpbLZxhifzrdj38t9l5Kc8Q5jfDoyY="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/backward-cpp/default.nix b/pkgs/development/libraries/backward-cpp/default.nix index 125e3799f572b..15556a4108c67 100644 --- a/pkgs/development/libraries/backward-cpp/default.nix +++ b/pkgs/development/libraries/backward-cpp/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/bombela/backward-cpp"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/development/libraries/boringssl/default.nix index 2c99989bc8892..5cb04d05a08d6 100644 --- a/pkgs/development/libraries/boringssl/default.nix +++ b/pkgs/development/libraries/boringssl/default.nix @@ -10,17 +10,18 @@ # reference: https://boringssl.googlesource.com/boringssl/+/2661/BUILDING.md buildGoModule { pname = "boringssl"; - version = "2021-07-09"; + version = "unstable-2023-09-27"; src = fetchgit { - url = "https://boringssl.googlesource.com/boringssl"; - rev = "268a4a6ff3bd656ae65fe41ef1185daa85cfae21"; - sha256 = "04fja4fdwhc69clmvg8i12zm6ks3sfl3r8i5bxn4x63b9dj5znlx"; + url = "https://boringssl.googlesource.com/boringssl"; + rev = "d24a38200fef19150eef00cad35b138936c08767"; + hash = "sha256-FBQ7y4N2rCM/Cyd6LBnDUXpSa2O3osUXukECTBjZL6s="; }; nativeBuildInputs = [ cmake ninja perl ]; - vendorSha256 = null; + vendorHash = "sha256-EJPcx07WuvHPAgiS1ASU6WHlHkxjUOO72if4TkmrqwY="; + proxyVendor = true; # hack to get both go and cmake configure phase # (if we use postConfigure then cmake will loop runHook postConfigure) diff --git a/pkgs/development/libraries/capnproto/default.nix b/pkgs/development/libraries/capnproto/default.nix index f21c3955836d0..05e80893ebb0e 100644 --- a/pkgs/development/libraries/capnproto/default.nix +++ b/pkgs/development/libraries/capnproto/default.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation rec { pname = "capnproto"; - version = "0.10.4"; + version = "1.0.1"; # release tarballs are missing some ekam rules src = fetchFromGitHub { owner = "capnproto"; repo = "capnproto"; rev = "v${version}"; - sha256 = "sha256-45sxnVyyYIw9i3sbFZ1naBMoUzkpP21WarzR5crg4X8="; + sha256 = "sha256-ZruJikcMZuUBmNq+f6+wUl4Rr6MVFxmgcj1TSOKM1ZE="; }; nativeBuildInputs = [ cmake ]; @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { ''; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/cdo/default.nix b/pkgs/development/libraries/cdo/default.nix index 8bece077f8c56..b016aa4d4d683 100644 --- a/pkgs/development/libraries/cdo/default.nix +++ b/pkgs/development/libraries/cdo/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "cdo"; - version = "2.2.0"; + version = "2.2.2"; # Dependencies buildInputs = [ curl netcdf hdf5 python3 ]; src = fetchurl { - url = "https://code.mpimet.mpg.de/attachments/download/28013/${pname}-${version}.tar.gz"; - sha256 = "sha256-Z5yNEFcGyv/LoJYOxd3EoTMsG0DFL4LDk3NWmZ2PrfI="; + url = "https://code.mpimet.mpg.de/attachments/download/28882/${pname}-${version}.tar.gz"; + sha256 = "sha256-QZx3MVJEAZr0GilsBQZvR0zMv5Tev6rp4hBtpRvHyTc="; }; configureFlags = [ diff --git a/pkgs/development/libraries/cgreen/default.nix b/pkgs/development/libraries/cgreen/default.nix index 86908c8713881..60d5bc1289ac5 100644 --- a/pkgs/development/libraries/cgreen/default.nix +++ b/pkgs/development/libraries/cgreen/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cgreen"; - version = "1.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "cgreen-devs"; repo = "cgreen"; rev = finalAttrs.version; - sha256 = "sha256-beaCoyDCERb/bdKcKS7dRQHlI0auLOStu3cZr1dhubg="; + sha256 = "sha256-qcOj+NlgbHCYuNsM6ngNI2fNhkCwLL6mIVkNSv9hRE8="; }; postPatch = '' diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index debc2b7aebdc7..5223f2039cf7f 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cpp-utilities"; - version = "5.24.0"; + version = "5.24.1"; src = fetchFromGitHub { owner = "Martchus"; repo = "cpp-utilities"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-krskfuoCRxYcAIDqrae4+yEABXXZ9Nv0BjBVwSMjC7g="; + sha256 = "sha256-Prb593+jXhYzwPHQnwen2qgaNfdX1Atiz1FhmXm9X7U="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cracklib/default.nix b/pkgs/development/libraries/cracklib/default.nix index 484af3337a09e..ba5d96a95182b 100644 --- a/pkgs/development/libraries/cracklib/default.nix +++ b/pkgs/development/libraries/cracklib/default.nix @@ -1,8 +1,8 @@ -let version = "2.9.8"; in +let version = "2.9.11"; in { stdenv, lib, buildPackages, fetchurl, zlib, gettext , wordlists ? [ (fetchurl { url = "https://github.com/cracklib/cracklib/releases/download/v${version}/cracklib-words-${version}.gz"; - hash = "sha256-WLOCTIDdO6kIsMytUdbhZx4woj/u1gf7jmORR2i8T4U="; + hash = "sha256-popxGjE1c517Z+nzYLM/DU7M+b1/rE0XwNXkVqkcUXo="; }) ] }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - hash = "sha256-H500OF6jqnzXwH+jiNwlgQrqnTwz4mDHE6Olhz1w44Y="; + hash = "sha256-yosEmjwtOyIloejRXWE3mOvHSOOVA4jtomlN5Qe6YCA="; }; nativeBuildInputs = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) buildPackages.cracklib; diff --git a/pkgs/development/libraries/ctranslate2/default.nix b/pkgs/development/libraries/ctranslate2/default.nix index a4ebfb5c3de1a..f9408818e37fe 100644 --- a/pkgs/development/libraries/ctranslate2/default.nix +++ b/pkgs/development/libraries/ctranslate2/default.nix @@ -10,6 +10,10 @@ , withOneDNN ? false, oneDNN , withOpenblas ? true, openblas , withRuy ? true + +# passthru tests +, libretranslate +, wyoming-faster-whisper }: let @@ -17,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "ctranslate2"; - version = "3.18.0"; + version = "3.20.0"; src = fetchFromGitHub { owner = "OpenNMT"; repo = "CTranslate2"; rev = "v${version}"; - hash = "sha256-ipCUiCyWubKTUB0jDOsRN+DSg3S84hbj8Xum/2NsrKc="; + hash = "sha256-PdCjzLyc5O1rrTtPz8JD08unY7uMNS5fcD3ZLHJDeYg="; fetchSubmodules = true; }; @@ -57,6 +61,13 @@ stdenv.mkDerivation rec { darwin.apple_sdk.frameworks.CoreVideo ]; + passthru.tests = { + inherit + libretranslate + wyoming-faster-whisper + ; + }; + meta = with lib; { description = "Fast inference engine for Transformer models"; homepage = "https://github.com/OpenNMT/CTranslate2"; diff --git a/pkgs/development/libraries/cyclonedds/default.nix b/pkgs/development/libraries/cyclonedds/default.nix index 96d49c3132f5f..899249150b31c 100644 --- a/pkgs/development/libraries/cyclonedds/default.nix +++ b/pkgs/development/libraries/cyclonedds/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "cyclonedds"; - version = "0.10.3"; + version = "0.10.4"; src = fetchFromGitHub { owner = "eclipse-cyclonedds"; repo = "cyclonedds"; rev = version; - sha256 = "sha256-Ie2l2TwEXqhMZWL3CmQD+c8LdQlclP6egsP7jnsOAlM="; + sha256 = "sha256-LSCfQPyd/QOsrnLNbKb0OlCvmHi/2aDDhi8VeXpYb1w="; }; patches = [ diff --git a/pkgs/development/libraries/dav1d/default.nix b/pkgs/development/libraries/dav1d/default.nix index 8476860f1e797..9c5e5101c8afb 100644 --- a/pkgs/development/libraries/dav1d/default.nix +++ b/pkgs/development/libraries/dav1d/default.nix @@ -4,6 +4,13 @@ , withTools ? false # "dav1d" binary , withExamples ? false, SDL2 # "dav1dplay" binary , useVulkan ? false, libplacebo, vulkan-loader, vulkan-headers + +# for passthru.tests +, ffmpeg +, gdal +, handbrake +, libavif +, libheif }: assert useVulkan -> withExamples; @@ -34,6 +41,15 @@ stdenv.mkDerivation rec { doCheck = true; + passthru.tests = { + inherit + ffmpeg + gdal + handbrake + libavif + libheif; + }; + meta = with lib; { description = "A cross-platform AV1 decoder focused on speed and correctness"; longDescription = '' diff --git a/pkgs/development/libraries/drogon/default.nix b/pkgs/development/libraries/drogon/default.nix index 4c2ec82b0f3ce..a82759ba3e57a 100644 --- a/pkgs/development/libraries/drogon/default.nix +++ b/pkgs/development/libraries/drogon/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "drogon"; - version = "1.8.6"; + version = "1.8.7"; src = fetchFromGitHub { owner = "drogonframework"; repo = "drogon"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-BYZoMesDquXaphZvnf2Vd/RuOC9jsOjZsGNbDmQ3u+c="; + sha256 = "sha256-lKV4dRIIkCn/qW8DyqDRHADh0tW0/ocf/29ox9aC0Yo="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/duckdb/default.nix b/pkgs/development/libraries/duckdb/default.nix index f02dacb950342..ea152c0cc099d 100644 --- a/pkgs/development/libraries/duckdb/default.nix +++ b/pkgs/development/libraries/duckdb/default.nix @@ -15,13 +15,13 @@ let in stdenv.mkDerivation rec { pname = "duckdb"; - version = "0.8.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-LEv9yURkYvONObTbIA4CS+umwCRMH8gRQaDtzbCzID4="; + hash = "sha256-EKvDH7RwOC4Gu/lturrfnGpzXnJ9azIwAFeuVoa6L/Y="; }; patches = [ ./version.patch ]; @@ -36,19 +36,7 @@ stdenv.mkDerivation rec { ++ lib.optionals withOdbc [ unixODBC ]; cmakeFlags = [ - "-DBUILD_AUTOCOMPLETE_EXTENSION=ON" - "-DBUILD_ICU_EXTENSION=ON" - "-DBUILD_PARQUET_EXTENSION=ON" - "-DBUILD_TPCH_EXTENSION=ON" - "-DBUILD_TPCDS_EXTENSION=ON" - "-DBUILD_FTS_EXTENSION=ON" - "-DBUILD_HTTPFS_EXTENSION=ON" - "-DBUILD_VISUALIZER_EXTENSION=ON" - "-DBUILD_JSON_EXTENSION=ON" - "-DBUILD_JEMALLOC_EXTENSION=ON" - "-DBUILD_EXCEL_EXTENSION=ON" - "-DBUILD_INET_EXTENSION=ON" - "-DBUILD_TPCE=ON" + "-DDUCKDB_EXTENSION_CONFIGS=${src}/.github/config/in_tree_extensions.cmake" "-DBUILD_ODBC_DRIVER=${enableFeature withOdbc}" "-DJDBC_DRIVER=${enableFeature withJdbc}" ] ++ lib.optionals doInstallCheck [ @@ -69,6 +57,7 @@ stdenv.mkDerivation rec { excludes = map (pattern: "exclude:'${pattern}'") [ "[s3]" "Test closing database during long running query" + "Test using a remote optimizer pass in case thats important to someone" "test/common/test_cast_hugeint.test" "test/sql/copy/csv/test_csv_remote.test" "test/sql/copy/parquet/test_parquet_remote.test" @@ -79,6 +68,8 @@ stdenv.mkDerivation rec { "test/sql/storage/compression/patas/patas_read.test" "test/sql/json/read_json_objects.test" "test/sql/json/read_json.test" + "test/sql/json/table/read_json_objects.test" + "test/sql/json/table/read_json.test" "test/sql/copy/parquet/parquet_5968.test" "test/fuzzer/pedro/buffer_manager_out_of_memory.test" "test/sql/storage/compression/bitpacking/bitpacking_size_calculation.test" @@ -90,6 +81,7 @@ stdenv.mkDerivation rec { "test/sql/copy/parquet/delta_byte_array_multiple_pages.test" "test/sql/copy/csv/test_csv_httpfs_prepared.test" "test/sql/copy/csv/test_csv_httpfs.test" + "test/sql/settings/test_disabled_file_system_httpfs.test" "test/sql/copy/csv/parallel/test_parallel_csv.test" "test/sql/copy/csv/parallel/csv_parallel_httpfs.test" "test/common/test_cast_struct.test" diff --git a/pkgs/development/libraries/duckdb/version.patch b/pkgs/development/libraries/duckdb/version.patch index 1f52fdb3b9351..9b368eac5dbc6 100644 --- a/pkgs/development/libraries/duckdb/version.patch +++ b/pkgs/development/libraries/duckdb/version.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 349af6acf7..7ffec0b4cb 100644 +index 2b49e11288..0a4a69b9a0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -196,52 +196,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "SunOS") +@@ -244,52 +244,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "SunOS") set(SUN TRUE) endif() @@ -56,3 +56,25 @@ index 349af6acf7..7ffec0b4cb 100644 message(STATUS "git hash ${GIT_COMMIT_HASH}, version ${DUCKDB_VERSION}") +diff --git a/tools/pythonpkg/setup.py b/tools/pythonpkg/setup.py +index fdf2911019..c363cc518a 100644 +--- a/tools/pythonpkg/setup.py ++++ b/tools/pythonpkg/setup.py +@@ -163,8 +163,6 @@ if 'BUILD_HTTPFS' in os.environ: + for ext in extensions: + toolchain_args.extend(['-DDUCKDB_EXTENSION_{}_LINKED'.format(ext.upper())]) + +-toolchain_args.extend(['-DDUCKDB_EXTENSION_AUTOLOAD_DEFAULT=1', '-DDUCKDB_EXTENSION_AUTOINSTALL_DEFAULT=1']) +- + + class get_pybind_include(object): + def __init__(self, user=False): +@@ -343,7 +341,7 @@ setup( + packages=packages, + include_package_data=True, + python_requires='>=3.7.0', +- setup_requires=setup_requires + ["setuptools_scm<7.0.0", 'pybind11>=2.6.0'], ++ setup_requires=setup_requires + ["setuptools_scm", 'pybind11>=2.6.0'], + use_scm_version=setuptools_scm_conf, + tests_require=['google-cloud-storage', 'mypy', 'pytest'], + classifiers=[ diff --git a/pkgs/development/libraries/elpa/default.nix b/pkgs/development/libraries/elpa/default.nix index 003de885c7919..810e04d3a3770 100644 --- a/pkgs/development/libraries/elpa/default.nix +++ b/pkgs/development/libraries/elpa/default.nix @@ -41,6 +41,8 @@ stdenv.mkDerivation rec { substituteInPlace Makefile.am --replace '#!/bin/bash' '#!${stdenv.shell}' ''; + outputs = [ "out" "doc" "man" "dev" ]; + nativeBuildInputs = [ autoreconfHook perl ]; buildInputs = [ mpi blas lapack scalapack ] @@ -74,6 +76,8 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.hostPlatform.isx86_64 "--enable-sse-assembly" ++ lib.optionals enableCuda [ "--enable-nvidia-gpu" "--with-NVIDIA-GPU-compute-capability=${nvidiaArch}" ]; + enableParallelBuilding = true; + doCheck = true; nativeCheckInputs = [ mpiCheckPhaseHook openssh ]; diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix index 5fb09906895ee..690eba91e5724 100644 --- a/pkgs/development/libraries/enchant/2.x.nix +++ b/pkgs/development/libraries/enchant/2.x.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "enchant"; - version = "2.5.0"; + version = "2.6.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-FJ4iTN0sqCXYdGOVeLYkbgfzfVuPOXBlijd6HvRvLhU="; + hash = "sha256-M1fqk6F0T/vNcwIjzINmE11A/1mIGuBZHVHT7o/5rm8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/fastcdr/0001-Do-not-require-wget-and-unzip.patch b/pkgs/development/libraries/fastcdr/0001-Do-not-require-wget-and-unzip.patch new file mode 100644 index 0000000000000..8908beb082408 --- /dev/null +++ b/pkgs/development/libraries/fastcdr/0001-Do-not-require-wget-and-unzip.patch @@ -0,0 +1,34 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +Date: Sat, 5 Jun 2021 14:50:26 +0200 +Subject: [PATCH] Do not require wget and unzip + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2261fe7..ce8edad 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -243,21 +243,6 @@ if(BUILD_DOCUMENTATION) + set(DOXYFILE_MAKE make.bat) + endif() + +- if(NOT CHECK_DOCUMENTATION) +- find_program(WGET_EXE wget) +- if(WGET_EXE) +- message(STATUS "Found WGet: ${WGET_EXE}") +- else() +- message(FATAL_ERROR "wget is needed to build the documentation. Please install it correctly") +- endif() +- find_program(UNZIP_EXE unzip) +- if(UNZIP_EXE) +- message(STATUS "Found Unzip: ${UNZIP_EXE}") +- else() +- message(FATAL_ERROR "unzip is needed to build the documentation. Please install it correctly") +- endif() +- endif() +- + # Target to create documentation directories + add_custom_target(docdirs + COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/doc +-- +2.40.1 + diff --git a/pkgs/development/libraries/fastcdr/default.nix b/pkgs/development/libraries/fastcdr/default.nix new file mode 100644 index 0000000000000..19998799a6fbe --- /dev/null +++ b/pkgs/development/libraries/fastcdr/default.nix @@ -0,0 +1,56 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, gtest +, withDocs ? true +, doxygen +, graphviz-nox +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "fastcdr"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "eProsima"; + repo = "Fast-CDR"; + rev = "v${finalAttrs.version}"; + hash = "sha256-ZJQnm3JN56y2v/XIShfZxkEEu1AKMJxt8wpRqSn9HWk="; + }; + + patches = [ + ./0001-Do-not-require-wget-and-unzip.patch + ]; + + cmakeFlags = lib.optional (stdenv.hostPlatform.isStatic) "-DBUILD_SHARED_LIBS=OFF" + # fastcdr doesn't respect BUILD_TESTING + ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) "-DEPROSIMA_BUILD_TESTS=ON" + ++ lib.optional withDocs "-DBUILD_DOCUMENTATION=ON"; + + outputs = [ "out" ] ++ lib.optional withDocs "doc"; + + nativeBuildInputs = [ + cmake + ] ++ lib.optionals withDocs [ + doxygen + graphviz-nox + ]; + + doCheck = true; + + checkInputs = [ gtest ]; + + meta = with lib; { + homepage = "https://github.com/eProsima/Fast-CDR"; + description = "Serialization library for OMG's Common Data Representation (CDR)"; + longDescription = '' + A C++ library that provides two serialization mechanisms. One is the + standard CDR serialization mechanism, while the other is a faster + implementation that modifies the standard. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ panicgh ]; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix index af07f5854ccb8..2c23409dc8696 100644 --- a/pkgs/development/libraries/faudio/default.nix +++ b/pkgs/development/libraries/faudio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "faudio"; - version = "23.08"; + version = "23.10"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "sha256-ceFnk0JQtolx7Q1FnADCO0z6fCxu1RzmN3sHohy4hzU="; + sha256 = "sha256-h4wPUUYG8IZr2jHUlKFO2K3QKGiX9AzyLc2Ma5hR8Tk="; }; nativeBuildInputs = [cmake]; diff --git a/pkgs/development/libraries/fdk-aac/default.nix b/pkgs/development/libraries/fdk-aac/default.nix index 71077d6e315e2..99e211877da1e 100644 --- a/pkgs/development/libraries/fdk-aac/default.nix +++ b/pkgs/development/libraries/fdk-aac/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A high-quality implementation of the AAC codec from Android"; homepage = "https://sourceforge.net/projects/opencore-amr/"; - license = licenses.asl20; + license = licenses.fraunhofer-fdk; maintainers = with maintainers; [ codyopel ]; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix index 6bd9a8b8f1ae2..8dc42dea247d4 100644 --- a/pkgs/development/libraries/ffmpeg/4.nix +++ b/pkgs/development/libraries/ffmpeg/4.nix @@ -7,5 +7,17 @@ import ./generic.nix { url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/031f1561cd286596cdb374da32f8aa816ce3b135"; hash = "sha256-mSnmAkoNikDpxcN+A/hpB7mUbbtcMvm4tG6gZFuroe8="; } + # The upstream patch isn’t for ffmpeg 4, but it will apply with a few tweaks. + # Fixes a crash when built with clang 16 due to UB in ff_seek_frame_binary. + { + name = "utils-fix_crash_in_ff_seek_frame_binary.patch"; + url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/ab792634197e364ca1bb194f9abe36836e42f12d"; + hash = "sha256-UxZ4VneZpw+Q/UwkEUDNdb2nOx1QnMrZ40UagspNTxI="; + postFetch = '' + substituteInPlace "$out" \ + --replace libavformat/seek.c libavformat/utils.c \ + --replace 'const AVInputFormat *const ' 'const AVInputFormat *' + ''; + } ]; } diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 6bde5aa776ba6..cd02c6bba15c2 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -80,7 +80,7 @@ , withSvtav1 ? withHeadlessDeps && !stdenv.isAarch64 # AV1 encoder/decoder (focused on speed and correctness) , withTensorflow ? false # Tensorflow dnn backend support , withTheora ? withHeadlessDeps # Theora encoder -, withV4l2 ? withFullDeps && !stdenv.isDarwin # Video 4 Linux support +, withV4l2 ? withHeadlessDeps && !stdenv.isDarwin # Video 4 Linux support , withV4l2M2m ? withV4l2 , withVaapi ? withHeadlessDeps && (with stdenv; isLinux || isFreeBSD) # Vaapi hardware acceleration , withVdpau ? withSmallDeps # Vdpau hardware acceleration @@ -545,7 +545,10 @@ stdenv.mkDerivation (finalAttrs: { in "remove-references-to ${lib.concatStringsSep " " (map (o: "-t ${o}") toStrip)} config.h"; - nativeBuildInputs = [ removeReferencesTo addOpenGLRunpath perl pkg-config texinfo yasm ]; + strictDeps = true; + + nativeBuildInputs = [ removeReferencesTo addOpenGLRunpath perl pkg-config texinfo yasm ] + ++ optionals withCudaLLVM [ clang ]; # TODO This was always in buildInputs before, why? buildInputs = optionals withFullDeps [ libdc1394 ] @@ -559,7 +562,6 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withBzlib [ bzip2 ] ++ optionals withCaca [ libcaca ] ++ optionals withCelt [ celt ] - ++ optionals withCudaLLVM [ clang ] ++ optionals withDav1d [ dav1d ] ++ optionals withDrm [ libdrm ] ++ optionals withFdkAac [ fdk_aac ] @@ -697,5 +699,6 @@ stdenv.mkDerivation (finalAttrs: { pkgConfigModules = [ "libavutil" ]; platforms = platforms.all; maintainers = with maintainers; [ atemu ]; + mainProgram = "ffmpeg"; }; }) diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/pkgs/development/libraries/flatbuffers/default.nix index 58bf002eb2722..747a976f4c9e3 100644 --- a/pkgs/development/libraries/flatbuffers/default.nix +++ b/pkgs/development/libraries/flatbuffers/default.nix @@ -7,22 +7,17 @@ stdenv.mkDerivation rec { pname = "flatbuffers"; - version = "23.3.3"; + version = "23.5.26"; src = fetchFromGitHub { owner = "google"; repo = "flatbuffers"; rev = "v${version}"; - sha256 = "sha256-h0lF7jf1cDVVyqhUCi7D0NoZ3b4X/vWXsFplND80lGs="; + hash = "sha256-e+dNPNbCHYDXUS/W+hMqf/37fhVgEGzId6rhP3cToTE="; }; nativeBuildInputs = [ cmake python3 ]; - postPatch = '' - # Fix default value of "test_data_path" to make tests work - substituteInPlace tests/test.cpp --replace '"tests/";' '"../tests/";' - ''; - cmakeFlags = [ "-DFLATBUFFERS_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" "-DFLATBUFFERS_OSX_BUILD_UNIVERSAL=OFF" diff --git a/pkgs/development/libraries/flatcc/default.nix b/pkgs/development/libraries/flatcc/default.nix index a65ad5c6fe377..1f487955b3f37 100644 --- a/pkgs/development/libraries/flatcc/default.nix +++ b/pkgs/development/libraries/flatcc/default.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DFLATCC_INSTALL=on" - "-DCMAKE_BUILD_TYPE=Release" ]; env.NIX_CFLAGS_COMPILE = toString [ diff --git a/pkgs/development/libraries/flatpak/binary-path.patch b/pkgs/development/libraries/flatpak/binary-path.patch new file mode 100644 index 0000000000000..9da437df91b71 --- /dev/null +++ b/pkgs/development/libraries/flatpak/binary-path.patch @@ -0,0 +1,29 @@ +diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c +index eba81fef..134024e2 100644 +--- a/common/flatpak-dir.c ++++ b/common/flatpak-dir.c +@@ -7532,8 +7532,13 @@ export_desktop_file (const char *app, + g_key_file_remove_key (keyfile, groups[i], "X-GNOME-Bugzilla-ExtraInfoScript", NULL); + + new_exec = g_string_new (""); +- if ((flatpak = g_getenv ("FLATPAK_BINARY")) == NULL) +- flatpak = FLATPAK_BINDIR "/flatpak"; ++ if (g_str_has_suffix (name, ".service")) ++ { ++ flatpak = "/run/current-system/sw/bin/flatpak"; ++ } else { ++ if ((flatpak = g_getenv ("FLATPAK_BINARY")) == NULL) ++ flatpak = "flatpak"; ++ } + + g_string_append_printf (new_exec, + "%s run --branch=%s --arch=%s", +@@ -8867,7 +8872,7 @@ flatpak_dir_deploy (FlatpakDir *self, + error)) + return FALSE; + if ((flatpak = g_getenv ("FLATPAK_BINARY")) == NULL) +- flatpak = FLATPAK_BINDIR "/flatpak"; ++ flatpak = "flatpak"; + + bin_data = g_strdup_printf ("#!/bin/sh\nexec %s run --branch=%s --arch=%s %s \"$@\"\n", + flatpak, escaped_branch, escaped_arch, escaped_app); diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index 69dca4c50446e..0c44b99db8d9b 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -89,6 +89,11 @@ stdenv.mkDerivation (finalAttrs: { # https://github.com/NixOS/nixpkgs/issues/53441 ./unset-env-vars.patch + # Use flatpak from PATH to avoid references to `/nix/store` in `/desktop` files. + # Applications containing `DBusActivatable` entries should be able to find the flatpak binary. + # https://github.com/NixOS/nixpkgs/issues/138956 + ./binary-path.patch + # The icon validator needs to access the gdk-pixbuf loaders in the Nix store # and cannot bind FHS paths since those are not available on NixOS. finalAttrs.passthru.icon-validator-patch @@ -176,13 +181,6 @@ stdenv.mkDerivation (finalAttrs: { PATH=${lib.makeBinPath [vsc-py]}:$PATH patchShebangs --build subprojects/variant-schema-compiler/variant-schema-compiler ''; - preFixup = '' - gappsWrapperArgs+=( - # Use flatpak from PATH in exported assets (e.g. desktop files). - --set FLATPAK_BINARY flatpak - ) - ''; - passthru = { icon-validator-patch = substituteAll { src = ./fix-icon-validation.patch; diff --git a/pkgs/development/libraries/functionalplus/default.nix b/pkgs/development/libraries/functionalplus/default.nix index 4fc6c745cf62c..b456dd8873448 100644 --- a/pkgs/development/libraries/functionalplus/default.nix +++ b/pkgs/development/libraries/functionalplus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "functionalplus"; - version = "0.2.18-p0"; + version = "0.2.20-p0"; src = fetchFromGitHub { owner = "Dobiasd"; repo = "FunctionalPlus"; rev = "v${version}"; - sha256 = "sha256-jypBQjFdVEktB8Q71RTg+3RJoeFwD5Wxw+fq+4QG38g="; + sha256 = "sha256-PKd3gx63VTxyq1q0v7WaKXVA0oICpZQfVsKsgUml9wk="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/gr-framework/Use-the-module-mode-to-search-for-the-LibXml2-package.patch b/pkgs/development/libraries/gr-framework/Use-the-module-mode-to-search-for-the-LibXml2-package.patch new file mode 100644 index 0000000000000..b472d7271e8da --- /dev/null +++ b/pkgs/development/libraries/gr-framework/Use-the-module-mode-to-search-for-the-LibXml2-package.patch @@ -0,0 +1,25 @@ +From 5d2377ad5e99742662e056bb782d5c21afb01dfb Mon Sep 17 00:00:00 2001 +From: Pavel Sobolev <paveloom@riseup.net> +Date: Tue, 19 Sep 2023 13:27:39 +0300 +Subject: [PATCH] Use the module mode to search for the `LibXml2` package. + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 03490335..fb69e8fd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -96,7 +96,7 @@ find_package(Expat) + # CMake ships with a `FindLibXml2.cmake` module which does not configure needed libxml2 dependencies. + # Thus, use the `libxml2-config.cmake` config file shipped with libxml which configures dependencies correctly by + # skipping module search mode. +-find_package(LibXml2 NO_MODULE) ++find_package(LibXml2 MODULE) + if(${CMAKE_VERSION} VERSION_GREATER "3.16.0") + find_package( + Qt6 +-- +2.42.0 + diff --git a/pkgs/development/libraries/gr-framework/default.nix b/pkgs/development/libraries/gr-framework/default.nix index 415d9c4033bf6..42994adc73751 100644 --- a/pkgs/development/libraries/gr-framework/default.nix +++ b/pkgs/development/libraries/gr-framework/default.nix @@ -1,17 +1,18 @@ -{ cairo -, cmake +{ lib +, stdenv , fetchFromGitHub +, nix-update-script + +, cairo +, cmake , ffmpeg , freetype , ghostscript , glfw -, lib , libjpeg , libtiff -, nix-update-script , qhull , qtbase -, stdenv , wrapQtAppsHook , xorg , zeromq @@ -19,15 +20,19 @@ stdenv.mkDerivation rec { pname = "gr-framework"; - version = "0.72.9"; + version = "0.72.10"; src = fetchFromGitHub { owner = "sciapp"; repo = "gr"; rev = "v${version}"; - hash = "sha256-4rOcrMn0sxTeRQqiQMAWULzUV39i6J96Mb096Lyblns="; + hash = "sha256-ZFaun8PBtPTmhZ0+OHzUu27NvcJGxsImh+c7ZvCTNa0="; }; + patches = [ + ./Use-the-module-mode-to-search-for-the-LibXml2-package.patch + ]; + nativeBuildInputs = [ cmake wrapQtAppsHook diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index a527faf5a8beb..792f305a83ba6 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -24,6 +24,7 @@ , gobject-introspection , buildPackages , withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages +, compileSchemas ? stdenv.hostPlatform.emulatorAvailable buildPackages , fribidi , xorg , libepoxy @@ -110,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: { gtk-doc # For xmllint libxml2 - ] ++ lib.optionals (withIntrospection && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + ] ++ lib.optionals ((withIntrospection || compileSchemas) && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook ] ++ lib.optionals waylandSupport [ wayland-scanner @@ -183,6 +184,10 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace meson.build \ --replace "x11_enabled = false" "" + # this conditional gates the installation of share/gsettings-schemas/.../glib-2.0/schemas/gschemas.compiled. + substituteInPlace meson.build \ + --replace 'if not meson.is_cross_build()' 'if ${lib.boolToString compileSchemas}' + files=( build-aux/meson/post-install.py demos/gtk-demo/geninclude.py diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index b7e8c13ccca60..0503ac199f90b 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -1,5 +1,6 @@ { lib , stdenv +, buildPackages , substituteAll , fetchurl , pkg-config @@ -7,6 +8,7 @@ , graphene , gi-docgen , meson +, mesonEmulatorHook , ninja , python3 , makeWrapper @@ -45,6 +47,7 @@ , wayland-scanner , xineramaSupport ? stdenv.isLinux , cupsSupport ? stdenv.isLinux +, compileSchemas ? stdenv.hostPlatform.emulatorAvailable buildPackages , cups , AppKit , Cocoa @@ -99,6 +102,8 @@ stdenv.mkDerivation rec { sassc gi-docgen libxml2 # for xmllint + ] ++ lib.optionals (compileSchemas && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ] ++ lib.optionals waylandSupport [ wayland-scanner ] ++ setupHooks; @@ -190,6 +195,10 @@ stdenv.mkDerivation rec { }; postPatch = '' + # this conditional gates the installation of share/gsettings-schemas/.../glib-2.0/schemas/gschemas.compiled. + substituteInPlace meson.build \ + --replace 'if not meson.is_cross_build()' 'if ${lib.boolToString compileSchemas}' + files=( build-aux/meson/gen-demo-header.py demos/gtk-demo/geninclude.py diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index 82c5ea6597a5c..1d3f15ba9871b 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gtkmm"; - version = "3.24.7"; + version = "3.24.8"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "HXo1r5xc7MrLJE7jwt65skVyDYUQrFx+b0tvmUfmeJw="; + sha256 = "0pQMZJIuW5WFVLI9TEHRg56p5D4NLls4Gc+0aCSgmMQ="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/hmat-oss/default.nix b/pkgs/development/libraries/hmat-oss/default.nix index 01fe1c0a41cac..f24dc8777a73d 100644 --- a/pkgs/development/libraries/hmat-oss/default.nix +++ b/pkgs/development/libraries/hmat-oss/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "hmat-oss"; - version = "1.8.1"; + version = "1.9.0"; src = fetchFromGitHub { owner = "jeromerobert"; repo = "hmat-oss"; rev = "refs/tags/${version}"; - sha256 = "sha256-N6VSQeq2BS/PLcMbyIn/OQfd45zyJJHuOD5bho2nue8="; + sha256 = "sha256-JW6zghoYnF7NcAuAACgTQoxANEnmwjUAB8jCpof7Ums="; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/hpp-fcl/default.nix b/pkgs/development/libraries/hpp-fcl/default.nix index 421782fc8d3d8..7bf7132068676 100644 --- a/pkgs/development/libraries/hpp-fcl/default.nix +++ b/pkgs/development/libraries/hpp-fcl/default.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "hpp-fcl"; - version = "2.3.5"; + version = "2.3.6"; src = fetchFromGitHub { owner = "humanoid-path-planner"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-jVIYP0yA1oSsUMN4vtrkfawj9Q2MwNjSrwDBTvGErg8="; + hash = "sha256-Y6ATYXsV8hH22XiXyvacuUhHTuNCzObPlxNX2vZGghM="; }; strictDeps = true; diff --git a/pkgs/development/libraries/hyperscan/default.nix b/pkgs/development/libraries/hyperscan/default.nix index 2bfde78f7dbcf..0b9765dac4cf1 100644 --- a/pkgs/development/libraries/hyperscan/default.nix +++ b/pkgs/development/libraries/hyperscan/default.nix @@ -1,14 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, cmake, ragel, python3 -, util-linux, fetchpatch +{ lib +, stdenv +, fetchFromGitHub +, cmake +, ragel +, python3 +, util-linux +, pkg-config , boost +, pcre , withStatic ? false # build only shared libs by default, build static+shared if true }: -# NOTICE: pkg-config, pcap and pcre intentionally omitted from build inputs -# pcap used only in examples, pkg-config used only to check for pcre -# which is fixed 8.41 version requirement (nixpkgs have 8.42+, and -# I not see any reason (for now) to backport 8.41. - stdenv.mkDerivation (finalAttrs: { pname = "hyperscan"; version = "5.4.2"; @@ -24,16 +26,24 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ boost ]; nativeBuildInputs = [ - cmake ragel python3 util-linux + cmake ragel python3 util-linux pkg-config ]; cmakeFlags = [ - "-DFAT_RUNTIME=ON" "-DBUILD_AVX512=ON" ] + ++ lib.optional (!stdenv.isDarwin) "-DFAT_RUNTIME=ON" ++ lib.optional (withStatic) "-DBUILD_STATIC_AND_SHARED=ON" ++ lib.optional (!withStatic) "-DBUILD_SHARED_LIBS=ON"; + # hyperscan CMake is completely broken for chimera builds when pcre is compiled + # the only option to make it build - building from source + # In case pcre is built from source, chimera build is turned on by default + preConfigure = lib.optional withStatic '' + mkdir -p pcre + tar xvf ${pcre.src} --strip-components 1 -C pcre + ''; + postPatch = '' sed -i '/examples/d' CMakeLists.txt substituteInPlace libhs.pc.in \ @@ -46,6 +56,7 @@ stdenv.mkDerivation (finalAttrs: { runHook preCheck bin/unit-hyperscan + ${lib.optionalString withStatic ''bin/unit-chimera''} runHook postCheck ''; @@ -67,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.hyperscan.io/"; maintainers = with maintainers; [ avnik ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; license = licenses.bsd3; }; }) diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index 4f3c956a440dc..f85ec4d96b396 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -29,11 +29,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "imlib2"; - version = "1.11.1"; + version = "1.12.0"; src = fetchurl { url = "mirror://sourceforge/enlightenment/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; - hash = "sha256-9xK2u53K1G2Lj0rVJhDcu667TMgLX9EvkxJNOjgPpr8="; + hash = "sha256-lf9dTMF92fk0wuetFRw2DzCIgKCnhJpspDt8e5pLshY="; }; buildInputs = [ @@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://docs.enlightenment.org/api/imlib2/html"; - changelog = "https://git.enlightenment.org/legacy/imlib2.git/plain/ChangeLog?h=v${version}"; + changelog = "https://git.enlightenment.org/old/legacy-imlib2/raw/tag/v${finalAttrs.version}/ChangeLog"; license = licenses.imlib2; pkgConfigModules = [ "imlib2" ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index 7faeb324ad552..331198e975edc 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake # for passthru.tests , intel-compute-runtime @@ -10,24 +9,15 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "22.3.7"; + version = "22.3.11"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "intel-gmmlib-${version}"; - sha256 = "sha256-/iwTPWRVTZk1dhZD2Grcnc76ItgXjf2VrFD+93h8YvM="; + sha256 = "sha256-pweKUf/KW64neJkEZwjePh7ft8KEBu1I9zCIx/lMQT8="; }; - patches = [ - # fix build on i686 - # https://github.com/intel/gmmlib/pull/104 - (fetchpatch { - url = "https://github.com/intel/gmmlib/commit/2526286f29d8ad3d3a5833bdc29e23e5f3300b34.patch"; - hash = "sha256-mChK6wprAt+bo39g6LTNy25kJeGoKabpXFq2gSDhaPw="; - }) - ]; - nativeBuildInputs = [ cmake ]; passthru.tests = { diff --git a/pkgs/development/libraries/java/commons/bcel/default.nix b/pkgs/development/libraries/java/commons/bcel/default.nix index 053d06f34a6e2..6f0961e71630f 100644 --- a/pkgs/development/libraries/java/commons/bcel/default.nix +++ b/pkgs/development/libraries/java/commons/bcel/default.nix @@ -1,12 +1,12 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation rec { - version = "6.6.1"; + version = "6.7.0"; pname = "commons-bcel"; src = fetchurl { url = "mirror://apache/commons/bcel/binaries/bcel-${version}-bin.tar.gz"; - sha256 = "sha256-bwbERZqnmXD2LzGilDZYsr7BPQoTeZDwDU/8/AjAdP4="; + hash = "sha256-0b7iXp2iTwqcgI3IE3/Px/5mLT06yV6u5HdYboux6i4="; }; installPhase = '' diff --git a/pkgs/development/libraries/jbig2enc/default.nix b/pkgs/development/libraries/jbig2enc/default.nix index 734cb3839ad49..7c847918c9f98 100644 --- a/pkgs/development/libraries/jbig2enc/default.nix +++ b/pkgs/development/libraries/jbig2enc/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromGitHub , fetchpatch +, python3 , leptonica , zlib , libwebp @@ -24,6 +25,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook ]; + propagatedBuildInputs = [ leptonica zlib @@ -42,6 +44,11 @@ stdenv.mkDerivation rec { }) ]; + # We don't want to install this Python 2 script + postInstall = '' + rm "$out/bin/pdf.py" + ''; + # This is necessary, because the resulting library has # /tmp/nix-build-jbig2enc/src/.libs before /nix/store/jbig2enc/lib # in its rpath, which means that patchelf --shrink-rpath removes @@ -56,5 +63,6 @@ stdenv.mkDerivation rec { license = lib.licenses.asl20; platforms = lib.platforms.all; homepage = "https://github.com/agl/jbig2enc"; + mainProgram = "jbig2"; }; } diff --git a/pkgs/development/libraries/kde-frameworks/kio/default.nix b/pkgs/development/libraries/kde-frameworks/kio/default.nix index 3b07654fb8024..e0913a16a1f97 100644 --- a/pkgs/development/libraries/kde-frameworks/kio/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kio/default.nix @@ -28,5 +28,11 @@ mkDerivation { outputs = [ "out" "dev" ]; patches = [ ./0001-Remove-impure-smbd-search-path.patch + + # Fix a crash when saving files. + (fetchpatch { + url = "https://invent.kde.org/frameworks/kio/-/commit/48322f44323a1fc09305d66d9093fe6c3780709e.patch"; + hash = "sha256-4NxI2mD/TdthvrzgatCAlM6VN3N38i3IJUHh0Bs8Fjk="; + }) ]; } diff --git a/pkgs/development/libraries/keybinder3/default.nix b/pkgs/development/libraries/keybinder3/default.nix index cee48d5e9eff6..e7bbd2b131d53 100644 --- a/pkgs/development/libraries/keybinder3/default.nix +++ b/pkgs/development/libraries/keybinder3/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/kupferlauncher/keybinder/"; license = licenses.mit; platforms = platforms.unix; - maintainers = [ maintainers.cstrahan ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/kirigami-addons/default.nix b/pkgs/development/libraries/kirigami-addons/default.nix index 881b49364ee53..8cefa310b61ac 100644 --- a/pkgs/development/libraries/kirigami-addons/default.nix +++ b/pkgs/development/libraries/kirigami-addons/default.nix @@ -12,14 +12,14 @@ mkDerivation rec { pname = "kirigami-addons"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "libraries"; repo = pname; rev = "v${version}"; - hash = "sha256-wwc0PCY8vNCmmwfIYYQhQea9AYkHakvTaERtazz8npQ="; + hash = "sha256-KTkEfGmQf9kj+9e/rJM7jd/4BqubDLu5/oLkX88uENA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libavif/default.nix b/pkgs/development/libraries/libavif/default.nix index 3042dad31e177..27aaef5464330 100644 --- a/pkgs/development/libraries/libavif/default.nix +++ b/pkgs/development/libraries/libavif/default.nix @@ -19,13 +19,13 @@ in stdenv.mkDerivation rec { pname = "libavif"; - version = "0.11.1"; + version = "1.0.1"; src = fetchFromGitHub { owner = "AOMediaCodec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mUi0DU99XV3FzUZ8/9uJZU+W3fc6Bk6+y6Z78IRZ9Qs="; + sha256 = "sha256-3zNhKl8REWsRlblXIFD7zn7qvrc/pa4wHZI0oEc3pKE="; }; # reco: encode libaom slowest but best, decode dav1d fastest diff --git a/pkgs/development/libraries/libbsd/darwin-fix-libbsd.sym.patch b/pkgs/development/libraries/libbsd/darwin-fix-libbsd.sym.patch new file mode 100644 index 0000000000000..de40da981623b --- /dev/null +++ b/pkgs/development/libraries/libbsd/darwin-fix-libbsd.sym.patch @@ -0,0 +1,15 @@ +diff --git a/src/Makefile.am b/src/Makefile.am +index 9d22b00..c6848fc 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -198,7 +198,9 @@ libbsd_ctor_a_SOURCES = \ + # Generate a simple libtool symbol export list to be used as a fallback if + # there is no version script support. + libbsd.sym: libbsd.map +- $(AM_V_GEN) $(SED) -ne 's/^[[:space:]]\{1,\}\([A-Za-z0-9_]\{1,\}\);/\1/p' libbsd.map > $@ ++ $(AM_V_GEN) $(SED) -ne 's/^[[:space:]]\{1,\}\([A-Za-z0-9_]\{1,\}\);/\1/p' libbsd.map \ ++ | grep -Ev '(group_from_gid|user_from_uid|nlist|__fdnlist|bsd_getopt)' \ ++ > $@ + + if NEED_TRANSPARENT_LIBMD + TRANSPARENT_LIBMD_DEPENDS = format.ld diff --git a/pkgs/development/libraries/libbsd/darwin.patch b/pkgs/development/libraries/libbsd/darwin.patch deleted file mode 100644 index c52c64f35aee4..0000000000000 --- a/pkgs/development/libraries/libbsd/darwin.patch +++ /dev/null @@ -1,309 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 5b6d22b..98c449b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -145,7 +145,7 @@ AS_CASE([$host_os], - AM_CONDITIONAL([OS_WINDOWS], [test "x$is_windows" = "xyes"]) - - # Checks for header files. --AC_CHECK_HEADERS([sys/ndir.h sys/dir.h ndir.h dirent.h pwd.h grp.h]) -+AC_CHECK_HEADERS([sys/ndir.h sys/dir.h ndir.h dirent.h pwd.h grp.h nlist.h]) - - # Checks for typedefs, structures, and compiler characteristics. - AC_C_INLINE -@@ -245,7 +245,9 @@ AC_LINK_IFELSE( - - AC_CHECK_FUNCS([clearenv dirfd fopencookie __fpurge \ - getauxval getentropy getexecname getline \ -- pstat_getproc sysconf]) -+ pstat_getproc sysconf \ -+ strlcpy strlcat strnstr strmode fpurge \ -+ user_from_uid group_from_gid]) - AM_CONDITIONAL([HAVE_GETENTROPY], [test "x$ac_cv_func_getentropy" = "xtrue"]) - - AC_SUBST([MD5_LIBS]) -diff --git a/include/bsd/grp.h b/include/bsd/grp.h -index b2705e5..c9423a2 100644 ---- a/include/bsd/grp.h -+++ b/include/bsd/grp.h -@@ -44,8 +44,10 @@ - __BEGIN_DECLS - int - gid_from_group(const char *, gid_t *); -+#if !HAVE_GROUP_FROM_GID - const char * - group_from_gid(gid_t, int); -+#endif - __END_DECLS - - #endif -diff --git a/include/bsd/pwd.h b/include/bsd/pwd.h -index 798af4b..6ae5244 100644 ---- a/include/bsd/pwd.h -+++ b/include/bsd/pwd.h -@@ -44,8 +44,10 @@ - __BEGIN_DECLS - int - uid_from_user(const char *, uid_t *); -+#if !HAVE_USER_FROM_UID - const char * - user_from_uid(uid_t, int); -+#endif - __END_DECLS - - #endif -diff --git a/include/bsd/string.h b/include/bsd/string.h -index f987fee..a1e17ed 100644 ---- a/include/bsd/string.h -+++ b/include/bsd/string.h -@@ -41,10 +41,21 @@ - #include <sys/types.h> - - __BEGIN_DECLS -+#if !HAVE_STRLCPY - size_t strlcpy(char *dst, const char *src, size_t siz); -+#endif -+ -+#if !HAVE_STRLCAT - size_t strlcat(char *dst, const char *src, size_t siz); -+#endif -+ -+#if !HAVE_STRNSTR - char *strnstr(const char *str, const char *find, size_t str_len); -+#endif -+ -+#if !HAVE_STRMODE - void strmode(mode_t mode, char *str); -+#endif - - #if !defined(__GLIBC__) || \ - (defined(__GLIBC__) && (!__GLIBC_PREREQ(2, 25) || !defined(_GNU_SOURCE))) -diff --git a/src/fpurge.c b/src/fpurge.c -index 350f364..ff7f01e 100644 ---- a/src/fpurge.c -+++ b/src/fpurge.c -@@ -26,9 +26,10 @@ - - #include <errno.h> - #include <stdio.h> --#include <stdio_ext.h> - - #ifdef HAVE___FPURGE -+#include <stdio_ext.h> -+ - int - fpurge(FILE *fp) - { -@@ -41,6 +42,36 @@ fpurge(FILE *fp) - - return 0; - } -+/* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin 1.7 */ -+#elif HAVE_FPURGE -+int -+fpurge(FILE *fp) -+{ -+ if (fp == NULL || fileno(fp) < 0) { -+ errno = EBADF; -+ return EOF; -+ } -+ -+ /* Call the system's fpurge function. */ -+#undef fpurge -+#if !HAVE_DECL_FPURGE -+ extern int fpurge (FILE *); -+#endif -+ int result = fpurge (fp); -+/* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ -+#if defined(__sferror) || defined(__DragonFly__) -+ if (result == 0) -+ /* Correct the invariants that fpurge broke. -+ <stdio.h> on BSD systems says: -+ "The following always hold: if _flags & __SRD, _w is 0." -+ If this invariant is not fulfilled and the stream is read-write but -+ currently reading, subsequent putc or fputc calls will write directly -+ into the buffer, although they shouldn't be allowed to. */ -+ if ((fp->_flags & __SRD) != 0) -+ fp->_w = 0; -+#endif -+ return result; -+} - #else - #error "Function fpurge() needs to be ported." - #endif -diff --git a/src/funopen.c b/src/funopen.c -index 1e6f43a..3a3af6a 100644 ---- a/src/funopen.c -+++ b/src/funopen.c -@@ -143,6 +143,7 @@ funopen(const void *cookie, - * they will not add the needed support to implement it. Just ignore this - * interface there, as it has never been provided anyway. - */ -+#elif defined(__MACH__) - #else - #error "Function funopen() needs to be ported or disabled." - #endif -diff --git a/src/local-link.h b/src/local-link.h -index 6782d9a..fb76098 100644 ---- a/src/local-link.h -+++ b/src/local-link.h -@@ -29,6 +29,12 @@ - - #include <sys/cdefs.h> - -+#ifdef __MACH__ -+#define libbsd_link_warning(symbol, msg) -+#define libbsd_symver_default(alias, symbol, version) -+#define libbsd_symver_variant(alias, symbol, version) -+#define libbsd_symver_weak(alias, symbol, version) -+#else - #define libbsd_link_warning(symbol, msg) \ - static const char libbsd_emit_link_warning_##symbol[] \ - __attribute__((__used__,__section__(".gnu.warning." #symbol))) = msg -@@ -68,3 +74,4 @@ - #endif - - #endif -+#endif -diff --git a/src/nlist.c b/src/nlist.c -index 1cb9d18..b476f1e 100644 ---- a/src/nlist.c -+++ b/src/nlist.c -@@ -41,6 +41,7 @@ - #include <unistd.h> - #include <nlist.h> - -+#if !HAVE_NLIST_H - #include "local-elf.h" - - /* Note: This function is used by libkvm0, so we need to export it. -@@ -277,3 +278,4 @@ nlist(const char *name, struct nlist *list) - (void)close(fd); - return (n); - } -+#endif -diff --git a/src/pwcache.c b/src/pwcache.c -index d54daa0..74fde9f 100644 ---- a/src/pwcache.c -+++ b/src/pwcache.c -@@ -191,6 +191,7 @@ grptb_start(void) - return 0; - } - -+#if !HAVE_USER_FROM_UID - /* - * user_from_uid() - * caches the name (if any) for the uid. If noname clear, we always -@@ -251,7 +252,9 @@ user_from_uid(uid_t uid, int noname) - } - return ptr->name; - } -+#endif - -+#if !HAVE_USER_FROM_UID - /* - * group_from_gid() - * caches the name (if any) for the gid. If noname clear, we always -@@ -312,6 +315,7 @@ group_from_gid(gid_t gid, int noname) - } - return ptr->name; - } -+#endif - - /* - * uid_from_user() -diff --git a/src/readpassphrase.c b/src/readpassphrase.c -index f9f6195..2bc5fb4 100644 ---- a/src/readpassphrase.c -+++ b/src/readpassphrase.c -@@ -36,6 +36,14 @@ - #define TCSASOFT 0 - #endif - -+#ifndef _SIGMAX -+#define _SIGMAX 64 -+#endif -+ -+#ifndef _NSIG -+#define _NSIG (_SIGMAX + 1) -+#endif -+ - static volatile sig_atomic_t signo[_NSIG]; - - static void handler(int); -diff --git a/src/setproctitle.c b/src/setproctitle.c -index d3e1087..0e5f64c 100644 ---- a/src/setproctitle.c -+++ b/src/setproctitle.c -@@ -33,6 +33,10 @@ - #include <string.h> - #include "local-link.h" - -+#ifdef __MACH__ -+extern char **environ; -+#endif -+ - static struct { - /* Original value. */ - const char *arg0; -@@ -291,7 +295,8 @@ libbsd_symver_default(setproctitle, setproctitle_impl, LIBBSD_0.5); - * in 0.5, make the implementation available in the old version as an alias - * for code linking against that version, and change the default to use the - * new version, so that new code depends on the implemented version. */ --#ifdef HAVE_TYPEOF -+#ifdef __MACH__ -+#elif defined(HAVE_TYPEOF) - extern __typeof__(setproctitle_impl) - setproctitle_stub - __attribute__((__alias__("setproctitle_impl"))); -diff --git a/src/strlcat.c b/src/strlcat.c -index 14c53a1..5961c17 100644 ---- a/src/strlcat.c -+++ b/src/strlcat.c -@@ -26,6 +26,7 @@ - * Returns strlen(src) + MIN(dsize, strlen(initial dst)). - * If retval >= dsize, truncation occurred. - */ -+#if !HAVE_STRLCAT - size_t - strlcat(char *dst, const char *src, size_t dsize) - { -@@ -53,3 +54,4 @@ strlcat(char *dst, const char *src, size_t dsize) - - return(dlen + (src - osrc)); /* count does not include NUL */ - } -+#endif -diff --git a/src/strlcpy.c b/src/strlcpy.c -index e9a7fe4..5137acb 100644 ---- a/src/strlcpy.c -+++ b/src/strlcpy.c -@@ -24,6 +24,7 @@ - * chars will be copied. Always NUL terminates (unless dsize == 0). - * Returns strlen(src); if retval >= dsize, truncation occurred. - */ -+#if !HAVE_STRLCPY - size_t - strlcpy(char *dst, const char *src, size_t dsize) - { -@@ -48,3 +49,4 @@ strlcpy(char *dst, const char *src, size_t dsize) - - return(src - osrc - 1); /* count does not include NUL */ - } -+#endif -diff --git a/src/strmode.c b/src/strmode.c -index e6afde5..da680c9 100644 ---- a/src/strmode.c -+++ b/src/strmode.c -@@ -32,6 +32,7 @@ - #include <sys/stat.h> - #include <string.h> - -+#if !HAVE_STRMODE - void - strmode(mode_t mode, char *p) - { -@@ -141,3 +142,4 @@ strmode(mode_t mode, char *p) - *p++ = ' '; /* will be a '+' if ACL's implemented */ - *p = '\0'; - } -+#endif diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index 0c8040010e722..5943d697f6f1b 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/pkgs/development/libraries/libbsd/default.nix @@ -1,28 +1,53 @@ { lib , stdenv -, fetchurl +, fetchFromGitLab +, fetchpatch , autoreconfHook , libmd , gitUpdater }: -stdenv.mkDerivation rec { +# Run `./get-version` for the new value when bumping the Git revision. +let gitVersion = "0.11.7-55-g73b2"; in + +stdenv.mkDerivation { pname = "libbsd"; - version = "0.11.7"; + version = "unstable-2023-04-29"; - src = fetchurl { - url = "https://libbsd.freedesktop.org/releases/${pname}-${version}.tar.xz"; - hash = "sha256-m6oYYFnrvyXAYwjp+ZH9ox9xg8DySTGCbYOqar2KAmE="; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "libbsd"; + repo = "libbsd"; + rev = "73b25a8f871b3a20f6ff76679358540f95d7dbfd"; + hash = "sha256-LS28taIMjRCl6xqg75eYOIrTDl8PzSa+OvrdiEOP1+U="; }; outputs = [ "out" "dev" "man" ]; - # darwin changes configure.ac which means we need to regenerate - # the configure scripts + enableParallelBuilding = true; + + doCheck = true; + nativeBuildInputs = [ autoreconfHook ]; propagatedBuildInputs = [ libmd ]; - patches = [ ./darwin.patch ]; + patches = [ + # Fix `{get,set}progname(3bsd)` conditionalization + # https://gitlab.freedesktop.org/libbsd/libbsd/-/issues/24 + (fetchpatch { + url = "https://github.com/emilazy/libbsd/commit/0381f8d92873c5a19ced3ff861ee8ffe7825953e.patch"; + hash = "sha256-+RMg5eHLgC4gyX9zXM0ttNf7rd9E3UzJX/7UVCYGXx4="; + }) + ] ++ lib.optionals stdenv.isDarwin [ + # Temporary build system hack from upstream maintainer + # https://gitlab.freedesktop.org/libbsd/libbsd/-/issues/19#note_2017684 + ./darwin-fix-libbsd.sym.patch + ]; + + postPatch = '' + substituteInPlace configure.ac \ + --replace 'm4_esyscmd([./get-version])' '[${gitVersion}]' + ''; passthru.updateScript = gitUpdater { # No nicer place to find latest release. @@ -33,7 +58,7 @@ stdenv.mkDerivation rec { description = "Common functions found on BSD systems"; homepage = "https://libbsd.freedesktop.org/"; license = with licenses; [ beerware bsd2 bsd3 bsdOriginal isc mit ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.unix; maintainers = with maintainers; [ matthewbauer ]; }; } diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix index 63c72b7a8cedd..b648e06ad904c 100644 --- a/pkgs/development/libraries/libcef/default.nix +++ b/pkgs/development/libraries/libcef/default.nix @@ -66,16 +66,16 @@ let projectArch = "x86_64"; }; }; - platforms."aarch64-linux".sha256 = "0q7bd44zj8m493pqviw3xhnygls5p7dvwafgvsflkwn1jzxjbjgg"; - platforms."x86_64-linux".sha256 = "1gc7rc8x7lrz05dqgzd3yzhvqh4j63495d7b23cwhpyzq2viwgyg"; + platforms."aarch64-linux".sha256 = "0c034h0hcsff4qmibizjn2ik5pq1jb4p6f0a4k6nrkank9m0x7ap"; + platforms."x86_64-linux".sha256 = "02pj4dgfswpaglxkmbd9970znixlv82wna4xxhwjh7i5ps24a0n6"; platformInfo = builtins.getAttr stdenv.targetPlatform.system platforms; in stdenv.mkDerivation rec { pname = "cef-binary"; - version = "116.0.24"; - gitRevision = "5332865"; - chromiumVersion = "116.0.5845.190"; + version = "117.1.5"; + gitRevision = "f1b94ea"; + chromiumVersion = "117.0.5938.132"; src = fetchurl { url = "https://cef-builds.spotifycdn.com/cef_binary_${version}+g${gitRevision}+chromium-${chromiumVersion}_${platformInfo.platformStr}_minimal.tar.bz2"; diff --git a/pkgs/development/libraries/libdwarf/20210528.nix b/pkgs/development/libraries/libdwarf/20210528.nix index 01ab2d720bf0f..25d14de99ae27 100644 --- a/pkgs/development/libraries/libdwarf/20210528.nix +++ b/pkgs/development/libraries/libdwarf/20210528.nix @@ -2,7 +2,7 @@ callPackage ./common.nix rec { version = "20210528"; url = "https://www.prevanders.net/libdwarf-${version}.tar.gz"; - sha512 = "e0f9c88554053ee6c1b1333960891189e7820c4a4ddc302b7e63754a4cdcfc2acb1b4b6083a722d1204a75e994fff3401ecc251b8c3b24090f8cb4046d90f870"; + hash = "sha512-4PnIhVQFPubBsTM5YIkRieeCDEpN3DArfmN1Skzc/CrLG0tgg6ci0SBKdemU//NAHswlG4w7JAkPjLQEbZD4cA=="; buildInputs = [ zlib libelf ]; knownVulnerabilities = [ "CVE-2022-32200" "CVE-2022-39170" ]; } diff --git a/pkgs/development/libraries/libdwarf/common.nix b/pkgs/development/libraries/libdwarf/common.nix index 32dc6eaa6e4ea..ebf59ccd03f94 100644 --- a/pkgs/development/libraries/libdwarf/common.nix +++ b/pkgs/development/libraries/libdwarf/common.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, fetchurl, buildInputs, sha512, version, libelf, url, knownVulnerabilities }: +{ lib, stdenv, fetchurl, buildInputs, hash, version, libelf, url, knownVulnerabilities }: stdenv.mkDerivation rec { pname = "libdwarf"; inherit version; src = fetchurl { - inherit url sha512; + inherit url hash; }; configureFlags = [ "--enable-shared" "--disable-nonshared" ]; diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix index 2beb4efc4bcdb..0f96083100c23 100644 --- a/pkgs/development/libraries/libdwarf/default.nix +++ b/pkgs/development/libraries/libdwarf/default.nix @@ -2,7 +2,7 @@ callPackage ./common.nix rec { version = "0.4.2"; url = "https://www.prevanders.net/libdwarf-${version}.tar.xz"; - sha512 = "6d2a3ebf0104362dd9cecec272935684f977db119810eea0eec88c9f56a042f260a4f6ed3bbabde8592fe16f98cbd81b4ab2878005140e05c8f475df6380d1c2"; + hash = "sha512-bSo+vwEENi3Zzs7CcpNWhPl32xGYEO6g7siMn1agQvJgpPbtO7q96Fkv4W+Yy9gbSrKHgAUUDgXI9HXfY4DRwg=="; buildInputs = [ zlib ]; knownVulnerabilities = []; } diff --git a/pkgs/development/libraries/libetpan/default.nix b/pkgs/development/libraries/libetpan/default.nix index 572c90b27b47b..0633392a4f0c6 100644 --- a/pkgs/development/libraries/libetpan/default.nix +++ b/pkgs/development/libraries/libetpan/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { sha256 = "0g7an003simfdn7ihg9yjv7hl2czsmjsndjrp39i7cad8icixscn"; }; + outputs = [ "out" "dev" ]; + patches = [ # The following two patches are fixing CVE-2020-15953, as reported in the # issue tracker: https://github.com/dinhvh/libetpan/issues/386 diff --git a/pkgs/development/libraries/libfyaml/default.nix b/pkgs/development/libraries/libfyaml/default.nix index 6fe2f398b25e6..f594d64095c42 100644 --- a/pkgs/development/libraries/libfyaml/default.nix +++ b/pkgs/development/libraries/libfyaml/default.nix @@ -1,31 +1,39 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libfyaml"; - version = "0.8"; + version = "0.9"; src = fetchFromGitHub { owner = "pantoniou"; - repo = pname; - rev = "v${version}"; - hash = "sha256-b/jRKe23NIVSydoczI+Ax2VjBJLfAEwF8SW61vIDTwA="; + repo = "libfyaml"; + rev = "v${finalAttrs.version}"; + hash = "sha256-Id5pdFzjA9q67okfESO3LZH8jIz93mVgIEEuBbPjuGI="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; outputs = [ "bin" "dev" "out" "man" ]; + configureFlags = [ "--disable-network" ]; + doCheck = true; preCheck = '' patchShebangs test ''; + passthru.tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + meta = with lib; { - homepage = "https://github.com/pantoniou/libfyaml"; description = "Fully feature complete YAML parser and emitter, supporting the latest YAML spec and passing the full YAML testsuite"; + homepage = "https://github.com/pantoniou/libfyaml"; + changelog = "https://github.com/pantoniou/libfyaml/releases/tag/v${finalAttrs.version}"; license = licenses.mit; maintainers = [ maintainers.marsam ]; + pkgConfigModules = [ "libfyaml" ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/development/libraries/libglibutil/default.nix b/pkgs/development/libraries/libglibutil/default.nix index 6cba6bcf8a166..e210fa9e26bab 100644 --- a/pkgs/development/libraries/libglibutil/default.nix +++ b/pkgs/development/libraries/libglibutil/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libglibutil"; - version = "1.0.71"; + version = "1.0.74"; src = fetchFromGitHub { owner = "sailfishos"; repo = pname; rev = version; - sha256 = "sha256-I58XN1Ku5VVmxuTZ6yPm8jWGKscwLOhetWC+6B6EZRE="; + sha256 = "sha256-+nIB516XUPjfI3fHru48sU/5PYL/w14/sMK/B8FLflI="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index 4f110db51add1..4897934860b1f 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "libgphoto2"; - version = "2.5.30"; + version = "2.5.31"; src = fetchFromGitHub { owner = "gphoto"; repo = "libgphoto2"; rev = "libgphoto2-${builtins.replaceStrings [ "." ] [ "_" ] version}-release"; - sha256 = "sha256-4UwD283mKhZwC7setBU0BLRLsyfjD/6m/InSedrqgAU="; + sha256 = "sha256-UmyDKEaPP9VJqi8f+y6JZcTlQomhMTN+/C//ODYx6/w="; }; depsBuildBuild = [ pkg-config ]; diff --git a/pkgs/development/libraries/libharu/default.nix b/pkgs/development/libraries/libharu/default.nix index 65e19b8715f74..dabd74e648c3c 100644 --- a/pkgs/development/libraries/libharu/default.nix +++ b/pkgs/development/libraries/libharu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libharu"; - version = "2.4.3"; + version = "2.4.4"; src = fetchFromGitHub { owner = "libharu"; repo = pname; rev = "v${version}"; - hash = "sha256-v8eD1ZEFQFA7ceWOgOmq7hP0ZMPfxjdAp7ov4PBPaAE="; + hash = "sha256-tw/E79Cg/8kIei6NUu1W+mP0sUDCm8KTB7ZjzxsqpeM="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libhwy/default.nix b/pkgs/development/libraries/libhwy/default.nix index 4373f7474339a..b2f32cbe7252d 100644 --- a/pkgs/development/libraries/libhwy/default.nix +++ b/pkgs/development/libraries/libhwy/default.nix @@ -1,23 +1,21 @@ -{ lib, stdenv, cmake, ninja, gtest, fetchFromGitHub, fetchpatch }: +{ lib +, stdenv +, cmake +, ninja +, gtest +, fetchFromGitHub +}: stdenv.mkDerivation rec { pname = "libhwy"; - version = "1.0.5"; + version = "1.0.7"; src = fetchFromGitHub { owner = "google"; repo = "highway"; rev = version; - hash = "sha256-Gym2iHq5ws9kuG4HWSQndD8hVugV4USZt6dUFnEkLwY="; + hash = "sha256-Z+mAR9nSAbCskUvo6oK79Yd85bu0HtI2aR5THS1EozM="; }; - patches = [ - # backport for compilation issue on aarch64 - # https://github.com/google/highway/issues/1613 - (fetchpatch { - url = "https://github.com/google/highway/commit/7ad89efa911cb906ccf3f78fe510db415e921801.diff"; - hash = "sha256-hTSkeCh2QLMqeIKG/CAqJXaPqD/66Z02gjGXk591f+U="; - }) - ]; nativeBuildInputs = [ cmake ninja ]; @@ -53,7 +51,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Performance-portable, length-agnostic SIMD with runtime dispatch"; homepage = "https://github.com/google/highway"; - license = licenses.asl20; + license = with licenses; [ asl20 bsd3 ]; platforms = platforms.unix; maintainers = with maintainers; [ zhaofengli ]; }; diff --git a/pkgs/development/libraries/libicns/default.nix b/pkgs/development/libraries/libicns/default.nix index 6dd6654b35ad0..45fad4459a8c3 100644 --- a/pkgs/development/libraries/libicns/default.nix +++ b/pkgs/development/libraries/libicns/default.nix @@ -1,24 +1,18 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, libpng, openjpeg }: +{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, libpng, openjpeg, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libicns"; - version = "0.8.1"; + version = "unstable-2022-04-10"; - src = fetchurl { - url = "mirror://sourceforge/icns/${pname}-${version}.tar.gz"; - sha256 = "1hjm8lwap7bjyyxsyi94fh5817xzqhk4kb5y0b7mb6675xw10prk"; + src = fetchgit { + name = "libicns"; + url = "https://git.code.sf.net/p/icns/code"; + rev = "921f972c461c505e5ac981aaddbdfdde97e8bb2b"; + hash = "sha256-YeO0rlTujDNmrdJ3DRyl3TORswF2KFKA+wVUxJo8Dno"; }; - patches = [ - (fetchpatch { - url = "https://sources.debian.org/data/main/libi/libicns/0.8.1-3.1/debian/patches/support-libopenjp2.patch"; - sha256 = "0ss298lyzvydxvaxsadi6kbbjpwykd86jw3za76brcsg2dpssgas"; - }) - ]; - - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ libpng openjpeg ]; - env.NIX_CFLAGS_COMPILE = toString [ "-I${openjpeg.dev}/include/${openjpeg.incDir}" ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ libpng openjpeg zlib ]; meta = with lib; { description = "Library for manipulation of the Mac OS icns resource format"; diff --git a/pkgs/development/libraries/libimagequant/Cargo.lock b/pkgs/development/libraries/libimagequant/Cargo.lock index d85dfcde626fe..8823a070b81bd 100644 --- a/pkgs/development/libraries/libimagequant/Cargo.lock +++ b/pkgs/development/libraries/libimagequant/Cargo.lock @@ -21,9 +21,9 @@ dependencies = [ [[package]] name = "arrayvec" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "autocfg" @@ -33,15 +33,15 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "1.3.2" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" [[package]] name = "bytemuck" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" [[package]] name = "c_test" @@ -53,9 +53,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] [[package]] name = "cfg-if" @@ -95,9 +98,9 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.14" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", "cfg-if", @@ -108,33 +111,33 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if", ] [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "fallible_collections" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9acf77205554f3cfeca94a4b910e159ad9824e8c2d164de02b3f12495cc1074d" +checksum = "a88c69768c0a15262df21899142bc6df9b9b823546d4b4b9a7bc2d6c448ec6fd" dependencies = [ "hashbrown", ] [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", "miniz_oxide", @@ -151,16 +154,13 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.2.6" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "imagequant" -version = "4.2.0" +version = "4.2.1" dependencies = [ "arrayvec", "lodepng", @@ -173,7 +173,7 @@ dependencies = [ [[package]] name = "imagequant-sys" -version = "4.0.1" +version = "4.0.2" dependencies = [ "bitflags", "imagequant", @@ -182,9 +182,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.142" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "lodepng" @@ -201,9 +201,9 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] @@ -219,9 +219,9 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ "hermit-abi", "libc", @@ -229,9 +229,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "rayon" @@ -266,9 +266,9 @@ dependencies = [ [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "thread_local" diff --git a/pkgs/development/libraries/libimagequant/default.nix b/pkgs/development/libraries/libimagequant/default.nix index 088936115076b..9041b373edffb 100644 --- a/pkgs/development/libraries/libimagequant/default.nix +++ b/pkgs/development/libraries/libimagequant/default.nix @@ -5,13 +5,13 @@ let in rustPlatform.buildRustPackage rec { pname = "libimagequant"; - version = "4.2.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "ImageOptim"; repo = pname; rev = version; - hash = "sha256-51xTCymZKLuw1Xeje6EyKqHdbmqBV1Fdhx+OsO3bZ6Q="; + hash = "sha256-a5TztgNFRV9BVERpHI33ZEYwfOR46F9FzmbquzwGq3k="; }; cargoLock = { diff --git a/pkgs/development/libraries/libime/default.nix b/pkgs/development/libraries/libime/default.nix index 6a7b3f489af4c..72fb19fd5ab94 100644 --- a/pkgs/development/libraries/libime/default.nix +++ b/pkgs/development/libraries/libime/default.nix @@ -7,6 +7,7 @@ , boost , python3 , fcitx5 +, zstd }: let @@ -27,13 +28,13 @@ let in stdenv.mkDerivation rec { pname = "libime"; - version = "1.1.0"; + version = "1.1.2"; src = fetchFromGitHub { owner = "fcitx"; repo = "libime"; rev = version; - sha256 = "sha256-r1Px93Ly7FzcRaPUNTHNcedzHPHocnUj8t8VMZqXkFM="; + sha256 = "sha256-0+NVGxujFOJvxX+Tk4mVYsk2Nl7WK6hjl0oylrT6PXU="; fetchSubmodules = true; }; @@ -50,6 +51,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + zstd boost fcitx5 ]; diff --git a/pkgs/development/libraries/libite/default.nix b/pkgs/development/libraries/libite/default.nix index 900146f6b0118..c75c83764ac3d 100644 --- a/pkgs/development/libraries/libite/default.nix +++ b/pkgs/development/libraries/libite/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libite"; - version = "2.5.3"; + version = "2.6.0"; src = fetchFromGitHub { owner = "troglobit"; repo = "libite"; rev = "v${version}"; - sha256 = "sha256-orxmd6yItB6XLj650RQb0CP/EnN9563v+P9xz9LEJkY="; + sha256 = "sha256-hdV8g/BFTI/QfEgVsf942SR0G5xdqP/+h+vnydt4kf0="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index 27d4fda2ddc6e..711f05779e851 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -24,11 +24,12 @@ , opencv , python3 , vips +, testers }: assert !(enableJpeg7 && enableJpeg8); # pick only one or none, not both -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libjpeg-turbo"; version = "2.1.5.1"; @@ -36,7 +37,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "libjpeg-turbo"; repo = "libjpeg-turbo"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-96SBBZp+/4WkXLvHKSPItNi5WuzdVccI/ZcbJOFjYYk="; }; @@ -91,13 +92,15 @@ stdenv.mkDerivation rec { opencv vips; inherit (python3.pkgs) pillow imread pyturbojpeg; + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; meta = with lib; { homepage = "https://libjpeg-turbo.org/"; description = "A faster (using SIMD) libjpeg implementation"; license = licenses.ijg; # and some parts under other BSD-style licenses + pkgConfigModules = [ "libjpeg" "libturbojpeg" ]; maintainers = with maintainers; [ vcunat colemickens kamadorueda ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix index 6a6009c98e964..aaa481e8fd5d8 100644 --- a/pkgs/development/libraries/libjpeg/default.nix +++ b/pkgs/development/libraries/libjpeg/default.nix @@ -1,11 +1,14 @@ -{ lib, stdenv, fetchurl, static ? false }: +{ lib, stdenv, fetchurl +, testers +, static ? false +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libjpeg"; version = "9e"; src = fetchurl { - url = "http://www.ijg.org/files/jpegsrc.v${version}.tar.gz"; + url = "http://www.ijg.org/files/jpegsrc.v${finalAttrs.version}.tar.gz"; sha256 = "sha256-QHfWpqda6wGIT3CJGdJZNMkzBeSffj8225EpMg5vTz0="; }; @@ -13,11 +16,14 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" ]; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { homepage = "https://www.ijg.org/"; description = "A library that implements the JPEG image file format"; maintainers = with maintainers; [ ]; license = licenses.free; + pkgConfigModules = [ "libjpeg" ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix index d7f5aa24c155d..9b1716ecc6dfb 100644 --- a/pkgs/development/libraries/libksba/default.nix +++ b/pkgs/development/libraries/libksba/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libksba"; - version = "1.6.3"; + version = "1.6.4"; src = fetchurl { url = "mirror://gnupg/libksba/libksba-${version}.tar.bz2"; - hash = "sha256-P3LGjbMJceu/FDZ1J3GUI/Ck1fgQP8n0ocAan6RA3lw="; + hash = "sha256-u7Q/AyuRZNhseB/+QiE6g79PL+6RRV7fpGVFIbiwO2s="; }; outputs = [ "out" "dev" "info" ]; diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix index d87309111d569..32d1522fb68fe 100644 --- a/pkgs/development/libraries/liblouis/default.nix +++ b/pkgs/development/libraries/liblouis/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "liblouis"; - version = "3.26.0"; + version = "3.27.0"; outputs = [ "out" "dev" "info" "doc" ] # configure: WARNING: cannot generate manual pages while cross compiling @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "liblouis"; repo = "liblouis"; rev = "v${finalAttrs.version}"; - hash = "sha256-Kko9qBWdNiZ61Wbb7lUYoSNU1hhRUexPcU3pADv0UHo="; + hash = "sha256-5umpIscs4Y8MSaoY7yKtBFmlIa8QDQtjBxoysZ+GTm8="; }; strictDeps = true; diff --git a/pkgs/development/libraries/libmcrypt/default.nix b/pkgs/development/libraries/libmcrypt/default.nix index d1f048ee2c539..42164052075ef 100644 --- a/pkgs/development/libraries/libmcrypt/default.nix +++ b/pkgs/development/libraries/libmcrypt/default.nix @@ -11,8 +11,12 @@ stdenv.mkDerivation rec { buildInputs = lib.optional stdenv.isDarwin darwin.cctools; - configureFlags = lib.optionals disablePosixThreads - [ "--disable-posix-threads" ]; + configureFlags = lib.optionals disablePosixThreads [ "--disable-posix-threads" ] + ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + # AC_FUNC_MALLOC is broken on cross builds. + "ac_cv_func_malloc_0_nonnull=yes" + "ac_cv_func_realloc_0_nonnull=yes" + ]; meta = { description = "Replacement for the old crypt() package and crypt(1) command, with extensions"; diff --git a/pkgs/development/libraries/libmd/default.nix b/pkgs/development/libraries/libmd/default.nix index ad3d8f0cce406..bf156fb1c55dd 100644 --- a/pkgs/development/libraries/libmd/default.nix +++ b/pkgs/development/libraries/libmd/default.nix @@ -1,35 +1,30 @@ { lib, stdenv, fetchurl, fetchpatch, autoreconfHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libmd"; - version = "1.0.4"; + version = "1.1.0"; src = fetchurl { urls = [ - "https://archive.hadrons.org/software/libmd/libmd-${version}.tar.xz" - "https://libbsd.freedesktop.org/releases/libmd-${version}.tar.xz" + "https://archive.hadrons.org/software/libmd/libmd-${finalAttrs.version}.tar.xz" + "https://libbsd.freedesktop.org/releases/libmd-${finalAttrs.version}.tar.xz" ]; - sha256 = "sha256-9RySEELjS+3e3tS3VVdlZVnPWx8kSAM7TB7sEcB+Uw8="; + sha256 = "sha256-G9aqQidTE68xQcfPLluWTosf1IgCXK8vlx9DsAd2szI="; }; - patches = [ - # Drop aliases for SHA384 functions, because such aliases are not supported on Darwin. - (fetchpatch { - url = "https://github.com/macports/macports-ports/raw/8332f5dbcaf05a02bc31fbd4ccf735e7d5c9a5b0/devel/libmd/files/patch-symbol-alias.diff"; - sha256 = "sha256-py5hMpKYKwtBzhWn01lFc2a6+OZN72YCYXyhg1qe6rg="; - extraPrefix = ""; - }) - ]; + enableParallelBuilding = true; + + doCheck = true; nativeBuildInputs = [ autoreconfHook ]; meta = with lib; { - homepage = "https://www.hadrons.org/software/${pname}/"; - changelog = "https://archive.hadrons.org/software/libmd/libmd-${version}.announce"; + homepage = "https://www.hadrons.org/software/libmd/"; + changelog = "https://archive.hadrons.org/software/libmd/libmd-${finalAttrs.version}.announce"; # Git: https://git.hadrons.org/cgit/libmd.git description = "Message Digest functions from BSD systems"; license = with licenses; [ bsd3 bsd2 isc beerware publicDomain ]; maintainers = with maintainers; [ primeos ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/development/libraries/libmodplug/default.nix b/pkgs/development/libraries/libmodplug/default.nix index 69c36dc718cbf..334dfa9d80151 100644 --- a/pkgs/development/libraries/libmodplug/default.nix +++ b/pkgs/development/libraries/libmodplug/default.nix @@ -9,6 +9,11 @@ stdenv.mkDerivation rec { sha256 = "1pnri98a603xk47smnxr551svbmgbzcw018mq1k6srbrq6kaaz25"; }; + # Unfortunately, upstream appears inactive and the patches from the fork don’t apply cleanly. + # Modify `src/fastmix.cpp` to remove usage of the register storage class, which is + # not allowed in C++17 and is an error in clang 16. + prePatch = "substituteInPlace src/fastmix.cpp --replace 'register ' ''"; + outputs = [ "out" "dev" ]; preConfigure = '' diff --git a/pkgs/development/libraries/libmongocrypt/default.nix b/pkgs/development/libraries/libmongocrypt/default.nix index d2d22f4cf8c19..f45d41fed6283 100644 --- a/pkgs/development/libraries/libmongocrypt/default.nix +++ b/pkgs/development/libraries/libmongocrypt/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { mongoc openssl ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security + darwin.apple_sdk_11_0.frameworks.Security ]; cmakeFlags = [ diff --git a/pkgs/development/libraries/libmx/default.nix b/pkgs/development/libraries/libmx/default.nix index 23cb00618055f..52d92840a3461 100644 --- a/pkgs/development/libraries/libmx/default.nix +++ b/pkgs/development/libraries/libmx/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { feature is the possibility setting style properties from a CSS format file.''; license = licenses.lgpl21; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; platforms = with platforms; linux; }; } diff --git a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix index 4adb3958bd322..8c4e32b232c95 100644 --- a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix +++ b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "libmysqlconnectorcpp"; - version = "8.0.33"; + version = "8.1.0"; src = fetchurl { url = "https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}-src.tar.gz"; - hash = "sha256-Fgz2iB+96b1GzRGq8Skwtna8bidYmsXHuknBlrl+BTs="; + hash = "sha256-LuPH0NAxzlgd7u10fZVh0UAXI3NZK+1dBjCnkOYFPcE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libosmium/default.nix b/pkgs/development/libraries/libosmium/default.nix index d86755837b4a3..63aab4c0bfb10 100644 --- a/pkgs/development/libraries/libosmium/default.nix +++ b/pkgs/development/libraries/libosmium/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libosmium"; - version = "2.19.0"; + version = "2.20.0"; src = fetchFromGitHub { owner = "osmcode"; repo = "libosmium"; rev = "v${version}"; - sha256 = "sha256-R7kOhQFfGYuHNkIZV4BTE+WKjHnCJwKeIWjCJNrvyTQ="; + sha256 = "sha256-QM6Nj2cmrhUysR2enFKhTWXdBXNqM21/Yqdn/zXEfYE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libotr/default.nix b/pkgs/development/libraries/libotr/default.nix index a9c1d2008af3f..672d298f14468 100644 --- a/pkgs/development/libraries/libotr/default.nix +++ b/pkgs/development/libraries/libotr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libgcrypt, autoreconfHook }: +{ lib, stdenv, fetchurl, pkgsHostTarget, libgcrypt, autoreconfHook }: stdenv.mkDerivation rec { pname = "libotr"; @@ -13,7 +13,10 @@ stdenv.mkDerivation rec { outputs = [ "bin" "out" "dev" ]; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ + autoreconfHook + pkgsHostTarget.libgcrypt.dev # for libgcrypt-config + ]; propagatedBuildInputs = [ libgcrypt ]; meta = with lib; { diff --git a/pkgs/development/libraries/libpinyin/default.nix b/pkgs/development/libraries/libpinyin/default.nix index ce0b396eed18e..2ae333d61ad88 100644 --- a/pkgs/development/libraries/libpinyin/default.nix +++ b/pkgs/development/libraries/libpinyin/default.nix @@ -29,11 +29,16 @@ stdenv.mkDerivation rec { tar -xzf ${modelData} -C $sourceRoot/data ''; + strictDeps = true; + nativeBuildInputs = [ autoreconfHook + pkg-config + ]; + + buildInputs = [ glib db - pkg-config ]; meta = with lib; { diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index b757d20b71d51..f8ae5b828c257 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -3,20 +3,20 @@ assert zlib != null; let - patchVersion = "1.6.39"; + patchVersion = "1.6.40"; patch_src = fetchurl { url = "mirror://sourceforge/libpng-apng/libpng-${patchVersion}-apng.patch.gz"; - hash = "sha256-SsS26roAzeISxI22XLlCkQc/68oixcef2ocJFQLoDP0="; + hash = "sha256-CjykZIKTjY1sciZivtLH7gxlobViRESzztIa2NNW2y8="; }; whenPatched = lib.optionalString apngSupport; in stdenv.mkDerivation rec { pname = "libpng" + whenPatched "-apng"; - version = "1.6.39"; + version = "1.6.40"; src = fetchurl { url = "mirror://sourceforge/libpng/libpng-${version}.tar.xz"; - hash = "sha256-H0aWznC07l+F8eFiPcEimyEAKfpLeu5XPfPiunsDaTc="; + hash = "sha256-U1tHmyRn/yMaPsbZKlJZBvuO8nl4vk9m2+BdPzoBs6E="; }; postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1"; @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "The official reference implementation for the PNG file format" + whenPatched " with animation patch"; homepage = "http://www.libpng.org/pub/png/libpng.html"; - changelog = "https://github.com/glennrp/libpng/blob/v1.6.39/CHANGES"; + changelog = "https://github.com/glennrp/libpng/blob/v1.6.40/CHANGES"; license = licenses.libpng2; platforms = platforms.all; maintainers = with maintainers; [ vcunat ]; diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index 893c7b4e3a1e4..87e3049c6c852 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libqalculate"; - version = "4.8.0"; + version = "4.8.1"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-wONqqd8Ds10SvkUrj7Ps6BfqUNPE6hCnQrKDTEglVEQ="; + sha256 = "sha256-4WqKlwVf4/ixVr98lPFVfNL6EOIfHHfL55xLsYqxkhY="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/librist/darwin.patch b/pkgs/development/libraries/librist/darwin.patch new file mode 100644 index 0000000000000..f9571fd434f7d --- /dev/null +++ b/pkgs/development/libraries/librist/darwin.patch @@ -0,0 +1,14 @@ +--- a/tools/srp_shared.c ++++ b/tools/srp_shared.c +@@ -173,7 +173,11 @@ void user_verifier_lookup(char * username, + if (stat(srpfile, &buf) != 0) + return; + ++#if defined(__APPLE__) ++ *generation = (buf.st_mtimespec.tv_sec << 32) | buf.st_mtimespec.tv_nsec; ++#else + *generation = (buf.st_mtim.tv_sec << 32) | buf.st_mtim.tv_nsec; ++#endif + #endif + + if (!lookup_data || !hashversion) diff --git a/pkgs/development/libraries/librist/default.nix b/pkgs/development/libraries/librist/default.nix index 134b3acf20572..c883530907035 100644 --- a/pkgs/development/libraries/librist/default.nix +++ b/pkgs/development/libraries/librist/default.nix @@ -11,16 +11,21 @@ stdenv.mkDerivation rec { pname = "librist"; - version = "0.2.7"; + version = "0.2.8"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "rist"; repo = "librist"; rev = "v${version}"; - sha256 = "sha256-qQG2eRAPAQgxghMeUZk3nwyacX6jDl33F8BWW63nM3c="; + hash = "sha256-E12TS+N47UQapkF6oO0Lx66Z3lHAyP0R4tVnx/uKBwQ="; }; + patches = [ + # https://github.com/NixOS/nixpkgs/pull/257020 + ./darwin.patch + ]; + nativeBuildInputs = [ meson ninja diff --git a/pkgs/development/libraries/librtprocess/default.nix b/pkgs/development/libraries/librtprocess/default.nix index c7e9b3895d987..dabb5e62e45de 100644 --- a/pkgs/development/libraries/librtprocess/default.nix +++ b/pkgs/development/libraries/librtprocess/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake, llvmPackages }: stdenv.mkDerivation rec { pname = "librtprocess"; @@ -6,18 +6,20 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "CarVac"; - repo = pname; + repo = "librtprocess"; rev = version; - sha256 = "sha256-/1o6SWUor+ZBQ6RsK2PoDRu03jcVRG58PNYFttriH2w="; + hash = "sha256-/1o6SWUor+ZBQ6RsK2PoDRu03jcVRG58PNYFttriH2w="; }; nativeBuildInputs = [ cmake ]; + buildInputs = lib.optionals stdenv.isDarwin [ llvmPackages.openmp ]; + meta = with lib; { - homepage = "https://github.com/CarVac/librtprocess"; description = "Highly optimized library for processing RAW images"; - license = licenses.gpl3; + homepage = "https://github.com/CarVac/librtprocess"; + license = licenses.gpl3Plus; maintainers = with maintainers; [ hjones2199 ]; - platforms = [ "x86_64-linux" ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index 607f038b88400..29cb7616a9ac1 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -75,6 +75,7 @@ stdenv.mkDerivation rec { ]; doCheck = stdenv.isLinux && withIntrospection; + separateDebugInfo = true; postPatch = '' patchShebangs ./tool/test-*.sh diff --git a/pkgs/development/libraries/libsmi/default.nix b/pkgs/development/libraries/libsmi/default.nix index 9b71a91efed25..14139d849dc72 100644 --- a/pkgs/development/libraries/libsmi/default.nix +++ b/pkgs/development/libraries/libsmi/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1lslaxr2qcj6hf4naq5n5mparfhmswsgq4wa7zm2icqvvgdcq6pj"; }; + env.NIX_CFLAGS_COMPILE = "-std=gnu90"; + meta = with lib; { description = "A Library to Access SMI MIB Information"; homepage = "https://www.ibr.cs.tu-bs.de/projects/libsmi/index.html"; diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix index 7e912a6bcad97..76931b12fc005 100644 --- a/pkgs/development/libraries/libsolv/default.nix +++ b/pkgs/development/libraries/libsolv/default.nix @@ -16,14 +16,14 @@ }: stdenv.mkDerivation rec { - version = "0.7.24"; + version = "0.7.25"; pname = "libsolv"; src = fetchFromGitHub { owner = "openSUSE"; repo = "libsolv"; rev = version; - sha256 = "sha256-UTVnGJO/9mQF9RwK75hh6IkoP1MwAlFaLCtdYU8uS34="; + sha256 = "sha256-OSYfv8dTyoa2f1T/zCEruKczickP5jS05xjYLQQiFaY="; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/libspelling/default.nix b/pkgs/development/libraries/libspelling/default.nix index 32c1af55a37ff..812dddcc4a171 100644 --- a/pkgs/development/libraries/libspelling/default.nix +++ b/pkgs/development/libraries/libspelling/default.nix @@ -12,11 +12,12 @@ , gtksourceview5 , enchant , icu +, nix-update-script }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "libspelling"; - version = "unstable-2023-07-17"; + version = "0.2.0"; outputs = [ "out" "dev" "devdoc" ]; @@ -24,8 +25,8 @@ stdenv.mkDerivation { domain = "gitlab.gnome.org"; owner = "chergert"; repo = "libspelling"; - rev = "65185023db95ec464970aeaeab766fe3ba26ae7d"; - hash = "sha256-R3nPs16y8XGamQvMSF7wb52h0jxt17H2FZPwauLDI/c="; + rev = version; + hash = "sha256-OOSQgdtnEx6/5yKwavCGdY/5L0Mr3XW0Srmd42ZTdUk="; }; nativeBuildInputs = [ @@ -50,10 +51,13 @@ stdenv.mkDerivation { moveToOutput "share/doc" "$devdoc" ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Spellcheck library for GTK 4"; homepage = "https://gitlab.gnome.org/chergert/libspelling"; license = licenses.lgpl21Plus; + changelog = "https://gitlab.gnome.org/chergert/libspelling/-/raw/${version}/NEWS"; maintainers = with maintainers; [ chuangzhu ]; }; } diff --git a/pkgs/development/libraries/libtsm/default.nix b/pkgs/development/libraries/libtsm/default.nix index 7c0868509f092..75773296fab26 100644 --- a/pkgs/development/libraries/libtsm/default.nix +++ b/pkgs/development/libraries/libtsm/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { description = "Terminal-emulator State Machine"; homepage = "http://www.freedesktop.org/wiki/Software/kmscon/libtsm/"; license = licenses.mit; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libuchardet/default.nix b/pkgs/development/libraries/libuchardet/default.nix index 389aa7c283f24..14bf7f7c09c7c 100644 --- a/pkgs/development/libraries/libuchardet/default.nix +++ b/pkgs/development/libraries/libuchardet/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = "Mozilla's Universal Charset Detector C/C++ API"; homepage = "https://www.freedesktop.org/wiki/Software/uchardet/"; license = licenses.mpl11; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; platforms = with platforms; unix; }; } diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 113f83c1fc924..7be9bee23a25b 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -113,7 +113,7 @@ stdenv.mkDerivation (finalAttrs: { description = "A multi-platform support library with a focus on asynchronous I/O"; homepage = "https://libuv.org/"; changelog = "https://github.com/libuv/libuv/blob/v${finalAttrs.version}/ChangeLog"; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; license = with licenses; [ mit isc bsd2 bsd3 cc-by-40 ]; }; diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index 2a77677680d96..3df8cce6f4b47 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, perl, yasm +{ lib, stdenv, fetchFromGitHub, fetchpatch, perl, yasm , vp8DecoderSupport ? true # VP8 decoder , vp8EncoderSupport ? true # VP8 encoder , vp9DecoderSupport ? true # VP9 decoder @@ -84,6 +84,18 @@ stdenv.mkDerivation rec { sha256 = "sha256-IH+ZWbBUlU5fbciYe+dNGnTFFCte2BXxAlLcvmzdAeY="; }; + patches = [ + (fetchpatch { + # https://www.openwall.com/lists/oss-security/2023/09/28/5 + name = "CVE-2023-5217.patch"; + url = "https://github.com/webmproject/libvpx/commit/3fbd1dca6a4d2dad332a2110d646e4ffef36d590.patch"; + hash = "sha256-1hHUd/dNGm8dmdYYN60j1aOgC2pdIIq7vqJZ7mTXfps="; + includes = [ + "vp8/encoder/onyx_if.c" + ]; + }) + ]; + postPatch = '' patchShebangs --build \ build/make/*.sh \ diff --git a/pkgs/development/libraries/libwebp/CVE-2023-4863.patch b/pkgs/development/libraries/libwebp/CVE-2023-4863.patch deleted file mode 100644 index c01b8a4866755..0000000000000 --- a/pkgs/development/libraries/libwebp/CVE-2023-4863.patch +++ /dev/null @@ -1,361 +0,0 @@ -From 4de93ac70c3292fc944e4587101a52a29f8b0c9c Mon Sep 17 00:00:00 2001 -From: Vincent Rabaud <vrabaud@google.com> -Date: Thu, 7 Sep 2023 21:16:03 +0200 -Subject: [PATCH] Fix OOB write in BuildHuffmanTable. - -First, BuildHuffmanTable is called to check if the data is valid. -If it is and the table is not big enough, more memory is allocated. - -This will make sure that valid (but unoptimized because of unbalanced -codes) streams are still decodable. - -Bug: chromium:1479274 -Change-Id: I31c36dbf3aa78d35ecf38706b50464fd3d375741 -(cherry picked from commit 902bc9190331343b2017211debcec8d2ab87e17a) ---- - src/dec/vp8l_dec.c | 46 ++++++++++--------- - src/dec/vp8li_dec.h | 2 +- - src/utils/huffman_utils.c | 97 +++++++++++++++++++++++++++++++-------- - src/utils/huffman_utils.h | 27 +++++++++-- - 4 files changed, 129 insertions(+), 43 deletions(-) - -diff --git a/src/dec/vp8l_dec.c b/src/dec/vp8l_dec.c -index c0ea0181..7995313f 100644 ---- a/src/dec/vp8l_dec.c -+++ b/src/dec/vp8l_dec.c -@@ -253,11 +253,11 @@ static int ReadHuffmanCodeLengths( - int symbol; - int max_symbol; - int prev_code_len = DEFAULT_CODE_LENGTH; -- HuffmanCode table[1 << LENGTHS_TABLE_BITS]; -+ HuffmanTables tables; - -- if (!VP8LBuildHuffmanTable(table, LENGTHS_TABLE_BITS, -- code_length_code_lengths, -- NUM_CODE_LENGTH_CODES)) { -+ if (!VP8LHuffmanTablesAllocate(1 << LENGTHS_TABLE_BITS, &tables) || -+ !VP8LBuildHuffmanTable(&tables, LENGTHS_TABLE_BITS, -+ code_length_code_lengths, NUM_CODE_LENGTH_CODES)) { - goto End; - } - -@@ -277,7 +277,7 @@ static int ReadHuffmanCodeLengths( - int code_len; - if (max_symbol-- == 0) break; - VP8LFillBitWindow(br); -- p = &table[VP8LPrefetchBits(br) & LENGTHS_TABLE_MASK]; -+ p = &tables.curr_segment->start[VP8LPrefetchBits(br) & LENGTHS_TABLE_MASK]; - VP8LSetBitPos(br, br->bit_pos_ + p->bits); - code_len = p->value; - if (code_len < kCodeLengthLiterals) { -@@ -300,6 +300,7 @@ static int ReadHuffmanCodeLengths( - ok = 1; - - End: -+ VP8LHuffmanTablesDeallocate(&tables); - if (!ok) dec->status_ = VP8_STATUS_BITSTREAM_ERROR; - return ok; - } -@@ -307,7 +308,8 @@ static int ReadHuffmanCodeLengths( - // 'code_lengths' is pre-allocated temporary buffer, used for creating Huffman - // tree. - static int ReadHuffmanCode(int alphabet_size, VP8LDecoder* const dec, -- int* const code_lengths, HuffmanCode* const table) { -+ int* const code_lengths, -+ HuffmanTables* const table) { - int ok = 0; - int size = 0; - VP8LBitReader* const br = &dec->br_; -@@ -362,8 +364,7 @@ static int ReadHuffmanCodes(VP8LDecoder* const dec, int xsize, int ysize, - VP8LMetadata* const hdr = &dec->hdr_; - uint32_t* huffman_image = NULL; - HTreeGroup* htree_groups = NULL; -- HuffmanCode* huffman_tables = NULL; -- HuffmanCode* huffman_table = NULL; -+ HuffmanTables* huffman_tables = &hdr->huffman_tables_; - int num_htree_groups = 1; - int num_htree_groups_max = 1; - int max_alphabet_size = 0; -@@ -372,6 +373,10 @@ static int ReadHuffmanCodes(VP8LDecoder* const dec, int xsize, int ysize, - int* mapping = NULL; - int ok = 0; - -+ // Check the table has been 0 initialized (through InitMetadata). -+ assert(huffman_tables->root.start == NULL); -+ assert(huffman_tables->curr_segment == NULL); -+ - if (allow_recursion && VP8LReadBits(br, 1)) { - // use meta Huffman codes. - const int huffman_precision = VP8LReadBits(br, 3) + 2; -@@ -434,16 +439,15 @@ static int ReadHuffmanCodes(VP8LDecoder* const dec, int xsize, int ysize, - - code_lengths = (int*)WebPSafeCalloc((uint64_t)max_alphabet_size, - sizeof(*code_lengths)); -- huffman_tables = (HuffmanCode*)WebPSafeMalloc(num_htree_groups * table_size, -- sizeof(*huffman_tables)); - htree_groups = VP8LHtreeGroupsNew(num_htree_groups); - -- if (htree_groups == NULL || code_lengths == NULL || huffman_tables == NULL) { -+ if (htree_groups == NULL || code_lengths == NULL || -+ !VP8LHuffmanTablesAllocate(num_htree_groups * table_size, -+ huffman_tables)) { - dec->status_ = VP8_STATUS_OUT_OF_MEMORY; - goto Error; - } - -- huffman_table = huffman_tables; - for (i = 0; i < num_htree_groups_max; ++i) { - // If the index "i" is unused in the Huffman image, just make sure the - // coefficients are valid but do not store them. -@@ -468,19 +472,20 @@ static int ReadHuffmanCodes(VP8LDecoder* const dec, int xsize, int ysize, - int max_bits = 0; - for (j = 0; j < HUFFMAN_CODES_PER_META_CODE; ++j) { - int alphabet_size = kAlphabetSize[j]; -- htrees[j] = huffman_table; - if (j == 0 && color_cache_bits > 0) { - alphabet_size += (1 << color_cache_bits); - } -- size = ReadHuffmanCode(alphabet_size, dec, code_lengths, huffman_table); -+ size = -+ ReadHuffmanCode(alphabet_size, dec, code_lengths, huffman_tables); -+ htrees[j] = huffman_tables->curr_segment->curr_table; - if (size == 0) { - goto Error; - } - if (is_trivial_literal && kLiteralMap[j] == 1) { -- is_trivial_literal = (huffman_table->bits == 0); -+ is_trivial_literal = (htrees[j]->bits == 0); - } -- total_size += huffman_table->bits; -- huffman_table += size; -+ total_size += htrees[j]->bits; -+ huffman_tables->curr_segment->curr_table += size; - if (j <= ALPHA) { - int local_max_bits = code_lengths[0]; - int k; -@@ -515,14 +520,13 @@ static int ReadHuffmanCodes(VP8LDecoder* const dec, int xsize, int ysize, - hdr->huffman_image_ = huffman_image; - hdr->num_htree_groups_ = num_htree_groups; - hdr->htree_groups_ = htree_groups; -- hdr->huffman_tables_ = huffman_tables; - - Error: - WebPSafeFree(code_lengths); - WebPSafeFree(mapping); - if (!ok) { - WebPSafeFree(huffman_image); -- WebPSafeFree(huffman_tables); -+ VP8LHuffmanTablesDeallocate(huffman_tables); - VP8LHtreeGroupsFree(htree_groups); - } - return ok; -@@ -1358,7 +1362,7 @@ static void ClearMetadata(VP8LMetadata* const hdr) { - assert(hdr != NULL); - - WebPSafeFree(hdr->huffman_image_); -- WebPSafeFree(hdr->huffman_tables_); -+ VP8LHuffmanTablesDeallocate(&hdr->huffman_tables_); - VP8LHtreeGroupsFree(hdr->htree_groups_); - VP8LColorCacheClear(&hdr->color_cache_); - VP8LColorCacheClear(&hdr->saved_color_cache_); -@@ -1673,7 +1677,7 @@ int VP8LDecodeImage(VP8LDecoder* const dec) { - - if (dec == NULL) return 0; - -- assert(dec->hdr_.huffman_tables_ != NULL); -+ assert(dec->hdr_.huffman_tables_.root.start != NULL); - assert(dec->hdr_.htree_groups_ != NULL); - assert(dec->hdr_.num_htree_groups_ > 0); - -diff --git a/src/dec/vp8li_dec.h b/src/dec/vp8li_dec.h -index 72b2e861..32540a4b 100644 ---- a/src/dec/vp8li_dec.h -+++ b/src/dec/vp8li_dec.h -@@ -51,7 +51,7 @@ typedef struct { - uint32_t* huffman_image_; - int num_htree_groups_; - HTreeGroup* htree_groups_; -- HuffmanCode* huffman_tables_; -+ HuffmanTables huffman_tables_; - } VP8LMetadata; - - typedef struct VP8LDecoder VP8LDecoder; -diff --git a/src/utils/huffman_utils.c b/src/utils/huffman_utils.c -index 90c2fbf7..cf73abd4 100644 ---- a/src/utils/huffman_utils.c -+++ b/src/utils/huffman_utils.c -@@ -177,21 +177,24 @@ static int BuildHuffmanTable(HuffmanCode* const root_table, int root_bits, - if (num_open < 0) { - return 0; - } -- if (root_table == NULL) continue; - for (; count[len] > 0; --count[len]) { - HuffmanCode code; - if ((key & mask) != low) { -- table += table_size; -+ if (root_table != NULL) table += table_size; - table_bits = NextTableBitSize(count, len, root_bits); - table_size = 1 << table_bits; - total_size += table_size; - low = key & mask; -- root_table[low].bits = (uint8_t)(table_bits + root_bits); -- root_table[low].value = (uint16_t)((table - root_table) - low); -+ if (root_table != NULL) { -+ root_table[low].bits = (uint8_t)(table_bits + root_bits); -+ root_table[low].value = (uint16_t)((table - root_table) - low); -+ } -+ } -+ if (root_table != NULL) { -+ code.bits = (uint8_t)(len - root_bits); -+ code.value = (uint16_t)sorted[symbol++]; -+ ReplicateValue(&table[key >> root_bits], step, table_size, code); - } -- code.bits = (uint8_t)(len - root_bits); -- code.value = (uint16_t)sorted[symbol++]; -- ReplicateValue(&table[key >> root_bits], step, table_size, code); - key = GetNextKey(key, len); - } - } -@@ -211,25 +214,83 @@ static int BuildHuffmanTable(HuffmanCode* const root_table, int root_bits, - ((1 << MAX_CACHE_BITS) + NUM_LITERAL_CODES + NUM_LENGTH_CODES) - // Cut-off value for switching between heap and stack allocation. - #define SORTED_SIZE_CUTOFF 512 --int VP8LBuildHuffmanTable(HuffmanCode* const root_table, int root_bits, -+int VP8LBuildHuffmanTable(HuffmanTables* const root_table, int root_bits, - const int code_lengths[], int code_lengths_size) { -- int total_size; -+ const int total_size = -+ BuildHuffmanTable(NULL, root_bits, code_lengths, code_lengths_size, NULL); - assert(code_lengths_size <= MAX_CODE_LENGTHS_SIZE); -- if (root_table == NULL) { -- total_size = BuildHuffmanTable(NULL, root_bits, -- code_lengths, code_lengths_size, NULL); -- } else if (code_lengths_size <= SORTED_SIZE_CUTOFF) { -+ if (total_size == 0 || root_table == NULL) return total_size; -+ -+ if (root_table->curr_segment->curr_table + total_size >= -+ root_table->curr_segment->start + root_table->curr_segment->size) { -+ // If 'root_table' does not have enough memory, allocate a new segment. -+ // The available part of root_table->curr_segment is left unused because we -+ // need a contiguous buffer. -+ const int segment_size = root_table->curr_segment->size; -+ struct HuffmanTablesSegment* next = -+ (HuffmanTablesSegment*)WebPSafeMalloc(1, sizeof(*next)); -+ if (next == NULL) return 0; -+ // Fill the new segment. -+ // We need at least 'total_size' but if that value is small, it is better to -+ // allocate a big chunk to prevent more allocations later. 'segment_size' is -+ // therefore chosen (any other arbitrary value could be chosen). -+ next->size = total_size > segment_size ? total_size : segment_size; -+ next->start = -+ (HuffmanCode*)WebPSafeMalloc(next->size, sizeof(*next->start)); -+ if (next->start == NULL) { -+ WebPSafeFree(next); -+ return 0; -+ } -+ next->curr_table = next->start; -+ next->next = NULL; -+ // Point to the new segment. -+ root_table->curr_segment->next = next; -+ root_table->curr_segment = next; -+ } -+ if (code_lengths_size <= SORTED_SIZE_CUTOFF) { - // use local stack-allocated array. - uint16_t sorted[SORTED_SIZE_CUTOFF]; -- total_size = BuildHuffmanTable(root_table, root_bits, -- code_lengths, code_lengths_size, sorted); -- } else { // rare case. Use heap allocation. -+ BuildHuffmanTable(root_table->curr_segment->curr_table, root_bits, -+ code_lengths, code_lengths_size, sorted); -+ } else { // rare case. Use heap allocation. - uint16_t* const sorted = - (uint16_t*)WebPSafeMalloc(code_lengths_size, sizeof(*sorted)); - if (sorted == NULL) return 0; -- total_size = BuildHuffmanTable(root_table, root_bits, -- code_lengths, code_lengths_size, sorted); -+ BuildHuffmanTable(root_table->curr_segment->curr_table, root_bits, -+ code_lengths, code_lengths_size, sorted); - WebPSafeFree(sorted); - } - return total_size; - } -+ -+int VP8LHuffmanTablesAllocate(int size, HuffmanTables* huffman_tables) { -+ // Have 'segment' point to the first segment for now, 'root'. -+ HuffmanTablesSegment* const root = &huffman_tables->root; -+ huffman_tables->curr_segment = root; -+ // Allocate root. -+ root->start = (HuffmanCode*)WebPSafeMalloc(size, sizeof(*root->start)); -+ if (root->start == NULL) return 0; -+ root->curr_table = root->start; -+ root->next = NULL; -+ root->size = size; -+ return 1; -+} -+ -+void VP8LHuffmanTablesDeallocate(HuffmanTables* const huffman_tables) { -+ HuffmanTablesSegment *current, *next; -+ if (huffman_tables == NULL) return; -+ // Free the root node. -+ current = &huffman_tables->root; -+ next = current->next; -+ WebPSafeFree(current->start); -+ current->start = NULL; -+ current->next = NULL; -+ current = next; -+ // Free the following nodes. -+ while (current != NULL) { -+ next = current->next; -+ WebPSafeFree(current->start); -+ WebPSafeFree(current); -+ current = next; -+ } -+} -diff --git a/src/utils/huffman_utils.h b/src/utils/huffman_utils.h -index 13b7ad1a..98415c53 100644 ---- a/src/utils/huffman_utils.h -+++ b/src/utils/huffman_utils.h -@@ -43,6 +43,29 @@ typedef struct { - // or non-literal symbol otherwise - } HuffmanCode32; - -+// Contiguous memory segment of HuffmanCodes. -+typedef struct HuffmanTablesSegment { -+ HuffmanCode* start; -+ // Pointer to where we are writing into the segment. Starts at 'start' and -+ // cannot go beyond 'start' + 'size'. -+ HuffmanCode* curr_table; -+ // Pointer to the next segment in the chain. -+ struct HuffmanTablesSegment* next; -+ int size; -+} HuffmanTablesSegment; -+ -+// Chained memory segments of HuffmanCodes. -+typedef struct HuffmanTables { -+ HuffmanTablesSegment root; -+ // Currently processed segment. At first, this is 'root'. -+ HuffmanTablesSegment* curr_segment; -+} HuffmanTables; -+ -+// Allocates a HuffmanTables with 'size' contiguous HuffmanCodes. Returns 0 on -+// memory allocation error, 1 otherwise. -+int VP8LHuffmanTablesAllocate(int size, HuffmanTables* huffman_tables); -+void VP8LHuffmanTablesDeallocate(HuffmanTables* const huffman_tables); -+ - #define HUFFMAN_PACKED_BITS 6 - #define HUFFMAN_PACKED_TABLE_SIZE (1u << HUFFMAN_PACKED_BITS) - -@@ -78,9 +101,7 @@ void VP8LHtreeGroupsFree(HTreeGroup* const htree_groups); - // the huffman table. - // Returns built table size or 0 in case of error (invalid tree or - // memory error). --// If root_table is NULL, it returns 0 if a lookup cannot be built, something --// > 0 otherwise (but not the table size). --int VP8LBuildHuffmanTable(HuffmanCode* const root_table, int root_bits, -+int VP8LBuildHuffmanTable(HuffmanTables* const root_table, int root_bits, - const int code_lengths[], int code_lengths_size); - - #ifdef __cplusplus --- -2.41.0 - diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix index 287c0b6b18bea..2605dabf125a0 100644 --- a/pkgs/development/libraries/libwebp/default.nix +++ b/pkgs/development/libraries/libwebp/default.nix @@ -27,23 +27,15 @@ stdenv.mkDerivation rec { pname = "libwebp"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "webmproject"; repo = pname; rev = "v${version}"; - hash = "sha256-Q94avvKjPdwdGt5ADo30cf2V4T7MCTubDHJxTtbG4xQ="; + hash = "sha256-UYO2Fmm8nzQR8VBC26wEwWd3qZTD+6MHKcmKBoNcpEE="; }; - patches = [ - # Commit 902bc919 from upstream, mangled slightly to apply onto 1.3.1. - # There is currently (2023-09-12) no confirmation that this is the fix for - # CVE-2023-4863, but it is linked to the right crbug, and matches the - # description of that (critical sev, exploited in the wild) CVE. - ./CVE-2023-4863.patch - ]; - configureFlags = [ (lib.enableFeature threadingSupport "threading") (lib.enableFeature openglSupport "gl") diff --git a/pkgs/development/libraries/libxc/default.nix b/pkgs/development/libraries/libxc/default.nix index ff47a3881e044..b3f20d02c5339 100644 --- a/pkgs/development/libraries/libxc/default.nix +++ b/pkgs/development/libraries/libxc/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { --replace "PROPERTIES TIMEOUT 1" "PROPERTIES TIMEOUT 30" ''; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ perl cmake gfortran ]; preConfigure = '' diff --git a/pkgs/development/libraries/libxsmm/default.nix b/pkgs/development/libraries/libxsmm/default.nix index 893fb4697ac91..6530ee7f67ae3 100644 --- a/pkgs/development/libraries/libxsmm/default.nix +++ b/pkgs/development/libraries/libxsmm/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-PpMiD/PeQ0pe5hqFG6VFHWpR8y3wnO2z1dJfHHeItlQ="; }; + outputs = [ "out" "dev" "doc" ]; nativeBuildInputs = [ gfortran python3 @@ -34,6 +35,13 @@ stdenv.mkDerivation rec { "STATIC=${static}" ]; + postInstall = '' + mkdir -p $dev/lib/pkgconfig + mv $out/lib/*.pc $dev/lib/pkgconfig + + moveToOutput "share/libxsmm" "$doc" + ''; + prePatch = '' patchShebangs . ''; diff --git a/pkgs/development/libraries/libyang/default.nix b/pkgs/development/libraries/libyang/default.nix index 9102286746b6e..88fdfcca03caa 100644 --- a/pkgs/development/libraries/libyang/default.nix +++ b/pkgs/development/libraries/libyang/default.nix @@ -36,7 +36,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_INCLUDEDIR=include" - "-DCMAKE_BUILD_TYPE:String=Release" ]; passthru.updateScript = gitUpdater { diff --git a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix index 8ef4513a18dda..888e10d6a81d1 100644 --- a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix +++ b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = "https://lightstep.com/"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/linenoise-ng/default.nix b/pkgs/development/libraries/linenoise-ng/default.nix index d19d6748147cc..276756822746e 100644 --- a/pkgs/development/libraries/linenoise-ng/default.nix +++ b/pkgs/development/libraries/linenoise-ng/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/arangodb/linenoise-ng"; description = "A small, portable GNU readline replacement for Linux, Windows and MacOS which is capable of handling UTF-8 characters"; - maintainers = with lib.maintainers; [ cstrahan ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.all; license = lib.licenses.bsd3; }; diff --git a/pkgs/development/libraries/llhttp/default.nix b/pkgs/development/libraries/llhttp/default.nix index 39b1e0bf260e3..fbf7198f1d551 100644 --- a/pkgs/development/libraries/llhttp/default.nix +++ b/pkgs/development/libraries/llhttp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "llhttp"; - version = "9.1.2"; + version = "9.1.3"; src = fetchFromGitHub { owner = "nodejs"; repo = "llhttp"; rev = "release/v${finalAttrs.version}"; - hash = "sha256-kW6u9ETZJcJBh150chfE3SEwFpT7evZ0cqz8caM7fbQ="; + hash = "sha256-QacjukWkRCuQA4qzUq45521YOBLPuOSKNR1pVxgxe9o="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix index 21f07337fab4d..99296b63a7279 100644 --- a/pkgs/development/libraries/lmdb/default.nix +++ b/pkgs/development/libraries/lmdb/default.nix @@ -17,6 +17,11 @@ stdenv.mkDerivation rec { patches = [ ./hardcoded-compiler.patch ./bin-ext.patch ]; patchFlags = [ "-p3" ]; + # Don't attempt the .so if static, as it would fail. + postPatch = lib.optionalString stdenv.hostPlatform.isStatic '' + sed 's/^ILIBS\>.*/ILIBS = liblmdb.a/' -i Makefile + ''; + outputs = [ "bin" "out" "dev" ]; buildInputs = lib.optional stdenv.hostPlatform.isWindows windows.pthreads; diff --git a/pkgs/development/libraries/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix index 65e35217f80a2..77e7669c0e123 100644 --- a/pkgs/development/libraries/mailcore2/default.nix +++ b/pkgs/development/libraries/mailcore2/default.nix @@ -54,6 +54,6 @@ stdenv.mkDerivation rec { description = "A simple and asynchronous API to work with e-mail protocols IMAP, POP and SMTP"; homepage = "http://libmailcore.com"; license = licenses.bsd3; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix index 23059b91e7c03..ea60c32a08cd3 100644 --- a/pkgs/development/libraries/mdds/default.nix +++ b/pkgs/development/libraries/mdds/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mdds"; - version = "2.0.3"; + version = "2.1.1"; src = fetchFromGitLab { owner = "mdds"; repo = "mdds"; rev = finalAttrs.version; - hash = "sha256-Y9uBJKM34UTEj/3c1w69QHhvwFcMNlAohEco0O0B+xI="; + hash = "sha256-a412LpgDiYM8TMToaUrTlHtblYS1HehzrDOwvIAAxiA="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/mesa-glu/default.nix b/pkgs/development/libraries/mesa-glu/default.nix index b583eb93153a4..dac12db94b621 100644 --- a/pkgs/development/libraries/mesa-glu/default.nix +++ b/pkgs/development/libraries/mesa-glu/default.nix @@ -1,19 +1,22 @@ -{ lib, stdenv, fetchurl, pkg-config, libGL, ApplicationServices +{ lib, stdenv, fetchurl +, meson, ninja +, pkg-config, libGL, ApplicationServices , testers +, gitUpdater }: stdenv.mkDerivation (finalAttrs: { pname = "glu"; - version = "9.0.2"; + version = "9.0.3"; src = let inherit (finalAttrs) pname version; in fetchurl { url = "https://mesa.freedesktop.org/archive/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-bnKA/1hcah2d/N8vykiSUWNLM3e/wzwp5AAkZqONAtQ="; + hash = "sha256-vUP+EvN0sRkusV/iDkX/RWubwmq1fw7ukZ+Wyg+KMw8="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ meson ninja pkg-config ]; propagatedBuildInputs = [ libGL ] ++ lib.optional stdenv.isDarwin ApplicationServices; @@ -21,7 +24,16 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + passthru = { + tests = { + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + updateScript = gitUpdater { + # No nicer place to find latest release. + url = "https://gitlab.freedesktop.org/mesa/glu"; + rev-prefix = "glu-"; + }; + }; meta = { description = "OpenGL utility library"; diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix index 07a14e862258d..b1c88a5b75243 100644 --- a/pkgs/development/libraries/mongoc/default.nix +++ b/pkgs/development/libraries/mongoc/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "mongoc"; - version = "1.24.3"; + version = "1.24.4"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo-c-driver"; rev = "refs/tags/${version}"; - hash = "sha256-zEIdK994aebLeKe4g6/ByWvaoGNBB0ODXRpczrCEkB8="; + hash = "sha256-cOPZ4o9q/cOBtGXFv6mOenTSyU/L2U6DZB4UmMnhtes="; }; postPatch = '' diff --git a/pkgs/development/libraries/mps/default.nix b/pkgs/development/libraries/mps/default.nix index 6298a1dfef636..3cc6d9ce35100 100644 --- a/pkgs/development/libraries/mps/default.nix +++ b/pkgs/development/libraries/mps/default.nix @@ -1,12 +1,19 @@ -{ lib, stdenv, fetchurl, autoreconfHook, sqlite }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, sqlite +}: stdenv.mkDerivation rec { pname = "mps"; - version = "1.117.0"; + version = "1.118.0"; - src = fetchurl { - url = "https://www.ravenbrook.com/project/mps/release/${version}/mps-kit-${version}.tar.gz"; - sha256 = "04ix4l7lk6nxxk9sawpnxbybvqb82lks5606ym10bc1qbc2kqdcz"; + src = fetchFromGitHub { + owner = "Ravenbrook"; + repo = "mps"; + rev = "refs/tags/release-${version}"; + hash = "sha256-3ql3jWLccgnQHKf23B1en+nJ9rxqmHcWd7aBr93YER0="; }; nativeBuildInputs = [ autoreconfHook ]; @@ -21,7 +28,6 @@ stdenv.mkDerivation rec { meta = { - broken = true; description = "A flexible memory management and garbage collection library"; homepage = "https://www.ravenbrook.com/project/mps"; license = lib.licenses.sleepycat; diff --git a/pkgs/development/libraries/muparserx/default.nix b/pkgs/development/libraries/muparserx/default.nix index 2b3d2853d1328..8a7d2c8f36463 100644 --- a/pkgs/development/libraries/muparserx/default.nix +++ b/pkgs/development/libraries/muparserx/default.nix @@ -16,10 +16,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" - ]; - doCheck = true; checkPhase = '' echo "***Muparserx self-test***" diff --git a/pkgs/development/libraries/nghttp3/default.nix b/pkgs/development/libraries/nghttp3/default.nix index a81b43ae790e1..4aaaefe1eb79f 100644 --- a/pkgs/development/libraries/nghttp3/default.nix +++ b/pkgs/development/libraries/nghttp3/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "nghttp3"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; rev = "v${version}"; - hash = "sha256-DqqT8rgGlbV0upe0E37AR8bk3SIsoyCXt8xJzIkz9xc="; + hash = "sha256-ZnfwPgjBAI2elHrx7uzc3JX2MdeX/hsrFKj4TfMK2tI="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/development/libraries/ngtcp2/default.nix index 9bfd3324242a9..d276311a243fe 100644 --- a/pkgs/development/libraries/ngtcp2/default.nix +++ b/pkgs/development/libraries/ngtcp2/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "0.17.0"; + version = "0.19.1"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; rev = "v${version}"; - hash = "sha256-vY3RooC8ttezru6vAqbG1MU5uZhD8fLnlEYVYS3pFRk="; + hash = "sha256-agiQRy/e5VS+ANxajXYi5huRjQQ2M8eddH/AzmwnHdQ=="; }; outputs = [ "out" "dev" "doc" ]; @@ -27,13 +27,6 @@ stdenv.mkDerivation rec { "-DENABLE_STATIC_LIB=OFF" ]; - preConfigure = '' - # https://github.com/ngtcp2/ngtcp2/issues/858 - # Fix ngtcp2_crypto_openssl remnants. - substituteInPlace crypto/includes/CMakeLists.txt \ - --replace 'ngtcp2/ngtcp2_crypto_openssl.h' 'ngtcp2/ngtcp2_crypto_quictls.h' - ''; - doCheck = true; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/nss/latest.nix b/pkgs/development/libraries/nss/latest.nix index db0ad2efad5e3..c4d619e771441 100644 --- a/pkgs/development/libraries/nss/latest.nix +++ b/pkgs/development/libraries/nss/latest.nix @@ -5,6 +5,6 @@ # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert import ./generic.nix { - version = "3.93"; - hash = "sha256-FfVLtyBI6xBfjA6TagS4medMPbmhm7weAKzuKvlHaoo="; + version = "3.94"; + hash = "sha256-RjrhgO6eXunjrU9ikyZlfiNngMyGVXKpMKFlIKutndg="; } diff --git a/pkgs/development/libraries/onnxruntime/default.nix b/pkgs/development/libraries/onnxruntime/default.nix index 1b955b57de42e..4a9ee61f5614c 100644 --- a/pkgs/development/libraries/onnxruntime/default.nix +++ b/pkgs/development/libraries/onnxruntime/default.nix @@ -133,7 +133,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DABSL_ENABLE_INSTALL=ON" - "-DCMAKE_BUILD_TYPE=RELEASE" "-DFETCHCONTENT_FULLY_DISCONNECTED=ON" "-DFETCHCONTENT_QUIET=OFF" "-DFETCHCONTENT_SOURCE_DIR_ABSEIL_CPP=${abseil-cpp.src}" diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix deleted file mode 100644 index 2934558b58752..0000000000000 --- a/pkgs/development/libraries/opencascade/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, libGL, libGLU, libXmu, cmake, ninja, - pkg-config, fontconfig, freetype, expat, freeimage, vtk_8, gl2ps, tbb, - OpenCL, Cocoa -}: - -stdenv.mkDerivation rec { - pname = "opencascade-oce"; - version = "0.18.3"; - - src = fetchFromGitHub { - owner = "tpaviot"; - repo = "oce"; - rev = "OCE-${version}"; - sha256 = "17wy8dcf44vqisishv1jjf3cmcxyygqq29y9c3wjdj983qi2hsig"; - }; - - nativeBuildInputs = [ cmake ninja pkg-config ]; - buildInputs = [ - libGL libGLU libXmu freetype fontconfig expat freeimage vtk_8 - gl2ps tbb - ] - ++ lib.optionals stdenv.isDarwin [OpenCL Cocoa] - ; - - cmakeFlags = [ - "-DOCE_INSTALL_PREFIX=${placeholder "out"}" - "-DOCE_WITH_FREEIMAGE=ON" - "-DOCE_WITH_VTK=ON" - "-DOCE_WITH_GL2PS=ON" - "-DOCE_MULTITHREAD_LIBRARY=TBB" - ] - ++ lib.optionals stdenv.isDarwin ["-DOCE_OSX_USE_COCOA=ON" "-DOCE_WITH_OPENCL=ON"]; - - patches = [ - # Use fontconfig instead of hardcoded directory list - # https://github.com/tpaviot/oce/pull/714 - (fetchpatch { - url = "https://github.com/tpaviot/oce/commit/9643432b27fec8974ca0ee15c3c372f5fe8fc069.patch"; - sha256 = "1wd940rszmh5apcpk5fv6126h8mcjcy4rjifrql5d4ac90v06v4c"; - }) - # Fix for glibc 2.26 - (fetchpatch { - url = "https://github.com/tpaviot/oce/commit/3b44656e93270d782009b06ec4be84d2a13f8126.patch"; - sha256 = "1ccakkcwy5g0184m23x0mnh22i0lk45xm8kgiv5z3pl7nh35dh8k"; - }) - (fetchpatch { - url = "https://github.com/tpaviot/oce/commit/cf50d078cd5fac03a48fd204938bd240930a08dc.patch"; - sha256 = "1xv94hcvggmb1c8vqwic1aiw9jw1sxk8mqbaak9xs9ycfqdvgdyc"; - }) - ]; - - postPatch = '' - # make sure the installed cmake file uses absolute paths for fontconfig - substituteInPlace adm/cmake/TKService/CMakeLists.txt \ - --replace FONTCONFIG_LIBRARIES FONTCONFIG_LINK_LIBRARIES - ''; - - meta = with lib; { - description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation"; - homepage = "https://github.com/tpaviot/oce"; - maintainers = [ maintainers.viric ]; - platforms = platforms.unix; - license = licenses.lgpl21; - }; -} diff --git a/pkgs/development/libraries/opencl-clang/default.nix b/pkgs/development/libraries/opencl-clang/default.nix index 3732103d73a61..70b80e3a84ddc 100644 --- a/pkgs/development/libraries/opencl-clang/default.nix +++ b/pkgs/development/libraries/opencl-clang/default.nix @@ -1,19 +1,16 @@ { lib , stdenv +, applyPatches , fetchFromGitHub , fetchpatch , cmake , git -, llvmPackages_11 +, llvmPackages_14 , spirv-llvm-translator , buildWithPatches ? true }: let - llvmPkgs = llvmPackages_11 // { - inherit spirv-llvm-translator; - }; - addPatches = component: pkg: pkg.overrideAttrs (oldAttrs: { postPatch = oldAttrs.postPatch or "" + '' for p in ${passthru.patchesOut}/${component}/*; do @@ -22,8 +19,13 @@ let ''; }); + llvmPkgs = llvmPackages_14; + inherit (llvmPkgs) llvm; + spirv-llvm-translator' = spirv-llvm-translator.override { inherit llvm; }; + libclang = if buildWithPatches then passthru.libclang else llvmPkgs.libclang; + passthru = rec { - spirv-llvm-translator = llvmPkgs.spirv-llvm-translator.override { llvm = llvmPackages_11.llvm; }; + spirv-llvm-translator = spirv-llvm-translator'; llvm = addPatches "llvm" llvmPkgs.llvm; libclang = addPatches "clang" llvmPkgs.libclang; @@ -34,7 +36,7 @@ let patchesOut = stdenv.mkDerivation { pname = "opencl-clang-patches"; - inherit (library) version src patches; + inherit version src; # Clang patches assume the root is the llvm root dir # but clang root in nixpkgs is the clang sub-directory postPatch = '' @@ -52,56 +54,66 @@ let }; }; - library = let - inherit (llvmPackages_11) llvm; - inherit (if buildWithPatches then passthru else llvmPkgs) libclang spirv-llvm-translator; - in - stdenv.mkDerivation { - pname = "opencl-clang"; - version = "unstable-2022-03-16"; - - - src = fetchFromGitHub { - owner = "intel"; - repo = "opencl-clang"; - rev = "bbdd1587f577397a105c900be114b56755d1f7dc"; - sha256 = "sha256-qEZoQ6h4XAvSnJ7/gLXBb1qrzeYa6Jp6nij9VFo8MwQ="; - }; - - patches = [ - # Build script tries to find Clang OpenCL headers under ${llvm} - # Work around it by specifying that directory manually. - ./opencl-headers-dir.patch - ]; + version = "unstable-2023-06-12"; + src = applyPatches { + src = fetchFromGitHub { + owner = "intel"; + repo = "opencl-clang"; + # https://github.com/intel/opencl-clang/compare/ocl-open-140 + rev = "cf95b338d14685e4f3402ab1828bef31d48f1fd6"; + hash = "sha256-To1RlQX9IJ+1zAwEXaW7ua3VNfjK9mu7pgsRPsfa8g8="; + }; + patches = [ + # Build script tries to find Clang OpenCL headers under ${llvm} + # Work around it by specifying that directory manually. + ./opencl-headers-dir.patch + + # fix CMake throwing errors + (fetchpatch { + url = "https://github.com/intel/opencl-clang/commit/321e3b99c1a8d54c8475f5ae998452069cc5eb71.patch"; + hash = "sha256-cATbH+AMVtcabhl3EkzAH7w3wGreUV53hQYHVUUEP4g="; + }) + ]; + + postPatch = '' + # fix not be able to find clang from PATH + substituteInPlace cl_headers/CMakeLists.txt \ + --replace " NO_DEFAULT_PATH" "" + '' + lib.optionalString stdenv.isDarwin '' # Uses linker flags that are not supported on Darwin. - postPatch = lib.optionalString stdenv.isDarwin '' - sed -i -e '/SET_LINUX_EXPORTS_FILE/d' CMakeLists.txt - substituteInPlace CMakeLists.txt \ - --replace '-Wl,--no-undefined' "" - ''; + sed -i -e '/SET_LINUX_EXPORTS_FILE/d' CMakeLists.txt + substituteInPlace CMakeLists.txt \ + --replace '-Wl,--no-undefined' "" + ''; + }; +in - nativeBuildInputs = [ cmake git llvm.dev ]; +stdenv.mkDerivation { + pname = "opencl-clang"; + inherit version src; - buildInputs = [ libclang llvm spirv-llvm-translator ]; + nativeBuildInputs = [ cmake git llvm.dev ]; - cmakeFlags = [ - "-DPREFERRED_LLVM_VERSION=${lib.getVersion llvm}" - "-DOPENCL_HEADERS_DIR=${libclang.lib}/lib/clang/${lib.getVersion libclang}/include/" + buildInputs = [ libclang llvm spirv-llvm-translator' ]; - "-DLLVMSPIRV_INCLUDED_IN_LLVM=OFF" - "-DSPIRV_TRANSLATOR_DIR=${spirv-llvm-translator}" - ]; + cmakeFlags = [ + "-DPREFERRED_LLVM_VERSION=${lib.getVersion llvm}" + "-DOPENCL_HEADERS_DIR=${libclang.lib}/lib/clang/${lib.getVersion libclang}/include/" - inherit passthru; + "-DLLVMSPIRV_INCLUDED_IN_LLVM=OFF" + "-DSPIRV_TRANSLATOR_DIR=${spirv-llvm-translator'}" + ]; - meta = with lib; { - homepage = "https://github.com/intel/opencl-clang/"; - description = "A clang wrapper library with an OpenCL-oriented API and the ability to compile OpenCL C kernels to SPIR-V modules"; - license = licenses.ncsa; - platforms = platforms.all; - maintainers = with maintainers; [ ]; - }; - }; -in - library + inherit passthru; + + meta = with lib; { + homepage = "https://github.com/intel/opencl-clang/"; + description = "A clang wrapper library with an OpenCL-oriented API and the ability to compile OpenCL C kernels to SPIR-V modules"; + license = licenses.ncsa; + maintainers = with maintainers; [ ]; + platforms = platforms.all; + # error: invalid value 'CL3.0' in '-cl-std=CL3.0' + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index d295efe6feed4..037192d871e77 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -22,7 +22,6 @@ , enablePython ? false, pythonPackages ? null , enableGtk2 ? false, gtk2 , enableGtk3 ? false, gtk3 -, enableVtk ? false, vtk_8 , enableFfmpeg ? false, ffmpeg , enableGStreamer ? false, gst_all_1 , enableTesseract ? false, tesseract, leptonica @@ -191,7 +190,6 @@ stdenv.mkDerivation { ++ lib.optional enablePython pythonPackages.python ++ lib.optional enableGtk2 gtk2 ++ lib.optional enableGtk3 gtk3 - ++ lib.optional enableVtk vtk_8 ++ lib.optional enableJPEG libjpeg ++ lib.optional enablePNG libpng ++ lib.optional enableTIFF libtiff @@ -252,6 +250,16 @@ stdenv.mkDerivation { ] ++ lib.optionals stdenv.isDarwin [ "-DWITH_OPENCL=OFF" "-DWITH_LAPACK=OFF" + + # Disable unnecessary vendoring that's enabled by default only for Darwin. + # Note that the opencvFlag feature flags listed above still take + # precedence, so we can safely list everything here. + "-DBUILD_ZLIB=OFF" + "-DBUILD_TIFF=OFF" + "-DBUILD_JASPER=OFF" + "-DBUILD_JPEG=OFF" + "-DBUILD_PNG=OFF" + "-DBUILD_WEBP=OFF" ] ++ lib.optionals enablePython [ "-DOPENCV_SKIP_PYTHON_LOADER=ON" ] ++ lib.optionals enableEigen [ diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 2bc3954f8ab94..68099a57c63f3 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -424,6 +424,17 @@ stdenv.mkDerivation { ] ++ lib.optionals stdenv.isDarwin [ "-DWITH_OPENCL=OFF" "-DWITH_LAPACK=OFF" + + # Disable unnecessary vendoring that's enabled by default only for Darwin. + # Note that the opencvFlag feature flags listed above still take + # precedence, so we can safely list everything here. + "-DBUILD_ZLIB=OFF" + "-DBUILD_TIFF=OFF" + "-DBUILD_OPENJPEG=OFF" + "-DBUILD_JASPER=OFF" + "-DBUILD_JPEG=OFF" + "-DBUILD_PNG=OFF" + "-DBUILD_WEBP=OFF" ] ++ lib.optionals (!stdenv.isDarwin) [ "-DOPENCL_LIBRARY=${ocl-icd}/lib/libOpenCL.so" ] ++ lib.optionals enablePython [ diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix index 42bcf436b9a25..f45bda41b8635 100644 --- a/pkgs/development/libraries/openscenegraph/default.nix +++ b/pkgs/development/libraries/openscenegraph/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, doxygen, +{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, pkg-config, doxygen, libX11, libXinerama, libXrandr, libGLU, libGL, glib, ilmbase, libxml2, pcre, zlib, AGL, Accelerate, Carbon, Cocoa, Foundation, @@ -11,7 +11,7 @@ gdalSupport ? false, gdal, curlSupport ? true, curl, colladaSupport ? false, collada-dom, - opencascadeSupport ? false, opencascade, + opencascadeSupport ? false, opencascade-occt, ffmpegSupport ? false, ffmpeg, nvttSupport ? false, nvidia-texture-tools, freetypeSupport ? true, freetype, @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ++ lib.optional gdalSupport gdal ++ lib.optional curlSupport curl ++ lib.optional colladaSupport collada-dom - ++ lib.optional opencascadeSupport opencascade + ++ lib.optional opencascadeSupport opencascade-occt ++ lib.optional ffmpegSupport ffmpeg ++ lib.optional nvttSupport nvidia-texture-tools ++ lib.optional freetypeSupport freetype @@ -66,7 +66,15 @@ stdenv.mkDerivation rec { ++ lib.optionals (!stdenv.isDarwin) [ ] ++ lib.optionals stdenv.isDarwin [ AGL Accelerate Carbon Cocoa Foundation ] ++ lib.optional (restSupport || colladaSupport) boost - ; + ; + + patches = [ + (fetchpatch { + name = "opencascade-api-patch"; + url = "https://github.com/openscenegraph/OpenSceneGraph/commit/bc2daf9b3239c42d7e51ecd7947d31a92a7dc82b.patch"; + hash = "sha256-VR8YKOV/YihB5eEGZOGaIfJNrig1EPS/PJmpKsK284c="; + }) + ]; cmakeFlags = lib.optional (!withApps) "-DBUILD_OSG_APPLICATIONS=OFF" ++ lib.optional withExamples "-DBUILD_OSG_EXAMPLES=ON"; diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix index 4cd398e6394a9..06d65be106daf 100644 --- a/pkgs/development/libraries/opensubdiv/default.nix +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "opensubdiv"; - version = "3.5.0"; + version = "3.5.1"; src = fetchFromGitHub { owner = "PixarAnimationStudios"; repo = "OpenSubdiv"; rev = "v${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "sha256-pYD2HxAszE9Ux1xsSJ7s2R13U8ct5tDo3ZP7H0+F9Rc="; + sha256 = "sha256-uDKCT0Uoa5WQekMUFm2iZmzm+oWAZ6IWMwfpchkUZY0="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix index 91e978ce04b3b..1abc8a2633c69 100644 --- a/pkgs/development/libraries/openxr-loader/default.nix +++ b/pkgs/development/libraries/openxr-loader/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openxr-loader"; - version = "1.0.28"; + version = "1.0.30"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenXR-SDK-Source"; rev = "release-${version}"; - sha256 = "sha256-rQ+Zkmvi4bWVp86KDPs7SLZ040stKUsC7Ycb9kltElk="; + sha256 = "sha256-lF8Pauyi+zSNVnpHqq86J3SGUTM6AhFmnT48eyFoYco="; }; nativeBuildInputs = [ cmake python3 pkg-config ]; diff --git a/pkgs/development/libraries/packr/default.nix b/pkgs/development/libraries/packr/default.nix index 5b04c168cf318..1a5bacad59f87 100644 --- a/pkgs/development/libraries/packr/default.nix +++ b/pkgs/development/libraries/packr/default.nix @@ -13,12 +13,12 @@ let p2 = buildGoModule rec { owner = "gobuffalo"; repo = "packr"; rev = "v${version}"; - sha256 = "1x78yq2yg0r82h7a67078llni85gk9nbd2ismlbqgppap7fcpyai"; + hash = "sha256-UfnL3Lnq3ocXrTqKtmyar6BoKUUHHKMOFCiD5wX26PQ="; }+"/v2"; subPackages = [ "packr2" ]; - vendorSha256 = "12yq121b0bn8z12091fyqhhz421kgx4z1nskrkvbxlhyc47bwyrp"; + vendorHash = "sha256-N3u+DmEe0r72zFPb8El/MwjyIcTehQRE+MgusIII2Is="; doCheck = false; @@ -45,12 +45,12 @@ p1 = buildGoModule rec { owner = "gobuffalo"; repo = "packr"; rev = "v${version}"; - sha256 = "1x78yq2yg0r82h7a67078llni85gk9nbd2ismlbqgppap7fcpyai"; + hash = "sha256-UfnL3Lnq3ocXrTqKtmyar6BoKUUHHKMOFCiD5wX26PQ="; }; subPackages = [ "packr" ]; - vendorSha256 = "0m3yj8ww4a16j56p8d8w0sdnyx0g2bkd8zg0l4d8vb72mvg5asga"; + vendorHash = "sha256-6mlV3q7irI0aoeB91OYSD3RvmwYcNXRNkSYowjmSflQ="; doCheck = false; diff --git a/pkgs/development/libraries/pdfhummus/default.nix b/pkgs/development/libraries/pdfhummus/default.nix index e9d3c45ae8bac..c811f0d4eb8b9 100644 --- a/pkgs/development/libraries/pdfhummus/default.nix +++ b/pkgs/development/libraries/pdfhummus/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "pdfhummus"; - version = "4.5.11"; + version = "4.5.12"; src = fetchFromGitHub { owner = "galkahana"; repo = "PDF-Writer"; rev = "v${version}"; - hash = "sha256-nTLyFGnY07gDoahYe5YqSmU/URzdvRKQ1MsXt3164+c="; + hash = "sha256-n5mzzIDU7Lb2V9YImPvceCBUt9Q+ZeF45CHtW52cGpY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/pe-parse/default.nix b/pkgs/development/libraries/pe-parse/default.nix index d9ccb4447b2fd..7560f2297cfad 100644 --- a/pkgs/development/libraries/pe-parse/default.nix +++ b/pkgs/development/libraries/pe-parse/default.nix @@ -1,23 +1,16 @@ -{ stdenv, lib, fetchFromGitHub, cmake, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "pe-parse"; - version = "2.0.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "trailofbits"; repo = "pe-parse"; rev = "v${version}"; - hash = "sha256-HwWlMRhpB/sa/JRyAZF7LZzkXCCyuxB+gtDAfHt7e6k="; + hash = "sha256-XegSZWRoQg6NEWuTSFI1RMvN3GbpLDrZrloPU2XdK2M="; }; - patches = [ - (fetchpatch { - url = "https://github.com/trailofbits/pe-parse/commit/eecdb3d36eb44e306398a2e66e85490f9bdcc74c.patch"; - hash = "sha256-pd6D/JMctiQqJxnJU9Nm/GDVf4/CaIGeXx1UfdcCupo="; - }) - ]; - nativeBuildInputs = [ cmake ]; doInstallCheck = true; @@ -28,6 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A principled, lightweight parser for Windows portable executable files"; homepage = "https://github.com/trailofbits/pe-parse"; + changelog = "https://github.com/trailofbits/pe-parse/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ arturcygan ]; mainProgram = "dump-pe"; diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix index fc0afbe2184c1..a94234aec41bf 100644 --- a/pkgs/development/libraries/phonon/backends/gstreamer.nix +++ b/pkgs/development/libraries/phonon/backends/gstreamer.nix @@ -58,9 +58,7 @@ stdenv.mkDerivation rec { qttools ]; - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}" - ]; + cmakeBuildType = if debug then "Debug" else "Release"; meta = with lib; { homepage = "https://phonon.kde.org/"; diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/pkgs/development/libraries/phonon/backends/vlc.nix index 42923d4f026bc..a50a07dde1a14 100644 --- a/pkgs/development/libraries/phonon/backends/vlc.nix +++ b/pkgs/development/libraries/phonon/backends/vlc.nix @@ -28,9 +28,7 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}" - ]; + cmakeBuildType = if debug then "Debug" else "Release"; meta = with lib; { homepage = "https://community.kde.org/Phonon"; diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index 59d9e19556aaf..dc95b4ed82660 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -52,9 +52,7 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = "-fPIC"; - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}" - ]; + cmakeBuildType = if debug then "Debug" else "Release"; dontWrapQtApps = true; diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index fdc514c286b7e..1e66d1573fc56 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -23,6 +23,7 @@ , vulkan-headers , vulkan-loader , webrtc-audio-processing +, webrtc-audio-processing_1 , ncurses , readline # meson can't find <7 as those versions don't have a .pc file , lilv @@ -42,10 +43,11 @@ , bluez , sbc , libfreeaptx -, ldacbt , liblc3 , fdk_aac , libopus +, ldacbtSupport ? bluezSupport && lib.meta.availableOn stdenv.hostPlatform ldacbt +, ldacbt , nativeHspSupport ? true , nativeHfpSupport ? true , nativeModemManagerSupport ? true @@ -70,12 +72,15 @@ , ffado }: +# Bluetooth codec only makes sense if general bluetooth enabled +assert ldacbtSupport -> bluezSupport; + let mesonEnableFeature = b: if b then "enabled" else "disabled"; self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.79"; + version = "0.3.80"; outputs = [ "out" @@ -93,7 +98,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-pqs991pMqz3IQE+NUk0VNzZS4ExwfoZqBQDWBSGdWcs="; + sha256 = "sha256-6Ka83Bqd/nsfp8rv0GTBerpGP226MeZvC5u/j62FzP0="; }; patches = [ @@ -111,6 +116,12 @@ let ./0090-pipewire-config-template-paths.patch # Place SPA data files in lib output to avoid dependency cycles ./0095-spa-data-dir.patch + + # backport fix for building with webrtc-audio-processing 0.3 on platforms where we don't have 1.x + (fetchpatch { + url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/1f1c308c9766312e684f0b53fc2d1422c7414d31.patch"; + hash = "sha256-ECM7/84G99yzXsg5A2DkFnXFGJSV9lz3vD0IRSzR8vU="; + }) ]; strictDeps = true; @@ -138,13 +149,14 @@ let udev vulkan-headers vulkan-loader - webrtc-audio-processing tinycompress ] ++ (if enableSystemd then [ systemd ] else [ eudev ]) + ++ (if lib.meta.availableOn stdenv.hostPlatform webrtc-audio-processing_1 then [ webrtc-audio-processing_1 ] else [ webrtc-audio-processing ]) ++ lib.optionals gstreamerSupport [ gst_all_1.gst-plugins-base gst_all_1.gstreamer ] ++ lib.optionals libcameraSupport [ libcamera libdrm ] ++ lib.optional ffmpegSupport ffmpeg - ++ lib.optionals bluezSupport [ bluez libfreeaptx ldacbt liblc3 sbc fdk_aac libopus ] + ++ lib.optionals bluezSupport [ bluez libfreeaptx liblc3 sbc fdk_aac libopus ] + ++ lib.optional ldacbtSupport ldacbt ++ lib.optional nativeModemManagerSupport modemmanager ++ lib.optional pulseTunnelSupport libpulseaudio ++ lib.optional zeroconfSupport avahi @@ -184,6 +196,7 @@ let # source code is not easily obtainable "-Dbluez5-codec-lc3plus=disabled" "-Dbluez5-codec-lc3=${mesonEnableFeature bluezSupport}" + "-Dbluez5-codec-ldac=${mesonEnableFeature ldacbtSupport}" "-Dsysconfdir=/etc" "-Dpipewire_confdata_dir=${placeholder "lib"}/share/pipewire" "-Draop=${mesonEnableFeature raopSupport}" diff --git a/pkgs/development/libraries/pipewire/wireplumber.nix b/pkgs/development/libraries/pipewire/wireplumber.nix index 4e249459d7aec..2fbbb2a1c01c5 100644 --- a/pkgs/development/libraries/pipewire/wireplumber.nix +++ b/pkgs/development/libraries/pipewire/wireplumber.nix @@ -2,28 +2,26 @@ , stdenv , fetchFromGitLab , nix-update-script -, # base build deps - meson +# base build deps +, meson , pkg-config , ninja -, # docs build deps - python3 +# docs build deps +, python3 , doxygen , graphviz -, # GI build deps - gobject-introspection -, # runtime deps - glib +# GI build deps +, gobject-introspection +# runtime deps +, glib , systemd , lua5_4 , pipewire -, # options - enableDocs ? true +# options +, enableDocs ? true , enableGI ? true }: -let - mesonEnableFeature = b: if b then "enabled" else "disabled"; -in + stdenv.mkDerivation rec { pname = "wireplumber"; version = "0.4.14"; @@ -49,8 +47,8 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (enableDocs || enableGI) [ doxygen (python3.pythonForBuild.withPackages (ps: with ps; - lib.optionals enableDocs [ sphinx sphinx-rtd-theme breathe ] ++ - lib.optionals enableGI [ lxml ] + lib.optionals enableDocs [ sphinx sphinx-rtd-theme breathe ] + ++ lib.optionals enableGI [ lxml ] )) ]; @@ -62,13 +60,13 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dsystem-lua=true" - "-Delogind=disabled" - "-Ddoc=${mesonEnableFeature enableDocs}" - "-Dintrospection=${mesonEnableFeature enableGI}" - "-Dsystemd-system-service=true" - "-Dsystemd-system-unit-dir=${placeholder "out"}/lib/systemd/system" - "-Dsysconfdir=/etc" + (lib.mesonBool "system-lua" true) + (lib.mesonEnable "elogind" false) + (lib.mesonEnable "doc" enableDocs) + (lib.mesonEnable "introspection" enableGI) + (lib.mesonBool "systemd-system-service" true) + (lib.mesonOption "systemd-system-unit-dir" "${placeholder "out"}/lib/systemd/system") + (lib.mesonOption "sysconfdir" "/etc") ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/development/libraries/pkger/default.nix b/pkgs/development/libraries/pkger/default.nix index f2e984c8c8162..073c57c013da8 100644 --- a/pkgs/development/libraries/pkger/default.nix +++ b/pkgs/development/libraries/pkger/default.nix @@ -12,10 +12,10 @@ buildGoModule rec { owner = "markbates"; repo = "pkger"; rev = "v${version}"; - sha256 = "12zcvsd6bv581wwhahp1wy903495s51lw86b99cfihwmxc5qw6ww"; + hash = "sha256-nBuOC+uVw+hYSssgTkPRJZEBkufhQgU5D6jsZZre7Is="; }; - vendorSha256 = "1b9gpym6kb4hpdbrixphfh1qylmqr265jrmcd4vxb87ahvrsrvgp"; + vendorHash = "sha256-9+2s84bqoNU3aaxmWYzIuFKPA3Tw9phXu5Csaaq/L60="; doCheck = false; diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index a00b6bb07a543..b6de5b02c0918 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -39,7 +39,7 @@ let in stdenv.mkDerivation rec { pname = "polkit"; - version = "122"; + version = "123"; outputs = [ "bin" "dev" "out" ]; # small man pages in $bin @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { owner = "polkit"; repo = "polkit"; rev = version; - sha256 = "fLY8i8h4McAnwVt8dLOqbyHM7v3SkbWqATz69NkUudU="; + hash = "sha256-/kjWkh6w2FYgtYWzw3g3GlWJKKpkJ3cqwfE0iDqJctw="; }; patches = [ diff --git a/pkgs/development/libraries/pplite/default.nix b/pkgs/development/libraries/pplite/default.nix new file mode 100644 index 0000000000000..c9c0d18633824 --- /dev/null +++ b/pkgs/development/libraries/pplite/default.nix @@ -0,0 +1,19 @@ +{ stdenv, lib, fetchurl, flint, gmp }: + +stdenv.mkDerivation { + pname = "pplite"; + version = "0.11"; + + src = fetchurl { + url = "https://github.com/ezaffanella/PPLite/raw/main/releases/pplite-0.11.tar.gz"; + hash = "sha256-6IS5zVab8X+gnhK8/qbPH5FODFaG6vIsIG9TTEpfHEI="; + }; + + buildInputs = [ flint gmp ]; + + meta = { + homepage = "https://github.com/ezaffanella/PPLite"; + description = "Convex polyhedra library for Abstract Interpretation"; + license = lib.licenses.gpl3Only; + }; +} diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix index 2f4f5fc238251..ce1f74f0b1537 100644 --- a/pkgs/development/libraries/proj/default.nix +++ b/pkgs/development/libraries/proj/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: rec { pname = "proj"; - version = "9.2.1"; + version = "9.3.0"; src = fetchFromGitHub { owner = "OSGeo"; repo = "PROJ"; rev = version; - hash = "sha256-cUnnJ9gOh65xBbfamfDkN7ajRdRLO5nUXRLeaBBMchg="; + hash = "sha256-M1KUXzht4qIjPfHxvzPr7XUnisMwtbegKp18XQjNYHg="; }; patches = [ diff --git a/pkgs/development/libraries/protobuf/3.17.nix b/pkgs/development/libraries/protobuf/3.17.nix deleted file mode 100644 index 36198b5d337b2..0000000000000 --- a/pkgs/development/libraries/protobuf/3.17.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic-v3.nix ({ - version = "3.17.3"; - sha256 = "08644kaxhpjs38q5q4fp01yr0wakg1ijha4g3lzp2ifg7y3c465d"; -} // args) diff --git a/pkgs/development/libraries/protobuf/3.19.nix b/pkgs/development/libraries/protobuf/3.19.nix deleted file mode 100644 index 7ee378d8ed3b7..0000000000000 --- a/pkgs/development/libraries/protobuf/3.19.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic-v3.nix ({ - version = "3.19.6"; - sha256 = "sha256-+ul9F8tyrwk2p25Dd9ragqwpYzdxdeGjpXhLAwKYWfM="; -} // args) diff --git a/pkgs/development/libraries/protobuf/3.24.nix b/pkgs/development/libraries/protobuf/3.24.nix index 2deb155444ec2..60ad747194df8 100644 --- a/pkgs/development/libraries/protobuf/3.24.nix +++ b/pkgs/development/libraries/protobuf/3.24.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic-v3-cmake.nix ({ - version = "3.24.2"; - sha256 = "sha256-yVLszyVtsz1CCzeOkioL4O3mWTFKKVBUyOhwDbC5UqE="; + version = "3.24.3"; + sha256 = "sha256-wXGQW/o674DeLXX2IlyZskl5OrBcSRptOMoJqLQGm94="; } // args) diff --git a/pkgs/development/libraries/protobuf/generic-v3-cmake.nix b/pkgs/development/libraries/protobuf/generic-v3-cmake.nix index 384d2d0decb4c..dd31aba434cee 100644 --- a/pkgs/development/libraries/protobuf/generic-v3-cmake.nix +++ b/pkgs/development/libraries/protobuf/generic-v3-cmake.nix @@ -13,53 +13,46 @@ , version , sha256 -# downstream dependencies + # downstream dependencies , python3 +, grpc +, enableShared ? !stdenv.hostPlatform.isStatic , ... }: -let - self = stdenv.mkDerivation { - pname = "protobuf"; - inherit version; +stdenv.mkDerivation (finalAttrs: { + pname = "protobuf"; + inherit version; - src = fetchFromGitHub { - owner = "protocolbuffers"; - repo = "protobuf"; - rev = "v${version}"; - inherit sha256; - }; - - # re-create submodule logic - postPatch = '' - rm -rf gmock - cp -r ${gtest.src}/googlemock third_party/gmock - cp -r ${gtest.src}/googletest third_party/ - chmod -R a+w third_party/ + src = fetchFromGitHub { + owner = "protocolbuffers"; + repo = "protobuf"; + rev = "v${version}"; + inherit sha256; + }; - ln -s ../googletest third_party/gmock/gtest - ln -s ../gmock third_party/googletest/googlemock - ln -s $(pwd)/third_party/googletest third_party/googletest/googletest - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace src/google/protobuf/testing/googletest.cc \ - --replace 'tmpnam(b)' '"'$TMPDIR'/foo"' - ''; + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace src/google/protobuf/testing/googletest.cc \ + --replace 'tmpnam(b)' '"'$TMPDIR'/foo"' + ''; - patches = lib.optionals (lib.versionOlder version "3.22") [ - # fix protobuf-targets.cmake installation paths, and allow for CMAKE_INSTALL_LIBDIR to be absolute - # https://github.com/protocolbuffers/protobuf/pull/10090 - (fetchpatch { - url = "https://github.com/protocolbuffers/protobuf/commit/a7324f88e92bc16b57f3683403b6c993bf68070b.patch"; - sha256 = "sha256-SmwaUjOjjZulg/wgNmR/F5b8rhYA2wkKAjHIOxjcQdQ="; - }) - ] ++ lib.optionals stdenv.hostPlatform.isStatic [ - ./static-executables-have-no-rpath.patch - ]; + patches = lib.optionals (lib.versionOlder version "3.22") [ + # fix protobuf-targets.cmake installation paths, and allow for CMAKE_INSTALL_LIBDIR to be absolute + # https://github.com/protocolbuffers/protobuf/pull/10090 + (fetchpatch { + url = "https://github.com/protocolbuffers/protobuf/commit/a7324f88e92bc16b57f3683403b6c993bf68070b.patch"; + sha256 = "sha256-SmwaUjOjjZulg/wgNmR/F5b8rhYA2wkKAjHIOxjcQdQ="; + }) + ] ++ lib.optionals stdenv.hostPlatform.isStatic [ + ./static-executables-have-no-rpath.patch + ]; - nativeBuildInputs = let + nativeBuildInputs = + let protobufVersion = "${lib.versions.major version}_${lib.versions.minor version}"; - in [ + in + [ cmake ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # protoc of the same version must be available for build. For non-cross builds, it's able to @@ -67,52 +60,57 @@ let buildPackages."protobuf${protobufVersion}" ]; - buildInputs = [ - zlib - ]; + buildInputs = [ + gtest + zlib + ]; - propagatedBuildInputs = [ - abseil-cpp - ]; + propagatedBuildInputs = [ + abseil-cpp + ]; - cmakeDir = if lib.versionOlder version "3.22" then "../cmake" else null; - cmakeFlags = [ - "-Dprotobuf_ABSL_PROVIDER=package" - ] ++ lib.optionals (!stdenv.targetPlatform.isStatic) [ - "-Dprotobuf_BUILD_SHARED_LIBS=ON" - ] - # Tests fail to build on 32-bit platforms; fixed in 3.22 - # https://github.com/protocolbuffers/protobuf/issues/10418 - ++ lib.optional - (stdenv.targetPlatform.is32bit && lib.versionOlder version "3.22") - "-Dprotobuf_BUILD_TESTS=OFF"; + strictDeps = true; - # unfortunately the shared libraries have yet to been patched by nix, thus tests will fail - doCheck = false; + cmakeDir = if lib.versionOlder version "3.22" then "../cmake" else null; + cmakeFlags = [ + "-Dprotobuf_USE_EXTERNAL_GTEST=ON" + "-Dprotobuf_ABSL_PROVIDER=package" + ] ++ lib.optionals enableShared [ + "-Dprotobuf_BUILD_SHARED_LIBS=ON" + ] + # Tests fail to build on 32-bit platforms; fixed in 3.22 + # https://github.com/protocolbuffers/protobuf/issues/10418 + ++ lib.optionals (stdenv.targetPlatform.is32bit && lib.versionOlder version "3.22") [ + "-Dprotobuf_BUILD_TESTS=OFF" + ]; - passthru = { - tests = { - pythonProtobuf = python3.pkgs.protobuf.override(_: { - protobuf = self; - }); - }; + # FIXME: investigate. 3.24 and 3.23 have different errors. + # At least some of it is not reproduced on some other machine; example: + # https://hydra.nixos.org/build/235677717/nixlog/4/tail + doCheck = !(stdenv.isDarwin && lib.versionAtLeast version "3.23"); - inherit abseil-cpp; + passthru = { + tests = { + pythonProtobuf = python3.pkgs.protobuf.override (_: { + protobuf = finalAttrs.finalPackage; + }); + inherit grpc; }; - meta = { - description = "Google's data interchange format"; - longDescription = '' - Protocol Buffers are a way of encoding structured data in an efficient - yet extensible format. Google uses Protocol Buffers for almost all of - its internal RPC protocols and file formats. - ''; - license = lib.licenses.bsd3; - platforms = lib.platforms.unix; - homepage = "https://developers.google.com/protocol-buffers/"; - maintainers = with lib.maintainers; [ jonringer ]; - mainProgram = "protoc"; - }; + inherit abseil-cpp; + }; + + meta = { + description = "Google's data interchange format"; + longDescription = '' + Protocol Buffers are a way of encoding structured data in an efficient + yet extensible format. Google uses Protocol Buffers for almost all of + its internal RPC protocols and file formats. + ''; + license = lib.licenses.bsd3; + platforms = lib.platforms.all; + homepage = "https://protobuf.dev/"; + maintainers = with lib.maintainers; [ jonringer ]; + mainProgram = "protoc"; }; -in - self +}) diff --git a/pkgs/development/libraries/psqlodbc/default.nix b/pkgs/development/libraries/psqlodbc/default.nix index c1a86b1f39792..f503f3f844d49 100644 --- a/pkgs/development/libraries/psqlodbc/default.nix +++ b/pkgs/development/libraries/psqlodbc/default.nix @@ -2,21 +2,25 @@ stdenv.mkDerivation rec { pname = "psqlodbc"; - version = "09.01.0200"; + version = "13.02.0000"; src = fetchurl { - url = "https://ftp.postgresql.org/pub/odbc/versions/src/${pname}-${version}.tar.gz"; - sha256 = "0b4w1ahfpp34jpscfk2kv9050lh3xl9pvcysqvaigkcd0vsk1hl9"; + url = "https://ftp.postgresql.org/pub/odbc/versions/src/psqlodbc-${version}.tar.gz"; + hash = "sha256-s5t+XEH9ZHXFUREvpyS/V8SkRhdexBiKkOKETMFhJYU="; }; buildInputs = [ libiodbc postgresql openssl ]; - configureFlags = [ "--with-iodbc=${libiodbc}" ]; + configureFlags = [ + "--with-iodbc=${libiodbc}" + "--with-libpq=${lib.getDev postgresql}/bin/pg_config" + ]; meta = with lib; { homepage = "https://odbc.postgresql.org/"; description = "ODBC driver for PostgreSQL"; license = licenses.lgpl2; platforms = platforms.linux; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index 838657f48bbef..d80309f2b16b4 100644 --- a/pkgs/development/libraries/qpdf/default.nix +++ b/pkgs/development/libraries/qpdf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qpdf"; - version = "11.5.0"; + version = "11.6.1"; src = fetchFromGitHub { owner = "qpdf"; repo = "qpdf"; rev = "v${version}"; - hash = "sha256-lojvsCgBsT7wVRLWfkeOduEYUG7ztI/uryM0WueWiL0="; + hash = "sha256-QXRzvSMi6gKISJo44KIjTYENNqxh1yDhUUhEZa8uz6Q="; }; nativeBuildInputs = [ cmake perl ]; diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index 5a2b00c54e3e5..394446feb0170 100644 --- a/pkgs/development/libraries/qscintilla/default.nix +++ b/pkgs/development/libraries/qscintilla/default.nix @@ -6,9 +6,16 @@ , qtmacextras ? null , qmake , fixDarwinDylibNames +, darwin }: -stdenv.mkDerivation rec { +let + stdenv' = if stdenv.isDarwin then + darwin.apple_sdk_11_0.stdenv + else + stdenv + ; +in stdenv'.mkDerivation rec { pname = "qscintilla-qt5"; version = "2.13.2"; diff --git a/pkgs/development/libraries/qt-5/modules/qtwayland.nix b/pkgs/development/libraries/qt-5/modules/qtwayland.nix index edb15b0b48b1c..0faabf3752a25 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwayland.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwayland.nix @@ -1,10 +1,10 @@ -{ qtModule, qtbase, qtquickcontrols, wayland, pkg-config }: +{ qtModule, qtbase, qtquickcontrols, wayland, wayland-scanner, pkg-config }: qtModule { pname = "qtwayland"; qtInputs = [ qtbase qtquickcontrols ]; buildInputs = [ wayland ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config wayland-scanner ]; outputs = [ "out" "dev" "bin" ]; patches = [ # NixOS-specific, ensure that app_id is correctly determined for diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index 0dd6cd75df08a..840d3adc6dcab 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -109,8 +109,8 @@ let patches = [ (fetchpatch2 { # fix compatibility with protobuf 23 - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/qt6-grpc/-/raw/d6b33bd915dc6e63b30db2cd29150d55b289d7ed/protobuf-23.patch"; - hash = "sha256-KQAcrjQ3rK9pDQUOUK6AS4ej8YvtRv9WZOxby31Y5r4="; + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/qt6-grpc/-/raw/5cfb8728ca626af41d5dc2b1f642d026c011ec56/protobuf-23.patch"; + hash = "sha256-msVQEAt0DewOnZIgymGijJEpIXbfmMUkdbIyJ0ZNuok="; }) ]; }; diff --git a/pkgs/development/libraries/qt-6/fetch.sh b/pkgs/development/libraries/qt-6/fetch.sh index 519f2f887d1f8..5102cfa8e4073 100644 --- a/pkgs/development/libraries/qt-6/fetch.sh +++ b/pkgs/development/libraries/qt-6/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.qt.io/official_releases/qt/6.5/6.5.3/submodules/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-6/modules/qtmqtt.nix b/pkgs/development/libraries/qt-6/modules/qtmqtt.nix index 43c6dade7de3f..1a112d7c6f932 100644 --- a/pkgs/development/libraries/qt-6/modules/qtmqtt.nix +++ b/pkgs/development/libraries/qt-6/modules/qtmqtt.nix @@ -5,12 +5,12 @@ qtModule rec { pname = "qtmqtt"; - version = "6.5.2"; + version = "6.5.3"; src = fetchFromGitHub { owner = "qt"; repo = "qtmqtt"; rev = "v${version}"; - hash = "sha256-yyerVzz+nGT5kjNo24zYqZcJmrE50KCp38s3+samjd0="; + hash = "sha256-F0rq72Cvnwy2cJmw3wUL9t8ZsnI61HBRMMWRwKdSEs8="; }; qtInputs = [ qtbase ]; } diff --git a/pkgs/development/libraries/qt-6/srcs.nix b/pkgs/development/libraries/qt-6/srcs.nix index a0ac367f162cd..bad7dee1e1054 100644 --- a/pkgs/development/libraries/qt-6/srcs.nix +++ b/pkgs/development/libraries/qt-6/srcs.nix @@ -4,315 +4,307 @@ { qt3d = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qt3d-everywhere-src-6.5.2.tar.xz"; - sha256 = "047rwawrlm7n0vifxmsqvs3w3j5c16x8qkpx8xazq6xd47dn9w11"; - name = "qt3d-everywhere-src-6.5.2.tar.xz"; - }; - }; - qt5 = { - version = "6.5.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qt5-everywhere-src-6.5.2.tar.xz"; - sha256 = "15da8xd213fg2yfna3zvvr5mnhdfdai0i4m1paqfxr10sl81p515"; - name = "qt5-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qt3d-everywhere-src-6.5.3.tar.xz"; + sha256 = "1p7x70wnqynsvd7w4jkz31amf02hwh49gqsccv5hhlpx50h9ydhd"; + name = "qt3d-everywhere-src-6.5.3.tar.xz"; }; }; qt5compat = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qt5compat-everywhere-src-6.5.2.tar.xz"; - sha256 = "1i4izabbmf1dayzlj1miz7hsm4cy0qb7i72pwyl2fp05w8pf9axr"; - name = "qt5compat-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qt5compat-everywhere-src-6.5.3.tar.xz"; + sha256 = "0r34h35w0m17zyncxq2a0kichv5l4j01mximg6m5mqbifziakcpf"; + name = "qt5compat-everywhere-src-6.5.3.tar.xz"; }; }; qtactiveqt = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtactiveqt-everywhere-src-6.5.2.tar.xz"; - sha256 = "04zhbwhnjlc561bs2f4y82mzlf18byy6g5gh37yq9r3gfz54002x"; - name = "qtactiveqt-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtactiveqt-everywhere-src-6.5.3.tar.xz"; + sha256 = "1lawc0jq5w0jqjagkf7d0g9i8rrsdgrd4k34ylriy27djpd53b1j"; + name = "qtactiveqt-everywhere-src-6.5.3.tar.xz"; }; }; qtbase = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtbase-everywhere-src-6.5.2.tar.xz"; - sha256 = "0s8jwzdcv97dfy8n3jjm8zzvllv380l73mwdva7rs2nqnhlwgd1x"; - name = "qtbase-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtbase-everywhere-src-6.5.3.tar.xz"; + sha256 = "0imm0x9j7102ymcz7gl0dbnbi8qk2jmijb4gg7wh9sp41cillbyz"; + name = "qtbase-everywhere-src-6.5.3.tar.xz"; }; }; qtcharts = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtcharts-everywhere-src-6.5.2.tar.xz"; - sha256 = "0bddlrwda5bh5bdwdx86ixdpm3zg5nygzb754y5nkjlw06zgfnkp"; - name = "qtcharts-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtcharts-everywhere-src-6.5.3.tar.xz"; + sha256 = "1n9fflfh47wm0fk1995dw56vyqfprwv5ialjfpcxxgzm187816sa"; + name = "qtcharts-everywhere-src-6.5.3.tar.xz"; }; }; qtconnectivity = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtconnectivity-everywhere-src-6.5.2.tar.xz"; - sha256 = "16fwbz9pr6pi19119mp6w0crq9nsb35fw8cgpfpkq99d6li4jbnv"; - name = "qtconnectivity-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtconnectivity-everywhere-src-6.5.3.tar.xz"; + sha256 = "0nrzpqs3cq0inwp3siskxz9yxxqkz15yaf9aicnggvvic2q328i4"; + name = "qtconnectivity-everywhere-src-6.5.3.tar.xz"; }; }; qtdatavis3d = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtdatavis3d-everywhere-src-6.5.2.tar.xz"; - sha256 = "1s8wlpc4nibnxaghkxmaxda5dkkn64jw6qgmzw39vi5vvhc3khb8"; - name = "qtdatavis3d-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtdatavis3d-everywhere-src-6.5.3.tar.xz"; + sha256 = "0qf07m3bplqpm7pkn3145l2k9h0npv9qbw9gcnydzp0qdsqc1dhi"; + name = "qtdatavis3d-everywhere-src-6.5.3.tar.xz"; }; }; qtdeclarative = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtdeclarative-everywhere-src-6.5.2.tar.xz"; - sha256 = "06c7xfqn2a5s2m8j1bcvx3pyjqg1rgqkjvp49737gb4z9vjiz8gk"; - name = "qtdeclarative-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtdeclarative-everywhere-src-6.5.3.tar.xz"; + sha256 = "05fjb70n35y42dp7g0sd99rbvmn9133z08k6rlp8ifq6sb9dcka0"; + name = "qtdeclarative-everywhere-src-6.5.3.tar.xz"; }; }; qtdoc = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtdoc-everywhere-src-6.5.2.tar.xz"; - sha256 = "0cydg39f4cpv965pr97qn3spm5fzlxvhamifjfdsrzgskc5nm0v3"; - name = "qtdoc-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtdoc-everywhere-src-6.5.3.tar.xz"; + sha256 = "1k430zc8khakpcjbj7vmkgrdyrz0y6bfcfgw4dzc68gcvbwbq27g"; + name = "qtdoc-everywhere-src-6.5.3.tar.xz"; }; }; qtgrpc = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtgrpc-everywhere-src-6.5.2.tar.xz"; - sha256 = "016jw2ny7paky54pk4pa499273919s8ag2ksx361ir6d0ydrdcks"; - name = "qtgrpc-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtgrpc-everywhere-src-6.5.3.tar.xz"; + sha256 = "10wbq5zcr263g1hi06xpyvh7y2advhhy07asx4aqwf56v9rpmgvf"; + name = "qtgrpc-everywhere-src-6.5.3.tar.xz"; }; }; qthttpserver = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qthttpserver-everywhere-src-6.5.2.tar.xz"; - sha256 = "1b6w0999n5vw5xb93m0rc896l6ci3jld657y8645rl3q29fjpypq"; - name = "qthttpserver-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qthttpserver-everywhere-src-6.5.3.tar.xz"; + sha256 = "0ivcaqf39k7mawd17wf2db3kn8ch2ajm4gqm6wl1iqkp45aqjm05"; + name = "qthttpserver-everywhere-src-6.5.3.tar.xz"; }; }; qtimageformats = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtimageformats-everywhere-src-6.5.2.tar.xz"; - sha256 = "0hv7mkn72126rkhy5gmjmbvzy7v17mkk3q2pkmzy99f64j4w1q5a"; - name = "qtimageformats-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtimageformats-everywhere-src-6.5.3.tar.xz"; + sha256 = "1jwc2gzlymxx82khwbaav83ma8y1rl2v593jq0jd13kkkb22dh29"; + name = "qtimageformats-everywhere-src-6.5.3.tar.xz"; }; }; qtlanguageserver = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtlanguageserver-everywhere-src-6.5.2.tar.xz"; - sha256 = "196iicwpqca2ydpca41qs6aqxxq8ycknw6lm2v00h1w3m86frdbk"; - name = "qtlanguageserver-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtlanguageserver-everywhere-src-6.5.3.tar.xz"; + sha256 = "12i1g8inp667w95gx4ldc3shb3pjd65c1x74qhmr6k2mq1sc3h60"; + name = "qtlanguageserver-everywhere-src-6.5.3.tar.xz"; }; }; qtlocation = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtlocation-everywhere-src-6.5.2.tar.xz"; - sha256 = "1yvdv1gqj7dij7v4cq9rlnqfb77c0v9b7n56jccvy5v6q9j7s7c9"; - name = "qtlocation-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtlocation-everywhere-src-6.5.3.tar.xz"; + sha256 = "1k77ck556wkcjzly2z2p9da54hpf8x5mjhyjvn6039xzjzax232k"; + name = "qtlocation-everywhere-src-6.5.3.tar.xz"; }; }; qtlottie = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtlottie-everywhere-src-6.5.2.tar.xz"; - sha256 = "16z8fhaa40ig0cggb689zf8j3cid6fk6pmh91b8342ymy1fdqfh0"; - name = "qtlottie-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtlottie-everywhere-src-6.5.3.tar.xz"; + sha256 = "08jpm4vhcwh0a72np6fmws79v9k3dpsji5gd3ws1rh04n62lcb1x"; + name = "qtlottie-everywhere-src-6.5.3.tar.xz"; }; }; qtmultimedia = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtmultimedia-everywhere-src-6.5.2.tar.xz"; - sha256 = "0xc9k4mlncscxqbp8q46yjd89k4jb8j0ggbi5ad874lycym013wl"; - name = "qtmultimedia-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtmultimedia-everywhere-src-6.5.3.tar.xz"; + sha256 = "09zzl3wywhnz5a0ym3q7nbydjcq2vj2bz7gi5p8hrhlqpg9g6r7d"; + name = "qtmultimedia-everywhere-src-6.5.3.tar.xz"; }; }; qtnetworkauth = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtnetworkauth-everywhere-src-6.5.2.tar.xz"; - sha256 = "0g18kh3zhcfi9ni8cqbbjdc1l6jf99ijv5shcl42jk6219b4pk2f"; - name = "qtnetworkauth-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtnetworkauth-everywhere-src-6.5.3.tar.xz"; + sha256 = "00m71302b1m4hjzn0hv222yz1d8dvm9n5djgyn38ikazb5smvd1n"; + name = "qtnetworkauth-everywhere-src-6.5.3.tar.xz"; }; }; qtpositioning = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtpositioning-everywhere-src-6.5.2.tar.xz"; - sha256 = "1yhlfs8izc054qv1krf5qv6zzjlvmz013h74fwamn74dfh1kyjbh"; - name = "qtpositioning-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtpositioning-everywhere-src-6.5.3.tar.xz"; + sha256 = "13vdklh87jz2p3miaifffi6r0ciw191b9ciaicwk0wry5fdhj6mb"; + name = "qtpositioning-everywhere-src-6.5.3.tar.xz"; }; }; qtquick3d = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtquick3d-everywhere-src-6.5.2.tar.xz"; - sha256 = "1nh0vg2m1lf8m40bxbwsam5pwdzjammhal69k2pb5s0rjifs7q3m"; - name = "qtquick3d-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtquick3d-everywhere-src-6.5.3.tar.xz"; + sha256 = "0pffi1wcai6d5w18v39fdwp74za6ydjjcgbgn84y939h7xham0k6"; + name = "qtquick3d-everywhere-src-6.5.3.tar.xz"; }; }; qtquick3dphysics = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtquick3dphysics-everywhere-src-6.5.2.tar.xz"; - sha256 = "0dri8v0pmvc1h1cdhdchvd4xi5f62c1wrk0jd01lh95i6sc1403m"; - name = "qtquick3dphysics-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtquick3dphysics-everywhere-src-6.5.3.tar.xz"; + sha256 = "1fm4ll8cjbdjn35pbi4763sfxzj49gml2rkdr7mrzwrz4hfk149j"; + name = "qtquick3dphysics-everywhere-src-6.5.3.tar.xz"; }; }; qtquickeffectmaker = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtquickeffectmaker-everywhere-src-6.5.2.tar.xz"; - sha256 = "1gvcszqj6khqisxkpwi67xad0247hpq5zcz4v2vhbgkxq8kwfiym"; - name = "qtquickeffectmaker-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtquickeffectmaker-everywhere-src-6.5.3.tar.xz"; + sha256 = "19wwmal5k00l54ybb1ml2c40r4y5a1cwkd36zlri9jycs6x9nrxr"; + name = "qtquickeffectmaker-everywhere-src-6.5.3.tar.xz"; }; }; qtquicktimeline = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtquicktimeline-everywhere-src-6.5.2.tar.xz"; - sha256 = "1fhmy01nqcr9q1193m9fkhbvqd9208kaigprqxkjjm61bn8awif9"; - name = "qtquicktimeline-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtquicktimeline-everywhere-src-6.5.3.tar.xz"; + sha256 = "0nvv5v5dy3ga1c1whrqdwvicmkys0psb720jycq833yqazn4qgpv"; + name = "qtquicktimeline-everywhere-src-6.5.3.tar.xz"; }; }; qtremoteobjects = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtremoteobjects-everywhere-src-6.5.2.tar.xz"; - sha256 = "0k29sk02n54vj1w6vh6xycsjpyfqlijc13fnxh1q7wpgg4gizx60"; - name = "qtremoteobjects-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtremoteobjects-everywhere-src-6.5.3.tar.xz"; + sha256 = "18g78q2b9iabc1a9sgbksxj2nsiizaq4lfmxqljjq2cbzd09x74d"; + name = "qtremoteobjects-everywhere-src-6.5.3.tar.xz"; }; }; qtscxml = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtscxml-everywhere-src-6.5.2.tar.xz"; - sha256 = "1jxx9p7zi40r990ky991xd43mv6i8hdpnj2fhl7sf4q9fpng4c58"; - name = "qtscxml-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtscxml-everywhere-src-6.5.3.tar.xz"; + sha256 = "0ld7i84nxxzp3bm96v2ymg53kkb8fpws2vq8b5bibs2zq0m6gn7k"; + name = "qtscxml-everywhere-src-6.5.3.tar.xz"; }; }; qtsensors = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtsensors-everywhere-src-6.5.2.tar.xz"; - sha256 = "19iamfl4znqbfflnnpis6qk3cqri7kzbg0nsgf42lc5lzdybs1j0"; - name = "qtsensors-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtsensors-everywhere-src-6.5.3.tar.xz"; + sha256 = "14y25lp296vddk3n4wpf8glshfww73dg47khhvw4s4l3b8rsgl8r"; + name = "qtsensors-everywhere-src-6.5.3.tar.xz"; }; }; qtserialbus = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtserialbus-everywhere-src-6.5.2.tar.xz"; - sha256 = "1zndnw1zx5x9daidcm0jq7jcr06ihw0nf6iksrx591f1rl3n6hph"; - name = "qtserialbus-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtserialbus-everywhere-src-6.5.3.tar.xz"; + sha256 = "13fhm8r0zp8rhbcn9i01s73kdng8afdvh5y0grqw8xqd2ncrav91"; + name = "qtserialbus-everywhere-src-6.5.3.tar.xz"; }; }; qtserialport = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtserialport-everywhere-src-6.5.2.tar.xz"; - sha256 = "17nc5kmha6fy3vzkxfr2gxyzdsahs1x66d5lhcqk0szak8b58g06"; - name = "qtserialport-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtserialport-everywhere-src-6.5.3.tar.xz"; + sha256 = "1njfhj063gw7v05ynw4frgwisl2cnlkd4xk2yf22hhmiihwsvjwr"; + name = "qtserialport-everywhere-src-6.5.3.tar.xz"; }; }; qtshadertools = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtshadertools-everywhere-src-6.5.2.tar.xz"; - sha256 = "0g8aziqhds2fkx11y4p2akmyn2p1qqf2fjxv72f9pibnhpdv0gya"; - name = "qtshadertools-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtshadertools-everywhere-src-6.5.3.tar.xz"; + sha256 = "0wrm1yp90fdqwvw8chxd2diic8zl1akr1yyyqmw8w14z80x7n6r0"; + name = "qtshadertools-everywhere-src-6.5.3.tar.xz"; }; }; qtspeech = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtspeech-everywhere-src-6.5.2.tar.xz"; - sha256 = "1cnlc9x0wswzl7j2imi4kvs9zavs4z1mhzzfpwr6d9zlfql9rzw8"; - name = "qtspeech-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtspeech-everywhere-src-6.5.3.tar.xz"; + sha256 = "170bdch6hvmqkf4y3071ym9aqbmknn0mdbayh9rpw6lj9lng9hkr"; + name = "qtspeech-everywhere-src-6.5.3.tar.xz"; }; }; qtsvg = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtsvg-everywhere-src-6.5.2.tar.xz"; - sha256 = "18v337lfk8krg0hff5jx6fi7gn6x3djn03x3psrhlbmgjc8crd28"; - name = "qtsvg-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtsvg-everywhere-src-6.5.3.tar.xz"; + sha256 = "1vsvbpwh8k863nb94lrl0l8phma176b1kcfl7i3q07yad5xw8hgw"; + name = "qtsvg-everywhere-src-6.5.3.tar.xz"; }; }; qttools = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qttools-everywhere-src-6.5.2.tar.xz"; - sha256 = "0ha3v488vnm4pgdpyjgf859sak0z2fwmbgcyivcd93qxflign7sm"; - name = "qttools-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qttools-everywhere-src-6.5.3.tar.xz"; + sha256 = "0dsy82k7ds5yziy648mxwfz6nq2vq90g43cbnjxjarv97wmx74gw"; + name = "qttools-everywhere-src-6.5.3.tar.xz"; }; }; qttranslations = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qttranslations-everywhere-src-6.5.2.tar.xz"; - sha256 = "1sxy2ljn5ajvn4yjb8fx86l56viyvqh5r9hf5x67azkmgrilaz1k"; - name = "qttranslations-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qttranslations-everywhere-src-6.5.3.tar.xz"; + sha256 = "1qs9x52fqnsgk1wzrvihnr6c5cigx8zimhk3dy1qxhprvh6lrd43"; + name = "qttranslations-everywhere-src-6.5.3.tar.xz"; }; }; qtvirtualkeyboard = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtvirtualkeyboard-everywhere-src-6.5.2.tar.xz"; - sha256 = "0sb2c901ma30dcbf4yhznw0pad09iz55alvkzyw2d992gqwf0w05"; - name = "qtvirtualkeyboard-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtvirtualkeyboard-everywhere-src-6.5.3.tar.xz"; + sha256 = "0bg678dirmw5b3d46abbidkch0p5hchmqgiwvcvxfh3928aqz01i"; + name = "qtvirtualkeyboard-everywhere-src-6.5.3.tar.xz"; }; }; qtwayland = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtwayland-everywhere-src-6.5.2.tar.xz"; - sha256 = "16iwar19sgjvxgmbr6hmd3hsxp6ahdjwl1lra2wapl3zzf3bw81h"; - name = "qtwayland-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtwayland-everywhere-src-6.5.3.tar.xz"; + sha256 = "17rnaap0xa0c6q8b0drm020qny0i3ia8nb0z66xq36zzny48aapp"; + name = "qtwayland-everywhere-src-6.5.3.tar.xz"; }; }; qtwebchannel = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtwebchannel-everywhere-src-6.5.2.tar.xz"; - sha256 = "0qwfnwva7v5f2g5is17yy66mnmc9c1yf9aagaw5qanskdvxdk261"; - name = "qtwebchannel-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtwebchannel-everywhere-src-6.5.3.tar.xz"; + sha256 = "0jphdg711lhxbxg4dqrxnvkmfr2q9xzrd0h525zw94m7mfk8k7qj"; + name = "qtwebchannel-everywhere-src-6.5.3.tar.xz"; }; }; qtwebengine = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtwebengine-everywhere-src-6.5.2.tar.xz"; - sha256 = "17qxf3asyxq6kcqqvml170n7rnzih3nr4srp9r5v80pmas5l7jg7"; - name = "qtwebengine-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtwebengine-everywhere-src-6.5.3.tar.xz"; + sha256 = "1ra5hyyg4vymp8pgzv08smjc3fl1axdavnkpj1i5zxym1ndww513"; + name = "qtwebengine-everywhere-src-6.5.3.tar.xz"; }; }; qtwebsockets = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtwebsockets-everywhere-src-6.5.2.tar.xz"; - sha256 = "0xjwifxj2ssshys6f6kjr6ri2vq1wfshxky6mcscjm7vvyqdfjr0"; - name = "qtwebsockets-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtwebsockets-everywhere-src-6.5.3.tar.xz"; + sha256 = "1hx7qy7rgs46ggzifp249d8zz27bjwmbv7f960lwymjdb4bsxqh4"; + name = "qtwebsockets-everywhere-src-6.5.3.tar.xz"; }; }; qtwebview = { - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtwebview-everywhere-src-6.5.2.tar.xz"; - sha256 = "0cgn1px8zk2khmswi9zawi9cnx9p26y4lb3a0kr4kfklm1rf00jr"; - name = "qtwebview-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtwebview-everywhere-src-6.5.3.tar.xz"; + sha256 = "0jbiwwhjp4lz4r3ym3a4wr3s966d6imffmpb0jlvkah9ji6g276g"; + name = "qtwebview-everywhere-src-6.5.3.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/quictls/default.nix b/pkgs/development/libraries/quictls/default.nix index bee09ec67bf1c..1e08912fabfbd 100644 --- a/pkgs/development/libraries/quictls/default.nix +++ b/pkgs/development/libraries/quictls/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "quictls"; - version = "3.0.10-quic1"; + version = "3.1.2-quic1"; src = fetchFromGitHub { owner = "quictls"; repo = "openssl"; rev = "openssl-${finalAttrs.version}"; - hash = "sha256-PTHZCj5aqwFrrvydut9ZS04EJ7YPywKAjbXBBihj4Gg="; + hash = "sha256-erMSGQDmq1S57Y/0GL5Zxw2aygB9XoMJ0x5g+vG6WoM="; }; patches = [ diff --git a/pkgs/development/libraries/rapidjson/default.nix b/pkgs/development/libraries/rapidjson/default.nix index f73e01b64764c..d3233384d3ebf 100644 --- a/pkgs/development/libraries/rapidjson/default.nix +++ b/pkgs/development/libraries/rapidjson/default.nix @@ -51,6 +51,6 @@ stdenv.mkDerivation rec { homepage = "http://rapidjson.org/"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ cstrahan dotlambda ]; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/development/libraries/re2/default.nix index adaef49976a78..c5f74854f77ca 100644 --- a/pkgs/development/libraries/re2/default.nix +++ b/pkgs/development/libraries/re2/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "re2"; - version = "2023-08-01"; + version = "2023-09-01"; src = fetchFromGitHub { owner = "google"; repo = "re2"; rev = version; - hash = "sha256-RexwqNR/Izf2Rzu1cvMw+le6C4EmL4CeWCOc+vXUBZQ="; + hash = "sha256-dCEkwjIs8ITVUZ4N0+qeGoShGNqKkdvJ88teyGKN6pg="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/reproc/default.nix b/pkgs/development/libraries/reproc/default.nix index 2083a6a7af4d3..680455d4cb5af 100644 --- a/pkgs/development/libraries/reproc/default.nix +++ b/pkgs/development/libraries/reproc/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_INSTALL_LIBDIR=lib" "-DBUILD_SHARED_LIBS=ON" "-DREPROC++=ON" diff --git a/pkgs/development/libraries/rnnoise-plugin/default.nix b/pkgs/development/libraries/rnnoise-plugin/default.nix index d5f5268ac8ebf..39a8f1a4b6a6f 100644 --- a/pkgs/development/libraries/rnnoise-plugin/default.nix +++ b/pkgs/development/libraries/rnnoise-plugin/default.nix @@ -49,8 +49,6 @@ stdenv.mkDerivation rec { simd ]; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; - meta = with lib; { description = "A real-time noise suppression plugin for voice based on Xiph's RNNoise"; homepage = "https://github.com/werman/noise-suppression-for-voice"; diff --git a/pkgs/development/libraries/s2n-tls/default.nix b/pkgs/development/libraries/s2n-tls/default.nix index 678aac37e8985..c1483f90c433e 100644 --- a/pkgs/development/libraries/s2n-tls/default.nix +++ b/pkgs/development/libraries/s2n-tls/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "s2n-tls"; - version = "1.3.48"; + version = "1.3.50"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7C1syZAhMv0N+AuE/SuXqhatKhlzDOix4ZDxLRyuWOs="; + sha256 = "sha256-B+znuvQ7TTl2u4rw64ylPywfpr066Yf8Wg0qrdByGRE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix b/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix index ff1cb5026fdf7..8c6eb60d1d2b0 100644 --- a/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix +++ b/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "stellarsolver"; - version = "2.4"; + version = "2.5"; src = fetchFromGitHub { owner = "rlancaste"; repo = pname; rev = version; - sha256 = "sha256-HYNkpgkiRtA1ZsiFkmYk3MT3fKgs2d2neSExVXBbsPc="; + sha256 = "sha256-0bFGHlkZnAZlnxlj8tY3s9yTWgkNtSsPFfudB3uvyOA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/science/biology/mirtk/default.nix b/pkgs/development/libraries/science/biology/mirtk/default.nix index de419dc3d5751..b6adf67cbe823 100644 --- a/pkgs/development/libraries/science/biology/mirtk/default.nix +++ b/pkgs/development/libraries/science/biology/mirtk/default.nix @@ -1,14 +1,27 @@ -{ lib, stdenv, gtest, fetchFromGitHub, cmake, boost, eigen, python3, vtk_8, zlib, tbb }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, python3 +, boost +, eigen +, libGLU +, fltk +, itk +, vtk +, zlib +, tbb +}: stdenv.mkDerivation rec { - version = "2.0.0"; pname = "mirtk"; + version = "unstable-2022-07-22"; src = fetchFromGitHub { owner = "BioMedIA"; repo = "MIRTK"; - rev = "v${version}"; - sha256 = "0i2v97m66ir5myvi5b123r7zcagwy551b73s984gk7lksl5yiqxk"; + rev = "973ce2fe3f9508dec68892dbf97cca39067aa3d6"; + hash = "sha256-vKgkDrbyGOcbaYlxys1duC8ZNG0Y2nqh3TtSQ06Ox0Q="; fetchSubmodules = true; }; @@ -16,23 +29,36 @@ stdenv.mkDerivation rec { "-DWITH_VTK=ON" "-DBUILD_ALL_MODULES=ON" "-DWITH_TBB=ON" + "-DWITH_ITK=ON" + "-DWITH_GIFTICLIB=ON" + "-DWITH_NIFTILIB=ON" ]; - doCheck = true; - - checkPhase = '' - ctest -E '(Polynomial|ConvolutionFunction|Downsampling|EdgeTable|InterpolateExtrapolateImage)' + # tries to download data during configuration + postPatch = '' + substituteInPlace Packages/DrawEM/CMakeLists.txt --replace "include(Atlases.cmake)" "" ''; - # testPolynomial - segfaults for some reason - # testConvolutionFunction, testDownsampling - main not called correctly - # testEdgeTable, testInterpolateExtrapolateImageFunction - setup fails + + # tests don't seem to be maintained and gtest fails to link with BUILD_TESTING=ON; + # unclear if specific to Nixpkgs + doCheck = false; postInstall = '' install -Dm644 -t "$out/share/bash-completion/completions/mirtk" share/completion/bash/mirtk ''; - nativeBuildInputs = [ cmake gtest ]; - buildInputs = [ boost eigen python3 vtk_8 zlib tbb ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ + boost + eigen + fltk + itk + libGLU.dev + python3 + tbb + vtk + zlib + ]; meta = with lib; { homepage = "https://github.com/BioMedIA/MIRTK"; diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix index 55438c63a5e0c..8f0c930eff62b 100644 --- a/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/pkgs/development/libraries/science/math/or-tools/default.nix @@ -45,6 +45,9 @@ stdenv.mkDerivation rec { url = "https://github.com/google/or-tools/commit/edd1544375bd55f79168db315151a48faa548fa0.patch"; hash = "sha256-S//1YM3IoRCp3Ghg8zMF0XXgIpVmaw4gH8cVb9eUbqM="; }) + # Don't use non-existent member of string_view. Partial patch from commit + # https://github.com/google/or-tools/commit/c5a2fa1eb673bf652cb9ad4f5049d054b8166e17.patch + ./fix-stringview-compile.patch ]; # or-tools normally attempts to build Protobuf for the build platform when diff --git a/pkgs/development/libraries/science/math/or-tools/fix-stringview-compile.patch b/pkgs/development/libraries/science/math/or-tools/fix-stringview-compile.patch new file mode 100644 index 0000000000000..760ab80a38e4d --- /dev/null +++ b/pkgs/development/libraries/science/math/or-tools/fix-stringview-compile.patch @@ -0,0 +1,36 @@ +diff --git a/ortools/lp_data/lp_parser.cc b/ortools/lp_data/lp_parser.cc +index 58286306e5..bd26c019ab 100644 +--- a/ortools/lp_data/lp_parser.cc ++++ b/ortools/lp_data/lp_parser.cc +@@ -185,7 +185,7 @@ bool LPParser::ParseIntegerVariablesList(StringPiece line) { + + bool LPParser::ParseConstraint(StringPiece constraint) { + const StatusOr<ParsedConstraint> parsed_constraint_or_status = +- ::operations_research::glop::ParseConstraint(constraint.as_string()); ++ ::operations_research::glop::ParseConstraint(constraint); + if (!parsed_constraint_or_status.ok()) return false; + const ParsedConstraint& parsed_constraint = + parsed_constraint_or_status.value(); +@@ -342,10 +342,9 @@ TokenType LPParser::ConsumeToken(StringPiece* sp) { + + } // namespace + +-StatusOr<ParsedConstraint> ParseConstraint(absl::string_view constraint_view) { ++StatusOr<ParsedConstraint> ParseConstraint(absl::string_view constraint) { + ParsedConstraint parsed_constraint; + // Get the name, if present. +- StringPiece constraint{constraint_view}; + StringPiece constraint_copy{constraint}; + std::string consumed_name; + Fractional consumed_coeff; +@@ -413,8 +412,8 @@ StatusOr<ParsedConstraint> ParseConstraint(absl::string_view constraint_view) { + right_bound = consumed_coeff; + if (ConsumeToken(&constraint, &consumed_name, &consumed_coeff) != + TokenType::END) { +- return absl::InvalidArgumentError(absl::StrCat( +- "End of input was expected, found: ", constraint.as_string())); ++ return absl::InvalidArgumentError( ++ absl::StrCat("End of input was expected, found: ", constraint)); + } + } + diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix index e2a5e76c55866..81bcec504473d 100644 --- a/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/pkgs/development/libraries/science/math/scalapack/default.nix @@ -34,6 +34,8 @@ stdenv.mkDerivation rec { sed -i '/xssep/d;/xsgsep/d;/xssyevr/d' TESTING/CMakeLists.txt ''; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ cmake ]; nativeCheckInputs = [ openssh mpiCheckPhaseHook ]; buildInputs = [ blas lapack ]; diff --git a/pkgs/development/libraries/sentry-native/default.nix b/pkgs/development/libraries/sentry-native/default.nix index 9f6ac99c6f024..09989fb7bddfb 100644 --- a/pkgs/development/libraries/sentry-native/default.nix +++ b/pkgs/development/libraries/sentry-native/default.nix @@ -28,8 +28,9 @@ stdenv.mkDerivation rec { breakpad ]; + cmakeBuildType = "RelWithDebInfo"; + cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=RelWithDebInfo" "-DSENTRY_BREAKPAD_SYSTEM=On" ]; diff --git a/pkgs/development/libraries/simdjson/default.nix b/pkgs/development/libraries/simdjson/default.nix index 0e73ed979ebaf..873e107513a15 100644 --- a/pkgs/development/libraries/simdjson/default.nix +++ b/pkgs/development/libraries/simdjson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "simdjson"; - version = "3.2.3"; + version = "3.3.0"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-h15IyPYvIUPDOJ03KgEDyRhXe0Oi8XCR5LnzSpPc4PI="; + sha256 = "sha256-81CvuQduIV1R/FN7nbVIQQs79B/Cy1ylOldNXix1KMw="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/smesh/default.nix b/pkgs/development/libraries/smesh/default.nix deleted file mode 100644 index 478237f866cbc..0000000000000 --- a/pkgs/development/libraries/smesh/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, ninja, opencascade -, Cocoa }: - -stdenv.mkDerivation rec { - pname = "smesh"; - version = "6.7.6"; - - src = fetchFromGitHub { - owner = "tpaviot"; - repo = "smesh"; - rev = version; - sha256 = "1b07j3bw3lnxk8dk3x1kkl2mbsmfwi98si84054038lflaaijzi0"; - }; - - patches = [ - (fetchpatch { - name = "fix-build-with-clang.patch"; - url = "https://github.com/tpaviot/smesh/commit/e32c430f526f1637ec5973c9723acbc5be571ae3.patch"; - sha256 = "0s4j5rb70g3jvvkgfbrxv7q52wk6yjyjiaya61gy2j64khplcjlb"; - }) - ]; - - nativeBuildInputs = [ cmake ninja ]; - buildInputs = [ opencascade ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; - - env.NIX_CFLAGS_COMPILE = toString [ "-std=c++11" ]; - - meta = with lib; { - description = "Extension to OCE providing advanced meshing features"; - homepage = "https://github.com/tpaviot/smesh"; - license = licenses.lgpl21; - platforms = platforms.unix; - maintainers = with maintainers; [ gebner ]; - }; -} diff --git a/pkgs/development/libraries/speexdsp/default.nix b/pkgs/development/libraries/speexdsp/default.nix index 5e6f27f434ad8..f73ebe0141a94 100644 --- a/pkgs/development/libraries/speexdsp/default.nix +++ b/pkgs/development/libraries/speexdsp/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, fftw }: +{ lib +, stdenv +, fetchurl +, autoreconfHook +, pkg-config +, fftw +, withFftw3 ? true +}: stdenv.mkDerivation rec { pname = "speexdsp"; @@ -15,11 +22,10 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ fftw ]; + buildInputs = lib.optionals withFftw3 [ fftw ]; - configureFlags = [ - "--with-fft=gpl-fftw3" - ] ++ lib.optional stdenv.isAarch64 "--disable-neon"; + configureFlags = lib.optionals withFftw3 [ "--with-fft=gpl-fftw3" ] + ++ lib.optional stdenv.isAarch64 "--disable-neon"; meta = with lib; { homepage = "https://www.speex.org/"; diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index cc26df385a5cc..f51ce3a500053 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -7,6 +7,8 @@ , interactive ? false # TODO: can be removed since 3.36 since it is the default now. , enableDeserialize ? false + +, gitUpdater }: let @@ -15,13 +17,13 @@ in stdenv.mkDerivation rec { pname = "sqlite${lib.optionalString interactive "-interactive"}"; - version = "3.42.0"; + version = "3.43.1"; # nixpkgs-update: no auto update # NB! Make sure to update ./tools.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2023/sqlite-autoconf-${archiveVersion version}.tar.gz"; - hash = "sha256-erz9FhxuJ0LKXGwIldH4U8lA8gMwSgtJ2k4eyl0IjKY="; + hash = "sha256-ORFslOdmMPItVM2Cw86jCFZfFxX3FtGyUn8cnJabpNk="; }; outputs = [ "bin" "dev" "out" ]; @@ -87,9 +89,18 @@ stdenv.mkDerivation rec { doCheck = false; # fails to link against tcl - passthru.tests = { - inherit (python3Packages) sqlalchemy; - inherit sqldiff sqlite-analyzer tracker; + passthru = { + tests = { + inherit (python3Packages) sqlalchemy; + inherit sqldiff sqlite-analyzer tracker; + }; + + updateScript = gitUpdater { + # No nicer place to look for patest version. + url = "https://github.com/sqlite/sqlite.git"; + # Expect tags like "version-3.43.0". + rev-prefix = "version-"; + }; }; meta = with lib; { diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix index c30ce8d45d9a2..31207ad9edf9c 100644 --- a/pkgs/development/libraries/sqlite/tools.nix +++ b/pkgs/development/libraries/sqlite/tools.nix @@ -4,12 +4,12 @@ let archiveVersion = import ./archive-version.nix lib; mkTool = { pname, makeTarget, description, homepage, mainProgram }: stdenv.mkDerivation rec { inherit pname; - version = "3.42.0"; + version = "3.43.1"; # nixpkgs-update: no auto update src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2023/sqlite-src-${archiveVersion version}.zip"; - hash = "sha256-OMpWoxe+N/sAvZK8KA2bkgm9QAiyl9SDxB7B9geb+20="; + hash = "sha256-IunC70n+b4otvJPE09zgnG1qT1Y95SsKgXGtSajHKRc="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/taglib/default.nix b/pkgs/development/libraries/taglib/default.nix index 0fb207e4e0f71..6eaab96234173 100644 --- a/pkgs/development/libraries/taglib/default.nix +++ b/pkgs/development/libraries/taglib/default.nix @@ -7,20 +7,26 @@ stdenv.mkDerivation rec { pname = "taglib"; - version = "1.13"; + version = "1.13.1"; src = fetchFromGitHub { owner = "taglib"; repo = "taglib"; rev = "v${version}"; - sha256 = "sha256-DRALRH+/7c2lBvCpLp8hop3Xxsf76F1q8L7F9qehqQA="; + hash = "sha256-QX0EpHGT36UsgIfRf5iALnwxe0jjLpZvCTbk8vSMFF4="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ zlib ]; - cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + # Workaround unconditional ${prefix} until upstream is fixed: + # https://github.com/taglib/taglib/issues/1098 + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + ]; meta = with lib; { homepage = "https://taglib.org/"; diff --git a/pkgs/development/libraries/tdlib/default.nix b/pkgs/development/libraries/tdlib/default.nix index b3802c3a45140..118dc26f2f569 100644 --- a/pkgs/development/libraries/tdlib/default.nix +++ b/pkgs/development/libraries/tdlib/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "tdlib"; - version = "1.8.16"; + version = "1.8.19"; src = fetchFromGitHub { owner = "tdlib"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { # The tdlib authors do not set tags for minor versions, but # external programs depending on tdlib constrain the minor # version, hence we set a specific commit with a known version. - rev = "cde095db6c75827fe4bd237039574aad373ad96b"; - hash = "sha256-m/RN6g0GxPiSvDZbiOaJFcT2j0K7sIaVGaxKWMVn6v8="; + rev = "2589c3fd46925f5d57e4ec79233cd1bd0f5d0c09"; + hash = "sha256-mbhxuJjrV3nC8Ja7N0WWF9ByHovJLmoLLuuzoU4khjU="; }; buildInputs = [ gperf openssl readline zlib ]; diff --git a/pkgs/development/libraries/ucx/default.nix b/pkgs/development/libraries/ucx/default.nix index 4ded9c2860aa3..a6dfb9f85c80d 100644 --- a/pkgs/development/libraries/ucx/default.nix +++ b/pkgs/development/libraries/ucx/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "ucx"; - version = "1.14.1"; + version = "1.15.0"; src = fetchFromGitHub { owner = "openucx"; repo = "ucx"; rev = "v${version}"; - sha256 = "sha256-oAigiCgbr27pX+kNl+RW1P10TKYFSKrHDK4U4z8WMko="; + sha256 = "sha256-VxIxrk9qKM6Ncfczl4p2EhXiLNgPaYTmjhqi6/w2ZNY="; }; nativeBuildInputs = [ autoreconfHook doxygen pkg-config ]; @@ -43,11 +43,11 @@ stdenv.mkDerivation rec { ++ lib.optionals enableRocm [ rocm-core rocm-runtime rocm-device-libs hip ]; configureFlags = [ - "--with-rdmacm=${rdma-core}" + "--with-rdmacm=${lib.getDev rdma-core}" "--with-dc" "--with-rc" "--with-dm" - "--with-verbs=${rdma-core}" + "--with-verbs=${lib.getDev rdma-core}" ] ++ lib.optional enableCuda "--with-cuda=${cudatoolkit'}" ++ lib.optional enableRocm "--with-rocm=${rocm}"; diff --git a/pkgs/development/libraries/unixODBC/default.nix b/pkgs/development/libraries/unixODBC/default.nix index 90398e5aef255..8587ad6d2c3c1 100644 --- a/pkgs/development/libraries/unixODBC/default.nix +++ b/pkgs/development/libraries/unixODBC/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "unixODBC"; - version = "2.3.11"; + version = "2.3.12"; src = fetchurl { urls = [ "ftp://ftp.unixodbc.org/pub/unixODBC/${pname}-${version}.tar.gz" "https://www.unixodbc.org/${pname}-${version}.tar.gz" ]; - sha256 = "sha256-2eVcjnEYNH48ZshzOIVtrRUWtJD7fHVsFWKiwmfHO1w="; + sha256 = "sha256-8hBQFEXOIb9ge6Ue+MEl4Q4i3/3/7Dd2RkYt9fAZFew="; }; configureFlags = [ "--disable-gui" "--sysconfdir=/etc" ]; diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index d29ea557b1f2b..e692d58a7c867 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -1,6 +1,19 @@ -{ fetchurl, stdenv, unixODBC, cmake, postgresql, mariadb, sqlite, zlib, libxml2, dpkg, lib, openssl, libkrb5, libuuid, patchelf, libiconv, fetchFromGitHub }: - -# I haven't done any parameter tweaking.. So the defaults provided here might be bad +{ fetchurl, stdenv, unixODBC, cmake, postgresql, mariadb, sqlite, zlib, libxml2, dpkg, lib, openssl, libkrb5, libuuid, patchelf, libiconv, fixDarwinDylibNames, fetchFromGitHub }: + +# Each of these ODBC drivers can be configured in your odbcinst.ini file using +# the various passthru and meta values. Of note are: +# +# * `passthru.fancyName`, the typical name used to reference the driver +# * `passthru.driver`, the path to the driver within the built package +# * `meta.description`, a short description of the ODBC driver +# +# For example, you might generate it as follows: +# +# '' +# [${package.fancyName}] +# Description = ${package.meta.description} +# Driver = ${package}/${package.driver} +# '' { psql = stdenv.mkDerivation rec { @@ -14,6 +27,7 @@ buildInputs = [ unixODBC postgresql ]; + # see the top of the file for an explanation passthru = { fancyName = "PostgreSQL"; driver = "lib/psqlodbcw.so"; @@ -41,8 +55,14 @@ fetchSubmodules = true; }; + patches = [ + # Fix `call to undeclared function 'sleep'` with clang 16 + ./mariadb-connector-odbc-unistd.patch + ]; + nativeBuildInputs = [ cmake ]; - buildInputs = [ unixODBC openssl libiconv ]; + buildInputs = [ unixODBC openssl libiconv zlib ] + ++ lib.optionals stdenv.isDarwin [ libkrb5 ]; preConfigure = '' # we don't want to build a .pkg @@ -52,6 +72,7 @@ ''; cmakeFlags = [ + "-DWITH_EXTERNAL_ZLIB=ON" "-DODBC_LIB_DIR=${lib.getLib unixODBC}/lib" "-DODBC_INCLUDE_DIR=${lib.getDev unixODBC}/include" "-DWITH_OPENSSL=ON" @@ -59,6 +80,7 @@ "-DWITH_IODBC=OFF" ]; + # see the top of the file for an explanation passthru = { fancyName = "MariaDB"; driver = "lib/libmaodbc${stdenv.hostPlatform.extensions.sharedLibrary}"; @@ -87,6 +109,7 @@ cmakeFlags = [ "-DWITH_UNIXODBC=1" ]; + # see the top of the file for an explanation passthru = { fancyName = "MySQL"; driver = "lib/libmyodbc3-3.51.12.so"; @@ -122,6 +145,7 @@ mv "$out"/*.* "$out/lib" ''; + # see the top of the file for an explanation passthru = { fancyName = "SQLite"; driver = "lib/libsqlite3odbc.so"; @@ -165,14 +189,15 @@ $out/lib/libmsodbcsql-${versionMajor}.${versionMinor}.so.${versionAdditional} ''; + # see the top of the file for an explanation passthru = { - fancyName = "ODBC Driver 17 for SQL Server"; + fancyName = "ODBC Driver ${versionMajor} for SQL Server"; driver = "lib/libmsodbcsql-${versionMajor}.${versionMinor}.so.${versionAdditional}"; }; meta = with lib; { broken = stdenv.isDarwin; - description = "ODBC Driver 17 for SQL Server"; + description = "ODBC Driver ${versionMajor} for SQL Server"; homepage = "https://docs.microsoft.com/en-us/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server?view=sql-server-2017"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; @@ -181,6 +206,90 @@ }; }; + msodbcsql18 = stdenv.mkDerivation(finalAttrs: { + pname = "msodbcsql${finalAttrs.versionMajor}"; + version = "${finalAttrs.versionMajor}.${finalAttrs.versionMinor}.${finalAttrs.versionAdditional}${finalAttrs.versionSuffix}"; + + versionMajor = "18"; + versionMinor = "1"; + versionAdditional = "1.1"; + versionSuffix = lib.optionalString stdenv.isLinux "-1"; + + src = fetchurl { + url = { + x86_64-linux = "https://packages.microsoft.com/debian/11/prod/pool/main/m/${finalAttrs.pname}/${finalAttrs.pname}_${finalAttrs.version}_amd64.deb"; + aarch64-linux = "https://packages.microsoft.com/debian/11/prod/pool/main/m/${finalAttrs.pname}/${finalAttrs.pname}_${finalAttrs.version}_arm64.deb"; + x86_64-darwin = "https://download.microsoft.com/download/6/4/0/64006503-51e3-44f0-a6cd-a9b757d0d61b/${finalAttrs.pname}-${finalAttrs.version}-amd64.tar.gz"; + aarch64-darwin = "https://download.microsoft.com/download/6/4/0/64006503-51e3-44f0-a6cd-a9b757d0d61b/${finalAttrs.pname}-${finalAttrs.version}-arm64.tar.gz"; + }.${stdenv.system} or (throw "Unsupported platform"); + hash = { + x86_64-linux = "sha256:1f0rmh1aynf1sqmjclbsyh2wz5jby0fixrwz71zp6impxpwvil52"; + aarch64-linux = "sha256:0zphnbvkqdbkcv6lvv63p7pyl68h5bs2dy6vv44wm6bi89svms4a"; + x86_64-darwin = "sha256:1fn80byn1yihflznxcm9cpj42mpllnz54apnk9n46vzm2ng2lj6d"; + aarch64-darwin = "sha256:116xl8r2apr5b48jnq6myj9fwqs88yccw5176yfyzh4534fznj5x"; + }.${stdenv.system} or (throw "Unsupported platform"); + }; + + nativeBuildInputs = + if stdenv.isDarwin + then + [ + # Fix up the names encoded into the dylib, and make them absolute. + fixDarwinDylibNames + ] + else + [ + dpkg + patchelf + ]; + + unpackPhase = lib.optionalString stdenv.isLinux '' + dpkg -x $src ./ + ''; + + installPhase = + if stdenv.isDarwin + then + '' + mkdir -p $out + tar xf $src --strip-components=1 -C $out + '' + else + '' + mkdir -p $out + mkdir -p $out/lib + cp -r opt/microsoft/msodbcsql${finalAttrs.versionMajor}/lib64 opt/microsoft/msodbcsql${finalAttrs.versionMajor}/share $out/ + ''; + + # Replace the hard-coded paths in the dylib with nixpkgs equivalents. + fixupPhase = lib.optionalString stdenv.isDarwin '' + ${stdenv.cc.bintools.targetPrefix}install_name_tool \ + -change /usr/lib/libiconv.2.dylib ${libiconv}/lib/libiconv.2.dylib \ + -change /opt/homebrew/lib/libodbcinst.2.dylib ${unixODBC}/lib/libodbcinst.2.dylib \ + $out/${finalAttrs.passthru.driver} + ''; + + postFixup = lib.optionalString stdenv.isLinux '' + patchelf --set-rpath ${lib.makeLibraryPath [ unixODBC openssl libkrb5 libuuid stdenv.cc.cc ]} \ + $out/${finalAttrs.passthru.driver} + ''; + + # see the top of the file for an explanation + passthru = { + fancyName = "ODBC Driver ${finalAttrs.versionMajor} for SQL Server"; + driver = "lib/libmsodbcsql${if stdenv.isDarwin then ".${finalAttrs.versionMajor}.dylib" else "-${finalAttrs.versionMajor}.${finalAttrs.versionMinor}.so.${finalAttrs.versionAdditional}"}"; + }; + + meta = with lib; { + description = finalAttrs.passthru.fancyName; + homepage = "https://learn.microsoft.com/en-us/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server?view=sql-server-ver16"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + platforms = platforms.unix; + license = licenses.unfree; + maintainers = with maintainers; [ SamirTalwar ]; + }; + }); + redshift = stdenv.mkDerivation rec { pname = "redshift-odbc"; version = "1.4.49.1000"; @@ -210,6 +319,7 @@ buildInputs = [ unixODBC ]; + # see the top of the file for an explanation passthru = { fancyName = "Amazon Redshift (x64)"; driver = "lib/libamazonredshiftodbc64.so"; diff --git a/pkgs/development/libraries/unixODBCDrivers/mariadb-connector-odbc-unistd.patch b/pkgs/development/libraries/unixODBCDrivers/mariadb-connector-odbc-unistd.patch new file mode 100644 index 0000000000000..8c976885eb626 --- /dev/null +++ b/pkgs/development/libraries/unixODBCDrivers/mariadb-connector-odbc-unistd.patch @@ -0,0 +1,12 @@ +diff -ur a/test/use_result.c b/test/use_result.c +--- a/test/use_result.c 1969-12-31 19:00:01.000000000 -0500 ++++ b/test/use_result.c 2023-09-05 00:08:12.979889343 -0400 +@@ -23,6 +23,8 @@ + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + ++#include <unistd.h> ++ + #include "tap.h" + + SQLINTEGER my_max_rows= 100; diff --git a/pkgs/development/libraries/utf8cpp/default.nix b/pkgs/development/libraries/utf8cpp/default.nix index c32c6e1e52f5a..764f991c4467c 100644 --- a/pkgs/development/libraries/utf8cpp/default.nix +++ b/pkgs/development/libraries/utf8cpp/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "utf8cpp"; - version = "3.2.4"; + version = "3.2.5"; src = fetchFromGitHub { owner = "nemtrif"; repo = "utfcpp"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-cpy1lg/9pWgI5uyOO9lfSt8llfGEjnu/O4P9688XVEA="; + sha256 = "sha256-cWiGggn2GP25K/8eopvnFPq6iwcBteNI3i9Lo1Sr+ig="; }; cmakeFlags = [ @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/nemtrif/utfcpp"; + changelog = "https://github.com/nemtrif/utfcpp/releases/tag/v${version}"; description = "UTF-8 with C++ in a Portable Way"; license = licenses.boost; maintainers = with maintainers; [ jobojeha ]; diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 73ff840340060..a9891a9d328c6 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -174,7 +174,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://v8.dev/"; description = "Google's open source JavaScript engine"; - maintainers = with maintainers; [ cstrahan proglodyte matthewbauer ]; + maintainers = with maintainers; [ proglodyte matthewbauer ]; platforms = platforms.unix; license = licenses.bsd3; }; diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index 684982e5364f4..652833a39367c 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "vapoursynth"; - version = "63"; + version = "64"; src = fetchFromGitHub { owner = "vapoursynth"; repo = "vapoursynth"; rev = "R${version}"; - sha256 = "sha256-6ITmzz1xJN/UnzVl0aAO8VNs0Go8zGcswwGpJUwwLB8="; + sha256 = "sha256-EdIe0hWsx0W9+03O0Avk4DV2jKv8s4wGAKk0NxIAuTU="; }; patches = [ diff --git a/pkgs/development/libraries/vkd3d/default.nix b/pkgs/development/libraries/vkd3d/default.nix index 77a275b20df55..9febc120e67f2 100644 --- a/pkgs/development/libraries/vkd3d/default.nix +++ b/pkgs/development/libraries/vkd3d/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "vkd3d"; - version = "1.8"; + version = "1.9"; nativeBuildInputs = [ autoreconfHook pkg-config wine flex bison ]; buildInputs = [ vulkan-loader vulkan-headers spirv-headers ]; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "wine"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-v2UhJvfB5Clupmgoykei3AoWYBOp5l9pQFkUEQVlajs="; + sha256 = "sha256-IF7TOKxNEWr1p4DpIqoRCeVzi9b3yN8XrmWTMvfoOqw="; }; meta = with lib; { diff --git a/pkgs/development/libraries/vtk/8.x.nix b/pkgs/development/libraries/vtk/8.x.nix deleted file mode 100644 index ad84ec163cfa9..0000000000000 --- a/pkgs/development/libraries/vtk/8.x.nix +++ /dev/null @@ -1,18 +0,0 @@ -import ./generic.nix { - majorVersion = "8.2"; - minorVersion = "0"; - sourceSha256 = "1fspgp8k0myr6p2a6wkc21ldcswb4bvmb484m12mxgk1a9vxrhrl"; - patchesToFetch = [{ - url = "https://gitlab.kitware.com/vtk/vtk/-/commit/257b9d7b18d5f3db3fe099dc18f230e23f7dfbab.diff"; - sha256 = "0qdahp4f4gcaznr28j06d5fyxiis774ys0p335aazf7h51zb8rzy"; - } - { - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-libs/vtk/files/vtk-8.2.0-gcc-10.patch?id=c4256f68d3589570443075eccbbafacf661f785f"; - sha256 = "sha256:0bpwrdfmi15grsg4jy7bzj2z6511a0c160cmw5lsi65aabyh7cl5"; - } - { - url = "https://gitlab.kitware.com/vtk/vtk/-/merge_requests/6943.diff"; - sha256 = "sha256:1nzdw3f6bsri04y528zj2klqkb9p8s4lnl9g5zvm119m1cmyhn04"; - } - ]; -} diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/development/libraries/webrtc-audio-processing/default.nix index f78d8b35e2a80..2c1e15bfbef3f 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/default.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/default.nix @@ -1,45 +1,41 @@ -{ lib, stdenv, fetchurl +{ lib, stdenv, fetchFromGitLab , darwin , abseil-cpp , meson , ninja +, pkg-config }: stdenv.mkDerivation rec { pname = "webrtc-audio-processing"; - version = "1.0"; + version = "1.3"; - src = fetchurl { - url = "https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/archive/v${version}/webrtc-audio-processing-v${version}.tar.gz"; - sha256 = "sha256-dqRy1OfOG9TX2cgCD8cowU44zVanns/nPYZrilPfuiU="; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "pulseaudio"; + repo = "webrtc-audio-processing"; + rev = "v${version}"; + hash = "sha256-8CDt4kMt2Owzyv22dqWIcFuHeg4Y3FxB405cLw3FZ+g="; }; nativeBuildInputs = [ meson ninja + pkg-config ]; - buildInputs = [ + propagatedBuildInputs = [ abseil-cpp - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); + ]; - patchPhase = '' - # this is just incorrect upstream - # see https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/issues/4 - substituteInPlace meson.build \ - --replace "absl_flags_registry" "absl_flags_reflection" - '' + lib.optionalString stdenv.hostPlatform.isMusl '' - substituteInPlace webrtc/base/checks.cc --replace 'defined(__UCLIBC__)' 1 - ''; + buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); meta = with lib; { homepage = "https://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing"; description = "A more Linux packaging friendly copy of the AudioProcessing module from the WebRTC project"; license = licenses.bsd3; # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/blob/master/webrtc/rtc_base/system/arch.h - platforms = intersectLists platforms.unix (platforms.aarch64 ++ platforms.mips ++ platforms.riscv ++ platforms.x86); - # attempts to inline 256bit AVX instructions on x86 - # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/issues/5 - broken = stdenv.isx86_32; + # x86-32 disabled due to https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/issues/5 + platforms = intersectLists platforms.unix (platforms.aarch64 ++ platforms.mips ++ platforms.riscv ++ platforms.x86_64); }; } diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index b77ec4d3c4a86..4c60ccf6c8ba1 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -3,18 +3,19 @@ , fetchFromGitHub , Security , autoreconfHook +, util-linux , openssl }: stdenv.mkDerivation rec { pname = "wolfssl"; - version = "5.5.4"; + version = "5.6.3"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; - rev = "v${version}-stable"; - hash = "sha256-sR/Gjk50kLej5oJzDH1I6/V+7OIRiwtyeg5tEE3fmHk="; + rev = "refs/tags/v${version}-stable"; + hash = "sha256-UN4zs+Rxh/bsLD1BQA+f1YN/UOJ6OB2HduhoetEp10Y="; }; postPatch = '' @@ -43,13 +44,20 @@ stdenv.mkDerivation rec { "out" ]; - propagatedBuildInputs = [ ] ++ lib.optionals stdenv.isDarwin [ Security ]; + propagatedBuildInputs = lib.optionals stdenv.isDarwin [ + Security + ]; + nativeBuildInputs = [ autoreconfHook + util-linux ]; doCheck = true; - nativeCheckInputs = [ openssl ]; + + nativeCheckInputs = [ + openssl + ]; postInstall = '' # fix recursive cycle: @@ -62,6 +70,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A small, fast, portable implementation of TLS/SSL for embedded devices"; homepage = "https://www.wolfssl.com/"; + changelog = "https://github.com/wolfSSL/wolfssl/releases/tag/v${version}-stable"; platforms = platforms.all; license = licenses.gpl2Plus; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/libraries/xeus/default.nix b/pkgs/development/libraries/xeus/default.nix index 5e7380fc974b5..d060986515fa5 100644 --- a/pkgs/development/libraries/xeus/default.nix +++ b/pkgs/development/libraries/xeus/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "xeus"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "jupyter-xeus"; repo = pname; rev = version; - sha256 = "sha256-jZZe8SegQuFLoH2Qp+etoKELGEWdlYQPXj14DNIMJ/0="; + sha256 = "sha256-bSZ5ImgFztiNYGrn513LLm4OtO1hYGak3xAsBN224g8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix index 31d064c2af6de..49d042886b731 100644 --- a/pkgs/development/libraries/xgboost/default.nix +++ b/pkgs/development/libraries/xgboost/default.nix @@ -45,14 +45,14 @@ stdenv.mkDerivation rec { # in \ # rWrapper.override{ packages = [ xgb ]; }" pname = lib.optionalString rLibrary "r-" + pnameBase; - version = "1.7.6"; + version = "2.0.0"; src = fetchFromGitHub { owner = "dmlc"; repo = pnameBase; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-i7smd56rLbNY0qXysq818VYWYbjrnFbyIjQkIgf9aOs="; + hash = "sha256-HKITioCvBZHZWKFWwe9KbrFP+Nbz8adbZJvQiqApjUQ="; }; nativeBuildInputs = [ cmake ] @@ -144,6 +144,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/dmlc/xgboost"; license = licenses.asl20; platforms = platforms.unix; + broken = stdenv.isDarwin; maintainers = with maintainers; [ abbradar nviets ]; }; } diff --git a/pkgs/development/libraries/yajl/cmake-shared-static-fix.patch b/pkgs/development/libraries/yajl/cmake-shared-static-fix.patch new file mode 100644 index 0000000000000..05c8f19dacbce --- /dev/null +++ b/pkgs/development/libraries/yajl/cmake-shared-static-fix.patch @@ -0,0 +1,89 @@ +From 768be8b9f98e30a8bd2d51576be9dfcf2cb838ea Mon Sep 17 00:00:00 2001 +From: Kiskae <Kiskae@users.noreply.github.com> +Date: Tue, 26 Sep 2023 20:53:00 +0200 +Subject: [PATCH] simplify compilation of static/shared with cmake + +Signed-off-by: Kiskae <Kiskae@users.noreply.github.com> +--- + CMakeLists.txt | 2 ++ + example/CMakeLists.txt | 2 +- + perf/CMakeLists.txt | 2 +- + src/CMakeLists.txt | 7 ++----- + test/parsing/CMakeLists.txt | 2 +- + 5 files changed, 7 insertions(+), 8 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 471eee13..9af25203 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -16,6 +16,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) + + PROJECT(YetAnotherJSONParser C) + ++option(BUILD_SHARED_LIBS "Build using shared libraries" ON) ++ + SET (YAJL_MAJOR 2) + SET (YAJL_MINOR 1) + SET (YAJL_MICRO 1) +diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt +index 0a7f6220..62ddf14c 100644 +--- a/example/CMakeLists.txt ++++ b/example/CMakeLists.txt +@@ -20,4 +20,4 @@ LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/lib) + + ADD_EXECUTABLE(parse_config ${SRCS}) + +-TARGET_LINK_LIBRARIES(parse_config yajl_s) ++TARGET_LINK_LIBRARIES(parse_config yajl) +diff --git a/perf/CMakeLists.txt b/perf/CMakeLists.txt +index b438d7a1..924a2681 100644 +--- a/perf/CMakeLists.txt ++++ b/perf/CMakeLists.txt +@@ -20,4 +20,4 @@ LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/lib) + + ADD_EXECUTABLE(perftest ${SRCS}) + +-TARGET_LINK_LIBRARIES(perftest yajl_s) ++TARGET_LINK_LIBRARIES(perftest yajl) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 789ddf99..78875032 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -35,9 +35,7 @@ SET (pkgconfigDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/lib/pkgconfig + # set the output path for libraries + SET(LIBRARY_OUTPUT_PATH ${libDir}) + +-ADD_LIBRARY(yajl_s STATIC ${SRCS} ${HDRS} ${PUB_HDRS}) +- +-ADD_LIBRARY(yajl SHARED ${SRCS} ${HDRS} ${PUB_HDRS}) ++ADD_LIBRARY(yajl ${SRCS} ${HDRS} ${PUB_HDRS}) + + #### setup shared library version number + SET_TARGET_PROPERTIES(yajl PROPERTIES +@@ -69,7 +67,7 @@ FOREACH (header ${PUB_HDRS}) + + EXEC_PROGRAM(${CMAKE_COMMAND} ARGS -E copy_if_different ${header} ${incDir}) + +- ADD_CUSTOM_COMMAND(TARGET yajl_s POST_BUILD ++ ADD_CUSTOM_COMMAND(TARGET yajl POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${header} ${incDir}) + ENDFOREACH (header ${PUB_HDRS}) + +@@ -81,7 +79,6 @@ INSTALL(TARGETS yajl + RUNTIME DESTINATION lib${LIB_SUFFIX} + LIBRARY DESTINATION lib${LIB_SUFFIX} + ARCHIVE DESTINATION lib${LIB_SUFFIX}) +-INSTALL(TARGETS yajl_s ARCHIVE DESTINATION lib${LIB_SUFFIX}) + INSTALL(FILES ${PUB_HDRS} DESTINATION include/yajl) + INSTALL(FILES ${incDir}/yajl_version.h DESTINATION include/yajl) + INSTALL(FILES ${pkgconfigDir}/yajl.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig) +diff --git a/test/parsing/CMakeLists.txt b/test/parsing/CMakeLists.txt +index c22a3887..f445920d 100644 +--- a/test/parsing/CMakeLists.txt ++++ b/test/parsing/CMakeLists.txt +@@ -20,4 +20,4 @@ LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../../${YAJL_DIST_NAME}/lib) + + ADD_EXECUTABLE(yajl_test ${SRCS}) + +-TARGET_LINK_LIBRARIES(yajl_test yajl_s) ++TARGET_LINK_LIBRARIES(yajl_test yajl) diff --git a/pkgs/development/libraries/yajl/default.nix b/pkgs/development/libraries/yajl/default.nix index 022284b0b1303..dad884c248426 100644 --- a/pkgs/development/libraries/yajl/default.nix +++ b/pkgs/development/libraries/yajl/default.nix @@ -1,18 +1,30 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake, which, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "yajl"; - version = "2.1.0"; + version = "unstable-2022-04-20"; src = fetchFromGitHub { - owner = "lloyd"; + owner = "containers"; repo = "yajl"; - rev = "refs/tags/${version}"; - sha256 = "00yj06drb6izcxfxfqlhimlrb089kka0w0x8k27pyzyiq7qzcvml"; + rev = "49923ccb2143e36850bcdeb781e2bcdf5ce22f15"; + hash = "sha256-9bMPA5FpyBp8fvG/kkT/MnhYtdqg3QzOnmDFXKwJVW0="; }; + patches = [ + # https://github.com/containers/yajl/pull/1 + ./cmake-shared-static-fix.patch + ]; + nativeBuildInputs = [ cmake ]; + doCheck = true; + nativeCheckInputs = [ which ]; + + passthru = { + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + meta = { description = "Yet Another JSON Library"; longDescription = '' @@ -21,7 +33,8 @@ stdenv.mkDerivation rec { ''; homepage = "http://lloyd.github.com/yajl/"; license = lib.licenses.isc; + pkgConfigModules = [ "yajl" ]; platforms = with lib.platforms; linux ++ darwin; maintainers = with lib.maintainers; [ maggesi ]; }; -} +}) diff --git a/pkgs/development/libraries/zlib-ng/default.nix b/pkgs/development/libraries/zlib-ng/default.nix index 456ef7c7a1bf4..3f2ba22ea430c 100644 --- a/pkgs/development/libraries/zlib-ng/default.nix +++ b/pkgs/development/libraries/zlib-ng/default.nix @@ -1,26 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub , cmake, pkg-config, gtest , withZlibCompat ? false }: stdenv.mkDerivation rec { pname = "zlib-ng"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = "zlib-ng"; repo = "zlib-ng"; rev = version; - sha256 = "sha256-6IEH9IQsBiNwfAZAemmP0/p6CTOzxEKyekciuH6pLhw="; + hash = "sha256-DC4KPPaMuqML0HEhWJmWjyox4WEbExPDfNnpnWzoaHc="; }; - patches = [ - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/zlib-ng/zlib-ng/pull/1519.patch"; - hash = "sha256-itobS8kJ2Hj3RfjslVkvEVdQ4t5eeIrsA9muRZt03pE="; - }) - ]; - outputs = [ "out" "dev" "bin" ]; strictDeps = true; diff --git a/pkgs/development/libraries/zookeeper_mt/default.nix b/pkgs/development/libraries/zookeeper_mt/default.nix index 6a52f6a41d53d..9c4302433ff0b 100644 --- a/pkgs/development/libraries/zookeeper_mt/default.nix +++ b/pkgs/development/libraries/zookeeper_mt/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://apache/zookeeper/${zookeeper.pname}-${version}/apache-${zookeeper.pname}-${version}.tar.gz"; - sha512 = "sha512-ttYbATvfe+uRYhQWfeG1WGXl5GOztcrITfl/4EQierAzSaDvTmVxSb582hYQOdBpxw2QrVbIdnTm3/Xt4ifecg=="; + hash = "sha512-ttYbATvfe+uRYhQWfeG1WGXl5GOztcrITfl/4EQierAzSaDvTmVxSb582hYQOdBpxw2QrVbIdnTm3/Xt4ifecg=="; }; sourceRoot = "apache-${zookeeper.pname}-${version}/zookeeper-client/zookeeper-client-c"; diff --git a/pkgs/development/lisp-modules-new-obsolete/doc/api.md b/pkgs/development/lisp-modules-new-obsolete/doc/api.md index cc305b52f6e9f..f5aed70de72a6 100644 --- a/pkgs/development/lisp-modules-new-obsolete/doc/api.md +++ b/pkgs/development/lisp-modules-new-obsolete/doc/api.md @@ -76,7 +76,7 @@ Some libraries have multiple systems under one project, for example, to the Nix store. This prevents ASDF from referring to uncompiled systems on run time. -Also useful when the `pname` is differrent than the system name, such +Also useful when the `pname` is different than the system name, such as when using [reverse domain naming]. (see `jzon` -> `com.inuoe.jzon`) diff --git a/pkgs/development/lisp-modules-new-obsolete/doc/nix-cl.md b/pkgs/development/lisp-modules-new-obsolete/doc/nix-cl.md index d96ac234ae1a0..eb84ed43777c2 100644 --- a/pkgs/development/lisp-modules-new-obsolete/doc/nix-cl.md +++ b/pkgs/development/lisp-modules-new-obsolete/doc/nix-cl.md @@ -31,7 +31,7 @@ package. ## Using libraries not available in repositories -There are useful and working libraries out there, that are nontheless +There are useful and working libraries out there, that are nonetheless unavailable to users of package managers such as Quicklisp or Ultralisp. Two real-world examples are [jzon] and [cl-tar]. diff --git a/pkgs/development/lisp-modules/packages.nix b/pkgs/development/lisp-modules/packages.nix index fee30ca57346f..590a1ea7797bf 100644 --- a/pkgs/development/lisp-modules/packages.nix +++ b/pkgs/development/lisp-modules/packages.nix @@ -1,4 +1,4 @@ -{ build-asdf-system, spec, quicklispPackagesFor, pkgs, ... }: +{ build-asdf-system, spec, quicklispPackagesFor, stdenv, pkgs, ... }: let @@ -80,6 +80,7 @@ let url = "https://github.com/cffi/cffi/archive/3f842b92ef808900bf20dae92c2d74232c2f6d3a.tar.gz"; sha256 = "1jilvmbbfrmb23j07lwmkbffc6r35wnvas5s4zjc84i856ccclm2"; }; + patches = optionals stdenv.isDarwin [ ./patches/cffi-libffi-darwin-ffi-h.patch ]; }; cl-unicode = build-with-compile-into-pwd { @@ -668,29 +669,64 @@ let ]; }; + trivial-clock = build-asdf-system { + pname = "trivial-clock"; + version = "trunk"; + src = pkgs.fetchFromGitHub { + owner = "ak-coram"; + repo = "cl-trivial-clock"; + rev = "641e12ab1763914996beb1ceee67aabc9f1a3b1e"; + hash = "sha256-mltQEJ2asxyQ/aS/9BuWmN3XZ9bGmmkopcF5YJU1cPk="; + }; + systems = [ "trivial-clock" "trivial-clock/test" ]; + lispLibs = [ self.cffi self.fiveam ]; + }; + + frugal-uuid = build-asdf-system { + pname = "frugal-uuid"; + version = "trunk"; + src = pkgs.fetchFromGitHub { + owner = "ak-coram"; + repo = "cl-frugal-uuid"; + rev = "be27972333a16fc3f16bc7fbf9e3013b2123d75c"; + hash = "sha256-rWO43vWMibF8/OxL70jle5nhd9oRWC7+MI44KWrQD48="; + }; + systems = [ "frugal-uuid" + "frugal-uuid/non-frugal" + "frugal-uuid/benchmark" + "frugal-uuid/test" ]; + lispLibs = with self; [ + babel + bordeaux-threads + fiveam + ironclad + trivial-benchmark + trivial-clock + ]; + }; + duckdb = build-asdf-system { pname = "duckdb"; version = "trunk"; src = pkgs.fetchFromGitHub { owner = "ak-coram"; repo = "cl-duckdb"; - rev = "2f0df62f59fbede0addd8d72cf286f4007818a3e"; - hash = "sha256-+jeOuXtCFZwMvF0XvlRaqTNHIAAFKMx6y1pz6u8Wxug="; + rev = "3ed1df5ba5c738a0b7fed7aa73632ec86f558d09"; + hash = "sha256-AJMxhtDACe6WTwEOxLsC8y6uBaPqjt8HLRw/eIZI02E="; }; systems = [ "duckdb" "duckdb/test" "duckdb/benchmark" ]; - lispLibs = with super; [ + lispLibs = with self; [ bordeaux-threads cffi-libffi cl-ascii-table cl-spark - fiveam + cl-ppcre + frugal-uuid + let-plus local-time local-time-duration periods - trivial-benchmark - serapeum - str - uuid + float-features ]; nativeLibs = with pkgs; [ duckdb libffi diff --git a/pkgs/development/lisp-modules/patches/cffi-libffi-darwin-ffi-h.patch b/pkgs/development/lisp-modules/patches/cffi-libffi-darwin-ffi-h.patch new file mode 100644 index 0000000000000..15c4a45887550 --- /dev/null +++ b/pkgs/development/lisp-modules/patches/cffi-libffi-darwin-ffi-h.patch @@ -0,0 +1,14 @@ +--- a/libffi/libffi-types.lisp ++++ b/libffi/libffi-types.lisp +@@ -43,9 +43,6 @@ + + (pkg-config-cflags "libffi" :optional t) + +-#+darwin +-(include "ffi/ffi.h") +-#-darwin + (include "ffi.h") + + (cenum status + +Diff finished. Sun Nov 13 00:23:10 2022 \ No newline at end of file diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index e8b4be7dfd5db..383ab0f665bc8 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -5,7 +5,7 @@ nixpkgs$ ./maintainers/scripts/update-luarocks-packages You can customize the generated packages in pkgs/development/lua-modules/overrides.nix */ -{ self, stdenv, lib, fetchurl, fetchgit, callPackage, ... } @ args: +{ stdenv, lib, fetchurl, fetchgit, callPackage, ... } @ args: final: prev: { alt-getopt = callPackage({ luaAtLeast, lua, luaOlder, fetchgit, buildLuarocksPackage }: @@ -563,14 +563,14 @@ buildLuarocksPackage { haskell-tools-nvim = callPackage({ plenary-nvim, fetchzip, lua, luaOlder, buildLuarocksPackage }: buildLuarocksPackage { pname = "haskell-tools.nvim"; - version = "1.9.1-1"; + version = "2.3.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/haskell-tools.nvim-1.9.1-1.rockspec"; - sha256 = "1m7fasn5iz9hv9l1ycsjiaah14i1s5nssvqq9sypbwcpc9slj93b"; + url = "mirror://luarocks/haskell-tools.nvim-2.3.0-1.rockspec"; + sha256 = "0jcmb0hzyhq14b2xcwdhwr9a9wbmfaw27vzfzkv52is24mwfr0p0"; }).outPath; src = fetchzip { - url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/1.9.1.zip"; - sha256 = "0m425ipfvbb1f1m2wmz8qg57b901vspvvpckxr380crbwl3dflpr"; + url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/2.3.0.zip"; + sha256 = "0lg8g2j9fbikgmhimvz9d0yb63csn85racc09qyszba2kviipr24"; }; disabled = (luaOlder "5.1"); @@ -2501,6 +2501,29 @@ buildLuarocksPackage { }; }) {}; +middleclass = callPackage({ luaOlder, buildLuarocksPackage, fetchurl, lua }: +buildLuarocksPackage { + pname = "middleclass"; + version = "4.1.1-0"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/middleclass-4.1.1-0.rockspec"; + sha256 = "10xzs48lr1dy7cx99581r956gl16px0a9gbdlfar41n19r96mhb1"; + }).outPath; + src = fetchurl { + url = "https://github.com/kikito/middleclass/archive/v4.1.1.tar.gz"; + sha256 = "11ahv0b9wgqfnabv57rb7ilsvn2vcvxb1czq6faqrsqylvr5l7nh"; + }; + + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = { + homepage = "https://github.com/kikito/middleclass"; + description = "A simple OOP library for Lua"; + license.fullName = "MIT"; + }; +}) {}; + moonscript = callPackage({ lpeg, luaOlder, fetchgit, lua, buildLuarocksPackage, argparse, luafilesystem }: buildLuarocksPackage { pname = "moonscript"; diff --git a/pkgs/development/misc/haskell/hasura/update.sh b/pkgs/development/misc/haskell/hasura/update.sh index f4286ea6b831e..825f57fa4e586 100755 --- a/pkgs/development/misc/haskell/hasura/update.sh +++ b/pkgs/development/misc/haskell/hasura/update.sh @@ -88,7 +88,7 @@ new_kritilang_version=$(curl --silent "https://api.github.com/repos/hasura/kriti cabal2nix --revision "$new_kritilang_version" --maintainer lassulus "https://github.com/hasura/kriti-lang.git" >> "$kritilang_derivation_file" echo "###################" -echo "please update pkgs/servers/hasura/cli.nix vendorSha256" +echo "please update pkgs/servers/hasura/cli.nix vendorHash" echo "please update pkgs/development/haskell-modules/configuration-common.nix graphql-engine version" echo "###################" diff --git a/pkgs/development/misc/resholve/README.md b/pkgs/development/misc/resholve/README.md index c3be4ad5b9f24..082a7fe757a48 100644 --- a/pkgs/development/misc/resholve/README.md +++ b/pkgs/development/misc/resholve/README.md @@ -203,7 +203,7 @@ more copies of their specification/behavior than I like, and continuing to add more at this early date will only ensure that I spend more time updating docs and less time filling in feature gaps. -Full documentation may be greatly accellerated if someone can help me sort out +Full documentation may be greatly accelerated if someone can help me sort out single-sourcing. See: https://github.com/abathur/resholve/issues/19 --> diff --git a/pkgs/development/misc/resholve/oildev.nix b/pkgs/development/misc/resholve/oildev.nix index de3ac08ec99da..3e7dbc8e0108c 100644 --- a/pkgs/development/misc/resholve/oildev.nix +++ b/pkgs/development/misc/resholve/oildev.nix @@ -9,8 +9,7 @@ , # py-yajl deps git , # oil deps - cmark -, file + file , glibcLocales , six , typing @@ -80,8 +79,8 @@ rec { patchSrc = fetchFromGitHub { owner = "abathur"; repo = "nix-py-dev-oil"; - rev = "v0.14.0.0"; - hash = "sha256-U6uR8G6yB2xwuDE/fznco23mVFSVdCxPUNdCRYz4Mj8="; + rev = "v0.14.0.1"; + hash = "sha256-47+986+SohdtoNzTYAgF2vPPWgakyg0VCmR+MgxMzTk="; }; patches = [ "${patchSrc}/0001-add_setup_py.patch" @@ -93,6 +92,7 @@ rec { "${patchSrc}/0010-disable-line-input.patch" "${patchSrc}/0011-disable-fanos.patch" "${patchSrc}/0012-disable-doc-cmark.patch" + "${patchSrc}/0013-fix-pyverify.patch" ]; configureFlags = [ @@ -118,14 +118,6 @@ rec { substituteInPlace osh/cmd_parse.py --replace 'elif self.c_id == Id.Op_LParen' 'elif False' ''; - /* - We did convince oil to upstream an env for specifying - this to support a shell.nix. Would need a patch if they - later drop this support. See: - https://github.com/oilshell/oil/blob/46900310c7e4a07a6223eb6c08e4f26460aad285/doctools/cmark.py#L30-L34 - */ - _NIX_SHELL_LIBCMARK = "${cmark}/lib/libcmark${stdenv.hostPlatform.extensions.sharedLibrary}"; - # See earlier note on glibcLocales TODO: verify needed? LOCALE_ARCHIVE = lib.optionalString (stdenv.buildPlatform.libc == "glibc") "${glibcLocales}/lib/locale/locale-archive"; diff --git a/pkgs/development/mobile/maestro/default.nix b/pkgs/development/mobile/maestro/default.nix index 2bc34bfcf4350..c43260770e5b3 100644 --- a/pkgs/development/mobile/maestro/default.nix +++ b/pkgs/development/mobile/maestro/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "maestro"; - version = "1.32.0"; + version = "1.33.1"; src = fetchurl { url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${version}/maestro.zip"; - sha256 = "1bhyg0w6dwgba0ykk898dxs661imcx2s6si3ldwgg01pmxpcsm30"; + sha256 = "142h53qwmibi9bpdwla9ard771vcri8yibnynvgj5nvfgapj2p4z"; }; dontUnpack = true; diff --git a/pkgs/development/nim-packages/atlas/default.nix b/pkgs/development/nim-packages/atlas/default.nix new file mode 100644 index 0000000000000..b1c22e776ab58 --- /dev/null +++ b/pkgs/development/nim-packages/atlas/default.nix @@ -0,0 +1,23 @@ +{ lib, buildNimPackage, fetchFromGitHub, openssl }: + +buildNimPackage (final: prev: { + pname = "atlas"; + version = "unstable=2023-09-22"; + nimBinOnly = true; + src = fetchFromGitHub { + owner = "nim-lang"; + repo = "atlas"; + rev = "ab22f997c22a644924c1a9b920f8ce207da9b77f"; + hash = "sha256-TsZ8TriVuKEY9/mV6KR89eFOgYrgTqXmyv/vKu362GU="; + }; + buildInputs = [ openssl ]; + prePatch = '' + rm config.nims + ''; # never trust a .nims file + doCheck = false; # tests will clone repos + meta = final.src.meta // { + description = "Nim package cloner"; + license = [ lib.licenses.mit ]; + maintainers = with lib.maintainers; [ ehmry ]; + }; +}) diff --git a/pkgs/development/nim-packages/csvtools/default.nix b/pkgs/development/nim-packages/csvtools/default.nix new file mode 100644 index 0000000000000..2eaaae1dc5263 --- /dev/null +++ b/pkgs/development/nim-packages/csvtools/default.nix @@ -0,0 +1,19 @@ +{ lib, pkgs, buildNimPackage, fetchFromGitHub }: + +buildNimPackage (finalAttrs: { + pname = "csvtools"; + version = "0.2.1"; + src = fetchFromGitHub { + owner = "andreaferretti"; + repo = "csvtools"; + rev = "${finalAttrs.version}"; + hash = "sha256-G/OvcusnlRR5zdGF+wC7z411RLXI6D9aFJVj9LrMR+s="; + }; + doCheck = true; + meta = finalAttrs.src.meta // { + description = "Manage CSV files easily in Nim"; + homepage = "https://github.com/andreaferretti/csvtools"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.trevdev ]; + }; +}) diff --git a/pkgs/development/nim-packages/jsony/default.nix b/pkgs/development/nim-packages/jsony/default.nix index 5f9c0f2741c29..525da7928171e 100644 --- a/pkgs/development/nim-packages/jsony/default.nix +++ b/pkgs/development/nim-packages/jsony/default.nix @@ -2,13 +2,13 @@ buildNimPackage rec { pname = "jsony"; - version = "d0e69bddf83874e15b5c2f52f8b1386ac080b443"; + version = "1.1.5"; src = fetchFromGitHub { owner = "treeform"; repo = pname; rev = version; - sha256 = "1p250wb97nzz2g0vvq6mn521fx7sn1jpk1ralbzqh5q8clh4g7wr"; + sha256 = "1720iqsxjhqmhw1zhhs7d2ncdz25r8fqadls1p1iry1wfikjlnba"; }; diff --git a/pkgs/development/nim-packages/nimble/default.nix b/pkgs/development/nim-packages/nimble/default.nix new file mode 100644 index 0000000000000..d89810bb94d41 --- /dev/null +++ b/pkgs/development/nim-packages/nimble/default.nix @@ -0,0 +1,30 @@ +{ lib, buildNimPackage, fetchFromGitHub, nim, makeWrapper }: + +buildNimPackage (final: prev: { + pname = "nimble"; + version = "0.14.2"; + + src = fetchFromGitHub { + owner = "nim-lang"; + repo = "nimble"; + rev = "v${final.version}"; + hash = "sha256-8b5yKvEl7c7wA/8cpdaN2CSvawQJzuRce6mULj3z/mI="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + doCheck = false; # it works on their machine + + postInstall = '' + wrapProgram $out/bin/nimble \ + --suffix PATH : ${lib.makeBinPath [ nim ]} + ''; + + meta = with lib; { + description = "Package manager for the Nim programming language"; + homepage = "https://github.com/nim-lang/nimble"; + license = licenses.bsd3; + maintainers = with maintainers; [ ehmry ]; + mainProgram = "nimble"; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index cdfc4f78719f4..d7ddb48ccdb73 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -41,14 +41,18 @@ mapAliases { "@antora/cli" = pkgs.antora; # Added 2023-05-06 "@bitwarden/cli" = pkgs.bitwarden-cli; # added 2023-07-25 "@emacs-eask/cli" = pkgs.eask; # added 2023-08-17 + "@forge/cli" = throw "@forge/cli was removed because it was broken"; # added 2023-09-20 "@githubnext/github-copilot-cli" = pkgs.github-copilot-cli; # Added 2023-05-02 "@google/clasp" = pkgs.google-clasp; # Added 2023-05-07 "@maizzle/cli" = pkgs.maizzle; # added 2023-08-17 "@medable/mdctl-cli" = throw "@medable/mdctl-cli was removed because it was broken"; # added 2023-08-21 + "@mermaid-js/mermaid-cli" = pkgs.mermaid-cli; # added 2023-10-01 + "@nerdwallet/shepherd" = pkgs.shepherd; # added 2023-09-30 "@nestjs/cli" = pkgs.nest-cli; # Added 2023-05-06 alloy = pkgs.titanium-alloy; # added 2023-08-17 antennas = pkgs.antennas; # added 2023-07-30 inherit (pkgs) asar; # added 2023-08-26 + inherit (pkgs) aws-azure-login; # added 2023-09-30 balanceofsatoshis = pkgs.balanceofsatoshis; # added 2023-07-31 bibtex-tidy = pkgs.bibtex-tidy; # added 2023-07-30 bitwarden-cli = pkgs.bitwarden-cli; # added 2023-07-25 @@ -62,6 +66,7 @@ mapAliases { coffee-script = pkgs.coffeescript; # added 2023-08-18 inherit (pkgs) configurable-http-proxy; # added 2023-08-19 inherit (pkgs) cordova; # added 2023-08-18 + inherit (pkgs) create-react-app; # added 2023-09-25 dat = throw "dat was removed because it was broken"; # added 2023-08-21 inherit (pkgs) degit; # added 2023-08-18 inherit (pkgs) dockerfile-language-server-nodejs; # added 2023-08-18 @@ -70,7 +75,9 @@ mapAliases { eslint_d = pkgs.eslint_d; # Added 2023-05-26 inherit (pkgs) firebase-tools; # added 2023-08-18 flood = pkgs.flood; # Added 2023-07-25 + generator-code = throw "generator-code was removed because it provides no executable"; # added 2023-09-24 git-ssb = throw "git-ssb was removed because it was broken"; # added 2023-08-21 + inherit (pkgs) gitmoji-cli; # added 2023-09-23 glob = pkgs.node-glob; # added 2023-08-18 inherit (pkgs) gqlint; # added 2023-08-19 inherit (pkgs) graphqurl; # added 2023-08-19 @@ -92,6 +99,7 @@ mapAliases { markdownlint-cli = pkgs.markdownlint-cli; # added 2023-07-29 inherit (pkgs) markdownlint-cli2; # added 2023-08-22 mdctl-cli = self."@medable/mdctl-cli"; # added 2023-08-21 + inherit (pkgs) mermaid-cli; # added 2023-10-01 musescore-downloader = pkgs.dl-librescore; # added 2023-08-19 inherit (pkgs) near-cli; # added 2023-09-09 node-inspector = throw "node-inspector was removed because it was broken"; # added 2023-08-21 @@ -99,8 +107,11 @@ mapAliases { ocaml-language-server = throw "ocaml-language-server was removed because it was abandoned upstream"; # added 2023-09-04 parcel-bundler = parcel; # added 2023-09-04 prettier_d_slim = pkgs.prettier-d-slim; # added 2023-09-14 + inherit (pkgs) pxder; # added 2023-09-26 inherit (pkgs) quicktype; # added 2023-09-09 + react-native-cli = throw "react-native-cli was removed because it was deprecated"; # added 2023-09-25 inherit (pkgs) react-static; # added 2023-08-21 + react-tools = throw "react-tools was removed because it was deprecated"; # added 2023-09-25 readability-cli = pkgs.readability-cli; # Added 2023-06-12 inherit (pkgs) redoc-cli; # added 2023-09-12 reveal-md = pkgs.reveal-md; # added 2023-07-31 diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index d42505bd24e3e..bd7229556908d 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -13,10 +13,7 @@ "@astrojs/language-server" = "astro-ls"; "@babel/cli" = "babel"; "@commitlint/cli" = "commitlint"; - "@forge/cli" = "forge"; "@gitbeaker/cli" = "gitbeaker"; - "@mermaid-js/mermaid-cli" = "mmdc"; - "@nerdwallet/shepherd" = "shepherd"; "@prisma/language-server" = "prisma-language-server"; "@tailwindcss/language-server" = "tailwindcss-language-server"; "@uppy/companion" = "companion"; @@ -38,7 +35,6 @@ fkill-cli = "fkill"; fleek-cli = "fleek"; git-run = "gr"; - gitmoji-cli = "gitmoji"; graphql-cli = "graphql"; graphql-language-service-cli = "graphql-lsp"; grunt-cli = "grunt"; @@ -54,8 +50,6 @@ prettier = "prettier"; purescript-psa = "psa"; purs-tidy = "purs-tidy"; - react-native-cli = "react-native"; - react-tools = "jsx"; remod-cli = "remod"; svelte-language-server = "svelteserver"; teck-programmer = "teck-firmware-upgrade"; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 47e15b7b2abb0..74f38684a99bd 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -5,10 +5,7 @@ , "@babel/cli" , "@commitlint/cli" , "@commitlint/config-conventional" -, "@forge/cli" -, "@mermaid-js/mermaid-cli" , "@microsoft/rush" -, "@nerdwallet/shepherd" , "@shopify/cli" , "@tailwindcss/aspect-ratio" , "@tailwindcss/forms" @@ -27,7 +24,6 @@ , "audiosprite" , "autoprefixer" , "auto-changelog" -, "aws-azure-login" , "aws-cdk" , "awesome-lint" , "bash-language-server" @@ -93,7 +89,6 @@ , "conventional-changelog-cli" , "cpy-cli" , "create-cycle-app" -, "create-react-app" , "create-react-native-app" , "cspell" , "csslint" @@ -121,12 +116,10 @@ , "fx" , "ganache" , "gatsby-cli" -, "generator-code" , "get-graphql-schema" , "git-run" , "git-standup" , "@gitbeaker/cli" -, "gitmoji-cli" , "gramma" , "grammarly-languageserver" , "graphql" @@ -194,6 +187,7 @@ , "patch-package" , "peerflix" , "peerflix-server" +, {"pgrok-build-deps": "../../tools/networking/pgrok/build-deps"} , "pkg" , "pm2" , "pnpm" @@ -211,10 +205,7 @@ , "purescript-psa" , "purs-tidy" , "purty" -, "pxder" , "pyright" -, "react-native-cli" -, "react-tools" , "remod-cli" , "reveal.js" , "rimraf" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index e90fe04e494a7..ce2a41d5a607b 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -40,6 +40,15 @@ let sha512 = "/EvNkqB4HNxPWCZASmgrjqG8gIdPOolD67LGASvGMp/FY5ne0rbvpYg5o9x8RmgjAl8KdmNQ4YlV1et9DYiW8g=="; }; }; + "@adobe/css-tools-4.2.0" = { + name = "_at_adobe_slash_css-tools"; + packageName = "@adobe/css-tools"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.2.0.tgz"; + sha512 = "E09FiIft46CmH5Qnjb0wsW54/YQd69LsxeKUOWawmws1XWvyFGURnAChH0mlr7YPFR1ofwvUQfcL0J3lMxXqPA=="; + }; + }; "@akryum/winattr-3.0.0" = { name = "_at_akryum_slash_winattr"; packageName = "@akryum/winattr"; @@ -94,31 +103,31 @@ let sha512 = "lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg=="; }; }; - "@angular-devkit/architect-0.1602.2" = { + "@angular-devkit/architect-0.1602.4" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1602.2"; + version = "0.1602.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1602.2.tgz"; - sha512 = "JFIeKKW7V2+/C8+pTReM6gfQkVU9l1IR1OCb9vvHWTRvuTr7E5h2L1rUInnmLiRWkEvkYfG29B+UPpYlkVl9oQ=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1602.4.tgz"; + sha512 = "SQr/FZ8wEOGC6EM+7V5rWyb/qpK0LFND/WbES5l+Yvwv+TEyPihsh5QCPmvPxi45eFbaHPrXkIZnvxnkxRDN/A=="; }; }; - "@angular-devkit/core-16.2.2" = { + "@angular-devkit/core-16.2.4" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "16.2.2"; + version = "16.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-16.2.2.tgz"; - sha512 = "6H4FsvP3rLJaGiWpIhCFPS7ZeNoM4sSrnFtRhhecu6s7MidzE4aqzuGdzJpzLammw1KL+DuTlN0gpLtM1Bvcwg=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-16.2.4.tgz"; + sha512 = "VCZ1z1lDbFkbYkQ6ZMEFfmNzkMEOCBKSzAhWutRyd7oM02by4/5SvDSXd5BMvMxWhPJ/567DdSPOfhhnXQkkDg=="; }; }; - "@angular-devkit/schematics-16.2.2" = { + "@angular-devkit/schematics-16.2.4" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "16.2.2"; + version = "16.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-16.2.2.tgz"; - sha512 = "KeXIlibVrQEwIKbR9GViLKc3m1SXi/xuSXgIvSv+22FNu5i91ScsAhYLe65sDUL6m6MM1XQQMS46XN1Z9bRqQw=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-16.2.4.tgz"; + sha512 = "TsSflKJlaHzKgcU/taQg5regmBP/ggvwVtAbJRBWmCaeQJzobFo68+rtwfYfvuQXKAR6KsbSJc97mqmq6zmTwQ=="; }; }; "@apidevtools/json-schema-ref-parser-9.0.6" = { @@ -130,15 +139,6 @@ let sha512 = "M3YgsLjI0lZxvrpeGVk9Ap032W6TPQkH6pRAZz81Ac3WUNF79VQooAFnp8umjvVzUmD93NkogxEwbSce7qMsUg=="; }; }; - "@apidevtools/json-schema-ref-parser-9.0.9" = { - name = "_at_apidevtools_slash_json-schema-ref-parser"; - packageName = "@apidevtools/json-schema-ref-parser"; - version = "9.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-9.0.9.tgz"; - sha512 = "GBD2Le9w2+lVFoc4vswGI/TjkNIZSVp7+9xPf+X3uidBfWnAeUWmquteSyt0+VCrhNMWj/FTABISQrD3Z/YA+w=="; - }; - }; "@apidevtools/openapi-schemas-2.1.0" = { name = "_at_apidevtools_slash_openapi-schemas"; packageName = "@apidevtools/openapi-schemas"; @@ -418,6 +418,15 @@ let sha512 = "9Sp4vXjoG99qI6sFe09MfgIzsKwiOR0atqxmAcJJLn6fUNXhJEoW04n3w/YcRlk7P4gC9cOMsEyvb8xu+fDEOQ=="; }; }; + "@aws-sdk/client-cloudformation-3.423.0" = { + name = "_at_aws-sdk_slash_client-cloudformation"; + packageName = "@aws-sdk/client-cloudformation"; + version = "3.423.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/client-cloudformation/-/client-cloudformation-3.423.0.tgz"; + sha512 = "lWsVMSDnTP7zDb1xx+8OkhQu4hISmV8edrBKJqVk9XZ7ktZ6bpITswir5l7qYQ4IFXp8rxcV81LcUj/iJHtrYg=="; + }; + }; "@aws-sdk/client-s3-3.296.0" = { name = "_at_aws-sdk_slash_client-s3"; packageName = "@aws-sdk/client-s3"; @@ -427,13 +436,13 @@ let sha512 = "PI6mjM0fmcV2fqkkRoivF3DYex4lnbEz7WIsOFAwpHJBbA9ykClQpiutCKcgl0x/yEWAeTNdQtrCVeAwbxYfvw=="; }; }; - "@aws-sdk/client-s3-3.414.0" = { + "@aws-sdk/client-s3-3.423.0" = { name = "_at_aws-sdk_slash_client-s3"; packageName = "@aws-sdk/client-s3"; - version = "3.414.0"; + version = "3.423.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.414.0.tgz"; - sha512 = "uEag2GPuuxWmnzOxUhAy0EYo3LW3u/UyCw1IxU3zkaTRQnD6TZ07kjv3Q6Zytqt82yKzJPZInzNNRdtGJdyxbw=="; + url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.423.0.tgz"; + sha512 = "Sn/6fotTDGp+uUfPU0JrKszHT/cYwZonly6Ahi4R/uxASLQnOEAF7MwVSjms+/LGu72Qs0Tt7B7RKW76GI4OIA=="; }; }; "@aws-sdk/client-sso-3.296.0" = { @@ -445,13 +454,13 @@ let sha512 = "0P0x++jhlmhzViFPOHvTb7+Z6tSV9aONwB8CchIseg2enSPBbGfml7y5gQu1jdOTDS6pBUmrPZ+9sOI4/GvAfA=="; }; }; - "@aws-sdk/client-sso-3.414.0" = { + "@aws-sdk/client-sso-3.423.0" = { name = "_at_aws-sdk_slash_client-sso"; packageName = "@aws-sdk/client-sso"; - version = "3.414.0"; + version = "3.423.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.414.0.tgz"; - sha512 = "GvRwQ7wA3edzsQEKS70ZPhkOUZ62PAiXasjp6GxrsADEb8sV1z4FxXNl9Un/7fQxKkh9QYaK1Wu1PmhLi9MLMg=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.423.0.tgz"; + sha512 = "znIufHkwhCIePgaYciIs3x/+BpzR57CZzbCKHR9+oOvGyufEPPpUT5bFLvbwTgfiVkTjuk6sG/ES3U5Bc+xtrA=="; }; }; "@aws-sdk/client-sso-oidc-3.296.0" = { @@ -472,13 +481,13 @@ let sha512 = "ew7hSVNpitnLCIRVhnI2L1HZB/yYpRQFReR62fOqCUnpKqm6WGga37bnvgYbY5y0Rv23C0VHARovwunVg1gabA=="; }; }; - "@aws-sdk/client-sts-3.414.0" = { + "@aws-sdk/client-sts-3.423.0" = { name = "_at_aws-sdk_slash_client-sts"; packageName = "@aws-sdk/client-sts"; - version = "3.414.0"; + version = "3.423.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.414.0.tgz"; - sha512 = "xeYH3si6Imp1EWolWn1zuxJJu2AXKwXl1HDftQULwC5AWkm1mNFbXYSJN4hQul1IM+kn+JTRB0XRHByQkKhe+Q=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.423.0.tgz"; + sha512 = "EcpkKu02QZbRX6dQE0u7a8RgWrn/5riz1qAlKd7rM8FZJpr/D6GGX8ZzWxjgp7pRUgfNvinTmIudDnyQY3v9Mg=="; }; }; "@aws-sdk/config-resolver-3.296.0" = { @@ -499,13 +508,13 @@ let sha512 = "eDWSU3p04gytkkVXnYn05YzrP5SEaj/DQiafd4y+iBl8IFfF3zM6982rs6qFhvpwrHeSbLqHNfKR1HDWVwfG5g=="; }; }; - "@aws-sdk/credential-provider-env-3.413.0" = { + "@aws-sdk/credential-provider-env-3.418.0" = { name = "_at_aws-sdk_slash_credential-provider-env"; packageName = "@aws-sdk/credential-provider-env"; - version = "3.413.0"; + version = "3.418.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.413.0.tgz"; - sha512 = "yeMOkfG20/RlzfPMtQuDB647AcPEvFEVYOWZzAWVJfldYQ5ybKr0d7sBkgG9sdAzGkK3Aw9dE4rigYI8EIqc1Q=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.418.0.tgz"; + sha512 = "e74sS+x63EZUBO+HaI8zor886YdtmULzwKdctsZp5/37Xho1CVUNtEC+fYa69nigBD9afoiH33I4JggaHgrekQ=="; }; }; "@aws-sdk/credential-provider-imds-3.296.0" = { @@ -526,13 +535,13 @@ let sha512 = "U0ecY0GX2jeDAgmTzaVO9YgjlLUfb8wgZSu1OwbOxCJscL/5eFkhcF0/xJQXDbRgcj4H4dlquqeSWsBVl/PgvQ=="; }; }; - "@aws-sdk/credential-provider-ini-3.414.0" = { + "@aws-sdk/credential-provider-ini-3.423.0" = { name = "_at_aws-sdk_slash_credential-provider-ini"; packageName = "@aws-sdk/credential-provider-ini"; - version = "3.414.0"; + version = "3.423.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.414.0.tgz"; - sha512 = "rlpLLx70roJL/t40opWC96LbIASejdMbRlgSCRpK8b/hKngYDe5A7SRVacaw08vYrAywxRiybxpQOwOt9b++rA=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.423.0.tgz"; + sha512 = "7CsFWz8g7dQmblp57XzzxMirO4ClowGZIOwAheBkmk6q1XHbllcHFnbh2kdPyQQ0+JmjDg6waztIc7dY7Ycfvw=="; }; }; "@aws-sdk/credential-provider-node-3.296.0" = { @@ -544,13 +553,13 @@ let sha512 = "oCkmh2b1DQhHkhd/qA9jiSIOkrBBK7cMg1/PVIgLw8e15NkzUHBObLJ/ZQw6ZzCxZzjlMYaFv9oCB8hyO8txmA=="; }; }; - "@aws-sdk/credential-provider-node-3.414.0" = { + "@aws-sdk/credential-provider-node-3.423.0" = { name = "_at_aws-sdk_slash_credential-provider-node"; packageName = "@aws-sdk/credential-provider-node"; - version = "3.414.0"; + version = "3.423.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.414.0.tgz"; - sha512 = "xlkcOUKeGHInxWKKrZKIPSBCUL/ozyCldJBjmMKEj7ZmBAEiDcjpMe3pZ//LibMkCSy0b/7jtyQBE/eaIT2o0A=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.423.0.tgz"; + sha512 = "lygbGJJUnDpgo8OEqdoYd51BKkyBVQ1Catiua/m0aHvL+SCmVrHiYPQPawWYGxpH8X3DXdXa0nd0LkEaevrHRg=="; }; }; "@aws-sdk/credential-provider-process-3.296.0" = { @@ -562,13 +571,13 @@ let sha512 = "AY7sTX2dGi8ripuCpcJLYHOZB2wJ6NnseyK/kK5TfJn/pgboKwuGtz0hkJCVprNWomKa6IpHksm7vLQ4O2E+UA=="; }; }; - "@aws-sdk/credential-provider-process-3.413.0" = { + "@aws-sdk/credential-provider-process-3.418.0" = { name = "_at_aws-sdk_slash_credential-provider-process"; packageName = "@aws-sdk/credential-provider-process"; - version = "3.413.0"; + version = "3.418.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.413.0.tgz"; - sha512 = "GFJdgS14GzJ1wc2DEnS44Z/34iBZ05CAkvDsLN2CMwcDgH4eZuif9/x0lwzIJBK3xVFHzYUeVvEzsqRPbCHRsw=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.418.0.tgz"; + sha512 = "xPbdm2WKz1oH6pTkrJoUmr3OLuqvvcPYTQX0IIlc31tmDwDWPQjXGGFD/vwZGIZIkKaFpFxVMgAzfFScxox7dw=="; }; }; "@aws-sdk/credential-provider-sso-3.296.0" = { @@ -580,13 +589,13 @@ let sha512 = "zPFHDX/niXfcQrKQhmBv1XPYEe4b7im4vRKrzjYXgDRpG2M3LP0KaWIwN6Ap+GRYBNBthen86vhTlmKGzyU5YA=="; }; }; - "@aws-sdk/credential-provider-sso-3.414.0" = { + "@aws-sdk/credential-provider-sso-3.423.0" = { name = "_at_aws-sdk_slash_credential-provider-sso"; packageName = "@aws-sdk/credential-provider-sso"; - version = "3.414.0"; + version = "3.423.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.414.0.tgz"; - sha512 = "w9g2hlkZn7WekWICRqk+L33py7KrjYMFryVpkKXOx2pjDchCfZDr6pL1ml782GZ0L3qsob4SbNpbtp13JprnWQ=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.423.0.tgz"; + sha512 = "zAH68IjRMmW22USbsCVQ5Q6AHqhmWABwLbZAMocSGMasddTGv/nkA/nUiVCJ/B4LI3P81FoPQVrG5JxNmkNH0w=="; }; }; "@aws-sdk/credential-provider-web-identity-3.296.0" = { @@ -598,13 +607,13 @@ let sha512 = "Rl6Ohoekxe+pccA55XXQDW5wApbg3rGWr6FkmPRcg7Ld6Vfe+HL8OtfsFf83/0eoFerevbif+00BdknXWT05LA=="; }; }; - "@aws-sdk/credential-provider-web-identity-3.413.0" = { + "@aws-sdk/credential-provider-web-identity-3.418.0" = { name = "_at_aws-sdk_slash_credential-provider-web-identity"; packageName = "@aws-sdk/credential-provider-web-identity"; - version = "3.413.0"; + version = "3.418.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.413.0.tgz"; - sha512 = "5cdA1Iq9JeEHtg59ERV9fdMQ7cS0JF6gH/BWA7HYEUGdSVPXCuwyEggPtG64QgpNU7SmxH+QdDG+Ldxz09ycIA=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.418.0.tgz"; + sha512 = "do7ang565n9p3dS1JdsQY01rUfRx8vkxQqz5M8OlcEHBNiCdi2PvSjNwcBdrv/FKkyIxZb0TImOfBSt40hVdxQ=="; }; }; "@aws-sdk/eventstream-codec-3.296.0" = { @@ -706,13 +715,13 @@ let sha512 = "SCIt10cr5dud7hvwveU4wkLjvkGssJ3GrcbHCds2NwI+JHmpcaaNYLAqi305JAuT29T36U5ssTFDSmrrEOcfag=="; }; }; - "@aws-sdk/lib-storage-3.414.0" = { + "@aws-sdk/lib-storage-3.423.0" = { name = "_at_aws-sdk_slash_lib-storage"; packageName = "@aws-sdk/lib-storage"; - version = "3.414.0"; + version = "3.423.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/lib-storage/-/lib-storage-3.414.0.tgz"; - sha512 = "R2ZdLVWa+EhMYrta61c0fNgnRpsIWr4zj1rCnC0ZlTwP5J3jiAaRHPMVgd9Jgo1u91y8nHVYaLdIJ6EQDN0scg=="; + url = "https://registry.npmjs.org/@aws-sdk/lib-storage/-/lib-storage-3.423.0.tgz"; + sha512 = "EyE1d/99BxUdfHs144u7h5gkb/GccApHT2uq1QwaLHqee5rw8+oZoAbhrwQ5kyysH2v3GSdcBEeTwonNJo1jSw=="; }; }; "@aws-sdk/md5-js-3.296.0" = { @@ -733,13 +742,13 @@ let sha512 = "Xhzucs5psscjXJW7V6vMrjJWGmej8Xtw8XIKd91RLmbxdmecMy85/mQC3bIqxgTGhC/e3pKqWSp8z/YjV6iPZg=="; }; }; - "@aws-sdk/middleware-bucket-endpoint-3.413.0" = { + "@aws-sdk/middleware-bucket-endpoint-3.418.0" = { name = "_at_aws-sdk_slash_middleware-bucket-endpoint"; packageName = "@aws-sdk/middleware-bucket-endpoint"; - version = "3.413.0"; + version = "3.418.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.413.0.tgz"; - sha512 = "hHfaKg4rbpdgB6iMNLW/ubAJFsPFMNOV/hHpZ7BJVdA05fW6Zj6es+TSr7DM3j4Dv49ckhWY0P+JrSkM3FXXpg=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.418.0.tgz"; + sha512 = "gj/mj1UfbKkGbQ1N4YUvjTTp8BVs5fO1QAL2AjFJ+jfJOToLReX72aNEkm7sPGbHML0TqOY4cQbJuWYy+zdD5g=="; }; }; "@aws-sdk/middleware-content-length-3.296.0" = { @@ -769,13 +778,13 @@ let sha512 = "aVCv9CdAVWt9AlZKQZRweIywkAszRrZUCo8K5bBUJNdD4061DoDqLK/6jmqXmObas0j1wQr/eNzjYbv99MZBCg=="; }; }; - "@aws-sdk/middleware-expect-continue-3.413.0" = { + "@aws-sdk/middleware-expect-continue-3.418.0" = { name = "_at_aws-sdk_slash_middleware-expect-continue"; packageName = "@aws-sdk/middleware-expect-continue"; - version = "3.413.0"; + version = "3.418.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.413.0.tgz"; - sha512 = "14L4Fit+3EEVZNHCZKxua4vCrh+dGaaDfC5Ng3A8nILAqCsG2dhbDbUOwbnAaM8MCEVOgZS/NwUUlLA9AZfKgQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.418.0.tgz"; + sha512 = "6x4rcIj685EmqDLQkbWoCur3Dg5DRClHMen6nHXmD3CR5Xyt3z1Gk/+jmZICxyJo9c6M4AeZht8o95BopkmYAQ=="; }; }; "@aws-sdk/middleware-flexible-checksums-3.296.0" = { @@ -787,13 +796,13 @@ let sha512 = "F5wVMhLIgA86PKsK/Az7LGIiNVDdZjoSn0+boe6fYW/AIAmgJhPf//500Md0GsKsLOCcPcxiQC43a0hVT2zbew=="; }; }; - "@aws-sdk/middleware-flexible-checksums-3.413.0" = { + "@aws-sdk/middleware-flexible-checksums-3.418.0" = { name = "_at_aws-sdk_slash_middleware-flexible-checksums"; packageName = "@aws-sdk/middleware-flexible-checksums"; - version = "3.413.0"; + version = "3.418.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.413.0.tgz"; - sha512 = "xb7WIxmyCQoBCnzaN+Widuan0PbNxYegKLOW4XheYz/v7lBEttIcGMu+OIAIQs3KlTb3dx8jqjSj2rMNnru8MQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.418.0.tgz"; + sha512 = "3O203dqS2JU5P1TAAbo7p1qplXQh59pevw9nqzPVb3EG8B+mSucVf2kKmF7kGHqKSk+nK/mB/4XGSsZBzGt6Wg=="; }; }; "@aws-sdk/middleware-host-header-3.296.0" = { @@ -805,13 +814,13 @@ let sha512 = "V47dFtfkX5lXWv9GDp71gZVCRws4fEdQ9QF9BQ/2UMSNrYjQLg6mFe7NibH+IJoNOid2FIwWIl94Eos636VGYQ=="; }; }; - "@aws-sdk/middleware-host-header-3.413.0" = { + "@aws-sdk/middleware-host-header-3.418.0" = { name = "_at_aws-sdk_slash_middleware-host-header"; packageName = "@aws-sdk/middleware-host-header"; - version = "3.413.0"; + version = "3.418.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.413.0.tgz"; - sha512 = "r9PQx468EzPHo9wRzZLfgROpKtVdbkteMrdhsuM12bifVHjU1OHr7yfhc1OdWv39X8Xiv6F8n5r+RBQEM0S6+g=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.418.0.tgz"; + sha512 = "LrMTdzalkPw/1ujLCKPLwCGvPMCmT4P+vOZQRbSEVZPnlZk+Aj++aL/RaHou0jL4kJH3zl8iQepriBt4a7UvXQ=="; }; }; "@aws-sdk/middleware-location-constraint-3.296.0" = { @@ -823,13 +832,13 @@ let sha512 = "KHkWaIrZOtJmV1/WO9KOf7kSK41ngfqts3YIun956NYglKTDKyrBIOPCgmXTT/03odnYsKVT/UfbEIh/v4RxGA=="; }; }; - "@aws-sdk/middleware-location-constraint-3.413.0" = { + "@aws-sdk/middleware-location-constraint-3.418.0" = { name = "_at_aws-sdk_slash_middleware-location-constraint"; packageName = "@aws-sdk/middleware-location-constraint"; - version = "3.413.0"; + version = "3.418.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.413.0.tgz"; - sha512 = "JecF1O1Lm8ZZtCgXHwJm0ZysVf8K0Z8DbrNMJfYkyfsP3CYuQNJbmjrehyRl7aCuxMJ16EUGdXgoP1M8TImLpA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.418.0.tgz"; + sha512 = "cc8M3VEaESHJhDsDV8tTpt2QYUprDWhvAVVSlcL43cTdZ54Quc0W+toDiaVOUlwrAZz2Y7g5NDj22ibJGFbOvw=="; }; }; "@aws-sdk/middleware-logger-3.296.0" = { @@ -841,13 +850,13 @@ let sha512 = "LzfEEFyBR9LXdWwLdtBrmi1vLdzgdJNntEgzqktVF8LwaCyY+9xIE6TGu/2V+9fJHAwECxjOC1eQbNQdAZ0Tmw=="; }; }; - "@aws-sdk/middleware-logger-3.413.0" = { + "@aws-sdk/middleware-logger-3.418.0" = { name = "_at_aws-sdk_slash_middleware-logger"; packageName = "@aws-sdk/middleware-logger"; - version = "3.413.0"; + version = "3.418.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.413.0.tgz"; - sha512 = "jqcXDubcKvoqBy+kkEa0WoNjG6SveDeyNy+gdGnTV+DEtYjkcHrHJei4q0W5zFl0mzc+dP+z8tJF44rv95ZY3Q=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.418.0.tgz"; + sha512 = "StKGmyPVfoO/wdNTtKemYwoJsqIl4l7oqarQY7VSf2Mp3mqaa+njLViHsQbirYpyqpgUEusOnuTlH5utxJ1NsQ=="; }; }; "@aws-sdk/middleware-recursion-detection-3.296.0" = { @@ -859,13 +868,13 @@ let sha512 = "UG7TLDPz9ImQG0uVklHTxE9Us7rTImwN+6el6qZCpoTBuGeXgOkfb0/p8izJyFgY/hMUR4cZqs7IdCDUkxQF3w=="; }; }; - "@aws-sdk/middleware-recursion-detection-3.413.0" = { + "@aws-sdk/middleware-recursion-detection-3.418.0" = { name = "_at_aws-sdk_slash_middleware-recursion-detection"; packageName = "@aws-sdk/middleware-recursion-detection"; - version = "3.413.0"; + version = "3.418.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.413.0.tgz"; - sha512 = "C6k0IKJk/A4/VBGwUjxEPG+WOjjnmWAZVRBUzaeM7PqRh+g5rLcuIV356ntV3pREVxyiSTePTYVYIHU9YXkLKQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.418.0.tgz"; + sha512 = "kKFrIQglBLUFPbHSDy1+bbe3Na2Kd70JSUC3QLMbUHmqipXN8KeXRfAj7vTv97zXl0WzG0buV++WcNwOm1rFjg=="; }; }; "@aws-sdk/middleware-retry-3.296.0" = { @@ -886,13 +895,13 @@ let sha512 = "zH4uZKEqumo01wn+dTwrYnvOui9GjDiuBHdECnSjnA0Mkxo/tfMPYzYD7mE8kUlBz7HfQcXeXlyaApj9fPkxvg=="; }; }; - "@aws-sdk/middleware-sdk-s3-3.414.0" = { + "@aws-sdk/middleware-sdk-s3-3.418.0" = { name = "_at_aws-sdk_slash_middleware-sdk-s3"; packageName = "@aws-sdk/middleware-sdk-s3"; - version = "3.414.0"; + version = "3.418.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.414.0.tgz"; - sha512 = "IKTiYMWN/2HZtgBinrDOGq+gKYkM9h477AqVr7EXSfll+gM9phwJKEitgxje7IaCi8ViQcFKtTRly3eCLX6GIA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.418.0.tgz"; + sha512 = "rei32LF45SyqL3NlWDjEOfMwAca9A5F4QgUyXJqvASc43oWC1tJnLIhiCxNh8qkWAiRyRzFpcanTeqyaRSsZpA=="; }; }; "@aws-sdk/middleware-sdk-sts-3.296.0" = { @@ -904,13 +913,13 @@ let sha512 = "0EnHtiRzcRcXaF6zEgcRGUtVgX0RqczwlGXjtryHcxiqU/+adqbRuckC7bdMF4Zva6GVPS25XppvGF4M+UzAEw=="; }; }; - "@aws-sdk/middleware-sdk-sts-3.413.0" = { + "@aws-sdk/middleware-sdk-sts-3.418.0" = { name = "_at_aws-sdk_slash_middleware-sdk-sts"; packageName = "@aws-sdk/middleware-sdk-sts"; - version = "3.413.0"; + version = "3.418.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.413.0.tgz"; - sha512 = "t0u//JUyaEZRVnH5q+Ur3tWnuyIsTdwA0XOdDCZXcSlLYzGp2MI/tScLjn9IydRrceIFpFfmbjk4Nf/Q6TeBTQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.418.0.tgz"; + sha512 = "cW8ijrCTP+mgihvcq4+TbhAcE/we5lFl4ydRqvTdtcSnYQAVQADg47rnTScQiFsPFEB3NKq7BGeyTJF9MKolPA=="; }; }; "@aws-sdk/middleware-serde-3.296.0" = { @@ -931,13 +940,13 @@ let sha512 = "wyiG+WPDvugGTIPpKchGOdvvpcMZEN2IfP6iK//QAqGXsC6rDm5+SNZ3+elvduZjPUdVA06W0CcFYBAkVz8D7Q=="; }; }; - "@aws-sdk/middleware-signing-3.413.0" = { + "@aws-sdk/middleware-signing-3.418.0" = { name = "_at_aws-sdk_slash_middleware-signing"; packageName = "@aws-sdk/middleware-signing"; - version = "3.413.0"; + version = "3.418.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.413.0.tgz"; - sha512 = "QFEnVvIKYPCermM+ESxEztgUgXzGSKpnPnohMYNvSZySqmOLu/4VvxiZbRO/BX9J3ZHcUgaw4vKm5VBZRrycxw=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.418.0.tgz"; + sha512 = "onvs5KoYQE8OlOE740RxWBGtsUyVIgAo0CzRKOQO63ZEYqpL1Os+MS1CGzdNhvQnJgJruE1WW+Ix8fjN30zKPA=="; }; }; "@aws-sdk/middleware-ssec-3.296.0" = { @@ -949,13 +958,13 @@ let sha512 = "vcSyXxEXAC9rWzUd7rq2/JxPdt87DKiA+wfiBrpGvFV+bacocIV0TFcpJncgZqMOoP8b6Osd+mW4BjlkwBamtA=="; }; }; - "@aws-sdk/middleware-ssec-3.413.0" = { + "@aws-sdk/middleware-ssec-3.418.0" = { name = "_at_aws-sdk_slash_middleware-ssec"; packageName = "@aws-sdk/middleware-ssec"; - version = "3.413.0"; + version = "3.418.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.413.0.tgz"; - sha512 = "MQNksEnhjObNLgE2zRd0OltdijQuqHaArP3FygtdeE2bCXc/D5mCpUX8fgDC5grQIBNdRdaar2YL62UxFsHWrw=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.418.0.tgz"; + sha512 = "J7K+5h6aP7IYMlu/NwHEIjb0+WDu1eFvO8TCPo6j1H9xYRi8B/6h+6pa9Rk9IgRUzFnrdlDu9FazG8Tp0KKLyg=="; }; }; "@aws-sdk/middleware-stack-3.296.0" = { @@ -976,13 +985,13 @@ let sha512 = "L7jacxSt6gxX1gD3tQtfwHqBDk5rT2wWD3rxBa6rs7f81b9ObgY/sPT2IgRT7JNCVzvKLYFxJaTklDj65mY1SQ=="; }; }; - "@aws-sdk/middleware-user-agent-3.413.0" = { + "@aws-sdk/middleware-user-agent-3.418.0" = { name = "_at_aws-sdk_slash_middleware-user-agent"; packageName = "@aws-sdk/middleware-user-agent"; - version = "3.413.0"; + version = "3.418.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.413.0.tgz"; - sha512 = "eVMJyeWxNBqerhfD+sE9sTjDtwQiECrfU6wpUQP5fGPhJD2cVVZPxuTuJGDZCu/4k/V61dF85IYlsPUNLdVQ6w=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.418.0.tgz"; + sha512 = "Jdcztg9Tal9SEAL0dKRrnpKrm6LFlWmAhvuwv0dQ7bNTJxIxyEFbpqdgy7mpQHsLVZgq1Aad/7gT/72c9igyZw=="; }; }; "@aws-sdk/node-config-provider-3.296.0" = { @@ -1039,22 +1048,22 @@ let sha512 = "nLNZKVQfK42euv7101cE5qfg17YCtGcfccx3B5XSAzvyTROR46kwYqbEvYSsWisbZoRhbQc905gB/5E0U5HDIw=="; }; }; - "@aws-sdk/region-config-resolver-3.413.0" = { + "@aws-sdk/region-config-resolver-3.418.0" = { name = "_at_aws-sdk_slash_region-config-resolver"; packageName = "@aws-sdk/region-config-resolver"; - version = "3.413.0"; + version = "3.418.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.413.0.tgz"; - sha512 = "h90e6yyOhvoc+1F5vFk3C5mxwB8RSDEMKTO/fxexyur94seczZ1yxyYkTMZv30oc9RUiToABlHNrh/wxL7TZPQ=="; + url = "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.418.0.tgz"; + sha512 = "lJRZ/9TjZU6yLz+mAwxJkcJZ6BmyYoIJVo1p5+BN//EFdEmC8/c0c9gXMRzfISV/mqWSttdtccpAyN4/goHTYA=="; }; }; - "@aws-sdk/s3-presigned-post-3.414.0" = { + "@aws-sdk/s3-presigned-post-3.423.0" = { name = "_at_aws-sdk_slash_s3-presigned-post"; packageName = "@aws-sdk/s3-presigned-post"; - version = "3.414.0"; + version = "3.423.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/s3-presigned-post/-/s3-presigned-post-3.414.0.tgz"; - sha512 = "JyF27PwQ0PHsB1Mu2/rc+AOCmrSZxJnoaYf0hC/Y0pHdQz2+ANHeYpS8R7LqcJ3yy6rgG18IX1g8LaRlQJVqhQ=="; + url = "https://registry.npmjs.org/@aws-sdk/s3-presigned-post/-/s3-presigned-post-3.423.0.tgz"; + sha512 = "VEnsFJM/bg+tB2maEiDwAMXQNIpHChnmEbzdyBfhcgxdpCt43/Jpd0Uawy+Mdzcw9b81YMNduE9xEDMSZ5nWAA=="; }; }; "@aws-sdk/s3-request-presigner-3.296.0" = { @@ -1066,13 +1075,13 @@ let sha512 = "BQv+oNA5EzJymrfh7cnMun/ougmTX3eo6bGCWn/bQdL1LyxodeVdRZacD5tN+lAUYtjhQ7yS23ozYh0lvWNEXw=="; }; }; - "@aws-sdk/s3-request-presigner-3.414.0" = { + "@aws-sdk/s3-request-presigner-3.423.0" = { name = "_at_aws-sdk_slash_s3-request-presigner"; packageName = "@aws-sdk/s3-request-presigner"; - version = "3.414.0"; + version = "3.423.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.414.0.tgz"; - sha512 = "+nw4reziYOF6BR7ay6iw3cWsXdN48+QnzTnLtb0Sm03vleVcGNroHXr5k826PgjT+lpgsR8TsuhAScB90foflA=="; + url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.423.0.tgz"; + sha512 = "VwC5WjcFKdmPpQXYn6vKi+9iJtP6a0sY9UJu0fy6yXKK4pm9yk9ZFflq46PWT/Z6JNAR+dvi+hzAZLbvXWpSvA=="; }; }; "@aws-sdk/service-error-classification-3.296.0" = { @@ -1102,13 +1111,13 @@ let sha512 = "NQyJ/FClty4VmF1WoV4rOkbN0Unn0zevzy8iJrYhqxE3Sc7lySM4Btnsd4Iqelm2dR6l+jNRApGgD8NvoGjGig=="; }; }; - "@aws-sdk/signature-v4-crt-3.413.0" = { + "@aws-sdk/signature-v4-crt-3.418.0" = { name = "_at_aws-sdk_slash_signature-v4-crt"; packageName = "@aws-sdk/signature-v4-crt"; - version = "3.413.0"; + version = "3.418.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/signature-v4-crt/-/signature-v4-crt-3.413.0.tgz"; - sha512 = "yeIcRy7G0JUZI2a7WJGbO2GHYNb1xsSAjddUOvqnNXwOjYGDLVUY9rEnU436mRKT3HbCYbtZ0Rgb7GRcRVzf8w=="; + url = "https://registry.npmjs.org/@aws-sdk/signature-v4-crt/-/signature-v4-crt-3.418.0.tgz"; + sha512 = "4DNHPy8xxtKtyjAQdTwStiuEhe39GTte1KoZY+rRRsB5A6NPQB2N+Q5eEtoN6XGL9x4Ga5vQpseuHFMKB0Ll/A=="; }; }; "@aws-sdk/signature-v4-multi-region-3.296.0" = { @@ -1120,13 +1129,13 @@ let sha512 = "BNMXS0YJEgflPhO2KxXG4f0iTMOGdyxslDMNGmMWGGQm6bbwtqZ7Y9ZyMQYKfzk3GUPpfGQcaaSNiGfURPOCOg=="; }; }; - "@aws-sdk/signature-v4-multi-region-3.413.0" = { + "@aws-sdk/signature-v4-multi-region-3.418.0" = { name = "_at_aws-sdk_slash_signature-v4-multi-region"; packageName = "@aws-sdk/signature-v4-multi-region"; - version = "3.413.0"; + version = "3.418.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.413.0.tgz"; - sha512 = "4USefVS5HPeJ8Yx0j6l84837adWGTifGpnltD+4mIgvpGp/hW3EkwvJko6i4cnLbeY8D2+8XvgT9YN1LUhvFmg=="; + url = "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.418.0.tgz"; + sha512 = "LeVYMZeUQUURFqDf4yZxTEv016g64hi0LqYBjU0mjwd8aPc0k6hckwvshezc80jCNbuLyjNfQclvlg3iFliItQ=="; }; }; "@aws-sdk/smithy-client-3.296.0" = { @@ -1147,13 +1156,13 @@ let sha512 = "yC1ku7A5S+o/CLlgbgDB2bx8+Wq43qj8xfohmTuIhpiP2m/NyUiRVv6S6ARONLI6bVeo1T2/BFk5Q9DfE2xzAQ=="; }; }; - "@aws-sdk/token-providers-3.413.0" = { + "@aws-sdk/token-providers-3.418.0" = { name = "_at_aws-sdk_slash_token-providers"; packageName = "@aws-sdk/token-providers"; - version = "3.413.0"; + version = "3.418.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.413.0.tgz"; - sha512 = "NfP1Ib9LAWVLMTOa/1aJwt4TRrlRrNyukCpVZGfNaMnNNEoP5Rakdbcs8KFVHe/MJzU+GdKVzxQ4TgRkLOGTrA=="; + url = "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.418.0.tgz"; + sha512 = "9P7Q0VN0hEzTngy3Sz5eya2qEOEf0Q8qf1vB3um0gE6ID6EVAdz/nc/DztfN32MFxk8FeVBrCP5vWdoOzmd72g=="; }; }; "@aws-sdk/types-3.296.0" = { @@ -1165,13 +1174,13 @@ let sha512 = "s0wIac64rrMEo2ioUxP9IarGiiCGmelCspNcoNTPSjGl25QqjhyfQqTeGgS58qJ4fHoQb07qra39930xp1IzJg=="; }; }; - "@aws-sdk/types-3.413.0" = { + "@aws-sdk/types-3.418.0" = { name = "_at_aws-sdk_slash_types"; packageName = "@aws-sdk/types"; - version = "3.413.0"; + version = "3.418.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/types/-/types-3.413.0.tgz"; - sha512 = "j1xib0f/TazIFc5ySIKOlT1ujntRbaoG4LJFeEezz4ji03/wSJMI8Vi4KjzpBp8J1tTu0oRDnsxRIGixsUBeYQ=="; + url = "https://registry.npmjs.org/@aws-sdk/types/-/types-3.418.0.tgz"; + sha512 = "y4PQSH+ulfFLY0+FYkaK4qbIaQI9IJNMO2xsxukW6/aNoApNymN1D2FSi2la8Qbp/iPjNDKsG8suNPm9NtsWXQ=="; }; }; "@aws-sdk/url-parser-3.296.0" = { @@ -1282,13 +1291,13 @@ let sha512 = "YraGGLJepXM6HCTaqEGTFf8RFRBdJ0C6uG5k0kVhiXmYxBkeupn8J07CVp9jfWqcPYWElAnMGVEZKU1OjRo4HQ=="; }; }; - "@aws-sdk/util-endpoints-3.413.0" = { + "@aws-sdk/util-endpoints-3.418.0" = { name = "_at_aws-sdk_slash_util-endpoints"; packageName = "@aws-sdk/util-endpoints"; - version = "3.413.0"; + version = "3.418.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.413.0.tgz"; - sha512 = "VAwr7cITNb1L6/2XUPIbCOuhKGm0VtKCRblurrfUF2bxqG/wtuw/2Fm4ahYJPyxklOSXAMSq+RHdFWcir0YB/g=="; + url = "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.418.0.tgz"; + sha512 = "sYSDwRTl7yE7LhHkPzemGzmIXFVHSsi3AQ1KeNEk84eBqxMHHcCc2kqklaBk2roXWe50QDgRMy1ikZUxvtzNHQ=="; }; }; "@aws-sdk/util-format-url-3.296.0" = { @@ -1300,13 +1309,13 @@ let sha512 = "CcYECzkUAnHL5q3uyPicafn2OY0GiklIYfuOUHPZ/4FMxIesd1BnCDDRjTlFxLWjuNuiihIdwB7Qb1pDzxc3Iw=="; }; }; - "@aws-sdk/util-format-url-3.413.0" = { + "@aws-sdk/util-format-url-3.418.0" = { name = "_at_aws-sdk_slash_util-format-url"; packageName = "@aws-sdk/util-format-url"; - version = "3.413.0"; + version = "3.418.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.413.0.tgz"; - sha512 = "ZTL8eOMY8C3CJErYBV3Qp3EEc3wfTmwiB2b9Eqml7WjWeAgg4x4RZrsx4EYN8HITtuHkZrEw5hq3v0PgCmOQPQ=="; + url = "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.418.0.tgz"; + sha512 = "7/Xy+8J1txuOYOKsez6vpKTIkHYIIX4c7anjp/aQgUQL23FDwkPisj56cIlevJ7useGugnYw1rUR6fMULGzQ/g=="; }; }; "@aws-sdk/util-hex-encoding-3.295.0" = { @@ -1381,13 +1390,13 @@ let sha512 = "MGGG+09VkF0N+8KEht8NNE6Q7bqmddgqLkUbvzSky0y18UPEZyq9LTC4JZtzDDOzf/swgbq2IQ/5wtB81iouog=="; }; }; - "@aws-sdk/util-user-agent-browser-3.413.0" = { + "@aws-sdk/util-user-agent-browser-3.418.0" = { name = "_at_aws-sdk_slash_util-user-agent-browser"; packageName = "@aws-sdk/util-user-agent-browser"; - version = "3.413.0"; + version = "3.418.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.413.0.tgz"; - sha512 = "7j/qWcRO2OBZBre2fC6V6M0PAS9n7k6i+VtofPkkhxC2DZszLJElqnooF9hGmVGYK3zR47Np4WjURXKIEZclWg=="; + url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.418.0.tgz"; + sha512 = "c4p4mc0VV/jIeNH0lsXzhJ1MpWRLuboGtNEpqE4s1Vl9ck2amv9VdUUZUmHbg+bVxlMgRQ4nmiovA4qIrqGuyg=="; }; }; "@aws-sdk/util-user-agent-node-3.296.0" = { @@ -1399,13 +1408,13 @@ let sha512 = "AMWac8aIBnaa9nxAEpZ752j29a/UQTViRfR5gnCX38ECBKGfOQMpgYnee5HdlMr4GHJj0WkOzQxBtInW4pV58g=="; }; }; - "@aws-sdk/util-user-agent-node-3.413.0" = { + "@aws-sdk/util-user-agent-node-3.418.0" = { name = "_at_aws-sdk_slash_util-user-agent-node"; packageName = "@aws-sdk/util-user-agent-node"; - version = "3.413.0"; + version = "3.418.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.413.0.tgz"; - sha512 = "vHm9TVZIzfWMeDvdmoOky6VarqOt8Pr68CESHN0jyuO6XbhCDnr9rpaXiBhbSR+N1Qm7R/AfJgAhQyTMu2G1OA=="; + url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.418.0.tgz"; + sha512 = "BXMskXFtg+dmzSCgmnWOffokxIbPr1lFqa1D9kvM3l3IFRiFGx2IyDg+8MAhq11aPDLvoa/BDuQ0Yqma5izOhg=="; }; }; "@aws-sdk/util-utf8-3.295.0" = { @@ -1552,13 +1561,13 @@ let sha512 = "I5CGMoLtX+pI17ZdiFJZgxMJApsK6jjfm85hpgp3oazCdq5Wxgh4wMr7ge/TTWW1B5WBuvIOI1fMU/FrOAMKrw=="; }; }; - "@azure/core-util-1.4.0" = { + "@azure/core-util-1.5.0" = { name = "_at_azure_slash_core-util"; packageName = "@azure/core-util"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-util/-/core-util-1.4.0.tgz"; - sha512 = "eGAyJpm3skVQoLiRqm/xPa+SXi/NPDdSHMxbRAz2lSprd+Zs+qrpQGQQ2VQ3Nttu+nSZR4XoYQC71LbEI7jsig=="; + url = "https://registry.npmjs.org/@azure/core-util/-/core-util-1.5.0.tgz"; + sha512 = "GZBpVFDtQ/15hW1OgBcRdT4Bl7AEpcEZqLfbAvOtm1CQUncKWiYapFHVD588hmlV27NbOOtSm3cnLF3lvoHi4g=="; }; }; "@azure/identity-2.1.0" = { @@ -1624,13 +1633,13 @@ let sha512 = "na+FisoARuaOWaHWpmdtk3FeuTWf2VWamdJ9/TJJzj5ZdXPLC3juoDgFs6XVuJIoK30yuBpyFBEDXVRK4pB7Tg=="; }; }; - "@babel/cli-7.22.15" = { + "@babel/cli-7.23.0" = { name = "_at_babel_slash_cli"; packageName = "@babel/cli"; - version = "7.22.15"; + version = "7.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/cli/-/cli-7.22.15.tgz"; - sha512 = "prtg5f6zCERIaECeTZzd2fMtVjlfjhUcO+fBLQ6DXXdq5FljN+excVitJ2nogsusdf31LeqkjAfXZ7Xq+HmN8g=="; + url = "https://registry.npmjs.org/@babel/cli/-/cli-7.23.0.tgz"; + sha512 = "17E1oSkGk2IwNILM4jtfAvgjt+ohmpfBky8aLerUfYZhiPNg7ca+CRCxZn8QDxwNhV/upsc2VHBCqGFIR+iBfA=="; }; }; "@babel/code-frame-7.10.4" = { @@ -1669,22 +1678,31 @@ let sha512 = "XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w=="; }; }; - "@babel/compat-data-7.22.9" = { + "@babel/compat-data-7.22.20" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.22.9"; + version = "7.22.20"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.9.tgz"; - sha512 = "5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.20.tgz"; + sha512 = "BQYjKbpXjoXwFW5jGqiizJQQT/aC7pFm9Ok1OWssonuguICi264lbgMzRp2ZMmRSlfkX6DsWDDcsrctK8Rwfiw=="; }; }; - "@babel/core-7.22.19" = { + "@babel/core-7.23.0" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.22.19"; + version = "7.23.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/core/-/core-7.23.0.tgz"; + sha512 = "97z/ju/Jy1rZmDxybphrBuI+jtJjFVoz7Mr9yUQVVVi+DNZE333uFQeMOqcCIy1x3WYBIbWftUSLmbNXNT7qFQ=="; + }; + }; + "@babel/generator-7.17.7" = { + name = "_at_babel_slash_generator"; + packageName = "@babel/generator"; + version = "7.17.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.22.19.tgz"; - sha512 = "Q8Yj5X4LHVYTbLCKVz0//2D2aDmHF4xzCdEttYvKOnWvErGsa6geHXD6w46x64n5tP69VfeH+IfSrdyH3MLhwA=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.17.7.tgz"; + sha512 = "oLcVCTeIFadUoArDTwpluncplrYBmTCCZZgXCbgNGvOBBiSDDK3eWO4b/+eOTli5tKv1lg+a5/NAXg+nTcei1w=="; }; }; "@babel/generator-7.18.2" = { @@ -1696,13 +1714,13 @@ let sha512 = "W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw=="; }; }; - "@babel/generator-7.22.15" = { + "@babel/generator-7.23.0" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.22.15"; + version = "7.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.22.15.tgz"; - sha512 = "Zu9oWARBqeVOW0dZOjXc3JObrzuqothQ3y/n1kUtrjCoCPLkXUwMvOo/F/TCfoHMbWIFlWwpZtkZVb9ga4U2pA=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz"; + sha512 = "lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g=="; }; }; "@babel/helper-annotate-as-pure-7.22.5" = { @@ -1759,22 +1777,22 @@ let sha512 = "k0qnnOqHn5dK9pZpfD5XXZ9SojAITdCKRn2Lp6rnDGzIbaP0rHyMPk/4wsSxVBVz4RfN0q6VpXWP2pDGIoQ7hw=="; }; }; - "@babel/helper-environment-visitor-7.22.5" = { + "@babel/helper-environment-visitor-7.22.20" = { name = "_at_babel_slash_helper-environment-visitor"; packageName = "@babel/helper-environment-visitor"; - version = "7.22.5"; + version = "7.22.20"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz"; - sha512 = "XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q=="; + url = "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz"; + sha512 = "zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA=="; }; }; - "@babel/helper-function-name-7.22.5" = { + "@babel/helper-function-name-7.23.0" = { name = "_at_babel_slash_helper-function-name"; packageName = "@babel/helper-function-name"; - version = "7.22.5"; + version = "7.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz"; - sha512 = "wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ=="; + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz"; + sha512 = "OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw=="; }; }; "@babel/helper-hoist-variables-7.22.5" = { @@ -1786,13 +1804,13 @@ let sha512 = "wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw=="; }; }; - "@babel/helper-member-expression-to-functions-7.22.15" = { + "@babel/helper-member-expression-to-functions-7.23.0" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.22.15"; + version = "7.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.15.tgz"; - sha512 = "qLNsZbgrNh0fDQBCPocSL8guki1hcPvltGDv/NxvUoABwFq7GkKSu1nRXeJkVZc+wJvne2E0RKQz+2SQrz6eAA=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz"; + sha512 = "6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA=="; }; }; "@babel/helper-module-imports-7.22.15" = { @@ -1804,13 +1822,13 @@ let sha512 = "0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w=="; }; }; - "@babel/helper-module-transforms-7.22.19" = { + "@babel/helper-module-transforms-7.23.0" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.22.19"; + version = "7.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.19.tgz"; - sha512 = "m6h1cJvn+OJ+R3jOHp30faq5xKJ7VbjwDj5RGgHuRlU9hrMeKsGC+JpihkR5w1g7IfseCPPtZ0r7/hB4UKaYlA=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.0.tgz"; + sha512 = "WhDWw1tdrlT0gMgUJSlX0IQvoO1eN279zrAUbVB+KpV2c3Tylz8+GnKOLllCS6Z/iZQEyVYxhZVUdPTqs2YYPw=="; }; }; "@babel/helper-optimise-call-expression-7.22.5" = { @@ -1831,22 +1849,22 @@ let sha512 = "uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg=="; }; }; - "@babel/helper-remap-async-to-generator-7.22.17" = { + "@babel/helper-remap-async-to-generator-7.22.20" = { name = "_at_babel_slash_helper-remap-async-to-generator"; packageName = "@babel/helper-remap-async-to-generator"; - version = "7.22.17"; + version = "7.22.20"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.17.tgz"; - sha512 = "bxH77R5gjH3Nkde6/LuncQoLaP16THYPscurp1S8z7S9ZgezCyV3G8Hc+TZiCmY8pz4fp8CvKSgtJMW0FkLAxA=="; + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz"; + sha512 = "pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw=="; }; }; - "@babel/helper-replace-supers-7.22.9" = { + "@babel/helper-replace-supers-7.22.20" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.22.9"; + version = "7.22.20"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.9.tgz"; - sha512 = "LJIKvvpgPOPUThdYqcX6IXRuIcTkcAub0IaDRGCZH0p5GPUp7PhRU9QVgFcDDd51BaPkk77ZjqFwh6DZTAEmGg=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz"; + sha512 = "qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw=="; }; }; "@babel/helper-simple-access-7.22.5" = { @@ -1885,13 +1903,13 @@ let sha512 = "mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw=="; }; }; - "@babel/helper-validator-identifier-7.22.19" = { + "@babel/helper-validator-identifier-7.22.20" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; - version = "7.22.19"; + version = "7.22.20"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.19.tgz"; - sha512 = "Tinq7ybnEPFFXhlYOYFiSjespWQk0dq2dRNAiMdRTOYQzEGqnnNyrTxPYHP5r6wGjlF1rFgABdDV0g8EwD6Qbg=="; + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz"; + sha512 = "Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A=="; }; }; "@babel/helper-validator-option-7.22.15" = { @@ -1903,31 +1921,31 @@ let sha512 = "bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA=="; }; }; - "@babel/helper-wrap-function-7.22.17" = { + "@babel/helper-wrap-function-7.22.20" = { name = "_at_babel_slash_helper-wrap-function"; packageName = "@babel/helper-wrap-function"; - version = "7.22.17"; + version = "7.22.20"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.17.tgz"; - sha512 = "nAhoheCMlrqU41tAojw9GpVEKDlTS8r3lzFmF0lP52LwblCPbuFSO7nGIZoIcoU5NIm1ABrna0cJExE4Ay6l2Q=="; + url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz"; + sha512 = "pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw=="; }; }; - "@babel/helpers-7.22.15" = { + "@babel/helpers-7.23.1" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.22.15"; + version = "7.23.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.15.tgz"; - sha512 = "7pAjK0aSdxOwR+CcYAqgWOGy5dcfvzsTIfFTb2odQqW47MDfv14UaJDY6eng8ylM2EaeKXdxaSWESbkmaQHTmw=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.1.tgz"; + sha512 = "chNpneuK18yW5Oxsr+t553UZzzAs3aZnFm4bxhebsNTeshrC95yA7l5yl7GBAG+JG1rF0F7zzD2EixK9mWSDoA=="; }; }; - "@babel/highlight-7.22.13" = { + "@babel/highlight-7.22.20" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.22.13"; + version = "7.22.20"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.13.tgz"; - sha512 = "C/BaXcnnvBCmHTpz/VGZ8jgtE2aYlW4hxDhseJAWZb7gqGM/qtCK6iZUb0TyKFf7BOUsBH7Q7fkRsDRhg1XklQ=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz"; + sha512 = "dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg=="; }; }; "@babel/node-7.22.19" = { @@ -1948,22 +1966,22 @@ let sha512 = "FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow=="; }; }; - "@babel/parser-7.22.16" = { + "@babel/parser-7.22.5" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.22.16"; + version = "7.22.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.22.16.tgz"; - sha512 = "+gPfKv8UWeKKeJTUxe59+OobVcrYHETCsORl61EmSkmgymguYk/X5bp7GuUIXaFsc6y++v8ZxPsLSSuujqDphA=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.22.5.tgz"; + sha512 = "DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q=="; }; }; - "@babel/parser-7.22.5" = { + "@babel/parser-7.23.0" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.22.5"; + version = "7.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.22.5.tgz"; - sha512 = "DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz"; + sha512 = "vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw=="; }; }; "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.15" = { @@ -2002,13 +2020,13 @@ let sha512 = "cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ=="; }; }; - "@babel/plugin-proposal-decorators-7.22.15" = { + "@babel/plugin-proposal-decorators-7.23.0" = { name = "_at_babel_slash_plugin-proposal-decorators"; packageName = "@babel/plugin-proposal-decorators"; - version = "7.22.15"; + version = "7.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.22.15.tgz"; - sha512 = "kc0VvbbUyKelvzcKOSyQUSVVXS5pT3UhRB0e3c9An86MvLqs+gx0dN4asllrDluqSa3m9YyooXKGOFVomnyFkg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.23.0.tgz"; + sha512 = "kYsT+f5ARWF6AdFmqoEEp+hpqxEB8vGmRWfw2aj78M2vTwS2uHW91EF58iFm1Z9U8Y/RrLu2XKJn46P9ca1b0w=="; }; }; "@babel/plugin-proposal-export-default-from-7.22.17" = { @@ -2308,13 +2326,13 @@ let sha512 = "tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA=="; }; }; - "@babel/plugin-transform-block-scoping-7.22.15" = { + "@babel/plugin-transform-block-scoping-7.23.0" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.22.15"; + version = "7.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.15.tgz"; - sha512 = "G1czpdJBZCtngoK1sJgloLiOHUnkb/bLZwqVZD8kXmq0ZnVfTTWUcs9OWtp0mBtYJ+4LQY1fllqBkOIPhXmFmw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.0.tgz"; + sha512 = "cOsrbmIOXmf+5YbL99/S49Y3j46k/T16b9ml8bm9lP6N9US5iQ2yBK7gpui1pg0V/WMcXdkfKbTb7HXq9u+v4g=="; }; }; "@babel/plugin-transform-class-properties-7.22.5" = { @@ -2353,13 +2371,13 @@ let sha512 = "4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg=="; }; }; - "@babel/plugin-transform-destructuring-7.22.15" = { + "@babel/plugin-transform-destructuring-7.23.0" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.22.15"; + version = "7.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.15.tgz"; - sha512 = "HzG8sFl1ZVGTme74Nw+X01XsUTqERVQ6/RLHo3XjGRzm7XD6QTtfS3NJotVgCGy8BzkDqRjRBD8dAyJn5TuvSQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.0.tgz"; + sha512 = "vaMdgNXFkYrB+8lbgniSYWHsgqK5gjaMNcc84bMIOMRLH0L9AqYq3hwMdvnyqj1OPqea8UtjPEuS/DCenah1wg=="; }; }; "@babel/plugin-transform-dotall-regex-7.22.5" = { @@ -2470,31 +2488,31 @@ let sha512 = "RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew=="; }; }; - "@babel/plugin-transform-modules-amd-7.22.5" = { + "@babel/plugin-transform-modules-amd-7.23.0" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.22.5"; + version = "7.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.22.5.tgz"; - sha512 = "R+PTfLTcYEmb1+kK7FNkhQ1gP4KgjpSO6HfH9+f8/yfp2Nt3ggBjiVpRwmwTlfqZLafYKJACy36yDXlEmI9HjQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.0.tgz"; + sha512 = "xWT5gefv2HGSm4QHtgc1sYPbseOyf+FFDo2JbpE25GWl5BqTGO9IMwTYJRoIdjsF85GE+VegHxSCUt5EvoYTAw=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.22.15" = { + "@babel/plugin-transform-modules-commonjs-7.23.0" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.22.15"; + version = "7.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.15.tgz"; - sha512 = "jWL4eh90w0HQOTKP2MoXXUpVxilxsB2Vl4ji69rSjS3EcZ/v4sBmn+A3NpepuJzBhOaEBbR7udonlHHn5DWidg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.0.tgz"; + sha512 = "32Xzss14/UVc7k9g775yMIvkVK8xwKE0DPdP5JTapr3+Z9w4tzeOuLNY6BXDQR6BdnzIlXnCGAzsk/ICHBLVWQ=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.22.11" = { + "@babel/plugin-transform-modules-systemjs-7.23.0" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.22.11"; + version = "7.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.11.tgz"; - sha512 = "rIqHmHoMEOhI3VkVf5jQ15l539KrwhzqcBO6wdCNWPWc/JWt9ILNYNUssbRpeq0qWns8svuw8LnMNCvWBIJ8wA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.0.tgz"; + sha512 = "qBej6ctXZD2f+DhlOC9yO47yEYgUh5CZNz/aBoH4j/3NOlRfJXJbY7xDQCqQVf9KbrqGzIWER1f23doHGrIHFg=="; }; }; "@babel/plugin-transform-modules-umd-7.22.5" = { @@ -2569,13 +2587,13 @@ let sha512 = "rli0WxesXUeCJnMYhzAglEjLWVDF6ahb45HuprcmQuLidBJFWjNnOzssk2kuc6e33FlLaiZhG/kUIzUMWdBKaQ=="; }; }; - "@babel/plugin-transform-optional-chaining-7.22.15" = { + "@babel/plugin-transform-optional-chaining-7.23.0" = { name = "_at_babel_slash_plugin-transform-optional-chaining"; packageName = "@babel/plugin-transform-optional-chaining"; - version = "7.22.15"; + version = "7.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.15.tgz"; - sha512 = "ngQ2tBhq5vvSJw2Q2Z9i7ealNkpDMU0rGWnHPKqRZO0tzZ5tlaoz4hDvhXioOoaE0X2vfNss1djwg0DXlfu30A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.0.tgz"; + sha512 = "sBBGXbLJjxTzLBF5rFWaikMnOGOk/BmK6vVByIdEggZ7Vn6CvWXZyRkkLFK6WE0IF8jSliyOkUN6SScFgzCM0g=="; }; }; "@babel/plugin-transform-parameters-7.22.15" = { @@ -2776,13 +2794,13 @@ let sha512 = "X0pi0V6gxLi6lFZpGmeNa4zxtwEmCs42isWLNjZZDE0Y8yVfgu0T2OAHlzBbdYlqbW/YXVvoBHpATEM+goCj8g=="; }; }; - "@babel/preset-env-7.22.15" = { + "@babel/preset-env-7.22.20" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.22.15"; + version = "7.22.20"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.15.tgz"; - sha512 = "tZFHr54GBkHk6hQuVA8w4Fmq+MSPsfvMG0vPnOYyTnJpyfMqybL8/MbNCPRT9zc2KBO2pe4tq15g6Uno4Jpoag=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.20.tgz"; + sha512 = "11MY04gGC4kSzlPHRfvVkNAZhUxOvm7DCJ37hPDnUENwe06npjIRAfInEMTGSb4LZK5ZgDFkv5hw0lGebHeTyg=="; }; }; "@babel/preset-flow-7.22.15" = { @@ -2803,13 +2821,13 @@ let sha512 = "HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA=="; }; }; - "@babel/preset-typescript-7.22.15" = { + "@babel/preset-typescript-7.23.0" = { name = "_at_babel_slash_preset-typescript"; packageName = "@babel/preset-typescript"; - version = "7.22.15"; + version = "7.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.22.15.tgz"; - sha512 = "HblhNmh6yM+cU4VwbBRpxFhxsTdfS1zsvH9W+gEjD0ARV9+8B4sNfpI6GuhePti84nuvhiwKS539jKPFHskA9A=="; + url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.23.0.tgz"; + sha512 = "6P6VVa/NM/VlAYj5s2Aq/gdVg8FSENCg3wlZ6Qau9AcPaoF5LbN1nyGlR9DTRIw9PpxI94e+ReydsJHcjwAweg=="; }; }; "@babel/register-7.22.15" = { @@ -2830,22 +2848,13 @@ let sha512 = "x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA=="; }; }; - "@babel/runtime-7.12.1" = { - name = "_at_babel_slash_runtime"; - packageName = "@babel/runtime"; - version = "7.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.1.tgz"; - sha512 = "J5AIf3vPj3UwXaAzb5j1xM4WAQDX3EMgemF8rjCP3SoW09LfRKAXQKt6CoVYl230P6iWdRcBbnLDDdnqWxZSCA=="; - }; - }; - "@babel/runtime-7.22.15" = { + "@babel/runtime-7.23.1" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.22.15"; + version = "7.23.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.15.tgz"; - sha512 = "T0O+aa+4w0u06iNmapipJXMV4HoUir03hpx3/YqXXhu9xim3w+dVphjFWl1OH8NbZHw5Lbm9k45drDkgq2VNNA=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.1.tgz"; + sha512 = "hC2v6p8ZSI/W0HUzh3V8C5g+NwSKzKPtJwSpTjwl0o297GP9+ZLQSkdvHz46CM3LqyoXxq+5G9komY+eSqSO0g=="; }; }; "@babel/runtime-7.9.0" = { @@ -2866,13 +2875,13 @@ let sha512 = "QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w=="; }; }; - "@babel/traverse-7.22.19" = { + "@babel/traverse-7.17.3" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.22.19"; + version = "7.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.19.tgz"; - sha512 = "ZCcpVPK64krfdScRbpxF6xA5fz7IOsfMwx1tcACvCzt6JY+0aHkBk7eIU8FRDSZRU5Zei6Z4JfgAxN1bqXGECg=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.3.tgz"; + sha512 = "5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw=="; }; }; "@babel/traverse-7.22.5" = { @@ -2884,6 +2893,24 @@ let sha512 = "7DuIjPgERaNo6r+PZwItpjCZEa5vyw4eJGufeLxrPdBXBoLcCJCIasvK6pK/9DVNrLZTLFhUGqaC6X/PA007TQ=="; }; }; + "@babel/traverse-7.23.0" = { + name = "_at_babel_slash_traverse"; + packageName = "@babel/traverse"; + version = "7.23.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.0.tgz"; + sha512 = "t/QaEvyIoIkwzpiZ7aoSKK8kObQYeF7T2v+dazAYCb8SXtp58zEVkWW7zAnju8FNKNdr4ScAOEDmMItbyOmEYw=="; + }; + }; + "@babel/types-7.17.0" = { + name = "_at_babel_slash_types"; + packageName = "@babel/types"; + version = "7.17.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/types/-/types-7.17.0.tgz"; + sha512 = "TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw=="; + }; + }; "@babel/types-7.19.0" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; @@ -2893,13 +2920,13 @@ let sha512 = "YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA=="; }; }; - "@babel/types-7.22.19" = { + "@babel/types-7.23.0" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.22.19"; + version = "7.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.22.19.tgz"; - sha512 = "P7LAw/LbojPzkgp5oznjE6tQEIWbp4PkkfrZDINTro9zgBRtI324/EYsiSI7lhPbpIQ+DCeR2NNmMWANGGfZsg=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz"; + sha512 = "0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg=="; }; }; "@bconnorwhite/module-2.0.2" = { @@ -3118,49 +3145,49 @@ let sha512 = "MVbXLbTcAotOPUj0pAMhVtJ+3/kFkwJqc5qNOleOZTv6QkZZABDMS21dSrSlVswEHwrpWC03e4fWytjqKvuE2A=="; }; }; - "@cloudflare/workerd-darwin-64-1.20230904.0" = { + "@cloudflare/workerd-darwin-64-1.20230922.0" = { name = "_at_cloudflare_slash_workerd-darwin-64"; packageName = "@cloudflare/workerd-darwin-64"; - version = "1.20230904.0"; + version = "1.20230922.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cloudflare/workerd-darwin-64/-/workerd-darwin-64-1.20230904.0.tgz"; - sha512 = "/GDlmxAFbDtrQwP4zOXFbqOfaPvkDxdsCoEa+KEBcAl5uR98+7WW5/b8naBHX+t26uS7p4bLlImM8J5F1ienRQ=="; + url = "https://registry.npmjs.org/@cloudflare/workerd-darwin-64/-/workerd-darwin-64-1.20230922.0.tgz"; + sha512 = "g1hkVhLna0ICfg1l4iYOTAlfvqzZ4RD/wu5yYFaEOVwA9HlKcB9axmQxCSmeHTHfC763RqXdfBFVgBabp0SK+A=="; }; }; - "@cloudflare/workerd-darwin-arm64-1.20230904.0" = { + "@cloudflare/workerd-darwin-arm64-1.20230922.0" = { name = "_at_cloudflare_slash_workerd-darwin-arm64"; packageName = "@cloudflare/workerd-darwin-arm64"; - version = "1.20230904.0"; + version = "1.20230922.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cloudflare/workerd-darwin-arm64/-/workerd-darwin-arm64-1.20230904.0.tgz"; - sha512 = "x8WXNc2xnDqr5y1iirnNdyx8GZY3rL5xiF7ebK3mKQeB+jFjkhO71yuPTkDCzUWtOvw1Wfd4jbwy4wxacMX4mQ=="; + url = "https://registry.npmjs.org/@cloudflare/workerd-darwin-arm64/-/workerd-darwin-arm64-1.20230922.0.tgz"; + sha512 = "FMPN7VO6tG3DWUw4XLTB3bL/UKIo0P2aghXC6BG6QxdzLqPMxXWRRfLahdFYc3uPz0ehqrZaQR5Wybck7b9Bdg=="; }; }; - "@cloudflare/workerd-linux-64-1.20230904.0" = { + "@cloudflare/workerd-linux-64-1.20230922.0" = { name = "_at_cloudflare_slash_workerd-linux-64"; packageName = "@cloudflare/workerd-linux-64"; - version = "1.20230904.0"; + version = "1.20230922.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cloudflare/workerd-linux-64/-/workerd-linux-64-1.20230904.0.tgz"; - sha512 = "V58xyMS3oDpKO8Dpdh0r0BXm99OzoGgvWe9ufttVraj/1NTMGELwb6i9ySb8k3F1J9m/sO26+TV7pQc/bGC1VQ=="; + url = "https://registry.npmjs.org/@cloudflare/workerd-linux-64/-/workerd-linux-64-1.20230922.0.tgz"; + sha512 = "EDRdGVgOdd14jt2LJHne3CueUvjnH6lnpAtETj0Ce0SkbdW27GY/YARtcGcPBGO1AKrEnXvMdnvV6EVYp1Yl/w=="; }; }; - "@cloudflare/workerd-linux-arm64-1.20230904.0" = { + "@cloudflare/workerd-linux-arm64-1.20230922.0" = { name = "_at_cloudflare_slash_workerd-linux-arm64"; packageName = "@cloudflare/workerd-linux-arm64"; - version = "1.20230904.0"; + version = "1.20230922.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cloudflare/workerd-linux-arm64/-/workerd-linux-arm64-1.20230904.0.tgz"; - sha512 = "VrDaW+pjb5IAKEnNWtEaFiG377kXKmk5Fu0Era4W+jKzPON2BW/qRb/4LNHXQ4yxg/2HLm7RiUTn7JZtt1qO6A=="; + url = "https://registry.npmjs.org/@cloudflare/workerd-linux-arm64/-/workerd-linux-arm64-1.20230922.0.tgz"; + sha512 = "QDf3JqRDwnxdCFni/bLWElJowf5xNmk1h2n4nBB30k1lvcfFiQ0HXgbBMhs2W/x/VUUT2j+hAoIGmvkSNlIj4w=="; }; }; - "@cloudflare/workerd-windows-64-1.20230904.0" = { + "@cloudflare/workerd-windows-64-1.20230922.0" = { name = "_at_cloudflare_slash_workerd-windows-64"; packageName = "@cloudflare/workerd-windows-64"; - version = "1.20230904.0"; + version = "1.20230922.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cloudflare/workerd-windows-64/-/workerd-windows-64-1.20230904.0.tgz"; - sha512 = "/R/dE8uy+8J2YeXfDhI8/Bg7YUirdbbjH5/l/Vv00ZRE0lC3nPLcYeyBXSwXIQ6/Xht3gN+lksLQgKd0ZWRd+Q=="; + url = "https://registry.npmjs.org/@cloudflare/workerd-windows-64/-/workerd-windows-64-1.20230922.0.tgz"; + sha512 = "Tzoq64YMcHjXRheGyWKHNAfklHS9Us2M1lNZ/6y6ziNB0tF06RNRuD5yRhH1LulSOMxVH/KQAqZ0pNEpt3XyPQ=="; }; }; "@colors/colors-1.5.0" = { @@ -3226,13 +3253,13 @@ let sha512 = "TCQihm7/uszA5z1Ux1vw+Nf3yHTgicus/+9HiUQk+kRSQawByxZNESeQoX9ujfVd3r4Sa+3fn0JQAguG4xvvbA=="; }; }; - "@commitlint/load-17.7.1" = { + "@commitlint/load-17.7.2" = { name = "_at_commitlint_slash_load"; packageName = "@commitlint/load"; - version = "17.7.1"; + version = "17.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/load/-/load-17.7.1.tgz"; - sha512 = "S/QSOjE1ztdogYj61p6n3UbkUvweR17FQ0zDbNtoTLc+Hz7vvfS7ehoTMQ27hPSjVBpp7SzEcOQu081RLjKHJQ=="; + url = "https://registry.npmjs.org/@commitlint/load/-/load-17.7.2.tgz"; + sha512 = "XA7WTnsjHZ4YH6ZYsrnxgLdXzriwMMq+utZUET6spbOEEIPBCDLdOQXS26P+v3TTO4hUHOEhzUquaBv3jbBixw=="; }; }; "@commitlint/message-17.4.2" = { @@ -3316,58 +3343,58 @@ let sha512 = "gB5C5nDIacLUdsMuW8YsM9SzK3vaFANe4J11CVXpovpy7bZUGrcJKmc6m/0gWG789pKr6XSZY2aEetjFvSRw5g=="; }; }; - "@cspell/cspell-bundled-dicts-7.3.6" = { + "@cspell/cspell-bundled-dicts-7.3.7" = { name = "_at_cspell_slash_cspell-bundled-dicts"; packageName = "@cspell/cspell-bundled-dicts"; - version = "7.3.6"; + version = "7.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-7.3.6.tgz"; - sha512 = "9T0fFdHbKJXAQgQjLJ9SjtlHvKceKE2Vpa2sdnIXz3K1/coLLF04wHM/wzEPe2VXjYZjbjBatBRfTGjzRGJlbw=="; + url = "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-7.3.7.tgz"; + sha512 = "Mw7J0RAWGpEup/+eIePw3wi+OlMGNicrD1r9OhdgIgO6sHEi01ibS/RzNNbC7UziLaYEHi8+WfLyGzmp1ZISrQ=="; }; }; - "@cspell/cspell-json-reporter-7.3.6" = { + "@cspell/cspell-json-reporter-7.3.7" = { name = "_at_cspell_slash_cspell-json-reporter"; packageName = "@cspell/cspell-json-reporter"; - version = "7.3.6"; + version = "7.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-json-reporter/-/cspell-json-reporter-7.3.6.tgz"; - sha512 = "Op0pSKiImhqXHtQGMVCfx+Fc5tFCGeZwww+fFVQnnPwbU/JkhqbW8ZcYgyPF2KK18lzB8bDOHaltKcePkz13OA=="; + url = "https://registry.npmjs.org/@cspell/cspell-json-reporter/-/cspell-json-reporter-7.3.7.tgz"; + sha512 = "bogUQKKZWLttZtxFKjpzHuliIha/ByV2km18gm8dA2uB3IrzD1UJy4sCE8lnaodm6n3VtjnViSkQ5XIVU3gAKQ=="; }; }; - "@cspell/cspell-pipe-7.3.6" = { + "@cspell/cspell-pipe-7.3.7" = { name = "_at_cspell_slash_cspell-pipe"; packageName = "@cspell/cspell-pipe"; - version = "7.3.6"; + version = "7.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-pipe/-/cspell-pipe-7.3.6.tgz"; - sha512 = "tvNgi31f/p8M108YlDhkC8nqLJBpD1mvVqYNxL+kB/aQtkaw0AHKDsuRhg0rU6xL5MAEnoi3fXgT1HoADhJpbA=="; + url = "https://registry.npmjs.org/@cspell/cspell-pipe/-/cspell-pipe-7.3.7.tgz"; + sha512 = "ZO8v3EwGhjUvhPo1S48+CKv7EPXMoYF7LGERB34K8EXFByb9+J74ojMYj9UgLRV68lFTrDFde3bHoZPPVS1FsA=="; }; }; - "@cspell/cspell-resolver-7.3.6" = { + "@cspell/cspell-resolver-7.3.7" = { name = "_at_cspell_slash_cspell-resolver"; packageName = "@cspell/cspell-resolver"; - version = "7.3.6"; + version = "7.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-resolver/-/cspell-resolver-7.3.6.tgz"; - sha512 = "rFmeqhRFfmlq4oh9tYQIIVZ9aWlP88cU48oCBjvwxjj+GambrD/qobWiW9VYl/CQBPVq4S39cTirf5RXbBHMJA=="; + url = "https://registry.npmjs.org/@cspell/cspell-resolver/-/cspell-resolver-7.3.7.tgz"; + sha512 = "WWZcTI5f2cCjr1yRDTMkcVg7Meil3s+0aaKcLCDTGQf9J2UWWjpqDJ6M6keYei3paAjxW2Pk03IRNNwdA3+igQ=="; }; }; - "@cspell/cspell-service-bus-7.3.6" = { + "@cspell/cspell-service-bus-7.3.7" = { name = "_at_cspell_slash_cspell-service-bus"; packageName = "@cspell/cspell-service-bus"; - version = "7.3.6"; + version = "7.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-service-bus/-/cspell-service-bus-7.3.6.tgz"; - sha512 = "jRXII9ceuostAqr/eft9RJR44TMzivuUkufhNZG4657alfhjHQBv/gME4QeFt/jOQqsDi/ifDhw5+r8ew/LsJA=="; + url = "https://registry.npmjs.org/@cspell/cspell-service-bus/-/cspell-service-bus-7.3.7.tgz"; + sha512 = "pnDOFpjht7dZYydMygcf0brCSk5BGRvbeWRH6MaMhd+3CdyzyEvtZG3IbBQVNyVvDTA2c/K3rljOAo8y3/lpnw=="; }; }; - "@cspell/cspell-types-7.3.6" = { + "@cspell/cspell-types-7.3.7" = { name = "_at_cspell_slash_cspell-types"; packageName = "@cspell/cspell-types"; - version = "7.3.6"; + version = "7.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-7.3.6.tgz"; - sha512 = "JnuIMJasZtJpZm0+hzr3emkRJ0PP6QWc9zgd3fx4U8W0lHGZ3Zil5peg67SnjmdTVm4UE63UviAl1y6DyD4kLg=="; + url = "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-7.3.7.tgz"; + sha512 = "zM2BuZJ3UUgPwF78bssggi8X20nmW3a95EmbNJKfbO6Zf2ui7UMzeP3BwpCZk30A/EixGlFhLf6Xd+eBT/DQqw=="; }; }; "@cspell/dict-ada-4.0.2" = { @@ -3406,13 +3433,13 @@ let sha512 = "kJIqQ+FD2TCSgaaP5XLEDgy222+pVWTc+VhveNO++gnTWU3BCVjkD5LjfW7g/CmGONnz+nwXDueWspProaSdJw=="; }; }; - "@cspell/dict-bash-4.1.1" = { + "@cspell/dict-bash-4.1.2" = { name = "_at_cspell_slash_dict-bash"; packageName = "@cspell/dict-bash"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-bash/-/dict-bash-4.1.1.tgz"; - sha512 = "8czAa/Mh96wu2xr0RXQEGMTBUGkTvYn/Pb0o+gqOO1YW+poXGQc3gx0YPqILDryP/KCERrNvkWUJz3iGbvwC2A=="; + url = "https://registry.npmjs.org/@cspell/dict-bash/-/dict-bash-4.1.2.tgz"; + sha512 = "AEBWjbaMaJEyAjOHW0F15P2izBjli2cNerG3NjuVH7xX/HUUeNoTj8FF1nwpMufKwGQCvuyO2hCmkVxhJ0y55Q=="; }; }; "@cspell/dict-companies-1.0.40" = { @@ -3424,13 +3451,13 @@ let sha512 = "Aw07qiTroqSST2P5joSrC4uOA05zTXzI2wMb+me3q4Davv1D9sCkzXY0TGoC2vzhNv5ooemRi9KATGaBSdU1sw=="; }; }; - "@cspell/dict-companies-3.0.22" = { + "@cspell/dict-companies-3.0.25" = { name = "_at_cspell_slash_dict-companies"; packageName = "@cspell/dict-companies"; - version = "3.0.22"; + version = "3.0.25"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-companies/-/dict-companies-3.0.22.tgz"; - sha512 = "hUN4polifWv1IIXb4NDNXctr/smJ7/1IrOy0rU6fOwPCY/u9DkQO+xeASzuFJasvs6v0Pub/y+NUQLaeXNRW6g=="; + url = "https://registry.npmjs.org/@cspell/dict-companies/-/dict-companies-3.0.25.tgz"; + sha512 = "7phQlGJ/4qCx9fQg/kR8YV0n5TPak4+eleQ7M/e7uhsQR8TwOWsPU1dW23WABoTqJbYCgdUYLxqjQ8458w7jZQ=="; }; }; "@cspell/dict-cpp-1.1.40" = { @@ -3496,13 +3523,13 @@ let sha512 = "HU8RbFRoGanFH85mT01Ot/Ay48ixr/gG25VPLtdq56QTrmPsw79gxYm/5Qay16eQbpoPIxaj5CAWNam+DX4GbA=="; }; }; - "@cspell/dict-css-4.0.7" = { + "@cspell/dict-css-4.0.11" = { name = "_at_cspell_slash_dict-css"; packageName = "@cspell/dict-css"; - version = "4.0.7"; + version = "4.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-css/-/dict-css-4.0.7.tgz"; - sha512 = "NNlUTx/sYg+74kC0EtRewb7pjkEtPlIsu9JFNWAXa0JMTqqpQXqM3aEO4QJvUZFZF09bObeCAvzzxemAwxej7Q=="; + url = "https://registry.npmjs.org/@cspell/dict-css/-/dict-css-4.0.11.tgz"; + sha512 = "kHQqg3/3Xra2Xki3K4e6s3BHDw5L82geie4q7jRBxQ9CofIgVEMcOqTr2QWKgIWegmACEe7B/CIMH35d4eiafA=="; }; }; "@cspell/dict-dart-2.0.3" = { @@ -3613,13 +3640,13 @@ let sha512 = "UPwR4rfiJCxnS+Py+EK9E4AUj3aPZE4p/yBRSHN+5aBQConlI0lLDtMceH5wlupA/sQTU1ERZGPJA9L96jVSyQ=="; }; }; - "@cspell/dict-en_us-4.3.7" = { + "@cspell/dict-en_us-4.3.8" = { name = "_at_cspell_slash_dict-en_us"; packageName = "@cspell/dict-en_us"; - version = "4.3.7"; + version = "4.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-en_us/-/dict-en_us-4.3.7.tgz"; - sha512 = "83V0XXqiXJvXa1pj5cVpviYKeLTN2Dxvouz8ullrwgcfPtY57pYBy+3ACVAMYK0eGByhRPc/xVXlIgv4o0BNZw=="; + url = "https://registry.npmjs.org/@cspell/dict-en_us/-/dict-en_us-4.3.8.tgz"; + sha512 = "rCPsbDHuRnFUbzWAY6O1H9+cLZt5FNQwjPVw2TdQZfipdb0lim984aLGY+nupi1iKC3lfjyd5SVUgmSZEG1QNA=="; }; }; "@cspell/dict-filetypes-1.1.8" = { @@ -3712,13 +3739,13 @@ let sha512 = "qq3Cjnx2U1jpeWAGJL1GL0ylEhUMqyaR36Xij6Y6Aq4bViCRp+HRRqk0x5/IHHbOrti45h3yy7ii1itRFo+Xkg=="; }; }; - "@cspell/dict-golang-6.0.2" = { + "@cspell/dict-golang-6.0.3" = { name = "_at_cspell_slash_dict-golang"; packageName = "@cspell/dict-golang"; - version = "6.0.2"; + version = "6.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-golang/-/dict-golang-6.0.2.tgz"; - sha512 = "5pyZn4AAiYukAW+gVMIMVmUSkIERFrDX2vtPDjg8PLQUhAHWiVeQSDjuOhq9/C5GCCEZU/zWSONkGiwLBBvV9A=="; + url = "https://registry.npmjs.org/@cspell/dict-golang/-/dict-golang-6.0.3.tgz"; + sha512 = "KiNnjAeqDBq6zH4s46hzBrKgqIrkSZ9bbHzQ54PbHfe+jurZkSZ4lXz6E+315RNh2TkRLcNppFvaZqJvKZXomA=="; }; }; "@cspell/dict-haskell-1.0.13" = { @@ -3748,13 +3775,13 @@ let sha512 = "vvnYia0tyIS5Fdoz+gEQm77MGZZE66kOJjuNpIYyRHCXFAhWdYz3SmkRm6YKJSWSvuO+WBJYTKDvkOxSh3Fx/w=="; }; }; - "@cspell/dict-html-4.0.3" = { + "@cspell/dict-html-4.0.5" = { name = "_at_cspell_slash_dict-html"; packageName = "@cspell/dict-html"; - version = "4.0.3"; + version = "4.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-html/-/dict-html-4.0.3.tgz"; - sha512 = "Gae8i8rrArT0UyG1I6DHDK62b7Be6QEcBSIeWOm4VIIW1CASkN9B0qFgSVnkmfvnu1Y3H7SSaaEynKjdj3cs8w=="; + url = "https://registry.npmjs.org/@cspell/dict-html/-/dict-html-4.0.5.tgz"; + sha512 = "p0brEnRybzSSWi8sGbuVEf7jSTDmXPx7XhQUb5bgG6b54uj+Z0Qf0V2n8b/LWwIPJNd1GygaO9l8k3HTCy1h4w=="; }; }; "@cspell/dict-html-symbol-entities-1.0.23" = { @@ -3784,13 +3811,13 @@ let sha512 = "LcOg9srYLDoNGd8n3kbfDBlZD+LOC9IVcnFCdua1b/luCHNVmlgBx7e677qPu7olpMYOD5TQIVW2OmM1+/6MFA=="; }; }; - "@cspell/dict-java-5.0.5" = { + "@cspell/dict-java-5.0.6" = { name = "_at_cspell_slash_dict-java"; packageName = "@cspell/dict-java"; - version = "5.0.5"; + version = "5.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-java/-/dict-java-5.0.5.tgz"; - sha512 = "X19AoJgWIBwJBSWGFqSgHaBR/FEykBHTMjL6EqOnhIGEyE9nvuo32tsSHjXNJ230fQxQptEvRZoaldNLtKxsRg=="; + url = "https://registry.npmjs.org/@cspell/dict-java/-/dict-java-5.0.6.tgz"; + sha512 = "kdE4AHHHrixyZ5p6zyms1SLoYpaJarPxrz8Tveo6gddszBVVwIUZ+JkQE1bWNLK740GWzIXdkznpUfw1hP9nXw=="; }; }; "@cspell/dict-k8s-1.0.1" = { @@ -3883,13 +3910,13 @@ let sha512 = "RwkuZGcYBxL3Yux3cSG/IOWGlQ1e9HLCpHeyMtTVGYKAIkFAVUnGrz20l16/Q7zUG7IEktBz5O42kAozrEnqMQ=="; }; }; - "@cspell/dict-npm-5.0.8" = { + "@cspell/dict-npm-5.0.11" = { name = "_at_cspell_slash_dict-npm"; packageName = "@cspell/dict-npm"; - version = "5.0.8"; + version = "5.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-npm/-/dict-npm-5.0.8.tgz"; - sha512 = "KuqH8tEsFD6DPKqKwIfWr9E+admE3yghaC0AKXG8jPaf77N0lkctKaS3dm0oxWUXkYKA/eXj6LCtz3VcTyxFPg=="; + url = "https://registry.npmjs.org/@cspell/dict-npm/-/dict-npm-5.0.11.tgz"; + sha512 = "QlgF92q29mT0LbNqlDHb3UgY5jCLcSn+GnA1pvD5ps/zw2LhVl+ZXMHExwSIi7gwTzP3IyJ1f/dT6rnw9wic4A=="; }; }; "@cspell/dict-php-1.0.25" = { @@ -3901,13 +3928,13 @@ let sha512 = "RoBIP5MRdByyPaXcznZMfOY1JdCMYPPLua5E9gkq0TJO7bX5mC9hyAKfYBSWVQunZydd82HZixjb5MPkDFU1uw=="; }; }; - "@cspell/dict-php-4.0.2" = { + "@cspell/dict-php-4.0.3" = { name = "_at_cspell_slash_dict-php"; packageName = "@cspell/dict-php"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-php/-/dict-php-4.0.2.tgz"; - sha512 = "7yglcmMoFHDPQXHW+9QAl8YjAToMm1qOi+4x/yGY1FSIEjZbCpjeDgyKMGg/NgpooQQceEN38AR59Pn23EDriA=="; + url = "https://registry.npmjs.org/@cspell/dict-php/-/dict-php-4.0.3.tgz"; + sha512 = "PxtSmWJCDEB4M8R9ER9ijxBum/tvUqYT26QeuV58q2IFs5IrPZ6hocQKvnFGXItjCWH4oYXyAEAAzINlBC4Opg=="; }; }; "@cspell/dict-powershell-1.0.19" = { @@ -3928,13 +3955,13 @@ let sha512 = "IHfWLme3FXE7vnOmMncSBxOsMTdNWd1Vcyhag03WS8oANSgX8IZ+4lMI00mF0ptlgchf16/OU8WsV4pZfikEFw=="; }; }; - "@cspell/dict-public-licenses-2.0.3" = { + "@cspell/dict-public-licenses-2.0.4" = { name = "_at_cspell_slash_dict-public-licenses"; packageName = "@cspell/dict-public-licenses"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-public-licenses/-/dict-public-licenses-2.0.3.tgz"; - sha512 = "JSLEdpEYufQ1H+93UHi+axlqQm1fhgK6kpdLHp6uPHu//CsvETcqNVawjB+qOdI/g38JTMw5fBqSd0aGNxa6Dw=="; + url = "https://registry.npmjs.org/@cspell/dict-public-licenses/-/dict-public-licenses-2.0.4.tgz"; + sha512 = "KjsfuGwMWvPkp6s0nR+s4mZc9SQhh1tHDOyQZfEVRwi+2ev7f8l7R6ts9sP2Mplb8UcxwO6YmKwxHjN+XHoMoA=="; }; }; "@cspell/dict-python-1.0.38" = { @@ -3946,13 +3973,13 @@ let sha512 = "KuyOQaby9NID/pn7EkXilpUxjVIvvyLzhr7BPsDS6FcvUE8Yhss6bJowEDHSv6pa+W2387phoqbDf2rTicquAA=="; }; }; - "@cspell/dict-python-4.1.8" = { + "@cspell/dict-python-4.1.9" = { name = "_at_cspell_slash_dict-python"; packageName = "@cspell/dict-python"; - version = "4.1.8"; + version = "4.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-python/-/dict-python-4.1.8.tgz"; - sha512 = "yFrO9gGI3KIbw0Y1odAEtagrzmthjJVank9B7qlsSQvN78RgD1JQQycTadNWpzdjCj+JuiiH8pJBFWflweZoxw=="; + url = "https://registry.npmjs.org/@cspell/dict-python/-/dict-python-4.1.9.tgz"; + sha512 = "JMA4v/ZPJWuDt3PPFz+23VIY3iDIB+xOTQ6nw+WkcJU5yr6FUl5zMU9ModKrgujg3jGRuuJqofErZVPqHNHYAA=="; }; }; "@cspell/dict-r-2.0.1" = { @@ -4027,13 +4054,13 @@ let sha512 = "pfF3Ys2gRffu5ElqkH7FQMDMi/iZMyOzpGMb3FSH0PJ2AnRQ5rRNWght1h2L36YxvXl0mWVaFrrfwiOyRIc8ZQ=="; }; }; - "@cspell/dict-software-terms-3.2.3" = { + "@cspell/dict-software-terms-3.3.3" = { name = "_at_cspell_slash_dict-software-terms"; packageName = "@cspell/dict-software-terms"; - version = "3.2.3"; + version = "3.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-3.2.3.tgz"; - sha512 = "L1Fjkt+Q5MnjEOGPXQxdT4+8ieDBcaHSjh1gHzxdqFXTOnnfvsLUa5ykuv/fG06b/G/yget1066ftKosMaPcXA=="; + url = "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-3.3.3.tgz"; + sha512 = "JKxBPyubapWkeekGquJYo5MLZe1TXAWAC8bqxuarG0cYkWoa7wIqCNH6/9OywRFSBzIYCgoVu2xDP1yRqTEokg=="; }; }; "@cspell/dict-sql-2.1.1" = { @@ -4072,13 +4099,13 @@ let sha512 = "yIuGeeZtQA2gqpGefGjZqBl8iGJpIYWz0QzDqsscNi2qfSnLsbjM0RkRbTehM8y9gGGe7xfgUP5adxceJa5Krg=="; }; }; - "@cspell/dict-typescript-3.1.1" = { + "@cspell/dict-typescript-3.1.2" = { name = "_at_cspell_slash_dict-typescript"; packageName = "@cspell/dict-typescript"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-typescript/-/dict-typescript-3.1.1.tgz"; - sha512 = "N9vNJZoOXmmrFPR4ir3rGvnqqwmQGgOYoL1+y6D4oIhyr7FhaYiyF/d7QT61RmjZQcATMa6PSL+ZisCeRLx9+A=="; + url = "https://registry.npmjs.org/@cspell/dict-typescript/-/dict-typescript-3.1.2.tgz"; + sha512 = "lcNOYWjLUvDZdLa0UMNd/LwfVdxhE9rKA+agZBGjL3lTA3uNvH7IUqSJM/IXhJoBpLLMVEOk8v1N9xi+vDuCdA=="; }; }; "@cspell/dict-vue-3.0.0" = { @@ -4090,22 +4117,22 @@ let sha512 = "niiEMPWPV9IeRBRzZ0TBZmNnkK3olkOPYxC1Ny2AX4TGlYRajcW0WUtoSHmvvjZNfWLSg2L6ruiBeuPSbjnG6A=="; }; }; - "@cspell/dynamic-import-7.3.6" = { + "@cspell/dynamic-import-7.3.7" = { name = "_at_cspell_slash_dynamic-import"; packageName = "@cspell/dynamic-import"; - version = "7.3.6"; + version = "7.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dynamic-import/-/dynamic-import-7.3.6.tgz"; - sha512 = "NLWawhLkfTSkf36UwYJrRyMh3snXOHhuRFO7eVanPqE7oeU+1+OF/C467sYdiJGZnrCL3ojIr399JTVMz148Iw=="; + url = "https://registry.npmjs.org/@cspell/dynamic-import/-/dynamic-import-7.3.7.tgz"; + sha512 = "ac52OLDMYBHkRQ8XzihOWnyfqri3M84ELTZdqBhR5YGcHW/mxKhsmXqudA980SdRRKaicD39yhX4idAFb4AsDg=="; }; }; - "@cspell/strong-weak-map-7.3.6" = { + "@cspell/strong-weak-map-7.3.7" = { name = "_at_cspell_slash_strong-weak-map"; packageName = "@cspell/strong-weak-map"; - version = "7.3.6"; + version = "7.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/strong-weak-map/-/strong-weak-map-7.3.6.tgz"; - sha512 = "PoVFTvY8CGhc+7W3uvyPUWIBakc+ga9X5QpSkFI/HQghmaGDDaaQBfbuv/LsS7T9bkEoWz4jLtJoNBas870gZA=="; + url = "https://registry.npmjs.org/@cspell/strong-weak-map/-/strong-weak-map-7.3.7.tgz"; + sha512 = "n+jRgwH0wU+HsfqgCGVzPmWnZl4SyhtvPxusKwXj6L/STGdt8IP2rYl1PFOtyvgjPjh8xXe/jRrq7zH07btiKA=="; }; }; "@cspotcode/source-map-support-0.8.1" = { @@ -4342,13 +4369,13 @@ let sha512 = "MPAZQ4v6piCED7NT1LTVQf61o6Eg/laNoKbhbrFBSH1i20OUwbtV2MLj6Op292ynI9+1qdHKmFgctr6qPTCAQw=="; }; }; - "@electron/asar-3.2.4" = { + "@electron/asar-3.2.7" = { name = "_at_electron_slash_asar"; packageName = "@electron/asar"; - version = "3.2.4"; + version = "3.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/@electron/asar/-/asar-3.2.4.tgz"; - sha512 = "lykfY3TJRRWFeTxccEKdf1I6BLl2Plw81H0bbp4Fc5iEc67foDCa5pjJQULVgo0wF+Dli75f3xVcdb/67FFZ/g=="; + url = "https://registry.npmjs.org/@electron/asar/-/asar-3.2.7.tgz"; + sha512 = "8FaSCAIiZGYFWyjeevPQt+0e9xCK9YmJ2Rjg5SXgdsXon6cRnU0Yxnbe6CvJbQn26baifur2Y2G5EBayRIsjyg=="; }; }; "@electron/get-2.0.3" = { @@ -4468,6 +4495,15 @@ let sha512 = "rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A=="; }; }; + "@esbuild/android-arm-0.18.20" = { + name = "_at_esbuild_slash_android-arm"; + packageName = "@esbuild/android-arm"; + version = "0.18.20"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz"; + sha512 = "fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw=="; + }; + }; "@esbuild/android-arm64-0.17.19" = { name = "_at_esbuild_slash_android-arm64"; packageName = "@esbuild/android-arm64"; @@ -4477,6 +4513,15 @@ let sha512 = "KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA=="; }; }; + "@esbuild/android-arm64-0.18.20" = { + name = "_at_esbuild_slash_android-arm64"; + packageName = "@esbuild/android-arm64"; + version = "0.18.20"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz"; + sha512 = "Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ=="; + }; + }; "@esbuild/android-x64-0.17.19" = { name = "_at_esbuild_slash_android-x64"; packageName = "@esbuild/android-x64"; @@ -4486,6 +4531,15 @@ let sha512 = "uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww=="; }; }; + "@esbuild/android-x64-0.18.20" = { + name = "_at_esbuild_slash_android-x64"; + packageName = "@esbuild/android-x64"; + version = "0.18.20"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz"; + sha512 = "8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg=="; + }; + }; "@esbuild/darwin-arm64-0.17.19" = { name = "_at_esbuild_slash_darwin-arm64"; packageName = "@esbuild/darwin-arm64"; @@ -4495,6 +4549,15 @@ let sha512 = "80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg=="; }; }; + "@esbuild/darwin-arm64-0.18.20" = { + name = "_at_esbuild_slash_darwin-arm64"; + packageName = "@esbuild/darwin-arm64"; + version = "0.18.20"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz"; + sha512 = "bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA=="; + }; + }; "@esbuild/darwin-x64-0.17.19" = { name = "_at_esbuild_slash_darwin-x64"; packageName = "@esbuild/darwin-x64"; @@ -4504,6 +4567,15 @@ let sha512 = "IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw=="; }; }; + "@esbuild/darwin-x64-0.18.20" = { + name = "_at_esbuild_slash_darwin-x64"; + packageName = "@esbuild/darwin-x64"; + version = "0.18.20"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz"; + sha512 = "pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ=="; + }; + }; "@esbuild/freebsd-arm64-0.17.19" = { name = "_at_esbuild_slash_freebsd-arm64"; packageName = "@esbuild/freebsd-arm64"; @@ -4513,6 +4585,15 @@ let sha512 = "pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ=="; }; }; + "@esbuild/freebsd-arm64-0.18.20" = { + name = "_at_esbuild_slash_freebsd-arm64"; + packageName = "@esbuild/freebsd-arm64"; + version = "0.18.20"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz"; + sha512 = "yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw=="; + }; + }; "@esbuild/freebsd-x64-0.17.19" = { name = "_at_esbuild_slash_freebsd-x64"; packageName = "@esbuild/freebsd-x64"; @@ -4522,6 +4603,15 @@ let sha512 = "4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ=="; }; }; + "@esbuild/freebsd-x64-0.18.20" = { + name = "_at_esbuild_slash_freebsd-x64"; + packageName = "@esbuild/freebsd-x64"; + version = "0.18.20"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz"; + sha512 = "tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ=="; + }; + }; "@esbuild/linux-arm-0.17.19" = { name = "_at_esbuild_slash_linux-arm"; packageName = "@esbuild/linux-arm"; @@ -4531,6 +4621,15 @@ let sha512 = "cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA=="; }; }; + "@esbuild/linux-arm-0.18.20" = { + name = "_at_esbuild_slash_linux-arm"; + packageName = "@esbuild/linux-arm"; + version = "0.18.20"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz"; + sha512 = "/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg=="; + }; + }; "@esbuild/linux-arm64-0.17.19" = { name = "_at_esbuild_slash_linux-arm64"; packageName = "@esbuild/linux-arm64"; @@ -4540,6 +4639,15 @@ let sha512 = "ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg=="; }; }; + "@esbuild/linux-arm64-0.18.20" = { + name = "_at_esbuild_slash_linux-arm64"; + packageName = "@esbuild/linux-arm64"; + version = "0.18.20"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz"; + sha512 = "2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA=="; + }; + }; "@esbuild/linux-ia32-0.17.19" = { name = "_at_esbuild_slash_linux-ia32"; packageName = "@esbuild/linux-ia32"; @@ -4549,6 +4657,15 @@ let sha512 = "w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ=="; }; }; + "@esbuild/linux-ia32-0.18.20" = { + name = "_at_esbuild_slash_linux-ia32"; + packageName = "@esbuild/linux-ia32"; + version = "0.18.20"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz"; + sha512 = "P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA=="; + }; + }; "@esbuild/linux-loong64-0.15.18" = { name = "_at_esbuild_slash_linux-loong64"; packageName = "@esbuild/linux-loong64"; @@ -4567,6 +4684,15 @@ let sha512 = "2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ=="; }; }; + "@esbuild/linux-loong64-0.18.20" = { + name = "_at_esbuild_slash_linux-loong64"; + packageName = "@esbuild/linux-loong64"; + version = "0.18.20"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz"; + sha512 = "nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg=="; + }; + }; "@esbuild/linux-mips64el-0.17.19" = { name = "_at_esbuild_slash_linux-mips64el"; packageName = "@esbuild/linux-mips64el"; @@ -4576,6 +4702,15 @@ let sha512 = "LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A=="; }; }; + "@esbuild/linux-mips64el-0.18.20" = { + name = "_at_esbuild_slash_linux-mips64el"; + packageName = "@esbuild/linux-mips64el"; + version = "0.18.20"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz"; + sha512 = "d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ=="; + }; + }; "@esbuild/linux-ppc64-0.17.19" = { name = "_at_esbuild_slash_linux-ppc64"; packageName = "@esbuild/linux-ppc64"; @@ -4585,6 +4720,15 @@ let sha512 = "/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg=="; }; }; + "@esbuild/linux-ppc64-0.18.20" = { + name = "_at_esbuild_slash_linux-ppc64"; + packageName = "@esbuild/linux-ppc64"; + version = "0.18.20"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz"; + sha512 = "WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA=="; + }; + }; "@esbuild/linux-riscv64-0.17.19" = { name = "_at_esbuild_slash_linux-riscv64"; packageName = "@esbuild/linux-riscv64"; @@ -4594,6 +4738,15 @@ let sha512 = "FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA=="; }; }; + "@esbuild/linux-riscv64-0.18.20" = { + name = "_at_esbuild_slash_linux-riscv64"; + packageName = "@esbuild/linux-riscv64"; + version = "0.18.20"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz"; + sha512 = "WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A=="; + }; + }; "@esbuild/linux-s390x-0.17.19" = { name = "_at_esbuild_slash_linux-s390x"; packageName = "@esbuild/linux-s390x"; @@ -4603,6 +4756,15 @@ let sha512 = "IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q=="; }; }; + "@esbuild/linux-s390x-0.18.20" = { + name = "_at_esbuild_slash_linux-s390x"; + packageName = "@esbuild/linux-s390x"; + version = "0.18.20"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz"; + sha512 = "+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ=="; + }; + }; "@esbuild/linux-x64-0.17.19" = { name = "_at_esbuild_slash_linux-x64"; packageName = "@esbuild/linux-x64"; @@ -4612,6 +4774,15 @@ let sha512 = "68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw=="; }; }; + "@esbuild/linux-x64-0.18.20" = { + name = "_at_esbuild_slash_linux-x64"; + packageName = "@esbuild/linux-x64"; + version = "0.18.20"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz"; + sha512 = "UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w=="; + }; + }; "@esbuild/netbsd-x64-0.17.19" = { name = "_at_esbuild_slash_netbsd-x64"; packageName = "@esbuild/netbsd-x64"; @@ -4621,6 +4792,15 @@ let sha512 = "CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q=="; }; }; + "@esbuild/netbsd-x64-0.18.20" = { + name = "_at_esbuild_slash_netbsd-x64"; + packageName = "@esbuild/netbsd-x64"; + version = "0.18.20"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz"; + sha512 = "iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A=="; + }; + }; "@esbuild/openbsd-x64-0.17.19" = { name = "_at_esbuild_slash_openbsd-x64"; packageName = "@esbuild/openbsd-x64"; @@ -4630,6 +4810,15 @@ let sha512 = "cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g=="; }; }; + "@esbuild/openbsd-x64-0.18.20" = { + name = "_at_esbuild_slash_openbsd-x64"; + packageName = "@esbuild/openbsd-x64"; + version = "0.18.20"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz"; + sha512 = "e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg=="; + }; + }; "@esbuild/sunos-x64-0.17.19" = { name = "_at_esbuild_slash_sunos-x64"; packageName = "@esbuild/sunos-x64"; @@ -4639,6 +4828,15 @@ let sha512 = "vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg=="; }; }; + "@esbuild/sunos-x64-0.18.20" = { + name = "_at_esbuild_slash_sunos-x64"; + packageName = "@esbuild/sunos-x64"; + version = "0.18.20"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz"; + sha512 = "kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ=="; + }; + }; "@esbuild/win32-arm64-0.17.19" = { name = "_at_esbuild_slash_win32-arm64"; packageName = "@esbuild/win32-arm64"; @@ -4648,6 +4846,15 @@ let sha512 = "yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag=="; }; }; + "@esbuild/win32-arm64-0.18.20" = { + name = "_at_esbuild_slash_win32-arm64"; + packageName = "@esbuild/win32-arm64"; + version = "0.18.20"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz"; + sha512 = "ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg=="; + }; + }; "@esbuild/win32-ia32-0.17.19" = { name = "_at_esbuild_slash_win32-ia32"; packageName = "@esbuild/win32-ia32"; @@ -4657,6 +4864,15 @@ let sha512 = "eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw=="; }; }; + "@esbuild/win32-ia32-0.18.20" = { + name = "_at_esbuild_slash_win32-ia32"; + packageName = "@esbuild/win32-ia32"; + version = "0.18.20"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz"; + sha512 = "Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g=="; + }; + }; "@esbuild/win32-x64-0.17.19" = { name = "_at_esbuild_slash_win32-x64"; packageName = "@esbuild/win32-x64"; @@ -4666,6 +4882,15 @@ let sha512 = "lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA=="; }; }; + "@esbuild/win32-x64-0.18.20" = { + name = "_at_esbuild_slash_win32-x64"; + packageName = "@esbuild/win32-x64"; + version = "0.18.20"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz"; + sha512 = "kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ=="; + }; + }; "@eslint-community/eslint-utils-4.4.0" = { name = "_at_eslint-community_slash_eslint-utils"; packageName = "@eslint-community/eslint-utils"; @@ -4675,13 +4900,13 @@ let sha512 = "1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA=="; }; }; - "@eslint-community/regexpp-4.8.1" = { + "@eslint-community/regexpp-4.9.1" = { name = "_at_eslint-community_slash_regexpp"; packageName = "@eslint-community/regexpp"; - version = "4.8.1"; + version = "4.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.8.1.tgz"; - sha512 = "PWiOzLIUAjN/w5K17PoF4n6sKBw0gqLHPhywmYHP4t1VFQQVYeb1yWsJwnMVEMl3tUHME7X/SJPZLmtG7XBDxQ=="; + url = "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.9.1.tgz"; + sha512 = "Y27x+MBLjXa+0JWDhykM3+JE+il3kHKAEqabfEWq3SDhZjLYb6/BHL/JKFnH3fe207JaXkyDo685Oc2Glt6ifA=="; }; }; "@eslint/eslintrc-0.4.3" = { @@ -4702,130 +4927,22 @@ let sha512 = "+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g=="; }; }; - "@eslint/js-8.49.0" = { + "@eslint/js-8.44.0" = { name = "_at_eslint_slash_js"; packageName = "@eslint/js"; - version = "8.49.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@eslint/js/-/js-8.49.0.tgz"; - sha512 = "1S8uAY/MTJqVx0SC4epBq+N2yhuwtNwLbJYNZyhL2pO1ZVKn5HFXav5T41Ryzy9K9V7ZId2JB2oy/W4aCd9/2w=="; - }; - }; - "@esm2cjs/cacheable-lookup-7.0.0" = { - name = "_at_esm2cjs_slash_cacheable-lookup"; - packageName = "@esm2cjs/cacheable-lookup"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@esm2cjs/cacheable-lookup/-/cacheable-lookup-7.0.0.tgz"; - sha512 = "5HzrA5N0lSMtx2RdXfD9Z4HUFaRGwVOFs7jsFG8jDivoZjYYwZFsSqvA17TaNZYFcwBrkSCqHlxDu2YDpjjUBA=="; - }; - }; - "@esm2cjs/cacheable-request-10.2.12" = { - name = "_at_esm2cjs_slash_cacheable-request"; - packageName = "@esm2cjs/cacheable-request"; - version = "10.2.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@esm2cjs/cacheable-request/-/cacheable-request-10.2.12.tgz"; - sha512 = "M3CoP/XAPA/+UWjRVZzdDs1BjSCT+gdI/RqP0fwDU5zWjoTScdx9j59YFTGj5PF3SZ9DSAzTAgpUA0lEUsF3eg=="; - }; - }; - "@esm2cjs/form-data-encoder-2.1.4" = { - name = "_at_esm2cjs_slash_form-data-encoder"; - packageName = "@esm2cjs/form-data-encoder"; - version = "2.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@esm2cjs/form-data-encoder/-/form-data-encoder-2.1.4.tgz"; - sha512 = "HfuSoCMEgT5oHOwnN+o0f4Kzm+vBvRtddzJFFbLmawzPlFr3Djh2DHVDa2XpJCON4vjmd6RObd9R/oa0MvCLjg=="; - }; - }; - "@esm2cjs/got-12.5.3" = { - name = "_at_esm2cjs_slash_got"; - packageName = "@esm2cjs/got"; - version = "12.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@esm2cjs/got/-/got-12.5.3.tgz"; - sha512 = "eI+5wDoF5bV4juELczVb65i+dFVPoQCq0XsnnBudzClQUYV+oScXVKt+LrToXO/1Vimfvt+EZoNmuwdQjz+Kkg=="; - }; - }; - "@esm2cjs/http-timer-5.0.1" = { - name = "_at_esm2cjs_slash_http-timer"; - packageName = "@esm2cjs/http-timer"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@esm2cjs/http-timer/-/http-timer-5.0.1.tgz"; - sha512 = "BuqNhUgDz7pZffEwVXRXhRNb6l46CCu17knfUW7juP6H5ugqFFrLOcNiVjt66h4HjsHA0V5NKR7udA7kziqhoQ=="; - }; - }; - "@esm2cjs/is-5.6.0" = { - name = "_at_esm2cjs_slash_is"; - packageName = "@esm2cjs/is"; - version = "5.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@esm2cjs/is/-/is-5.6.0.tgz"; - sha512 = "r0j/f9mRDfhegzmZw9zw2k76Igv8jBdpd/Dy/+W2B+uZ0iVPggA3h4rkAcvNKyVeD/7YAfaMORuncBprZ/hLRA=="; - }; - }; - "@esm2cjs/lowercase-keys-3.0.0" = { - name = "_at_esm2cjs_slash_lowercase-keys"; - packageName = "@esm2cjs/lowercase-keys"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@esm2cjs/lowercase-keys/-/lowercase-keys-3.0.0.tgz"; - sha512 = "hqfn6odHNsUaMq2qptVKthPJCts6MxDf6eRIUl49NiN2CIu4CoaTGEswC+9WBg0hhzC+BqlfXTBNCgjp7OWyCQ=="; - }; - }; - "@esm2cjs/mimic-response-4.0.0" = { - name = "_at_esm2cjs_slash_mimic-response"; - packageName = "@esm2cjs/mimic-response"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@esm2cjs/mimic-response/-/mimic-response-4.0.0.tgz"; - sha512 = "v0OcLK+2AmkCaUVirWNu+e8j8xd8jRIXhC/VbpFp4AkVXGovFspCmwx26IluxXiz8vHckP4uLy/GzMatiEqdLg=="; - }; - }; - "@esm2cjs/normalize-url-8.0.0" = { - name = "_at_esm2cjs_slash_normalize-url"; - packageName = "@esm2cjs/normalize-url"; - version = "8.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@esm2cjs/normalize-url/-/normalize-url-8.0.0.tgz"; - sha512 = "9lrM8Q0ANSfM7ziVpNXEDKrVYcU4M3xIAUZWcvH9bY0fINBCkew1YBU1C1otfNoFDCERvCH0AkO70wkePdQwQw=="; - }; - }; - "@esm2cjs/p-cancelable-3.0.0" = { - name = "_at_esm2cjs_slash_p-cancelable"; - packageName = "@esm2cjs/p-cancelable"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@esm2cjs/p-cancelable/-/p-cancelable-3.0.0.tgz"; - sha512 = "ETfhJRf8RpTHYua7nk9izoEYK4SbNBEvRoUF14VqSGgZt5qIOa5dnFsa1LBJ4Spw5UtjjD4LdwFW/93qnRFV0A=="; - }; - }; - "@esm2cjs/p-queue-7.3.0" = { - name = "_at_esm2cjs_slash_p-queue"; - packageName = "@esm2cjs/p-queue"; - version = "7.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@esm2cjs/p-queue/-/p-queue-7.3.0.tgz"; - sha512 = "2sLG0pX2KlvRRv/UXOoZ1tg9w1V2FAerm514BWq1ykNlJPHaIpz0GfbaBWFgCFSlfcaHmxjvs7ZlHtPrPUXWMg=="; - }; - }; - "@esm2cjs/p-timeout-5.1.0" = { - name = "_at_esm2cjs_slash_p-timeout"; - packageName = "@esm2cjs/p-timeout"; - version = "5.1.0"; + version = "8.44.0"; src = fetchurl { - url = "https://registry.npmjs.org/@esm2cjs/p-timeout/-/p-timeout-5.1.0.tgz"; - sha512 = "QW2sTVKgqiK1nirBD8Sq39izyYj3IINfzwtxn/rpcFjMan7qXovQG3X2SzTsLKxw/phftc2M9Qh4lPtBfb2Bzg=="; + url = "https://registry.npmjs.org/@eslint/js/-/js-8.44.0.tgz"; + sha512 = "Ag+9YM4ocKQx9AarydN0KY2j0ErMHNIocPDrVo8zAE44xLTjEtz81OdR68/cydGtk6m6jDb5Za3r2useMzYmSw=="; }; }; - "@esm2cjs/responselike-3.0.0" = { - name = "_at_esm2cjs_slash_responselike"; - packageName = "@esm2cjs/responselike"; - version = "3.0.0"; + "@eslint/js-8.50.0" = { + name = "_at_eslint_slash_js"; + packageName = "@eslint/js"; + version = "8.50.0"; src = fetchurl { - url = "https://registry.npmjs.org/@esm2cjs/responselike/-/responselike-3.0.0.tgz"; - sha512 = "VIQ3pvevlVGC1uzQ7JxCQH3VFmzmC8ASXk35oKq4+VaLBZioKJR/eXk8C7GD8OgajnNByClo/rEsku1fqMTNSw=="; + url = "https://registry.npmjs.org/@eslint/js/-/js-8.50.0.tgz"; + sha512 = "NCC3zz2+nvYd+Ckfh87rA47zfu2QsQpvc6k1yzTk+b9KzRj0wkGa8LSoGOXN6Zv4lRf/EIoZ80biDh9HOI+RNQ=="; }; }; "@ethereumjs/rlp-4.0.1" = { @@ -4873,13 +4990,13 @@ let sha512 = "V8gMy1C63oAYlvkSjhfGYOET7sOmRIUAYv/wVcKJZiVAMZ5MQ2geeXCpLGC4+vuOQe2Hs3+qAgl4y0/b8OUO+A=="; }; }; - "@expo/apple-utils-1.3.1" = { + "@expo/apple-utils-1.3.2" = { name = "_at_expo_slash_apple-utils"; packageName = "@expo/apple-utils"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/apple-utils/-/apple-utils-1.3.1.tgz"; - sha512 = "ADPHXIpTWlt9tIg9yhwyuxQ6UMICWMfHgoCE1v8zzyYsa3BcKvawgkAGApYNxp2IYUKiNMqRYzViEKgq+Svk3w=="; + url = "https://registry.npmjs.org/@expo/apple-utils/-/apple-utils-1.3.2.tgz"; + sha512 = "8utf2r+ka9uI1qhazBEbLzjPX0CIBvvpBHy0o4XFoLUiZDvBqGBEctduvJc49hvu/16hxVtNqGXs1U97OVKe4g=="; }; }; "@expo/bunyan-4.0.0" = { @@ -4936,13 +5053,13 @@ let sha512 = "4e7hzPj50mQIlsrzOH6XZ36O094mPfPTIDIH4yv49bWNMc7GFLTofB/lcT+QyxiLaJuC0Wlk9yOLB8DIqmtwug=="; }; }; - "@expo/config-8.3.0" = { + "@expo/config-8.3.1" = { name = "_at_expo_slash_config"; packageName = "@expo/config"; - version = "8.3.0"; + version = "8.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config/-/config-8.3.0.tgz"; - sha512 = "BjgYDrle/UCS+FtXc9yUzQ0HOLHt5c4HvbINyGicxq6GyQZ2uu9eCRmXw5k4Qdl0DlmPKj6h7XbvDg5CEJTHtA=="; + url = "https://registry.npmjs.org/@expo/config/-/config-8.3.1.tgz"; + sha512 = "5fNGAw5h/MDOc8Ulv9nonafPtOT042B7dF6vrVxSP3CY5qiVu0tCsmbL412wEcrAZ8MY7UMv9e6IzpGTgleYgg=="; }; }; "@expo/config-plugins-4.1.5" = { @@ -4972,13 +5089,13 @@ let sha512 = "TItGwmKH1GDjA5GlMkXo1A8pqeqppSK40aSVRVQaGZraUj+nuvtpWxNgEWZxWFumiatP2ocWwyWVjfmH+rJY6g=="; }; }; - "@expo/config-plugins-7.4.0" = { + "@expo/config-plugins-7.5.0" = { name = "_at_expo_slash_config-plugins"; packageName = "@expo/config-plugins"; - version = "7.4.0"; + version = "7.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-7.4.0.tgz"; - sha512 = "/BwYRl6QQ9ZKYpVaIqHE5sSPqNZI9CUtfLfYHhpnShQUA1KHRMi6y9zjb3IXJisk0/fcrtRm2yP3A7F0l304sQ=="; + url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-7.5.0.tgz"; + sha512 = "qOKjmgbddLh1vj9ytUT6AduhEans2cHgS42nopVgh5Wz8X+QUvPcCr1Yc8MvLM3OlbswBMCJceeosZa463i0uA=="; }; }; "@expo/config-types-45.0.0" = { @@ -5008,13 +5125,13 @@ let sha512 = "8eyREVi+K2acnMBe/rTIu1dOfyR2+AMnTLHlut+YpMV9OZPdeKV0Bs9BxAewGqBA2slslbQ9N39IS2CuTKpXkA=="; }; }; - "@expo/config-types-50.0.0-alpha.1" = { + "@expo/config-types-50.0.0-alpha.2" = { name = "_at_expo_slash_config-types"; packageName = "@expo/config-types"; - version = "50.0.0-alpha.1"; + version = "50.0.0-alpha.2"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config-types/-/config-types-50.0.0-alpha.1.tgz"; - sha512 = "bfQzw3bzdR3x6Nup/FN/2TAWwpJKTgx0j/uZxyoOBiBVNof2P0q193tsgDd3GYxbQJnoVMNhSI6Mjxu5hzuXRw=="; + url = "https://registry.npmjs.org/@expo/config-types/-/config-types-50.0.0-alpha.2.tgz"; + sha512 = "eAUMUg4wnw0bYovs+isibq4l9ssMacS/r0NolDxDdIX/N+ZjIEZ5DEl5GO8dnD0dKbN/DPWwUln7SG/nSYHfmw=="; }; }; "@expo/dev-server-0.2.0" = { @@ -5053,13 +5170,31 @@ let sha512 = "OqCCxLx9HRMFQDiZvfpOfNmGhsTrV15IUOhmbp9iIa+uO/VyPpBvXqiA4ENCN9Jmf6yXtirIranCeJcm+jAuSA=="; }; }; - "@expo/eas-json-5.2.0" = { + "@expo/eas-build-job-1.0.43" = { + name = "_at_expo_slash_eas-build-job"; + packageName = "@expo/eas-build-job"; + version = "1.0.43"; + src = fetchurl { + url = "https://registry.npmjs.org/@expo/eas-build-job/-/eas-build-job-1.0.43.tgz"; + sha512 = "LMOoDIEax31uGBGux6/ocbCjUbWK3cUHuCxrsYlU+bvba4pGifegYWt2YQ/HC2477paq+K69IGjOUCHvNWG6Yg=="; + }; + }; + "@expo/eas-json-5.3.1" = { name = "_at_expo_slash_eas-json"; packageName = "@expo/eas-json"; - version = "5.2.0"; + version = "5.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@expo/eas-json/-/eas-json-5.3.1.tgz"; + sha512 = "0o2mDv2wyErRyR86738KfyXf6+xuYyK9zpC/WaCRAkGO+sNANeXncxl7SXh7aVa5+YC550AK0L3lWFcM4XeLBg=="; + }; + }; + "@expo/fingerprint-0.2.0" = { + name = "_at_expo_slash_fingerprint"; + packageName = "@expo/fingerprint"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/eas-json/-/eas-json-5.2.0.tgz"; - sha512 = "Uk+4KdoMO1qMs1wSzp62Z/0Ddk4eRDKiRsGyZWu8oLU+RRSdYhxJ9J05c0l3EgZSbR4IR4RRWI9I+h8OymlnWw=="; + url = "https://registry.npmjs.org/@expo/fingerprint/-/fingerprint-0.2.0.tgz"; + sha512 = "k6MhJTrX4CYEwsyGemiLT8rnBwjRBYe0eKYAM3kqw0WbSHzkOJm739sgdswGLmA53iiX6FbB1TsiLnqt+h2U2w=="; }; }; "@expo/image-utils-0.3.21" = { @@ -5386,130 +5521,13 @@ let sha512 = "tzTXX1TFEjWCseEsNdIlXXkD+48uJoN+zpqIojUX4pSoMscsbhO/UuVEB5SzJucexqDWOo2ma0ECwdD7hZdrzg=="; }; }; - "@forge/api-2.19.0" = { - name = "_at_forge_slash_api"; - packageName = "@forge/api"; - version = "2.19.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@forge/api/-/api-2.19.0.tgz"; - sha512 = "kWyI1J6PdftRPnjPFKIM8g6wZAsJDzWtSFdfDfk07gv3pMOpwkajs+Qh0DOVvSP9FPexV+0lTIW7Rl6mrKImxw=="; - }; - }; - "@forge/auth-0.0.5" = { - name = "_at_forge_slash_auth"; - packageName = "@forge/auth"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@forge/auth/-/auth-0.0.5.tgz"; - sha512 = "JIJMRRnNWQjvLlnf2Goc+/CEzx+XTpzTarOR7wzRMOEoE715T5gdvb4hWeyQVyRJkRJUQQAXxDPT0WH7rINOcg=="; - }; - }; - "@forge/babel-plugin-transform-ui-1.1.7" = { - name = "_at_forge_slash_babel-plugin-transform-ui"; - packageName = "@forge/babel-plugin-transform-ui"; - version = "1.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@forge/babel-plugin-transform-ui/-/babel-plugin-transform-ui-1.1.7.tgz"; - sha512 = "heofqwqu/zdWdvxlV3y11cuyDob17LmwaV2lVyfgbpnC/vJE11x6mFpLPmqIzHGi8ogja1c5Kn3pcg3HCRaCFQ=="; - }; - }; - "@forge/bundler-4.12.0" = { - name = "_at_forge_slash_bundler"; - packageName = "@forge/bundler"; - version = "4.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@forge/bundler/-/bundler-4.12.0.tgz"; - sha512 = "zh29buHsdtmDDUz8J91IQY5mOGDAMPRw7fz4Asxsx3bNN5X3cV0b/OGVgypJnsg7HrCerT7NAoqTs2rUMX6xuw=="; - }; - }; - "@forge/cli-shared-3.18.0" = { - name = "_at_forge_slash_cli-shared"; - packageName = "@forge/cli-shared"; - version = "3.18.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-3.18.0.tgz"; - sha512 = "1EoxW0JGX8Gk0bqv3xeTogS5V6WpV7ObMNY0WSmXI+HYi/4tkHr6Tey3N4pN/yaKF9LpwEqTi7fiKUi1SBGQGw=="; - }; - }; - "@forge/csp-2.2.1" = { - name = "_at_forge_slash_csp"; - packageName = "@forge/csp"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@forge/csp/-/csp-2.2.1.tgz"; - sha512 = "LWE6VHPkIy6oiPYdjuKfnNCxZKqXE06jT0W6+5nO6lsfqhFMn3pmB43ZNI3PS3/TJ8Zx+ZSxUOv713V5Ga2p6A=="; - }; - }; - "@forge/egress-1.2.4" = { - name = "_at_forge_slash_egress"; - packageName = "@forge/egress"; - version = "1.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@forge/egress/-/egress-1.2.4.tgz"; - sha512 = "FIaeMj8mvMuocppoPpxEiPm4WwxCKF7V4c7+a04MoQ+nnoVa4c6Bcj8S6dRcGS4hT8i5YE7UKpo42bENaqS6SQ=="; - }; - }; - "@forge/lint-3.6.6" = { - name = "_at_forge_slash_lint"; - packageName = "@forge/lint"; - version = "3.6.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@forge/lint/-/lint-3.6.6.tgz"; - sha512 = "LAJHs4aabzyzUGBIElJUkahO7jdvN9kpgczkMQeCqjs9peD8v9FvljTPtTajtAc5iV7+LB/V4M/7WY+dzFczwA=="; - }; - }; - "@forge/manifest-4.20.0" = { - name = "_at_forge_slash_manifest"; - packageName = "@forge/manifest"; - version = "4.20.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@forge/manifest/-/manifest-4.20.0.tgz"; - sha512 = "2WQjfKz+TW/f5CtXZuXLNCylXPizLIBGcYFNBQghzaOCW905rkrXK8jGmUuH26fCivtgse89HGw7uilpLIBPxA=="; - }; - }; - "@forge/node-runtime-0.1.2" = { - name = "_at_forge_slash_node-runtime"; - packageName = "@forge/node-runtime"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@forge/node-runtime/-/node-runtime-0.1.2.tgz"; - sha512 = "kUr8tOfNvRtUDDgzxwqv8pT1OFENBz0GquC9JmW5NCnwHecBnasjl9b1HC4H/Fw14JpbBr/HL9QBPshGRfoPiA=="; - }; - }; - "@forge/runtime-5.0.1" = { - name = "_at_forge_slash_runtime"; - packageName = "@forge/runtime"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@forge/runtime/-/runtime-5.0.1.tgz"; - sha512 = "on2s7si1Ma7m3+oRuqfUACgUFBIuxtmnmyGfB0TCzqkrIOi97BW1WMj3uyRJk8vdLNwkGt9biP/QWWsEefAs1A=="; - }; - }; - "@forge/storage-1.5.8" = { - name = "_at_forge_slash_storage"; - packageName = "@forge/storage"; - version = "1.5.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@forge/storage/-/storage-1.5.8.tgz"; - sha512 = "yrfhAkO+GEV/Sij8tAZkieRB/Hs+gi3adMzPXoDbOyC5IWAdmFp3nIP6g+mzVmf+vWbhBvxclUYfVEzSoHOd0Q=="; - }; - }; - "@forge/tunnel-3.7.0" = { - name = "_at_forge_slash_tunnel"; - packageName = "@forge/tunnel"; - version = "3.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@forge/tunnel/-/tunnel-3.7.0.tgz"; - sha512 = "StC3djiuhQln/1Vc1mDcUoll7jyZBGiX8JE1Afam6afwg8lvg4jOQYXpVWFWNYHdVxK/j8gV8LnOpZP/ACYFJg=="; - }; - }; - "@forge/util-1.3.1" = { - name = "_at_forge_slash_util"; - packageName = "@forge/util"; - version = "1.3.1"; + "@fastify/busboy-2.0.0" = { + name = "_at_fastify_slash_busboy"; + packageName = "@fastify/busboy"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/util/-/util-1.3.1.tgz"; - sha512 = "AgyTKr0wWOZlCTZtShwOIoW8JApA78H7n+PhXbXC0NQwJE2fKust2uOOsty0fNDqw2ooabxbY1zZLq7pSQt9Uw=="; + url = "https://registry.npmjs.org/@fastify/busboy/-/busboy-2.0.0.tgz"; + sha512 = "JUFJad5lv7jxj926GPgymrWQxxjPYuJNiNjNMzqT+HiuP6Vl3dk5xzG+8sTX96np0ZAluvaMzPsjhHZ5rNuNQQ=="; }; }; "@gar/promisify-1.1.3" = { @@ -5521,31 +5539,31 @@ let sha512 = "k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw=="; }; }; - "@gitbeaker/core-39.15.0" = { + "@gitbeaker/core-39.16.0" = { name = "_at_gitbeaker_slash_core"; packageName = "@gitbeaker/core"; - version = "39.15.0"; + version = "39.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/core/-/core-39.15.0.tgz"; - sha512 = "ydwsPyuhdJOL/Mg1aE/if0QFsogy/QUpUzpGohlZzbrv3CX4xGB69eKBxNpWhLNgK/dCEHz13F+1D0t0SVyZzw=="; + url = "https://registry.npmjs.org/@gitbeaker/core/-/core-39.16.0.tgz"; + sha512 = "O0CiVt7EwD7zOqMBluEI+PsJL0bIotxcmvQLTh0vd7ylpK0J3QVPpe1/63hI1njaJDpwBR1jfErXD1xxkjQ5zA=="; }; }; - "@gitbeaker/requester-utils-39.15.0" = { + "@gitbeaker/requester-utils-39.16.0" = { name = "_at_gitbeaker_slash_requester-utils"; packageName = "@gitbeaker/requester-utils"; - version = "39.15.0"; + version = "39.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/requester-utils/-/requester-utils-39.15.0.tgz"; - sha512 = "2QpI4RQ3eV1OuEJF5iykvce89+27a7iCZtZ2ReBBZ6teE0sV2IgEHmbftByU4XwCaM6Cb8ED18q+aWszEKKokA=="; + url = "https://registry.npmjs.org/@gitbeaker/requester-utils/-/requester-utils-39.16.0.tgz"; + sha512 = "SEBGY4yyuuAPU7Bk/oWxHNM/bUhCMToW6r8G0PItM7BfYbF344MpRUYmcKvbFNBycctpU0qoyabWYi5SH3cVaw=="; }; }; - "@gitbeaker/rest-39.15.0" = { + "@gitbeaker/rest-39.16.0" = { name = "_at_gitbeaker_slash_rest"; packageName = "@gitbeaker/rest"; - version = "39.15.0"; + version = "39.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/rest/-/rest-39.15.0.tgz"; - sha512 = "tVJR90Zdj84AnvTCBWhPDaqygUPGDYLurKgelIBq6BOHITr4xHnNFEchC9DSM2uDQzO+ivq0pHBXR4/dqmSa5A=="; + url = "https://registry.npmjs.org/@gitbeaker/rest/-/rest-39.16.0.tgz"; + sha512 = "J7JRYO4AuZaeNA75dHeH48ZuOp9111kWUYOlAmwl2VfhTwkjdjjDSKV8/bn7vs/3qLJlyxI1NxoHpOpTyyWEyw=="; }; }; "@grammarly/sdk-1.11.0" = { @@ -5935,6 +5953,24 @@ let sha512 = "foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg=="; }; }; + "@headlessui/react-1.7.17" = { + name = "_at_headlessui_slash_react"; + packageName = "@headlessui/react"; + version = "1.7.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@headlessui/react/-/react-1.7.17.tgz"; + sha512 = "4am+tzvkqDSSgiwrsEpGWqgGo9dz8qU5M3znCkC4PgkpY4HcCZzEDEvozltGGGHIKl9jbXbZPSH5TWn4sWJdow=="; + }; + }; + "@heroicons/react-2.0.18" = { + name = "_at_heroicons_slash_react"; + packageName = "@heroicons/react"; + version = "2.0.18"; + src = fetchurl { + url = "https://registry.npmjs.org/@heroicons/react/-/react-2.0.18.tgz"; + sha512 = "7TyMjRrZZMBPa+/5Y8lN0iyvUU/01PeMGX2+RE7cQWpEUIcb4QotzUObFkJDejj/HUH4qjP/eQ0gzzKs2f+6Yw=="; + }; + }; "@heroku-cli/color-1.1.16" = { name = "_at_heroku-cli_slash_color"; packageName = "@heroku-cli/color"; @@ -6052,22 +6088,22 @@ let sha512 = "LBWf21EYmOJnM4azYPM4LsNbiH9GBK8rc1dwmDhuUELI43dEOGWSs2ateLn8/E9vyrVELGwQ1Y3Bu61YHa8kaA=="; }; }; - "@inquirer/checkbox-1.3.11" = { + "@inquirer/checkbox-1.3.12" = { name = "_at_inquirer_slash_checkbox"; packageName = "@inquirer/checkbox"; - version = "1.3.11"; + version = "1.3.12"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-1.3.11.tgz"; - sha512 = "SaQBDr7niZQzoP5Mqzak5pQY7476mvf4Sj2V8VFrbFHWHsavy3nKGKEOgijNHy151bEgqDog1829g/pKa9Qcrw=="; + url = "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-1.3.12.tgz"; + sha512 = "Jz2XAwN6R9ONtb7+QqmUhKtVL7lumunHhUoNuOzBj2mP/pe/sNZzJQKGbwiePPyKot64vzDAJ4qiBES0ubpb+A=="; }; }; - "@inquirer/confirm-2.0.12" = { + "@inquirer/confirm-2.0.13" = { name = "_at_inquirer_slash_confirm"; packageName = "@inquirer/confirm"; - version = "2.0.12"; + version = "2.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/confirm/-/confirm-2.0.12.tgz"; - sha512 = "Oxz3L0ti+0nWYHPPUIrPkxA2KnQZUGBHnk56yF5RjKqPGFrwvgLZdIXNe/w4I/OtdLeOBqHCrJ+kCvNvHVdk9g=="; + url = "https://registry.npmjs.org/@inquirer/confirm/-/confirm-2.0.13.tgz"; + sha512 = "MoobMgUxq0UCEcNm8O2zegEoSbf9DdYQfmW2csTcpIbLfrv3LfPTWoFcgY50cS8CXpP2o/Dog2GH03jWxzNIzg=="; }; }; "@inquirer/core-2.3.1" = { @@ -6079,49 +6115,49 @@ let sha512 = "faYAYnIfdEuns3jGKykaog5oUqFiEVbCx9nXGZfUhyEEpKcHt5bpJfZTb3eOBQKo8I/v4sJkZeBHmFlSZQuBCw=="; }; }; - "@inquirer/core-5.0.0" = { + "@inquirer/core-5.0.1" = { name = "_at_inquirer_slash_core"; packageName = "@inquirer/core"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/core/-/core-5.0.0.tgz"; - sha512 = "q2o4BcANKFyuUI5V6ejmPs1f9SdbJxfnLmhQVb72Fj7hOudoKsJpByJZ0imv9a/rpKDogA+93vtBBMqsnS7/Fg=="; + url = "https://registry.npmjs.org/@inquirer/core/-/core-5.0.1.tgz"; + sha512 = "mRf9YFdrSa3+nHA8n/SUF/sDJcK6C5KlXS5xYwIB2NWfESYYBM2KTpubJPBR0sJxsrsZZC2WgfYl8TURPvMm8g=="; }; }; - "@inquirer/editor-1.2.10" = { + "@inquirer/editor-1.2.11" = { name = "_at_inquirer_slash_editor"; packageName = "@inquirer/editor"; - version = "1.2.10"; + version = "1.2.11"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/editor/-/editor-1.2.10.tgz"; - sha512 = "aluYpazbxIdM54L+xNmVHzOjoXGwkliTCvHxhtPg6itmqDGMVmU1z+T2akHt6Xnx9RyrTpbumFB4xn1iI0UfnA=="; + url = "https://registry.npmjs.org/@inquirer/editor/-/editor-1.2.11.tgz"; + sha512 = "5WcjiTZsr8utlmfOFcHIC0o2Mdg3nXUf1ij5IZtgJTFd8QOy7N/sfsZHW0p1wY+YSbX6Sxd+YyUCJ2t6xQiyqA=="; }; }; - "@inquirer/expand-1.1.11" = { + "@inquirer/expand-1.1.12" = { name = "_at_inquirer_slash_expand"; packageName = "@inquirer/expand"; - version = "1.1.11"; + version = "1.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/expand/-/expand-1.1.11.tgz"; - sha512 = "GSZJbYKPBniyXgWeFLsqiv7TSK9QjpQqCr+i/85Yts3wwixXTrAeoqM3TVVgHO/3j+xeFcuhOm1wy/F2QY5aEg=="; + url = "https://registry.npmjs.org/@inquirer/expand/-/expand-1.1.12.tgz"; + sha512 = "xNDrp5TO3xclcSqlWClskQd11OyGjnW2lek/4xeWQUrNKO1nN9VAzRAaEAkSpxF5FXG38M9oIBq6SMCYtBx/zw=="; }; }; - "@inquirer/input-1.2.11" = { + "@inquirer/input-1.2.12" = { name = "_at_inquirer_slash_input"; packageName = "@inquirer/input"; - version = "1.2.11"; + version = "1.2.12"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/input/-/input-1.2.11.tgz"; - sha512 = "sV1nO6+RxMFTHAznmxMkbMkjGQ8NGMWr0mvXjU35YQ0OFEL+YlD+DPbNd9s3ltnswODZAcnM1yFvdko3S/Kj/w=="; + url = "https://registry.npmjs.org/@inquirer/input/-/input-1.2.12.tgz"; + sha512 = "ruckbVn/Jv+Pkqod7ACKNOtiKkW/DKSmWn11TUsJweuUbQQMWX5V/9nUvbX/4mJV9bFX817rnJhRru3MwjU8jA=="; }; }; - "@inquirer/password-1.1.11" = { + "@inquirer/password-1.1.12" = { name = "_at_inquirer_slash_password"; packageName = "@inquirer/password"; - version = "1.1.11"; + version = "1.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/password/-/password-1.1.11.tgz"; - sha512 = "r2eiLMlTuY+k+yJf6XLbnAEz7EDyWdjOrgVAWjSKoEDBc3T9/rq2I+7WiY9FUFArYY/1LxmsNWavs5NuMICx8Q=="; + url = "https://registry.npmjs.org/@inquirer/password/-/password-1.1.12.tgz"; + sha512 = "vVNxEVbe+XltKZlLBFvo4IcKwGyqmnc5cQkoEOTDYs0Jazrxct3x8bu89FpRhT/e93gm/TnWpqdI47+B7n/sWw=="; }; }; "@inquirer/prompts-2.3.1" = { @@ -6133,31 +6169,31 @@ let sha512 = "YQeBFzIE+6fcec5N/U2mSz+IcKEG4wtGDwF7MBLIDgITWzB3o723JpKJ1rxWqdCvTXkYE+gDXK/seSN6omo3DQ=="; }; }; - "@inquirer/rawlist-1.2.11" = { + "@inquirer/rawlist-1.2.12" = { name = "_at_inquirer_slash_rawlist"; packageName = "@inquirer/rawlist"; - version = "1.2.11"; + version = "1.2.12"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-1.2.11.tgz"; - sha512 = "4S2t2pCCR3VgyB3lbPKoiJ9020HHAi9g4M+DIyXHYwGE++7wURAwKkzb6v78fS0yKfCbyFt3BTcL2UffQRQ9Fg=="; + url = "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-1.2.12.tgz"; + sha512 = "j5n4TpK4YP/Wt+hREjzDsqALulOocAEl1e4l8Mt2+2DQ66hWrfBTazkEaQJSeaTLRbm9153NjuObRD1+mQqg7g=="; }; }; - "@inquirer/select-1.2.11" = { + "@inquirer/select-1.2.12" = { name = "_at_inquirer_slash_select"; packageName = "@inquirer/select"; - version = "1.2.11"; + version = "1.2.12"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/select/-/select-1.2.11.tgz"; - sha512 = "LH2wzAsWfu/+wcapeht07zTDefuvGTpv0+9dCAQ68QigF+4gHzpWq5+AbBLbxzuH2Wz4WlHcti85nFUPPM1t3A=="; + url = "https://registry.npmjs.org/@inquirer/select/-/select-1.2.12.tgz"; + sha512 = "+KeKbxjJ/qa1yUxwaD38fhhi1nzL2qGigdT/E/GwXLtoWLJ8Rl8hCe37xRB2gP8yK3vhhv6ll8C4bgJtu2hIWA=="; }; }; - "@inquirer/type-1.1.4" = { + "@inquirer/type-1.1.5" = { name = "_at_inquirer_slash_type"; packageName = "@inquirer/type"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/type/-/type-1.1.4.tgz"; - sha512 = "a6+RCiXBQEbiA73RT1pBfwiH2I+MPcoZoGKuuUYFkws+6ud7nb5kUQGHFGUSBim25IyVMT/mqbWIrkxetcIb/w=="; + url = "https://registry.npmjs.org/@inquirer/type/-/type-1.1.5.tgz"; + sha512 = "wmwHvHozpPo4IZkkNtbYenem/0wnfI6hvOcGKmPEa0DwuaH5XUQzFqy6OpEpjEegZMhYIk8HDYITI16BPLtrRA=="; }; }; "@isaacs/cliui-8.0.2" = { @@ -6169,15 +6205,6 @@ let sha512 = "O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA=="; }; }; - "@isaacs/string-locale-compare-1.1.0" = { - name = "_at_isaacs_slash_string-locale-compare"; - packageName = "@isaacs/string-locale-compare"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@isaacs/string-locale-compare/-/string-locale-compare-1.1.0.tgz"; - sha512 = "SQ7Kzhh9+D+ZW9MA0zkYv3VXhIDNx+LzM6EJ+/65I3QY+enU6Itte7E5XX7EWrqLW2FN4n06GWzBnPoC3th2aQ=="; - }; - }; "@istanbuljs/load-nyc-config-1.1.0" = { name = "_at_istanbuljs_slash_load-nyc-config"; packageName = "@istanbuljs/load-nyc-config"; @@ -6709,13 +6736,22 @@ let sha512 = "AveFyqkJIb8qZvGk5nZal/8mEJB6lWhwqvAQLodHmqE3WzpmZD5+h+aspBVt0El5cEFRJ1k1mrQqhAnJCVpvxg=="; }; }; - "@jsii/spec-1.88.0" = { + "@jsii/check-node-1.89.0" = { + name = "_at_jsii_slash_check-node"; + packageName = "@jsii/check-node"; + version = "1.89.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.89.0.tgz"; + sha512 = "RMw19IEj6ch6oOGkBrAbtzwshrOXMKlfbX54S0hGrwR1qlSjNS9qqt4p+LRSpurhriEo7oHDegItNGUjPYoNXw=="; + }; + }; + "@jsii/spec-1.89.0" = { name = "_at_jsii_slash_spec"; packageName = "@jsii/spec"; - version = "1.88.0"; + version = "1.89.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.88.0.tgz"; - sha512 = "Q6xirxPM06TRW0GcsHa+tzPZLwe9I+mFYx5BaNMimcv21u6bQnxfynZMgNhHqvLYCmP37HWg0SboUYTa5JROzw=="; + url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.89.0.tgz"; + sha512 = "byzIC5M5FrEaW+GaPGQfPsobfwmEfzHvS7dh5d5fgY4VvvsHBkkhhF/H5xUG+1wQBcdBnqdKyp5CEFm8UEVfqg=="; }; }; "@kwsites/file-exists-1.1.1" = { @@ -6763,22 +6799,22 @@ let sha512 = "fjgiKjg9VXwQ4ZKKsrXICEKRiC3yo6+FprR0mc55uz0s5e9xupoSGLobUTTBdE7ncNB3ibqml8dfaAn/+ESajQ=="; }; }; - "@lezer/common-0.15.12" = { + "@lezer/common-1.1.0" = { name = "_at_lezer_slash_common"; packageName = "@lezer/common"; - version = "0.15.12"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lezer/common/-/common-0.15.12.tgz"; - sha512 = "edfwCxNLnzq5pBA/yaIhwJ3U3Kz8VAUOTRg0hhxaizaI1N+qxV7EXDv/kLCkLeq2RzSFvxexlaj5Mzfn2kY0Ig=="; + url = "https://registry.npmjs.org/@lezer/common/-/common-1.1.0.tgz"; + sha512 = "XPIN3cYDXsoJI/oDWoR2tD++juVrhgIago9xyKhZ7IhGlzdDM9QgC8D8saKNCz5pindGcznFr2HBSsEQSWnSjw=="; }; }; - "@lezer/lr-0.15.8" = { + "@lezer/lr-1.3.12" = { name = "_at_lezer_slash_lr"; packageName = "@lezer/lr"; - version = "0.15.8"; + version = "1.3.12"; src = fetchurl { - url = "https://registry.npmjs.org/@lezer/lr/-/lr-0.15.8.tgz"; - sha512 = "bM6oE6VQZ6hIFxDNKk8bKPa14hqFrV07J/vHGOeiAbJReIaQXmkVb6xQu4MR+JBTLa5arGRyAAjJe1qaQt3Uvg=="; + url = "https://registry.npmjs.org/@lezer/lr/-/lr-1.3.12.tgz"; + sha512 = "5nwY1JzCueUdRtlMBnlf1SUi69iGCq2ABq7WQFQMkn/kxPvoACAEnTp4P17CtXxYr7WCwtYPLL2AEvxKPuF1OQ=="; }; }; "@ljharb/through-2.3.9" = { @@ -6943,22 +6979,22 @@ let sha512 = "W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA=="; }; }; - "@microsoft/rush-lib-5.106.0" = { + "@microsoft/rush-lib-5.107.4" = { name = "_at_microsoft_slash_rush-lib"; packageName = "@microsoft/rush-lib"; - version = "5.106.0"; + version = "5.107.4"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/rush-lib/-/rush-lib-5.106.0.tgz"; - sha512 = "x6lq1LDeoCpwu6tSfjjZNDdtENb+CdJgWT8NeBZNLK5JWjacWxvDD2qIYOw0v+8VwTiZMl7XYDf8MxkXVpCf+g=="; + url = "https://registry.npmjs.org/@microsoft/rush-lib/-/rush-lib-5.107.4.tgz"; + sha512 = "B9s0HhvXbQXHE14q2TcI9FMHYB0WvmlXTdXhsmumJ3tddJQd9jVxIdQd5H5OBGELULLc1UQnnTFAid4/cND6UA=="; }; }; - "@mischnic/json-sourcemap-0.1.0" = { + "@mischnic/json-sourcemap-0.1.1" = { name = "_at_mischnic_slash_json-sourcemap"; packageName = "@mischnic/json-sourcemap"; - version = "0.1.0"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@mischnic/json-sourcemap/-/json-sourcemap-0.1.0.tgz"; - sha512 = "dQb3QnfNqmQNYA4nFSN/uLaByIic58gOXq4Y4XqLOWmOrw73KmJPt/HLyG0wvn1bnR6mBKs/Uwvkh+Hns1T0XA=="; + url = "https://registry.npmjs.org/@mischnic/json-sourcemap/-/json-sourcemap-0.1.1.tgz"; + sha512 = "iA7+tyVqfrATAIsIRWQG+a7ZLLD0VaOCKV2Wd/v4mqIU3J9c4jx9p7S0nw1XH3gJCKNBOOwACOPYYSUu9pgT+w=="; }; }; "@msgpack/msgpack-2.8.0" = { @@ -7132,15 +7168,6 @@ let sha512 = "oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="; }; }; - "@npmcli/arborist-4.3.1" = { - name = "_at_npmcli_slash_arborist"; - packageName = "@npmcli/arborist"; - version = "4.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/arborist/-/arborist-4.3.1.tgz"; - sha512 = "yMRgZVDpwWjplorzt9SFSaakWx6QIK248Nw4ZFgkrAy/GvJaFRaSZzE6nD7JBK5r8g/+PTxFq5Wj/sfciE7x+A=="; - }; - }; "@npmcli/ci-detect-1.4.0" = { name = "_at_npmcli_slash_ci-detect"; packageName = "@npmcli/ci-detect"; @@ -7150,13 +7177,13 @@ let sha512 = "3BGrt6FLjqM6br5AhWRKTr3u5GIVkjRYeAFrMp3HjnfICrg4xOrVRwFavKT6tsp++bq5dluL5t8ME/Nha/6c1Q=="; }; }; - "@npmcli/config-6.2.1" = { + "@npmcli/config-6.3.0" = { name = "_at_npmcli_slash_config"; packageName = "@npmcli/config"; - version = "6.2.1"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/config/-/config-6.2.1.tgz"; - sha512 = "Cj/OrSbrLvnwWuzquFCDTwFN8QmR+SWH6qLNCBttUreDkKM5D5p36SeSMbcEUiCGdwjUrVy2yd8C0REwwwDPEw=="; + url = "https://registry.npmjs.org/@npmcli/config/-/config-6.3.0.tgz"; + sha512 = "gV64pm5cQ7F2oeoSJ5HTfaKxjFsvC4dAbCsQbtbOkEOymM6iZI62yNGCOLjcq/rfYX9+wVn34ThxK7GZpUwWFg=="; }; }; "@npmcli/fs-1.1.1" = { @@ -7168,15 +7195,6 @@ let sha512 = "8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ=="; }; }; - "@npmcli/fs-2.1.2" = { - name = "_at_npmcli_slash_fs"; - packageName = "@npmcli/fs"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/fs/-/fs-2.1.2.tgz"; - sha512 = "yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ=="; - }; - }; "@npmcli/fs-3.1.0" = { name = "_at_npmcli_slash_fs"; packageName = "@npmcli/fs"; @@ -7186,15 +7204,6 @@ let sha512 = "7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w=="; }; }; - "@npmcli/git-2.1.0" = { - name = "_at_npmcli_slash_git"; - packageName = "@npmcli/git"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/git/-/git-2.1.0.tgz"; - sha512 = "/hBFX/QG1b+N7PZBFs0bi+evgRZcK9nWBxQKZkGoXUT5hJSwl5c4d7y8/hm+NQZRPhQ67RzFaj5UM9YeyKoryw=="; - }; - }; "@npmcli/git-4.1.0" = { name = "_at_npmcli_slash_git"; packageName = "@npmcli/git"; @@ -7204,15 +7213,6 @@ let sha512 = "9hwoB3gStVfa0N31ymBmrX+GuDGdVA/QWShZVqE0HK2Af+7QGGrCTbZia/SW0ImUTjTne7SP91qxDmtXvDHRPQ=="; }; }; - "@npmcli/installed-package-contents-1.0.7" = { - name = "_at_npmcli_slash_installed-package-contents"; - packageName = "@npmcli/installed-package-contents"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-1.0.7.tgz"; - sha512 = "9rufe0wnJusCQoLpV9ZPKIVP55itrM5BxOXs10DmdbRfgWtHy1LDyskbwRnBghuB0PrF7pNPOqREVtpz4HqzKw=="; - }; - }; "@npmcli/installed-package-contents-2.0.2" = { name = "_at_npmcli_slash_installed-package-contents"; packageName = "@npmcli/installed-package-contents"; @@ -7222,15 +7222,6 @@ let sha512 = "xACzLPhnfD51GKvTOOuNX2/V4G4mz9/1I2MfDoye9kBM3RYe5g2YbscsaGoTlaWqkxeiapBWyseULVKpSVHtKQ=="; }; }; - "@npmcli/map-workspaces-2.0.4" = { - name = "_at_npmcli_slash_map-workspaces"; - packageName = "@npmcli/map-workspaces"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/map-workspaces/-/map-workspaces-2.0.4.tgz"; - sha512 = "bMo0aAfwhVwqoVM5UzX1DJnlvVvzDCHae821jv48L1EsrYwfOZChlqWYXEtto/+BkBXetPbEWgau++/brh4oVg=="; - }; - }; "@npmcli/map-workspaces-3.0.4" = { name = "_at_npmcli_slash_map-workspaces"; packageName = "@npmcli/map-workspaces"; @@ -7240,15 +7231,6 @@ let sha512 = "Z0TbvXkRbacjFFLpVpV0e2mheCh+WzQpcqL+4xp49uNJOxOnIAPZyXtUxZ5Qn3QBTGKA11Exjd9a5411rBrhDg=="; }; }; - "@npmcli/metavuln-calculator-2.0.0" = { - name = "_at_npmcli_slash_metavuln-calculator"; - packageName = "@npmcli/metavuln-calculator"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/metavuln-calculator/-/metavuln-calculator-2.0.0.tgz"; - sha512 = "VVW+JhWCKRwCTE+0xvD6p3uV4WpqocNYYtzyvenqL/u1Q3Xx6fGTJ+6UoIoii07fbuEO9U3IIyuGY0CYHDv1sg=="; - }; - }; "@npmcli/move-file-1.1.2" = { name = "_at_npmcli_slash_move-file"; packageName = "@npmcli/move-file"; @@ -7258,24 +7240,6 @@ let sha512 = "1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg=="; }; }; - "@npmcli/move-file-2.0.1" = { - name = "_at_npmcli_slash_move-file"; - packageName = "@npmcli/move-file"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/move-file/-/move-file-2.0.1.tgz"; - sha512 = "mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ=="; - }; - }; - "@npmcli/name-from-folder-1.0.1" = { - name = "_at_npmcli_slash_name-from-folder"; - packageName = "@npmcli/name-from-folder"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/name-from-folder/-/name-from-folder-1.0.1.tgz"; - sha512 = "qq3oEfcLFwNfEYOQ8HLimRGKlD8WSeGEdtUa7hmzpR8Sa7haL1KVQrvgO6wqMjhWFFVjgtrh1gIxDz+P8sjUaA=="; - }; - }; "@npmcli/name-from-folder-2.0.0" = { name = "_at_npmcli_slash_name-from-folder"; packageName = "@npmcli/name-from-folder"; @@ -7285,15 +7249,6 @@ let sha512 = "pwK+BfEBZJbKdNYpHHRTNBwBoqrN/iIMO0AiGvYsp3Hoaq0WbgGSWQR6SCldZovoDpY3yje5lkFUe6gsDgJ2vg=="; }; }; - "@npmcli/node-gyp-1.0.3" = { - name = "_at_npmcli_slash_node-gyp"; - packageName = "@npmcli/node-gyp"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-1.0.3.tgz"; - sha512 = "fnkhw+fmX65kiLqk6E3BFLXNC26rUhK90zVwe2yncPliVT/Qos3xjhTLE59Df8KnPlcwIERXKVlU1bXoUQ+liA=="; - }; - }; "@npmcli/node-gyp-3.0.0" = { name = "_at_npmcli_slash_node-gyp"; packageName = "@npmcli/node-gyp"; @@ -7303,24 +7258,6 @@ let sha512 = "gp8pRXC2oOxu0DUE1/M3bYtb1b3/DbJ5aM113+XJBgfXdussRAsX0YOrOhdd8WvnAR6auDBvJomGAkLKA5ydxA=="; }; }; - "@npmcli/package-json-1.0.1" = { - name = "_at_npmcli_slash_package-json"; - packageName = "@npmcli/package-json"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/package-json/-/package-json-1.0.1.tgz"; - sha512 = "y6jnu76E9C23osz8gEMBayZmaZ69vFOIk8vR1FJL/wbEJ54+9aVG9rLTjQKSXfgYZEr50nw1txBBFfBZZe+bYg=="; - }; - }; - "@npmcli/promise-spawn-1.3.2" = { - name = "_at_npmcli_slash_promise-spawn"; - packageName = "@npmcli/promise-spawn"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-1.3.2.tgz"; - sha512 = "QyAGYo/Fbj4MXeGdJcFzZ+FkDkomfRBrPM+9QYJSg+PxgAUL+LU3FneQk37rKR2/zjqkCV1BLHccX98wRXG3Sg=="; - }; - }; "@npmcli/promise-spawn-6.0.2" = { name = "_at_npmcli_slash_promise-spawn"; packageName = "@npmcli/promise-spawn"; @@ -7330,15 +7267,6 @@ let sha512 = "gGq0NJkIGSwdbUt4yhdF8ZrmkGKVz9vAdVzpOfnom+V8PLSmSOVhZwbNvZZS1EYcJN5hzzKBxmmVVAInM6HQLg=="; }; }; - "@npmcli/run-script-2.0.0" = { - name = "_at_npmcli_slash_run-script"; - packageName = "@npmcli/run-script"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-2.0.0.tgz"; - sha512 = "fSan/Pu11xS/TdaTpTB0MRn9guwGU8dye+x56mEVgBEd/QsybBbYcAL0phPXi8SGWFEChkQd6M9qL4y6VOpFig=="; - }; - }; "@npmcli/run-script-6.0.2" = { name = "_at_npmcli_slash_run-script"; packageName = "@npmcli/run-script"; @@ -7348,130 +7276,40 @@ let sha512 = "NCcr1uQo1k5U+SYlnIrbAh3cxy+OQT1VtqiAbxdymSlptbzBb62AjH2xXgjNCoP073hoa1CfCAcwoZ8k96C4nA=="; }; }; - "@nrwl/devkit-16.8.1" = { + "@nrwl/devkit-16.9.1" = { name = "_at_nrwl_slash_devkit"; packageName = "@nrwl/devkit"; - version = "16.8.1"; + version = "16.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/devkit/-/devkit-16.8.1.tgz"; - sha512 = "Y7yYDh62Hi4q99Q4+ipIQ3K9iLuAld3WcwjLv6vtl6Livu+TU3eqbraBEno7DQL8JuIuwgBT4lX7Bp3w3N9RDg=="; + url = "https://registry.npmjs.org/@nrwl/devkit/-/devkit-16.9.1.tgz"; + sha512 = "+iR7tg+LOrGWAGmGv0hr45hYUOeKjK/Jm6WV3Ldmx6I7LaaYM5Fu6Ev2KXL669QMzLJpg3kqgKQsneWbFT3MAw=="; }; }; - "@nrwl/tao-16.8.1" = { + "@nrwl/tao-16.9.1" = { name = "_at_nrwl_slash_tao"; packageName = "@nrwl/tao"; - version = "16.8.1"; + version = "16.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/tao/-/tao-16.8.1.tgz"; - sha512 = "hgGFLyEgONSofxnJsXN9NlUx4J8/YSLUkfZKdR8Qa97+JGZT8FEuk7NLFJOWdYYqROoCzXLHK0d+twFFNPS5BQ=="; + url = "https://registry.npmjs.org/@nrwl/tao/-/tao-16.9.1.tgz"; + sha512 = "KsRBRAE5mSP83ZjO9cPW6ZQZWOtkMfCBih/WE9qpaiHn+hCydtYStyAO2QSic4tHVV+8VpPUQWYnpf5rhkNzWg=="; }; }; - "@nx/devkit-16.8.1" = { + "@nx/devkit-16.9.1" = { name = "_at_nx_slash_devkit"; packageName = "@nx/devkit"; - version = "16.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@nx/devkit/-/devkit-16.8.1.tgz"; - sha512 = "I+Cg+lXk0wRz6KC9FZbWFuJWQTXAt5O3bNl9ksISmzqmEyuy72Cv+/MBHvF7o54Sq80DNw+RKWB1re5HFOsqCA=="; - }; - }; - "@nx/nx-darwin-arm64-16.8.1" = { - name = "_at_nx_slash_nx-darwin-arm64"; - packageName = "@nx/nx-darwin-arm64"; - version = "16.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-16.8.1.tgz"; - sha512 = "xOflqyIVcyLPzdJOZcucI+5ClwnTgK8zIvpjbxHokrO9McJJglhfUyP0bbTHpEpWqzA+GaPA/6/Qdu0ATzqQBQ=="; - }; - }; - "@nx/nx-darwin-x64-16.8.1" = { - name = "_at_nx_slash_nx-darwin-x64"; - packageName = "@nx/nx-darwin-x64"; - version = "16.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-16.8.1.tgz"; - sha512 = "JJGrlOvEpDMWnM6YKaA1WOnzHgiw5vRKEowX9ba+jxhmCvtdjbLSxi228kv92JtQPPQ91zvtsNM+BFY0EbPOlA=="; - }; - }; - "@nx/nx-freebsd-x64-16.8.1" = { - name = "_at_nx_slash_nx-freebsd-x64"; - packageName = "@nx/nx-freebsd-x64"; - version = "16.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-16.8.1.tgz"; - sha512 = "aZdJQ7cIQfXOmfk4vRXvVYxuV68xz8YyhNZ0IvBfJ16uZQ+YNl4BpklRLEIdaloSbwz9M1NNewmL+AgklEBxlA=="; - }; - }; - "@nx/nx-linux-arm-gnueabihf-16.8.1" = { - name = "_at_nx_slash_nx-linux-arm-gnueabihf"; - packageName = "@nx/nx-linux-arm-gnueabihf"; - version = "16.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-16.8.1.tgz"; - sha512 = "JzjrTf7FFgikoVUbRs0hKvwHRR6SyqT4yIdk/YyiCt2mWY9w4m5DWtHM/9kJzhckkH9MY66m+X/zG6+NKsEMvg=="; - }; - }; - "@nx/nx-linux-arm64-gnu-16.8.1" = { - name = "_at_nx_slash_nx-linux-arm64-gnu"; - packageName = "@nx/nx-linux-arm64-gnu"; - version = "16.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-16.8.1.tgz"; - sha512 = "CF0s981myBWusW7iW2+fKPa7ceYYe+NO5EdKe9l27fpHDkcA71KZU3q7U823QpO/7tYvVdBevJp3CCn2/GBURQ=="; - }; - }; - "@nx/nx-linux-arm64-musl-16.8.1" = { - name = "_at_nx_slash_nx-linux-arm64-musl"; - packageName = "@nx/nx-linux-arm64-musl"; - version = "16.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-16.8.1.tgz"; - sha512 = "X4TobxRt1dALvoeKC3/t1CqZCMUqtEhGG+KQLT/51sG54HdxmTAWRFlvj8PvLH0QSBk4e+uRZAo45qpt3iSnBg=="; - }; - }; - "@nx/nx-linux-x64-gnu-16.8.1" = { - name = "_at_nx_slash_nx-linux-x64-gnu"; - packageName = "@nx/nx-linux-x64-gnu"; - version = "16.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-16.8.1.tgz"; - sha512 = "lHvv2FD14Lpxh7muMLStH2tC1opQOaepO4nXwb1LaaoIpMym7kBgCK8AQuI98/oNQiMDXMNDKWQZCjxnJGDIPw=="; - }; - }; - "@nx/nx-linux-x64-musl-16.8.1" = { - name = "_at_nx_slash_nx-linux-x64-musl"; - packageName = "@nx/nx-linux-x64-musl"; - version = "16.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-16.8.1.tgz"; - sha512 = "c4gQvNgIjggD1A5sYhftQEC1PtAhV3sEnv60X00v9wmjl57Wj4Ty0TgyzpYglLysVRiko/B58S8NYS0jKvMmeA=="; - }; - }; - "@nx/nx-win32-arm64-msvc-16.8.1" = { - name = "_at_nx_slash_nx-win32-arm64-msvc"; - packageName = "@nx/nx-win32-arm64-msvc"; - version = "16.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-16.8.1.tgz"; - sha512 = "GKHPy/MyGFoV9cdKgcWLZZK2vDdxt5bQ53ss0k+BDKRP+YwLKm7tJl23eeM7JdB4GLCBntEQPC+dBqxOA8Ze/w=="; - }; - }; - "@nx/nx-win32-x64-msvc-16.8.1" = { - name = "_at_nx_slash_nx-win32-x64-msvc"; - packageName = "@nx/nx-win32-x64-msvc"; - version = "16.8.1"; + version = "16.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-16.8.1.tgz"; - sha512 = "yHZ5FAcx54rVc31R0yIpniepkHMPwaxG23l8E/ZYbL1iPwE/Wc1HeUzUvxUuSXtguRp7ihcRhaUEPkcSl2EAVw=="; + url = "https://registry.npmjs.org/@nx/devkit/-/devkit-16.9.1.tgz"; + sha512 = "jQMLX8pUKsOIk0tLFzJms5awPxKfJEi0uxY7+IUfRNHcnDkOFiv6gf1QqJ3pobmgwBdbC6Nv/dhDP3JT2wA1gA=="; }; }; - "@oclif/color-1.0.11" = { + "@oclif/color-1.0.12" = { name = "_at_oclif_slash_color"; packageName = "@oclif/color"; - version = "1.0.11"; + version = "1.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/color/-/color-1.0.11.tgz"; - sha512 = "2hOJFJoaJdeEH/0D9Ek5B7Q3bV6jFVRIc7AUimqV8HiA6HGynvCcV0jb1kDK7O2h+WT3j6MO6S4IdjipwqOP4Q=="; + url = "https://registry.npmjs.org/@oclif/color/-/color-1.0.12.tgz"; + sha512 = "pz3MmtQVNwsbVsyIxEWWuSXZTViGfW1v1JjI+3fWMiJ5IqCCeImDafynPDuh7QBwzl2UmjcbmSGyGYqfaFAzJA=="; }; }; "@oclif/command-1.8.36" = { @@ -7627,22 +7465,22 @@ let sha512 = "q3gC4kIRlTilA8sG/9Eq2BEW2wo2KWV0ZbQ+8i3uQCvrgY4qoCIp5JTfsbbKR5XWaqPDdZPWhWuS1Rveu5V4FA=="; }; }; - "@oclif/plugin-help-5.2.19" = { + "@oclif/plugin-help-5.2.20" = { name = "_at_oclif_slash_plugin-help"; packageName = "@oclif/plugin-help"; - version = "5.2.19"; + version = "5.2.20"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/plugin-help/-/plugin-help-5.2.19.tgz"; - sha512 = "gf6/dFtzMJ8RA4ovlBCBGJsZsd4jPXhYWJho+Gh6KmA+Ev9LupoExbE0qT+a2uHJyHEvIg4uX/MBW3qdERD/8g=="; + url = "https://registry.npmjs.org/@oclif/plugin-help/-/plugin-help-5.2.20.tgz"; + sha512 = "u+GXX/KAGL9S10LxAwNUaWdzbEBARJ92ogmM7g3gDVud2HioCmvWQCDohNRVZ9GYV9oKwZ/M8xwd6a1d95rEKQ=="; }; }; - "@oclif/plugin-not-found-2.4.1" = { + "@oclif/plugin-not-found-2.4.2" = { name = "_at_oclif_slash_plugin-not-found"; packageName = "@oclif/plugin-not-found"; - version = "2.4.1"; + version = "2.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/plugin-not-found/-/plugin-not-found-2.4.1.tgz"; - sha512 = "LqW7qpw5Q8ploRiup2jEIMQJXcxHP1tpwj45GApKQMe7GRdGdRdjBT9Tu+U2tdEgMqgMplAIhOsYCx2nc2nMSw=="; + url = "https://registry.npmjs.org/@oclif/plugin-not-found/-/plugin-not-found-2.4.2.tgz"; + sha512 = "NT/MRj5haUhkJJGf7wiF9+PslMfceQzkn8YkmdWON/X0iMPeoEst3aa50eSZvw79id+Kckl9kneJndqrUgWu/w=="; }; }; "@oclif/plugin-plugins-2.4.7" = { @@ -7663,22 +7501,22 @@ let sha512 = "514sFBzLcR9QCSMWCHt/1XntfjJEZvb637b9YuV4kwq749pKEPF7fjCxSV1gYQCCP4TjMB5gB4AwPL4cCbe+/A=="; }; }; - "@oclif/plugin-update-3.2.3" = { + "@oclif/plugin-update-3.2.4" = { name = "_at_oclif_slash_plugin-update"; packageName = "@oclif/plugin-update"; - version = "3.2.3"; + version = "3.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/plugin-update/-/plugin-update-3.2.3.tgz"; - sha512 = "JVKwp4ysG9GU4RmG59MZYMunz8onRI+wEQzJThyYkUFd0VfZviYt2FHsyoNtxi30l0tInC8APgKp1pCCO4e+FQ=="; + url = "https://registry.npmjs.org/@oclif/plugin-update/-/plugin-update-3.2.4.tgz"; + sha512 = "41G7NTKND+yTpb8LHlvlMIcNoaEUIIJuEwju9igL+ME/pN/53opeXgFV2IjjeFiexXj50OfesY9OQ6lqOZHw+g=="; }; }; - "@oclif/plugin-warn-if-update-available-2.1.0" = { + "@oclif/plugin-warn-if-update-available-2.1.1" = { name = "_at_oclif_slash_plugin-warn-if-update-available"; packageName = "@oclif/plugin-warn-if-update-available"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/plugin-warn-if-update-available/-/plugin-warn-if-update-available-2.1.0.tgz"; - sha512 = "liTWd/qSIqALsikr88CAB9o2xGFt0LdT5REbhxtrx16/trRmkxQ+0RHK1FieGZAzEENx/4D3YcC/Y67a0uyO0g=="; + url = "https://registry.npmjs.org/@oclif/plugin-warn-if-update-available/-/plugin-warn-if-update-available-2.1.1.tgz"; + sha512 = "y7eSzT6R5bmTIJbiMMXgOlbBpcWXGlVhNeQJBLBCCy1+90Wbjyqf6uvY0i2WcO4sh/THTJ20qCW80j3XUlgDTA=="; }; }; "@oclif/screen-1.0.4" = { @@ -7690,13 +7528,13 @@ let sha512 = "60CHpq+eqnTxLZQ4PGHYNwUX572hgpMHGPtTWMjdTMsAvlm69lZV/4ly6O3sAYkomo4NggGcomrDpBe34rxUqw=="; }; }; - "@oclif/screen-3.0.6" = { + "@oclif/screen-3.0.7" = { name = "_at_oclif_slash_screen"; packageName = "@oclif/screen"; - version = "3.0.6"; + version = "3.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/screen/-/screen-3.0.6.tgz"; - sha512 = "nEv7dFPxCrWrvK6dQ8zya0/Kb54EXVcwIKV9capjSa89ZDoOo+qH0YSo4/eQVECXgW3eUvgKLDIcIt62YBk0HA=="; + url = "https://registry.npmjs.org/@oclif/screen/-/screen-3.0.7.tgz"; + sha512 = "jQBPHcMh5rcIPKdqA6xlzioLOmkaVnjg2MVyjMzBKV8hDhLWNSiZqx7NAWXpP70v2LFvGdVoV8BSbK9iID3eHg=="; }; }; "@octokit/auth-token-2.5.0" = { @@ -7780,13 +7618,13 @@ let sha512 = "VsXyi8peyRq9PqIz/tpqiL2w3w80OgVMwBHltTml3LmVvXiphgeqmY9mvBw9Wu7e0QWk/fqD37ux8yP5uVekyQ=="; }; }; - "@octokit/openapi-types-18.0.0" = { + "@octokit/openapi-types-18.1.1" = { name = "_at_octokit_slash_openapi-types"; packageName = "@octokit/openapi-types"; - version = "18.0.0"; + version = "18.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-18.0.0.tgz"; - sha512 = "V8GImKs3TeQRxRtXFpG2wl19V7444NIOTDF24AWuIbmNaNYOQMWRbjcGDXV5B+0n887fgDcuMNOmlul+k+oJtw=="; + url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-18.1.1.tgz"; + sha512 = "VRaeH8nCDtF5aXWnjPuEMIYf1itK/s3JYyJcWFJT8X9pSNnBtriDf7wlEWsGuhPLl4QIH4xM8fqTXDwJ3Mu6sw=="; }; }; "@octokit/plugin-enterprise-rest-6.0.1" = { @@ -7843,24 +7681,6 @@ let sha512 = "I5Gml6kTAkzVlN7KCtjOM+Ruwe/rQppp0QU372K1GP7kNOYEKe8Xn5BW4sE62JAHdwpq95OQK/qGNyKQMUzVgA=="; }; }; - "@octokit/plugin-retry-3.0.9" = { - name = "_at_octokit_slash_plugin-retry"; - packageName = "@octokit/plugin-retry"; - version = "3.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-retry/-/plugin-retry-3.0.9.tgz"; - sha512 = "r+fArdP5+TG6l1Rv/C9hVoty6tldw6cE2pRHNGmFPdyfrc696R6JjrQ3d7HdVqGwuzfyrcaLAKD7K8TX8aehUQ=="; - }; - }; - "@octokit/plugin-throttling-3.7.0" = { - name = "_at_octokit_slash_plugin-throttling"; - packageName = "@octokit/plugin-throttling"; - version = "3.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-throttling/-/plugin-throttling-3.7.0.tgz"; - sha512 = "qrKT1Yl/KuwGSC6/oHpLBot3ooC9rq0/ryDYBCpkRtoj+R8T47xTMDT6Tk2CxWopFota/8Pi/2SqArqwC0JPow=="; - }; - }; "@octokit/request-5.6.3" = { name = "_at_octokit_slash_request"; packageName = "@octokit/request"; @@ -8050,67 +7870,67 @@ let sha512 = "+fguCd2d8d2qruk0H0DsCEy2CTK3t0Tugg7MhZ/UQMvmewbZLNnJ6heSYyzIZWG5IPfAXzoj4f4F/qpM7l4VBA=="; }; }; - "@orval/angular-6.17.0" = { + "@orval/angular-6.18.1" = { name = "_at_orval_slash_angular"; packageName = "@orval/angular"; - version = "6.17.0"; + version = "6.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/angular/-/angular-6.17.0.tgz"; - sha512 = "MW1tySUMXGqLNrImjdQ7ezy2tpOowkTwWgh71n0N8mm/wAr3h3AUqTkXs8ZIdI/rlG9aCV5tRbm/NQSC1KaPjA=="; + url = "https://registry.npmjs.org/@orval/angular/-/angular-6.18.1.tgz"; + sha512 = "kyuqiKyNH1NxrMBZheGTYOU+Gfz4J9Re4MEGUvIVd3Y2Pq4+9zBT+oO3O5LYziquA1viDrzBPEK2LIroHze1Cg=="; }; }; - "@orval/axios-6.17.0" = { + "@orval/axios-6.18.1" = { name = "_at_orval_slash_axios"; packageName = "@orval/axios"; - version = "6.17.0"; + version = "6.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/axios/-/axios-6.17.0.tgz"; - sha512 = "S40tnHRAhXBnDqAIfLCjgJuhUrFrPCCi9ARVIjhiM8R1EkVwI/ApWNuwZj48eqbzICTojaC+jVWY54TDkZ02hg=="; + url = "https://registry.npmjs.org/@orval/axios/-/axios-6.18.1.tgz"; + sha512 = "r6cciQatrDb0vWFWEekJYBBL3DE+egbSbGWr938SK5xx/bCLgEQqtDeT3HTS2iGFC8evADH52L0xdx5J/7I/WQ=="; }; }; - "@orval/core-6.17.0" = { + "@orval/core-6.18.1" = { name = "_at_orval_slash_core"; packageName = "@orval/core"; - version = "6.17.0"; + version = "6.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/core/-/core-6.17.0.tgz"; - sha512 = "WrGaG4Ri+AW7oiDNErlVLNs/SdMI/TQGz5VObOP3Q7gek2IsVqE4mr/X7zrMZxbZhrUuIl207mltFdqc4zCgNA=="; + url = "https://registry.npmjs.org/@orval/core/-/core-6.18.1.tgz"; + sha512 = "sL6U9tVDhfrYPk50JXLhotBGzT7xePLlgT2ZEQmn9+lUBL0j9zk9oXrSgNsCE+mKVPiVOAXt96FXNUOKUaCE6Q=="; }; }; - "@orval/msw-6.17.0" = { + "@orval/msw-6.18.1" = { name = "_at_orval_slash_msw"; packageName = "@orval/msw"; - version = "6.17.0"; + version = "6.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/msw/-/msw-6.17.0.tgz"; - sha512 = "/awk0JBOg5oO7bw9ZlVguvJAngFKi9roTV35XpCUtcGG4Sw9KtujLZ2T3lMvEy5wxWoMFD2UAoH7Ob1uAJpZJQ=="; + url = "https://registry.npmjs.org/@orval/msw/-/msw-6.18.1.tgz"; + sha512 = "U/+YzhdgEnT7jYfxD4fqGLmboL20U2Rh85HJEpPT59NbpaizI/cMIpr3CWVPRakPPdWzxrc21E5OK7Z/a05qdw=="; }; }; - "@orval/query-6.17.0" = { + "@orval/query-6.18.1" = { name = "_at_orval_slash_query"; packageName = "@orval/query"; - version = "6.17.0"; + version = "6.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/query/-/query-6.17.0.tgz"; - sha512 = "YXvHjz2PcRd7faw9PYsqyRx+0ES5G0IS1JjYFWGoOYy6saSaRLVAYte8ABJJ8Sju8fxzba/BzQBgTZfe3BP8Zw=="; + url = "https://registry.npmjs.org/@orval/query/-/query-6.18.1.tgz"; + sha512 = "c7O1m6+DSLCbvIKwEvkfh0JccTvp+BFiZKWskXDdjMgasyrZDj5Aa1Jh8vsbtiofJnLqbevCMqaidNSKe561tA=="; }; }; - "@orval/swr-6.17.0" = { + "@orval/swr-6.18.1" = { name = "_at_orval_slash_swr"; packageName = "@orval/swr"; - version = "6.17.0"; + version = "6.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/swr/-/swr-6.17.0.tgz"; - sha512 = "entOSyODgDCXwOwE+aBAlg+LdmwhFNCg/0y/v5tuIfVTP5vhwTcqJFYGIZvMT9xittxTss7bAbiDQ9zOReU/Qg=="; + url = "https://registry.npmjs.org/@orval/swr/-/swr-6.18.1.tgz"; + sha512 = "z9bA9KlYMobBNMdEnAg/WFbZllwTh6aU96lcpwuZn4sKl0+2Dxu7TKWm2wxMfhH11Qju85yLob7WyqDIytNoNQ=="; }; }; - "@orval/zod-6.17.0" = { + "@orval/zod-6.18.1" = { name = "_at_orval_slash_zod"; packageName = "@orval/zod"; - version = "6.17.0"; + version = "6.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/zod/-/zod-6.17.0.tgz"; - sha512 = "ff0HSMC9LUVNreulsdx5hKy6lkoayZBcFn9bbk9BmFpbMCynjPOLXOpXwjHhWgny0HP66gjZtp5uOEtvVkWoMg=="; + url = "https://registry.npmjs.org/@orval/zod/-/zod-6.18.1.tgz"; + sha512 = "gGGsa+sGtb7Q+Ah5GWU1wC6b/phQ2OVldpsyvqTzMVdsXB6i1P79HplPBRMxeDub/gE7dp1xJm2xy/8lG/j1NA=="; }; }; "@parcel/bundler-default-2.9.3" = { @@ -8914,15 +8734,6 @@ let sha512 = "OLkDZSqkA1mkoPNPvLFXyI6fb0enCuFji6Zfditi/CLAo9kmIhQFmEUDu4krSB8i908EljG8YwL5Xjxzm5wsWA=="; }; }; - "@polka/url-1.0.0-next.23" = { - name = "_at_polka_slash_url"; - packageName = "@polka/url"; - version = "1.0.0-next.23"; - src = fetchurl { - url = "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.23.tgz"; - sha512 = "C16M+IYz0rgRhWZdCmK+h58JMv8vijAA61gmz2rspCSwKwzBebpdcsiUmwrtJRdphuY30i6BSLEOP8ppbNLyLg=="; - }; - }; "@prisma/engines-5.3.1" = { name = "_at_prisma_slash_engines"; packageName = "@prisma/engines"; @@ -9031,15 +8842,6 @@ let sha512 = "Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw=="; }; }; - "@puppeteer/browsers-0.5.0" = { - name = "_at_puppeteer_slash_browsers"; - packageName = "@puppeteer/browsers"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-0.5.0.tgz"; - sha512 = "Uw6oB7VvmPRLE4iKsjuOh8zgDabhNX67dzo8U/BB0f9527qx+4eeUs+korU98OhG5C4ubg7ufBgVi63XYwS6TQ=="; - }; - }; "@putdotio/api-client-8.37.0" = { name = "_at_putdotio_slash_api-client"; packageName = "@putdotio/api-client"; @@ -9112,6 +8914,15 @@ let sha512 = "OFp0q4SGrTH0Mruf6oFsHGea58u8vS/iI5+NpYdicaM+7BgqBZH8FFvNZ8rYYLrUO/QRqMq72NpXmxLVNcdmjA=="; }; }; + "@remix-run/router-1.8.0" = { + name = "_at_remix-run_slash_router"; + packageName = "@remix-run/router"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@remix-run/router/-/router-1.8.0.tgz"; + sha512 = "mrfKqIHnSZRyIzBcanNJmVQELTnX+qagEDlcKO90RgRBVOZGSGvZKeDihTRfWcqoDn5N/NkUcwWTccnpN18Tfg=="; + }; + }; "@repeaterjs/repeater-3.0.4" = { name = "_at_repeaterjs_slash_repeater"; packageName = "@repeaterjs/repeater"; @@ -9265,112 +9076,112 @@ let sha512 = "iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ=="; }; }; - "@rushstack/heft-config-file-0.13.3" = { + "@rushstack/heft-config-file-0.14.1" = { name = "_at_rushstack_slash_heft-config-file"; packageName = "@rushstack/heft-config-file"; - version = "0.13.3"; + version = "0.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/heft-config-file/-/heft-config-file-0.13.3.tgz"; - sha512 = "r9tmesrmnjw6hdXfBGQ0Dc58eLu7kJcgY2JWJmO9s6kpx1b/fhvHpXj1x+pSLp5f+R5ZB3ELezYfrQK0SOCEvg=="; + url = "https://registry.npmjs.org/@rushstack/heft-config-file/-/heft-config-file-0.14.1.tgz"; + sha512 = "PO4NvZX/HtasfRh6Izt/kGxZ0RxFF5CEu+0KER2/0y4KBPsSpuLhNOIwiQpAkYqWjCs95DEl8FZDSRCSRpZwiw=="; }; }; - "@rushstack/node-core-library-3.59.7" = { + "@rushstack/node-core-library-3.60.1" = { name = "_at_rushstack_slash_node-core-library"; packageName = "@rushstack/node-core-library"; - version = "3.59.7"; + version = "3.60.1"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-3.59.7.tgz"; - sha512 = "ln1Drq0h+Hwa1JVA65x5mlSgUrBa1uHL+V89FqVWQgXd1vVIMhrtqtWGQrhTnFHxru5ppX+FY39VWELF/FjQCw=="; + url = "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-3.60.1.tgz"; + sha512 = "cWKCImfezPvILKu5eUPkz0Mp/cO/zOSJdPD64KHliBcdmbPHg/sF4rEL7WJkWywXT1RQ/U/N8uKdXMe7jDCXNw=="; }; }; - "@rushstack/package-deps-hash-4.0.44" = { + "@rushstack/package-deps-hash-4.1.5" = { name = "_at_rushstack_slash_package-deps-hash"; packageName = "@rushstack/package-deps-hash"; - version = "4.0.44"; + version = "4.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/package-deps-hash/-/package-deps-hash-4.0.44.tgz"; - sha512 = "3TicOuPpDOyl1wWvkaFwYvMgvC2tiqBIZkNbYuSntYCu4i5dh1wUC07Rfnm/K7s3/gNJgZCvOLIxetvUqfv0hg=="; + url = "https://registry.npmjs.org/@rushstack/package-deps-hash/-/package-deps-hash-4.1.5.tgz"; + sha512 = "FKNaypRvnX1DZVcAmZsjk9DgiZkK8E8jiWF1On8XUANBaNUMmVi11lSbnbQSpeOm5Eym6aiQTVm/Kic/xyqNFw=="; }; }; - "@rushstack/package-extractor-0.5.3" = { + "@rushstack/package-extractor-0.6.6" = { name = "_at_rushstack_slash_package-extractor"; packageName = "@rushstack/package-extractor"; - version = "0.5.3"; + version = "0.6.6"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/package-extractor/-/package-extractor-0.5.3.tgz"; - sha512 = "YqEtaspIyd4CpxGDgxpI7p5CvkrYBrg2A8U/RWYvKcTMA+y3fnndHFR3KQNsbbEGa0iGeb2A0w7dScMe7Yo9kw=="; + url = "https://registry.npmjs.org/@rushstack/package-extractor/-/package-extractor-0.6.6.tgz"; + sha512 = "qzZ/MXQ9SGWooFfSECEst6HbX34li3spgl//0Srx2YEghcSYAeJo26x5Ani+86GWXFpw3WifnZnXQ4k6sfJr5w=="; }; }; - "@rushstack/rig-package-0.4.1" = { + "@rushstack/rig-package-0.5.1" = { name = "_at_rushstack_slash_rig-package"; packageName = "@rushstack/rig-package"; - version = "0.4.1"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/rig-package/-/rig-package-0.4.1.tgz"; - sha512 = "AGRwpqlXNSp9LhUSz4HKI9xCluqQDt/obsQFdv/NYIekF3pTTPzc+HbQsIsjVjYnJ3DcmxOREVMhvrMEjpiq6g=="; + url = "https://registry.npmjs.org/@rushstack/rig-package/-/rig-package-0.5.1.tgz"; + sha512 = "pXRYSe29TjRw7rqxD4WS3HN/sRSbfr+tJs4a9uuaSIBAITbUggygdhuG0VrO0EO+QqH91GhYMN4S6KRtOEmGVA=="; }; }; - "@rushstack/rush-amazon-s3-build-cache-plugin-5.106.0" = { + "@rushstack/rush-amazon-s3-build-cache-plugin-5.107.4" = { name = "_at_rushstack_slash_rush-amazon-s3-build-cache-plugin"; packageName = "@rushstack/rush-amazon-s3-build-cache-plugin"; - version = "5.106.0"; + version = "5.107.4"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/rush-amazon-s3-build-cache-plugin/-/rush-amazon-s3-build-cache-plugin-5.106.0.tgz"; - sha512 = "WvYsnPfCgNb4g4vzyX+AzxZe40BThLhaFx8VO7zz758auxq3VcKmSO5vjOlc1VI9rB+Ualf5qyNrtsXyVEcAZQ=="; + url = "https://registry.npmjs.org/@rushstack/rush-amazon-s3-build-cache-plugin/-/rush-amazon-s3-build-cache-plugin-5.107.4.tgz"; + sha512 = "H0/1kK1SPCzBpIgKZ5ZZp904jPoTD/oe+Oac1sXyIUf436/oTFzsode2CJJClAD3NzjKAX/+PHBsWrfaYkDJmg=="; }; }; - "@rushstack/rush-azure-storage-build-cache-plugin-5.106.0" = { + "@rushstack/rush-azure-storage-build-cache-plugin-5.107.4" = { name = "_at_rushstack_slash_rush-azure-storage-build-cache-plugin"; packageName = "@rushstack/rush-azure-storage-build-cache-plugin"; - version = "5.106.0"; + version = "5.107.4"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/rush-azure-storage-build-cache-plugin/-/rush-azure-storage-build-cache-plugin-5.106.0.tgz"; - sha512 = "KpENq4eUBGm7gcZbH8PbxMC1vnrvMjEPu4HnaFxMbogpSGEWsasSGBFYX2KIQ0/U+eDEMekWdz1eslA8TtsWZg=="; + url = "https://registry.npmjs.org/@rushstack/rush-azure-storage-build-cache-plugin/-/rush-azure-storage-build-cache-plugin-5.107.4.tgz"; + sha512 = "OQTaGxyrnGrC4/yCjkB4Pb/qPefTACmeZqJnOZ1oFPkeuc4o4bB7D0d4mCrKeFL3P47qfhEkuEYDEErQ8Wm9qg=="; }; }; - "@rushstack/rush-http-build-cache-plugin-5.106.0" = { + "@rushstack/rush-http-build-cache-plugin-5.107.4" = { name = "_at_rushstack_slash_rush-http-build-cache-plugin"; packageName = "@rushstack/rush-http-build-cache-plugin"; - version = "5.106.0"; + version = "5.107.4"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/rush-http-build-cache-plugin/-/rush-http-build-cache-plugin-5.106.0.tgz"; - sha512 = "TCWNju8V/j7zjanpgNzGc8NXeFiCh+2JXUzz8GvVt/3X1HWvXEB/ETXzpb5sgzkM3EO7+2htd9PqHgjAKIAtkg=="; + url = "https://registry.npmjs.org/@rushstack/rush-http-build-cache-plugin/-/rush-http-build-cache-plugin-5.107.4.tgz"; + sha512 = "fJrE9g5LBobvDLCWqwk9UjkAdEdPE81HCO80kE8DfmCTLqSqEFbonCB49ReIGOsdRg9JxIULYSNc1Owa9yy8UQ=="; }; }; - "@rushstack/rush-sdk-5.106.0" = { + "@rushstack/rush-sdk-5.107.4" = { name = "_at_rushstack_slash_rush-sdk"; packageName = "@rushstack/rush-sdk"; - version = "5.106.0"; + version = "5.107.4"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/rush-sdk/-/rush-sdk-5.106.0.tgz"; - sha512 = "q1fIEyZ6IPY6Y+q94ddZCjA6JsYLDKeZ8WhJ4+Ae+MfscPPN/h7k/ts3ZfSFYbUIUBUPQGhZjWHMRg2nUOr+Ow=="; + url = "https://registry.npmjs.org/@rushstack/rush-sdk/-/rush-sdk-5.107.4.tgz"; + sha512 = "SJyr6ZQqLTc58sxnI50WzDRegIv+KkgKpixjrUz/rOJJfeiw5aBO+DU/tSGDOnuAdJUWYZFUGiLCLmMOrJmDOQ=="; }; }; - "@rushstack/stream-collator-4.0.263" = { + "@rushstack/stream-collator-4.1.6" = { name = "_at_rushstack_slash_stream-collator"; packageName = "@rushstack/stream-collator"; - version = "4.0.263"; + version = "4.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/stream-collator/-/stream-collator-4.0.263.tgz"; - sha512 = "rfESRMUBDCaqihnJW/B8D7UmJ/wRnmpZaZY/T1GRTVb0uSasL0LR6O9Zg6hTjqFTXDUN5lIVFRvZZ8dpW3TFbg=="; + url = "https://registry.npmjs.org/@rushstack/stream-collator/-/stream-collator-4.1.6.tgz"; + sha512 = "rJbQmEsEEPE4guuQuppaSF3XayDya5lSexFE4GK35rMo51CWvKYP94e0RZ13bd0GgipaAy3x2ASMtifbr8ShnA=="; }; }; - "@rushstack/terminal-0.5.38" = { + "@rushstack/terminal-0.7.5" = { name = "_at_rushstack_slash_terminal"; packageName = "@rushstack/terminal"; - version = "0.5.38"; + version = "0.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/terminal/-/terminal-0.5.38.tgz"; - sha512 = "cHnVU0k91PQPhFDa2HYqsF4jBgg597ySRKmIqvjf/XXoCsY+AjAP1H8XbzV6mNDRiJODTaCmb0IqHYYjpIoLZw=="; + url = "https://registry.npmjs.org/@rushstack/terminal/-/terminal-0.7.5.tgz"; + sha512 = "eDrGrhlOi2IOR5bjJ5ILjNz2Q4B8VpCtUnVPBrLZEhjDqlHzblzEt/AeKRo1aIk0n2NsbgdQH9pi8+0TJLDLrA=="; }; }; - "@rushstack/ts-command-line-4.15.2" = { + "@rushstack/ts-command-line-4.16.1" = { name = "_at_rushstack_slash_ts-command-line"; packageName = "@rushstack/ts-command-line"; - version = "4.15.2"; + version = "4.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.15.2.tgz"; - sha512 = "5+C2uoJY8b+odcZD6coEe2XNC4ZjGB4vCMESbqW/8DHRWC/qIHfANdmN9F1wz/lAgxz72i7xRoVtPY2j7e4gpQ=="; + url = "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.16.1.tgz"; + sha512 = "+OCsD553GYVLEmz12yiFjMOzuPeCiZ3f8wTiFHL30ZVXexTyPmgjwXEhg2K2P0a2lVf+8YBy7WtPoflB2Fp8/A=="; }; }; "@samverschueren/stream-to-observable-0.3.1" = { @@ -9382,13 +9193,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-16.2.2" = { + "@schematics/angular-16.2.4" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "16.2.2"; + version = "16.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-16.2.2.tgz"; - sha512 = "OqPhpodkQx9pzSz7H2AGeEbf3ut6WOkJFP2YlX2JIGholfG/0FQMJmfTEyRoFXCBeVIDGt3sOmlfK7An0PS8uA=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-16.2.4.tgz"; + sha512 = "ZFPxn0yihdNcg5UpJvnfxIpv4GuW6nYDkgeIlYb5k/a0dKSW8wE8Akcl1JhJtdKJ0RVcn1OwZDmx028JCbZJLA=="; }; }; "@scure/base-1.1.3" = { @@ -9454,15 +9265,6 @@ let sha512 = "P33hHGdldxGabLFjPPpaTxVolMrzrcegejx+0GxjrIb9Zv48D8yAIA/QTDR2dFl7Uz7urX8aX6+5bCZslr+gWQ=="; }; }; - "@sentry-internal/tracing-7.69.0" = { - name = "_at_sentry-internal_slash_tracing"; - packageName = "@sentry-internal/tracing"; - version = "7.69.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.69.0.tgz"; - sha512 = "4BgeWZUj9MO6IgfO93C9ocP3+AdngqujF/+zB2rFdUe+y9S6koDyUC7jr9Knds/0Ta72N/0D6PwhgSCpHK8s0Q=="; - }; - }; "@sentry/core-6.19.7" = { name = "_at_sentry_slash_core"; packageName = "@sentry/core"; @@ -9472,15 +9274,6 @@ let sha512 = "tOfZ/umqB2AcHPGbIrsFLcvApdTm9ggpi/kQZFkej7kMphjT+SGBiQfYtjyg9jcRW+ilAR4JXC9BGKsdEQ+8Vw=="; }; }; - "@sentry/core-7.69.0" = { - name = "_at_sentry_slash_core"; - packageName = "@sentry/core"; - version = "7.69.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@sentry/core/-/core-7.69.0.tgz"; - sha512 = "V6jvK2lS8bhqZDMFUtvwe2XvNstFQf5A+2LMKCNBOV/NN6eSAAd6THwEpginabjet9dHsNRmMk7WNKvrUfQhZw=="; - }; - }; "@sentry/hub-6.19.7" = { name = "_at_sentry_slash_hub"; packageName = "@sentry/hub"; @@ -9508,15 +9301,6 @@ let sha512 = "gtmRC4dAXKODMpHXKfrkfvyBL3cI8y64vEi3fDD046uqYcrWdgoQsffuBbxMAizc6Ez1ia+f0Flue6p15Qaltg=="; }; }; - "@sentry/node-7.69.0" = { - name = "_at_sentry_slash_node"; - packageName = "@sentry/node"; - version = "7.69.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@sentry/node/-/node-7.69.0.tgz"; - sha512 = "T0NgPcmDQvEuz5hy6aEhXghTHHTWsiP3IWoeEAakDBHAXmtpT6lYFQZgb5AiEOt9F5KO/G/1yH3YYdpDAnKhPw=="; - }; - }; "@sentry/types-6.19.7" = { name = "_at_sentry_slash_types"; packageName = "@sentry/types"; @@ -9526,15 +9310,6 @@ let sha512 = "jH84pDYE+hHIbVnab3Hr+ZXr1v8QABfhx39KknxqKWr2l0oEItzepV0URvbEhB446lk/S/59230dlUUIBGsXbg=="; }; }; - "@sentry/types-7.69.0" = { - name = "_at_sentry_slash_types"; - packageName = "@sentry/types"; - version = "7.69.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@sentry/types/-/types-7.69.0.tgz"; - sha512 = "zPyCox0mzitzU6SIa1KIbNoJAInYDdUpdiA+PoUmMn2hFMH1llGU/cS7f4w/mAsssTlbtlBi72RMnWUCy578bw=="; - }; - }; "@sentry/utils-6.19.7" = { name = "_at_sentry_slash_utils"; packageName = "@sentry/utils"; @@ -9544,15 +9319,6 @@ let sha512 = "z95ECmE3i9pbWoXQrD/7PgkBAzJYR+iXtPuTkpBjDKs86O3mT+PXOT3BAn79w2wkn7/i3vOGD2xVr1uiMl26dA=="; }; }; - "@sentry/utils-7.69.0" = { - name = "_at_sentry_slash_utils"; - packageName = "@sentry/utils"; - version = "7.69.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.69.0.tgz"; - sha512 = "4eBixe5Y+0EGVU95R4NxH3jkkjtkE4/CmSZD4In8SCkWGSauogePtq6hyiLsZuP1QHdpPb9Kt0+zYiBb2LouBA=="; - }; - }; "@serialport/binding-mock-10.2.2" = { name = "_at_serialport_slash_binding-mock"; packageName = "@serialport/binding-mock"; @@ -9562,13 +9328,13 @@ let sha512 = "HAFzGhk9OuFMpuor7aT5G1ChPgn5qSsklTFOTUX72Rl6p0xwcSVsRtG/xaGp6bxpN7fI9D/S8THLBWbBgS6ldw=="; }; }; - "@serialport/bindings-cpp-10.8.0" = { + "@serialport/bindings-cpp-12.0.1" = { name = "_at_serialport_slash_bindings-cpp"; packageName = "@serialport/bindings-cpp"; - version = "10.8.0"; + version = "12.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/bindings-cpp/-/bindings-cpp-10.8.0.tgz"; - sha512 = "OMQNJz5kJblbmZN5UgJXLwi2XNtVLxSKmq5VyWuXQVsUIJD4l9UGHnLPqM5LD9u3HPZgDI5w7iYN7gxkQNZJUw=="; + url = "https://registry.npmjs.org/@serialport/bindings-cpp/-/bindings-cpp-12.0.1.tgz"; + sha512 = "r2XOwY2dDvbW7dKqSPIk2gzsr6M6Qpe9+/Ngs94fNaNlcTRCV02PfaoDmRgcubpNVVcLATlxSxPTIDw12dbKOg=="; }; }; "@serialport/bindings-interface-1.2.2" = { @@ -9580,112 +9346,130 @@ let sha512 = "CJaUd5bLvtM9c5dmO9rPBHPXTa9R2UwpkJ0wdh9JCYcbrPWsKz+ErvR0hBLeo7NPeiFdjFO4sonRljiw4d2XiA=="; }; }; - "@serialport/parser-byte-length-10.5.0" = { + "@serialport/parser-byte-length-12.0.0" = { name = "_at_serialport_slash_parser-byte-length"; packageName = "@serialport/parser-byte-length"; - version = "10.5.0"; + version = "12.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-byte-length/-/parser-byte-length-10.5.0.tgz"; - sha512 = "eHhr4lHKboq1OagyaXAqkemQ1XyoqbLQC8XJbvccm95o476TmEdW5d7AElwZV28kWprPW68ZXdGF2VXCkJgS2w=="; + url = "https://registry.npmjs.org/@serialport/parser-byte-length/-/parser-byte-length-12.0.0.tgz"; + sha512 = "0ei0txFAj+s6FTiCJFBJ1T2hpKkX8Md0Pu6dqMrYoirjPskDLJRgZGLqoy3/lnU1bkvHpnJO+9oJ3PB9v8rNlg=="; }; }; - "@serialport/parser-cctalk-10.5.0" = { + "@serialport/parser-cctalk-12.0.0" = { name = "_at_serialport_slash_parser-cctalk"; packageName = "@serialport/parser-cctalk"; - version = "10.5.0"; + version = "12.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-cctalk/-/parser-cctalk-10.5.0.tgz"; - sha512 = "Iwsdr03xmCKAiibLSr7b3w6ZUTBNiS+PwbDQXdKU/clutXjuoex83XvsOtYVcNZmwJlVNhAUbkG+FJzWwIa4DA=="; + url = "https://registry.npmjs.org/@serialport/parser-cctalk/-/parser-cctalk-12.0.0.tgz"; + sha512 = "0PfLzO9t2X5ufKuBO34DQKLXrCCqS9xz2D0pfuaLNeTkyGUBv426zxoMf3rsMRodDOZNbFblu3Ae84MOQXjnZw=="; }; }; - "@serialport/parser-delimiter-10.5.0" = { + "@serialport/parser-delimiter-11.0.0" = { name = "_at_serialport_slash_parser-delimiter"; packageName = "@serialport/parser-delimiter"; - version = "10.5.0"; + version = "11.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-delimiter/-/parser-delimiter-10.5.0.tgz"; - sha512 = "/uR/yT3jmrcwnl2FJU/2ySvwgo5+XpksDUR4NF/nwTS5i3CcuKS+FKi/tLzy1k8F+rCx5JzpiK+koqPqOUWArA=="; + url = "https://registry.npmjs.org/@serialport/parser-delimiter/-/parser-delimiter-11.0.0.tgz"; + sha512 = "aZLJhlRTjSmEwllLG7S4J8s8ctRAS0cbvCpO87smLvl3e4BgzbVgF6Z6zaJd3Aji2uSiYgfedCdNc4L6W+1E2g=="; }; }; - "@serialport/parser-inter-byte-timeout-10.5.0" = { + "@serialport/parser-delimiter-12.0.0" = { + name = "_at_serialport_slash_parser-delimiter"; + packageName = "@serialport/parser-delimiter"; + version = "12.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@serialport/parser-delimiter/-/parser-delimiter-12.0.0.tgz"; + sha512 = "gu26tVt5lQoybhorLTPsH2j2LnX3AOP2x/34+DUSTNaUTzu2fBXw+isVjQJpUBFWu6aeQRZw5bJol5X9Gxjblw=="; + }; + }; + "@serialport/parser-inter-byte-timeout-12.0.0" = { name = "_at_serialport_slash_parser-inter-byte-timeout"; packageName = "@serialport/parser-inter-byte-timeout"; - version = "10.5.0"; + version = "12.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-inter-byte-timeout/-/parser-inter-byte-timeout-10.5.0.tgz"; - sha512 = "WPvVlSx98HmmUF9jjK6y9mMp3Wnv6JQA0cUxLeZBgS74TibOuYG3fuUxUWGJALgAXotOYMxfXSezJ/vSnQrkhQ=="; + url = "https://registry.npmjs.org/@serialport/parser-inter-byte-timeout/-/parser-inter-byte-timeout-12.0.0.tgz"; + sha512 = "GnCh8K0NAESfhCuXAt+FfBRz1Cf9CzIgXfp7SdMgXwrtuUnCC/yuRTUFWRvuzhYKoAo1TL0hhUo77SFHUH1T/w=="; }; }; - "@serialport/parser-packet-length-10.5.0" = { + "@serialport/parser-packet-length-12.0.0" = { name = "_at_serialport_slash_parser-packet-length"; packageName = "@serialport/parser-packet-length"; - version = "10.5.0"; + version = "12.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@serialport/parser-packet-length/-/parser-packet-length-12.0.0.tgz"; + sha512 = "p1hiCRqvGHHLCN/8ZiPUY/G0zrxd7gtZs251n+cfNTn+87rwcdUeu9Dps3Aadx30/sOGGFL6brIRGK4l/t7MuQ=="; + }; + }; + "@serialport/parser-readline-11.0.0" = { + name = "_at_serialport_slash_parser-readline"; + packageName = "@serialport/parser-readline"; + version = "11.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-packet-length/-/parser-packet-length-10.5.0.tgz"; - sha512 = "jkpC/8w4/gUBRa2Teyn7URv1D7T//0lGj27/4u9AojpDVXsR6dtdcTG7b7dNirXDlOrSLvvN7aS5/GNaRlEByw=="; + url = "https://registry.npmjs.org/@serialport/parser-readline/-/parser-readline-11.0.0.tgz"; + sha512 = "rRAivhRkT3YO28WjmmG4FQX6L+KMb5/ikhyylRfzWPw0nSXy97+u07peS9CbHqaNvJkMhH1locp2H36aGMOEIA=="; }; }; - "@serialport/parser-readline-10.5.0" = { + "@serialport/parser-readline-12.0.0" = { name = "_at_serialport_slash_parser-readline"; packageName = "@serialport/parser-readline"; - version = "10.5.0"; + version = "12.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-readline/-/parser-readline-10.5.0.tgz"; - sha512 = "0aXJknodcl94W9zSjvU+sLdXiyEG2rqjQmvBWZCr8wJZjWEtv3RgrnYiWq4i2OTOyC8C/oPK8ZjpBjQptRsoJQ=="; + url = "https://registry.npmjs.org/@serialport/parser-readline/-/parser-readline-12.0.0.tgz"; + sha512 = "O7cywCWC8PiOMvo/gglEBfAkLjp/SENEML46BXDykfKP5mTPM46XMaX1L0waWU6DXJpBgjaL7+yX6VriVPbN4w=="; }; }; - "@serialport/parser-ready-10.5.0" = { + "@serialport/parser-ready-12.0.0" = { name = "_at_serialport_slash_parser-ready"; packageName = "@serialport/parser-ready"; - version = "10.5.0"; + version = "12.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-ready/-/parser-ready-10.5.0.tgz"; - sha512 = "QIf65LTvUoxqWWHBpgYOL+soldLIIyD1bwuWelukem2yDZVWwEjR288cLQ558BgYxH4U+jLAQahhqoyN1I7BaA=="; + url = "https://registry.npmjs.org/@serialport/parser-ready/-/parser-ready-12.0.0.tgz"; + sha512 = "ygDwj3O4SDpZlbrRUraoXIoIqb8sM7aMKryGjYTIF0JRnKeB1ys8+wIp0RFMdFbO62YriUDextHB5Um5cKFSWg=="; }; }; - "@serialport/parser-regex-10.5.0" = { + "@serialport/parser-regex-12.0.0" = { name = "_at_serialport_slash_parser-regex"; packageName = "@serialport/parser-regex"; - version = "10.5.0"; + version = "12.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-regex/-/parser-regex-10.5.0.tgz"; - sha512 = "9jnr9+PCxRoLjtGs7uxwsFqvho+rxuJlW6ZWSB7oqfzshEZWXtTJgJRgac/RuLft4hRlrmRz5XU40i3uoL4HKw=="; + url = "https://registry.npmjs.org/@serialport/parser-regex/-/parser-regex-12.0.0.tgz"; + sha512 = "dCAVh4P/pZrLcPv9NJ2mvPRBg64L5jXuiRxIlyxxdZGH4WubwXVXY/kBTihQmiAMPxbT3yshSX8f2+feqWsxqA=="; }; }; - "@serialport/parser-slip-encoder-10.5.0" = { + "@serialport/parser-slip-encoder-12.0.0" = { name = "_at_serialport_slash_parser-slip-encoder"; packageName = "@serialport/parser-slip-encoder"; - version = "10.5.0"; + version = "12.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-slip-encoder/-/parser-slip-encoder-10.5.0.tgz"; - sha512 = "wP8m+uXQdkWSa//3n+VvfjLthlabwd9NiG6kegf0fYweLWio8j4pJRL7t9eTh2Lbc7zdxuO0r8ducFzO0m8CQw=="; + url = "https://registry.npmjs.org/@serialport/parser-slip-encoder/-/parser-slip-encoder-12.0.0.tgz"; + sha512 = "0APxDGR9YvJXTRfY+uRGhzOhTpU5akSH183RUcwzN7QXh8/1jwFsFLCu0grmAUfi+fItCkR+Xr1TcNJLR13VNA=="; }; }; - "@serialport/parser-spacepacket-10.5.0" = { + "@serialport/parser-spacepacket-12.0.0" = { name = "_at_serialport_slash_parser-spacepacket"; packageName = "@serialport/parser-spacepacket"; - version = "10.5.0"; + version = "12.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-spacepacket/-/parser-spacepacket-10.5.0.tgz"; - sha512 = "BEZ/HAEMwOd8xfuJSeI/823IR/jtnThovh7ils90rXD4DPL1ZmrP4abAIEktwe42RobZjIPfA4PaVfyO0Fjfhg=="; + url = "https://registry.npmjs.org/@serialport/parser-spacepacket/-/parser-spacepacket-12.0.0.tgz"; + sha512 = "dozONxhPC/78pntuxpz/NOtVps8qIc/UZzdc/LuPvVsqCoJXiRxOg6ZtCP/W58iibJDKPZPAWPGYeZt9DJxI+Q=="; }; }; - "@serialport/stream-10.5.0" = { + "@serialport/stream-12.0.0" = { name = "_at_serialport_slash_stream"; packageName = "@serialport/stream"; - version = "10.5.0"; + version = "12.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serialport/stream/-/stream-10.5.0.tgz"; - sha512 = "gbcUdvq9Kyv2HsnywS7QjnEB28g+6OGB5Z8TLP7X+UPpoMIWoUsoQIq5Kt0ZTgMoWn3JGM2lqwTsSHF+1qhniA=="; + url = "https://registry.npmjs.org/@serialport/stream/-/stream-12.0.0.tgz"; + sha512 = "9On64rhzuqKdOQyiYLYv2lQOh3TZU/D3+IWCR5gk0alPel2nwpp4YwDEGiUBfrQZEdQ6xww0PWkzqth4wqwX3Q=="; }; }; - "@serverless/dashboard-plugin-6.4.0" = { + "@serverless/dashboard-plugin-7.0.5" = { name = "_at_serverless_slash_dashboard-plugin"; packageName = "@serverless/dashboard-plugin"; - version = "6.4.0"; + version = "7.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/dashboard-plugin/-/dashboard-plugin-6.4.0.tgz"; - sha512 = "2yJQym94sXZhEFbcOVRMJgJ4a2H9Qly94UeUesPwf8bfWCxtiB4l5rxLnCB2aLTuUf/djcuD5/VrNPY1pRU7DA=="; + url = "https://registry.npmjs.org/@serverless/dashboard-plugin/-/dashboard-plugin-7.0.5.tgz"; + sha512 = "OpZJpldLCJmQ/JCvuSCbWaNd6CprQ8yDi9lqrpP3WeR61jOGG8JFxmMs6hjpDd9bKyUMnQ9qAJ+C+QbAxdUosw=="; }; }; "@serverless/event-mocks-1.1.1" = { @@ -9706,31 +9490,31 @@ let sha512 = "urL7SNefRqC2EOFDcpvm8fyn/06B5yXWneKpyGw7ylGt0Qr9JHZCB9TiUeTkIpPUNz0jTvKUaJ2+M/JNEiaVIA=="; }; }; - "@serverless/utils-6.13.1" = { + "@serverless/utils-6.15.0" = { name = "_at_serverless_slash_utils"; packageName = "@serverless/utils"; - version = "6.13.1"; + version = "6.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils/-/utils-6.13.1.tgz"; - sha512 = "yokWzlsIaAd3TWzNgIDz6l8HZmtYZs9caaLuheZ0IiZ/bDWSCLBWn84HKkdWZOmFnYxejyPNJEOwE59mtSR3Ow=="; + url = "https://registry.npmjs.org/@serverless/utils/-/utils-6.15.0.tgz"; + sha512 = "7eDbqKv/OBd11jjdZjUwFGN8sHWkeUqLeHXHQxQ1azja2IM7WIH+z/aLgzR6LhB3/MINNwtjesDpjGqTMj2JKQ=="; }; }; - "@shopify/cli-kit-3.49.3" = { + "@shopify/cli-kit-3.49.5" = { name = "_at_shopify_slash_cli-kit"; packageName = "@shopify/cli-kit"; - version = "3.49.3"; + version = "3.49.5"; src = fetchurl { - url = "https://registry.npmjs.org/@shopify/cli-kit/-/cli-kit-3.49.3.tgz"; - sha512 = "CGJu2WPwMT058XBYyxDNXhdqhHvKwTmq3VjQGbVlDeHvEUO1ePM4PfTHRp1kF45h6aSKvD5PAMHYelplQit5zg=="; + url = "https://registry.npmjs.org/@shopify/cli-kit/-/cli-kit-3.49.5.tgz"; + sha512 = "Ydoh3L2n3X5yiCIN3WpEkRSAFqnyfvk4DJV1btATF+hxnHVdS/w6NzZi1ZVZpE7t3ShN7UylovFARyerVZwYAg=="; }; }; - "@shopify/plugin-did-you-mean-3.49.3" = { + "@shopify/plugin-did-you-mean-3.49.5" = { name = "_at_shopify_slash_plugin-did-you-mean"; packageName = "@shopify/plugin-did-you-mean"; - version = "3.49.3"; + version = "3.49.5"; src = fetchurl { - url = "https://registry.npmjs.org/@shopify/plugin-did-you-mean/-/plugin-did-you-mean-3.49.3.tgz"; - sha512 = "sSMyQ8l5KnZRhLNVgAfQ5ADfoeWbUlqEWifDeNck/TZWN1tSKdaw6Kr/unGicavcM1ug3zeP591D4ZPzWrqRYQ=="; + url = "https://registry.npmjs.org/@shopify/plugin-did-you-mean/-/plugin-did-you-mean-3.49.5.tgz"; + sha512 = "kXyn/6oVt8TrFhXhN2kzDwNuDgd/fayS33AiV2RtjbZi0qbCNUyX3nk7WD98K+xjt9dhrV+CuAHq3dZopjggKw=="; }; }; "@sideway/address-4.1.4" = { @@ -9886,13 +9670,13 @@ let sha512 = "TV7t8GKYaJWsn00tFDqBw8+Uqmr8A0fRU1tvTQhyZzGv0sJCGRQL3JGMI3ucuKo3XIZdUP+Lx7/gh2t3lewy7g=="; }; }; - "@smithy/abort-controller-2.0.8" = { + "@smithy/abort-controller-2.0.10" = { name = "_at_smithy_slash_abort-controller"; packageName = "@smithy/abort-controller"; - version = "2.0.8"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-2.0.8.tgz"; - sha512 = "2SOdVj5y0zE37Y9scSXoizoxgi6mgnDabi7a/SOfhl0p+50I0rIkuJTfyAuTPDtQ7e5dD6tSZPCLB3c/YM6Zig=="; + url = "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-2.0.10.tgz"; + sha512 = "xn7PnFD3m4rQIG00h1lPuDVnC2QMtTFhzRLX3y56KkgFaCysS7vpNevNBgmNUtmJ4eVFc+66Zucwo2KDLdicOg=="; }; }; "@smithy/chunked-blob-reader-2.0.0" = { @@ -9913,112 +9697,112 @@ let sha512 = "HM8V2Rp1y8+1343tkZUKZllFhEQPNmpNdgFAncbTsxkZ18/gqjk23XXv3qGyXWp412f3o43ZZ1UZHVcHrpRnCQ=="; }; }; - "@smithy/config-resolver-2.0.9" = { + "@smithy/config-resolver-2.0.11" = { name = "_at_smithy_slash_config-resolver"; packageName = "@smithy/config-resolver"; - version = "2.0.9"; + version = "2.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-2.0.9.tgz"; - sha512 = "QBkGPLUqyPmis9Erz8v4q5lo/ErnF7+GD5WZHa6JZiXopUPfaaM+B21n8gzS5xCkIXZmnwzNQhObP9xQPu8oqQ=="; + url = "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-2.0.11.tgz"; + sha512 = "q97FnlUmbai1c4JlQJgLVBsvSxgV/7Nvg/JK76E1nRq/U5UM56Eqo3dn2fY7JibqgJLg4LPsGdwtIyqyOk35CQ=="; }; }; - "@smithy/credential-provider-imds-2.0.11" = { + "@smithy/credential-provider-imds-2.0.13" = { name = "_at_smithy_slash_credential-provider-imds"; packageName = "@smithy/credential-provider-imds"; - version = "2.0.11"; + version = "2.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-2.0.11.tgz"; - sha512 = "uJJs8dnM5iXkn8a2GaKvlKMhcOJ+oJPYqY9gY3CM/EieCVObIDjxUtR/g8lU/k/A+OauA78GzScAfulmFjPOYA=="; + url = "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-2.0.13.tgz"; + sha512 = "/xe3wNoC4j+BeTemH9t2gSKLBfyZmk8LXB2pQm/TOEYi+QhBgT+PSolNDfNAhrR68eggNE17uOimsrnwSkCt4w=="; }; }; - "@smithy/eventstream-codec-2.0.8" = { + "@smithy/eventstream-codec-2.0.10" = { name = "_at_smithy_slash_eventstream-codec"; packageName = "@smithy/eventstream-codec"; - version = "2.0.8"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-2.0.8.tgz"; - sha512 = "onO4to8ujCKn4m5XagReT9Nc6FlNG5vveuvjp1H7AtaG7njdet1LOl6/jmUOkskF2C/w+9jNw3r9Ak+ghOvN0A=="; + url = "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-2.0.10.tgz"; + sha512 = "3SSDgX2nIsFwif6m+I4+ar4KDcZX463Noes8ekBgQHitULiWvaDZX8XqPaRQSQ4bl1vbeVXHklJfv66MnVO+lw=="; }; }; - "@smithy/eventstream-serde-browser-2.0.8" = { + "@smithy/eventstream-serde-browser-2.0.10" = { name = "_at_smithy_slash_eventstream-serde-browser"; packageName = "@smithy/eventstream-serde-browser"; - version = "2.0.8"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-2.0.8.tgz"; - sha512 = "/RGlkKUnC0sd+xKBKH/2APSBRmVMZTeLOKZMhrZmrO+ONoU+DwyMr/RLJ6WnmBKN+2ebjffM4pcIJTKLNNDD8g=="; + url = "https://registry.npmjs.org/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-2.0.10.tgz"; + sha512 = "/NSUNrWedO9Se80jo/2WcPvqobqCM/0drZ03Kqn1GZpGwVTsdqNj7frVTCUJs/W/JEzOShdMv8ewoKIR7RWPmA=="; }; }; - "@smithy/eventstream-serde-config-resolver-2.0.8" = { + "@smithy/eventstream-serde-config-resolver-2.0.10" = { name = "_at_smithy_slash_eventstream-serde-config-resolver"; packageName = "@smithy/eventstream-serde-config-resolver"; - version = "2.0.8"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-2.0.8.tgz"; - sha512 = "EyAEj258eMUv9zcMvBbqrInh2eHRYuiwQAjXDMxZFCyP+JePzQB6O++3wFwjQeRKMFFgZipNgnEXfReII4+NAw=="; + url = "https://registry.npmjs.org/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-2.0.10.tgz"; + sha512 = "ag1U0vsC5rhRm7okFzsS6YsvyTRe62jIgJ82+Wr4qoOASx7eCDWdjoqLnrdDY0S4UToF9hZAyo4Du/xrSSSk4g=="; }; }; - "@smithy/eventstream-serde-node-2.0.8" = { + "@smithy/eventstream-serde-node-2.0.10" = { name = "_at_smithy_slash_eventstream-serde-node"; packageName = "@smithy/eventstream-serde-node"; - version = "2.0.8"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/eventstream-serde-node/-/eventstream-serde-node-2.0.8.tgz"; - sha512 = "FMBatSUSKwh6aguKVJokXfJaV8nqsuCkCZHb9MP9zah0ZF+ohbTLeeed7DQGeTVBueVIVWEzIsShPxtxBv7MMQ=="; + url = "https://registry.npmjs.org/@smithy/eventstream-serde-node/-/eventstream-serde-node-2.0.10.tgz"; + sha512 = "3+VeofxoVCa+dvqcuzEpnFve8EQJKaYR7UslDFpj6UTZfa7Hxr8o1/cbFkTftFo71PxzYVsR+bsD56EbAO432A=="; }; }; - "@smithy/eventstream-serde-universal-2.0.8" = { + "@smithy/eventstream-serde-universal-2.0.10" = { name = "_at_smithy_slash_eventstream-serde-universal"; packageName = "@smithy/eventstream-serde-universal"; - version = "2.0.8"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-2.0.8.tgz"; - sha512 = "6InMXH8BUKoEDa6CAuxR4Gn8Gf2vBfVtjA9A6zDKZClYHT+ANUJS+2EtOBc5wECJJGk4KLn5ajQyrt9MBv5lcw=="; + url = "https://registry.npmjs.org/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-2.0.10.tgz"; + sha512 = "JhJJU1ULLsn5kxKfFe8zOF2tibjxlPIvIB71Kn20aa/OFs+lvXBR0hBGswpovyYyckXH3qU8VxuIOEuS+2G+3A=="; }; }; - "@smithy/fetch-http-handler-2.1.4" = { + "@smithy/fetch-http-handler-2.2.0" = { name = "_at_smithy_slash_fetch-http-handler"; packageName = "@smithy/fetch-http-handler"; - version = "2.1.4"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-2.1.4.tgz"; - sha512 = "SL24M9W5ERByoXaVicRx+bj9GJVujDnPn+QO7GY7adhY0mPGa6DSF58pVKsgIh4r5Tx/k3SWCPlH4BxxSxA/fQ=="; + url = "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-2.2.0.tgz"; + sha512 = "P2808PM0CsEkXj3rnQAi3QyqRbAAi8iuePYUB5GveJ+dVd1WMv03NM+CYCI14IGXt1j/r7jHGvMJHO+Gv+kdMQ=="; }; }; - "@smithy/hash-blob-browser-2.0.8" = { + "@smithy/hash-blob-browser-2.0.10" = { name = "_at_smithy_slash_hash-blob-browser"; packageName = "@smithy/hash-blob-browser"; - version = "2.0.8"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/hash-blob-browser/-/hash-blob-browser-2.0.8.tgz"; - sha512 = "IgvRlBMfg/qLg321a59T1yTdEEbaizLrEVsU3DHj65DAO4lFRMF5f+l7vuV+je6m1G9wSD5GQXLturX8qlGb4g=="; + url = "https://registry.npmjs.org/@smithy/hash-blob-browser/-/hash-blob-browser-2.0.10.tgz"; + sha512 = "U2+wIWWloOZ9DaRuz2sk9f7A6STRTlwdcv+q6abXDvS0TRDk8KGgUmfV5lCZy8yxFxZIA0hvHDNqcd25r4Hrew=="; }; }; - "@smithy/hash-node-2.0.8" = { + "@smithy/hash-node-2.0.10" = { name = "_at_smithy_slash_hash-node"; packageName = "@smithy/hash-node"; - version = "2.0.8"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-2.0.8.tgz"; - sha512 = "yZL/nmxZzjZV5/QX5JWSgXlt0HxuMTwFO89CS++jOMMPiCMZngf6VYmtNdccs8IIIAMmfQeTzwu07XgUE/Zd3Q=="; + url = "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-2.0.10.tgz"; + sha512 = "jSTf6uzPk/Vf+8aQ7tVXeHfjxe9wRXSCqIZcBymSDTf7/YrVxniBdpyN74iI8ZUOx/Pyagc81OK5FROLaEjbXQ=="; }; }; - "@smithy/hash-stream-node-2.0.8" = { + "@smithy/hash-stream-node-2.0.10" = { name = "_at_smithy_slash_hash-stream-node"; packageName = "@smithy/hash-stream-node"; - version = "2.0.8"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/hash-stream-node/-/hash-stream-node-2.0.8.tgz"; - sha512 = "82zC6I9ZJycbEZH8TVyXyBx9c2ZIPQDgBvM0x5AFPUl/i1AxwKKX+lwYRnzgkF//cYhIIoJaCfJ9mjSMPRGvCQ=="; + url = "https://registry.npmjs.org/@smithy/hash-stream-node/-/hash-stream-node-2.0.10.tgz"; + sha512 = "L58XEGrownZZSpF7Lp0gc0hy+eYKXuPgNz3pQgP5lPFGwBzHdldx2X6o3c6swD6RkcPvTRh0wTUVVGwUotbgnQ=="; }; }; - "@smithy/invalid-dependency-2.0.8" = { + "@smithy/invalid-dependency-2.0.10" = { name = "_at_smithy_slash_invalid-dependency"; packageName = "@smithy/invalid-dependency"; - version = "2.0.8"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-2.0.8.tgz"; - sha512 = "88VOS7W3KzUz/bNRc+Sl/F/CDIasFspEE4G39YZRHIh9YmsXF7GUyVaAKURfMNulTie62ayk6BHC9O0nOBAVgQ=="; + url = "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-2.0.10.tgz"; + sha512 = "zw9p/zsmJ2cFcW4KMz3CJoznlbRvEA6HG2mvEaX5eAca5dq4VGI2MwPDTfmteC/GsnURS4ogoMQ0p6aHM2SDVQ=="; }; }; "@smithy/is-array-buffer-2.0.0" = { @@ -10030,166 +9814,166 @@ let sha512 = "z3PjFjMyZNI98JFRJi/U0nGoLWMSJlDjAW4QUX2WNZLas5C0CmVV6LJ01JI0k90l7FvpmixjWxPFmENSClQ7ug=="; }; }; - "@smithy/md5-js-2.0.8" = { + "@smithy/md5-js-2.0.10" = { name = "_at_smithy_slash_md5-js"; packageName = "@smithy/md5-js"; - version = "2.0.8"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/md5-js/-/md5-js-2.0.8.tgz"; - sha512 = "1VVECXEiuJvjXv+mudiaUFKYwgDLOWz5MTTy8RzbrPiU3GiOb3/o5/urdkYpqmgoMfxdvxxOw/Adjv2dV2q2Yg=="; + url = "https://registry.npmjs.org/@smithy/md5-js/-/md5-js-2.0.10.tgz"; + sha512 = "eA/Ova4/UdQUbMlrbBmnewmukH0zWU6C67HFFR/719vkFNepbnliGjmGksQ9vylz9eD4nfGkZZ5NKZMAcUuzjQ=="; }; }; - "@smithy/middleware-content-length-2.0.10" = { + "@smithy/middleware-content-length-2.0.12" = { name = "_at_smithy_slash_middleware-content-length"; packageName = "@smithy/middleware-content-length"; - version = "2.0.10"; + version = "2.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-2.0.10.tgz"; - sha512 = "EGSbysyA4jH0p3xI6G0jdXoj9Iz9GUnAta6aEaHtXm3wVWtenRf80y2TeVvNkVSr5jwKOdSCjKIRI2l1A/oZLA=="; + url = "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-2.0.12.tgz"; + sha512 = "QRhJTo5TjG7oF7np6yY4ZO9GDKFVzU/GtcqUqyEa96bLHE3yZHgNmsolOQ97pfxPHmFhH4vDP//PdpAIN3uI1Q=="; }; }; - "@smithy/middleware-endpoint-2.0.8" = { + "@smithy/middleware-endpoint-2.0.10" = { name = "_at_smithy_slash_middleware-endpoint"; packageName = "@smithy/middleware-endpoint"; - version = "2.0.8"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-2.0.8.tgz"; - sha512 = "yOpogfG2d2V0cbJdAJ6GLAWkNOc9pVsL5hZUfXcxJu408N3CUCsXzIAFF6+70ZKSE+lCfG3GFErcSXv/UfUbjw=="; + url = "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-2.0.10.tgz"; + sha512 = "O6m4puZc16xfenotZUHL4bRlMrwf4gTp+0I5l954M5KNd3dOK18P+FA/IIUgnXF/dX6hlCUcJkBp7nAzwrePKA=="; }; }; - "@smithy/middleware-retry-2.0.11" = { + "@smithy/middleware-retry-2.0.13" = { name = "_at_smithy_slash_middleware-retry"; packageName = "@smithy/middleware-retry"; - version = "2.0.11"; + version = "2.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-2.0.11.tgz"; - sha512 = "pknfokumZ+wvBERSuKAI2vVr+aK3ZgPiWRg6+0ZG4kKJogBRpPmDGWw+Jht0izS9ZaEbIobNzueIb4wD33JJVg=="; + url = "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-2.0.13.tgz"; + sha512 = "zuOva8xgWC7KYG8rEXyWIcZv2GWszO83DCTU6IKcf/FKu6OBmSE+EYv3EUcCGY+GfiwCX0EyJExC9Lpq9b0w5Q=="; }; }; - "@smithy/middleware-serde-2.0.8" = { + "@smithy/middleware-serde-2.0.10" = { name = "_at_smithy_slash_middleware-serde"; packageName = "@smithy/middleware-serde"; - version = "2.0.8"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-2.0.8.tgz"; - sha512 = "Is0sm+LiNlgsc0QpstDzifugzL9ehno1wXp109GgBgpnKTK3j+KphiparBDI4hWTtH9/7OUsxuspNqai2yyhcg=="; + url = "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-2.0.10.tgz"; + sha512 = "+A0AFqs768256H/BhVEsBF6HijFbVyAwYRVXY/izJFkTalVWJOp4JA0YdY0dpXQd+AlW0tzs+nMQCE1Ew+DcgQ=="; }; }; - "@smithy/middleware-stack-2.0.1" = { + "@smithy/middleware-stack-2.0.4" = { name = "_at_smithy_slash_middleware-stack"; packageName = "@smithy/middleware-stack"; - version = "2.0.1"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-2.0.1.tgz"; - sha512 = "UexsfY6/oQZRjTQL56s9AKtMcR60tBNibSgNYX1I2WXaUaXg97W9JCkFyth85TzBWKDBTyhLfenrukS/kyu54A=="; + url = "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-2.0.4.tgz"; + sha512 = "MW0KNKfh8ZGLagMZnxcLJWPNXoKqW6XV/st5NnCBmmA2e2JhrUjU0AJ5Ca/yjTyNEKs3xH7AQDwp1YmmpEpmQQ=="; }; }; - "@smithy/node-config-provider-2.0.11" = { + "@smithy/node-config-provider-2.0.13" = { name = "_at_smithy_slash_node-config-provider"; packageName = "@smithy/node-config-provider"; - version = "2.0.11"; + version = "2.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-2.0.11.tgz"; - sha512 = "CaR1dciSSGKttjhcefpytYjsfI/Yd5mqL8am4wfmyFCDxSiPsvnEWHl8UjM/RbcAjX0klt+CeIKPSHEc0wGvJA=="; + url = "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-2.0.13.tgz"; + sha512 = "pPpLqYuJcOq1sj1EGu+DoZK47DUS4gepqSTNgRezmrjnzNlSU2/Dcc9Ebzs+WZ0Z5vXKazuE+k+NksFLo07/AA=="; }; }; - "@smithy/node-http-handler-2.1.4" = { + "@smithy/node-http-handler-2.1.6" = { name = "_at_smithy_slash_node-http-handler"; packageName = "@smithy/node-http-handler"; - version = "2.1.4"; + version = "2.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-2.1.4.tgz"; - sha512 = "8Rw/AusvWDyC6SK8esAcVBeTlQHf94NMFv805suFUJCQ2gwlh0oLDNh+6s2MDOrxcjvLxjjzv1mytM0Mt+0cPQ=="; + url = "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-2.1.6.tgz"; + sha512 = "NspvD3aCwiUNtoSTcVHz0RZz1tQ/SaRIe1KPF+r0mAdCZ9eWuhIeJT8ZNPYa1ITn7/Lgg64IyFjqPynZ8KnYQw=="; }; }; - "@smithy/property-provider-2.0.9" = { + "@smithy/property-provider-2.0.11" = { name = "_at_smithy_slash_property-provider"; packageName = "@smithy/property-provider"; - version = "2.0.9"; + version = "2.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-2.0.9.tgz"; - sha512 = "25pPZ8f8DeRwYI5wbPRZaoMoR+3vrw8DwbA0TjP+GsdiB2KxScndr4HQehiJ5+WJ0giOTWhLz0bd+7Djv1qpUQ=="; + url = "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-2.0.11.tgz"; + sha512 = "kzuOadu6XvrnlF1iXofpKXYmo4oe19st9/DE8f5gHNaFepb4eTkR8gD8BSdTnNnv7lxfv6uOwZPg4VS6hemX1w=="; }; }; - "@smithy/protocol-http-3.0.4" = { + "@smithy/protocol-http-3.0.6" = { name = "_at_smithy_slash_protocol-http"; packageName = "@smithy/protocol-http"; - version = "3.0.4"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-3.0.4.tgz"; - sha512 = "CGfSWk6TRlbwa8YgrSXdn80Yu7pov3EV/h7TSfiCHhq6/LO3WymmqnzgH1f0qV2bdTDipIkTNp5dGCGN3Af/5g=="; + url = "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-3.0.6.tgz"; + sha512 = "F0jAZzwznMmHaggiZgc7YoS08eGpmLvhVktY/Taz6+OAOHfyIqWSDNgFqYR+WHW9z5fp2XvY4mEUrQgYMQ71jw=="; }; }; - "@smithy/querystring-builder-2.0.8" = { + "@smithy/querystring-builder-2.0.10" = { name = "_at_smithy_slash_querystring-builder"; packageName = "@smithy/querystring-builder"; - version = "2.0.8"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-2.0.8.tgz"; - sha512 = "+vzIMwjC8Saz97/ptPn+IJRCRRZ+pP95ZIWDRqEqZV/a6hiKbaFoMSa2iCKsnKzR696U2JZXrDqMu3e/FD1+2g=="; + url = "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-2.0.10.tgz"; + sha512 = "uujJGp8jzrrU1UHme8sUKEbawQTcTmUWsh8rbGXYD/lMwNLQ+9jQ9dMDWbbH9Hpoa9RER1BeL/38WzGrbpob2w=="; }; }; - "@smithy/querystring-parser-2.0.8" = { + "@smithy/querystring-parser-2.0.10" = { name = "_at_smithy_slash_querystring-parser"; packageName = "@smithy/querystring-parser"; - version = "2.0.8"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-2.0.8.tgz"; - sha512 = "ArbanNuR7O/MmTd90ZqhDqGOPPDYmxx3huHxD+R3cuCnazcK/1tGQA+SnnR5307T7ZRb5WTpB6qBggERuibVSA=="; + url = "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-2.0.10.tgz"; + sha512 = "WSD4EU60Q8scacT5PIpx4Bahn6nWpt+MiYLcBkFt6fOj7AssrNeaNIU2Z0g40ftVmrwLcEOIKGX92ynbVDb3ZA=="; }; }; - "@smithy/service-error-classification-2.0.1" = { + "@smithy/service-error-classification-2.0.3" = { name = "_at_smithy_slash_service-error-classification"; packageName = "@smithy/service-error-classification"; - version = "2.0.1"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-2.0.1.tgz"; - sha512 = "QHa9+t+v4s0cMuDCcbjIJN67mNZ42/+fc3jKe8P6ZMPXZl5ksKk6a8vhZ/m494GZng5eFTc3OePv+NF9cG83yg=="; + url = "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-2.0.3.tgz"; + sha512 = "b+m4QCHXb7oKAkM/jHwHrl5gpqhFoMTHF643L0/vAEkegrcUWyh1UjyoHttuHcP5FnHVVy4EtpPtLkEYD+xMFw=="; }; }; - "@smithy/shared-ini-file-loader-2.0.10" = { + "@smithy/shared-ini-file-loader-2.0.12" = { name = "_at_smithy_slash_shared-ini-file-loader"; packageName = "@smithy/shared-ini-file-loader"; - version = "2.0.10"; + version = "2.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-2.0.10.tgz"; - sha512 = "jWASteSezRKohJ7GdA7pHDvmr7Q7tw3b5mu3xLHIkZy/ICftJ+O7aqNaF8wklhI7UNFoQ7flFRM3Rd0KA+1BbQ=="; + url = "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-2.0.12.tgz"; + sha512 = "umi0wc4UBGYullAgYNUVfGLgVpxQyES47cnomTqzCKeKO5oudO4hyDNj+wzrOjqDFwK2nWYGVgS8Y0JgGietrw=="; }; }; - "@smithy/signature-v4-2.0.8" = { + "@smithy/signature-v4-2.0.10" = { name = "_at_smithy_slash_signature-v4"; packageName = "@smithy/signature-v4"; - version = "2.0.8"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-2.0.8.tgz"; - sha512 = "qrtiYMzaLlQ5HSJOaFwnyTQ3JLjmPY+3+pr9IBDpCVM6YtVj22cBLVB9bPOiZMIpkdI7ZRdxLBFlIjh5CO1Bhw=="; + url = "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-2.0.10.tgz"; + sha512 = "S6gcP4IXfO/VMswovrhxPpqvQvMal7ZRjM4NvblHSPpE5aNBYx67UkHFF3kg0hR3tJKqNpBGbxwq0gzpdHKLRA=="; }; }; - "@smithy/smithy-client-2.1.5" = { + "@smithy/smithy-client-2.1.8" = { name = "_at_smithy_slash_smithy-client"; packageName = "@smithy/smithy-client"; - version = "2.1.5"; + version = "2.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-2.1.5.tgz"; - sha512 = "7S865uKzsxApM8W8Q6zkij7tcUFgaG8PuADMFdMt1yL/ku3d0+s6Zwrg3N7iXCPM08Gu/mf0BIfTXIu/9i450Q=="; + url = "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-2.1.8.tgz"; + sha512 = "Puuc4wuhdTSs8wstkNJ/JtpaFwIh0qDE27zawfRVzzjpXprpT+4wROqO2+NVoZ+6GKv7kz7QgZx6AI5325bSeQ=="; }; }; - "@smithy/types-2.3.2" = { + "@smithy/types-2.3.4" = { name = "_at_smithy_slash_types"; packageName = "@smithy/types"; - version = "2.3.2"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/types/-/types-2.3.2.tgz"; - sha512 = "iH0cdKi7HQlzfAM3w2shFk/qZYKAqJWswtpmQpPtlruF+uFZeGEpMJjgDRyhWiddfVM4e2oP4nMaOBsMy6lXgg=="; + url = "https://registry.npmjs.org/@smithy/types/-/types-2.3.4.tgz"; + sha512 = "D7xlM9FOMFyFw7YnMXn9dK2KuN6+JhnrZwVt1fWaIu8hCk5CigysweeIT/H/nCo4YV+s8/oqUdLfexbkPZtvqw=="; }; }; - "@smithy/url-parser-2.0.8" = { + "@smithy/url-parser-2.0.10" = { name = "_at_smithy_slash_url-parser"; packageName = "@smithy/url-parser"; - version = "2.0.8"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-2.0.8.tgz"; - sha512 = "wQw7j004ScCrBRJ+oNPXlLE9mtofxyadSZ9D8ov/rHkyurS7z1HTNuyaGRj6OvKsEk0SVQsuY0C9+EfM75XTkw=="; + url = "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-2.0.10.tgz"; + sha512 = "4TXQFGjHcqru8aH5VRB4dSnOFKCYNX6SR1Do6fwxZ+ExT2onLsh2W77cHpks7ma26W5jv6rI1u7d0+KX9F0aOw=="; }; }; "@smithy/util-base64-2.0.0" = { @@ -10237,22 +10021,22 @@ let sha512 = "xCQ6UapcIWKxXHEU4Mcs2s7LcFQRiU3XEluM2WcCjjBtQkUN71Tb+ydGmJFPxMUrW/GWMgQEEGipLym4XG0jZg=="; }; }; - "@smithy/util-defaults-mode-browser-2.0.9" = { + "@smithy/util-defaults-mode-browser-2.0.12" = { name = "_at_smithy_slash_util-defaults-mode-browser"; packageName = "@smithy/util-defaults-mode-browser"; - version = "2.0.9"; + version = "2.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-2.0.9.tgz"; - sha512 = "JONLJVQWT8165XoSV36ERn3SVlZLJJ4D6IeGsCSePv65Uxa93pzSLE0UMSR9Jwm4zix7rst9AS8W5QIypZWP8Q=="; + url = "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-2.0.12.tgz"; + sha512 = "BCsFPdNThMS2312/Zj3/TtFsXfO2BwkbDNsoWbdtZ0cAv9cE6vqGKllYXmq2Gj6u+Vv8V3wUgBUicNol6s/7Sg=="; }; }; - "@smithy/util-defaults-mode-node-2.0.11" = { + "@smithy/util-defaults-mode-node-2.0.14" = { name = "_at_smithy_slash_util-defaults-mode-node"; packageName = "@smithy/util-defaults-mode-node"; - version = "2.0.11"; + version = "2.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.0.11.tgz"; - sha512 = "tmqjNsfj+bgZN6jXBe6efZnukzILA7BUytHkzqikuRLNtR+0VVchQHvawD0w6vManh76rO81ydhioe7i4oBzuA=="; + url = "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.0.14.tgz"; + sha512 = "EtomtYsWDkBGs0fLeF+7N2df+zIqGix+O4llWqQD+97rbo2hk+GBWeZzBkujKrzFeXNUbPkFqfvZPLdoq4S4XQ=="; }; }; "@smithy/util-hex-encoding-2.0.0" = { @@ -10264,31 +10048,31 @@ let sha512 = "c5xY+NUnFqG6d7HFh1IFfrm3mGl29lC+vF+geHv4ToiuJCBmIfzx6IeHLg+OgRdPFKDXIw6pvi+p3CsscaMcMA=="; }; }; - "@smithy/util-middleware-2.0.1" = { + "@smithy/util-middleware-2.0.3" = { name = "_at_smithy_slash_util-middleware"; packageName = "@smithy/util-middleware"; - version = "2.0.1"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-2.0.1.tgz"; - sha512 = "LnsBMi0Mg3gfz/TpNGLv2Jjcz2ra1OX5HR/4IaCepIYmtPQzqMWDdhX/XTW1LS8OZ0xbQuyQPcHkQ+2XkhWOVQ=="; + url = "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-2.0.3.tgz"; + sha512 = "+FOCFYOxd2HO7v/0hkFSETKf7FYQWa08wh/x/4KUeoVBnLR4juw8Qi+TTqZI6E2h5LkzD9uOaxC9lAjrpVzaaA=="; }; }; - "@smithy/util-retry-2.0.1" = { + "@smithy/util-retry-2.0.3" = { name = "_at_smithy_slash_util-retry"; packageName = "@smithy/util-retry"; - version = "2.0.1"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-2.0.1.tgz"; - sha512 = "naj4X0IafJ9yJnVJ58QgSMkCNLjyQOnyrnKh/T0f+0UOUxJiT8vuFn/hS7B/pNqbo2STY7PyJ4J4f+5YqxwNtA=="; + url = "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-2.0.3.tgz"; + sha512 = "gw+czMnj82i+EaH7NL7XKkfX/ZKrCS2DIWwJFPKs76bMgkhf0y1C94Lybn7f8GkBI9lfIOUdPYtzm19zQOC8sw=="; }; }; - "@smithy/util-stream-2.0.11" = { + "@smithy/util-stream-2.0.13" = { name = "_at_smithy_slash_util-stream"; packageName = "@smithy/util-stream"; - version = "2.0.11"; + version = "2.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-2.0.11.tgz"; - sha512 = "2MeWfqSpZKdmEJ+tH8CJQSgzLWhH5cmdE24X7JB0hiamXrOmswWGGuPvyj/9sQCTclo57pNxLR2p7KrP8Ahiyg=="; + url = "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-2.0.13.tgz"; + sha512 = "aeua6pN0WMdQtZNRRJ8J+mop57fezLMsApYbk5Q3q11pyHwZypVPuKoelr7K9PMJZcuYk90dQyUsUAd7hTCeRg=="; }; }; "@smithy/util-uri-escape-2.0.0" = { @@ -10309,13 +10093,13 @@ let sha512 = "rctU1VkziY84n5OXe3bPNpKR001ZCME2JCaBBFgtiM2hfKbHFudc/BkMuPab8hRbLd0j3vbnBTTZ1igBf0wgiQ=="; }; }; - "@smithy/util-waiter-2.0.8" = { + "@smithy/util-waiter-2.0.10" = { name = "_at_smithy_slash_util-waiter"; packageName = "@smithy/util-waiter"; - version = "2.0.8"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-waiter/-/util-waiter-2.0.8.tgz"; - sha512 = "t9yaoofNhdEhNlyDeV5al/JJEFJ62HIQBGktgCUE63MvKn6imnbkh1qISsYMyMYVLwhWCpZ3Xa3R1LA+SnWcng=="; + url = "https://registry.npmjs.org/@smithy/util-waiter/-/util-waiter-2.0.10.tgz"; + sha512 = "yQjwWVrwYw+/f3hFQccE3zZF7lk6N6xtNcA6jvhWFYhnyKAm6B2mX8Gzftl0TbgoPUpzCvKYlvhaEpVtRpVfVw=="; }; }; "@socket.io/component-emitter-3.1.0" = { @@ -10552,22 +10336,22 @@ let sha512 = "2kGbqUVJUGE8dM+bMzXG/PYUWKkjLIkRLWNh39OaADkiabDRdw8ATFCgbMz5xdIcvwspPAluSL7uY+ZiTWdWmQ=="; }; }; - "@swc-node/core-1.10.5" = { + "@swc-node/core-1.10.6" = { name = "_at_swc-node_slash_core"; packageName = "@swc-node/core"; - version = "1.10.5"; + version = "1.10.6"; src = fetchurl { - url = "https://registry.npmjs.org/@swc-node/core/-/core-1.10.5.tgz"; - sha512 = "G+Me0sTApMy6WY9mT0TluFxdO633P1GWMllbT3LWeJlknqQxJo8dAQcV0Uc0+rvBVXt7rRo/BMUZNJp88qarzg=="; + url = "https://registry.npmjs.org/@swc-node/core/-/core-1.10.6.tgz"; + sha512 = "lDIi/rPosmKIknWzvs2/Fi9zWRtbkx8OJ9pQaevhsoGzJSal8Pd315k1W5AIrnknfdAB4HqRN12fk6AhqnrEEw=="; }; }; - "@swc-node/register-1.6.7" = { + "@swc-node/register-1.6.8" = { name = "_at_swc-node_slash_register"; packageName = "@swc-node/register"; - version = "1.6.7"; + version = "1.6.8"; src = fetchurl { - url = "https://registry.npmjs.org/@swc-node/register/-/register-1.6.7.tgz"; - sha512 = "+Tccbb4+fN8vYx88fdEGFbsCSnF0zBxbVhZkYkFAbVI7h6zVIgA3Jmlok4ZM+q+1KxzPN7AOfhQVuFOYBzZBeA=="; + url = "https://registry.npmjs.org/@swc-node/register/-/register-1.6.8.tgz"; + sha512 = "74ijy7J9CWr1Z88yO+ykXphV29giCrSpANQPQRooE0bObpkTO1g4RzQovIfbIaniBiGDDVsYwDoQ3FIrCE8HcQ=="; }; }; "@swc-node/sourcemap-support-0.3.0" = { @@ -10579,103 +10363,22 @@ let sha512 = "gqBJSmJMWomZFxlppaKea7NeAqFrDrrS0RMt24No92M3nJWcyI9YKGEQKl+EyJqZ5gh6w1s0cTklMHMzRwA1NA=="; }; }; - "@swc/core-1.3.85" = { + "@swc/core-1.3.91" = { name = "_at_swc_slash_core"; packageName = "@swc/core"; - version = "1.3.85"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/core/-/core-1.3.85.tgz"; - sha512 = "qnoxp+2O0GtvRdYnXgR1v8J7iymGGYpx6f6yCK9KxipOZOjrlKILFANYlghQxZyPUfXwK++TFxfSlX4r9wK+kg=="; - }; - }; - "@swc/core-darwin-arm64-1.3.85" = { - name = "_at_swc_slash_core-darwin-arm64"; - packageName = "@swc/core-darwin-arm64"; - version = "1.3.85"; + version = "1.3.91"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.85.tgz"; - sha512 = "jTikp+i4nO4Ofe6qGm4I3sFeebD1OvueBCHITux5tQKD6umN1c2z4CRGv6K49NIz/qEpUcdr6Qny6K+3yibVFQ=="; + url = "https://registry.npmjs.org/@swc/core/-/core-1.3.91.tgz"; + sha512 = "r950d0fdlZ8qbSDyvApn3HyCojiZE8xpgJzQvypeMi32dalYwugdJKWyLB55JIGMRGJ8+lmVvY4MPGkSR3kXgA=="; }; }; - "@swc/core-darwin-x64-1.3.85" = { - name = "_at_swc_slash_core-darwin-x64"; - packageName = "@swc/core-darwin-x64"; - version = "1.3.85"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.3.85.tgz"; - sha512 = "3uHYkjVU+2F+YbVYtq5rH0uCJIztFTALaS3mQEfQUZKXZ5/8jD5titTCRqFKtSlQg0CzaFZgsYsuqwYBmgN0mA=="; - }; - }; - "@swc/core-linux-arm-gnueabihf-1.3.85" = { - name = "_at_swc_slash_core-linux-arm-gnueabihf"; - packageName = "@swc/core-linux-arm-gnueabihf"; - version = "1.3.85"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.85.tgz"; - sha512 = "ouHzAHsFaEOkRuoTAOI/8n2m8BQAAnb4vr/xbMhhDOmix0lp5eNsW5Iac/EcJ2uG6B3n7P2K8oycj9SWkj+pfw=="; - }; - }; - "@swc/core-linux-arm64-gnu-1.3.85" = { - name = "_at_swc_slash_core-linux-arm64-gnu"; - packageName = "@swc/core-linux-arm64-gnu"; - version = "1.3.85"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.85.tgz"; - sha512 = "/Z1CZOWiO+NqJEh1J20PIxQFHMH43upQJ1l7FJ5Z7+MyuYF8WkeJ7OSovau729pBR+38vvvccEJrMZIztfv7hQ=="; - }; - }; - "@swc/core-linux-arm64-musl-1.3.85" = { - name = "_at_swc_slash_core-linux-arm64-musl"; - packageName = "@swc/core-linux-arm64-musl"; - version = "1.3.85"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.85.tgz"; - sha512 = "gfh7CfKavi076dbMBTzfdawSGcYfZ4+1Q+8aRkSesqepKHcIWIJti8Cf3zB4a6CHNhJe+VN0Gb7DEfumydAm1w=="; - }; - }; - "@swc/core-linux-x64-gnu-1.3.85" = { - name = "_at_swc_slash_core-linux-x64-gnu"; - packageName = "@swc/core-linux-x64-gnu"; - version = "1.3.85"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.85.tgz"; - sha512 = "lWVqjHKzofb9q1qrBM4dLqO7CIisp08/xMS5Hz9DWex1gTc5F2b6yJO6Ceqwa256GMweJcdP6A5EvEFQAiZ5dg=="; - }; - }; - "@swc/core-linux-x64-musl-1.3.85" = { - name = "_at_swc_slash_core-linux-x64-musl"; - packageName = "@swc/core-linux-x64-musl"; - version = "1.3.85"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.85.tgz"; - sha512 = "EPJmlfqC05TUetnlErxNRyIp7Nc3B2w9abET6oQ/EgldeAeQnZ3M6svMViET/c2QSomgrU3rdP+Qcozkt62/4A=="; - }; - }; - "@swc/core-win32-arm64-msvc-1.3.85" = { - name = "_at_swc_slash_core-win32-arm64-msvc"; - packageName = "@swc/core-win32-arm64-msvc"; - version = "1.3.85"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.85.tgz"; - sha512 = "ibckJDZw8kNosciMexwk0z75ZyUhwtiFMV9rSBpup0opa7NNCUCoERCJ1e9LRyMdhsVUoLpZg/KZiHCdTw96hQ=="; - }; - }; - "@swc/core-win32-ia32-msvc-1.3.85" = { - name = "_at_swc_slash_core-win32-ia32-msvc"; - packageName = "@swc/core-win32-ia32-msvc"; - version = "1.3.85"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.85.tgz"; - sha512 = "hY4MpHGUVQHL1T2kgRXOigDho4DTIpVPYzJ4uyy8VQRbS7GzN5XtvdGP/fA4zp8+2BQjcig+6J7Y92SY15ouNQ=="; - }; - }; - "@swc/core-win32-x64-msvc-1.3.85" = { - name = "_at_swc_slash_core-win32-x64-msvc"; - packageName = "@swc/core-win32-x64-msvc"; - version = "1.3.85"; + "@swc/counter-0.1.2" = { + name = "_at_swc_slash_counter"; + packageName = "@swc/counter"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.85.tgz"; - sha512 = "ktxWOMFJ0iqKn6WUHtXqi4CS7xkyHmrRtjllGRuGqxmLmDX/HSOfuQ55Tm1KXKk5oHLacJkUbOSF2kBrpZ8dpg=="; + url = "https://registry.npmjs.org/@swc/counter/-/counter-0.1.2.tgz"; + sha512 = "9F4ys4C74eSTEUNndnER3VJ15oru2NumfQxS8geE+f3eB5xvfxpWyqE5XlVnxb/R14uoXi6SLbBwwiDSkv+XEw=="; }; }; "@swc/helpers-0.5.2" = { @@ -10687,22 +10390,22 @@ let sha512 = "E4KcWTpoLHqwPHLxidpOqQbcrZVgi0rsmmZXUle1jXmJfuIf/UWpczUJ7MZZ5tlxytgJXyp0w4PGkkeLiuIdZw=="; }; }; - "@swc/types-0.1.4" = { + "@swc/types-0.1.5" = { name = "_at_swc_slash_types"; packageName = "@swc/types"; - version = "0.1.4"; + version = "0.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/types/-/types-0.1.4.tgz"; - sha512 = "z/G02d+59gyyUb7KYhKi9jOhicek6QD2oMaotUyG+lUkybpXoV49dY9bj7Ah5Q+y7knK2jU67UTX9FyfGzaxQg=="; + url = "https://registry.npmjs.org/@swc/types/-/types-0.1.5.tgz"; + sha512 = "myfUej5naTBWnqOCc/MdVOLVjXUXtIA+NpDrDBKJtLLg2shUjBu3cZmB/85RyitKc55+lUUyl7oRfLOvkr2hsw=="; }; }; - "@swc/wasm-1.3.85" = { + "@swc/wasm-1.3.91" = { name = "_at_swc_slash_wasm"; packageName = "@swc/wasm"; - version = "1.3.85"; + version = "1.3.91"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.85.tgz"; - sha512 = "lO2QTgKsq/CQSs0fbojiFFmbMo5Nv1cnDdbyLUpl7q+XXkFA/uBh5zF8Bgv5kqJo2Yoo+ydCbTq7GQLrmcjyMQ=="; + url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.91.tgz"; + sha512 = "SEMDGgLMjJOpizg+fC+L/1K0eVjyup5L462jXt3BlY6BSM7T2RtJLtIai1evMvDX6brK+PVUIPjtY4XMdmyBWQ=="; }; }; "@szmarczak/http-timer-1.1.2" = { @@ -10732,6 +10435,15 @@ let sha512 = "+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw=="; }; }; + "@tailwindcss/forms-0.5.6" = { + name = "_at_tailwindcss_slash_forms"; + packageName = "@tailwindcss/forms"; + version = "0.5.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.5.6.tgz"; + sha512 = "Fw+2BJ0tmAwK/w01tEFL5TiaJBX1NLT1/YbWgvm7ws3Qcn11kiXxzNTEQDMs5V3mQemhB56l3u0i9dwdzSQldA=="; + }; + }; "@taplo/lsp-0.2.4" = { name = "_at_taplo_slash_lsp"; packageName = "@taplo/lsp"; @@ -10957,6 +10669,15 @@ let sha512 = "C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA=="; }; }; + "@trivago/prettier-plugin-sort-imports-4.2.0" = { + name = "_at_trivago_slash_prettier-plugin-sort-imports"; + packageName = "@trivago/prettier-plugin-sort-imports"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@trivago/prettier-plugin-sort-imports/-/prettier-plugin-sort-imports-4.2.0.tgz"; + sha512 = "YBepjbt+ZNBVmN3ev1amQH3lWCmHyt5qTbLCp/syXJRu/Kw2koXh44qayB1gMRxcL/gV8egmjN5xWSrYyfUtyw=="; + }; + }; "@trufflesuite/uws-js-unofficial-20.30.0-unofficial.0" = { name = "_at_trufflesuite_slash_uws-js-unofficial"; packageName = "@trufflesuite/uws-js-unofficial"; @@ -11155,13 +10876,13 @@ let sha512 = "IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw=="; }; }; - "@types/cli-progress-3.11.2" = { + "@types/cli-progress-3.11.3" = { name = "_at_types_slash_cli-progress"; packageName = "@types/cli-progress"; - version = "3.11.2"; + version = "3.11.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/cli-progress/-/cli-progress-3.11.2.tgz"; - sha512 = "Yt/8rEJalfa9ve2SbfQnwFHrc9QF52JIZYHW3FDaTMpkCvnns26ueKiPHDxyJ0CS//IqjMINTx7R5Xa7k7uFHQ=="; + url = "https://registry.npmjs.org/@types/cli-progress/-/cli-progress-3.11.3.tgz"; + sha512 = "/+C9xAdVtc+g5yHHkGBThgAA8rYpi5B+2ve3wLtybYj0JHEBs57ivR4x/zGfSsplRnV+psE91Nfin1soNKqz5Q=="; }; }; "@types/commander-2.12.2" = { @@ -11245,40 +10966,40 @@ let sha512 = "RXHUvNWYICtbP6s18PnOCaqToK8y14DnLd75c6HfyKf228dxy7pHNOQkxPtvXKp/hINFMDjbYzsj63nnpPMSRQ=="; }; }; - "@types/debug-4.1.8" = { + "@types/debug-4.1.9" = { name = "_at_types_slash_debug"; packageName = "@types/debug"; - version = "4.1.8"; + version = "4.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/debug/-/debug-4.1.8.tgz"; - sha512 = "/vPO1EPOs306Cvhwv7KfVfYvOJqA/S/AXjaHQiJboCZzcNDb+TIJFN9/2C9DZ//ijSKWioNyUxD792QmDJ+HKQ=="; + url = "https://registry.npmjs.org/@types/debug/-/debug-4.1.9.tgz"; + sha512 = "8Hz50m2eoS56ldRlepxSBa6PWEVCtzUo/92HgLc2qTMnotJNIm7xP+UZhyWoYsyOdd5dxZ+NZLb24rsKyFs2ow=="; }; }; - "@types/diff-3.5.5" = { + "@types/diff-3.5.6" = { name = "_at_types_slash_diff"; packageName = "@types/diff"; - version = "3.5.5"; + version = "3.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/diff/-/diff-3.5.5.tgz"; - sha512 = "aqcrAbqT/0+ULJJ73bwKWsiFkBh3ZnAelj9u+iI5/cr4Nz3yXGf3w4glx5am6uvvgBbKinK1PAqSJs7fSKD6ig=="; + url = "https://registry.npmjs.org/@types/diff/-/diff-3.5.6.tgz"; + sha512 = "5BV7iGX/NmFGqAQn+YDBK++kO7IbZf0mIn8mwdJACIpZsMUqJvEin0riqNDbmS3SQL8u00dGnbC0FFJQptTSWw=="; }; }; - "@types/ejs-3.1.2" = { + "@types/ejs-3.1.3" = { name = "_at_types_slash_ejs"; packageName = "@types/ejs"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/ejs/-/ejs-3.1.2.tgz"; - sha512 = "ZmiaE3wglXVWBM9fyVC17aGPkLo/UgaOjEiI2FXQfyczrCefORPxIe+2dVmnmk3zkVIbizjrlQzmPGhSYGXG5g=="; + url = "https://registry.npmjs.org/@types/ejs/-/ejs-3.1.3.tgz"; + sha512 = "mv5T/JI/bu+pbfz1o+TLl1NF0NIBbjS0Vl6Ppz1YY9DkXfzZT0lelXpfS5i3ZS3U/p90it7uERQpBvLYoK8e4A=="; }; }; - "@types/es-aggregate-error-1.0.2" = { + "@types/es-aggregate-error-1.0.3" = { name = "_at_types_slash_es-aggregate-error"; packageName = "@types/es-aggregate-error"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/es-aggregate-error/-/es-aggregate-error-1.0.2.tgz"; - sha512 = "erqUpFXksaeR2kejKnhnjZjbFxUpGZx4Z7ydNL9ie8tEhXPiZTsLeUDJ6aR1F8j5wWUAtOAQWUqkc7givBJbBA=="; + url = "https://registry.npmjs.org/@types/es-aggregate-error/-/es-aggregate-error-1.0.3.tgz"; + sha512 = "GmY61WWXQemfJp+qmMu6RsrNev0eoEWeWtg46w9pdXje23jRJrf7yETbAkl7F+CfQJSKW7w3//sTYtQTt+R5Lg=="; }; }; "@types/eslint-7.29.0" = { @@ -11290,22 +11011,22 @@ let sha512 = "VNcvioYDH8/FxaeTKkM4/TiTwt6pBV9E3OfGmvaw8tPl0rrHCJ4Ll15HRT+pMiFAf/MLQvAzC+6RzUMEL9Ceng=="; }; }; - "@types/eslint-8.44.2" = { + "@types/eslint-8.44.3" = { name = "_at_types_slash_eslint"; packageName = "@types/eslint"; - version = "8.44.2"; + version = "8.44.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.2.tgz"; - sha512 = "sdPRb9K6iL5XZOmBubg8yiFp5yS/JdUDQsq5e6h95km91MCYMuvp7mh1fjPEYUhvHepKpZOjnEaMBR4PxjWDzg=="; + url = "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.3.tgz"; + sha512 = "iM/WfkwAhwmPff3wZuPLYiHX18HI24jU8k1ZSH7P8FHwxTjZ2P6CoX2wnF43oprR+YXJM6UUxATkNvyv/JHd+g=="; }; }; - "@types/eslint-scope-3.7.4" = { + "@types/eslint-scope-3.7.5" = { name = "_at_types_slash_eslint-scope"; packageName = "@types/eslint-scope"; - version = "3.7.4"; + version = "3.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz"; - sha512 = "9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA=="; + url = "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.5.tgz"; + sha512 = "JNvhIEyxVW6EoMIFIvj93ZOywYFatlpu9deeH6eSx6PE3WHYvHaQtmHmQeNw7aA81bYGBPPQqdtBm6b1SsQMmA=="; }; }; "@types/estree-0.0.39" = { @@ -11317,31 +11038,22 @@ let sha512 = "EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw=="; }; }; - "@types/estree-1.0.1" = { + "@types/estree-1.0.2" = { name = "_at_types_slash_estree"; packageName = "@types/estree"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/estree/-/estree-1.0.1.tgz"; - sha512 = "LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA=="; + url = "https://registry.npmjs.org/@types/estree/-/estree-1.0.2.tgz"; + sha512 = "VeiPZ9MMwXjO32/Xu7+OwflfmeoRwkE/qzndw42gGtgJwZopBnzy2gD//NN1+go1mADzkDcqf/KnFRSjTJ8xJA=="; }; }; - "@types/estree-jsx-1.0.0" = { + "@types/estree-jsx-1.0.1" = { name = "_at_types_slash_estree-jsx"; packageName = "@types/estree-jsx"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/estree-jsx/-/estree-jsx-1.0.0.tgz"; - sha512 = "3qvGd0z8F2ENTGr/GG1yViqfiKmRfrXVx5sJyHGFu3z7m5g5utCQtGp/g29JnjflhtQJBv1WDQukHiT58xPcYQ=="; - }; - }; - "@types/expect-1.20.4" = { - name = "_at_types_slash_expect"; - packageName = "@types/expect"; - version = "1.20.4"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/expect/-/expect-1.20.4.tgz"; - sha512 = "Q5Vn3yjTDyCMV50TB6VRIbQNxSE4OmZR86VSbGaNpfUolm0iePBB4KdEEHmxoY5sT2+2DIvXW0rvMDP2nHZ4Mg=="; + url = "https://registry.npmjs.org/@types/estree-jsx/-/estree-jsx-1.0.1.tgz"; + sha512 = "sHyakZlAezNFxmYRo0fopDZW+XvK6ipeZkkp5EAOLjdPfZp8VjZBJ67vSRI99RSCAoqXVmXOHS4fnWoxpuGQtQ=="; }; }; "@types/express-4.17.14" = { @@ -11353,13 +11065,13 @@ let sha512 = "TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg=="; }; }; - "@types/express-4.17.17" = { + "@types/express-4.17.18" = { name = "_at_types_slash_express"; packageName = "@types/express"; - version = "4.17.17"; + version = "4.17.18"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.17.tgz"; - sha512 = "Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q=="; + url = "https://registry.npmjs.org/@types/express/-/express-4.17.18.tgz"; + sha512 = "Sxv8BSLLgsBYmcnGdGjjEjqET2U+AKAdCRODmMiq02FgjwuV75Ut85DRpvFjyw/Mk0vgUOliGRU0UUmuuZHByQ=="; }; }; "@types/express-serve-static-core-4.17.31" = { @@ -11371,13 +11083,13 @@ let sha512 = "DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q=="; }; }; - "@types/express-serve-static-core-4.17.36" = { + "@types/express-serve-static-core-4.17.37" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.36"; + version = "4.17.37"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.36.tgz"; - sha512 = "zbivROJ0ZqLAtMzgzIUC4oNqDG9iF0lSsAqpOD9kbs5xcIM3dTiyuHvBc7R8MtWBp3AAWGaovJa+wzWPjLYW7Q=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.37.tgz"; + sha512 = "ZohaCYTgGFcOP7u6aJOhY9uIZQgZ2vxC2yWoArY+FeDXlqeH66ZVBjgvg+RLVAS/DWNq4Ap9ZXu1+SUQiiWYMg=="; }; }; "@types/geojson-7946.0.4" = { @@ -11407,13 +11119,13 @@ let sha512 = "ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA=="; }; }; - "@types/hast-2.3.5" = { + "@types/hast-2.3.6" = { name = "_at_types_slash_hast"; packageName = "@types/hast"; - version = "2.3.5"; + version = "2.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/hast/-/hast-2.3.5.tgz"; - sha512 = "SvQi0L/lNpThgPoleH53cdjB3y9zpLlVjRbqB3rH8hx1jiRSBGAhyjV3H+URFjNVRqt2EdYNrbZE5IsGlNfpRg=="; + url = "https://registry.npmjs.org/@types/hast/-/hast-2.3.6.tgz"; + sha512 = "47rJE80oqPmFdVDCD7IheXBrVdwuBgsYwoczFvKmwfo2Mzsnt+V9OONsYauFmICb6lQPpCuXYJWejBNs4pDJRg=="; }; }; "@types/html-minifier-terser-6.1.0" = { @@ -11425,31 +11137,31 @@ let sha512 = "oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg=="; }; }; - "@types/http-cache-semantics-4.0.1" = { + "@types/http-cache-semantics-4.0.2" = { name = "_at_types_slash_http-cache-semantics"; packageName = "@types/http-cache-semantics"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz"; - sha512 = "SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ=="; + url = "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.2.tgz"; + sha512 = "FD+nQWA2zJjh4L9+pFXqWOi0Hs1ryBCfI+985NjluQ1p8EYtoLvjLOKidXBtZ4/IcxDX4o8/E8qDS3540tNliw=="; }; }; - "@types/http-errors-2.0.1" = { + "@types/http-errors-2.0.2" = { name = "_at_types_slash_http-errors"; packageName = "@types/http-errors"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.1.tgz"; - sha512 = "/K3ds8TRAfBvi5vfjuz8y6+GiAYBZ0x4tXv1Av6CWBWn0IlADc+ZX9pMq7oU0fNQPnBwIZl3rmeLp6SBApbxSQ=="; + url = "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.2.tgz"; + sha512 = "lPG6KlZs88gef6aD85z3HNkztpj7w2R7HmR3gygjfXCQmsLloWNARFkMuzKiiY8FGdh1XDpgBdrSf4aKDiA7Kg=="; }; }; - "@types/http-proxy-1.17.11" = { + "@types/http-proxy-1.17.12" = { name = "_at_types_slash_http-proxy"; packageName = "@types/http-proxy"; - version = "1.17.11"; + version = "1.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.11.tgz"; - sha512 = "HC8G7c1WmaF2ekqpnFq626xd3Zz0uvaqFmBJNRZCGEZCXkvSdJoNFn/8Ygbd9fKNQj8UzLdCETaI0UWPAjK7IA=="; + url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.12.tgz"; + sha512 = "kQtujO08dVtQ2wXAuSFfk9ASy3sug4+ogFR8Kd8UgP8PEuc1/G/8yjYRmp//PcDNJEUKOza/MrQu15bouEUCiw=="; }; }; "@types/inquirer-6.5.0" = { @@ -11488,31 +11200,31 @@ let sha512 = "z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g=="; }; }; - "@types/istanbul-lib-report-3.0.0" = { + "@types/istanbul-lib-report-3.0.1" = { name = "_at_types_slash_istanbul-lib-report"; packageName = "@types/istanbul-lib-report"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz"; - sha512 = "plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg=="; + url = "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz"; + sha512 = "gPQuzaPR5h/djlAv2apEG1HVOyj1IUs7GpfMZixU0/0KXT3pm64ylHuMUI1/Akh+sq/iikxg6Z2j+fcMDXaaTQ=="; }; }; - "@types/istanbul-reports-3.0.1" = { + "@types/istanbul-reports-3.0.2" = { name = "_at_types_slash_istanbul-reports"; packageName = "@types/istanbul-reports"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz"; - sha512 = "c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw=="; + url = "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.2.tgz"; + sha512 = "kv43F9eb3Lhj+lr/Hn6OcLCs/sSM8bt+fIaP11rCYngfV6NVjzWXJ17owQtDQTL9tQ8WSLUrGsSJ6rJz0F1w1A=="; }; }; - "@types/jquery-3.5.19" = { + "@types/jquery-3.5.20" = { name = "_at_types_slash_jquery"; packageName = "@types/jquery"; - version = "3.5.19"; + version = "3.5.20"; src = fetchurl { - url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.19.tgz"; - sha512 = "KFbmk+dXfphHGuVCmlopgcNRCegN/21mkeoD4BzuJhVH0SJW3Uo2mLuAwb6oqTNV79EsRp6J7yC1BbKymjpx/g=="; + url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.20.tgz"; + sha512 = "UI+EGhgYD4LdSZ8gaiziFqXYIIB38VQSDsnAs8jL/div7FGrzrShx4HKCykVzk3tPfiIlusdNP9Wi3G60LCF2Q=="; }; }; "@types/js-levenshtein-1.1.1" = { @@ -11524,15 +11236,6 @@ let sha512 = "qC4bCqYGy1y/NP7dDVr7KJarn+PbX1nSpwA7JXdu0HxT3QYjO8MJ+cntENtHFVy2dRAyBV23OZ6MxsW1AM1L8g=="; }; }; - "@types/js-yaml-3.12.8" = { - name = "_at_types_slash_js-yaml"; - packageName = "@types/js-yaml"; - version = "3.12.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-3.12.8.tgz"; - sha512 = "6McoI148SFmiE2m2Y9lpzwN238grgzEn2J1mHoc8UWwDKvAUsjl100jjqoj5ORVqDwWuEmD+zlOES0+jI7fZCA=="; - }; - }; "@types/jscodeshift-0.7.2" = { name = "_at_types_slash_jscodeshift"; packageName = "@types/jscodeshift"; @@ -11542,15 +11245,6 @@ let sha512 = "k4ih8ayQ65e26vhCxeMTKtZ808DzC0RFQ4unBvPEy9bcFhS4aPm3oXgWWZNmZ4u+H2WzHQDCNrRC5iNX+afiZw=="; }; }; - "@types/json-schema-7.0.12" = { - name = "_at_types_slash_json-schema"; - packageName = "@types/json-schema"; - version = "7.0.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz"; - sha512 = "Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA=="; - }; - }; "@types/json-schema-7.0.13" = { name = "_at_types_slash_json-schema"; packageName = "@types/json-schema"; @@ -11587,13 +11281,13 @@ let sha512 = "pTjcqY9E4nOI55Wgpz7eiI8+LzdYnw3qxXCfHyBDdPbYvbyLgWLJGh8EdPvqawwMK1Uo1794AUkkR38Fr0g+2g=="; }; }; - "@types/lodash-4.14.198" = { + "@types/lodash-4.14.199" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.198"; + version = "4.14.199"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.198.tgz"; - sha512 = "trNJ/vtMZYMLhfN45uLq4ShQSw0/S7xCTLLVM+WM1rmFpba/VS42jVUgaO3w/NOLiWR/09lnYk0yMaA/atdIsg=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.199.tgz"; + sha512 = "Vrjz5N5Ia4SEzWWgIVwnHNEnb1UE1XMkvY5DGXrAeOGE9imk0hgTHh5GyDjLDJi9OTCn9oo9dXH1uToK1VRfrg=="; }; }; "@types/long-4.0.2" = { @@ -11623,40 +11317,40 @@ let sha512 = "GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ=="; }; }; - "@types/mdast-3.0.12" = { + "@types/mdast-3.0.13" = { name = "_at_types_slash_mdast"; packageName = "@types/mdast"; - version = "3.0.12"; + version = "3.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.12.tgz"; - sha512 = "DT+iNIRNX884cx0/Q1ja7NyUPpZuv0KPyL5rGNxm1WC1OtHstl7n4Jb7nk+xacNShQMbczJjt8uFzznpp6kYBg=="; + url = "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.13.tgz"; + sha512 = "HjiGiWedR0DVFkeNljpa6Lv4/IZU1+30VY5d747K7lBudFc3R0Ibr6yJ9lN3BE28VnZyDfLF/VB1Ql1ZIbKrmg=="; }; }; - "@types/mdurl-1.0.2" = { + "@types/mdurl-1.0.3" = { name = "_at_types_slash_mdurl"; packageName = "@types/mdurl"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mdurl/-/mdurl-1.0.2.tgz"; - sha512 = "eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA=="; + url = "https://registry.npmjs.org/@types/mdurl/-/mdurl-1.0.3.tgz"; + sha512 = "T5k6kTXak79gwmIOaDF2UUQXFbnBE0zBUzF20pz7wDYu0RQMzWg+Ml/Pz50214NsFHBITkoi5VtdjFZnJ2ijjA=="; }; }; - "@types/mime-1.3.2" = { + "@types/mime-1.3.3" = { name = "_at_types_slash_mime"; packageName = "@types/mime"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz"; - sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="; + url = "https://registry.npmjs.org/@types/mime/-/mime-1.3.3.tgz"; + sha512 = "Ys+/St+2VF4+xuY6+kDIXGxbNRO0mesVg0bbxEfB97Od1Vjpjx9KD1qxs64Gcb3CWPirk9Xe+PT4YiiHQ9T+eg=="; }; }; - "@types/mime-3.0.1" = { + "@types/mime-3.0.2" = { name = "_at_types_slash_mime"; packageName = "@types/mime"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mime/-/mime-3.0.1.tgz"; - sha512 = "Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA=="; + url = "https://registry.npmjs.org/@types/mime/-/mime-3.0.2.tgz"; + sha512 = "Wj+fqpTLtTbG7c0tH47dkahefpLKEbB+xAZuLq7b4/IDHPl/n6VoXcyUQ2bypFlbSwvCr0y+bD4euTTqTJsPxQ=="; }; }; "@types/minimatch-3.0.5" = { @@ -11677,22 +11371,22 @@ let sha512 = "K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA=="; }; }; - "@types/minimist-1.2.2" = { + "@types/minimist-1.2.3" = { name = "_at_types_slash_minimist"; packageName = "@types/minimist"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz"; - sha512 = "jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ=="; + url = "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.3.tgz"; + sha512 = "ZYFzrvyWUNhaPomn80dsMNgMeXxNWZBdkuG/hWlUvXvbdUH8ZERNBGXnU87McuGcWDsyzX2aChCv/SVN348k3A=="; }; }; - "@types/ms-0.7.31" = { + "@types/ms-0.7.32" = { name = "_at_types_slash_ms"; packageName = "@types/ms"; - version = "0.7.31"; + version = "0.7.32"; src = fetchurl { - url = "https://registry.npmjs.org/@types/ms/-/ms-0.7.31.tgz"; - sha512 = "iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA=="; + url = "https://registry.npmjs.org/@types/ms/-/ms-0.7.32.tgz"; + sha512 = "xPSg0jm4mqgEkNhowKgZFBNtwoEwF6gJ4Dhww+GFpm3IgtNseHQZ5IqdNwnquZEoANxyDAKDRAdVo4Z72VvD/g=="; }; }; "@types/mute-stream-0.0.1" = { @@ -11713,13 +11407,13 @@ let sha512 = "UXitWSmXCwhDmAKe7D3hNQtQaHeHt5L8LO1CB8GF8jlYVzOv5cBWDNqiJ+oPEWrWei3i3dkZtHY/bUtd0R/uOQ=="; }; }; - "@types/nlcst-1.0.1" = { + "@types/nlcst-1.0.2" = { name = "_at_types_slash_nlcst"; packageName = "@types/nlcst"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/nlcst/-/nlcst-1.0.1.tgz"; - sha512 = "aVIyXt6pZiiMOtVByE4Y0gf+BLm1Cxc4ZLSK8VRHn1CgkO+kXbQwN/EBhQmhPdBMjFJCMBKtmNW2zWQuFywz8Q=="; + url = "https://registry.npmjs.org/@types/nlcst/-/nlcst-1.0.2.tgz"; + sha512 = "ykxL/GDDUhqikjU0LIywZvEwb1NTYXTEWf+XgMSS2o6IXIakafPccxZmxgZcvJPZ3yFl2kdL1gJZz3U3iZF3QA=="; }; }; "@types/node-10.17.60" = { @@ -11740,22 +11434,13 @@ let sha512 = "qelS/Ra6sacc4loe/3MSjXNL1dNQ/GjxNHVzuChwMfmk7HuycRLVQN2qNY3XahK+fZc5E2szqQSKUyAF0E+2bg=="; }; }; - "@types/node-14.18.60" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "14.18.60"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.18.60.tgz"; - sha512 = "F2dfYDznasZ6XfuWvTmQcrElTHfxCdC+F23WCcuAJaIrMIhhBUSARJQdy0lUY+MPDNLqGvTo8/IuiF+QX64IHQ=="; - }; - }; - "@types/node-15.14.9" = { + "@types/node-14.18.63" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "15.14.9"; + version = "14.18.63"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-15.14.9.tgz"; - sha512 = "qjd88DrCxupx/kJD5yQgZdcYKZKSIGBVDIBE1/LTGcNm3d2Np/jxojkdePDdfnBHJc5W7vSMpbJ1aB7p/Py69A=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.18.63.tgz"; + sha512 = "fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ=="; }; }; "@types/node-16.11.68" = { @@ -11776,13 +11461,13 @@ let sha512 = "XAMpaw1s1+6zM+jn2tmw8MyaRDIJfXxqmIQIS0HfoGYPuf7dUWeiUKopwq13KFX9lEp1+THGtlaaYx39Nxr58g=="; }; }; - "@types/node-16.18.51" = { + "@types/node-16.18.55" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.18.51"; + version = "16.18.55"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.18.51.tgz"; - sha512 = "LKA7ZhY30I8PiUOzBzhtnIULQTACpiEpPXLiYMWyS+tPAORf+rmXUadHZXB/KFrFyMjeHeKc1GFvLd+3f7LE3w=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.18.55.tgz"; + sha512 = "Y1zz/LIuJek01+hlPNzzXQhmq/Z2BCP96j18MSXC0S0jSu/IG4FFxmBs7W4/lI2vPJ7foVfEB0hUVtnOjnCiTg=="; }; }; "@types/node-16.9.1" = { @@ -11794,31 +11479,49 @@ let sha512 = "QpLcX9ZSsq3YYUUnD3nFDY8H7wctAhQj/TFKL8Ya8v5fMm3CFXxo8zStsLAl780ltoYoo1WvKUVGBQK+1ifr7g=="; }; }; - "@types/node-18.17.16" = { + "@types/node-18.18.1" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "18.18.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-18.18.1.tgz"; + sha512 = "3G42sxmm0fF2+Vtb9TJQpnjmP+uKlWvFa8KoEGquh4gqRmoUG/N0ufuhikw6HEsdG2G2oIKhog1GCTfz9v5NdQ=="; + }; + }; + "@types/node-20.5.1" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "18.17.16"; + version = "20.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.17.16.tgz"; - sha512 = "e0zgs7qe1XH/X3KEPnldfkD07LH9O1B9T31U8qoO7lqGSjj3/IrBuvqMeJ1aYejXRK3KOphIUDw6pLIplEW17A=="; + url = "https://registry.npmjs.org/@types/node/-/node-20.5.1.tgz"; + sha512 = "4tT2UrL5LBqDwoed9wZ6N3umC4Yhz3W3FloMmiiG4JwmUJWpie0c7lcnUNd4gtMKuDEO4wRVS8B6Xa0uMRsMKg=="; }; }; - "@types/node-20.4.7" = { + "@types/node-20.5.9" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "20.4.7"; + version = "20.5.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-20.4.7.tgz"; - sha512 = "bUBrPjEry2QUTsnuEjzjbS7voGWCc30W0qzgMf90GPeDGFRakvrz47ju+oqDAKCXLUCe39u57/ORMl/O/04/9g=="; + url = "https://registry.npmjs.org/@types/node/-/node-20.5.9.tgz"; + sha512 = "PcGNd//40kHAS3sTlzKB9C9XL4K0sTup8nbG5lC14kzEteTNuAFh9u5nA0o5TWnSG2r/JNPRXFVcHJIIeRlmqQ=="; }; }; - "@types/node-20.6.1" = { + "@types/node-20.8.0" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "20.6.1"; + version = "20.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-20.6.1.tgz"; - sha512 = "4LcJvuXQlv4lTHnxwyHQZ3uR9Zw2j7m1C9DfuwoTFQQP4Pmu04O6IfLYgMmHoOCt0nosItLLZAH+sOrRE0Bo8g=="; + url = "https://registry.npmjs.org/@types/node/-/node-20.8.0.tgz"; + sha512 = "LzcWltT83s1bthcvjBmiBvGJiiUe84NWRHkw+ZV6Fr41z2FbIzvc815dk2nQ3RAKMuN2fkenM/z3Xv2QzEpYxQ=="; + }; + }; + "@types/node-20.8.1" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "20.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-20.8.1.tgz"; + sha512 = "iN6stS2QGMl50pjH0h/dIfmcEUogljAreQZ+cubPw3ISWp5fJrZw9NOh/sDHJfw92A41hCU+Ls5zTIsNYzcnuA=="; }; }; "@types/node-6.14.13" = { @@ -11839,22 +11542,22 @@ let sha512 = "DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A=="; }; }; - "@types/node-fetch-2.6.5" = { + "@types/node-fetch-2.6.6" = { name = "_at_types_slash_node-fetch"; packageName = "@types/node-fetch"; - version = "2.6.5"; + version = "2.6.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.5.tgz"; - sha512 = "OZsUlr2nxvkqUFLSaY2ZbA+P1q22q+KrlxWOn/38RX+u5kTkYL2mTujEpzUhGkS+K/QCYp9oagfXG39XOzyySg=="; + url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.6.tgz"; + sha512 = "95X8guJYhfqiuVVhRFxVQcf4hW/2bCuoPwDasMf/531STFoNoWTT7YDnWdXHEZKqAGUigmpG31r2FE70LwnzJw=="; }; }; - "@types/normalize-package-data-2.4.1" = { + "@types/normalize-package-data-2.4.2" = { name = "_at_types_slash_normalize-package-data"; packageName = "@types/normalize-package-data"; - version = "2.4.1"; + version = "2.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz"; - sha512 = "Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw=="; + url = "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.2.tgz"; + sha512 = "lqa4UEhhv/2sjjIQgjX8B+RBjj47eo0mzGasklVJ78UKGQY1r0VpB9XHDaZZO9qzEFDdy4MrXLuEaSmPrPSe/A=="; }; }; "@types/parse-json-4.0.0" = { @@ -11875,22 +11578,22 @@ let sha512 = "kUNnecmtkunAoQ3CnjmMkzNU/gtxG8guhi+Fk2U/kOpIKjIMKnXGp4IJCgQJrXSgMsWYimYG4TGjz/UzbGEBTw=="; }; }; - "@types/prop-types-15.7.5" = { + "@types/prop-types-15.7.8" = { name = "_at_types_slash_prop-types"; packageName = "@types/prop-types"; - version = "15.7.5"; + version = "15.7.8"; src = fetchurl { - url = "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz"; - sha512 = "JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w=="; + url = "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.8.tgz"; + sha512 = "kMpQpfZKSCBqltAJwskgePRaYRFukDkm1oItcAbC3gNELR20XIBcN9VRgg4+m8DKsTfkWeA4m4Imp4DDuWy7FQ=="; }; }; - "@types/pug-2.0.6" = { + "@types/pug-2.0.7" = { name = "_at_types_slash_pug"; packageName = "@types/pug"; - version = "2.0.6"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/pug/-/pug-2.0.6.tgz"; - sha512 = "SnHmG9wN1UVmagJOnyo/qkk0Z7gejYxOYYmaAwr5u2yFYfsupN3sg10kyzN8Hep/2zbHxCnsumxOoRIRMBwKCg=="; + url = "https://registry.npmjs.org/@types/pug/-/pug-2.0.7.tgz"; + sha512 = "I469DU0UXNC1aHepwirWhu9YKg5fkxohZD95Ey/5A7lovC+Siu+MCLffva87lnfThaOrw9Vb1DUN5t55oULAAw=="; }; }; "@types/qs-6.9.8" = { @@ -11902,40 +11605,49 @@ let sha512 = "u95svzDlTysU5xecFNTgfFG5RUWu1A9P0VzgpcIiGZA9iraHOdSzcxMxQ55DyeRaGCSxQi7LxXDI4rzq/MYfdg=="; }; }; - "@types/range-parser-1.2.4" = { + "@types/range-parser-1.2.5" = { name = "_at_types_slash_range-parser"; packageName = "@types/range-parser"; - version = "1.2.4"; + version = "1.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz"; - sha512 = "EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="; + url = "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.5.tgz"; + sha512 = "xrO9OoVPqFuYyR/loIHjnbvvyRZREYKLjxV4+dY6v3FQR3stQ9ZxIGkaclF7YhI9hfjpuTbu14hZEy94qKLtOA=="; }; }; - "@types/react-18.2.21" = { + "@types/react-18.2.24" = { name = "_at_types_slash_react"; packageName = "@types/react"; - version = "18.2.21"; + version = "18.2.24"; src = fetchurl { - url = "https://registry.npmjs.org/@types/react/-/react-18.2.21.tgz"; - sha512 = "neFKG/sBAwGxHgXiIxnbm3/AAVQ/cMRS93hvBpg8xYRbeQSPVABp9U2bRnPf0iI4+Ucdv3plSxKK+3CW2ENJxA=="; + url = "https://registry.npmjs.org/@types/react/-/react-18.2.24.tgz"; + sha512 = "Ee0Jt4sbJxMu1iDcetZEIKQr99J1Zfb6D4F3qfUWoR1JpInkY1Wdg4WwCyBjL257D0+jGqSl1twBjV8iCaC0Aw=="; }; }; - "@types/readdir-glob-1.1.1" = { + "@types/react-dom-18.2.8" = { + name = "_at_types_slash_react-dom"; + packageName = "@types/react-dom"; + version = "18.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.8.tgz"; + sha512 = "bAIvO5lN/U8sPGvs1Xm61rlRHHaq5rp5N3kp9C+NJ/Q41P8iqjkXSu0+/qu8POsjH9pNWb0OYabFez7taP7omw=="; + }; + }; + "@types/readdir-glob-1.1.2" = { name = "_at_types_slash_readdir-glob"; packageName = "@types/readdir-glob"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/readdir-glob/-/readdir-glob-1.1.1.tgz"; - sha512 = "ImM6TmoF8bgOwvehGviEj3tRdRBbQujr1N+0ypaln/GWjaerOB26jb93vsRHmdMtvVQZQebOlqt2HROark87mQ=="; + url = "https://registry.npmjs.org/@types/readdir-glob/-/readdir-glob-1.1.2.tgz"; + sha512 = "vwAYrNN/8yhp/FJRU6HUSD0yk6xfoOS8HrZa8ZL7j+X8hJpaC1hTcAiXX2IxaAkkvrz9mLyoEhYZTE3cEYvA9Q=="; }; }; - "@types/responselike-1.0.0" = { + "@types/responselike-1.0.1" = { name = "_at_types_slash_responselike"; packageName = "@types/responselike"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz"; - sha512 = "85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA=="; + url = "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.1.tgz"; + sha512 = "TiGnitEDxj2X0j+98Eqk5lv/Cij8oHd32bU4D/Yw6AOq7vvTk0gSD2GPj0G/HkvhMoVsdlhYF4yqqlyPBTM6Sg=="; }; }; "@types/retry-0.12.0" = { @@ -11947,31 +11659,31 @@ let sha512 = "wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA=="; }; }; - "@types/retry-0.12.2" = { + "@types/retry-0.12.3" = { name = "_at_types_slash_retry"; packageName = "@types/retry"; - version = "0.12.2"; + version = "0.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/retry/-/retry-0.12.2.tgz"; - sha512 = "XISRgDJ2Tc5q4TRqvgJtzsRkFYNJzZrhTdtMoGVBttwzzQJkPnS3WWTFc7kuDRoPtPakl+T+OfdEUjYJj7Jbow=="; + url = "https://registry.npmjs.org/@types/retry/-/retry-0.12.3.tgz"; + sha512 = "rkxEZUFIyDEZhC6EfHz6Hwos2zXewCOLBzhdgv7D55qu4OAySNwDZzxbaMpFI6XthdBa5oHhR5s6/9MSuTfw4g=="; }; }; - "@types/sarif-2.1.4" = { + "@types/sarif-2.1.5" = { name = "_at_types_slash_sarif"; packageName = "@types/sarif"; - version = "2.1.4"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/sarif/-/sarif-2.1.4.tgz"; - sha512 = "4xKHMdg3foh3Va1fxTzY1qt8QVqmaJpGWsVvtjQrJBn+/bkig2pWFKJ4FPI2yLI4PAj0SUKiPO4Vd7ggYIMZjQ=="; + url = "https://registry.npmjs.org/@types/sarif/-/sarif-2.1.5.tgz"; + sha512 = "onJXseJAteCVczKQbO/Tx8zrvhZwZkAd+T7GGYXZvJJ7pzy7We5NJXcNk2oZoUbcnTP/AjkAH7XtPCkpfRBOnQ=="; }; }; - "@types/scheduler-0.16.3" = { + "@types/scheduler-0.16.4" = { name = "_at_types_slash_scheduler"; packageName = "@types/scheduler"; - version = "0.16.3"; + version = "0.16.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.3.tgz"; - sha512 = "5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ=="; + url = "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.4.tgz"; + sha512 = "2L9ifAGl7wmXwP4v3pN4p2FLhD0O1qsJpvKmNin5VA8+UvNVb447UDaAEV6UdrkA+m/Xs58U1RFps44x6TFsVQ=="; }; }; "@types/seedrandom-3.0.1" = { @@ -11983,58 +11695,58 @@ let sha512 = "giB9gzDeiCeloIXDgzFBCgjj1k4WxcDrZtGl6h1IqmUPlxF+Nx8Ve+96QCyDZ/HseB/uvDsKbpib9hU5cU53pw=="; }; }; - "@types/semver-7.5.2" = { + "@types/semver-7.5.3" = { name = "_at_types_slash_semver"; packageName = "@types/semver"; - version = "7.5.2"; + version = "7.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/semver/-/semver-7.5.2.tgz"; - sha512 = "7aqorHYgdNO4DM36stTiGO3DvKoex9TQRwsJU6vMaFGyqpBA1MNZkz+PG3gaNUPpTAOYhT1WR7M1JyA3fbS9Cw=="; + url = "https://registry.npmjs.org/@types/semver/-/semver-7.5.3.tgz"; + sha512 = "OxepLK9EuNEIPxWNME+C6WwbRAOOI2o2BaQEGzz5Lu2e4Z5eDnEo+/aVEDMIXywoJitJ7xWd641wrGLZdtwRyw=="; }; }; - "@types/send-0.17.1" = { + "@types/send-0.17.2" = { name = "_at_types_slash_send"; packageName = "@types/send"; - version = "0.17.1"; + version = "0.17.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/send/-/send-0.17.1.tgz"; - sha512 = "Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q=="; + url = "https://registry.npmjs.org/@types/send/-/send-0.17.2.tgz"; + sha512 = "aAG6yRf6r0wQ29bkS+x97BIs64ZLxeE/ARwyS6wrldMm3C1MdKwCcnnEwMC1slI8wuxJOpiUH9MioC0A0i+GJw=="; }; }; - "@types/serve-index-1.9.1" = { + "@types/serve-index-1.9.2" = { name = "_at_types_slash_serve-index"; packageName = "@types/serve-index"; - version = "1.9.1"; + version = "1.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz"; - sha512 = "d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg=="; + url = "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.2.tgz"; + sha512 = "asaEIoc6J+DbBKXtO7p2shWUpKacZOoMBEGBgPG91P8xhO53ohzHWGCs4ScZo5pQMf5ukQzVT9fhX1WzpHihig=="; }; }; - "@types/serve-static-1.15.2" = { + "@types/serve-static-1.15.3" = { name = "_at_types_slash_serve-static"; packageName = "@types/serve-static"; - version = "1.15.2"; + version = "1.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.2.tgz"; - sha512 = "J2LqtvFYCzaj8pVYKw8klQXrLLk7TBZmQ4ShlcdkELFKGwGMfevMLneMMRkMgZxotOD9wg497LpC7O8PcvAmfw=="; + url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.3.tgz"; + sha512 = "yVRvFsEMrv7s0lGhzrggJjNOSmZCdgCjw9xWrPr/kNNLp6FaDfMC1KaYl3TSJ0c58bECwNBMoQrZJ8hA8E1eFg=="; }; }; - "@types/sizzle-2.3.3" = { + "@types/sizzle-2.3.4" = { name = "_at_types_slash_sizzle"; packageName = "@types/sizzle"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz"; - sha512 = "JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ=="; + url = "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.4.tgz"; + sha512 = "jA2llq2zNkg8HrALI7DtWzhALcVH0l7i89yhY3iBdOz6cBPeACoFq+fkQrjHA39t1hnSFOboZ7A/AY5MMZSlag=="; }; }; - "@types/sockjs-0.3.33" = { + "@types/sockjs-0.3.34" = { name = "_at_types_slash_sockjs"; packageName = "@types/sockjs"; - version = "0.3.33"; + version = "0.3.34"; src = fetchurl { - url = "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.33.tgz"; - sha512 = "f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw=="; + url = "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.34.tgz"; + sha512 = "R+n7qBFnm/6jinlteC9DBL5dGiDGjWAvjo4viUanpnc/dG1y7uDoacXPIQ/PQEg1fI912SMHIa014ZjRpvDw4g=="; }; }; "@types/superagent-3.8.2" = { @@ -12100,6 +11812,15 @@ let sha512 = "d0XxK3YTObnWVp6rZuev3c49+j4Lo8g4L1ZRm9z5L0xpoZycUPshHgczK5gsUMaZOstjVYYi09p5gYvUtfChYw=="; }; }; + "@types/unist-3.0.0" = { + name = "_at_types_slash_unist"; + packageName = "@types/unist"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/unist/-/unist-3.0.0.tgz"; + sha512 = "MFETx3tbTjE7Uk6vvnWINA/1iJ7LuMdO4fcq8UfF0pRbj01aGLduVvQcRyswuACJdpnHgg8E3rQLhaRdNEJS0w=="; + }; + }; "@types/urijs-1.19.20" = { name = "_at_types_slash_urijs"; packageName = "@types/urijs"; @@ -12109,15 +11830,6 @@ let sha512 = "77Mq/2BeHU894J364dUv9tSwxxyCLtcX228Pc8TwZpP5bvOoMns+gZoftp3LYl3FBH8vChpWbuagKGiMki2c1A=="; }; }; - "@types/vinyl-2.0.7" = { - name = "_at_types_slash_vinyl"; - packageName = "@types/vinyl"; - version = "2.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.7.tgz"; - sha512 = "4UqPv+2567NhMQuMLdKAyK4yzrfCqwaTt6bLhHEs8PFcxbHILsrxaY63n4wgE/BRLDWDQeI+WcTmkXKExh9hQg=="; - }; - }; "@types/vscode-1.66.0" = { name = "_at_types_slash_vscode"; packageName = "@types/vscode"; @@ -12145,22 +11857,22 @@ let sha512 = "ltIpx+kM7g/MLRZfkbL7EsCEjfzCcScLpkg37eXEtx5kmrAKBkTJwd1GIAjDSL8wTpM6Hzn5YO4pSb91BEwu1g=="; }; }; - "@types/ws-8.5.5" = { + "@types/ws-8.5.6" = { name = "_at_types_slash_ws"; packageName = "@types/ws"; - version = "8.5.5"; + version = "8.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/ws/-/ws-8.5.5.tgz"; - sha512 = "lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg=="; + url = "https://registry.npmjs.org/@types/ws/-/ws-8.5.6.tgz"; + sha512 = "8B5EO9jLVCy+B58PLHvLDuOD8DRVMgQzq8d55SjLCOn9kqGyqOvy27exVaTio1q1nX5zLu8/6N0n2ThSxOM6tg=="; }; }; - "@types/yargs-15.0.15" = { + "@types/yargs-15.0.16" = { name = "_at_types_slash_yargs"; packageName = "@types/yargs"; - version = "15.0.15"; + version = "15.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.15.tgz"; - sha512 = "IziEYMU9XoVj8hWg7k+UJrXALkGFjWJhn5QFEv9q4p+v40oZhSuC135M38st8XPjICL7Ey4TV64ferBGUoJhBg=="; + url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.16.tgz"; + sha512 = "2FeD5qezW3FvLpZ0JpfuaEWepgNLl9b2gQYiz/ce0NhoB1W/D+VZu98phITXkADYerfr/jb7JcDcVhITsc9bwg=="; }; }; "@types/yargs-16.0.5" = { @@ -12172,22 +11884,22 @@ let sha512 = "AxO/ADJOBFJScHbWhq2xAhlWP24rY4aCEG/NFaMvbT3X2MgRsLjhjQwsn0Zi5zn0LG9jUhCCZMeX9Dkuw6k+vQ=="; }; }; - "@types/yargs-parser-21.0.0" = { + "@types/yargs-parser-21.0.1" = { name = "_at_types_slash_yargs-parser"; packageName = "@types/yargs-parser"; - version = "21.0.0"; + version = "21.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz"; - sha512 = "iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA=="; + url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.1.tgz"; + sha512 = "axdPBuLuEJt0c4yI5OZssC19K2Mq1uKdrfZBzuxLvaztgqUtFYZUNw7lETExPYJR9jdEoIg4mb7RQKRQzOkeGQ=="; }; }; - "@types/yauzl-2.10.0" = { + "@types/yauzl-2.10.1" = { name = "_at_types_slash_yauzl"; packageName = "@types/yauzl"; - version = "2.10.0"; + version = "2.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz"; - sha512 = "Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw=="; + url = "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.1.tgz"; + sha512 = "CHzgNU3qYBnp/O4S3yv2tXPlvMTq0YWSTVg2/JYLqWZGHwwgJGAwd00poay/11asPq8wLFwHzubyInqHIFmmiw=="; }; }; "@types/yoga-layout-1.9.2" = { @@ -12208,6 +11920,15 @@ let sha512 = "TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag=="; }; }; + "@typescript-eslint/eslint-plugin-6.0.0" = { + name = "_at_typescript-eslint_slash_eslint-plugin"; + packageName = "@typescript-eslint/eslint-plugin"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.0.0.tgz"; + sha512 = "xuv6ghKGoiq856Bww/yVYnXGsKa588kY3M0XK7uUW/3fJNNULKRfZfSBkMTSpqGG/8ZCXCadfh8G/z/B4aqS/A=="; + }; + }; "@typescript-eslint/parser-5.62.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; @@ -12217,6 +11938,15 @@ let sha512 = "VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA=="; }; }; + "@typescript-eslint/parser-6.0.0" = { + name = "_at_typescript-eslint_slash_parser"; + packageName = "@typescript-eslint/parser"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.0.0.tgz"; + sha512 = "TNaufYSPrr1U8n+3xN+Yp9g31vQDJqhXzzPSHfQDLcaO4tU+mCfODPxCwf4H530zo7aUBE3QIdxCXamEnG04Tg=="; + }; + }; "@typescript-eslint/scope-manager-5.62.0" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; @@ -12226,6 +11956,15 @@ let sha512 = "VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w=="; }; }; + "@typescript-eslint/scope-manager-6.0.0" = { + name = "_at_typescript-eslint_slash_scope-manager"; + packageName = "@typescript-eslint/scope-manager"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.0.0.tgz"; + sha512 = "o4q0KHlgCZTqjuaZ25nw5W57NeykZT9LiMEG4do/ovwvOcPnDO1BI5BQdCsUkjxFyrCL0cSzLjvIMfR9uo7cWg=="; + }; + }; "@typescript-eslint/type-utils-5.62.0" = { name = "_at_typescript-eslint_slash_type-utils"; packageName = "@typescript-eslint/type-utils"; @@ -12235,6 +11974,15 @@ let sha512 = "xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew=="; }; }; + "@typescript-eslint/type-utils-6.0.0" = { + name = "_at_typescript-eslint_slash_type-utils"; + packageName = "@typescript-eslint/type-utils"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.0.0.tgz"; + sha512 = "ah6LJvLgkoZ/pyJ9GAdFkzeuMZ8goV6BH7eC9FPmojrnX9yNCIsfjB+zYcnex28YO3RFvBkV6rMV6WpIqkPvoQ=="; + }; + }; "@typescript-eslint/types-5.62.0" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; @@ -12244,6 +11992,15 @@ let sha512 = "87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ=="; }; }; + "@typescript-eslint/types-6.0.0" = { + name = "_at_typescript-eslint_slash_types"; + packageName = "@typescript-eslint/types"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.0.0.tgz"; + sha512 = "Zk9KDggyZM6tj0AJWYYKgF0yQyrcnievdhG0g5FqyU3Y2DRxJn4yWY21sJC0QKBckbsdKKjYDV2yVrrEvuTgxg=="; + }; + }; "@typescript-eslint/typescript-estree-5.62.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; @@ -12253,6 +12010,15 @@ let sha512 = "CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA=="; }; }; + "@typescript-eslint/typescript-estree-6.0.0" = { + name = "_at_typescript-eslint_slash_typescript-estree"; + packageName = "@typescript-eslint/typescript-estree"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.0.0.tgz"; + sha512 = "2zq4O7P6YCQADfmJ5OTDQTP3ktajnXIRrYAtHM9ofto/CJZV3QfJ89GEaM2BNGeSr1KgmBuLhEkz5FBkS2RQhQ=="; + }; + }; "@typescript-eslint/utils-5.62.0" = { name = "_at_typescript-eslint_slash_utils"; packageName = "@typescript-eslint/utils"; @@ -12262,6 +12028,15 @@ let sha512 = "n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ=="; }; }; + "@typescript-eslint/utils-6.0.0" = { + name = "_at_typescript-eslint_slash_utils"; + packageName = "@typescript-eslint/utils"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.0.0.tgz"; + sha512 = "SOr6l4NB6HE4H/ktz0JVVWNXqCJTOo/mHnvIte1ZhBQ0Cvd04x5uKZa3zT6tiodL06zf5xxdK8COiDvPnQ27JQ=="; + }; + }; "@typescript-eslint/visitor-keys-5.62.0" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; @@ -12271,6 +12046,24 @@ let sha512 = "07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw=="; }; }; + "@typescript-eslint/visitor-keys-6.0.0" = { + name = "_at_typescript-eslint_slash_visitor-keys"; + packageName = "@typescript-eslint/visitor-keys"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.0.0.tgz"; + sha512 = "cvJ63l8c0yXdeT5POHpL0Q1cZoRcmRKFCtSjNGJxPkcP571EfZMcNbzWAc7oK3D1dRzm/V5EwtkANTZxqvuuUA=="; + }; + }; + "@ungap/structured-clone-1.2.0" = { + name = "_at_ungap_slash_structured-clone"; + packageName = "@ungap/structured-clone"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz"; + sha512 = "zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ=="; + }; + }; "@urql/core-2.3.6" = { name = "_at_urql_slash_core"; packageName = "@urql/core"; @@ -12307,13 +12100,13 @@ let sha512 = "1O/biKiVhhn0EtvDF4UOvz325K4RrLupfL8rHcmqD2TBLv4qVDWQuzx4JGa1FfqjjRb+C9TNZ6w19f32Mq85Ug=="; }; }; - "@vercel/build-utils-7.2.0" = { + "@vercel/build-utils-7.2.1" = { name = "_at_vercel_slash_build-utils"; packageName = "@vercel/build-utils"; - version = "7.2.0"; + version = "7.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/build-utils/-/build-utils-7.2.0.tgz"; - sha512 = "zLGXMuqRG/s++tqmui6MNRmHHi9phArug6XF5iRLVN8w/w3UxnnMVn3zXmnozrljrjwqSE43u8jLOVDqnk879Q=="; + url = "https://registry.npmjs.org/@vercel/build-utils/-/build-utils-7.2.1.tgz"; + sha512 = "WCqSBCPNlANEOsmroCzCZq6ZxArV20RHBbdaZzhZjkGtEReSZx5BSOsrnkewFJFuu5pNGYegAaVi0VCkA1irZQ=="; }; }; "@vercel/error-utils-2.0.1" = { @@ -12325,31 +12118,40 @@ let sha512 = "ZUVpRFArh5eyKpJmdfEuCaMpZKQvZgUq0pQ7PdK8m5FgRYEvF4I0TMJH3JnkbYaMMUH82aYWZr+/hFJtEBcmTQ=="; }; }; - "@vercel/gatsby-plugin-vercel-analytics-1.0.10" = { + "@vercel/fun-1.1.0" = { + name = "_at_vercel_slash_fun"; + packageName = "@vercel/fun"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@vercel/fun/-/fun-1.1.0.tgz"; + sha512 = "SpuPAo+MlAYMtcMcC0plx7Tv4Mp7SQhJJj1iIENlOnABL24kxHpL09XLQMGzZIzIW7upR8c3edwgfpRtp+dhVw=="; + }; + }; + "@vercel/gatsby-plugin-vercel-analytics-1.0.11" = { name = "_at_vercel_slash_gatsby-plugin-vercel-analytics"; packageName = "@vercel/gatsby-plugin-vercel-analytics"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/gatsby-plugin-vercel-analytics/-/gatsby-plugin-vercel-analytics-1.0.10.tgz"; - sha512 = "v329WHdtIce+y7oAmaWRvEx59Xfo0FxlQqK4BJG0u6VWYoKWPaflohDAiehIZf/YHCRVb59ZxnzmMOcm/LR8YQ=="; + url = "https://registry.npmjs.org/@vercel/gatsby-plugin-vercel-analytics/-/gatsby-plugin-vercel-analytics-1.0.11.tgz"; + sha512 = "iTEA0vY6RBPuEzkwUTVzSHDATo1aF6bdLLspI68mQ/BTbi5UQEGjpjyzdKOVcSYApDtFU6M6vypZ1t4vIEnHvw=="; }; }; - "@vercel/gatsby-plugin-vercel-builder-2.0.5" = { + "@vercel/gatsby-plugin-vercel-builder-2.0.6" = { name = "_at_vercel_slash_gatsby-plugin-vercel-builder"; packageName = "@vercel/gatsby-plugin-vercel-builder"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/gatsby-plugin-vercel-builder/-/gatsby-plugin-vercel-builder-2.0.5.tgz"; - sha512 = "NrApRLfSXOs2vJwuX1Hx3vRYM4n+F4LNQgajVW6NAwmWQeKUzfsinA0jduZLYFqpYPeTHXQhbStZL9T4gk8ong=="; + url = "https://registry.npmjs.org/@vercel/gatsby-plugin-vercel-builder/-/gatsby-plugin-vercel-builder-2.0.6.tgz"; + sha512 = "ne6Xkqm/Naxc6KON3RwhE3irJVevCRwdMp+VMSXgC8ik+q9tWxtmMa4tbdnregKWEk1cw3ToHN6MkXRdcchpYA=="; }; }; - "@vercel/go-3.0.1" = { + "@vercel/go-3.0.2" = { name = "_at_vercel_slash_go"; packageName = "@vercel/go"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/go/-/go-3.0.1.tgz"; - sha512 = "Bd0jdtNbvAeTadqCOHU5YW7f1nd44WplzETNGvAVijG3c2hDyrKIOQNKzBGyqVaca2HwVqtumxIjTS6rJDkMpA=="; + url = "https://registry.npmjs.org/@vercel/go/-/go-3.0.2.tgz"; + sha512 = "g1i1X/h6SfIiCj+wVfNPZPqxhoOQbQXDximoGywTgKpRWZD40ReAjYIL4siemsHHX26ihhaJX2eHX8vWyQ57EQ=="; }; }; "@vercel/hydrogen-1.0.1" = { @@ -12361,58 +12163,58 @@ let sha512 = "4PYk4LeIWPTjGtgnxvB0Hdw7aqCau843/96K2xX3z9pa0Hn//pUnZBMz2jrs5MRseCm1Li1LdQAK3u8/vaUnVQ=="; }; }; - "@vercel/next-4.0.5" = { + "@vercel/next-4.0.8" = { name = "_at_vercel_slash_next"; packageName = "@vercel/next"; - version = "4.0.5"; + version = "4.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/next/-/next-4.0.5.tgz"; - sha512 = "wdRiMqfr//KPEzEJYlQ0Ri4SFbPdnoEJdpktdmaxAK7bREvkJeeCjFAkqBDGb1OiqjyKolxF1xwMewRvLj80MQ=="; + url = "https://registry.npmjs.org/@vercel/next/-/next-4.0.8.tgz"; + sha512 = "rKP63aGivXyw6ihNL+P67qxIQ0de5OTzGV5s650GzkF1RwNLs3coy1NSWlspWL3SlaAXwqWJSIQmhcA8EYaSKA=="; }; }; - "@vercel/nft-0.22.5" = { + "@vercel/nft-0.24.1" = { name = "_at_vercel_slash_nft"; packageName = "@vercel/nft"; - version = "0.22.5"; + version = "0.24.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/nft/-/nft-0.22.5.tgz"; - sha512 = "mug57Wd1BL7GMj9gXMgMeKUjdqO0e4u+0QLPYMFE1rwdJ+55oPy6lp3nIBCS8gOvigT62UI4QKUL2sGqcoW4Hw=="; + url = "https://registry.npmjs.org/@vercel/nft/-/nft-0.24.1.tgz"; + sha512 = "bGYrA/w98LNl9edxXcAezKs+Ixa2a+RkAvxXK38gH3815v+WkNa2AGY+wQv59vu2f9il9+zIKj6YrnlYIbh+jA=="; }; }; - "@vercel/node-3.0.5" = { + "@vercel/node-3.0.6" = { name = "_at_vercel_slash_node"; packageName = "@vercel/node"; - version = "3.0.5"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/node/-/node-3.0.5.tgz"; - sha512 = "Ow98UMLuODqORNO34j+mbmTGimWD9BjM4onUKkuaSoLaHcl/CAlTTR4m71IdyJeoDBcf0bRURluseED0gmXCTA=="; + url = "https://registry.npmjs.org/@vercel/node/-/node-3.0.6.tgz"; + sha512 = "QYsmc5rtuyjSAryAo4qRwsEw9NXhapAbF/OBM0Fdq3kPiwHDfbElJpb7UbeQH19u3q4d+E7Z6wZTbO6bsrzw4g=="; }; }; - "@vercel/python-4.0.1" = { + "@vercel/python-4.0.2" = { name = "_at_vercel_slash_python"; packageName = "@vercel/python"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/python/-/python-4.0.1.tgz"; - sha512 = "3VfHbLBJ+JIQjUTjosveDM4Y8O6u9vkYWvJYg7BJIyv2TFzJcl8fhW5qurPb5Z7kMj2aRQaN1YRjDvElCOqwVA=="; + url = "https://registry.npmjs.org/@vercel/python/-/python-4.0.2.tgz"; + sha512 = "mmUeR3GBuDnaJK3IIHRoPl3bNevcWO3N/YrNAx+zxLPSHzfzmCLZbFVVXbzoKBi/cALiOPcApVhlQXwU26y7xg=="; }; }; - "@vercel/redwood-2.0.2" = { + "@vercel/redwood-2.0.3" = { name = "_at_vercel_slash_redwood"; packageName = "@vercel/redwood"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/redwood/-/redwood-2.0.2.tgz"; - sha512 = "TyCloruHLi5kBrFPTPDVcQoDDYHG3VfA9ZngNBpqHXQqhR4VsymTh8wV0995faKMPiHcQFbJy7WArhxC/T0Png=="; + url = "https://registry.npmjs.org/@vercel/redwood/-/redwood-2.0.3.tgz"; + sha512 = "efUqJjRxRhB+nw6OpYw3ptQyXAoWKA/qnzz1UKWfcL2yunCDrdvh2IL3O+Kjt2YqixJAH6DTK1B8lc6NhMoY/g=="; }; }; - "@vercel/remix-builder-2.0.5" = { + "@vercel/remix-builder-2.0.8" = { name = "_at_vercel_slash_remix-builder"; packageName = "@vercel/remix-builder"; - version = "2.0.5"; + version = "2.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/remix-builder/-/remix-builder-2.0.5.tgz"; - sha512 = "EzqyE/B4dNhKYmukOGBDrRl5Z/J7UkX8Q9DXOr0EBR1fs09l+T/qxLshk7rLU2ubl1oDHiIuxOYQWHVb2vtdFw=="; + url = "https://registry.npmjs.org/@vercel/remix-builder/-/remix-builder-2.0.8.tgz"; + sha512 = "PQA4Iu47qKOEyOa0WqS3u9lSnVEGfq/9ZVY6+IlZfR1+bmCVx7c2PW7BOSBucwhn1qMD6TF2kka0fz48UXpVXQ=="; }; }; "@vercel/routing-utils-3.0.0" = { @@ -12433,13 +12235,13 @@ let sha512 = "MqFynhtZ905L210DWAbgkiEQEK39LTtp9eL2Nm6PjzhjNzU6hV0UfK8Z24vU9CC6J4mrUTTZx396fH7XTYJWqg=="; }; }; - "@vercel/static-build-2.0.6" = { + "@vercel/static-build-2.0.7" = { name = "_at_vercel_slash_static-build"; packageName = "@vercel/static-build"; - version = "2.0.6"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/static-build/-/static-build-2.0.6.tgz"; - sha512 = "gMqSK+kR8WQupcHXFDnZvpt6z30p1tqRggU68xQP3aI9Spqk6tWT8hXscdPH6OOsQ+fJmis6STc4/4zWZO2WLw=="; + url = "https://registry.npmjs.org/@vercel/static-build/-/static-build-2.0.7.tgz"; + sha512 = "MjEgxf9HaK7tjVqS/bSlVSGBxFw3hNHdrVEoGJNwMZEfocgBiFxFGaw0Vxki8FTs+F3cciXdxwi6+O1bjj91GA=="; }; }; "@vercel/static-config-3.0.0" = { @@ -12451,6 +12253,15 @@ let sha512 = "2qtvcBJ1bGY0dYGYh3iM7yGKkk971FujLEDXzuW5wcZsPr1GSEjO/w2iSr3qve6nDDtBImsGoDEnus5FI4+fIw=="; }; }; + "@vitejs/plugin-react-4.0.4" = { + name = "_at_vitejs_slash_plugin-react"; + packageName = "@vitejs/plugin-react"; + version = "4.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.0.4.tgz"; + sha512 = "7wU921ABnNYkETiMaZy7XqpueMnpu5VxvVps13MjmCo+utBdD79sZzrApHawHtVX66cCJQQTXFcjH0y9dSUK8g=="; + }; + }; "@volar-plugins/css-2.0.0" = { name = "_at_volar-plugins_slash_css"; packageName = "@volar-plugins/css"; @@ -13207,15 +13018,6 @@ let sha512 = "YYRBpDCBLeYJBO+sVapLRkEE/+wrjv1O03IEybkqyls3sCZqhu3ZXjJwMSMCgFEyYP2MrdZvqL/dz2RBnULTbA=="; }; }; - "@webpack-cli/configtest-1.2.0" = { - name = "_at_webpack-cli_slash_configtest"; - packageName = "@webpack-cli/configtest"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.2.0.tgz"; - sha512 = "4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg=="; - }; - }; "@webpack-cli/configtest-2.1.1" = { name = "_at_webpack-cli_slash_configtest"; packageName = "@webpack-cli/configtest"; @@ -13225,15 +13027,6 @@ let sha512 = "wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw=="; }; }; - "@webpack-cli/info-1.5.0" = { - name = "_at_webpack-cli_slash_info"; - packageName = "@webpack-cli/info"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/info/-/info-1.5.0.tgz"; - sha512 = "e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ=="; - }; - }; "@webpack-cli/info-2.0.2" = { name = "_at_webpack-cli_slash_info"; packageName = "@webpack-cli/info"; @@ -13243,15 +13036,6 @@ let sha512 = "zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A=="; }; }; - "@webpack-cli/serve-1.7.0" = { - name = "_at_webpack-cli_slash_serve"; - packageName = "@webpack-cli/serve"; - version = "1.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.7.0.tgz"; - sha512 = "oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q=="; - }; - }; "@webpack-cli/serve-2.0.5" = { name = "_at_webpack-cli_slash_serve"; packageName = "@webpack-cli/serve"; @@ -13648,76 +13432,76 @@ let sha512 = "nzvgl3VfhcELQ8LyVrYOru+UtAy1nrygk2+AGbTm8a5YcO6o8lSjAT+pfg3vJWxIoZKOUhrK6UU7xW/+00kQrg=="; }; }; - "@zwave-js/cc-11.14.0" = { + "@zwave-js/cc-12.0.2" = { name = "_at_zwave-js_slash_cc"; packageName = "@zwave-js/cc"; - version = "11.14.0"; + version = "12.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/cc/-/cc-11.14.0.tgz"; - sha512 = "t+3az2yrsI5JqI8gMHcc8tg9u+w98SCyP33sjF12GysoRFRwnbUS25UBxzXM1VBT3tbdttg2+sTiKxVM1tnpVw=="; + url = "https://registry.npmjs.org/@zwave-js/cc/-/cc-12.0.2.tgz"; + sha512 = "jpdLyNcdozlACzHU9MXWHn7wBFM28thwZtdbh4pCyigTH+s8G9csZo8jU4tQHhocGZMY/votrqObyqbgL/Jneg=="; }; }; - "@zwave-js/config-11.14.0" = { + "@zwave-js/config-12.0.2" = { name = "_at_zwave-js_slash_config"; packageName = "@zwave-js/config"; - version = "11.14.0"; + version = "12.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/config/-/config-11.14.0.tgz"; - sha512 = "z9TDRMlLx1VEtvE2hz1xzH7vqMxEuPnhOZBXwPsrtXsCHOCk/IOwkIQWDwh4wh1DA5VIWwSF26WeIHfrPc/LvQ=="; + url = "https://registry.npmjs.org/@zwave-js/config/-/config-12.0.2.tgz"; + sha512 = "9PXR4wa+/2vC2ltLM0fWwypr7GaXao3RQXM1KEb2oyFCvNnCIsjUmmnJiguuRr+7oqhHvgvq5bfyGegd177a3A=="; }; }; - "@zwave-js/core-11.14.0" = { + "@zwave-js/core-12.0.2" = { name = "_at_zwave-js_slash_core"; packageName = "@zwave-js/core"; - version = "11.14.0"; + version = "12.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/core/-/core-11.14.0.tgz"; - sha512 = "L9MbM+09iJiOHh6lJvOn9lildb8vEH+pW7oQIYhOWiGMQe3caXotUg9j+uvGIf7dskFT1SoivZcBk9HtQswr/g=="; + url = "https://registry.npmjs.org/@zwave-js/core/-/core-12.0.2.tgz"; + sha512 = "Dqq9yZYWffMIaEGV5ycA5u6HJSXCxTnVGqe7p933zHw8KhKxiab/2zcD7cX2HAyJtPgRbRFH8vs7qy4Qx0P+8Q=="; }; }; - "@zwave-js/host-11.14.0" = { + "@zwave-js/host-12.0.2" = { name = "_at_zwave-js_slash_host"; packageName = "@zwave-js/host"; - version = "11.14.0"; + version = "12.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/host/-/host-11.14.0.tgz"; - sha512 = "gchz4e3z3lICklWwN8Sncno391VxciF3AC4FriNa0224bw9VJRabEn+LL9QzdwCQkQJrBluqNOL5uS3WLzINbg=="; + url = "https://registry.npmjs.org/@zwave-js/host/-/host-12.0.2.tgz"; + sha512 = "TEzRG5HvYonDK/6cX3DLbaHiU523Du3uQ8DfUNM8zFV0ocDLmjh3g4zWRd0LTngqFAB9+K1SnOjrleaNm/SYzQ=="; }; }; - "@zwave-js/nvmedit-11.14.0" = { + "@zwave-js/nvmedit-12.0.2" = { name = "_at_zwave-js_slash_nvmedit"; packageName = "@zwave-js/nvmedit"; - version = "11.14.0"; + version = "12.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/nvmedit/-/nvmedit-11.14.0.tgz"; - sha512 = "MmtxVv4orxoTB7KQRUKY0ytuQyQO+NoHcw1fZ02vZAruDmu1x7lqyHu+8Vc4cVtEFWdOHCPAxyxR+B8fKLRlmQ=="; + url = "https://registry.npmjs.org/@zwave-js/nvmedit/-/nvmedit-12.0.2.tgz"; + sha512 = "Rk790S0yeE2YukTX4XLrfGYS4j845WYIKg3sQXEkjm/AjRLlCxEvpp0T1d7HqYBBIuQCG50DVMYWmnnp1WsmFg=="; }; }; - "@zwave-js/serial-11.14.0" = { + "@zwave-js/serial-12.0.2" = { name = "_at_zwave-js_slash_serial"; packageName = "@zwave-js/serial"; - version = "11.14.0"; + version = "12.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/serial/-/serial-11.14.0.tgz"; - sha512 = "mT8Fk/r0mJ7351yBue64YH2vx2fUbwOtA5uGfyzqW16jWvSRzFfQrdtzadXd7Zha6rQLFfjYa5dKCn1iKEX+RA=="; + url = "https://registry.npmjs.org/@zwave-js/serial/-/serial-12.0.2.tgz"; + sha512 = "g9Lr870CEzmh1JaSC8Jy2E4F31bLEf2aT7tkutVGQtgoyUxYg7W9p1PdmOSBRIuBJxLXru88NczfSLzIPtlRWg=="; }; }; - "@zwave-js/shared-11.13.1" = { + "@zwave-js/shared-12.0.0" = { name = "_at_zwave-js_slash_shared"; packageName = "@zwave-js/shared"; - version = "11.13.1"; + version = "12.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/shared/-/shared-11.13.1.tgz"; - sha512 = "enpzMK8vwkTJ042jp0M2BfvjDZtLvgCYmliKhy3FMWw9csvZpHc3S6MqItlymHsy097i4mYeZP2WOnXW4ApVLQ=="; + url = "https://registry.npmjs.org/@zwave-js/shared/-/shared-12.0.0.tgz"; + sha512 = "baypO1WxHJXbGR5BUyM0ibV6iU/S2etKKKY+UR0S1tT45jzC/Jqx9rn3XN/lDZrd+tn66ViZ4twKeLx85skt3Q=="; }; }; - "@zwave-js/testing-11.14.0" = { + "@zwave-js/testing-12.0.2" = { name = "_at_zwave-js_slash_testing"; packageName = "@zwave-js/testing"; - version = "11.14.0"; + version = "12.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/testing/-/testing-11.14.0.tgz"; - sha512 = "nXFSX3AkfDmspP2idYFHHTElfF8jIGQJHzqzgT+T+JW4lLUFqW32k9HqTwlOvrWlYPq6zaVOR6GHKYOOFFwddA=="; + url = "https://registry.npmjs.org/@zwave-js/testing/-/testing-12.0.2.tgz"; + sha512 = "srJf8zOXQ39yM94Zl3BxIgVDLSbgGcC744b7Ika/PaM/q75Y+1i8fbO/qSYygSVN9XvazgdqBzv3s5ZbrhAA3Q=="; }; }; "CSSselect-0.4.1" = { @@ -14269,13 +14053,13 @@ let sha512 = "GrTZLRpmp6wIC2ztrWW9MjjTgSKccffgFagbNDOX95/dcjEcYZibYTeaOntySQLcdw1ztBoFkviiUvTMbb9MYg=="; }; }; - "all-package-names-2.0.737" = { + "all-package-names-2.0.748" = { name = "all-package-names"; packageName = "all-package-names"; - version = "2.0.737"; + version = "2.0.748"; src = fetchurl { - url = "https://registry.npmjs.org/all-package-names/-/all-package-names-2.0.737.tgz"; - sha512 = "c6kaqYGKLroNZ+zPKXGn4fPD4Vh7ZBrmPABMpVrL4g4KEqlo8ojiBcchoDMoE3yTWMw1i51jm69by/PM+kKYmw=="; + url = "https://registry.npmjs.org/all-package-names/-/all-package-names-2.0.748.tgz"; + sha512 = "/aaO1fGUeOqYYDV6bN6u1Pd3vgk3w8nVxYNzXAkkTTai61lwBhwb6j0XDNrd8rUjibLcJCn21fXgGYLPTClnzw=="; }; }; "amdefine-1.0.1" = { @@ -14710,15 +14494,6 @@ let sha512 = "ZI/8rTE4ww8BHktsVpb91Sdq7Cb71rdSkXELSwdSR0eXu600/sY+1UXhTWdiJvk+Eq5ljqoHLwLbY2+Clq2b9A=="; }; }; - "appdata-path-1.0.0" = { - name = "appdata-path"; - packageName = "appdata-path"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/appdata-path/-/appdata-path-1.0.0.tgz"; - sha512 = "ZbH3ezXfnT/YE3NdqduIt4lBV+H0ybvA2Qx3K76gIjQvh8gROpDFdDLpx6B1QJtW7zxisCbpTlCLhKqoR8cDBw=="; - }; - }; "append-buffer-1.0.2" = { name = "append-buffer"; packageName = "append-buffer"; @@ -14854,15 +14629,6 @@ let sha512 = "+25nxyyznAXF7Nef3y0EbBeqmGZgeN/BxHX29Rs39djAfaFalmQ89SE6CWyDCHzGL0yt/ycBtNOmGTW0FyGWNw=="; }; }; - "archiver-6.0.1" = { - name = "archiver"; - packageName = "archiver"; - version = "6.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/archiver/-/archiver-6.0.1.tgz"; - sha512 = "CXGy4poOLBKptiZH//VlWdFuUC1RESbdZjGjILwBuZ73P7WkAUN0htfSfBq/7k6FRFlpu7bg4JOkj1vU9G6jcQ=="; - }; - }; "archiver-utils-2.1.0" = { name = "archiver-utils"; packageName = "archiver-utils"; @@ -14881,15 +14647,6 @@ let sha512 = "KVgf4XQVrTjhyWmx6cte4RxonPLR9onExufI1jhvw/MQ4BB6IsZD5gT8Lq+u/+pRkWna/6JoHpiQioaqFP5Rzw=="; }; }; - "archiver-utils-4.0.1" = { - name = "archiver-utils"; - packageName = "archiver-utils"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/archiver-utils/-/archiver-utils-4.0.1.tgz"; - sha512 = "Q4Q99idbvzmgCTEAAhi32BkOyq8iVI5EwdO0PmBDSGIzzjYNdcFn7Q7k3OzbLy4kLUPXfJtG6fO2RjftXbobBg=="; - }; - }; "archy-1.0.0" = { name = "archy"; packageName = "archy"; @@ -15448,15 +15205,6 @@ let sha512 = "zzw1uCAgLbsKwBfFc8CX78DDg+xZeBksSO3vwVIDDN5i94eOrPsSSyiVhmsSABFDM/OcpE2aagCat9dnWQLG1A=="; }; }; - "assert-2.1.0" = { - name = "assert"; - packageName = "assert"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/assert/-/assert-2.1.0.tgz"; - sha512 = "eLHpSK/Y4nhMJ07gDaAzoX/XAKS8PSaojml3M0DM4JpV1LAi5JOJ/p6H/XWrl8L+DzVEvVCW1z3vWAaB9oTsQw=="; - }; - }; "assert-never-1.2.1" = { name = "assert-never"; packageName = "assert-never"; @@ -15547,15 +15295,6 @@ let sha512 = "O0yuUDnZeQDL+ncNGlJ78BiO4jnYI3bvMsD5prT0/nsgijG/LpNBIr63gTjVTNsiGkgQhiyCShTgxt8oXOrklA=="; }; }; - "ast-types-0.9.6" = { - name = "ast-types"; - packageName = "ast-types"; - version = "0.9.6"; - src = fetchurl { - url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.6.tgz"; - sha512 = "qEdtR2UH78yyHX/AUNfXmJTlM48XoFZKBdwi1nzkI1mJL21cmbu0cvjxjpkXJ5NENMq42H+hNs8VLJcqXLerBQ=="; - }; - }; "astral-regex-1.0.0" = { name = "astral-regex"; packageName = "astral-regex"; @@ -15637,15 +15376,6 @@ let sha512 = "nSVgobk4rv61R9PUSDtYt7mPVB2olxNR5RWJcAsH676/ef11bUZwvu7+RGYrYauVdDPcO519v68wRhXQtxsV9w=="; }; }; - "async-2.1.5" = { - name = "async"; - packageName = "async"; - version = "2.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.1.5.tgz"; - sha512 = "+g/Ncjbx0JSq2Mk03WQkyKvNh5q9Qvyo/RIqIqnmC5feJY70PNl2ESwZU2BhAB+AZPkHNzzyC2Dq2AS5VnTKhQ=="; - }; - }; "async-2.6.4" = { name = "async"; packageName = "async"; @@ -15718,6 +15448,15 @@ let sha512 = "csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ=="; }; }; + "async-listen-1.2.0" = { + name = "async-listen"; + packageName = "async-listen"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/async-listen/-/async-listen-1.2.0.tgz"; + sha512 = "CcEtRh/oc9Jc4uWeUwdpG/+Mb2YUHKmdaTf0gUr7Wa+bfp4xx70HOb3RuSTJMvqKNB1TkdTfjLdrcz2X4rkkZA=="; + }; + }; "async-listen-3.0.0" = { name = "async-listen"; packageName = "async-listen"; @@ -15754,15 +15493,6 @@ let sha512 = "eJFZ1YhRR8UN8eBLoNzcDPcy/jqjsg6I1AP+KvWQX80BqOSW1oJPJXDylPUEeMr2ZQvHgnQ//Lp6f3RQ1zI7HA=="; }; }; - "async-request-handler-0.9.0" = { - name = "async-request-handler"; - packageName = "async-request-handler"; - version = "0.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/async-request-handler/-/async-request-handler-0.9.0.tgz"; - sha512 = "lsi3nHzXXRdC49L/2jpWaNU2NfQwFNYm5PepjSD9duASlsA+O+xPrqaIMCQIIAMjGLMImkgPGLy/DEBwHTkceA=="; - }; - }; "async-retry-1.3.3" = { name = "async-retry"; packageName = "async-retry"; @@ -15817,15 +15547,6 @@ let sha512 = "+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg=="; }; }; - "atlassian-openapi-1.0.17" = { - name = "atlassian-openapi"; - packageName = "atlassian-openapi"; - version = "1.0.17"; - src = fetchurl { - url = "https://registry.npmjs.org/atlassian-openapi/-/atlassian-openapi-1.0.17.tgz"; - sha512 = "8aW0Xgl9mVdL9dCABSZAvCayMPyh6uVu86UzOat8Kc1qDMUtXn2OxcwDsJfm/qCtBSeZ+GE/PkFxx3ZRIp3hFg=="; - }; - }; "atob-2.1.2" = { name = "atob"; packageName = "atob"; @@ -15880,6 +15601,15 @@ let sha512 = "ooviqdwwgfIfNmDwo94wlshcdzfO64XV0Cg6oDsDYBJfITDz1EngD2z7DkbvCWn+XIMsIqW27sEVF6qcpJrRcg=="; }; }; + "autoprefixer-10.4.16" = { + name = "autoprefixer"; + packageName = "autoprefixer"; + version = "10.4.16"; + src = fetchurl { + url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.16.tgz"; + sha512 = "7vd3UC6xKp0HLfua5IjZlcXvGAGy7cBAXTg2lyQ/8WpNhd6SiZ8Be+xm3FyBSYJx5GKcpRCzBh7RH4/0dnY+uQ=="; + }; + }; "autoprefixer-9.8.8" = { name = "autoprefixer"; packageName = "autoprefixer"; @@ -15934,13 +15664,13 @@ let sha512 = "bSOfBCVPQ/0NWYpPl34MgqMbJf0eO6PsyVlmjbStlba+98hnE6X7z67tawBRot7S+qH3L49KW2u6dfJjvhDfdQ=="; }; }; - "aws-sdk-2.1459.0" = { + "aws-sdk-2.1468.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1459.0"; + version = "2.1468.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1459.0.tgz"; - sha512 = "My45PgQYhRTh6fOeZ94ELUoXzza/6gTy0J22aK4iy0DEA+uE5gjr1VthnIwbLYNMeEqn8xwJZuNJqvi/WaUUcQ=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1468.0.tgz"; + sha512 = "1DAa0UA779M0VyKKPjTPDtox4KOyFrHnGDLbJrDKzqylC+O0DMR4kh9Oy2vfErhwFwsiPUvWgkknddVS+igVGA=="; }; }; "aws-sign2-0.7.0" = { @@ -16015,13 +15745,22 @@ let sha512 = "t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ=="; }; }; - "axios-1.5.0" = { + "axios-1.4.0" = { name = "axios"; packageName = "axios"; - version = "1.5.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-1.5.0.tgz"; - sha512 = "D4DdjDo5CY50Qms0qGQTTw6Q44jl7zRwY7bthds06pUGfChBCTcQs+N743eFWGEd6pRTMd6A+I87aWyFV5wiZQ=="; + url = "https://registry.npmjs.org/axios/-/axios-1.4.0.tgz"; + sha512 = "S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA=="; + }; + }; + "axios-1.5.1" = { + name = "axios"; + packageName = "axios"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/axios/-/axios-1.5.1.tgz"; + sha512 = "Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A=="; }; }; "axobject-query-3.2.1" = { @@ -16105,13 +15844,13 @@ let sha512 = "19hwUH5FKl49JEsvyTcoHakh6BE0wgXLLptIyKZ3PijHc/Ci521wygORCUCCred+E/twuqRyAkE02BAWPmsHOg=="; }; }; - "babel-plugin-polyfill-corejs3-0.8.3" = { + "babel-plugin-polyfill-corejs3-0.8.4" = { name = "babel-plugin-polyfill-corejs3"; packageName = "babel-plugin-polyfill-corejs3"; - version = "0.8.3"; + version = "0.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.3.tgz"; - sha512 = "z41XaniZL26WLrvjy7soabMXrfPWARN25PZoriDEiLMxAp50AUW3t35BGQUMg5xK3UrpVTtagIDklxYa+MhiNA=="; + url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.4.tgz"; + sha512 = "9l//BZZsPR+5XjyJMPtZSK4jv0BsTO1zDac2GC6ygx9WLGlcsnRd1Co0B2zT5fF5Ic6BZy+9m3HNZ3QcOeDKfg=="; }; }; "babel-plugin-polyfill-regenerator-0.5.2" = { @@ -16276,15 +16015,6 @@ let sha512 = "H7JU6iBHTal1gp56aKoaa//YUxEaAOUiydvrV/pILqIHXTtqxSkATOnDA2u+jZ/61sD+L/412+7kzXRtWukhpQ=="; }; }; - "base62-0.1.1" = { - name = "base62"; - packageName = "base62"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/base62/-/base62-0.1.1.tgz"; - sha512 = "QtExujIOq/F672OkHmDi3CdkphOA1kSQ38gv03Ro3cplYQk831dq9GM3Q1oXAxpR5HNJjGjjjT2pHtBGAJu1jw=="; - }; - }; "base64-arraybuffer-0.1.2" = { name = "base64-arraybuffer"; packageName = "base64-arraybuffer"; @@ -16537,15 +16267,6 @@ let sha512 = "pbnl5XzGBdrFU/wT4jqmJVPn2B6UHPBOhzMQkY/SPUPB6QtUXtmBHBIwCbXJol93mOpGMnQyP/+BB19q04xj7g=="; }; }; - "better-sqlite3-8.6.0" = { - name = "better-sqlite3"; - packageName = "better-sqlite3"; - version = "8.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-8.6.0.tgz"; - sha512 = "jwAudeiTMTSyby+/SfbHDebShbmC2MCH8mU2+DXi0WJfv13ypEJm47cd3kljmy/H130CazEvkf2Li//ewcMJ1g=="; - }; - }; "bfile-0.2.3" = { name = "bfile"; packageName = "bfile"; @@ -16573,15 +16294,6 @@ let sha512 = "vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="; }; }; - "bin-links-3.0.3" = { - name = "bin-links"; - packageName = "bin-links"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/bin-links/-/bin-links-3.0.3.tgz"; - sha512 = "zKdnMPWEdh4F5INR07/eBrodC7QrF5JKvqskjz/ZZRXg5YSAZIbn8zGhbhUrElzHBZ2fvEQdOU59RHcTG3GiwA=="; - }; - }; "binary-0.3.0" = { name = "binary"; packageName = "binary"; @@ -16627,15 +16339,6 @@ let sha512 = "CvNVKS6iXagL1uGwLagSXz1hzSMezxOuGnFi5FHGKqaTO3nPPWrAbyALUzK640j+xOTVm7lzD9YP8W1f/gvUdw=="; }; }; - "binaryextensions-4.18.0" = { - name = "binaryextensions"; - packageName = "binaryextensions"; - version = "4.18.0"; - src = fetchurl { - url = "https://registry.npmjs.org/binaryextensions/-/binaryextensions-4.18.0.tgz"; - sha512 = "PQu3Kyv9dM4FnwB7XGj1+HucW+ShvJzJqjuw1JkKVs1mWdwOKVcRjOi+pV9X52A0tNvrPCsPkbFFQb+wE1EAXw=="; - }; - }; "bindings-1.5.0" = { name = "bindings"; packageName = "bindings"; @@ -17410,13 +17113,13 @@ let sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA=="; }; }; - "browserslist-4.21.10" = { + "browserslist-4.22.1" = { name = "browserslist"; packageName = "browserslist"; - version = "4.21.10"; + version = "4.22.1"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz"; - sha512 = "bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz"; + sha512 = "FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ=="; }; }; "brq-0.1.10" = { @@ -17608,15 +17311,6 @@ let sha512 = "T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ=="; }; }; - "buffer-from-0.1.2" = { - name = "buffer-from"; - packageName = "buffer-from"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer-from/-/buffer-from-0.1.2.tgz"; - sha512 = "RiWIenusJsmI2KcvqQABB83tLxCByE3upSP8QU3rJDMVFGPWLvPQJt/O1Su9moRWeH7d+Q2HYb68f6+v+tw2vg=="; - }; - }; "buffer-from-1.1.2" = { name = "buffer-from"; packageName = "buffer-from"; @@ -17878,15 +17572,6 @@ let sha512 = "VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ=="; }; }; - "cacache-16.1.3" = { - name = "cacache"; - packageName = "cacache"; - version = "16.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/cacache/-/cacache-16.1.3.tgz"; - sha512 = "/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ=="; - }; - }; "cacache-17.1.4" = { name = "cacache"; packageName = "cacache"; @@ -18247,13 +17932,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001534" = { + "caniuse-lite-1.0.30001542" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001534"; + version = "1.0.30001542"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001534.tgz"; - sha512 = "vlPVrhsCS7XaSh2VvWluIQEzVhefrUQcEsQWSS5A5V+dM07uv1qHeQzAOTGIMy9i3e9bH15+muvI/UHojVgS/Q=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001542.tgz"; + sha512 = "UrtAXVcj1mvPBFQ4sKd38daP8dEcXXr5sQe6QNNinaPd0iA/cxg9/l3VrSdL73jgw5sKyuQ6jNgiKO12W3SsVA=="; }; }; "canvas-2.11.2" = { @@ -18382,22 +18067,22 @@ let sha512 = "eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg=="; }; }; - "cdk8s-2.64.11" = { + "cdk8s-2.66.1" = { name = "cdk8s"; packageName = "cdk8s"; - version = "2.64.11"; + version = "2.66.1"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-2.64.11.tgz"; - sha512 = "n5uVoeuVe/mpCnC3fQX+94NOE35X8I7YwoIlgmfCJ5QCh8XZGkQ7N4Fr+4r4ZJVLEjI54P74T5AYJNd1Zj5U8Q=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-2.66.1.tgz"; + sha512 = "lm4eASTSRigaj9dYlSCG/F+O8O5/nLH5IEl3j+IxirPb9Y46nwIdx3JD7l+xwprCSgWQXfUJTxizOS0Gm1uE8g=="; }; }; - "cdk8s-plus-25-2.22.11" = { + "cdk8s-plus-25-2.22.24" = { name = "cdk8s-plus-25"; packageName = "cdk8s-plus-25"; - version = "2.22.11"; + version = "2.22.24"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-plus-25/-/cdk8s-plus-25-2.22.11.tgz"; - sha512 = "CQGZ2CkjRfhHMjvm5bxX7/1p6SILJdP7OnJQk2VWgfZZ+0jP2kB8jM0M8Gflj0rWgQRneqjropeIgrjQaBeOBQ=="; + url = "https://registry.npmjs.org/cdk8s-plus-25/-/cdk8s-plus-25-2.22.24.tgz"; + sha512 = "HmRWcN70uf9AXD4dyWG4CfyhecY/puGkoJIQ4qmVWmGJEj2lZzAr2SP1QAe5SGrfqE2zjDKH7ghFKO7c/0rBzA=="; }; }; "cdktf-0.18.0" = { @@ -18472,6 +18157,15 @@ let sha512 = "qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A=="; }; }; + "chalk-4.1.1" = { + name = "chalk"; + packageName = "chalk"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz"; + sha512 = "diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg=="; + }; + }; "chalk-4.1.2" = { name = "chalk"; packageName = "chalk"; @@ -18625,13 +18319,13 @@ let sha512 = "mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="; }; }; - "chardet-1.6.0" = { + "chardet-1.6.1" = { name = "chardet"; packageName = "chardet"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/chardet/-/chardet-1.6.0.tgz"; - sha512 = "+QOTw3otC4+FxdjK9RopGpNOglADbr4WPFi0SonkO99JbpkTPbMxmdm4NenhF5Zs+4gPXLI1+y2uazws5TMe8w=="; + url = "https://registry.npmjs.org/chardet/-/chardet-1.6.1.tgz"; + sha512 = "RHP0lMTBsIhM/RxxoOzuTsY7IMNE6/XQ7FKGch0D/aluQzgah0BS4i9ND8wPJdIu7WvMMjk88EXcNi6j8Tdung=="; }; }; "charenc-0.0.2" = { @@ -18769,15 +18463,6 @@ let sha512 = "oBePsLbQpTJFxzwyCvs9yWWF0OEM6vGGepHwt1stqmX7QQqOuDc8j2ywdvAs9Tvi44TT7d9ackqhR4Q10l1u8w=="; }; }; - "child-process-promise-2.2.1" = { - name = "child-process-promise"; - packageName = "child-process-promise"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/child-process-promise/-/child-process-promise-2.2.1.tgz"; - sha512 = "Fi4aNdqBsr0mv+jgWxcZ/7rAIC2mgihrptyVI4foh/rrjY/3BNjfP9+oaiFx/fzim+1ZyCNBae0DlyfQhSugog=="; - }; - }; "chokidar-1.7.0" = { name = "chokidar"; packageName = "chokidar"; @@ -18796,6 +18481,15 @@ let sha512 = "ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg=="; }; }; + "chokidar-3.3.1" = { + name = "chokidar"; + packageName = "chokidar"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.3.1.tgz"; + sha512 = "4QYCEWOcK3OJrxwvyyAOxFuhpvOVCYkr33LPfFNBjAD/w3sEzWsp2BUOkI4l9bHvWioAd0rc6NlHUOEaWkTeqg=="; + }; + }; "chokidar-3.5.3" = { name = "chokidar"; packageName = "chokidar"; @@ -18877,24 +18571,6 @@ let sha512 = "Pa5nrrCMWukBafWxQ8wwmeRuqs/6nVFAdhRXYcxpDePduAbZZ8lXNZhtGZ5/mmWI1rzrSR6tpRR9J3BtR84yUw=="; }; }; - "chromium-bidi-0.4.7" = { - name = "chromium-bidi"; - packageName = "chromium-bidi"; - version = "0.4.7"; - src = fetchurl { - url = "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.4.7.tgz"; - sha512 = "6+mJuFXwTMU6I3vYLs6IL8A1DyQTPjCfIL971X0aMPVGRbGnNfl6i6Cl0NMbxi2bRYLGESt9T2ZIMRM5PAEcIQ=="; - }; - }; - "chromium-pickle-js-0.2.0" = { - name = "chromium-pickle-js"; - packageName = "chromium-pickle-js"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz"; - sha512 = "1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw=="; - }; - }; "chunk-store-stream-4.3.0" = { name = "chunk-store-stream"; packageName = "chunk-store-stream"; @@ -18994,6 +18670,15 @@ let sha512 = "JVJbM+f3d3Q704rF4bqQ5UUyTtuJ0JRKNbTKVEeujCCBoMdkEi+V+e8oktO9qGQNSvHrFTM6JZRXrUvGR1czww=="; }; }; + "clean-regexp-1.0.0" = { + name = "clean-regexp"; + packageName = "clean-regexp"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clean-regexp/-/clean-regexp-1.0.0.tgz"; + sha512 = "GfisEZEJvzKrmGWkvfhgzcz/BllN1USeqD2V6tg14OAOgaCD2Z/PUEuxnAZ/nPvmaHRG7a8y77p1T/IRQ4D1Hw=="; + }; + }; "clean-stack-2.2.0" = { name = "clean-stack"; packageName = "clean-stack"; @@ -19300,6 +18985,15 @@ let sha512 = "ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ=="; }; }; + "client-only-0.0.1" = { + name = "client-only"; + packageName = "client-only"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/client-only/-/client-only-0.0.1.tgz"; + sha512 = "IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA=="; + }; + }; "cliff-0.1.10" = { name = "cliff"; packageName = "cliff"; @@ -19552,15 +19246,6 @@ let sha512 = "A5C0Cyf2H8sKsHqX0tvIWRXw5/PK++3Dc0lDbsugr90nOECLLuSPahVQBG8pgmgiXgm/TzBWMqI2rWdZwHduAw=="; }; }; - "cmd-shim-5.0.0" = { - name = "cmd-shim"; - packageName = "cmd-shim"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cmd-shim/-/cmd-shim-5.0.0.tgz"; - sha512 = "qkCtZ59BidfEwHltnJwkyVZn+XQojdAySM1D1gSeh11Z4pW1Kpolkyo53L5noc0nrxmIvyFwTmJRo4xs7FFLPw=="; - }; - }; "cmd-shim-6.0.1" = { name = "cmd-shim"; packageName = "cmd-shim"; @@ -19642,6 +19327,24 @@ let sha512 = "xxodCmBen3iy2i0WtAK8FlFNrRzjUqjRsMfho58xT/wvZU1YTM3fCnRjcy1gJPMepaRlgm/0e6w8SpWHpn3/cA=="; }; }; + "code-inspector-core-0.1.9" = { + name = "code-inspector-core"; + packageName = "code-inspector-core"; + version = "0.1.9"; + src = fetchurl { + url = "https://registry.npmjs.org/code-inspector-core/-/code-inspector-core-0.1.9.tgz"; + sha512 = "A00SydCM8zgPWfoM140hbcOjTFzciuGKYMsd7sl1evy+M+ZH2/k6n90vGHHTCdOfVmlaaHcXU+aaPnsADb17Aw=="; + }; + }; + "code-inspector-plugin-0.1.9" = { + name = "code-inspector-plugin"; + packageName = "code-inspector-plugin"; + version = "0.1.9"; + src = fetchurl { + url = "https://registry.npmjs.org/code-inspector-plugin/-/code-inspector-plugin-0.1.9.tgz"; + sha512 = "/OyEt9e+DmxuyHI3dMzkOgcbFT6CIi8PgwK7QIlIQKMU/P9QvDehHUKpZU1Yjd/AAymcni7RikRVQNGU3+kwtg=="; + }; + }; "code-point-at-1.1.0" = { name = "code-point-at"; packageName = "code-point-at"; @@ -19660,13 +19363,13 @@ let sha512 = "7qJWqItLA8/VPVlKJlFXU+NBlo/qyfs39aJcuMT/2ere32ZqvF5OSxgdM5xOfJJ7O429gg2HM47y8v9P+9wrNw=="; }; }; - "codemaker-1.88.0" = { + "codemaker-1.89.0" = { name = "codemaker"; packageName = "codemaker"; - version = "1.88.0"; + version = "1.89.0"; src = fetchurl { - url = "https://registry.npmjs.org/codemaker/-/codemaker-1.88.0.tgz"; - sha512 = "/7+1mPQCEFmBm9zhf5blMiqirCcXNwulb8dozu2LVsDLgnafPt1h2eg/OwvyrqSMWUnsIFetAssKVP2gE66MPQ=="; + url = "https://registry.npmjs.org/codemaker/-/codemaker-1.89.0.tgz"; + sha512 = "Jh9ZrMxzX+jbzNvuHNlmEjXUYMSGVNW151SV2aOXU01V3bMjaSP+exfHFsYQ66x/zGEWcjh33pAu2rY44hyYIQ=="; }; }; "coffeescript-2.7.0" = { @@ -20011,15 +19714,6 @@ let sha512 = "+pJLBFVk+9ZZdlAOB5WuIElVPPth47hILFkmGym57aq8kwxsowvByvB0DHs1vQAhyMZzdcpTtF0VDKGkSDR4ZQ=="; }; }; - "commander-2.9.0" = { - name = "commander"; - packageName = "commander"; - version = "2.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"; - sha512 = "bmkUukX8wAOjHdN26xj5c4ctEV22TQ7dQYhSmuckKhToXrkUn0iIaolHdIxYYqD55nhpSPA9zPQ1yP57GdXP2A=="; - }; - }; "commander-3.0.2" = { name = "commander"; packageName = "commander"; @@ -20065,15 +19759,6 @@ let sha512 = "U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA=="; }; }; - "commander-7.1.0" = { - name = "commander"; - packageName = "commander"; - version = "7.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-7.1.0.tgz"; - sha512 = "pRxBna3MJe6HKnBGsDyMv8ETbptw3axEdYHoqNh7gu5oDcew8fs0xnivZGm06Ogk8zGAJ9VX+OPEr2GXEQK4dg=="; - }; - }; "commander-7.2.0" = { name = "commander"; packageName = "commander"; @@ -20146,15 +19831,6 @@ let sha512 = "rraC8NXWOEjhADbZe9QBNzLAN5Q3fsTPQtBV+fEVj6xKIgDgNiEVE6ZNfHpZOqfQ21YUzfVNUXLOEZquYvQPPg=="; }; }; - "common-ancestor-path-1.0.1" = { - name = "common-ancestor-path"; - packageName = "common-ancestor-path"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/common-ancestor-path/-/common-ancestor-path-1.0.1.tgz"; - sha512 = "L3sHRo1pXXEqX8VU28kfgUY+YGsk09hPqZiZmLacNib6XNTCM8ubYeT7ryXQw8asB1sKgcU5lkB7ONug08aB8w=="; - }; - }; "common-tags-1.8.2" = { name = "common-tags"; packageName = "common-tags"; @@ -20173,15 +19849,6 @@ let sha512 = "W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg=="; }; }; - "commoner-0.10.8" = { - name = "commoner"; - packageName = "commoner"; - version = "0.10.8"; - src = fetchurl { - url = "https://registry.npmjs.org/commoner/-/commoner-0.10.8.tgz"; - sha512 = "3/qHkNMM6o/KGXHITA14y78PcfmXh4+AOCJpSoF73h4VY1JpdGv3CHMS5+JW6SwLhfJt4RhNmLAa7+RRX/62EQ=="; - }; - }; "commonmark-0.30.0" = { name = "commonmark"; packageName = "commonmark"; @@ -20227,13 +19894,13 @@ let sha512 = "W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA=="; }; }; - "compare-versions-4.1.4" = { + "compare-versions-6.1.0" = { name = "compare-versions"; packageName = "compare-versions"; - version = "4.1.4"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/compare-versions/-/compare-versions-4.1.4.tgz"; - sha512 = "FemMreK9xNyL8gQevsdRMrvO4lFCkQP7qbuktn1q8ndcNk1+0mz7lgE7b/sNvbhVgY4w6tMN1FDp6aADjqw2rw=="; + url = "https://registry.npmjs.org/compare-versions/-/compare-versions-6.1.0.tgz"; + sha512 = "LNZQXhqUvqUTotpZ00qLSaify3b4VFD588aRr8MKFw4CMUr98ytzCW5wDH5qx/DEY5kCDXcbcRuCqL0szEf2tg=="; }; }; "component-bind-1.0.0" = { @@ -20308,15 +19975,6 @@ let sha512 = "D3uMHtGc/fcO1Gt1/L7i1e33VOvD4A9hfQLP+6ewd+BvG/gQ84Yh4oftEhAdjSMgBgwGL+jsppT7JYNpo6MHHg=="; }; }; - "compress-commons-5.0.1" = { - name = "compress-commons"; - packageName = "compress-commons"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/compress-commons/-/compress-commons-5.0.1.tgz"; - sha512 = "MPh//1cERdLtqwO3pOFLeXtpuai0Y2WCd5AhtKxznqM7WtaMYaOEMSgn45d9D10sIHSfIKE603HlOp8OPGrvag=="; - }; - }; "compressible-2.0.18" = { name = "compressible"; packageName = "compressible"; @@ -20362,15 +20020,6 @@ let sha512 = "MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A=="; }; }; - "conf-10.2.0" = { - name = "conf"; - packageName = "conf"; - version = "10.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conf/-/conf-10.2.0.tgz"; - sha512 = "8fLl9F04EJqjSqH+QjITQfJF8BrOVaYr1jewVgSRAEWePfxT0sku4w2hrGQ60BC/TNLGQ2pgxNlTbWQmMPFvXg=="; - }; - }; "conf-11.0.2" = { name = "conf"; packageName = "conf"; @@ -20641,13 +20290,13 @@ let sha512 = "FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ=="; }; }; - "content-security-policy-parser-0.4.1" = { - name = "content-security-policy-parser"; - packageName = "content-security-policy-parser"; - version = "0.4.1"; + "content-type-1.0.4" = { + name = "content-type"; + packageName = "content-type"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/content-security-policy-parser/-/content-security-policy-parser-0.4.1.tgz"; - sha512 = "NNJS8XPnx3OKr/CUOSwDSJw+lWTrZMYnclLKj0Y9CYOfJNJTWLFGPg3u2hYgbXMXKVRkZR2fbyReNQ1mUff/Qg=="; + url = "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz"; + sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; }; }; "content-type-1.0.5" = { @@ -20912,6 +20561,15 @@ let sha512 = "ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="; }; }; + "convert-source-map-2.0.0" = { + name = "convert-source-map"; + packageName = "convert-source-map"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz"; + sha512 = "Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="; + }; + }; "convert-to-spaces-1.0.2" = { name = "convert-to-spaces"; packageName = "convert-to-spaces"; @@ -21056,22 +20714,22 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-3.32.2" = { + "core-js-3.33.0" = { name = "core-js"; packageName = "core-js"; - version = "3.32.2"; + version = "3.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.32.2.tgz"; - sha512 = "pxXSw1mYZPDGvTQqEc5vgIb83jGQKFGYWY76z4a7weZXUolw3G+OvpZqSRcfYOoOVUQJYEPsWeQK8pKEnUtWxQ=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.33.0.tgz"; + sha512 = "HoZr92+ZjFEKar5HS6MC776gYslNOKHt75mEBKWKnPeFDpZ6nH5OeF3S6HFT1mUAUZKrzkez05VboaX8myjSuw=="; }; }; - "core-js-compat-3.32.2" = { + "core-js-compat-3.33.0" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.32.2"; + version = "3.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.32.2.tgz"; - sha512 = "+GjlguTDINOijtVRUxrQOv3kfu9rl+qPNdX2LTbJ/ZyVTuxK+ksVSAGX1nHstu4hrv1En/uPTtWgq2gI5wt4AQ=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.33.0.tgz"; + sha512 = "0w4LcLXsVEuNkIqwjjf9rjCoPhK8uqA4tMRh4Ge26vfLtUutshn+aRJU21I9LCJlh2QQHfisNToLjw1XEJLTWw=="; }; }; "core-util-is-1.0.2" = { @@ -21146,15 +20804,6 @@ let sha512 = "da1EafcpH6b/TD8vDRaWV7xFINlHlF6zKsGwS1TsuVJTZRkquaS5HTMq7uq6h31619QjbsYl21gVDOm32KM1vQ=="; }; }; - "cosmiconfig-8.1.3" = { - name = "cosmiconfig"; - packageName = "cosmiconfig"; - version = "8.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.1.3.tgz"; - sha512 = "/UkO2JKI18b5jVMJUp0lvKFMpa/Gye+ZgZjKD+DGEN9y7NRcf/nK1A0sp67ONmKtnDCNMS44E6jrk0Yc3bDuUw=="; - }; - }; "cosmiconfig-8.3.6" = { name = "cosmiconfig"; packageName = "cosmiconfig"; @@ -21245,15 +20894,6 @@ let sha512 = "NT7w2JVU7DFroFdYkeq8cywxrgjPHWkdX1wjpRQXPX5Asews3tA+Ght6lddQO5Mkumffp3X7GEqku3epj2toIw=="; }; }; - "crc32-stream-5.0.0" = { - name = "crc32-stream"; - packageName = "crc32-stream"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/crc32-stream/-/crc32-stream-5.0.0.tgz"; - sha512 = "B0EPa1UK+qnpBZpG+7FgPCu0J2ETLpXq09o9BkLkEAhdB6Z61Qo4pJ3JYu0c+Qi+/SAL7QThqnzS06pmSSyZaw=="; - }; - }; "create-ecdh-4.0.4" = { name = "create-ecdh"; packageName = "create-ecdh"; @@ -21398,15 +21038,6 @@ let sha512 = "cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg=="; }; }; - "cross-spawn-4.0.2" = { - name = "cross-spawn"; - packageName = "cross-spawn"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz"; - sha512 = "yAXz/pA1tD8Gtg2S98Ekf/sewp3Lcp3YoFKJ4Hkp5h5yLWnKVTDU0kwjKJ8NDCYcfTLfyGkzTikst+jWypT1iA=="; - }; - }; "cross-spawn-5.1.0" = { name = "cross-spawn"; packageName = "cross-spawn"; @@ -21515,22 +21146,22 @@ let sha512 = "pP2W2BvLrRKggS1fUk8qQw2FG8PhyV969dlwF3M0jAg/HH83n76H+KGdzGsmEut6VJFlJYQkd1ZZskjaeVWnrA=="; }; }; - "cspell-dictionary-7.3.6" = { + "cspell-dictionary-7.3.7" = { name = "cspell-dictionary"; packageName = "cspell-dictionary"; - version = "7.3.6"; + version = "7.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-dictionary/-/cspell-dictionary-7.3.6.tgz"; - sha512 = "8E0qsGTP7uHZeQ0qD6au+bjaj4M9F4AgurssG3VQuvsYpzEI6S/81U3GQVzcn/4mn7Z5KE286CElZQWAiQPLQA=="; + url = "https://registry.npmjs.org/cspell-dictionary/-/cspell-dictionary-7.3.7.tgz"; + sha512 = "mJ0h2BGxYEqb/1FxKD50WuufKhDaCaIk8pwZQryqazXQCvoTpla0yud3KO61Cke92za8z37Rfb+5xATlywEfaw=="; }; }; - "cspell-gitignore-7.3.6" = { + "cspell-gitignore-7.3.7" = { name = "cspell-gitignore"; packageName = "cspell-gitignore"; - version = "7.3.6"; + version = "7.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-7.3.6.tgz"; - sha512 = "D/oWUoeW3kgKIIpLpJCJk4KmtxPdb6yqkMX8Ze4rzMXAUjHkw6PPjMd8hcJl7uTJa4T8vHM+UR6L4t3huDuVoA=="; + url = "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-7.3.7.tgz"; + sha512 = "nP4Gg+zq5y0njzhiNYTLvaJIMAponBhJoTMzkXCOOKYEHJmiRQocfa3gO4t2s8iZ4YVhscbrB2h+dYvo3MLQqg=="; }; }; "cspell-glob-0.1.25" = { @@ -21542,22 +21173,22 @@ let sha512 = "/XaSHrGBpMJa+duFz3GKOWfrijrfdHT7a/XGgIcq3cymCSpOH+DPho42sl0jLI/hjM+8yv2m8aEoxRT8yVSnlg=="; }; }; - "cspell-glob-7.3.6" = { + "cspell-glob-7.3.7" = { name = "cspell-glob"; packageName = "cspell-glob"; - version = "7.3.6"; + version = "7.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-glob/-/cspell-glob-7.3.6.tgz"; - sha512 = "xfVmqkkg/Pznij3VJCLbUvEKWqs/+AyyHIXo9s1j/d4M0Nw/O4HJFoHwNiMoAk6aceMTgjjVIneGmSZsHVGYZg=="; + url = "https://registry.npmjs.org/cspell-glob/-/cspell-glob-7.3.7.tgz"; + sha512 = "DJX5wJ5dhcNzyycukZst+WtbIdpCLTL7DaKS0EKW/57QjzMwwMBgpsF89ufnreGHB8dHrPF85epF9qyOI1SRNg=="; }; }; - "cspell-grammar-7.3.6" = { + "cspell-grammar-7.3.7" = { name = "cspell-grammar"; packageName = "cspell-grammar"; - version = "7.3.6"; + version = "7.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-grammar/-/cspell-grammar-7.3.6.tgz"; - sha512 = "04kvcptwvJBSMfcOTbanEFa194Xkpkjo4wkTImO26Zzu06tGawbL4FPPQdGygMz7yTdc6Wlrlks5TNChWlcn+Q=="; + url = "https://registry.npmjs.org/cspell-grammar/-/cspell-grammar-7.3.7.tgz"; + sha512 = "4cyJ4Alq/wBGTctH7fNTbY9EZCihm11fbrGSYVe8w+msRNx6W8rugsMX009aHiw9zlvGrMAeTD08YFPnBVdfpA=="; }; }; "cspell-io-4.1.7" = { @@ -21569,13 +21200,13 @@ let sha512 = "V0/tUu9FnIS3v+vAvDT6NNa14Nc/zUNX8+YUUOfFAiDJJTdqefmvcWjOJBIMYBf3wIk9iWLmLbMM+bNHqr7DSQ=="; }; }; - "cspell-io-7.3.6" = { + "cspell-io-7.3.7" = { name = "cspell-io"; packageName = "cspell-io"; - version = "7.3.6"; + version = "7.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-io/-/cspell-io-7.3.6.tgz"; - sha512 = "FzynVc3OE9rS4t0cxTCVD9VFwOAnhvhV/WBWMrMUtvi8DVnRu7of/1ZJsC+XDtij+G1Kd6EOrzSnTj5gn9aQaQ=="; + url = "https://registry.npmjs.org/cspell-io/-/cspell-io-7.3.7.tgz"; + sha512 = "zqGGllG/OM3Of7zaOELdrSoBpCyG9nJuSRCzLfKgnCG4g2zpoMfDZknJaY9VjZODHP99PvYWooF8E6kVxT34Fw=="; }; }; "cspell-lib-4.3.12" = { @@ -21587,13 +21218,13 @@ let sha512 = "yCCb6MoW1K8Tsr/WVEQoO4dfYhH9bCsjQayccb8MlyDaNNuWJHuX+gUGHsZSXSuChSh8PrTWKXJzs13/uM977g=="; }; }; - "cspell-lib-7.3.6" = { + "cspell-lib-7.3.7" = { name = "cspell-lib"; packageName = "cspell-lib"; - version = "7.3.6"; + version = "7.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-lib/-/cspell-lib-7.3.6.tgz"; - sha512 = "ixPnudlaNh4UwFkHeKUXbBYB/wLHNv1Gf+zBGy4oz2Uu9ZZTVgczhE/t2pPTD6ZRcq4+YulGuqxYCS+3qqOQQQ=="; + url = "https://registry.npmjs.org/cspell-lib/-/cspell-lib-7.3.7.tgz"; + sha512 = "KuFn0WTwmK50Ij1KVaXVuheleSOfv3oFIO3PfMuFg7llkfPfaRawF0b61da/EFGckU/hUc8uHRbBuGELlDo3tA=="; }; }; "cspell-trie-lib-4.2.8" = { @@ -21605,13 +21236,13 @@ let sha512 = "Nt3c0gxOYXIc3/yhALDukpje1BgR6guvlUKWQO2zb0r7qRWpwUw2j2YM4dWbHQeH/3Hx5ei4Braa6cMaiJ5YBw=="; }; }; - "cspell-trie-lib-7.3.6" = { + "cspell-trie-lib-7.3.7" = { name = "cspell-trie-lib"; packageName = "cspell-trie-lib"; - version = "7.3.6"; + version = "7.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-7.3.6.tgz"; - sha512 = "75lSsKTdmFpewEl8Q+/WnSbpZ+JjoNnSDobNDcjZHTTnj/TlgCVxXASTaFLlXnqWU51QX+5798smnqpWBcJigg=="; + url = "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-7.3.7.tgz"; + sha512 = "Vv8TdTMZD3DE79SorTwn5NoWj8JD7DnYMeUK+5S6JDNLy4Ck+kTEPN6Ic9hvLAxuDmQjmoZI3TizrWvuCG66aA=="; }; }; "cspell-util-bundle-4.1.11" = { @@ -22757,15 +22388,6 @@ let sha512 = "ND9qDTLc6diwj+Xe5cdAgVTbLVdXbtxTJRXRhli8Mowuaan+0EJOtdqJ0QCHNSSPyoXGx9HX2/VMnKeC34AChA=="; }; }; - "data-uri-to-buffer-3.0.1" = { - name = "data-uri-to-buffer"; - packageName = "data-uri-to-buffer"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-3.0.1.tgz"; - sha512 = "WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og=="; - }; - }; "data-uri-to-buffer-4.0.1" = { name = "data-uri-to-buffer"; packageName = "data-uri-to-buffer"; @@ -22775,13 +22397,13 @@ let sha512 = "0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A=="; }; }; - "data-uri-to-buffer-5.0.1" = { + "data-uri-to-buffer-6.0.1" = { name = "data-uri-to-buffer"; packageName = "data-uri-to-buffer"; - version = "5.0.1"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-5.0.1.tgz"; - sha512 = "a9l6T1qqDogvvnw0nKlfZzqsyikEBZBClF39V3TFoKhDtGBqHu2HkuomJc02j5zft8zrUaXEuoicLeW54RkzPg=="; + url = "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-6.0.1.tgz"; + sha512 = "MZd3VlchQkp8rdend6vrx7MmVDJzSNTBvghvKjirLkD+WTChA3KUf0jkE68Q4UyctNqI11zZO9/x2Yx+ub5Cvg=="; }; }; "data-urls-1.1.0" = { @@ -22901,13 +22523,13 @@ let sha512 = "2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA=="; }; }; - "dayjs-1.11.9" = { + "dayjs-1.11.10" = { name = "dayjs"; packageName = "dayjs"; - version = "1.11.9"; + version = "1.11.10"; src = fetchurl { - url = "https://registry.npmjs.org/dayjs/-/dayjs-1.11.9.tgz"; - sha512 = "QvzAURSbQ0pKdIye2txOzNaHmxtUBXerpY0FJsFXUMKbIZeFm5ht1LS/jFsrncjnmtv8HsG0W2g6c0zUjZWmpA=="; + url = "https://registry.npmjs.org/dayjs/-/dayjs-1.11.10.tgz"; + sha512 = "vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ=="; }; }; "dayjs-1.8.36" = { @@ -23486,15 +23108,6 @@ let sha512 = "hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q=="; }; }; - "degenerator-3.0.4" = { - name = "degenerator"; - packageName = "degenerator"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/degenerator/-/degenerator-3.0.4.tgz"; - sha512 = "Z66uPeBfHZAHVmue3HPfyKu2Q0rC2cRxbTOsvmU/po5fvvcx27W4mIu9n0PUlQih4oUYvcG1BsbtVv8x7KDOSw=="; - }; - }; "degenerator-5.0.1" = { name = "degenerator"; packageName = "degenerator"; @@ -23756,15 +23369,6 @@ let sha512 = "aBzdj76lueB6uUst5iAs7+0H/oOjqI5D16XUWxlWMIMROhcM0rfsNVk93zTngq1dDNpoXRr++Sus7ETAExppAQ=="; }; }; - "detective-4.7.1" = { - name = "detective"; - packageName = "detective"; - version = "4.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/detective/-/detective-4.7.1.tgz"; - sha512 = "H6PmeeUcZloWtdt4DAkFyzFL94arpHr3NOwwmVILFiy+9Qd4JTxxXrzfyGk/lmct2qVGBwTSwSXagqu2BxmWig=="; - }; - }; "detective-5.2.1" = { name = "detective"; packageName = "detective"; @@ -23783,15 +23387,6 @@ let sha512 = "LmVkry/oDShEgSZPNgqCIp2/TlqtExeGmymru3uCELnfyjY11IzpAproLYs+1X88fXO6DBoYP3ul2Xo2yz2j6A=="; }; }; - "devtools-protocol-0.0.1107588" = { - name = "devtools-protocol"; - packageName = "devtools-protocol"; - version = "0.0.1107588"; - src = fetchurl { - url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1107588.tgz"; - sha512 = "yIR+pG9x65Xko7bErCUSQaDLrO/P1p3JUzEk7JCU4DowPcGHkTGUGQapcfcLc4qj0UaALwZ+cr0riFgiqpixcg=="; - }; - }; "devtools-protocol-0.0.981744" = { name = "devtools-protocol"; packageName = "devtools-protocol"; @@ -23909,13 +23504,13 @@ let sha512 = "EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q=="; }; }; - "diff2html-3.4.42" = { + "diff2html-3.4.44" = { name = "diff2html"; packageName = "diff2html"; - version = "3.4.42"; + version = "3.4.44"; src = fetchurl { - url = "https://registry.npmjs.org/diff2html/-/diff2html-3.4.42.tgz"; - sha512 = "ja12y3PsOutadumdb/f3SUV+9+kgLBjUe6qY74amONUE0JD5aMBjkzrrxKg/6fxfJIQ8U03S3Niau0uBAz6iHQ=="; + url = "https://registry.npmjs.org/diff2html/-/diff2html-3.4.44.tgz"; + sha512 = "h6Ev+OJfTNUxDTUvo+DsH6DNmcFNjNtcaZ2g/WLP5nBnIev7O+JgPFmIc2iFcazqyN/WNOkSR91UZlEl2DPe7w=="; }; }; "diffie-hellman-5.0.3" = { @@ -24440,15 +24035,6 @@ let sha512 = "M3NhsLbV1i6HuGzBUH8vXrtxOk+tWmzWKDMbAVSUp3Zsjm7ywFeuwrUXhmhQyRK1q5B5GGy7hcXPbj3bnfZg2g=="; }; }; - "dotenv-8.2.0" = { - name = "dotenv"; - packageName = "dotenv"; - version = "8.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz"; - sha512 = "8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw=="; - }; - }; "dotenv-8.6.0" = { name = "dotenv"; packageName = "dotenv"; @@ -24764,13 +24350,13 @@ let sha512 = "XofXdikjYI7MVBcnXeoOvRR+yFFFHOLs3J7PF5KYQweigtgLshcH4W660PsvHr4lYZ03JBpLyEcUB8DzHZ+BNw=="; }; }; - "electron-to-chromium-1.4.523" = { + "electron-to-chromium-1.4.538" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.523"; + version = "1.4.538"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.523.tgz"; - sha512 = "9AreocSUWnzNtvLcbpng6N+GkXnCcBR80IQkxRC9Dfdyg4gaWNUPBujAHUpKkiUkoSoR9UlhA4zD/IgBklmhzg=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.538.tgz"; + sha512 = "1a2m63NEookb1beNFTGDihgF3CKL7ksZ7PSA0VloON5DpTEhnOVgaDes8xkrDhkXRxlcN8JymQDGnv+Nn+uvhg=="; }; }; "elegant-spinner-1.0.1" = { @@ -24909,13 +24495,13 @@ let sha512 = "AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ=="; }; }; - "encode-registry-3.0.0" = { + "encode-registry-3.0.1" = { name = "encode-registry"; packageName = "encode-registry"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/encode-registry/-/encode-registry-3.0.0.tgz"; - sha512 = "2fRYji8K6FwYuQ6EPBKR/J9mcqb7kIoNqt1vGvJr3NrvKfncRiNm00Oxo6gi/YJF8R5Sp2bNFSFdGKTG0rje1Q=="; + url = "https://registry.npmjs.org/encode-registry/-/encode-registry-3.0.1.tgz"; + sha512 = "6qOwkl1g0fv0DN3Y3ggr2EaZXN71aoAqPp3p/pVaWSBSIo+YjLOWN61Fva43oVyQNPf7kgm8lkudzlzojwE2jw=="; }; }; "encodeurl-1.0.2" = { @@ -24945,6 +24531,15 @@ let sha512 = "go5TQkd0YRXYhX+Lc3UrXkoKU5j+m72jEP5lHWr2Nh82L8wfZtH8toKgcg4T10o23ELIMGXQdwCbl+qAXIPDrw=="; }; }; + "end-of-stream-1.1.0" = { + name = "end-of-stream"; + packageName = "end-of-stream"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.1.0.tgz"; + sha512 = "EoulkdKF/1xa92q25PbjuDcgJ9RDHYU2Rs3SCIvs2/dSQ3BpmxneNHmA/M7fe60M3PrV7nNGTTNbkK62l6vXiQ=="; + }; + }; "end-of-stream-1.4.4" = { name = "end-of-stream"; packageName = "end-of-stream"; @@ -25287,15 +24882,6 @@ let sha512 = "dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A=="; }; }; - "error-10.4.0" = { - name = "error"; - packageName = "error"; - version = "10.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/error/-/error-10.4.0.tgz"; - sha512 = "YxIFEJuhgcICugOUvRx5th0UM+ActZ9sjY0QJmeVwsQdvosZ7kYzc9QqS0Da3R5iUmgU5meGIxh0xBeZpMVeLw=="; - }; - }; "error-ex-1.3.2" = { name = "error-ex"; packageName = "error-ex"; @@ -25539,6 +25125,15 @@ let sha512 = "XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw=="; }; }; + "esbuild-0.18.20" = { + name = "esbuild"; + packageName = "esbuild"; + version = "0.18.20"; + src = fetchurl { + url = "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz"; + sha512 = "ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA=="; + }; + }; "esbuild-android-64-0.14.47" = { name = "esbuild-android-64"; packageName = "esbuild-android-64"; @@ -26043,13 +25638,22 @@ let sha512 = "VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA=="; }; }; - "eslint-8.49.0" = { + "eslint-8.45.0" = { name = "eslint"; packageName = "eslint"; - version = "8.49.0"; + version = "8.45.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.49.0.tgz"; - sha512 = "jw03ENfm6VJI0jA9U+8H5zfl5b+FvuU3YYvZRdZHOlU2ggJkxrlkJH4HcDrZpj6YwD8kuYqvQM8LyesoazrSOQ=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.45.0.tgz"; + sha512 = "pd8KSxiQpdYRfYa9Wufvdoct3ZPQQuVuU5O6scNgMuOMYuxvH0IGaYK0wUFjo4UYYQQCUndlXiMbnxopwvvTiw=="; + }; + }; + "eslint-8.50.0" = { + name = "eslint"; + packageName = "eslint"; + version = "8.50.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint/-/eslint-8.50.0.tgz"; + sha512 = "FOnOGSuFuFLv/Sa+FDVRZl4GGVAAFFi8LecRsI5a1tMO5HIE8nCm4ivAlzt4dT3ol/PaaGC0rJEEXQmHJBGoOg=="; }; }; "eslint-config-prettier-8.10.0" = { @@ -26061,24 +25665,6 @@ let sha512 = "SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg=="; }; }; - "eslint-config-standard-17.1.0" = { - name = "eslint-config-standard"; - packageName = "eslint-config-standard"; - version = "17.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.1.0.tgz"; - sha512 = "IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q=="; - }; - }; - "eslint-config-standard-jsx-11.0.0" = { - name = "eslint-config-standard-jsx"; - packageName = "eslint-config-standard-jsx"; - version = "11.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-config-standard-jsx/-/eslint-config-standard-jsx-11.0.0.tgz"; - sha512 = "+1EV/R0JxEK1L0NGolAr8Iktm3Rgotx3BKwgaX+eAuSX8D952LULKtjgZD3F+e6SvibONnhLwoTi9DPxN5LvvQ=="; - }; - }; "eslint-formatter-pretty-4.1.0" = { name = "eslint-formatter-pretty"; packageName = "eslint-formatter-pretty"; @@ -26106,15 +25692,6 @@ let sha512 = "aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw=="; }; }; - "eslint-plugin-es-4.1.0" = { - name = "eslint-plugin-es"; - packageName = "eslint-plugin-es"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz"; - sha512 = "GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ=="; - }; - }; "eslint-plugin-import-2.28.1" = { name = "eslint-plugin-import"; packageName = "eslint-plugin-import"; @@ -26124,24 +25701,6 @@ let sha512 = "9I9hFlITvOV55alzoKBI+K9q74kv0iKMeY6av5+umsNwayt59fz692daGyjR+oStBQgx6nwR9rXldDev3Clw+A=="; }; }; - "eslint-plugin-n-15.7.0" = { - name = "eslint-plugin-n"; - packageName = "eslint-plugin-n"; - version = "15.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.7.0.tgz"; - sha512 = "jDex9s7D/Qial8AGVIHq4W7NswpUD5DPDL2RH8Lzd9EloWUuvUkHfv4FRLMipH5q2UtyurorBkPeNi1wVWNh3Q=="; - }; - }; - "eslint-plugin-promise-6.1.1" = { - name = "eslint-plugin-promise"; - packageName = "eslint-plugin-promise"; - version = "6.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.1.1.tgz"; - sha512 = "tjqWDwVZQo7UIPMeDReOpUgHCmCiH+ePnVT+5zVapL0uuHnegBUs2smM13CzOs2Xb5+MHMRFTs9v24yjba4Oig=="; - }; - }; "eslint-plugin-react-7.33.2" = { name = "eslint-plugin-react"; packageName = "eslint-plugin-react"; @@ -26151,6 +25710,33 @@ let sha512 = "73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw=="; }; }; + "eslint-plugin-react-hooks-4.6.0" = { + name = "eslint-plugin-react-hooks"; + packageName = "eslint-plugin-react-hooks"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz"; + sha512 = "oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g=="; + }; + }; + "eslint-plugin-react-refresh-0.4.3" = { + name = "eslint-plugin-react-refresh"; + packageName = "eslint-plugin-react-refresh"; + version = "0.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.3.tgz"; + sha512 = "Hh0wv8bUNY877+sI0BlCUlsS0TYYQqvzEwJsJJPM2WF4RnTStSnSR3zdJYa2nPOJgg3UghXi54lVyMSmpCalzA=="; + }; + }; + "eslint-plugin-unicorn-48.0.1" = { + name = "eslint-plugin-unicorn"; + packageName = "eslint-plugin-unicorn"; + version = "48.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-48.0.1.tgz"; + sha512 = "FW+4r20myG/DqFcCSzoumaddKBicIPeFnTrifon2mWIzlfyvzwyqZjqVP7m4Cqr/ZYisS2aiLghkUWaPg6vtCw=="; + }; + }; "eslint-plugin-vue-7.20.0" = { name = "eslint-plugin-vue"; packageName = "eslint-plugin-vue"; @@ -26205,15 +25791,6 @@ let sha512 = "w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg=="; }; }; - "eslint-utils-3.0.0" = { - name = "eslint-utils"; - packageName = "eslint-utils"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz"; - sha512 = "uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA=="; - }; - }; "eslint-visitor-keys-1.3.0" = { name = "eslint-visitor-keys"; packageName = "eslint-visitor-keys"; @@ -26295,15 +25872,6 @@ let sha512 = "OarPfz0lFCiW4/AV2Oy1Rp9qu0iusTKqykwTspGCZtPxmF81JR4MmIebvF1F9+UOKth2ZubLQ4XGGaU+hSn99A=="; }; }; - "esprima-3.1.3" = { - name = "esprima"; - packageName = "esprima"; - version = "3.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz"; - sha512 = "AWwVMNxwhN8+NIPQzAQZCm7RkLC4RbM3B1OobMuyp3i+w73X57KCKaVIxaRZb+DYCojq7rspo+fmuQfAboyhFg=="; - }; - }; "esprima-4.0.1" = { name = "esprima"; packageName = "esprima"; @@ -26313,15 +25881,6 @@ let sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; }; }; - "esprima-fb-13001.1001.0-dev-harmony-fb" = { - name = "esprima-fb"; - packageName = "esprima-fb"; - version = "13001.1001.0-dev-harmony-fb"; - src = fetchurl { - url = "https://registry.npmjs.org/esprima-fb/-/esprima-fb-13001.1001.0-dev-harmony-fb.tgz"; - sha512 = "u0PLCs9J36198vK7lFdvzfOiMT2v2K9/9d+J2M4d1ZEfTsXzvrzRHh95D+/sIziSabl4b6QKJOTn8+VaWc/B4A=="; - }; - }; "esquery-1.5.0" = { name = "esquery"; packageName = "esquery"; @@ -26619,6 +26178,15 @@ let sha512 = "mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q=="; }; }; + "events-intercept-2.0.0" = { + name = "events-intercept"; + packageName = "events-intercept"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/events-intercept/-/events-intercept-2.0.0.tgz"; + sha512 = "blk1va0zol9QOrdZt0rFXo5KMkNPVSp92Eju/Qz8THwKWKRKeE0T8Br/1aW6+Edkyq9xHYgYxn2QtOnUKPUp+Q=="; + }; + }; "evp_bytestokey-1.0.3" = { name = "evp_bytestokey"; packageName = "evp_bytestokey"; @@ -26673,6 +26241,15 @@ let sha512 = "Y/URAVapfbYy2Xp/gb6A0E7iR8xeqOCXsuuaoMn7A5PzrXUK84E1gyiEfq0wQd/GHA6GsoHWwhNq8anb0mleIw=="; }; }; + "execa-3.2.0" = { + name = "execa"; + packageName = "execa"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-3.2.0.tgz"; + sha512 = "kJJfVbI/lZE1PZYDI5VPxp8zXPO9rtxOkhpZ0jMKha56AI9y2gGVC6bkukStQf0ka5Rh15BA5m7cCCH4jmHqkw=="; + }; + }; "execa-3.4.0" = { name = "execa"; packageName = "execa"; @@ -26718,15 +26295,6 @@ let sha512 = "UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA=="; }; }; - "execa-8.0.1" = { - name = "execa"; - packageName = "execa"; - version = "8.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-8.0.1.tgz"; - sha512 = "VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg=="; - }; - }; "execall-2.0.0" = { name = "execall"; packageName = "execall"; @@ -26925,13 +26493,13 @@ let sha512 = "QOPh/iXykNDCAzUual1imSrn2aDakzCGUp2QmxVREr0llajXygroUWlT9sQXh1zKzbNp+a+i/xK375ZeBFiNJA=="; }; }; - "expo-modules-autolinking-1.5.2" = { + "expo-modules-autolinking-1.6.0" = { name = "expo-modules-autolinking"; packageName = "expo-modules-autolinking"; - version = "1.5.2"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/expo-modules-autolinking/-/expo-modules-autolinking-1.5.2.tgz"; - sha512 = "ckAowvTQo7fvVTgUBCoCKNsM95/cuVp11PxMS1v2do/vvxvAersSFj8MzLjB2Xt87MrX5AQ9RCXSt2VYZIkuGw=="; + url = "https://registry.npmjs.org/expo-modules-autolinking/-/expo-modules-autolinking-1.6.0.tgz"; + sha512 = "1SRzajlW7vLvydhUJnCDYdJXeu80IpNciMvH1YHZRvMnb21+UGhRkBTuqBfWEGcyaPVZxDVN/OWfU26TGa8hJA=="; }; }; "expo-modules-core-1.2.7" = { @@ -27033,15 +26601,6 @@ let sha512 = "swxwm3aP8vrOOvlzOdZvHlSZtJGwHKaY94J6AkrAgCTmcbko3IRwbkhLv2wKV1WeZhjxX58aLMpP3atDBnKuZg=="; }; }; - "express-intercept-1.1.0" = { - name = "express-intercept"; - packageName = "express-intercept"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/express-intercept/-/express-intercept-1.1.0.tgz"; - sha512 = "x1jgCJ8oNmZBhcsytRVnQd0iEuM1vYk3QBhxozjN5bwtsUyTbRhx7WvC+61/pcL8SaApwFDVxMZuMf8qdSOiHQ=="; - }; - }; "express-interceptor-1.2.0" = { name = "express-interceptor"; packageName = "express-interceptor"; @@ -27348,15 +26907,6 @@ let sha512 = "WKgKWg5eUxvRZGwW8FvfbaH7AXSh2cL+3j5fMGzUMCxWBJ3dV3a7Wz8y2f/uQ0e3B6WmodD3oS54jTQ9HVTIIg=="; }; }; - "fast-deep-equal-2.0.1" = { - name = "fast-deep-equal"; - packageName = "fast-deep-equal"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz"; - sha512 = "bCK/2Z4zLidyB4ReuIsvALH6w31YfAQDmXMqMx6FyfHqvBxtjC0eRumeSu4Bs3XtXwpyIywtSTrVT99BxY1f9w=="; - }; - }; "fast-deep-equal-3.1.3" = { name = "fast-deep-equal"; packageName = "fast-deep-equal"; @@ -27411,15 +26961,6 @@ let sha512 = "DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w=="; }; }; - "fast-glob-3.2.7" = { - name = "fast-glob"; - packageName = "fast-glob"; - version = "3.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz"; - sha512 = "rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q=="; - }; - }; "fast-glob-3.3.0" = { name = "fast-glob"; packageName = "fast-glob"; @@ -27492,15 +27033,6 @@ let sha512 = "Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw=="; }; }; - "fast-plist-0.1.3" = { - name = "fast-plist"; - packageName = "fast-plist"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-plist/-/fast-plist-0.1.3.tgz"; - sha512 = "d9cEfo/WcOezgPLAC/8t8wGb6YOD6JTCPMw2QcG2nAdFmyY+9rTUizCTaGjIZAloWENTEUMAPpkUAIJJJ0i96A=="; - }; - }; "fast-querystring-1.1.2" = { name = "fast-querystring"; packageName = "fast-querystring"; @@ -27924,15 +27456,6 @@ let sha512 = "0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="; }; }; - "file-uri-to-path-2.0.0" = { - name = "file-uri-to-path"; - packageName = "file-uri-to-path"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-2.0.0.tgz"; - sha512 = "hjPFI8oE/2iQPVe4gbrJ73Pp+Xfub2+WI2LlXDbsaJBwT5wuMh35WNWVYYTpnz895shtwfyutMFLFywpQAFdLg=="; - }; - }; "filelist-1.0.4" = { name = "filelist"; packageName = "filelist"; @@ -28275,15 +27798,6 @@ let sha512 = "ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng=="; }; }; - "first-chunk-stream-2.0.0" = { - name = "first-chunk-stream"; - packageName = "first-chunk-stream"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz"; - sha512 = "X8Z+b/0L4lToKYq+lwnKqi9X/Zek0NibLpsJgVsSxpoYq7JtiCtRb5HqKVEjEw/qAb/4AKKRLOwwKHlWNpm2Eg=="; - }; - }; "fkill-7.2.1" = { name = "fkill"; packageName = "fkill"; @@ -28365,13 +27879,13 @@ let sha512 = "r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA=="; }; }; - "flatted-3.2.7" = { + "flatted-3.2.9" = { name = "flatted"; packageName = "flatted"; - version = "3.2.7"; + version = "3.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz"; - sha512 = "5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ=="; + url = "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz"; + sha512 = "36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ=="; }; }; "flatten-0.0.1" = { @@ -28392,13 +27906,13 @@ let sha512 = "dz4HxH6pOvbUzZpZ/yXhafjbR2I8cenK5xL0KtBFb7U2ADsR+OwXifnxZjij/pZWF775uSCMzWVd+jDik2H2IA=="; }; }; - "flow-parser-0.216.1" = { + "flow-parser-0.217.2" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.216.1"; + version = "0.217.2"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.216.1.tgz"; - sha512 = "wstw46/C/8bRv/8RySCl15lK376j8DHxm41xFjD9eVL+jSS1UmVpbdLdA0LzGuS2v5uGgQiBLEj6mgSJQwW+MA=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.217.2.tgz"; + sha512 = "O+nt/FLXa1hTwtW0O9h36iZjbL84G8e1uByx5dDXMC97AJEbZXwJ4ohfaE8BNWrYFyYX0NGfz1o8AtLQvaaD/Q=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -28446,6 +27960,15 @@ let sha512 = "VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="; }; }; + "follow-redirects-1.15.3" = { + name = "follow-redirects"; + packageName = "follow-redirects"; + version = "1.15.3"; + src = fetchurl { + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz"; + sha512 = "1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q=="; + }; + }; "follow-redirects-1.5.10" = { name = "follow-redirects"; packageName = "follow-redirects"; @@ -28941,13 +28464,13 @@ let sha512 = "+vSd9frUnapVC2RZYfL3FCB2p3g4TBhaUmrsWlSudsGdnxIuUvBB2QM1VZeBtc49QFwrp+wQLrDs3+xxDgI5gQ=="; }; }; - "fs-monkey-1.0.4" = { + "fs-monkey-1.0.5" = { name = "fs-monkey"; packageName = "fs-monkey"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.4.tgz"; - sha512 = "INM/fWAxMICjttnD0DX1rBvinKskj5G1w+oy/pnm9u/tSlnBrzFonJMcalKJ30P8RRsPzKcCG7Q8l0jx5Fh9YQ=="; + url = "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.5.tgz"; + sha512 = "8uMbBjrhzW76TYgEV27Y5E//W2f/lTFmx78P2w19FZSxarhI/798APGQyuGCwmkNxgwGRhrLfvWyLBvNtuOmew=="; }; }; "fs-readdir-recursive-1.1.0" = { @@ -28995,6 +28518,15 @@ let sha512 = "oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw=="; }; }; + "fsevents-2.1.3" = { + name = "fsevents"; + packageName = "fsevents"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz"; + sha512 = "Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ=="; + }; + }; "fsevents-2.3.2" = { name = "fsevents"; packageName = "fsevents"; @@ -29022,15 +28554,6 @@ let sha512 = "WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg=="; }; }; - "fstream-ignore-1.0.5" = { - name = "fstream-ignore"; - packageName = "fstream-ignore"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz"; - sha512 = "VVRuOs41VUqptEGiR0N5ZoWEcfGvbGRqLINyZAhHRnF3DH5wrqjNkYr3VbRoZnI41BZgO7zIVdiobc13TVI1ow=="; - }; - }; "fswin-2.17.1227" = { name = "fswin"; packageName = "fswin"; @@ -29040,24 +28563,6 @@ let sha512 = "xNDktvwzSsXT8Xqnpz59VbuFwGHhtn1w+dS7QQ+wAu5cbH0p3WMGKU9Duf7cPna+nubhR+5ZG1MTl6/V6xgRgw=="; }; }; - "fswin-3.23.311" = { - name = "fswin"; - packageName = "fswin"; - version = "3.23.311"; - src = fetchurl { - url = "https://registry.npmjs.org/fswin/-/fswin-3.23.311.tgz"; - sha512 = "MKiaXljyEA7D9AXP1X0bCsgn1b1PEIo0P9pHKsxz6BLXZFIpfY1jYs8biRaVWlDEFkK10E3jD99mwpUZhVVCkQ=="; - }; - }; - "ftp-0.3.10" = { - name = "ftp"; - packageName = "ftp"; - version = "0.3.10"; - src = fetchurl { - url = "https://registry.npmjs.org/ftp/-/ftp-0.3.10.tgz"; - sha512 = "faFVML1aBx2UoDStmLwv2Wptt4vw5x03xxX172nhA5Y5HBshW5JweqQ2W4xL4dezQTG8inJsuYcpPHHU3X5OTQ=="; - }; - }; "fullname-4.0.1" = { name = "fullname"; packageName = "fullname"; @@ -29103,15 +28608,6 @@ let sha512 = "xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="; }; }; - "fuse.js-6.6.2" = { - name = "fuse.js"; - packageName = "fuse.js"; - version = "6.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fuse.js/-/fuse.js-6.6.2.tgz"; - sha512 = "cJaJkxCCxC8qIIcPBF9yGxY0W/tVZS3uEISDxhYIdtk8OL93pe+6Zj7LjCqVV4dzbqcriOZ+kQ/NE4RXZHsIGA=="; - }; - }; "fuzzy-0.1.3" = { name = "fuzzy"; packageName = "fuzzy"; @@ -29139,15 +28635,6 @@ let sha512 = "R1fam6D4CyKQGNlvJne4dkNF+PvUUl7TAJInvTGa9fti9qAv95quQz29GXapA4d8Ec266mJJxFVh82M4GIIGDQ=="; }; }; - "gar-1.0.4" = { - name = "gar"; - packageName = "gar"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/gar/-/gar-1.0.4.tgz"; - sha512 = "w4n9cPWyP7aHxKxYHFQMegj7WIAsL/YX/C4Bs5Rr8s1H9M1rNtRWRsw+ovYMkXDQ5S4ZbYHsHAPmevPjPgw44w=="; - }; - }; "gatsby-core-utils-4.12.0" = { name = "gatsby-core-utils"; packageName = "gatsby-core-utils"; @@ -29247,6 +28734,15 @@ let sha512 = "TuOwZWgJ2VAMEGJvAyPWvpqxSANF0LDpmyHauMjFYzaACvn+QTT/AZomvPCzVBV7yDN3OmwHQ5OvHaeLKre3JQ=="; }; }; + "generic-pool-3.4.2" = { + name = "generic-pool"; + packageName = "generic-pool"; + version = "3.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/generic-pool/-/generic-pool-3.4.2.tgz"; + sha512 = "H7cUpwCQSiJmAHM4c/aFu6fUfrhWXW1ncyh8ftxEPMu6AiYkHw9K8br720TGPZJbk5eOH2bynjZD1yPvdDAmag=="; + }; + }; "generic-pool-3.8.2" = { name = "generic-pool"; packageName = "generic-pool"; @@ -29328,15 +28824,6 @@ let sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; }; }; - "get-folder-size-2.0.1" = { - name = "get-folder-size"; - packageName = "get-folder-size"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/get-folder-size/-/get-folder-size-2.0.1.tgz"; - sha512 = "+CEb+GDCM7tkOS2wdMKTn9vU7DgnKUTuDlehkNJKNSovdCOVxs14OfKCk4cvSaR3za4gj+OBdl9opPN9xrJ0zA=="; - }; - }; "get-installed-path-2.1.1" = { name = "get-installed-path"; packageName = "get-installed-path"; @@ -29544,15 +29031,6 @@ let sha512 = "ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="; }; }; - "get-stream-8.0.1" = { - name = "get-stream"; - packageName = "get-stream"; - version = "8.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/get-stream/-/get-stream-8.0.1.tgz"; - sha512 = "VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA=="; - }; - }; "get-symbol-description-1.0.0" = { name = "get-symbol-description"; packageName = "get-symbol-description"; @@ -29571,22 +29049,13 @@ let sha512 = "LRn8Jlk+DwZE4GTlDbT3Hikd1wSHgLMme/+7ddlqKd7ldwR6LjJgTVWzBnR01wnYGe4KgrXjg287RaI22UHmAw=="; }; }; - "get-uri-3.0.2" = { - name = "get-uri"; - packageName = "get-uri"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/get-uri/-/get-uri-3.0.2.tgz"; - sha512 = "+5s0SJbGoyiJTZZ2JTpFPLMPSch72KEqGOTvQsBqg0RBWvwhWUSYZFAtz3TPW0GXJuLBJPts1E241iHg+VRfhg=="; - }; - }; - "get-uri-6.0.1" = { + "get-uri-6.0.2" = { name = "get-uri"; packageName = "get-uri"; - version = "6.0.1"; + version = "6.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/get-uri/-/get-uri-6.0.1.tgz"; - sha512 = "7ZqONUVqaabogsYNWlYj0t3YZaL6dhuEueZXGF+/YVmf6dHmaFg8/6psJKqhx9QykIDKzpGcy2cn4oV4YC7V/Q=="; + url = "https://registry.npmjs.org/get-uri/-/get-uri-6.0.2.tgz"; + sha512 = "5KLucCJobh8vBY1K07EFV4+cPZH3mrV9YeAruUseCQKHB58SGjjT2l9/eA9LD082IiuMjSlFJEcdJ27TXvbZNw=="; }; }; "get-value-2.0.6" = { @@ -29814,15 +29283,6 @@ let sha512 = "NaqbYHMUAlPcmWFdrAB7bcxrNIiiJWJe8s/2+iOc9vlcHlwHqSGrPk+Yi3nu6ebTwgsZEa7igz+NH2vEq3gYwQ=="; }; }; - "github-username-6.0.0" = { - name = "github-username"; - packageName = "github-username"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/github-username/-/github-username-6.0.0.tgz"; - sha512 = "7TTrRjxblSI5l6adk9zd+cV5d6i1OrJSo3Vr9xdGqFLBQo0mz5P9eIfKCDJ7eekVGGFLbce0qbPSnktXV2BjDQ=="; - }; - }; "giturl-1.0.3" = { name = "giturl"; packageName = "giturl"; @@ -29832,31 +29292,22 @@ let sha512 = "qVDEXufVtYUzYqI5hoDUONh9GCEPi0n+e35KNDafdsNt9fPxB0nvFW/kFiw7W42wkg8TUyhBqb+t24yyaoc87A=="; }; }; - "glob-10.3.3" = { - name = "glob"; - packageName = "glob"; - version = "10.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-10.3.3.tgz"; - sha512 = "92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw=="; - }; - }; - "glob-10.3.4" = { + "glob-10.3.10" = { name = "glob"; packageName = "glob"; - version = "10.3.4"; + version = "10.3.10"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-10.3.4.tgz"; - sha512 = "6LFElP3A+i/Q8XQKEvZjkEWEOTgAIALR9AO2rwT8bgPhDd1anmqDJDZ6lLddI4ehxxxR1S5RIqKe1uapMQfYaQ=="; + url = "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz"; + sha512 = "fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g=="; }; }; - "glob-5.0.15" = { + "glob-10.3.3" = { name = "glob"; packageName = "glob"; - version = "5.0.15"; + version = "10.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz"; - sha512 = "c9IPMazfRITpmAAKi22dK1VKxGDX9ehhqfABDriL/lzO92xcUKEJPQHrVA/2YHSNFB4iFlykVmWvwo48nr3OxA=="; + url = "https://registry.npmjs.org/glob/-/glob-10.3.3.tgz"; + sha512 = "92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw=="; }; }; "glob-6.0.4" = { @@ -30121,13 +29572,13 @@ let sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; }; }; - "globals-13.21.0" = { + "globals-13.22.0" = { name = "globals"; packageName = "globals"; - version = "13.21.0"; + version = "13.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-13.21.0.tgz"; - sha512 = "ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg=="; + url = "https://registry.npmjs.org/globals/-/globals-13.22.0.tgz"; + sha512 = "H1Ddc/PbZHTDVJSnj8kWptIRSD6AM3pK+mKytuIVF4uoBV7rshFlhhvA58ceJ5wp3Er58w6zj7bykMpYXt3ETw=="; }; }; "globals-9.18.0" = { @@ -30328,6 +29779,15 @@ let sha512 = "mThBblvlAF1d4O5oqyvN+ZxLAYwIJK7bpMxgYqPD9okW0C3qm5FFn7k811QrcuEBwaogR3ngOFoCfs6mRv7teQ=="; }; }; + "got-13.0.0" = { + name = "got"; + packageName = "got"; + version = "13.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/got/-/got-13.0.0.tgz"; + sha512 = "XfBk1CxOOScDcMr9O1yKkNaQyy865NbYs+F7dr4H0LZMVgCj2Le59k6PqbNHoL5ToeaEQUYh6c6yMfVcc6SJxA=="; + }; + }; "got-3.3.1" = { name = "got"; packageName = "got"; @@ -30544,13 +30004,13 @@ let sha512 = "KPIBPDlW7NxrbT/eh4qPXz5FiFdL5UbaA0XUNz2Rp3Z3hqBSkbj0GVjwFDztsWVauZUWsbKHgMg++sk8UX0bkw=="; }; }; - "graphql-16.8.0" = { + "graphql-16.8.1" = { name = "graphql"; packageName = "graphql"; - version = "16.8.0"; + version = "16.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/graphql/-/graphql-16.8.0.tgz"; - sha512 = "0oKGaR+y3qcS5mCu1vb7KG+a89vjn06C7Ihq/dDl3jA+A8B3TKomvi3CiEcVLJQGalbu8F52LxkOym7U5sSfbg=="; + url = "https://registry.npmjs.org/graphql/-/graphql-16.8.1.tgz"; + sha512 = "59LZHPdGZVh695Ud9lRzPBVTtlX9ZCV150Er2W43ro37wVof0ctenSaskPPjN7lVTIN8mSZt8PHUNKZuNQUuxw=="; }; }; "graphql-config-3.0.3" = { @@ -30571,31 +30031,22 @@ let sha512 = "7TPxOrlbiG0JplSZYCyxn2XQtqVhXomEjXUmWJVSS5ET1nPhOJSsIb/WTwqWhcYX6G0RlHXSj9PLtGTKmxLNGg=="; }; }; - "graphql-language-service-5.1.7" = { + "graphql-language-service-5.2.0" = { name = "graphql-language-service"; packageName = "graphql-language-service"; - version = "5.1.7"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-language-service/-/graphql-language-service-5.1.7.tgz"; - sha512 = "xkawYMJeoNYGhT+SpSH3c2qf6HpGHQ/duDmrseVHBpVCrXAiGnliXGSCC4jyMGgZQ05GytsZ12p0nUo7s6lSSw=="; + url = "https://registry.npmjs.org/graphql-language-service/-/graphql-language-service-5.2.0.tgz"; + sha512 = "o/ZgTS0pBxWm3hSF4+6GwiV1//DxzoLWEbS38+jqpzzy1d/QXBidwQuVYTOksclbtOJZ3KR/tZ8fi/tI6VpVMg=="; }; }; - "graphql-language-service-server-2.11.3" = { + "graphql-language-service-server-2.11.5" = { name = "graphql-language-service-server"; packageName = "graphql-language-service-server"; - version = "2.11.3"; + version = "2.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-language-service-server/-/graphql-language-service-server-2.11.3.tgz"; - sha512 = "pkH29NNjbus/lmlzGW5SOlL6iVvtj46ImG+UgXdv8uOLfv6wQHOX6aOFeCx7NpGVlCZYDxyPp220NQIyO5RucA=="; - }; - }; - "graphql-request-3.7.0" = { - name = "graphql-request"; - packageName = "graphql-request"; - version = "3.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/graphql-request/-/graphql-request-3.7.0.tgz"; - sha512 = "dw5PxHCgBneN2DDNqpWu8QkbbJ07oOziy8z+bK/TAXufsOLaETuVO4GkXrbs0WjhdKhBMN3BkpN/RIvUHkmNUQ=="; + url = "https://registry.npmjs.org/graphql-language-service-server/-/graphql-language-service-server-2.11.5.tgz"; + sha512 = "qDGS0h6t0RyTdpV0lqSrMcB1IXeQK4NhkrjYeltTJhRCnqmXXYeF0QzOGx//EizQaXphbha9+vO2xviYhOTamA=="; }; }; "graphql-request-5.2.0" = { @@ -30643,22 +30094,13 @@ let sha512 = "sHkK9+lUm20/BGawNEWNtVAeJzhZeBg21VmvmLoT5NdGVeZWv5PdIhkcayQIAgjSyyQ17WMKmbDijIPG2On+Ag=="; }; }; - "graphql-ws-5.14.0" = { + "graphql-ws-5.14.1" = { name = "graphql-ws"; packageName = "graphql-ws"; - version = "5.14.0"; - src = fetchurl { - url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-5.14.0.tgz"; - sha512 = "itrUTQZP/TgswR4GSSYuwWUzrE/w5GhbwM2GX3ic2U7aw33jgEsayfIlvaj7/GcIvZgNMzsPTrE5hqPuFUiE5g=="; - }; - }; - "grouped-queue-2.0.0" = { - name = "grouped-queue"; - packageName = "grouped-queue"; - version = "2.0.0"; + version = "5.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/grouped-queue/-/grouped-queue-2.0.0.tgz"; - sha512 = "/PiFUa7WIsl48dUeCvhIHnwNmAAzlI/eHoJl0vu3nsFA366JleY7Ff8EVTplZu5kO0MIdZjKTTnzItL61ahbnw=="; + url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-5.14.1.tgz"; + sha512 = "aqkls1espsygP1PfkAuuLIV96IbztQ6EaADse97pw8wRIMT3+AL/OYfS8V2iCRkc0gzckitoDRGCQEdnySggiA=="; }; }; "growly-1.3.0" = { @@ -30715,15 +30157,6 @@ let sha512 = "hm6N8nrm3Y08jXie48jsC55eCZz9mnb4OirAStEk2deqeyhXU3C1otDVh+ccttMuc1sBi6RX6ZJ720hs9RCvgw=="; }; }; - "gzip-size-6.0.0" = { - name = "gzip-size"; - packageName = "gzip-size"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz"; - sha512 = "ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q=="; - }; - }; "handle-thing-2.0.1" = { name = "handle-thing"; packageName = "handle-thing"; @@ -31372,15 +30805,6 @@ let sha512 = "QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g=="; }; }; - "hidefile-3.0.0" = { - name = "hidefile"; - packageName = "hidefile"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hidefile/-/hidefile-3.0.0.tgz"; - sha512 = "AvJ9joE59PQPGOB78smS63K60KKpTK5GBIagupfK9Hw6zpA0JKba2D9uAnDycaI8/bN30ltHWGZVXIkQ4BU6oA=="; - }; - }; "highlight-es-1.0.3" = { name = "highlight-es"; packageName = "highlight-es"; @@ -31507,15 +30931,6 @@ let sha512 = "zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ=="; }; }; - "hpagent-0.1.2" = { - name = "hpagent"; - packageName = "hpagent"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/hpagent/-/hpagent-0.1.2.tgz"; - sha512 = "ePqFXHtSQWAFXYmj+JtOTHr84iNrII4/QRlAAPPE+zqnKy4xJo7Ie1Y4kC7AdB+LxLxSTTzBMASsEcy0q8YyvQ=="; - }; - }; "hpagent-1.2.0" = { name = "hpagent"; packageName = "hpagent"; @@ -31759,6 +31174,15 @@ let sha512 = "LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw=="; }; }; + "http-errors-1.4.0" = { + name = "http-errors"; + packageName = "http-errors"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.4.0.tgz"; + sha512 = "oLjPqve1tuOl5aRhv8GK5eHpqP1C9fb+Ol+XTLjKfLltE44zdDbEdjPSbU7Ch5rSNsVFqZn97SrMmZLdu1/YMw=="; + }; + }; "http-errors-1.6.3" = { name = "http-errors"; packageName = "http-errors"; @@ -31876,15 +31300,6 @@ let sha512 = "+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ=="; }; }; - "http-proxy-middleware-1.3.1" = { - name = "http-proxy-middleware"; - packageName = "http-proxy-middleware"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-1.3.1.tgz"; - sha512 = "13eVVDYS4z79w7f1+NPllJtOQFx/FdUW4btIvVRMaRlUY9VGstAbo5MOhLEuUgZFRHn3x50ufn25zkj/boZnEg=="; - }; - }; "http-proxy-middleware-2.0.6" = { name = "http-proxy-middleware"; packageName = "http-proxy-middleware"; @@ -32038,15 +31453,6 @@ let sha512 = "nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ=="; }; }; - "human-signals-5.0.0" = { - name = "human-signals"; - packageName = "human-signals"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/human-signals/-/human-signals-5.0.0.tgz"; - sha512 = "AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ=="; - }; - }; "humanize-ms-1.2.1" = { name = "humanize-ms"; packageName = "humanize-ms"; @@ -32065,15 +31471,6 @@ let sha512 = "Ty8UblRWFEcfSuIaajM34LdPXIhbs1ajEX/BBPv24J+enSVaEVY63xQ6lTO9VRYS5LAoghIG0IDJ+p+IPzKUQQ=="; }; }; - "hyperquest-2.1.3" = { - name = "hyperquest"; - packageName = "hyperquest"; - version = "2.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/hyperquest/-/hyperquest-2.1.3.tgz"; - sha512 = "fUuDOrB47PqNK/BAMOS13v41UoaqIxqSLHX6CAbOD7OfT+/GCWO1/vPLfTNutOeXrv1ikuaZ3yux+33Z9vh+rw=="; - }; - }; "i-0.3.7" = { name = "i"; packageName = "i"; @@ -32218,15 +31615,6 @@ let sha512 = "PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ=="; }; }; - "ignore-walk-4.0.1" = { - name = "ignore-walk"; - packageName = "ignore-walk"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-4.0.1.tgz"; - sha512 = "rzDQLaW4jQbh2YrOFlJdCtX8qgJTehFRYiUB2r1osqTeDzV/3+Jh8fz1oAPzUThf3iku8Ds4IDqawI5d8mUiQw=="; - }; - }; "ignore-walk-5.0.1" = { name = "ignore-walk"; packageName = "ignore-walk"; @@ -32551,6 +31939,15 @@ let sha512 = "k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA=="; }; }; + "inherits-2.0.1" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; + sha512 = "8nWq2nLTAwd02jTqJExUYFSD/fKq6VH9Y/oG2accc/kdI0V98Bag8d5a4gi3XHz73rDWa2PvTtvcWYquKqSENA=="; + }; + }; "inherits-2.0.3" = { name = "inherits"; packageName = "inherits"; @@ -32596,15 +31993,6 @@ let sha512 = "7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA=="; }; }; - "ini-3.0.1" = { - name = "ini"; - packageName = "ini"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ini/-/ini-3.0.1.tgz"; - sha512 = "it4HyVAUTKBc6m8e1iXWvXSTdndF7HbdN713+kvLrymxTaU4AUBWrJ4vEooP+V7fexnVD3LKcBshjGGPefSMUQ=="; - }; - }; "ini-4.1.1" = { name = "ini"; packageName = "ini"; @@ -32803,15 +32191,6 @@ let sha512 = "qHgHyJmbULt4hI+kCmwX92MnSxDs/Yhdt4wPA30qnoa01OF6uTXV8yvH4hKXgdaTNmkZ9D01MHjqKYEuJN+ONw=="; }; }; - "inquirer-autocomplete-prompt-3.0.0" = { - name = "inquirer-autocomplete-prompt"; - packageName = "inquirer-autocomplete-prompt"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/inquirer-autocomplete-prompt/-/inquirer-autocomplete-prompt-3.0.0.tgz"; - sha512 = "nsPWllBQB3qhvpVgV1UIJN4xo3yz7Qv8y1+zrNVpJUNPxtUZ7btCum/4UCAs5apPCe/FVhKH1V6Wx0cAwkreyg=="; - }; - }; "inquirer-autosubmit-prompt-0.2.0" = { name = "inquirer-autosubmit-prompt"; packageName = "inquirer-autosubmit-prompt"; @@ -32965,15 +32344,6 @@ let sha512 = "agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA=="; }; }; - "interpret-2.2.0" = { - name = "interpret"; - packageName = "interpret"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz"; - sha512 = "Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw=="; - }; - }; "interpret-3.1.1" = { name = "interpret"; packageName = "interpret"; @@ -33046,24 +32416,6 @@ let sha512 = "xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ=="; }; }; - "io-ts-2.2.20" = { - name = "io-ts"; - packageName = "io-ts"; - version = "2.2.20"; - src = fetchurl { - url = "https://registry.npmjs.org/io-ts/-/io-ts-2.2.20.tgz"; - sha512 = "Rq2BsYmtwS5vVttie4rqrOCIfHCS9TgpRLFpKQCM1wZBBRY9nWVGmEvm2FnDbSE2un1UE39DvFpTR5UL47YDcA=="; - }; - }; - "io-ts-reporters-1.2.2" = { - name = "io-ts-reporters"; - packageName = "io-ts-reporters"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/io-ts-reporters/-/io-ts-reporters-1.2.2.tgz"; - sha512 = "igASwWWkDY757OutNcM6zTtdJf/eTZYkoe2ymsX2qpm5bKZLo74FJYjsCtMQOEdY7dRHLLEulCyFQwdN69GBCg=="; - }; - }; "iota-array-1.0.0" = { name = "iota-array"; packageName = "iota-array"; @@ -33424,6 +32776,15 @@ let sha512 = "i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ=="; }; }; + "is-builtin-module-3.2.1" = { + name = "is-builtin-module"; + packageName = "is-builtin-module"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz"; + sha512 = "BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A=="; + }; + }; "is-callable-1.2.7" = { name = "is-callable"; packageName = "is-callable"; @@ -34360,15 +33721,6 @@ let sha512 = "AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg=="; }; }; - "is-scoped-2.1.0" = { - name = "is-scoped"; - packageName = "is-scoped"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-scoped/-/is-scoped-2.1.0.tgz"; - sha512 = "Cv4OpPTHAK9kHYzkzCrof3VJh7H/PrG2MBUMvvJebaaUMbqhm0YAtXnvh0I3Hnj2tMZWwrRROWLSgfJrKqWmlQ=="; - }; - }; "is-scoped-3.0.0" = { name = "is-scoped"; packageName = "is-scoped"; @@ -34756,15 +34108,6 @@ let sha512 = "iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw=="; }; }; - "isbinaryfile-5.0.0" = { - name = "isbinaryfile"; - packageName = "isbinaryfile"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-5.0.0.tgz"; - sha512 = "UDdnyGvMajJUWCkib7Cei/dvyJrrvo4FIrsvSFWdPpXSUorzXrDJ0S+X5Q4ZlasfPjca4yqCNNsjbCeiy8FFeg=="; - }; - }; "isemail-3.2.0" = { name = "isemail"; packageName = "isemail"; @@ -34792,6 +34135,15 @@ let sha512 = "RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="; }; }; + "isexe-3.1.1" = { + name = "isexe"; + packageName = "isexe"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz"; + sha512 = "LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ=="; + }; + }; "isobject-2.1.0" = { name = "isobject"; packageName = "isobject"; @@ -34972,13 +34324,13 @@ let sha512 = "DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w=="; }; }; - "jackspeak-2.3.3" = { + "jackspeak-2.3.6" = { name = "jackspeak"; packageName = "jackspeak"; - version = "2.3.3"; + version = "2.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.3.tgz"; - sha512 = "R2bUw+kVZFS/h1AZqBKrSgDmdmjApzgY0AlCPumopFiAlbUxE2gf+SCuBzQ0cP5hHmUmFYF5yw55T97Th5Kstg=="; + url = "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz"; + sha512 = "N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ=="; }; }; "jade-0.27.0" = { @@ -34999,6 +34351,15 @@ let sha512 = "ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w=="; }; }; + "javascript-natural-sort-0.7.1" = { + name = "javascript-natural-sort"; + packageName = "javascript-natural-sort"; + version = "0.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz"; + sha512 = "nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw=="; + }; + }; "javascript-stringify-2.1.0" = { name = "javascript-stringify"; packageName = "javascript-stringify"; @@ -35107,13 +34468,13 @@ let sha512 = "b2Zna/wGIyTzi0Gemg27JYUaRyTyBETw5GnqyVQMr71uojOYMrgkD2+Px3bG2ZFi7/zTUXJSDoGoBOhMixq7tg=="; }; }; - "joi-17.10.1" = { + "joi-17.10.2" = { name = "joi"; packageName = "joi"; - version = "17.10.1"; + version = "17.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/joi/-/joi-17.10.1.tgz"; - sha512 = "vIiDxQKmRidUVp8KngT8MZSOcmRVm2zV7jbMjNYWuHcJWI0bUck3nRTGQjhpPlQenIQIBC5Vp9AhcnHbWQqafw=="; + url = "https://registry.npmjs.org/joi/-/joi-17.10.2.tgz"; + sha512 = "hcVhjBxRNW/is3nNLdGLIjkgXetkeGc2wyhydhz8KumG23Aerk4HPjU5zaPAMRqXQFc0xNqXTC7+zQjxr0GlKA=="; }; }; "joi-17.7.0" = { @@ -35413,13 +34774,22 @@ let sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="; }; }; - "jsii-1.88.0" = { + "jsesc-3.0.2" = { + name = "jsesc"; + packageName = "jsesc"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz"; + sha512 = "xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g=="; + }; + }; + "jsii-1.89.0" = { name = "jsii"; packageName = "jsii"; - version = "1.88.0"; + version = "1.89.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii/-/jsii-1.88.0.tgz"; - sha512 = "WKfwHbcEI/j5OYDPexvkH8KKDcTZR7tIBFNTxu8h1Nh3G8xFT4hh3pObUUSMRCa6rsSF9EHGjS+AKC+TfpFGrQ=="; + url = "https://registry.npmjs.org/jsii/-/jsii-1.89.0.tgz"; + sha512 = "NOeltDlkRSu7OXpNS8I4izFtcVKsMppn0pbqM07LWHXrNZT0Y7c/dDtuMyYRIDNcwB6aLtOzLHfls9rd6qrLyg=="; }; }; "jsii-5.1.12" = { @@ -35431,40 +34801,40 @@ let sha512 = "iY3zLosUEKbeua6IAGJXjFxibiiI0xHFjyYPyewOc56MBRHC7nczWSVGRP+Jgwyo7HWXs4TvJKLG6w8zSuAZrg=="; }; }; - "jsii-5.2.5" = { + "jsii-5.2.11" = { name = "jsii"; packageName = "jsii"; - version = "5.2.5"; + version = "5.2.11"; src = fetchurl { - url = "https://registry.npmjs.org/jsii/-/jsii-5.2.5.tgz"; - sha512 = "kVNFvxRJ5gakm8Aiv9x5Yo/w7zAw6seW+zwK7XPzULTYNSQBoWnikIGaRZIHoQtImtbheyQ8AmzRrD9pNocF/g=="; + url = "https://registry.npmjs.org/jsii/-/jsii-5.2.11.tgz"; + sha512 = "HbEgIrWuGswoxgRaKOTOp4m6FPnrL6gpBAc3j78hhPo1k9MCxydiQQAKm73eCRYCwt9/zPBms8O+3Vd6Bi1kRQ=="; }; }; - "jsii-pacmak-1.88.0" = { + "jsii-pacmak-1.89.0" = { name = "jsii-pacmak"; packageName = "jsii-pacmak"; - version = "1.88.0"; + version = "1.89.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.88.0.tgz"; - sha512 = "nanfSaYpe2lgOzvosup4iObQ76tCs47+rERUUGFyrCq7sruQ7VMYgRdAuGWh8PqF9fGNwq6Do1eR+EMC+d4WUg=="; + url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.89.0.tgz"; + sha512 = "fEvXWBdIOz1WyPrpZRbDaaV1f3UyAN8vYIhzH8mtLklsdFUkS3SZdfFJWEKsa6gjILT+4/CqBtLOEZE0iHy0bg=="; }; }; - "jsii-reflect-1.88.0" = { + "jsii-reflect-1.89.0" = { name = "jsii-reflect"; packageName = "jsii-reflect"; - version = "1.88.0"; + version = "1.89.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.88.0.tgz"; - sha512 = "YYZTEQpayvwMDtRMCjgNraTFUqsj4/KEOE8ChvDCkpxv6aH89vpZSsAJM5ymhNLDHj4XZ2OW3XE0sNOz31NbvA=="; + url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.89.0.tgz"; + sha512 = "05g0fUVot46rPGXYWzB3q4w2Cx2Ox7pzWfsGuIz6Kql/d9KoAFWMuGjwQbSbrI2I52RPKfTbM8wATzzp6Q5kdQ=="; }; }; - "jsii-rosetta-1.88.0" = { + "jsii-rosetta-1.89.0" = { name = "jsii-rosetta"; packageName = "jsii-rosetta"; - version = "1.88.0"; + version = "1.89.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.88.0.tgz"; - sha512 = "6xRRkwWUKFqDTnjgCXkB6v9dxA51KUD4Cd7InLB4qirMBDuMtyYhYVNc1yJbHPYs9gkN5/ao0dFk+1CQxt7T7g=="; + url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.89.0.tgz"; + sha512 = "1hmLO+LtZ6bf2uvYW45YaRBQJD+rVondVkWfT2Ex9xYrkxAsc4304TV2DoQILfZbkaUPezyJ3ejGFlMhliNG0g=="; }; }; "jsii-rosetta-5.1.13" = { @@ -35638,15 +35008,6 @@ let sha512 = "CpDFlBwz/6la78hZxyB9FECVKGYjIIl3Ms3KLqFj99W7IIb7D00/RDgc++IGB4BBALl0QRhh5m4q5WNSopvLtQ=="; }; }; - "json-schema-ref-parser-9.0.9" = { - name = "json-schema-ref-parser"; - packageName = "json-schema-ref-parser"; - version = "9.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/json-schema-ref-parser/-/json-schema-ref-parser-9.0.9.tgz"; - sha512 = "qcP2lmGy+JUoQJ4DOQeLaZDqH9qSkeGCK3suKWxJXS82dg728Mn3j97azDMaOUmJAN4uCq91LdPx4K7E8F1a7Q=="; - }; - }; "json-schema-to-ts-1.6.4" = { name = "json-schema-to-ts"; packageName = "json-schema-to-ts"; @@ -35656,15 +35017,6 @@ let sha512 = "pR4yQ9DHz6itqswtHCm26mw45FSNfQ9rEQjosaZErhn5J3J2sIViQiz8rDaezjKAhFGpmsoczYVBgGHzFw/stA=="; }; }; - "json-schema-to-typescript-9.1.1" = { - name = "json-schema-to-typescript"; - packageName = "json-schema-to-typescript"; - version = "9.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-schema-to-typescript/-/json-schema-to-typescript-9.1.1.tgz"; - sha512 = "VrdxmwQROjPBRlHxXwGUa2xzhOMPiNZIVsxZrZjMYtbI7suRFMiEktqaD/gqhfSya7Djy+x8dnJT+H0/0sZO0Q=="; - }; - }; "json-schema-traverse-0.4.1" = { name = "json-schema-traverse"; packageName = "json-schema-traverse"; @@ -35737,15 +35089,6 @@ let sha512 = "Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="; }; }; - "json-stringify-nice-1.1.4" = { - name = "json-stringify-nice"; - packageName = "json-stringify-nice"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/json-stringify-nice/-/json-stringify-nice-1.1.4.tgz"; - sha512 = "5Z5RFW63yxReJ7vANgW6eZFGWaQvnPE3WNmZoOJrSkGju2etKA2L5rrOa1sm877TVTFt57A80BH1bArcmlLfPw=="; - }; - }; "json-stringify-pretty-compact-3.0.0" = { name = "json-stringify-pretty-compact"; packageName = "json-stringify-pretty-compact"; @@ -36025,15 +35368,6 @@ let sha512 = "gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ=="; }; }; - "jstransform-10.1.0" = { - name = "jstransform"; - packageName = "jstransform"; - version = "10.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jstransform/-/jstransform-10.1.0.tgz"; - sha512 = "hzsCrPlH8ASlARV/sjsjbnvg0AXz9DxMHry44wXF3GTvletHT8UhsmqUzSGaImlney40E1gw4D6izUzifD15IQ=="; - }; - }; "jstransformer-1.0.0" = { name = "jstransformer"; packageName = "jstransformer"; @@ -36097,24 +35431,6 @@ let sha512 = "qpcRocdkUmf+UTNBYx5w6dexX5J31AKK1OmPwH630a83DdVVUIngk55RSAiIGpQyoH0dlr872VHfPjnQnK1qDQ=="; }; }; - "just-diff-5.2.0" = { - name = "just-diff"; - packageName = "just-diff"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/just-diff/-/just-diff-5.2.0.tgz"; - sha512 = "6ufhP9SHjb7jibNFrNxyFZ6od3g+An6Ai9mhGRvcYe8UJlH0prseN64M+6ZBBUoKYHZsitDP42gAJ8+eVWr3lw=="; - }; - }; - "just-diff-apply-5.5.0" = { - name = "just-diff-apply"; - packageName = "just-diff-apply"; - version = "5.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/just-diff-apply/-/just-diff-apply-5.5.0.tgz"; - sha512 = "OYTthRfSh55WOItVqwpefPtNt2VdKsq5AnAK6apdtR6yCH8pr0CmSr710J0Mf+WdQy7K/OzMy7K2MgAfdQURDw=="; - }; - }; "jwa-1.4.1" = { name = "jwa"; packageName = "jwa"; @@ -36529,15 +35845,6 @@ let sha512 = "weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA=="; }; }; - "latest-version-6.0.0" = { - name = "latest-version"; - packageName = "latest-version"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/latest-version/-/latest-version-6.0.0.tgz"; - sha512 = "zfTuGx4PwpoSJ1mABs58AkM6qMzu49LZ7LT5JHprKvpGpQ+cYtfSibi3tLLrH4z7UylYU42rfBdwN8YgqbTljA=="; - }; - }; "latest-version-7.0.0" = { name = "latest-version"; packageName = "latest-version"; @@ -36556,33 +35863,6 @@ let sha512 = "JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ=="; }; }; - "launchdarkly-eventsource-1.4.3" = { - name = "launchdarkly-eventsource"; - packageName = "launchdarkly-eventsource"; - version = "1.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/launchdarkly-eventsource/-/launchdarkly-eventsource-1.4.3.tgz"; - sha512 = "taeidSNMbF4AuUXjoFStT5CSTknicaKqu+0vrw7gYEMrpQgG74BEzlS0BGYmxW20JdGm2gpm7jtZ542ZG/h8tA=="; - }; - }; - "launchdarkly-js-sdk-common-4.3.3" = { - name = "launchdarkly-js-sdk-common"; - packageName = "launchdarkly-js-sdk-common"; - version = "4.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/launchdarkly-js-sdk-common/-/launchdarkly-js-sdk-common-4.3.3.tgz"; - sha512 = "COLKk6JxrP+xFrp7gQMGta19uLik/Gy2iq151lydxRfPbmWcY0BCfW/Y8uTTSjI1r4fLGdWsupIiY0ojhGXu8w=="; - }; - }; - "launchdarkly-node-client-sdk-2.2.2" = { - name = "launchdarkly-node-client-sdk"; - packageName = "launchdarkly-node-client-sdk"; - version = "2.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/launchdarkly-node-client-sdk/-/launchdarkly-node-client-sdk-2.2.2.tgz"; - sha512 = "rWXqAS6yXZ7jJdPkbJTij+HR+MbdlItczUxy2JPbSK+ofv4tOhR39ktJSKfqa3go7xwPabKSgaDRf+exP77d3w=="; - }; - }; "lazy-1.0.11" = { name = "lazy"; packageName = "lazy"; @@ -36844,94 +36124,94 @@ let sha512 = "yRHaiQDizWSzoXk3APcA71eOI/UuhEkNN9DiW2Tt44mhYzX4joFoCZlxsSOF7RyeLlfqzFLQI1ngFq3ggMPhOw=="; }; }; - "lightningcss-1.21.8" = { + "lightningcss-1.22.0" = { name = "lightningcss"; packageName = "lightningcss"; - version = "1.21.8"; + version = "1.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/lightningcss/-/lightningcss-1.21.8.tgz"; - sha512 = "jEqaL7m/ZckZJjlMAfycr1Kpz7f93k6n7KGF5SJjuPSm6DWI6h3ayLZmgRHgy1OfrwoCed6h4C/gHYPOd1OFMA=="; + url = "https://registry.npmjs.org/lightningcss/-/lightningcss-1.22.0.tgz"; + sha512 = "+z0qvwRVzs4XGRXelnWRNwqsXUx8k3bSkbP8vD42kYKSk3z9OM2P3e/gagT7ei/gwh8DTS80LZOFZV6lm8Z8Fg=="; }; }; - "lightningcss-darwin-arm64-1.21.8" = { + "lightningcss-darwin-arm64-1.22.0" = { name = "lightningcss-darwin-arm64"; packageName = "lightningcss-darwin-arm64"; - version = "1.21.8"; + version = "1.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.21.8.tgz"; - sha512 = "BOMoGfcgkk2f4ltzsJqmkjiqRtlZUK+UdwhR+P6VgIsnpQBV3G01mlL6GzYxYqxq+6/3/n/D+4oy2NeknmADZw=="; + url = "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.22.0.tgz"; + sha512 = "aH2be3nNny+It5YEVm8tBSSdRlBVWQV8m2oJ7dESiYRzyY/E/bQUe2xlw5caaMuhlM9aoTMtOH25yzMhir0qPg=="; }; }; - "lightningcss-darwin-x64-1.21.8" = { + "lightningcss-darwin-x64-1.22.0" = { name = "lightningcss-darwin-x64"; packageName = "lightningcss-darwin-x64"; - version = "1.21.8"; + version = "1.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.21.8.tgz"; - sha512 = "YhF64mcVDPKKufL4aNFBnVH7uvzE0bW3YUsPXdP4yUcT/8IXChypOZ/PE1pmt2RlbmsyVuuIIeZU4zTyZe5Amw=="; + url = "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.22.0.tgz"; + sha512 = "9KHRFA0Y6mNxRHeoQMp0YaI0R0O2kOgUlYPRjuasU4d+pI8NRhVn9bt0yX9VPs5ibWX1RbDViSPtGJvYYrfVAQ=="; }; }; - "lightningcss-freebsd-x64-1.21.8" = { + "lightningcss-freebsd-x64-1.22.0" = { name = "lightningcss-freebsd-x64"; packageName = "lightningcss-freebsd-x64"; - version = "1.21.8"; + version = "1.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.21.8.tgz"; - sha512 = "CV6A/vTG2Ryd3YpChEgfWWv4TXCAETo9TcHSNx0IP0dnKcnDEiAko4PIKhCqZL11IGdN1ZLBCVPw+vw5ZYwzfA=="; + url = "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.22.0.tgz"; + sha512 = "xaYL3xperGwD85rQioDb52ozF3NAJb+9wrge3jD9lxGffplu0Mn35rXMptB8Uc2N9Mw1i3Bvl7+z1evlqVl7ww=="; }; }; - "lightningcss-linux-arm-gnueabihf-1.21.8" = { + "lightningcss-linux-arm-gnueabihf-1.22.0" = { name = "lightningcss-linux-arm-gnueabihf"; packageName = "lightningcss-linux-arm-gnueabihf"; - version = "1.21.8"; + version = "1.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.21.8.tgz"; - sha512 = "9PMbqh8n/Xq0F4/j2NR/hHM2HRDiFXFSF0iOvV67pNWKJkHIO6mR8jBw/88Aro5Ye/ILsX5OuWsxIVJDFv0NXA=="; + url = "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.22.0.tgz"; + sha512 = "epQGvXIjOuxrZpMpMnRjK54ZqzhiHhCPLtHvw2fb6NeK2kK9YtF0wqmeTBiQ1AkbWfnnXGTstYaFNiadNK+StQ=="; }; }; - "lightningcss-linux-arm64-gnu-1.21.8" = { + "lightningcss-linux-arm64-gnu-1.22.0" = { name = "lightningcss-linux-arm64-gnu"; packageName = "lightningcss-linux-arm64-gnu"; - version = "1.21.8"; + version = "1.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.21.8.tgz"; - sha512 = "JTM/TuMMllkzaXV7/eDjG4IJKLlCl+RfYZwtsVmC82gc0QX0O37csGAcY2OGleiuA4DnEo/Qea5WoFfZUNC6zg=="; + url = "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.22.0.tgz"; + sha512 = "AArGtKSY4DGTA8xP8SDyNyKtpsUl1Rzq6FW4JomeyUQ4nBrR71uPChksTpj3gmWuGhZeRKLeCUI1DBid/zhChg=="; }; }; - "lightningcss-linux-arm64-musl-1.21.8" = { + "lightningcss-linux-arm64-musl-1.22.0" = { name = "lightningcss-linux-arm64-musl"; packageName = "lightningcss-linux-arm64-musl"; - version = "1.21.8"; + version = "1.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.21.8.tgz"; - sha512 = "01gWShXrgoIb8urzShpn1RWtZuaSyKSzF2hfO+flzlTPoACqcO3rgcu/3af4Cw54e8vKzL5hPRo4kROmgaOMLg=="; + url = "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.22.0.tgz"; + sha512 = "RRraNgP8hnBPhInTTUdlFm+z16C/ghbxBG51Sw00hd7HUyKmEUKRozyc5od+/N6pOrX/bIh5vIbtMXIxsos0lg=="; }; }; - "lightningcss-linux-x64-gnu-1.21.8" = { + "lightningcss-linux-x64-gnu-1.22.0" = { name = "lightningcss-linux-x64-gnu"; packageName = "lightningcss-linux-x64-gnu"; - version = "1.21.8"; + version = "1.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.21.8.tgz"; - sha512 = "yVB5vYJjJb/Aku0V9QaGYIntvK/1TJOlNB9GmkNpXX5bSSP2pYW4lWW97jxFMHO908M0zjEt1qyOLMyqojHL+Q=="; + url = "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.22.0.tgz"; + sha512 = "grdrhYGRi2KrR+bsXJVI0myRADqyA7ekprGxiuK5QRNkv7kj3Yq1fERDNyzZvjisHwKUi29sYMClscbtl+/Zpw=="; }; }; - "lightningcss-linux-x64-musl-1.21.8" = { + "lightningcss-linux-x64-musl-1.22.0" = { name = "lightningcss-linux-x64-musl"; packageName = "lightningcss-linux-x64-musl"; - version = "1.21.8"; + version = "1.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.21.8.tgz"; - sha512 = "TYi+KNtBVK0+FZvxTX/d5XJb+tw3Jq+2Rr9hW359wp1afsi1Vkg+uVGgbn+m2dipa5XwpCseQq81ylMlXuyfPw=="; + url = "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.22.0.tgz"; + sha512 = "t5f90X+iQUtIyR56oXIHMBUyQFX/zwmPt72E6Dane3P8KNGlkijTg2I75XVQS860gNoEFzV7Mm5ArRRA7u5CAQ=="; }; }; - "lightningcss-win32-x64-msvc-1.21.8" = { + "lightningcss-win32-x64-msvc-1.22.0" = { name = "lightningcss-win32-x64-msvc"; packageName = "lightningcss-win32-x64-msvc"; - version = "1.21.8"; + version = "1.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.21.8.tgz"; - sha512 = "mww+kqbPx0/C44l2LEloECtRUuOFDjq9ftp+EHTPiCp2t+avy0sh8MaFwGsrKkj2XfZhaRhi4CPVKBoqF1Qlwg=="; + url = "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.22.0.tgz"; + sha512 = "64HTDtOOZE9PUCZJiZZQpyqXBbdby1lnztBccnqh+NtbKxjnGzP92R2ngcgeuqMPecMNqNWxgoWgTGpC+yN5Sw=="; }; }; "lilconfig-2.1.0" = { @@ -37717,15 +36997,6 @@ let sha512 = "n1PZMXgaaDWZDSvuNZ/8XOcYO2hOKDqZel5adtR30VKQAtoWs/5AOeFA0vPV8moiPzlqe7F4cP2tzpFewQyelQ=="; }; }; - "lodash.escape-4.0.1" = { - name = "lodash.escape"; - packageName = "lodash.escape"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.escape/-/lodash.escape-4.0.1.tgz"; - sha512 = "nXEOnb/jK9g0DYMr1/Xvq6l5xMD7GDG55+GSYIYmS0G4tBk/hURD4JR9WCavs04t33WmJx9kCyp9vJ+mr4BOUw=="; - }; - }; "lodash.escaperegexp-4.1.2" = { name = "lodash.escaperegexp"; packageName = "lodash.escaperegexp"; @@ -37744,15 +37015,6 @@ let sha512 = "pXYUy7PR8BCLwX5mgJ/aNtyOvuJTdZAo9EQFUvMIYugqmJxnrYaANvTbgndOzHSCSR0wnlBBfRXJL5SbWxo3FQ=="; }; }; - "lodash.flatmap-4.5.0" = { - name = "lodash.flatmap"; - packageName = "lodash.flatmap"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.flatmap/-/lodash.flatmap-4.5.0.tgz"; - sha512 = "/OcpcAGWlrZyoHGeHh3cAoa6nGdX6QYtmzNP84Jqol6UEQQ2gIaU3H+0eICcjcKGl0/XF8LWOujNn9lffsnaOg=="; - }; - }; "lodash.flatten-4.4.0" = { name = "lodash.flatten"; packageName = "lodash.flatten"; @@ -37825,15 +37087,6 @@ let sha512 = "N+L0cCfnqMv6mxXtSPeKt+IavbOBBSiAEkKyLasZ8BVcP9YXQgxLO12oPR8OyURwKV8l5vJKiE1M8aS70heuMg=="; }; }; - "lodash.invokemap-4.6.0" = { - name = "lodash.invokemap"; - packageName = "lodash.invokemap"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.invokemap/-/lodash.invokemap-4.6.0.tgz"; - sha512 = "CfkycNtMqgUlfjfdh2BhKO/ZXrP8ePOX5lEU/g0R3ItJcnuxWDwokMGKx1hWcfOikmyOVx6X9IwWnDGlgKl61w=="; - }; - }; "lodash.isarguments-3.1.0" = { name = "lodash.isarguments"; packageName = "lodash.isarguments"; @@ -38077,15 +37330,6 @@ let sha512 = "hXt6Ul/5yWjfklSGvLQl8vM//l3FtyHZeuelpzK6mm99pNvN9yTDruNZPEJZD1oWrqo+izBmB7oUfWgcCX7s4Q=="; }; }; - "lodash.pullall-4.2.0" = { - name = "lodash.pullall"; - packageName = "lodash.pullall"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.pullall/-/lodash.pullall-4.2.0.tgz"; - sha512 = "VhqxBKH0ZxPpLhiu68YD1KnHmbhQJQctcipvmFnqIBDYzcIHzf3Zpu0tpeOKtR4x76p9yohc506eGdOjTmyIBg=="; - }; - }; "lodash.reduce-4.6.0" = { name = "lodash.reduce"; packageName = "lodash.reduce"; @@ -38356,15 +37600,6 @@ let sha512 = "VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg=="; }; }; - "log-symbols-3.0.0" = { - name = "log-symbols"; - packageName = "log-symbols"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz"; - sha512 = "dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ=="; - }; - }; "log-symbols-4.1.0" = { name = "log-symbols"; packageName = "log-symbols"; @@ -38807,13 +38042,13 @@ let sha512 = "mbVKXPmS0z0G4XqFDCTllmDQ6coZzn94aMlb0o/A4HEHJCKcanlDZwYJgwnkmgD3jyWhUgj9VsPrfd972yPffA=="; }; }; - "magic-string-0.30.3" = { + "magic-string-0.30.4" = { name = "magic-string"; packageName = "magic-string"; - version = "0.30.3"; + version = "0.30.4"; src = fetchurl { - url = "https://registry.npmjs.org/magic-string/-/magic-string-0.30.3.tgz"; - sha512 = "B7xGbll2fG/VjP+SWg4sX3JynwIU0mjoTc6MPpKNuIvftk6u6vqhDnk1R80b8C2GBR6ywqy+1DcKBrevBg+bmw=="; + url = "https://registry.npmjs.org/magic-string/-/magic-string-0.30.4.tgz"; + sha512 = "Q/TKtsC5BPm0kGqgBIF9oXAs/xEf2vRKiIB4wCRQTJOQIByZ1d+NnUOotvJOvNpi5RNIgVOMC3pOuaP1ZTDlVg=="; }; }; "magicli-0.0.5" = { @@ -38915,15 +38150,6 @@ let sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="; }; }; - "make-fetch-happen-10.2.1" = { - name = "make-fetch-happen"; - packageName = "make-fetch-happen"; - version = "10.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz"; - sha512 = "NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w=="; - }; - }; "make-fetch-happen-11.1.1" = { name = "make-fetch-happen"; packageName = "make-fetch-happen"; @@ -39806,24 +39032,6 @@ let sha512 = "qFCFUDs7U3b8mBDPyz5EToEKoAkgCzqquIgi9nkkR9bixxOVOre+09lbuH7+9Kn2NFpm56M3GUWVbU2hQgdACA=="; }; }; - "mem-fs-2.3.0" = { - name = "mem-fs"; - packageName = "mem-fs"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mem-fs/-/mem-fs-2.3.0.tgz"; - sha512 = "GftCCBs6EN8sz3BoWO1bCj8t7YBtT713d8bUgbhg9Iel5kFSqnSvCK06TYIDJAtJ51cSiWkM/YemlT0dfoFycw=="; - }; - }; - "mem-fs-editor-9.7.0" = { - name = "mem-fs-editor"; - packageName = "mem-fs-editor"; - version = "9.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mem-fs-editor/-/mem-fs-editor-9.7.0.tgz"; - sha512 = "ReB3YD24GNykmu4WeUL/FDIQtkoyGB6zfJv60yfCo3QjKeimNcTqv2FT83bP0ccs6uu+sm5zyoBlspAzigmsdg=="; - }; - }; "memfs-3.6.0" = { name = "memfs"; packageName = "memfs"; @@ -40067,6 +39275,15 @@ let sha512 = "AoD7v132iYDV4K78yN2OLgTPwtAKn0XlD2pOhzyBxiI8PeXzozhbKyPV7zUOJUPETj+pcEVfuYj5ZN/8+bhbCw=="; }; }; + "micro-9.3.5-canary.3" = { + name = "micro"; + packageName = "micro"; + version = "9.3.5-canary.3"; + src = fetchurl { + url = "https://registry.npmjs.org/micro/-/micro-9.3.5-canary.3.tgz"; + sha512 = "viYIo9PefV+w9dvoIBh1gI44Mvx1BOk67B4BpC2QK77qdY0xZF0Q+vWLt/BII6cLkIc8rLmSIcJaB/OrXXKe1g=="; + }; + }; "micro-ftch-0.3.1" = { name = "micro-ftch"; packageName = "micro-ftch"; @@ -40787,13 +40004,13 @@ let sha512 = "r9deDe9p5FJUPZAk3A59wGH7Ii9YrjjWw0jmw/liSbHl2CHiyXj6FcDXDu2K3TjVAXqiJdaw3xxwlZZr9E6nHg=="; }; }; - "miniflare-3.20230904.0" = { + "miniflare-3.20230922.0" = { name = "miniflare"; packageName = "miniflare"; - version = "3.20230904.0"; + version = "3.20230922.0"; src = fetchurl { - url = "https://registry.npmjs.org/miniflare/-/miniflare-3.20230904.0.tgz"; - sha512 = "+OWQqEk8hV7vZaPCoj5dk1lZr4YUy56OiyNZ45/3ITYf+ZxgQOBPWhQhpw1jCahkRKGPa9Aykz01sc+GhPZYDA=="; + url = "https://registry.npmjs.org/miniflare/-/miniflare-3.20230922.0.tgz"; + sha512 = "1h8c7b0Ouoml7TmU2mtJo4k/DKMX4ift1vOxyfcktPY/0lqeiRNYulcOCPcF94maI4uATdBIO6Fx/zN2c2Ew0A=="; }; }; "minilog-3.1.0" = { @@ -40895,15 +40112,6 @@ let sha512 = "lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g=="; }; }; - "minimatch-7.4.6" = { - name = "minimatch"; - packageName = "minimatch"; - version = "7.4.6"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-7.4.6.tgz"; - sha512 = "sBz8G/YjVniEz6lKPNpKxXwazJe4c19fEfV2GDMX6AjFz+MX9uDWIZW8XreVhkFW3fkIdTv/gxWr/Kks5FFAVw=="; - }; - }; "minimatch-8.0.4" = { name = "minimatch"; packageName = "minimatch"; @@ -41012,13 +40220,13 @@ let sha512 = "3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ=="; }; }; - "minipass-7.0.3" = { + "minipass-7.0.4" = { name = "minipass"; packageName = "minipass"; - version = "7.0.3"; + version = "7.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-7.0.3.tgz"; - sha512 = "LhbbwCfz3vsb12j/WkWQPZfKTsgqIe1Nf/ti1pKjYESGLHIVjWU96G9/ljLH4F9mWNVhlQOm0VySdAWzf05dpg=="; + url = "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz"; + sha512 = "jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ=="; }; }; "minipass-collect-1.0.2" = { @@ -41039,15 +40247,6 @@ let sha512 = "CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw=="; }; }; - "minipass-fetch-2.1.2" = { - name = "minipass-fetch"; - packageName = "minipass-fetch"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.1.2.tgz"; - sha512 = "LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA=="; - }; - }; "minipass-fetch-3.0.4" = { name = "minipass-fetch"; packageName = "minipass-fetch"; @@ -41129,15 +40328,6 @@ let sha512 = "r6lj77KlwqLhIUku9UWYes7KJtsczvolZkzp8hbaDPPaE24OmWl5s539Mytlj22siEQKosZ26qCBgda2PKwoJw=="; }; }; - "mitt-3.0.0" = { - name = "mitt"; - packageName = "mitt"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mitt/-/mitt-3.0.0.tgz"; - sha512 = "7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ=="; - }; - }; "mixin-deep-1.3.2" = { name = "mixin-deep"; packageName = "mixin-deep"; @@ -41192,15 +40382,6 @@ let sha512 = "gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="; }; }; - "mkdirp-infer-owner-2.0.0" = { - name = "mkdirp-infer-owner"; - packageName = "mkdirp-infer-owner"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp-infer-owner/-/mkdirp-infer-owner-2.0.0.tgz"; - sha512 = "sdqtiFt3lkOaYvTXSRIUjkIdPTcxgv5+fgqYE/5qgwdw12cOrAuzzgzvVExIkH/ul1oeHN3bCLOWSG3XOqbKKw=="; - }; - }; "mock-require-3.0.3" = { name = "mock-require"; packageName = "mock-require"; @@ -41949,15 +41130,6 @@ let sha512 = "dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg=="; }; }; - "netrc-0.1.4" = { - name = "netrc"; - packageName = "netrc"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/netrc/-/netrc-0.1.4.tgz"; - sha512 = "ye8AIYWQcP9MvoM1i0Z2jV0qed31Z8EWXYnyGNkiUAd+Fo8J+7uy90xTV8g/oAbhtjkY7iZbNTizQaXdKUuwpQ=="; - }; - }; "netrc-parser-3.1.6" = { name = "netrc-parser"; packageName = "netrc-parser"; @@ -42021,15 +41193,6 @@ let sha512 = "P6qw6kenNXP+J9XlKJNi/MNHUQ+Lx5K8FEcSfX7/w8KJdZan5+BB5MKzuNgL2RTjHG1Svg8SehfseVEp8zAqwA=="; }; }; - "ngrok-5.0.0-beta.2" = { - name = "ngrok"; - packageName = "ngrok"; - version = "5.0.0-beta.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ngrok/-/ngrok-5.0.0-beta.2.tgz"; - sha512 = "UzsyGiJ4yTTQLCQD11k1DQaMwq2/SsztBg2b34zAqcyjS25qjDpogMKPaCKHwe/APRTHeel3iDXcVctk5CNaCQ=="; - }; - }; "nice-try-1.0.5" = { name = "nice-try"; packageName = "nice-try"; @@ -42156,15 +41319,6 @@ let sha512 = "3yZ1vfGKOcv0dyyhUeqA0Qa6RsQ4SfUnL6o2IWR4sVg8kdnJo48XTWbMLdtnfiZTbCUdsMttNwyJcihEdGCZBw=="; }; }; - "nock-13.3.3" = { - name = "nock"; - packageName = "nock"; - version = "13.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/nock/-/nock-13.3.3.tgz"; - sha512 = "z+KUlILy9SK/RjpeXDiDUEAq4T94ADPHE3qaRkf66mpEhzc/ytOMm3Bwdrbq6k1tMWkbdujiKim3G2tfQARuJw=="; - }; - }; "node-abi-3.47.0" = { name = "node-abi"; packageName = "node-abi"; @@ -42264,15 +41418,6 @@ let sha512 = "Jx5lPaaLdIaOsj2mVLWMWulXF6GQVdyLvNSxmiYCvZ8Ma2hfKX0POoR2kgKOqz+oFsRreq0yYZjQ2wjE9VNzCA=="; }; }; - "node-cache-5.1.2" = { - name = "node-cache"; - packageName = "node-cache"; - version = "5.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/node-cache/-/node-cache-5.1.2.tgz"; - sha512 = "t1QzWwnk4sjLWaQAS8CHgOJ+RAfmHpxFWmc36IWTiWHQfs0w5JDMBS1b1ZxQteo0vVVuWJvIUKHDkkeK7vIGCg=="; - }; - }; "node-color-readline-1.0.1" = { name = "node-color-readline"; packageName = "node-color-readline"; @@ -42480,6 +41625,15 @@ let sha512 = "dMXsYP6gc9rRbejLXmTbVRYjAHw7ppswsKyMxuxJxxOHzluIO1rGp9TOQgjFJ+2MCqcOcQTOPB/8Xwhr+7s4Eg=="; }; }; + "node-gyp-build-4.6.0" = { + name = "node-gyp-build"; + packageName = "node-gyp-build"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.0.tgz"; + sha512 = "NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ=="; + }; + }; "node-gyp-build-4.6.1" = { name = "node-gyp-build"; packageName = "node-gyp-build"; @@ -42534,15 +41688,6 @@ let sha512 = "O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw=="; }; }; - "node-localstorage-1.3.1" = { - name = "node-localstorage"; - packageName = "node-localstorage"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/node-localstorage/-/node-localstorage-1.3.1.tgz"; - sha512 = "NMWCSWWc6JbHT5PyWlNT2i8r7PgGYXVntmKawY83k/M0UJScZ5jirb61TLnqKwd815DfBQu+lR3sRw08SPzIaQ=="; - }; - }; "node-machine-id-1.1.12" = { name = "node-machine-id"; packageName = "node-machine-id"; @@ -42687,15 +41832,6 @@ let sha512 = "TkCET/3rr9mUuRp+CpO7qfgT++aAxfDRaalQhwPFzI9BY/2rCDn6OfpZOVggi1AXfTPpfkTrg5f5WQx5G1uLxA=="; }; }; - "node-version-1.2.0" = { - name = "node-version"; - packageName = "node-version"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-version/-/node-version-1.2.0.tgz"; - sha512 = "ma6oU4Sk0qOoKEAymVoTvk8EdXEobdS7m/mAGhDJ8Rouugho48crHBORAmy5BoOcv8wraPM6xumapQp5hl4iIQ=="; - }; - }; "node-watch-0.6.4" = { name = "node-watch"; packageName = "node-watch"; @@ -42993,15 +42129,6 @@ let sha512 = "Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw=="; }; }; - "npm-install-checks-4.0.0" = { - name = "npm-install-checks"; - packageName = "npm-install-checks"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-4.0.0.tgz"; - sha512 = "09OmyDkNLYwqKPOnbI8exiOZU2GVVmQp7tgez2BPi5OZC8M82elDAps7sxC4l//uSUtotWqoEIDwjRvWH4qz8w=="; - }; - }; "npm-install-checks-6.2.0" = { name = "npm-install-checks"; packageName = "npm-install-checks"; @@ -43029,15 +42156,6 @@ let sha512 = "EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA=="; }; }; - "npm-normalize-package-bin-2.0.0" = { - name = "npm-normalize-package-bin"; - packageName = "npm-normalize-package-bin"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-2.0.0.tgz"; - sha512 = "awzfKUO7v0FscrSpRoogyNm0sajikhBWpU0QMrW09AMi9n1PoKU6WaIqUzuJSQnpciZZmJ/jMZ2Egfmb/9LiWQ=="; - }; - }; "npm-normalize-package-bin-3.0.1" = { name = "npm-normalize-package-bin"; packageName = "npm-normalize-package-bin"; @@ -43092,15 +42210,6 @@ let sha512 = "CsP95FhWQDwNqiYS+Q0mZ7FAEDytDZAkNxQqea6IaAFJTAY9Lhhqyl0irU/6PMc7BGfUmnsbHcqxJD7XuVM/rg=="; }; }; - "npm-package-arg-8.1.5" = { - name = "npm-package-arg"; - packageName = "npm-package-arg"; - version = "8.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.5.tgz"; - sha512 = "LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q=="; - }; - }; "npm-packlist-1.4.8" = { name = "npm-packlist"; packageName = "npm-packlist"; @@ -43128,15 +42237,6 @@ let sha512 = "Jt01acDvJRhJGthnUJVF/w6gumWOZxO7IkpY/lsX9//zqQgnF7OJaxgQXcerd4uQOLu7W5bkb4mChL9mdfm+Zg=="; }; }; - "npm-packlist-3.0.0" = { - name = "npm-packlist"; - packageName = "npm-packlist"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-3.0.0.tgz"; - sha512 = "L/cbzmutAwII5glUcf2DBRNY/d0TFd4e/FnaZigJV6JD85RHZXJFGwCndjMWiiViiWSsWt3tiOLpI3ByTnIdFQ=="; - }; - }; "npm-packlist-5.1.1" = { name = "npm-packlist"; packageName = "npm-packlist"; @@ -43155,15 +42255,6 @@ let sha512 = "d6RGEuRrNS5/N84iglPivjaJPxhDbZmlbTwTDX2IbcRHG5bZCdtysYMhwiPvcF4GisXHGn7xsxv+GQ7T/02M5Q=="; }; }; - "npm-pick-manifest-6.1.1" = { - name = "npm-pick-manifest"; - packageName = "npm-pick-manifest"; - version = "6.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-6.1.1.tgz"; - sha512 = "dBsdBtORT84S8V8UTad1WlUyKIY9iMsAmqxHbLdeEeBNMLQDlDWWra3wYUx9EBEIiG/YwAy0XyNHDd2goAsfuA=="; - }; - }; "npm-pick-manifest-8.0.1" = { name = "npm-pick-manifest"; packageName = "npm-pick-manifest"; @@ -43191,15 +42282,6 @@ let sha512 = "Qs6P6nnopig+Y8gbzpeN/dkt+n7IyVd8f45NTMotGk6Qo7GfBmzwYx6jRLoOOgKiMnaQfYxsuyQlD8Mc3guBhg=="; }; }; - "npm-registry-fetch-12.0.2" = { - name = "npm-registry-fetch"; - packageName = "npm-registry-fetch"; - version = "12.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-12.0.2.tgz"; - sha512 = "Df5QT3RaJnXYuOwtXBXS9BWs+tHH2olvkCLh6jcR/b/u3DvPMlp3J0TvvYwplPKxHMOwfg287PYih9QqaVFoKA=="; - }; - }; "npm-registry-fetch-14.0.5" = { name = "npm-registry-fetch"; packageName = "npm-registry-fetch"; @@ -43398,13 +42480,13 @@ let sha512 = "ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ=="; }; }; - "nx-16.8.1" = { + "nx-16.9.1" = { name = "nx"; packageName = "nx"; - version = "16.8.1"; + version = "16.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/nx/-/nx-16.8.1.tgz"; - sha512 = "K5KrwNdPz0eEe6SY5wrnhZcigjfIJkttPrIJRXNBQTE50NGcOfz1TjMXPdTWBxBCCua5PAealO3OrE8jpv+QnQ=="; + url = "https://registry.npmjs.org/nx/-/nx-16.9.1.tgz"; + sha512 = "h6jp0fXzEsBO3pwCNS2JbfzJZRgE2DnIo7Sj1/1oBo82o44jNqsPo3nMTj95qhcveJ0qBiKIh+Xw/fghXiRiSQ=="; }; }; "nyc-15.1.0" = { @@ -43749,15 +42831,6 @@ let sha512 = "PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg=="; }; }; - "omelette-0.4.17" = { - name = "omelette"; - packageName = "omelette"; - version = "0.4.17"; - src = fetchurl { - url = "https://registry.npmjs.org/omelette/-/omelette-0.4.17.tgz"; - sha512 = "UlU69G6Bhu0XFjw3tjFZ0qyiMUjAOR+rdzblA1nLQ8xiqFtxOVlkhM39BlgTpLFx9fxkm6rnxNNRsS5GxE/yww=="; - }; - }; "omggif-1.0.10" = { name = "omggif"; packageName = "omggif"; @@ -43884,13 +42957,13 @@ let sha512 = "jQ31cORBFE6td25deYeD80wxKBMj+zBmHTrVxnc6CKhx8gho6ipmWM5zj/oeoqioZ99yqBls9Z/9Nss7J26G2g=="; }; }; - "oo-ascii-tree-1.88.0" = { + "oo-ascii-tree-1.89.0" = { name = "oo-ascii-tree"; packageName = "oo-ascii-tree"; - version = "1.88.0"; + version = "1.89.0"; src = fetchurl { - url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.88.0.tgz"; - sha512 = "A7m3z7XlUD3DnXSYxWmAdKQTIY6+1JzWS0lhaqgPGhj6g7a/odCsV1ctaRnjJljCB3zQBrbp2QHdYTUsD9AXcQ=="; + url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.89.0.tgz"; + sha512 = "HRFmdGyLTO/xUo9XNHwa8ColVVP6IEeeRKcxbzRIbgRpPcIiDGo99ShecJdkaXOyR+q4Wi6hiX5b7yrsBI/gxA=="; }; }; "open-0.0.2" = { @@ -43983,13 +43056,13 @@ let sha512 = "ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A=="; }; }; - "openpgp-5.10.1" = { + "openpgp-5.10.2" = { name = "openpgp"; packageName = "openpgp"; - version = "5.10.1"; + version = "5.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/openpgp/-/openpgp-5.10.1.tgz"; - sha512 = "SR5Ft+ej51d0+p53ld5Ney0Yiz0y8Mh1YYLJrvpRMbTaNhvS1QcDX0Oq1rW9sjBnQXtgrpWw2Zve3rm7K5C/pw=="; + url = "https://registry.npmjs.org/openpgp/-/openpgp-5.10.2.tgz"; + sha512 = "nRqMp4o31rBagWB02tgfKCsocXWq4uYobZf9GDVlD5rQXBq/wRIZHiDhGX1dlDAI2inkZcPd2dSZOqmtGnsK1A=="; }; }; "opentracing-0.14.7" = { @@ -44118,15 +43191,6 @@ let sha512 = "eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg=="; }; }; - "ora-4.1.1" = { - name = "ora"; - packageName = "ora"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ora/-/ora-4.1.1.tgz"; - sha512 = "sjYP8QyVWBpBZWD6Vr1M/KwknSw6kJOz41tvGMlwWeClHBtYKTbHMki1PsLZnxKpXMPbTKv9b3pjQu3REib96A=="; - }; - }; "ora-5.1.0" = { name = "ora"; packageName = "ora"; @@ -44154,15 +43218,6 @@ let sha512 = "ERAyNnZOfqM+Ao3RAvIXkYh5joP220yf59gVe2X/cI6SiCxIdi4c9HZKZD8R6q/RDXEje1THBju6iExiSsgJaQ=="; }; }; - "ora-7.0.1" = { - name = "ora"; - packageName = "ora"; - version = "7.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ora/-/ora-7.0.1.tgz"; - sha512 = "0TUxTiFJWv+JnjWm4o9yvuskpEJLXTcng8MJuKd+SzAzp2o+OP3HWqNhB4OdJRt1Vsd9/mR0oyaEYlOnL7XIRw=="; - }; - }; "ordered-binary-1.4.1" = { name = "ordered-binary"; packageName = "ordered-binary"; @@ -44190,15 +43245,6 @@ let sha512 = "7bqkxkEJwzJQUAlyYniqEZ3Ilzjh0yoa62c7gL6Ijxj5bEpPL+8IE1Z0PFj0ywjjXQcdrwR51g9MIcLezR0hKQ=="; }; }; - "original-1.0.2" = { - name = "original"; - packageName = "original"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/original/-/original-1.0.2.tgz"; - sha512 = "hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg=="; - }; - }; "os-browserify-0.3.0" = { name = "os-browserify"; packageName = "os-browserify"; @@ -44226,6 +43272,15 @@ let sha512 = "PRT7ZORmwu2MEFt4/fv3Q+mEfN4zetKxufQrkShY2oGvUms9r8otu5HfdyIFHkYXjO7laNsoVGmM2MANfuTA8g=="; }; }; + "os-paths-4.4.0" = { + name = "os-paths"; + packageName = "os-paths"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/os-paths/-/os-paths-4.4.0.tgz"; + sha512 = "wrAwOeXp1RRMFfQY8Sy7VaGVmPocaLwSFOYCGKSyo8qmJ+/yaafCl5BCA1IQZWqFSRBrKDYFeR9d/VyQzfH/jg=="; + }; + }; "os-tmpdir-1.0.2" = { name = "os-tmpdir"; packageName = "os-tmpdir"; @@ -44577,6 +43632,15 @@ let sha512 = "RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ=="; }; }; + "p-queue-7.4.1" = { + name = "p-queue"; + packageName = "p-queue"; + version = "7.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/p-queue/-/p-queue-7.4.1.tgz"; + sha512 = "vRpMXmIkYF2/1hLBKisKeVYJZ8S2tZ0zEAmIJgdVKP2nq0nh4qCdf8bgw+ZgKrkh71AOCaqzwbJJk1WtdcF3VA=="; + }; + }; "p-reduce-2.1.0" = { name = "p-reduce"; packageName = "p-reduce"; @@ -44676,15 +43740,6 @@ let sha512 = "UbD77BuZ9Bc9aABo74gfXhNvzC9Tx7SxtHSh1fxvx3jTLLYvmVhiQZZrJzqqU0jKbN32kb5VOKiLEQI/3bIjgQ=="; }; }; - "p-transform-1.3.0" = { - name = "p-transform"; - packageName = "p-transform"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-transform/-/p-transform-1.3.0.tgz"; - sha512 = "UJKdSzgd3KOnXXAtqN5+/eeHcvTn1hBkesEmElVgvO/NAYcxAvmjzIGmnNd3Tb/gRAvMBdNRFD4qAWdHxY6QXg=="; - }; - }; "p-try-1.0.0" = { name = "p-try"; packageName = "p-try"; @@ -44712,15 +43767,6 @@ let sha512 = "RRTnDb2TBG/epPRI2yYXsimO0v3BXC8Yd3ogr1545IaqKK17VGhbWVeGGN+XfCm/08OK8635nH31c8bATkHuSw=="; }; }; - "pac-proxy-agent-5.0.0" = { - name = "pac-proxy-agent"; - packageName = "pac-proxy-agent"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-5.0.0.tgz"; - sha512 = "CcFG3ZtnxO8McDigozwE3AqAw15zDvGH+OjXO4kzf7IkEKkQ4gxQ+3sdF50WmhQ4P/bVusXcqNE2S3XrNURwzQ=="; - }; - }; "pac-proxy-agent-7.0.1" = { name = "pac-proxy-agent"; packageName = "pac-proxy-agent"; @@ -44730,15 +43776,6 @@ let sha512 = "ASV8yU4LLKBAjqIPMbrgtaKIvxQri/yh2OpI+S6hVa9JRkUI3Y3NPFbfngDtY7oFtSMD3w31Xns89mDa3Feo5A=="; }; }; - "pac-resolver-5.0.1" = { - name = "pac-resolver"; - packageName = "pac-resolver"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pac-resolver/-/pac-resolver-5.0.1.tgz"; - sha512 = "cy7u00ko2KVgBAjuhevqpPeHIkCIqPe1v24cydhWjmeuzaBfmUWFCZJ1iAh5TuVzVZoUzXIW7K8sMYOZ84uZ9Q=="; - }; - }; "pac-resolver-7.0.0" = { name = "pac-resolver"; packageName = "pac-resolver"; @@ -44829,15 +43866,6 @@ let sha512 = "DPBNWSUWC0wPofXeNThao0uP4a93J7r90UyhagmJS0QcacTTkorZwXYsOop70phn1hKdcf/2e9lJIhazS8bx5A=="; }; }; - "pacote-12.0.3" = { - name = "pacote"; - packageName = "pacote"; - version = "12.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-12.0.3.tgz"; - sha512 = "CdYEl03JDrRO3x18uHjBYA9TyoW8gy+ThVcypcDkxPtKlw76e4ejhYB6i9lJ+/cebbjpqPW/CijjqxwDTts8Ow=="; - }; - }; "pacote-15.2.0" = { name = "pacote"; packageName = "pacote"; @@ -44856,15 +43884,6 @@ let sha512 = "lxrgnOG5AXmzMRT1O5urWtYFxHnFSE+QntgTHij1nvS4W+ubhQLmQRHmZXDeEvk9I00itAixLqU9Q6fE0gW3sw=="; }; }; - "pad-component-0.0.1" = { - name = "pad-component"; - packageName = "pad-component"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pad-component/-/pad-component-0.0.1.tgz"; - sha512 = "8EKVBxCRSvLnsX1p2LlSFSH3c2/wuhY9/BXXWu8boL78FbVKqn2L5SpURt1x5iw6Gq8PTqJ7MdPoe5nCtX3I+g=="; - }; - }; "pako-0.2.9" = { name = "pako"; packageName = "pako"; @@ -44973,15 +43992,6 @@ let sha512 = "bjnliEOmGv3y1aMEfREMBJ9tfL3WR0i0CKPj61DnSLaoxWR3nLrsQrEbCId/8rF4NyRF0cCqisSVXyQYWM+mCQ=="; }; }; - "parse-conflict-json-2.0.2" = { - name = "parse-conflict-json"; - packageName = "parse-conflict-json"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-conflict-json/-/parse-conflict-json-2.0.2.tgz"; - sha512 = "jDbRGb00TAPFsKWCpZZOT93SxVP9nONOSgES3AevqRq/CHvavEBvKAjxX9p5Y5F0RZLxH9Ufd9+RwtCsa+lFDA=="; - }; - }; "parse-english-4.2.0" = { name = "parse-english"; packageName = "parse-english"; @@ -45540,15 +44550,6 @@ let sha512 = "ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q=="; }; }; - "path-equal-1.2.5" = { - name = "path-equal"; - packageName = "path-equal"; - version = "1.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/path-equal/-/path-equal-1.2.5.tgz"; - sha512 = "i73IctDr3F2W+bsOWDyyVm/lqsXO47aY9nsFZUjTT/aljSbkxHxxCoyZ9UUrM8jK0JVod+An+rl48RCsvWM+9g=="; - }; - }; "path-exists-2.1.0" = { name = "path-exists"; packageName = "path-exists"; @@ -45639,6 +44640,15 @@ let sha512 = "n7oDG8B+k/p818uweWrOixY9/Dsr89o2TkCm6tOTex3fpdo2+BFDgR+KpB37mGKBRsBAlR8CIJMFN0OEy/7hIQ=="; }; }; + "path-match-1.2.4" = { + name = "path-match"; + packageName = "path-match"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/path-match/-/path-match-1.2.4.tgz"; + sha512 = "UWlehEdqu36jmh4h5CWJ7tARp1OEVKGHKm6+dg9qMq5RKUTV5WJrGgaZ3dN2m7WFAXDbjlHzvJvL/IUpy84Ktw=="; + }; + }; "path-parse-1.0.7" = { name = "path-parse"; packageName = "path-parse"; @@ -46062,15 +45072,6 @@ let sha512 = "J8B6xqiO37sU/gkcMglv6h5Jbd9xNER7aHzpfRdNmV4IbQBzBpe4l9XmbG+xPF/znacgu2jfEw+wHffaq/YkXA=="; }; }; - "pixiv-api-client-0.25.0" = { - name = "pixiv-api-client"; - packageName = "pixiv-api-client"; - version = "0.25.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pixiv-api-client/-/pixiv-api-client-0.25.0.tgz"; - sha512 = "IWo0HwnxUEH9OtQ3qEZsKUbpdStRSomS18Gx4UV5JT1fj/E/opYGZMgpcdzC1+3ouBJECV1evzt0778S2RJ+/Q=="; - }; - }; "pkg-5.8.1" = { name = "pkg"; packageName = "pkg"; @@ -46080,15 +45081,6 @@ let sha512 = "CjBWtFStCfIiT4Bde9QpJy0KeH19jCfwZRJqHFDFXfhUklCx8JoFmMj3wgnEYIwGmZVNkhsStPHEOnrtrQhEXA=="; }; }; - "pkg-conf-3.1.0" = { - name = "pkg-conf"; - packageName = "pkg-conf"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pkg-conf/-/pkg-conf-3.1.0.tgz"; - sha512 = "m0OTbR/5VPNPqO1ph6Fqbj7Hv6QU7gR/tQW40ZqrL1rjgCU85W6C1bJn0BItuJqnR98PWzw7Z8hHeChD1WrgdQ=="; - }; - }; "pkg-dir-3.0.0" = { name = "pkg-dir"; packageName = "pkg-dir"; @@ -46161,15 +45153,6 @@ let sha512 = "yO5feByMzAp96LtP58wvPKSbaKAi/1C4kV9XpTctr6EepnP6F33RBNOiVrdz9BrPA98U2BMFsTNHo44TWcbQ2A=="; }; }; - "pkginfo-0.4.1" = { - name = "pkginfo"; - packageName = "pkginfo"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.4.1.tgz"; - sha512 = "8xCNE/aT/EXKenuMDZ+xTVwkT8gsoHN2z/Q29l80u0ppGEXVvsKRzNMbtKhg8LS8k1tJLAHHylf6p4VFmP6XUQ=="; - }; - }; "please-upgrade-node-3.2.0" = { name = "please-upgrade-node"; packageName = "please-upgrade-node"; @@ -46377,13 +45360,13 @@ let sha512 = "yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="; }; }; - "postcss-8.4.29" = { + "postcss-8.4.31" = { name = "postcss"; packageName = "postcss"; - version = "8.4.29"; + version = "8.4.31"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.29.tgz"; - sha512 = "cbI+jaqIeu/VGqXEarWkRCCffhjgXc0qjBtXpqJhTBohMUjUQnbBr0xqX3vEKudc4iviTewcJo5ajcec5+wdJw=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz"; + sha512 = "PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ=="; }; }; "postcss-calc-8.2.4" = { @@ -47115,15 +46098,6 @@ let sha512 = "QCYG84SgGyGzqJ/vlMsxeXd/pgL/I94ixdNFyh1PusWmTCyVfPJjZ1K1jvHtsbfnXQs2TSkEP2fR7QiMZAnKFQ=="; }; }; - "preferences-2.0.2" = { - name = "preferences"; - packageName = "preferences"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/preferences/-/preferences-2.0.2.tgz"; - sha512 = "Pc5qb/4ATHtikU4pky8MthNowe/yuhu5Wr7pPEC7pJyFZ2V7Nfh/9M0jNnZ64kiDK0nv1wDZ0TmY2ICMK0zjiw=="; - }; - }; "preferred-pm-3.1.2" = { name = "preferred-pm"; packageName = "preferred-pm"; @@ -47376,15 +46350,6 @@ let sha512 = "HubhG4Rb2UH8YtV4ba0Vp5bQ7L78RTONYu/ujmCu5nBI8wGv24s4E9xSKBi0N1MowRpxk76pFCpJtW0KPzOK0w=="; }; }; - "proc-log-1.0.0" = { - name = "proc-log"; - packageName = "proc-log"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/proc-log/-/proc-log-1.0.0.tgz"; - sha512 = "aCk8AO51s+4JyuYGg3Q/a6gnrlDO09NpVWePtjp7xwphcoQ04x5WAfCyugcsbLooWcMJ87CLkD4+604IckEdhg=="; - }; - }; "proc-log-3.0.0" = { name = "proc-log"; packageName = "proc-log"; @@ -47511,24 +46476,6 @@ let sha512 = "rZPNPKTOYVNEEKFaq1HqTgOwZD+4/YHS5ukLzQCypkj+OkYx7iv0mA91lJlpPPZ8vMau3IIGj5Qlwrx+8iiSmg=="; }; }; - "promise-all-reject-late-1.0.1" = { - name = "promise-all-reject-late"; - packageName = "promise-all-reject-late"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/promise-all-reject-late/-/promise-all-reject-late-1.0.1.tgz"; - sha512 = "vuf0Lf0lOxyQREH7GDIOUMLS7kz+gs8i6B+Yi8dC68a2sychGrHTJYghMBD6k7eUcH0H5P73EckCA48xijWqXw=="; - }; - }; - "promise-call-limit-1.0.2" = { - name = "promise-call-limit"; - packageName = "promise-call-limit"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/promise-call-limit/-/promise-call-limit-1.0.2.tgz"; - sha512 = "1vTUnfI2hzui8AEIixbdAJlFY4LFDXqQswy/2eOlThAscXCY4It8FdVuI0fMJGAB2aWGbdQf/gv0skKYXmdrHA=="; - }; - }; "promise-inflight-1.0.1" = { name = "promise-inflight"; packageName = "promise-inflight"; @@ -47547,15 +46494,6 @@ let sha512 = "7nJ6v5lnJsXwGprnGXga4wx6d1POjvi5Qmf1ivTRxTjH4Z/9Czja/UCMLVmB9N93GeWOU93XaFaEt6jbuoagNw=="; }; }; - "promise-polyfill-6.1.0" = { - name = "promise-polyfill"; - packageName = "promise-polyfill"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-6.1.0.tgz"; - sha512 = "g0LWaH0gFsxovsU7R5LrrhHhWAWiHRnh1GPrhXnPgYsDkIqjRYUYSZEsej/wtleDrz5xVSIDbeKfidztp2XHFQ=="; - }; - }; "promise-queue-2.2.5" = { name = "promise-queue"; packageName = "promise-queue"; @@ -47592,6 +46530,15 @@ let sha512 = "hftln6irUZlMiaQIvet59HEDUKFJ8pGHMyyMk9DuA5DTezIa8z9pDLBhjt78AKs/JMdZEJ7JATzT/G8mizbORQ=="; }; }; + "promisepipe-3.0.0" = { + name = "promisepipe"; + packageName = "promisepipe"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/promisepipe/-/promisepipe-3.0.0.tgz"; + sha512 = "V6TbZDJ/ZswevgkDNpGt/YqNCiZP9ASfgU+p83uJE6NrGtvSGoOcHLiDCqkMs2+yg7F5qHdLV8d0aS8O26G/KA=="; + }; + }; "promisify-child-process-4.1.1" = { name = "promisify-child-process"; packageName = "promisify-child-process"; @@ -47646,15 +46593,6 @@ let sha512 = "oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg=="; }; }; - "propagate-2.0.1" = { - name = "propagate"; - packageName = "propagate"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/propagate/-/propagate-2.0.1.tgz"; - sha512 = "vGrhOavPSTz4QVNuBNdcNXePNdNMaO1xj9yBeH1ScQPjk/rhg9sSlCXPhMkFuaNNW/syTvYqsnbIJxMBfRbbag=="; - }; - }; "proper-lockfile-4.1.2" = { name = "proper-lockfile"; packageName = "proper-lockfile"; @@ -47727,15 +46665,6 @@ let sha512 = "llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg=="; }; }; - "proxy-agent-5.0.0" = { - name = "proxy-agent"; - packageName = "proxy-agent"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/proxy-agent/-/proxy-agent-5.0.0.tgz"; - sha512 = "gkH7BkvLVkSfX9Dk27W6TyNOWWZWRilRfk1XxGNWOYJ2TuedAv1yFpCaU9QSBmBe716XOTNpYNOzhysyw8xn7g=="; - }; - }; "proxy-agent-6.3.1" = { name = "proxy-agent"; packageName = "proxy-agent"; @@ -48042,24 +46971,6 @@ let sha512 = "U1uufzBjz3+PkpCxFrWzh4OrMIdIb2ztzCu0YEPfRHjHswcSwHZswnK+WdsOQJsRV8WeTg3jLhJR4D867+fjsA=="; }; }; - "puppeteer-19.11.1" = { - name = "puppeteer"; - packageName = "puppeteer"; - version = "19.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/puppeteer/-/puppeteer-19.11.1.tgz"; - sha512 = "39olGaX2djYUdhaQQHDZ0T0GwEp+5f9UB9HmEP0qHfdQHIq0xGQZuAZ5TLnJIc/88SrPLpEflPC+xUqOTv3c5g=="; - }; - }; - "puppeteer-core-19.11.1" = { - name = "puppeteer-core"; - packageName = "puppeteer-core"; - version = "19.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-19.11.1.tgz"; - sha512 = "qcuC2Uf0Fwdj9wNtaTZ2OvYRraXpAK+puwwVW8ofOhOgLPZyz1c68tsorfIZyCUOpyBisjr+xByu7BMbEYMepA=="; - }; - }; "purgecss-5.0.0" = { name = "purgecss"; packageName = "purgecss"; @@ -48087,13 +46998,13 @@ let sha512 = "pMpnA0qRdFp32b1sJl1wOJNxZLQ2cbQx+k6tjNtZ8CpvVhNqEPRgivZ2WOUev2YMajecdH7ctUPDvEe87nariQ=="; }; }; - "pyright-1.1.327" = { + "pyright-1.1.329" = { name = "pyright"; packageName = "pyright"; - version = "1.1.327"; + version = "1.1.329"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.327.tgz"; - sha512 = "2OgKe3//ortVz7thxoiaVSjACVtUn+hOIanrlLZCEkagdKMheLcftu6GmoLjgibV/E2SvZZ//izidxTB5vN8dQ=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.329.tgz"; + sha512 = "5AT98Mi0OYcDiQ5lD1nPJ3cq8gX/HHaXrQ5WjJ/QZkaJtGqnEdrUp5Gq5wBPipWgOnv/l5e50YScaaNDMjoy9Q=="; }; }; "q-1.5.1" = { @@ -48258,15 +47169,6 @@ let sha512 = "wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg=="; }; }; - "querystring-browser-1.0.4" = { - name = "querystring-browser"; - packageName = "querystring-browser"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/querystring-browser/-/querystring-browser-1.0.4.tgz"; - sha512 = "oqPm3iZO4r4lEFM2YAJyMwCqAMIL0r3jO36ZohmHLUs9NpAfEGee7G5+PllGec/TkAnfI85FMmkPaW8UbZI0Uw=="; - }; - }; "querystring-es3-0.2.1" = { name = "querystring-es3"; packageName = "querystring-es3"; @@ -48528,6 +47430,15 @@ let sha512 = "4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q=="; }; }; + "raw-body-2.4.1" = { + name = "raw-body"; + packageName = "raw-body"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.1.tgz"; + sha512 = "9WmIKF6mkvA0SLmA2Knm9+qj89e+j1zqgyn8aXGd7+nAduPoqgI9lO57SAZNn/Byzo5P7JhXTyg9PzaJbH73bA=="; + }; + }; "raw-body-2.4.3" = { name = "raw-body"; packageName = "raw-body"; @@ -48645,6 +47556,15 @@ let sha512 = "E3C3X1skWBdBzwpOUbmXG8SgH6BtsluSMe+s6rRcujNKG1DGi8uIfhdhszkgDpAsMoE55hwqRUzeXCmETDBpTg=="; }; }; + "react-dom-18.2.0" = { + name = "react-dom"; + packageName = "react-dom"; + version = "18.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz"; + sha512 = "6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g=="; + }; + }; "react-error-overlay-6.0.9" = { name = "react-error-overlay"; packageName = "react-error-overlay"; @@ -48708,6 +47628,15 @@ let sha512 = "wa0fGj7Zht1EYMRhKWwoo1H9GApxYLBuhoAuXN0TlltESAjDssB+Apf0T/DngVqaMyPypDmabL37vw/2aRM98Q=="; }; }; + "react-refresh-0.14.0" = { + name = "react-refresh"; + packageName = "react-refresh"; + version = "0.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.0.tgz"; + sha512 = "wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ=="; + }; + }; "react-refresh-0.4.3" = { name = "react-refresh"; packageName = "react-refresh"; @@ -48726,6 +47655,24 @@ let sha512 = "Gvzk7OZpiqKSkxsQvO/mbTN1poglhmAV7gR/DdIrRrSMXraRQQlfikRJOr3Nb9GTMPC5kof948Zy6jJZIFtDvQ=="; }; }; + "react-router-6.15.0" = { + name = "react-router"; + packageName = "react-router"; + version = "6.15.0"; + src = fetchurl { + url = "https://registry.npmjs.org/react-router/-/react-router-6.15.0.tgz"; + sha512 = "NIytlzvzLwJkCQj2HLefmeakxxWHWAP+02EGqWEZy+DgfHHKQMUoBBjUQLOtFInBMhWtb3hiUy6MfFgwLjXhqg=="; + }; + }; + "react-router-dom-6.15.0" = { + name = "react-router-dom"; + packageName = "react-router-dom"; + version = "6.15.0"; + src = fetchurl { + url = "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.15.0.tgz"; + sha512 = "aR42t0fs7brintwBGAv2+mGlCtgtFQeOzK0BM1/OiqEzRejOZtpMZepvgkscpMUnKb8YO84G7s3LsHnnDNonbQ=="; + }; + }; "read-1.0.7" = { name = "read"; packageName = "read"; @@ -48780,15 +47727,6 @@ let sha512 = "CEjy9LCzhmD7nUpJ1oVOE6s/hBkejlcJEgLQHVnQznOSilOPb+kpKktlLfFDK3/WP43+F80xkUTM2VOkYoSYvQ=="; }; }; - "read-cmd-shim-3.0.1" = { - name = "read-cmd-shim"; - packageName = "read-cmd-shim"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-3.0.1.tgz"; - sha512 = "kEmDUoYf/CDy8yZbLTmhB1X9kkjf9Q80PCNsDMb7ufrGd6zZSQA1+UyjrO+pZm5K/S4OXCWJeiIt1JA8kAsa6g=="; - }; - }; "read-cmd-shim-4.0.0" = { name = "read-cmd-shim"; packageName = "read-cmd-shim"; @@ -48852,15 +47790,6 @@ let sha512 = "AEtWXYfopBj2z5N5PbkAOeNHRPUg5q+Nen7QLxV8M2zJq1ym6/lCz3fYNTCXe19puu2d06jfHhrP7v/S2PtMMw=="; }; }; - "read-package-json-fast-2.0.3" = { - name = "read-package-json-fast"; - packageName = "read-package-json-fast"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz"; - sha512 = "W/BKtbL+dUjTuRL2vziuYhp76s5HZ9qQhd/dKfWIZveD0O40453QNyZhC0e63lqZrAQ4jiOapVoeJ7JrszenQQ=="; - }; - }; "read-package-json-fast-3.0.2" = { name = "read-package-json-fast"; packageName = "read-package-json-fast"; @@ -49068,15 +47997,6 @@ let sha512 = "9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA=="; }; }; - "readable-stream-4.4.2" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "4.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-4.4.2.tgz"; - sha512 = "Lk/fICSyIhodxy1IDK2HazkeGjSmezAWX2egdtJnYhtzKEsBPJowlI6F6LPb5tqIQILrMbx22S5o3GuJavPusA=="; - }; - }; "readable-web-to-node-stream-2.0.0" = { name = "readable-web-to-node-stream"; packageName = "readable-web-to-node-stream"; @@ -49122,6 +48042,15 @@ let sha512 = "1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ=="; }; }; + "readdirp-3.3.0" = { + name = "readdirp"; + packageName = "readdirp"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/readdirp/-/readdirp-3.3.0.tgz"; + sha512 = "zz0pAkSPOXXm1viEwygWIPSPkcBYjW1xU5j/JBh5t9bGCJwa6f9+BJa6VaB2g+b55yVrmXzqkyLf4xaWYM0IkQ=="; + }; + }; "readdirp-3.6.0" = { name = "readdirp"; packageName = "readdirp"; @@ -49140,15 +48069,6 @@ let sha512 = "k2d6ACCkiNYz222Fs/iNze30rRJ1iIicW7JuX/7/cozvih6YCkFZH+J6mAFDVgv0dRBaAyr4jDqC95R2y4IADg=="; }; }; - "readline-sync-1.4.10" = { - name = "readline-sync"; - packageName = "readline-sync"; - version = "1.4.10"; - src = fetchurl { - url = "https://registry.npmjs.org/readline-sync/-/readline-sync-1.4.10.tgz"; - sha512 = "gNva8/6UAe8QYepIQH/jQ2qn91Qj0B9sYjMBBs3QOB8F2CXcKgLxQaJRP76sWVRQt+QU+8fAkCbCvjjMFu7Ycw=="; - }; - }; "readline2-1.0.1" = { name = "readline2"; packageName = "readline2"; @@ -49158,15 +48078,6 @@ let sha512 = "8/td4MmwUB6PkZUbV25uKz7dfrmjYWxsW8DVfibWdlHRk/l/DfHKn4pU+dfcoGLFgWOdyGCzINRQD7jn+Bv+/g=="; }; }; - "recast-0.11.23" = { - name = "recast"; - packageName = "recast"; - version = "0.11.23"; - src = fetchurl { - url = "https://registry.npmjs.org/recast/-/recast-0.11.23.tgz"; - sha512 = "+nixG+3NugceyR8O1bLU45qs84JgI3+8EauyRZafLgC9XbdAOIVgwV1Pe2da0YzGo62KzWoZwUpVEQf6qNAXWA=="; - }; - }; "recast-0.17.2" = { name = "recast"; packageName = "recast"; @@ -49221,15 +48132,6 @@ let sha512 = "kyy3HWCez2WrotaL3O4fTn0rsIdfRKOdQQcEJ9KpvmKmbffKVvwsloX063EgRUlpJIXHiDQFhJcTbZequ2uTZw=="; }; }; - "recursive-readdir-2.2.3" = { - name = "recursive-readdir"; - packageName = "recursive-readdir"; - version = "2.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.3.tgz"; - sha512 = "8HrF5ZsXk5FAH9dgsx3BlUer73nIhuj+9OrQwEbLTPOBzGkL1lsFCR01am+v+0m2Cmbs1nP12hLDl5FA7EszKA=="; - }; - }; "redent-1.0.0" = { name = "redent"; packageName = "redent"; @@ -49392,6 +48294,15 @@ let sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A=="; }; }; + "regexp-tree-0.1.27" = { + name = "regexp-tree"; + packageName = "regexp-tree"; + version = "0.1.27"; + src = fetchurl { + url = "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.27.tgz"; + sha512 = "iETxpjK6YoRWJG5o6hXLwvjYAoW+FEZn9os0PD/b6AP6xQwsa/Y7lCVgIixBbUPMfhu+i2LtdeAqVTgGlQarfA=="; + }; + }; "regexp.prototype.flags-1.5.1" = { name = "regexp.prototype.flags"; packageName = "regexp.prototype.flags"; @@ -49419,15 +48330,6 @@ let sha512 = "RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ=="; }; }; - "register-protocol-win32-1.1.0" = { - name = "register-protocol-win32"; - packageName = "register-protocol-win32"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/register-protocol-win32/-/register-protocol-win32-1.1.0.tgz"; - sha512 = "Ca1loTkt5v1zZYBOCHDLiw21A/68iWbukmoCqauoczcXOBz14U8/tBeTa78ftdmrk7TgJIjLqbq5B8w3MettlQ=="; - }; - }; "registry-auth-token-3.3.2" = { name = "registry-auth-token"; packageName = "registry-auth-token"; @@ -49491,6 +48393,15 @@ let sha512 = "+crtS5QjFRqFCoQmvGduwYWEBng99ZvmFvF+cUJkGYF1L1BfU8C6Zp9T7f5vPAwyLkUExpvK+ANVZmGU49qi4Q=="; }; }; + "regjsparser-0.10.0" = { + name = "regjsparser"; + packageName = "regjsparser"; + version = "0.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.10.0.tgz"; + sha512 = "qx+xQGZVsy55CH0a1hiVwHmqjLryfh7wQyF5HO07XJ9f7dQMY/gPQHhlyDkIzJKC+x2fUCpCcUODUUUFrm7SHA=="; + }; + }; "regjsparser-0.9.1" = { name = "regjsparser"; packageName = "regjsparser"; @@ -50553,13 +49464,13 @@ let sha512 = "Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g=="; }; }; - "resolve-1.22.5" = { + "resolve-1.22.6" = { name = "resolve"; packageName = "resolve"; - version = "1.22.5"; + version = "1.22.6"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.22.5.tgz"; - sha512 = "qWhv7PF1V95QPvRoUGHxOtnAlEvlXBylMZcjUR9pAumMmveFtcHJRXGIr+TkjfNJVQypqv2qcDiiars2y1PsSg=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.22.6.tgz"; + sha512 = "njhxM7mV12JfufShqGy3Rz8j11RPdLy4xi15UurGJeoHLfJpVXKdh3ueuOqbYUcDZnffr6X739JBo5LzyahEsw=="; }; }; "resolve-1.7.1" = { @@ -51021,6 +49932,15 @@ let sha512 = "uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw=="; }; }; + "rollup-3.29.4" = { + name = "rollup"; + packageName = "rollup"; + version = "3.29.4"; + src = fetchurl { + url = "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz"; + sha512 = "oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw=="; + }; + }; "rollup-plugin-inject-3.0.2" = { name = "rollup-plugin-inject"; packageName = "rollup-plugin-inject"; @@ -51390,15 +50310,6 @@ let sha512 = "3lVqBir7WuKDHGrKRDn/1Ye3kwpXaDOMsiRP1wd6wpZW56gJhsbp5RqQpA6JG/P+pkXizygnr1dKR8vzWaVsfA=="; }; }; - "sanitize-filename-1.6.3" = { - name = "sanitize-filename"; - packageName = "sanitize-filename"; - version = "1.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/sanitize-filename/-/sanitize-filename-1.6.3.tgz"; - sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg=="; - }; - }; "sasl-anonymous-0.1.0" = { name = "sasl-anonymous"; packageName = "sasl-anonymous"; @@ -51435,13 +50346,13 @@ let sha512 = "pVlvK5ysevz8MzybRnDIa2YMxn0OJ7b9lDiWhMoaKPoJ7YkAg/7YtNjUgaYzElkwHxsw8dBMhaEn7UP6zxEwPg=="; }; }; - "sass-1.67.0" = { + "sass-1.68.0" = { name = "sass"; packageName = "sass"; - version = "1.67.0"; + version = "1.68.0"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.67.0.tgz"; - sha512 = "SVrO9ZeX/QQyEGtuZYCVxoeAL5vGlYjJ9p4i4HFuekWl8y/LtJ7tJc10Z+ck1c8xOuoBm2MYzcLfTAffD0pl/A=="; + url = "https://registry.npmjs.org/sass/-/sass-1.68.0.tgz"; + sha512 = "Lmj9lM/fef0nQswm1J2HJcEsBUba4wgNx2fea6yJHODREoMFnwRpZydBnX/RjyXw2REIwdkbqE4hrTo4qfDBUA=="; }; }; "sass-formatter-0.7.8" = { @@ -51480,6 +50391,15 @@ let sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; }; }; + "sax-1.3.0" = { + name = "sax"; + packageName = "sax"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sax/-/sax-1.3.0.tgz"; + sha512 = "0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA=="; + }; + }; "saxes-3.1.11" = { name = "saxes"; packageName = "saxes"; @@ -51561,15 +50481,6 @@ let sha512 = "L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw=="; }; }; - "scoped-regex-2.1.0" = { - name = "scoped-regex"; - packageName = "scoped-regex"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/scoped-regex/-/scoped-regex-2.1.0.tgz"; - sha512 = "g3WxHrqSWCZHGHlSrF51VXFdjImhwvH8ZO/pryFH56Qi0cDsZfylQa/t0jCzVQFNbNvM00HfHjkDPEuarKDSWQ=="; - }; - }; "scoped-regex-3.0.0" = { name = "scoped-regex"; packageName = "scoped-regex"; @@ -51912,13 +50823,13 @@ let sha512 = "owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w=="; }; }; - "serialport-10.5.0" = { + "serialport-12.0.0" = { name = "serialport"; packageName = "serialport"; - version = "10.5.0"; + version = "12.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/serialport/-/serialport-10.5.0.tgz"; - sha512 = "7OYLDsu5i6bbv3lU81pGy076xe0JwpK6b49G6RjNvGibstUqQkI+I3/X491yBGtf4gaqUdOgoU1/5KZ/XxL4dw=="; + url = "https://registry.npmjs.org/serialport/-/serialport-12.0.0.tgz"; + sha512 = "AmH3D9hHPFmnF/oq/rvigfiAouAKyK/TjnrkwZRYSFZxNggJxwvbAbfYrLeuvq7ktUdhuHdVdSjj852Z55R+uA=="; }; }; "serve-favicon-2.5.0" = { @@ -52416,22 +51327,22 @@ let sha512 = "rohCHmEjD/ESXFLxF4bVeqgdb4Awc65ZyyuCKl3f7BvgMbZOBa/Ye3HN/GFnvruiUOAWWNupxhz3Rz5/3vJLTg=="; }; }; - "simple-git-2.48.0" = { + "simple-git-3.19.1" = { name = "simple-git"; packageName = "simple-git"; - version = "2.48.0"; + version = "3.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-2.48.0.tgz"; - sha512 = "z4qtrRuaAFJS4PUd0g+xy7aN4y+RvEt/QTJpR184lhJguBA1S/LsVlvE/CM95RsYMOFJG3NGGDjqFCzKU19S/A=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-3.19.1.tgz"; + sha512 = "Ck+rcjVaE1HotraRAS8u/+xgTvToTuoMkT9/l9lvuP5jftwnYUp6DwuJzsKErHgfyRk8IB8pqGHWEbM3tLgV1w=="; }; }; - "simple-git-3.19.1" = { + "simple-git-3.20.0" = { name = "simple-git"; packageName = "simple-git"; - version = "3.19.1"; + version = "3.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-3.19.1.tgz"; - sha512 = "Ck+rcjVaE1HotraRAS8u/+xgTvToTuoMkT9/l9lvuP5jftwnYUp6DwuJzsKErHgfyRk8IB8pqGHWEbM3tLgV1w=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-3.20.0.tgz"; + sha512 = "ozK8tl2hvLts8ijTs18iFruE+RoqmC/mqZhjs/+V7gS5W68JpJ3+FCTmLVqmR59MaUQ52MfGQuWsIqfsTbbJ0Q=="; }; }; "simple-peer-6.4.4" = { @@ -52533,15 +51444,6 @@ let sha512 = "awzaaIPtYFdexLr6TBpcZSGPB6D1RInNO/qNetgaJloPDF/D0GkVtLvGEp8InfmLV7CyLyQ5fIRP+tVN/JmWQA=="; }; }; - "sirv-2.0.3" = { - name = "sirv"; - packageName = "sirv"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/sirv/-/sirv-2.0.3.tgz"; - sha512 = "O9jm9BsID1P+0HOi81VpXPoDxYP374pkOLzACAoyUQ/3OUVndNpsz6wMnY2z+yOxzbllCKZrM+9QrWsv4THnyA=="; - }; - }; "sisteransi-1.0.5" = { name = "sisteransi"; packageName = "sisteransi"; @@ -52956,15 +51858,6 @@ let sha512 = "7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ=="; }; }; - "socks-proxy-agent-5.0.1" = { - name = "socks-proxy-agent"; - packageName = "socks-proxy-agent"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.1.tgz"; - sha512 = "vZdmnjb9a2Tz6WEQVIurybSwElwPxMZaIc7PzqbJTrezcKNznv6giT7J7tZDZ1BojVaa1jvO/UiUdhDVB0ACoQ=="; - }; - }; "socks-proxy-agent-6.2.1" = { name = "socks-proxy-agent"; packageName = "socks-proxy-agent"; @@ -53118,15 +52011,6 @@ let sha512 = "qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw=="; }; }; - "source-map-0.1.31" = { - name = "source-map"; - packageName = "source-map"; - version = "0.1.31"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.1.31.tgz"; - sha512 = "qFALUiKHo35Duky0Ubmb5YKj9b3c6CcgGNGeI60sd6Nn3KaY7h9fclEOcCVk0hwszwYYP6+X2/jpS5hHqqVuig=="; - }; - }; "source-map-0.4.4" = { name = "source-map"; packageName = "source-map"; @@ -53316,13 +52200,13 @@ let sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; }; }; - "spdx-license-ids-3.0.13" = { + "spdx-license-ids-3.0.15" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; - version = "3.0.13"; + version = "3.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz"; - sha512 = "XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w=="; + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.15.tgz"; + sha512 = "lpT8hSQp9jAKp9mhtBU4Xjon8LPGBvLIuBiSVhMEtmLecTh2mO0tlqrAMp47tBXzMr13NJMQ2lf7RpQGLJ3HsQ=="; }; }; "spdx-license-list-6.7.0" = { @@ -53721,22 +52605,13 @@ let sha512 = "Kpij9riA+UNg7TnphqjH7/CzctQ/owJGNbFkfEeve4Z4uxT5+JapVLFXcsurIfN34gnTWZNJ/f7NMG0E8JDzTw=="; }; }; - "standard-17.1.0" = { - name = "standard"; - packageName = "standard"; - version = "17.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/standard/-/standard-17.1.0.tgz"; - sha512 = "jaDqlNSzLtWYW4lvQmU0EnxWMUGQiwHasZl5ZEIwx3S/ijZDjZOzs1y1QqKwKs5vqnFpGtizo4NOYX2s0Voq/g=="; - }; - }; - "standard-engine-15.1.0" = { - name = "standard-engine"; - packageName = "standard-engine"; - version = "15.1.0"; + "stat-mode-0.3.0" = { + name = "stat-mode"; + packageName = "stat-mode"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/standard-engine/-/standard-engine-15.1.0.tgz"; - sha512 = "VHysfoyxFu/ukT+9v49d4BRXIokFRZuH3z1VRxzFArZdjSCFpro6rEIU3ji7e4AoAtuSfKBkiOmsrDqKW5ZSRw=="; + url = "https://registry.npmjs.org/stat-mode/-/stat-mode-0.3.0.tgz"; + sha512 = "QjMLR0A3WwFY2aZdV0okfFEJB5TRjkggXZjxP3A1RsWsNHNu3YPv8btmtc6iCFZ0Rul3FE93OYogvhOUClU+ng=="; }; }; "state-toggle-1.0.3" = { @@ -53793,15 +52668,6 @@ let sha512 = "RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="; }; }; - "stdin-0.0.1" = { - name = "stdin"; - packageName = "stdin"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/stdin/-/stdin-0.0.1.tgz"; - sha512 = "2bacd1TXzqOEsqRa+eEWkRdOSznwptrs4gqFcpMq5tOtmJUGPZd10W5Lam6wQ4YQ/+qjQt4e9u35yXCF6mrlfQ=="; - }; - }; "stdin-discarder-0.1.0" = { name = "stdin-discarder"; packageName = "stdin-discarder"; @@ -54000,6 +52866,15 @@ let sha512 = "889+B9vN9dq7/vLbGyuHeZ6/ctf5sNuGWsDy89uNxkFTAgzy0eK7+w5fL3KLNRTkLle7EgZGvHUphZW0Q26MnQ=="; }; }; + "stream-to-array-2.3.0" = { + name = "stream-to-array"; + packageName = "stream-to-array"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-to-array/-/stream-to-array-2.3.0.tgz"; + sha512 = "UsZtOYEn4tWU2RGLOXr/o/xjRBftZRlG3dEWoaHr8j4GuypJ3isitGbVyjQKAuMu+xbiop8q224TjiZWc4XTZA=="; + }; + }; "stream-to-blob-2.0.1" = { name = "stream-to-blob"; packageName = "stream-to-blob"; @@ -54018,6 +52893,15 @@ let sha512 = "PS6wT2ZyyR38Cy+lE6PBEI1ZmO2HdzZoLeDGG0zZbYikCZd0dh8FUoSeFzgWLItpBYw1WJmPVRLpykRV+lAWLQ=="; }; }; + "stream-to-promise-2.2.0" = { + name = "stream-to-promise"; + packageName = "stream-to-promise"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-to-promise/-/stream-to-promise-2.2.0.tgz"; + sha512 = "HAGUASw8NT0k8JvIVutB2Y/9iBk7gpgEyAudXwNJmZERdMITGdajOa4VJfD/kNiA3TppQpTP4J+CtcHwdzKBAw=="; + }; + }; "stream-transform-0.1.2" = { name = "stream-transform"; packageName = "stream-transform"; @@ -54423,24 +53307,6 @@ let sha512 = "3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w=="; }; }; - "strip-bom-buf-1.0.0" = { - name = "strip-bom-buf"; - packageName = "strip-bom-buf"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-bom-buf/-/strip-bom-buf-1.0.0.tgz"; - sha512 = "1sUIL1jck0T1mhOLP2c696BIznzT525Lkub+n4jjMHjhjhoAQA6Ye659DxdlZBr0aLDMQoTxKIpnlqxgtwjsuQ=="; - }; - }; - "strip-bom-stream-2.0.0" = { - name = "strip-bom-stream"; - packageName = "strip-bom-stream"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-2.0.0.tgz"; - sha512 = "yH0+mD8oahBZWnY43vxs4pSinn8SMKAdml/EOGBewoe1Y0Eitd0h2Mg3ZRiXruUW6L4P+lvZiEgbh0NgUGia1w=="; - }; - }; "strip-dirs-2.1.0" = { name = "strip-dirs"; packageName = "strip-dirs"; @@ -54684,6 +53550,15 @@ let sha512 = "MuzIIVRSbc8XxHH7FjkvWqkIcr1BvoMZoR/oFuAJDlh7VSaNJzrB4uJ38GRQa+mWjLXODAMzeDe0xi9GYbGwnw=="; }; }; + "stylus-0.60.0" = { + name = "stylus"; + packageName = "stylus"; + version = "0.60.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stylus/-/stylus-0.60.0.tgz"; + sha512 = "j2pBgEwzCu05yCuY4cmyp0FtPQQFBBAGB7TY7QaNl7eztiHwkxzwvIp5vjZJND/a1JNOka+ZW9ewVPFZpI3pcA=="; + }; + }; "subarg-1.0.0" = { name = "subarg"; packageName = "subarg"; @@ -54900,13 +53775,13 @@ let sha512 = "vzSyuGr3eEoAtT/A6bmajosJZIUWySzY2CzB3w2pgPvnkUjGqlDnsNnA0PMO+mMAhuyMul6C2uuZzY6ELSkzyA=="; }; }; - "svelte-4.2.0" = { + "svelte-4.2.1" = { name = "svelte"; packageName = "svelte"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/svelte/-/svelte-4.2.0.tgz"; - sha512 = "kVsdPjDbLrv74SmLSUzAsBGquMs4MPgWGkGLpH+PjOYnFOziAvENVzgJmyOCV2gntxE32aNm8/sqNKD6LbIpeQ=="; + url = "https://registry.npmjs.org/svelte/-/svelte-4.2.1.tgz"; + sha512 = "LpLqY2Jr7cRxkrTc796/AaaoMLF/1ax7cto8Ot76wrvKQhrPmZ0JgajiWPmg9mTSDqO16SSLiD17r9MsvAPTmw=="; }; }; "svelte-preprocess-5.0.4" = { @@ -54918,13 +53793,13 @@ let sha512 = "ABia2QegosxOGsVlsSBJvoWeXy1wUKSfF7SWJdTjLAbx/Y3SrVevvvbFNQqrSJw89+lNSsM58SipmZJ5SRi5iw=="; }; }; - "svelte2tsx-0.6.21" = { + "svelte2tsx-0.6.22" = { name = "svelte2tsx"; packageName = "svelte2tsx"; - version = "0.6.21"; + version = "0.6.22"; src = fetchurl { - url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.6.21.tgz"; - sha512 = "v+vvbiy6WDmEQdIkJpvHYxJYG/obALfH0P6CTreYO350q/9+QmFTNCOJvx0O1o59Zpzx1Bqe+qlDxP/KtJSZEA=="; + url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.6.22.tgz"; + sha512 = "eFCfz0juaWeanbwGeQV21kPMwH3LKhfrUYRy1PqRmlieuHvJs8VeK7CaoHJdpBZWCXba2cltHVdywJmwOGhbww=="; }; }; "sver-compat-1.5.0" = { @@ -55053,13 +53928,13 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-5.21.5" = { + "systeminformation-5.21.9" = { name = "systeminformation"; packageName = "systeminformation"; - version = "5.21.5"; + version = "5.21.9"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.21.5.tgz"; - sha512 = "W1bvYcSM6hVIEqFmjAWTtfX+Qq1Mc3sEZq4AxjtkNya01WbcleahsCzM2/eAey+no+XxPk6a0/7RnCLX6/BmOQ=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.21.9.tgz"; + sha512 = "7pI4mu9P/2MGDV0T49B52E7IULBGj+kRVk6JSYUj5qfAk7N7C7aNX15fXziqrbgZntc6/jjYzWeb/x41jhg/eA=="; }; }; "sywac-1.3.0" = { @@ -55117,15 +53992,6 @@ let sha512 = "A0KgSkef7eE4Mf+nKJ83i75TMyq8HqY3qmFIJSWy8bNt0v1lG7jUcpGpoTFxAwYcWOphcTBLPPJg+bDfhDf52w=="; }; }; - "taketalk-1.0.0" = { - name = "taketalk"; - packageName = "taketalk"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/taketalk/-/taketalk-1.0.0.tgz"; - sha512 = "kS7E53It6HA8S1FVFBWP7HDwgTiJtkmYk7TsowGlizzVrivR1Mf9mgjXHY1k7rOfozRVMZSfwjB3bevO4QEqpg=="; - }; - }; "tapable-0.2.9" = { name = "tapable"; packageName = "tapable"; @@ -55153,6 +54019,15 @@ let sha512 = "FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA=="; }; }; + "tar-4.4.18" = { + name = "tar"; + packageName = "tar"; + version = "4.4.18"; + src = fetchurl { + url = "https://registry.npmjs.org/tar/-/tar-4.4.18.tgz"; + sha512 = "ZuOtqqmkV9RE1+4odd+MhBpibmCxNP6PJhH/h2OqNuotTX7/XHPZQJv2pKvWMplFH9SIZZhitehh6vBH6LO8Pg=="; + }; + }; "tar-4.4.19" = { name = "tar"; packageName = "tar"; @@ -55225,15 +54100,6 @@ let sha512 = "5AFQU8b9qLfZCX9zp2duONhPmZv0hGYiBPJsyUdqMjzq/mqVpy/rEUSeHk1+YitmxugaptgBh5oDGU3VsAJq4w=="; }; }; - "tar-pack-3.4.1" = { - name = "tar-pack"; - packageName = "tar-pack"; - version = "3.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.1.tgz"; - sha512 = "PPRybI9+jM5tjtCbN2cxmmRU7YmqT3Zv/UDy48tAh2XRkLa9bAORtSWLkVc13+GJF+cdTh1yEnHEk3cpTaL5Kg=="; - }; - }; "tar-stream-1.6.2" = { name = "tar-stream"; packageName = "tar-stream"; @@ -55450,13 +54316,13 @@ let sha512 = "flFL3m4wuixmf6IfhFJd1YPiLiMuxEc8uHRM1buzIeZPm22Au2pDqBJQgdo7n1WfPU1ONFGv7YDwpFBmHGF6lg=="; }; }; - "terser-5.19.4" = { + "terser-5.20.0" = { name = "terser"; packageName = "terser"; - version = "5.19.4"; + version = "5.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.19.4.tgz"; - sha512 = "6p1DjHeuluwxDXcuT9VR8p64klWJKo1ILiy19s6C9+0Bh2+NWTX6nD9EPppiER4ICkHDVB1RkVpin/YW2nQn/g=="; + url = "https://registry.npmjs.org/terser/-/terser-5.20.0.tgz"; + sha512 = "e56ETryaQDyebBwJIWYB2TT6f2EZ0fL0sW/JRXNMN26zZdKi2u/E/5my5lG6jNxym6qsrVXfFRmOdV42zlAgLQ=="; }; }; "terser-webpack-plugin-5.3.9" = { @@ -55486,15 +54352,6 @@ let sha512 = "/0TJD42KDnVwKmDK6jj3xP7E2MG7SHAOG4tyTgyUCRPdHwvkquYNLEQltmdMa3owq3TkddCVcTsoctJI8VQNKA=="; }; }; - "text-encoder-lite-2.0.0" = { - name = "text-encoder-lite"; - packageName = "text-encoder-lite"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/text-encoder-lite/-/text-encoder-lite-2.0.0.tgz"; - sha512 = "bo08ND8LlBwPeU23EluRUcO3p2Rsb/eN5EIfOVqfRmblNDEVKK5IzM9Qfidvo+odT0hhV8mpXQcP/M5MMzABXw=="; - }; - }; "text-extensions-1.9.0" = { name = "text-extensions"; packageName = "text-extensions"; @@ -55531,15 +54388,6 @@ let sha512 = "N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="; }; }; - "textextensions-5.16.0" = { - name = "textextensions"; - packageName = "textextensions"; - version = "5.16.0"; - src = fetchurl { - url = "https://registry.npmjs.org/textextensions/-/textextensions-5.16.0.tgz"; - sha512 = "7D/r3s6uPZyU//MCYrX6I14nzauDwJ5CxazouuRGNuvSCihW87ufN6VLoROLCrHg6FblLuJrT6N2BVaPVzqElw=="; - }; - }; "textlint-rule-helper-1.2.0" = { name = "textlint-rule-helper"; packageName = "textlint-rule-helper"; @@ -55702,15 +54550,6 @@ let sha512 = "45Llu+EwHKtAZYTPPVn3XZHBgakWMN3rokhEv5hu596XP+cNgplMg+Gj+1nmAvj+L0K7+N49zBKx5rah5u0QIQ=="; }; }; - "through2-0.6.5" = { - name = "through2"; - packageName = "through2"; - version = "0.6.5"; - src = fetchurl { - url = "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz"; - sha512 = "RkK/CCESdTKQZHdmKICijdKKsCRVHs5KsLZ6pACAmF/1GPUQhonHSXWNERctxEp7RmvjdNbZTL5z9V7nSCXKcg=="; - }; - }; "through2-2.0.0" = { name = "through2"; packageName = "through2"; @@ -55837,15 +54676,6 @@ let sha512 = "PIxwAupJZiYU4JmVZYwXp9FKsHMXb5h0ZEFyuXTAn8WLHOlcij+FEcbrvDsom1o5dr1YggEtFbECvGCW2sT53Q=="; }; }; - "timers-browserify-2.0.12" = { - name = "timers-browserify"; - packageName = "timers-browserify"; - version = "2.0.12"; - src = fetchurl { - url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz"; - sha512 = "9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ=="; - }; - }; "timers-ext-0.1.7" = { name = "timers-ext"; packageName = "timers-ext"; @@ -55873,15 +54703,6 @@ let sha512 = "qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A=="; }; }; - "tiny-each-async-2.0.3" = { - name = "tiny-each-async"; - packageName = "tiny-each-async"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/tiny-each-async/-/tiny-each-async-2.0.3.tgz"; - sha512 = "5ROII7nElnAirvFn8g7H7MtpfV1daMcyfTGQwsn/x2VtyV+VPiO5CjReCJtWLvoKTDEDmZocf3cNPraiMnBXLA=="; - }; - }; "tiny-glob-0.2.9" = { name = "tiny-glob"; packageName = "tiny-glob"; @@ -56215,15 +55036,6 @@ let sha512 = "F+3tYmXnpO2gyhZQ7o8yakELJH3FtKISI/FU0iWvchOWFUXiFnjbEBoumSzfcK1P71Qxzx2az4lVK4Dkq4KSew=="; }; }; - "totalist-3.0.1" = { - name = "totalist"; - packageName = "totalist"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz"; - sha512 = "sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ=="; - }; - }; "touch-3.1.0" = { name = "touch"; packageName = "touch"; @@ -56350,15 +55162,6 @@ let sha512 = "1m4RA7xVAJrSGrrXGs0L3YTwyvBs2S8PbRHaLZAkFw7JR8oIFwYtysxlBZhYIa7xSyiYJKZ3iGrrk55cGA3i9A=="; }; }; - "treeverse-1.0.4" = { - name = "treeverse"; - packageName = "treeverse"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/treeverse/-/treeverse-1.0.4.tgz"; - sha512 = "whw60l7r+8ZU8Tu/Uc2yxtc4ZTZbR/PF3u1IPNKGQ6p8EICLb3Z2lAgoqw9bqYd8IkgnsaOcLzYHFckjqNsf0g=="; - }; - }; "trim-0.0.1" = { name = "trim"; packageName = "trim"; @@ -56458,15 +55261,6 @@ let sha512 = "0z3j8R7MCjy10kc/g+qg7Ln3alJTodw9aDuVWZa3uiWqfuBMKeAeP2ocWcxoyM3D73yz3Jt/Pu4qPr4wHSdB/Q=="; }; }; - "truncate-utf8-bytes-1.0.2" = { - name = "truncate-utf8-bytes"; - packageName = "truncate-utf8-bytes"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz"; - sha512 = "95Pu1QXQvruGEhv62XCMO3Mm90GscOCClvrIUwCM0PYOXK3kaF3l3sIHxx71ThJfcbM2O5Au6SO3AWCSEfW4mQ=="; - }; - }; "try-resolve-1.0.1" = { name = "try-resolve"; packageName = "try-resolve"; @@ -56476,6 +55270,15 @@ let sha512 = "yHeaPjCBzVaXwWl5IMUapTaTC2rn/eBYg2fsG2L+CvJd+ttFbk0ylDnpTO3wVhosmE1tQEvcebbBeKLCwScQSQ=="; }; }; + "ts-api-utils-1.0.3" = { + name = "ts-api-utils"; + packageName = "ts-api-utils"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.3.tgz"; + sha512 = "wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg=="; + }; + }; "ts-error-1.0.6" = { name = "ts-error"; packageName = "ts-error"; @@ -56494,24 +55297,6 @@ let sha512 = "Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA=="; }; }; - "ts-is-present-1.2.2" = { - name = "ts-is-present"; - packageName = "ts-is-present"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ts-is-present/-/ts-is-present-1.2.2.tgz"; - sha512 = "cA5MPLWGWYXvnlJb4TamUUx858HVHBsxxdy8l7jxODOLDyGYnQOllob2A2jyDghGa5iJHs2gzFNHvwGJ0ZfR8g=="; - }; - }; - "ts-loader-9.4.4" = { - name = "ts-loader"; - packageName = "ts-loader"; - version = "9.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/ts-loader/-/ts-loader-9.4.4.tgz"; - sha512 = "MLukxDHBl8OJ5Dk3y69IsKVFRA/6MwzEqBgh+OXMPB/OD01KQuWPFd1WAQP8a5PeSCAxfnkhiuWqfmFJzJQt9w=="; - }; - }; "ts-morph-12.0.0" = { name = "ts-morph"; packageName = "ts-morph"; @@ -56989,13 +55774,13 @@ let sha512 = "tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g=="; }; }; - "type-fest-4.3.1" = { + "type-fest-4.3.3" = { name = "type-fest"; packageName = "type-fest"; - version = "4.3.1"; + version = "4.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-4.3.1.tgz"; - sha512 = "pphNW/msgOUSkJbH58x8sqpq8uQj6b0ZKGxEsLKMUnGorRcDjrUaLS+39+/ub41JNTwrrMyJcUB8+YZs3mbwqw=="; + url = "https://registry.npmjs.org/type-fest/-/type-fest-4.3.3.tgz"; + sha512 = "bxhiFii6BBv6UiSDq7uKTMyADT9unXEl3ydGefndVLxFeB44LRbT4K7OJGDYSyDrKnklCC1Pre68qT2wbUl2Aw=="; }; }; "type-is-1.6.18" = { @@ -57142,6 +55927,15 @@ let sha512 = "1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g=="; }; }; + "typescript-5.0.4" = { + name = "typescript"; + packageName = "typescript"; + version = "5.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz"; + sha512 = "cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw=="; + }; + }; "typescript-5.1.6" = { name = "typescript"; packageName = "typescript"; @@ -57160,13 +55954,13 @@ let sha512 = "mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w=="; }; }; - "typescript-5.3.0-dev.20230915" = { + "typescript-5.3.0-dev.20231002" = { name = "typescript"; packageName = "typescript"; - version = "5.3.0-dev.20230915"; + version = "5.3.0-dev.20231002"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-5.3.0-dev.20230915.tgz"; - sha512 = "GQr8dkpN44ywddczAzV80zSPckUfqUbxmCi2SXJ0SvOMOk7TXMUrcptoHQm7HqFggTUS41AUEr+a8RmyPApw4Q=="; + url = "https://registry.npmjs.org/typescript/-/typescript-5.3.0-dev.20231002.tgz"; + sha512 = "TQXM13rrDgID8W4Ok4KDQAqwLUjLcAXL+NKv0zJiIEQfa0bOM0yoRiSgvcjaCJ4lZT4bScrq3vHspVM2x8rkOQ=="; }; }; "typescript-auto-import-cache-0.2.1" = { @@ -57187,15 +55981,6 @@ let sha512 = "Rq6/q4O9iyqUdjvOoyas7x/Qf9nWUMeqpP3YeTaLA+uECgfy5wOhfOS+SW/+fZ/uI/ZcKaf+2/ZhFzXh8xfofQ=="; }; }; - "typescript-json-schema-0.60.0" = { - name = "typescript-json-schema"; - packageName = "typescript-json-schema"; - version = "0.60.0"; - src = fetchurl { - url = "https://registry.npmjs.org/typescript-json-schema/-/typescript-json-schema-0.60.0.tgz"; - sha512 = "pgSsm0K4jN2BMVPRVe8aCsct0hGAdmFIU3P8LtuUuwqzZnJh9oEabz82RuVhIWcKAA/yVyHYBKXWkkDid8/R9Q=="; - }; - }; "typescript-tslint-plugin-0.5.4" = { name = "typescript-tslint-plugin"; packageName = "typescript-tslint-plugin"; @@ -57304,13 +56089,13 @@ let sha512 = "ZiLtQrdrFvWVXW5wickjtHiyOkn+cG74B0r33DQ2vJuz12FsFO7dU2q0dumrrYk6ny4wl2Vjsodpxk0+Z10/rA=="; }; }; - "uid-number-0.0.6" = { - name = "uid-number"; - packageName = "uid-number"; - version = "0.0.6"; + "uid-promise-1.0.0" = { + name = "uid-promise"; + packageName = "uid-promise"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz"; - sha512 = "c461FXIljswCuscZn67xq9PpszkPT6RjheWFQTgCyabJrTUozElanb0YEqv2UGgk247YpcJkFBuSGNvBlpXM9w=="; + url = "https://registry.npmjs.org/uid-promise/-/uid-promise-1.0.0.tgz"; + sha512 = "R8375j0qwXyIu/7R0tjdF06/sElHqbmdmWC9M2qQHpEVbvE4I5+38KJI7LUUmQMp7NVq4tKHiBMkT0NFM453Ig=="; }; }; "uid-safe-2.1.5" = { @@ -57493,13 +56278,13 @@ let sha512 = "1D7w+fvRsqlQ9GscLBwcAJinqcZGHUKjbOmXdlE/v8BvEGXjeWAax+341q44EuTcHXXnfyKNbKRq4Lg7OzhMmg=="; }; }; - "undici-5.24.0" = { + "undici-5.25.3" = { name = "undici"; packageName = "undici"; - version = "5.24.0"; + version = "5.25.3"; src = fetchurl { - url = "https://registry.npmjs.org/undici/-/undici-5.24.0.tgz"; - sha512 = "OKlckxBjFl0oXxcj9FU6oB8fDAaiRUq+D8jrFWGmOfI/gIyjk/IeS75LMzgYKUaeHzLUcYvf9bbJGSrUwTfwwQ=="; + url = "https://registry.npmjs.org/undici/-/undici-5.25.3.tgz"; + sha512 = "7lmhlz3K1+IKB6IUjkdzV2l0jKY8/0KguEMdEpzzXCug5pEGIp3DxUg0DEN65DrVoxHiRKpPORC/qzX+UglSkQ=="; }; }; "unherit-1.1.3" = { @@ -57628,6 +56413,15 @@ let sha512 = "5+JDIs4hqKfHnJcVCxTid1yBoI/++FfF/1PFdSMpaftZZZY+qg2JFruRbf7PaIwa9KgLotXQV3gSjtY0IdcFGQ=="; }; }; + "unified-engine-11.1.0" = { + name = "unified-engine"; + packageName = "unified-engine"; + version = "11.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unified-engine/-/unified-engine-11.1.0.tgz"; + sha512 = "RS3K5PgNjDRQN9eNIefLUDxpfyWIItmKcjBhD1VnYYT/h7xpheZoZBtb5gtwFyKWZlhKCGRVQknIm1M8qHZfIg=="; + }; + }; "unified-engine-8.2.0" = { name = "unified-engine"; packageName = "unified-engine"; @@ -57709,15 +56503,6 @@ let sha512 = "Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ=="; }; }; - "unique-filename-2.0.1" = { - name = "unique-filename"; - packageName = "unique-filename"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/unique-filename/-/unique-filename-2.0.1.tgz"; - sha512 = "ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A=="; - }; - }; "unique-filename-3.0.0" = { name = "unique-filename"; packageName = "unique-filename"; @@ -57736,15 +56521,6 @@ let sha512 = "zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w=="; }; }; - "unique-slug-3.0.0" = { - name = "unique-slug"; - packageName = "unique-slug"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unique-slug/-/unique-slug-3.0.0.tgz"; - sha512 = "8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w=="; - }; - }; "unique-slug-4.0.0" = { name = "unique-slug"; packageName = "unique-slug"; @@ -57853,6 +56629,15 @@ let sha512 = "Op0XnmHUl6C2zo/yJCwhXQSm/SmW22eDZdWP2qdf4WpGrgO1ZxFodq+5zFyeRGasFjJotAnLgfuD1jkcKqiH1Q=="; }; }; + "unist-util-inspect-8.0.0" = { + name = "unist-util-inspect"; + packageName = "unist-util-inspect"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-inspect/-/unist-util-inspect-8.0.0.tgz"; + sha512 = "/3Wn/wU6/H6UEo4FoYUeo8KUePN8ERiZpQYFWYoihOsr1DoDuv80PeB0hobVZyYSvALa2e556bG1A1/AbwU4yg=="; + }; + }; "unist-util-is-3.0.0" = { name = "unist-util-is"; packageName = "unist-util-is"; @@ -57880,6 +56665,15 @@ let sha512 = "u9njyyfEh43npf1M+yGKDGVPbY/JWEemg5nH05ncKPfi+kBbKBJoTdsogMu33uhytuLlv9y0O7GH7fEdwLdLQw=="; }; }; + "unist-util-lsp-2.1.0" = { + name = "unist-util-lsp"; + packageName = "unist-util-lsp"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-lsp/-/unist-util-lsp-2.1.0.tgz"; + sha512 = "ICI1PWbalSfOrsdosGk+WXdZBvdjhZVjbkgHOzKFdkCdzBpVEi8GjsVTAG6NR3VLGcwTOGLj/+k4L0HwGQYvEQ=="; + }; + }; "unist-util-map-1.0.5" = { name = "unist-util-map"; packageName = "unist-util-map"; @@ -57970,6 +56764,15 @@ let sha512 = "k5GzIBZ/QatR8N5X2y+drfpWG8IDBzdnVj6OInRNWm1oXrzydiaAT2OQiA8DPRRZyAKb9b6I2a6PxYklZD0gKg=="; }; }; + "unist-util-stringify-position-4.0.0" = { + name = "unist-util-stringify-position"; + packageName = "unist-util-stringify-position"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-4.0.0.tgz"; + sha512 = "0ASV06AAoKCDkS2+xw5RXJywruurpbC4JZSm7nr7MOt1ojAzvyyaO+UxZf18j8FCF6kmzCZKcAgN/yu2gm2XgQ=="; + }; + }; "unist-util-to-list-of-char-0.1.3" = { name = "unist-util-to-list-of-char"; packageName = "unist-util-to-list-of-char"; @@ -58258,13 +57061,13 @@ let sha512 = "1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w=="; }; }; - "update-browserslist-db-1.0.11" = { + "update-browserslist-db-1.0.13" = { name = "update-browserslist-db"; packageName = "update-browserslist-db"; - version = "1.0.11"; + version = "1.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz"; - sha512 = "dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA=="; + url = "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz"; + sha512 = "xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg=="; }; }; "update-check-1.5.3" = { @@ -58609,15 +57412,6 @@ let sha512 = "E8VjFIQ/TyQgp+TZfS6l8yp/xWppSAHzidGiRrqe4bK4XP9pTRyKFgGJpO3SN7zdX4DeomTrwaseCHovfpFcqQ=="; }; }; - "utf8-byte-length-1.0.4" = { - name = "utf8-byte-length"; - packageName = "utf8-byte-length"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz"; - sha512 = "4+wkEYLBbWxqTahEsWrhxepcoVOJ+1z5PGIjPZxRkytcdSUaNjIjBM7Xn8E+pdSuV7SzvWovBFA54FO0JSoqhA=="; - }; - }; "utif-2.0.1" = { name = "utif"; packageName = "utif"; @@ -58717,6 +57511,15 @@ let sha512 = "FULf7fayPdpASncVy4DLh3xydlXEJJpvIELjYjNeQWYUZ9pclcpvCZSr2gkmN2FrrGcI7G/cJsIEwk5/8vfXpg=="; }; }; + "uuid-3.3.2" = { + name = "uuid"; + packageName = "uuid"; + version = "3.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz"; + sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="; + }; + }; "uuid-3.3.3" = { name = "uuid"; packageName = "uuid"; @@ -59302,15 +58105,6 @@ let sha512 = "bIOaZx4+Bf6a7sIORfmYnyKLDLk/lhVym6rjYlq+vkitYKnhFmUpmPpDTCltWFrUTlGKs6sCeoDWfMA0oOOneA=="; }; }; - "version-guard-1.1.1" = { - name = "version-guard"; - packageName = "version-guard"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/version-guard/-/version-guard-1.1.1.tgz"; - sha512 = "MGQLX89UxmYHgDvcXyjBI0cbmoW+t/dANDppNPrno64rYr8nH4SHSuElQuSYdXGEs0mUzdQe1BY+FhVPNsAmJQ=="; - }; - }; "vfile-4.2.1" = { name = "vfile"; packageName = "vfile"; @@ -59329,6 +58123,15 @@ let sha512 = "r7qlzkgErKjobAmyNIkkSpizsFPYiUPuJb5pNW1RB4JcYVZhs4lIbVqk8XPk033CV/1z8ss5pkax8SuhGpcG8g=="; }; }; + "vfile-6.0.1" = { + name = "vfile"; + packageName = "vfile"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vfile/-/vfile-6.0.1.tgz"; + sha512 = "1bYqc7pt6NIADBJ98UiG0Bn/CHIVOoZ/IyEkqIruLg0mE1BKzkOXY2D6CSqQIcKqgadppE5lrxgWXJmXd7zZJw=="; + }; + }; "vfile-find-up-5.0.1" = { name = "vfile-find-up"; packageName = "vfile-find-up"; @@ -59383,6 +58186,15 @@ let sha512 = "fa0Z6P8HUrQN4BZaX05SIVXic+7kE3b05PWAtPuYP9QLHsLKYR7/AlLW3NtOrpXRLeawpDLMsVkmk5DG0NXgWw=="; }; }; + "vfile-message-4.0.2" = { + name = "vfile-message"; + packageName = "vfile-message"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vfile-message/-/vfile-message-4.0.2.tgz"; + sha512 = "jRDZ1IMLttGj41KcZvlrYAaI3CfqpLpfpf+Mfig13viT6NKvRzWZ+lXz0Y5D60w6uJIBAOGq9mSHf0gktF0duw=="; + }; + }; "vfile-reporter-6.0.2" = { name = "vfile-reporter"; packageName = "vfile-reporter"; @@ -59401,6 +58213,15 @@ let sha512 = "NdWWXkv6gcd7AZMvDomlQbK3MqFWL1RlGzMn++/O2TI+68+nqxCPTvLugdOtfSzXmjh+xUyhp07HhlrbJjT+mw=="; }; }; + "vfile-reporter-8.1.0" = { + name = "vfile-reporter"; + packageName = "vfile-reporter"; + version = "8.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vfile-reporter/-/vfile-reporter-8.1.0.tgz"; + sha512 = "NfHyHdkCcy0BsXiLA3nId29TY7W7hgpc8nd8Soe3imATx5N4/+mkLYdMR+Y6Zvu6BXMMi0FZsD4FLCm1dN85Pg=="; + }; + }; "vfile-reporter-pretty-5.0.0" = { name = "vfile-reporter-pretty"; packageName = "vfile-reporter-pretty"; @@ -59428,6 +58249,15 @@ let sha512 = "1os1733XY6y0D5x0ugqSeaVJm9lYgj0j5qdcZQFyxlZOSy1jYarL77lLyb5gK4Wqr1d5OxmuyflSO3zKyFnTFw=="; }; }; + "vfile-sort-4.0.0" = { + name = "vfile-sort"; + packageName = "vfile-sort"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vfile-sort/-/vfile-sort-4.0.0.tgz"; + sha512 = "lffPI1JrbHDTToJwcq0rl6rBmkjQmMuXkAxsZPRS9DXbaJQvc642eCg6EGxcX2i1L+esbuhq+2l9tBll5v8AeQ=="; + }; + }; "vfile-statistics-1.1.4" = { name = "vfile-statistics"; packageName = "vfile-statistics"; @@ -59446,6 +58276,15 @@ let sha512 = "W6dkECZmP32EG/l+dp2jCLdYzmnDBIw6jwiLZSER81oR5AHRcVqL+k3Z+pfH1R73le6ayDkJRMk0sutj1bMVeg=="; }; }; + "vfile-statistics-3.0.0" = { + name = "vfile-statistics"; + packageName = "vfile-statistics"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vfile-statistics/-/vfile-statistics-3.0.0.tgz"; + sha512 = "/qlwqwWBWFOmpXujL/20P+Iuydil0rZZNglR+VNm6J0gpLHwuVM5s7g2TfVoswbXjZ4HuIhLMySEyIw5i7/D8w=="; + }; + }; "vfile-to-eslint-2.0.2" = { name = "vfile-to-eslint"; packageName = "vfile-to-eslint"; @@ -59482,15 +58321,6 @@ let sha512 = "LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw=="; }; }; - "vinyl-file-3.0.0" = { - name = "vinyl-file"; - packageName = "vinyl-file"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vinyl-file/-/vinyl-file-3.0.0.tgz"; - sha512 = "BoJDj+ca3D9xOuPEM6RWVtWQtvEPQiQYn82LvdxhLWplfQsBzBqtgK0yhCP0s1BNTi6dH9BO+dzybvyQIacifg=="; - }; - }; "vinyl-fs-3.0.3" = { name = "vinyl-fs"; packageName = "vinyl-fs"; @@ -59509,6 +58339,24 @@ let sha512 = "NiibMgt6VJGJmyw7vtzhctDcfKch4e4n9TBeoWlirb7FMg9/1Ov9k+A5ZRAtywBpRPiyECvQRQllYM8dECegVA=="; }; }; + "vite-4.4.9" = { + name = "vite"; + packageName = "vite"; + version = "4.4.9"; + src = fetchurl { + url = "https://registry.npmjs.org/vite/-/vite-4.4.9.tgz"; + sha512 = "2mbUn2LlUmNASWwSCNSJ/EG2HuSRTnVNaydp6vMCm5VIqJsjMfbIWtbH2kDuwUVW5mMUKKZvGPX/rqeqVvv1XA=="; + }; + }; + "vite-code-inspector-plugin-0.1.9" = { + name = "vite-code-inspector-plugin"; + packageName = "vite-code-inspector-plugin"; + version = "0.1.9"; + src = fetchurl { + url = "https://registry.npmjs.org/vite-code-inspector-plugin/-/vite-code-inspector-plugin-0.1.9.tgz"; + sha512 = "49ZLkFS2ajDCZ0eXTKK0BG4G2yLMtXHjQUZ5ebx889sZm0O3qJzjhtzTITjOi37xjYFASWuIptqL98qEgYXhoA=="; + }; + }; "vizion-2.2.1" = { name = "vizion"; packageName = "vizion"; @@ -59545,15 +58393,6 @@ let sha512 = "2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ=="; }; }; - "vm2-3.9.19" = { - name = "vm2"; - packageName = "vm2"; - version = "3.9.19"; - src = fetchurl { - url = "https://registry.npmjs.org/vm2/-/vm2-3.9.19.tgz"; - sha512 = "J637XF0DHDMV57R6JyVsTak7nIL8gy5KH4r1HiwWLf/4GBbb5MKL5y7LpmF4A8E2nR6XmzpmMFQ7V7ppPTmUQg=="; - }; - }; "void-elements-3.1.0" = { name = "void-elements"; packageName = "void-elements"; @@ -59635,13 +58474,13 @@ let sha512 = "RWkO/c/A7iXhHEy3OuEqkCqavDjpD4NF2Ca8vjai+ZtEYNeHrm1ybTnBYLP4Ft1uXvvaaVtYA9HrDjD6+CUONg=="; }; }; - "vscode-css-languageservice-6.2.7" = { + "vscode-css-languageservice-6.2.9" = { name = "vscode-css-languageservice"; packageName = "vscode-css-languageservice"; - version = "6.2.7"; + version = "6.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.2.7.tgz"; - sha512 = "Jd8wpIg5kJ15CfrieoEPvu3gGFc36sbM3qXCtjVq5zrnLEX5NhHxikMDtf8AgQsYklXiDqiZLKoBnzkJtRbTHQ=="; + url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.2.9.tgz"; + sha512 = "9MsOvAi+VycKomQ7KEq4o/hLtjHHrtRLLl8lM9nMcH8cxfNI7/6jVXmsV/7pdbDWu9L3DZhsspN1eMXZwiOymw=="; }; }; "vscode-emmet-helper-1.2.17" = { @@ -59770,6 +58609,15 @@ let sha512 = "6TDy/abTQk+zDGYazgbIPc+4JoXdwC8NHU9Pbn4UJP1fehUyZmM4RHp5IthX7A6L5KS30PRui+j+tbbMMMafdw=="; }; }; + "vscode-jsonrpc-8.2.0" = { + name = "vscode-jsonrpc"; + packageName = "vscode-jsonrpc"; + version = "8.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0.tgz"; + sha512 = "C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA=="; + }; + }; "vscode-languageclient-8.1.0" = { name = "vscode-languageclient"; packageName = "vscode-languageclient"; @@ -59851,6 +58699,15 @@ let sha512 = "eUt8f1z2N2IEUDBsKaNapkz7jl5QpskN2Y0G01T/ItMxBxw1fJwvtySGB9QMecatne8jFIWJGWI61dWjyTLQsw=="; }; }; + "vscode-languageserver-9.0.1" = { + name = "vscode-languageserver"; + packageName = "vscode-languageserver"; + version = "9.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-9.0.1.tgz"; + sha512 = "woByF3PDpkHFUreUa7Hos7+pUWdeWMXRd26+ZX2A8cFx6v/JPTtd4/uN0/jB6XQHYaOlHbio03NTHCqrgG5n7g=="; + }; + }; "vscode-languageserver-protocol-3.14.1" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; @@ -59905,6 +58762,15 @@ let sha512 = "924/h0AqsMtA5yK22GgMtCYiMdCOtWTSGgUOkgEDX+wk2b0x4sAfLiO4NxBxqbiVtz7K7/1/RgVrVI0NClZwqA=="; }; }; + "vscode-languageserver-protocol-3.17.5" = { + name = "vscode-languageserver-protocol"; + packageName = "vscode-languageserver-protocol"; + version = "3.17.5"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.5.tgz"; + sha512 = "mb1bvRJN8SVznADSGWM9u/b07H7Ecg0I3OgXDuLdn307rl/J3A9YD6/eYOssqhecL27hK1IPZAsaqh00i/Jljg=="; + }; + }; "vscode-languageserver-protocol-3.5.1" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; @@ -59923,13 +58789,13 @@ let sha512 = "N8bOS8i0xuQMn/y0bijyefDbOsMl6hiH6LDREYWavTLTM5jbj44EiQfStsbmAv/0eaFKkL/jf5hW7nWwBy2HBw=="; }; }; - "vscode-languageserver-textdocument-1.0.10" = { + "vscode-languageserver-textdocument-1.0.11" = { name = "vscode-languageserver-textdocument"; packageName = "vscode-languageserver-textdocument"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.10.tgz"; - sha512 = "dPA6WqtAQJ/Iopm0Hrj11VvaKxsEcm62jpqyaYbY0xuvUffeWAn77f3VKr2SCsJphSyEw4Fjkjqm2gQ24KQfrA=="; + url = "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.11.tgz"; + sha512 = "X+8T3GoiwTVlJbicx/sIAF+yuJAqz8VvwJyoMVhwEMoEKE/fkDmrqUgDMyBECcM2A2frVZIUj5HI/ErRXCfOeA=="; }; }; "vscode-languageserver-textdocument-1.0.8" = { @@ -60013,6 +58879,15 @@ let sha512 = "SYU4z1dL0PyIMd4Vj8YOqFvHu7Hz/enbWtpfnVbJHU4Nd1YNYx8u0ennumc6h48GQNeOLxmwySmnADouT/AuZA=="; }; }; + "vscode-languageserver-types-3.17.5" = { + name = "vscode-languageserver-types"; + packageName = "vscode-languageserver-types"; + version = "3.17.5"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz"; + sha512 = "Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg=="; + }; + }; "vscode-languageserver-types-3.5.0" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; @@ -60193,15 +59068,6 @@ let sha512 = "4eRTBZljBfIISK1Vnt69Gvr2w/wc3U6Vtrw7qiN5iqYJPH7LElcYh/iU4XWhdCy2dZqv1ToMyYlybDylfG/5Vg=="; }; }; - "walk-up-path-1.0.0" = { - name = "walk-up-path"; - packageName = "walk-up-path"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/walk-up-path/-/walk-up-path-1.0.0.tgz"; - sha512 = "hwj/qMDUEjCU5h0xr90KGCf0tg0/LgJbmOWgrWKYlcJZM7XvquvUJZ0G/HMGr7F7OQMOUuPHWP9JpriinkAlkg=="; - }; - }; "walk-up-path-3.0.1" = { name = "walk-up-path"; packageName = "walk-up-path"; @@ -60427,24 +59293,6 @@ let sha512 = "JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ=="; }; }; - "webpack-bundle-analyzer-4.9.1" = { - name = "webpack-bundle-analyzer"; - packageName = "webpack-bundle-analyzer"; - version = "4.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.9.1.tgz"; - sha512 = "jnd6EoYrf9yMxCyYDPj8eutJvtjQNp8PHmni/e/ulydHBWhT5J3menXt3HEkScsu9YqMAcG4CfFjs3rj5pVU1w=="; - }; - }; - "webpack-cli-4.10.0" = { - name = "webpack-cli"; - packageName = "webpack-cli"; - version = "4.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.10.0.tgz"; - sha512 = "NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w=="; - }; - }; "webpack-cli-5.1.4" = { name = "webpack-cli"; packageName = "webpack-cli"; @@ -60454,6 +59302,15 @@ let sha512 = "pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg=="; }; }; + "webpack-code-inspector-plugin-0.1.9" = { + name = "webpack-code-inspector-plugin"; + packageName = "webpack-code-inspector-plugin"; + version = "0.1.9"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-code-inspector-plugin/-/webpack-code-inspector-plugin-0.1.9.tgz"; + sha512 = "w4/dvbCVeuhmmY2TnnHSjo7SWXfYicNdjdGU7CixZy8rxyXBSMCdlArSFgxJ/DWctLMWJ5whxIcMNm7twIPi6A=="; + }; + }; "webpack-dev-middleware-5.3.3" = { name = "webpack-dev-middleware"; packageName = "webpack-dev-middleware"; @@ -60661,6 +59518,15 @@ let sha512 = "XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg=="; }; }; + "which-4.0.0" = { + name = "which"; + packageName = "which"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/which/-/which-4.0.0.tgz"; + sha512 = "GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg=="; + }; + }; "which-boxed-primitive-1.0.2" = { name = "which-boxed-primitive"; packageName = "which-boxed-primitive"; @@ -60796,15 +59662,6 @@ let sha512 = "CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ=="; }; }; - "winattr-3.0.0" = { - name = "winattr"; - packageName = "winattr"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/winattr/-/winattr-3.0.0.tgz"; - sha512 = "dt33rYsTYcGbB+I1ubB6ZLODibRSCW//TgY/SuajLllR9kHnHnbUMqnXIe0osYsXUdRLGs770zb3t9z/ScGUpw=="; - }; - }; "window-size-0.1.0" = { name = "window-size"; packageName = "window-size"; @@ -61003,13 +59860,13 @@ let sha512 = "rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw=="; }; }; - "workerd-1.20230904.0" = { + "workerd-1.20230922.0" = { name = "workerd"; packageName = "workerd"; - version = "1.20230904.0"; + version = "1.20230922.0"; src = fetchurl { - url = "https://registry.npmjs.org/workerd/-/workerd-1.20230904.0.tgz"; - sha512 = "t9znszH0rQGK4mJGvF9L3nN0qKEaObAGx0JkywFtAwH8OkSn+YfQbHNZE+YsJ4qa1hOz1DCNEk08UDFRBaYq4g=="; + url = "https://registry.npmjs.org/workerd/-/workerd-1.20230922.0.tgz"; + sha512 = "iFe0tqoHsxgZXCaURVNKYtc0QnWdjORZJ0WzaasdSK4STOwV1aD7yC2v5o3HwnNTaJOpNt7H09AYWKB3y1ju8A=="; }; }; "workerpool-6.2.1" = { @@ -61318,6 +60175,15 @@ let sha512 = "4OOseMUq8AzRBI/7SLMUwO+FEDnguetSk7KMb1sHwvF2w2Wv5Hoj0nlifx8vtGsftE/jWHojPy8sMMzYLJ2G/A=="; }; }; + "ws-8.14.2" = { + name = "ws"; + packageName = "ws"; + version = "8.14.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz"; + sha512 = "wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g=="; + }; + }; "ws-8.5.0" = { name = "ws"; packageName = "ws"; @@ -61354,6 +60220,15 @@ let sha512 = "kCz5k7J7XbJtjABOvkc5lJmkiDh8VhjVCGNiqdKCscmVpdVUpEAyXv1xmCLkQJ5dsHqx3IPO4XW+NTDhU/fatA=="; }; }; + "xdg-app-paths-5.1.0" = { + name = "xdg-app-paths"; + packageName = "xdg-app-paths"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xdg-app-paths/-/xdg-app-paths-5.1.0.tgz"; + sha512 = "RAQ3WkPf4KTU1A8RtFx3gWywzVKe00tfOPFfl2NDGqbIFENQO4kqAJp7mhQjNj/33W5x5hiWWUdyfPq/5SU3QA=="; + }; + }; "xdg-basedir-2.0.0" = { name = "xdg-basedir"; packageName = "xdg-basedir"; @@ -61390,6 +60265,15 @@ let sha512 = "GCPAHLvrIH13+c0SuacwvRYj2SxJXQ4kaVTT5xgL3kPrz56XxkF21IGhjSE1+W0aw7gpBWRGXLCPnPby6lSpmQ=="; }; }; + "xdg-portable-7.3.0" = { + name = "xdg-portable"; + packageName = "xdg-portable"; + version = "7.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xdg-portable/-/xdg-portable-7.3.0.tgz"; + sha512 = "sqMMuL1rc0FmMBOzCpd0yuy9trqF2yTTVe+E9ogwCSWQCdDEtQUwrZPT6AxqtsFGRNxycgncbP/xmOOSPw5ZUw=="; + }; + }; "xdg-trashdir-3.1.0" = { name = "xdg-trashdir"; packageName = "xdg-trashdir"; @@ -61625,15 +60509,6 @@ let sha512 = "QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A=="; }; }; - "xregexp-2.0.0" = { - name = "xregexp"; - packageName = "xregexp"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz"; - sha512 = "xl/50/Cf32VsGq/1R8jJE5ajH1yMCQkpmoS10QbFZWl2Oor4H0Me64Pu2yxvsRWK3m6soJbmGfzSR7BYmDcWAA=="; - }; - }; "xss-1.0.14" = { name = "xss"; packageName = "xss"; @@ -61643,15 +60518,6 @@ let sha512 = "og7TEJhXvn1a7kzZGQ7ETjdQVS2UfZyTlsEdDOqvQF7GoxNfY+0YLCzBy1kPdsDDx4QuNAonQPddpsn6Xl/7sw=="; }; }; - "xstate-4.38.0" = { - name = "xstate"; - packageName = "xstate"; - version = "4.38.0"; - src = fetchurl { - url = "https://registry.npmjs.org/xstate/-/xstate-4.38.0.tgz"; - sha512 = "oFjw2YZPyu6HeO0JWCSqfhAALsjFPURsrD2FUFN3u213dWwYU68RFuLtSHco+cEUhpQFW+hRG3PNYgq8HatudQ=="; - }; - }; "xstate-4.38.2" = { name = "xstate"; packageName = "xstate"; @@ -61877,15 +60743,6 @@ let sha512 = "WUANQeVgjLbNsEmGk20f+nlHgOqzRFpiGWVaBrYGYIGANIIu3lWjoyi0fNlFmJkvfhCZ6BXINe7/W2O2bV4iaA=="; }; }; - "yargs-17.7.1" = { - name = "yargs"; - packageName = "yargs"; - version = "17.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz"; - sha512 = "cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw=="; - }; - }; "yargs-17.7.2" = { name = "yargs"; packageName = "yargs"; @@ -62075,6 +60932,24 @@ let sha512 = "p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g=="; }; }; + "yauzl-clone-1.0.4" = { + name = "yauzl-clone"; + packageName = "yauzl-clone"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/yauzl-clone/-/yauzl-clone-1.0.4.tgz"; + sha512 = "igM2RRCf3k8TvZoxR2oguuw4z1xasOnA31joCqHIyLkeWrvAc2Jgay5ISQ2ZplinkoGaJ6orCz56Ey456c5ESA=="; + }; + }; + "yauzl-promise-2.1.3" = { + name = "yauzl-promise"; + packageName = "yauzl-promise"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/yauzl-promise/-/yauzl-promise-2.1.3.tgz"; + sha512 = "A1pf6fzh6eYkK0L4Qp7g9jzJSDrM6nN0bOn5T0IbY4Yo3w+YkWlHFkJP7mzknMXjqusHFHlKsK2N+4OLsK2MRA=="; + }; + }; "yazl-2.5.1" = { name = "yazl"; packageName = "yazl"; @@ -62093,24 +60968,6 @@ let sha512 = "8HFIh676uyGYP6wP13R/j6OJ/1HwJ46snpvzE7aHAN3Ryqh2yX6Xox2B4CUmTwwOIzlG3Bs7ocsP5dZH/R1Qbg=="; }; }; - "yeoman-environment-3.19.3" = { - name = "yeoman-environment"; - packageName = "yeoman-environment"; - version = "3.19.3"; - src = fetchurl { - url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-3.19.3.tgz"; - sha512 = "/+ODrTUHtlDPRH9qIC0JREH8+7nsRcjDl3Bxn2Xo/rvAaVvixH5275jHwg0C85g4QsF4P6M2ojfScPPAl+pLAg=="; - }; - }; - "yeoman-generator-5.9.0" = { - name = "yeoman-generator"; - packageName = "yeoman-generator"; - version = "5.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yeoman-generator/-/yeoman-generator-5.9.0.tgz"; - sha512 = "sN1e01Db4fdd8P/n/yYvizfy77HdbwzvXmPxps9Gwz2D24slegrkSn+qyj+0nmZhtFwGX2i/cH29QDrvAFT9Aw=="; - }; - }; "yn-3.1.1" = { name = "yn"; packageName = "yn"; @@ -62156,22 +61013,13 @@ let sha512 = "N+d4UJSJbt/R3wqY7Coqs5pcV0aUj2j9IaQ3rNj9bVCLld8tTGKRa2USARjnvZJWVx1NDmQev8EknoczaOQDOA=="; }; }; - "yosay-2.0.2" = { - name = "yosay"; - packageName = "yosay"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/yosay/-/yosay-2.0.2.tgz"; - sha512 = "avX6nz2esp7IMXGag4gu6OyQBsMh/SEn+ZybGu3yKPlOTE6z9qJrzG/0X5vCq/e0rPFy0CUYCze0G5hL310ibA=="; - }; - }; - "youch-3.3.1" = { + "youch-3.3.2" = { name = "youch"; packageName = "youch"; - version = "3.3.1"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/youch/-/youch-3.3.1.tgz"; - sha512 = "Rg9ioi+AkKyje2Hk4qILSVvayaFW98KTsOJ4aIkjDf97LZX5WJVIHZmFLnM4ThcVofHo/fbbwtYajfBPHFOVtg=="; + url = "https://registry.npmjs.org/youch/-/youch-3.3.2.tgz"; + sha512 = "9cwz/z7abtcHOIuH45nzmUFCZbyJA1nLqlirKvyNRx4wDMhqsBaifAJzBej7L4fsVPjFxYq3NK3GAcfvZsydFw=="; }; }; "yurnalist-2.1.0" = { @@ -62228,15 +61076,6 @@ let sha512 = "9qv4rlDiopXg4E69k+vMHjNN63YFMe9sZMrdlvKnCjlCRWeCBswPPMPUfx+ipsAWq1LXHe70RcbaHdJJpS6hyQ=="; }; }; - "zip-stream-5.0.1" = { - name = "zip-stream"; - packageName = "zip-stream"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/zip-stream/-/zip-stream-5.0.1.tgz"; - sha512 = "UfZ0oa0C8LI58wJ+moL46BDIMgCQbnsb+2PoiJYtonhBsMh2bq1eRBVkvjfVsqbEHd9/EgKPUuL9saSSsec8OA=="; - }; - }; "zod-1.11.17" = { name = "zod"; packageName = "zod"; @@ -62273,13 +61112,13 @@ let sha512 = "fjUZh4nQ1s6HMccgIeE0VP4QG/YRGPmyjO9sAh890aQKPEk3nqbfUXhMFaC+Dr5KvYBm8BCyvfpZf2jY9aGSsw=="; }; }; - "zwave-js-11.14.2" = { + "zwave-js-12.0.2" = { name = "zwave-js"; packageName = "zwave-js"; - version = "11.14.2"; + version = "12.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/zwave-js/-/zwave-js-11.14.2.tgz"; - sha512 = "pc3AFz5woXoFW4Wl+9WV/AAKxxvyNTUSv7+dZmK0+mBpAsm4pe1MaGuw0K1k/EPesdhL5mKaHNRCtmMenvXTRg=="; + url = "https://registry.npmjs.org/zwave-js/-/zwave-js-12.0.2.tgz"; + sha512 = "csC3CCU6qcq3tzDgePoA6ZSMvrkDyxsf95rshg8fF8lbqjFdOwSxB+O2HUEkr6DDyzkO4GA+lMsdUei/OSnejQ=="; }; }; "zwitch-1.0.5" = { @@ -62306,15 +61145,15 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "16.2.2"; + version = "16.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-16.2.2.tgz"; - sha512 = "PmhR/NMVVCiATXxHLkVCV781Q5aa5DaYye9+plZGX3rdKTilEunRNIfT13w7IuRfa0K/pKZj6PJU1S6yb7sqZg=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-16.2.4.tgz"; + sha512 = "OjnlQ2wzhkc1q3iDbWtLeaXoPzS0BtevazT7vmB/MiNVgjDcF3bPFQTcBBvtWAF0wN9jgPC712X8ucwdEAOMlg=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1602.2" - sources."@angular-devkit/core-16.2.2" - sources."@angular-devkit/schematics-16.2.2" + sources."@angular-devkit/architect-0.1602.4" + sources."@angular-devkit/core-16.2.4" + sources."@angular-devkit/schematics-16.2.4" (sources."@isaacs/cliui-8.0.2" // { dependencies = [ sources."ansi-regex-6.0.1" @@ -62332,7 +61171,7 @@ in sources."@npmcli/node-gyp-3.0.0" sources."@npmcli/promise-spawn-6.0.2" sources."@npmcli/run-script-6.0.2" - sources."@schematics/angular-16.2.2" + sources."@schematics/angular-16.2.4" sources."@sigstore/bundle-1.1.0" sources."@sigstore/protobuf-specs-0.2.1" sources."@sigstore/sign-1.0.0" @@ -62370,9 +61209,9 @@ in (sources."cacache-17.1.4" // { dependencies = [ sources."brace-expansion-2.0.1" - sources."glob-10.3.4" + sources."glob-10.3.10" sources."minimatch-9.0.3" - sources."minipass-7.0.3" + sources."minipass-7.0.4" ]; }) sources."chalk-4.1.2" @@ -62421,7 +61260,7 @@ in }) (sources."fs-minipass-3.0.3" // { dependencies = [ - sources."minipass-7.0.3" + sources."minipass-7.0.4" ]; }) sources."fs.realpath-1.0.0" @@ -62467,7 +61306,7 @@ in sources."is-unicode-supported-0.1.0" sources."is-wsl-2.2.0" sources."isexe-2.0.0" - sources."jackspeak-2.3.3" + sources."jackspeak-2.3.6" sources."json-parse-even-better-errors-3.0.0" sources."json-schema-traverse-1.0.0" sources."jsonc-parser-3.2.0" @@ -62487,7 +61326,7 @@ in }) (sources."minipass-fetch-3.0.4" // { dependencies = [ - sources."minipass-7.0.3" + sources."minipass-7.0.4" ]; }) (sources."minipass-flush-1.0.5" // { @@ -62558,7 +61397,7 @@ in (sources."read-package-json-6.0.4" // { dependencies = [ sources."brace-expansion-2.0.1" - sources."glob-10.3.4" + sources."glob-10.3.10" sources."minimatch-9.0.3" ]; }) @@ -62592,10 +61431,10 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.13" + sources."spdx-license-ids-3.0.15" (sources."ssri-10.0.5" // { dependencies = [ - sources."minipass-7.0.3" + sources."minipass-7.0.4" ]; }) sources."string-width-4.2.3" @@ -62730,7 +61569,7 @@ in sources."volar-service-prettier-0.0.13" sources."volar-service-typescript-0.0.13" sources."volar-service-typescript-twoslash-queries-0.0.13" - (sources."vscode-css-languageservice-6.2.7" // { + (sources."vscode-css-languageservice-6.2.9" // { dependencies = [ sources."@vscode/l10n-0.0.16" ]; @@ -62741,9 +61580,18 @@ in ]; }) sources."vscode-jsonrpc-8.1.0" - sources."vscode-languageserver-8.1.0" - sources."vscode-languageserver-protocol-3.17.3" - sources."vscode-languageserver-textdocument-1.0.10" + (sources."vscode-languageserver-8.1.0" // { + dependencies = [ + sources."vscode-languageserver-protocol-3.17.3" + ]; + }) + (sources."vscode-languageserver-protocol-3.17.5" // { + dependencies = [ + sources."vscode-jsonrpc-8.2.0" + sources."vscode-languageserver-types-3.17.5" + ]; + }) + sources."vscode-languageserver-textdocument-1.0.11" sources."vscode-languageserver-types-3.17.3" sources."vscode-nls-5.2.0" sources."vscode-uri-3.0.7" @@ -62762,42 +61610,42 @@ in "@babel/cli" = nodeEnv.buildNodePackage { name = "_at_babel_slash_cli"; packageName = "@babel/cli"; - version = "7.22.15"; + version = "7.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/cli/-/cli-7.22.15.tgz"; - sha512 = "prtg5f6zCERIaECeTZzd2fMtVjlfjhUcO+fBLQ6DXXdq5FljN+excVitJ2nogsusdf31LeqkjAfXZ7Xq+HmN8g=="; + url = "https://registry.npmjs.org/@babel/cli/-/cli-7.23.0.tgz"; + sha512 = "17E1oSkGk2IwNILM4jtfAvgjt+ohmpfBky8aLerUfYZhiPNg7ca+CRCxZn8QDxwNhV/upsc2VHBCqGFIR+iBfA=="; }; dependencies = [ sources."@ampproject/remapping-2.2.1" sources."@babel/code-frame-7.22.13" - sources."@babel/compat-data-7.22.9" - (sources."@babel/core-7.22.19" // { + sources."@babel/compat-data-7.22.20" + (sources."@babel/core-7.23.0" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."@babel/generator-7.22.15" + sources."@babel/generator-7.23.0" (sources."@babel/helper-compilation-targets-7.22.15" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."@babel/helper-environment-visitor-7.22.5" - sources."@babel/helper-function-name-7.22.5" + sources."@babel/helper-environment-visitor-7.22.20" + sources."@babel/helper-function-name-7.23.0" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-module-imports-7.22.15" - sources."@babel/helper-module-transforms-7.22.19" + sources."@babel/helper-module-transforms-7.23.0" sources."@babel/helper-simple-access-7.22.5" sources."@babel/helper-split-export-declaration-7.22.6" sources."@babel/helper-string-parser-7.22.5" - sources."@babel/helper-validator-identifier-7.22.19" + sources."@babel/helper-validator-identifier-7.22.20" sources."@babel/helper-validator-option-7.22.15" - sources."@babel/helpers-7.22.15" - sources."@babel/highlight-7.22.13" - sources."@babel/parser-7.22.16" + sources."@babel/helpers-7.23.1" + sources."@babel/highlight-7.22.20" + sources."@babel/parser-7.23.0" sources."@babel/template-7.22.15" - sources."@babel/traverse-7.22.19" - sources."@babel/types-7.22.19" + sources."@babel/traverse-7.23.0" + sources."@babel/types-7.23.0" sources."@jridgewell/gen-mapping-0.3.3" sources."@jridgewell/resolve-uri-3.1.1" sources."@jridgewell/set-array-1.1.2" @@ -62806,16 +61654,16 @@ in sources."ansi-styles-3.2.1" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.21.10" - sources."caniuse-lite-1.0.30001534" + sources."browserslist-4.22.1" + sources."caniuse-lite-1.0.30001542" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."commander-4.1.1" sources."concat-map-0.0.1" - sources."convert-source-map-1.9.0" + sources."convert-source-map-2.0.0" sources."debug-4.3.4" - sources."electron-to-chromium-1.4.523" + sources."electron-to-chromium-1.4.538" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" sources."fs-readdir-recursive-1.1.0" @@ -62842,7 +61690,7 @@ in sources."slash-2.0.0" sources."supports-color-5.5.0" sources."to-fast-properties-2.0.0" - sources."update-browserslist-db-1.0.11" + sources."update-browserslist-db-1.0.13" sources."wrappy-1.0.2" sources."yallist-3.1.1" ]; @@ -62859,10 +61707,10 @@ in "@commitlint/cli" = nodeEnv.buildNodePackage { name = "_at_commitlint_slash_cli"; packageName = "@commitlint/cli"; - version = "17.7.1"; + version = "17.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/cli/-/cli-17.7.1.tgz"; - sha512 = "BCm/AT06SNCQtvFv921iNhudOHuY16LswT0R3OeolVGLk8oP+Rk9TfQfgjH7QPMjhvp76bNqGFEcpKojxUNW1g=="; + url = "https://registry.npmjs.org/@commitlint/cli/-/cli-17.7.2.tgz"; + sha512 = "t3N7TZq7lOeqTOyEgfGcaltHqEJf7YDlPg75MldeVPPyz14jZq/+mbGF9tueDLFX8R6RwdymrN6D+U5XwZ8Iwg=="; }; dependencies = [ (sources."@babel/code-frame-7.22.13" // { @@ -62875,8 +61723,8 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/helper-validator-identifier-7.22.19" - (sources."@babel/highlight-7.22.13" // { + sources."@babel/helper-validator-identifier-7.22.20" + (sources."@babel/highlight-7.22.20" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -62892,7 +61740,7 @@ in sources."@commitlint/format-17.4.4" sources."@commitlint/is-ignored-17.7.0" sources."@commitlint/lint-17.7.0" - sources."@commitlint/load-17.7.1" + sources."@commitlint/load-17.7.2" sources."@commitlint/message-17.4.2" sources."@commitlint/parse-17.7.0" sources."@commitlint/read-17.5.1" @@ -62912,27 +61760,18 @@ in sources."@jridgewell/resolve-uri-3.1.1" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.9" - sources."@swc/core-1.3.85" - sources."@swc/core-darwin-arm64-1.3.85" - sources."@swc/core-darwin-x64-1.3.85" - sources."@swc/core-linux-arm-gnueabihf-1.3.85" - sources."@swc/core-linux-arm64-gnu-1.3.85" - sources."@swc/core-linux-arm64-musl-1.3.85" - sources."@swc/core-linux-x64-gnu-1.3.85" - sources."@swc/core-linux-x64-musl-1.3.85" - sources."@swc/core-win32-arm64-msvc-1.3.85" - sources."@swc/core-win32-ia32-msvc-1.3.85" - sources."@swc/core-win32-x64-msvc-1.3.85" + sources."@swc/core-1.3.91" + sources."@swc/counter-0.1.2" sources."@swc/helpers-0.5.2" - sources."@swc/types-0.1.4" - sources."@swc/wasm-1.3.85" + sources."@swc/types-0.1.5" + sources."@swc/wasm-1.3.91" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/minimist-1.2.2" - sources."@types/node-20.4.7" - sources."@types/normalize-package-data-2.4.1" + sources."@types/minimist-1.2.3" + sources."@types/node-20.5.1" + sources."@types/normalize-package-data-2.4.2" sources."JSONStream-1.3.5" sources."acorn-8.10.0" sources."acorn-walk-8.2.0" @@ -63061,7 +61900,7 @@ in sources."redent-3.0.0" sources."require-directory-2.1.1" sources."require-from-string-2.0.2" - sources."resolve-1.22.5" + sources."resolve-1.22.6" sources."resolve-from-5.0.0" sources."resolve-global-1.0.0" sources."safe-buffer-5.2.1" @@ -63072,7 +61911,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.13" + sources."spdx-license-ids-3.0.15" sources."split2-3.2.2" sources."string-width-4.2.3" sources."string_decoder-1.3.0" @@ -63142,1290 +61981,13 @@ in bypassCache = true; reconstructLock = true; }; - "@forge/cli" = nodeEnv.buildNodePackage { - name = "_at_forge_slash_cli"; - packageName = "@forge/cli"; - version = "6.17.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@forge/cli/-/cli-6.17.0.tgz"; - sha512 = "bMI+dVl2IEzVm8x2urZhfHemE6fqoo+UxRYzMT0Ga7MDOCxGSS6uMDUGfOKpYVwF10j7Pe4BrtoHxBEp7BhG7Q=="; - }; - dependencies = [ - sources."@ampproject/remapping-2.2.1" - (sources."@apidevtools/json-schema-ref-parser-9.0.9" // { - dependencies = [ - sources."argparse-2.0.1" - sources."js-yaml-4.1.0" - ]; - }) - sources."@babel/code-frame-7.22.13" - sources."@babel/compat-data-7.22.9" - (sources."@babel/core-7.22.19" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) - sources."@babel/generator-7.22.15" - sources."@babel/helper-annotate-as-pure-7.22.5" - (sources."@babel/helper-compilation-targets-7.22.15" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) - (sources."@babel/helper-create-class-features-plugin-7.22.15" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) - sources."@babel/helper-environment-visitor-7.22.5" - sources."@babel/helper-function-name-7.22.5" - sources."@babel/helper-hoist-variables-7.22.5" - sources."@babel/helper-member-expression-to-functions-7.22.15" - sources."@babel/helper-module-imports-7.22.15" - sources."@babel/helper-module-transforms-7.22.19" - sources."@babel/helper-optimise-call-expression-7.22.5" - sources."@babel/helper-plugin-utils-7.22.5" - sources."@babel/helper-replace-supers-7.22.9" - sources."@babel/helper-simple-access-7.22.5" - sources."@babel/helper-skip-transparent-expression-wrappers-7.22.5" - sources."@babel/helper-split-export-declaration-7.22.6" - sources."@babel/helper-string-parser-7.22.5" - sources."@babel/helper-validator-identifier-7.22.19" - sources."@babel/helper-validator-option-7.22.15" - sources."@babel/helpers-7.22.15" - sources."@babel/highlight-7.22.13" - sources."@babel/parser-7.22.16" - sources."@babel/plugin-syntax-class-static-block-7.14.5" - sources."@babel/plugin-syntax-jsx-7.22.5" - sources."@babel/plugin-syntax-numeric-separator-7.10.4" - sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-typescript-7.22.5" - sources."@babel/plugin-transform-class-properties-7.22.5" - sources."@babel/plugin-transform-class-static-block-7.22.11" - sources."@babel/plugin-transform-modules-commonjs-7.22.15" - sources."@babel/plugin-transform-numeric-separator-7.22.11" - sources."@babel/plugin-transform-optional-chaining-7.22.15" - sources."@babel/plugin-transform-react-jsx-7.22.15" - sources."@babel/plugin-transform-typescript-7.22.15" - sources."@babel/preset-typescript-7.22.15" - sources."@babel/template-7.22.15" - sources."@babel/traverse-7.22.19" - sources."@babel/types-7.22.19" - sources."@colors/colors-1.5.0" - (sources."@cspotcode/source-map-support-0.8.1" // { - dependencies = [ - sources."@jridgewell/trace-mapping-0.3.9" - ]; - }) - sources."@discoveryjs/json-ext-0.5.7" - sources."@forge/api-2.19.0" - sources."@forge/auth-0.0.5" - sources."@forge/babel-plugin-transform-ui-1.1.7" - sources."@forge/bundler-4.12.0" - sources."@forge/cli-shared-3.18.0" - sources."@forge/csp-2.2.1" - (sources."@forge/egress-1.2.4" // { - dependencies = [ - sources."brace-expansion-2.0.1" - sources."minimatch-5.1.6" - ]; - }) - sources."@forge/lint-3.6.6" - sources."@forge/manifest-4.20.0" - sources."@forge/node-runtime-0.1.2" - sources."@forge/runtime-5.0.1" - sources."@forge/storage-1.5.8" - sources."@forge/tunnel-3.7.0" - sources."@forge/util-1.3.1" - sources."@jridgewell/gen-mapping-0.3.3" - sources."@jridgewell/resolve-uri-3.1.1" - sources."@jridgewell/set-array-1.1.2" - sources."@jridgewell/source-map-0.3.5" - sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@jridgewell/trace-mapping-0.3.19" - sources."@jsdevtools/ono-7.1.3" - sources."@leichtgewicht/ip-codec-2.0.4" - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - sources."@polka/url-1.0.0-next.23" - sources."@sentry-internal/tracing-7.69.0" - sources."@sentry/core-7.69.0" - (sources."@sentry/node-7.69.0" // { - dependencies = [ - sources."cookie-0.4.2" - ]; - }) - sources."@sentry/types-7.69.0" - sources."@sentry/utils-7.69.0" - sources."@sindresorhus/is-4.6.0" - sources."@swc/core-1.3.85" - sources."@swc/core-darwin-arm64-1.3.85" - sources."@swc/core-darwin-x64-1.3.85" - sources."@swc/core-linux-arm-gnueabihf-1.3.85" - sources."@swc/core-linux-arm64-gnu-1.3.85" - sources."@swc/core-linux-arm64-musl-1.3.85" - sources."@swc/core-linux-x64-gnu-1.3.85" - sources."@swc/core-linux-x64-musl-1.3.85" - sources."@swc/core-win32-arm64-msvc-1.3.85" - sources."@swc/core-win32-ia32-msvc-1.3.85" - sources."@swc/core-win32-x64-msvc-1.3.85" - sources."@swc/helpers-0.5.2" - sources."@swc/types-0.1.4" - sources."@swc/wasm-1.3.85" - sources."@szmarczak/http-timer-4.0.6" - sources."@tsconfig/node10-1.0.9" - sources."@tsconfig/node12-1.0.11" - sources."@tsconfig/node14-1.0.3" - sources."@tsconfig/node16-1.0.4" - sources."@types/body-parser-1.19.3" - sources."@types/bonjour-3.5.11" - sources."@types/cacheable-request-6.0.3" - sources."@types/connect-3.4.36" - sources."@types/connect-history-api-fallback-1.5.1" - sources."@types/eslint-8.44.2" - sources."@types/eslint-scope-3.7.4" - sources."@types/estree-1.0.1" - sources."@types/express-4.17.17" - sources."@types/express-serve-static-core-4.17.36" - sources."@types/html-minifier-terser-6.1.0" - sources."@types/http-cache-semantics-4.0.1" - sources."@types/http-errors-2.0.1" - sources."@types/http-proxy-1.17.11" - sources."@types/json-schema-7.0.12" - sources."@types/keyv-3.1.4" - sources."@types/mime-1.3.2" - sources."@types/node-20.6.1" - (sources."@types/node-fetch-2.6.5" // { - dependencies = [ - sources."form-data-4.0.0" - ]; - }) - sources."@types/qs-6.9.8" - sources."@types/range-parser-1.2.4" - sources."@types/responselike-1.0.0" - sources."@types/retry-0.12.0" - sources."@types/send-0.17.1" - sources."@types/serve-index-1.9.1" - sources."@types/serve-static-1.15.2" - sources."@types/sockjs-0.3.33" - sources."@types/ws-8.5.5" - sources."@types/yauzl-2.10.0" - sources."@typescript-eslint/types-5.62.0" - sources."@typescript-eslint/typescript-estree-5.62.0" - sources."@typescript-eslint/visitor-keys-5.62.0" - sources."@webassemblyjs/ast-1.11.6" - sources."@webassemblyjs/floating-point-hex-parser-1.11.6" - sources."@webassemblyjs/helper-api-error-1.11.6" - sources."@webassemblyjs/helper-buffer-1.11.6" - sources."@webassemblyjs/helper-numbers-1.11.6" - sources."@webassemblyjs/helper-wasm-bytecode-1.11.6" - sources."@webassemblyjs/helper-wasm-section-1.11.6" - sources."@webassemblyjs/ieee754-1.11.6" - sources."@webassemblyjs/leb128-1.11.6" - sources."@webassemblyjs/utf8-1.11.6" - sources."@webassemblyjs/wasm-edit-1.11.6" - sources."@webassemblyjs/wasm-gen-1.11.6" - sources."@webassemblyjs/wasm-opt-1.11.6" - sources."@webassemblyjs/wasm-parser-1.11.6" - sources."@webassemblyjs/wast-printer-1.11.6" - sources."@webpack-cli/configtest-1.2.0" - sources."@webpack-cli/info-1.5.0" - sources."@webpack-cli/serve-1.7.0" - sources."@xtuc/ieee754-1.2.0" - sources."@xtuc/long-4.2.2" - sources."accepts-1.3.8" - sources."acorn-8.10.0" - sources."acorn-import-assertions-1.9.0" - sources."acorn-walk-8.2.0" - sources."adm-zip-0.5.10" - sources."agent-base-6.0.2" - (sources."ajv-8.12.0" // { - dependencies = [ - sources."json-schema-traverse-1.0.0" - ]; - }) - sources."ajv-formats-2.1.1" - (sources."ajv-keywords-3.5.2" // { - dependencies = [ - sources."ajv-6.12.6" - ]; - }) - sources."ansi-escapes-4.3.2" - sources."ansi-html-community-0.0.8" - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."any-promise-1.3.0" - sources."anymatch-3.1.3" - (sources."archiver-6.0.1" // { - dependencies = [ - sources."tar-stream-3.1.6" - ]; - }) - (sources."archiver-utils-4.0.1" // { - dependencies = [ - sources."brace-expansion-2.0.1" - sources."glob-8.1.0" - sources."minimatch-5.1.6" - ]; - }) - sources."arg-4.1.3" - sources."argparse-1.0.10" - sources."array-buffer-byte-length-1.0.0" - sources."array-flatten-1.1.1" - sources."array-union-2.1.0" - sources."array.prototype.flatmap-1.3.2" - sources."arraybuffer.prototype.slice-1.0.2" - (sources."asn1.js-5.4.1" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - sources."assert-2.1.0" - sources."async-3.2.4" - sources."async-request-handler-0.9.0" - sources."asynckit-0.4.0" - sources."atlassian-openapi-1.0.17" - sources."atomically-1.7.0" - sources."available-typed-arrays-1.0.5" - sources."b4a-1.6.4" - sources."babel-loader-8.3.0" - sources."balanced-match-1.0.2" - sources."base64-js-1.5.1" - sources."batch-0.6.1" - sources."big.js-5.2.2" - sources."binary-extensions-2.2.0" - (sources."bl-4.1.0" // { - dependencies = [ - sources."buffer-5.7.1" - ]; - }) - sources."bn.js-5.2.1" - (sources."body-parser-1.20.1" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - sources."qs-6.11.0" - ]; - }) - (sources."bonjour-service-1.1.1" // { - dependencies = [ - sources."array-flatten-2.1.2" - ]; - }) - sources."boolbase-1.0.0" - sources."brace-expansion-1.1.11" - sources."braces-3.0.2" - sources."brorand-1.1.0" - sources."browserify-aes-1.2.0" - sources."browserify-cipher-1.0.1" - sources."browserify-des-1.0.2" - sources."browserify-rsa-4.1.0" - sources."browserify-sign-4.2.1" - sources."browserify-zlib-0.2.0" - sources."browserslist-4.21.10" - sources."buffer-6.0.3" - sources."buffer-crc32-0.2.13" - sources."buffer-from-1.1.2" - sources."buffer-xor-1.0.3" - sources."bufferutil-4.0.7" - sources."bytes-3.1.2" - sources."cacheable-lookup-5.0.4" - sources."cacheable-request-7.0.4" - sources."call-bind-1.0.2" - sources."call-me-maybe-1.0.2" - sources."camel-case-4.1.2" - sources."caniuse-lite-1.0.30001534" - sources."case-1.6.3" - (sources."chalk-2.4.2" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."escape-string-regexp-1.0.5" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" - ]; - }) - sources."chardet-0.7.0" - (sources."cheerio-0.22.0" // { - dependencies = [ - sources."css-select-1.2.0" - sources."css-what-2.1.3" - sources."dom-serializer-0.1.1" - sources."domelementtype-1.3.1" - sources."domhandler-2.4.2" - sources."domutils-1.5.1" - sources."entities-1.1.2" - sources."htmlparser2-3.10.1" - sources."nth-check-1.0.2" - ]; - }) - sources."chokidar-3.5.3" - sources."chownr-1.1.4" - sources."chrome-trace-event-1.0.3" - sources."cipher-base-1.0.4" - sources."clean-css-5.3.2" - sources."cli-color-2.0.3" - sources."cli-cursor-3.1.0" - sources."cli-spinners-2.9.1" - sources."cli-table3-0.6.3" - sources."cli-width-3.0.0" - (sources."cliui-8.0.1" // { - dependencies = [ - sources."wrap-ansi-7.0.0" - ]; - }) - sources."clone-1.0.4" - (sources."clone-deep-4.0.1" // { - dependencies = [ - sources."is-plain-object-2.0.4" - ]; - }) - (sources."clone-response-1.0.3" // { - dependencies = [ - sources."mimic-response-1.0.1" - ]; - }) - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."colorette-2.0.20" - sources."combined-stream-1.0.8" - sources."command-exists-1.2.9" - sources."commander-11.0.0" - sources."commondir-1.0.1" - sources."compress-commons-5.0.1" - sources."compressible-2.0.18" - (sources."compression-1.7.4" // { - dependencies = [ - sources."bytes-3.0.0" - sources."debug-2.6.9" - sources."ms-2.0.0" - sources."safe-buffer-5.1.2" - ]; - }) - sources."concat-map-0.0.1" - sources."conf-10.2.0" - sources."connect-history-api-fallback-2.0.0" - sources."console-browserify-1.2.0" - sources."content-disposition-0.5.4" - sources."content-security-policy-parser-0.4.1" - sources."content-type-1.0.5" - sources."convert-source-map-1.9.0" - sources."cookie-0.5.0" - sources."cookie-signature-1.0.6" - sources."core-util-is-1.0.3" - sources."crc-32-1.2.2" - sources."crc32-stream-5.0.0" - (sources."create-ecdh-4.0.4" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - sources."create-hash-1.2.0" - sources."create-hmac-1.1.7" - sources."create-require-1.1.1" - sources."cross-fetch-3.1.8" - sources."cross-spawn-7.0.3" - sources."crypto-browserify-3.12.0" - sources."css-select-4.3.0" - sources."css-what-6.1.0" - sources."d-1.0.1" - sources."dayjs-1.11.9" - sources."debounce-fn-4.0.0" - sources."debug-4.3.4" - sources."decompress-response-6.0.0" - sources."deep-extend-0.6.0" - sources."default-gateway-6.0.3" - sources."defaults-1.0.4" - sources."defer-to-connect-2.0.1" - sources."define-data-property-1.1.0" - sources."define-lazy-prop-2.0.0" - sources."define-properties-1.2.1" - sources."delayed-stream-1.0.0" - sources."depd-2.0.0" - sources."des.js-1.1.0" - sources."destroy-1.2.0" - sources."detect-libc-2.0.2" - sources."detect-node-2.1.0" - sources."didyoumean-1.2.2" - sources."diff-4.0.2" - (sources."diffie-hellman-5.0.3" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - sources."dir-glob-3.0.1" - sources."dns-equal-1.0.0" - sources."dns-packet-5.6.1" - sources."dom-converter-0.2.0" - sources."dom-serializer-1.4.1" - sources."domelementtype-2.3.0" - sources."domhandler-4.3.1" - sources."domutils-2.8.0" - sources."dot-case-3.0.4" - sources."dot-prop-6.0.1" - sources."duplexer-0.1.2" - sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.523" - (sources."elliptic-6.5.4" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - sources."emoji-regex-8.0.0" - sources."emojis-list-3.0.0" - sources."encodeurl-1.0.2" - (sources."encoding-0.1.13" // { - dependencies = [ - sources."iconv-lite-0.6.3" - ]; - }) - sources."end-of-stream-1.4.4" - sources."enhanced-resolve-5.15.0" - sources."entities-2.2.0" - sources."env-paths-2.2.1" - sources."envinfo-7.10.0" - sources."es-abstract-1.22.2" - sources."es-module-lexer-1.3.1" - sources."es-set-tostringtag-2.0.1" - sources."es-shim-unscopables-1.0.0" - sources."es-to-primitive-1.2.1" - sources."es5-ext-0.10.62" - sources."es6-iterator-2.0.3" - sources."es6-symbol-3.1.3" - sources."es6-weak-map-2.0.3" - sources."escalade-3.1.1" - sources."escape-html-1.0.3" - sources."escape-string-regexp-4.0.0" - sources."eslint-scope-5.1.1" - sources."eslint-visitor-keys-3.4.3" - sources."esprima-4.0.1" - (sources."esrecurse-4.3.0" // { - dependencies = [ - sources."estraverse-5.3.0" - ]; - }) - sources."estraverse-4.3.0" - sources."etag-1.8.1" - sources."event-emitter-0.3.5" - sources."eventemitter3-4.0.7" - sources."events-3.3.0" - sources."evp_bytestokey-1.0.3" - (sources."execa-5.1.1" // { - dependencies = [ - sources."get-stream-6.0.1" - ]; - }) - sources."expand-template-2.0.3" - (sources."express-4.18.2" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - sources."qs-6.11.0" - ]; - }) - sources."express-intercept-1.1.0" - (sources."ext-1.7.0" // { - dependencies = [ - sources."type-2.7.2" - ]; - }) - (sources."external-editor-3.1.0" // { - dependencies = [ - sources."tmp-0.0.33" - ]; - }) - sources."extract-files-9.0.0" - sources."extract-zip-2.0.1" - sources."fast-deep-equal-3.1.3" - sources."fast-fifo-1.3.2" - sources."fast-glob-3.3.1" - sources."fast-json-stable-stringify-2.1.0" - sources."fastest-levenshtein-1.0.16" - sources."fastq-1.15.0" - sources."faye-websocket-0.11.4" - sources."fd-slicer-1.1.0" - (sources."figures-3.2.0" // { - dependencies = [ - sources."escape-string-regexp-1.0.5" - ]; - }) - sources."fill-range-7.0.1" - (sources."finalhandler-1.2.0" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - sources."find-cache-dir-3.3.2" - sources."find-up-4.1.0" - sources."follow-redirects-1.15.2" - sources."for-each-0.3.3" - sources."form-data-3.0.1" - sources."forwarded-0.2.0" - sources."fp-ts-2.16.1" - sources."fresh-0.5.2" - sources."fs-constants-1.0.0" - sources."fs-extra-8.1.0" - sources."fs-monkey-1.0.4" - sources."fs.realpath-1.0.0" - sources."fsevents-2.3.3" - sources."fswin-3.23.311" - sources."function-bind-1.1.1" - sources."function.prototype.name-1.1.6" - sources."functions-have-names-1.2.3" - sources."gar-1.0.4" - sources."gensync-1.0.0-beta.2" - sources."get-caller-file-2.0.5" - sources."get-folder-size-2.0.1" - sources."get-intrinsic-1.2.1" - sources."get-stream-5.2.0" - sources."get-symbol-description-1.0.0" - sources."github-from-package-0.0.0" - sources."glob-7.2.3" - sources."glob-parent-5.1.2" - sources."glob-to-regexp-0.4.1" - sources."globals-11.12.0" - sources."globalthis-1.0.3" - sources."globby-11.1.0" - sources."gopd-1.0.1" - sources."got-11.8.6" - sources."graceful-fs-4.2.11" - sources."graphql-15.8.0" - sources."graphql-request-3.7.0" - sources."gzip-size-6.0.0" - sources."handle-thing-2.0.1" - sources."has-1.0.3" - sources."has-bigints-1.0.2" - sources."has-flag-4.0.0" - sources."has-property-descriptors-1.0.0" - sources."has-proto-1.0.1" - sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" - sources."hash-base-3.1.0" - sources."hash.js-1.1.7" - sources."he-1.2.0" - sources."hidefile-3.0.0" - sources."hmac-drbg-1.0.1" - (sources."hpack.js-2.1.6" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.8" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) - sources."hpagent-0.1.2" - sources."html-entities-2.4.0" - (sources."html-minifier-terser-6.1.0" // { - dependencies = [ - sources."commander-8.3.0" - ]; - }) - sources."html-webpack-plugin-5.5.3" - sources."htmlparser2-6.1.0" - sources."http-cache-semantics-4.1.1" - sources."http-deceiver-1.2.7" - sources."http-errors-2.0.0" - sources."http-parser-js-0.5.8" - sources."http-proxy-1.18.1" - sources."http-proxy-middleware-1.3.1" - sources."http2-wrapper-1.0.3" - sources."https-proxy-agent-5.0.1" - sources."human-signals-2.1.0" - sources."iconv-lite-0.4.24" - sources."ieee754-1.2.1" - sources."ignore-5.2.4" - sources."ignore-walk-3.0.4" - sources."import-local-3.1.0" - sources."imurmurhash-0.1.4" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ini-1.3.8" - (sources."inquirer-8.2.6" // { - dependencies = [ - sources."chalk-4.1.2" - sources."ora-5.4.1" - ]; - }) - sources."internal-slot-1.0.5" - sources."interpret-2.2.0" - sources."io-ts-2.2.20" - sources."io-ts-reporters-1.2.2" - sources."ipaddr.js-1.9.1" - sources."is-arguments-1.1.1" - sources."is-array-buffer-3.0.2" - sources."is-bigint-1.0.4" - sources."is-binary-path-2.1.0" - sources."is-boolean-object-1.1.2" - sources."is-callable-1.2.7" - sources."is-core-module-2.13.0" - sources."is-date-object-1.0.5" - sources."is-docker-2.2.1" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-generator-function-1.0.10" - sources."is-glob-4.0.3" - sources."is-interactive-1.0.0" - sources."is-nan-1.3.2" - sources."is-negative-zero-2.0.2" - sources."is-number-7.0.0" - sources."is-number-object-1.0.7" - sources."is-obj-2.0.0" - sources."is-plain-obj-3.0.0" - sources."is-plain-object-5.0.0" - sources."is-promise-2.2.2" - sources."is-regex-1.1.4" - sources."is-shared-array-buffer-1.0.2" - sources."is-stream-2.0.1" - sources."is-string-1.0.7" - sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.12" - sources."is-unicode-supported-0.1.0" - sources."is-weakref-1.0.2" - sources."is-wsl-2.2.0" - sources."isarray-2.0.5" - sources."isexe-2.0.0" - sources."isobject-3.0.1" - (sources."jest-worker-27.5.1" // { - dependencies = [ - sources."supports-color-8.1.1" - ]; - }) - sources."js-tokens-4.0.0" - sources."js-yaml-3.14.1" - sources."jsesc-2.5.2" - sources."json-buffer-3.0.1" - sources."json-parse-even-better-errors-2.3.1" - sources."json-schema-ref-parser-9.0.9" - sources."json-schema-to-typescript-9.1.1" - sources."json-schema-traverse-0.4.1" - sources."json-schema-typed-7.0.3" - sources."json-stringify-safe-5.0.1" - sources."json5-2.2.3" - sources."jsonfile-4.0.0" - sources."jsonpointer-5.0.1" - sources."keytar-7.9.0" - sources."keyv-4.5.3" - sources."kind-of-6.0.3" - sources."latest-version-6.0.0" - sources."launch-editor-2.6.0" - sources."launchdarkly-eventsource-1.4.3" - (sources."launchdarkly-js-sdk-common-4.3.3" // { - dependencies = [ - sources."fast-deep-equal-2.0.1" - sources."uuid-8.3.2" - ]; - }) - sources."launchdarkly-node-client-sdk-2.2.2" - (sources."lazystream-1.0.1" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.8" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) - sources."loader-runner-4.3.0" - sources."loader-utils-2.0.4" - sources."locate-path-5.0.0" - sources."lodash-4.17.21" - sources."lodash.assignin-4.2.0" - sources."lodash.bind-4.2.1" - sources."lodash.clonedeep-4.5.0" - sources."lodash.debounce-4.0.8" - sources."lodash.defaults-4.2.0" - sources."lodash.escape-4.0.1" - sources."lodash.filter-4.6.0" - sources."lodash.flatten-4.4.0" - sources."lodash.foreach-4.5.0" - sources."lodash.invokemap-4.6.0" - sources."lodash.map-4.6.0" - sources."lodash.merge-4.6.2" - sources."lodash.pick-4.4.0" - sources."lodash.pullall-4.2.0" - sources."lodash.reduce-4.6.0" - sources."lodash.reject-4.6.0" - sources."lodash.some-4.6.0" - sources."lodash.sortby-4.7.0" - sources."lodash.uniqby-4.7.0" - (sources."log-symbols-4.1.0" // { - dependencies = [ - sources."chalk-4.1.2" - ]; - }) - sources."lower-case-2.0.2" - sources."lowercase-keys-2.0.0" - sources."lru-cache-5.1.1" - sources."lru-queue-0.1.0" - sources."lru_map-0.3.3" - (sources."make-dir-3.1.0" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) - sources."make-error-1.3.6" - sources."md5.js-1.3.5" - sources."media-typer-0.3.0" - sources."memfs-3.6.0" - sources."memoizee-0.4.15" - sources."merge-descriptors-1.0.1" - sources."merge-stream-2.0.0" - sources."merge2-1.4.1" - sources."methods-1.1.2" - sources."micromatch-4.0.5" - (sources."miller-rabin-4.0.1" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - sources."mime-1.6.0" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."mimic-fn-3.1.0" - sources."mimic-response-3.1.0" - sources."minimalistic-assert-1.0.1" - sources."minimalistic-crypto-utils-1.0.1" - sources."minimatch-3.1.2" - sources."minimist-1.2.8" - sources."mkdirp-1.0.4" - sources."mkdirp-classic-0.5.3" - sources."mrmime-1.0.1" - sources."ms-2.1.2" - sources."multicast-dns-7.2.5" - sources."mute-stream-0.0.8" - sources."mz-2.7.0" - sources."napi-build-utils-1.0.2" - sources."negotiator-0.6.3" - sources."neo-async-2.6.2" - sources."next-tick-1.1.0" - (sources."ngrok-5.0.0-beta.2" // { - dependencies = [ - sources."uuid-8.3.2" - sources."yaml-2.3.2" - ]; - }) - sources."no-case-3.0.4" - sources."nock-13.3.3" - sources."node-abi-3.47.0" - sources."node-addon-api-4.3.0" - (sources."node-cache-5.1.2" // { - dependencies = [ - sources."clone-2.1.2" - ]; - }) - (sources."node-fetch-2.7.0" // { - dependencies = [ - sources."tr46-0.0.3" - sources."webidl-conversions-3.0.1" - sources."whatwg-url-5.0.0" - ]; - }) - sources."node-forge-1.3.1" - sources."node-gyp-build-4.6.1" - sources."node-localstorage-1.3.1" - sources."node-machine-id-1.1.12" - sources."node-releases-2.0.13" - sources."normalize-path-3.0.0" - sources."normalize-url-6.1.0" - sources."npm-run-path-4.0.1" - sources."nth-check-2.1.1" - sources."object-assign-4.1.1" - sources."object-inspect-1.12.3" - sources."object-is-1.1.5" - sources."object-keys-1.1.1" - sources."object.assign-4.1.4" - sources."obuf-1.1.2" - sources."omelette-0.4.17" - sources."on-finished-2.4.1" - sources."on-headers-1.0.2" - sources."once-1.4.0" - (sources."onetime-5.1.2" // { - dependencies = [ - sources."mimic-fn-2.1.0" - ]; - }) - sources."open-8.4.2" - sources."opener-1.5.2" - (sources."ora-4.1.1" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-3.0.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."escape-string-regexp-1.0.5" - sources."has-flag-3.0.0" - (sources."log-symbols-3.0.0" // { - dependencies = [ - sources."chalk-2.4.2" - ]; - }) - sources."supports-color-5.5.0" - ]; - }) - sources."original-1.0.2" - sources."os-browserify-0.3.0" - sources."os-tmpdir-1.0.2" - sources."p-cancelable-2.1.1" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-retry-4.6.2" - sources."p-try-2.2.0" - sources."package-json-7.0.0" - sources."pako-1.0.11" - sources."param-case-3.0.4" - sources."parse-asn1-5.1.6" - sources."parseurl-1.3.3" - sources."pascal-case-3.1.2" - sources."path-browserify-1.0.1" - sources."path-equal-1.2.5" - sources."path-exists-4.0.0" - sources."path-is-absolute-1.0.1" - sources."path-key-3.1.1" - sources."path-parse-1.0.7" - sources."path-to-regexp-0.1.7" - sources."path-type-4.0.0" - sources."pbkdf2-3.1.2" - sources."pend-1.2.0" - sources."picocolors-1.0.0" - sources."picomatch-2.3.1" - sources."pkg-dir-4.2.0" - (sources."pkg-up-3.1.0" // { - dependencies = [ - sources."find-up-3.0.0" - sources."locate-path-3.0.0" - sources."p-locate-3.0.0" - sources."path-exists-3.0.0" - ]; - }) - (sources."portfinder-1.0.32" // { - dependencies = [ - sources."async-2.6.4" - sources."debug-3.2.7" - sources."mkdirp-0.5.6" - ]; - }) - sources."prebuild-install-7.1.1" - sources."prettier-2.8.8" - sources."pretty-error-4.0.0" - sources."process-0.11.10" - sources."process-nextick-args-2.0.1" - sources."propagate-2.0.1" - sources."proxy-addr-2.0.7" - (sources."public-encrypt-4.0.3" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - sources."pump-3.0.0" - sources."punycode-1.4.1" - sources."qs-6.11.2" - sources."querystring-browser-1.0.4" - sources."querystringify-2.2.0" - sources."queue-microtask-1.2.3" - sources."queue-tick-1.0.1" - sources."quick-lru-5.1.1" - sources."randombytes-2.1.0" - sources."randomfill-1.0.4" - sources."range-parser-1.2.1" - sources."raw-body-2.5.1" - sources."rc-1.2.8" - sources."readable-stream-3.6.2" - (sources."readdir-glob-1.1.3" // { - dependencies = [ - sources."brace-expansion-2.0.1" - sources."minimatch-5.1.6" - ]; - }) - sources."readdirp-3.6.0" - sources."rechoir-0.7.1" - sources."recursive-readdir-2.2.3" - sources."regexp.prototype.flags-1.5.1" - sources."registry-auth-token-4.2.2" - sources."registry-url-5.1.0" - sources."relateurl-0.2.7" - sources."renderkid-3.0.0" - sources."require-directory-2.1.1" - sources."require-from-string-2.0.2" - sources."requires-port-1.0.0" - sources."resolve-1.22.5" - sources."resolve-alpn-1.2.1" - sources."resolve-cwd-3.0.0" - sources."resolve-from-5.0.0" - sources."responselike-2.0.1" - sources."restore-cursor-3.1.0" - sources."retry-0.13.1" - sources."reusify-1.0.4" - sources."rimraf-3.0.2" - sources."ripemd160-2.0.2" - sources."run-async-2.4.1" - sources."run-parallel-1.2.0" - sources."rxjs-7.8.1" - sources."safe-array-concat-1.0.1" - sources."safe-buffer-5.2.1" - sources."safe-regex-test-1.0.0" - sources."safe-stable-stringify-2.4.3" - sources."safer-buffer-2.1.2" - sources."sanitize-filename-1.6.3" - (sources."schema-utils-2.7.1" // { - dependencies = [ - sources."ajv-6.12.6" - ]; - }) - sources."select-hose-2.0.0" - sources."selfsigned-2.1.1" - (sources."semver-7.5.4" // { - dependencies = [ - sources."lru-cache-6.0.0" - sources."yallist-4.0.0" - ]; - }) - (sources."send-0.18.0" // { - dependencies = [ - (sources."debug-2.6.9" // { - dependencies = [ - sources."ms-2.0.0" - ]; - }) - sources."ms-2.1.3" - ]; - }) - sources."serialize-javascript-6.0.1" - (sources."serve-index-1.9.1" // { - dependencies = [ - sources."debug-2.6.9" - sources."depd-1.1.2" - sources."http-errors-1.6.3" - sources."inherits-2.0.3" - sources."ms-2.0.0" - sources."setprototypeof-1.1.0" - sources."statuses-1.5.0" - ]; - }) - sources."serve-static-1.15.0" - sources."set-function-name-2.0.1" - sources."setimmediate-1.0.5" - sources."setprototypeof-1.2.0" - sources."sha.js-2.4.11" - sources."shallow-clone-3.0.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."shell-quote-1.8.1" - sources."side-channel-1.0.4" - sources."signal-exit-3.0.7" - sources."simple-concat-1.0.1" - sources."simple-get-4.0.1" - sources."sirv-2.0.3" - sources."slash-3.0.0" - sources."slide-1.1.6" - (sources."sockjs-0.3.24" // { - dependencies = [ - sources."uuid-8.3.2" - ]; - }) - sources."source-map-0.6.1" - sources."source-map-support-0.5.21" - sources."spdy-4.0.2" - sources."spdy-transport-3.0.0" - sources."sprintf-js-1.0.3" - sources."statuses-2.0.1" - sources."stdin-0.0.1" - sources."streamx-2.15.1" - sources."string-width-4.2.3" - sources."string.prototype.trim-1.2.8" - sources."string.prototype.trimend-1.0.7" - sources."string.prototype.trimstart-1.0.7" - sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.1" - sources."strip-final-newline-2.0.0" - sources."strip-json-comments-2.0.1" - sources."supports-color-7.2.0" - sources."supports-hyperlinks-2.3.0" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."tapable-2.2.1" - sources."tar-fs-2.1.1" - sources."tar-stream-2.2.0" - sources."terminal-link-2.1.1" - (sources."terser-5.19.4" // { - dependencies = [ - sources."commander-2.20.3" - ]; - }) - (sources."terser-webpack-plugin-5.3.9" // { - dependencies = [ - sources."ajv-6.12.6" - sources."schema-utils-3.3.0" - ]; - }) - sources."text-encoder-lite-2.0.0" - sources."thenify-3.3.1" - sources."thenify-all-1.6.0" - sources."through-2.3.8" - sources."thunky-1.1.0" - sources."timers-browserify-2.0.12" - sources."timers-ext-0.1.7" - sources."tiny-each-async-2.0.3" - sources."tmp-0.2.1" - sources."to-fast-properties-2.0.0" - sources."to-regex-range-5.0.1" - sources."toidentifier-1.0.1" - sources."totalist-3.0.1" - (sources."tr46-1.0.1" // { - dependencies = [ - sources."punycode-2.3.0" - ]; - }) - sources."truncate-utf8-bytes-1.0.2" - sources."ts-is-present-1.2.2" - (sources."ts-loader-9.4.4" // { - dependencies = [ - sources."chalk-4.1.2" - ]; - }) - sources."ts-node-10.9.1" - sources."tslib-2.6.2" - (sources."tsutils-3.21.0" // { - dependencies = [ - sources."tslib-1.14.1" - ]; - }) - sources."tunnel-agent-0.6.0" - sources."type-1.2.0" - sources."type-fest-0.21.3" - sources."type-is-1.6.18" - sources."typed-array-buffer-1.0.0" - sources."typed-array-byte-length-1.0.0" - sources."typed-array-byte-offset-1.0.0" - sources."typed-array-length-1.0.4" - sources."typescript-4.9.5" - (sources."typescript-json-schema-0.60.0" // { - dependencies = [ - sources."@types/node-16.18.51" - sources."typescript-5.1.6" - ]; - }) - sources."unbox-primitive-1.0.2" - sources."universalify-0.1.2" - sources."unpipe-1.0.0" - sources."update-browserslist-db-1.0.11" - (sources."uri-js-4.4.1" // { - dependencies = [ - sources."punycode-2.3.0" - ]; - }) - sources."urijs-1.19.11" - sources."url-0.11.3" - sources."url-parse-1.5.10" - sources."utf-8-validate-5.0.10" - sources."utf8-byte-length-1.0.4" - sources."util-0.12.5" - sources."util-deprecate-1.0.2" - sources."utila-0.4.0" - sources."utils-merge-1.0.1" - sources."uuid-3.4.0" - sources."v8-compile-cache-lib-3.0.1" - sources."vary-1.1.2" - sources."watchpack-2.4.0" - sources."wbuf-1.7.3" - sources."wcwidth-1.0.1" - sources."webidl-conversions-4.0.2" - (sources."webpack-5.88.2" // { - dependencies = [ - sources."ajv-6.12.6" - sources."schema-utils-3.3.0" - ]; - }) - (sources."webpack-bundle-analyzer-4.9.1" // { - dependencies = [ - sources."commander-7.2.0" - ]; - }) - (sources."webpack-cli-4.10.0" // { - dependencies = [ - sources."commander-7.2.0" - ]; - }) - (sources."webpack-dev-middleware-5.3.3" // { - dependencies = [ - sources."ajv-keywords-5.1.0" - sources."schema-utils-4.2.0" - ]; - }) - (sources."webpack-dev-server-4.15.1" // { - dependencies = [ - sources."ajv-keywords-5.1.0" - sources."http-proxy-middleware-2.0.6" - sources."ipaddr.js-2.1.0" - sources."schema-utils-4.2.0" - sources."ws-8.14.1" - ]; - }) - sources."webpack-merge-5.9.0" - sources."webpack-sources-3.2.3" - sources."websocket-driver-0.7.4" - sources."websocket-extensions-0.1.4" - sources."whatwg-url-7.1.0" - sources."which-2.0.2" - sources."which-boxed-primitive-1.0.2" - sources."which-typed-array-1.1.11" - sources."wildcard-2.0.1" - sources."winattr-3.0.0" - sources."wrap-ansi-6.2.0" - sources."wrappy-1.0.2" - sources."write-file-atomic-1.3.4" - sources."ws-7.5.9" - sources."y18n-5.0.8" - sources."yallist-3.1.1" - sources."yaml-1.10.2" - sources."yargs-17.7.2" - sources."yargs-parser-21.1.1" - sources."yauzl-2.10.0" - sources."yn-3.1.1" - sources."zip-stream-5.0.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "A command line interface for managing Atlassian-hosted apps"; - homepage = "https://developer.atlassian.com/platform/forge"; - license = "UNLICENSED"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; - "@mermaid-js/mermaid-cli" = nodeEnv.buildNodePackage { - name = "_at_mermaid-js_slash_mermaid-cli"; - packageName = "@mermaid-js/mermaid-cli"; - version = "10.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-10.4.0.tgz"; - sha512 = "sXohfGD6xgR8VEKvLdvSCndFaFNVTlyXjgZlJ3x8U3/J0V2VTfLIZO94Gt8KUPUccFWci8dRYDGG0fQerB+aIA=="; - }; - dependencies = [ - (sources."@babel/code-frame-7.22.13" // { - dependencies = [ - sources."chalk-2.4.2" - ]; - }) - sources."@babel/helper-validator-identifier-7.22.19" - (sources."@babel/highlight-7.22.13" // { - dependencies = [ - sources."chalk-2.4.2" - ]; - }) - sources."@puppeteer/browsers-0.5.0" - sources."@types/node-20.6.1" - sources."@types/yauzl-2.10.0" - sources."agent-base-6.0.2" - sources."ansi-regex-5.0.1" - sources."ansi-styles-3.2.1" - sources."argparse-2.0.1" - sources."base64-js-1.5.1" - sources."bl-4.1.0" - sources."buffer-5.7.1" - sources."buffer-crc32-0.2.13" - sources."bufferutil-4.0.7" - sources."callsites-3.1.0" - sources."chalk-5.3.0" - sources."chownr-1.1.4" - sources."chromium-bidi-0.4.7" - sources."cliui-8.0.1" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."commander-10.0.1" - sources."cosmiconfig-8.1.3" - sources."cross-fetch-3.1.5" - sources."debug-4.3.4" - sources."devtools-protocol-0.0.1107588" - sources."emoji-regex-8.0.0" - sources."encoding-0.1.13" - sources."end-of-stream-1.4.4" - sources."error-ex-1.3.2" - sources."escalade-3.1.1" - sources."escape-string-regexp-1.0.5" - sources."extract-zip-2.0.1" - sources."fd-slicer-1.1.0" - sources."fs-constants-1.0.0" - sources."get-caller-file-2.0.5" - sources."get-stream-5.2.0" - sources."has-flag-3.0.0" - sources."https-proxy-agent-5.0.1" - sources."iconv-lite-0.6.3" - sources."ieee754-1.2.1" - sources."import-fresh-3.3.0" - sources."inherits-2.0.4" - sources."is-arrayish-0.2.1" - sources."is-fullwidth-code-point-3.0.0" - sources."js-tokens-4.0.0" - sources."js-yaml-4.1.0" - sources."json-parse-even-better-errors-2.3.1" - sources."lines-and-columns-1.2.4" - sources."mitt-3.0.0" - sources."mkdirp-classic-0.5.3" - sources."ms-2.1.2" - sources."node-fetch-2.6.7" - sources."node-gyp-build-4.6.1" - sources."once-1.4.0" - sources."parent-module-1.0.1" - sources."parse-json-5.2.0" - sources."path-type-4.0.0" - sources."pend-1.2.0" - sources."progress-2.0.3" - sources."proxy-from-env-1.1.0" - sources."pump-3.0.0" - sources."puppeteer-19.11.1" - sources."puppeteer-core-19.11.1" - sources."readable-stream-3.6.2" - sources."require-directory-2.1.1" - sources."resolve-from-4.0.0" - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" - sources."string-width-4.2.3" - sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.1" - sources."supports-color-5.5.0" - sources."tar-fs-2.1.1" - sources."tar-stream-2.2.0" - sources."through-2.3.8" - sources."tr46-0.0.3" - sources."typescript-5.2.2" - sources."unbzip2-stream-1.4.3" - sources."utf-8-validate-6.0.3" - sources."util-deprecate-1.0.2" - sources."webidl-conversions-3.0.1" - sources."whatwg-url-5.0.0" - (sources."wrap-ansi-7.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - ]; - }) - sources."wrappy-1.0.2" - sources."ws-8.13.0" - sources."y18n-5.0.8" - sources."yargs-17.7.1" - sources."yargs-parser-21.1.1" - sources."yauzl-2.10.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Command-line interface for mermaid"; - homepage = "https://github.com/mermaid-js/mermaid-cli#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; "@microsoft/rush" = nodeEnv.buildNodePackage { name = "_at_microsoft_slash_rush"; packageName = "@microsoft/rush"; - version = "5.106.0"; + version = "5.107.4"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/rush/-/rush-5.106.0.tgz"; - sha512 = "M9LUaSDKS2Kcsyw9iyZX2dh7b4MV6/mlDx3QSHGzKGHwOUaClwIlNw7VvG09FADq7Tncfa9s98vHqNeV3MQdxQ=="; + url = "https://registry.npmjs.org/@microsoft/rush/-/rush-5.107.4.tgz"; + sha512 = "EyHUPDE3iXQvkyqkWdkzRqoT2D8EwLKAjIjy1zte4cihKgdq1RyI8p33EkidUiYQ5fBtcGAOTLyMWvMMRzBVAQ=="; }; dependencies = [ (sources."@azure/abort-controller-1.1.0" // { @@ -64471,7 +62033,7 @@ in sources."tslib-2.6.2" ]; }) - (sources."@azure/core-util-1.4.0" // { + (sources."@azure/core-util-1.5.0" // { dependencies = [ sources."tslib-2.6.2" ]; @@ -64504,29 +62066,29 @@ in ]; }) sources."@babel/code-frame-7.22.13" - sources."@babel/generator-7.22.15" - sources."@babel/helper-environment-visitor-7.22.5" - sources."@babel/helper-function-name-7.22.5" + sources."@babel/generator-7.23.0" + sources."@babel/helper-environment-visitor-7.22.20" + sources."@babel/helper-function-name-7.23.0" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-split-export-declaration-7.22.6" sources."@babel/helper-string-parser-7.22.5" - sources."@babel/helper-validator-identifier-7.22.19" - sources."@babel/highlight-7.22.13" + sources."@babel/helper-validator-identifier-7.22.20" + sources."@babel/highlight-7.22.20" sources."@babel/parser-7.22.5" (sources."@babel/template-7.22.15" // { dependencies = [ - sources."@babel/parser-7.22.16" + sources."@babel/parser-7.23.0" ]; }) sources."@babel/traverse-7.22.5" - sources."@babel/types-7.22.19" + sources."@babel/types-7.23.0" sources."@devexpress/error-stack-parser-2.0.6" sources."@jridgewell/gen-mapping-0.3.3" sources."@jridgewell/resolve-uri-3.1.1" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.19" - sources."@microsoft/rush-lib-5.106.0" + sources."@microsoft/rush-lib-5.107.4" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -64562,30 +62124,30 @@ in sources."@pnpm/types-6.4.0" ]; }) - sources."@rushstack/heft-config-file-0.13.3" - (sources."@rushstack/node-core-library-3.59.7" // { + sources."@rushstack/heft-config-file-0.14.1" + (sources."@rushstack/node-core-library-3.60.1" // { dependencies = [ sources."import-lazy-4.0.0" ]; }) - sources."@rushstack/package-deps-hash-4.0.44" - (sources."@rushstack/package-extractor-0.5.3" // { + sources."@rushstack/package-deps-hash-4.1.5" + (sources."@rushstack/package-extractor-0.6.6" // { dependencies = [ sources."minimatch-3.0.8" ]; }) - (sources."@rushstack/rig-package-0.4.1" // { + (sources."@rushstack/rig-package-0.5.1" // { dependencies = [ sources."strip-json-comments-3.1.1" ]; }) - sources."@rushstack/rush-amazon-s3-build-cache-plugin-5.106.0" - sources."@rushstack/rush-azure-storage-build-cache-plugin-5.106.0" - sources."@rushstack/rush-http-build-cache-plugin-5.106.0" - sources."@rushstack/rush-sdk-5.106.0" - sources."@rushstack/stream-collator-4.0.263" - sources."@rushstack/terminal-0.5.38" - (sources."@rushstack/ts-command-line-4.15.2" // { + sources."@rushstack/rush-amazon-s3-build-cache-plugin-5.107.4" + sources."@rushstack/rush-azure-storage-build-cache-plugin-5.107.4" + sources."@rushstack/rush-http-build-cache-plugin-5.107.4" + sources."@rushstack/rush-sdk-5.107.4" + sources."@rushstack/stream-collator-4.1.6" + sources."@rushstack/terminal-0.7.5" + (sources."@rushstack/ts-command-line-4.16.1" // { dependencies = [ sources."argparse-1.0.10" ]; @@ -64594,12 +62156,12 @@ in sources."@szmarczak/http-timer-1.1.2" sources."@tootallnate/once-2.0.0" sources."@types/argparse-1.0.38" - sources."@types/lodash-4.14.198" + sources."@types/lodash-4.14.199" sources."@types/minimatch-3.0.5" - sources."@types/minimist-1.2.2" - sources."@types/node-20.6.1" + sources."@types/minimist-1.2.3" + sources."@types/node-20.8.0" sources."@types/node-fetch-2.6.2" - sources."@types/normalize-package-data-2.4.1" + sources."@types/normalize-package-data-2.4.2" sources."@types/parse-json-4.0.0" sources."@types/tunnel-0.0.3" sources."@vue/compiler-core-3.3.4" @@ -64730,7 +62292,7 @@ in sources."duplexer3-0.1.5" sources."ecdsa-sig-formatter-1.0.11" sources."emoji-regex-8.0.0" - sources."encode-registry-3.0.0" + sources."encode-registry-3.0.1" (sources."encoding-0.1.13" // { dependencies = [ sources."iconv-lite-0.6.3" @@ -64748,7 +62310,7 @@ in sources."expand-tilde-2.0.2" sources."external-editor-3.1.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.12" + sources."fast-glob-3.3.1" sources."fastq-1.15.0" sources."figures-3.0.0" sources."fill-range-7.0.1" @@ -64928,7 +62490,7 @@ in }) sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" - sources."magic-string-0.30.3" + sources."magic-string-0.30.4" (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.1" @@ -65047,7 +62609,7 @@ in ]; }) sources."please-upgrade-node-3.2.0" - sources."postcss-8.4.29" + sources."postcss-8.4.31" (sources."preferred-pm-3.1.2" // { dependencies = [ sources."find-up-5.0.0" @@ -65108,7 +62670,7 @@ in sources."require-from-string-2.0.2" sources."require-package-name-2.0.1" sources."requires-port-1.0.0" - sources."resolve-1.22.5" + sources."resolve-1.22.6" (sources."resolve-dir-1.0.1" // { dependencies = [ sources."global-modules-1.0.0" @@ -65124,7 +62686,7 @@ in sources."rxjs-6.6.7" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."sax-1.2.4" + sources."sax-1.3.0" sources."semver-7.5.4" sources."semver-compare-1.0.0" (sources."semver-diff-3.1.1" // { @@ -65142,7 +62704,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.13" + sources."spdx-license-ids-3.0.15" sources."sprintf-js-1.0.3" sources."ssri-8.0.1" sources."stackframe-1.3.4" @@ -65206,7 +62768,6 @@ in sources."which-1.3.1" sources."which-pm-2.0.0" sources."widest-line-3.1.0" - sources."wordwrap-1.0.0" (sources."wrap-ansi-7.0.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -65243,126 +62804,13 @@ in bypassCache = true; reconstructLock = true; }; - "@nerdwallet/shepherd" = nodeEnv.buildNodePackage { - name = "_at_nerdwallet_slash_shepherd"; - packageName = "@nerdwallet/shepherd"; - version = "1.16.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@nerdwallet/shepherd/-/shepherd-1.16.0.tgz"; - sha512 = "wNbAzVF3G4zjGkxATccYtiSgiWXseDRacra71ozH5JOUX4L3RRbd1iaqKRwILLKzcyxsvsOWbV47CSBRR6bK5g=="; - }; - dependencies = [ - sources."@hapi/hoek-9.3.0" - sources."@hapi/topo-5.1.0" - sources."@kwsites/file-exists-1.1.1" - sources."@kwsites/promise-deferred-1.1.1" - sources."@octokit/auth-token-2.5.0" - sources."@octokit/core-3.6.0" - sources."@octokit/endpoint-6.0.12" - sources."@octokit/graphql-4.8.0" - sources."@octokit/openapi-types-12.11.0" - sources."@octokit/plugin-paginate-rest-2.21.3" - sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.16.2" - sources."@octokit/plugin-retry-3.0.9" - sources."@octokit/plugin-throttling-3.7.0" - sources."@octokit/request-5.6.3" - sources."@octokit/request-error-2.1.0" - sources."@octokit/rest-18.12.0" - sources."@octokit/types-6.41.0" - sources."@sideway/address-4.1.4" - sources."@sideway/formula-3.0.1" - sources."@sideway/pinpoint-2.0.0" - sources."@types/js-yaml-3.12.8" - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."argparse-1.0.10" - sources."at-least-node-1.0.0" - sources."base64-js-1.5.1" - sources."before-after-hook-2.2.3" - sources."bl-4.1.0" - sources."bottleneck-2.19.5" - sources."buffer-5.7.1" - sources."chalk-4.1.2" - sources."child-process-promise-2.2.1" - sources."cli-cursor-3.1.0" - sources."cli-spinners-2.9.1" - sources."clone-1.0.4" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."commander-6.2.1" - sources."cross-spawn-4.0.2" - sources."debug-4.3.4" - sources."defaults-1.0.4" - sources."deprecation-2.3.1" - sources."encoding-0.1.13" - sources."esprima-4.0.1" - sources."fs-extra-9.1.0" - sources."graceful-fs-4.2.11" - sources."has-flag-4.0.0" - sources."iconv-lite-0.6.3" - sources."ieee754-1.2.1" - sources."inherits-2.0.4" - sources."is-interactive-1.0.0" - sources."is-plain-object-5.0.0" - sources."is-unicode-supported-0.1.0" - sources."isexe-2.0.0" - sources."joi-17.10.1" - sources."js-yaml-3.14.1" - sources."jsonfile-6.1.0" - sources."lodash-4.17.21" - sources."log-symbols-4.1.0" - sources."lru-cache-4.1.5" - sources."mimic-fn-2.1.0" - sources."ms-2.1.2" - sources."netrc-0.1.4" - sources."node-fetch-2.7.0" - sources."node-version-1.2.0" - sources."once-1.4.0" - sources."onetime-5.1.2" - sources."ora-5.4.1" - sources."preferences-2.0.2" - sources."promise-polyfill-6.1.0" - sources."pseudomap-1.0.2" - sources."readable-stream-3.6.2" - sources."restore-cursor-3.1.0" - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" - sources."signal-exit-3.0.7" - sources."simple-git-2.48.0" - sources."sprintf-js-1.0.3" - sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.1" - sources."supports-color-7.2.0" - sources."tr46-0.0.3" - sources."universal-user-agent-6.0.0" - sources."universalify-2.0.0" - sources."util-deprecate-1.0.2" - sources."wcwidth-1.0.1" - sources."webidl-conversions-3.0.1" - sources."whatwg-url-5.0.0" - sources."which-1.3.1" - sources."wrappy-1.0.2" - sources."yallist-2.1.2" - sources."yaml-1.10.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "A utility for applying code changes across many repositories"; - homepage = "https://github.com/NerdWalletOSS/shepherd#readme"; - license = "Apache-2.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; "@shopify/cli" = nodeEnv.buildNodePackage { name = "_at_shopify_slash_cli"; packageName = "@shopify/cli"; - version = "3.49.3"; + version = "3.49.5"; src = fetchurl { - url = "https://registry.npmjs.org/@shopify/cli/-/cli-3.49.3.tgz"; - sha512 = "0Hnve7sRP3AOGpNnu0DD2vOYMHy0LqxoQfW9BaDqpRNbf4jVKCDtWCUwnPVF78HYtBhsJRSTwz8iP3jAZklyUQ=="; + url = "https://registry.npmjs.org/@shopify/cli/-/cli-3.49.5.tgz"; + sha512 = "E9nA5f1IT7MlV34SVnSekyeTEeCuC6NFqWucXzVU3t6xoTtNCl82v6Mi3laeXPs25c7npoJYv+nUUMjkLzR4jQ=="; }; dependencies = [ sources."@bugsnag/browser-7.21.0" @@ -65382,7 +62830,7 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@oclif/color-1.0.11" + sources."@oclif/color-1.0.12" sources."@oclif/core-2.11.7" sources."@oclif/plugin-commands-2.2.21" sources."@oclif/plugin-help-5.2.15" @@ -65394,7 +62842,7 @@ in ]; }) sources."@pnpm/npm-conf-2.2.2" - (sources."@shopify/cli-kit-3.49.3" // { + (sources."@shopify/cli-kit-3.49.5" // { dependencies = [ sources."ansi-escapes-6.2.0" sources."ansi-regex-6.0.1" @@ -65409,35 +62857,26 @@ in sources."type-fest-3.13.1" ]; }) - sources."@shopify/plugin-did-you-mean-3.49.3" + sources."@shopify/plugin-did-you-mean-3.49.5" sources."@sindresorhus/is-5.6.0" - sources."@swc/core-1.3.85" - sources."@swc/core-darwin-arm64-1.3.85" - sources."@swc/core-darwin-x64-1.3.85" - sources."@swc/core-linux-arm-gnueabihf-1.3.85" - sources."@swc/core-linux-arm64-gnu-1.3.85" - sources."@swc/core-linux-arm64-musl-1.3.85" - sources."@swc/core-linux-x64-gnu-1.3.85" - sources."@swc/core-linux-x64-musl-1.3.85" - sources."@swc/core-win32-arm64-msvc-1.3.85" - sources."@swc/core-win32-ia32-msvc-1.3.85" - sources."@swc/core-win32-x64-msvc-1.3.85" + sources."@swc/core-1.3.91" + sources."@swc/counter-0.1.2" sources."@swc/helpers-0.5.2" - sources."@swc/types-0.1.4" - sources."@swc/wasm-1.3.85" + sources."@swc/types-0.1.5" + sources."@swc/wasm-1.3.91" sources."@szmarczak/http-timer-5.0.1" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" sources."@types/archiver-5.3.2" - sources."@types/cli-progress-3.11.2" - sources."@types/http-cache-semantics-4.0.1" - sources."@types/node-20.6.1" - sources."@types/prop-types-15.7.5" - sources."@types/react-18.2.21" - sources."@types/readdir-glob-1.1.1" - sources."@types/scheduler-0.16.3" + sources."@types/cli-progress-3.11.3" + sources."@types/http-cache-semantics-4.0.2" + sources."@types/node-20.8.0" + sources."@types/prop-types-15.7.8" + sources."@types/react-18.2.24" + sources."@types/readdir-glob-1.1.2" + sources."@types/scheduler-0.16.4" sources."@types/tinycolor2-1.4.4" sources."abort-controller-3.0.0" sources."acorn-8.10.0" @@ -65832,7 +63271,7 @@ in sources."registry-auth-token-5.0.2" sources."registry-url-6.0.1" sources."require-from-string-2.0.2" - sources."resolve-1.22.5" + sources."resolve-1.22.6" sources."resolve-alpn-1.2.1" sources."responselike-3.0.0" (sources."restore-cursor-4.0.0" // { @@ -65933,7 +63372,7 @@ in sources."wordwrap-1.0.0" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" - sources."ws-8.14.1" + sources."ws-8.14.2" sources."yallist-4.0.0" sources."yarn-1.22.19" sources."yn-3.1.1" @@ -65976,25 +63415,16 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.85" - sources."@swc/core-darwin-arm64-1.3.85" - sources."@swc/core-darwin-x64-1.3.85" - sources."@swc/core-linux-arm-gnueabihf-1.3.85" - sources."@swc/core-linux-arm64-gnu-1.3.85" - sources."@swc/core-linux-arm64-musl-1.3.85" - sources."@swc/core-linux-x64-gnu-1.3.85" - sources."@swc/core-linux-x64-musl-1.3.85" - sources."@swc/core-win32-arm64-msvc-1.3.85" - sources."@swc/core-win32-ia32-msvc-1.3.85" - sources."@swc/core-win32-x64-msvc-1.3.85" + sources."@swc/core-1.3.91" + sources."@swc/counter-0.1.2" sources."@swc/helpers-0.5.2" - sources."@swc/types-0.1.4" - sources."@swc/wasm-1.3.85" + sources."@swc/types-0.1.5" + sources."@swc/wasm-1.3.91" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.6.1" + sources."@types/node-20.8.0" sources."acorn-8.10.0" sources."acorn-walk-8.2.0" sources."any-promise-1.3.0" @@ -66056,7 +63486,7 @@ in sources."picomatch-2.3.1" sources."pify-2.3.0" sources."pirates-4.0.6" - sources."postcss-8.4.29" + sources."postcss-8.4.31" sources."postcss-import-15.1.0" sources."postcss-js-4.0.1" sources."postcss-load-config-4.0.1" @@ -66066,7 +63496,7 @@ in sources."queue-microtask-1.2.3" sources."read-cache-1.0.0" sources."readdirp-3.6.0" - sources."resolve-1.22.5" + sources."resolve-1.22.6" sources."reusify-1.0.4" sources."run-parallel-1.2.0" sources."source-map-js-1.0.2" @@ -66119,25 +63549,16 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.85" - sources."@swc/core-darwin-arm64-1.3.85" - sources."@swc/core-darwin-x64-1.3.85" - sources."@swc/core-linux-arm-gnueabihf-1.3.85" - sources."@swc/core-linux-arm64-gnu-1.3.85" - sources."@swc/core-linux-arm64-musl-1.3.85" - sources."@swc/core-linux-x64-gnu-1.3.85" - sources."@swc/core-linux-x64-musl-1.3.85" - sources."@swc/core-win32-arm64-msvc-1.3.85" - sources."@swc/core-win32-ia32-msvc-1.3.85" - sources."@swc/core-win32-x64-msvc-1.3.85" + sources."@swc/core-1.3.91" + sources."@swc/counter-0.1.2" sources."@swc/helpers-0.5.2" - sources."@swc/types-0.1.4" - sources."@swc/wasm-1.3.85" + sources."@swc/types-0.1.5" + sources."@swc/wasm-1.3.91" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.6.1" + sources."@types/node-20.8.0" sources."acorn-8.10.0" sources."acorn-walk-8.2.0" sources."any-promise-1.3.0" @@ -66200,7 +63621,7 @@ in sources."picomatch-2.3.1" sources."pify-2.3.0" sources."pirates-4.0.6" - sources."postcss-8.4.29" + sources."postcss-8.4.31" sources."postcss-import-15.1.0" sources."postcss-js-4.0.1" sources."postcss-load-config-4.0.1" @@ -66210,7 +63631,7 @@ in sources."queue-microtask-1.2.3" sources."read-cache-1.0.0" sources."readdirp-3.6.0" - sources."resolve-1.22.5" + sources."resolve-1.22.6" sources."reusify-1.0.4" sources."run-parallel-1.2.0" sources."source-map-js-1.0.2" @@ -66281,25 +63702,16 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.85" - sources."@swc/core-darwin-arm64-1.3.85" - sources."@swc/core-darwin-x64-1.3.85" - sources."@swc/core-linux-arm-gnueabihf-1.3.85" - sources."@swc/core-linux-arm64-gnu-1.3.85" - sources."@swc/core-linux-arm64-musl-1.3.85" - sources."@swc/core-linux-x64-gnu-1.3.85" - sources."@swc/core-linux-x64-musl-1.3.85" - sources."@swc/core-win32-arm64-msvc-1.3.85" - sources."@swc/core-win32-ia32-msvc-1.3.85" - sources."@swc/core-win32-x64-msvc-1.3.85" + sources."@swc/core-1.3.91" + sources."@swc/counter-0.1.2" sources."@swc/helpers-0.5.2" - sources."@swc/types-0.1.4" - sources."@swc/wasm-1.3.85" + sources."@swc/types-0.1.5" + sources."@swc/wasm-1.3.91" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.6.1" + sources."@types/node-20.8.0" sources."acorn-8.10.0" sources."acorn-walk-8.2.0" sources."any-promise-1.3.0" @@ -66361,7 +63773,7 @@ in sources."picomatch-2.3.1" sources."pify-2.3.0" sources."pirates-4.0.6" - sources."postcss-8.4.29" + sources."postcss-8.4.31" sources."postcss-import-15.1.0" sources."postcss-js-4.0.1" sources."postcss-load-config-4.0.1" @@ -66371,7 +63783,7 @@ in sources."queue-microtask-1.2.3" sources."read-cache-1.0.0" sources."readdirp-3.6.0" - sources."resolve-1.22.5" + sources."resolve-1.22.6" sources."reusify-1.0.4" sources."run-parallel-1.2.0" sources."source-map-js-1.0.2" @@ -66424,25 +63836,16 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.85" - sources."@swc/core-darwin-arm64-1.3.85" - sources."@swc/core-darwin-x64-1.3.85" - sources."@swc/core-linux-arm-gnueabihf-1.3.85" - sources."@swc/core-linux-arm64-gnu-1.3.85" - sources."@swc/core-linux-arm64-musl-1.3.85" - sources."@swc/core-linux-x64-gnu-1.3.85" - sources."@swc/core-linux-x64-musl-1.3.85" - sources."@swc/core-win32-arm64-msvc-1.3.85" - sources."@swc/core-win32-ia32-msvc-1.3.85" - sources."@swc/core-win32-x64-msvc-1.3.85" + sources."@swc/core-1.3.91" + sources."@swc/counter-0.1.2" sources."@swc/helpers-0.5.2" - sources."@swc/types-0.1.4" - sources."@swc/wasm-1.3.85" + sources."@swc/types-0.1.5" + sources."@swc/wasm-1.3.91" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.6.1" + sources."@types/node-20.8.0" sources."acorn-8.10.0" sources."acorn-walk-8.2.0" sources."any-promise-1.3.0" @@ -66507,7 +63910,7 @@ in sources."picomatch-2.3.1" sources."pify-2.3.0" sources."pirates-4.0.6" - sources."postcss-8.4.29" + sources."postcss-8.4.31" sources."postcss-import-15.1.0" sources."postcss-js-4.0.1" sources."postcss-load-config-4.0.1" @@ -66521,7 +63924,7 @@ in sources."queue-microtask-1.2.3" sources."read-cache-1.0.0" sources."readdirp-3.6.0" - sources."resolve-1.22.5" + sources."resolve-1.22.6" sources."reusify-1.0.4" sources."run-parallel-1.2.0" sources."source-map-js-1.0.2" @@ -66562,10 +63965,10 @@ in "@uppy/companion" = nodeEnv.buildNodePackage { name = "_at_uppy_slash_companion"; packageName = "@uppy/companion"; - version = "4.8.2"; + version = "4.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@uppy/companion/-/companion-4.8.2.tgz"; - sha512 = "vhzKPcmlyM2ETwR+Ge/11G4tkeZpeNbEGSHEeZQN3yP3yh9tFtbtOaNP3O3/xnVljcfwBpb0xOtTbyP+bLMNRg=="; + url = "https://registry.npmjs.org/@uppy/companion/-/companion-4.9.1.tgz"; + sha512 = "fxx1TvWKNEOfwn9ar+T4FzyqmrsjUQjdhc3O3mz7KQU7IotJOoIiC6I00BD8UMxpAblqgOfq0SVCmk9ZzjIXxQ=="; }; dependencies = [ (sources."@aws-crypto/crc32-3.0.0" // { @@ -66608,44 +64011,44 @@ in sources."tslib-1.14.1" ]; }) - sources."@aws-sdk/client-s3-3.414.0" - sources."@aws-sdk/client-sso-3.414.0" - sources."@aws-sdk/client-sts-3.414.0" - sources."@aws-sdk/credential-provider-env-3.413.0" - sources."@aws-sdk/credential-provider-ini-3.414.0" - sources."@aws-sdk/credential-provider-node-3.414.0" - sources."@aws-sdk/credential-provider-process-3.413.0" - sources."@aws-sdk/credential-provider-sso-3.414.0" - sources."@aws-sdk/credential-provider-web-identity-3.413.0" - (sources."@aws-sdk/lib-storage-3.414.0" // { + sources."@aws-sdk/client-s3-3.423.0" + sources."@aws-sdk/client-sso-3.423.0" + sources."@aws-sdk/client-sts-3.423.0" + sources."@aws-sdk/credential-provider-env-3.418.0" + sources."@aws-sdk/credential-provider-ini-3.423.0" + sources."@aws-sdk/credential-provider-node-3.423.0" + sources."@aws-sdk/credential-provider-process-3.418.0" + sources."@aws-sdk/credential-provider-sso-3.423.0" + sources."@aws-sdk/credential-provider-web-identity-3.418.0" + (sources."@aws-sdk/lib-storage-3.423.0" // { dependencies = [ sources."buffer-5.6.0" ]; }) - sources."@aws-sdk/middleware-bucket-endpoint-3.413.0" - sources."@aws-sdk/middleware-expect-continue-3.413.0" - sources."@aws-sdk/middleware-flexible-checksums-3.413.0" - sources."@aws-sdk/middleware-host-header-3.413.0" - sources."@aws-sdk/middleware-location-constraint-3.413.0" - sources."@aws-sdk/middleware-logger-3.413.0" - sources."@aws-sdk/middleware-recursion-detection-3.413.0" - sources."@aws-sdk/middleware-sdk-s3-3.414.0" - sources."@aws-sdk/middleware-sdk-sts-3.413.0" - sources."@aws-sdk/middleware-signing-3.413.0" - sources."@aws-sdk/middleware-ssec-3.413.0" - sources."@aws-sdk/middleware-user-agent-3.413.0" - sources."@aws-sdk/region-config-resolver-3.413.0" - sources."@aws-sdk/s3-presigned-post-3.414.0" - sources."@aws-sdk/s3-request-presigner-3.414.0" - sources."@aws-sdk/signature-v4-multi-region-3.413.0" - sources."@aws-sdk/token-providers-3.413.0" - sources."@aws-sdk/types-3.413.0" + sources."@aws-sdk/middleware-bucket-endpoint-3.418.0" + sources."@aws-sdk/middleware-expect-continue-3.418.0" + sources."@aws-sdk/middleware-flexible-checksums-3.418.0" + sources."@aws-sdk/middleware-host-header-3.418.0" + sources."@aws-sdk/middleware-location-constraint-3.418.0" + sources."@aws-sdk/middleware-logger-3.418.0" + sources."@aws-sdk/middleware-recursion-detection-3.418.0" + sources."@aws-sdk/middleware-sdk-s3-3.418.0" + sources."@aws-sdk/middleware-sdk-sts-3.418.0" + sources."@aws-sdk/middleware-signing-3.418.0" + sources."@aws-sdk/middleware-ssec-3.418.0" + sources."@aws-sdk/middleware-user-agent-3.418.0" + sources."@aws-sdk/region-config-resolver-3.418.0" + sources."@aws-sdk/s3-presigned-post-3.423.0" + sources."@aws-sdk/s3-request-presigner-3.423.0" + sources."@aws-sdk/signature-v4-multi-region-3.418.0" + sources."@aws-sdk/token-providers-3.418.0" + sources."@aws-sdk/types-3.418.0" sources."@aws-sdk/util-arn-parser-3.310.0" - sources."@aws-sdk/util-endpoints-3.413.0" - sources."@aws-sdk/util-format-url-3.413.0" + sources."@aws-sdk/util-endpoints-3.418.0" + sources."@aws-sdk/util-format-url-3.418.0" sources."@aws-sdk/util-locate-window-3.310.0" - sources."@aws-sdk/util-user-agent-browser-3.413.0" - sources."@aws-sdk/util-user-agent-node-3.413.0" + sources."@aws-sdk/util-user-agent-browser-3.418.0" + sources."@aws-sdk/util-user-agent-node-3.418.0" sources."@aws-sdk/util-utf8-browser-3.259.0" sources."@aws-sdk/xml-builder-3.310.0" sources."@httptoolkit/websocket-stream-6.0.1" @@ -66656,61 +64059,61 @@ in sources."@redis/search-1.0.6" sources."@redis/time-series-1.0.3" sources."@sindresorhus/is-4.6.0" - sources."@smithy/abort-controller-2.0.8" + sources."@smithy/abort-controller-2.0.10" sources."@smithy/chunked-blob-reader-2.0.0" sources."@smithy/chunked-blob-reader-native-2.0.0" - sources."@smithy/config-resolver-2.0.9" - sources."@smithy/credential-provider-imds-2.0.11" - sources."@smithy/eventstream-codec-2.0.8" - sources."@smithy/eventstream-serde-browser-2.0.8" - sources."@smithy/eventstream-serde-config-resolver-2.0.8" - sources."@smithy/eventstream-serde-node-2.0.8" - sources."@smithy/eventstream-serde-universal-2.0.8" - sources."@smithy/fetch-http-handler-2.1.4" - sources."@smithy/hash-blob-browser-2.0.8" - sources."@smithy/hash-node-2.0.8" - sources."@smithy/hash-stream-node-2.0.8" - sources."@smithy/invalid-dependency-2.0.8" + sources."@smithy/config-resolver-2.0.11" + sources."@smithy/credential-provider-imds-2.0.13" + sources."@smithy/eventstream-codec-2.0.10" + sources."@smithy/eventstream-serde-browser-2.0.10" + sources."@smithy/eventstream-serde-config-resolver-2.0.10" + sources."@smithy/eventstream-serde-node-2.0.10" + sources."@smithy/eventstream-serde-universal-2.0.10" + sources."@smithy/fetch-http-handler-2.2.0" + sources."@smithy/hash-blob-browser-2.0.10" + sources."@smithy/hash-node-2.0.10" + sources."@smithy/hash-stream-node-2.0.10" + sources."@smithy/invalid-dependency-2.0.10" sources."@smithy/is-array-buffer-2.0.0" - sources."@smithy/md5-js-2.0.8" - sources."@smithy/middleware-content-length-2.0.10" - sources."@smithy/middleware-endpoint-2.0.8" - sources."@smithy/middleware-retry-2.0.11" - sources."@smithy/middleware-serde-2.0.8" - sources."@smithy/middleware-stack-2.0.1" - sources."@smithy/node-config-provider-2.0.11" - sources."@smithy/node-http-handler-2.1.4" - sources."@smithy/property-provider-2.0.9" - sources."@smithy/protocol-http-3.0.4" - sources."@smithy/querystring-builder-2.0.8" - sources."@smithy/querystring-parser-2.0.8" - sources."@smithy/service-error-classification-2.0.1" - sources."@smithy/shared-ini-file-loader-2.0.10" - sources."@smithy/signature-v4-2.0.8" - sources."@smithy/smithy-client-2.1.5" - sources."@smithy/types-2.3.2" - sources."@smithy/url-parser-2.0.8" + sources."@smithy/md5-js-2.0.10" + sources."@smithy/middleware-content-length-2.0.12" + sources."@smithy/middleware-endpoint-2.0.10" + sources."@smithy/middleware-retry-2.0.13" + sources."@smithy/middleware-serde-2.0.10" + sources."@smithy/middleware-stack-2.0.4" + sources."@smithy/node-config-provider-2.0.13" + sources."@smithy/node-http-handler-2.1.6" + sources."@smithy/property-provider-2.0.11" + sources."@smithy/protocol-http-3.0.6" + sources."@smithy/querystring-builder-2.0.10" + sources."@smithy/querystring-parser-2.0.10" + sources."@smithy/service-error-classification-2.0.3" + sources."@smithy/shared-ini-file-loader-2.0.12" + sources."@smithy/signature-v4-2.0.10" + sources."@smithy/smithy-client-2.1.8" + sources."@smithy/types-2.3.4" + sources."@smithy/url-parser-2.0.10" sources."@smithy/util-base64-2.0.0" sources."@smithy/util-body-length-browser-2.0.0" sources."@smithy/util-body-length-node-2.1.0" sources."@smithy/util-buffer-from-2.0.0" sources."@smithy/util-config-provider-2.0.0" - sources."@smithy/util-defaults-mode-browser-2.0.9" - sources."@smithy/util-defaults-mode-node-2.0.11" + sources."@smithy/util-defaults-mode-browser-2.0.12" + sources."@smithy/util-defaults-mode-node-2.0.14" sources."@smithy/util-hex-encoding-2.0.0" - sources."@smithy/util-middleware-2.0.1" - sources."@smithy/util-retry-2.0.1" - sources."@smithy/util-stream-2.0.11" + sources."@smithy/util-middleware-2.0.3" + sources."@smithy/util-retry-2.0.3" + sources."@smithy/util-stream-2.0.13" sources."@smithy/util-uri-escape-2.0.0" sources."@smithy/util-utf8-2.0.0" - sources."@smithy/util-waiter-2.0.8" + sources."@smithy/util-waiter-2.0.10" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.3" - sources."@types/http-cache-semantics-4.0.1" + sources."@types/http-cache-semantics-4.0.2" sources."@types/keyv-3.1.4" - sources."@types/node-20.6.1" - sources."@types/responselike-1.0.0" - sources."@types/ws-8.5.5" + sources."@types/node-20.8.0" + sources."@types/responselike-1.0.1" + sources."@types/ws-8.5.6" sources."accepts-1.3.8" sources."ansi-styles-4.3.0" sources."array-flatten-1.1.1" @@ -66837,7 +64240,7 @@ in sources."ms-2.0.0" ]; }) - sources."follow-redirects-1.15.2" + sources."follow-redirects-1.15.3" sources."form-data-3.0.1" sources."forwarded-0.2.0" sources."fresh-0.5.2" @@ -67069,7 +64472,7 @@ in sha512 = "+/kSxBAkZbeVBePoG2qRSvCkVIslk1dNlU5wQHAcbzOFTi7pEQR6C+kjoj94I+vGXVGMFfDwOYm07sPsd8dM6w=="; }; dependencies = [ - sources."@babel/parser-7.22.16" + sources."@babel/parser-7.23.0" sources."@emmetio/abbreviation-2.3.3" sources."@emmetio/css-abbreviation-2.1.8" sources."@emmetio/scanner-1.0.4" @@ -67122,13 +64525,13 @@ in sources."is-regex-1.1.4" sources."jsonc-parser-3.2.0" sources."lru-cache-6.0.0" - sources."magic-string-0.30.3" + sources."magic-string-0.30.4" sources."minimatch-9.0.3" sources."muggle-string-0.2.2" sources."nanoid-3.3.6" sources."object-assign-4.1.1" sources."picocolors-1.0.0" - sources."postcss-8.4.29" + sources."postcss-8.4.31" sources."pug-error-2.0.0" sources."pug-lexer-5.0.1" sources."pug-parser-6.0.0" @@ -67139,9 +64542,10 @@ in sources."typesafe-path-0.2.2" sources."typescript-5.2.2" sources."typescript-auto-import-cache-0.2.1" - (sources."vscode-css-languageservice-6.2.7" // { + (sources."vscode-css-languageservice-6.2.9" // { dependencies = [ sources."@vscode/l10n-0.0.16" + sources."vscode-languageserver-types-3.17.3" ]; }) (sources."vscode-html-languageservice-5.1.0" // { @@ -67155,10 +64559,19 @@ in ]; }) sources."vscode-jsonrpc-8.1.0" - sources."vscode-languageserver-8.1.0" - sources."vscode-languageserver-protocol-3.17.3" - sources."vscode-languageserver-textdocument-1.0.10" - sources."vscode-languageserver-types-3.17.3" + (sources."vscode-languageserver-8.1.0" // { + dependencies = [ + sources."vscode-languageserver-protocol-3.17.3" + sources."vscode-languageserver-types-3.17.3" + ]; + }) + (sources."vscode-languageserver-protocol-3.17.5" // { + dependencies = [ + sources."vscode-jsonrpc-8.2.0" + ]; + }) + sources."vscode-languageserver-textdocument-1.0.11" + sources."vscode-languageserver-types-3.17.5" sources."vscode-nls-5.2.0" sources."vscode-uri-3.0.7" sources."vue-component-meta-1.6.5" @@ -67213,13 +64626,13 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/compat-data-7.22.9" - (sources."@babel/core-7.22.19" // { + sources."@babel/compat-data-7.22.20" + (sources."@babel/core-7.23.0" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."@babel/generator-7.22.15" + sources."@babel/generator-7.23.0" sources."@babel/helper-annotate-as-pure-7.22.5" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.22.15" (sources."@babel/helper-compilation-targets-7.22.15" // { @@ -67240,25 +64653,25 @@ in ]; }) sources."@babel/helper-define-polyfill-provider-0.4.2" - sources."@babel/helper-environment-visitor-7.22.5" - sources."@babel/helper-function-name-7.22.5" + sources."@babel/helper-environment-visitor-7.22.20" + sources."@babel/helper-function-name-7.23.0" sources."@babel/helper-hoist-variables-7.22.5" - sources."@babel/helper-member-expression-to-functions-7.22.15" + sources."@babel/helper-member-expression-to-functions-7.23.0" sources."@babel/helper-module-imports-7.22.15" - sources."@babel/helper-module-transforms-7.22.19" + sources."@babel/helper-module-transforms-7.23.0" sources."@babel/helper-optimise-call-expression-7.22.5" sources."@babel/helper-plugin-utils-7.22.5" - sources."@babel/helper-remap-async-to-generator-7.22.17" - sources."@babel/helper-replace-supers-7.22.9" + sources."@babel/helper-remap-async-to-generator-7.22.20" + sources."@babel/helper-replace-supers-7.22.20" sources."@babel/helper-simple-access-7.22.5" sources."@babel/helper-skip-transparent-expression-wrappers-7.22.5" sources."@babel/helper-split-export-declaration-7.22.6" sources."@babel/helper-string-parser-7.22.5" - sources."@babel/helper-validator-identifier-7.22.19" + sources."@babel/helper-validator-identifier-7.22.20" sources."@babel/helper-validator-option-7.22.15" - sources."@babel/helper-wrap-function-7.22.17" - sources."@babel/helpers-7.22.15" - (sources."@babel/highlight-7.22.13" // { + sources."@babel/helper-wrap-function-7.22.20" + sources."@babel/helpers-7.23.1" + (sources."@babel/highlight-7.22.20" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -67268,7 +64681,7 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/parser-7.22.16" + sources."@babel/parser-7.23.0" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.15" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.15" sources."@babel/plugin-proposal-class-properties-7.18.6" @@ -67300,12 +64713,12 @@ in sources."@babel/plugin-transform-async-generator-functions-7.22.15" sources."@babel/plugin-transform-async-to-generator-7.22.5" sources."@babel/plugin-transform-block-scoped-functions-7.22.5" - sources."@babel/plugin-transform-block-scoping-7.22.15" + sources."@babel/plugin-transform-block-scoping-7.23.0" sources."@babel/plugin-transform-class-properties-7.22.5" sources."@babel/plugin-transform-class-static-block-7.22.11" sources."@babel/plugin-transform-classes-7.22.15" sources."@babel/plugin-transform-computed-properties-7.22.5" - sources."@babel/plugin-transform-destructuring-7.22.15" + sources."@babel/plugin-transform-destructuring-7.23.0" sources."@babel/plugin-transform-dotall-regex-7.22.5" sources."@babel/plugin-transform-duplicate-keys-7.22.5" sources."@babel/plugin-transform-dynamic-import-7.22.11" @@ -67318,9 +64731,9 @@ in sources."@babel/plugin-transform-literals-7.22.5" sources."@babel/plugin-transform-logical-assignment-operators-7.22.11" sources."@babel/plugin-transform-member-expression-literals-7.22.5" - sources."@babel/plugin-transform-modules-amd-7.22.5" - sources."@babel/plugin-transform-modules-commonjs-7.22.15" - sources."@babel/plugin-transform-modules-systemjs-7.22.11" + sources."@babel/plugin-transform-modules-amd-7.23.0" + sources."@babel/plugin-transform-modules-commonjs-7.23.0" + sources."@babel/plugin-transform-modules-systemjs-7.23.0" sources."@babel/plugin-transform-modules-umd-7.22.5" sources."@babel/plugin-transform-named-capturing-groups-regex-7.22.5" sources."@babel/plugin-transform-new-target-7.22.5" @@ -67329,7 +64742,7 @@ in sources."@babel/plugin-transform-object-rest-spread-7.22.15" sources."@babel/plugin-transform-object-super-7.22.5" sources."@babel/plugin-transform-optional-catch-binding-7.22.11" - sources."@babel/plugin-transform-optional-chaining-7.22.15" + sources."@babel/plugin-transform-optional-chaining-7.23.0" sources."@babel/plugin-transform-parameters-7.22.15" sources."@babel/plugin-transform-private-methods-7.22.5" sources."@babel/plugin-transform-private-property-in-object-7.22.11" @@ -67346,14 +64759,14 @@ in sources."@babel/plugin-transform-unicode-property-regex-7.22.5" sources."@babel/plugin-transform-unicode-regex-7.22.5" sources."@babel/plugin-transform-unicode-sets-regex-7.22.5" - (sources."@babel/preset-env-7.22.15" // { + (sources."@babel/preset-env-7.22.20" // { dependencies = [ sources."semver-6.3.1" ]; }) sources."@babel/preset-flow-7.22.15" sources."@babel/preset-modules-0.1.6-no-external-plugins" - sources."@babel/preset-typescript-7.22.15" + sources."@babel/preset-typescript-7.23.0" (sources."@babel/register-7.22.15" // { dependencies = [ sources."make-dir-2.1.0" @@ -67362,10 +64775,10 @@ in ]; }) sources."@babel/regjsgen-0.8.0" - sources."@babel/runtime-7.22.15" + sources."@babel/runtime-7.23.1" sources."@babel/template-7.22.15" - sources."@babel/traverse-7.22.19" - sources."@babel/types-7.22.19" + sources."@babel/traverse-7.23.0" + sources."@babel/types-7.23.0" sources."@graphql-tools/merge-8.3.1" (sources."@graphql-tools/mock-8.7.20" // { dependencies = [ @@ -67408,10 +64821,10 @@ in sources."@types/body-parser-1.19.2" sources."@types/connect-3.4.36" sources."@types/cors-2.8.12" - sources."@types/ejs-3.1.2" + sources."@types/ejs-3.1.3" sources."@types/express-4.17.14" sources."@types/express-serve-static-core-4.17.31" - sources."@types/http-errors-2.0.1" + sources."@types/http-errors-2.0.2" sources."@types/inquirer-8.2.6" (sources."@types/jscodeshift-0.7.2" // { dependencies = [ @@ -67420,12 +64833,12 @@ in ]; }) sources."@types/long-4.0.2" - sources."@types/mime-3.0.1" - sources."@types/node-20.6.1" - sources."@types/normalize-package-data-2.4.1" + sources."@types/mime-3.0.2" + sources."@types/node-20.8.0" + sources."@types/normalize-package-data-2.4.2" sources."@types/qs-6.9.8" - sources."@types/range-parser-1.2.4" - sources."@types/serve-static-1.15.2" + sources."@types/range-parser-1.2.5" + sources."@types/serve-static-1.15.3" sources."@types/through-0.0.31" sources."@vue/cli-shared-utils-5.0.8" (sources."@vue/cli-ui-5.0.8" // { @@ -67487,7 +64900,7 @@ in sources."semver-6.3.1" ]; }) - sources."babel-plugin-polyfill-corejs3-0.8.3" + sources."babel-plugin-polyfill-corejs3-0.8.4" sources."babel-plugin-polyfill-regenerator-0.5.2" sources."backo2-1.0.2" sources."balanced-match-1.0.2" @@ -67511,7 +64924,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.21.10" + sources."browserslist-4.22.1" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -67530,7 +64943,7 @@ in }) sources."call-bind-1.0.2" sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001534" + sources."caniuse-lite-1.0.30001542" sources."caw-2.0.1" sources."chalk-4.1.2" sources."chardet-0.7.0" @@ -67575,11 +64988,11 @@ in }) sources."content-disposition-0.5.4" sources."content-type-1.0.5" - sources."convert-source-map-1.9.0" + sources."convert-source-map-2.0.0" sources."cookie-0.5.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - sources."core-js-compat-3.32.2" + sources."core-js-compat-3.33.0" sources."core-util-is-1.0.3" sources."cors-2.8.5" (sources."cross-spawn-6.0.5" // { @@ -67640,7 +65053,7 @@ in sources."easy-stack-1.0.1" sources."ee-first-1.1.1" sources."ejs-3.1.9" - sources."electron-to-chromium-1.4.523" + sources."electron-to-chromium-1.4.538" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."encoding-0.1.13" @@ -67751,7 +65164,7 @@ in sources."which-2.0.2" ]; }) - sources."flow-parser-0.216.1" + sources."flow-parser-0.217.2" sources."for-in-1.0.2" sources."forwarded-0.2.0" sources."fragment-cache-0.2.1" @@ -67868,7 +65281,7 @@ in ]; }) sources."javascript-stringify-2.1.0" - sources."joi-17.10.1" + sources."joi-17.10.2" sources."js-message-1.0.7" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" @@ -68037,7 +65450,7 @@ in ]; }) sources."posix-character-classes-0.1.1" - (sources."postcss-8.4.29" // { + (sources."postcss-8.4.31" // { dependencies = [ sources."nanoid-3.3.6" ]; @@ -68081,7 +65494,7 @@ in sources."repeat-element-1.1.4" sources."repeat-string-1.6.1" sources."require-directory-2.1.1" - sources."resolve-1.22.5" + sources."resolve-1.22.6" sources."resolve-url-0.2.1" sources."responselike-1.0.2" sources."restore-cursor-3.1.0" @@ -68096,7 +65509,7 @@ in sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."sax-1.2.4" + sources."sax-1.3.0" (sources."seek-bzip-1.0.6" // { dependencies = [ sources."commander-2.20.3" @@ -68170,7 +65583,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.13" + sources."spdx-license-ids-3.0.15" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" (sources."static-extend-0.1.2" // { @@ -68270,7 +65683,7 @@ in sources."has-values-0.1.4" ]; }) - sources."update-browserslist-db-1.0.11" + sources."update-browserslist-db-1.0.13" sources."urix-0.1.0" sources."url-parse-lax-3.0.0" sources."url-to-options-1.0.1" @@ -68458,13 +65871,13 @@ in }; dependencies = [ sources."@babel/code-frame-7.22.13" - sources."@babel/generator-7.22.15" + sources."@babel/generator-7.23.0" sources."@babel/helper-string-parser-7.22.5" - sources."@babel/helper-validator-identifier-7.22.19" - sources."@babel/highlight-7.22.13" - sources."@babel/parser-7.22.16" + sources."@babel/helper-validator-identifier-7.22.20" + sources."@babel/highlight-7.22.20" + sources."@babel/parser-7.23.0" sources."@babel/template-7.22.15" - sources."@babel/types-7.22.19" + sources."@babel/types-7.23.0" sources."@jridgewell/gen-mapping-0.3.3" sources."@jridgewell/resolve-uri-3.1.1" sources."@jridgewell/set-array-1.1.2" @@ -68543,13 +65956,13 @@ in }; dependencies = [ sources."@babel/code-frame-7.22.13" - sources."@babel/helper-validator-identifier-7.22.19" - sources."@babel/highlight-7.22.13" + sources."@babel/helper-validator-identifier-7.22.20" + sources."@babel/highlight-7.22.20" sources."@isaacs/cliui-8.0.2" - sources."@npmcli/config-6.2.1" + sources."@npmcli/config-6.3.0" (sources."@npmcli/map-workspaces-3.0.4" // { dependencies = [ - sources."glob-10.3.4" + sources."glob-10.3.10" sources."minimatch-9.0.3" ]; }) @@ -68565,18 +65978,18 @@ in sources."@szmarczak/http-timer-5.0.1" sources."@types/acorn-4.0.6" sources."@types/concat-stream-2.0.0" - sources."@types/debug-4.1.8" - sources."@types/estree-1.0.1" - sources."@types/estree-jsx-1.0.0" - sources."@types/hast-2.3.5" - sources."@types/http-cache-semantics-4.0.1" + sources."@types/debug-4.1.9" + sources."@types/estree-1.0.2" + sources."@types/estree-jsx-1.0.1" + sources."@types/hast-2.3.6" + sources."@types/http-cache-semantics-4.0.2" sources."@types/is-empty-1.2.1" - sources."@types/mdast-3.0.12" - sources."@types/minimist-1.2.2" - sources."@types/ms-0.7.31" - sources."@types/nlcst-1.0.1" - sources."@types/node-18.17.16" - sources."@types/normalize-package-data-2.4.1" + sources."@types/mdast-3.0.13" + sources."@types/minimist-1.2.3" + sources."@types/ms-0.7.32" + sources."@types/nlcst-1.0.2" + sources."@types/node-18.18.1" + sources."@types/normalize-package-data-2.4.2" sources."@types/supports-color-8.1.1" sources."@types/unist-2.0.8" sources."abbrev-2.0.0" @@ -68741,7 +66154,7 @@ in sources."is-yarn-global-0.4.1" sources."isarray-0.0.1" sources."isexe-2.0.0" - sources."jackspeak-2.3.3" + sources."jackspeak-2.3.6" sources."js-tokens-4.0.0" sources."json-buffer-3.0.1" sources."json-parse-even-better-errors-2.3.1" @@ -68823,7 +66236,7 @@ in sources."minimatch-5.1.6" sources."minimist-1.2.8" sources."minimist-options-4.1.0" - sources."minipass-7.0.3" + sources."minipass-7.0.4" sources."mri-1.2.0" sources."ms-2.1.2" sources."nlcst-is-literal-2.1.1" @@ -68933,7 +66346,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.13" + sources."spdx-license-ids-3.0.15" sources."split-0.2.10" (sources."split-transform-stream-0.1.1" // { dependencies = [ @@ -69124,25 +66537,25 @@ in autoprefixer = nodeEnv.buildNodePackage { name = "autoprefixer"; packageName = "autoprefixer"; - version = "10.4.15"; + version = "10.4.16"; src = fetchurl { - url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.15.tgz"; - sha512 = "KCuPB8ZCIqFdA4HwKXsvz7j6gvSDNhDP7WnUjBleRkKjPdvCmHFuQ77ocavI8FT6NdvlBnE2UFr2H4Mycn8Vew=="; + url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.16.tgz"; + sha512 = "7vd3UC6xKp0HLfua5IjZlcXvGAGy7cBAXTg2lyQ/8WpNhd6SiZ8Be+xm3FyBSYJx5GKcpRCzBh7RH4/0dnY+uQ=="; }; dependencies = [ - sources."browserslist-4.21.10" - sources."caniuse-lite-1.0.30001534" - sources."electron-to-chromium-1.4.523" + sources."browserslist-4.22.1" + sources."caniuse-lite-1.0.30001542" + sources."electron-to-chromium-1.4.538" sources."escalade-3.1.1" sources."fraction.js-4.3.6" sources."nanoid-3.3.6" sources."node-releases-2.0.13" sources."normalize-range-0.1.2" sources."picocolors-1.0.0" - sources."postcss-8.4.29" + sources."postcss-8.4.31" sources."postcss-value-parser-4.2.0" sources."source-map-js-1.0.2" - sources."update-browserslist-db-1.0.11" + sources."update-browserslist-db-1.0.13" ]; buildInputs = globalBuildInputs; meta = { @@ -69192,255 +66605,13 @@ in bypassCache = true; reconstructLock = true; }; - aws-azure-login = nodeEnv.buildNodePackage { - name = "aws-azure-login"; - packageName = "aws-azure-login"; - version = "3.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/aws-azure-login/-/aws-azure-login-3.6.1.tgz"; - sha512 = "wIUVyYY5XNksGeRJZjDKW6kQ17lUzCMsfKh2o9O8kYjfxvNF7DA+6iWX8m4eq8eVMjnEFIzxoq5yWLn4qFYcGg=="; - }; - dependencies = [ - sources."@tootallnate/once-1.1.2" - sources."@types/node-20.6.1" - sources."@types/yauzl-2.10.0" - sources."acorn-8.10.0" - sources."acorn-walk-8.2.0" - sources."agent-base-6.0.2" - sources."ansi-escapes-4.3.2" - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."ast-types-0.13.4" - sources."available-typed-arrays-1.0.5" - (sources."aws-sdk-2.1459.0" // { - dependencies = [ - sources."uuid-8.0.0" - ]; - }) - sources."balanced-match-1.0.2" - sources."base64-js-1.5.1" - (sources."bl-4.1.0" // { - dependencies = [ - sources."buffer-5.7.1" - ]; - }) - sources."bluebird-3.7.2" - sources."boolbase-1.0.0" - sources."brace-expansion-1.1.11" - sources."buffer-4.9.2" - sources."buffer-crc32-0.2.13" - sources."bufferutil-4.0.7" - sources."bytes-3.1.2" - sources."call-bind-1.0.2" - sources."chalk-4.1.2" - sources."chardet-0.7.0" - sources."cheerio-1.0.0-rc.12" - sources."cheerio-select-2.1.0" - sources."chownr-1.1.4" - sources."cli-cursor-3.1.0" - sources."cli-spinners-2.9.1" - sources."cli-width-3.0.0" - sources."clone-1.0.4" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."commander-9.5.0" - sources."concat-map-0.0.1" - sources."core-util-is-1.0.3" - sources."cross-fetch-3.1.5" - sources."css-select-5.1.0" - sources."css-what-6.1.0" - sources."data-uri-to-buffer-3.0.1" - sources."debug-4.3.4" - sources."deep-is-0.1.4" - sources."defaults-1.0.4" - sources."degenerator-3.0.4" - sources."depd-2.0.0" - sources."devtools-protocol-0.0.981744" - sources."dom-serializer-2.0.0" - sources."domelementtype-2.3.0" - sources."domhandler-5.0.3" - sources."domutils-3.1.0" - sources."emoji-regex-8.0.0" - (sources."encoding-0.1.13" // { - dependencies = [ - sources."iconv-lite-0.6.3" - ]; - }) - sources."end-of-stream-1.4.4" - sources."entities-4.5.0" - sources."escape-string-regexp-1.0.5" - sources."escodegen-1.14.3" - sources."esprima-4.0.1" - sources."estraverse-4.3.0" - sources."esutils-2.0.3" - sources."events-1.1.1" - sources."external-editor-3.1.0" - sources."extract-zip-2.0.1" - sources."fast-levenshtein-2.0.6" - sources."fd-slicer-1.1.0" - sources."figures-3.2.0" - sources."file-uri-to-path-2.0.0" - sources."find-up-4.1.0" - sources."for-each-0.3.3" - sources."fs-constants-1.0.0" - sources."fs-extra-8.1.0" - sources."fs.realpath-1.0.0" - (sources."ftp-0.3.10" // { - dependencies = [ - sources."isarray-0.0.1" - sources."readable-stream-1.1.14" - sources."string_decoder-0.10.31" - ]; - }) - sources."function-bind-1.1.1" - sources."get-intrinsic-1.2.1" - sources."get-stream-5.2.0" - sources."get-uri-3.0.2" - sources."glob-7.2.3" - sources."gopd-1.0.1" - sources."graceful-fs-4.2.11" - sources."has-1.0.3" - sources."has-flag-4.0.0" - sources."has-proto-1.0.1" - sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" - sources."htmlparser2-8.0.2" - sources."http-errors-2.0.0" - sources."http-proxy-agent-4.0.1" - sources."https-proxy-agent-5.0.1" - sources."iconv-lite-0.4.24" - sources."ieee754-1.1.13" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ini-3.0.1" - sources."inquirer-8.2.6" - sources."ip-1.1.8" - sources."is-arguments-1.1.1" - sources."is-callable-1.2.7" - sources."is-fullwidth-code-point-3.0.0" - sources."is-generator-function-1.0.10" - sources."is-interactive-1.0.0" - sources."is-typed-array-1.1.12" - sources."is-unicode-supported-0.1.0" - sources."isarray-1.0.0" - sources."jmespath-0.16.0" - sources."jsonfile-4.0.0" - sources."levn-0.3.0" - sources."locate-path-5.0.0" - sources."lodash-4.17.21" - sources."log-symbols-4.1.0" - sources."lru-cache-5.1.1" - sources."mimic-fn-2.1.0" - sources."minimatch-3.1.2" - sources."mkdirp-1.0.4" - sources."mkdirp-classic-0.5.3" - sources."ms-2.1.2" - sources."mute-stream-0.0.8" - sources."netmask-2.0.2" - sources."node-fetch-2.6.7" - sources."node-gyp-build-4.6.1" - sources."nth-check-2.1.1" - sources."once-1.4.0" - sources."onetime-5.1.2" - sources."optionator-0.8.3" - sources."ora-5.4.1" - sources."os-tmpdir-1.0.2" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-try-2.2.0" - sources."pac-proxy-agent-5.0.0" - sources."pac-resolver-5.0.1" - sources."parse5-7.1.2" - sources."parse5-htmlparser2-tree-adapter-7.0.0" - sources."path-exists-4.0.0" - sources."path-is-absolute-1.0.1" - sources."pend-1.2.0" - sources."pkg-dir-4.2.0" - sources."prelude-ls-1.1.2" - sources."progress-2.0.3" - sources."proxy-agent-5.0.0" - sources."proxy-from-env-1.1.0" - sources."pump-3.0.0" - sources."punycode-1.3.2" - sources."puppeteer-13.7.0" - sources."querystring-0.2.0" - sources."raw-body-2.5.2" - sources."readable-stream-3.6.2" - sources."restore-cursor-3.1.0" - sources."rimraf-3.0.2" - sources."run-async-2.4.1" - sources."rxjs-7.8.1" - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" - sources."sax-1.2.1" - sources."setprototypeof-1.2.0" - sources."signal-exit-3.0.7" - sources."smart-buffer-4.2.0" - (sources."socks-2.7.1" // { - dependencies = [ - sources."ip-2.0.0" - ]; - }) - sources."socks-proxy-agent-5.0.1" - sources."source-map-0.6.1" - sources."statuses-2.0.1" - sources."string-width-4.2.3" - sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.1" - sources."supports-color-7.2.0" - sources."tar-fs-2.1.1" - sources."tar-stream-2.2.0" - sources."through-2.3.8" - sources."tmp-0.0.33" - sources."toidentifier-1.0.1" - sources."tr46-0.0.3" - sources."tslib-2.6.2" - sources."type-check-0.3.2" - sources."type-fest-0.21.3" - (sources."unbzip2-stream-1.4.3" // { - dependencies = [ - sources."buffer-5.7.1" - ]; - }) - sources."universalify-0.1.2" - sources."unpipe-1.0.0" - sources."url-0.10.3" - sources."utf-8-validate-5.0.10" - sources."util-0.12.5" - sources."util-deprecate-1.0.2" - sources."uuid-8.3.2" - sources."vm2-3.9.19" - sources."wcwidth-1.0.1" - sources."webidl-conversions-3.0.1" - sources."whatwg-url-5.0.0" - sources."which-typed-array-1.1.11" - sources."word-wrap-1.2.5" - sources."wrap-ansi-6.2.0" - sources."wrappy-1.0.2" - sources."ws-8.5.0" - sources."xml2js-0.5.0" - sources."xmlbuilder-11.0.1" - sources."xregexp-2.0.0" - sources."yallist-3.1.1" - sources."yauzl-2.10.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Use Azure AD SSO to log into the AWS CLI."; - homepage = "https://github.com/aws-azure-login/aws-azure-login#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; aws-cdk = nodeEnv.buildNodePackage { name = "aws-cdk"; packageName = "aws-cdk"; - version = "2.96.2"; + version = "2.99.1"; src = fetchurl { - url = "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.96.2.tgz"; - sha512 = "13ERpPV99OFAD75PLOtl0rRMXTWn6bCrmUPwYKkLwIMkj2xWCBiwo2Y9Qg+UzEszm5NMHA1N4ichSvuZ0mt2IQ=="; + url = "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.99.1.tgz"; + sha512 = "uWg4xhBrHNoRMlEgvWzr0MacJ92dLFeJ5AvT7nruxrgShU1fgt/Rsxw1WCXSASaVUsIUGgtO+P89x8cRU2nf7w=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -69458,10 +66629,10 @@ in awesome-lint = nodeEnv.buildNodePackage { name = "awesome-lint"; packageName = "awesome-lint"; - version = "0.18.3"; + version = "0.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/awesome-lint/-/awesome-lint-0.18.3.tgz"; - sha512 = "s4peLfrUG1sSt/i7h5CbezkYxyVWGylL1xbntB2JMzu4x3CVCGHtzZ5kQygMxMKYsBReVr8PcXVJ2v+Jg7jSvA=="; + url = "https://registry.npmjs.org/awesome-lint/-/awesome-lint-0.18.6.tgz"; + sha512 = "QGFEPM6m3ejd62pMuxvvqoHxx7AXHmn2Q2ed8lwZe6J01emKXVbW6MkIWjlD4ZFS1WnDqE4V220emoXJemUnkw=="; }; dependencies = [ (sources."@babel/code-frame-7.22.13" // { @@ -69474,8 +66645,8 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/helper-validator-identifier-7.22.19" - (sources."@babel/highlight-7.22.13" // { + sources."@babel/helper-validator-identifier-7.22.20" + (sources."@babel/highlight-7.22.20" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -69491,11 +66662,11 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/eslint-7.29.0" - sources."@types/estree-1.0.1" + sources."@types/estree-1.0.2" sources."@types/json-schema-7.0.13" - sources."@types/mdast-3.0.12" - sources."@types/minimist-1.2.2" - sources."@types/normalize-package-data-2.4.1" + sources."@types/mdast-3.0.13" + sources."@types/minimist-1.2.3" + sources."@types/normalize-package-data-2.4.2" sources."@types/unist-2.0.8" sources."aggregate-error-3.1.0" (sources."ansi-escapes-4.3.2" // { @@ -69766,7 +66937,7 @@ in sources."remark-parse-9.0.0" sources."remark-stringify-9.0.1" sources."repeat-string-1.6.1" - sources."resolve-1.22.5" + sources."resolve-1.22.6" sources."responselike-1.0.2" sources."restore-cursor-3.1.0" sources."reusify-1.0.4" @@ -69783,7 +66954,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.13" + sources."spdx-license-ids-3.0.15" (sources."string-width-4.2.3" // { dependencies = [ sources."emoji-regex-8.0.0" @@ -70052,7 +67223,7 @@ in sources."read-pkg-up-1.0.1" sources."redent-1.0.0" sources."repeating-2.0.1" - sources."resolve-1.22.5" + sources."resolve-1.22.6" (sources."rimraf-2.7.1" // { dependencies = [ sources."glob-7.2.3" @@ -70065,7 +67236,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.13" + sources."spdx-license-ids-3.0.15" sources."sprintf-js-1.0.3" sources."strip-bom-2.0.0" sources."strip-indent-1.0.1" @@ -70255,7 +67426,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."resolve-1.22.5" + sources."resolve-1.22.6" sources."ripemd160-2.0.2" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" @@ -70318,7 +67489,7 @@ in sources."@socket.io/component-emitter-3.1.0" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.14" - sources."@types/node-20.6.1" + sources."@types/node-20.8.0" sources."accepts-1.3.8" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -70376,7 +67547,7 @@ in sources."ms-2.0.0" ]; }) - sources."follow-redirects-1.15.2" + sources."follow-redirects-1.15.3" sources."fresh-0.5.2" sources."fs-extra-3.0.1" sources."fsevents-2.3.3" @@ -70507,16 +67678,16 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "2.88.0"; + version = "2.118.1"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-2.88.0.tgz"; - sha512 = "+IGyk/tNAegskDFSLSGJNRStuMdjIP7N3AGRCb5YVV6oy1nvpOMdQ44htul6z7csnIkD7o0jHN+6orLhPgS81g=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-2.118.1.tgz"; + sha512 = "mq/NLHlcbyi9f2878LmozgDCnOo3Bo5XOOwkCNElzRnL2Qc7p5kNm71q/KJJk6Lt6Wnzofq5418MPmZPjbMgKw=="; }; dependencies = [ sources."@colors/colors-1.5.0" sources."@dabh/diagnostics-2.0.3" - sources."@jsii/check-node-1.88.0" - sources."@jsii/spec-1.88.0" + sources."@jsii/check-node-1.89.0" + sources."@jsii/spec-1.89.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -70532,7 +67703,7 @@ in sources."@octokit/request-error-2.1.0" sources."@octokit/rest-18.12.0" sources."@octokit/types-6.41.0" - sources."@types/node-16.18.51" + sources."@types/node-16.18.55" sources."@types/triple-beam-1.3.3" sources."@xmldom/xmldom-0.8.10" sources."aggregate-error-3.1.0" @@ -70566,8 +67737,8 @@ in sources."buffer-5.7.1" sources."camelcase-6.3.0" sources."case-1.6.3" - sources."cdk8s-2.64.11" - sources."cdk8s-plus-25-2.22.11" + sources."cdk8s-2.66.1" + sources."cdk8s-plus-25-2.22.24" sources."chalk-4.1.2" sources."chardet-0.7.0" sources."clean-stack-2.2.0" @@ -70576,7 +67747,7 @@ in sources."cli-width-3.0.0" sources."cliui-7.0.4" sources."clone-2.1.2" - (sources."codemaker-1.88.0" // { + (sources."codemaker-1.89.0" // { dependencies = [ sources."fs-extra-10.1.0" ]; @@ -70615,7 +67786,7 @@ in sources."dotenv-16.3.1" (sources."downlevel-dts-0.11.0" // { dependencies = [ - sources."typescript-5.3.0-dev.20230915" + sources."typescript-5.3.0-dev.20231002" ]; }) sources."emoji-regex-8.0.0" @@ -70640,9 +67811,9 @@ in }) sources."fill-range-7.0.1" sources."find-up-4.1.0" - sources."flatted-3.2.7" + sources."flatted-3.2.9" sources."fn.name-1.1.0" - sources."follow-redirects-1.15.2" + sources."follow-redirects-1.15.3" sources."form-data-4.0.0" (sources."fs-extra-8.1.0" // { dependencies = [ @@ -70657,7 +67828,7 @@ in sources."glob-parent-5.1.2" sources."globby-11.1.0" sources."graceful-fs-4.2.11" - sources."graphql-16.8.0" + sources."graphql-16.8.1" sources."graphql-tag-2.12.6" sources."has-1.0.3" sources."has-flag-4.0.0" @@ -70685,31 +67856,32 @@ in sources."is-plain-object-5.0.0" sources."is-stream-2.0.1" sources."is-unicode-supported-0.1.0" - (sources."jsii-1.88.0" // { + (sources."jsii-1.89.0" // { dependencies = [ sources."fs-extra-10.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.88.0" // { + (sources."jsii-pacmak-1.89.0" // { dependencies = [ sources."fs-extra-10.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.88.0" // { + (sources."jsii-reflect-1.89.0" // { dependencies = [ sources."fs-extra-10.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.88.0" // { + (sources."jsii-rosetta-1.89.0" // { dependencies = [ sources."yargs-16.2.0" ]; }) (sources."jsii-srcmak-0.1.951" // { dependencies = [ + sources."@jsii/check-node-1.88.0" sources."cliui-8.0.1" sources."fs-extra-9.1.0" (sources."jsii-5.1.12" // { @@ -70755,7 +67927,7 @@ in sources."once-1.4.0" sources."one-time-1.0.0" sources."onetime-5.1.2" - sources."oo-ascii-tree-1.88.0" + sources."oo-ascii-tree-1.89.0" sources."ora-5.4.1" sources."os-tmpdir-1.0.2" sources."p-limit-2.3.0" @@ -70774,7 +67946,7 @@ in sources."require-directory-2.1.1" sources."require-from-string-2.0.2" sources."require-main-filename-2.0.0" - sources."resolve-1.22.5" + sources."resolve-1.22.6" sources."restore-cursor-3.1.0" sources."reusify-1.0.4" sources."rfdc-1.3.0" @@ -70886,10 +68058,10 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/generator-7.22.15" + sources."@babel/generator-7.23.0" sources."@babel/helper-string-parser-7.22.5" - sources."@babel/helper-validator-identifier-7.22.19" - (sources."@babel/highlight-7.22.13" // { + sources."@babel/helper-validator-identifier-7.22.20" + (sources."@babel/highlight-7.22.20" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -70900,16 +68072,16 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/parser-7.22.16" + sources."@babel/parser-7.23.0" sources."@babel/template-7.22.15" - sources."@babel/types-7.22.19" + sources."@babel/types-7.23.0" sources."@cdktf/cli-core-0.18.0" sources."@cdktf/commons-0.18.0" (sources."@cdktf/hcl2cdk-0.18.0" // { dependencies = [ sources."brace-expansion-2.0.1" sources."camelcase-6.3.0" - sources."glob-10.3.4" + sources."glob-10.3.10" sources."minimatch-9.0.3" sources."zod-3.22.2" ]; @@ -70927,16 +68099,16 @@ in sources."@types/node-16.18.23" ]; }) - (sources."@inquirer/checkbox-1.3.11" // { + (sources."@inquirer/checkbox-1.3.12" // { dependencies = [ - sources."@inquirer/core-5.0.0" + sources."@inquirer/core-5.0.1" sources."cli-spinners-2.9.1" sources."signal-exit-4.1.0" ]; }) - (sources."@inquirer/confirm-2.0.12" // { + (sources."@inquirer/confirm-2.0.13" // { dependencies = [ - sources."@inquirer/core-5.0.0" + sources."@inquirer/core-5.0.1" sources."cli-spinners-2.9.1" sources."signal-exit-4.1.0" ]; @@ -70946,44 +68118,44 @@ in sources."cli-spinners-2.9.1" ]; }) - (sources."@inquirer/editor-1.2.10" // { + (sources."@inquirer/editor-1.2.11" // { dependencies = [ - sources."@inquirer/core-5.0.0" + sources."@inquirer/core-5.0.1" sources."cli-spinners-2.9.1" sources."signal-exit-4.1.0" ]; }) - (sources."@inquirer/expand-1.1.11" // { + (sources."@inquirer/expand-1.1.12" // { dependencies = [ - sources."@inquirer/core-5.0.0" + sources."@inquirer/core-5.0.1" sources."cli-spinners-2.9.1" sources."signal-exit-4.1.0" ]; }) - (sources."@inquirer/input-1.2.11" // { + (sources."@inquirer/input-1.2.12" // { dependencies = [ - sources."@inquirer/core-5.0.0" + sources."@inquirer/core-5.0.1" sources."cli-spinners-2.9.1" sources."signal-exit-4.1.0" ]; }) - sources."@inquirer/password-1.1.11" + sources."@inquirer/password-1.1.12" sources."@inquirer/prompts-2.3.1" - (sources."@inquirer/rawlist-1.2.11" // { + (sources."@inquirer/rawlist-1.2.12" // { dependencies = [ - sources."@inquirer/core-5.0.0" + sources."@inquirer/core-5.0.1" sources."cli-spinners-2.9.1" sources."signal-exit-4.1.0" ]; }) - (sources."@inquirer/select-1.2.11" // { + (sources."@inquirer/select-1.2.12" // { dependencies = [ - sources."@inquirer/core-5.0.0" + sources."@inquirer/core-5.0.1" sources."cli-spinners-2.9.1" sources."signal-exit-4.1.0" ]; }) - sources."@inquirer/type-1.1.4" + sources."@inquirer/type-1.1.5" (sources."@isaacs/cliui-8.0.2" // { dependencies = [ sources."ansi-regex-6.0.1" @@ -71000,7 +68172,7 @@ in sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.19" sources."@jsii/check-node-1.88.0" - sources."@jsii/spec-1.88.0" + sources."@jsii/spec-1.89.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -71012,12 +68184,12 @@ in sources."@sentry/types-6.19.7" sources."@sentry/utils-6.19.7" sources."@types/mute-stream-0.0.1" - sources."@types/node-20.6.1" - sources."@types/prop-types-15.7.5" - sources."@types/react-18.2.21" - sources."@types/scheduler-0.16.3" + sources."@types/node-20.8.0" + sources."@types/prop-types-15.7.8" + sources."@types/react-18.2.24" + sources."@types/scheduler-0.16.4" sources."@types/wrap-ansi-3.0.0" - sources."@types/yauzl-2.10.0" + sources."@types/yauzl-2.10.1" sources."@types/yoga-layout-1.9.2" sources."@xmldom/xmldom-0.8.10" sources."address-1.2.2" @@ -71076,7 +68248,7 @@ in }) sources."clone-2.1.2" sources."code-excerpt-3.0.0" - (sources."codemaker-1.88.0" // { + (sources."codemaker-1.89.0" // { dependencies = [ sources."camelcase-6.3.0" sources."decamelize-5.0.1" @@ -71118,7 +68290,7 @@ in sources."detect-port-1.5.1" (sources."downlevel-dts-0.11.0" // { dependencies = [ - sources."typescript-5.3.0-dev.20230915" + sources."typescript-5.3.0-dev.20231002" ]; }) sources."eastasianwidth-0.2.0" @@ -71157,8 +68329,8 @@ in }) sources."fill-range-7.0.1" sources."find-up-4.1.0" - sources."flatted-3.2.7" - sources."follow-redirects-1.15.2" + sources."flatted-3.2.9" + sources."follow-redirects-1.15.3" sources."for-each-0.3.3" (sources."foreground-child-3.1.1" // { dependencies = [ @@ -71241,21 +68413,23 @@ in sources."is-wsl-2.2.0" sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."jackspeak-2.3.3" + sources."jackspeak-2.3.6" sources."js-tokens-4.0.0" sources."jsesc-2.5.2" - (sources."jsii-5.2.5" // { + (sources."jsii-5.2.11" // { dependencies = [ + sources."@jsii/check-node-1.89.0" sources."typescript-5.2.2" ]; }) - (sources."jsii-pacmak-1.88.0" // { + (sources."jsii-pacmak-1.89.0" // { dependencies = [ + sources."@jsii/check-node-1.89.0" sources."cliui-7.0.4" sources."escape-string-regexp-4.0.0" sources."fs-extra-10.1.0" - sources."jsii-1.88.0" - sources."jsii-rosetta-1.88.0" + sources."jsii-1.89.0" + sources."jsii-rosetta-1.89.0" sources."jsonfile-6.1.0" sources."typescript-3.9.10" sources."universalify-2.0.0" @@ -71264,8 +68438,9 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-reflect-1.88.0" // { + (sources."jsii-reflect-1.89.0" // { dependencies = [ + sources."@jsii/check-node-1.89.0" sources."cliui-7.0.4" sources."fs-extra-10.1.0" sources."jsonfile-6.1.0" @@ -71332,7 +68507,7 @@ in ]; }) sources."minimist-1.2.8" - sources."minipass-7.0.3" + sources."minipass-7.0.4" sources."mkdirp-classic-0.5.3" sources."ms-2.1.2" sources."mute-stream-1.0.0" @@ -71353,7 +68528,7 @@ in sources."obliterator-2.0.4" sources."once-1.4.0" sources."onetime-5.1.2" - sources."oo-ascii-tree-1.88.0" + sources."oo-ascii-tree-1.89.0" sources."open-7.4.2" sources."os-tmpdir-1.0.2" sources."p-limit-2.3.0" @@ -71405,7 +68580,7 @@ in sources."require-from-string-2.0.2" sources."require-main-filename-2.0.0" sources."reserved-words-0.1.2" - sources."resolve-1.22.5" + sources."resolve-1.22.6" sources."restore-cursor-3.1.0" sources."reusify-1.0.4" sources."rfdc-1.3.0" @@ -71413,7 +68588,7 @@ in sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."sax-1.2.4" + sources."sax-1.3.0" sources."scheduler-0.20.2" sources."semver-7.5.4" (sources."semver-intersect-1.4.0" // { @@ -71515,10 +68690,10 @@ in }; dependencies = [ sources."@babel/code-frame-7.22.13" - sources."@babel/helper-validator-identifier-7.22.19" - sources."@babel/highlight-7.22.13" - sources."@types/minimist-1.2.2" - sources."@types/normalize-package-data-2.4.1" + sources."@babel/helper-validator-identifier-7.22.20" + sources."@babel/highlight-7.22.20" + sources."@types/minimist-1.2.3" + sources."@types/normalize-package-data-2.4.2" sources."ansi-styles-3.2.1" sources."arch-2.2.0" sources."arrify-1.0.1" @@ -71587,7 +68762,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.13" + sources."spdx-license-ids-3.0.15" sources."strip-final-newline-2.0.0" sources."strip-indent-4.0.0" sources."supports-color-5.5.0" @@ -71665,10 +68840,10 @@ in coc-diagnostic = nodeEnv.buildNodePackage { name = "coc-diagnostic"; packageName = "coc-diagnostic"; - version = "0.24.0"; + version = "0.24.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.24.0.tgz"; - sha512 = "YZZWz5fUT0I18Wzo8uUW5FgRc9tZt5s4Rg5P75gkzZrGbm0iEWehSyYouHGmSMozAAQgIfPIXPWEqv6dr6alJA=="; + url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.24.1.tgz"; + sha512 = "pAiP55qF3Uh4Mb7QzJAhtMyys3OOVg9iowupr27XBnoFZJxmxOZYG5nydOtHKBqhXIJ+mMfy/okHNLheD/4w/w=="; }; buildInputs = globalBuildInputs; meta = { @@ -71701,7 +68876,7 @@ in sources."vscode-languageserver-types-3.17.3" ]; }) - sources."vscode-languageserver-textdocument-1.0.10" + sources."vscode-languageserver-textdocument-1.0.11" sources."vscode-languageserver-types-3.17.0-next.3" ]; buildInputs = globalBuildInputs; @@ -71726,7 +68901,7 @@ in sources."@emmetio/extract-abbreviation-0.1.6" sources."jsonc-parser-1.0.3" sources."vscode-emmet-helper-1.2.17" - sources."vscode-languageserver-types-3.17.3" + sources."vscode-languageserver-types-3.17.5" ]; buildInputs = globalBuildInputs; meta = { @@ -71875,15 +69050,15 @@ in coc-go = nodeEnv.buildNodePackage { name = "coc-go"; packageName = "coc-go"; - version = "1.3.24"; + version = "1.3.26"; src = fetchurl { - url = "https://registry.npmjs.org/coc-go/-/coc-go-1.3.24.tgz"; - sha512 = "aD2liZq9oatyFrOGHhm9qw94Dg0v23bDFHoob/61o5OERPi4qef0VBCph/EXNokZoi1OQcFg8RrGESj4H8SqUQ=="; + url = "https://registry.npmjs.org/coc-go/-/coc-go-1.3.26.tgz"; + sha512 = "J66k2LBOcqDLS4vdEcSymFGW1GXg9LlEIH47Juw5uExpUtJ5Xc9b+fhtZ3djh6QJjJrIeJkbjl+7Jk+Gc49l2g=="; }; dependencies = [ sources."isexe-2.0.0" sources."tslib-2.6.2" - sources."vscode-languageserver-textdocument-1.0.10" + sources."vscode-languageserver-textdocument-1.0.11" sources."vscode-uri-3.0.7" sources."which-3.0.1" ]; @@ -71956,10 +69131,10 @@ in coc-java = nodeEnv.buildNodePackage { name = "coc-java"; packageName = "coc-java"; - version = "1.14.1"; + version = "1.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/coc-java/-/coc-java-1.14.1.tgz"; - sha512 = "1QpsmzpcToU+kt9xp8XfncPdOH8I7W8vV+dDNDiDG/F6e0rkqFFI8vJseGW4gd5hms5fMK0bJs8zFSoP1GcPUw=="; + url = "https://registry.npmjs.org/coc-java/-/coc-java-1.15.2.tgz"; + sha512 = "3m23YfDeqqXWCDppVoa9jgFTfm/gwdD65YoLbnE0jyyaloYbZKdVKSY8bCVEqY5Q/bvgUQShG8TNWs/1dL4agw=="; }; dependencies = [ sources."anymatch-3.1.3" @@ -72062,10 +69237,10 @@ in coc-markdownlint = nodeEnv.buildNodePackage { name = "coc-markdownlint"; packageName = "coc-markdownlint"; - version = "1.30.0"; + version = "1.31.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-markdownlint/-/coc-markdownlint-1.30.0.tgz"; - sha512 = "ZaI5MTlLL5DdwznOqkCK8xnRIYg0RmqQA/4S5p3pIedyI+2JdDVErviB9KkNuipLXYAgQkGH3uqipYrmRyB1aA=="; + url = "https://registry.npmjs.org/coc-markdownlint/-/coc-markdownlint-1.31.1.tgz"; + sha512 = "kphNwsL2yvrlCHBJq3WoEEBBQkRxikd7GT1xvKe5/4waBWBlHea8PB7W0W77jHS7t1FTGIcM24xqV17/byUsmw=="; }; buildInputs = globalBuildInputs; meta = { @@ -72134,8 +69309,8 @@ in sources."execa-1.0.0" sources."fast-diff-1.3.0" sources."fb-watchman-2.0.2" - sources."flatted-3.2.7" - sources."follow-redirects-1.15.2" + sources."flatted-3.2.9" + sources."follow-redirects-1.15.3" sources."for-each-0.3.3" sources."fp-ts-2.16.1" sources."fs-extra-8.1.0" @@ -72293,8 +69468,8 @@ in sources."vscode-languageserver-types-3.15.1" ]; }) - sources."vscode-languageserver-textdocument-1.0.10" - sources."vscode-languageserver-types-3.17.3" + sources."vscode-languageserver-textdocument-1.0.11" + sources."vscode-languageserver-types-3.17.5" sources."vscode-uri-2.1.2" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" @@ -72362,7 +69537,7 @@ in }; dependencies = [ sources."fsevents-2.3.3" - sources."pyright-1.1.327" + sources."pyright-1.1.329" ]; buildInputs = globalBuildInputs; meta = { @@ -72401,10 +69576,10 @@ in sha512 = "SOsCwIuQeE4eiX/Scgs2nL1WnR0JwFZ2/Edh3dx5ijmZSlEPxdc0PnMUN0hT9y96jK5/ZHAByC3qEperpWqPUA=="; }; dependencies = [ - sources."vscode-jsonrpc-8.1.0" - sources."vscode-languageserver-protocol-3.17.3" - sources."vscode-languageserver-textdocument-1.0.10" - sources."vscode-languageserver-types-3.17.3" + sources."vscode-jsonrpc-8.2.0" + sources."vscode-languageserver-protocol-3.17.5" + sources."vscode-languageserver-textdocument-1.0.11" + sources."vscode-languageserver-types-3.17.5" ]; buildInputs = globalBuildInputs; meta = { @@ -72436,10 +69611,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.73.0"; + version = "0.74.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.73.0.tgz"; - sha512 = "lDaF2Qp4pV7+XTDMN1fkW1k42JRZC9xzwdyIZkDfjU+FELaspDk0/TwHnU/oFQXxfrjaAPqPx3B1oNuRN1krxA=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.74.0.tgz"; + sha512 = "G3RjZWYq/cY/mFwabWfor7q4AdbQeEhJTC8O6pYRSbUe2n+zM++7aVBYElUoFlipFY3qFfN25kGLQ2LO7VXuWg=="; }; buildInputs = globalBuildInputs; meta = { @@ -72529,10 +69704,10 @@ in coc-snippets = nodeEnv.buildNodePackage { name = "coc-snippets"; packageName = "coc-snippets"; - version = "3.1.9"; + version = "3.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-3.1.9.tgz"; - sha512 = "9NIB3i27YI31zTBs2fmwx1W+tjuO8DguSI/wyxuMxot3GOaRiNmfsSPsDBohgzW8rgu+RpTzoo//Ie0i/H0X3A=="; + url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-3.1.10.tgz"; + sha512 = "8nIkxrALq9uvA6aM/boCoT++h1O2bH+JhwajdXwooQJetIeEt71h8MB3CusdwRLU89QdsBbkhrNpmkgaS2pgPw=="; }; buildInputs = globalBuildInputs; meta = { @@ -72710,30 +69885,30 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/compat-data-7.22.9" - sources."@babel/core-7.22.19" - sources."@babel/generator-7.22.15" + sources."@babel/compat-data-7.22.20" + sources."@babel/core-7.23.0" + sources."@babel/generator-7.23.0" sources."@babel/helper-compilation-targets-7.22.15" - sources."@babel/helper-environment-visitor-7.22.5" - sources."@babel/helper-function-name-7.22.5" + sources."@babel/helper-environment-visitor-7.22.20" + sources."@babel/helper-function-name-7.23.0" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-module-imports-7.22.15" - sources."@babel/helper-module-transforms-7.22.19" + sources."@babel/helper-module-transforms-7.23.0" sources."@babel/helper-simple-access-7.22.5" sources."@babel/helper-split-export-declaration-7.22.6" sources."@babel/helper-string-parser-7.22.5" - sources."@babel/helper-validator-identifier-7.22.19" + sources."@babel/helper-validator-identifier-7.22.20" sources."@babel/helper-validator-option-7.22.15" - sources."@babel/helpers-7.22.15" - (sources."@babel/highlight-7.22.13" // { + sources."@babel/helpers-7.23.1" + (sources."@babel/highlight-7.22.20" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.22.16" + sources."@babel/parser-7.23.0" sources."@babel/template-7.22.15" - sources."@babel/traverse-7.22.19" - sources."@babel/types-7.22.19" + sources."@babel/traverse-7.23.0" + sources."@babel/types-7.23.0" sources."@jridgewell/gen-mapping-0.3.3" sources."@jridgewell/resolve-uri-3.1.1" sources."@jridgewell/set-array-1.1.2" @@ -72744,9 +69919,9 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@stylelint/postcss-css-in-js-0.37.3" sources."@stylelint/postcss-markdown-0.36.2" - sources."@types/mdast-3.0.12" - sources."@types/minimist-1.2.2" - sources."@types/normalize-package-data-2.4.1" + sources."@types/mdast-3.0.13" + sources."@types/minimist-1.2.3" + sources."@types/normalize-package-data-2.4.2" sources."@types/parse-json-4.0.0" sources."@types/unist-2.0.8" sources."ajv-8.12.0" @@ -72768,11 +69943,11 @@ in ]; }) sources."braces-3.0.2" - sources."browserslist-4.21.10" + sources."browserslist-4.22.1" sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001534" + sources."caniuse-lite-1.0.30001542" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -72789,7 +69964,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."concat-map-0.0.1" - sources."convert-source-map-1.9.0" + sources."convert-source-map-2.0.0" sources."cosmiconfig-7.1.0" sources."cssesc-3.0.0" sources."debug-4.3.4" @@ -72809,7 +69984,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.4.523" + sources."electron-to-chromium-1.4.538" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -72826,7 +70001,7 @@ in sources."fill-range-7.0.1" sources."find-up-4.1.0" sources."flat-cache-3.1.0" - sources."flatted-3.2.7" + sources."flatted-3.2.9" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" @@ -72975,7 +70150,7 @@ in sources."remark-stringify-9.0.1" sources."repeat-string-1.6.1" sources."require-from-string-2.0.2" - sources."resolve-1.22.5" + sources."resolve-1.22.6" sources."resolve-from-5.0.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" @@ -72995,7 +70170,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.13" + sources."spdx-license-ids-3.0.15" sources."specificity-0.4.1" sources."string-width-4.2.3" sources."string_decoder-1.3.0" @@ -73018,7 +70193,7 @@ in sources."unist-util-find-all-after-3.0.2" sources."unist-util-is-4.1.0" sources."unist-util-stringify-position-2.0.3" - sources."update-browserslist-db-1.0.11" + sources."update-browserslist-db-1.0.13" sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.4.0" @@ -73032,8 +70207,8 @@ in sources."vscode-languageserver-types-3.16.0-next.1" ]; }) - sources."vscode-languageserver-textdocument-1.0.10" - sources."vscode-languageserver-types-3.17.3" + sources."vscode-languageserver-textdocument-1.0.11" + sources."vscode-languageserver-types-3.17.5" sources."vscode-uri-2.1.2" sources."which-1.3.1" sources."wrappy-1.0.2" @@ -73165,8 +70340,8 @@ in }; dependencies = [ sources."@babel/code-frame-7.22.13" - sources."@babel/helper-validator-identifier-7.22.19" - sources."@babel/highlight-7.22.13" + sources."@babel/helper-validator-identifier-7.22.20" + sources."@babel/highlight-7.22.20" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" sources."balanced-match-1.0.2" @@ -73196,7 +70371,7 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.7" - sources."resolve-1.22.5" + sources."resolve-1.22.6" sources."semver-5.7.2" sources."sprintf-js-1.0.3" sources."supports-color-5.5.0" @@ -73253,13 +70428,13 @@ in coc-tsserver = nodeEnv.buildNodePackage { name = "coc-tsserver"; packageName = "coc-tsserver"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-2.1.3.tgz"; - sha512 = "rzom53icaFoCF7p6Ps0dHqflS8yv+hOtQw43qOS4NL3b+rnulkfNracHFzuH1n1tyQWCzLgs73cAL1pBGrkUHQ=="; + url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-2.1.4.tgz"; + sha512 = "PItTyCjeAPF0V7wZO+viGCO2PxrDLujRcb4wN4TKUFLni8fw3p5czviA6JFl5s8WLdkfjH6XkrciTwcVWH2srQ=="; }; dependencies = [ - sources."typescript-4.9.5" + sources."typescript-5.2.2" ]; buildInputs = globalBuildInputs; meta = { @@ -73300,8 +70475,8 @@ in dependencies = [ sources."@aashutoshrathi/word-wrap-1.2.6" sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.22.19" - (sources."@babel/highlight-7.22.13" // { + sources."@babel/helper-validator-identifier-7.22.20" + (sources."@babel/highlight-7.22.20" // { dependencies = [ sources."chalk-2.4.2" sources."escape-string-regexp-1.0.5" @@ -73381,14 +70556,14 @@ in sources."fast-levenshtein-2.0.6" sources."file-entry-cache-6.0.1" sources."flat-cache-3.1.0" - sources."flatted-3.2.7" + sources."flatted-3.2.9" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" sources."get-intrinsic-1.2.1" sources."glob-7.2.3" sources."glob-parent-5.1.2" - sources."globals-13.21.0" + sources."globals-13.22.0" sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-proto-1.0.1" @@ -73437,7 +70612,7 @@ in sources."punycode-2.3.0" sources."regexpp-3.2.0" sources."require-from-string-2.0.2" - sources."resolve-1.22.5" + sources."resolve-1.22.6" sources."resolve-from-4.0.0" sources."rimraf-3.0.2" sources."semver-7.5.4" @@ -73784,7 +70959,7 @@ in sources."colors-1.4.0" sources."commander-2.20.3" sources."escape-string-regexp-1.0.5" - sources."follow-redirects-1.15.2" + sources."follow-redirects-1.15.3" sources."has-flag-3.0.0" sources."is-fullwidth-code-point-2.0.0" sources."log-symbols-2.2.0" @@ -73817,7 +70992,7 @@ in sha512 = "nVraf3aXOpIcNud5pB9M82p1tynmZkrSGQ1p6X/VY8cJ+2LMVqAgXsJxYYefACSHbTYlm92O1xuhdGTjwoEvbQ=="; }; dependencies = [ - sources."@babel/runtime-7.22.15" + sources."@babel/runtime-7.23.1" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" (sources."chalk-4.1.2" // { @@ -73870,10 +71045,10 @@ in }; dependencies = [ sources."@babel/code-frame-7.22.13" - sources."@babel/helper-validator-identifier-7.22.19" - sources."@babel/highlight-7.22.13" + sources."@babel/helper-validator-identifier-7.22.20" + sources."@babel/highlight-7.22.20" sources."@hutson/parse-repository-url-5.0.0" - sources."@types/normalize-package-data-2.4.1" + sources."@types/normalize-package-data-2.4.2" sources."JSONStream-1.3.5" sources."add-stream-1.0.0" sources."ansi-styles-3.2.1" @@ -73943,14 +71118,14 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.13" + sources."spdx-license-ids-3.0.15" sources."split2-4.2.0" sources."supports-color-5.5.0" sources."temp-dir-3.0.0" sources."tempfile-5.0.0" sources."text-extensions-2.4.0" sources."through-2.3.8" - sources."type-fest-4.3.1" + sources."type-fest-4.3.3" sources."uglify-js-3.17.4" sources."validate-npm-package-license-3.0.4" sources."wordwrap-1.0.0" @@ -74048,7 +71223,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-20.6.1" + sources."@types/node-20.8.0" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -74200,101 +71375,6 @@ in bypassCache = true; reconstructLock = true; }; - create-react-app = nodeEnv.buildNodePackage { - name = "create-react-app"; - packageName = "create-react-app"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/create-react-app/-/create-react-app-5.0.1.tgz"; - sha512 = "UkxTKK8I9HuZZHqkNq/JkKXDgdLeiRGc+bL58Iae2g+7WwFomAj4wppn6JfqlZM2IKYRlZtgLlmVr5oZfdd1xg=="; - }; - dependencies = [ - sources."ansi-styles-4.3.0" - sources."balanced-match-1.0.2" - sources."block-stream-0.0.9" - sources."brace-expansion-1.1.11" - sources."buffer-from-0.1.2" - sources."builtins-1.0.3" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."commander-4.1.1" - sources."concat-map-0.0.1" - sources."core-util-is-1.0.3" - sources."cross-spawn-7.0.3" - sources."debug-2.6.9" - sources."duplexer2-0.0.2" - sources."envinfo-7.10.0" - sources."fs-extra-10.1.0" - sources."fs.realpath-1.0.0" - sources."fstream-1.0.12" - sources."fstream-ignore-1.0.5" - sources."glob-7.2.3" - sources."graceful-fs-4.2.11" - sources."has-flag-4.0.0" - sources."hyperquest-2.1.3" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."isarray-0.0.1" - sources."isexe-2.0.0" - sources."jsonfile-6.1.0" - sources."kleur-3.0.3" - sources."lru-cache-6.0.0" - sources."minimatch-3.1.2" - sources."minimist-1.2.8" - sources."mkdirp-0.5.6" - sources."ms-2.0.0" - sources."once-1.4.0" - sources."path-is-absolute-1.0.1" - sources."path-key-3.1.1" - sources."process-nextick-args-2.0.1" - sources."prompts-2.4.2" - sources."readable-stream-1.1.14" - sources."rimraf-2.7.1" - sources."safe-buffer-5.1.2" - sources."semver-7.5.4" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."sisteransi-1.0.5" - sources."string_decoder-0.10.31" - sources."supports-color-7.2.0" - sources."tar-2.2.2" - (sources."tar-pack-3.4.1" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.8" - sources."string_decoder-1.1.1" - ]; - }) - (sources."through2-0.6.5" // { - dependencies = [ - sources."readable-stream-1.0.34" - ]; - }) - (sources."tmp-0.2.1" // { - dependencies = [ - sources."rimraf-3.0.2" - ]; - }) - sources."uid-number-0.0.6" - sources."universalify-2.0.0" - sources."util-deprecate-1.0.2" - sources."validate-npm-package-name-3.0.0" - sources."which-2.0.2" - sources."wrappy-1.0.2" - sources."xtend-4.0.2" - sources."yallist-4.0.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Create React apps with no build configuration."; - homepage = "https://github.com/facebook/create-react-app#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; create-react-native-app = nodeEnv.buildNodePackage { name = "create-react-native-app"; packageName = "create-react-native-app"; @@ -74316,10 +71396,10 @@ in cspell = nodeEnv.buildNodePackage { name = "cspell"; packageName = "cspell"; - version = "7.3.6"; + version = "7.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/cspell/-/cspell-7.3.6.tgz"; - sha512 = "iN3D05nwCbS6MdignKwK97vQPX3yrT/Nsu3LhhFptU0O5PO4hvRzFuSzEq+AumMby4Tuf9HcGP5Ugvyi7Gb3gw=="; + url = "https://registry.npmjs.org/cspell/-/cspell-7.3.7.tgz"; + sha512 = "p23EuTu+7b2qioRxC7sV1TVfxIPm7928BtT4jYBHGeONiYP0EOOWNP8ynaksMYLTifQBzH1Q0LO4L5ogHiQsfw=="; }; dependencies = [ (sources."@babel/code-frame-7.22.13" // { @@ -74327,26 +71407,26 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/helper-validator-identifier-7.22.19" - (sources."@babel/highlight-7.22.13" // { + sources."@babel/helper-validator-identifier-7.22.20" + (sources."@babel/highlight-7.22.20" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@cspell/cspell-bundled-dicts-7.3.6" - sources."@cspell/cspell-json-reporter-7.3.6" - sources."@cspell/cspell-pipe-7.3.6" - sources."@cspell/cspell-resolver-7.3.6" - sources."@cspell/cspell-service-bus-7.3.6" - sources."@cspell/cspell-types-7.3.6" + sources."@cspell/cspell-bundled-dicts-7.3.7" + sources."@cspell/cspell-json-reporter-7.3.7" + sources."@cspell/cspell-pipe-7.3.7" + sources."@cspell/cspell-resolver-7.3.7" + sources."@cspell/cspell-service-bus-7.3.7" + sources."@cspell/cspell-types-7.3.7" sources."@cspell/dict-ada-4.0.2" sources."@cspell/dict-aws-4.0.0" - sources."@cspell/dict-bash-4.1.1" - sources."@cspell/dict-companies-3.0.22" + sources."@cspell/dict-bash-4.1.2" + sources."@cspell/dict-companies-3.0.25" sources."@cspell/dict-cpp-5.0.5" sources."@cspell/dict-cryptocurrencies-4.0.0" sources."@cspell/dict-csharp-4.0.2" - sources."@cspell/dict-css-4.0.7" + sources."@cspell/dict-css-4.0.11" sources."@cspell/dict-dart-2.0.3" sources."@cspell/dict-data-science-1.0.11" sources."@cspell/dict-django-4.1.0" @@ -74355,40 +71435,40 @@ in sources."@cspell/dict-elixir-4.0.3" sources."@cspell/dict-en-common-misspellings-1.0.2" sources."@cspell/dict-en-gb-1.1.33" - sources."@cspell/dict-en_us-4.3.7" + sources."@cspell/dict-en_us-4.3.8" sources."@cspell/dict-filetypes-3.0.1" sources."@cspell/dict-fonts-4.0.0" sources."@cspell/dict-fsharp-1.0.0" sources."@cspell/dict-fullstack-3.1.5" sources."@cspell/dict-gaming-terms-1.0.4" sources."@cspell/dict-git-2.0.0" - sources."@cspell/dict-golang-6.0.2" + sources."@cspell/dict-golang-6.0.3" sources."@cspell/dict-haskell-4.0.1" - sources."@cspell/dict-html-4.0.3" + sources."@cspell/dict-html-4.0.5" sources."@cspell/dict-html-symbol-entities-4.0.0" - sources."@cspell/dict-java-5.0.5" + sources."@cspell/dict-java-5.0.6" sources."@cspell/dict-k8s-1.0.1" sources."@cspell/dict-latex-4.0.0" sources."@cspell/dict-lorem-ipsum-4.0.0" sources."@cspell/dict-lua-4.0.1" sources."@cspell/dict-node-4.0.3" - sources."@cspell/dict-npm-5.0.8" - sources."@cspell/dict-php-4.0.2" + sources."@cspell/dict-npm-5.0.11" + sources."@cspell/dict-php-4.0.3" sources."@cspell/dict-powershell-5.0.2" - sources."@cspell/dict-public-licenses-2.0.3" - sources."@cspell/dict-python-4.1.8" + sources."@cspell/dict-public-licenses-2.0.4" + sources."@cspell/dict-python-4.1.9" sources."@cspell/dict-r-2.0.1" sources."@cspell/dict-ruby-5.0.0" sources."@cspell/dict-rust-4.0.1" sources."@cspell/dict-scala-5.0.0" - sources."@cspell/dict-software-terms-3.2.3" + sources."@cspell/dict-software-terms-3.3.3" sources."@cspell/dict-sql-2.1.1" sources."@cspell/dict-svelte-1.0.2" sources."@cspell/dict-swift-2.0.1" - sources."@cspell/dict-typescript-3.1.1" + sources."@cspell/dict-typescript-3.1.2" sources."@cspell/dict-vue-3.0.0" - sources."@cspell/dynamic-import-7.3.6" - sources."@cspell/strong-weak-map-7.3.6" + sources."@cspell/dynamic-import-7.3.7" + sources."@cspell/strong-weak-map-7.3.7" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -74412,16 +71492,16 @@ in sources."core-util-is-1.0.3" sources."cosmiconfig-8.0.0" sources."crypto-random-string-4.0.0" - (sources."cspell-dictionary-7.3.6" // { + (sources."cspell-dictionary-7.3.7" // { dependencies = [ sources."fast-equals-4.0.3" ]; }) - sources."cspell-gitignore-7.3.6" - sources."cspell-glob-7.3.6" - sources."cspell-grammar-7.3.6" - sources."cspell-io-7.3.6" - (sources."cspell-lib-7.3.6" // { + sources."cspell-gitignore-7.3.7" + sources."cspell-glob-7.3.7" + sources."cspell-grammar-7.3.7" + sources."cspell-io-7.3.7" + (sources."cspell-lib-7.3.7" // { dependencies = [ sources."find-up-6.3.0" sources."locate-path-7.2.0" @@ -74431,7 +71511,7 @@ in sources."yocto-queue-1.0.0" ]; }) - sources."cspell-trie-lib-7.3.6" + sources."cspell-trie-lib-7.3.7" sources."dot-prop-6.0.1" sources."encoding-0.1.13" sources."error-ex-1.3.2" @@ -74445,7 +71525,7 @@ in sources."fill-range-7.0.1" sources."find-up-5.0.0" sources."flat-cache-3.1.0" - sources."flatted-3.2.7" + sources."flatted-3.2.9" sources."fs.realpath-1.0.0" sources."gensequence-6.0.0" sources."get-stdin-9.0.0" @@ -74510,7 +71590,7 @@ in sources."type-fest-1.4.0" sources."typedarray-to-buffer-3.1.5" sources."unique-string-3.0.0" - sources."vscode-languageserver-textdocument-1.0.10" + sources."vscode-languageserver-textdocument-1.0.11" sources."vscode-uri-3.0.7" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" @@ -74641,11 +71721,11 @@ in sources."tslib-1.14.1" sources."type-fest-0.16.0" sources."unique-string-2.0.0" - sources."vscode-jsonrpc-8.1.0" + sources."vscode-jsonrpc-8.2.0" sources."vscode-languageserver-6.1.1" - sources."vscode-languageserver-protocol-3.17.3" - sources."vscode-languageserver-textdocument-1.0.10" - sources."vscode-languageserver-types-3.17.3" + sources."vscode-languageserver-protocol-3.17.5" + sources."vscode-languageserver-textdocument-1.0.11" + sources."vscode-languageserver-types-3.17.5" sources."vscode-uri-2.1.2" sources."wrappy-1.0.2" ]; @@ -74696,7 +71776,7 @@ in sources."default-browser-id-3.0.0" sources."define-lazy-prop-3.0.0" sources."diff-5.1.0" - sources."diff2html-3.4.42" + sources."diff2html-3.4.44" sources."emoji-regex-8.0.0" sources."escalade-3.1.1" sources."execa-5.1.1" @@ -74799,47 +71879,38 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@oclif/core-1.26.2" sources."@oclif/linewrap-1.0.0" - (sources."@oclif/plugin-help-5.2.19" // { + (sources."@oclif/plugin-help-5.2.20" // { dependencies = [ sources."@oclif/core-2.15.0" ]; }) - (sources."@oclif/plugin-not-found-2.4.1" // { + (sources."@oclif/plugin-not-found-2.4.2" // { dependencies = [ sources."@oclif/core-2.15.0" ]; }) - (sources."@oclif/plugin-update-3.2.3" // { + (sources."@oclif/plugin-update-3.2.4" // { dependencies = [ sources."@oclif/core-2.15.0" ]; }) - (sources."@oclif/plugin-warn-if-update-available-2.1.0" // { + (sources."@oclif/plugin-warn-if-update-available-2.1.1" // { dependencies = [ sources."@oclif/core-2.15.0" ]; }) - sources."@oclif/screen-3.0.6" - sources."@swc/core-1.3.85" - sources."@swc/core-darwin-arm64-1.3.85" - sources."@swc/core-darwin-x64-1.3.85" - sources."@swc/core-linux-arm-gnueabihf-1.3.85" - sources."@swc/core-linux-arm64-gnu-1.3.85" - sources."@swc/core-linux-arm64-musl-1.3.85" - sources."@swc/core-linux-x64-gnu-1.3.85" - sources."@swc/core-linux-x64-musl-1.3.85" - sources."@swc/core-win32-arm64-msvc-1.3.85" - sources."@swc/core-win32-ia32-msvc-1.3.85" - sources."@swc/core-win32-x64-msvc-1.3.85" + sources."@oclif/screen-3.0.7" + sources."@swc/core-1.3.91" + sources."@swc/counter-0.1.2" sources."@swc/helpers-0.5.2" - sources."@swc/types-0.1.4" - sources."@swc/wasm-1.3.85" + sources."@swc/types-0.1.5" + sources."@swc/wasm-1.3.91" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/cli-progress-3.11.2" - sources."@types/node-20.6.1" + sources."@types/cli-progress-3.11.3" + sources."@types/node-20.8.0" sources."acorn-8.10.0" sources."acorn-walk-8.2.0" sources."ansi-escapes-4.3.2" @@ -74911,7 +71982,7 @@ in }) sources."filesize-6.4.0" sources."fill-range-7.0.1" - sources."follow-redirects-1.15.2" + sources."follow-redirects-1.15.3" sources."form-data-4.0.0" sources."fs-constants-1.0.0" sources."fs-extra-9.1.0" @@ -75052,7 +72123,7 @@ in sources."@fast-csv/format-4.3.5" sources."@fast-csv/parse-4.3.6" sources."@search-dump/jsonstream-1.5.0" - sources."@types/node-14.18.60" + sources."@types/node-14.18.63" sources."ajv-6.12.6" sources."asn1-0.2.6" sources."assert-plus-1.0.0" @@ -75225,7 +72296,7 @@ in sources."@electron-forge/template-vite-typescript-6.4.2" sources."@electron-forge/template-webpack-6.4.2" sources."@electron-forge/template-webpack-typescript-6.4.2" - (sources."@electron/asar-3.2.4" // { + (sources."@electron/asar-3.2.7" // { dependencies = [ sources."commander-5.1.0" ]; @@ -75261,11 +72332,11 @@ in sources."@szmarczak/http-timer-4.0.6" sources."@tootallnate/once-2.0.0" sources."@types/cacheable-request-6.0.3" - sources."@types/http-cache-semantics-4.0.1" + sources."@types/http-cache-semantics-4.0.2" sources."@types/keyv-3.1.4" - sources."@types/node-20.6.1" - sources."@types/responselike-1.0.0" - sources."@types/yauzl-2.10.0" + sources."@types/node-20.8.0" + sources."@types/responselike-1.0.1" + sources."@types/yauzl-2.10.1" sources."@xmldom/xmldom-0.8.10" sources."abbrev-1.1.1" sources."agent-base-6.0.2" @@ -75298,9 +72369,9 @@ in (sources."cacache-17.1.4" // { dependencies = [ sources."brace-expansion-2.0.1" - sources."glob-10.3.4" + sources."glob-10.3.10" sources."minimatch-9.0.3" - sources."minipass-7.0.3" + sources."minipass-7.0.4" ]; }) sources."cacheable-lookup-5.0.4" @@ -75311,7 +72382,6 @@ in ]; }) sources."chownr-2.0.0" - sources."chromium-pickle-js-0.2.0" sources."clean-stack-2.2.0" sources."cli-cursor-3.1.0" sources."cli-spinners-2.9.1" @@ -75419,7 +72489,7 @@ in sources."fs-extra-10.1.0" (sources."fs-minipass-3.0.3" // { dependencies = [ - sources."minipass-7.0.3" + sources."minipass-7.0.4" ]; }) sources."fs.realpath-1.0.0" @@ -75493,7 +72563,7 @@ in sources."is-wsl-2.2.0" sources."isbinaryfile-4.0.10" sources."isexe-2.0.0" - sources."jackspeak-2.3.3" + sources."jackspeak-2.3.6" sources."json-buffer-3.0.1" sources."json-stringify-safe-5.0.1" sources."jsonfile-6.1.0" @@ -75547,7 +72617,7 @@ in }) (sources."minipass-fetch-3.0.4" // { dependencies = [ - sources."minipass-7.0.3" + sources."minipass-7.0.4" ]; }) (sources."minipass-flush-1.0.5" // { @@ -75649,7 +72719,7 @@ in sources."readable-stream-3.6.2" sources."rechoir-0.8.0" sources."require-directory-2.1.1" - sources."resolve-1.22.5" + sources."resolve-1.22.6" sources."resolve-alpn-1.2.1" sources."resolve-dir-1.0.1" sources."resolve-package-1.0.1" @@ -75692,11 +72762,11 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.13" + sources."spdx-license-ids-3.0.15" sources."sprintf-js-1.1.3" (sources."ssri-10.0.5" // { dependencies = [ - sources."minipass-7.0.3" + sources."minipass-7.0.4" ]; }) sources."string-width-5.1.2" @@ -75799,21 +72869,21 @@ in eas-cli = nodeEnv.buildNodePackage { name = "eas-cli"; packageName = "eas-cli"; - version = "5.2.0"; + version = "5.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/eas-cli/-/eas-cli-5.2.0.tgz"; - sha512 = "FQ/yJ/uuslcCxnvLjVKzGlxDz2gMloUfIMv0YaLbGjNzM18dShobP8GVfM+8NwpjlCTetuGhyeJj/gcIkaIt4w=="; + url = "https://registry.npmjs.org/eas-cli/-/eas-cli-5.4.0.tgz"; + sha512 = "FnTsvPYY9+5n3aSXHDbTmgU3hisYotKlGow6Fi1fc+wxoEDIaq60opEgB8RdXQZqx8TpJTcmbVzed4Ej74D06Q=="; }; dependencies = [ sources."@0no-co/graphql.web-1.0.4" sources."@babel/code-frame-7.10.4" - sources."@babel/helper-validator-identifier-7.22.19" - (sources."@babel/highlight-7.22.13" // { + sources."@babel/helper-validator-identifier-7.22.20" + (sources."@babel/highlight-7.22.20" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@expo/apple-utils-1.3.1" + sources."@expo/apple-utils-1.3.2" (sources."@expo/bunyan-4.0.0" // { dependencies = [ sources."uuid-8.3.2" @@ -75831,15 +72901,26 @@ in ]; }) sources."@expo/config-types-49.0.0" - (sources."@expo/eas-build-job-1.0.39" // { + (sources."@expo/eas-build-job-1.0.43" // { dependencies = [ - sources."joi-17.10.1" + sources."joi-17.10.2" sources."semver-7.5.4" ]; }) - (sources."@expo/eas-json-5.2.0" // { + (sources."@expo/eas-json-5.3.1" // { dependencies = [ sources."@babel/code-frame-7.18.6" + (sources."@expo/eas-build-job-1.0.39" // { + dependencies = [ + sources."joi-17.10.2" + sources."semver-7.5.4" + ]; + }) + ]; + }) + (sources."@expo/fingerprint-0.2.0" // { + dependencies = [ + sources."minimatch-3.1.2" ]; }) (sources."@expo/image-utils-0.3.22" // { @@ -75897,7 +72978,7 @@ in sources."@expo/spawn-async-1.7.2" sources."cross-spawn-7.0.3" sources."fs-extra-11.1.1" - sources."joi-17.10.1" + sources."joi-17.10.2" sources."path-key-3.1.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -75934,7 +73015,7 @@ in sources."universalify-2.0.0" ]; }) - sources."@oclif/screen-3.0.6" + sources."@oclif/screen-3.0.7" sources."@react-native/normalize-color-2.1.0" sources."@segment/ajv-human-errors-2.11.3" sources."@segment/loosely-validate-event-2.0.0" @@ -75942,7 +73023,7 @@ in sources."@sideway/formula-3.0.1" sources."@sideway/pinpoint-2.0.0" sources."@types/bunyan-1.8.9" - sources."@types/node-20.6.1" + sources."@types/node-20.8.0" sources."@urql/core-4.0.11" sources."@urql/exchange-retry-1.2.0" sources."@xmldom/xmldom-0.8.10" @@ -76031,11 +73112,11 @@ in sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."exec-async-2.2.0" - (sources."expo-modules-autolinking-1.5.2" // { + (sources."expo-modules-autolinking-1.6.0" // { dependencies = [ - sources."@expo/config-8.3.0" - sources."@expo/config-plugins-7.4.0" - sources."@expo/config-types-50.0.0-alpha.1" + sources."@expo/config-8.3.1" + sources."@expo/config-plugins-7.5.0" + sources."@expo/config-types-50.0.0-alpha.2" sources."commander-7.2.0" sources."fs-extra-9.1.0" sources."semver-7.5.3" @@ -76236,7 +73317,7 @@ in sources."safe-buffer-5.2.1" sources."safe-json-stringify-1.2.0" sources."safer-buffer-2.1.2" - sources."sax-1.2.4" + sources."sax-1.3.0" sources."semver-7.5.2" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" @@ -76355,13 +73436,13 @@ in dependencies = [ sources."@ampproject/remapping-2.2.1" sources."@babel/code-frame-7.22.13" - sources."@babel/compat-data-7.22.9" - (sources."@babel/core-7.22.19" // { + sources."@babel/compat-data-7.22.20" + (sources."@babel/core-7.23.0" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."@babel/generator-7.22.15" + sources."@babel/generator-7.23.0" sources."@babel/helper-annotate-as-pure-7.22.5" (sources."@babel/helper-compilation-targets-7.22.15" // { dependencies = [ @@ -76370,39 +73451,39 @@ in sources."yallist-3.1.1" ]; }) - sources."@babel/helper-environment-visitor-7.22.5" - sources."@babel/helper-function-name-7.22.5" + sources."@babel/helper-environment-visitor-7.22.20" + sources."@babel/helper-function-name-7.23.0" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-module-imports-7.22.15" - sources."@babel/helper-module-transforms-7.22.19" + sources."@babel/helper-module-transforms-7.23.0" sources."@babel/helper-plugin-utils-7.22.5" sources."@babel/helper-simple-access-7.22.5" sources."@babel/helper-split-export-declaration-7.22.6" sources."@babel/helper-string-parser-7.22.5" - sources."@babel/helper-validator-identifier-7.22.19" + sources."@babel/helper-validator-identifier-7.22.20" sources."@babel/helper-validator-option-7.22.15" - sources."@babel/helpers-7.22.15" - sources."@babel/highlight-7.22.13" - sources."@babel/parser-7.22.16" + sources."@babel/helpers-7.23.1" + sources."@babel/highlight-7.22.20" + sources."@babel/parser-7.23.0" sources."@babel/plugin-proposal-object-rest-spread-7.20.7" sources."@babel/plugin-syntax-jsx-7.22.5" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" - sources."@babel/plugin-transform-destructuring-7.22.15" + sources."@babel/plugin-transform-destructuring-7.23.0" sources."@babel/plugin-transform-parameters-7.22.15" sources."@babel/plugin-transform-react-jsx-7.22.15" sources."@babel/template-7.22.15" - sources."@babel/traverse-7.22.19" - sources."@babel/types-7.22.19" + sources."@babel/traverse-7.23.0" + sources."@babel/types-7.23.0" sources."@jridgewell/gen-mapping-0.3.3" sources."@jridgewell/resolve-uri-3.1.1" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.19" - sources."@types/minimist-1.2.2" - sources."@types/normalize-package-data-2.4.1" - sources."@types/prop-types-15.7.5" - sources."@types/react-18.2.21" - sources."@types/scheduler-0.16.3" + sources."@types/minimist-1.2.3" + sources."@types/normalize-package-data-2.4.2" + sources."@types/prop-types-15.7.8" + sources."@types/react-18.2.24" + sources."@types/scheduler-0.16.4" sources."@types/yoga-layout-1.9.2" sources."ajv-6.12.6" (sources."ansi-escapes-4.3.2" // { @@ -76419,14 +73500,14 @@ in sources."auto-bind-4.0.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.21.10" + sources."browserslist-4.22.1" sources."bufferutil-4.0.7" sources."caller-callsite-4.1.0" sources."caller-path-3.0.1" sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001534" + sources."caniuse-lite-1.0.30001542" sources."chalk-2.4.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -76443,7 +73524,7 @@ in sources."semver-7.5.4" ]; }) - sources."convert-source-map-1.9.0" + sources."convert-source-map-2.0.0" sources."convert-to-spaces-1.0.2" sources."cross-spawn-6.0.5" sources."csstype-3.1.2" @@ -76456,7 +73537,7 @@ in ]; }) sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.4.523" + sources."electron-to-chromium-1.4.538" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -76604,7 +73685,7 @@ in ]; }) sources."redent-3.0.0" - sources."resolve-1.22.5" + sources."resolve-1.22.6" sources."resolve-from-3.0.0" sources."restore-cursor-3.1.0" sources."rimraf-3.0.2" @@ -76625,7 +73706,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.13" + sources."spdx-license-ids-3.0.15" (sources."stack-utils-2.0.6" // { dependencies = [ sources."escape-string-regexp-2.0.0" @@ -76641,7 +73722,7 @@ in sources."trim-newlines-3.0.1" sources."type-fest-0.12.0" sources."unicode-emoji-modifier-base-1.0.0" - sources."update-browserslist-db-1.0.11" + sources."update-browserslist-db-1.0.13" sources."uri-js-4.4.1" sources."utf-8-validate-5.0.10" sources."validate-npm-package-license-3.0.4" @@ -76708,17 +73789,17 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "8.49.0"; + version = "8.50.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.49.0.tgz"; - sha512 = "jw03ENfm6VJI0jA9U+8H5zfl5b+FvuU3YYvZRdZHOlU2ggJkxrlkJH4HcDrZpj6YwD8kuYqvQM8LyesoazrSOQ=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.50.0.tgz"; + sha512 = "FOnOGSuFuFLv/Sa+FDVRZl4GGVAAFFi8LecRsI5a1tMO5HIE8nCm4ivAlzt4dT3ol/PaaGC0rJEEXQmHJBGoOg=="; }; dependencies = [ sources."@aashutoshrathi/word-wrap-1.2.6" sources."@eslint-community/eslint-utils-4.4.0" - sources."@eslint-community/regexpp-4.8.1" + sources."@eslint-community/regexpp-4.9.1" sources."@eslint/eslintrc-2.1.2" - sources."@eslint/js-8.49.0" + sources."@eslint/js-8.50.0" sources."@humanwhocodes/config-array-0.11.11" sources."@humanwhocodes/module-importer-1.0.1" sources."@humanwhocodes/object-schema-1.2.1" @@ -76743,7 +73824,7 @@ in sources."deep-is-0.1.4" sources."doctrine-3.0.0" sources."escape-string-regexp-4.0.0" - sources."eslint-8.49.0" + sources."eslint-8.50.0" sources."eslint-scope-7.2.2" sources."eslint-visitor-keys-3.4.3" sources."espree-9.6.1" @@ -76758,11 +73839,11 @@ in sources."file-entry-cache-6.0.1" sources."find-up-5.0.0" sources."flat-cache-3.1.0" - sources."flatted-3.2.7" + sources."flatted-3.2.9" sources."fs.realpath-1.0.0" sources."glob-7.2.3" sources."glob-parent-6.0.2" - sources."globals-13.21.0" + sources."globals-13.22.0" sources."graphemer-1.4.0" sources."has-flag-4.0.0" sources."ignore-5.2.4" @@ -76851,8 +73932,8 @@ in dependencies = [ sources."@ampproject/remapping-2.2.1" sources."@babel/code-frame-7.10.4" - sources."@babel/compat-data-7.22.9" - (sources."@babel/core-7.22.19" // { + sources."@babel/compat-data-7.22.20" + (sources."@babel/core-7.23.0" // { dependencies = [ sources."@babel/code-frame-7.22.13" sources."chalk-2.4.2" @@ -76860,7 +73941,7 @@ in sources."semver-6.3.1" ]; }) - sources."@babel/generator-7.22.15" + sources."@babel/generator-7.23.0" sources."@babel/helper-annotate-as-pure-7.22.5" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.22.15" (sources."@babel/helper-compilation-targets-7.22.15" // { @@ -76881,35 +73962,35 @@ in ]; }) sources."@babel/helper-define-polyfill-provider-0.4.2" - sources."@babel/helper-environment-visitor-7.22.5" - sources."@babel/helper-function-name-7.22.5" + sources."@babel/helper-environment-visitor-7.22.20" + sources."@babel/helper-function-name-7.23.0" sources."@babel/helper-hoist-variables-7.22.5" - sources."@babel/helper-member-expression-to-functions-7.22.15" + sources."@babel/helper-member-expression-to-functions-7.23.0" sources."@babel/helper-module-imports-7.22.15" - sources."@babel/helper-module-transforms-7.22.19" + sources."@babel/helper-module-transforms-7.23.0" sources."@babel/helper-optimise-call-expression-7.22.5" sources."@babel/helper-plugin-utils-7.22.5" - sources."@babel/helper-remap-async-to-generator-7.22.17" - sources."@babel/helper-replace-supers-7.22.9" + sources."@babel/helper-remap-async-to-generator-7.22.20" + sources."@babel/helper-replace-supers-7.22.20" sources."@babel/helper-simple-access-7.22.5" sources."@babel/helper-skip-transparent-expression-wrappers-7.22.5" sources."@babel/helper-split-export-declaration-7.22.6" sources."@babel/helper-string-parser-7.22.5" - sources."@babel/helper-validator-identifier-7.22.19" + sources."@babel/helper-validator-identifier-7.22.20" sources."@babel/helper-validator-option-7.22.15" - sources."@babel/helper-wrap-function-7.22.17" - sources."@babel/helpers-7.22.15" - (sources."@babel/highlight-7.22.13" // { + sources."@babel/helper-wrap-function-7.22.20" + sources."@babel/helpers-7.23.1" + (sources."@babel/highlight-7.22.20" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.22.16" + sources."@babel/parser-7.23.0" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.15" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.15" sources."@babel/plugin-proposal-async-generator-functions-7.20.7" sources."@babel/plugin-proposal-class-properties-7.18.6" - sources."@babel/plugin-proposal-decorators-7.22.15" + sources."@babel/plugin-proposal-decorators-7.23.0" sources."@babel/plugin-proposal-export-default-from-7.22.17" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" sources."@babel/plugin-proposal-object-rest-spread-7.20.7" @@ -76943,12 +74024,12 @@ in sources."@babel/plugin-transform-async-generator-functions-7.22.15" sources."@babel/plugin-transform-async-to-generator-7.22.5" sources."@babel/plugin-transform-block-scoped-functions-7.22.5" - sources."@babel/plugin-transform-block-scoping-7.22.15" + sources."@babel/plugin-transform-block-scoping-7.23.0" sources."@babel/plugin-transform-class-properties-7.22.5" sources."@babel/plugin-transform-class-static-block-7.22.11" sources."@babel/plugin-transform-classes-7.22.15" sources."@babel/plugin-transform-computed-properties-7.22.5" - sources."@babel/plugin-transform-destructuring-7.22.15" + sources."@babel/plugin-transform-destructuring-7.23.0" sources."@babel/plugin-transform-dotall-regex-7.22.5" sources."@babel/plugin-transform-duplicate-keys-7.22.5" sources."@babel/plugin-transform-dynamic-import-7.22.11" @@ -76961,9 +74042,9 @@ in sources."@babel/plugin-transform-literals-7.22.5" sources."@babel/plugin-transform-logical-assignment-operators-7.22.11" sources."@babel/plugin-transform-member-expression-literals-7.22.5" - sources."@babel/plugin-transform-modules-amd-7.22.5" - sources."@babel/plugin-transform-modules-commonjs-7.22.15" - sources."@babel/plugin-transform-modules-systemjs-7.22.11" + sources."@babel/plugin-transform-modules-amd-7.23.0" + sources."@babel/plugin-transform-modules-commonjs-7.23.0" + sources."@babel/plugin-transform-modules-systemjs-7.23.0" sources."@babel/plugin-transform-modules-umd-7.22.5" sources."@babel/plugin-transform-named-capturing-groups-regex-7.22.5" sources."@babel/plugin-transform-new-target-7.22.5" @@ -76972,7 +74053,7 @@ in sources."@babel/plugin-transform-object-rest-spread-7.22.15" sources."@babel/plugin-transform-object-super-7.22.5" sources."@babel/plugin-transform-optional-catch-binding-7.22.11" - sources."@babel/plugin-transform-optional-chaining-7.22.15" + sources."@babel/plugin-transform-optional-chaining-7.23.0" sources."@babel/plugin-transform-parameters-7.22.15" sources."@babel/plugin-transform-private-methods-7.22.5" sources."@babel/plugin-transform-private-property-in-object-7.22.11" @@ -76998,7 +74079,7 @@ in sources."@babel/plugin-transform-unicode-property-regex-7.22.5" sources."@babel/plugin-transform-unicode-regex-7.22.5" sources."@babel/plugin-transform-unicode-sets-regex-7.22.5" - (sources."@babel/preset-env-7.22.15" // { + (sources."@babel/preset-env-7.22.20" // { dependencies = [ sources."semver-6.3.1" ]; @@ -77012,19 +74093,19 @@ in sources."chalk-2.4.2" ]; }) - (sources."@babel/traverse-7.22.19" // { + (sources."@babel/traverse-7.23.0" // { dependencies = [ sources."@babel/code-frame-7.22.13" sources."chalk-2.4.2" ]; }) - sources."@babel/types-7.22.19" + sources."@babel/types-7.23.0" sources."@colors/colors-1.5.0" sources."@expo/apple-utils-1.0.0" sources."@expo/bunyan-4.0.0" (sources."@expo/cli-0.7.3" // { dependencies = [ - sources."@babel/runtime-7.22.15" + sources."@babel/runtime-7.23.1" (sources."@expo/config-8.0.5" // { dependencies = [ sources."semver-7.3.2" @@ -77194,35 +74275,35 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/connect-3.4.36" sources."@types/connect-history-api-fallback-1.5.1" - sources."@types/eslint-8.44.2" - sources."@types/eslint-scope-3.7.4" - sources."@types/estree-1.0.1" - sources."@types/express-4.17.17" - sources."@types/express-serve-static-core-4.17.36" + sources."@types/eslint-8.44.3" + sources."@types/eslint-scope-3.7.5" + sources."@types/estree-1.0.2" + sources."@types/express-4.17.18" + sources."@types/express-serve-static-core-4.17.37" sources."@types/glob-7.2.0" sources."@types/html-minifier-terser-6.1.0" - sources."@types/http-cache-semantics-4.0.1" - sources."@types/http-errors-2.0.1" - sources."@types/http-proxy-1.17.11" + sources."@types/http-cache-semantics-4.0.2" + sources."@types/http-errors-2.0.2" + sources."@types/http-proxy-1.17.12" sources."@types/istanbul-lib-coverage-2.0.4" - sources."@types/istanbul-lib-report-3.0.0" - sources."@types/istanbul-reports-3.0.1" + sources."@types/istanbul-lib-report-3.0.1" + sources."@types/istanbul-reports-3.0.2" sources."@types/json-schema-7.0.13" sources."@types/keyv-3.1.4" - sources."@types/mime-1.3.2" + sources."@types/mime-1.3.3" sources."@types/minimatch-5.1.2" - sources."@types/node-20.6.1" + sources."@types/node-20.8.0" sources."@types/qs-6.9.8" - sources."@types/range-parser-1.2.4" - sources."@types/responselike-1.0.0" - sources."@types/retry-0.12.2" - sources."@types/send-0.17.1" - sources."@types/serve-index-1.9.1" - sources."@types/serve-static-1.15.2" - sources."@types/sockjs-0.3.33" - sources."@types/ws-8.5.5" - sources."@types/yargs-15.0.15" - sources."@types/yargs-parser-21.0.0" + sources."@types/range-parser-1.2.5" + sources."@types/responselike-1.0.1" + sources."@types/retry-0.12.3" + sources."@types/send-0.17.2" + sources."@types/serve-index-1.9.2" + sources."@types/serve-static-1.15.3" + sources."@types/sockjs-0.3.34" + sources."@types/ws-8.5.6" + sources."@types/yargs-15.0.16" + sources."@types/yargs-parser-21.0.1" sources."@urql/core-2.3.6" sources."@urql/exchange-retry-0.3.0" sources."@webassemblyjs/ast-1.11.6" @@ -77287,7 +74368,7 @@ in sources."semver-6.3.1" ]; }) - sources."babel-plugin-polyfill-corejs3-0.8.3" + sources."babel-plugin-polyfill-corejs3-0.8.4" sources."babel-plugin-polyfill-regenerator-0.5.2" sources."babel-plugin-react-native-web-0.18.12" sources."babel-preset-expo-9.3.2" @@ -77320,7 +74401,7 @@ in sources."bplist-parser-0.2.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.21.10" + sources."browserslist-4.22.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-fill-1.0.0" @@ -77341,7 +74422,7 @@ in sources."camel-case-4.1.2" sources."camelcase-6.3.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001534" + sources."caniuse-lite-1.0.30001542" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -77404,7 +74485,7 @@ in sources."connect-history-api-fallback-2.0.0" sources."content-disposition-0.5.2" sources."content-type-1.0.5" - sources."convert-source-map-1.9.0" + sources."convert-source-map-2.0.0" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" (sources."copy-webpack-plugin-10.2.4" // { @@ -77417,7 +74498,7 @@ in sources."slash-4.0.0" ]; }) - sources."core-js-compat-3.32.2" + sources."core-js-compat-3.33.0" sources."core-util-is-1.0.3" sources."cross-fetch-3.1.8" (sources."cross-spawn-6.0.5" // { @@ -77483,7 +74564,7 @@ in sources."dot-case-3.0.4" sources."duplexer3-0.1.5" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.523" + sources."electron-to-chromium-1.4.538" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."encodeurl-1.0.2" @@ -77522,7 +74603,7 @@ in }) (sources."expo-48.0.20" // { dependencies = [ - sources."@babel/runtime-7.22.15" + sources."@babel/runtime-7.23.1" (sources."@expo/config-8.0.5" // { dependencies = [ sources."semver-7.3.2" @@ -77631,7 +74712,7 @@ in sources."find-cache-dir-3.3.2" sources."find-up-5.0.0" sources."find-yarn-workspace-root-2.0.0" - sources."follow-redirects-1.15.2" + sources."follow-redirects-1.15.3" sources."fontfaceobserver-2.3.0" sources."form-data-2.5.1" sources."forwarded-0.2.0" @@ -77643,7 +74724,7 @@ in ]; }) sources."fs-minipass-2.1.0" - sources."fs-monkey-1.0.4" + sources."fs-monkey-1.0.5" sources."fs.realpath-1.0.0" sources."fsevents-2.3.3" sources."function-bind-1.1.1" @@ -77760,7 +74841,7 @@ in ]; }) sources."jimp-compact-0.16.1" - sources."joi-17.10.1" + sources."joi-17.10.2" sources."join-component-1.1.0" sources."js-tokens-4.0.0" (sources."js-yaml-3.14.1" // { @@ -77987,7 +75068,7 @@ in ]; }) sources."pngjs-3.4.0" - sources."postcss-8.4.29" + sources."postcss-8.4.31" sources."postcss-calc-8.2.4" sources."postcss-colormin-5.3.1" sources."postcss-convert-values-5.1.3" @@ -78082,7 +75163,7 @@ in }) sources."requires-port-1.0.0" sources."reselect-4.1.8" - sources."resolve-1.22.5" + sources."resolve-1.22.6" sources."resolve-alpn-1.2.1" sources."resolve-from-5.0.0" sources."responselike-2.0.1" @@ -78099,7 +75180,7 @@ in sources."safe-buffer-5.2.1" sources."safe-json-stringify-1.2.0" sources."safer-buffer-2.1.2" - sources."sax-1.2.4" + sources."sax-1.3.0" (sources."schema-utils-2.7.1" // { dependencies = [ sources."ajv-6.12.6" @@ -78247,7 +75328,7 @@ in ]; }) sources."terminal-link-2.1.1" - (sources."terser-5.19.4" // { + (sources."terser-5.20.0" // { dependencies = [ sources."commander-2.20.3" sources."source-map-support-0.5.21" @@ -78290,7 +75371,7 @@ in sources."universalify-2.0.0" sources."unpipe-1.0.0" sources."untildify-3.0.3" - sources."update-browserslist-db-1.0.11" + sources."update-browserslist-db-1.0.13" sources."update-check-1.5.3" sources."uri-js-4.4.1" sources."url-join-4.0.0" @@ -78375,7 +75456,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" - sources."ws-8.14.1" + sources."ws-8.14.2" (sources."xcode-3.0.1" // { dependencies = [ sources."uuid-7.0.3" @@ -78419,46 +75500,46 @@ in dependencies = [ sources."@ampproject/remapping-2.2.1" sources."@babel/code-frame-7.22.13" - sources."@babel/compat-data-7.22.9" - sources."@babel/core-7.22.19" - sources."@babel/generator-7.22.15" + sources."@babel/compat-data-7.22.20" + sources."@babel/core-7.23.0" + sources."@babel/generator-7.23.0" sources."@babel/helper-annotate-as-pure-7.22.5" sources."@babel/helper-compilation-targets-7.22.15" - sources."@babel/helper-environment-visitor-7.22.5" - sources."@babel/helper-function-name-7.22.5" + sources."@babel/helper-environment-visitor-7.22.20" + sources."@babel/helper-function-name-7.23.0" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-module-imports-7.22.15" - sources."@babel/helper-module-transforms-7.22.19" + sources."@babel/helper-module-transforms-7.23.0" sources."@babel/helper-plugin-utils-7.22.5" sources."@babel/helper-simple-access-7.22.5" sources."@babel/helper-split-export-declaration-7.22.6" sources."@babel/helper-string-parser-7.22.5" - sources."@babel/helper-validator-identifier-7.22.19" + sources."@babel/helper-validator-identifier-7.22.20" sources."@babel/helper-validator-option-7.22.15" - sources."@babel/helpers-7.22.15" - sources."@babel/highlight-7.22.13" - sources."@babel/parser-7.22.16" + sources."@babel/helpers-7.23.1" + sources."@babel/highlight-7.22.20" + sources."@babel/parser-7.23.0" sources."@babel/plugin-proposal-object-rest-spread-7.20.7" sources."@babel/plugin-syntax-jsx-7.22.5" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" - sources."@babel/plugin-transform-destructuring-7.22.15" + sources."@babel/plugin-transform-destructuring-7.23.0" sources."@babel/plugin-transform-parameters-7.22.15" sources."@babel/plugin-transform-react-jsx-7.22.15" sources."@babel/template-7.22.15" - sources."@babel/traverse-7.22.19" - sources."@babel/types-7.22.19" + sources."@babel/traverse-7.23.0" + sources."@babel/types-7.23.0" sources."@jridgewell/gen-mapping-0.3.3" sources."@jridgewell/resolve-uri-3.1.1" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.19" - sources."@types/minimist-1.2.2" - sources."@types/node-20.6.1" - sources."@types/normalize-package-data-2.4.1" - sources."@types/prop-types-15.7.5" - sources."@types/react-18.2.21" - sources."@types/scheduler-0.16.3" - sources."@types/yauzl-2.10.0" + sources."@types/minimist-1.2.3" + sources."@types/node-20.8.0" + sources."@types/normalize-package-data-2.4.2" + sources."@types/prop-types-15.7.8" + sources."@types/react-18.2.24" + sources."@types/scheduler-0.16.4" + sources."@types/yauzl-2.10.1" sources."@types/yoga-layout-1.9.2" sources."agent-base-6.0.2" (sources."ansi-escapes-4.3.2" // { @@ -78475,7 +75556,7 @@ in sources."base64-js-1.5.1" sources."bl-4.1.0" sources."brace-expansion-1.1.11" - sources."browserslist-4.21.10" + sources."browserslist-4.22.1" sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" sources."bufferutil-4.0.7" @@ -78484,7 +75565,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001534" + sources."caniuse-lite-1.0.30001542" sources."chalk-2.4.2" sources."chownr-1.1.4" sources."ci-info-2.0.0" @@ -78497,7 +75578,7 @@ in sources."color-name-1.1.3" sources."commondir-1.0.1" sources."concat-map-0.0.1" - sources."convert-source-map-1.9.0" + sources."convert-source-map-2.0.0" sources."convert-to-spaces-1.0.2" sources."cross-fetch-3.1.5" sources."csstype-3.1.2" @@ -78510,7 +75591,7 @@ in }) sources."delay-5.0.0" sources."devtools-protocol-0.0.981744" - sources."electron-to-chromium-1.4.523" + sources."electron-to-chromium-1.4.538" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" @@ -78634,7 +75715,7 @@ in }) sources."readable-stream-3.6.2" sources."redent-3.0.0" - sources."resolve-1.22.5" + sources."resolve-1.22.6" sources."resolve-from-3.0.0" sources."restore-cursor-3.1.0" sources."rimraf-3.0.2" @@ -78654,7 +75735,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.13" + sources."spdx-license-ids-3.0.15" (sources."stack-utils-2.0.6" // { dependencies = [ sources."escape-string-regexp-2.0.0" @@ -78674,7 +75755,7 @@ in sources."trim-newlines-3.0.1" sources."type-fest-0.12.0" sources."unbzip2-stream-1.4.3" - sources."update-browserslist-db-1.0.11" + sources."update-browserslist-db-1.0.13" sources."utf-8-validate-5.0.10" sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" @@ -78736,7 +75817,7 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@oclif/color-1.0.11" + sources."@oclif/color-1.0.12" sources."@oclif/core-2.15.0" (sources."@oclif/errors-1.3.6" // { dependencies = [ @@ -78746,30 +75827,21 @@ in ]; }) sources."@oclif/linewrap-1.0.0" - sources."@oclif/plugin-help-5.2.19" + sources."@oclif/plugin-help-5.2.20" sources."@oclif/plugin-plugins-2.4.7" sources."@oclif/screen-1.0.4" sources."@sindresorhus/is-0.7.0" - sources."@swc/core-1.3.85" - sources."@swc/core-darwin-arm64-1.3.85" - sources."@swc/core-darwin-x64-1.3.85" - sources."@swc/core-linux-arm-gnueabihf-1.3.85" - sources."@swc/core-linux-arm64-gnu-1.3.85" - sources."@swc/core-linux-arm64-musl-1.3.85" - sources."@swc/core-linux-x64-gnu-1.3.85" - sources."@swc/core-linux-x64-musl-1.3.85" - sources."@swc/core-win32-arm64-msvc-1.3.85" - sources."@swc/core-win32-ia32-msvc-1.3.85" - sources."@swc/core-win32-x64-msvc-1.3.85" + sources."@swc/core-1.3.91" + sources."@swc/counter-0.1.2" sources."@swc/helpers-0.5.2" - sources."@swc/types-0.1.4" - sources."@swc/wasm-1.3.85" + sources."@swc/types-0.1.5" + sources."@swc/wasm-1.3.91" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/cli-progress-3.11.2" - sources."@types/node-20.6.1" + sources."@types/cli-progress-3.11.3" + sources."@types/node-20.8.0" sources."acorn-8.10.0" sources."acorn-walk-8.2.0" sources."ajv-6.12.6" @@ -79244,8 +76316,8 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/helper-validator-identifier-7.22.19" - (sources."@babel/highlight-7.22.13" // { + sources."@babel/helper-validator-identifier-7.22.20" + (sources."@babel/highlight-7.22.20" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -79256,8 +76328,8 @@ in sources."supports-color-5.5.0" ]; }) - sources."@types/minimist-1.2.2" - sources."@types/normalize-package-data-2.4.1" + sources."@types/minimist-1.2.3" + sources."@types/normalize-package-data-2.4.2" sources."aggregate-error-4.0.1" sources."ansi-escapes-4.3.2" sources."ansi-regex-6.0.1" @@ -79416,7 +76488,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.13" + sources."spdx-license-ids-3.0.15" sources."string-width-5.1.2" sources."string_decoder-1.3.0" sources."strip-ansi-7.1.0" @@ -79474,7 +76546,7 @@ in sources."@scure/bip39-1.2.1" sources."@types/atob-2.1.2" sources."@types/inquirer-6.5.0" - sources."@types/node-20.6.1" + sources."@types/node-20.8.0" sources."@types/through-0.0.31" sources."ajv-6.12.6" sources."ansi-escapes-4.3.2" @@ -80105,10 +77177,10 @@ in fx = nodeEnv.buildNodePackage { name = "fx"; packageName = "fx"; - version = "28.0.1"; + version = "30.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/fx/-/fx-28.0.1.tgz"; - sha512 = "U/ELI6liBxdquKMe7oA6sOYgutVjSmaQTpZ3MDhJs/9l4lK6ewATv1SQCR8LRDz+n2sKTjcNEnj1djtuZ9OgoA=="; + url = "https://registry.npmjs.org/fx/-/fx-30.2.0.tgz"; + sha512 = "rIYQBmx85Jfhd3pkSw06YPgvSvfTi022ZXTeFDkcCZGCs5nt3sjqFBGtcMFe1TR2S00RDz63be0ab5mhCiOLBw=="; }; buildInputs = globalBuildInputs; meta = { @@ -80137,7 +77209,7 @@ in }) sources."@types/bn.js-5.1.2" sources."@types/lru-cache-5.1.1" - sources."@types/node-20.6.1" + sources."@types/node-20.8.0" sources."@types/seedrandom-3.0.1" sources."abstract-level-1.0.3" (sources."abstract-leveldown-7.2.0" // { @@ -80189,13 +77261,13 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/compat-data-7.22.9" - (sources."@babel/core-7.22.19" // { + sources."@babel/compat-data-7.22.20" + (sources."@babel/core-7.23.0" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."@babel/generator-7.22.15" + sources."@babel/generator-7.23.0" sources."@babel/helper-annotate-as-pure-7.22.5" (sources."@babel/helper-compilation-targets-7.22.15" // { dependencies = [ @@ -80207,37 +77279,37 @@ in sources."semver-6.3.1" ]; }) - sources."@babel/helper-environment-visitor-7.22.5" - sources."@babel/helper-function-name-7.22.5" + sources."@babel/helper-environment-visitor-7.22.20" + sources."@babel/helper-function-name-7.23.0" sources."@babel/helper-hoist-variables-7.22.5" - sources."@babel/helper-member-expression-to-functions-7.22.15" + sources."@babel/helper-member-expression-to-functions-7.23.0" sources."@babel/helper-module-imports-7.22.15" - sources."@babel/helper-module-transforms-7.22.19" + sources."@babel/helper-module-transforms-7.23.0" sources."@babel/helper-optimise-call-expression-7.22.5" sources."@babel/helper-plugin-utils-7.22.5" - sources."@babel/helper-replace-supers-7.22.9" + sources."@babel/helper-replace-supers-7.22.20" sources."@babel/helper-simple-access-7.22.5" sources."@babel/helper-skip-transparent-expression-wrappers-7.22.5" sources."@babel/helper-split-export-declaration-7.22.6" sources."@babel/helper-string-parser-7.22.5" - sources."@babel/helper-validator-identifier-7.22.19" + sources."@babel/helper-validator-identifier-7.22.20" sources."@babel/helper-validator-option-7.22.15" - sources."@babel/helpers-7.22.15" - (sources."@babel/highlight-7.22.13" // { + sources."@babel/helpers-7.23.1" + (sources."@babel/highlight-7.22.20" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.22.16" + sources."@babel/parser-7.23.0" sources."@babel/plugin-syntax-jsx-7.22.5" sources."@babel/plugin-syntax-typescript-7.22.5" - sources."@babel/plugin-transform-modules-commonjs-7.22.15" + sources."@babel/plugin-transform-modules-commonjs-7.23.0" sources."@babel/plugin-transform-typescript-7.22.15" - sources."@babel/preset-typescript-7.22.15" - sources."@babel/runtime-7.22.15" + sources."@babel/preset-typescript-7.23.0" + sources."@babel/runtime-7.23.1" sources."@babel/template-7.22.15" - sources."@babel/traverse-7.22.19" - sources."@babel/types-7.22.19" + sources."@babel/traverse-7.23.0" + sources."@babel/types-7.23.0" sources."@hapi/hoek-9.3.0" sources."@hapi/topo-5.1.0" sources."@jridgewell/gen-mapping-0.3.3" @@ -80261,11 +77333,11 @@ in sources."@turist/time-0.0.2" sources."@types/cacheable-request-6.0.3" sources."@types/common-tags-1.8.2" - sources."@types/http-cache-semantics-4.0.1" + sources."@types/http-cache-semantics-4.0.2" sources."@types/keyv-3.1.4" - sources."@types/node-20.6.1" - sources."@types/node-fetch-2.6.5" - sources."@types/responselike-1.0.0" + sources."@types/node-20.8.0" + sources."@types/node-fetch-2.6.6" + sources."@types/responselike-1.0.1" sources."@types/yoga-layout-1.9.2" sources."ansi-align-3.0.1" (sources."ansi-escapes-4.3.2" // { @@ -80282,7 +77354,7 @@ in sources."boolbase-1.0.0" sources."boxen-5.1.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.21.10" + sources."browserslist-4.22.1" sources."cacheable-lookup-5.0.4" (sources."cacheable-request-7.0.4" // { dependencies = [ @@ -80290,7 +77362,7 @@ in ]; }) sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001534" + sources."caniuse-lite-1.0.30001542" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -80326,7 +77398,7 @@ in sources."concat-map-0.0.1" sources."configstore-5.0.1" sources."convert-hrtime-3.0.0" - sources."convert-source-map-1.9.0" + sources."convert-source-map-2.0.0" sources."create-gatsby-3.12.0" (sources."cross-spawn-6.0.5" // { dependencies = [ @@ -80351,7 +77423,7 @@ in sources."domhandler-4.3.1" sources."domutils-2.8.0" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.4.523" + sources."electron-to-chromium-1.4.538" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" @@ -80427,7 +77499,7 @@ in sources."is-valid-path-0.1.1" sources."is-wsl-2.2.0" sources."isexe-2.0.0" - sources."joi-17.10.1" + sources."joi-17.10.2" sources."js-tokens-4.0.0" sources."jsesc-2.5.2" sources."json-buffer-3.0.1" @@ -80546,7 +77618,7 @@ in sources."typedarray-to-buffer-3.1.5" sources."unique-string-2.0.0" sources."universalify-2.0.0" - sources."update-browserslist-db-1.0.11" + sources."update-browserslist-db-1.0.13" sources."util-deprecate-1.0.2" sources."utila-0.4.0" sources."weak-lru-cache-1.2.2" @@ -80592,846 +77664,6 @@ in bypassCache = true; reconstructLock = true; }; - generator-code = nodeEnv.buildNodePackage { - name = "generator-code"; - packageName = "generator-code"; - version = "1.7.8"; - src = fetchurl { - url = "https://registry.npmjs.org/generator-code/-/generator-code-1.7.8.tgz"; - sha512 = "vaqIRIxCAkY9NBep8qacZqJjZKezSjEK6UilcwgsS4vCRkd9PqjxhH2NLWnFjrNGaxG0k0u4piyHtOwagd/mfQ=="; - }; - dependencies = [ - (sources."@babel/code-frame-7.22.13" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" - ]; - }) - sources."@babel/helper-validator-identifier-7.22.19" - (sources."@babel/highlight-7.22.13" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" - ]; - }) - sources."@gar/promisify-1.1.3" - (sources."@isaacs/cliui-8.0.2" // { - dependencies = [ - sources."ansi-regex-6.0.1" - sources."emoji-regex-9.2.2" - sources."string-width-5.1.2" - sources."strip-ansi-7.1.0" - ]; - }) - sources."@isaacs/string-locale-compare-1.1.0" - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - (sources."@npmcli/arborist-4.3.1" // { - dependencies = [ - sources."@npmcli/fs-1.1.1" - sources."@npmcli/git-2.1.0" - sources."@npmcli/installed-package-contents-1.0.7" - sources."@npmcli/node-gyp-1.0.3" - sources."@npmcli/promise-spawn-1.3.2" - sources."@npmcli/run-script-2.0.0" - sources."@tootallnate/once-1.1.2" - sources."brace-expansion-1.1.11" - sources."builtins-1.0.3" - sources."cacache-15.3.0" - sources."fs-minipass-2.1.0" - sources."glob-8.1.0" - sources."hosted-git-info-4.1.0" - sources."http-proxy-agent-4.0.1" - (sources."ignore-walk-4.0.1" // { - dependencies = [ - sources."minimatch-3.1.2" - ]; - }) - sources."json-parse-even-better-errors-2.3.1" - sources."lru-cache-6.0.0" - sources."make-fetch-happen-9.1.0" - sources."minimatch-5.1.6" - sources."minipass-3.3.6" - sources."minipass-fetch-1.4.1" - sources."node-gyp-8.4.1" - sources."nopt-5.0.0" - sources."npm-bundled-1.1.2" - sources."npm-install-checks-4.0.0" - sources."npm-normalize-package-bin-1.0.1" - sources."npm-package-arg-8.1.5" - (sources."npm-packlist-3.0.0" // { - dependencies = [ - sources."glob-7.2.3" - sources."minimatch-3.1.2" - ]; - }) - sources."npm-pick-manifest-6.1.1" - (sources."npm-registry-fetch-12.0.2" // { - dependencies = [ - sources."@npmcli/fs-2.1.2" - sources."@npmcli/move-file-2.0.1" - sources."@tootallnate/once-2.0.0" - sources."cacache-16.1.3" - sources."http-proxy-agent-5.0.0" - sources."lru-cache-7.18.3" - (sources."make-fetch-happen-10.2.1" // { - dependencies = [ - sources."minipass-fetch-2.1.2" - ]; - }) - sources."socks-proxy-agent-7.0.0" - sources."ssri-9.0.1" - sources."unique-filename-2.0.1" - sources."unique-slug-3.0.0" - ]; - }) - sources."pacote-12.0.3" - sources."proc-log-1.0.0" - sources."read-package-json-fast-2.0.3" - sources."socks-proxy-agent-6.2.1" - sources."ssri-8.0.1" - sources."unique-filename-1.1.1" - sources."unique-slug-2.0.2" - sources."validate-npm-package-name-3.0.0" - sources."which-2.0.2" - ]; - }) - sources."@npmcli/fs-3.1.0" - sources."@npmcli/git-4.1.0" - sources."@npmcli/installed-package-contents-2.0.2" - (sources."@npmcli/map-workspaces-2.0.4" // { - dependencies = [ - sources."glob-8.1.0" - sources."json-parse-even-better-errors-2.3.1" - sources."minimatch-5.1.6" - sources."npm-normalize-package-bin-1.0.1" - sources."read-package-json-fast-2.0.3" - ]; - }) - (sources."@npmcli/metavuln-calculator-2.0.0" // { - dependencies = [ - sources."@npmcli/fs-1.1.1" - sources."@npmcli/git-2.1.0" - sources."@npmcli/installed-package-contents-1.0.7" - sources."@npmcli/move-file-2.0.1" - sources."@npmcli/node-gyp-1.0.3" - sources."@npmcli/promise-spawn-1.3.2" - sources."@npmcli/run-script-2.0.0" - sources."@tootallnate/once-1.1.2" - sources."brace-expansion-1.1.11" - sources."builtins-1.0.3" - sources."cacache-15.3.0" - sources."fs-minipass-2.1.0" - (sources."glob-8.1.0" // { - dependencies = [ - sources."brace-expansion-2.0.1" - sources."minimatch-5.1.6" - ]; - }) - sources."hosted-git-info-4.1.0" - sources."http-proxy-agent-4.0.1" - sources."ignore-walk-4.0.1" - sources."json-parse-even-better-errors-2.3.1" - sources."lru-cache-6.0.0" - sources."make-fetch-happen-9.1.0" - sources."minimatch-3.1.2" - sources."minipass-3.3.6" - sources."minipass-fetch-1.4.1" - sources."node-gyp-8.4.1" - sources."nopt-5.0.0" - sources."npm-bundled-1.1.2" - sources."npm-install-checks-4.0.0" - sources."npm-normalize-package-bin-1.0.1" - sources."npm-package-arg-8.1.5" - sources."npm-packlist-3.0.0" - sources."npm-pick-manifest-6.1.1" - (sources."npm-registry-fetch-12.0.2" // { - dependencies = [ - sources."@npmcli/fs-2.1.2" - sources."@tootallnate/once-2.0.0" - sources."cacache-16.1.3" - sources."http-proxy-agent-5.0.0" - sources."lru-cache-7.18.3" - (sources."make-fetch-happen-10.2.1" // { - dependencies = [ - sources."minipass-fetch-2.1.2" - ]; - }) - sources."socks-proxy-agent-7.0.0" - sources."ssri-9.0.1" - sources."unique-filename-2.0.1" - sources."unique-slug-3.0.0" - ]; - }) - sources."pacote-12.0.3" - sources."read-package-json-fast-2.0.3" - sources."socks-proxy-agent-6.2.1" - sources."ssri-8.0.1" - sources."unique-filename-1.1.1" - sources."unique-slug-2.0.2" - sources."validate-npm-package-name-3.0.0" - sources."which-2.0.2" - ]; - }) - sources."@npmcli/move-file-1.1.2" - sources."@npmcli/name-from-folder-1.0.1" - sources."@npmcli/node-gyp-3.0.0" - (sources."@npmcli/package-json-1.0.1" // { - dependencies = [ - sources."json-parse-even-better-errors-2.3.1" - ]; - }) - sources."@npmcli/promise-spawn-6.0.2" - sources."@npmcli/run-script-6.0.2" - sources."@octokit/auth-token-2.5.0" - sources."@octokit/core-3.6.0" - sources."@octokit/endpoint-6.0.12" - sources."@octokit/graphql-4.8.0" - sources."@octokit/openapi-types-12.11.0" - sources."@octokit/plugin-paginate-rest-2.21.3" - sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.16.2" - sources."@octokit/request-5.6.3" - sources."@octokit/request-error-2.1.0" - sources."@octokit/rest-18.12.0" - sources."@octokit/types-6.41.0" - sources."@sigstore/bundle-1.1.0" - sources."@sigstore/protobuf-specs-0.2.1" - sources."@sigstore/sign-1.0.0" - sources."@sigstore/tuf-1.0.3" - sources."@tootallnate/once-2.0.0" - sources."@tufjs/canonical-json-1.0.0" - (sources."@tufjs/models-1.0.4" // { - dependencies = [ - sources."minimatch-9.0.3" - ]; - }) - sources."@types/expect-1.20.4" - sources."@types/minimatch-3.0.5" - sources."@types/node-15.14.9" - sources."@types/normalize-package-data-2.4.1" - sources."@types/vinyl-2.0.7" - sources."abbrev-1.1.1" - sources."abort-controller-3.0.0" - sources."agent-base-6.0.2" - sources."agentkeepalive-4.5.0" - sources."aggregate-error-3.1.0" - (sources."ansi-escapes-4.3.2" // { - dependencies = [ - sources."type-fest-0.21.3" - ]; - }) - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."aproba-2.0.0" - (sources."are-we-there-yet-3.0.1" // { - dependencies = [ - sources."readable-stream-3.6.2" - ]; - }) - sources."argparse-1.0.10" - sources."array-differ-3.0.0" - sources."array-union-2.1.0" - sources."arrify-2.0.1" - sources."asap-2.0.6" - sources."async-3.2.4" - sources."balanced-match-1.0.2" - sources."base64-js-1.5.1" - sources."before-after-hook-2.2.3" - (sources."bin-links-3.0.3" // { - dependencies = [ - sources."npm-normalize-package-bin-2.0.0" - ]; - }) - sources."binaryextensions-4.18.0" - (sources."bl-4.1.0" // { - dependencies = [ - sources."readable-stream-3.6.2" - ]; - }) - sources."brace-expansion-2.0.1" - sources."braces-3.0.2" - sources."buffer-5.7.1" - sources."builtins-5.0.1" - (sources."cacache-17.1.4" // { - dependencies = [ - sources."glob-10.3.4" - sources."minimatch-9.0.3" - sources."minipass-7.0.3" - ]; - }) - sources."chalk-4.1.2" - sources."chardet-0.7.0" - sources."chownr-2.0.0" - sources."clean-stack-2.2.0" - sources."cli-boxes-1.0.0" - sources."cli-cursor-3.1.0" - sources."cli-spinners-2.9.1" - sources."cli-table-0.3.11" - sources."cli-width-3.0.0" - sources."clone-2.1.2" - sources."clone-buffer-1.0.0" - sources."clone-stats-1.0.0" - sources."cloneable-readable-1.1.3" - sources."cmd-shim-5.0.0" - sources."code-point-at-1.1.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."color-support-1.1.3" - sources."colors-1.0.3" - sources."commander-7.1.0" - sources."common-ancestor-path-1.0.1" - sources."commondir-1.0.1" - sources."concat-map-0.0.1" - sources."console-control-strings-1.1.0" - sources."core-util-is-1.0.3" - (sources."cross-spawn-7.0.3" // { - dependencies = [ - sources."which-2.0.2" - ]; - }) - sources."dargs-7.0.0" - sources."dateformat-4.6.3" - sources."debug-4.3.4" - sources."debuglog-1.0.1" - sources."deep-extend-0.6.0" - (sources."defaults-1.0.4" // { - dependencies = [ - sources."clone-1.0.4" - ]; - }) - sources."delegates-1.0.0" - sources."deprecation-2.3.1" - sources."dezalgo-1.0.4" - sources."diff-5.1.0" - sources."dir-glob-3.0.1" - sources."eastasianwidth-0.2.0" - sources."ejs-3.1.9" - sources."emoji-regex-8.0.0" - sources."encoding-0.1.13" - sources."env-paths-2.2.1" - sources."err-code-2.0.3" - sources."error-10.4.0" - sources."error-ex-1.3.2" - sources."escape-string-regexp-1.0.5" - sources."esprima-4.0.1" - sources."event-target-shim-5.0.1" - sources."eventemitter3-4.0.7" - sources."events-3.3.0" - sources."execa-5.1.1" - sources."exponential-backoff-3.1.1" - (sources."external-editor-3.1.0" // { - dependencies = [ - sources."iconv-lite-0.4.24" - ]; - }) - sources."fast-glob-3.3.1" - sources."fast-plist-0.1.3" - sources."fastq-1.15.0" - sources."figures-3.2.0" - (sources."filelist-1.0.4" // { - dependencies = [ - sources."minimatch-5.1.6" - ]; - }) - sources."fill-range-7.0.1" - sources."find-up-4.1.0" - sources."find-yarn-workspace-root2-1.2.16" - sources."first-chunk-stream-2.0.0" - (sources."foreground-child-3.1.1" // { - dependencies = [ - sources."signal-exit-4.1.0" - ]; - }) - (sources."fs-minipass-3.0.3" // { - dependencies = [ - sources."minipass-7.0.3" - ]; - }) - sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" - sources."gauge-4.0.4" - sources."get-stdin-4.0.1" - sources."get-stream-6.0.1" - sources."github-username-6.0.0" - (sources."glob-7.2.3" // { - dependencies = [ - sources."brace-expansion-1.1.11" - sources."minimatch-3.1.2" - ]; - }) - sources."glob-parent-5.1.2" - sources."globby-11.1.0" - sources."graceful-fs-4.2.11" - sources."grouped-queue-2.0.0" - sources."has-1.0.3" - (sources."has-ansi-2.0.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) - sources."has-flag-4.0.0" - sources."has-unicode-2.0.1" - sources."hosted-git-info-6.1.1" - sources."http-cache-semantics-4.1.1" - sources."http-proxy-agent-5.0.0" - sources."https-proxy-agent-5.0.1" - sources."human-signals-2.1.0" - sources."humanize-ms-1.2.1" - sources."iconv-lite-0.6.3" - sources."ieee754-1.2.1" - sources."ignore-5.2.4" - (sources."ignore-walk-6.0.3" // { - dependencies = [ - sources."minimatch-9.0.3" - ]; - }) - sources."imurmurhash-0.1.4" - sources."indent-string-4.0.0" - sources."infer-owner-1.0.4" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - (sources."inquirer-8.2.6" // { - dependencies = [ - sources."wrap-ansi-6.2.0" - ]; - }) - sources."interpret-1.4.0" - sources."ip-2.0.0" - sources."is-arrayish-0.2.1" - sources."is-core-module-2.13.0" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-glob-4.0.3" - sources."is-interactive-1.0.0" - sources."is-lambda-1.0.1" - sources."is-number-7.0.0" - sources."is-plain-obj-2.1.0" - sources."is-plain-object-5.0.0" - sources."is-scoped-2.1.0" - sources."is-stream-2.0.1" - sources."is-unicode-supported-0.1.0" - sources."is-utf8-0.2.1" - sources."isarray-1.0.0" - sources."isbinaryfile-5.0.0" - sources."isexe-2.0.0" - sources."jackspeak-2.3.3" - (sources."jake-10.8.7" // { - dependencies = [ - sources."brace-expansion-1.1.11" - sources."minimatch-3.1.2" - ]; - }) - sources."js-tokens-4.0.0" - sources."js-yaml-3.14.1" - sources."json-parse-even-better-errors-3.0.0" - sources."json-stringify-nice-1.1.4" - sources."jsonparse-1.3.1" - sources."just-diff-5.2.0" - sources."just-diff-apply-5.5.0" - sources."lines-and-columns-1.2.4" - (sources."load-yaml-file-0.2.0" // { - dependencies = [ - sources."pify-4.0.1" - sources."strip-bom-3.0.0" - ]; - }) - sources."locate-path-5.0.0" - sources."lodash-4.17.21" - sources."log-symbols-4.1.0" - sources."lru-cache-7.18.3" - sources."make-fetch-happen-11.1.1" - sources."mem-fs-2.3.0" - sources."mem-fs-editor-9.7.0" - sources."merge-stream-2.0.0" - sources."merge2-1.4.1" - sources."micromatch-4.0.5" - sources."mimic-fn-2.1.0" - sources."minimatch-7.4.6" - sources."minimist-1.2.8" - sources."minipass-5.0.0" - (sources."minipass-collect-1.0.2" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-fetch-3.0.4" // { - dependencies = [ - sources."minipass-7.0.3" - ]; - }) - (sources."minipass-flush-1.0.5" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-json-stream-1.0.1" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-pipeline-1.2.4" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-sized-1.0.3" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minizlib-2.1.2" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - sources."mkdirp-1.0.4" - sources."mkdirp-infer-owner-2.0.0" - sources."ms-2.1.2" - (sources."multimatch-5.0.0" // { - dependencies = [ - sources."brace-expansion-1.1.11" - sources."minimatch-3.1.2" - ]; - }) - sources."mute-stream-0.0.8" - sources."negotiator-0.6.3" - sources."node-fetch-2.7.0" - (sources."node-gyp-9.4.0" // { - dependencies = [ - sources."which-2.0.2" - ]; - }) - sources."nopt-6.0.0" - sources."normalize-package-data-5.0.0" - sources."normalize-path-3.0.0" - sources."npm-bundled-3.0.0" - sources."npm-install-checks-6.2.0" - sources."npm-normalize-package-bin-3.0.1" - sources."npm-package-arg-10.1.0" - sources."npm-packlist-7.0.4" - sources."npm-pick-manifest-8.0.2" - sources."npm-registry-fetch-14.0.5" - sources."npm-run-path-4.0.1" - sources."npmlog-6.0.2" - sources."number-is-nan-1.0.1" - sources."object-assign-4.1.1" - sources."once-1.4.0" - sources."onetime-5.1.2" - sources."ora-5.4.1" - sources."os-tmpdir-1.0.2" - sources."p-finally-1.0.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-map-4.0.0" - sources."p-queue-6.6.2" - sources."p-timeout-3.2.0" - sources."p-transform-1.3.0" - sources."p-try-2.2.0" - sources."pacote-15.2.0" - sources."pad-component-0.0.1" - (sources."parse-conflict-json-2.0.2" // { - dependencies = [ - sources."json-parse-even-better-errors-2.3.1" - ]; - }) - (sources."parse-json-5.2.0" // { - dependencies = [ - sources."json-parse-even-better-errors-2.3.1" - ]; - }) - sources."path-exists-4.0.0" - sources."path-is-absolute-1.0.1" - sources."path-key-3.1.1" - sources."path-parse-1.0.7" - (sources."path-scurry-1.10.1" // { - dependencies = [ - sources."lru-cache-10.0.1" - ]; - }) - sources."path-type-4.0.0" - sources."picomatch-2.3.1" - sources."pify-2.3.0" - sources."pkg-dir-4.2.0" - (sources."preferred-pm-3.1.2" // { - dependencies = [ - sources."find-up-5.0.0" - sources."locate-path-6.0.0" - sources."p-limit-3.1.0" - sources."p-locate-5.0.0" - ]; - }) - sources."pretty-bytes-5.6.0" - sources."proc-log-3.0.0" - sources."process-0.11.10" - sources."process-nextick-args-2.0.1" - sources."promise-all-reject-late-1.0.1" - sources."promise-call-limit-1.0.2" - sources."promise-inflight-1.0.1" - sources."promise-retry-2.0.1" - sources."queue-microtask-1.2.3" - sources."read-cmd-shim-3.0.1" - (sources."read-package-json-6.0.4" // { - dependencies = [ - sources."glob-10.3.4" - sources."minimatch-9.0.3" - ]; - }) - sources."read-package-json-fast-3.0.2" - (sources."read-pkg-5.2.0" // { - dependencies = [ - sources."hosted-git-info-2.8.9" - sources."normalize-package-data-2.5.0" - sources."semver-5.7.2" - sources."type-fest-0.6.0" - ]; - }) - sources."read-pkg-up-7.0.1" - sources."readable-stream-2.3.8" - sources."readdir-scoped-modules-1.1.0" - sources."rechoir-0.6.2" - sources."remove-trailing-separator-1.1.0" - sources."replace-ext-1.0.1" - sources."request-light-0.7.0" - sources."resolve-1.22.5" - sources."restore-cursor-3.1.0" - sources."retry-0.12.0" - sources."reusify-1.0.4" - sources."rimraf-3.0.2" - sources."run-async-2.4.1" - sources."run-parallel-1.2.0" - sources."rxjs-7.8.1" - sources."safe-buffer-5.1.2" - sources."safer-buffer-2.1.2" - sources."sanitize-filename-1.6.3" - sources."scoped-regex-2.1.0" - (sources."semver-7.5.4" // { - dependencies = [ - sources."lru-cache-6.0.0" - ]; - }) - sources."set-blocking-2.0.0" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."shelljs-0.8.5" - sources."signal-exit-3.0.7" - sources."sigstore-1.9.0" - sources."slash-3.0.0" - sources."smart-buffer-4.2.0" - sources."socks-2.7.1" - sources."socks-proxy-agent-7.0.0" - sources."sort-keys-4.2.0" - sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.3.0" - sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.13" - sources."sprintf-js-1.0.3" - (sources."ssri-10.0.5" // { - dependencies = [ - sources."minipass-7.0.3" - ]; - }) - sources."string-width-4.2.3" - sources."string-width-cjs-4.2.3" - sources."string_decoder-1.1.1" - sources."strip-ansi-6.0.1" - sources."strip-ansi-cjs-6.0.1" - sources."strip-bom-2.0.0" - sources."strip-bom-buf-1.0.0" - sources."strip-bom-stream-2.0.0" - sources."strip-final-newline-2.0.0" - sources."supports-color-7.2.0" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."taketalk-1.0.0" - (sources."tar-6.2.0" // { - dependencies = [ - (sources."fs-minipass-2.1.0" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - ]; - }) - sources."text-table-0.2.0" - sources."textextensions-5.16.0" - sources."through-2.3.8" - sources."tmp-0.0.33" - sources."to-regex-range-5.0.1" - sources."tr46-0.0.3" - sources."treeverse-1.0.4" - sources."truncate-utf8-bytes-1.0.2" - sources."tslib-2.6.2" - sources."tuf-js-1.1.7" - sources."type-fest-0.8.1" - sources."unique-filename-3.0.0" - sources."unique-slug-4.0.0" - sources."universal-user-agent-6.0.0" - sources."untildify-4.0.0" - sources."utf8-byte-length-1.0.4" - sources."util-deprecate-1.0.2" - sources."validate-npm-package-license-3.0.4" - sources."validate-npm-package-name-5.0.0" - sources."vinyl-2.2.1" - sources."vinyl-file-3.0.0" - sources."walk-up-path-1.0.0" - sources."wcwidth-1.0.1" - sources."webidl-conversions-3.0.1" - sources."whatwg-url-5.0.0" - sources."which-3.0.1" - sources."which-pm-2.0.0" - sources."wide-align-1.1.5" - (sources."wrap-ansi-8.1.0" // { - dependencies = [ - sources."ansi-regex-6.0.1" - sources."ansi-styles-6.2.1" - sources."emoji-regex-9.2.2" - sources."string-width-5.1.2" - sources."strip-ansi-7.1.0" - ]; - }) - sources."wrap-ansi-cjs-7.0.0" - sources."wrappy-1.0.2" - sources."write-file-atomic-4.0.2" - sources."yallist-4.0.0" - (sources."yeoman-environment-3.19.3" // { - dependencies = [ - sources."@npmcli/fs-1.1.1" - sources."@npmcli/git-2.1.0" - sources."@npmcli/installed-package-contents-1.0.7" - sources."@npmcli/move-file-2.0.1" - sources."@npmcli/node-gyp-1.0.3" - sources."@npmcli/promise-spawn-1.3.2" - sources."@npmcli/run-script-2.0.0" - sources."@tootallnate/once-1.1.2" - (sources."are-we-there-yet-2.0.0" // { - dependencies = [ - sources."readable-stream-3.6.2" - ]; - }) - sources."brace-expansion-1.1.11" - sources."buffer-6.0.3" - sources."builtins-1.0.3" - sources."cacache-15.3.0" - sources."escape-string-regexp-4.0.0" - sources."find-up-5.0.0" - sources."fs-minipass-2.1.0" - sources."gauge-3.0.2" - (sources."glob-8.1.0" // { - dependencies = [ - sources."brace-expansion-2.0.1" - sources."minimatch-5.1.6" - ]; - }) - sources."hosted-git-info-4.1.0" - sources."http-proxy-agent-4.0.1" - sources."ignore-walk-4.0.1" - sources."isbinaryfile-4.0.10" - sources."json-parse-even-better-errors-2.3.1" - sources."locate-path-6.0.0" - sources."lru-cache-6.0.0" - sources."make-fetch-happen-9.1.0" - sources."minimatch-3.1.2" - sources."minipass-3.3.6" - sources."minipass-fetch-1.4.1" - (sources."node-gyp-8.4.1" // { - dependencies = [ - sources."are-we-there-yet-3.0.1" - sources."gauge-4.0.4" - sources."npmlog-6.0.2" - sources."readable-stream-3.6.2" - ]; - }) - sources."nopt-5.0.0" - sources."npm-bundled-1.1.2" - sources."npm-install-checks-4.0.0" - sources."npm-normalize-package-bin-1.0.1" - sources."npm-package-arg-8.1.5" - sources."npm-packlist-3.0.0" - sources."npm-pick-manifest-6.1.1" - (sources."npm-registry-fetch-12.0.2" // { - dependencies = [ - sources."@npmcli/fs-2.1.2" - sources."@tootallnate/once-2.0.0" - sources."cacache-16.1.3" - sources."http-proxy-agent-5.0.0" - sources."lru-cache-7.18.3" - (sources."make-fetch-happen-10.2.1" // { - dependencies = [ - sources."minipass-fetch-2.1.2" - ]; - }) - sources."socks-proxy-agent-7.0.0" - sources."ssri-9.0.1" - sources."unique-filename-2.0.1" - sources."unique-slug-3.0.0" - ]; - }) - sources."npmlog-5.0.1" - sources."p-limit-3.1.0" - sources."p-locate-5.0.0" - sources."pacote-12.0.3" - sources."read-package-json-fast-2.0.3" - sources."readable-stream-4.4.2" - sources."safe-buffer-5.2.1" - sources."socks-proxy-agent-6.2.1" - sources."ssri-8.0.1" - sources."string_decoder-1.3.0" - sources."unique-filename-1.1.1" - sources."unique-slug-2.0.2" - sources."validate-npm-package-name-3.0.0" - sources."which-2.0.2" - ]; - }) - sources."yeoman-generator-5.9.0" - sources."yocto-queue-0.1.0" - (sources."yosay-2.0.2" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."ansi-styles-3.2.1" - (sources."chalk-1.1.3" // { - dependencies = [ - sources."ansi-styles-2.2.1" - ]; - }) - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."is-fullwidth-code-point-2.0.0" - (sources."string-width-2.1.1" // { - dependencies = [ - sources."ansi-regex-3.0.1" - sources."strip-ansi-4.0.0" - ]; - }) - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - (sources."wrap-ansi-2.1.0" // { - dependencies = [ - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" - ]; - }) - ]; - }) - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Yeoman generator for Visual Studio Code extensions."; - homepage = "http://code.visualstudio.com"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; get-graphql-schema = nodeEnv.buildNodePackage { name = "get-graphql-schema"; packageName = "get-graphql-schema"; @@ -81519,15 +77751,15 @@ in "@gitbeaker/cli" = nodeEnv.buildNodePackage { name = "_at_gitbeaker_slash_cli"; packageName = "@gitbeaker/cli"; - version = "39.15.0"; + version = "39.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/cli/-/cli-39.15.0.tgz"; - sha512 = "tYk/+9aEAlphIU/t5/dzMDTrVVE5kixbI6uCpUqQYfYdvRgTqEX5lGfvanVLXohsKrjm4nvxCeiQ6Rm6HDvOsQ=="; + url = "https://registry.npmjs.org/@gitbeaker/cli/-/cli-39.16.0.tgz"; + sha512 = "mAbuolRI/YUZSU9kifwdj8PMVbSTEf2UJlGB2NQNMS+243ijqbSiH/3s68a5SBy4sOGPc9aHtmQ2aWJ3/KhEJg=="; }; dependencies = [ - sources."@gitbeaker/core-39.15.0" - sources."@gitbeaker/requester-utils-39.15.0" - sources."@gitbeaker/rest-39.15.0" + sources."@gitbeaker/core-39.16.0" + sources."@gitbeaker/requester-utils-39.16.0" + sources."@gitbeaker/rest-39.16.0" sources."ansi-styles-4.3.0" sources."call-bind-1.0.2" sources."chalk-4.1.2" @@ -81556,329 +77788,6 @@ in bypassCache = true; reconstructLock = true; }; - gitmoji-cli = nodeEnv.buildNodePackage { - name = "gitmoji-cli"; - packageName = "gitmoji-cli"; - version = "8.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-8.5.0.tgz"; - sha512 = "ZSplvgm8UiAjsWBOxYAfbLj8JTMFj5TjB6yM7RFlqEfsFMgP0fhIPpgnHU5aMiyVyvX6jBRVf1hzjrmP3/cgiA=="; - }; - dependencies = [ - sources."@ljharb/through-2.3.9" - sources."@pnpm/config.env-replace-1.1.0" - (sources."@pnpm/network.ca-file-1.0.2" // { - dependencies = [ - sources."graceful-fs-4.2.10" - ]; - }) - sources."@pnpm/npm-conf-2.2.2" - sources."@sindresorhus/is-5.6.0" - sources."@szmarczak/http-timer-5.0.1" - sources."@tootallnate/quickjs-emscripten-0.23.0" - sources."@types/http-cache-semantics-4.0.1" - sources."agent-base-7.1.0" - sources."ajv-8.12.0" - sources."ajv-formats-2.1.1" - sources."ansi-align-3.0.1" - (sources."ansi-escapes-4.3.2" // { - dependencies = [ - sources."type-fest-0.21.3" - ]; - }) - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."ast-types-0.13.4" - sources."atomically-2.0.2" - sources."base64-js-1.5.1" - sources."basic-ftp-5.0.3" - sources."bl-4.1.0" - (sources."boxen-7.1.1" // { - dependencies = [ - sources."ansi-regex-6.0.1" - sources."ansi-styles-6.2.1" - sources."emoji-regex-9.2.2" - sources."string-width-5.1.2" - sources."strip-ansi-7.1.0" - sources."wrap-ansi-8.1.0" - ]; - }) - sources."buffer-5.7.1" - sources."cacheable-lookup-7.0.0" - (sources."cacheable-request-10.2.13" // { - dependencies = [ - sources."get-stream-6.0.1" - ]; - }) - sources."camelcase-7.0.1" - sources."chalk-5.3.0" - sources."chardet-0.7.0" - sources."ci-info-3.8.0" - sources."cli-boxes-3.0.0" - sources."cli-cursor-3.1.0" - sources."cli-spinners-2.9.1" - sources."cli-width-4.1.0" - sources."clone-1.0.4" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."conf-11.0.2" - (sources."config-chain-1.1.13" // { - dependencies = [ - sources."ini-1.3.8" - ]; - }) - (sources."configstore-6.0.0" // { - dependencies = [ - sources."dot-prop-6.0.1" - ]; - }) - sources."cross-spawn-7.0.3" - (sources."crypto-random-string-4.0.0" // { - dependencies = [ - sources."type-fest-1.4.0" - ]; - }) - sources."data-uri-to-buffer-4.0.1" - sources."debounce-fn-5.1.2" - sources."debug-4.3.4" - (sources."decompress-response-6.0.0" // { - dependencies = [ - sources."mimic-response-3.1.0" - ]; - }) - sources."deep-extend-0.6.0" - sources."defaults-1.0.4" - sources."defer-to-connect-2.0.1" - sources."degenerator-5.0.1" - sources."dot-prop-7.2.0" - sources."eastasianwidth-0.2.0" - sources."emoji-regex-8.0.0" - sources."env-paths-3.0.0" - sources."escape-goat-4.0.0" - sources."escape-string-regexp-5.0.0" - sources."escodegen-2.1.0" - sources."esprima-4.0.1" - sources."estraverse-5.3.0" - sources."esutils-2.0.3" - sources."execa-8.0.1" - sources."external-editor-3.1.0" - sources."fast-deep-equal-3.1.3" - sources."fetch-blob-3.2.0" - sources."figures-5.0.0" - sources."form-data-encoder-2.1.4" - sources."formdata-polyfill-4.0.10" - sources."fs-extra-8.1.0" - sources."fuse.js-6.6.2" - sources."get-stream-8.0.1" - (sources."get-uri-6.0.1" // { - dependencies = [ - sources."data-uri-to-buffer-5.0.1" - ]; - }) - sources."global-dirs-3.0.1" - (sources."got-12.6.1" // { - dependencies = [ - sources."get-stream-6.0.1" - ]; - }) - sources."graceful-fs-4.2.11" - sources."has-flag-4.0.0" - sources."has-yarn-3.0.0" - sources."http-cache-semantics-4.1.1" - sources."http-proxy-agent-7.0.0" - sources."http2-wrapper-2.2.0" - sources."https-proxy-agent-7.0.2" - sources."human-signals-5.0.0" - sources."iconv-lite-0.4.24" - sources."ieee754-1.2.1" - sources."import-lazy-4.0.0" - sources."imurmurhash-0.1.4" - sources."inherits-2.0.4" - sources."ini-2.0.0" - (sources."inquirer-9.2.11" // { - dependencies = [ - sources."is-unicode-supported-0.1.0" - (sources."ora-5.4.1" // { - dependencies = [ - sources."chalk-4.1.2" - ]; - }) - ]; - }) - (sources."inquirer-autocomplete-prompt-3.0.0" // { - dependencies = [ - sources."ansi-escapes-6.2.0" - sources."run-async-2.4.1" - sources."type-fest-3.13.1" - ]; - }) - sources."ip-1.1.8" - sources."is-ci-3.0.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-installed-globally-0.4.0" - sources."is-interactive-1.0.0" - sources."is-npm-6.0.0" - sources."is-obj-2.0.0" - sources."is-path-inside-3.0.3" - sources."is-stream-3.0.0" - sources."is-typedarray-1.0.0" - sources."is-unicode-supported-1.3.0" - sources."is-yarn-global-0.4.1" - sources."isexe-2.0.0" - sources."json-buffer-3.0.1" - sources."json-schema-traverse-1.0.0" - sources."json-schema-typed-8.0.1" - sources."jsonfile-4.0.0" - sources."keyv-4.5.3" - sources."latest-version-7.0.0" - sources."lodash-4.17.21" - (sources."log-symbols-4.1.0" // { - dependencies = [ - sources."chalk-4.1.2" - sources."is-unicode-supported-0.1.0" - ]; - }) - sources."lowercase-keys-3.0.0" - sources."lru-cache-6.0.0" - sources."meow-12.1.1" - sources."merge-stream-2.0.0" - sources."mimic-fn-4.0.0" - sources."mimic-response-4.0.0" - sources."minimist-1.2.8" - sources."ms-2.1.2" - sources."mute-stream-1.0.0" - sources."netmask-2.0.2" - sources."node-domexception-1.0.0" - sources."node-fetch-3.3.2" - sources."normalize-url-8.0.0" - (sources."npm-run-path-5.1.0" // { - dependencies = [ - sources."path-key-4.0.0" - ]; - }) - sources."onetime-6.0.0" - (sources."ora-7.0.1" // { - dependencies = [ - sources."ansi-regex-6.0.1" - sources."cli-cursor-4.0.0" - sources."emoji-regex-10.2.1" - sources."is-interactive-2.0.0" - sources."log-symbols-5.1.0" - sources."mimic-fn-2.1.0" - sources."onetime-5.1.2" - sources."restore-cursor-4.0.0" - sources."signal-exit-3.0.7" - sources."string-width-6.1.0" - sources."strip-ansi-7.1.0" - ]; - }) - sources."os-tmpdir-1.0.2" - sources."p-cancelable-3.0.0" - sources."pac-proxy-agent-7.0.1" - sources."pac-resolver-7.0.0" - sources."package-json-8.1.1" - sources."path-exists-5.0.0" - sources."path-key-3.1.1" - sources."picocolors-1.0.0" - sources."proto-list-1.2.4" - (sources."proxy-agent-6.3.1" // { - dependencies = [ - sources."lru-cache-7.18.3" - ]; - }) - sources."proxy-from-env-1.1.0" - sources."punycode-2.3.0" - sources."pupa-3.1.0" - sources."quick-lru-5.1.1" - (sources."rc-1.2.8" // { - dependencies = [ - sources."ini-1.3.8" - ]; - }) - sources."readable-stream-3.6.2" - sources."registry-auth-token-5.0.2" - sources."registry-url-6.0.1" - sources."require-from-string-2.0.2" - sources."resolve-alpn-1.2.1" - sources."responselike-3.0.0" - (sources."restore-cursor-3.1.0" // { - dependencies = [ - sources."mimic-fn-2.1.0" - sources."onetime-5.1.2" - sources."signal-exit-3.0.7" - ]; - }) - sources."run-async-3.0.0" - sources."rxjs-7.8.1" - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" - sources."semver-7.5.4" - sources."semver-diff-4.0.0" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."signal-exit-4.1.0" - sources."smart-buffer-4.2.0" - (sources."socks-2.7.1" // { - dependencies = [ - sources."ip-2.0.0" - ]; - }) - sources."socks-proxy-agent-8.0.2" - sources."source-map-0.6.1" - (sources."stdin-discarder-0.1.0" // { - dependencies = [ - sources."bl-5.1.0" - sources."buffer-6.0.3" - ]; - }) - sources."string-width-4.2.3" - sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.1" - sources."strip-final-newline-3.0.0" - sources."strip-json-comments-2.0.1" - sources."stubborn-fs-1.2.5" - sources."supports-color-7.2.0" - sources."tmp-0.0.33" - sources."tslib-2.6.2" - sources."type-fest-2.19.0" - sources."typedarray-to-buffer-3.1.5" - sources."unique-string-3.0.0" - sources."universalify-0.1.2" - sources."update-notifier-6.0.2" - sources."uri-js-4.4.1" - sources."util-deprecate-1.0.2" - sources."validator-13.11.0" - sources."wcwidth-1.0.1" - sources."web-streams-polyfill-3.2.1" - sources."when-exit-2.1.1" - sources."which-2.0.2" - (sources."widest-line-4.0.1" // { - dependencies = [ - sources."ansi-regex-6.0.1" - sources."emoji-regex-9.2.2" - sources."string-width-5.1.2" - sources."strip-ansi-7.1.0" - ]; - }) - sources."wrap-ansi-6.2.0" - (sources."write-file-atomic-3.0.3" // { - dependencies = [ - sources."signal-exit-3.0.7" - ]; - }) - sources."xdg-basedir-5.1.0" - sources."yallist-4.0.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "A gitmoji client for using emojis on commit messages."; - homepage = "https://github.com/carloscuesta/gitmoji-cli#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; gramma = nodeEnv.buildNodePackage { name = "gramma"; packageName = "gramma"; @@ -82069,7 +77978,7 @@ in sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-7.0.0" sources."vscode-languageserver-protocol-3.16.0" - sources."vscode-languageserver-textdocument-1.0.10" + sources."vscode-languageserver-textdocument-1.0.11" sources."vscode-languageserver-types-3.16.0" sources."web-tree-sitter-0.20.5" sources."webidl-conversions-3.0.1" @@ -82088,10 +77997,10 @@ in graphql = nodeEnv.buildNodePackage { name = "graphql"; packageName = "graphql"; - version = "16.8.0"; + version = "16.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/graphql/-/graphql-16.8.0.tgz"; - sha512 = "0oKGaR+y3qcS5mCu1vb7KG+a89vjn06C7Ihq/dDl3jA+A8B3TKomvi3CiEcVLJQGalbu8F52LxkOym7U5sSfbg=="; + url = "https://registry.npmjs.org/graphql/-/graphql-16.8.1.tgz"; + sha512 = "59LZHPdGZVh695Ud9lRzPBVTtlX9ZCV150Er2W43ro37wVof0ctenSaskPPjN7lVTIN8mSZt8PHUNKZuNQUuxw=="; }; buildInputs = globalBuildInputs; meta = { @@ -82123,8 +78032,8 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/helper-validator-identifier-7.22.19" - (sources."@babel/highlight-7.22.13" // { + sources."@babel/helper-validator-identifier-7.22.20" + (sources."@babel/highlight-7.22.20" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -82231,7 +78140,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-20.6.1" + sources."@types/node-20.8.0" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" @@ -82707,45 +78616,49 @@ in graphql-language-service-cli = nodeEnv.buildNodePackage { name = "graphql-language-service-cli"; packageName = "graphql-language-service-cli"; - version = "3.3.25"; + version = "3.3.27"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-language-service-cli/-/graphql-language-service-cli-3.3.25.tgz"; - sha512 = "Zqqs0m+qrUySidmuSCcB/p/qkbPe7PQAv0p8Ar20xo/Oz0YWfloXVVvlgSsJ/g386+p7NlC+FMImrOyG0HGM5w=="; + url = "https://registry.npmjs.org/graphql-language-service-cli/-/graphql-language-service-cli-3.3.27.tgz"; + sha512 = "g/fF4ZuoBz2VB5TqEn73rXbPTNSpYTDPNvU+9NtXLFWwvnUyRd0ma9E8JMIcv61/poEd8rW5wxUEREaN9P6BCQ=="; }; dependencies = [ sources."@ampproject/remapping-2.2.1" sources."@ardatan/sync-fetch-0.0.1" sources."@babel/code-frame-7.22.13" - sources."@babel/compat-data-7.22.9" - sources."@babel/core-7.22.19" - sources."@babel/generator-7.22.15" + sources."@babel/compat-data-7.22.20" + sources."@babel/core-7.23.0" + sources."@babel/generator-7.23.0" sources."@babel/helper-compilation-targets-7.22.15" - sources."@babel/helper-environment-visitor-7.22.5" - sources."@babel/helper-function-name-7.22.5" + sources."@babel/helper-environment-visitor-7.22.20" + sources."@babel/helper-function-name-7.23.0" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-module-imports-7.22.15" - sources."@babel/helper-module-transforms-7.22.19" + sources."@babel/helper-module-transforms-7.23.0" sources."@babel/helper-plugin-utils-7.22.5" sources."@babel/helper-simple-access-7.22.5" sources."@babel/helper-split-export-declaration-7.22.6" sources."@babel/helper-string-parser-7.22.5" - sources."@babel/helper-validator-identifier-7.22.19" + sources."@babel/helper-validator-identifier-7.22.20" sources."@babel/helper-validator-option-7.22.15" - sources."@babel/helpers-7.22.15" - sources."@babel/highlight-7.22.13" - sources."@babel/parser-7.22.16" + sources."@babel/helpers-7.23.1" + sources."@babel/highlight-7.22.20" + sources."@babel/parser-7.23.0" sources."@babel/plugin-syntax-import-assertions-7.22.5" sources."@babel/polyfill-7.12.1" sources."@babel/template-7.22.15" - sources."@babel/traverse-7.22.19" - sources."@babel/types-7.22.19" + sources."@babel/traverse-7.23.0" + sources."@babel/types-7.23.0" sources."@graphql-tools/batch-execute-9.0.2" sources."@graphql-tools/code-file-loader-8.0.1" sources."@graphql-tools/delegate-10.0.3" sources."@graphql-tools/executor-1.2.0" sources."@graphql-tools/executor-graphql-ws-1.1.0" sources."@graphql-tools/executor-http-1.0.2" - sources."@graphql-tools/executor-legacy-ws-1.0.3" + (sources."@graphql-tools/executor-legacy-ws-1.0.3" // { + dependencies = [ + sources."ws-8.14.1" + ]; + }) sources."@graphql-tools/graphql-file-loader-8.0.0" sources."@graphql-tools/graphql-tag-pluck-8.0.1" sources."@graphql-tools/import-7.0.0" @@ -82767,11 +78680,11 @@ in sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@repeaterjs/repeater-3.0.4" - sources."@types/estree-1.0.1" - sources."@types/node-20.6.1" - sources."@types/ws-8.5.5" + sources."@types/estree-1.0.2" + sources."@types/node-20.8.0" + sources."@types/ws-8.5.6" sources."@types/yargs-16.0.5" - sources."@types/yargs-parser-21.0.0" + sources."@types/yargs-parser-21.0.1" sources."@vue/compiler-core-3.3.4" sources."@vue/compiler-dom-3.3.4" sources."@vue/compiler-sfc-3.3.4" @@ -82791,11 +78704,11 @@ in sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.21.10" + sources."browserslist-4.22.1" sources."bufferutil-4.0.7" sources."busboy-1.6.0" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001534" + sources."caniuse-lite-1.0.30001542" sources."chalk-2.4.2" sources."cliui-7.0.4" (sources."code-red-1.0.4" // { @@ -82806,7 +78719,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."concat-map-0.0.1" - sources."convert-source-map-1.9.0" + sources."convert-source-map-2.0.0" sources."core-js-2.6.12" sources."cosmiconfig-8.3.6" sources."cosmiconfig-toml-loader-1.0.0" @@ -82816,9 +78729,9 @@ in sources."dedent-js-1.0.1" sources."dequal-2.0.3" sources."dir-glob-3.0.1" - sources."dotenv-8.2.0" + sources."dotenv-10.0.0" sources."dset-3.1.2" - sources."electron-to-chromium-1.4.523" + sources."electron-to-chromium-1.4.538" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."error-ex-1.3.2" @@ -82839,15 +78752,15 @@ in sources."glob-parent-5.1.2" sources."globals-11.12.0" sources."globby-11.1.0" - sources."graphql-16.8.0" + sources."graphql-16.8.1" (sources."graphql-config-5.0.2" // { dependencies = [ sources."minimatch-4.2.3" ]; }) - sources."graphql-language-service-5.1.7" - sources."graphql-language-service-server-2.11.3" - sources."graphql-ws-5.14.0" + sources."graphql-language-service-5.2.0" + sources."graphql-language-service-server-2.11.5" + sources."graphql-ws-5.14.1" sources."has-flag-3.0.0" sources."iconv-lite-0.6.3" sources."ignore-5.2.4" @@ -82875,7 +78788,7 @@ in sources."locate-character-3.0.0" sources."lower-case-2.0.2" sources."lru-cache-5.1.1" - sources."magic-string-0.30.3" + sources."magic-string-0.30.4" sources."mdn-data-2.0.30" sources."merge2-1.4.1" sources."meros-1.3.0" @@ -82905,7 +78818,7 @@ in }) sources."picocolors-1.0.0" sources."picomatch-2.3.1" - sources."postcss-8.4.29" + sources."postcss-8.4.31" sources."punycode-1.4.1" sources."queue-microtask-1.2.3" sources."regenerator-runtime-0.13.11" @@ -82923,26 +78836,31 @@ in sources."string-width-4.2.3" sources."strip-ansi-6.0.1" sources."supports-color-5.5.0" - (sources."svelte-4.2.0" // { + (sources."svelte-4.2.1" // { dependencies = [ sources."estree-walker-3.0.3" ]; }) - sources."svelte2tsx-0.6.21" + sources."svelte2tsx-0.6.22" sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" sources."tr46-0.0.3" sources."tslib-2.6.2" sources."typescript-5.2.2" sources."unixify-1.0.0" - sources."update-browserslist-db-1.0.11" + sources."update-browserslist-db-1.0.13" sources."urlpattern-polyfill-9.0.0" sources."utf-8-validate-6.0.3" sources."value-or-promise-1.0.12" - sources."vscode-jsonrpc-8.1.0" + sources."vscode-jsonrpc-8.2.0" sources."vscode-languageserver-8.1.0" - sources."vscode-languageserver-protocol-3.17.3" - sources."vscode-languageserver-types-3.17.3" + (sources."vscode-languageserver-protocol-3.17.3" // { + dependencies = [ + sources."vscode-jsonrpc-8.1.0" + sources."vscode-languageserver-types-3.17.3" + ]; + }) + sources."vscode-languageserver-types-3.17.5" sources."vscode-uri-3.0.7" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" @@ -82954,7 +78872,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-8.14.1" + sources."ws-8.14.2" sources."y18n-5.0.8" sources."yallist-3.1.1" sources."yargs-16.2.0" @@ -83031,7 +78949,7 @@ in sources."path-root-regex-0.1.2" sources."picomatch-2.3.1" sources."rechoir-0.7.1" - sources."resolve-1.22.5" + sources."resolve-1.22.6" sources."resolve-dir-1.0.1" sources."supports-preserve-symlinks-flag-1.0.0" sources."to-regex-range-5.0.1" @@ -83491,7 +79409,7 @@ in sources."replace-homedir-1.0.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.22.5" + sources."resolve-1.22.6" sources."resolve-dir-1.0.1" sources."resolve-options-1.1.0" sources."resolve-url-0.2.1" @@ -83541,7 +79459,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.13" + sources."spdx-license-ids-3.0.15" sources."split-string-3.1.0" sources."stack-trace-0.0.10" (sources."static-extend-0.1.2" // { @@ -83901,7 +79819,7 @@ in sources."replace-homedir-1.0.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.22.5" + sources."resolve-1.22.6" sources."resolve-dir-1.0.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" @@ -83943,7 +79861,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.13" + sources."spdx-license-ids-3.0.15" sources."split-string-3.1.0" sources."stack-trace-0.0.10" (sources."static-extend-0.1.2" // { @@ -84042,7 +79960,7 @@ in sources."corser-2.0.1" sources."debug-3.2.7" sources."eventemitter3-4.0.7" - sources."follow-redirects-1.15.2" + sources."follow-redirects-1.15.3" sources."function-bind-1.1.1" sources."get-intrinsic-1.2.1" sources."has-1.0.3" @@ -84429,8 +80347,8 @@ in }; dependencies = [ sources."@jcubic/lily-0.3.0" - sources."@types/jquery-3.5.19" - sources."@types/sizzle-2.3.3" + sources."@types/jquery-3.5.20" + sources."@types/sizzle-2.3.4" sources."ansidec-0.3.4" sources."arch-2.2.0" sources."clipboardy-2.3.0" @@ -84491,7 +80409,7 @@ in sources."@azure/core-auth-1.5.0" sources."@azure/core-http-2.3.2" sources."@azure/core-tracing-1.0.0-preview.13" - sources."@azure/core-util-1.4.0" + sources."@azure/core-util-1.5.0" sources."@azure/logger-1.0.4" sources."@bmewburn/js-beautify-1.14.7" sources."@bmewburn/vscode-html-languageserver-1.9.0" @@ -84520,8 +80438,8 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@selderee/plugin-htmlparser2-0.11.0" - sources."@types/node-20.6.1" - sources."@types/node-fetch-2.6.5" + sources."@types/node-20.8.0" + sources."@types/node-fetch-2.6.6" sources."@types/tunnel-0.0.3" sources."@vscode/l10n-0.0.16" sources."abbrev-1.1.1" @@ -84706,7 +80624,7 @@ in sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."sax-1.2.4" + sources."sax-1.3.0" sources."selderee-0.11.0" (sources."semver-7.3.8" // { dependencies = [ @@ -84744,29 +80662,29 @@ in sources."util-deprecate-1.0.2" sources."uuid-8.3.2" sources."verror-1.10.0" - (sources."vscode-css-languageservice-6.2.7" // { + (sources."vscode-css-languageservice-6.2.9" // { dependencies = [ sources."vscode-languageserver-types-3.17.3" ]; }) (sources."vscode-html-languageservice-5.1.0" // { dependencies = [ - sources."vscode-languageserver-types-3.17.3" + sources."vscode-languageserver-types-3.17.5" ]; }) - sources."vscode-jsonrpc-8.1.0" + sources."vscode-jsonrpc-8.2.0" (sources."vscode-languageserver-8.0.2" // { dependencies = [ sources."vscode-jsonrpc-8.0.2" sources."vscode-languageserver-protocol-3.17.2" ]; }) - (sources."vscode-languageserver-protocol-3.17.3" // { + (sources."vscode-languageserver-protocol-3.17.5" // { dependencies = [ - sources."vscode-languageserver-types-3.17.3" + sources."vscode-languageserver-types-3.17.5" ]; }) - sources."vscode-languageserver-textdocument-1.0.10" + sources."vscode-languageserver-textdocument-1.0.11" sources."vscode-languageserver-types-3.17.2" sources."vscode-nls-5.2.0" sources."vscode-uri-3.0.7" @@ -84903,10 +80821,10 @@ in sources."@aws-sdk/service-error-classification-3.296.0" sources."@aws-sdk/shared-ini-file-loader-3.296.0" sources."@aws-sdk/signature-v4-3.296.0" - (sources."@aws-sdk/signature-v4-crt-3.413.0" // { + (sources."@aws-sdk/signature-v4-crt-3.418.0" // { dependencies = [ - sources."@aws-sdk/signature-v4-multi-region-3.413.0" - sources."@aws-sdk/types-3.413.0" + sources."@aws-sdk/signature-v4-multi-region-3.418.0" + sources."@aws-sdk/types-3.418.0" ]; }) sources."@aws-sdk/signature-v4-multi-region-3.296.0" @@ -84938,7 +80856,7 @@ in sources."@aws-sdk/util-utf8-browser-3.259.0" sources."@aws-sdk/util-waiter-3.296.0" sources."@aws-sdk/xml-builder-3.295.0" - sources."@babel/runtime-7.22.15" + sources."@babel/runtime-7.23.1" sources."@braintree/sanitize-url-6.0.4" sources."@cronvel/get-pixels-3.4.1" sources."@gar/promisify-1.1.3" @@ -84969,21 +80887,21 @@ in sources."@mapbox/node-pre-gyp-1.0.11" sources."@npmcli/fs-1.1.1" sources."@npmcli/move-file-1.1.2" - sources."@smithy/eventstream-codec-2.0.8" + sources."@smithy/eventstream-codec-2.0.10" sources."@smithy/is-array-buffer-2.0.0" - sources."@smithy/protocol-http-3.0.4" - sources."@smithy/querystring-parser-2.0.8" - sources."@smithy/signature-v4-2.0.8" - sources."@smithy/types-2.3.2" + sources."@smithy/protocol-http-3.0.6" + sources."@smithy/querystring-parser-2.0.10" + sources."@smithy/signature-v4-2.0.10" + sources."@smithy/types-2.3.4" sources."@smithy/util-buffer-from-2.0.0" sources."@smithy/util-hex-encoding-2.0.0" - sources."@smithy/util-middleware-2.0.1" + sources."@smithy/util-middleware-2.0.3" sources."@smithy/util-uri-escape-2.0.0" sources."@smithy/util-utf8-2.0.0" sources."@tootallnate/once-2.0.0" sources."@types/nanoid-3.0.0" - sources."@types/node-20.6.1" - sources."@types/ws-8.5.5" + sources."@types/node-20.8.0" + sources."@types/ws-8.5.6" sources."abab-2.0.6" sources."abbrev-1.1.1" sources."agent-base-6.0.2" @@ -85380,7 +81298,7 @@ in sources."isobject-2.1.0" sources."isomorphic-ws-4.0.1" sources."isstream-0.1.2" - sources."jackspeak-2.3.3" + sources."jackspeak-2.3.6" sources."jmespath-0.16.0" sources."jpeg-js-0.4.4" sources."js-sdsl-4.3.0" @@ -85636,7 +81554,7 @@ in sources."rw-1.3.3" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."sax-1.2.4" + sources."sax-1.3.0" sources."saxes-6.0.0" sources."semver-7.5.4" sources."server-destroy-1.0.1" @@ -85824,7 +81742,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-8.14.1" + sources."ws-8.14.2" sources."xml-name-validator-4.0.0" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" @@ -85917,11 +81835,11 @@ in sha512 = "e8cIg2z62InH7azBBi3EsSEqrKx+nUtAS5bBcYTSpZFA+vhNPyhv8PTFZ0WsjOPDj04/dOLlm08EDcQJDqaGQg=="; }; dependencies = [ - sources."@babel/parser-7.22.16" + sources."@babel/parser-7.23.0" sources."@jsdoc/salty-0.2.5" sources."@types/linkify-it-3.0.3" sources."@types/markdown-it-12.2.3" - sources."@types/mdurl-1.0.2" + sources."@types/mdurl-1.0.3" sources."argparse-2.0.1" sources."bluebird-3.7.2" sources."catharsis-0.9.0" @@ -86123,63 +82041,20 @@ in json-server = nodeEnv.buildNodePackage { name = "json-server"; packageName = "json-server"; - version = "0.17.3"; + version = "0.17.4"; src = fetchurl { - url = "https://registry.npmjs.org/json-server/-/json-server-0.17.3.tgz"; - sha512 = "LDNOvleTv3rPAcefzXZpXMDZshV0FtSzWo8ZjnTOhKm4OCiUvsYGrGrfz4iHXIFd+UbRgFHm6gcOHI/BSZ/3fw=="; + url = "https://registry.npmjs.org/json-server/-/json-server-0.17.4.tgz"; + sha512 = "bGBb0WtFuAKbgI7JV3A864irWnMZSvBYRJbohaOuatHwKSRFUfqtQlrYMrB6WbalXy/cJabyjlb7JkHli6dYjQ=="; }; dependencies = [ - sources."@aashutoshrathi/word-wrap-1.2.6" - sources."@eslint-community/eslint-utils-4.4.0" - sources."@eslint-community/regexpp-4.8.1" - (sources."@eslint/eslintrc-2.1.2" // { - dependencies = [ - sources."debug-4.3.4" - sources."ms-2.1.2" - ]; - }) - sources."@eslint/js-8.49.0" - (sources."@humanwhocodes/config-array-0.11.11" // { - dependencies = [ - sources."debug-4.3.4" - sources."ms-2.1.2" - ]; - }) - sources."@humanwhocodes/module-importer-1.0.1" - sources."@humanwhocodes/object-schema-1.2.1" - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - sources."@types/json5-0.0.29" sources."accepts-1.3.8" - sources."acorn-8.10.0" - sources."acorn-jsx-5.3.2" - sources."ajv-6.12.6" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" - sources."argparse-2.0.1" - sources."array-buffer-byte-length-1.0.0" sources."array-flatten-1.1.1" - sources."array-includes-3.1.7" - sources."array.prototype.findlastindex-1.2.3" - sources."array.prototype.flat-1.3.2" - sources."array.prototype.flatmap-1.3.2" - sources."array.prototype.tosorted-1.1.2" - sources."arraybuffer.prototype.slice-1.0.2" - sources."asynciterator.prototype-1.0.0" - sources."available-typed-arrays-1.0.5" - sources."balanced-match-1.0.2" sources."basic-auth-2.0.1" sources."body-parser-1.20.2" - sources."brace-expansion-1.1.11" - (sources."builtins-5.0.1" // { - dependencies = [ - sources."semver-7.5.4" - ]; - }) sources."bytes-3.1.2" sources."call-bind-1.0.2" - sources."callsites-3.1.0" sources."chalk-4.1.2" sources."cliui-8.0.1" sources."color-convert-2.0.1" @@ -86190,7 +82065,6 @@ in sources."bytes-3.0.0" ]; }) - sources."concat-map-0.0.1" sources."connect-pause-0.1.1" (sources."content-disposition-0.5.4" // { dependencies = [ @@ -86201,84 +82075,15 @@ in sources."cookie-0.5.0" sources."cookie-signature-1.0.6" sources."cors-2.8.5" - sources."cross-spawn-7.0.3" sources."debug-2.6.9" - sources."deep-is-0.1.4" - sources."define-data-property-1.1.0" - sources."define-properties-1.2.1" sources."depd-2.0.0" sources."destroy-1.2.0" - sources."doctrine-3.0.0" sources."ee-first-1.1.1" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" - sources."error-ex-1.3.2" sources."errorhandler-1.5.1" - sources."es-abstract-1.22.2" - sources."es-iterator-helpers-1.0.15" - sources."es-set-tostringtag-2.0.1" - sources."es-shim-unscopables-1.0.0" - sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-html-1.0.3" - sources."escape-string-regexp-4.0.0" - (sources."eslint-8.49.0" // { - dependencies = [ - sources."debug-4.3.4" - sources."ms-2.1.2" - ]; - }) - sources."eslint-config-standard-17.1.0" - sources."eslint-config-standard-jsx-11.0.0" - (sources."eslint-import-resolver-node-0.3.9" // { - dependencies = [ - sources."debug-3.2.7" - sources."ms-2.1.3" - ]; - }) - (sources."eslint-module-utils-2.8.0" // { - dependencies = [ - sources."debug-3.2.7" - sources."ms-2.1.3" - ]; - }) - (sources."eslint-plugin-es-4.1.0" // { - dependencies = [ - sources."eslint-utils-2.1.0" - sources."eslint-visitor-keys-1.3.0" - ]; - }) - (sources."eslint-plugin-import-2.28.1" // { - dependencies = [ - sources."debug-3.2.7" - sources."doctrine-2.1.0" - sources."ms-2.1.3" - ]; - }) - (sources."eslint-plugin-n-15.7.0" // { - dependencies = [ - sources."semver-7.5.4" - ]; - }) - sources."eslint-plugin-promise-6.1.1" - (sources."eslint-plugin-react-7.33.2" // { - dependencies = [ - sources."doctrine-2.1.0" - sources."resolve-2.0.0-next.4" - ]; - }) - sources."eslint-scope-7.2.2" - (sources."eslint-utils-3.0.0" // { - dependencies = [ - sources."eslint-visitor-keys-2.1.0" - ]; - }) - sources."eslint-visitor-keys-3.4.3" - sources."espree-9.6.1" - sources."esquery-1.5.0" - sources."esrecurse-4.3.0" - sources."estraverse-5.3.0" - sources."esutils-2.0.3" sources."etag-1.8.1" (sources."express-4.18.2" // { dependencies = [ @@ -86292,104 +82097,29 @@ in sources."path-to-regexp-1.8.0" ]; }) - sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" - sources."fast-levenshtein-2.0.6" - sources."fastq-1.15.0" - sources."file-entry-cache-6.0.1" sources."finalhandler-1.2.0" - sources."find-up-5.0.0" - sources."flat-cache-3.1.0" - sources."flatted-3.2.7" - sources."for-each-0.3.3" sources."forwarded-0.2.0" sources."fresh-0.5.2" - sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."function.prototype.name-1.1.6" - sources."functions-have-names-1.2.3" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.2.1" - sources."get-stdin-8.0.0" - sources."get-symbol-description-1.0.0" - sources."glob-7.2.3" - sources."glob-parent-6.0.2" - sources."globals-13.21.0" - sources."globalthis-1.0.3" - sources."gopd-1.0.1" sources."graceful-fs-4.2.11" - sources."graphemer-1.4.0" sources."has-1.0.3" - sources."has-bigints-1.0.2" sources."has-flag-4.0.0" - sources."has-property-descriptors-1.0.0" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" sources."http-errors-2.0.0" sources."iconv-lite-0.4.24" - sources."ignore-5.2.4" - sources."import-fresh-3.3.0" - sources."imurmurhash-0.1.4" - sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."internal-slot-1.0.5" sources."ipaddr.js-1.9.1" - sources."is-array-buffer-3.0.2" - sources."is-arrayish-0.2.1" - sources."is-async-function-2.0.0" - sources."is-bigint-1.0.4" - sources."is-boolean-object-1.1.2" - sources."is-callable-1.2.7" - sources."is-core-module-2.13.0" - sources."is-date-object-1.0.5" - sources."is-extglob-2.1.1" - sources."is-finalizationregistry-1.0.2" sources."is-fullwidth-code-point-3.0.0" - sources."is-generator-function-1.0.10" - sources."is-glob-4.0.3" - sources."is-map-2.0.2" - sources."is-negative-zero-2.0.2" - sources."is-number-object-1.0.7" - sources."is-path-inside-3.0.3" sources."is-promise-2.2.2" - sources."is-regex-1.1.4" - sources."is-set-2.0.2" - sources."is-shared-array-buffer-1.0.2" - sources."is-string-1.0.7" - sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.12" - sources."is-weakmap-2.0.1" - sources."is-weakref-1.0.2" - sources."is-weakset-2.0.2" sources."isarray-0.0.1" - sources."isexe-2.0.0" - sources."iterator.prototype-1.1.2" sources."jju-1.4.0" - sources."js-tokens-4.0.0" - sources."js-yaml-4.1.0" - sources."json-buffer-3.0.1" - sources."json-parse-better-errors-1.0.2" sources."json-parse-helpfulerror-1.0.3" - sources."json-schema-traverse-0.4.1" - sources."json-stable-stringify-without-jsonify-1.0.1" - sources."json5-1.0.2" - sources."jsx-ast-utils-3.3.5" - sources."keyv-4.5.3" - sources."levn-0.4.1" - (sources."load-json-file-5.3.0" // { - dependencies = [ - sources."pify-4.0.1" - sources."type-fest-0.3.1" - ]; - }) - sources."locate-path-6.0.0" sources."lodash-4.17.21" sources."lodash-id-0.14.1" - sources."lodash.merge-4.6.2" - sources."loose-envify-1.4.0" sources."lowdb-1.0.0" - sources."lru-cache-6.0.0" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" (sources."method-override-3.0.0" // { @@ -86401,8 +82131,6 @@ in sources."mime-1.6.0" sources."mime-db-1.52.0" sources."mime-types-2.1.35" - sources."minimatch-3.1.2" - sources."minimist-1.2.8" (sources."morgan-1.10.0" // { dependencies = [ sources."on-finished-2.3.0" @@ -86410,71 +82138,23 @@ in }) sources."ms-2.0.0" sources."nanoid-3.3.6" - sources."natural-compare-1.4.0" sources."negotiator-0.6.3" sources."object-assign-4.1.1" sources."object-inspect-1.12.3" - sources."object-keys-1.1.1" - sources."object.assign-4.1.4" - sources."object.entries-1.1.7" - sources."object.fromentries-2.0.7" - sources."object.groupby-1.0.1" - sources."object.hasown-1.1.3" - sources."object.values-1.1.7" sources."on-finished-2.4.1" sources."on-headers-1.0.2" - sources."once-1.4.0" - sources."optionator-0.9.3" - sources."p-limit-3.1.0" - sources."p-locate-5.0.0" - sources."p-try-2.2.0" - sources."parent-module-1.0.1" - sources."parse-json-4.0.0" sources."parseurl-1.3.3" - sources."path-exists-4.0.0" - sources."path-is-absolute-1.0.1" - sources."path-key-3.1.1" - sources."path-parse-1.0.7" sources."path-to-regexp-0.1.7" sources."pify-3.0.0" - (sources."pkg-conf-3.1.0" // { - dependencies = [ - sources."find-up-3.0.0" - sources."locate-path-3.0.0" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."path-exists-3.0.0" - ]; - }) sources."please-upgrade-node-3.2.0" sources."pluralize-8.0.0" - sources."prelude-ls-1.2.1" - sources."prop-types-15.8.1" sources."proxy-addr-2.0.7" - sources."punycode-2.3.0" sources."qs-6.11.0" - sources."queue-microtask-1.2.3" sources."range-parser-1.2.1" sources."raw-body-2.5.2" - sources."react-is-16.13.1" - sources."reflect.getprototypeof-1.0.4" - sources."regexp.prototype.flags-1.5.1" - sources."regexpp-3.2.0" sources."require-directory-2.1.1" - sources."resolve-1.22.5" - sources."resolve-from-4.0.0" - sources."reusify-1.0.4" - sources."rimraf-3.0.2" - sources."run-parallel-1.2.0" - (sources."safe-array-concat-1.0.1" // { - dependencies = [ - sources."isarray-2.0.5" - ]; - }) sources."safe-buffer-5.1.2" - sources."safe-regex-test-1.0.0" sources."safer-buffer-2.1.2" - sources."semver-6.3.1" sources."semver-compare-1.0.0" (sources."send-0.18.0" // { dependencies = [ @@ -86483,58 +82163,22 @@ in }) sources."serve-static-1.15.0" sources."server-destroy-1.0.1" - sources."set-function-name-2.0.1" sources."setprototypeof-1.2.0" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" sources."side-channel-1.0.4" - sources."standard-17.1.0" - sources."standard-engine-15.1.0" sources."statuses-2.0.1" sources."steno-0.4.4" sources."string-width-4.2.3" - sources."string.prototype.matchall-4.0.10" - sources."string.prototype.trim-1.2.8" - sources."string.prototype.trimend-1.0.7" - sources."string.prototype.trimstart-1.0.7" sources."strip-ansi-6.0.1" - sources."strip-bom-3.0.0" - sources."strip-json-comments-3.1.1" sources."supports-color-7.2.0" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."text-table-0.2.0" sources."toidentifier-1.0.1" - sources."tsconfig-paths-3.14.2" - sources."type-check-0.4.0" - sources."type-fest-0.20.2" sources."type-is-1.6.18" - sources."typed-array-buffer-1.0.0" - sources."typed-array-byte-length-1.0.0" - sources."typed-array-byte-offset-1.0.0" - sources."typed-array-length-1.0.4" - sources."unbox-primitive-1.0.2" sources."unpipe-1.0.0" - sources."uri-js-4.4.1" sources."utils-merge-1.0.1" sources."vary-1.1.2" - sources."version-guard-1.1.1" - sources."which-2.0.2" - sources."which-boxed-primitive-1.0.2" - (sources."which-builtin-type-1.1.3" // { - dependencies = [ - sources."isarray-2.0.5" - ]; - }) - sources."which-collection-1.0.1" - sources."which-typed-array-1.1.11" sources."wrap-ansi-7.0.0" - sources."wrappy-1.0.2" - sources."xdg-basedir-4.0.0" sources."y18n-5.0.8" - sources."yallist-4.0.0" sources."yargs-17.7.2" sources."yargs-parser-21.1.1" - sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -87004,7 +82648,7 @@ in }) sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.22.5" + sources."resolve-1.22.6" sources."resolve-url-0.2.1" sources."ret-0.1.15" sources."safe-buffer-5.1.2" @@ -87059,7 +82703,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.13" + sources."spdx-license-ids-3.0.15" sources."split-string-3.1.0" sources."sshpk-1.17.0" (sources."static-extend-0.1.2" // { @@ -87263,7 +82907,7 @@ in }) sources."fill-range-7.0.1" sources."find-up-3.0.0" - sources."follow-redirects-1.15.2" + sources."follow-redirects-1.15.3" sources."fs-extra-8.1.0" sources."function-bind-1.1.1" sources."get-intrinsic-1.2.1" @@ -87406,42 +83050,42 @@ in }; dependencies = [ sources."@ampproject/remapping-2.2.1" - sources."@babel/cli-7.22.15" + sources."@babel/cli-7.23.0" sources."@babel/code-frame-7.22.13" - sources."@babel/compat-data-7.22.9" - (sources."@babel/core-7.22.19" // { + sources."@babel/compat-data-7.22.20" + (sources."@babel/core-7.23.0" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."@babel/generator-7.22.15" + sources."@babel/generator-7.23.0" sources."@babel/helper-annotate-as-pure-7.22.5" (sources."@babel/helper-compilation-targets-7.22.15" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."@babel/helper-environment-visitor-7.22.5" - sources."@babel/helper-function-name-7.22.5" + sources."@babel/helper-environment-visitor-7.22.20" + sources."@babel/helper-function-name-7.23.0" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-module-imports-7.22.15" - sources."@babel/helper-module-transforms-7.22.19" + sources."@babel/helper-module-transforms-7.23.0" sources."@babel/helper-plugin-utils-7.22.5" sources."@babel/helper-simple-access-7.22.5" sources."@babel/helper-split-export-declaration-7.22.6" sources."@babel/helper-string-parser-7.22.5" - sources."@babel/helper-validator-identifier-7.22.19" + sources."@babel/helper-validator-identifier-7.22.20" sources."@babel/helper-validator-option-7.22.15" - sources."@babel/helpers-7.22.15" - sources."@babel/highlight-7.22.13" + sources."@babel/helpers-7.23.1" + sources."@babel/highlight-7.22.20" sources."@babel/node-7.22.19" - sources."@babel/parser-7.22.16" + sources."@babel/parser-7.23.0" sources."@babel/plugin-syntax-jsx-7.22.5" sources."@babel/plugin-transform-react-jsx-7.22.15" sources."@babel/register-7.22.15" sources."@babel/template-7.22.15" - sources."@babel/traverse-7.22.19" - sources."@babel/types-7.22.19" + sources."@babel/traverse-7.23.0" + sources."@babel/types-7.23.0" sources."@jridgewell/gen-mapping-0.3.3" sources."@jridgewell/resolve-uri-3.1.1" sources."@jridgewell/set-array-1.1.2" @@ -87541,16 +83185,16 @@ in sources."braces-3.0.2" sources."browser-or-node-1.3.0" sources."browser-process-hrtime-1.0.0" - sources."browserslist-4.21.10" + sources."browserslist-4.22.1" sources."buffer-5.7.1" sources."buffer-from-1.1.2" sources."bufferutil-4.0.7" sources."bytes-3.1.2" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001534" + sources."caniuse-lite-1.0.30001542" sources."canvas-2.11.2" sources."chalk-2.4.2" - sources."chardet-1.6.0" + sources."chardet-1.6.1" sources."chownr-2.0.0" sources."cipher-base-1.0.4" sources."cliui-7.0.4" @@ -87565,10 +83209,10 @@ in sources."console-control-strings-1.1.0" sources."content-disposition-0.5.4" sources."content-type-1.0.5" - sources."convert-source-map-1.9.0" + sources."convert-source-map-2.0.0" sources."cookie-0.5.0" sources."cookie-signature-1.0.6" - sources."core-js-3.32.2" + sources."core-js-3.33.0" sources."core-util-is-1.0.3" sources."cors-2.8.5" sources."create-hash-1.2.0" @@ -87607,7 +83251,7 @@ in }) sources."dotenv-8.6.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.523" + sources."electron-to-chromium-1.4.538" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."encoding-0.1.13" @@ -87646,7 +83290,7 @@ in }) sources."find-cache-dir-2.1.0" sources."find-up-3.0.0" - sources."follow-redirects-1.15.2" + sources."follow-redirects-1.15.3" sources."for-each-0.3.3" sources."form-data-3.0.1" sources."forwarded-0.2.0" @@ -87825,7 +83469,7 @@ in sources."object.getownpropertydescriptors-2.1.7" sources."on-finished-2.4.1" sources."once-1.4.0" - sources."openpgp-5.10.1" + sources."openpgp-5.10.2" sources."p-is-promise-3.0.0" sources."p-limit-2.3.0" sources."p-locate-3.0.0" @@ -87901,7 +83545,7 @@ in sources."regexp.prototype.flags-1.5.1" sources."require-directory-2.1.1" sources."requires-port-1.0.0" - (sources."resolve-1.22.5" // { + (sources."resolve-1.22.6" // { dependencies = [ sources."is-core-module-2.13.0" ]; @@ -87991,7 +83635,7 @@ in sources."unbox-primitive-1.0.2" sources."universalify-0.2.0" sources."unpipe-1.0.0" - sources."update-browserslist-db-1.0.11" + sources."update-browserslist-db-1.0.13" sources."url-parse-1.5.10" sources."utf-8-validate-6.0.3" sources."util-deprecate-1.0.2" @@ -88024,7 +83668,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-8.14.1" + sources."ws-8.14.2" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."y18n-5.0.8" @@ -88125,8 +83769,8 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/helper-validator-identifier-7.22.19" - (sources."@babel/highlight-7.22.13" // { + sources."@babel/helper-validator-identifier-7.22.20" + (sources."@babel/highlight-7.22.20" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -88154,29 +83798,19 @@ in sources."@npmcli/node-gyp-3.0.0" sources."@npmcli/promise-spawn-6.0.2" sources."@npmcli/run-script-6.0.2" - sources."@nrwl/devkit-16.8.1" - sources."@nrwl/tao-16.8.1" - (sources."@nx/devkit-16.8.1" // { + sources."@nrwl/devkit-16.9.1" + sources."@nrwl/tao-16.9.1" + (sources."@nx/devkit-16.9.1" // { dependencies = [ sources."lru-cache-6.0.0" sources."semver-7.5.3" ]; }) - sources."@nx/nx-darwin-arm64-16.8.1" - sources."@nx/nx-darwin-x64-16.8.1" - sources."@nx/nx-freebsd-x64-16.8.1" - sources."@nx/nx-linux-arm-gnueabihf-16.8.1" - sources."@nx/nx-linux-arm64-gnu-16.8.1" - sources."@nx/nx-linux-arm64-musl-16.8.1" - sources."@nx/nx-linux-x64-gnu-16.8.1" - sources."@nx/nx-linux-x64-musl-16.8.1" - sources."@nx/nx-win32-arm64-msvc-16.8.1" - sources."@nx/nx-win32-x64-msvc-16.8.1" sources."@octokit/auth-token-3.0.4" sources."@octokit/core-4.2.4" sources."@octokit/endpoint-7.0.6" sources."@octokit/graphql-5.0.6" - sources."@octokit/openapi-types-18.0.0" + sources."@octokit/openapi-types-18.1.1" sources."@octokit/plugin-enterprise-rest-6.0.1" sources."@octokit/plugin-paginate-rest-6.1.2" sources."@octokit/plugin-request-log-1.0.4" @@ -88196,22 +83830,13 @@ in sources."@sigstore/sign-1.0.0" sources."@sigstore/tuf-1.0.3" sources."@sinclair/typebox-0.27.8" - sources."@swc-node/core-1.10.5" - sources."@swc-node/register-1.6.7" + sources."@swc-node/core-1.10.6" + sources."@swc-node/register-1.6.8" sources."@swc-node/sourcemap-support-0.3.0" - sources."@swc/core-1.3.85" - sources."@swc/core-darwin-arm64-1.3.85" - sources."@swc/core-darwin-x64-1.3.85" - sources."@swc/core-linux-arm-gnueabihf-1.3.85" - sources."@swc/core-linux-arm64-gnu-1.3.85" - sources."@swc/core-linux-arm64-musl-1.3.85" - sources."@swc/core-linux-x64-gnu-1.3.85" - sources."@swc/core-linux-x64-musl-1.3.85" - sources."@swc/core-win32-arm64-msvc-1.3.85" - sources."@swc/core-win32-ia32-msvc-1.3.85" - sources."@swc/core-win32-x64-msvc-1.3.85" + sources."@swc/core-1.3.91" + sources."@swc/counter-0.1.2" sources."@swc/helpers-0.5.2" - sources."@swc/types-0.1.4" + sources."@swc/types-0.1.5" sources."@tootallnate/once-2.0.0" sources."@tufjs/canonical-json-1.0.0" (sources."@tufjs/models-1.0.4" // { @@ -88221,8 +83846,8 @@ in ]; }) sources."@types/minimatch-3.0.5" - sources."@types/minimist-1.2.2" - sources."@types/normalize-package-data-2.4.1" + sources."@types/minimist-1.2.3" + sources."@types/normalize-package-data-2.4.2" sources."@yarnpkg/lockfile-1.1.0" (sources."@yarnpkg/parsers-3.0.0-rc.46" // { dependencies = [ @@ -88254,7 +83879,7 @@ in sources."arrify-1.0.1" sources."async-3.2.4" sources."asynckit-0.4.0" - sources."axios-1.5.0" + sources."axios-1.5.1" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."before-after-hook-2.2.3" @@ -88268,9 +83893,9 @@ in (sources."cacache-17.1.4" // { dependencies = [ sources."brace-expansion-2.0.1" - sources."glob-10.3.4" + sources."glob-10.3.10" sources."minimatch-9.0.3" - sources."minipass-7.0.3" + sources."minipass-7.0.4" sources."ssri-10.0.5" ]; }) @@ -88404,7 +84029,7 @@ in sources."fill-range-7.0.1" sources."find-up-4.1.0" sources."flat-5.0.2" - sources."follow-redirects-1.15.2" + sources."follow-redirects-1.15.3" (sources."foreground-child-3.1.1" // { dependencies = [ sources."signal-exit-4.1.0" @@ -88415,7 +84040,7 @@ in sources."fs-extra-11.1.1" (sources."fs-minipass-3.0.3" // { dependencies = [ - sources."minipass-7.0.3" + sources."minipass-7.0.4" ]; }) sources."fs.realpath-1.0.0" @@ -88524,7 +84149,7 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-3.0.1" - sources."jackspeak-2.3.3" + sources."jackspeak-2.3.6" (sources."jake-10.8.7" // { dependencies = [ sources."minimatch-3.1.2" @@ -88551,7 +84176,7 @@ in (sources."libnpmpublish-7.3.0" // { dependencies = [ sources."hosted-git-info-6.1.1" - sources."minipass-7.0.3" + sources."minipass-7.0.4" sources."normalize-package-data-5.0.0" sources."npm-package-arg-10.1.0" sources."ssri-10.0.5" @@ -88574,7 +84199,7 @@ in dependencies = [ (sources."ssri-10.0.5" // { dependencies = [ - sources."minipass-7.0.3" + sources."minipass-7.0.4" ]; }) ]; @@ -88614,7 +84239,7 @@ in }) (sources."minipass-fetch-3.0.4" // { dependencies = [ - sources."minipass-7.0.3" + sources."minipass-7.0.4" ]; }) (sources."minipass-flush-1.0.5" // { @@ -88706,12 +84331,11 @@ in }) sources."npm-run-path-4.0.1" sources."npmlog-6.0.2" - (sources."nx-16.8.1" // { + (sources."nx-16.9.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."cli-spinners-2.6.1" sources."emoji-regex-8.0.0" - sources."fast-glob-3.2.7" sources."glob-7.1.4" sources."lines-and-columns-2.0.3" sources."lru-cache-6.0.0" @@ -88757,7 +84381,7 @@ in sources."npm-packlist-7.0.4" (sources."ssri-10.0.5" // { dependencies = [ - sources."minipass-7.0.3" + sources."minipass-7.0.4" ]; }) ]; @@ -88808,7 +84432,7 @@ in (sources."read-package-json-6.0.4" // { dependencies = [ sources."brace-expansion-2.0.1" - sources."glob-10.3.4" + sources."glob-10.3.10" sources."hosted-git-info-6.1.1" sources."minimatch-9.0.3" sources."normalize-package-data-5.0.0" @@ -88837,7 +84461,7 @@ in sources."readable-stream-3.6.2" sources."redent-3.0.0" sources."require-directory-2.1.1" - sources."resolve-1.22.5" + sources."resolve-1.22.6" sources."resolve-cwd-3.0.0" sources."resolve-from-5.0.0" sources."restore-cursor-3.1.0" @@ -88877,7 +84501,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.13" + sources."spdx-license-ids-3.0.15" sources."split-1.0.1" sources."split2-3.2.2" sources."sprintf-js-1.0.3" @@ -89038,7 +84662,7 @@ in sources."pify-4.0.1" sources."prr-1.0.1" sources."safer-buffer-2.1.2" - sources."sax-1.2.4" + sources."sax-1.3.0" sources."semver-5.7.2" sources."source-map-0.6.1" sources."tslib-2.6.2" @@ -89948,7 +85572,7 @@ in sources."debug-4.3.2" sources."emoji-regex-8.0.0" sources."escalade-3.1.1" - sources."follow-redirects-1.15.2" + sources."follow-redirects-1.15.3" sources."get-caller-file-2.0.5" sources."is-fullwidth-code-point-3.0.0" sources."ms-2.1.2" @@ -89999,9 +85623,9 @@ in }; dependencies = [ sources."@types/commander-2.12.2" - sources."@types/diff-3.5.5" + sources."@types/diff-3.5.6" sources."@types/get-stdin-5.0.1" - sources."@types/node-20.6.1" + sources."@types/node-20.8.1" sources."commander-2.20.3" sources."diff-3.5.0" sources."get-stdin-5.0.1" @@ -90110,7 +85734,7 @@ in sources."progress-2.0.3" sources."punycode-2.3.0" sources."safer-buffer-2.1.2" - sources."sax-1.2.4" + sources."sax-1.3.0" ]; buildInputs = globalBuildInputs; meta = { @@ -90350,7 +85974,7 @@ in sources."replace-ext-0.0.1" sources."request-2.88.0" sources."require-uncached-1.0.3" - sources."resolve-1.22.5" + sources."resolve-1.22.6" sources."resolve-from-1.0.1" sources."restore-cursor-1.0.1" sources."rimraf-2.6.3" @@ -90359,7 +85983,7 @@ in sources."rx-lite-3.1.2" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."sax-1.2.4" + sources."sax-1.3.0" sources."shelljs-0.7.8" sources."slice-ansi-0.0.4" sources."sparkles-1.0.1" @@ -90761,9 +86385,9 @@ in (sources."cacache-17.1.4" // { dependencies = [ sources."brace-expansion-2.0.1" - sources."glob-10.3.4" + sources."glob-10.3.10" sources."minimatch-9.0.3" - sources."minipass-7.0.3" + sources."minipass-7.0.4" ]; }) sources."chownr-2.0.0" @@ -90788,7 +86412,7 @@ in sources."foreground-child-3.1.1" (sources."fs-minipass-3.0.3" // { dependencies = [ - sources."minipass-7.0.3" + sources."minipass-7.0.4" ]; }) sources."fs.realpath-1.0.0" @@ -90815,7 +86439,7 @@ in sources."is-fullwidth-code-point-3.0.0" sources."is-lambda-1.0.1" sources."isexe-2.0.0" - sources."jackspeak-2.3.3" + sources."jackspeak-2.3.6" sources."lru-cache-7.18.3" sources."make-fetch-happen-11.1.1" sources."minimatch-3.1.2" @@ -90827,7 +86451,7 @@ in }) (sources."minipass-fetch-3.0.4" // { dependencies = [ - sources."minipass-7.0.3" + sources."minipass-7.0.4" ]; }) (sources."minipass-flush-1.0.5" // { @@ -90883,7 +86507,7 @@ in sources."socks-proxy-agent-7.0.0" (sources."ssri-10.0.5" // { dependencies = [ - sources."minipass-7.0.3" + sources."minipass-7.0.4" ]; }) sources."string-width-5.1.2" @@ -91021,7 +86645,7 @@ in sources."rimraf-2.7.1" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."sax-1.2.4" + sources."sax-1.3.0" sources."semver-5.7.2" sources."set-blocking-2.0.0" sources."signal-exit-3.0.7" @@ -91058,7 +86682,7 @@ in sha512 = "khGc+Fh8YeuDR2KZ7lCTEvAhbRDiXpmMSfvX6eKxt7TER+WVG0U8TdXyiFq6K+3ELnJz54vITJJ3DZ5hYzijoQ=="; }; dependencies = [ - sources."@babel/runtime-7.22.15" + sources."@babel/runtime-7.23.1" sources."@mapbox/node-pre-gyp-1.0.11" sources."@node-red/editor-api-3.1.0" sources."@node-red/editor-client-3.1.0" @@ -91074,7 +86698,7 @@ in sources."@node-red/util-3.1.0" sources."@sindresorhus/is-5.6.0" sources."@szmarczak/http-timer-5.0.1" - sources."@types/http-cache-semantics-4.0.1" + sources."@types/http-cache-semantics-4.0.2" sources."abbrev-1.1.1" sources."accepts-1.3.8" sources."acorn-8.8.2" @@ -91196,7 +86820,7 @@ in sources."express-session-1.17.3" sources."fast-deep-equal-3.1.3" sources."finalhandler-1.2.0" - sources."follow-redirects-1.15.2" + sources."follow-redirects-1.15.3" sources."form-data-4.0.0" sources."form-data-encoder-2.1.4" sources."forwarded-0.2.0" @@ -91381,7 +87005,7 @@ in sources."rimraf-3.0.2" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."sax-1.2.4" + sources."sax-1.3.0" (sources."semver-7.5.4" // { dependencies = [ sources."lru-cache-6.0.0" @@ -91597,7 +87221,7 @@ in ]; }) sources."request-2.88.2" - sources."resolve-1.22.5" + sources."resolve-1.22.6" sources."retry-0.10.1" sources."rimraf-2.2.8" sources."safe-buffer-5.2.1" @@ -91610,7 +87234,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.13" + sources."spdx-license-ids-3.0.15" sources."sshpk-1.17.0" sources."ssri-5.3.0" sources."string-width-1.0.2" @@ -91730,8 +87354,8 @@ in sources."escape-string-regexp-1.0.5" ]; }) - sources."@babel/helper-validator-identifier-7.22.19" - (sources."@babel/highlight-7.22.13" // { + sources."@babel/helper-validator-identifier-7.22.20" + (sources."@babel/highlight-7.22.20" // { dependencies = [ sources."chalk-2.4.2" sources."escape-string-regexp-1.0.5" @@ -91761,13 +87385,13 @@ in sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.3" - sources."@types/http-cache-semantics-4.0.1" + sources."@types/http-cache-semantics-4.0.2" sources."@types/keyv-3.1.4" - sources."@types/node-20.6.1" - sources."@types/normalize-package-data-2.4.1" - sources."@types/responselike-1.0.0" + sources."@types/node-20.8.1" + sources."@types/normalize-package-data-2.4.2" + sources."@types/responselike-1.0.1" sources."aggregate-error-4.0.1" - sources."all-package-names-2.0.737" + sources."all-package-names-2.0.748" sources."ansi-align-3.0.1" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" @@ -92260,7 +87884,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.13" + sources."spdx-license-ids-3.0.15" sources."string-width-4.2.3" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" @@ -92406,10 +88030,10 @@ in orval = nodeEnv.buildNodePackage { name = "orval"; packageName = "orval"; - version = "6.17.0"; + version = "6.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/orval/-/orval-6.17.0.tgz"; - sha512 = "QeK/Zxk9ZnoL//br/2oe5HnB53safd5eKtncCc0/3HjQS2BRtJpAyH8q7sQRFPTV4ToG9duYSQrTjgTvTsLTnQ=="; + url = "https://registry.npmjs.org/orval/-/orval-6.18.1.tgz"; + sha512 = "wV1QPgoafC9JvO48eEZtN99GApuaYCwvsbcAZudHM0MAw2DbKFy0ThIeXLI5VjW+bdInoNd/8RqncCwZSZVSCg=="; }; dependencies = [ sources."@apidevtools/json-schema-ref-parser-9.0.6" @@ -92428,13 +88052,13 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@orval/angular-6.17.0" - sources."@orval/axios-6.17.0" - sources."@orval/core-6.17.0" - sources."@orval/msw-6.17.0" - sources."@orval/query-6.17.0" - sources."@orval/swr-6.17.0" - sources."@orval/zod-6.17.0" + sources."@orval/angular-6.18.1" + sources."@orval/axios-6.18.1" + sources."@orval/core-6.18.1" + sources."@orval/msw-6.18.1" + sources."@orval/query-6.18.1" + sources."@orval/swr-6.18.1" + sources."@orval/zod-6.18.1" sources."@rollup/plugin-commonjs-22.0.2" (sources."@rollup/pluginutils-3.1.0" // { dependencies = [ @@ -92477,11 +88101,11 @@ in sources."@stoplight/types-13.20.0" sources."@stoplight/yaml-4.2.3" sources."@stoplight/yaml-ast-parser-0.0.48" - sources."@types/es-aggregate-error-1.0.2" + sources."@types/es-aggregate-error-1.0.3" sources."@types/estree-0.0.39" sources."@types/json-schema-7.0.13" - sources."@types/node-20.6.1" - sources."@types/sarif-2.1.4" + sources."@types/node-20.8.1" + sources."@types/sarif-2.1.5" sources."@types/urijs-1.19.20" sources."abort-controller-3.0.0" sources."acorn-8.10.0" @@ -92518,7 +88142,7 @@ in sources."color-name-1.1.4" sources."commander-2.20.3" sources."commondir-1.0.1" - sources."compare-versions-4.1.4" + sources."compare-versions-6.1.0" sources."concat-map-0.0.1" sources."cross-spawn-7.0.3" sources."cuid-2.1.8" @@ -92725,7 +88349,7 @@ in sources."require-directory-2.1.1" sources."require-from-string-2.0.2" sources."reserved-0.1.2" - sources."resolve-1.22.5" + sources."resolve-1.22.6" sources."reusify-1.0.4" sources."rollup-2.79.1" sources."run-parallel-1.2.0" @@ -92817,8 +88441,8 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/helper-validator-identifier-7.22.19" - (sources."@babel/highlight-7.22.13" // { + sources."@babel/helper-validator-identifier-7.22.20" + (sources."@babel/highlight-7.22.20" // { dependencies = [ sources."chalk-2.4.2" ]; @@ -92829,15 +88453,15 @@ in sources."@jridgewell/source-map-0.3.5" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.19" - sources."@lezer/common-0.15.12" - sources."@lezer/lr-0.15.8" + sources."@lezer/common-1.1.0" + sources."@lezer/lr-1.3.12" sources."@lmdb/lmdb-darwin-arm64-2.7.11" sources."@lmdb/lmdb-darwin-x64-2.7.11" sources."@lmdb/lmdb-linux-arm-2.7.11" sources."@lmdb/lmdb-linux-arm64-2.7.11" sources."@lmdb/lmdb-linux-x64-2.7.11" sources."@lmdb/lmdb-win32-x64-2.7.11" - sources."@mischnic/json-sourcemap-0.1.0" + sources."@mischnic/json-sourcemap-0.1.1" sources."@msgpackr-extract/msgpackr-extract-darwin-arm64-3.0.2" sources."@msgpackr-extract/msgpackr-extract-darwin-x64-3.0.2" sources."@msgpackr-extract/msgpackr-extract-linux-arm-3.0.2" @@ -92925,19 +88549,10 @@ in sources."@parcel/watcher-win32-ia32-2.3.0" sources."@parcel/watcher-win32-x64-2.3.0" sources."@parcel/workers-2.9.3" - sources."@swc/core-1.3.85" - sources."@swc/core-darwin-arm64-1.3.85" - sources."@swc/core-darwin-x64-1.3.85" - sources."@swc/core-linux-arm-gnueabihf-1.3.85" - sources."@swc/core-linux-arm64-gnu-1.3.85" - sources."@swc/core-linux-arm64-musl-1.3.85" - sources."@swc/core-linux-x64-gnu-1.3.85" - sources."@swc/core-linux-x64-musl-1.3.85" - sources."@swc/core-win32-arm64-msvc-1.3.85" - sources."@swc/core-win32-ia32-msvc-1.3.85" - sources."@swc/core-win32-x64-msvc-1.3.85" + sources."@swc/core-1.3.91" + sources."@swc/counter-0.1.2" sources."@swc/helpers-0.5.2" - sources."@swc/types-0.1.4" + sources."@swc/types-0.1.5" sources."@trysound/sax-0.2.0" sources."abab-2.0.6" sources."abortcontroller-polyfill-1.7.5" @@ -92965,11 +88580,11 @@ in sources."brace-expansion-2.0.1" sources."braces-3.0.2" sources."browser-process-hrtime-1.0.0" - sources."browserslist-4.21.10" + sources."browserslist-4.22.1" sources."buffer-from-1.1.2" sources."callsites-3.1.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001534" + sources."caniuse-lite-1.0.30001542" sources."caseless-0.12.0" (sources."chalk-4.1.2" // { dependencies = [ @@ -93019,7 +88634,7 @@ in sources."dotenv-7.0.0" sources."dotenv-expand-5.1.0" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.4.523" + sources."electron-to-chromium-1.4.538" sources."entities-4.5.0" sources."error-ex-1.3.2" sources."escalade-3.1.1" @@ -93040,7 +88655,7 @@ in sources."get-port-4.2.0" sources."getpass-0.1.7" sources."glob-8.1.0" - sources."globals-13.21.0" + sources."globals-13.22.0" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-flag-3.0.0" @@ -93093,16 +88708,16 @@ in sources."json5-2.2.3" sources."jsprim-1.4.2" sources."levn-0.3.0" - sources."lightningcss-1.21.8" - sources."lightningcss-darwin-arm64-1.21.8" - sources."lightningcss-darwin-x64-1.21.8" - sources."lightningcss-freebsd-x64-1.21.8" - sources."lightningcss-linux-arm-gnueabihf-1.21.8" - sources."lightningcss-linux-arm64-gnu-1.21.8" - sources."lightningcss-linux-arm64-musl-1.21.8" - sources."lightningcss-linux-x64-gnu-1.21.8" - sources."lightningcss-linux-x64-musl-1.21.8" - sources."lightningcss-win32-x64-msvc-1.21.8" + sources."lightningcss-1.22.0" + sources."lightningcss-darwin-arm64-1.22.0" + sources."lightningcss-darwin-x64-1.22.0" + sources."lightningcss-freebsd-x64-1.22.0" + sources."lightningcss-linux-arm-gnueabihf-1.22.0" + sources."lightningcss-linux-arm64-gnu-1.22.0" + sources."lightningcss-linux-arm64-musl-1.22.0" + sources."lightningcss-linux-x64-gnu-1.22.0" + sources."lightningcss-linux-x64-musl-1.22.0" + sources."lightningcss-win32-x64-msvc-1.22.0" sources."lilconfig-2.1.0" sources."lines-and-columns-1.2.4" sources."lmdb-2.7.11" @@ -93142,7 +88757,7 @@ in sources."picocolors-1.0.0" sources."picomatch-2.3.1" sources."pn-1.1.0" - sources."postcss-8.4.29" + sources."postcss-8.4.31" sources."postcss-calc-9.0.1" sources."postcss-colormin-6.0.0" sources."postcss-convert-values-6.0.0" @@ -93223,7 +88838,7 @@ in }) sources."symbol-tree-3.2.4" sources."term-size-2.2.1" - (sources."terser-5.19.4" // { + (sources."terser-5.20.0" // { dependencies = [ sources."commander-2.20.3" ]; @@ -93250,7 +88865,7 @@ in ]; }) sources."uniq-1.0.1" - sources."update-browserslist-db-1.0.11" + sources."update-browserslist-db-1.0.13" sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."utility-types-3.10.0" @@ -93886,7 +89501,7 @@ in sources."redent-1.0.0" sources."regexp.prototype.flags-1.5.1" sources."repeating-2.0.1" - sources."resolve-1.22.5" + sources."resolve-1.22.6" sources."restore-cursor-2.0.0" sources."reverse-http-1.3.0" sources."rimraf-2.7.1" @@ -93915,7 +89530,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.13" + sources."spdx-license-ids-3.0.15" sources."speedometer-0.1.4" sources."stream-buffers-2.2.0" sources."string-width-1.0.2" @@ -94371,6 +89986,666 @@ in bypassCache = true; reconstructLock = true; }; + "pgrok-build-deps-../../tools/networking/pgrok/build-deps" = nodeEnv.buildNodePackage { + name = "pgrokd"; + packageName = "pgrokd"; + version = "1.4.0"; + src = ../../tools/networking/pgrok/build-deps; + dependencies = [ + sources."@aashutoshrathi/word-wrap-1.2.6" + sources."@adobe/css-tools-4.2.0" + sources."@alloc/quick-lru-5.2.0" + sources."@ampproject/remapping-2.2.1" + sources."@babel/code-frame-7.22.13" + sources."@babel/compat-data-7.22.20" + (sources."@babel/core-7.23.0" // { + dependencies = [ + sources."@babel/generator-7.23.0" + sources."@babel/traverse-7.23.0" + sources."@babel/types-7.23.0" + sources."semver-6.3.1" + ]; + }) + sources."@babel/generator-7.17.7" + (sources."@babel/helper-compilation-targets-7.22.15" // { + dependencies = [ + sources."lru-cache-5.1.1" + sources."semver-6.3.1" + sources."yallist-3.1.1" + ]; + }) + sources."@babel/helper-environment-visitor-7.22.20" + (sources."@babel/helper-function-name-7.23.0" // { + dependencies = [ + sources."@babel/types-7.23.0" + ]; + }) + (sources."@babel/helper-hoist-variables-7.22.5" // { + dependencies = [ + sources."@babel/types-7.23.0" + ]; + }) + (sources."@babel/helper-module-imports-7.22.15" // { + dependencies = [ + sources."@babel/types-7.23.0" + ]; + }) + sources."@babel/helper-module-transforms-7.23.0" + sources."@babel/helper-plugin-utils-7.22.5" + (sources."@babel/helper-simple-access-7.22.5" // { + dependencies = [ + sources."@babel/types-7.23.0" + ]; + }) + (sources."@babel/helper-split-export-declaration-7.22.6" // { + dependencies = [ + sources."@babel/types-7.23.0" + ]; + }) + sources."@babel/helper-string-parser-7.22.5" + sources."@babel/helper-validator-identifier-7.22.20" + sources."@babel/helper-validator-option-7.22.15" + (sources."@babel/helpers-7.23.1" // { + dependencies = [ + sources."@babel/generator-7.23.0" + sources."@babel/traverse-7.23.0" + sources."@babel/types-7.23.0" + ]; + }) + sources."@babel/highlight-7.22.20" + sources."@babel/parser-7.23.0" + sources."@babel/plugin-transform-react-jsx-self-7.22.5" + sources."@babel/plugin-transform-react-jsx-source-7.22.5" + (sources."@babel/template-7.22.15" // { + dependencies = [ + sources."@babel/types-7.23.0" + ]; + }) + sources."@babel/traverse-7.17.3" + sources."@babel/types-7.17.0" + (sources."@cspotcode/source-map-support-0.8.1" // { + dependencies = [ + sources."@jridgewell/trace-mapping-0.3.9" + ]; + }) + sources."@esbuild/android-arm-0.18.20" + sources."@esbuild/android-arm64-0.18.20" + sources."@esbuild/android-x64-0.18.20" + sources."@esbuild/darwin-arm64-0.18.20" + sources."@esbuild/darwin-x64-0.18.20" + sources."@esbuild/freebsd-arm64-0.18.20" + sources."@esbuild/freebsd-x64-0.18.20" + sources."@esbuild/linux-arm-0.18.20" + sources."@esbuild/linux-arm64-0.18.20" + sources."@esbuild/linux-ia32-0.18.20" + sources."@esbuild/linux-loong64-0.18.20" + sources."@esbuild/linux-mips64el-0.18.20" + sources."@esbuild/linux-ppc64-0.18.20" + sources."@esbuild/linux-riscv64-0.18.20" + sources."@esbuild/linux-s390x-0.18.20" + sources."@esbuild/linux-x64-0.18.20" + sources."@esbuild/netbsd-x64-0.18.20" + sources."@esbuild/openbsd-x64-0.18.20" + sources."@esbuild/sunos-x64-0.18.20" + sources."@esbuild/win32-arm64-0.18.20" + sources."@esbuild/win32-ia32-0.18.20" + sources."@esbuild/win32-x64-0.18.20" + sources."@eslint-community/eslint-utils-4.4.0" + sources."@eslint-community/regexpp-4.9.1" + (sources."@eslint/eslintrc-2.1.2" // { + dependencies = [ + sources."globals-13.22.0" + ]; + }) + sources."@eslint/js-8.44.0" + sources."@headlessui/react-1.7.17" + sources."@heroicons/react-2.0.18" + sources."@humanwhocodes/config-array-0.11.11" + sources."@humanwhocodes/module-importer-1.0.1" + sources."@humanwhocodes/object-schema-1.2.1" + sources."@jridgewell/gen-mapping-0.3.3" + sources."@jridgewell/resolve-uri-3.1.1" + sources."@jridgewell/set-array-1.1.2" + sources."@jridgewell/source-map-0.3.5" + sources."@jridgewell/sourcemap-codec-1.4.15" + sources."@jridgewell/trace-mapping-0.3.19" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.8" + sources."@remix-run/router-1.8.0" + sources."@swc/core-1.3.91" + sources."@swc/counter-0.1.2" + sources."@swc/helpers-0.5.2" + sources."@swc/types-0.1.5" + sources."@swc/wasm-1.3.91" + sources."@tailwindcss/forms-0.5.6" + sources."@trivago/prettier-plugin-sort-imports-4.2.0" + sources."@tsconfig/node10-1.0.9" + sources."@tsconfig/node12-1.0.11" + sources."@tsconfig/node14-1.0.3" + sources."@tsconfig/node16-1.0.4" + sources."@types/json-schema-7.0.13" + sources."@types/json5-0.0.29" + sources."@types/node-20.5.9" + sources."@types/normalize-package-data-2.4.2" + sources."@types/prop-types-15.7.8" + sources."@types/react-18.2.24" + sources."@types/react-dom-18.2.8" + sources."@types/scheduler-0.16.4" + sources."@types/semver-7.5.3" + sources."@typescript-eslint/eslint-plugin-6.0.0" + sources."@typescript-eslint/parser-6.0.0" + sources."@typescript-eslint/scope-manager-6.0.0" + sources."@typescript-eslint/type-utils-6.0.0" + sources."@typescript-eslint/types-6.0.0" + sources."@typescript-eslint/typescript-estree-6.0.0" + sources."@typescript-eslint/utils-6.0.0" + sources."@typescript-eslint/visitor-keys-6.0.0" + sources."@vitejs/plugin-react-4.0.4" + sources."@vue/compiler-core-3.3.4" + sources."@vue/compiler-dom-3.3.4" + sources."@vue/compiler-sfc-3.3.4" + sources."@vue/compiler-ssr-3.3.4" + sources."@vue/reactivity-transform-3.3.4" + sources."@vue/shared-3.3.4" + sources."acorn-8.10.0" + sources."acorn-jsx-5.3.2" + sources."acorn-walk-8.2.0" + sources."ajv-6.12.6" + sources."ansi-regex-5.0.1" + sources."ansi-styles-3.2.1" + sources."any-promise-1.3.0" + sources."anymatch-3.1.3" + sources."arg-5.0.2" + sources."argparse-2.0.1" + sources."array-buffer-byte-length-1.0.0" + sources."array-includes-3.1.7" + sources."array-union-2.1.0" + sources."array.prototype.findlastindex-1.2.3" + sources."array.prototype.flat-1.3.2" + sources."array.prototype.flatmap-1.3.2" + sources."array.prototype.tosorted-1.1.2" + sources."arraybuffer.prototype.slice-1.0.2" + sources."async-2.6.4" + sources."asynciterator.prototype-1.0.0" + sources."asynckit-0.4.0" + sources."autoprefixer-10.4.16" + sources."available-typed-arrays-1.0.5" + sources."axios-1.4.0" + sources."balanced-match-1.0.2" + sources."binary-extensions-2.2.0" + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."browserslist-4.22.1" + sources."buffer-from-1.1.2" + sources."builtin-modules-3.3.0" + sources."call-bind-1.0.2" + sources."callsites-3.1.0" + sources."camelcase-css-2.0.1" + sources."caniuse-lite-1.0.30001542" + sources."chalk-2.4.2" + sources."chokidar-3.5.3" + sources."ci-info-3.8.0" + sources."clean-regexp-1.0.0" + sources."client-only-0.0.1" + (sources."code-inspector-core-0.1.9" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-4.1.2" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + (sources."code-inspector-plugin-0.1.9" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-4.1.1" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."combined-stream-1.0.8" + sources."commander-4.1.1" + sources."concat-map-0.0.1" + sources."convert-source-map-2.0.0" + sources."copy-anything-2.0.6" + sources."create-require-1.1.1" + sources."cross-spawn-7.0.3" + sources."cssesc-3.0.0" + sources."csstype-3.1.2" + sources."debug-4.3.4" + sources."deep-is-0.1.4" + sources."define-data-property-1.1.0" + sources."define-properties-1.2.1" + sources."delayed-stream-1.0.0" + sources."detect-libc-1.0.3" + sources."didyoumean-1.2.2" + sources."diff-4.0.2" + sources."dir-glob-3.0.1" + sources."dlv-1.1.3" + sources."doctrine-3.0.0" + sources."electron-to-chromium-1.4.538" + sources."errno-0.1.8" + sources."error-ex-1.3.2" + sources."es-abstract-1.22.2" + sources."es-iterator-helpers-1.0.15" + sources."es-set-tostringtag-2.0.1" + sources."es-shim-unscopables-1.0.0" + sources."es-to-primitive-1.2.1" + sources."esbuild-0.18.20" + sources."escalade-3.1.1" + sources."escape-string-regexp-1.0.5" + (sources."eslint-8.45.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-4.1.2" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."escape-string-regexp-4.0.0" + sources."eslint-scope-7.2.2" + sources."estraverse-5.3.0" + sources."glob-parent-6.0.2" + sources."globals-13.22.0" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + (sources."eslint-import-resolver-node-0.3.9" // { + dependencies = [ + sources."debug-3.2.7" + ]; + }) + (sources."eslint-module-utils-2.8.0" // { + dependencies = [ + sources."debug-3.2.7" + ]; + }) + (sources."eslint-plugin-import-2.28.1" // { + dependencies = [ + sources."debug-3.2.7" + sources."doctrine-2.1.0" + sources."semver-6.3.1" + ]; + }) + (sources."eslint-plugin-react-7.33.2" // { + dependencies = [ + sources."doctrine-2.1.0" + sources."estraverse-5.3.0" + sources."resolve-2.0.0-next.4" + sources."semver-6.3.1" + ]; + }) + sources."eslint-plugin-react-hooks-4.6.0" + sources."eslint-plugin-react-refresh-0.4.3" + (sources."eslint-plugin-unicorn-48.0.1" // { + dependencies = [ + sources."jsesc-3.0.2" + ]; + }) + sources."eslint-scope-5.1.1" + sources."eslint-visitor-keys-3.4.3" + sources."espree-9.6.1" + (sources."esquery-1.5.0" // { + dependencies = [ + sources."estraverse-5.3.0" + ]; + }) + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.3.0" + ]; + }) + sources."estraverse-4.3.0" + sources."estree-walker-2.0.2" + sources."esutils-2.0.3" + sources."fast-deep-equal-3.1.3" + sources."fast-glob-3.3.1" + sources."fast-json-stable-stringify-2.1.0" + sources."fast-levenshtein-2.0.6" + sources."fastq-1.15.0" + sources."file-entry-cache-6.0.1" + sources."fill-range-7.0.1" + sources."find-up-5.0.0" + sources."flat-cache-3.1.0" + sources."flatted-3.2.9" + sources."follow-redirects-1.15.3" + sources."for-each-0.3.3" + sources."form-data-4.0.0" + sources."fraction.js-4.3.6" + sources."fs.realpath-1.0.0" + sources."fsevents-2.3.3" + sources."function-bind-1.1.1" + sources."function.prototype.name-1.1.6" + sources."functions-have-names-1.2.3" + sources."gensync-1.0.0-beta.2" + sources."get-intrinsic-1.2.1" + sources."get-symbol-description-1.0.0" + sources."glob-7.2.3" + sources."glob-parent-5.1.2" + sources."globals-11.12.0" + sources."globalthis-1.0.3" + sources."globby-11.1.0" + sources."gopd-1.0.1" + sources."graceful-fs-4.2.11" + sources."grapheme-splitter-1.0.4" + sources."graphemer-1.4.0" + sources."has-1.0.3" + sources."has-bigints-1.0.2" + sources."has-flag-3.0.0" + sources."has-property-descriptors-1.0.0" + sources."has-proto-1.0.1" + sources."has-symbols-1.0.3" + sources."has-tostringtag-1.0.0" + sources."hosted-git-info-2.8.9" + sources."iconv-lite-0.6.3" + sources."ignore-5.2.4" + sources."image-size-0.5.5" + sources."immutable-4.3.4" + sources."import-fresh-3.3.0" + sources."imurmurhash-0.1.4" + sources."indent-string-4.0.0" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."internal-slot-1.0.5" + sources."is-array-buffer-3.0.2" + sources."is-arrayish-0.2.1" + sources."is-async-function-2.0.0" + sources."is-bigint-1.0.4" + sources."is-binary-path-2.1.0" + sources."is-boolean-object-1.1.2" + sources."is-builtin-module-3.2.1" + sources."is-callable-1.2.7" + sources."is-core-module-2.13.0" + sources."is-date-object-1.0.5" + sources."is-extglob-2.1.1" + sources."is-finalizationregistry-1.0.2" + sources."is-generator-function-1.0.10" + sources."is-glob-4.0.3" + sources."is-map-2.0.2" + sources."is-negative-zero-2.0.2" + sources."is-number-7.0.0" + sources."is-number-object-1.0.7" + sources."is-path-inside-3.0.3" + sources."is-regex-1.1.4" + sources."is-set-2.0.2" + sources."is-shared-array-buffer-1.0.2" + sources."is-string-1.0.7" + sources."is-symbol-1.0.4" + sources."is-typed-array-1.1.12" + sources."is-weakmap-2.0.1" + sources."is-weakref-1.0.2" + sources."is-weakset-2.0.2" + sources."is-what-3.14.1" + sources."isarray-2.0.5" + sources."isexe-2.0.0" + sources."iterator.prototype-1.1.2" + sources."javascript-natural-sort-0.7.1" + sources."jiti-1.20.0" + sources."js-tokens-4.0.0" + sources."js-yaml-4.1.0" + sources."jsesc-2.5.2" + sources."json-buffer-3.0.1" + sources."json-parse-even-better-errors-2.3.1" + sources."json-schema-traverse-0.4.1" + sources."json-stable-stringify-without-jsonify-1.0.1" + sources."json5-2.2.3" + sources."jsx-ast-utils-3.3.5" + sources."keyv-4.5.3" + (sources."less-4.2.0" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."levn-0.4.1" + sources."lightningcss-1.22.0" + sources."lightningcss-darwin-arm64-1.22.0" + sources."lightningcss-darwin-x64-1.22.0" + sources."lightningcss-freebsd-x64-1.22.0" + sources."lightningcss-linux-arm-gnueabihf-1.22.0" + sources."lightningcss-linux-arm64-gnu-1.22.0" + sources."lightningcss-linux-arm64-musl-1.22.0" + sources."lightningcss-linux-x64-gnu-1.22.0" + sources."lightningcss-linux-x64-musl-1.22.0" + sources."lightningcss-win32-x64-msvc-1.22.0" + sources."lilconfig-2.1.0" + sources."lines-and-columns-1.2.4" + sources."locate-path-6.0.0" + sources."lodash-4.17.21" + sources."lodash.merge-4.6.2" + sources."loose-envify-1.4.0" + sources."lru-cache-6.0.0" + sources."magic-string-0.30.4" + (sources."make-dir-2.1.0" // { + dependencies = [ + sources."pify-4.0.1" + sources."semver-5.7.2" + ]; + }) + sources."make-error-1.3.6" + sources."merge2-1.4.1" + sources."micromatch-4.0.5" + sources."mime-1.6.0" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" + sources."min-indent-1.0.1" + sources."mini-svg-data-uri-1.4.4" + sources."minimatch-3.1.2" + sources."minimist-1.2.8" + sources."mkdirp-0.5.6" + sources."ms-2.1.2" + sources."mz-2.7.0" + sources."nanoid-3.3.6" + sources."natural-compare-1.4.0" + sources."natural-compare-lite-1.4.0" + (sources."needle-3.2.0" // { + dependencies = [ + sources."debug-3.2.7" + ]; + }) + sources."node-releases-2.0.13" + (sources."normalize-package-data-2.5.0" // { + dependencies = [ + sources."semver-5.7.2" + ]; + }) + sources."normalize-path-3.0.0" + sources."normalize-range-0.1.2" + sources."object-assign-4.1.1" + sources."object-hash-3.0.0" + sources."object-inspect-1.12.3" + sources."object-keys-1.1.1" + sources."object.assign-4.1.4" + sources."object.entries-1.1.7" + sources."object.fromentries-2.0.7" + sources."object.groupby-1.0.1" + sources."object.hasown-1.1.3" + sources."object.values-1.1.7" + sources."once-1.4.0" + sources."optionator-0.9.3" + sources."p-limit-3.1.0" + sources."p-locate-5.0.0" + sources."p-try-2.2.0" + sources."parent-module-1.0.1" + sources."parse-json-5.2.0" + sources."parse-node-version-1.0.1" + sources."path-exists-4.0.0" + sources."path-is-absolute-1.0.1" + sources."path-key-3.1.1" + sources."path-parse-1.0.7" + sources."path-type-4.0.0" + sources."picocolors-1.0.0" + sources."picomatch-2.3.1" + sources."pify-2.3.0" + sources."pirates-4.0.6" + sources."pluralize-8.0.0" + (sources."portfinder-1.0.32" // { + dependencies = [ + sources."debug-3.2.7" + ]; + }) + sources."postcss-8.4.31" + sources."postcss-import-15.1.0" + sources."postcss-js-4.0.1" + sources."postcss-load-config-4.0.1" + sources."postcss-nested-6.0.1" + sources."postcss-selector-parser-6.0.13" + sources."postcss-value-parser-4.2.0" + sources."prelude-ls-1.2.1" + sources."prettier-3.0.3" + sources."prop-types-15.8.1" + sources."proxy-from-env-1.1.0" + sources."prr-1.0.1" + sources."punycode-2.3.0" + sources."queue-microtask-1.2.3" + sources."react-18.2.0" + sources."react-dom-18.2.0" + sources."react-is-16.13.1" + sources."react-refresh-0.14.0" + sources."react-router-6.15.0" + sources."react-router-dom-6.15.0" + sources."read-cache-1.0.0" + (sources."read-pkg-5.2.0" // { + dependencies = [ + sources."type-fest-0.6.0" + ]; + }) + (sources."read-pkg-up-7.0.1" // { + dependencies = [ + sources."find-up-4.1.0" + sources."locate-path-5.0.0" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + sources."type-fest-0.8.1" + ]; + }) + sources."readdirp-3.6.0" + sources."reflect.getprototypeof-1.0.4" + sources."regexp-tree-0.1.27" + sources."regexp.prototype.flags-1.5.1" + (sources."regjsparser-0.10.0" // { + dependencies = [ + sources."jsesc-0.5.0" + ]; + }) + sources."resolve-1.22.6" + sources."resolve-from-4.0.0" + sources."reusify-1.0.4" + sources."rimraf-3.0.2" + sources."rollup-3.29.4" + sources."run-parallel-1.2.0" + sources."safe-array-concat-1.0.1" + sources."safe-regex-test-1.0.0" + sources."safer-buffer-2.1.2" + sources."sass-1.68.0" + sources."sax-1.3.0" + sources."scheduler-0.23.0" + sources."semver-7.5.4" + sources."set-function-name-2.0.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."side-channel-1.0.4" + sources."slash-3.0.0" + sources."source-map-0.5.7" + sources."source-map-js-1.0.2" + (sources."source-map-support-0.5.21" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."spdx-correct-3.2.0" + sources."spdx-exceptions-2.3.0" + sources."spdx-expression-parse-3.0.1" + sources."spdx-license-ids-3.0.15" + sources."string.prototype.matchall-4.0.10" + sources."string.prototype.trim-1.2.8" + sources."string.prototype.trimend-1.0.7" + sources."string.prototype.trimstart-1.0.7" + sources."strip-ansi-6.0.1" + sources."strip-bom-3.0.0" + sources."strip-indent-3.0.0" + sources."strip-json-comments-3.1.1" + (sources."stylus-0.60.0" // { + dependencies = [ + sources."sax-1.2.4" + sources."source-map-0.7.4" + ]; + }) + (sources."sucrase-3.34.0" // { + dependencies = [ + sources."glob-7.1.6" + ]; + }) + sources."sugarss-4.0.1" + sources."supports-color-5.5.0" + sources."supports-preserve-symlinks-flag-1.0.0" + (sources."tailwindcss-3.3.3" // { + dependencies = [ + sources."glob-parent-6.0.2" + ]; + }) + (sources."terser-5.20.0" // { + dependencies = [ + sources."commander-2.20.3" + ]; + }) + sources."text-table-0.2.0" + sources."thenify-3.3.1" + sources."thenify-all-1.6.0" + sources."to-fast-properties-2.0.0" + sources."to-regex-range-5.0.1" + sources."ts-api-utils-1.0.3" + sources."ts-interface-checker-0.1.13" + (sources."ts-node-10.9.1" // { + dependencies = [ + sources."arg-4.1.3" + ]; + }) + (sources."tsconfig-paths-3.14.2" // { + dependencies = [ + sources."json5-1.0.2" + ]; + }) + sources."tslib-2.6.2" + sources."type-check-0.4.0" + sources."type-fest-0.20.2" + sources."typed-array-buffer-1.0.0" + sources."typed-array-byte-length-1.0.0" + sources."typed-array-byte-offset-1.0.0" + sources."typed-array-length-1.0.4" + sources."typescript-5.0.4" + sources."unbox-primitive-1.0.2" + sources."update-browserslist-db-1.0.13" + sources."uri-js-4.4.1" + sources."util-deprecate-1.0.2" + sources."v8-compile-cache-lib-3.0.1" + sources."validate-npm-package-license-3.0.4" + sources."vite-4.4.9" + sources."vite-code-inspector-plugin-0.1.9" + sources."webpack-code-inspector-plugin-0.1.9" + sources."which-2.0.2" + sources."which-boxed-primitive-1.0.2" + sources."which-builtin-type-1.1.3" + sources."which-collection-1.0.1" + sources."which-typed-array-1.1.11" + sources."wrappy-1.0.2" + sources."yallist-4.0.0" + sources."yaml-2.3.2" + sources."yn-3.1.1" + sources."yocto-queue-0.1.0" + ]; + buildInputs = globalBuildInputs; + meta = { + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; pkg = nodeEnv.buildNodePackage { name = "pkg"; packageName = "pkg"; @@ -94382,7 +90657,7 @@ in dependencies = [ sources."@babel/generator-7.18.2" sources."@babel/helper-string-parser-7.22.5" - sources."@babel/helper-validator-identifier-7.22.19" + sources."@babel/helper-validator-identifier-7.22.20" sources."@babel/parser-7.18.4" sources."@babel/types-7.19.0" sources."@jridgewell/gen-mapping-0.3.3" @@ -94485,7 +90760,7 @@ in sources."rc-1.2.8" sources."readable-stream-2.3.8" sources."require-directory-2.1.1" - (sources."resolve-1.22.5" // { + (sources."resolve-1.22.6" // { dependencies = [ sources."is-core-module-2.13.0" ]; @@ -94618,8 +90893,8 @@ in sources."continuation-local-storage-3.2.1" sources."croner-4.1.97" sources."culvert-0.1.2" - sources."data-uri-to-buffer-5.0.1" - sources."dayjs-1.11.9" + sources."data-uri-to-buffer-6.0.1" + sources."dayjs-1.11.10" sources."debug-4.3.4" sources."degenerator-5.0.1" sources."emitter-listener-1.1.2" @@ -94633,12 +90908,12 @@ in sources."fast-json-patch-3.1.1" sources."fclone-1.0.11" sources."fill-range-7.0.1" - sources."follow-redirects-1.15.2" + sources."follow-redirects-1.15.3" sources."fs-extra-8.1.0" sources."fs.realpath-1.0.0" sources."fsevents-2.3.3" sources."function-bind-1.1.1" - sources."get-uri-6.0.1" + sources."get-uri-6.0.2" sources."git-node-fs-1.0.0" sources."git-sha1-0.1.2" sources."glob-7.2.3" @@ -94706,11 +90981,11 @@ in sources."read-1.0.7" sources."readdirp-3.6.0" sources."require-in-the-middle-5.2.0" - sources."resolve-1.22.5" + sources."resolve-1.22.6" sources."run-series-1.1.9" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."sax-1.2.4" + sources."sax-1.3.0" (sources."semver-7.5.4" // { dependencies = [ sources."lru-cache-6.0.0" @@ -94730,7 +91005,7 @@ in sources."sprintf-js-1.1.2" sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."systeminformation-5.21.5" + sources."systeminformation-5.21.9" sources."to-regex-range-5.0.1" sources."tslib-2.6.2" sources."tv4-1.3.0" @@ -94761,10 +91036,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "8.7.5"; + version = "8.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-8.7.5.tgz"; - sha512 = "WI8WZb89Uiq5x2jdz4PcQMG9ovTnXcDCEpoEckPYIT2zD8/+dEhVozPlT7bu3WkBgE0uTARtgyIKAFt+IpW2cQ=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-8.8.0.tgz"; + sha512 = "eY5rMiZpzmPI2oVr1irR97bzb036oKwCWvK91wDQndXcqUPlytPtrF0bO668Syw/uA+7hTf5NnM8Mr4ux4BRRA=="; }; buildInputs = globalBuildInputs; meta = { @@ -94807,10 +91082,10 @@ in postcss = nodeEnv.buildNodePackage { name = "postcss"; packageName = "postcss"; - version = "8.4.29"; + version = "8.4.31"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.29.tgz"; - sha512 = "cbI+jaqIeu/VGqXEarWkRCCffhjgXc0qjBtXpqJhTBohMUjUQnbBr0xqX3vEKudc4iviTewcJo5ajcec5+wdJw=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz"; + sha512 = "PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ=="; }; dependencies = [ sources."nanoid-3.3.6" @@ -94843,25 +91118,16 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.85" - sources."@swc/core-darwin-arm64-1.3.85" - sources."@swc/core-darwin-x64-1.3.85" - sources."@swc/core-linux-arm-gnueabihf-1.3.85" - sources."@swc/core-linux-arm64-gnu-1.3.85" - sources."@swc/core-linux-arm64-musl-1.3.85" - sources."@swc/core-linux-x64-gnu-1.3.85" - sources."@swc/core-linux-x64-musl-1.3.85" - sources."@swc/core-win32-arm64-msvc-1.3.85" - sources."@swc/core-win32-ia32-msvc-1.3.85" - sources."@swc/core-win32-x64-msvc-1.3.85" + sources."@swc/core-1.3.91" + sources."@swc/counter-0.1.2" sources."@swc/helpers-0.5.2" - sources."@swc/types-0.1.4" - sources."@swc/wasm-1.3.85" + sources."@swc/types-0.1.5" + sources."@swc/wasm-1.3.91" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.6.1" + sources."@types/node-20.8.1" sources."acorn-8.10.0" sources."acorn-walk-8.2.0" sources."ansi-regex-5.0.1" @@ -94911,7 +91177,7 @@ in sources."picocolors-1.0.0" sources."picomatch-2.3.1" sources."pify-2.3.0" - sources."postcss-8.4.29" + sources."postcss-8.4.31" sources."postcss-load-config-4.0.1" sources."postcss-reporter-7.0.5" sources."pretty-hrtime-1.0.3" @@ -95085,26 +91351,30 @@ in dependencies = [ sources."@ampproject/remapping-2.2.1" sources."@babel/code-frame-7.22.13" - sources."@babel/compat-data-7.22.9" - sources."@babel/core-7.22.19" - sources."@babel/generator-7.22.15" + sources."@babel/compat-data-7.22.20" + (sources."@babel/core-7.23.0" // { + dependencies = [ + sources."convert-source-map-2.0.0" + ]; + }) + sources."@babel/generator-7.23.0" sources."@babel/helper-compilation-targets-7.22.15" - sources."@babel/helper-environment-visitor-7.22.5" - sources."@babel/helper-function-name-7.22.5" + sources."@babel/helper-environment-visitor-7.22.20" + sources."@babel/helper-function-name-7.23.0" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-module-imports-7.22.15" - sources."@babel/helper-module-transforms-7.22.19" + sources."@babel/helper-module-transforms-7.23.0" sources."@babel/helper-simple-access-7.22.5" sources."@babel/helper-split-export-declaration-7.22.6" sources."@babel/helper-string-parser-7.22.5" - sources."@babel/helper-validator-identifier-7.22.19" + sources."@babel/helper-validator-identifier-7.22.20" sources."@babel/helper-validator-option-7.22.15" - sources."@babel/helpers-7.22.15" - sources."@babel/highlight-7.22.13" - sources."@babel/parser-7.22.16" + sources."@babel/helpers-7.23.1" + sources."@babel/highlight-7.22.20" + sources."@babel/parser-7.23.0" sources."@babel/template-7.22.15" - sources."@babel/traverse-7.22.19" - sources."@babel/types-7.22.19" + sources."@babel/traverse-7.23.0" + sources."@babel/types-7.23.0" sources."@istanbuljs/load-nyc-config-1.1.0" sources."@istanbuljs/schema-0.1.3" sources."@jridgewell/gen-mapping-0.3.3" @@ -95122,10 +91392,10 @@ in sources."argparse-1.0.10" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.21.10" + sources."browserslist-4.22.1" sources."caching-transform-4.0.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001534" + sources."caniuse-lite-1.0.30001542" sources."chalk-2.4.2" sources."clean-stack-2.2.0" sources."cliui-6.0.0" @@ -95138,7 +91408,7 @@ in sources."debug-4.3.4" sources."decamelize-1.2.0" sources."default-require-extensions-3.0.1" - sources."electron-to-chromium-1.4.523" + sources."electron-to-chromium-1.4.538" sources."emoji-regex-8.0.0" sources."es6-error-4.1.1" sources."escalade-3.1.1" @@ -95231,7 +91501,7 @@ in sources."to-fast-properties-2.0.0" sources."type-fest-0.8.1" sources."typedarray-to-buffer-3.1.5" - sources."update-browserslist-db-1.0.11" + sources."update-browserslist-db-1.0.13" sources."uuid-8.3.2" sources."vscode-jsonrpc-8.1.0" sources."vscode-languageserver-8.1.0" @@ -95267,10 +91537,10 @@ in pscid = nodeEnv.buildNodePackage { name = "pscid"; packageName = "pscid"; - version = "2.10.0"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/pscid/-/pscid-2.10.0.tgz"; - sha512 = "9YZY5/4yqLp6mXGsTMq7AQO7WfZ9McvFx+9Q1SyRyDsgXbg2CAQ36r0bSLIggVytHtyg7TIb3I+bG6jSWxHewA=="; + url = "https://registry.npmjs.org/pscid/-/pscid-2.11.0.tgz"; + sha512 = "gD1XxTSZXiGiFFHDNZhc7E2n/BTdRM8nix2mpHhzxZcH/iZMTMKwXnT37anH6nbCzLWqF6RTmF/jgHsdHOwVeg=="; }; dependencies = [ sources."@isaacs/cliui-8.0.2" @@ -95291,7 +91561,7 @@ in sources."foreground-child-3.1.1" sources."fs.realpath-1.0.0" sources."gaze-1.1.3" - (sources."glob-10.3.4" // { + (sources."glob-10.3.10" // { dependencies = [ sources."brace-expansion-2.0.1" sources."minimatch-9.0.3" @@ -95306,12 +91576,12 @@ in sources."inherits-2.0.4" sources."is-fullwidth-code-point-3.0.0" sources."isexe-2.0.0" - sources."jackspeak-2.3.3" + sources."jackspeak-2.3.6" sources."keypress-0.2.1" sources."lodash-4.17.21" sources."lru-cache-10.0.1" sources."minimatch-3.0.8" - sources."minipass-7.0.3" + sources."minipass-7.0.4" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" @@ -95332,7 +91602,11 @@ in ]; }) sources."strip-ansi-cjs-6.0.1" - sources."which-3.0.1" + (sources."which-4.0.0" // { + dependencies = [ + sources."isexe-3.1.1" + ]; + }) sources."wrap-ansi-8.1.0" (sources."wrap-ansi-cjs-7.0.0" // { dependencies = [ @@ -95567,7 +91841,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."resolve-1.22.5" + sources."resolve-1.22.6" sources."rimraf-2.7.1" sources."ripemd160-2.0.2" sources."safe-buffer-5.2.1" @@ -95642,10 +91916,14 @@ in sources."isexe-2.0.0" sources."shell-quote-1.8.1" sources."uuid-9.0.1" - sources."vscode-jsonrpc-8.1.0" + sources."vscode-jsonrpc-8.2.0" sources."vscode-languageserver-8.1.0" - sources."vscode-languageserver-protocol-3.17.3" - sources."vscode-languageserver-textdocument-1.0.10" + (sources."vscode-languageserver-protocol-3.17.3" // { + dependencies = [ + sources."vscode-jsonrpc-8.1.0" + ]; + }) + sources."vscode-languageserver-textdocument-1.0.11" sources."vscode-languageserver-types-3.17.3" sources."vscode-uri-2.1.2" sources."which-2.0.2" @@ -95714,148 +91992,13 @@ in bypassCache = true; reconstructLock = true; }; - pxder = nodeEnv.buildNodePackage { - name = "pxder"; - packageName = "pxder"; - version = "2.12.8"; - src = fetchurl { - url = "https://registry.npmjs.org/pxder/-/pxder-2.12.8.tgz"; - sha512 = "y1WhrgmrlfxF6wgTVnGIXO177BJj4WrjIfrxGAyZ9pDSDRPHcMySEfjXw1dTkqMD8wnIT0GR3dt1F72FxKRRhQ=="; - }; - dependencies = [ - sources."@sindresorhus/is-0.14.0" - sources."@szmarczak/http-timer-1.1.2" - sources."@tootallnate/quickjs-emscripten-0.23.0" - sources."agent-base-7.1.0" - sources."appdata-path-1.0.0" - sources."ast-types-0.13.4" - sources."axios-0.24.0" - sources."basic-ftp-5.0.3" - sources."blueimp-md5-2.19.0" - (sources."cacheable-request-6.1.0" // { - dependencies = [ - sources."get-stream-5.2.0" - sources."lowercase-keys-2.0.0" - ]; - }) - sources."call-bind-1.0.2" - sources."clone-response-1.0.3" - sources."colors-1.4.0" - sources."commander-5.1.0" - sources."compare-versions-4.1.4" - sources."data-uri-to-buffer-5.0.1" - sources."debug-4.3.4" - sources."decompress-response-3.3.0" - sources."deep-extend-0.6.0" - sources."defer-to-connect-1.1.3" - sources."define-lazy-prop-2.0.0" - sources."degenerator-5.0.1" - sources."duplexer3-0.1.5" - sources."end-of-stream-1.4.4" - sources."escodegen-2.1.0" - sources."esprima-4.0.1" - sources."estraverse-5.3.0" - sources."esutils-2.0.3" - sources."follow-redirects-1.15.2" - sources."fs-extra-11.1.1" - sources."function-bind-1.1.1" - sources."get-intrinsic-1.2.1" - sources."get-stream-4.1.0" - (sources."get-uri-6.0.1" // { - dependencies = [ - sources."fs-extra-8.1.0" - sources."jsonfile-4.0.0" - sources."universalify-0.1.2" - ]; - }) - sources."got-9.6.0" - sources."graceful-fs-4.2.11" - sources."has-1.0.3" - sources."has-proto-1.0.1" - sources."has-symbols-1.0.3" - sources."http-cache-semantics-4.1.1" - sources."http-proxy-agent-7.0.0" - sources."https-proxy-agent-7.0.2" - sources."ini-1.3.8" - sources."ip-1.1.8" - sources."is-docker-2.2.1" - sources."is-wsl-2.2.0" - sources."js-base64-3.7.5" - sources."json-buffer-3.0.0" - sources."jsonfile-6.1.0" - sources."keyv-3.1.0" - sources."kleur-3.0.3" - sources."latest-version-5.1.0" - sources."lodash.flatmap-4.5.0" - sources."lowercase-keys-1.0.1" - sources."lru-cache-7.18.3" - sources."mimic-response-1.0.1" - sources."minimist-1.2.8" - sources."moment-2.29.4" - sources."ms-2.1.2" - sources."netmask-2.0.2" - sources."node-abort-controller-3.1.1" - sources."normalize-url-4.5.1" - sources."object-inspect-1.12.3" - sources."once-1.4.0" - sources."open-8.4.2" - sources."p-cancelable-1.1.0" - sources."pac-proxy-agent-7.0.1" - sources."pac-resolver-7.0.0" - sources."package-json-6.5.0" - (sources."pixiv-api-client-0.25.0" // { - dependencies = [ - sources."axios-0.21.4" - ]; - }) - sources."prepend-http-2.0.0" - sources."prompts-2.4.2" - sources."proxy-agent-6.3.1" - sources."proxy-from-env-1.1.0" - sources."pump-3.0.0" - sources."qs-6.11.2" - sources."rc-1.2.8" - sources."readline-sync-1.4.10" - sources."register-protocol-win32-1.1.0" - sources."registry-auth-token-4.2.2" - sources."registry-url-5.1.0" - sources."responselike-1.0.2" - sources."semver-6.3.1" - sources."side-channel-1.0.4" - sources."sisteransi-1.0.5" - sources."smart-buffer-4.2.0" - (sources."socks-2.7.1" // { - dependencies = [ - sources."ip-2.0.0" - ]; - }) - sources."socks-proxy-agent-8.0.2" - sources."source-map-0.6.1" - sources."strip-json-comments-2.0.1" - sources."to-readable-stream-1.0.0" - sources."tslib-2.6.2" - sources."universalify-2.0.0" - sources."url-parse-lax-3.0.0" - sources."winreg-1.2.4" - sources."wrappy-1.0.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Download illusts from pixiv.net P站插画批量下载器"; - homepage = "https://github.com/Tsuk1ko/pxder#readme"; - license = "GPL-3.0-or-later"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.327"; + version = "1.1.329"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.327.tgz"; - sha512 = "2OgKe3//ortVz7thxoiaVSjACVtUn+hOIanrlLZCEkagdKMheLcftu6GmoLjgibV/E2SvZZ//izidxTB5vN8dQ=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.329.tgz"; + sha512 = "5AT98Mi0OYcDiQ5lD1nPJ3cq8gX/HHaXrQ5WjJ/QZkaJtGqnEdrUp5Gq5wBPipWgOnv/l5e50YScaaNDMjoy9Q=="; }; dependencies = [ sources."fsevents-2.3.3" @@ -95870,168 +92013,6 @@ in bypassCache = true; reconstructLock = true; }; - react-native-cli = nodeEnv.buildNodePackage { - name = "react-native-cli"; - packageName = "react-native-cli"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/react-native-cli/-/react-native-cli-2.0.1.tgz"; - sha512 = "QgkB1urUhGe9q1vcqQLIfNdCd/Qf3MdNQe19QO6lVjhIVKljlVMKtaK8RaZ8PCNB/cdXlO/G3tKUGk+ghMXE6w=="; - }; - dependencies = [ - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" - sources."array-buffer-byte-length-1.0.0" - sources."async-0.2.10" - sources."available-typed-arrays-1.0.5" - sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" - sources."call-bind-1.0.2" - sources."chalk-1.1.3" - sources."colors-0.6.2" - sources."concat-map-0.0.1" - sources."cycle-1.0.3" - sources."deep-equal-2.2.2" - sources."define-data-property-1.1.0" - sources."define-properties-1.2.1" - sources."es-get-iterator-1.1.3" - sources."escape-string-regexp-1.0.5" - sources."eyes-0.1.8" - sources."for-each-0.3.3" - sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" - sources."functions-have-names-1.2.3" - sources."get-intrinsic-1.2.1" - sources."glob-7.2.3" - sources."gopd-1.0.1" - sources."has-1.0.3" - sources."has-ansi-2.0.0" - sources."has-bigints-1.0.2" - sources."has-property-descriptors-1.0.0" - sources."has-proto-1.0.1" - sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" - sources."i-0.3.7" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."internal-slot-1.0.5" - sources."is-arguments-1.1.1" - sources."is-array-buffer-3.0.2" - sources."is-bigint-1.0.4" - sources."is-boolean-object-1.1.2" - sources."is-callable-1.2.7" - sources."is-date-object-1.0.5" - sources."is-map-2.0.2" - sources."is-number-object-1.0.7" - sources."is-regex-1.1.4" - sources."is-set-2.0.2" - sources."is-shared-array-buffer-1.0.2" - sources."is-string-1.0.7" - sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.12" - sources."is-weakmap-2.0.1" - sources."is-weakset-2.0.2" - sources."isarray-2.0.5" - sources."isstream-0.1.2" - sources."minimatch-3.1.2" - sources."minimist-1.2.8" - sources."mkdirp-0.5.6" - sources."mute-stream-0.0.8" - sources."ncp-0.4.2" - sources."object-inspect-1.12.3" - sources."object-is-1.1.5" - sources."object-keys-1.1.1" - sources."object.assign-4.1.4" - sources."once-1.4.0" - sources."path-is-absolute-1.0.1" - sources."pkginfo-0.4.1" - sources."prompt-0.2.14" - sources."read-1.0.7" - sources."regexp.prototype.flags-1.5.1" - sources."revalidator-0.1.8" - sources."rimraf-2.7.1" - sources."semver-5.7.2" - sources."set-function-name-2.0.1" - sources."side-channel-1.0.4" - sources."stack-trace-0.0.10" - sources."stop-iteration-iterator-1.0.0" - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - sources."utile-0.2.1" - sources."which-boxed-primitive-1.0.2" - sources."which-collection-1.0.1" - sources."which-typed-array-1.1.11" - (sources."winston-0.8.3" // { - dependencies = [ - sources."pkginfo-0.3.1" - ]; - }) - sources."wrappy-1.0.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "The React Native CLI tools"; - homepage = "https://github.com/facebook/react-native#readme"; - license = "BSD-3-Clause"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; - react-tools = nodeEnv.buildNodePackage { - name = "react-tools"; - packageName = "react-tools"; - version = "0.13.3"; - src = fetchurl { - url = "https://registry.npmjs.org/react-tools/-/react-tools-0.13.3.tgz"; - sha512 = "lmdjIRNk2cVUdlF/dyy6oP0nG2qrlX5qKFYRtiC5zK5Sg5QqgUEOrcS7Jz+kPNeOj9OWT7NfrR/cDvbGGSjCyg=="; - }; - dependencies = [ - sources."acorn-5.7.4" - sources."amdefine-1.0.1" - sources."ast-types-0.9.6" - sources."balanced-match-1.0.2" - sources."base62-0.1.1" - sources."brace-expansion-1.1.11" - sources."commander-2.20.3" - sources."commoner-0.10.8" - sources."concat-map-0.0.1" - sources."defined-1.0.1" - sources."detective-4.7.1" - sources."esprima-3.1.3" - sources."esprima-fb-13001.1001.0-dev-harmony-fb" - sources."glob-5.0.15" - sources."graceful-fs-4.2.11" - sources."iconv-lite-0.4.24" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - (sources."jstransform-10.1.0" // { - dependencies = [ - sources."source-map-0.1.31" - ]; - }) - sources."minimatch-3.1.2" - sources."minimist-1.2.8" - sources."mkdirp-0.5.6" - sources."once-1.4.0" - sources."path-is-absolute-1.0.1" - sources."private-0.1.8" - sources."q-1.5.1" - sources."recast-0.11.23" - sources."safer-buffer-2.1.2" - sources."source-map-0.5.7" - sources."wrappy-1.0.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "A set of complementary tools to React, including the JSX transformer."; - homepage = "https://facebook.github.io/react"; - license = "BSD-3-Clause"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; remod-cli = nodeEnv.buildNodePackage { name = "remod-cli"; packageName = "remod-cli"; @@ -96041,9 +92022,9 @@ in sha512 = "QxvCtwgDBTeBC9V+niO9WPrnNKVEIa0osvdKhw2JkhOjFY0PK/vcFL5jrj7di6GurLIzdweXJgTWnQz2VljdQQ=="; }; dependencies = [ - sources."@types/prop-types-15.7.5" - sources."@types/react-18.2.21" - sources."@types/scheduler-0.16.3" + sources."@types/prop-types-15.7.8" + sources."@types/react-18.2.24" + sources."@types/scheduler-0.16.4" sources."@types/yoga-layout-1.9.2" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" @@ -96137,7 +92118,7 @@ in sources."read-pkg-3.0.0" sources."read-pkg-up-3.0.0" sources."redent-2.0.0" - sources."resolve-1.22.5" + sources."resolve-1.22.6" sources."restore-cursor-3.1.0" sources."scheduler-0.18.0" sources."semver-5.7.2" @@ -96146,7 +92127,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.13" + sources."spdx-license-ids-3.0.15" (sources."string-length-3.1.0" // { dependencies = [ sources."ansi-regex-4.1.1" @@ -96198,10 +92179,10 @@ in rimraf = nodeEnv.buildNodePackage { name = "rimraf"; packageName = "rimraf"; - version = "5.0.1"; + version = "5.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-5.0.1.tgz"; - sha512 = "OfFZdwtd3lZ+XZzYP/6gTACubwFcHdLRqS9UX3UwpU2dnGQYkPFISRwvM3w9IiB2w7bW5qGo/uAwE4SmXXSKvg=="; + url = "https://registry.npmjs.org/rimraf/-/rimraf-5.0.5.tgz"; + sha512 = "CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A=="; }; dependencies = [ sources."@isaacs/cliui-8.0.2" @@ -96215,13 +92196,13 @@ in sources."eastasianwidth-0.2.0" sources."emoji-regex-9.2.2" sources."foreground-child-3.1.1" - sources."glob-10.3.4" + sources."glob-10.3.10" sources."is-fullwidth-code-point-3.0.0" sources."isexe-2.0.0" - sources."jackspeak-2.3.3" + sources."jackspeak-2.3.6" sources."lru-cache-10.0.1" sources."minimatch-9.0.3" - sources."minipass-7.0.3" + sources."minipass-7.0.4" sources."path-key-3.1.1" sources."path-scurry-1.10.1" sources."shebang-command-2.0.0" @@ -96264,10 +92245,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "3.29.2"; + version = "3.29.4"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-3.29.2.tgz"; - sha512 = "CJouHoZ27v6siztc21eEQGo0kIcE5D1gVPA571ez0mMYb25LGYGKnVNXpEj5MGlepmDWGXNjDB5q7uNiPHC11A=="; + url = "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz"; + sha512 = "oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw=="; }; dependencies = [ sources."fsevents-2.3.3" @@ -96290,14 +92271,14 @@ in dependencies = [ sources."@aashutoshrathi/word-wrap-1.2.6" sources."@eslint-community/eslint-utils-4.4.0" - sources."@eslint-community/regexpp-4.8.1" + sources."@eslint-community/regexpp-4.9.1" (sources."@eslint/eslintrc-2.1.2" // { dependencies = [ sources."brace-expansion-1.1.11" sources."minimatch-3.1.2" ]; }) - sources."@eslint/js-8.49.0" + sources."@eslint/js-8.50.0" sources."@hpcc-js/wasm-2.13.1" (sources."@humanwhocodes/config-array-0.11.11" // { dependencies = [ @@ -96313,7 +92294,7 @@ in sources."@tootallnate/once-1.1.2" sources."@types/json-schema-7.0.13" sources."@types/node-16.11.68" - sources."@types/semver-7.5.2" + sources."@types/semver-7.5.3" sources."@types/vscode-1.66.0" sources."@typescript-eslint/eslint-plugin-5.62.0" sources."@typescript-eslint/parser-5.62.0" @@ -96412,7 +92393,7 @@ in sources."entities-4.5.0" sources."escalade-3.1.1" sources."escape-string-regexp-4.0.0" - (sources."eslint-8.49.0" // { + (sources."eslint-8.50.0" // { dependencies = [ sources."brace-expansion-1.1.11" sources."eslint-scope-7.2.2" @@ -96448,8 +92429,8 @@ in sources."fill-range-7.0.1" sources."find-up-5.0.0" sources."flat-cache-3.1.0" - sources."flatted-3.2.7" - sources."follow-redirects-1.15.2" + sources."flatted-3.2.9" + sources."follow-redirects-1.15.3" sources."fs-constants-1.0.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" @@ -96463,7 +92444,7 @@ in ]; }) sources."glob-parent-5.1.2" - sources."globals-13.21.0" + sources."globals-13.22.0" sources."globby-11.1.0" sources."graphemer-1.4.0" sources."has-1.0.3" @@ -96576,7 +92557,7 @@ in sources."rw-1.3.3" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."sax-1.2.4" + sources."sax-1.3.0" sources."semver-7.5.4" sources."setimmediate-1.0.5" sources."shebang-command-2.0.0" @@ -96658,10 +92639,10 @@ in sass = nodeEnv.buildNodePackage { name = "sass"; packageName = "sass"; - version = "1.67.0"; + version = "1.68.0"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.67.0.tgz"; - sha512 = "SVrO9ZeX/QQyEGtuZYCVxoeAL5vGlYjJ9p4i4HFuekWl8y/LtJ7tJc10Z+ck1c8xOuoBm2MYzcLfTAffD0pl/A=="; + url = "https://registry.npmjs.org/sass/-/sass-1.68.0.tgz"; + sha512 = "Lmj9lM/fef0nQswm1J2HJcEsBUba4wgNx2fea6yJHODREoMFnwRpZydBnX/RjyXw2REIwdkbqE4hrTo4qfDBUA=="; }; dependencies = [ sources."anymatch-3.1.3" @@ -96845,19 +92826,77 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "3.34.0"; + version = "3.35.2"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-3.34.0.tgz"; - sha512 = "xtWAg78NGgboolP/GArdorx+UHyESJgriGSE6Qpgg9trTYsKMyd8YKaMIM3sidy89e45XZopRSpvnPYoQCJOBA=="; + url = "https://registry.npmjs.org/serverless/-/serverless-3.35.2.tgz"; + sha512 = "1RZ4eHl2OaGG2Rzw0l0ZD3byCk2JMCL9/+btzGQGQruuQWu9HwRZGJI7l4A2ghW3Mu6DVwLYLfceNpmEWBZoag=="; }; dependencies = [ sources."2-thenable-1.0.0" + (sources."@aws-crypto/crc32-3.0.0" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) + (sources."@aws-crypto/ie11-detection-3.0.0" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) + (sources."@aws-crypto/sha256-browser-3.0.0" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) + (sources."@aws-crypto/sha256-js-3.0.0" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) + (sources."@aws-crypto/supports-web-crypto-3.0.0" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) + (sources."@aws-crypto/util-3.0.0" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) + (sources."@aws-sdk/client-cloudformation-3.423.0" // { + dependencies = [ + sources."uuid-8.3.2" + ]; + }) + sources."@aws-sdk/client-sso-3.423.0" + sources."@aws-sdk/client-sts-3.423.0" + sources."@aws-sdk/credential-provider-env-3.418.0" + sources."@aws-sdk/credential-provider-ini-3.423.0" + sources."@aws-sdk/credential-provider-node-3.423.0" + sources."@aws-sdk/credential-provider-process-3.418.0" + sources."@aws-sdk/credential-provider-sso-3.423.0" + sources."@aws-sdk/credential-provider-web-identity-3.418.0" + sources."@aws-sdk/middleware-host-header-3.418.0" + sources."@aws-sdk/middleware-logger-3.418.0" + sources."@aws-sdk/middleware-recursion-detection-3.418.0" + sources."@aws-sdk/middleware-sdk-sts-3.418.0" + sources."@aws-sdk/middleware-signing-3.418.0" + sources."@aws-sdk/middleware-user-agent-3.418.0" + sources."@aws-sdk/region-config-resolver-3.418.0" + sources."@aws-sdk/token-providers-3.418.0" + sources."@aws-sdk/types-3.418.0" + sources."@aws-sdk/util-endpoints-3.418.0" + sources."@aws-sdk/util-locate-window-3.310.0" + sources."@aws-sdk/util-user-agent-browser-3.418.0" + sources."@aws-sdk/util-user-agent-node-3.418.0" + sources."@aws-sdk/util-utf8-browser-3.259.0" + sources."@httptoolkit/websocket-stream-6.0.1" sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - (sources."@serverless/dashboard-plugin-6.4.0" // { + (sources."@serverless/dashboard-plugin-7.0.5" // { dependencies = [ sources."child-process-ext-3.0.2" sources."fs-extra-9.1.0" @@ -96868,10 +92907,11 @@ in sources."@serverless/event-mocks-1.1.1" (sources."@serverless/platform-client-4.4.0" // { dependencies = [ + sources."axios-0.21.4" sources."js-yaml-3.14.1" ]; }) - (sources."@serverless/utils-6.13.1" // { + (sources."@serverless/utils-6.15.0" // { dependencies = [ sources."jwt-decode-3.1.2" sources."ms-2.1.3" @@ -96879,14 +92919,58 @@ in ]; }) sources."@sindresorhus/is-4.6.0" + sources."@smithy/abort-controller-2.0.10" + sources."@smithy/config-resolver-2.0.11" + sources."@smithy/credential-provider-imds-2.0.13" + sources."@smithy/eventstream-codec-2.0.10" + sources."@smithy/fetch-http-handler-2.2.0" + sources."@smithy/hash-node-2.0.10" + sources."@smithy/invalid-dependency-2.0.10" + sources."@smithy/is-array-buffer-2.0.0" + sources."@smithy/middleware-content-length-2.0.12" + sources."@smithy/middleware-endpoint-2.0.10" + (sources."@smithy/middleware-retry-2.0.13" // { + dependencies = [ + sources."uuid-8.3.2" + ]; + }) + sources."@smithy/middleware-serde-2.0.10" + sources."@smithy/middleware-stack-2.0.4" + sources."@smithy/node-config-provider-2.0.13" + sources."@smithy/node-http-handler-2.1.6" + sources."@smithy/property-provider-2.0.11" + sources."@smithy/protocol-http-3.0.6" + sources."@smithy/querystring-builder-2.0.10" + sources."@smithy/querystring-parser-2.0.10" + sources."@smithy/service-error-classification-2.0.3" + sources."@smithy/shared-ini-file-loader-2.0.12" + sources."@smithy/signature-v4-2.0.10" + sources."@smithy/smithy-client-2.1.8" + sources."@smithy/types-2.3.4" + sources."@smithy/url-parser-2.0.10" + sources."@smithy/util-base64-2.0.0" + sources."@smithy/util-body-length-browser-2.0.0" + sources."@smithy/util-body-length-node-2.1.0" + sources."@smithy/util-buffer-from-2.0.0" + sources."@smithy/util-config-provider-2.0.0" + sources."@smithy/util-defaults-mode-browser-2.0.12" + sources."@smithy/util-defaults-mode-node-2.0.14" + sources."@smithy/util-hex-encoding-2.0.0" + sources."@smithy/util-middleware-2.0.3" + sources."@smithy/util-retry-2.0.3" + sources."@smithy/util-stream-2.0.13" + sources."@smithy/util-uri-escape-2.0.0" + sources."@smithy/util-utf8-2.0.0" + sources."@smithy/util-waiter-2.0.10" sources."@szmarczak/http-timer-4.0.6" sources."@tokenizer/token-0.3.0" sources."@types/cacheable-request-6.0.3" - sources."@types/http-cache-semantics-4.0.1" + sources."@types/http-cache-semantics-4.0.2" sources."@types/keyv-3.1.4" - sources."@types/lodash-4.14.198" - sources."@types/node-20.6.1" - sources."@types/responselike-1.0.0" + sources."@types/lodash-4.14.199" + sources."@types/node-20.8.1" + sources."@types/responselike-1.0.1" + sources."@types/ws-8.5.6" sources."abort-controller-3.0.0" sources."adm-zip-0.5.10" sources."agent-base-6.0.2" @@ -96901,14 +92985,12 @@ in sources."file-type-4.4.0" ]; }) - sources."archiver-5.3.2" - (sources."archiver-utils-2.1.0" // { + (sources."archiver-5.3.2" // { dependencies = [ - sources."readable-stream-2.3.8" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" + sources."readable-stream-3.6.2" ]; }) + sources."archiver-utils-2.1.0" sources."argparse-1.0.10" sources."array-union-2.1.0" sources."asap-2.0.6" @@ -96916,7 +92998,8 @@ in sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."available-typed-arrays-1.0.5" - (sources."aws-sdk-2.1459.0" // { + sources."aws-crt-1.18.0" + (sources."aws-sdk-2.1468.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -96924,19 +93007,26 @@ in sources."uuid-8.0.0" ]; }) - sources."axios-0.21.4" + sources."axios-0.24.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."binary-extensions-2.2.0" - sources."bl-4.1.0" + (sources."bl-4.1.0" // { + dependencies = [ + sources."buffer-5.7.1" + sources."readable-stream-3.6.2" + ]; + }) sources."bluebird-3.7.2" + sources."bowser-2.11.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."buffer-5.7.1" + sources."buffer-6.0.3" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" sources."buffer-fill-1.0.0" + sources."buffer-from-1.1.2" sources."bufferutil-4.0.7" sources."builtin-modules-3.3.0" sources."builtins-1.0.3" @@ -96984,21 +93074,36 @@ in sources."color-name-1.1.4" sources."combined-stream-1.0.8" sources."commander-2.20.3" + sources."commist-1.1.0" sources."component-emitter-1.3.0" - sources."compress-commons-4.1.2" + (sources."compress-commons-4.1.2" // { + dependencies = [ + sources."readable-stream-3.6.2" + ]; + }) sources."concat-map-0.0.1" + (sources."concat-stream-2.0.0" // { + dependencies = [ + sources."readable-stream-3.6.2" + ]; + }) sources."content-disposition-0.5.4" sources."cookiejar-2.1.4" sources."core-util-is-1.0.3" sources."crc-32-1.2.2" - sources."crc32-stream-4.0.3" + (sources."crc32-stream-4.0.3" // { + dependencies = [ + sources."readable-stream-3.6.2" + ]; + }) sources."cross-spawn-7.0.3" + sources."crypto-js-4.1.1" (sources."d-1.0.1" // { dependencies = [ sources."type-1.2.0" ]; }) - sources."dayjs-1.11.9" + sources."dayjs-1.11.10" sources."debug-4.3.4" (sources."decompress-4.2.1" // { dependencies = [ @@ -97018,9 +93123,6 @@ in dependencies = [ sources."bl-1.2.3" sources."file-type-5.2.0" - sources."readable-stream-2.3.8" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" sources."tar-stream-1.6.2" ]; }) @@ -97049,6 +93151,7 @@ in sources."dir-glob-3.0.1" sources."dotenv-16.3.1" sources."dotenv-expand-10.0.0" + sources."duplexify-3.7.1" sources."duration-0.2.2" sources."emoji-regex-8.0.0" (sources."encoding-0.1.13" // { @@ -97076,6 +93179,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-glob-3.3.1" sources."fast-safe-stringify-2.1.1" + sources."fast-xml-parser-4.2.5" sources."fastest-levenshtein-1.0.16" sources."fastq-1.15.0" sources."fd-slicer-1.1.0" @@ -97087,7 +93191,7 @@ in sources."fill-range-7.0.1" sources."find-requires-1.0.0" sources."flat-5.0.2" - sources."follow-redirects-1.15.2" + sources."follow-redirects-1.15.3" sources."for-each-0.3.3" sources."form-data-4.0.0" sources."formidable-2.1.2" @@ -97117,6 +93221,11 @@ in sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" + (sources."help-me-3.0.0" // { + dependencies = [ + sources."readable-stream-3.6.2" + ]; + }) sources."hexoid-1.0.0" sources."http-cache-semantics-4.1.1" sources."http2-wrapper-1.0.3" @@ -97150,6 +93259,7 @@ in sources."isexe-2.0.0" sources."isomorphic-ws-4.0.1" sources."jmespath-0.16.0" + sources."js-sdsl-4.3.0" (sources."js-yaml-4.1.0" // { dependencies = [ sources."argparse-2.0.1" @@ -97174,22 +93284,11 @@ in }) sources."json-schema-traverse-1.0.0" sources."jsonfile-6.1.0" - (sources."jszip-3.10.1" // { - dependencies = [ - sources."readable-stream-2.3.8" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) + sources."jszip-3.10.1" sources."jwt-decode-2.2.0" sources."keyv-4.5.3" - (sources."lazystream-1.0.1" // { - dependencies = [ - sources."readable-stream-2.3.8" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) + sources."lazystream-1.0.1" + sources."leven-2.1.0" sources."lie-3.3.0" sources."lodash-4.17.21" sources."lodash.defaults-4.2.0" @@ -97215,6 +93314,7 @@ in sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.1.2" + sources."minimist-1.2.8" sources."minipass-5.0.0" (sources."minizlib-2.1.2" // { dependencies = [ @@ -97222,6 +93322,13 @@ in ]; }) sources."mkdirp-1.0.4" + (sources."mqtt-4.3.7" // { + dependencies = [ + sources."duplexify-4.1.2" + sources."readable-stream-3.6.2" + ]; + }) + sources."mqtt-packet-6.10.0" sources."ms-2.1.2" sources."mute-stream-0.0.8" sources."native-promise-only-0.8.1" @@ -97234,6 +93341,7 @@ in sources."normalize-path-3.0.0" sources."normalize-url-6.1.0" sources."npm-registry-utilities-1.0.0" + sources."number-allocator-1.0.14" sources."object-assign-4.1.1" sources."object-hash-3.0.0" sources."object-inspect-1.12.3" @@ -97258,6 +93366,7 @@ in sources."pify-2.3.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" + sources."process-0.11.10" sources."process-nextick-args-2.0.1" sources."process-utils-4.0.0" sources."promise-queue-2.2.5" @@ -97267,8 +93376,16 @@ in sources."querystring-0.2.1" sources."queue-microtask-1.2.3" sources."quick-lru-5.1.1" - sources."readable-stream-3.6.2" - sources."readable-web-to-node-stream-3.0.2" + (sources."readable-stream-2.3.8" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + (sources."readable-web-to-node-stream-3.0.2" // { + dependencies = [ + sources."readable-stream-3.6.2" + ]; + }) (sources."readdir-glob-1.1.3" // { dependencies = [ sources."brace-expansion-2.0.1" @@ -97276,11 +93393,13 @@ in ]; }) sources."readdirp-3.6.0" + sources."reinterval-1.1.0" sources."require-from-string-2.0.2" sources."resolve-alpn-1.2.1" sources."responselike-2.0.1" sources."restore-cursor-3.1.0" sources."reusify-1.0.4" + sources."rfdc-1.3.0" sources."run-async-2.4.1" sources."run-parallel-1.2.0" sources."run-parallel-limit-1.1.0" @@ -97295,29 +93414,47 @@ in sources."shebang-regex-3.0.0" sources."side-channel-1.0.4" sources."signal-exit-3.0.7" - sources."simple-git-3.19.1" + sources."simple-git-3.20.0" sources."slash-3.0.0" sources."sort-keys-1.1.2" sources."sort-keys-length-1.0.1" - sources."split2-3.2.2" + (sources."split2-3.2.2" // { + dependencies = [ + sources."readable-stream-3.6.2" + ]; + }) sources."sprintf-js-1.0.3" sources."sprintf-kit-2.0.1" sources."stream-buffers-3.0.2" sources."stream-promise-3.2.0" + sources."stream-shift-1.0.1" sources."string-width-4.2.3" - sources."string_decoder-1.3.0" + (sources."string_decoder-1.1.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."strip-ansi-6.0.1" sources."strip-dirs-2.1.0" sources."strip-outer-1.0.1" + sources."strnum-1.0.5" sources."strtok3-6.3.0" - sources."superagent-7.1.6" + (sources."superagent-7.1.6" // { + dependencies = [ + sources."readable-stream-3.6.2" + ]; + }) (sources."supports-color-8.1.1" // { dependencies = [ sources."has-flag-4.0.0" ]; }) sources."tar-6.2.0" - sources."tar-stream-2.2.0" + (sources."tar-stream-2.2.0" // { + dependencies = [ + sources."readable-stream-3.6.2" + ]; + }) sources."throat-5.0.0" sources."through-2.3.8" sources."timers-ext-0.1.7" @@ -97331,7 +93468,12 @@ in sources."tslib-2.6.2" sources."type-2.7.2" sources."type-fest-0.21.3" - sources."unbzip2-stream-1.4.3" + sources."typedarray-0.0.6" + (sources."unbzip2-stream-1.4.3" // { + dependencies = [ + sources."buffer-5.7.1" + ]; + }) sources."uni-global-1.0.0" sources."universalify-2.0.0" sources."untildify-4.0.0" @@ -97366,6 +93508,7 @@ in (sources."zip-stream-4.1.1" // { dependencies = [ sources."archiver-utils-3.0.4" + sources."readable-stream-3.6.2" ]; }) ]; @@ -97622,232 +93765,18 @@ in sloc = nodeEnv.buildNodePackage { name = "sloc"; packageName = "sloc"; - version = "0.2.1"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/sloc/-/sloc-0.2.1.tgz"; - sha512 = "8XJnwCFR4DatLz1s0nGFe6IJPJ+5pjRFhoBuBKq8SLgFI40eD7ak6jOXpzeG0tmIpyOc1zCs9bjKAxMFm1451A=="; + url = "https://registry.npmjs.org/sloc/-/sloc-0.3.0.tgz"; + sha512 = "fKmMA8q5OyeZpFCxBa3FuFywQcziQXKBw9B8jwDJ/Ra3H/pkZpQJl9g5s3MIjUo2jwUDHUnaxXgVXObXFdiJBw=="; }; dependencies = [ - sources."arr-diff-4.0.0" - sources."arr-flatten-1.1.0" - sources."arr-union-3.1.0" - sources."array-unique-0.3.2" - sources."assign-symbols-1.0.0" - sources."async-2.1.5" - sources."atob-2.1.2" - (sources."base-0.11.2" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."cache-base-1.0.1" - (sources."class-utils-0.3.6" // { - dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) + sources."async-3.2.4" sources."cli-table-0.3.11" - sources."collection-visit-1.0.0" sources."colors-1.0.3" - sources."commander-2.9.0" - sources."component-emitter-1.3.0" - sources."copy-descriptor-0.1.1" - sources."core-util-is-1.0.3" - sources."debug-2.6.9" - sources."decode-uri-component-0.2.2" - sources."define-property-2.0.2" - (sources."expand-brackets-2.1.4" // { - dependencies = [ - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) - (sources."extend-shallow-3.0.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - (sources."extglob-2.0.4" // { - dependencies = [ - sources."define-property-1.0.0" - sources."extend-shallow-2.0.1" - ]; - }) - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."for-in-1.0.2" - sources."fragment-cache-0.2.1" - sources."get-value-2.0.6" - sources."graceful-fs-4.2.11" - sources."graceful-readlink-1.0.1" - sources."has-value-1.0.0" - (sources."has-values-1.0.0" // { - dependencies = [ - sources."kind-of-4.0.0" - ]; - }) - sources."inherits-2.0.4" - sources."is-accessor-descriptor-1.0.0" - sources."is-buffer-1.1.6" - sources."is-data-descriptor-1.0.0" - sources."is-descriptor-1.0.2" - sources."is-extendable-0.1.1" - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-plain-object-2.0.4" - sources."is-windows-1.0.2" - sources."isarray-1.0.0" - sources."isobject-3.0.1" - sources."kind-of-6.0.3" - sources."lodash-4.17.21" - sources."map-cache-0.2.2" - sources."map-visit-1.0.0" - sources."micromatch-3.1.10" - (sources."mixin-deep-1.3.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - sources."ms-2.0.0" - sources."nanomatch-1.2.13" - (sources."object-copy-0.1.0" // { - dependencies = [ - sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) - sources."kind-of-3.2.2" - ]; - }) - sources."object-visit-1.0.1" - sources."object.pick-1.3.0" - sources."pascalcase-0.1.1" - sources."posix-character-classes-0.1.1" - sources."process-nextick-args-2.0.1" - sources."readable-stream-2.3.8" - sources."readdirp-2.2.1" - sources."regex-not-1.0.2" - sources."repeat-element-1.1.4" - sources."repeat-string-1.6.1" - sources."resolve-url-0.2.1" - sources."ret-0.1.15" - sources."safe-buffer-5.1.2" - sources."safe-regex-1.1.0" - (sources."set-value-2.0.1" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - (sources."snapdragon-0.8.2" // { - dependencies = [ - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) - (sources."snapdragon-node-2.1.1" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - (sources."snapdragon-util-3.0.1" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."source-map-0.5.7" - sources."source-map-resolve-0.5.3" - sources."source-map-url-0.4.1" - sources."split-string-3.1.0" - (sources."static-extend-0.1.2" // { - dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) - sources."string_decoder-1.1.1" - (sources."to-object-path-0.3.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."to-regex-3.0.2" - sources."to-regex-range-2.1.1" - sources."union-value-1.0.1" - (sources."unset-value-1.0.0" // { - dependencies = [ - (sources."has-value-0.3.1" // { - dependencies = [ - sources."isobject-2.1.0" - ]; - }) - sources."has-values-0.1.4" - ]; - }) - sources."urix-0.1.0" - sources."use-3.1.1" - sources."util-deprecate-1.0.2" + sources."commander-11.0.0" + sources."picomatch-2.3.1" + sources."readdirp-3.6.0" ]; buildInputs = globalBuildInputs; meta = { @@ -98024,7 +93953,7 @@ in sources."@socket.io/component-emitter-3.1.0" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.14" - sources."@types/node-20.6.1" + sources."@types/node-20.8.1" sources."accepts-1.3.8" sources."base64id-2.0.0" sources."bufferutil-4.0.7" @@ -98074,8 +94003,8 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/helper-validator-identifier-7.22.19" - (sources."@babel/highlight-7.22.13" // { + sources."@babel/helper-validator-identifier-7.22.20" + (sources."@babel/highlight-7.22.20" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -98085,8 +94014,8 @@ in sources."supports-color-5.5.0" ]; }) - sources."@types/minimist-1.2.2" - sources."@types/normalize-package-data-2.4.1" + sources."@types/minimist-1.2.3" + sources."@types/normalize-package-data-2.4.2" sources."agent-base-4.3.0" sources."ansi-escapes-5.0.0" sources."ansi-regex-6.0.1" @@ -98173,7 +94102,7 @@ in sources."restore-cursor-4.0.0" sources."round-to-6.0.0" sources."safe-buffer-5.2.1" - sources."sax-1.2.4" + sources."sax-1.3.0" sources."semver-7.5.4" sources."signal-exit-3.0.7" (sources."slice-ansi-5.0.0" // { @@ -98184,7 +94113,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.13" + sources."spdx-license-ids-3.0.15" (sources."speedtest-net-1.6.2" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -98277,34 +94206,34 @@ in svelte-check = nodeEnv.buildNodePackage { name = "svelte-check"; packageName = "svelte-check"; - version = "3.5.1"; + version = "3.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-check/-/svelte-check-3.5.1.tgz"; - sha512 = "+Zb4iHxAhdUtcUg/WJPRjlS1RJalIsWAe9Mz6G1zyznSs7dDkT7VUBdXc3q7Iwg49O/VrZgyJRvOJkjuBfKjFA=="; + url = "https://registry.npmjs.org/svelte-check/-/svelte-check-3.5.2.tgz"; + sha512 = "5a/YWbiH4c+AqAUP+0VneiV5bP8YOk9JL3jwvN+k2PEPLgpu85bjQc5eE67+eIZBBwUEJzmO3I92OqKcqbp3fw=="; }; dependencies = [ sources."@ampproject/remapping-2.2.1" sources."@babel/code-frame-7.22.13" - sources."@babel/compat-data-7.22.9" - sources."@babel/core-7.22.19" - sources."@babel/generator-7.22.15" + sources."@babel/compat-data-7.22.20" + sources."@babel/core-7.23.0" + sources."@babel/generator-7.23.0" sources."@babel/helper-compilation-targets-7.22.15" - sources."@babel/helper-environment-visitor-7.22.5" - sources."@babel/helper-function-name-7.22.5" + sources."@babel/helper-environment-visitor-7.22.20" + sources."@babel/helper-function-name-7.23.0" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-module-imports-7.22.15" - sources."@babel/helper-module-transforms-7.22.19" + sources."@babel/helper-module-transforms-7.23.0" sources."@babel/helper-simple-access-7.22.5" sources."@babel/helper-split-export-declaration-7.22.6" sources."@babel/helper-string-parser-7.22.5" - sources."@babel/helper-validator-identifier-7.22.19" + sources."@babel/helper-validator-identifier-7.22.20" sources."@babel/helper-validator-option-7.22.15" - sources."@babel/helpers-7.22.15" - sources."@babel/highlight-7.22.13" - sources."@babel/parser-7.22.16" + sources."@babel/helpers-7.23.1" + sources."@babel/highlight-7.22.20" + sources."@babel/parser-7.23.0" sources."@babel/template-7.22.15" - sources."@babel/traverse-7.22.19" - sources."@babel/types-7.22.19" + sources."@babel/traverse-7.23.0" + sources."@babel/types-7.23.0" (sources."@cspotcode/source-map-support-0.8.1" // { dependencies = [ sources."@jridgewell/trace-mapping-0.3.9" @@ -98318,27 +94247,18 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.85" - sources."@swc/core-darwin-arm64-1.3.85" - sources."@swc/core-darwin-x64-1.3.85" - sources."@swc/core-linux-arm-gnueabihf-1.3.85" - sources."@swc/core-linux-arm64-gnu-1.3.85" - sources."@swc/core-linux-arm64-musl-1.3.85" - sources."@swc/core-linux-x64-gnu-1.3.85" - sources."@swc/core-linux-x64-musl-1.3.85" - sources."@swc/core-win32-arm64-msvc-1.3.85" - sources."@swc/core-win32-ia32-msvc-1.3.85" - sources."@swc/core-win32-x64-msvc-1.3.85" + sources."@swc/core-1.3.91" + sources."@swc/counter-0.1.2" sources."@swc/helpers-0.5.2" - sources."@swc/types-0.1.4" - sources."@swc/wasm-1.3.85" + sources."@swc/types-0.1.5" + sources."@swc/wasm-1.3.91" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/estree-1.0.1" - sources."@types/node-20.6.1" - sources."@types/pug-2.0.6" + sources."@types/estree-1.0.2" + sources."@types/node-20.8.1" + sources."@types/pug-2.0.7" sources."acorn-8.10.0" sources."acorn-walk-8.2.0" sources."ansi-styles-3.2.1" @@ -98354,11 +94274,11 @@ in sources."binary-extensions-2.2.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.21.10" + sources."browserslist-4.22.1" sources."buffer-crc32-0.2.13" sources."call-bind-1.0.2" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001534" + sources."caniuse-lite-1.0.30001542" sources."chalk-2.4.2" sources."character-parser-2.2.0" sources."chokidar-3.5.3" @@ -98368,7 +94288,7 @@ in sources."color-name-1.1.3" sources."concat-map-0.0.1" sources."constantinople-4.0.1" - sources."convert-source-map-1.9.0" + sources."convert-source-map-2.0.0" sources."copy-anything-2.0.6" sources."create-require-1.1.1" sources."css-3.0.0" @@ -98379,7 +94299,7 @@ in sources."detect-indent-6.1.0" sources."diff-4.0.2" sources."doctypes-1.1.0" - sources."electron-to-chromium-1.4.523" + sources."electron-to-chromium-1.4.538" sources."errno-0.1.8" sources."es6-promise-3.3.1" sources."escalade-3.1.1" @@ -98466,7 +94386,7 @@ in sources."picocolors-1.0.0" sources."picomatch-2.3.1" sources."pify-4.0.1" - sources."postcss-8.4.29" + sources."postcss-8.4.31" sources."postcss-load-config-4.0.1" sources."promise-7.3.1" sources."prr-1.0.1" @@ -98484,7 +94404,7 @@ in sources."pug-walk-2.0.0" sources."queue-microtask-1.2.3" sources."readdirp-3.6.0" - sources."resolve-1.22.5" + sources."resolve-1.22.6" sources."resolve-from-4.0.0" sources."reusify-1.0.4" sources."rimraf-2.7.1" @@ -98492,8 +94412,8 @@ in sources."sade-1.8.1" sources."safer-buffer-2.1.2" sources."sander-0.5.1" - sources."sass-1.67.0" - sources."sax-1.2.4" + sources."sass-1.68.0" + sources."sax-1.3.0" sources."semver-6.3.1" sources."sorcery-0.11.0" sources."source-map-0.6.1" @@ -98505,15 +94425,16 @@ in sources."debug-3.1.0" sources."mkdirp-1.0.4" sources."ms-2.0.0" + sources."sax-1.2.4" sources."source-map-0.7.4" ]; }) sources."sugarss-4.0.1" sources."supports-color-5.5.0" sources."supports-preserve-symlinks-flag-1.0.0" - (sources."svelte-4.2.0" // { + (sources."svelte-4.2.1" // { dependencies = [ - sources."magic-string-0.30.3" + sources."magic-string-0.30.4" ]; }) sources."svelte-preprocess-5.0.4" @@ -98523,7 +94444,7 @@ in sources."ts-node-10.9.1" sources."tslib-2.6.2" sources."typescript-5.2.2" - sources."update-browserslist-db-1.0.11" + sources."update-browserslist-db-1.0.13" sources."v8-compile-cache-lib-3.0.1" sources."void-elements-3.1.0" sources."with-7.0.2" @@ -98545,34 +94466,34 @@ in svelte-language-server = nodeEnv.buildNodePackage { name = "svelte-language-server"; packageName = "svelte-language-server"; - version = "0.15.18"; + version = "0.15.19"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.15.18.tgz"; - sha512 = "dNMcHjUgNrl3IvAJqIo36a1hTPINWgGx4uAKjfCim32z4B+gx8B3bYqiv7FeHaE+w2Xpn1tiADix/RK77KYb0g=="; + url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.15.19.tgz"; + sha512 = "Ge31qUlrLcnYJErDUWqjYDhwUyXxDLN8+2efApqNcV7UZQtBLOZ8Hm+NYYl/MJxjwsKT3eKEe13HJBwB5kciJA=="; }; dependencies = [ sources."@ampproject/remapping-2.2.1" sources."@babel/code-frame-7.22.13" - sources."@babel/compat-data-7.22.9" - sources."@babel/core-7.22.19" - sources."@babel/generator-7.22.15" + sources."@babel/compat-data-7.22.20" + sources."@babel/core-7.23.0" + sources."@babel/generator-7.23.0" sources."@babel/helper-compilation-targets-7.22.15" - sources."@babel/helper-environment-visitor-7.22.5" - sources."@babel/helper-function-name-7.22.5" + sources."@babel/helper-environment-visitor-7.22.20" + sources."@babel/helper-function-name-7.23.0" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-module-imports-7.22.15" - sources."@babel/helper-module-transforms-7.22.19" + sources."@babel/helper-module-transforms-7.23.0" sources."@babel/helper-simple-access-7.22.5" sources."@babel/helper-split-export-declaration-7.22.6" sources."@babel/helper-string-parser-7.22.5" - sources."@babel/helper-validator-identifier-7.22.19" + sources."@babel/helper-validator-identifier-7.22.20" sources."@babel/helper-validator-option-7.22.15" - sources."@babel/helpers-7.22.15" - sources."@babel/highlight-7.22.13" - sources."@babel/parser-7.22.16" + sources."@babel/helpers-7.23.1" + sources."@babel/highlight-7.22.20" + sources."@babel/parser-7.23.0" sources."@babel/template-7.22.15" - sources."@babel/traverse-7.22.19" - sources."@babel/types-7.22.19" + sources."@babel/traverse-7.23.0" + sources."@babel/types-7.23.0" (sources."@cspotcode/source-map-support-0.8.1" // { dependencies = [ sources."@jridgewell/trace-mapping-0.3.9" @@ -98589,26 +94510,17 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.85" - sources."@swc/core-darwin-arm64-1.3.85" - sources."@swc/core-darwin-x64-1.3.85" - sources."@swc/core-linux-arm-gnueabihf-1.3.85" - sources."@swc/core-linux-arm64-gnu-1.3.85" - sources."@swc/core-linux-arm64-musl-1.3.85" - sources."@swc/core-linux-x64-gnu-1.3.85" - sources."@swc/core-linux-x64-musl-1.3.85" - sources."@swc/core-win32-arm64-msvc-1.3.85" - sources."@swc/core-win32-ia32-msvc-1.3.85" - sources."@swc/core-win32-x64-msvc-1.3.85" + sources."@swc/core-1.3.91" + sources."@swc/counter-0.1.2" sources."@swc/helpers-0.5.2" - sources."@swc/types-0.1.4" - sources."@swc/wasm-1.3.85" + sources."@swc/types-0.1.5" + sources."@swc/wasm-1.3.91" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.6.1" - sources."@types/pug-2.0.6" + sources."@types/node-20.8.1" + sources."@types/pug-2.0.7" (sources."@vscode/emmet-helper-2.8.4" // { dependencies = [ sources."vscode-uri-2.1.2" @@ -98628,10 +94540,10 @@ in sources."binary-extensions-2.2.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.21.10" + sources."browserslist-4.22.1" sources."buffer-crc32-0.2.13" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001534" + sources."caniuse-lite-1.0.30001542" sources."chalk-2.4.2" sources."character-parser-2.2.0" sources."chokidar-3.5.3" @@ -98640,7 +94552,7 @@ in sources."color-name-1.1.3" sources."concat-map-0.0.1" sources."constantinople-4.0.1" - sources."convert-source-map-1.9.0" + sources."convert-source-map-2.0.0" sources."copy-anything-2.0.6" sources."create-require-1.1.1" sources."css-3.0.0" @@ -98650,7 +94562,7 @@ in sources."detect-indent-6.1.0" sources."diff-4.0.2" sources."doctypes-1.1.0" - sources."electron-to-chromium-1.4.523" + sources."electron-to-chromium-1.4.538" sources."emmet-2.4.6" sources."errno-0.1.8" sources."es6-promise-3.3.1" @@ -98736,7 +94648,7 @@ in sources."picocolors-1.0.0" sources."picomatch-2.3.1" sources."pify-4.0.1" - sources."postcss-8.4.29" + sources."postcss-8.4.31" sources."postcss-load-config-4.0.1" sources."prettier-2.8.8" sources."prettier-plugin-svelte-2.10.1" @@ -98756,14 +94668,14 @@ in sources."pug-walk-2.0.0" sources."queue-microtask-1.2.3" sources."readdirp-3.6.0" - sources."resolve-1.22.5" + sources."resolve-1.22.6" sources."reusify-1.0.4" sources."rimraf-2.7.1" sources."run-parallel-1.2.0" sources."safer-buffer-2.1.2" sources."sander-0.5.1" - sources."sass-1.67.0" - sources."sax-1.2.4" + sources."sass-1.68.0" + sources."sax-1.3.0" sources."semver-6.3.1" sources."sorcery-0.11.0" sources."source-map-0.6.1" @@ -98775,6 +94687,7 @@ in sources."debug-3.1.0" sources."mkdirp-1.0.4" sources."ms-2.0.0" + sources."sax-1.2.4" sources."source-map-0.7.4" ]; }) @@ -98783,30 +94696,30 @@ in sources."supports-preserve-symlinks-flag-1.0.0" sources."svelte-3.59.2" sources."svelte-preprocess-5.0.4" - sources."svelte2tsx-0.6.21" + sources."svelte2tsx-0.6.22" sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" sources."token-stream-1.0.0" sources."ts-node-10.9.1" sources."tslib-2.6.2" sources."typescript-5.2.2" - sources."update-browserslist-db-1.0.11" + sources."update-browserslist-db-1.0.13" sources."v8-compile-cache-lib-3.0.1" sources."void-elements-3.1.0" - (sources."vscode-css-languageservice-6.2.7" // { + (sources."vscode-css-languageservice-6.2.9" // { dependencies = [ sources."vscode-languageserver-types-3.17.3" ]; }) (sources."vscode-html-languageservice-5.0.7" // { dependencies = [ - sources."vscode-languageserver-types-3.17.3" + sources."vscode-languageserver-types-3.17.5" ]; }) sources."vscode-jsonrpc-8.0.2" sources."vscode-languageserver-8.0.2" sources."vscode-languageserver-protocol-3.17.2" - sources."vscode-languageserver-textdocument-1.0.10" + sources."vscode-languageserver-textdocument-1.0.11" sources."vscode-languageserver-types-3.17.2" sources."vscode-nls-5.2.0" sources."vscode-uri-3.0.7" @@ -98886,25 +94799,16 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.85" - sources."@swc/core-darwin-arm64-1.3.85" - sources."@swc/core-darwin-x64-1.3.85" - sources."@swc/core-linux-arm-gnueabihf-1.3.85" - sources."@swc/core-linux-arm64-gnu-1.3.85" - sources."@swc/core-linux-arm64-musl-1.3.85" - sources."@swc/core-linux-x64-gnu-1.3.85" - sources."@swc/core-linux-x64-musl-1.3.85" - sources."@swc/core-win32-arm64-msvc-1.3.85" - sources."@swc/core-win32-ia32-msvc-1.3.85" - sources."@swc/core-win32-x64-msvc-1.3.85" + sources."@swc/core-1.3.91" + sources."@swc/counter-0.1.2" sources."@swc/helpers-0.5.2" - sources."@swc/types-0.1.4" - sources."@swc/wasm-1.3.85" + sources."@swc/types-0.1.5" + sources."@swc/wasm-1.3.91" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.6.1" + sources."@types/node-20.8.1" sources."acorn-8.10.0" sources."acorn-walk-8.2.0" sources."any-promise-1.3.0" @@ -98966,7 +94870,7 @@ in sources."picomatch-2.3.1" sources."pify-2.3.0" sources."pirates-4.0.6" - sources."postcss-8.4.29" + sources."postcss-8.4.31" sources."postcss-import-15.1.0" sources."postcss-js-4.0.1" sources."postcss-load-config-4.0.1" @@ -98976,7 +94880,7 @@ in sources."queue-microtask-1.2.3" sources."read-cache-1.0.0" sources."readdirp-3.6.0" - sources."resolve-1.22.5" + sources."resolve-1.22.6" sources."reusify-1.0.4" sources."run-parallel-1.2.0" sources."source-map-js-1.0.2" @@ -99110,7 +95014,7 @@ in sources."@textlint/textlint-plugin-text-13.3.3" sources."@textlint/types-13.3.3" sources."@textlint/utils-13.3.3" - sources."@types/mdast-3.0.12" + sources."@types/mdast-3.0.13" sources."@types/unist-2.0.8" sources."ajv-8.12.0" sources."ansi-regex-5.0.1" @@ -99251,14 +95155,14 @@ in sources."remark-parse-9.0.0" sources."repeat-string-1.6.1" sources."require-from-string-2.0.2" - sources."resolve-1.22.5" + sources."resolve-1.22.6" sources."rimraf-2.6.3" sources."semver-5.7.2" sources."slice-ansi-4.0.0" sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.13" + sources."spdx-license-ids-3.0.15" sources."sprintf-js-1.0.3" sources."string-width-4.2.3" sources."strip-ansi-6.0.1" @@ -99362,14 +95266,14 @@ in }; dependencies = [ sources."@babel/code-frame-7.22.13" - sources."@babel/helper-validator-identifier-7.22.19" - sources."@babel/highlight-7.22.13" + sources."@babel/helper-validator-identifier-7.22.20" + sources."@babel/highlight-7.22.20" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@textlint/ast-node-types-13.3.3" - sources."@types/hast-2.3.5" - sources."@types/minimist-1.2.2" - sources."@types/normalize-package-data-2.4.1" + sources."@types/hast-2.3.6" + sources."@types/minimist-1.2.3" + sources."@types/normalize-package-data-2.4.2" sources."@types/parse5-5.0.3" sources."@types/unist-2.0.8" sources."alex-9.1.1" @@ -99619,7 +95523,7 @@ in sources."remark-retext-4.0.0" sources."remark-stringify-8.1.1" sources."repeat-string-1.6.1" - sources."resolve-1.22.5" + sources."resolve-1.22.6" sources."resolve-from-5.0.0" sources."responselike-1.0.2" sources."retext-english-3.0.4" @@ -99645,7 +95549,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.13" + sources."spdx-license-ids-3.0.15" sources."split-0.2.10" (sources."split-transform-stream-0.1.1" // { dependencies = [ @@ -99959,10 +95863,10 @@ in textlint-rule-stop-words = nodeEnv.buildNodePackage { name = "textlint-rule-stop-words"; packageName = "textlint-rule-stop-words"; - version = "3.0.1"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-rule-stop-words/-/textlint-rule-stop-words-3.0.1.tgz"; - sha512 = "gO4N3OnPLvE6+fvJ1Y5m8MzDVrqMEWzW8pTGMXjL8VAXmQkD6YQ9eDMbsVN0/DzEe8tcsBqNgA/iIrQ64oECuQ=="; + url = "https://registry.npmjs.org/textlint-rule-stop-words/-/textlint-rule-stop-words-4.0.0.tgz"; + sha512 = "vP99cbTyapn+Hviom2doO3pJtjlhKlZvlHTf21zoB22CxJx2w3S7Ie169neB5U4Xsei+NodHf5tnwT933mO19A=="; }; dependencies = [ sources."@textlint/ast-node-types-13.3.3" @@ -100152,10 +96056,10 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.14" - sources."@types/http-cache-semantics-4.0.1" + sources."@types/http-cache-semantics-4.0.2" sources."@types/keyv-3.1.4" - sources."@types/node-20.6.1" - sources."@types/responselike-1.0.0" + sources."@types/node-20.8.1" + sources."@types/responselike-1.0.1" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" sources."accepts-1.3.8" @@ -100213,7 +96117,7 @@ in sources."content-type-1.0.5" sources."cookie-0.4.2" sources."cookie-signature-1.0.6" - sources."core-js-3.32.2" + sources."core-js-3.33.0" sources."core-util-is-1.0.2" sources."cors-2.8.5" sources."css-select-4.3.0" @@ -100641,7 +96545,7 @@ in sources."content-type-1.0.5" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.32.2" + sources."core-js-3.33.0" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -100879,7 +96783,7 @@ in sources."rimraf-2.7.1" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."sax-1.2.4" + sources."sax-1.3.0" sources."semver-6.3.0" (sources."send-0.17.1" // { dependencies = [ @@ -101234,10 +97138,10 @@ in sources."@szmarczak/http-timer-4.0.6" sources."@tokenizer/token-0.3.0" sources."@types/cacheable-request-6.0.3" - sources."@types/http-cache-semantics-4.0.1" + sources."@types/http-cache-semantics-4.0.2" sources."@types/keyv-3.1.4" - sources."@types/node-20.6.1" - sources."@types/responselike-1.0.0" + sources."@types/node-20.8.1" + sources."@types/responselike-1.0.1" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" (sources."accepts-1.3.8" // { @@ -101317,7 +97221,7 @@ in sources."content-type-1.0.5" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.32.2" + sources."core-js-3.33.0" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -101580,7 +97484,7 @@ in sources."rimraf-2.7.1" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."sax-1.2.4" + sources."sax-1.3.0" sources."semver-7.3.2" (sources."send-0.17.1" // { dependencies = [ @@ -101702,10 +97606,10 @@ in sources."@szmarczak/http-timer-4.0.6" sources."@tokenizer/token-0.3.0" sources."@types/cacheable-request-6.0.3" - sources."@types/http-cache-semantics-4.0.1" + sources."@types/http-cache-semantics-4.0.2" sources."@types/keyv-3.1.4" - sources."@types/node-20.6.1" - sources."@types/responselike-1.0.0" + sources."@types/node-20.8.1" + sources."@types/responselike-1.0.1" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" (sources."accepts-1.3.8" // { @@ -101785,7 +97689,7 @@ in sources."content-type-1.0.5" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.32.2" + sources."core-js-3.33.0" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -102048,7 +97952,7 @@ in sources."rimraf-2.7.1" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."sax-1.2.4" + sources."sax-1.3.0" sources."semver-7.3.2" (sources."send-0.17.1" // { dependencies = [ @@ -102634,25 +98538,16 @@ in sources."@jridgewell/resolve-uri-3.1.1" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.9" - sources."@swc/core-1.3.85" - sources."@swc/core-darwin-arm64-1.3.85" - sources."@swc/core-darwin-x64-1.3.85" - sources."@swc/core-linux-arm-gnueabihf-1.3.85" - sources."@swc/core-linux-arm64-gnu-1.3.85" - sources."@swc/core-linux-arm64-musl-1.3.85" - sources."@swc/core-linux-x64-gnu-1.3.85" - sources."@swc/core-linux-x64-musl-1.3.85" - sources."@swc/core-win32-arm64-msvc-1.3.85" - sources."@swc/core-win32-ia32-msvc-1.3.85" - sources."@swc/core-win32-x64-msvc-1.3.85" + sources."@swc/core-1.3.91" + sources."@swc/counter-0.1.2" sources."@swc/helpers-0.5.2" - sources."@swc/types-0.1.4" - sources."@swc/wasm-1.3.85" + sources."@swc/types-0.1.5" + sources."@swc/wasm-1.3.91" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.6.1" + sources."@types/node-20.8.1" sources."acorn-8.10.0" sources."acorn-walk-8.2.0" sources."arg-4.1.3" @@ -102751,26 +98646,27 @@ in unified-language-server = nodeEnv.buildNodePackage { name = "unified-language-server"; packageName = "unified-language-server"; - version = "3.1.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/unified-language-server/-/unified-language-server-3.1.0.tgz"; - sha512 = "5+qWt66my+GdFZLK7Hgv3jpzzlQRsH3LgPlFL8BaApBq3KXSoNShVrPDtE2m8oyDKIfTKJZQ6Ai4Od25B7qQfw=="; + url = "https://registry.npmjs.org/unified-language-server/-/unified-language-server-4.0.0.tgz"; + sha512 = "QuiszzQwHu8OOUHJpe7sM4UcF8C1zmjpvVZNPca2NE/jW2QVLmQ0iSyujdza/+spOoMwVmPIrv0Ws3Ew3RJO/w=="; }; dependencies = [ sources."@babel/code-frame-7.22.13" - sources."@babel/helper-validator-identifier-7.22.19" - sources."@babel/highlight-7.22.13" + sources."@babel/helper-validator-identifier-7.22.20" + sources."@babel/highlight-7.22.20" sources."@isaacs/cliui-8.0.2" - sources."@npmcli/config-6.2.1" + sources."@npmcli/config-6.3.0" sources."@npmcli/map-workspaces-3.0.4" sources."@npmcli/name-from-folder-2.0.0" sources."@types/concat-stream-2.0.0" - sources."@types/debug-4.1.8" + sources."@types/debug-4.1.9" sources."@types/is-empty-1.2.1" - sources."@types/ms-0.7.31" - sources."@types/node-18.17.16" + sources."@types/ms-0.7.32" + sources."@types/node-20.8.1" sources."@types/supports-color-8.1.1" - sources."@types/unist-2.0.8" + sources."@types/unist-3.0.0" + sources."@ungap/structured-clone-1.2.0" sources."abbrev-2.0.0" sources."ansi-regex-5.0.1" sources."ansi-styles-6.2.1" @@ -102794,25 +98690,20 @@ in sources."emoji-regex-9.2.2" sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" - sources."fault-2.0.1" sources."find-up-6.3.0" sources."foreground-child-3.1.1" - sources."format-0.2.2" - sources."fs.realpath-1.0.0" - sources."glob-10.3.4" + sources."glob-10.3.10" sources."has-flag-3.0.0" sources."ignore-5.2.4" sources."import-meta-resolve-2.2.2" - sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-4.1.1" sources."is-arrayish-0.2.1" - sources."is-buffer-2.0.5" sources."is-empty-1.2.0" sources."is-fullwidth-code-point-3.0.0" sources."is-plain-obj-4.1.0" sources."isexe-2.0.0" - sources."jackspeak-2.3.3" + sources."jackspeak-2.3.6" sources."js-tokens-4.0.0" sources."json-parse-even-better-errors-3.0.0" sources."lines-and-columns-2.0.3" @@ -102820,18 +98711,13 @@ in sources."locate-path-7.2.0" sources."lru-cache-10.0.1" sources."minimatch-9.0.3" - sources."minipass-7.0.3" + sources."minipass-7.0.4" sources."ms-2.1.2" sources."nopt-7.2.0" sources."npm-normalize-package-bin-3.0.1" - sources."once-1.4.0" sources."p-limit-4.0.0" sources."p-locate-6.0.0" - (sources."parse-json-6.0.2" // { - dependencies = [ - sources."json-parse-even-better-errors-2.3.1" - ]; - }) + sources."parse-json-7.1.0" sources."path-exists-5.0.0" sources."path-key-3.1.1" sources."path-scurry-1.10.1" @@ -102862,32 +98748,30 @@ in }) sources."strip-ansi-cjs-6.0.1" sources."supports-color-5.5.0" - sources."to-vfile-7.2.4" sources."trough-2.1.0" + sources."type-fest-3.13.1" sources."typedarray-0.0.6" - (sources."unified-engine-10.1.0" // { - dependencies = [ - sources."glob-8.1.0" - sources."minimatch-5.1.6" - ]; - }) - sources."unist-util-inspect-7.0.2" - sources."unist-util-stringify-position-3.0.3" + sources."unified-engine-11.1.0" + sources."unist-util-inspect-8.0.0" + sources."unist-util-lsp-2.1.0" + sources."unist-util-stringify-position-4.0.0" sources."util-deprecate-1.0.2" - sources."vfile-5.3.7" - sources."vfile-message-3.1.4" - (sources."vfile-reporter-7.0.5" // { + sources."vfile-6.0.1" + sources."vfile-message-4.0.2" + (sources."vfile-reporter-8.1.0" // { dependencies = [ + sources."emoji-regex-10.2.1" + sources."string-width-6.1.0" sources."supports-color-9.4.0" ]; }) - sources."vfile-sort-3.0.1" - sources."vfile-statistics-2.0.1" - sources."vscode-jsonrpc-8.1.0" - sources."vscode-languageserver-8.1.0" - sources."vscode-languageserver-protocol-3.17.3" - sources."vscode-languageserver-textdocument-1.0.10" - sources."vscode-languageserver-types-3.17.3" + sources."vfile-sort-4.0.0" + sources."vfile-statistics-3.0.0" + sources."vscode-jsonrpc-8.2.0" + sources."vscode-languageserver-9.0.1" + sources."vscode-languageserver-protocol-3.17.5" + sources."vscode-languageserver-textdocument-1.0.11" + sources."vscode-languageserver-types-3.17.5" sources."walk-up-path-3.0.1" sources."which-2.0.2" sources."wrap-ansi-8.1.0" @@ -102899,7 +98783,6 @@ in sources."strip-ansi-6.0.1" ]; }) - sources."wrappy-1.0.2" sources."yallist-4.0.0" sources."yaml-2.3.2" sources."yocto-queue-1.0.0" @@ -102924,7 +98807,7 @@ in }; dependencies = [ sources."@mapbox/node-pre-gyp-1.0.11" - sources."@types/estree-1.0.1" + sources."@types/estree-1.0.2" sources."@types/geojson-7946.0.4" sources."abbrev-1.1.1" sources."agent-base-6.0.2" @@ -103088,13 +98971,13 @@ in vega-lite = nodeEnv.buildNodePackage { name = "vega-lite"; packageName = "vega-lite"; - version = "5.15.0"; + version = "5.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/vega-lite/-/vega-lite-5.15.0.tgz"; - sha512 = "Eac4VBhdtwbJQWH8m2OaRba/YVZbUHlmTAiPfiF3XIapJ73rcs+gHZBE1DfYgfoGjBN+5YJUMvdgm4UE7j/Ncg=="; + url = "https://registry.npmjs.org/vega-lite/-/vega-lite-5.15.1.tgz"; + sha512 = "NpHwK8iLtW2OY0uDmtgSXQ2kuIc65vypTSXPD8q5mcfdVGn97OghhJwwRNn5ZYi7v0BEvdKBfMjQIbQhBpcwQA=="; }; dependencies = [ - sources."@types/estree-1.0.1" + sources."@types/estree-1.0.2" sources."@types/geojson-7946.0.4" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -103197,13 +99080,12 @@ in vercel = nodeEnv.buildNodePackage { name = "vercel"; packageName = "vercel"; - version = "32.2.4"; + version = "32.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/vercel/-/vercel-32.2.4.tgz"; - sha512 = "Vdp/kglvpxcmY+yaQ+4/qZm8O8Hu9sn/JTpdfXNaxAcHP4Pt3GmHTZJmY0K6bQ2MoXjE0/Tp0h9BfHLUoNjRIw=="; + url = "https://registry.npmjs.org/vercel/-/vercel-32.3.1.tgz"; + sha512 = "XPwkXNbsqyqGy4kNo5T2At9TK71rfT/d9t55bUTkhWCHv62CZrZ+HdKrkZf2knx3mi11zeCWAU+2GvX9G1+3hw=="; }; dependencies = [ - sources."@babel/runtime-7.12.1" sources."@cspotcode/source-map-support-0.8.1" sources."@edge-runtime/cookies-3.4.1" sources."@edge-runtime/format-2.2.0" @@ -103215,7 +99097,20 @@ in sources."@jridgewell/trace-mapping-0.3.9" (sources."@mapbox/node-pre-gyp-1.0.11" // { dependencies = [ - sources."semver-7.5.4" + sources."chownr-2.0.0" + (sources."fs-minipass-2.1.0" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) + sources."minipass-5.0.0" + (sources."minizlib-2.1.2" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) + sources."mkdirp-1.0.4" + sources."tar-6.2.0" ]; }) sources."@nodelib/fs.scandir-2.1.5" @@ -103223,39 +99118,52 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@rollup/pluginutils-4.2.1" sources."@sinclair/typebox-0.25.24" - sources."@swc/core-1.3.85" - sources."@swc/core-darwin-arm64-1.3.85" - sources."@swc/core-darwin-x64-1.3.85" - sources."@swc/core-linux-arm-gnueabihf-1.3.85" - sources."@swc/core-linux-arm64-gnu-1.3.85" - sources."@swc/core-linux-arm64-musl-1.3.85" - sources."@swc/core-linux-x64-gnu-1.3.85" - sources."@swc/core-linux-x64-musl-1.3.85" - sources."@swc/core-win32-arm64-msvc-1.3.85" - sources."@swc/core-win32-ia32-msvc-1.3.85" - sources."@swc/core-win32-x64-msvc-1.3.85" + sources."@swc/core-1.3.91" + sources."@swc/counter-0.1.2" sources."@swc/helpers-0.5.2" - sources."@swc/types-0.1.4" - sources."@swc/wasm-1.3.85" - sources."@ts-morph/common-0.11.1" + sources."@swc/types-0.1.5" + sources."@swc/wasm-1.3.91" + sources."@tootallnate/once-2.0.0" + (sources."@ts-morph/common-0.11.1" // { + dependencies = [ + sources."mkdirp-1.0.4" + ]; + }) sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" sources."@types/json-schema-7.0.13" sources."@types/node-14.18.33" - sources."@vercel/build-utils-7.2.0" + sources."@vercel/build-utils-7.2.1" sources."@vercel/error-utils-2.0.1" - sources."@vercel/gatsby-plugin-vercel-analytics-1.0.10" - sources."@vercel/gatsby-plugin-vercel-builder-2.0.5" - sources."@vercel/go-3.0.1" + sources."@vercel/fun-1.1.0" + sources."@vercel/gatsby-plugin-vercel-analytics-1.0.11" + (sources."@vercel/gatsby-plugin-vercel-builder-2.0.6" // { + dependencies = [ + sources."fs-extra-11.1.0" + sources."jsonfile-6.1.0" + sources."universalify-2.0.0" + ]; + }) + sources."@vercel/go-3.0.2" sources."@vercel/hydrogen-1.0.1" - sources."@vercel/next-4.0.5" - sources."@vercel/nft-0.22.5" - sources."@vercel/node-3.0.5" - sources."@vercel/python-4.0.1" - sources."@vercel/redwood-2.0.2" - sources."@vercel/remix-builder-2.0.5" + sources."@vercel/next-4.0.8" + sources."@vercel/nft-0.24.1" + (sources."@vercel/node-3.0.6" // { + dependencies = [ + sources."async-listen-3.0.0" + sources."node-fetch-2.6.9" + sources."path-to-regexp-6.2.1" + ]; + }) + sources."@vercel/python-4.0.2" + (sources."@vercel/redwood-2.0.3" // { + dependencies = [ + sources."semver-6.3.1" + ]; + }) + sources."@vercel/remix-builder-2.0.8" (sources."@vercel/routing-utils-3.0.0" // { dependencies = [ sources."ajv-6.12.6" @@ -103264,7 +99172,7 @@ in ]; }) sources."@vercel/ruby-2.0.2" - sources."@vercel/static-build-2.0.6" + sources."@vercel/static-build-2.0.7" sources."@vercel/static-config-3.0.0" sources."abbrev-1.1.1" sources."acorn-8.10.0" @@ -103272,35 +99180,49 @@ in sources."agent-base-6.0.2" sources."ajv-8.6.3" sources."ansi-regex-5.0.1" + sources."any-promise-1.3.0" + sources."anymatch-3.1.3" sources."aproba-2.0.0" sources."are-we-there-yet-2.0.0" - sources."arg-4.1.3" - sources."async-listen-3.0.0" + sources."arg-4.1.0" + sources."async-listen-1.2.0" sources."async-sema-3.1.1" sources."balanced-match-1.0.2" + sources."binary-extensions-2.2.0" sources."bindings-1.5.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" + sources."buffer-crc32-0.2.13" sources."busboy-1.6.0" - sources."chownr-2.0.0" + sources."bytes-3.1.0" + sources."chokidar-3.3.1" + sources."chownr-1.1.4" sources."code-block-writer-10.1.1" sources."color-support-1.1.3" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" - sources."content-type-1.0.5" + sources."content-type-1.0.4" sources."convert-hrtime-3.0.0" sources."create-require-1.1.1" - sources."debug-4.3.4" + sources."cross-spawn-7.0.3" + sources."debug-4.1.1" sources."delegates-1.0.0" + sources."depd-1.1.2" sources."detect-libc-2.0.2" sources."diff-4.0.2" (sources."edge-runtime-2.5.1" // { dependencies = [ sources."async-listen-3.0.1" + sources."signal-exit-4.0.2" ]; }) sources."emoji-regex-8.0.0" - sources."encoding-0.1.13" + (sources."encoding-0.1.13" // { + dependencies = [ + sources."iconv-lite-0.6.3" + ]; + }) + sources."end-of-stream-1.4.4" sources."esbuild-0.14.47" sources."esbuild-android-64-0.14.47" sources."esbuild-android-arm64-0.14.47" @@ -103324,73 +99246,101 @@ in sources."esbuild-windows-arm64-0.14.47" sources."estree-walker-2.0.2" sources."etag-1.8.1" + sources."events-intercept-2.0.0" + sources."execa-3.2.0" sources."exit-hook-2.2.1" sources."fast-deep-equal-3.1.3" sources."fast-glob-3.3.1" sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.15.0" + sources."fd-slicer-1.1.0" sources."file-uri-to-path-1.0.0" sources."fill-range-7.0.1" - sources."fs-extra-11.1.0" - (sources."fs-minipass-2.1.0" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) + sources."fs-extra-8.1.0" + sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" - (sources."gauge-3.0.2" // { - dependencies = [ - sources."signal-exit-3.0.7" - ]; - }) + sources."fsevents-2.1.3" + sources."gauge-3.0.2" + sources."generic-pool-3.4.2" + sources."get-stream-5.2.0" sources."glob-7.2.3" sources."glob-parent-5.1.2" sources."graceful-fs-4.2.11" sources."has-unicode-2.0.1" + sources."http-errors-1.7.3" sources."https-proxy-agent-5.0.1" - sources."iconv-lite-0.6.3" + sources."human-signals-1.1.1" + sources."iconv-lite-0.4.24" sources."inflight-1.0.6" sources."inherits-2.0.4" + sources."is-binary-path-2.1.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" sources."is-number-7.0.0" + sources."is-stream-2.0.1" + sources."isarray-0.0.1" + sources."isexe-2.0.0" sources."json-schema-to-ts-1.6.4" sources."json-schema-traverse-1.0.0" - sources."jsonfile-6.1.0" + sources."jsonfile-4.0.0" sources."lru-cache-6.0.0" - sources."make-dir-3.1.0" + (sources."make-dir-3.1.0" // { + dependencies = [ + sources."semver-6.3.1" + ]; + }) sources."make-error-1.3.6" + sources."merge-stream-2.0.0" sources."merge2-1.4.1" + sources."micro-9.3.5-canary.3" sources."micromatch-4.0.5" + sources."mimic-fn-2.1.0" sources."minimatch-3.1.2" - sources."minipass-5.0.0" - (sources."minizlib-2.1.2" // { + sources."minimist-1.2.8" + (sources."minipass-2.9.0" // { dependencies = [ - sources."minipass-3.3.6" + sources."yallist-3.1.1" ]; }) - sources."mkdirp-1.0.4" + sources."minizlib-1.3.3" + sources."mkdirp-0.5.6" sources."mri-1.2.0" - sources."ms-2.1.2" - sources."node-fetch-2.6.9" + sources."ms-2.1.1" + sources."node-fetch-2.6.7" sources."node-gyp-build-4.6.1" sources."nopt-5.0.0" + sources."normalize-path-3.0.0" + sources."npm-run-path-4.0.1" sources."npmlog-5.0.1" sources."object-assign-4.1.1" sources."once-1.4.0" + sources."onetime-5.1.2" + sources."os-paths-4.4.0" + sources."p-finally-2.0.1" sources."parse-ms-2.1.0" sources."path-browserify-1.0.1" sources."path-is-absolute-1.0.1" - sources."path-to-regexp-6.2.1" + sources."path-key-3.1.1" + (sources."path-match-1.2.4" // { + dependencies = [ + sources."http-errors-1.4.0" + sources."inherits-2.0.1" + ]; + }) + sources."path-to-regexp-1.8.0" + sources."pend-1.2.0" sources."picocolors-1.0.0" sources."picomatch-2.3.1" sources."pretty-bytes-5.6.0" sources."pretty-ms-7.0.1" + sources."promisepipe-3.0.0" + sources."pump-3.0.0" sources."punycode-2.3.0" sources."queue-microtask-1.2.3" + sources."raw-body-2.4.1" sources."readable-stream-3.6.2" - sources."regenerator-runtime-0.13.11" + sources."readdirp-3.3.0" sources."require-from-string-2.0.2" sources."resolve-from-5.0.0" sources."reusify-1.0.4" @@ -103398,33 +99348,61 @@ in sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."semver-6.3.1" + sources."semver-7.3.5" sources."set-blocking-2.0.0" - sources."signal-exit-4.0.2" + sources."setprototypeof-1.1.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."signal-exit-3.0.7" + sources."stat-mode-0.3.0" + sources."statuses-1.5.0" + sources."stream-to-array-2.3.0" + (sources."stream-to-promise-2.2.0" // { + dependencies = [ + sources."end-of-stream-1.1.0" + sources."once-1.3.3" + ]; + }) sources."streamsearch-1.1.0" sources."string-width-4.2.3" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" - sources."tar-6.2.0" + sources."strip-final-newline-2.0.0" + (sources."tar-4.4.18" // { + dependencies = [ + sources."yallist-3.1.1" + ]; + }) sources."time-span-4.0.0" sources."to-regex-range-5.0.1" + sources."toidentifier-1.0.0" sources."tr46-0.0.3" + sources."tree-kill-1.2.2" sources."ts-morph-12.0.0" sources."ts-node-10.9.1" sources."ts-toolbelt-6.15.5" sources."tslib-2.6.2" sources."typescript-4.9.5" + sources."uid-promise-1.0.0" sources."undici-5.23.0" - sources."universalify-2.0.0" + sources."universalify-0.1.2" + sources."unpipe-1.0.0" sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" + sources."uuid-3.3.2" sources."v8-compile-cache-lib-3.0.1" sources."web-vitals-0.2.4" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" + sources."which-2.0.2" sources."wide-align-1.1.5" sources."wrappy-1.0.2" + sources."xdg-app-paths-5.1.0" + sources."xdg-portable-7.3.0" sources."yallist-4.0.0" + sources."yauzl-2.10.0" + sources."yauzl-clone-1.0.4" + sources."yauzl-promise-2.1.3" sources."yn-3.1.1" ]; buildInputs = globalBuildInputs; @@ -103476,8 +99454,8 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/helper-validator-identifier-7.22.19" - (sources."@babel/highlight-7.22.13" // { + sources."@babel/helper-validator-identifier-7.22.20" + (sources."@babel/highlight-7.22.20" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -103489,9 +99467,9 @@ in ]; }) sources."@eslint-community/eslint-utils-4.4.0" - sources."@eslint-community/regexpp-4.8.1" + sources."@eslint-community/regexpp-4.9.1" sources."@eslint/eslintrc-2.1.2" - sources."@eslint/js-8.49.0" + sources."@eslint/js-8.50.0" sources."@humanwhocodes/config-array-0.11.11" sources."@humanwhocodes/module-importer-1.0.1" sources."@humanwhocodes/object-schema-1.2.1" @@ -103523,7 +99501,7 @@ in sources."diff-4.0.2" sources."doctrine-3.0.0" sources."escape-string-regexp-4.0.0" - sources."eslint-8.49.0" + sources."eslint-8.50.0" sources."eslint-plugin-vue-9.17.0" sources."eslint-scope-7.2.2" sources."eslint-visitor-keys-3.4.3" @@ -103540,13 +99518,13 @@ in sources."file-entry-cache-6.0.1" sources."find-up-5.0.0" sources."flat-cache-3.1.0" - sources."flatted-3.2.7" + sources."flatted-3.2.9" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-intrinsic-1.2.1" sources."glob-7.2.3" sources."glob-parent-6.0.2" - sources."globals-13.21.0" + sources."globals-13.22.0" sources."graphemer-1.4.0" sources."has-1.0.3" sources."has-flag-4.0.0" @@ -103603,7 +99581,7 @@ in sources."pug-lexer-5.0.1" sources."punycode-2.3.0" sources."queue-microtask-1.2.3" - sources."resolve-1.22.5" + sources."resolve-1.22.6" sources."resolve-from-4.0.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" @@ -103665,11 +99643,11 @@ in }; dependencies = [ sources."vscode-css-languageservice-3.0.13" - sources."vscode-jsonrpc-8.1.0" + sources."vscode-jsonrpc-8.2.0" sources."vscode-languageserver-4.4.2" - sources."vscode-languageserver-protocol-3.17.3" + sources."vscode-languageserver-protocol-3.17.5" sources."vscode-languageserver-protocol-foldingprovider-2.0.1" - sources."vscode-languageserver-types-3.17.3" + sources."vscode-languageserver-types-3.17.5" sources."vscode-nls-4.1.2" sources."vscode-uri-1.0.8" ]; @@ -103703,11 +99681,11 @@ in sources."vscode-nls-4.1.2" ]; }) - sources."vscode-jsonrpc-8.1.0" + sources."vscode-jsonrpc-8.2.0" sources."vscode-languageserver-4.4.2" - sources."vscode-languageserver-protocol-3.17.3" + sources."vscode-languageserver-protocol-3.17.5" sources."vscode-languageserver-protocol-foldingprovider-2.0.1" - sources."vscode-languageserver-types-3.17.3" + sources."vscode-languageserver-types-3.17.5" sources."vscode-nls-3.2.5" sources."vscode-uri-1.0.8" ]; @@ -103751,8 +99729,8 @@ in sources."vscode-languageserver-types-3.16.0" ]; }) - sources."vscode-languageserver-textdocument-1.0.10" - sources."vscode-languageserver-types-3.17.3" + sources."vscode-languageserver-textdocument-1.0.11" + sources."vscode-languageserver-types-3.17.5" sources."vscode-nls-4.1.2" sources."vscode-uri-3.0.7" ]; @@ -103801,7 +99779,7 @@ in sources."vscode-languageserver-types-3.5.0" ]; }) - sources."vscode-languageserver-textdocument-1.0.10" + sources."vscode-languageserver-textdocument-1.0.11" sources."vscode-languageserver-types-3.16.0-next.2" sources."vscode-nls-2.0.2" sources."vscode-uri-1.0.8" @@ -103825,7 +99803,7 @@ in sha512 = "EwAUg6706mBujMLbb4Czhe9Ax5Dw3x64t/X2hn+vIVvVexAANSifVg3yB7ILZmeRSGmv9uYo6kL5J1c/DiGdaw=="; }; dependencies = [ - (sources."@babel/runtime-7.22.15" // { + (sources."@babel/runtime-7.23.1" // { dependencies = [ sources."regenerator-runtime-0.14.0" ]; @@ -103936,7 +99914,7 @@ in sources."regenerator-runtime-0.13.11" sources."require-directory-2.1.1" sources."safe-buffer-5.2.1" - sources."sax-1.2.4" + sources."sax-1.3.0" sources."string-width-4.2.3" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" @@ -103985,11 +99963,11 @@ in sources."@jridgewell/source-map-0.3.5" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.19" - sources."@types/eslint-8.44.2" - sources."@types/eslint-scope-3.7.4" - sources."@types/estree-1.0.1" + sources."@types/eslint-8.44.3" + sources."@types/eslint-scope-3.7.5" + sources."@types/estree-1.0.2" sources."@types/json-schema-7.0.13" - sources."@types/node-20.6.1" + sources."@types/node-20.8.1" sources."@webassemblyjs/ast-1.11.6" sources."@webassemblyjs/floating-point-hex-parser-1.11.6" sources."@webassemblyjs/helper-api-error-1.11.6" @@ -104011,12 +99989,12 @@ in sources."acorn-import-assertions-1.9.0" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" - sources."browserslist-4.21.10" + sources."browserslist-4.22.1" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001534" + sources."caniuse-lite-1.0.30001542" sources."chrome-trace-event-1.0.3" sources."commander-2.20.3" - sources."electron-to-chromium-1.4.523" + sources."electron-to-chromium-1.4.538" sources."enhanced-resolve-5.15.0" sources."es-module-lexer-1.3.1" sources."escalade-3.1.1" @@ -104052,9 +100030,9 @@ in sources."source-map-support-0.5.21" sources."supports-color-8.1.1" sources."tapable-2.2.1" - sources."terser-5.19.4" + sources."terser-5.20.0" sources."terser-webpack-plugin-5.3.9" - sources."update-browserslist-db-1.0.11" + sources."update-browserslist-db-1.0.13" sources."uri-js-4.4.1" sources."watchpack-2.4.0" sources."webpack-5.88.2" @@ -104086,11 +100064,11 @@ in sources."@jridgewell/source-map-0.3.5" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.19" - sources."@types/eslint-8.44.2" - sources."@types/eslint-scope-3.7.4" - sources."@types/estree-1.0.1" + sources."@types/eslint-8.44.3" + sources."@types/eslint-scope-3.7.5" + sources."@types/estree-1.0.2" sources."@types/json-schema-7.0.13" - sources."@types/node-20.6.1" + sources."@types/node-20.8.1" sources."@webassemblyjs/ast-1.11.6" sources."@webassemblyjs/floating-point-hex-parser-1.11.6" sources."@webassemblyjs/helper-api-error-1.11.6" @@ -104115,15 +100093,15 @@ in sources."acorn-import-assertions-1.9.0" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" - sources."browserslist-4.21.10" + sources."browserslist-4.22.1" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001534" + sources."caniuse-lite-1.0.30001542" sources."chrome-trace-event-1.0.3" sources."clone-deep-4.0.1" sources."colorette-2.0.20" sources."commander-10.0.1" sources."cross-spawn-7.0.3" - sources."electron-to-chromium-1.4.523" + sources."electron-to-chromium-1.4.538" sources."enhanced-resolve-5.15.0" sources."envinfo-7.10.0" sources."es-module-lexer-1.3.1" @@ -104173,7 +100151,7 @@ in sources."punycode-2.3.0" sources."randombytes-2.1.0" sources."rechoir-0.8.0" - sources."resolve-1.22.5" + sources."resolve-1.22.6" sources."resolve-cwd-3.0.0" sources."resolve-from-5.0.0" sources."safe-buffer-5.2.1" @@ -104187,13 +100165,13 @@ in sources."supports-color-8.1.1" sources."supports-preserve-symlinks-flag-1.0.0" sources."tapable-2.2.1" - (sources."terser-5.19.4" // { + (sources."terser-5.20.0" // { dependencies = [ sources."commander-2.20.3" ]; }) sources."terser-webpack-plugin-5.3.9" - sources."update-browserslist-db-1.0.11" + sources."update-browserslist-db-1.0.13" sources."uri-js-4.4.1" sources."watchpack-2.4.0" sources."webpack-5.88.2" @@ -104233,24 +100211,24 @@ in sources."@types/bonjour-3.5.11" sources."@types/connect-3.4.36" sources."@types/connect-history-api-fallback-1.5.1" - sources."@types/eslint-8.44.2" - sources."@types/eslint-scope-3.7.4" - sources."@types/estree-1.0.1" - sources."@types/express-4.17.17" - sources."@types/express-serve-static-core-4.17.36" - sources."@types/http-errors-2.0.1" - sources."@types/http-proxy-1.17.11" + sources."@types/eslint-8.44.3" + sources."@types/eslint-scope-3.7.5" + sources."@types/estree-1.0.2" + sources."@types/express-4.17.18" + sources."@types/express-serve-static-core-4.17.37" + sources."@types/http-errors-2.0.2" + sources."@types/http-proxy-1.17.12" sources."@types/json-schema-7.0.13" - sources."@types/mime-1.3.2" - sources."@types/node-20.6.1" + sources."@types/mime-1.3.3" + sources."@types/node-20.8.1" sources."@types/qs-6.9.8" - sources."@types/range-parser-1.2.4" + sources."@types/range-parser-1.2.5" sources."@types/retry-0.12.0" - sources."@types/send-0.17.1" - sources."@types/serve-index-1.9.1" - sources."@types/serve-static-1.15.2" - sources."@types/sockjs-0.3.33" - sources."@types/ws-8.5.5" + sources."@types/send-0.17.2" + sources."@types/serve-index-1.9.2" + sources."@types/serve-static-1.15.3" + sources."@types/sockjs-0.3.34" + sources."@types/ws-8.5.6" sources."@webassemblyjs/ast-1.11.6" sources."@webassemblyjs/floating-point-hex-parser-1.11.6" sources."@webassemblyjs/helper-api-error-1.11.6" @@ -104288,12 +100266,12 @@ in sources."bonjour-service-1.1.1" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.21.10" + sources."browserslist-4.22.1" sources."buffer-from-1.1.2" sources."bufferutil-4.0.7" sources."bytes-3.0.0" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001534" + sources."caniuse-lite-1.0.30001542" sources."chokidar-3.5.3" sources."chrome-trace-event-1.0.3" sources."colorette-2.0.20" @@ -104321,7 +100299,7 @@ in sources."dns-equal-1.0.0" sources."dns-packet-5.6.1" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.523" + sources."electron-to-chromium-1.4.538" sources."encodeurl-1.0.2" sources."enhanced-resolve-5.15.0" sources."es-module-lexer-1.3.1" @@ -104349,10 +100327,10 @@ in sources."faye-websocket-0.11.4" sources."fill-range-7.0.1" sources."finalhandler-1.2.0" - sources."follow-redirects-1.15.2" + sources."follow-redirects-1.15.3" sources."forwarded-0.2.0" sources."fresh-0.5.2" - sources."fs-monkey-1.0.4" + sources."fs-monkey-1.0.5" sources."fs.realpath-1.0.0" sources."fsevents-2.3.3" sources."function-bind-1.1.1" @@ -104501,7 +100479,7 @@ in sources."strip-final-newline-2.0.0" sources."supports-color-8.1.1" sources."tapable-2.2.1" - sources."terser-5.19.4" + sources."terser-5.20.0" (sources."terser-webpack-plugin-5.3.9" // { dependencies = [ sources."ajv-6.12.6" @@ -104515,7 +100493,7 @@ in sources."toidentifier-1.0.1" sources."type-is-1.6.18" sources."unpipe-1.0.0" - sources."update-browserslist-db-1.0.11" + sources."update-browserslist-db-1.0.13" sources."uri-js-4.4.1" sources."utf-8-validate-6.0.3" sources."util-deprecate-1.0.2" @@ -104538,7 +100516,7 @@ in sources."websocket-extensions-0.1.4" sources."which-2.0.2" sources."wrappy-1.0.2" - sources."ws-8.14.1" + sources."ws-8.14.2" ]; buildInputs = globalBuildInputs; meta = { @@ -104568,11 +100546,11 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@types/eslint-8.44.2" - sources."@types/eslint-scope-3.7.4" - sources."@types/estree-1.0.1" + sources."@types/eslint-8.44.3" + sources."@types/eslint-scope-3.7.5" + sources."@types/estree-1.0.2" sources."@types/json-schema-7.0.13" - sources."@types/node-20.6.1" + sources."@types/node-20.8.1" sources."@webassemblyjs/ast-1.11.6" sources."@webassemblyjs/floating-point-hex-parser-1.11.6" sources."@webassemblyjs/helper-api-error-1.11.6" @@ -104596,13 +100574,13 @@ in sources."ajv-formats-2.1.1" sources."ajv-keywords-5.1.0" sources."braces-3.0.2" - sources."browserslist-4.21.10" + sources."browserslist-4.22.1" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001534" + sources."caniuse-lite-1.0.30001542" sources."chrome-trace-event-1.0.3" sources."commander-2.20.3" sources."dir-glob-3.0.1" - sources."electron-to-chromium-1.4.523" + sources."electron-to-chromium-1.4.538" sources."enhanced-resolve-5.15.0" sources."es-module-lexer-1.3.1" sources."escalade-3.1.1" @@ -104661,7 +100639,7 @@ in sources."source-map-support-0.5.21" sources."supports-color-8.1.1" sources."tapable-2.2.1" - sources."terser-5.19.4" + sources."terser-5.20.0" (sources."terser-webpack-plugin-5.3.9" // { dependencies = [ sources."ajv-6.12.6" @@ -104671,7 +100649,7 @@ in ]; }) sources."to-regex-range-5.0.1" - sources."update-browserslist-db-1.0.11" + sources."update-browserslist-db-1.0.13" sources."uri-js-4.4.1" sources."watchpack-2.4.0" (sources."webpack-5.88.2" // { @@ -104715,7 +100693,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.2" - sources."@types/node-20.6.1" + sources."@types/node-20.8.1" sources."@webtorrent/http-node-1.3.0" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.3.0" @@ -105105,10 +101083,10 @@ in "@withgraphite/graphite-cli" = nodeEnv.buildNodePackage { name = "_at_withgraphite_slash_graphite-cli"; packageName = "@withgraphite/graphite-cli"; - version = "1.0.2"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-1.0.2.tgz"; - sha512 = "QLkH4O/yIYBUNZIifVfWTOaRV/NcCTDZvOznaJLnNbEBmW5Su6JfYgHJUlyqekZNiDWYJDvtU3IXsJvluYUVDw=="; + url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-1.0.6.tgz"; + sha512 = "XXI/8DG+dFXXO9WvewYZwlxAx2MRMt69XYbxPPYWRvpu8dGiTUQ5EeDsOm4yEOsOMvefNxjnq9mqwJxuwRfRyQ=="; }; dependencies = [ sources."ansi-regex-5.0.1" @@ -105130,7 +101108,7 @@ in sources."supports-color-7.2.0" sources."utf-8-validate-6.0.3" sources."wrap-ansi-7.0.0" - sources."ws-8.14.1" + sources."ws-8.14.2" sources."y18n-5.0.8" sources."yargs-17.7.2" sources."yargs-parser-21.1.1" @@ -105147,18 +101125,18 @@ in wrangler = nodeEnv.buildNodePackage { name = "wrangler"; packageName = "wrangler"; - version = "3.8.0"; + version = "3.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/wrangler/-/wrangler-3.8.0.tgz"; - sha512 = "sTdD+6fMEpM9ROxv+gcyxgTKpnf7tB5ftRV5+wupsdljWkow5C00UCWU/IWSOUfuitAGAj1PWATjKfrRp9Bk9w=="; + url = "https://registry.npmjs.org/wrangler/-/wrangler-3.10.1.tgz"; + sha512 = "k7BUIinKVYFHJYo8HVeVjDncjTQIu6Z6/CNnTB9WcsGlJ0MFTsFWdWspWSPgef1vOTrzkfbweZpZCY3YXIew3g=="; }; dependencies = [ sources."@cloudflare/kv-asset-handler-0.2.0" - sources."@cloudflare/workerd-darwin-64-1.20230904.0" - sources."@cloudflare/workerd-darwin-arm64-1.20230904.0" - sources."@cloudflare/workerd-linux-64-1.20230904.0" - sources."@cloudflare/workerd-linux-arm64-1.20230904.0" - sources."@cloudflare/workerd-windows-64-1.20230904.0" + sources."@cloudflare/workerd-darwin-64-1.20230922.0" + sources."@cloudflare/workerd-darwin-arm64-1.20230922.0" + sources."@cloudflare/workerd-linux-64-1.20230922.0" + sources."@cloudflare/workerd-linux-arm64-1.20230922.0" + sources."@cloudflare/workerd-windows-64-1.20230922.0" sources."@esbuild-plugins/node-globals-polyfill-0.2.3" sources."@esbuild-plugins/node-modules-polyfill-0.2.2" sources."@esbuild/android-arm-0.17.19" @@ -105183,115 +101161,64 @@ in sources."@esbuild/win32-arm64-0.17.19" sources."@esbuild/win32-ia32-0.17.19" sources."@esbuild/win32-x64-0.17.19" + sources."@fastify/busboy-2.0.0" sources."acorn-8.10.0" sources."acorn-walk-8.2.0" sources."anymatch-3.1.3" sources."as-table-1.0.55" - sources."base64-js-1.5.1" - sources."better-sqlite3-8.6.0" sources."binary-extensions-2.2.0" - sources."bindings-1.5.0" - sources."bl-4.1.0" sources."blake3-wasm-2.1.5" sources."braces-3.0.2" - sources."buffer-5.7.1" sources."buffer-from-1.1.2" sources."bufferutil-4.0.7" - sources."busboy-1.6.0" sources."capnp-ts-0.7.0" sources."chokidar-3.5.3" - sources."chownr-1.1.4" sources."cookie-0.5.0" sources."data-uri-to-buffer-2.0.2" sources."debug-4.3.4" - sources."decompress-response-6.0.0" - sources."deep-extend-0.6.0" - sources."detect-libc-2.0.2" - sources."end-of-stream-1.4.4" sources."esbuild-0.17.19" sources."escape-string-regexp-4.0.0" sources."estree-walker-0.6.1" sources."exit-hook-2.2.1" - sources."expand-template-2.0.3" - sources."file-uri-to-path-1.0.0" sources."fill-range-7.0.1" - sources."fs-constants-1.0.0" sources."fsevents-2.3.3" - (sources."get-source-2.0.12" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - sources."github-from-package-0.0.0" + sources."get-source-2.0.12" sources."glob-parent-5.1.2" sources."glob-to-regexp-0.4.1" - sources."http-cache-semantics-4.1.1" - sources."ieee754-1.2.1" - sources."inherits-2.0.4" - sources."ini-1.3.8" sources."is-binary-path-2.1.0" sources."is-extglob-2.1.1" sources."is-glob-4.0.3" sources."is-number-7.0.0" - sources."kleur-4.1.5" - sources."lru-cache-6.0.0" sources."magic-string-0.25.9" sources."mime-3.0.0" - sources."mimic-response-3.1.0" - sources."miniflare-3.20230904.0" - sources."minimist-1.2.8" - sources."mkdirp-classic-0.5.3" + sources."miniflare-3.20230922.0" sources."ms-2.1.2" sources."mustache-4.2.0" sources."nanoid-3.3.6" - sources."napi-build-utils-1.0.2" - sources."node-abi-3.47.0" sources."node-forge-1.3.1" sources."node-gyp-build-4.6.1" sources."normalize-path-3.0.0" - sources."once-1.4.0" sources."path-to-regexp-6.2.1" sources."picomatch-2.3.1" - sources."prebuild-install-7.1.1" sources."printable-characters-1.0.42" - sources."pump-3.0.0" - sources."rc-1.2.8" - sources."readable-stream-3.6.2" sources."readdirp-3.6.0" sources."rollup-plugin-inject-3.0.2" sources."rollup-plugin-node-polyfills-0.2.1" sources."rollup-pluginutils-2.8.2" - sources."safe-buffer-5.2.1" sources."selfsigned-2.1.1" - sources."semver-7.5.4" - sources."simple-concat-1.0.1" - sources."simple-get-4.0.1" - sources."source-map-0.7.4" - (sources."source-map-support-0.5.21" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) + sources."source-map-0.6.1" + sources."source-map-support-0.5.21" sources."sourcemap-codec-1.4.8" sources."stacktracey-2.1.8" sources."stoppable-1.1.0" - sources."streamsearch-1.1.0" - sources."string_decoder-1.3.0" - sources."strip-json-comments-2.0.1" - sources."tar-fs-2.1.1" - sources."tar-stream-2.2.0" sources."to-regex-range-5.0.1" sources."tslib-2.6.2" - sources."tunnel-agent-0.6.0" - sources."undici-5.24.0" + sources."undici-5.25.3" sources."utf-8-validate-6.0.3" - sources."util-deprecate-1.0.2" - sources."workerd-1.20230904.0" - sources."wrappy-1.0.2" - sources."ws-8.14.1" + sources."workerd-1.20230922.0" + sources."ws-8.14.2" sources."xxhash-wasm-1.0.2" - sources."yallist-4.0.0" - sources."youch-3.3.1" + sources."youch-3.3.2" sources."zod-3.22.2" ]; buildInputs = globalBuildInputs; @@ -105421,60 +101348,60 @@ in "@zwave-js/server" = nodeEnv.buildNodePackage { name = "_at_zwave-js_slash_server"; packageName = "@zwave-js/server"; - version = "1.31.0"; + version = "1.32.1"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/server/-/server-1.31.0.tgz"; - sha512 = "sshYo5kwG3OVUW0/7ZaEh4bnW3VQgPfVnYuqAr/g//2/7c/LA7yjUbOjyE8Rnqj76DXZqxk6choPKtFBRTBrkQ=="; + url = "https://registry.npmjs.org/@zwave-js/server/-/server-1.32.1.tgz"; + sha512 = "lO2G4FvjTjztvj9KW8pQTwMe5dPNxfZhi+zUvOVoURa773P2h620+i2ARQTGX/o/60cHm1LFETnrtzPqTwVnEg=="; }; dependencies = [ - sources."@alcalzone/jsonl-db-3.1.0" + (sources."@alcalzone/jsonl-db-3.1.0" // { + dependencies = [ + sources."fs-extra-10.1.0" + ]; + }) (sources."@alcalzone/pak-0.9.0" // { dependencies = [ sources."execa-5.0.1" + sources."fs-extra-10.1.0" ]; }) sources."@alcalzone/proper-lockfile-4.1.3-0" sources."@colors/colors-1.5.0" sources."@dabh/diagnostics-2.0.3" - sources."@esm2cjs/cacheable-lookup-7.0.0" - sources."@esm2cjs/cacheable-request-10.2.12" - sources."@esm2cjs/form-data-encoder-2.1.4" - sources."@esm2cjs/got-12.5.3" - sources."@esm2cjs/http-timer-5.0.1" - sources."@esm2cjs/is-5.6.0" - sources."@esm2cjs/lowercase-keys-3.0.0" - sources."@esm2cjs/mimic-response-4.0.0" - sources."@esm2cjs/normalize-url-8.0.0" - sources."@esm2cjs/p-cancelable-3.0.0" - sources."@esm2cjs/p-queue-7.3.0" - sources."@esm2cjs/p-timeout-5.1.0" - sources."@esm2cjs/responselike-3.0.0" sources."@homebridge/ciao-1.1.7" sources."@leichtgewicht/ip-codec-2.0.4" sources."@serialport/binding-mock-10.2.2" - sources."@serialport/bindings-cpp-10.8.0" + (sources."@serialport/bindings-cpp-12.0.1" // { + dependencies = [ + sources."@serialport/parser-delimiter-11.0.0" + sources."@serialport/parser-readline-11.0.0" + sources."node-gyp-build-4.6.0" + ]; + }) sources."@serialport/bindings-interface-1.2.2" - sources."@serialport/parser-byte-length-10.5.0" - sources."@serialport/parser-cctalk-10.5.0" - sources."@serialport/parser-delimiter-10.5.0" - sources."@serialport/parser-inter-byte-timeout-10.5.0" - sources."@serialport/parser-packet-length-10.5.0" - sources."@serialport/parser-readline-10.5.0" - sources."@serialport/parser-ready-10.5.0" - sources."@serialport/parser-regex-10.5.0" - sources."@serialport/parser-slip-encoder-10.5.0" - sources."@serialport/parser-spacepacket-10.5.0" - sources."@serialport/stream-10.5.0" - sources."@types/http-cache-semantics-4.0.1" + sources."@serialport/parser-byte-length-12.0.0" + sources."@serialport/parser-cctalk-12.0.0" + sources."@serialport/parser-delimiter-12.0.0" + sources."@serialport/parser-inter-byte-timeout-12.0.0" + sources."@serialport/parser-packet-length-12.0.0" + sources."@serialport/parser-readline-12.0.0" + sources."@serialport/parser-ready-12.0.0" + sources."@serialport/parser-regex-12.0.0" + sources."@serialport/parser-slip-encoder-12.0.0" + sources."@serialport/parser-spacepacket-12.0.0" + sources."@serialport/stream-12.0.0" + sources."@sindresorhus/is-5.6.0" + sources."@szmarczak/http-timer-5.0.1" + sources."@types/http-cache-semantics-4.0.2" sources."@types/triple-beam-1.3.3" - sources."@zwave-js/cc-11.14.0" - sources."@zwave-js/config-11.14.0" - sources."@zwave-js/core-11.14.0" - sources."@zwave-js/host-11.14.0" - sources."@zwave-js/nvmedit-11.14.0" - sources."@zwave-js/serial-11.14.0" - sources."@zwave-js/shared-11.13.1" - sources."@zwave-js/testing-11.14.0" + sources."@zwave-js/cc-12.0.2" + sources."@zwave-js/config-12.0.2" + sources."@zwave-js/core-12.0.2" + sources."@zwave-js/host-12.0.2" + sources."@zwave-js/nvmedit-12.0.2" + sources."@zwave-js/serial-12.0.2" + sources."@zwave-js/shared-12.0.0" + sources."@zwave-js/testing-12.0.2" sources."alcalzone-shared-4.0.8" sources."ansi-colors-4.1.3" sources."ansi-regex-5.0.1" @@ -105484,6 +101411,8 @@ in sources."axios-0.27.2" sources."buffer-from-1.1.2" sources."bufferutil-4.0.7" + sources."cacheable-lookup-7.0.0" + sources."cacheable-request-10.2.13" sources."cliui-8.0.1" (sources."color-3.2.1" // { dependencies = [ @@ -105497,28 +101426,34 @@ in sources."colorspace-1.1.4" sources."combined-stream-1.0.8" sources."cross-spawn-7.0.3" - sources."dayjs-1.11.9" + sources."dayjs-1.11.10" sources."debug-4.3.4" - sources."decompress-response-6.0.0" + (sources."decompress-response-6.0.0" // { + dependencies = [ + sources."mimic-response-3.1.0" + ]; + }) sources."defer-to-connect-2.0.1" sources."delayed-stream-1.0.0" sources."dns-packet-5.6.1" sources."emoji-regex-8.0.0" sources."enabled-2.0.0" sources."escalade-3.1.1" - sources."eventemitter3-4.0.7" + sources."eventemitter3-5.0.1" sources."execa-5.1.1" sources."fast-deep-equal-3.1.3" sources."fecha-4.2.3" sources."file-stream-rotator-0.6.1" sources."fn.name-1.1.0" - sources."follow-redirects-1.15.2" + sources."follow-redirects-1.15.3" sources."form-data-4.0.0" - sources."fs-extra-10.1.0" + sources."form-data-encoder-2.1.4" + sources."fs-extra-11.1.1" sources."get-caller-file-2.0.5" sources."get-stream-6.0.1" sources."globalyzer-0.1.0" sources."globrex-0.1.2" + sources."got-13.0.0" sources."graceful-fs-4.2.11" sources."http-cache-semantics-4.1.1" sources."http2-wrapper-2.2.0" @@ -105542,17 +101477,21 @@ in sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" - sources."mimic-response-3.1.0" + sources."mimic-response-4.0.0" sources."minimist-1.2.8" sources."moment-2.29.4" sources."ms-2.1.2" - sources."node-addon-api-5.1.0" + sources."node-addon-api-7.0.0" sources."node-gyp-build-4.6.1" + sources."normalize-url-8.0.0" sources."npm-run-path-4.0.1" sources."nrf-intel-hex-1.3.0" sources."object-hash-2.2.0" sources."one-time-1.0.0" sources."onetime-5.1.2" + sources."p-cancelable-3.0.0" + sources."p-queue-7.4.1" + sources."p-timeout-5.1.0" sources."path-key-3.1.1" sources."proper-lockfile-4.1.2" sources."quick-lru-5.1.1" @@ -105565,7 +101504,7 @@ in sources."safe-buffer-5.2.1" sources."safe-stable-stringify-2.4.3" sources."semver-7.5.4" - sources."serialport-10.5.0" + sources."serialport-12.0.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-3.0.7" @@ -105589,13 +101528,13 @@ in sources."winston-daily-rotate-file-4.7.1" sources."winston-transport-4.5.0" sources."wrap-ansi-7.0.0" - sources."ws-8.14.1" - sources."xstate-4.38.0" + sources."ws-8.14.2" + sources."xstate-4.38.2" sources."y18n-5.0.8" sources."yallist-4.0.0" sources."yargs-17.7.2" sources."yargs-parser-21.1.1" - sources."zwave-js-11.14.2" + sources."zwave-js-12.0.2" ]; buildInputs = globalBuildInputs; meta = { diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index fe947f4707758..a7afac111eb8a 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -29,21 +29,6 @@ final: prev: { buildInputs = [ final.node-gyp-build ]; }; - "@forge/cli" = prev."@forge/cli".override (old: { - nativeBuildInputs = [ pkgs.pkg-config ]; - buildInputs = with pkgs; [ - libsecret - final.node-gyp-build - final.node-pre-gyp - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.Security - ]; - meta = old.meta // { - license = lib.licenses.unfree; # unlicensed - }; - }); - autoprefixer = prev.autoprefixer.override { nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; postInstall = '' @@ -55,18 +40,6 @@ final: prev: { }; }; - aws-azure-login = prev.aws-azure-login.override (oldAttrs: { - nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; - prePatch = '' - export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1 - ''; - postInstall = '' - wrapProgram $out/bin/aws-azure-login \ - --set PUPPETEER_EXECUTABLE_PATH ${pkgs.chromium}/bin/chromium - ''; - meta = oldAttrs.meta // { platforms = lib.platforms.linux; }; - }); - bower2nix = prev.bower2nix.override { nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; postInstall = '' @@ -196,21 +169,6 @@ final: prev: { ''; }; - mermaid-cli = prev."@mermaid-js/mermaid-cli".override ( - if stdenv.isDarwin - then {} - else { - nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; - prePatch = '' - export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1 - ''; - postInstall = '' - wrapProgram $out/bin/mmdc \ - --set PUPPETEER_EXECUTABLE_PATH ${pkgs.chromium.outPath}/bin/chromium - ''; - }); - - node-gyp = prev.node-gyp.override { nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; # Teach node-gyp to use nodejs headers locally rather that download them form https://nodejs.org. diff --git a/pkgs/development/ocaml-modules/algaeff/default.nix b/pkgs/development/ocaml-modules/algaeff/default.nix index 7877d255a0af2..a146e0f53f518 100644 --- a/pkgs/development/ocaml-modules/algaeff/default.nix +++ b/pkgs/development/ocaml-modules/algaeff/default.nix @@ -1,22 +1,26 @@ { lib , buildDunePackage , fetchFromGitHub +, alcotest +, qcheck-core }: buildDunePackage rec { pname = "algaeff"; - version = "0.2.1"; + version = "1.1.0"; minimalOCamlVersion = "5.0"; - duneVersion = "3"; src = fetchFromGitHub { owner = "RedPRL"; repo = pname; rev = version; - hash = "sha256-jpnJhF+LN2ef6QPLcCHxcMg3Fr3GSLOnJkZ9ZUIOrlY="; + hash = "sha256-7kwQmoT8rpQWPHc+BZQi9fcZhgHxS99158ebXAXlpQ8="; }; + doCheck = true; + checkInputs = [ alcotest qcheck-core ]; + meta = { description = "Reusable Effects-Based Components"; homepage = "https://github.com/RedPRL/algaeff"; diff --git a/pkgs/development/ocaml-modules/apron/default.nix b/pkgs/development/ocaml-modules/apron/default.nix index fddf128d0d9be..5ad98224962e3 100644 --- a/pkgs/development/ocaml-modules/apron/default.nix +++ b/pkgs/development/ocaml-modules/apron/default.nix @@ -1,30 +1,29 @@ { stdenv, lib, fetchFromGitHub, perl, gmp, mpfr, ppl, ocaml, findlib, camlidl, mlgmpidl -, gnumake42 +, flint, pplite }: stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-apron"; - version = "0.9.13"; + version = "0.9.14"; src = fetchFromGitHub { owner = "antoinemine"; repo = "apron"; rev = "v${version}"; - sha256 = "14ymjahqdxj26da8wik9d5dzlxn81b3z1iggdl7rn2nn06jy7lvy"; + hash = "sha256-e8bSf0FPB6E3MFHHoSrE0x/6nrUStO+gOKxJ4LDHBi0="; }; - # fails with make 4.4 - nativeBuildInputs = [ ocaml findlib perl gnumake42 ]; - buildInputs = [ gmp mpfr ppl camlidl ]; + nativeBuildInputs = [ ocaml findlib perl ]; + buildInputs = [ gmp mpfr ppl camlidl flint pplite ]; propagatedBuildInputs = [ mlgmpidl ]; # TODO: Doesn't produce the library correctly if true strictDeps = false; - outputs = [ "out" "bin" "dev" ]; + outputs = [ "out" "dev" ]; configurePhase = '' runHook preConfigure - ./configure -prefix $out + ./configure -prefix $out ${lib.optionalString stdenv.isDarwin "-no-strip"} mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs runHook postConfigure ''; @@ -32,8 +31,6 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $dev/lib mv $out/lib/ocaml $dev/lib/ - mkdir -p $bin - mv $out/bin $bin/ ''; meta = { diff --git a/pkgs/development/ocaml-modules/b0/default.nix b/pkgs/development/ocaml-modules/b0/default.nix new file mode 100644 index 0000000000000..e3c21c31e6896 --- /dev/null +++ b/pkgs/development/ocaml-modules/b0/default.nix @@ -0,0 +1,46 @@ +{ lib, stdenv, fetchurl, ocaml, findlib, topkg, ocamlbuild, cmdliner }: + +let + +in lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") +"b0 is not available for OCaml ${ocaml.version}" + +stdenv.mkDerivation rec { + + pname = "ocaml${ocaml.version}-b0"; + version = "0.0.5"; + + src = fetchurl { + url = "${meta.homepage}/releases/b0-${version}.tbz"; + sha256 = "sha256-ty04JQcP4RCme/VQw0ko2IBebWWX5cBU6nRTTeV1I/I="; + }; + + strictDeps = true; + + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg cmdliner ]; + + inherit (topkg) buildPhase installPhase; + + meta = with lib; { + description = "Software construction and deployment kit"; + longDescription = '' + WARNING this package is unstable and work in progress, do not depend on + it. + B0 describes software construction and deployments using modular and + customizable definitions written in OCaml. B0 describes: + * Build environments. + * Software configuration, build and testing. + * Source and binary deployments. + * Software life-cycle procedures. + B0 also provides the B00 build library which provides abitrary build + abstraction with reliable and efficient incremental rebuilds. The B00 + library can be – and has been – used on its own to devise domain specific + build systems. + ''; + homepage = "https://erratique.ch/software/b0"; + inherit (ocaml.meta) platforms; + license = licenses.isc; + maintainers = [ maintainers.Julow ]; + }; +} diff --git a/pkgs/development/ocaml-modules/camomile/default.nix b/pkgs/development/ocaml-modules/camomile/default.nix index ea2a653936821..b1178a4e8dd8a 100644 --- a/pkgs/development/ocaml-modules/camomile/default.nix +++ b/pkgs/development/ocaml-modules/camomile/default.nix @@ -1,34 +1,57 @@ -{ lib, fetchFromGitHub, buildDunePackage, ocaml, cppo }: +{ stdenv, lib, darwin, fetchFromGitHub, buildDunePackage, ocaml, cppo +, camlp-streams, dune-site +, version ? if lib.versionAtLeast ocaml.version "4.08" then "2.0.0" else "1.0.2" +}: -buildDunePackage rec { - pname = "camomile"; - version = "1.0.2"; +let params = + { + "1.0.2" = lib.throwIf (lib.versionAtLeast ocaml.version "5.0") + "camomile 1 is not available for OCaml ${ocaml.version}" { + src = fetchFromGitHub { + owner = "yoriyuki"; + repo = "camomile"; + rev = version; + sha256 = "00i910qjv6bpk0nkafp5fg97isqas0bwjf7m6rz11rsxilpalzad"; + }; - useDune2 = true; + nativeBuildInputs = [ cppo ]; - src = fetchFromGitHub { - owner = "yoriyuki"; - repo = pname; - rev = version; - sha256 = "00i910qjv6bpk0nkafp5fg97isqas0bwjf7m6rz11rsxilpalzad"; - }; + configurePhase = '' + runHook preConfigure + ocaml configure.ml --share $out/share/camomile + runHook postConfigure + ''; + + postInstall = '' + echo "version = \"${version}\"" >> $out/lib/ocaml/${ocaml.version}/site-lib/camomile/META + ''; + + }; - nativeBuildInputs = [ cppo ]; + "2.0.0" = { + src = fetchFromGitHub { + owner = "ocaml-community"; + repo = "camomile"; + rev = "v${version}"; + hash = "sha256-HklX+VPD0Ta3Knv++dBT2rhsDSlDRH90k4Cj1YtWIa8="; + }; - configurePhase = '' - runHook preConfigure - ocaml configure.ml --share $out/share/camomile - runHook postConfigure - ''; + nativeBuildInputs = lib.optional stdenv.isDarwin darwin.sigtool; - postInstall = '' - echo "version = \"${version}\"" >> $out/lib/ocaml/${ocaml.version}/site-lib/camomile/META - ''; + propagatedBuildInputs = [ camlp-streams dune-site ]; + }; + } +; in + + +buildDunePackage (params."${version}" // { + pname = "camomile"; + inherit version; meta = { - inherit (src.meta) homepage; + homepage = "https://github.com/ocaml-community/Camomile"; maintainers = [ lib.maintainers.vbgl ]; license = lib.licenses.lgpl21; description = "A Unicode library for OCaml"; }; -} +}) diff --git a/pkgs/development/ocaml-modules/charInfo_width/default.nix b/pkgs/development/ocaml-modules/charInfo_width/default.nix index aaf1811045486..ab4e53a42b352 100644 --- a/pkgs/development/ocaml-modules/charInfo_width/default.nix +++ b/pkgs/development/ocaml-modules/charInfo_width/default.nix @@ -3,13 +3,15 @@ buildDunePackage rec { pname = "charInfo_width"; version = "1.1.0"; - duneVersion = "3"; src = fetchzip { url = "https://bitbucket.org/zandoye/charinfo_width/get/${version}.tar.bz2"; sha256 = "19mnq9a1yr16srqs8n6hddahr4f9d2gbpmld62pvlw1ps7nfrp9w"; }; - propagatedBuildInputs = [ camomile result ]; + propagatedBuildInputs = [ + (camomile.override { version = "1.0.2"; }) + result + ]; meta = { homepage = "https://bitbucket.org/zandoye/charinfo_width/"; diff --git a/pkgs/development/ocaml-modules/checkseum/default.nix b/pkgs/development/ocaml-modules/checkseum/default.nix index 498dcdfe04cbc..7e3a17ac56007 100644 --- a/pkgs/development/ocaml-modules/checkseum/default.nix +++ b/pkgs/development/ocaml-modules/checkseum/default.nix @@ -1,28 +1,22 @@ -{ lib, fetchurl, buildDunePackage, ocaml, dune-configurator, pkg-config +{ lib, fetchurl, buildDunePackage, ocaml, dune-configurator , optint , fmt, rresult, bos, fpath, astring, alcotest -, withFreestanding ? false -, ocaml-freestanding }: buildDunePackage rec { - version = "0.4.0"; + version = "0.5.2"; pname = "checkseum"; minimalOCamlVersion = "4.07"; - duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/checkseum/releases/download/v${version}/checkseum-${version}.tbz"; - hash = "sha256-K6QPMts5+hxH2a+WQ1N0lwMBoshG2T0bSozNgzRvAlo="; + hash = "sha256-nl5P1EBctKi03wCHdUMlGDPgimSZ70LMuNulgt8Nr8g="; }; buildInputs = [ dune-configurator ]; - nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ optint - ] ++ lib.optionals withFreestanding [ - ocaml-freestanding ]; checkInputs = [ diff --git a/pkgs/development/ocaml-modules/containers/data.nix b/pkgs/development/ocaml-modules/containers/data.nix index bdad78cdf6f68..98b6ec750640f 100644 --- a/pkgs/development/ocaml-modules/containers/data.nix +++ b/pkgs/development/ocaml-modules/containers/data.nix @@ -1,16 +1,19 @@ { buildDunePackage, containers +, ocaml , dune-configurator , gen, iter, qcheck-core +, mdx }: buildDunePackage { pname = "containers-data"; - inherit (containers) src version doCheck; + inherit (containers) src version; - duneVersion = "3"; + doCheck = containers.doCheck && ocaml.meta.branch != "5.0"; buildInputs = [ dune-configurator ]; + nativeCheckInputs = [ mdx.bin ]; checkInputs = [ gen iter qcheck-core ]; propagatedBuildInputs = [ containers ]; diff --git a/pkgs/development/ocaml-modules/containers/default.nix b/pkgs/development/ocaml-modules/containers/default.nix index f1c82f189bbaf..ee3d7045d5656 100644 --- a/pkgs/development/ocaml-modules/containers/default.nix +++ b/pkgs/development/ocaml-modules/containers/default.nix @@ -5,16 +5,14 @@ }: buildDunePackage rec { - version = "3.11"; + version = "3.12"; pname = "containers"; - duneVersion = "3"; - src = fetchFromGitHub { owner = "c-cube"; repo = "ocaml-containers"; rev = "v${version}"; - hash = "sha256-tGAsg98/T6VKvG95I4qioabWM3TEKrDKlsrfUJqxCyM="; + hash = "sha256-15Wd6k/NvjAvTmxlPlZPClODBtFXM6FG3VxniC66u88="; }; buildInputs = [ dune-configurator ]; diff --git a/pkgs/development/ocaml-modules/decompress/default.nix b/pkgs/development/ocaml-modules/decompress/default.nix index 3e15bd5bbcd18..b20ef17d08b97 100644 --- a/pkgs/development/ocaml-modules/decompress/default.nix +++ b/pkgs/development/ocaml-modules/decompress/default.nix @@ -6,14 +6,13 @@ buildDunePackage rec { pname = "decompress"; - version = "1.5.2"; + version = "1.5.3"; minimalOCamlVersion = "4.08"; - duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/decompress/releases/download/v${version}/decompress-${version}.tbz"; - hash = "sha256-qMmmuhMlFNVq02JvvV55EkhEg2AQNQ7hYdQ7spv1di4="; + hash = "sha256-+R5peL7/P8thRA0y98mcmfHoZUtPsYQIdB02A1NzrGA="; }; buildInputs = [ cmdliner ]; diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index f3c587428a409..5be5f09d19655 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -8,6 +8,7 @@ , opaline , ocamlbuild , ppx_deriving +, ppx_optcomp , findlib , js_of_ocaml-ocamlbuild , js_of_ocaml-ppx @@ -21,13 +22,13 @@ stdenv.mkDerivation rec { pname = "eliom"; - version = "9.4.0"; + version = "10.1.0"; src = fetchFromGitHub { owner = "ocsigen"; repo = "eliom"; rev = version; - sha256 = "sha256:1yn8mqxv9yz51x81j8wv1jn7l7crm8azp1m2g4zn5nz2s4nmfv6q"; + hash = "sha256-nzrLl8adaRW6c+IQfJ7s+7KtFT8uU27Umyrv0aWXuxw="; }; nativeBuildInputs = [ @@ -41,6 +42,7 @@ stdenv.mkDerivation rec { js_of_ocaml-ocamlbuild js_of_ocaml-ppx_deriving_json ocamlnet + ppx_optcomp ]; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/extlib/default.nix b/pkgs/development/ocaml-modules/extlib/default.nix index 35b8c59091cc5..cd9f6d9b86ce0 100644 --- a/pkgs/development/ocaml-modules/extlib/default.nix +++ b/pkgs/development/ocaml-modules/extlib/default.nix @@ -8,7 +8,7 @@ buildDunePackage rec { src = fetchurl { url = "https://ygrek.org/p/release/ocaml-${pname}/${pname}-${version}.tar.gz"; - sha512 = "2386ac69f037ea520835c0624d39ae9fbffe43a20b18e247de032232ed6f419d667b53d2314c6f56dc71d368bf0b6201a56c2f3f2a5bdfd933766c5a6cb98768"; + hash = "sha512-I4asafA36lIINcBiTTmun7/+Q6ILGOJH3gMiMu1vQZ1me1PSMUxvVtxx02i/C2IBpWwvPypb39kzdmxabLmHaA=="; }; nativeBuildInputs = [ cppo ]; diff --git a/pkgs/development/ocaml-modules/higlo/default.nix b/pkgs/development/ocaml-modules/higlo/default.nix index da843fe15112c..fba8e35fb5be6 100644 --- a/pkgs/development/ocaml-modules/higlo/default.nix +++ b/pkgs/development/ocaml-modules/higlo/default.nix @@ -2,14 +2,14 @@ buildDunePackage rec { pname = "higlo"; - version = "0.8"; - duneVersion = "3"; + version = "0.9"; + src = fetchFromGitLab { domain = "framagit.org"; owner = "zoggy"; repo = "higlo"; rev = version; - sha256 = "sha256:09hsbwy5asacgh4gdj0vjpy4kzfnq3qji9szbsbyswsf1nbyczir"; + hash = "sha256-SaFFzp4FCjVLdMLH6mNIv3HzJbkXJ5Ojbku258LCfLI="; }; propagatedBuildInputs = [ sedlex xtmpl ]; diff --git a/pkgs/development/ocaml-modules/junit/default.nix b/pkgs/development/ocaml-modules/junit/default.nix index cd33ae2f7f5ba..b71712aba9992 100644 --- a/pkgs/development/ocaml-modules/junit/default.nix +++ b/pkgs/development/ocaml-modules/junit/default.nix @@ -14,12 +14,11 @@ buildDunePackage (rec { tyxml ]; - duneVersion = "3"; doCheck = true; meta = with lib; { description = "ocaml-junit is an OCaml package for the creation of JUnit XML reports, proving a typed API to produce valid reports acceptable to Jenkins, comes with packages supporting OUnit and Alcotest."; - license = licenses.gpl3; + license = licenses.lgpl3Plus; maintainers = with maintainers; [ ]; homepage = "https://github.com/Khady/ocaml-junit"; }; diff --git a/pkgs/development/ocaml-modules/kafka/default.nix b/pkgs/development/ocaml-modules/kafka/default.nix index 7636942033a95..28c380a4616d7 100644 --- a/pkgs/development/ocaml-modules/kafka/default.nix +++ b/pkgs/development/ocaml-modules/kafka/default.nix @@ -5,8 +5,6 @@ buildDunePackage rec { pname = "kafka"; version = "0.5"; - useDune2 = true; - src = fetchurl { url = "https://github.com/didier-wenzek/ocaml-kafka/releases/download/${version}/kafka-${version}.tbz"; sha256 = "0m9212yap0a00hd0f61i4y4fna3141p77qj3mm7jl1h4q60jdhvy"; diff --git a/pkgs/development/ocaml-modules/kafka/lwt.nix b/pkgs/development/ocaml-modules/kafka/lwt.nix index a6cef66b27615..da931d6e8bffd 100644 --- a/pkgs/development/ocaml-modules/kafka/lwt.nix +++ b/pkgs/development/ocaml-modules/kafka/lwt.nix @@ -1,13 +1,18 @@ { buildDunePackage +, ocaml +, lib , kafka , lwt , cmdliner }: +lib.throwIf (lib.versionAtLeast ocaml.version "5.0") + "kafka_lwt is not available for OCaml ${ocaml.version}" + buildDunePackage rec { pname = "kafka_lwt"; - inherit (kafka) version useDune2 src; + inherit (kafka) version src; buildInputs = [ cmdliner ]; diff --git a/pkgs/development/ocaml-modules/lun/default.nix b/pkgs/development/ocaml-modules/lun/default.nix new file mode 100644 index 0000000000000..aab83d4c3cdbc --- /dev/null +++ b/pkgs/development/ocaml-modules/lun/default.nix @@ -0,0 +1,20 @@ +{ lib, buildDunePackage, fetchurl }: + +buildDunePackage rec { + pname = "lun"; + version = "0.0.1"; + + minimalOCamlVersion = "4.12.0"; + + src = fetchurl { + url = "https://github.com/robur-coop/lun/releases/download/v${version}/lun-${version}.tbz"; + hash = "sha256-zKi63/g7Rw/c+xhAEW+Oim8suGzeL0TtKM8my/aSp5M="; + }; + + meta = { + description = "Optics in OCaml"; + homepage = "https://git.robur.coop/robur/lun"; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ marsam ]; + }; +} diff --git a/pkgs/development/ocaml-modules/lun/ppx.nix b/pkgs/development/ocaml-modules/lun/ppx.nix new file mode 100644 index 0000000000000..fc138f1a6f8a4 --- /dev/null +++ b/pkgs/development/ocaml-modules/lun/ppx.nix @@ -0,0 +1,17 @@ +{ lib, buildDunePackage, fetchurl, fmt, lun, ppxlib }: + +buildDunePackage { + pname = "ppx_lun"; + inherit (lun) version src; + + propagatedBuildInputs = [ lun ppxlib ]; + + checkInputs = [ fmt ]; + + doCheck = true; + + meta = lun.meta // { + description = "Optics with lun package and PPX"; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index 4033336ae119b..167df30ae3535 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -4,7 +4,7 @@ buildDunePackage rec { pname = "lwt"; - version = "5.6.1"; + version = "5.7.0"; minimalOCamlVersion = "4.08"; @@ -12,16 +12,9 @@ buildDunePackage rec { owner = "ocsigen"; repo = "lwt"; rev = version; - sha256 = "sha256-XstKs0tMwliCyXnP0Vzi5WC27HKJGnATUYtbbQmH1TE="; + hash = "sha256-o0wPK6dPdnsr/LzwcSwbIGcL85wkDjdFuEcAxuS/UEs="; }; - postPatch = lib.optionalString (lib.versionAtLeast ocaml.version "5.0") '' - substituteInPlace src/core/dune \ - --replace "(libraries bytes)" "" - substituteInPlace src/unix/dune \ - --replace "libraries bigarray lwt" "libraries lwt" - ''; - nativeBuildInputs = [ cppo ]; buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ libev ocplib-endian ]; diff --git a/pkgs/development/ocaml-modules/mdx/default.nix b/pkgs/development/ocaml-modules/mdx/default.nix index 85a1a798b4782..ccda3f38b5ebf 100644 --- a/pkgs/development/ocaml-modules/mdx/default.nix +++ b/pkgs/development/ocaml-modules/mdx/default.nix @@ -1,23 +1,22 @@ { lib, fetchurl, buildDunePackage, ocaml, findlib , alcotest -, astring, cppo, fmt, logs, ocaml-version, odoc-parser, lwt, re, csexp +, astring, cppo, fmt, logs, ocaml-version, camlp-streams, lwt, re, csexp , gitUpdater }: buildDunePackage rec { pname = "mdx"; - version = "2.3.0"; + version = "2.3.1"; minimalOCamlVersion = "4.08"; - duneVersion = "3"; src = fetchurl { url = "https://github.com/realworldocaml/mdx/releases/download/${version}/mdx-${version}.tbz"; - hash = "sha256-MqCDmBAK/S0ueYi8O0XJtplxJx96twiFHe04Q8lHBmE="; + hash = "sha256-mkCkX6p41H4pOSvU/sJg0UAWysGweOSrAW6jrcCXQ/M="; }; nativeBuildInputs = [ cppo ]; - propagatedBuildInputs = [ astring fmt logs csexp ocaml-version odoc-parser re findlib ]; + propagatedBuildInputs = [ astring fmt logs csexp ocaml-version camlp-streams re findlib ]; checkInputs = [ alcotest lwt ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/msgpck/default.nix b/pkgs/development/ocaml-modules/msgpck/default.nix new file mode 100644 index 0000000000000..2871e774f3fe2 --- /dev/null +++ b/pkgs/development/ocaml-modules/msgpck/default.nix @@ -0,0 +1,31 @@ +{ lib +, fetchFromGitHub +, buildDunePackage +, ocplib-endian +, alcotest +}: + +buildDunePackage rec { + pname = "msgpck"; + version = "1.7"; + + src = fetchFromGitHub { + owner = "vbmithr"; + repo = "ocaml-msgpck"; + rev = "${version}"; + hash = "sha256-gBHIiicmk/5KBkKzRKyV0ymEH8dGCZG8vfE0mtpcDCM="; + }; + + propagatedBuildInputs = [ ocplib-endian ]; + + checkInputs = [ alcotest ]; + + doCheck = true; + + meta = { + description = "Fast MessagePack (http://msgpack.org) library "; + license = lib.licenses.isc; + homepage = "https://github.com/vbmithr/ocaml-msgpck"; + maintainers = [ lib.maintainers.ulrikstrid ]; + }; +} diff --git a/pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix b/pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix index 1a96c7adfe99d..3fde1d463cc7b 100644 --- a/pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix +++ b/pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix @@ -4,7 +4,10 @@ buildDunePackage { pname = "gettext-camomile"; inherit (ocaml_gettext) src version; - propagatedBuildInputs = [ camomile ocaml_gettext ]; + propagatedBuildInputs = [ + (camomile.override { version = "1.0.2"; }) + ocaml_gettext + ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; checkInputs = [ ounit fileutils ]; diff --git a/pkgs/development/ocaml-modules/ocolor/default.nix b/pkgs/development/ocaml-modules/ocolor/default.nix new file mode 100644 index 0000000000000..16663a8db64c2 --- /dev/null +++ b/pkgs/development/ocaml-modules/ocolor/default.nix @@ -0,0 +1,30 @@ +{ lib +, fetchFromGitHub +, buildDunePackage +, cppo +}: + +buildDunePackage rec { + pname = "ocolor"; + version = "1.3.1"; + + minimalOCamlVersion = "4.02"; + + src = fetchFromGitHub { + owner = "marc-chevalier"; + repo = pname; + rev = "refs/tags/${version}"; + sha256 = "osQTZGJp9yDoKNa6WoyhViNbRg1ukcD0Jxiu4VxqeUc="; + }; + + nativeBuildInputs = [ + cppo + ]; + + meta = { + description = "Print with style in your terminal using Format’s semantic tags"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ toastal ]; + homepage = "https://github.com/marc-chevalier/ocolor"; + }; +} diff --git a/pkgs/development/ocaml-modules/ocplib-simplex/default.nix b/pkgs/development/ocaml-modules/ocplib-simplex/default.nix index 474f69546d1a1..768c0baa6d229 100644 --- a/pkgs/development/ocaml-modules/ocplib-simplex/default.nix +++ b/pkgs/development/ocaml-modules/ocplib-simplex/default.nix @@ -1,33 +1,24 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, ocaml, findlib }: +{ lib, fetchFromGitHub, buildDunePackage, logs, num }: -let +buildDunePackage rec { pname = "ocplib-simplex"; - version = "0.4"; -in - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-${pname}-${version}"; + version = "0.5"; src = fetchFromGitHub { owner = "OCamlPro-Iguernlala"; repo = pname; rev = "v${version}"; - sha256 = "09niyidrjzrj8g1qwx4wgsdf5m6cwrnzg7zsgala36jliic4di60"; + hash = "sha256-sy5QUmghG28tXlwbKWx3PpBGTtzXarTSzd1WLSYyvbc="; }; - nativeBuildInputs = [ autoreconfHook ocaml findlib ]; - - strictDeps = true; - - installFlags = [ "LIBDIR=$(OCAMLFIND_DESTDIR)" ]; + propagatedBuildInputs = [ logs num ]; - createFindlibDestdir = true; + doCheck = true; meta = { description = "An OCaml library implementing a simplex algorithm, in a functional style, for solving systems of linear inequalities"; homepage = "https://github.com/OCamlPro-Iguernlala/ocplib-simplex"; - inherit (ocaml.meta) platforms; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; maintainers = [ lib.maintainers.vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/ocsigen-server/cohttp-5.patch b/pkgs/development/ocaml-modules/ocsigen-server/cohttp-5.patch deleted file mode 100644 index 44ade8da9296e..0000000000000 --- a/pkgs/development/ocaml-modules/ocsigen-server/cohttp-5.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/src/server/ocsigen_cohttp.ml b/src/server/ocsigen_cohttp.ml -index 4363cff7..b0cc0c53 100644 ---- a/src/server/ocsigen_cohttp.ml -+++ b/src/server/ocsigen_cohttp.ml -@@ -14,25 +14,13 @@ exception Ext_http_error of - - let _print_request fmt request = - -- let print_list print_data out_ch lst = -- let rec aux = function -- | [] -> () -- | [ x ] -> print_data out_ch x -- | x :: r -> print_data out_ch x; aux r -- in aux lst -- in -- - Format.fprintf fmt "%s [%s/%s]:\n" - (Uri.to_string (Cohttp.Request.uri request)) - Cohttp.(Code.string_of_version (Request.version request)) - Cohttp.(Code.string_of_method (Request.meth request)); - - Cohttp.Header.iter -- (fun key values -> -- (print_list -- (fun fmt value -> Format.fprintf fmt "\t%s = %s\n" key value) -- fmt -- values)) -+ (Format.fprintf fmt "\t%s = %s\n") - (Cohttp.Request.headers request) - - let connections = Hashtbl.create 256 diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index f4225c917dbda..515fd218d8fca 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -1,7 +1,7 @@ { lib, buildDunePackage, fetchFromGitHub, which, ocaml, lwt_react, ssl, lwt_ssl, findlib , bigstringaf, lwt, cstruct, mirage-crypto, zarith, mirage-crypto-ec, ptime, mirage-crypto-rng, mtime, ca-certs , cohttp, cohttp-lwt-unix, hmap -, lwt_log, ocaml_pcre, cryptokit, xml-light, ipaddr +, lwt_log, re, cryptokit, xml-light, ipaddr , camlzip , makeWrapper }: @@ -12,33 +12,30 @@ in let caml_ld_library_path = lib.concatMapStringsSep ":" mkpath [ - bigstringaf lwt ssl cstruct mirage-crypto zarith mirage-crypto-ec ptime mirage-crypto-rng mtime ca-certs cryptokit ocaml_pcre + bigstringaf lwt ssl cstruct mirage-crypto zarith mirage-crypto-ec ptime mirage-crypto-rng mtime ca-certs cryptokit re ] ; in buildDunePackage rec { - version = "5.0.1"; + version = "5.1.0"; pname = "ocsigenserver"; - duneVersion = "3"; minimalOCamlVersion = "4.08"; src = fetchFromGitHub { owner = "ocsigen"; repo = "ocsigenserver"; - rev = version; - sha256 = "sha256:1vzza33hd41740dqrx4854rqpyd8wv7kwpsvvmlpck841i9lh8h5"; + rev = "refs/tags/${version}"; + hash = "sha256-6xO+4eYSp6rlgPT09L7cvlaz6kYYuUPRa3K/TgZmaqE="; }; nativeBuildInputs = [ makeWrapper which ]; buildInputs = [ lwt_react camlzip findlib ]; propagatedBuildInputs = [ cohttp cohttp-lwt-unix cryptokit hmap ipaddr lwt_log lwt_ssl - ocaml_pcre xml-light + re xml-light ]; - patches = [ ./cohttp-5.patch ]; - configureFlags = [ "--root $(out)" "--prefix /" "--temproot ''" ]; dontAddPrefix = true; diff --git a/pkgs/development/ocaml-modules/ocsigen-start/default.nix b/pkgs/development/ocaml-modules/ocsigen-start/default.nix index 1df74b9036d20..86dcbe053effb 100644 --- a/pkgs/development/ocaml-modules/ocsigen-start/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-start/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-ocsigen-start"; - version = "6.0.1"; + version = "6.1.0"; nativeBuildInputs = [ ocaml findlib eliom ]; buildInputs = [ ocsigen-ppx-rpc ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "ocsigen"; repo = "ocsigen-start"; rev = version; - sha256 = "sha256:097bjaxvb1canilmqr8ay3ihig2msq7z8mi0g0rnbciikj1jsrym"; + hash = "sha256-gHFPutoPYKTDsFninwBTc2WOIFd3+ghRYW2hi1y5MUs="; }; preInstall = '' diff --git a/pkgs/development/ocaml-modules/odig/default.nix b/pkgs/development/ocaml-modules/odig/default.nix new file mode 100644 index 0000000000000..5ea3730c7ff4c --- /dev/null +++ b/pkgs/development/ocaml-modules/odig/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchurl, buildTopkgPackage, cmdliner, odoc, b0 }: + +buildTopkgPackage rec { + pname = "odig"; + version = "0.0.9"; + + src = fetchurl { + url = "${meta.homepage}/releases/odig-${version}.tbz"; + sha256 = "sha256-sYKvGYkxeF5FmrNQdOyMAtlsJqhlmUESi9SkPn/cjM4="; + }; + + buildInputs = [ cmdliner odoc b0 ]; + + meta = with lib; { + description = "Lookup documentation of installed OCaml packages"; + longDescription = '' + odig is a command line tool to lookup documentation of installed OCaml + packages. It shows package metadata, readmes, change logs, licenses, + cross-referenced `odoc` API documentation and manuals. + ''; + homepage = "https://erratique.ch/software/odig"; + license = licenses.isc; + maintainers = [ maintainers.Julow ]; + }; +} diff --git a/pkgs/development/ocaml-modules/parany/default.nix b/pkgs/development/ocaml-modules/parany/default.nix index f5af161679555..cb1414375197a 100644 --- a/pkgs/development/ocaml-modules/parany/default.nix +++ b/pkgs/development/ocaml-modules/parany/default.nix @@ -1,35 +1,22 @@ -{ lib, buildDunePackage, fetchFromGitHub, ocaml, cpu, domainslib }: - -let params = - if lib.versionAtLeast ocaml.version "5.00" then { - version = "13.0.1"; - hash = "sha256-OYa0uLsDyzjmXZgWcYUxLhqco4Kp/icfDamNe3En5JQ="; - propagatedBuildInputs = [ domainslib ]; - } else { - version = "12.2.2"; - hash = "sha256-woZ4XJqqoRr/7mDurXYvTbSUUcLBEylzVYBQp1BAOqc="; - propagatedBuildInputs = [ cpu ]; - } -; in +{ lib, buildDunePackage, fetchFromGitHub, cpu }: buildDunePackage rec { pname = "parany"; - inherit (params) version; + version = "14.0.0"; - duneVersion = "3"; minimalOCamlVersion = "4.08"; src = fetchFromGitHub { owner = "UnixJunkie"; repo = pname; rev = "v${version}"; - inherit (params) hash; + hash = "sha256-L5jHm3gZ2XIJ7jMUb/KvpSa/bnprEX75/P3BCMSe9Ok="; }; - inherit (params) propagatedBuildInputs; + propagatedBuildInputs = [ cpu ]; meta = with lib; { - inherit (src.meta) homepage; + homepage = "https://github.com/UnixJunkie/parany"; description = "Generalized map/reduce for multicore computing"; maintainers = [ maintainers.bcdarwin ]; license = licenses.lgpl2; diff --git a/pkgs/development/ocaml-modules/pp/default.nix b/pkgs/development/ocaml-modules/pp/default.nix index bd66880016697..5412f8955d76c 100644 --- a/pkgs/development/ocaml-modules/pp/default.nix +++ b/pkgs/development/ocaml-modules/pp/default.nix @@ -1,16 +1,13 @@ -{ buildDunePackage -, fetchurl -, ppx_expect -, lib -}: +{ buildDunePackage, fetchurl, ppx_expect, lib }: buildDunePackage rec { pname = "pp"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://github.com/ocaml-dune/pp/releases/download/${version}/pp-${version}.tbz"; - hash = "sha256-5KTpjZaxu3aVD81tpOk4yG2YnfTX5I8C96RFlfWvHVY="; + url = + "https://github.com/ocaml-dune/pp/releases/download/${version}/pp-${version}.tbz"; + hash = "sha256-pegiVzxVr7Qtsp7FbqzR8qzY9lzy3yh44pHeN0zmkJw="; }; duneVersion = "3"; @@ -20,7 +17,8 @@ buildDunePackage rec { doCheck = true; meta = with lib; { - description = "A an alternative pretty printing library to the Format module of the OCaml standard library"; + description = + "A an alternative pretty printing library to the Format module of the OCaml standard library"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/ocaml-modules/ptime/default.nix b/pkgs/development/ocaml-modules/ptime/default.nix index 9c1914b0f322c..1f23194582a0c 100644 --- a/pkgs/development/ocaml-modules/ptime/default.nix +++ b/pkgs/development/ocaml-modules/ptime/default.nix @@ -7,6 +7,9 @@ , topkg }: +lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") + "ptime is not available for OCaml ${ocaml.version}" + stdenv.mkDerivation (finalAttrs: { version = "1.1.0"; pname = "ocaml${ocaml.version}-ptime"; diff --git a/pkgs/development/ocaml-modules/qcheck/core.nix b/pkgs/development/ocaml-modules/qcheck/core.nix index cc24d0711b285..a688e9e595eca 100644 --- a/pkgs/development/ocaml-modules/qcheck/core.nix +++ b/pkgs/development/ocaml-modules/qcheck/core.nix @@ -2,16 +2,15 @@ buildDunePackage rec { pname = "qcheck-core"; - version = "0.20"; + version = "0.21.2"; minimalOCamlVersion = "4.08"; - duneVersion = "3"; src = fetchFromGitHub { owner = "c-cube"; repo = "qcheck"; rev = "v${version}"; - sha256 = "sha256-d3gleiaPEDJTbHtieL4oAq1NlA/0NtzdW9SA1sItFeQ="; + hash = "sha256-a+sjpvpQZbXjQgyx69hhVAmRCfDMMhFlg965dK5UN6Q="; }; patches = [ ./bytes.patch ]; diff --git a/pkgs/development/ocaml-modules/re/default.nix b/pkgs/development/ocaml-modules/re/default.nix index 5244aaf9edd05..2f5d2cd603b33 100644 --- a/pkgs/development/ocaml-modules/re/default.nix +++ b/pkgs/development/ocaml-modules/re/default.nix @@ -3,8 +3,8 @@ let version_sha = if lib.versionAtLeast ocaml.version "4.08" then { - version = "1.10.4"; - sha256 = "sha256-g+s+QwCqmx3HggdJAQ9DYuqDUkdCEwUk14wgzpnKdHw="; + version = "1.11.0"; + sha256 = "sha256-AfwkR4DA9r5yrnlrH7dQ82feGGJP110H7nl4LtbfjU8="; } else { diff --git a/pkgs/development/ocaml-modules/zelus-gtk/default.nix b/pkgs/development/ocaml-modules/zelus-gtk/default.nix new file mode 100644 index 0000000000000..c0e0e586066af --- /dev/null +++ b/pkgs/development/ocaml-modules/zelus-gtk/default.nix @@ -0,0 +1,24 @@ +{ buildDunePackage +, zelus +, lablgtk +}: + +buildDunePackage { + pname = "zelus-gtk"; + inherit (zelus) version src postPatch; + + minimalOCamlVersion = "4.08.1"; + + nativeBuildInputs = [ + zelus + ]; + + buildInputs = [ + lablgtk + ]; + + meta = { + description = "Zelus GTK library"; + inherit (zelus.meta) homepage license maintainers; + }; +} diff --git a/pkgs/development/ocaml-modules/zelus/default.nix b/pkgs/development/ocaml-modules/zelus/default.nix new file mode 100644 index 0000000000000..d326e234c0d02 --- /dev/null +++ b/pkgs/development/ocaml-modules/zelus/default.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, buildDunePackage +, fetchFromGitHub +, menhir +, menhirLib +}: + +buildDunePackage rec { + pname = "zelus"; + version = "2.2"; + + minimalOCamlVersion = "4.08.1"; + + src = fetchFromGitHub { + owner = "INRIA"; + repo = "zelus"; + rev = version; + hash = "sha256-NcGX343LProADtzJwlq1kmihLaya1giY6xv9ScvdgTA="; + }; + + # ./configure: cannot execute: required file not found + postPatch = lib.optionalString stdenv.isLinux '' + patchShebangs configure + ''; + + nativeBuildInputs = [ + menhir + ]; + + buildInputs = [ + menhirLib + ]; + + meta = with lib; { + description = "A synchronous language with ODEs"; + homepage = "https://zelus.di.ens.fr"; + license = licenses.inria-zelus; + mainProgram = "zeluc"; + maintainers = with maintainers; [ wegank ]; + }; +} diff --git a/pkgs/development/ocaml-modules/zmq/default.nix b/pkgs/development/ocaml-modules/zmq/default.nix index 267566d7ba0aa..b92d8e6cb8679 100644 --- a/pkgs/development/ocaml-modules/zmq/default.nix +++ b/pkgs/development/ocaml-modules/zmq/default.nix @@ -2,19 +2,15 @@ buildDunePackage rec { pname = "zmq"; - version = "5.1.5"; - - duneVersion = "3"; + version = "5.2.1"; src = fetchurl { - url = "https://github.com/issuu/ocaml-zmq/releases/download/${version}/zmq-lwt-${version}.tbz"; - sha256 = "sha256-mUfRPatLPFeSzWDwCIoFaVl85VkvDch4i6pOn3Kme1Y="; + url = "https://github.com/issuu/ocaml-zmq/releases/download/${version}/zmq-${version}.tbz"; + hash = "sha256-hVKfaTrUFqEBsv5hFB7JwsR630M0DKnqhB0QHpxcHKc="; }; buildInputs = [ czmq dune-configurator ]; - propagatedBuildInputs = [ stdint ]; - meta = { description = "ZeroMQ bindings for OCaml"; license = lib.licenses.mit; diff --git a/pkgs/development/ocaml-modules/zmq/lwt.nix b/pkgs/development/ocaml-modules/zmq/lwt.nix index f6408933452c1..1bbc1b7ad63ec 100644 --- a/pkgs/development/ocaml-modules/zmq/lwt.nix +++ b/pkgs/development/ocaml-modules/zmq/lwt.nix @@ -1,9 +1,8 @@ -{ buildDunePackage, zmq, ocaml_lwt }: +{ buildDunePackage, zmq, lwt }: buildDunePackage { pname = "zmq-lwt"; inherit (zmq) version src meta; - duneVersion = "3"; - propagatedBuildInputs = [ zmq ocaml_lwt ]; + propagatedBuildInputs = [ zmq lwt ]; } diff --git a/pkgs/development/perl-modules/sdl-modern-perl.patch b/pkgs/development/perl-modules/sdl-modern-perl.patch new file mode 100644 index 0000000000000..c97eeb034486e --- /dev/null +++ b/pkgs/development/perl-modules/sdl-modern-perl.patch @@ -0,0 +1,64 @@ +From d734d03862d7dcc776bd2fa3ba662cdd5879b32e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com> +Date: Wed, 12 Jul 2023 17:55:27 +0200 +Subject: [PATCH] Adapt to perl 5.37.1 + +Perl 5.37.1 removed a deprecated sv_nv() macro and SDL fails to build +with Perl 5.38.0: + +lib/SDLx/Controller/Interface.xs:60:26: error: implicit declaration of function 'sv_nv' + 60 | out->dv_x = sv_nv(temp); + | ^~~~~ + +Users are advised to use SvNVx() macro instead. SvNVx() seems to have been +available all the time (it predates a commit from 1993-10-07). + +This patch does that. + +https://github.com/PerlGameDev/SDL/issues/303 +--- + src/SDLx/Controller/Interface.xs | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/SDLx/Controller/Interface.xs b/src/SDLx/Controller/Interface.xs +index 3dc202b7..d326c885 100644 +--- a/src/SDLx/Controller/Interface.xs ++++ b/src/SDLx/Controller/Interface.xs +@@ -57,15 +57,15 @@ void evaluate(SDLx_Interface *obj, SDLx_Derivative *out, SDLx_State *initial, fl + + SV *temp; + temp = av_pop(accel); +- out->dv_x = sv_nv(temp); ++ out->dv_x = SvNVx(temp); + SvREFCNT_dec(temp); + + temp = av_pop(accel); +- out->dv_y = sv_nv(temp); ++ out->dv_y = SvNVx(temp); + SvREFCNT_dec(temp); + + temp = av_pop(accel); +- out->dang_v = sv_nv(temp); ++ out->dang_v = SvNVx(temp); + SvREFCNT_dec(temp); + + SvREFCNT_dec((SV *)accel); +@@ -90,15 +90,15 @@ void evaluate_dt(SDLx_Interface *obj, SDLx_Derivative *out, SDLx_State *initial, + + SV *temp; + temp = av_pop(accel); +- out->dv_x = sv_nv(temp); ++ out->dv_x = SvNVx(temp); + SvREFCNT_dec(temp); + + temp = av_pop(accel); +- out->dv_y = sv_nv(temp); ++ out->dv_y = SvNVx(temp); + SvREFCNT_dec(temp); + + temp = av_pop(accel); +- out->dang_v = sv_nv(temp); ++ out->dang_v = SvNVx(temp); + SvREFCNT_dec(temp); + + SvREFCNT_dec((SV *)accel); diff --git a/pkgs/development/php-packages/box/default.nix b/pkgs/development/php-packages/box/default.nix index 043e52ae46e1c..b1e447a4a7c77 100644 --- a/pkgs/development/php-packages/box/default.nix +++ b/pkgs/development/php-packages/box/default.nix @@ -1,35 +1,24 @@ -{ mkDerivation, fetchurl, makeWrapper, lib, php }: +{ lib, php, fetchFromGitHub }: -let +php.buildComposerProject (finalAttrs: { pname = "box"; version = "4.3.8"; -in -mkDerivation { - inherit pname version; - src = fetchurl { - url = "https://github.com/box-project/box/releases/download/${version}/box.phar"; - sha256 = "sha256-g9Y92yTsyXU4NWuQwyB3PRrKJxLRSBO9J77jumXPOxg="; + src = fetchFromGitHub { + owner = "box-project"; + repo = "box"; + rev = finalAttrs.version; + hash = "sha256-v1J84nqaX36DrLLH5kld+8NIymqtt5/5nJWJNCBVFRE="; }; - dontUnpack = true; + vendorHash = "sha256-LWggAUBMKljxa7HNdJMqOD/sx3IWCOQSqbYEnGntjN0="; - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin - install -D $src $out/libexec/box/box.phar - makeWrapper ${php}/bin/php $out/bin/box \ - --add-flags "-d phar.readonly=0 $out/libexec/box/box.phar" - runHook postInstall - ''; - - meta = with lib; { - changelog = "https://github.com/box-project/box/releases/tag/${version}"; + meta = { + changelog = "https://github.com/box-project/box/releases/tag/${finalAttrs.version}"; description = "An application for building and managing Phars"; - license = licenses.mit; + license = lib.licenses.mit; homepage = "https://github.com/box-project/box"; - maintainers = with maintainers; [ ] ++ teams.php.members; + maintainers = lib.teams.php.members; + mainProgram = "box"; }; -} +}) diff --git a/pkgs/development/php-packages/castor/default.nix b/pkgs/development/php-packages/castor/default.nix index ed6ce2ba33f45..b2bf7da5c2c78 100644 --- a/pkgs/development/php-packages/castor/default.nix +++ b/pkgs/development/php-packages/castor/default.nix @@ -1,60 +1,50 @@ { lib -, stdenv -, fetchurl -, makeBinaryWrapper +, fetchFromGitHub , installShellFiles , php , nix-update-script , testers -, castor }: -stdenv.mkDerivation (finalAttrs: { +php.buildComposerProject (finalAttrs: { pname = "castor"; version = "0.8.0"; - - src = fetchurl { - url = "https://github.com/jolicode/castor/releases/download/v${finalAttrs.version}/castor.linux-amd64.phar"; - hash = "sha256-0lnn4mS1/DgUoRoMFvCjwQ0j9CX9XWlskbtX9roFCfc="; + src = fetchFromGitHub { + owner = "jolicode"; + repo = "castor"; + rev = "v${finalAttrs.version}"; + hash = "sha256-rJz4BY74BI8gyT4ZlABc4PA+SCsd8guM0m2MTej350g="; }; - dontUnpack = true; - - nativeBuildInputs = [ makeBinaryWrapper installShellFiles ]; + vendorHash = "sha256-Jh4mNNYEM9sy0Dp+dZtD+xrMICjAuspe9D9BDXcfUPM="; - installPhase = '' - runHook preInstall - mkdir -p $out/bin - install -D $src $out/libexec/castor/castor.phar - makeWrapper ${php}/bin/php $out/bin/castor \ - --add-flags "$out/libexec/castor/castor.phar" - runHook postInstall - ''; + nativeBuildInputs = [ installShellFiles ]; - # castor requires to be initialized to generate completion files + # install shell completions postInstall = '' - echo "yes" | ${php}/bin/php $src + echo "yes" | ${php}/bin/php $out/share/php/castor/bin/castor installShellCompletion --cmd castor \ - --bash <($out/bin/castor completion bash) \ - --fish <($out/bin/castor completion fish) \ - --zsh <($out/bin/castor completion zsh) + --bash <(${php}/bin/php $out/share/php/castor/bin/castor completion bash) \ + --fish <(${php}/bin/php $out/share/php/castor/bin/castor completion fish) \ + --zsh <(${php}/bin/php $out/share/php/castor/bin/castor completion zsh) ''; passthru = { updateScript = nix-update-script { }; tests.version = testers.testVersion { - inherit (finalAttrs) version; - package = castor; command = "castor --version"; + package = php.packages.castor; + version = "v${finalAttrs.version}"; }; }; - meta = with lib; { + meta = { + changelog = "https://github.com/jolicode/castor/blob/v${finalAttrs.version}/CHANGELOG.md"; description = "DX oriented task runner and command launcher built with PHP"; homepage = "https://github.com/jolicode/castor"; - changelog = "https://github.com/jolicode/castor/blob/v${finalAttrs.version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ gaelreyrol ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ gaelreyrol ]; + mainProgram = "castor"; }; }) diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix index d4ce6fc256c3b..fd26cc0e48499 100644 --- a/pkgs/development/php-packages/composer/default.nix +++ b/pkgs/development/php-packages/composer/default.nix @@ -1,16 +1,19 @@ -{ lib, callPackage, fetchFromGitHub, php, unzip, _7zz, xz, git, curl, cacert, makeBinaryWrapper }: +{ lib, callPackage, fetchgit, php, unzip, _7zz, xz, git, curl, cacert, makeBinaryWrapper }: php.buildComposerProject (finalAttrs: { composer = callPackage ../../../build-support/php/pkgs/composer-phar.nix { }; pname = "composer"; - version = "2.6.3"; + version = "2.6.4"; - src = fetchFromGitHub { - owner = "composer"; - repo = "composer"; + + # We use `fetchgit` instead of `fetchFromGitHub` to ensure the existence + # of the `composer.lock` file, which is omitted in the archive downloaded + # via `fetchFromGitHub`. + src = fetchgit { + url = "https://github.com/composer/composer.git"; rev = finalAttrs.version; - hash = "sha256-yzpkdtfok22yMvRdv4jYrd8x8MgNZbSDOsg+sVl/JqE="; + hash = "sha256-8lylMfTARff+gBZpIRqttmE0jeXdJnLHZKVmqHY3p+s="; }; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/development/php-packages/mongodb/default.nix b/pkgs/development/php-packages/mongodb/default.nix index 777f777824909..7adfc3378887d 100644 --- a/pkgs/development/php-packages/mongodb/default.nix +++ b/pkgs/development/php-packages/mongodb/default.nix @@ -15,13 +15,13 @@ buildPecl rec { pname = "mongodb"; - version = "1.16.1"; + version = "1.16.2"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo-php-driver"; rev = version; - hash = "sha256-nVkue3qB6OwXKcyaYU1WmXG7pamKQtk8cbztVVkNejo="; + hash = "sha256-gI1Hd/i3S+lNcXaGG/hBR/cdn3S1fQ6xJ0xtRXo48rI="; fetchSubmodules = true; }; diff --git a/pkgs/development/php-packages/phalcon/default.nix b/pkgs/development/php-packages/phalcon/default.nix index 6f998be9a1f68..cbd689b136b96 100644 --- a/pkgs/development/php-packages/phalcon/default.nix +++ b/pkgs/development/php-packages/phalcon/default.nix @@ -2,13 +2,13 @@ buildPecl rec { pname = "phalcon"; - version = "5.3.0"; + version = "5.3.1"; src = fetchFromGitHub { owner = "phalcon"; repo = "cphalcon"; rev = "v${version}"; - hash = "sha256-82DJ+Qx0OYhw9Nv6FkAoyBec8WWfAiqNfBU9Ll/8RfA="; + hash = "sha256-FxGibpGlbNLqWDplCv4T4yUPg5US020niLfC7tHfkCU="; }; internalDeps = [ php.extensions.session php.extensions.pdo ]; diff --git a/pkgs/development/php-packages/php-cs-fixer/default.nix b/pkgs/development/php-packages/php-cs-fixer/default.nix index 24222ca2946ff..937b1f100128a 100644 --- a/pkgs/development/php-packages/php-cs-fixer/default.nix +++ b/pkgs/development/php-packages/php-cs-fixer/default.nix @@ -2,14 +2,14 @@ let pname = "php-cs-fixer"; - version = "3.22.0"; + version = "3.28.0"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar"; - sha256 = "sha256-iP5dmJkYZ/E1TAm4oLOCCQ5DCc4+I3CcEr8tOezzCt4="; + sha256 = "sha256-5dhS4QroRY9tGGSsXQfzWw5ObWO5fIoc+nkOUpAjUlQ="; }; dontUnpack = true; diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix index da0b80ad50e05..736e4f5bf810c 100644 --- a/pkgs/development/php-packages/phpstan/default.nix +++ b/pkgs/development/php-packages/phpstan/default.nix @@ -2,14 +2,14 @@ let pname = "phpstan"; - version = "1.10.33"; + version = "1.10.37"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "sha256-dFIuCVYmZr6E0181jegKs6d3mA9jPoFqoIY+lyWl7P8="; + sha256 = "sha256-i1h3N11MsKhHx/RJxAthnUbjacA5yZJF6bzmQnmEKzg="; }; dontUnpack = true; diff --git a/pkgs/development/php-packages/psysh/composer.lock b/pkgs/development/php-packages/psysh/composer.lock new file mode 100644 index 0000000000000..94dbc6383e4a4 --- /dev/null +++ b/pkgs/development/php-packages/psysh/composer.lock @@ -0,0 +1,929 @@ +{ + "_readme": [ + "This file locks the dependencies of your project to a known state", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", + "This file is @generated automatically" + ], + "content-hash": "90272fdd8203a2aef4218d76aca6b2e9", + "packages": [ + { + "name": "nikic/php-parser", + "version": "v4.17.1", + "source": { + "type": "git", + "url": "https://github.com/nikic/PHP-Parser.git", + "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", + "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "php": ">=7.0" + }, + "require-dev": { + "ircmaxell/php-yacc": "^0.0.7", + "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0" + }, + "bin": [ + "bin/php-parse" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.9-dev" + } + }, + "autoload": { + "psr-4": { + "PhpParser\\": "lib/PhpParser" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Nikita Popov" + } + ], + "description": "A PHP parser written in PHP", + "keywords": [ + "parser", + "php" + ], + "support": { + "issues": "https://github.com/nikic/PHP-Parser/issues", + "source": "https://github.com/nikic/PHP-Parser/tree/v4.17.1" + }, + "time": "2023-08-13T19:53:39+00:00" + }, + { + "name": "psr/container", + "version": "2.0.2", + "source": { + "type": "git", + "url": "https://github.com/php-fig/container.git", + "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963", + "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963", + "shasum": "" + }, + "require": { + "php": ">=7.4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Container\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common Container Interface (PHP FIG PSR-11)", + "homepage": "https://github.com/php-fig/container", + "keywords": [ + "PSR-11", + "container", + "container-interface", + "container-interop", + "psr" + ], + "support": { + "issues": "https://github.com/php-fig/container/issues", + "source": "https://github.com/php-fig/container/tree/2.0.2" + }, + "time": "2021-11-05T16:47:00+00:00" + }, + { + "name": "symfony/console", + "version": "v6.3.4", + "source": { + "type": "git", + "url": "https://github.com/symfony/console.git", + "reference": "eca495f2ee845130855ddf1cf18460c38966c8b6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/console/zipball/eca495f2ee845130855ddf1cf18460c38966c8b6", + "reference": "eca495f2ee845130855ddf1cf18460c38966c8b6", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/polyfill-mbstring": "~1.0", + "symfony/service-contracts": "^2.5|^3", + "symfony/string": "^5.4|^6.0" + }, + "conflict": { + "symfony/dependency-injection": "<5.4", + "symfony/dotenv": "<5.4", + "symfony/event-dispatcher": "<5.4", + "symfony/lock": "<5.4", + "symfony/process": "<5.4" + }, + "provide": { + "psr/log-implementation": "1.0|2.0|3.0" + }, + "require-dev": { + "psr/log": "^1|^2|^3", + "symfony/config": "^5.4|^6.0", + "symfony/dependency-injection": "^5.4|^6.0", + "symfony/event-dispatcher": "^5.4|^6.0", + "symfony/lock": "^5.4|^6.0", + "symfony/process": "^5.4|^6.0", + "symfony/var-dumper": "^5.4|^6.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Console\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Eases the creation of beautiful and testable command line interfaces", + "homepage": "https://symfony.com", + "keywords": [ + "cli", + "command-line", + "console", + "terminal" + ], + "support": { + "source": "https://github.com/symfony/console/tree/v6.3.4" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-08-16T10:10:12+00:00" + }, + { + "name": "symfony/deprecation-contracts", + "version": "v3.3.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/deprecation-contracts.git", + "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/7c3aff79d10325257a001fcf92d991f24fc967cf", + "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.4-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "files": [ + "function.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "A generic function and convention to trigger deprecation notices", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.3.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-05-23T14:45:45+00:00" + }, + { + "name": "symfony/polyfill-ctype", + "version": "v1.28.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-ctype.git", + "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", + "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "provide": { + "ext-ctype": "*" + }, + "suggest": { + "ext-ctype": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.28-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Ctype\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Gert de Pagter", + "email": "BackEndTea@gmail.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for ctype functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "ctype", + "polyfill", + "portable" + ], + "support": { + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-01-26T09:26:14+00:00" + }, + { + "name": "symfony/polyfill-intl-grapheme", + "version": "v1.28.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-intl-grapheme.git", + "reference": "875e90aeea2777b6f135677f618529449334a612" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/875e90aeea2777b6f135677f618529449334a612", + "reference": "875e90aeea2777b6f135677f618529449334a612", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "suggest": { + "ext-intl": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.28-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Grapheme\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for intl's grapheme_* functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "grapheme", + "intl", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.28.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-01-26T09:26:14+00:00" + }, + { + "name": "symfony/polyfill-intl-normalizer", + "version": "v1.28.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-intl-normalizer.git", + "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92", + "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "suggest": { + "ext-intl": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.28-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Normalizer\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for intl's Normalizer class and related functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "intl", + "normalizer", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.28.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-01-26T09:26:14+00:00" + }, + { + "name": "symfony/polyfill-mbstring", + "version": "v1.28.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "42292d99c55abe617799667f454222c54c60e229" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229", + "reference": "42292d99c55abe617799667f454222c54c60e229", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "provide": { + "ext-mbstring": "*" + }, + "suggest": { + "ext-mbstring": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.28-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for the Mbstring extension", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "mbstring", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-07-28T09:04:16+00:00" + }, + { + "name": "symfony/service-contracts", + "version": "v3.3.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/service-contracts.git", + "reference": "40da9cc13ec349d9e4966ce18b5fbcd724ab10a4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/40da9cc13ec349d9e4966ce18b5fbcd724ab10a4", + "reference": "40da9cc13ec349d9e4966ce18b5fbcd724ab10a4", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "psr/container": "^2.0" + }, + "conflict": { + "ext-psr": "<1.1|>=2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.4-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\Service\\": "" + }, + "exclude-from-classmap": [ + "/Test/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Generic abstractions related to writing services", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "support": { + "source": "https://github.com/symfony/service-contracts/tree/v3.3.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-05-23T14:45:45+00:00" + }, + { + "name": "symfony/string", + "version": "v6.3.5", + "source": { + "type": "git", + "url": "https://github.com/symfony/string.git", + "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/string/zipball/13d76d0fb049051ed12a04bef4f9de8715bea339", + "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-intl-grapheme": "~1.0", + "symfony/polyfill-intl-normalizer": "~1.0", + "symfony/polyfill-mbstring": "~1.0" + }, + "conflict": { + "symfony/translation-contracts": "<2.5" + }, + "require-dev": { + "symfony/error-handler": "^5.4|^6.0", + "symfony/http-client": "^5.4|^6.0", + "symfony/intl": "^6.2", + "symfony/translation-contracts": "^2.5|^3.0", + "symfony/var-exporter": "^5.4|^6.0" + }, + "type": "library", + "autoload": { + "files": [ + "Resources/functions.php" + ], + "psr-4": { + "Symfony\\Component\\String\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides an object-oriented API to strings and deals with bytes, UTF-8 code points and grapheme clusters in a unified way", + "homepage": "https://symfony.com", + "keywords": [ + "grapheme", + "i18n", + "string", + "unicode", + "utf-8", + "utf8" + ], + "support": { + "source": "https://github.com/symfony/string/tree/v6.3.5" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-09-18T10:38:32+00:00" + }, + { + "name": "symfony/var-dumper", + "version": "v6.3.5", + "source": { + "type": "git", + "url": "https://github.com/symfony/var-dumper.git", + "reference": "3d9999376be5fea8de47752837a3e1d1c5f69ef5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/3d9999376be5fea8de47752837a3e1d1c5f69ef5", + "reference": "3d9999376be5fea8de47752837a3e1d1c5f69ef5", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/polyfill-mbstring": "~1.0" + }, + "conflict": { + "symfony/console": "<5.4" + }, + "require-dev": { + "ext-iconv": "*", + "symfony/console": "^5.4|^6.0", + "symfony/http-kernel": "^5.4|^6.0", + "symfony/process": "^5.4|^6.0", + "symfony/uid": "^5.4|^6.0", + "twig/twig": "^2.13|^3.0.4" + }, + "bin": [ + "Resources/bin/var-dump-server" + ], + "type": "library", + "autoload": { + "files": [ + "Resources/functions/dump.php" + ], + "psr-4": { + "Symfony\\Component\\VarDumper\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides mechanisms for walking through any arbitrary PHP variable", + "homepage": "https://symfony.com", + "keywords": [ + "debug", + "dump" + ], + "support": { + "source": "https://github.com/symfony/var-dumper/tree/v6.3.5" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-09-12T10:11:35+00:00" + } + ], + "packages-dev": [ + { + "name": "bamarni/composer-bin-plugin", + "version": "1.8.2", + "source": { + "type": "git", + "url": "https://github.com/bamarni/composer-bin-plugin.git", + "reference": "92fd7b1e6e9cdae19b0d57369d8ad31a37b6a880" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/bamarni/composer-bin-plugin/zipball/92fd7b1e6e9cdae19b0d57369d8ad31a37b6a880", + "reference": "92fd7b1e6e9cdae19b0d57369d8ad31a37b6a880", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^2.0", + "php": "^7.2.5 || ^8.0" + }, + "require-dev": { + "composer/composer": "^2.0", + "ext-json": "*", + "phpstan/extension-installer": "^1.1", + "phpstan/phpstan": "^1.8", + "phpstan/phpstan-phpunit": "^1.1", + "phpunit/phpunit": "^8.5 || ^9.5", + "symfony/console": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0", + "symfony/finder": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0", + "symfony/process": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0" + }, + "type": "composer-plugin", + "extra": { + "class": "Bamarni\\Composer\\Bin\\BamarniBinPlugin" + }, + "autoload": { + "psr-4": { + "Bamarni\\Composer\\Bin\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "No conflicts for your bin dependencies", + "keywords": [ + "composer", + "conflict", + "dependency", + "executable", + "isolation", + "tool" + ], + "support": { + "issues": "https://github.com/bamarni/composer-bin-plugin/issues", + "source": "https://github.com/bamarni/composer-bin-plugin/tree/1.8.2" + }, + "time": "2022-10-31T08:38:03+00:00" + } + ], + "aliases": [], + "minimum-stability": "stable", + "stability-flags": [], + "prefer-stable": false, + "prefer-lowest": false, + "platform": { + "php": "^8.0 || ^7.0.8", + "ext-json": "*", + "ext-tokenizer": "*" + }, + "platform-dev": [], + "plugin-api-version": "2.6.0" +} diff --git a/pkgs/development/php-packages/psysh/default.nix b/pkgs/development/php-packages/psysh/default.nix index 6ae05cea4d3ca..484b67b43371a 100644 --- a/pkgs/development/php-packages/psysh/default.nix +++ b/pkgs/development/php-packages/psysh/default.nix @@ -2,16 +2,17 @@ php.buildComposerProject (finalAttrs: { pname = "psysh"; - version = "0.11.20"; + version = "0.11.21"; src = fetchFromGitHub { owner = "bobthecow"; repo = "psysh"; rev = "v${finalAttrs.version}"; - hash = "sha256-Bcpmn0rCjNMeGvF1CGg4uatakUtMY1H1o759CK15b0o="; + hash = "sha256-YuBn4mrgOzGeMGfGcyZySAISmQdv3WRGn91PRozyxdI="; }; - vendorHash = "sha256-1XPDgaiWVenGSGluDciQAm9qQTL9vGJk9AqkTviRa+c="; + composerLock = ./composer.lock; + vendorHash = "sha256-FZFeO7UiVssxTf0JX6wdjrAE+jucYnfQJA1eOng39lQ="; meta = { changelog = "https://github.com/bobthecow/psysh/releases/tag/v${finalAttrs.version}"; diff --git a/pkgs/development/php-packages/redis/default.nix b/pkgs/development/php-packages/redis/default.nix index 42cc89b4874cf..c334164087d9a 100644 --- a/pkgs/development/php-packages/redis/default.nix +++ b/pkgs/development/php-packages/redis/default.nix @@ -1,7 +1,7 @@ { buildPecl, lib, php, fetchFromGitHub }: let - version = "5.3.7"; + version = "6.0.1"; in buildPecl { inherit version; pname = "redis"; @@ -10,7 +10,7 @@ in buildPecl { repo = "phpredis"; owner = "phpredis"; rev = version; - sha256 = "sha256-Cc9Mtx28j3kpyV8Yq+JSYQt5XQnELaVjuUbkkbG45kw="; + hash = "sha256-0by0TC4TNFIzgMjoyuJG4EavMhkYqmn8TtRaVmgepfc="; }; internalDeps = with php.extensions; [ diff --git a/pkgs/development/php-packages/rrd/default.nix b/pkgs/development/php-packages/rrd/default.nix new file mode 100644 index 0000000000000..a89f9a3b71b16 --- /dev/null +++ b/pkgs/development/php-packages/rrd/default.nix @@ -0,0 +1,17 @@ +{ buildPecl, lib, pkg-config, rrdtool }: + +buildPecl { + pname = "rrd"; + + version = "2.0.3"; + hash = "sha256-pCFh5YzcioU7cs/ymJidy96CsPdkVt1ZzgKFTJK3MPc="; + + nativeBuildInputs = [ pkg-config rrdtool ]; + + meta = { + description = "PHP bindings to RRD tool system"; + license = lib.licenses.bsd0; + homepage = "https://github.com/php/pecl-processing-rrd"; + maintainers = lib.teams.wdz.members; + }; +} diff --git a/pkgs/development/python-modules/aardwolf/default.nix b/pkgs/development/python-modules/aardwolf/default.nix index 3b92fc06a915d..add8b364591f7 100644 --- a/pkgs/development/python-modules/aardwolf/default.nix +++ b/pkgs/development/python-modules/aardwolf/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "aardwolf"; - version = "0.2.7"; + version = "0.2.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -33,14 +33,14 @@ buildPythonPackage rec { owner = "skelsec"; repo = "aardwolf"; rev = "refs/tags/${version}"; - hash = "sha256-xz3461QgZ2tySj2cTlKQ5faYQDSECvbk1U6QCbzM86w="; + hash = "sha256-4kJsW0uwWfcgVruEdDw3QhbzfPDuLjmK+YvcLrgF4SI="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; sourceRoot = "${src.name}/aardwolf/utils/rlers"; name = "${pname}-${version}"; - hash = "sha256-JGXTCCyC20EuUX0pP3xSZG3qFB5jRL7+wW2YRC3EiCc="; + hash = "sha256-i7fmdWOseRQGdvdBnlGi+lgWvhC2WFI2FwXU9JywYsc="; }; cargoRoot = "aardwolf/utils/rlers"; diff --git a/pkgs/development/python-modules/acquire/default.nix b/pkgs/development/python-modules/acquire/default.nix index e944a1d210133..13297b0cd6d33 100644 --- a/pkgs/development/python-modules/acquire/default.nix +++ b/pkgs/development/python-modules/acquire/default.nix @@ -17,16 +17,16 @@ buildPythonPackage rec { pname = "acquire"; - version = "3.8"; + version = "3.9"; format = "pyproject"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fox-it"; repo = "acquire"; rev = "refs/tags/${version}"; - hash = "sha256-JfZ0sc7hFj71XxGWTTZ50uGWuKoWKY4vYm0v+zS2YiQ="; + hash = "sha256-ppkfnPJEvCImTA0+NjYD8r6SHcx9eBN9GBvo0IZYcjY="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/aemet-opendata/default.nix b/pkgs/development/python-modules/aemet-opendata/default.nix index 90f28265c0904..947f6d3d121f5 100644 --- a/pkgs/development/python-modules/aemet-opendata/default.nix +++ b/pkgs/development/python-modules/aemet-opendata/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aemet-opendata"; - version = "0.4.4"; + version = "0.4.5"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "AEMET-OpenData"; rev = "refs/tags/${version}"; - hash = "sha256-Jm7fv1fNavp2GkfKPhZXYGnGuCBy6BdN9iTNYTBIyew="; + hash = "sha256-rjHiDn8//zjFR27RTGGWZCxKI6pDXu47DFINV8Tq7ZM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aesara/default.nix b/pkgs/development/python-modules/aesara/default.nix index 4e1435133f77c..0362b5b3d4c24 100644 --- a/pkgs/development/python-modules/aesara/default.nix +++ b/pkgs/development/python-modules/aesara/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "aesara"; - version = "2.9.1"; + version = "2.9.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "aesara-devs"; repo = "aesara"; rev = "refs/tags/rel-${version}"; - hash = "sha256-eanFkEiuPzm4InLd9dFmoLs/IOofObn9NIzaqzINdMQ="; + hash = "sha256-6SZHr81OiqzKh977RrJtrDvFlAIjguK+1imP3bjxhS8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 1eeb2c2e7b2a7..76b289d49de58 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.68"; + version = "9.2.71"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-dQ4N1ixqcX+pHm6BIykISiHyao5kxJP+pFFqFV8+Ah0="; + hash = "sha256-urTztt+e0toD3tY0QwOmUhi6xzOv6NkrTzV8RerySSo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aio-pika/default.nix b/pkgs/development/python-modules/aio-pika/default.nix index 9082fd4b37a73..fdcb671029286 100644 --- a/pkgs/development/python-modules/aio-pika/default.nix +++ b/pkgs/development/python-modules/aio-pika/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aio-pika"; - version = "9.1.3"; + version = "9.3.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "mosquito"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-QCM/9Vt9/uXylaU8xymXJEjVd6sFRcVhpr2CGjB0AoY="; + hash = "sha256-Fy3vTXfj+gu/+PYWPfcOZ/D7boRiZYcFPX29p28HoGs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aioairzone-cloud/default.nix b/pkgs/development/python-modules/aioairzone-cloud/default.nix index db3f27b5d3f0d..bdc21d70892f7 100644 --- a/pkgs/development/python-modules/aioairzone-cloud/default.nix +++ b/pkgs/development/python-modules/aioairzone-cloud/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioairzone-cloud"; - version = "0.2.1"; + version = "0.2.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "aioairzone-cloud"; rev = "refs/tags/${version}"; - hash = "sha256-GOt6oFf1ogxODrgs6/OdgTjA1UNyiNZOPFr+0DRgz0M="; + hash = "sha256-7sjiY20jDUHtEnqAMwEHsBboK9XCH5XjE0sHR82YvEA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aioboto3/default.nix b/pkgs/development/python-modules/aioboto3/default.nix new file mode 100644 index 0000000000000..6494bf65a6e71 --- /dev/null +++ b/pkgs/development/python-modules/aioboto3/default.nix @@ -0,0 +1,73 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, poetry-dynamic-versioning +, aiobotocore +, chalice +, cryptography +, boto3 +, pytestCheckHook +, pytest-asyncio +, requests +, aiofiles +, moto +, dill +}: + +buildPythonPackage rec { + pname = "aioboto3"; + version = "11.3.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "terrycain"; + repo = "aioboto3"; + rev = "v${version}"; + hash = "sha256-jU9sKhbUdVeOvOXQnXR/S/4sBwTNcQCc9ZduO+HDXho="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace poetry.masonry.api poetry.core.masonry.api \ + --replace "poetry>=0.12" "poetry-core>=0.12" + ''; + + nativeBuildInputs = [ + poetry-core + poetry-dynamic-versioning + ]; + + propagatedBuildInputs = [ + aiobotocore + boto3 + ]; + + passthru.optional-dependencies = { + chalice = [ + chalice + ]; + s3cse = [ + cryptography + ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + requests + aiofiles + moto + dill + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + pythonImportsCheck = [ "aioboto3" ]; + + meta = with lib; { + description = "Wrapper to use boto3 resources with the aiobotocore async backend"; + homepage = "https://github.com/terrycain/aioboto3"; + changelog = "https://github.com/terrycain/aioboto3/blob/${src.rev}/CHANGELOG.rst"; + license = licenses.asl20; + maintainers = with maintainers; [ mbalatsko ]; + }; +} diff --git a/pkgs/development/python-modules/aiocomelit/default.nix b/pkgs/development/python-modules/aiocomelit/default.nix index dd572da52210f..f20d38b7266f4 100644 --- a/pkgs/development/python-modules/aiocomelit/default.nix +++ b/pkgs/development/python-modules/aiocomelit/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aiocomelit"; - version = "0.0.6"; + version = "0.0.9"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "chemelli74"; repo = "aiocomelit"; rev = "refs/tags/v${version}"; - hash = "sha256-u6CyqDFLgnIVak0UqN4JmL8ll/li3k9EhFs7iC5oZ9U="; + hash = "sha256-xVSxXiHSyUa31X+eOK5ZXH/+Uwm8lfStY0nZ2mKWFpI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index f0a310b7a14c6..1839f3d19eded 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "16.0.5"; + version = "17.0.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-SueK59CZTKkQPsHThs7k9eCEmc1GwaRIrw3oSK4E80E="; + hash = "sha256-CKh517bJA6enZJO3woj9jsL2hMPNfIrKhOO3vTuvyu0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix index afe7223f91f5d..7eb2a64d38e61 100644 --- a/pkgs/development/python-modules/aiohomekit/default.nix +++ b/pkgs/development/python-modules/aiohomekit/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "3.0.3"; + version = "3.0.5"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "Jc2k"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-6fNsiHddnsdjei0/wqx5ifWhM3bALlYG5Gli69+FmnM="; + hash = "sha256-Rux3fRP1lM42i42K24t27DwAadi+NRJJHDhPAjZXb7s="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiohttp-basicauth/default.nix b/pkgs/development/python-modules/aiohttp-basicauth/default.nix new file mode 100644 index 0000000000000..9855971564bcf --- /dev/null +++ b/pkgs/development/python-modules/aiohttp-basicauth/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, aiohttp +, pytestCheckHook +, pytest-asyncio +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aiohttp-basicauth"; + version = "1.0.0"; + format = "setuptools"; + + disable = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "romis2012"; + repo = "aiohttp-basicauth"; + rev = "v${version}"; + hash = "sha256-UaRzauHmBHYwXFqRwDn1py79BScqq5j5SWALM4dQBP4="; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + ]; + + pythonImportsCheck = [ "aiohttp_basicauth" ]; + + meta = with lib; { + description = "HTTP basic authentication middleware for aiohttp 3.0"; + homepage = "https://github.com/romis2012/aiohttp-basicauth"; + license = licenses.asl20; + maintainers = with maintainers; [ mbalatsko ]; + }; +} diff --git a/pkgs/development/python-modules/aiohttp-openmetrics/default.nix b/pkgs/development/python-modules/aiohttp-openmetrics/default.nix index eab5d1801f076..11b979c4f6c2d 100644 --- a/pkgs/development/python-modules/aiohttp-openmetrics/default.nix +++ b/pkgs/development/python-modules/aiohttp-openmetrics/default.nix @@ -3,15 +3,19 @@ , fetchPypi , aiohttp , prometheus-client +, pythonOlder }: buildPythonPackage rec { pname = "aiohttp-openmetrics"; - version = "0.0.11"; + version = "0.0.12"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-GIVUkjyn+iQSMZZ6dNmmimvbt+t+uxOYv2QEDk/dA+g="; + hash = "sha256-/ZRngcMlroCVTvIl+30DR4SI8LsSnTovuzg3YduWgWA="; }; propagatedBuildInputs = [ @@ -22,11 +26,14 @@ buildPythonPackage rec { # no tests doCheck = false; - pythonImportsCheck = [ "aiohttp_openmetrics" ]; + pythonImportsCheck = [ + "aiohttp_openmetrics" + ]; meta = with lib; { description = "OpenMetrics provider for aiohttp"; homepage = "https://github.com/jelmer/aiohttp-openmetrics/"; + changelog = "https://github.com/jelmer/aiohttp-openmetrics/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/aiohttp-remotes/default.nix b/pkgs/development/python-modules/aiohttp-remotes/default.nix index ae0cbf998417b..66f81b1232980 100644 --- a/pkgs/development/python-modules/aiohttp-remotes/default.nix +++ b/pkgs/development/python-modules/aiohttp-remotes/default.nix @@ -2,6 +2,7 @@ , aiohttp , buildPythonPackage , fetchPypi +, flit , pytest-aiohttp , pytestCheckHook , pythonOlder @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "aiohttp-remotes"; version = "1.2.0"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,6 +22,10 @@ buildPythonPackage rec { sha256 = "f95c3a6be5e2de746a85ce9af49ec548da6db8378d7e81bb171ec77b13562a6c"; }; + nativeBuildInputs = [ + flit + ]; + propagatedBuildInputs = [ aiohttp ] ++ lib.optionals (pythonOlder "3.7") [ diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix index efd590e7e827e..56b911ee4f893 100644 --- a/pkgs/development/python-modules/aiohue/default.nix +++ b/pkgs/development/python-modules/aiohue/default.nix @@ -5,23 +5,35 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook +, pytest-aiohttp +, pytest-asyncio , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "aiohue"; - version = "4.6.2"; - format = "setuptools"; + version = "4.7.0"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-DzslGfKwsXXWWhbTb0apJCsnNdnUe7AbvrRT8ZnPbVU="; + hash = "sha256-t48rUPAM0XpbDreCwHU/smoyhPtxhwrpDkb1170GkQM="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'version = "0.0.0"' 'version = "${version}"' + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ awesomeversion aiohttp @@ -30,6 +42,8 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + pytest-asyncio + pytest-aiohttp ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/aiomisc/default.nix b/pkgs/development/python-modules/aiomisc/default.nix index 045168b8d162d..77016c323d988 100644 --- a/pkgs/development/python-modules/aiomisc/default.nix +++ b/pkgs/development/python-modules/aiomisc/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "aiomisc"; - version = "17.3.21"; + version = "17.3.23"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-NaSwjU4SfUYeUe/3nWQxfgMYrN4Ez1Dc/PE4ffJmlSs="; + hash = "sha256-9Df/eGMnXFdv3RUh4LmlPm7STlUcVBw4flfH+bZ6q9Q="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aioprocessing/default.nix b/pkgs/development/python-modules/aioprocessing/default.nix index b09accb38b749..4a66a8f35d029 100644 --- a/pkgs/development/python-modules/aioprocessing/default.nix +++ b/pkgs/development/python-modules/aioprocessing/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioprocessing"; version = "2.0.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/aioprometheus/default.nix b/pkgs/development/python-modules/aioprometheus/default.nix new file mode 100644 index 0000000000000..5c875ea700870 --- /dev/null +++ b/pkgs/development/python-modules/aioprometheus/default.nix @@ -0,0 +1,65 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, orjson +, quantile-python +, aiohttp +, aiohttp-basicauth +, starlette +, quart +, pytestCheckHook +, httpx +, fastapi +, uvicorn +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aioprometheus"; + version = "unstable-2023-03-14"; + format = "setuptools"; + + disable = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "claws"; + repo = "aioprometheus"; + rev = "4786678b413d166c0b6e0041558d11bc1a7097b2"; + hash = "sha256-2z68rQkMjYqkszg5Noj9owWUWQGOEp/91RGiWiyZVOY="; + }; + + propagatedBuildInputs = [ + orjson + quantile-python + ]; + + passthru.optional-dependencies = { + aiohttp = [ + aiohttp + ]; + starlette = [ + starlette + ]; + quart = [ + quart + ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + aiohttp-basicauth + httpx + fastapi + uvicorn + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + pythonImportsCheck = [ "aioprometheus" ]; + + meta = with lib; { + description = "A Prometheus Python client library for asyncio-based applications"; + homepage = "https://github.com/claws/aioprometheus"; + changelog = "https://github.com/claws/aioprometheus/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ mbalatsko ]; + }; +} diff --git a/pkgs/development/python-modules/aiorun/default.nix b/pkgs/development/python-modules/aiorun/default.nix index 2027123672325..f0e63e0ae374c 100644 --- a/pkgs/development/python-modules/aiorun/default.nix +++ b/pkgs/development/python-modules/aiorun/default.nix @@ -2,6 +2,8 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, fetchpatch +, flit-core , pygments , pytestCheckHook , uvloop @@ -10,7 +12,7 @@ buildPythonPackage rec { pname = "aiorun"; version = "2023.7.2"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,6 +23,18 @@ buildPythonPackage rec { hash = "sha256-3AGsT8IUNi5SZHBsBfd7akj8eQ+xb0mrR7ydIr3T8gs="; }; + patches = [ + # Raise flit-core version constrains + (fetchpatch { # https://github.com/cjrh/aiorun/pull/85 + url = "https://github.com/cjrh/aiorun/commit/a0c027ea331167712738e35ca70fefcd794e16d5.patch"; + hash = "sha256-M1rcrkdFcoFa3IncPnJaRhnXbelyk56QnMGtmgB6bvk="; + }) + ]; + + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ pygments ]; diff --git a/pkgs/development/python-modules/aiosmb/default.nix b/pkgs/development/python-modules/aiosmb/default.nix index b0655e0dabc37..aada2ac415cef 100644 --- a/pkgs/development/python-modules/aiosmb/default.nix +++ b/pkgs/development/python-modules/aiosmb/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "aiosmb"; - version = "0.4.6"; + version = "0.4.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Y0Z76YP1cWcfMKZOn2L6z4B+hAdibxJOYBzT3WV6FcY="; + hash = "sha256-ze8x0vFGnPAIQQicuJxAcBVEeeKOGUHvepRTO4Ejx+g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiostream/default.nix b/pkgs/development/python-modules/aiostream/default.nix index 5d6b5436db439..0e8e7927ddca2 100644 --- a/pkgs/development/python-modules/aiostream/default.nix +++ b/pkgs/development/python-modules/aiostream/default.nix @@ -1,30 +1,49 @@ { lib , buildPythonPackage , fetchFromGitHub -, pythonOlder -, pytestCheckHook -, pytest-cov , pytest-asyncio +, pytestCheckHook +, pythonOlder +, typing-extensions }: buildPythonPackage rec { pname = "aiostream"; - version = "0.4.5"; - disabled = pythonOlder "3.6"; + version = "0.5.1"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "vxgmichel"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-WOtscg02Dq5YNSAfq4pIyH3oUP/5G+cjBwKB6c+SUVA="; + hash = "sha256-YdVvUP1b/NfXpbJ83ktjtXaVLHS6CQUGCw+EVygB4fU="; }; - nativeCheckInputs = [ pytestCheckHook pytest-cov pytest-asyncio ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace " --cov aiostream --cov-report html --cov-report term" "" + ''; + + propagatedBuildInputs = [ + typing-extensions + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "aiostream" + ]; meta = with lib; { description = "Generator-based operators for asynchronous iteration"; homepage = "https://aiostream.readthedocs.io"; + changelog = "https://github.com/vxgmichel/aiostream/releases/tag/v${version}"; license = licenses.gpl3Only; - maintainers = [ maintainers.rmcgibbo ]; + maintainers = with maintainers; [ rmcgibbo ]; }; } diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix index a906f8311f812..02e84b8f7e04e 100644 --- a/pkgs/development/python-modules/aiounifi/default.nix +++ b/pkgs/development/python-modules/aiounifi/default.nix @@ -10,12 +10,13 @@ , pythonOlder , segno , setuptools +, trustme , wheel }: buildPythonPackage rec { pname = "aiounifi"; - version = "62"; + version = "63"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -24,7 +25,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-5XCF67YuelS4RDUxfImSAELfdb3rJWGprIYQeQPp+yk="; + hash = "sha256-am11pFgYMRccUNaK/iKdp6mfk5NQ4QnU41xbFiGCMPs="; }; postPatch = '' @@ -51,6 +52,7 @@ buildPythonPackage rec { pytest-aiohttp pytest-asyncio pytestCheckHook + trustme ]; pytestFlagsArray = [ diff --git a/pkgs/development/python-modules/aiovodafone/default.nix b/pkgs/development/python-modules/aiovodafone/default.nix index 77d4947437863..ac9b87fb4eda4 100644 --- a/pkgs/development/python-modules/aiovodafone/default.nix +++ b/pkgs/development/python-modules/aiovodafone/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aiovodafone"; - version = "0.2.1"; + version = "0.3.1"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "chemelli74"; repo = "aiovodafone"; rev = "refs/tags/v${version}"; - hash = "sha256-fBGVXYHyC7Ek75KgmH9LCCgETGvHnS9WF1QJMbDtfVc="; + hash = "sha256-Zitssjoe88T7gphfAQXyv2el7jbMLKTnr1GSe5LTWnI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aiowaqi/default.nix b/pkgs/development/python-modules/aiowaqi/default.nix index ba2d16c7e3e91..3b91ea1cc4e26 100644 --- a/pkgs/development/python-modules/aiowaqi/default.nix +++ b/pkgs/development/python-modules/aiowaqi/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiowaqi"; - version = "1.1.0"; + version = "2.0.0"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "joostlek"; repo = "python-waqi"; rev = "refs/tags/v${version}"; - hash = "sha256-CQCF59Tp0VE7PNHPdVzzZegLUNDkslzKapELDjZn1k4="; + hash = "sha256-WEcCv4PCJ1gmRkQbjhIxx8qi1zps2Z65iFrdBHXPPvA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/alexapy/default.nix b/pkgs/development/python-modules/alexapy/default.nix index d5e6f93ebefd5..2aeebd0239f7e 100644 --- a/pkgs/development/python-modules/alexapy/default.nix +++ b/pkgs/development/python-modules/alexapy/default.nix @@ -19,8 +19,8 @@ buildPythonPackage rec { pname = "alexapy"; - version = "1.26.9"; - format = "pyproject"; + version = "1.27.4"; + pyproject = true; disabled = pythonOlder "3.10"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "keatontaylor"; repo = "alexapy"; rev = "refs/tags/v${version}"; - hash = "sha256-mDh4kYwRXpvVCh+nBmQblmlmgG98P6+UmgG4ZioQ68M="; + hash = "sha256-Z7h6VX4cwcepo0Kxq9GdHv+XFNg/0s/OhJ/iHubhovs="; }; pythonRelaxDeps = [ @@ -64,7 +64,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python Package for controlling Alexa devices (echo dot, etc) programmatically"; homepage = "https://gitlab.com/keatontaylor/alexapy"; - changelog = "https://gitlab.com/keatontaylor/alexapy/-/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://gitlab.com/keatontaylor/alexapy/-/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix index 16d2842b5e567..1ab81cd86b521 100644 --- a/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix +++ b/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-core"; - version = "2.13.36"; + version = "2.14.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-IL1UmE+jFtpwDH81WlGrC4FmkOKg/O+3te8BP+0NqSg="; + hash = "sha256-yAaBWkj/24lMxbzhW4JZuaMBLMDNoBvi89+7hE8/TyE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix index 9f4098d6fa5b2..2a753b4251034 100644 --- a/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix +++ b/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-iot"; - version = "8.56.0"; + version = "8.57.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8d77P522c6gV8LhKErixzE2DvGmjr9bms+2eHYirgwg="; + hash = "sha256-Ea0IUn2mlu0c7QYJZkUrBUrtjUuTHoTeuvZHw/il+4A="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/amaranth-soc/default.nix b/pkgs/development/python-modules/amaranth-soc/default.nix index e90137ba22b72..685d63414ec5a 100644 --- a/pkgs/development/python-modules/amaranth-soc/default.nix +++ b/pkgs/development/python-modules/amaranth-soc/default.nix @@ -8,15 +8,15 @@ buildPythonPackage rec { pname = "amaranth-soc"; - version = "unstable-2021-12-10"; + version = "unstable-2023-09-15"; # python setup.py --version - realVersion = "0.1.dev49+g${lib.substring 0 7 src.rev}"; + realVersion = "0.1.dev70+g${lib.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "amaranth-lang"; repo = "amaranth-soc"; - rev = "217d4ea76ad3b3bbf146980d168bc7b3b9d95a18"; - sha256 = "dMip82L7faUn16RDeG3NgMv0nougpwTwDWLX0doD2YA="; + rev = "cce8a79a37498f4d5900be21a295ba77e51e6c9d"; + sha256 = "sha256-hfkJaqICuy3iSTwLM9lbUPvSMDBLW8GdxqswyAOsowo="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/amaranth/default.nix b/pkgs/development/python-modules/amaranth/default.nix index 713f886d7df4e..ad2cacb2ced8d 100644 --- a/pkgs/development/python-modules/amaranth/default.nix +++ b/pkgs/development/python-modules/amaranth/default.nix @@ -2,9 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, fetchpatch -, setuptools -, setuptools-scm +, pdm-backend , pyvcd , jinja2 , importlib-resources @@ -20,52 +18,26 @@ buildPythonPackage rec { pname = "amaranth"; - version = "0.3"; - # python setup.py --version - realVersion = "0.3"; - disabled = pythonOlder "3.6"; + format = "pyproject"; + # python -m setuptools_scm + version = "0.4.dev197+g${lib.substring 0 7 src.rev}"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "amaranth-lang"; repo = "amaranth"; - rev = "39a83f4d995d16364cc9b99da646ff8db6394166"; - sha256 = "P9AG3t30eGeeCN5+t7mjhRoOWIGZVzWQji9eYXphjA0="; + rev = "11d5bb19eb34463918c07dc5e2e0eac7dbf822b0"; + sha256 = "sha256-Ji5oYfF2hKSunAdAQTniv8Ajj6NE/bvW5cvadrGKa+U="; }; - patches = [ - (fetchpatch { - name = "fix-for-setuptools-64.0.2-preparation.patch"; - url = "https://github.com/amaranth-lang/amaranth/commit/64771a065a280fa683c1e6692383bec4f59f20fa.patch"; - hash = "sha256-Rsh9vVvUQj9nIcrsRirmR6XwFrfZ2VMaYJ4RCQ8sBE0="; - # This commit removes support for Python 3.6, which is unnecessary to fix - # the build when using new setuptools. Include only one file, which has a - # harmless comment change so that the subsequent patch applies cleanly. - includes = ["amaranth/_toolchain/cxx.py"]; - }) - (fetchpatch { - name = "fix-for-setuptools-64.0.2.patch"; - url = "https://github.com/amaranth-lang/amaranth/pull/722/commits/e5a56b07c568e5f4cc2603eefebd14c5cc4e13d8.patch"; - hash = "sha256-C8FyMSKHA7XsEMpO9eYNZx/X5rGaK7p3eXP+jSb6wVg="; - }) - (fetchpatch { - name = "add-python-3.11-support.patch"; - url = "https://github.com/amaranth-lang/amaranth/commit/851546bf2d16db62663d7002bece51f07078d0a5.patch"; - hash = "sha256-eetlFCLqmpCfTKViD16OScJbkql1yhdi5uJGnfnpcCE="; - }) - ]; - - SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}"; - nativeBuildInputs = [ git - setuptools - setuptools-scm + pdm-backend ]; propagatedBuildInputs = [ jinja2 pyvcd - setuptools ] ++ lib.optional (pythonOlder "3.9") importlib-resources ++ lib.optional (pythonOlder "3.8") importlib-metadata; @@ -77,17 +49,6 @@ buildPythonPackage rec { yosys ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "Jinja2~=2.11" "Jinja2>=2.11" \ - --replace "pyvcd~=0.2.2" "pyvcd" \ - --replace "amaranth-yosys>=0.10.*" "amaranth-yosys>=0.10" - - # jinja2.contextfunction was removed in jinja2 v3.1 - substituteInPlace amaranth/build/plat.py \ - --replace "@jinja2.contextfunction" "@jinja2.pass_context" - ''; - pythonImportsCheck = [ "amaranth" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 26a988a7632a8..da7b016d131df 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.68"; + version = "9.2.71"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+RDsYDROIbcuXl5q45T6lFzDpObWduOK9paDBALbImg="; + hash = "sha256-qdH7lLetLoqXvZw+HmxOyiLzYjdbpeZygqwFYwGRTRQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/anywidget/default.nix b/pkgs/development/python-modules/anywidget/default.nix index f96ef47e7332c..b4c29745e555f 100644 --- a/pkgs/development/python-modules/anywidget/default.nix +++ b/pkgs/development/python-modules/anywidget/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "anywidget"; - version = "0.6.3"; + version = "0.6.5"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-OUKxmYceEKURJeQTVI7oLT4SdZM90V7BoZf0UykkEV4="; + hash = "sha256-prriSqvy2S9URnXfTEY88lssU71/cV38egSIqnLHE+Q="; }; # We do not need the jupyterlab build dependency, because we do not need to diff --git a/pkgs/development/python-modules/app-model/default.nix b/pkgs/development/python-modules/app-model/default.nix index 29f19979ff539..1371cc72de3b3 100644 --- a/pkgs/development/python-modules/app-model/default.nix +++ b/pkgs/development/python-modules/app-model/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "app-model"; - version = "0.2.1"; + version = "0.2.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "pyapp-kit"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-1LldqihVCCgFdnsod751zWAAqkaaIH2qMpfsPYjWzgs="; + hash = "sha256-vo10BHUzvYlldAqTw/1LxgvSXgTM3LAls9jQIeB5LcU="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index 1e5cd61aff4f8..647a77e035a59 100644 --- a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "appthreat-vulnerability-db"; - version = "5.4.2"; + version = "5.4.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "AppThreat"; repo = "vulnerability-db"; rev = "refs/tags/v${version}"; - hash = "sha256-S0ebTM7X21Lny9Y1JG7ztv/H5gUjxXxNOQIIBTGFB7c="; + hash = "sha256-hALpNLXPg2Apha3KbEixFEH3NuzLe6lnEy9V5otskDM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/apycula/default.nix b/pkgs/development/python-modules/apycula/default.nix index 2d985b8786f5a..c09d616b4d502 100644 --- a/pkgs/development/python-modules/apycula/default.nix +++ b/pkgs/development/python-modules/apycula/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "apycula"; - version = "0.9.0"; + version = "0.9.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "Apycula"; - hash = "sha256-M62RgNUxn14o8w+vIJjDrMpYnfvwcU4jw05PPvPvR8A="; + hash = "sha256-9THKebhyoUUSnZek1uBIFckFM0Xh1fKRpxEt5Eptugw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 9b489ef8e733b..a2ceae590f063 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.68"; + version = "9.2.71"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-rbhzqp8PaotOt5d4E8hqWTwDRsG+hm7sVjBDkkblaIU="; + hash = "sha256-AZMbE+/2uw7mFtBKwwLWCiVwupnB+EkUrgZFkGiKHtM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/argilla/default.nix b/pkgs/development/python-modules/argilla/default.nix index 4ef9c171d2b27..82d79c2396d75 100644 --- a/pkgs/development/python-modules/argilla/default.nix +++ b/pkgs/development/python-modules/argilla/default.nix @@ -65,7 +65,7 @@ }: let pname = "argilla"; - version = "1.15.0"; + version = "1.16.0"; optional-dependencies = { server = [ fastapi @@ -126,7 +126,7 @@ buildPythonPackage { owner = "argilla-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-CEB2Q+8JJmYWeqKS1QuOysedCSuPWXcljlmaclwZzmY="; + hash = "sha256-SKxIc7T9wmMMGQeebcRVOrB4Y5ETz9LSeKzzqI+wf80="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/argon2-cffi/default.nix b/pkgs/development/python-modules/argon2-cffi/default.nix index 24e32526682f1..2282a06e5c646 100644 --- a/pkgs/development/python-modules/argon2-cffi/default.nix +++ b/pkgs/development/python-modules/argon2-cffi/default.nix @@ -6,6 +6,7 @@ , wheel , buildPythonPackage , fetchPypi +, flit-core , isPy3k , lib , stdenv @@ -15,13 +16,17 @@ buildPythonPackage rec { pname = "argon2-cffi"; version = "21.3.0"; - format = "flit"; + format = "pyproject"; src = fetchPypi { inherit pname version; sha256 = "d384164d944190a7dd7ef22c6aa3ff197da12962bd04b17f64d4e93d934dba5b"; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ cffi six argon2-cffi-bindings ] ++ lib.optional (!isPy3k) enum34; diff --git a/pkgs/development/python-modules/art/default.nix b/pkgs/development/python-modules/art/default.nix index 669b81032be79..2bf6f51cd1639 100644 --- a/pkgs/development/python-modules/art/default.nix +++ b/pkgs/development/python-modules/art/default.nix @@ -5,14 +5,14 @@ buildPythonPackage rec { pname = "art"; - version = "6.0"; + version = "6.1"; format = "setuptools"; src = fetchFromGitHub { owner = "sepandhaghighi"; repo = "art"; rev = "v${version}"; - hash = "sha256-ZF7UvqJU7KxNccMXL7tsL/s5KYpgGeGqaEATHo4WyNI="; + hash = "sha256-RJexYOGWwAwxQ7lWGgXzFSR2aly1twB9pC4QFs5m7k8="; }; pythonImportsCheck = [ "art" ]; diff --git a/pkgs/development/python-modules/asdf/default.nix b/pkgs/development/python-modules/asdf/default.nix index 0363eae2919bc..f4a45ecaf9ade 100644 --- a/pkgs/development/python-modules/asdf/default.nix +++ b/pkgs/development/python-modules/asdf/default.nix @@ -94,5 +94,7 @@ buildPythonPackage rec { homepage = "https://github.com/asdf-format/asdf"; license = licenses.bsd3; maintainers = with maintainers; [ ]; + # Many tests fail, according to Hydra + broken = true; }; } diff --git a/pkgs/development/python-modules/astropy-extension-helpers/default.nix b/pkgs/development/python-modules/astropy-extension-helpers/default.nix index 0077cfdde1503..d02ed1236154e 100644 --- a/pkgs/development/python-modules/astropy-extension-helpers/default.nix +++ b/pkgs/development/python-modules/astropy-extension-helpers/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , findutils , pytestCheckHook , pythonOlder @@ -11,23 +12,31 @@ buildPythonPackage rec { pname = "extension-helpers"; - version = "1.0.0"; + version = "1.1.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "ca1bfac67c79cf4a7a0c09286ce2a24eec31bf17715818d0726318dd0e5050e6"; + hash = "sha256-SUYMeKP40fjOwXRHn16FrURZSMzEFgM8WqPm3fLFAik="; }; + patches = [ + # Not needed to allow this package to build, but meant for it's dependent + # packages, like astropy. See explanation at: + # https://github.com/astropy/extension-helpers/pull/59 + (fetchpatch { + url = "https://github.com/astropy/extension-helpers/commit/796f3e7831298df2d26b6d994b13fd57061a56d1.patch"; + hash = "sha256-NnqK9HQq1hQ66RUJf9gTCuLyA0BVqVtL292mSXJ9860="; + }) + ]; + nativeBuildInputs = [ setuptools-scm wheel ]; - patches = [ ./permissions.patch ]; - nativeCheckInputs = [ findutils pip diff --git a/pkgs/development/python-modules/astropy-extension-helpers/permissions.patch b/pkgs/development/python-modules/astropy-extension-helpers/permissions.patch deleted file mode 100644 index cef74b3360347..0000000000000 --- a/pkgs/development/python-modules/astropy-extension-helpers/permissions.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/extension_helpers/_setup_helpers.py b/extension_helpers/_setup_helpers.py -index ec3e547..e2419f7 100644 ---- a/extension_helpers/_setup_helpers.py -+++ b/extension_helpers/_setup_helpers.py -@@ -79,8 +79,13 @@ def get_extensions(srcdir='.'): - if len(ext_modules) > 0: - main_package_dir = min(packages, key=len) - src_path = os.path.join(os.path.dirname(__file__), 'src') -- shutil.copy(os.path.join(src_path, 'compiler.c'), -- os.path.join(srcdir, main_package_dir, '_compiler.c')) -+ a = os.path.join(src_path, 'compiler.c') -+ b = os.path.join(srcdir, main_package_dir, '_compiler.c') -+ try: -+ os.unlink(b) -+ except OSError: -+ pass -+ shutil.copy(a, b) - ext = Extension(main_package_dir + '.compiler_version', - [os.path.join(main_package_dir, '_compiler.c')]) - ext_modules.append(ext) diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index 2176a6ff1fc39..0a70e40e9e8a0 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -1,5 +1,6 @@ { lib , fetchPypi +, fetchpatch , buildPythonPackage , pythonOlder @@ -10,6 +11,11 @@ , oldest-supported-numpy , setuptools-scm , wheel +# testing +, pytestCheckHook +, pytest-xdist +, pytest-astropy +, python # runtime , numpy @@ -18,21 +24,20 @@ , pyyaml }: -let +buildPythonPackage rec { pname = "astropy"; - version = "5.2.1"; -in -buildPythonPackage { - inherit pname version; + version = "5.3.4"; format = "pyproject"; disabled = pythonOlder "3.8"; # according to setup.cfg src = fetchPypi { inherit pname version; - hash = "sha256-9q4noHf46oSQPvp2x5C5hWFzQaAISw0hw5H3o/MyrCM="; + hash = "sha256-1JD34vqsLMwBySRCAtYpFUJZr4qXkQTO2J3ErOTm8dg="; }; - + # Relax cython dependency to allow this to build, upstream only doesn't + # support cython 3 as of writing. See: + # https://github.com/astropy/astropy/issues/15315 postPatch = '' substituteInPlace pyproject.toml \ --replace 'cython==' 'cython>=' @@ -54,14 +59,33 @@ buildPythonPackage { pyyaml ]; - # infinite recursion with pytest-astropy (pytest-astropy-header depends on astropy itself) - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + pytest-xdist + pytest-astropy + ]; + + # Not running it inside the build directory. See: + # https://github.com/astropy/astropy/issues/15316#issuecomment-1722190547 + preCheck = '' + cd "$out" + export HOME="$(mktemp -d)" + export OMP_NUM_THREADS=$(( $NIX_BUILD_CORES / 4 )) + ''; + pythonImportsCheck = [ + "astropy" + ]; + disabledTests = [ + # May fail due to parallelism, see: + # https://github.com/astropy/astropy/issues/15441 + "TestUnifiedOutputRegistry" + ]; - meta = with lib; { + meta = { description = "Astronomy/Astrophysics library for Python"; homepage = "https://www.astropy.org"; - license = licenses.bsd3; - platforms = platforms.all; - maintainers = [ maintainers.kentjames ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ kentjames doronbehar ]; }; } diff --git a/pkgs/development/python-modules/astroquery/default.nix b/pkgs/development/python-modules/astroquery/default.nix index 67bee933c0da2..7b5a24378dde4 100644 --- a/pkgs/development/python-modules/astroquery/default.nix +++ b/pkgs/development/python-modules/astroquery/default.nix @@ -66,6 +66,8 @@ buildPythonPackage rec { description = "Functions and classes to access online data resources"; homepage = "https://astroquery.readthedocs.io/"; license = licenses.bsd3; + # Broken since a certain astropy update, due to API incompatibility + broken = true; maintainers = [ maintainers.smaret ]; }; } diff --git a/pkgs/development/python-modules/asyauth/default.nix b/pkgs/development/python-modules/asyauth/default.nix index ccb8ef68911ec..a08a20831f1bd 100644 --- a/pkgs/development/python-modules/asyauth/default.nix +++ b/pkgs/development/python-modules/asyauth/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "asyauth"; - version = "0.0.15"; + version = "0.0.16"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-J2shp4YMGvDFDrfKxnqHQSfH6yteKM1DpQ+8DjblcNI="; + hash = "sha256-ktmL2EFWDTzZwhxfleYEeJtMiiDP28JaCGbsvxx73Ok="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/async-tkinter-loop/default.nix b/pkgs/development/python-modules/async-tkinter-loop/default.nix index bb00fbcde53bd..2bc90494ccf83 100644 --- a/pkgs/development/python-modules/async-tkinter-loop/default.nix +++ b/pkgs/development/python-modules/async-tkinter-loop/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "async-tkinter-loop"; - version = "0.8.1"; + version = "0.9.1"; format = "pyproject"; src = fetchPypi { inherit version; pname = "async_tkinter_loop"; - hash = "sha256-+9AvnYIZMWCbpCEKdbIadyU8zgyUlW/fRYYyDOxAzeg="; + hash = "sha256-Phxx9RovjU5JOonMt7Zhum0/BGRS5OLRAkLTl4L/BW4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix index acebba7126430..03b7e8664c467 100644 --- a/pkgs/development/python-modules/async-upnp-client/default.nix +++ b/pkgs/development/python-modules/async-upnp-client/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "async-upnp-client"; - version = "0.35.1"; + version = "0.36.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "StevenLooman"; repo = "async_upnp_client"; rev = "refs/tags/${version}"; - hash = "sha256-owg9oZv/smovJPoCjr9Y0TK4Ap5IMD7cNagtkYkJk1c="; + hash = "sha256-NFSJlBRVgeuhK7IXjNz2g6SbSgveSjaJpSQrxSACG04="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/asyncinotify/default.nix b/pkgs/development/python-modules/asyncinotify/default.nix index 9257e12f721e9..9049a22851854 100644 --- a/pkgs/development/python-modules/asyncinotify/default.nix +++ b/pkgs/development/python-modules/asyncinotify/default.nix @@ -1,13 +1,14 @@ { lib , buildPythonPackage , fetchFromGitLab +, flit-core , python }: buildPythonPackage rec { pname = "asyncinotify"; version = "4.0.2"; - format = "flit"; + format = "pyproject"; src = fetchFromGitLab { owner = "Taywee"; @@ -16,6 +17,10 @@ buildPythonPackage rec { hash = "sha256-Q7b406UENCmD9SGbaml+y2YLDi7VLZBmDkYMo8CLuVw="; }; + nativeBuildInputs = [ + flit-core + ]; + checkPhase = '' ${python.pythonForBuild.interpreter} ${src}/test.py ''; diff --git a/pkgs/development/python-modules/asyncstdlib/default.nix b/pkgs/development/python-modules/asyncstdlib/default.nix index 4d27c6da88277..8cd6af449f975 100644 --- a/pkgs/development/python-modules/asyncstdlib/default.nix +++ b/pkgs/development/python-modules/asyncstdlib/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , typing-extensions +, flit-core , pytestCheckHook , pythonOlder }: @@ -9,7 +10,7 @@ buildPythonPackage rec { pname = "asyncstdlib"; version = "3.10.8"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,6 +21,10 @@ buildPythonPackage rec { hash = "sha256-7HQFyIR+NWRzbFkzkZiuEQotZfCXpCzrWfWIFg1lWv4="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ typing-extensions ]; diff --git a/pkgs/development/python-modules/auditok/default.nix b/pkgs/development/python-modules/auditok/default.nix new file mode 100644 index 0000000000000..459662df15d59 --- /dev/null +++ b/pkgs/development/python-modules/auditok/default.nix @@ -0,0 +1,44 @@ +{ buildPythonPackage +, fetchPypi +, lib +, matplotlib +, numpy +, pyaudio +, pydub +, pythonOlder +, unittestCheckHook +}: + +buildPythonPackage rec { + pname = "auditok"; + version = "0.1.5"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit version; + pname = "auditok"; + hash = "sha256-HNsw9VLP7XEgs8E2X6p7ygDM47AwWxMYjptipknFig4="; + }; + + propagatedBuildInputs = [ matplotlib numpy pyaudio pydub ]; + + nativeCheckInputs = [ unittestCheckHook ]; + + unittestFlagsArray = [ "-s" "tests" ]; + + pythonImportsCheck = [ "auditok" ]; + + # The most recent version is 0.2.0, but the only dependent package is + # ffsubsync, which is pinned at 0.1.5. + passthru.skipBulkUpdate = true; + + meta = with lib; { + description = "Audio Activity Detection tool that can process online data as well as audio files"; + homepage = "https://github.com/amsehili/auditok/"; + changelog = "https://github.com/amsehili/auditok/blob/v${version}/CHANGELOG"; + license = licenses.mit; + maintainers = with maintainers; [ Benjamin-L ]; + }; +} diff --git a/pkgs/development/python-modules/auth0-python/default.nix b/pkgs/development/python-modules/auth0-python/default.nix index 44599435f149a..06313ed12ce11 100644 --- a/pkgs/development/python-modules/auth0-python/default.nix +++ b/pkgs/development/python-modules/auth0-python/default.nix @@ -3,7 +3,7 @@ , aioresponses , buildPythonPackage , callee -, fetchPypi +, fetchFromGitHub , mock , pyjwt , pytestCheckHook @@ -13,14 +13,16 @@ buildPythonPackage rec { pname = "auth0-python"; - version = "4.4.0"; + version = "4.4.2"; format = "setuptools"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-Yf8/NmQygdikQXv9sUukQEKKd+FcpSPnGbbi8kzVyLo="; + src = fetchFromGitHub { + owner = "auth0"; + repo = "auth0-python"; + rev = "refs/tags/${version}"; + hash = "sha256-RBkAuZQx7mBxVCpo5PoBiEge8+yTmp0XpcnxCkOsM6U="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/autofaiss/default.nix b/pkgs/development/python-modules/autofaiss/default.nix index aad226fa74513..eddea783def8f 100644 --- a/pkgs/development/python-modules/autofaiss/default.nix +++ b/pkgs/development/python-modules/autofaiss/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "autofaiss"; - version = "2.15.5"; + version = "2.15.8"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "criteo"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-IcAlvFlCERnw1UQWPRpSWpscOuPx0wd1MXOfoXZhvCU="; + hash = "sha256-vB906xbpEjNNzc8Dc8i3ENgl9lCPOgB9vs7QVRS7UcM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/automx2/default.nix b/pkgs/development/python-modules/automx2/default.nix new file mode 100644 index 0000000000000..cfc3a8484b67d --- /dev/null +++ b/pkgs/development/python-modules/automx2/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flask +, flask-migrate +, ldap3 +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "automx2"; + version = "unstable-2023-08-23"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "rseichter"; + repo = pname; + rev = "f3e3fc8e769c3799361001d51b7d9335a6a9d1a8"; + hash = "sha256-NkeazjjGDYUXfoydvEfww6e7SkSZ8rMRlML+oOaf374="; + }; + + propagatedBuildInputs = [ + flask + flask-migrate + ldap3 + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "automx2" + ]; + + meta = with lib; { + description = "Email client configuration made easy"; + homepage = "https://rseichter.github.io/automx2/"; + changelog = "https://github.com/rseichter/automx2/blob/${version}/CHANGELOG"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ twey ]; + }; +} diff --git a/pkgs/development/python-modules/aws-encryption-sdk/default.nix b/pkgs/development/python-modules/aws-encryption-sdk/default.nix new file mode 100644 index 0000000000000..7c69b062bd800 --- /dev/null +++ b/pkgs/development/python-modules/aws-encryption-sdk/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchPypi +, attrs +, boto3 +, cryptography +, setuptools +, wrapt +, mock +, pytest +, pytest-mock +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "aws-encryption-sdk"; + version = "3.1.1"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-jV+/AY/GjWscrL5N0Df9gFKWx3Nqn+RX62hNBT9/lWM="; + }; + + propagatedBuildInputs = [ + attrs + boto3 + cryptography + setuptools + wrapt + ]; + + doCheck = true; + + nativeCheckInputs = [ + mock + pytest + pytest-mock + pytestCheckHook + ]; + + disabledTestPaths = [ + # requires networking + "examples" + "test/integration" + ]; + + meta = with lib; { + homepage = "https://aws-encryption-sdk-python.readthedocs.io/"; + changelog = "https://github.com/aws/aws-encryption-sdk-python/blob/v${version}/CHANGELOG.rst"; + description = "Fully compliant, native Python implementation of the AWS Encryption SDK."; + license = licenses.asl20; + maintainers = with maintainers; [ anthonyroussel ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix index 67e7acde59a62..495b448c4c999 100644 --- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "azure-mgmt-compute"; - version = "30.2.0"; + version = "30.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-pd1tAbhn1ot2sAM+x8yKGgEpCtlp7vVyCAcAzMZhyYE="; + hash = "sha256-5Sl4Y0D4YqpqIYp61qW+trn7VYM8XKoIUcwzFNBJO2M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-storage-queue/default.nix b/pkgs/development/python-modules/azure-storage-queue/default.nix index 0990203d42dda..f861d2ec29641 100644 --- a/pkgs/development/python-modules/azure-storage-queue/default.nix +++ b/pkgs/development/python-modules/azure-storage-queue/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "azure-storage-queue"; - version = "12.7.1"; + version = "12.7.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zBt5z13ZRxB1xMLA3xEWf7mSoil43JLl8q46w0n/avY="; + hash = "sha256-90sni/yKGolR/92StkC4Kad7fNF/qeI1czzVqMW35JY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/b2sdk/default.nix b/pkgs/development/python-modules/b2sdk/default.nix index c577a7888a94b..7bb1551c57707 100644 --- a/pkgs/development/python-modules/b2sdk/default.nix +++ b/pkgs/development/python-modules/b2sdk/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "b2sdk"; - version = "1.24.0"; + version = "1.24.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-6zSjCt+J6530f1GMc/omP1zXKQKU1SDLLvslMWoqMcU="; + hash = "sha256-Tp9RjtybqCSxB1gFZXrjwNJ4mmwl+OWTzVyHd250Jas="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/base64io/default.nix b/pkgs/development/python-modules/base64io/default.nix new file mode 100644 index 0000000000000..4fefa1336214c --- /dev/null +++ b/pkgs/development/python-modules/base64io/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, mock +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "base64io"; + version = "1.0.3"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-JPLQ/nZcNTOeGy0zqpX5E3sbdltZQWT60QFsFYJ6cHM="; + }; + + nativeCheckInputs = [ + mock + pytestCheckHook + ]; + + meta = with lib; { + homepage = "https://base64io-python.readthedocs.io/"; + changelog = "https://github.com/aws/base64io-python/blob/${version}/CHANGELOG.rst"; + description = "Python stream implementation for base64 encoding/decoding"; + license = licenses.asl20; + maintainers = with maintainers; [ anthonyroussel ]; + }; +} diff --git a/pkgs/development/python-modules/bash_kernel/default.nix b/pkgs/development/python-modules/bash_kernel/default.nix index b7ccfedfbb855..582e7c5dccf18 100644 --- a/pkgs/development/python-modules/bash_kernel/default.nix +++ b/pkgs/development/python-modules/bash_kernel/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , fetchpatch +, flit-core , ipykernel , isPy27 , python @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "bash_kernel"; version = "0.9.0"; - format = "flit"; + format = "pyproject"; disabled = isPy27; src = fetchPypi { @@ -33,6 +34,8 @@ buildPythonPackage rec { --replace "\"bash\"" "'${bash}/bin/bash'" ''; + nativeBuildInputs = [ flit-core ]; + propagatedBuildInputs = [ ipykernel pexpect ]; # no tests diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix index bff59de425490..103f88082068a 100644 --- a/pkgs/development/python-modules/beancount/default.nix +++ b/pkgs/development/python-modules/beancount/default.nix @@ -17,14 +17,14 @@ }: buildPythonPackage rec { - version = "2.3.5"; + version = "2.3.6"; pname = "beancount"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - hash = "sha256-FONWJaLpy9Q8rmF42gjLPxIk9iYeVBymcm3zXZjpw2o="; + hash = "sha256-gB+Tvta1fS4iQ2aIxInVob8fduIQ887RhoB1fmDTR1o="; }; # Tests require files not included in the PyPI archive. diff --git a/pkgs/development/python-modules/beautifulsoup4/default.nix b/pkgs/development/python-modules/beautifulsoup4/default.nix index 4a9063365d68d..e803bcf154e17 100644 --- a/pkgs/development/python-modules/beautifulsoup4/default.nix +++ b/pkgs/development/python-modules/beautifulsoup4/default.nix @@ -9,6 +9,14 @@ , pythonOlder , soupsieve , sphinxHook + +# for passthru.tests +, html-sanitizer +, markdownify +, mechanicalsoup +, nbconvert +, subliminal +, wagtail }: buildPythonPackage rec { @@ -52,6 +60,15 @@ buildPythonPackage rec { "bs4" ]; + passthru.tests = { + inherit html-sanitizer + markdownify + mechanicalsoup + nbconvert + subliminal + wagtail; + }; + meta = with lib; { changelog = "https://git.launchpad.net/beautifulsoup/tree/CHANGELOG?h=${version}"; description = "HTML and XML parser"; diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index effdf9d010f89..3ed31e4ab4ddf 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.36.3"; + version = "0.36.5"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "bellows"; rev = "refs/tags/${version}"; - hash = "sha256-5s2I24gvHRXHm7ZTNZxc6ge9Kbe6UObcY29SvbIUWJg="; + hash = "sha256-f4AgYpqb4s5F46nGi0FjLQ9YRHetLfaA/jLydiewxOM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bibtexparser/default.nix b/pkgs/development/python-modules/bibtexparser/default.nix index 065af5879a474..aef733f938787 100644 --- a/pkgs/development/python-modules/bibtexparser/default.nix +++ b/pkgs/development/python-modules/bibtexparser/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "bibtexparser"; - version = "1.4.0"; + version = "1.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "sciunto-org"; repo = "python-${pname}"; rev = "refs/tags/v${version}"; - hash = "sha256-dP3ETzgVPI4NsxFI6Hv+nUInrjF+I1FwdqmeAetzL38="; + hash = "sha256-YMkLSx7L2srLINZa6Ec0rPoxE2SdMv6CnI4BpHgHuzM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bids-validator/default.nix b/pkgs/development/python-modules/bids-validator/default.nix index 7412fb2077b7d..115c80553cc5e 100644 --- a/pkgs/development/python-modules/bids-validator/default.nix +++ b/pkgs/development/python-modules/bids-validator/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "bids-validator"; - version = "1.12.0"; + version = "1.13.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-X569N5zfbTg+mDwQU5iGv16kiOTr8rwhKTEl9RCJMRY="; + hash = "sha256-cgXOTmj7oXIhUzLHhvGsFmUCW3Arbf8rHhWPAKLfmJA="; }; # needs packages which are not available in nixpkgs diff --git a/pkgs/development/python-modules/bimmer-connected/default.nix b/pkgs/development/python-modules/bimmer-connected/default.nix index 57eb2dc268453..40f7ad7cf8ab4 100644 --- a/pkgs/development/python-modules/bimmer-connected/default.nix +++ b/pkgs/development/python-modules/bimmer-connected/default.nix @@ -1,10 +1,10 @@ { lib -, aiofile , buildPythonPackage , pythonOlder , fetchFromGitHub , pbr , httpx +, pillow , pycryptodome , pyjwt , pytest-asyncio @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "bimmer-connected"; - version = "0.14.0"; + version = "0.14.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "bimmerconnected"; repo = "bimmer_connected"; rev = "refs/tags/${version}"; - hash = "sha256-cx22otbBCSFRTfr+wY1+k5kyX6h9mTQfRBfPw3rplzY="; + hash = "sha256-Fo30qDBqVxVuD/Ow0jsvN20Hx7Zhvie47CE+1ys1ewU="; }; nativeBuildInputs = [ @@ -36,8 +36,8 @@ buildPythonPackage rec { PBR_VERSION = version; propagatedBuildInputs = [ - aiofile httpx + pillow pycryptodome pyjwt ]; diff --git a/pkgs/development/python-modules/bleak-retry-connector/default.nix b/pkgs/development/python-modules/bleak-retry-connector/default.nix index 5e84af2a53b79..8ee08646d1e95 100644 --- a/pkgs/development/python-modules/bleak-retry-connector/default.nix +++ b/pkgs/development/python-modules/bleak-retry-connector/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bleak-retry-connector"; - version = "3.1.3"; + version = "3.2.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Nd/9mUtEEhCiJSF677lsE5UhMrbWiIl3ktQ7FjtyYlQ="; + hash = "sha256-3dftk/C6g6Hclc/N8LlsYcZfxA1I6bMiXkzRcUg69Oc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/bluetooth-data-tools/default.nix b/pkgs/development/python-modules/bluetooth-data-tools/default.nix index 920bb1cecc48b..608d7af455eb6 100644 --- a/pkgs/development/python-modules/bluetooth-data-tools/default.nix +++ b/pkgs/development/python-modules/bluetooth-data-tools/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "bluetooth-data-tools"; - version = "1.11.0"; + version = "1.12.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-iyfk0OOJezNCNyqRCbR2cTTTdgdYQM6hExTngd/3CtA="; + hash = "sha256-zdMqjZ7CEwDnvVvIe1breQ+/4ZwzdLk2CtI+GCY+3uk="; }; # The project can build both an optimized cython version and an unoptimized diff --git a/pkgs/development/python-modules/boost-histogram/default.nix b/pkgs/development/python-modules/boost-histogram/default.nix index 6e461e15b827f..ed29be91d81fd 100644 --- a/pkgs/development/python-modules/boost-histogram/default.nix +++ b/pkgs/development/python-modules/boost-histogram/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "boost-histogram"; - version = "1.3.2"; + version = "1.4.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boost_histogram"; inherit version; - hash = "sha256-4XXvvBBUonvFP7vpVHLKyeqTmZyR0GEYQNd2uZWI1Ro="; + hash = "sha256-z5gmz8/hAzUJa1emH2xlafZfAVklnusiUcW/MdhZ11M="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/bootstrap/build/default.nix b/pkgs/development/python-modules/bootstrap/build/default.nix index 639d2e3292cb0..f4e49bd65605c 100644 --- a/pkgs/development/python-modules/bootstrap/build/default.nix +++ b/pkgs/development/python-modules/bootstrap/build/default.nix @@ -7,12 +7,15 @@ , packaging , pyproject-hooks , tomli +, makeWrapper }: let buildBootstrapPythonModule = basePackage: attrs: stdenv.mkDerivation ({ pname = "${python.libPrefix}-bootstrap-${basePackage.pname}"; inherit (basePackage) version src meta; + nativeBuildInputs = [ makeWrapper ]; + buildPhase = '' runHook preBuild @@ -38,12 +41,30 @@ let bootstrap-pyproject-hooks = buildBootstrapPythonModule pyproject-hooks {}; bootstrap-tomli = buildBootstrapPythonModule tomli {}; + + sitePkgs = python.sitePackages; in buildBootstrapPythonModule build { - propagatedBuildInputs = [ - bootstrap-packaging - bootstrap-pyproject-hooks - ] ++ lib.optionals (python.pythonOlder "3.11") [ - bootstrap-tomli - ]; + # like the installPhase above, but wrapping the pyproject-build command + # to set up PYTHONPATH with the correct dependencies. + # This allows using `pyproject-build` without propagating its dependencies + # into the build environment, which is necessary to prevent + # pythonCatchConflicts from raising false positive alerts. + # This would happen whenever the package to build has a dependency on + # another version of a package that is also a dependency of pyproject-build. + installPhase = '' + runHook preInstall + + PYTHONPATH="${installer}/${python.sitePackages}" \ + ${python.interpreter} -m installer \ + --destdir "$out" --prefix "" dist/*.whl + + wrapProgram $out/bin/pyproject-build \ + --prefix PYTHONPATH : "$out/${sitePkgs}" \ + --prefix PYTHONPATH : "${bootstrap-pyproject-hooks}/${sitePkgs}" \ + --prefix PYTHONPATH : "${bootstrap-packaging}/${sitePkgs}" \ + --prefix PYTHONPATH : "${bootstrap-tomli}/${sitePkgs}" + + runHook postInstall + ''; } diff --git a/pkgs/development/python-modules/boschshcpy/default.nix b/pkgs/development/python-modules/boschshcpy/default.nix index 3a53322ceb91b..b8aeb5c157628 100644 --- a/pkgs/development/python-modules/boschshcpy/default.nix +++ b/pkgs/development/python-modules/boschshcpy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "boschshcpy"; - version = "0.2.67"; + version = "0.2.72"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tschamm"; repo = pname; rev = version; - hash = "sha256-M0LyEKJUcamv0PcflVI97zrXAoe1iV5sJ/oh60bMo6c="; + hash = "sha256-Re+OKgarLe4n54nZyBm0EtzMHcGKqDY6r+7rtvRSqsg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix new file mode 100644 index 0000000000000..369d722b2e3c6 --- /dev/null +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -0,0 +1,1823 @@ +{ lib +, boto3 +, botocore +, botocore-stubs +, buildPythonPackage +, fetchPypi +, mypy-boto3-accessanalyzer +, mypy-boto3-account +, mypy-boto3-acm +, mypy-boto3-acm-pca +, mypy-boto3-alexaforbusiness +, mypy-boto3-amp +, mypy-boto3-amplify +, mypy-boto3-amplifybackend +, mypy-boto3-amplifyuibuilder +, mypy-boto3-apigateway +, mypy-boto3-apigatewaymanagementapi +, mypy-boto3-apigatewayv2 +, mypy-boto3-appconfig +, mypy-boto3-appconfigdata +, mypy-boto3-appfabric +, mypy-boto3-appflow +, mypy-boto3-appintegrations +, mypy-boto3-application-autoscaling +, mypy-boto3-application-insights +, mypy-boto3-applicationcostprofiler +, mypy-boto3-appmesh +, mypy-boto3-apprunner +, mypy-boto3-appstream +, mypy-boto3-appsync +, mypy-boto3-arc-zonal-shift +, mypy-boto3-athena +, mypy-boto3-auditmanager +, mypy-boto3-autoscaling +, mypy-boto3-autoscaling-plans +, mypy-boto3-backup +, mypy-boto3-backup-gateway +, mypy-boto3-backupstorage +, mypy-boto3-batch +, mypy-boto3-billingconductor +, mypy-boto3-braket +, mypy-boto3-budgets +, mypy-boto3-ce +, mypy-boto3-chime +, mypy-boto3-chime-sdk-identity +, mypy-boto3-chime-sdk-media-pipelines +, mypy-boto3-chime-sdk-meetings +, mypy-boto3-chime-sdk-messaging +, mypy-boto3-chime-sdk-voice +, mypy-boto3-cleanrooms +, mypy-boto3-cloud9 +, mypy-boto3-cloudcontrol +, mypy-boto3-clouddirectory +, mypy-boto3-cloudformation +, mypy-boto3-cloudfront +, mypy-boto3-cloudhsm +, mypy-boto3-cloudhsmv2 +, mypy-boto3-cloudsearch +, mypy-boto3-cloudsearchdomain +, mypy-boto3-cloudtrail +, mypy-boto3-cloudtrail-data +, mypy-boto3-cloudwatch +, mypy-boto3-codeartifact +, mypy-boto3-codebuild +, mypy-boto3-codecatalyst +, mypy-boto3-codecommit +, mypy-boto3-codedeploy +, mypy-boto3-codeguru-reviewer +, mypy-boto3-codeguru-security +, mypy-boto3-codeguruprofiler +, mypy-boto3-codepipeline +, mypy-boto3-codestar +, mypy-boto3-codestar-connections +, mypy-boto3-codestar-notifications +, mypy-boto3-cognito-identity +, mypy-boto3-cognito-idp +, mypy-boto3-cognito-sync +, mypy-boto3-comprehend +, mypy-boto3-comprehendmedical +, mypy-boto3-compute-optimizer +, mypy-boto3-config +, mypy-boto3-connect +, mypy-boto3-connect-contact-lens +, mypy-boto3-connectcampaigns +, mypy-boto3-connectcases +, mypy-boto3-connectparticipant +, mypy-boto3-controltower +, mypy-boto3-cur +, mypy-boto3-customer-profiles +, mypy-boto3-databrew +, mypy-boto3-dataexchange +, mypy-boto3-datapipeline +, mypy-boto3-datasync +, mypy-boto3-dax +, mypy-boto3-detective +, mypy-boto3-devicefarm +, mypy-boto3-devops-guru +, mypy-boto3-directconnect +, mypy-boto3-discovery +, mypy-boto3-dlm +, mypy-boto3-dms +, mypy-boto3-docdb +, mypy-boto3-docdb-elastic +, mypy-boto3-drs +, mypy-boto3-ds +, mypy-boto3-dynamodb +, mypy-boto3-dynamodbstreams +, mypy-boto3-ebs +, mypy-boto3-ec2 +, mypy-boto3-ec2-instance-connect +, mypy-boto3-ecr +, mypy-boto3-ecr-public +, mypy-boto3-ecs +, mypy-boto3-efs +, mypy-boto3-eks +, mypy-boto3-elastic-inference +, mypy-boto3-elasticache +, mypy-boto3-elasticbeanstalk +, mypy-boto3-elastictranscoder +, mypy-boto3-elb +, mypy-boto3-elbv2 +, mypy-boto3-emr +, mypy-boto3-emr-containers +, mypy-boto3-emr-serverless +, mypy-boto3-entityresolution +, mypy-boto3-es +, mypy-boto3-events +, mypy-boto3-evidently +, mypy-boto3-finspace +, mypy-boto3-finspace-data +, mypy-boto3-firehose +, mypy-boto3-fis +, mypy-boto3-fms +, mypy-boto3-forecast +, mypy-boto3-forecastquery +, mypy-boto3-frauddetector +, mypy-boto3-fsx +, mypy-boto3-gamelift +, mypy-boto3-gamesparks +, mypy-boto3-glacier +, mypy-boto3-globalaccelerator +, mypy-boto3-glue +, mypy-boto3-grafana +, mypy-boto3-greengrass +, mypy-boto3-greengrassv2 +, mypy-boto3-groundstation +, mypy-boto3-guardduty +, mypy-boto3-health +, mypy-boto3-healthlake +, mypy-boto3-honeycode +, mypy-boto3-iam +, mypy-boto3-identitystore +, mypy-boto3-imagebuilder +, mypy-boto3-importexport +, mypy-boto3-inspector +, mypy-boto3-inspector2 +, mypy-boto3-internetmonitor +, mypy-boto3-iot +, mypy-boto3-iot-data +, mypy-boto3-iot-jobs-data +, mypy-boto3-iot-roborunner +, mypy-boto3-iot1click-devices +, mypy-boto3-iot1click-projects +, mypy-boto3-iotanalytics +, mypy-boto3-iotdeviceadvisor +, mypy-boto3-iotevents +, mypy-boto3-iotevents-data +, mypy-boto3-iotfleethub +, mypy-boto3-iotfleetwise +, mypy-boto3-iotsecuretunneling +, mypy-boto3-iotsitewise +, mypy-boto3-iotthingsgraph +, mypy-boto3-iottwinmaker +, mypy-boto3-iotwireless +, mypy-boto3-ivs +, mypy-boto3-ivs-realtime +, mypy-boto3-ivschat +, mypy-boto3-kafka +, mypy-boto3-kafkaconnect +, mypy-boto3-kendra +, mypy-boto3-kendra-ranking +, mypy-boto3-keyspaces +, mypy-boto3-kinesis +, mypy-boto3-kinesis-video-archived-media +, mypy-boto3-kinesis-video-media +, mypy-boto3-kinesis-video-signaling +, mypy-boto3-kinesis-video-webrtc-storage +, mypy-boto3-kinesisanalytics +, mypy-boto3-kinesisanalyticsv2 +, mypy-boto3-kinesisvideo +, mypy-boto3-kms +, mypy-boto3-lakeformation +, mypy-boto3-lambda +, mypy-boto3-lex-models +, mypy-boto3-lex-runtime +, mypy-boto3-lexv2-models +, mypy-boto3-lexv2-runtime +, mypy-boto3-license-manager +, mypy-boto3-license-manager-linux-subscriptions +, mypy-boto3-license-manager-user-subscriptions +, mypy-boto3-lightsail +, mypy-boto3-location +, mypy-boto3-logs +, mypy-boto3-lookoutequipment +, mypy-boto3-lookoutmetrics +, mypy-boto3-lookoutvision +, mypy-boto3-m2 +, mypy-boto3-machinelearning +, mypy-boto3-macie +, mypy-boto3-macie2 +, mypy-boto3-managedblockchain +, mypy-boto3-managedblockchain-query +, mypy-boto3-marketplace-catalog +, mypy-boto3-marketplace-entitlement +, mypy-boto3-marketplacecommerceanalytics +, mypy-boto3-mediaconnect +, mypy-boto3-mediaconvert +, mypy-boto3-medialive +, mypy-boto3-mediapackage +, mypy-boto3-mediapackage-vod +, mypy-boto3-mediapackagev2 +, mypy-boto3-mediastore +, mypy-boto3-mediastore-data +, mypy-boto3-mediatailor +, mypy-boto3-medical-imaging +, mypy-boto3-memorydb +, mypy-boto3-meteringmarketplace +, mypy-boto3-mgh +, mypy-boto3-mgn +, mypy-boto3-migration-hub-refactor-spaces +, mypy-boto3-migrationhub-config +, mypy-boto3-migrationhuborchestrator +, mypy-boto3-migrationhubstrategy +, mypy-boto3-mobile +, mypy-boto3-mq +, mypy-boto3-mturk +, mypy-boto3-mwaa +, mypy-boto3-neptune +, mypy-boto3-network-firewall +, mypy-boto3-networkmanager +, mypy-boto3-nimble +, mypy-boto3-oam +, mypy-boto3-omics +, mypy-boto3-opensearch +, mypy-boto3-opensearchserverless +, mypy-boto3-opsworks +, mypy-boto3-opsworkscm +, mypy-boto3-organizations +, mypy-boto3-osis +, mypy-boto3-outposts +, mypy-boto3-panorama +, mypy-boto3-payment-cryptography +, mypy-boto3-payment-cryptography-data +, mypy-boto3-personalize +, mypy-boto3-personalize-events +, mypy-boto3-personalize-runtime +, mypy-boto3-pi +, mypy-boto3-pinpoint +, mypy-boto3-pinpoint-email +, mypy-boto3-pinpoint-sms-voice +, mypy-boto3-pinpoint-sms-voice-v2 +, mypy-boto3-pipes +, mypy-boto3-polly +, mypy-boto3-pricing +, mypy-boto3-privatenetworks +, mypy-boto3-proton +, mypy-boto3-qldb +, mypy-boto3-qldb-session +, mypy-boto3-quicksight +, mypy-boto3-ram +, mypy-boto3-rbin +, mypy-boto3-rds +, mypy-boto3-rds-data +, mypy-boto3-redshift +, mypy-boto3-redshift-data +, mypy-boto3-redshift-serverless +, mypy-boto3-rekognition +, mypy-boto3-resiliencehub +, mypy-boto3-resource-explorer-2 +, mypy-boto3-resource-groups +, mypy-boto3-resourcegroupstaggingapi +, mypy-boto3-robomaker +, mypy-boto3-rolesanywhere +, mypy-boto3-route53 +, mypy-boto3-route53-recovery-cluster +, mypy-boto3-route53-recovery-control-config +, mypy-boto3-route53-recovery-readiness +, mypy-boto3-route53domains +, mypy-boto3-route53resolver +, mypy-boto3-rum +, mypy-boto3-s3 +, mypy-boto3-s3control +, mypy-boto3-s3outposts +, mypy-boto3-sagemaker +, mypy-boto3-sagemaker-a2i-runtime +, mypy-boto3-sagemaker-edge +, mypy-boto3-sagemaker-featurestore-runtime +, mypy-boto3-sagemaker-geospatial +, mypy-boto3-sagemaker-metrics +, mypy-boto3-sagemaker-runtime +, mypy-boto3-savingsplans +, mypy-boto3-scheduler +, mypy-boto3-schemas +, mypy-boto3-sdb +, mypy-boto3-secretsmanager +, mypy-boto3-securityhub +, mypy-boto3-securitylake +, mypy-boto3-serverlessrepo +, mypy-boto3-service-quotas +, mypy-boto3-servicecatalog +, mypy-boto3-servicecatalog-appregistry +, mypy-boto3-servicediscovery +, mypy-boto3-ses +, mypy-boto3-sesv2 +, mypy-boto3-shield +, mypy-boto3-signer +, mypy-boto3-simspaceweaver +, mypy-boto3-sms +, mypy-boto3-sms-voice +, mypy-boto3-snow-device-management +, mypy-boto3-snowball +, mypy-boto3-sns +, mypy-boto3-sqs +, mypy-boto3-ssm +, mypy-boto3-ssm-contacts +, mypy-boto3-ssm-incidents +, mypy-boto3-ssm-sap +, mypy-boto3-sso +, mypy-boto3-sso-admin +, mypy-boto3-sso-oidc +, mypy-boto3-stepfunctions +, mypy-boto3-storagegateway +, mypy-boto3-sts +, mypy-boto3-support +, mypy-boto3-support-app +, mypy-boto3-swf +, mypy-boto3-synthetics +, mypy-boto3-textract +, mypy-boto3-timestream-query +, mypy-boto3-timestream-write +, mypy-boto3-tnb +, mypy-boto3-transcribe +, mypy-boto3-transfer +, mypy-boto3-translate +, mypy-boto3-verifiedpermissions +, mypy-boto3-voice-id +, mypy-boto3-vpc-lattice +, mypy-boto3-waf +, mypy-boto3-waf-regional +, mypy-boto3-wafv2 +, mypy-boto3-wellarchitected +, mypy-boto3-wisdom +, mypy-boto3-workdocs +, mypy-boto3-worklink +, mypy-boto3-workmail +, mypy-boto3-workmailmessageflow +, mypy-boto3-workspaces +, mypy-boto3-workspaces-web +, mypy-boto3-xray +, types-s3transfer +, typing-extensions +}: + +buildPythonPackage rec { + pname = "boto3-stubs"; + version = "1.28.58"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-LQxPd+RhC/W6z2/BNuyqQmaATi4APVHQf8F2dI21OQc="; + }; + + propagatedBuildInputs = [ + botocore-stubs + types-s3transfer + typing-extensions + ]; + + passthru.optional-dependencies = { + accessanalyzer = [ + mypy-boto3-accessanalyzer + ]; + account = [ + mypy-boto3-account + ]; + acm = [ + mypy-boto3-acm + ]; + acm-pca = [ + mypy-boto3-acm-pca + ]; + alexaforbusiness = [ + mypy-boto3-alexaforbusiness + ]; + all = [ + mypy-boto3-accessanalyzer + mypy-boto3-account + mypy-boto3-acm + mypy-boto3-acm-pca + mypy-boto3-alexaforbusiness + mypy-boto3-amp + mypy-boto3-amplify + mypy-boto3-amplifybackend + mypy-boto3-amplifyuibuilder + mypy-boto3-apigateway + mypy-boto3-apigatewaymanagementapi + mypy-boto3-apigatewayv2 + mypy-boto3-appconfig + mypy-boto3-appconfigdata + mypy-boto3-appfabric + mypy-boto3-appflow + mypy-boto3-appintegrations + mypy-boto3-application-autoscaling + mypy-boto3-application-insights + mypy-boto3-applicationcostprofiler + mypy-boto3-appmesh + mypy-boto3-apprunner + mypy-boto3-appstream + mypy-boto3-appsync + mypy-boto3-arc-zonal-shift + mypy-boto3-athena + mypy-boto3-auditmanager + mypy-boto3-autoscaling + mypy-boto3-autoscaling-plans + mypy-boto3-backup + mypy-boto3-backup-gateway + mypy-boto3-backupstorage + mypy-boto3-batch + mypy-boto3-billingconductor + mypy-boto3-braket + mypy-boto3-budgets + mypy-boto3-ce + mypy-boto3-chime + mypy-boto3-chime-sdk-identity + mypy-boto3-chime-sdk-media-pipelines + mypy-boto3-chime-sdk-meetings + mypy-boto3-chime-sdk-messaging + mypy-boto3-chime-sdk-voice + mypy-boto3-cleanrooms + mypy-boto3-cloud9 + mypy-boto3-cloudcontrol + mypy-boto3-clouddirectory + mypy-boto3-cloudformation + mypy-boto3-cloudfront + mypy-boto3-cloudhsm + mypy-boto3-cloudhsmv2 + mypy-boto3-cloudsearch + mypy-boto3-cloudsearchdomain + mypy-boto3-cloudtrail + mypy-boto3-cloudtrail-data + mypy-boto3-cloudwatch + mypy-boto3-codeartifact + mypy-boto3-codebuild + mypy-boto3-codecatalyst + mypy-boto3-codecommit + mypy-boto3-codedeploy + mypy-boto3-codeguru-reviewer + mypy-boto3-codeguru-security + mypy-boto3-codeguruprofiler + mypy-boto3-codepipeline + mypy-boto3-codestar + mypy-boto3-codestar-connections + mypy-boto3-codestar-notifications + mypy-boto3-cognito-identity + mypy-boto3-cognito-idp + mypy-boto3-cognito-sync + mypy-boto3-comprehend + mypy-boto3-comprehendmedical + mypy-boto3-compute-optimizer + mypy-boto3-config + mypy-boto3-connect + mypy-boto3-connect-contact-lens + mypy-boto3-connectcampaigns + mypy-boto3-connectcases + mypy-boto3-connectparticipant + mypy-boto3-controltower + mypy-boto3-cur + mypy-boto3-customer-profiles + mypy-boto3-databrew + mypy-boto3-dataexchange + mypy-boto3-datapipeline + mypy-boto3-datasync + mypy-boto3-dax + mypy-boto3-detective + mypy-boto3-devicefarm + mypy-boto3-devops-guru + mypy-boto3-directconnect + mypy-boto3-discovery + mypy-boto3-dlm + mypy-boto3-dms + mypy-boto3-docdb + mypy-boto3-docdb-elastic + mypy-boto3-drs + mypy-boto3-ds + mypy-boto3-dynamodb + mypy-boto3-dynamodbstreams + mypy-boto3-ebs + mypy-boto3-ec2 + mypy-boto3-ec2-instance-connect + mypy-boto3-ecr + mypy-boto3-ecr-public + mypy-boto3-ecs + mypy-boto3-efs + mypy-boto3-eks + mypy-boto3-elastic-inference + mypy-boto3-elasticache + mypy-boto3-elasticbeanstalk + mypy-boto3-elastictranscoder + mypy-boto3-elb + mypy-boto3-elbv2 + mypy-boto3-emr + mypy-boto3-emr-containers + mypy-boto3-emr-serverless + mypy-boto3-entityresolution + mypy-boto3-es + mypy-boto3-events + mypy-boto3-evidently + mypy-boto3-finspace + mypy-boto3-finspace-data + mypy-boto3-firehose + mypy-boto3-fis + mypy-boto3-fms + mypy-boto3-forecast + mypy-boto3-forecastquery + mypy-boto3-frauddetector + mypy-boto3-fsx + mypy-boto3-gamelift + mypy-boto3-gamesparks + mypy-boto3-glacier + mypy-boto3-globalaccelerator + mypy-boto3-glue + mypy-boto3-grafana + mypy-boto3-greengrass + mypy-boto3-greengrassv2 + mypy-boto3-groundstation + mypy-boto3-guardduty + mypy-boto3-health + mypy-boto3-healthlake + mypy-boto3-honeycode + mypy-boto3-iam + mypy-boto3-identitystore + mypy-boto3-imagebuilder + mypy-boto3-importexport + mypy-boto3-inspector + mypy-boto3-inspector2 + mypy-boto3-internetmonitor + mypy-boto3-iot + mypy-boto3-iot-data + mypy-boto3-iot-jobs-data + mypy-boto3-iot-roborunner + mypy-boto3-iot1click-devices + mypy-boto3-iot1click-projects + mypy-boto3-iotanalytics + mypy-boto3-iotdeviceadvisor + mypy-boto3-iotevents + mypy-boto3-iotevents-data + mypy-boto3-iotfleethub + mypy-boto3-iotfleetwise + mypy-boto3-iotsecuretunneling + mypy-boto3-iotsitewise + mypy-boto3-iotthingsgraph + mypy-boto3-iottwinmaker + mypy-boto3-iotwireless + mypy-boto3-ivs + mypy-boto3-ivs-realtime + mypy-boto3-ivschat + mypy-boto3-kafka + mypy-boto3-kafkaconnect + mypy-boto3-kendra + mypy-boto3-kendra-ranking + mypy-boto3-keyspaces + mypy-boto3-kinesis + mypy-boto3-kinesis-video-archived-media + mypy-boto3-kinesis-video-media + mypy-boto3-kinesis-video-signaling + mypy-boto3-kinesis-video-webrtc-storage + mypy-boto3-kinesisanalytics + mypy-boto3-kinesisanalyticsv2 + mypy-boto3-kinesisvideo + mypy-boto3-kms + mypy-boto3-lakeformation + mypy-boto3-lambda + mypy-boto3-lex-models + mypy-boto3-lex-runtime + mypy-boto3-lexv2-models + mypy-boto3-lexv2-runtime + mypy-boto3-license-manager + mypy-boto3-license-manager-linux-subscriptions + mypy-boto3-license-manager-user-subscriptions + mypy-boto3-lightsail + mypy-boto3-location + mypy-boto3-logs + mypy-boto3-lookoutequipment + mypy-boto3-lookoutmetrics + mypy-boto3-lookoutvision + mypy-boto3-m2 + mypy-boto3-machinelearning + mypy-boto3-macie + mypy-boto3-macie2 + mypy-boto3-managedblockchain + mypy-boto3-managedblockchain-query + mypy-boto3-marketplace-catalog + mypy-boto3-marketplace-entitlement + mypy-boto3-marketplacecommerceanalytics + mypy-boto3-mediaconnect + mypy-boto3-mediaconvert + mypy-boto3-medialive + mypy-boto3-mediapackage + mypy-boto3-mediapackage-vod + mypy-boto3-mediapackagev2 + mypy-boto3-mediastore + mypy-boto3-mediastore-data + mypy-boto3-mediatailor + mypy-boto3-medical-imaging + mypy-boto3-memorydb + mypy-boto3-meteringmarketplace + mypy-boto3-mgh + mypy-boto3-mgn + mypy-boto3-migration-hub-refactor-spaces + mypy-boto3-migrationhub-config + mypy-boto3-migrationhuborchestrator + mypy-boto3-migrationhubstrategy + mypy-boto3-mobile + mypy-boto3-mq + mypy-boto3-mturk + mypy-boto3-mwaa + mypy-boto3-neptune + mypy-boto3-network-firewall + mypy-boto3-networkmanager + mypy-boto3-nimble + mypy-boto3-oam + mypy-boto3-omics + mypy-boto3-opensearch + mypy-boto3-opensearchserverless + mypy-boto3-opsworks + mypy-boto3-opsworkscm + mypy-boto3-organizations + mypy-boto3-osis + mypy-boto3-outposts + mypy-boto3-panorama + mypy-boto3-payment-cryptography + mypy-boto3-payment-cryptography-data + mypy-boto3-personalize + mypy-boto3-personalize-events + mypy-boto3-personalize-runtime + mypy-boto3-pi + mypy-boto3-pinpoint + mypy-boto3-pinpoint-email + mypy-boto3-pinpoint-sms-voice + mypy-boto3-pinpoint-sms-voice-v2 + mypy-boto3-pipes + mypy-boto3-polly + mypy-boto3-pricing + mypy-boto3-privatenetworks + mypy-boto3-proton + mypy-boto3-qldb + mypy-boto3-qldb-session + mypy-boto3-quicksight + mypy-boto3-ram + mypy-boto3-rbin + mypy-boto3-rds + mypy-boto3-rds-data + mypy-boto3-redshift + mypy-boto3-redshift-data + mypy-boto3-redshift-serverless + mypy-boto3-rekognition + mypy-boto3-resiliencehub + mypy-boto3-resource-explorer-2 + mypy-boto3-resource-groups + mypy-boto3-resourcegroupstaggingapi + mypy-boto3-robomaker + mypy-boto3-rolesanywhere + mypy-boto3-route53 + mypy-boto3-route53-recovery-cluster + mypy-boto3-route53-recovery-control-config + mypy-boto3-route53-recovery-readiness + mypy-boto3-route53domains + mypy-boto3-route53resolver + mypy-boto3-rum + mypy-boto3-s3 + mypy-boto3-s3control + mypy-boto3-s3outposts + mypy-boto3-sagemaker + mypy-boto3-sagemaker-a2i-runtime + mypy-boto3-sagemaker-edge + mypy-boto3-sagemaker-featurestore-runtime + mypy-boto3-sagemaker-geospatial + mypy-boto3-sagemaker-metrics + mypy-boto3-sagemaker-runtime + mypy-boto3-savingsplans + mypy-boto3-scheduler + mypy-boto3-schemas + mypy-boto3-sdb + mypy-boto3-secretsmanager + mypy-boto3-securityhub + mypy-boto3-securitylake + mypy-boto3-serverlessrepo + mypy-boto3-service-quotas + mypy-boto3-servicecatalog + mypy-boto3-servicecatalog-appregistry + mypy-boto3-servicediscovery + mypy-boto3-ses + mypy-boto3-sesv2 + mypy-boto3-shield + mypy-boto3-signer + mypy-boto3-simspaceweaver + mypy-boto3-sms + mypy-boto3-sms-voice + mypy-boto3-snow-device-management + mypy-boto3-snowball + mypy-boto3-sns + mypy-boto3-sqs + mypy-boto3-ssm + mypy-boto3-ssm-contacts + mypy-boto3-ssm-incidents + mypy-boto3-ssm-sap + mypy-boto3-sso + mypy-boto3-sso-admin + mypy-boto3-sso-oidc + mypy-boto3-stepfunctions + mypy-boto3-storagegateway + mypy-boto3-sts + mypy-boto3-support + mypy-boto3-support-app + mypy-boto3-swf + mypy-boto3-synthetics + mypy-boto3-textract + mypy-boto3-timestream-query + mypy-boto3-timestream-write + mypy-boto3-tnb + mypy-boto3-transcribe + mypy-boto3-transfer + mypy-boto3-translate + mypy-boto3-verifiedpermissions + mypy-boto3-voice-id + mypy-boto3-vpc-lattice + mypy-boto3-waf + mypy-boto3-waf-regional + mypy-boto3-wafv2 + mypy-boto3-wellarchitected + mypy-boto3-wisdom + mypy-boto3-workdocs + mypy-boto3-worklink + mypy-boto3-workmail + mypy-boto3-workmailmessageflow + mypy-boto3-workspaces + mypy-boto3-workspaces-web + mypy-boto3-xray + ]; + amp = [ + mypy-boto3-amp + ]; + amplify = [ + mypy-boto3-amplify + ]; + amplifybackend = [ + mypy-boto3-amplifybackend + ]; + amplifyuibuilder = [ + mypy-boto3-amplifyuibuilder + ]; + apigateway = [ + mypy-boto3-apigateway + ]; + apigatewaymanagementapi = [ + mypy-boto3-apigatewaymanagementapi + ]; + apigatewayv2 = [ + mypy-boto3-apigatewayv2 + ]; + appconfig = [ + mypy-boto3-appconfig + ]; + appconfigdata = [ + mypy-boto3-appconfigdata + ]; + appfabric = [ + mypy-boto3-appfabric + ]; + appflow = [ + mypy-boto3-appflow + ]; + appintegrations = [ + mypy-boto3-appintegrations + ]; + application-autoscaling = [ + mypy-boto3-application-autoscaling + ]; + application-insights = [ + mypy-boto3-application-insights + ]; + applicationcostprofiler = [ + mypy-boto3-applicationcostprofiler + ]; + appmesh = [ + mypy-boto3-appmesh + ]; + apprunner = [ + mypy-boto3-apprunner + ]; + appstream = [ + mypy-boto3-appstream + ]; + appsync = [ + mypy-boto3-appsync + ]; + arc-zonal-shift = [ + mypy-boto3-arc-zonal-shift + ]; + athena = [ + mypy-boto3-athena + ]; + auditmanager = [ + mypy-boto3-auditmanager + ]; + autoscaling = [ + mypy-boto3-autoscaling + ]; + autoscaling-plans = [ + mypy-boto3-autoscaling-plans + ]; + backup = [ + mypy-boto3-backup + ]; + backup-gateway = [ + mypy-boto3-backup-gateway + ]; + backupstorage = [ + mypy-boto3-backupstorage + ]; + batch = [ + mypy-boto3-batch + ]; + billingconductor = [ + mypy-boto3-billingconductor + ]; + boto3 = [ + boto3 + botocore + ]; + braket = [ + mypy-boto3-braket + ]; + budgets = [ + mypy-boto3-budgets + ]; + ce = [ + mypy-boto3-ce + ]; + chime = [ + mypy-boto3-chime + ]; + chime-sdk-identity = [ + mypy-boto3-chime-sdk-identity + ]; + chime-sdk-media-pipelines = [ + mypy-boto3-chime-sdk-media-pipelines + ]; + chime-sdk-meetings = [ + mypy-boto3-chime-sdk-meetings + ]; + chime-sdk-messaging = [ + mypy-boto3-chime-sdk-messaging + ]; + chime-sdk-voice = [ + mypy-boto3-chime-sdk-voice + ]; + cleanrooms = [ + mypy-boto3-cleanrooms + ]; + cloud9 = [ + mypy-boto3-cloud9 + ]; + cloudcontrol = [ + mypy-boto3-cloudcontrol + ]; + clouddirectory = [ + mypy-boto3-clouddirectory + ]; + cloudformation = [ + mypy-boto3-cloudformation + ]; + cloudfront = [ + mypy-boto3-cloudfront + ]; + cloudhsm = [ + mypy-boto3-cloudhsm + ]; + cloudhsmv2 = [ + mypy-boto3-cloudhsmv2 + ]; + cloudsearch = [ + mypy-boto3-cloudsearch + ]; + cloudsearchdomain = [ + mypy-boto3-cloudsearchdomain + ]; + cloudtrail = [ + mypy-boto3-cloudtrail + ]; + cloudtrail-data = [ + mypy-boto3-cloudtrail-data + ]; + cloudwatch = [ + mypy-boto3-cloudwatch + ]; + codeartifact = [ + mypy-boto3-codeartifact + ]; + codebuild = [ + mypy-boto3-codebuild + ]; + codecatalyst = [ + mypy-boto3-codecatalyst + ]; + codecommit = [ + mypy-boto3-codecommit + ]; + codedeploy = [ + mypy-boto3-codedeploy + ]; + codeguru-reviewer = [ + mypy-boto3-codeguru-reviewer + ]; + codeguru-security = [ + mypy-boto3-codeguru-security + ]; + codeguruprofiler = [ + mypy-boto3-codeguruprofiler + ]; + codepipeline = [ + mypy-boto3-codepipeline + ]; + codestar = [ + mypy-boto3-codestar + ]; + codestar-connections = [ + mypy-boto3-codestar-connections + ]; + codestar-notifications = [ + mypy-boto3-codestar-notifications + ]; + cognito-identity = [ + mypy-boto3-cognito-identity + ]; + cognito-idp = [ + mypy-boto3-cognito-idp + ]; + cognito-sync = [ + mypy-boto3-cognito-sync + ]; + comprehend = [ + mypy-boto3-comprehend + ]; + comprehendmedical = [ + mypy-boto3-comprehendmedical + ]; + compute-optimizer = [ + mypy-boto3-compute-optimizer + ]; + config = [ + mypy-boto3-config + ]; + connect = [ + mypy-boto3-connect + ]; + connect-contact-lens = [ + mypy-boto3-connect-contact-lens + ]; + connectcampaigns = [ + mypy-boto3-connectcampaigns + ]; + connectcases = [ + mypy-boto3-connectcases + ]; + connectparticipant = [ + mypy-boto3-connectparticipant + ]; + controltower = [ + mypy-boto3-controltower + ]; + cur = [ + mypy-boto3-cur + ]; + customer-profiles = [ + mypy-boto3-customer-profiles + ]; + databrew = [ + mypy-boto3-databrew + ]; + dataexchange = [ + mypy-boto3-dataexchange + ]; + datapipeline = [ + mypy-boto3-datapipeline + ]; + datasync = [ + mypy-boto3-datasync + ]; + dax = [ + mypy-boto3-dax + ]; + detective = [ + mypy-boto3-detective + ]; + devicefarm = [ + mypy-boto3-devicefarm + ]; + devops-guru = [ + mypy-boto3-devops-guru + ]; + directconnect = [ + mypy-boto3-directconnect + ]; + discovery = [ + mypy-boto3-discovery + ]; + dlm = [ + mypy-boto3-dlm + ]; + dms = [ + mypy-boto3-dms + ]; + docdb = [ + mypy-boto3-docdb + ]; + docdb-elastic = [ + mypy-boto3-docdb-elastic + ]; + drs = [ + mypy-boto3-drs + ]; + ds = [ + mypy-boto3-ds + ]; + dynamodb = [ + mypy-boto3-dynamodb + ]; + dynamodbstreams = [ + mypy-boto3-dynamodbstreams + ]; + ebs = [ + mypy-boto3-ebs + ]; + ec2 = [ + mypy-boto3-ec2 + ]; + ec2-instance-connect = [ + mypy-boto3-ec2-instance-connect + ]; + ecr = [ + mypy-boto3-ecr + ]; + ecr-public = [ + mypy-boto3-ecr-public + ]; + ecs = [ + mypy-boto3-ecs + ]; + efs = [ + mypy-boto3-efs + ]; + eks = [ + mypy-boto3-eks + ]; + elastic-inference = [ + mypy-boto3-elastic-inference + ]; + elasticache = [ + mypy-boto3-elasticache + ]; + elasticbeanstalk = [ + mypy-boto3-elasticbeanstalk + ]; + elastictranscoder = [ + mypy-boto3-elastictranscoder + ]; + elb = [ + mypy-boto3-elb + ]; + elbv2 = [ + mypy-boto3-elbv2 + ]; + emr = [ + mypy-boto3-emr + ]; + emr-containers = [ + mypy-boto3-emr-containers + ]; + emr-serverless = [ + mypy-boto3-emr-serverless + ]; + entityresolution = [ + mypy-boto3-entityresolution + ]; + es = [ + mypy-boto3-es + ]; + essential = [ + mypy-boto3-cloudformation + mypy-boto3-dynamodb + mypy-boto3-ec2 + mypy-boto3-lambda + mypy-boto3-rds + mypy-boto3-s3 + mypy-boto3-sqs + ]; + events = [ + mypy-boto3-events + ]; + evidently = [ + mypy-boto3-evidently + ]; + finspace = [ + mypy-boto3-finspace + ]; + finspace-data = [ + mypy-boto3-finspace-data + ]; + firehose = [ + mypy-boto3-firehose + ]; + fis = [ + mypy-boto3-fis + ]; + fms = [ + mypy-boto3-fms + ]; + forecast = [ + mypy-boto3-forecast + ]; + forecastquery = [ + mypy-boto3-forecastquery + ]; + frauddetector = [ + mypy-boto3-frauddetector + ]; + fsx = [ + mypy-boto3-fsx + ]; + gamelift = [ + mypy-boto3-gamelift + ]; + gamesparks = [ + mypy-boto3-gamesparks + ]; + glacier = [ + mypy-boto3-glacier + ]; + globalaccelerator = [ + mypy-boto3-globalaccelerator + ]; + glue = [ + mypy-boto3-glue + ]; + grafana = [ + mypy-boto3-grafana + ]; + greengrass = [ + mypy-boto3-greengrass + ]; + greengrassv2 = [ + mypy-boto3-greengrassv2 + ]; + groundstation = [ + mypy-boto3-groundstation + ]; + guardduty = [ + mypy-boto3-guardduty + ]; + health = [ + mypy-boto3-health + ]; + healthlake = [ + mypy-boto3-healthlake + ]; + honeycode = [ + mypy-boto3-honeycode + ]; + iam = [ + mypy-boto3-iam + ]; + identitystore = [ + mypy-boto3-identitystore + ]; + imagebuilder = [ + mypy-boto3-imagebuilder + ]; + importexport = [ + mypy-boto3-importexport + ]; + inspector = [ + mypy-boto3-inspector + ]; + inspector2 = [ + mypy-boto3-inspector2 + ]; + internetmonitor = [ + mypy-boto3-internetmonitor + ]; + iot = [ + mypy-boto3-iot + ]; + iot-data = [ + mypy-boto3-iot-data + ]; + iot-jobs-data = [ + mypy-boto3-iot-jobs-data + ]; + iot-roborunner = [ + mypy-boto3-iot-roborunner + ]; + iot1click-devices = [ + mypy-boto3-iot1click-devices + ]; + iot1click-projects = [ + mypy-boto3-iot1click-projects + ]; + iotanalytics = [ + mypy-boto3-iotanalytics + ]; + iotdeviceadvisor = [ + mypy-boto3-iotdeviceadvisor + ]; + iotevents = [ + mypy-boto3-iotevents + ]; + iotevents-data = [ + mypy-boto3-iotevents-data + ]; + iotfleethub = [ + mypy-boto3-iotfleethub + ]; + iotfleetwise = [ + mypy-boto3-iotfleetwise + ]; + iotsecuretunneling = [ + mypy-boto3-iotsecuretunneling + ]; + iotsitewise = [ + mypy-boto3-iotsitewise + ]; + iotthingsgraph = [ + mypy-boto3-iotthingsgraph + ]; + iottwinmaker = [ + mypy-boto3-iottwinmaker + ]; + iotwireless = [ + mypy-boto3-iotwireless + ]; + ivs = [ + mypy-boto3-ivs + ]; + ivs-realtime = [ + mypy-boto3-ivs-realtime + ]; + ivschat = [ + mypy-boto3-ivschat + ]; + kafka = [ + mypy-boto3-kafka + ]; + kafkaconnect = [ + mypy-boto3-kafkaconnect + ]; + kendra = [ + mypy-boto3-kendra + ]; + kendra-ranking = [ + mypy-boto3-kendra-ranking + ]; + keyspaces = [ + mypy-boto3-keyspaces + ]; + kinesis = [ + mypy-boto3-kinesis + ]; + kinesis-video-archived-media = [ + mypy-boto3-kinesis-video-archived-media + ]; + kinesis-video-media = [ + mypy-boto3-kinesis-video-media + ]; + kinesis-video-signaling = [ + mypy-boto3-kinesis-video-signaling + ]; + kinesis-video-webrtc-storage = [ + mypy-boto3-kinesis-video-webrtc-storage + ]; + kinesisanalytics = [ + mypy-boto3-kinesisanalytics + ]; + kinesisanalyticsv2 = [ + mypy-boto3-kinesisanalyticsv2 + ]; + kinesisvideo = [ + mypy-boto3-kinesisvideo + ]; + kms = [ + mypy-boto3-kms + ]; + lakeformation = [ + mypy-boto3-lakeformation + ]; + lambda = [ + mypy-boto3-lambda + ]; + lex-models = [ + mypy-boto3-lex-models + ]; + lex-runtime = [ + mypy-boto3-lex-runtime + ]; + lexv2-models = [ + mypy-boto3-lexv2-models + ]; + lexv2-runtime = [ + mypy-boto3-lexv2-runtime + ]; + license-manager = [ + mypy-boto3-license-manager + ]; + license-manager-linux-subscriptions = [ + mypy-boto3-license-manager-linux-subscriptions + ]; + license-manager-user-subscriptions = [ + mypy-boto3-license-manager-user-subscriptions + ]; + lightsail = [ + mypy-boto3-lightsail + ]; + location = [ + mypy-boto3-location + ]; + logs = [ + mypy-boto3-logs + ]; + lookoutequipment = [ + mypy-boto3-lookoutequipment + ]; + lookoutmetrics = [ + mypy-boto3-lookoutmetrics + ]; + lookoutvision = [ + mypy-boto3-lookoutvision + ]; + m2 = [ + mypy-boto3-m2 + ]; + machinelearning = [ + mypy-boto3-machinelearning + ]; + macie = [ + mypy-boto3-macie + ]; + macie2 = [ + mypy-boto3-macie2 + ]; + managedblockchain = [ + mypy-boto3-managedblockchain + ]; + managedblockchain-query = [ + mypy-boto3-managedblockchain-query + ]; + marketplace-catalog = [ + mypy-boto3-marketplace-catalog + ]; + marketplace-entitlement = [ + mypy-boto3-marketplace-entitlement + ]; + marketplacecommerceanalytics = [ + mypy-boto3-marketplacecommerceanalytics + ]; + mediaconnect = [ + mypy-boto3-mediaconnect + ]; + mediaconvert = [ + mypy-boto3-mediaconvert + ]; + medialive = [ + mypy-boto3-medialive + ]; + mediapackage = [ + mypy-boto3-mediapackage + ]; + mediapackage-vod = [ + mypy-boto3-mediapackage-vod + ]; + mediapackagev2 = [ + mypy-boto3-mediapackagev2 + ]; + mediastore = [ + mypy-boto3-mediastore + ]; + mediastore-data = [ + mypy-boto3-mediastore-data + ]; + mediatailor = [ + mypy-boto3-mediatailor + ]; + medical-imaging = [ + mypy-boto3-medical-imaging + ]; + memorydb = [ + mypy-boto3-memorydb + ]; + meteringmarketplace = [ + mypy-boto3-meteringmarketplace + ]; + mgh = [ + mypy-boto3-mgh + ]; + mgn = [ + mypy-boto3-mgn + ]; + migration-hub-refactor-spaces = [ + mypy-boto3-migration-hub-refactor-spaces + ]; + migrationhub-config = [ + mypy-boto3-migrationhub-config + ]; + migrationhuborchestrator = [ + mypy-boto3-migrationhuborchestrator + ]; + migrationhubstrategy = [ + mypy-boto3-migrationhubstrategy + ]; + mobile = [ + mypy-boto3-mobile + ]; + mq = [ + mypy-boto3-mq + ]; + mturk = [ + mypy-boto3-mturk + ]; + mwaa = [ + mypy-boto3-mwaa + ]; + neptune = [ + mypy-boto3-neptune + ]; + network-firewall = [ + mypy-boto3-network-firewall + ]; + networkmanager = [ + mypy-boto3-networkmanager + ]; + nimble = [ + mypy-boto3-nimble + ]; + oam = [ + mypy-boto3-oam + ]; + omics = [ + mypy-boto3-omics + ]; + opensearch = [ + mypy-boto3-opensearch + ]; + opensearchserverless = [ + mypy-boto3-opensearchserverless + ]; + opsworks = [ + mypy-boto3-opsworks + ]; + opsworkscm = [ + mypy-boto3-opsworkscm + ]; + organizations = [ + mypy-boto3-organizations + ]; + osis = [ + mypy-boto3-osis + ]; + outposts = [ + mypy-boto3-outposts + ]; + panorama = [ + mypy-boto3-panorama + ]; + payment-cryptography = [ + mypy-boto3-payment-cryptography + ]; + payment-cryptography-data = [ + mypy-boto3-payment-cryptography-data + ]; + personalize = [ + mypy-boto3-personalize + ]; + personalize-events = [ + mypy-boto3-personalize-events + ]; + personalize-runtime = [ + mypy-boto3-personalize-runtime + ]; + pi = [ + mypy-boto3-pi + ]; + pinpoint = [ + mypy-boto3-pinpoint + ]; + pinpoint-email = [ + mypy-boto3-pinpoint-email + ]; + pinpoint-sms-voice = [ + mypy-boto3-pinpoint-sms-voice + ]; + pinpoint-sms-voice-v2 = [ + mypy-boto3-pinpoint-sms-voice-v2 + ]; + pipes = [ + mypy-boto3-pipes + ]; + polly = [ + mypy-boto3-polly + ]; + pricing = [ + mypy-boto3-pricing + ]; + privatenetworks = [ + mypy-boto3-privatenetworks + ]; + proton = [ + mypy-boto3-proton + ]; + qldb = [ + mypy-boto3-qldb + ]; + qldb-session = [ + mypy-boto3-qldb-session + ]; + quicksight = [ + mypy-boto3-quicksight + ]; + ram = [ + mypy-boto3-ram + ]; + rbin = [ + mypy-boto3-rbin + ]; + rds = [ + mypy-boto3-rds + ]; + rds-data = [ + mypy-boto3-rds-data + ]; + redshift = [ + mypy-boto3-redshift + ]; + redshift-data = [ + mypy-boto3-redshift-data + ]; + redshift-serverless = [ + mypy-boto3-redshift-serverless + ]; + rekognition = [ + mypy-boto3-rekognition + ]; + resiliencehub = [ + mypy-boto3-resiliencehub + ]; + resource-explorer-2 = [ + mypy-boto3-resource-explorer-2 + ]; + resource-groups = [ + mypy-boto3-resource-groups + ]; + resourcegroupstaggingapi = [ + mypy-boto3-resourcegroupstaggingapi + ]; + robomaker = [ + mypy-boto3-robomaker + ]; + rolesanywhere = [ + mypy-boto3-rolesanywhere + ]; + route53 = [ + mypy-boto3-route53 + ]; + route53-recovery-cluster = [ + mypy-boto3-route53-recovery-cluster + ]; + route53-recovery-control-config = [ + mypy-boto3-route53-recovery-control-config + ]; + route53-recovery-readiness = [ + mypy-boto3-route53-recovery-readiness + ]; + route53domains = [ + mypy-boto3-route53domains + ]; + route53resolver = [ + mypy-boto3-route53resolver + ]; + rum = [ + mypy-boto3-rum + ]; + s3 = [ + mypy-boto3-s3 + ]; + s3control = [ + mypy-boto3-s3control + ]; + s3outposts = [ + mypy-boto3-s3outposts + ]; + sagemaker = [ + mypy-boto3-sagemaker + ]; + sagemaker-a2i-runtime = [ + mypy-boto3-sagemaker-a2i-runtime + ]; + sagemaker-edge = [ + mypy-boto3-sagemaker-edge + ]; + sagemaker-featurestore-runtime = [ + mypy-boto3-sagemaker-featurestore-runtime + ]; + sagemaker-geospatial = [ + mypy-boto3-sagemaker-geospatial + ]; + sagemaker-metrics = [ + mypy-boto3-sagemaker-metrics + ]; + sagemaker-runtime = [ + mypy-boto3-sagemaker-runtime + ]; + savingsplans = [ + mypy-boto3-savingsplans + ]; + scheduler = [ + mypy-boto3-scheduler + ]; + schemas = [ + mypy-boto3-schemas + ]; + sdb = [ + mypy-boto3-sdb + ]; + secretsmanager = [ + mypy-boto3-secretsmanager + ]; + securityhub = [ + mypy-boto3-securityhub + ]; + securitylake = [ + mypy-boto3-securitylake + ]; + serverlessrepo = [ + mypy-boto3-serverlessrepo + ]; + service-quotas = [ + mypy-boto3-service-quotas + ]; + servicecatalog = [ + mypy-boto3-servicecatalog + ]; + servicecatalog-appregistry = [ + mypy-boto3-servicecatalog-appregistry + ]; + servicediscovery = [ + mypy-boto3-servicediscovery + ]; + ses = [ + mypy-boto3-ses + ]; + sesv2 = [ + mypy-boto3-sesv2 + ]; + shield = [ + mypy-boto3-shield + ]; + signer = [ + mypy-boto3-signer + ]; + simspaceweaver = [ + mypy-boto3-simspaceweaver + ]; + sms = [ + mypy-boto3-sms + ]; + sms-voice = [ + mypy-boto3-sms-voice + ]; + snow-device-management = [ + mypy-boto3-snow-device-management + ]; + snowball = [ + mypy-boto3-snowball + ]; + sns = [ + mypy-boto3-sns + ]; + sqs = [ + mypy-boto3-sqs + ]; + ssm = [ + mypy-boto3-ssm + ]; + ssm-contacts = [ + mypy-boto3-ssm-contacts + ]; + ssm-incidents = [ + mypy-boto3-ssm-incidents + ]; + ssm-sap = [ + mypy-boto3-ssm-sap + ]; + sso = [ + mypy-boto3-sso + ]; + sso-admin = [ + mypy-boto3-sso-admin + ]; + sso-oidc = [ + mypy-boto3-sso-oidc + ]; + stepfunctions = [ + mypy-boto3-stepfunctions + ]; + storagegateway = [ + mypy-boto3-storagegateway + ]; + sts = [ + mypy-boto3-sts + ]; + support = [ + mypy-boto3-support + ]; + support-app = [ + mypy-boto3-support-app + ]; + swf = [ + mypy-boto3-swf + ]; + synthetics = [ + mypy-boto3-synthetics + ]; + textract = [ + mypy-boto3-textract + ]; + timestream-query = [ + mypy-boto3-timestream-query + ]; + timestream-write = [ + mypy-boto3-timestream-write + ]; + tnb = [ + mypy-boto3-tnb + ]; + transcribe = [ + mypy-boto3-transcribe + ]; + transfer = [ + mypy-boto3-transfer + ]; + translate = [ + mypy-boto3-translate + ]; + verifiedpermissions = [ + mypy-boto3-verifiedpermissions + ]; + voice-id = [ + mypy-boto3-voice-id + ]; + vpc-lattice = [ + mypy-boto3-vpc-lattice + ]; + waf = [ + mypy-boto3-waf + ]; + waf-regional = [ + mypy-boto3-waf-regional + ]; + wafv2 = [ + mypy-boto3-wafv2 + ]; + wellarchitected = [ + mypy-boto3-wellarchitected + ]; + wisdom = [ + mypy-boto3-wisdom + ]; + workdocs = [ + mypy-boto3-workdocs + ]; + worklink = [ + mypy-boto3-worklink + ]; + workmail = [ + mypy-boto3-workmail + ]; + workmailmessageflow = [ + mypy-boto3-workmailmessageflow + ]; + workspaces = [ + mypy-boto3-workspaces + ]; + workspaces-web = [ + mypy-boto3-workspaces-web + ]; + xray = [ + mypy-boto3-xray + ]; + }; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "boto3-stubs" + ]; + + meta = with lib; { + description = "Type annotations for boto3"; + homepage = "https://pypi.org/project/boto3-stubs/"; + license = licenses.mit; + maintainers = with maintainers; [ fab mbalatsko ]; + }; +} diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 7a74a0b5964b2..50669fc1c6278 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.31.52"; + version = "1.31.60"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-L6m3jHozWpTZGAeXc9wxmHht50FYYYfYR6hxC5wzcAk="; + hash = "sha256-mBNODmy8MhpZPYwRpuJTK3TYy4Rkvz880BhLzFnxs54="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/bthome-ble/default.nix b/pkgs/development/python-modules/bthome-ble/default.nix index bced86608d4dc..dddf9d5d9c1f8 100644 --- a/pkgs/development/python-modules/bthome-ble/default.nix +++ b/pkgs/development/python-modules/bthome-ble/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bthome-ble"; - version = "3.1.1"; + version = "3.2.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "bthome-ble"; rev = "refs/tags/v${version}"; - hash = "sha256-fQIvOa9/Bqo4BN6LJz8COHo6n2m4XogVYCMdAUvDZUQ="; + hash = "sha256-UYW7yEAg4RJR1ERFDDS6s8OBr0XRTHTJLSuOF7FO6u4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cadquery/default.nix b/pkgs/development/python-modules/cadquery/default.nix index 15142e3d80e4b..1eb8f73b7a776 100644 --- a/pkgs/development/python-modules/cadquery/default.nix +++ b/pkgs/development/python-modules/cadquery/default.nix @@ -5,12 +5,11 @@ , pythonAtLeast , fetchFromGitHub , pyparsing -, opencascade +, opencascade-occt , stdenv , python , cmake , swig -, smesh , freetype , libGL , libGLU @@ -42,8 +41,7 @@ let buildInputs = [ python - opencascade - smesh + opencascade-occt freetype libGL libGLU @@ -57,9 +55,6 @@ let cmakeFlags = [ "-Wno-dev" "-DPYTHONOCC_INSTALL_DIRECTORY=${placeholder "out"}/${python.sitePackages}/OCC" - "-DSMESH_INCLUDE_PATH=${smesh}/include/smesh" - "-DSMESH_LIB_PATH=${smesh}/lib" - "-DPYTHONOCC_WRAP_SMESH=TRUE" ]; }); @@ -76,7 +71,7 @@ in }; buildInputs = [ - opencascade + opencascade-occt ]; propagatedBuildInputs = [ @@ -99,5 +94,6 @@ in homepage = "https://github.com/CadQuery/cadquery"; license = licenses.asl20; maintainers = with maintainers; [ marcus7070 ]; + broken = true; }; } diff --git a/pkgs/development/python-modules/camel-converter/default.nix b/pkgs/development/python-modules/camel-converter/default.nix index cc9c345d3fb0a..176c49819dbf1 100644 --- a/pkgs/development/python-modules/camel-converter/default.nix +++ b/pkgs/development/python-modules/camel-converter/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "camel-converter"; - version = "3.0.2"; + version = "3.0.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "sanders41"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-XKtWR9dmSMfqkJYUHDQtWBLG3CHrbrI5lNtPUTShmBE="; + hash = "sha256-0sNb1zg8cnDjQQnStfe1k8uB1GpmNtd/VwqSqTcLmj0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/canals/default.nix b/pkgs/development/python-modules/canals/default.nix index 9b919465365df..b74594f25ed9b 100644 --- a/pkgs/development/python-modules/canals/default.nix +++ b/pkgs/development/python-modules/canals/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "canals"; - version = "0.8.0"; + version = "0.8.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "deepset-ai"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-co2Zv4U4Vnn8IdPqZnyLD+siFu7tectj7ckh4oaKWYU="; + hash = "sha256-XC4CxvDghz8/LReeYjHEVtd8j2ZN4jd+x7vP6N8BKpc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index eb825a5d9ad76..c3e2ccf3e1815 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "1.28.0"; + version = "1.31.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "refs/tags/v${version}"; - hash = "sha256-h/wg7O6zWnSQL5+VzAUA+G/4i7LcFpHvK2weyql998Y="; + hash = "sha256-hWKO64cx8lcErGWMPY2pDtvuO6xF1Ve+bLWhHnYL/ng="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/castepxbin/default.nix b/pkgs/development/python-modules/castepxbin/default.nix index 765bb7164369e..b02cac817fe2b 100644 --- a/pkgs/development/python-modules/castepxbin/default.nix +++ b/pkgs/development/python-modules/castepxbin/default.nix @@ -1,27 +1,35 @@ { lib , buildPythonPackage +, pythonOlder , fetchFromGitHub +, flit-core , numpy , scipy -, pymatgen , pytestCheckHook }: buildPythonPackage rec { pname = "castepxbin"; - version = "0.2.0"; + version = "0.3.0"; + + disabled = pythonOlder "3.7"; + + format = "pyproject"; src = fetchFromGitHub { owner = "zhubonan"; repo = "castepxbin"; rev = "v${version}"; - sha256 = "0bqicpdyisbcz8argy4ppm59zzkcn9lcs4y1mh2f31f75x732na3"; + hash = "sha256-6kumVnm4PLRxuKO6Uz0iHzfYuu21hFC7EPRsc3S1kxE="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ numpy scipy - pymatgen ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/censys/default.nix b/pkgs/development/python-modules/censys/default.nix index f0a144e646ee7..1c815da264745 100644 --- a/pkgs/development/python-modules/censys/default.nix +++ b/pkgs/development/python-modules/censys/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "censys"; - version = "2.2.6"; + version = "2.2.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "censys"; repo = "censys-python"; rev = "refs/tags/v${version}"; - hash = "sha256-awe/6d6AryihS8vYCRtU8APbLUsqv9aKULBmjjaz3gM="; + hash = "sha256-tIWrDbtNKTN4WYc0Zy03omauExarg9770d57tAuq4c0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/certipy-ad/default.nix b/pkgs/development/python-modules/certipy-ad/default.nix index a0411655c26d2..ce55ab9829250 100644 --- a/pkgs/development/python-modules/certipy-ad/default.nix +++ b/pkgs/development/python-modules/certipy-ad/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "certipy-ad"; - version = "4.8.1"; + version = "4.8.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "ly4k"; repo = "Certipy"; rev = "refs/tags/${version}"; - hash = "sha256-HgRUpltkai68tDkanXIOEdrJ4DJYDcbNk0op0enUAXU="; + hash = "sha256-Era5iNLJkZIRvN/p3BiD/eDiDQme24G65VSG97tuEOQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/chart-studio/default.nix b/pkgs/development/python-modules/chart-studio/default.nix index 1632d41fee67e..5f8117c6e586e 100644 --- a/pkgs/development/python-modules/chart-studio/default.nix +++ b/pkgs/development/python-modules/chart-studio/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "chart-studio"; - version = "5.16.1"; + version = "5.17.0"; # chart-studio was split from plotly src = fetchFromGitHub { owner = "plotly"; repo = "plotly.py"; rev = "refs/tags/v${version}"; - hash = "sha256-R94fmkz9cydOHKQbXMBR47OCdHHsR25uGiGszcr7AQQ="; + hash = "sha256-Vaa/MgauSoSpzNtRVXq3fQSVqMYzLTqDtIbiHBgrXQY="; }; sourceRoot = "${src.name}/packages/python/chart-studio"; diff --git a/pkgs/development/python-modules/checksumdir/default.nix b/pkgs/development/python-modules/checksumdir/default.nix new file mode 100644 index 0000000000000..7492d168d8d92 --- /dev/null +++ b/pkgs/development/python-modules/checksumdir/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, pythonOlder +}: + +buildPythonPackage rec { + pname = "checksumdir"; + version = "1.2.0"; + pyproject = true; + + disable = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "to-mc"; + repo = "checksumdir"; + rev = version; + hash = "sha256-PO8sRGFQ1Dt/UYJuFH6Y3EaQVaS+4DJlOQtvF8ZmBWQ="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + doCheck = false; # Package does not contain tests + pythonImportsCheck = [ "checksumdir" ]; + + meta = with lib; { + description = "Simple package to compute a single deterministic hash of the file contents of a directory"; + homepage = "https://github.com/to-mc/checksumdir"; + license = licenses.mit; + maintainers = with maintainers; [ mbalatsko ]; + }; +} diff --git a/pkgs/development/python-modules/chiabip158/default.nix b/pkgs/development/python-modules/chiabip158/default.nix index 508f32cd4641d..d926a3e5e2186 100644 --- a/pkgs/development/python-modules/chiabip158/default.nix +++ b/pkgs/development/python-modules/chiabip158/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "chiabip158"; - version = "1.2"; + version = "1.3"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-t0Fnsh9B83KiT5dFVVfHs7sm9HyNbMsp6goj3esoph8="; + hash = "sha256-HUgYVVQ7yc2X3ffnV7mCZf+oFUHl/29Mb4n91dRJ7gc="; }; nativeBuildInputs = [ cmake setuptools-scm ]; diff --git a/pkgs/development/python-modules/chiavdf/default.nix b/pkgs/development/python-modules/chiavdf/default.nix index a2ed3295f01f2..acd5e4ea0926e 100644 --- a/pkgs/development/python-modules/chiavdf/default.nix +++ b/pkgs/development/python-modules/chiavdf/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "chiavdf"; - version = "1.0.10"; - disabled = pythonOlder "3.7"; + version = "1.0.11"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-660Frlaj6WbYOl0sfb5ox6qTzE+jKJR0Qka9nEijSyg="; + hash = "sha256-PjUgpMTdWLMFQdnrpeWmn8vA8SlORjmu52ODc/2hivE="; }; patches = [ diff --git a/pkgs/development/python-modules/chispa/default.nix b/pkgs/development/python-modules/chispa/default.nix index 352a27c515dca..e72c3990e367e 100644 --- a/pkgs/development/python-modules/chispa/default.nix +++ b/pkgs/development/python-modules/chispa/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "chispa"; - version = "0.9.3"; + version = "0.9.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "MrPowers"; repo = "chispa"; rev = "refs/tags/v${version}"; - hash = "sha256-C+fodrQ7PztGzFHAi9SF+rkwtf4bdjDE2u0uORDXBbE="; + hash = "sha256-VF7k0u7QpoG3PXvU5M7jrM9pht6xeRUpYH9znMdLOxk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/circus/default.nix b/pkgs/development/python-modules/circus/default.nix index e5420f26c1a01..90cf6a4be7f7e 100644 --- a/pkgs/development/python-modules/circus/default.nix +++ b/pkgs/development/python-modules/circus/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, flit-core , psutil , pytestCheckHook , pyyaml @@ -11,13 +12,17 @@ buildPythonPackage rec { pname = "circus"; version = "0.18.0"; - format = "flit"; + format = "pyproject"; src = fetchPypi { inherit pname version; hash = "sha256-GTzoIk4GjO1mckz0gxBvtmdLUaV1g6waDn7Xp+6Mcas="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ psutil pyzmq diff --git a/pkgs/development/python-modules/clarifai-grpc/default.nix b/pkgs/development/python-modules/clarifai-grpc/default.nix index d9dbcf86fe534..b3fb2109a9f75 100644 --- a/pkgs/development/python-modules/clarifai-grpc/default.nix +++ b/pkgs/development/python-modules/clarifai-grpc/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "clarifai-grpc"; - version = "9.8.0"; + version = "9.8.4"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-hUx+dUx0Lkz6sEZizHqH8ONk2r19D9MIVuefhBmjEiQ="; + hash = "sha256-j+dtcNInkTcgcLt6IOjqVeI/qSczRNs9PhS9iPoUF+c="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index cf74525d84e85..a0f5144fab478 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.68"; + version = "9.2.71"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ZMXlCfeSt2Dcvuc0CdB27rfSIEIgvMS81s7nAbmw5QM="; + hash = "sha256-jdmgtW+oIxx/Xr8EI0z8HIUZ8MYVqaxA0zXJaLZJBJ4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index a808be461f8a3..3596c4751aae7 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -16,14 +16,14 @@ let # The binaries are following the argr projects release cycle - version = "9.2.68"; + version = "9.2.71"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { owner = "angr"; repo = "binaries"; rev = "refs/tags/v${version}"; - hash = "sha256-03DyvPht4E4uysKqgyfu8hxu1qh+YzWsTI09E4ftiSs="; + hash = "sha256-jp0UcfrjSRTbDPkQStvJpZzbMiHosMJVUaUQc7nSuHQ="; }; in @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-qJrVAofIhoYS9dA/ipLh6Xuyt2b+trDRE/yq8tV9arI="; + hash = "sha256-Uc4W4dXZs3HcSvn5fES0y+14KhED21sS5vzi92QC5hI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/clevercsv/default.nix b/pkgs/development/python-modules/clevercsv/default.nix index 6f7d682ba0335..6ad07d8ec62e8 100644 --- a/pkgs/development/python-modules/clevercsv/default.nix +++ b/pkgs/development/python-modules/clevercsv/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "clevercsv"; - version = "0.8.1"; + version = "0.8.2"; format = "setuptools"; src = fetchFromGitHub { owner = "alan-turing-institute"; repo = "CleverCSV"; rev = "refs/tags/v${version}"; - hash = "sha256-kCkMZnHbFUuBBvlQ5rn0tNeL7uTAq0aodpj2JvPo968="; + hash = "sha256-yyPUNFDq9W5OW1muHtQ10QgAHhXI8w7CY77fsWhIy0k="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cloudflare/default.nix b/pkgs/development/python-modules/cloudflare/default.nix index 05a84ae35a26d..f7e1cb2cf073a 100644 --- a/pkgs/development/python-modules/cloudflare/default.nix +++ b/pkgs/development/python-modules/cloudflare/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "cloudflare"; - version = "2.11.7"; + version = "2.12.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-e7DRZa7qB4n9B+UMZ4pT38Uj7ENEl8WZVj+rvHvFQcM="; + hash = "sha256-UX8ROC6pL8WR82zJupUkPac+aDReUvIh8D1R1ujXhqU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/coinmetrics-api-client/default.nix b/pkgs/development/python-modules/coinmetrics-api-client/default.nix index b113175941ccf..967bcab909d43 100644 --- a/pkgs/development/python-modules/coinmetrics-api-client/default.nix +++ b/pkgs/development/python-modules/coinmetrics-api-client/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "coinmetrics-api-client"; - version = "2023.8.30.20"; + version = "2023.9.29.14"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "coinmetrics_api_client"; - hash = "sha256-zi9hFpmRILfWXA9eLGbzt/+v3l1wykZz10GUuH20hzE="; + hash = "sha256-88tNPg/0U5ZC2OvH8Bh9EzKzRFF2YClS2tyrswBaUZw="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/comicon/default.nix b/pkgs/development/python-modules/comicon/default.nix new file mode 100644 index 0000000000000..8d69ae0fc7440 --- /dev/null +++ b/pkgs/development/python-modules/comicon/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, ebooklib +, lxml +, pillow +, pypdf +}: + +buildPythonPackage rec { + pname = "comicon"; + version = "1.0.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "potatoeggy"; + repo = "comicon"; + rev = "v${version}"; + hash = "sha256-D6nK+GlcG/XqMTH7h7mJcbZCRG2xDHRsnooSTtphDNs="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + ebooklib + lxml + pillow + pypdf + ]; + + pythonImportsCheck = [ "comicon" ]; + + meta = with lib; { + description = "Lightweight comic converter library between CBZ, PDF, and EPUB"; + homepage = "https://github.com/potatoeggy/comicon"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ Scrumplex ]; + }; +} diff --git a/pkgs/development/python-modules/confuse/default.nix b/pkgs/development/python-modules/confuse/default.nix index 1d2f56a85f11f..a3a979f68f872 100644 --- a/pkgs/development/python-modules/confuse/default.nix +++ b/pkgs/development/python-modules/confuse/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "confuse"; version = "1.7.0"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/controku/default.nix b/pkgs/development/python-modules/controku/default.nix new file mode 100644 index 0000000000000..4fd2e762b9c4d --- /dev/null +++ b/pkgs/development/python-modules/controku/default.nix @@ -0,0 +1,52 @@ +{ lib +, python3Packages +, fetchFromGitHub +, setuptools +, requests +, ssdpy +, appdirs +, pygobject3 +, gobject-introspection +, gtk3 +, wrapGAppsHook +, buildApplication ? false +}: + +python3Packages.buildPythonPackage rec { + pname = "controku"; + version = "1.1.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "benthetechguy"; + repo = "controku"; + rev = version; + hash = "sha256-sye2GtL3a77pygllZc6ylaIP7faPb+NFbyKKyqJzIXw="; + }; + + nativeBuildInputs = [ + setuptools + ] ++ lib.optionals buildApplication [ + gobject-introspection + wrapGAppsHook + ]; + + propagatedBuildInputs = [ + requests + ssdpy + ] ++ lib.optionals buildApplication [ + gtk3 + appdirs + pygobject3 + ]; + + pythonImportsCheck = [ "controku" ]; + + meta = with lib; { + changelog = "https://github.com/benthetechguy/controku/releases/tag/${version}"; + description = "Control Roku devices from the comfort of your own desktop"; + homepage = "https://github.com/benthetechguy/controku"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ mjm ]; + }; +} diff --git a/pkgs/development/python-modules/ctranslate2/default.nix b/pkgs/development/python-modules/ctranslate2/default.nix index bfb8c31a48a89..a86516856fd44 100644 --- a/pkgs/development/python-modules/ctranslate2/default.nix +++ b/pkgs/development/python-modules/ctranslate2/default.nix @@ -12,7 +12,7 @@ # tests , pytestCheckHook -, tensorflow +, tensorflow-bin , torch , transformers , wurlitzer @@ -49,7 +49,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - tensorflow + tensorflow-bin torch transformers wurlitzer diff --git a/pkgs/development/python-modules/cymem/default.nix b/pkgs/development/python-modules/cymem/default.nix index 0332ffd1f98a4..f168ea39a3719 100644 --- a/pkgs/development/python-modules/cymem/default.nix +++ b/pkgs/development/python-modules/cymem/default.nix @@ -3,17 +3,21 @@ , fetchFromGitHub , cython , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "cymem"; - version = "2.0.7"; + version = "2.0.8"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "explosion"; repo = "cymem"; rev = "refs/tags/v${version}"; - hash = "sha256-lYMRFFMS+ETjWd4xi12ezC8CVLbLJfynmOU1DpYQcck="; + hash = "sha256-e4lgV39lwC2Goqmd8Jjra+znuCpxsv2IsRXfFbQkGN8="; }; propagatedBuildInputs = [ @@ -34,10 +38,14 @@ buildPythonPackage rec { popd ''; + pythonImportsCheck = [ + "cymem" + ]; meta = with lib; { description = "Cython memory pool for RAII-style memory management"; homepage = "https://github.com/explosion/cymem"; + changelog = "https://github.com/explosion/cymem/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/darkdetect/default.nix b/pkgs/development/python-modules/darkdetect/default.nix new file mode 100644 index 0000000000000..534d9a0573ce8 --- /dev/null +++ b/pkgs/development/python-modules/darkdetect/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, stdenv + +, glib +, setuptools +}: + +buildPythonPackage rec { + pname = "darkdetect"; + version = "0.8.0"; + pyproject = true; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "albertosottile"; + repo = "darkdetect"; + rev = "v${version}"; + hash = "sha256-OOINgrgjSLr3L07E9zf1+mlTPr+7ZlgN3CfkWE8+LoE="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + pythonImportsCheck = [ + "darkdetect" + ]; + + postPatch = lib.optionalString (stdenv.isLinux) '' + substituteInPlace darkdetect/_linux_detect.py \ + --replace "'gsettings'" "'${glib.bin}/bin/gsettings'" + ''; + + meta = with lib; { + description = "Detect OS Dark Mode from Python"; + homepage = "https://github.com/albertosottile/darkdetect"; + license = licenses.bsd3; + maintainers = with maintainers; [ paveloom ]; + }; +} diff --git a/pkgs/development/python-modules/dask-glm/default.nix b/pkgs/development/python-modules/dask-glm/default.nix index 77dbf3717d5da..4e0357ddd8233 100644 --- a/pkgs/development/python-modules/dask-glm/default.nix +++ b/pkgs/development/python-modules/dask-glm/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "dask-glm"; - version = "0.2.0"; + version = "0.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-WLhs6/BP5bnlgJLhxGfjLmDQHhG3H9xii6qp/G0a3uU="; + hash = "sha256-ddaYNBUlvsMzrku7fKrlozRmjshVbQ9yrYIlaRBQCp4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dataclasses-json/default.nix b/pkgs/development/python-modules/dataclasses-json/default.nix index 32328178fa4eb..77a14c44b7cba 100644 --- a/pkgs/development/python-modules/dataclasses-json/default.nix +++ b/pkgs/development/python-modules/dataclasses-json/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "dataclasses-json"; - version = "0.6.0"; + version = "0.6.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "lidatong"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-jv00WqSC/KCM+6+LtsCAQcqZTBbV1pavEqsCP/F84VU="; + hash = "sha256-pZohueZvEIGgY6isci2mGGBewfi9SwnHHy8OwyJGR0w="; }; postPatch = '' diff --git a/pkgs/development/python-modules/dataprep-ml/default.nix b/pkgs/development/python-modules/dataprep-ml/default.nix new file mode 100644 index 0000000000000..f7d5a9cec94e4 --- /dev/null +++ b/pkgs/development/python-modules/dataprep-ml/default.nix @@ -0,0 +1,77 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, poetry-core +, numpy +, pandas +, pydateinfer +, python-dateutil +, scipy +, type-infer +, dataclasses-json +, colorlog +, pydantic +, nltk-data +, symlinkJoin +}: +let + testNltkData = symlinkJoin { + name = "nltk-test-data"; + paths = [ nltk-data.punkt nltk-data.stopwords ]; + }; +in +buildPythonPackage rec { + pname = "dataprep-ml"; + version = "0.0.18"; + pyproject = true; + + disable = pythonOlder "3.8"; + + # using PyPI as github repo does not contain tags or release branches + src = fetchPypi { + pname = "dataprep_ml"; + inherit version; + hash = "sha256-nIqyRwv62j8x5Fy7ILMLWxw6yJmkkNRE1zyUlfvRYTI="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + numpy + pandas + pydateinfer + python-dateutil + scipy + type-infer + dataclasses-json + colorlog + pydantic + ]; + + # PyPI tarball has no tests + doCheck = false; + + # Package import requires NLTK data to be downloaded + # It is the only way to set NLTK_DATA environment variable, + # so that it is available in pythonImportsCheck + env.NLTK_DATA = testNltkData; + pythonImportsCheck = [ + "dataprep_ml" + "dataprep_ml.cleaners" + "dataprep_ml.helpers" + "dataprep_ml.imputers" + "dataprep_ml.insights" + "dataprep_ml.recommenders" + "dataprep_ml.splitters" + ]; + + meta = with lib; { + description = "Data utilities for Machine Learning pipelines"; + homepage = "https://github.com/mindsdb/dataprep_ml"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ mbalatsko ]; + }; +} diff --git a/pkgs/development/python-modules/datasette/default.nix b/pkgs/development/python-modules/datasette/default.nix index 34a6bbf7dbbf7..7063e90a1d85a 100644 --- a/pkgs/development/python-modules/datasette/default.nix +++ b/pkgs/development/python-modules/datasette/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "datasette"; - version = "0.64.3"; + version = "0.64.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "simonw"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-hUMaveScSGbiELvN2oo8Nf/jFvYXeLpxTONl1R4UOZU="; + hash = "sha256-6zZgbUKszSo13qmrWKo5UAPqS/QaS8omoTJQgWFfULk="; }; postPatch = '' @@ -101,6 +101,7 @@ buildPythonPackage rec { meta = with lib; { description = "Multi-tool for exploring and publishing data"; homepage = "https://datasette.io/"; + changelog = "https://github.com/simonw/datasette/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix index a4cf927ec9014..88cb1385bf326 100644 --- a/pkgs/development/python-modules/dbus-fast/default.nix +++ b/pkgs/development/python-modules/dbus-fast/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dbus-fast"; - version = "2.9.0"; + version = "2.11.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-0+uWnm0gygDL4sc2b+3dekgZfgAQZKfmJRMSDgyeMjk="; + hash = "sha256-8kK0T5b5hzT8CBYKvYOrc7bKEQxXDsTgjApmrILecek="; }; # The project can build both an optimized cython version and an unoptimized diff --git a/pkgs/development/python-modules/dctorch/default.nix b/pkgs/development/python-modules/dctorch/default.nix new file mode 100644 index 0000000000000..d44d00629cffc --- /dev/null +++ b/pkgs/development/python-modules/dctorch/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, poetry-core +, numpy +, scipy +, torch +}: + +buildPythonPackage rec { + pname = "dctorch"; + version = "0.1.2"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-TmfLAkiofrQNWYBhIlY4zafbZPgFftISCGloO/rlEG4="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + numpy + scipy + torch + ]; + + pythonImportsCheck = [ + "dctorch" + ]; + + doCheck = false; # no tests + + meta = with lib; { + description = "Fast discrete cosine transforms for pytorch"; + homepage = "https://pypi.org/project/dctorch/"; + license = licenses.mit; + maintainers = teams.tts.members; + }; +} diff --git a/pkgs/development/python-modules/denonavr/default.nix b/pkgs/development/python-modules/denonavr/default.nix index 534d960b49a82..acfa4dc0eb5c5 100644 --- a/pkgs/development/python-modules/denonavr/default.nix +++ b/pkgs/development/python-modules/denonavr/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "denonavr"; - version = "0.11.3"; + version = "0.11.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "ol-iver"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-QBy1nm09trAmL7KsPWgv5iMAOJ3Fkviug/o7a+tSSDA="; + hash = "sha256-0+BjakGGnCbmiSHSipRifPkasfP1vvAWGvzyRufpsOk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dissect-cstruct/default.nix b/pkgs/development/python-modules/dissect-cstruct/default.nix index 556927b63a08f..a40b806ab01d5 100644 --- a/pkgs/development/python-modules/dissect-cstruct/default.nix +++ b/pkgs/development/python-modules/dissect-cstruct/default.nix @@ -9,16 +9,16 @@ buildPythonPackage rec { pname = "dissect-cstruct"; - version = "3.9"; + version = "3.10"; format = "pyproject"; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.cstruct"; rev = "refs/tags/${version}"; - hash = "sha256-v0giDdH6bYCSrotd9WGSlIMzylTz7FHeCE/JkCw7frY="; + hash = "sha256-cdBojvFI0cN6mEZ98xLa3XldvIoR+Jv1c0/hvVkKVoQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dissect-esedb/default.nix b/pkgs/development/python-modules/dissect-esedb/default.nix index bf2ef463247e1..5ae671c06a7ee 100644 --- a/pkgs/development/python-modules/dissect-esedb/default.nix +++ b/pkgs/development/python-modules/dissect-esedb/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "dissect-esedb"; - version = "3.8"; + version = "3.9"; format = "pyproject"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.esedb"; rev = "refs/tags/${version}"; - hash = "sha256-OW0HqKQDg15fO/ETNv+cIupfsX53+qopMoZZ/3xcAUI="; + hash = "sha256-MdEKAArdbOG/FnTSksuJCt8o8161NY3vL0KGnUHJEdQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dissect-evidence/default.nix b/pkgs/development/python-modules/dissect-evidence/default.nix index 13dbb72e95720..7e022eb1797b1 100644 --- a/pkgs/development/python-modules/dissect-evidence/default.nix +++ b/pkgs/development/python-modules/dissect-evidence/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-evidence"; - version = "3.6"; + version = "3.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.evidence"; rev = "refs/tags/${version}"; - hash = "sha256-0rDV7hMOUA18h4Mm4EnIL2NQO9wbVAh00P2V5t2YcZU="; + hash = "sha256-b7Ls3Xfd0scMe/gccjvRfuADITnz5QpJNLUaIgmZtpI="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dissect-hypervisor/default.nix b/pkgs/development/python-modules/dissect-hypervisor/default.nix index 26f466365939f..ff1395b932cb6 100644 --- a/pkgs/development/python-modules/dissect-hypervisor/default.nix +++ b/pkgs/development/python-modules/dissect-hypervisor/default.nix @@ -13,16 +13,16 @@ buildPythonPackage rec { pname = "dissect-hypervisor"; - version = "3.8"; + version = "3.9"; format = "pyproject"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.hypervisor"; rev = "refs/tags/${version}"; - hash = "sha256-PTF1PSFsjD9lYa3SLd7329+ZZuSC07tN1GqwOndo8Go="; + hash = "sha256-AcDlyLKrRyt1mhh7nb9Oln/cjVKw8s1g78J8sgE2p2g="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dissect-target/default.nix b/pkgs/development/python-modules/dissect-target/default.nix index 31fbfafe54963..7704766d43425 100644 --- a/pkgs/development/python-modules/dissect-target/default.nix +++ b/pkgs/development/python-modules/dissect-target/default.nix @@ -39,16 +39,16 @@ buildPythonPackage rec { pname = "dissect-target"; - version = "3.11.1"; + version = "3.12"; format = "pyproject"; - disabled = pythonOlder "3.11.1"; + disabled = pythonOlder "3.12"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.target"; rev = "refs/tags/${version}"; - hash = "sha256-xT0PXah+sYzSDRoBU4OWBp+zhlinKRuQUDBLvos4zKk="; + hash = "sha256-ByjeQcoDi0edum2XebF2DQ7d0xeH2nyulj6vt7bztKg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dissect-thumbcache/default.nix b/pkgs/development/python-modules/dissect-thumbcache/default.nix index 1e5ac9980963e..a9224d0d4361a 100644 --- a/pkgs/development/python-modules/dissect-thumbcache/default.nix +++ b/pkgs/development/python-modules/dissect-thumbcache/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-thumbcache"; - version = "1.5"; + version = "1.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.thumbcache"; rev = "refs/tags/${version}"; - hash = "sha256-xWwmkvBKKVCISL5RKzPkdPGo/ganNydymp4FaE9Mr7w="; + hash = "sha256-q35VL3BUZrxNBB5mHegqVObG76BYG4FAk/KIAvdm6B8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dissect-util/default.nix b/pkgs/development/python-modules/dissect-util/default.nix index bcd15ffbd2506..735ad9820f262 100644 --- a/pkgs/development/python-modules/dissect-util/default.nix +++ b/pkgs/development/python-modules/dissect-util/default.nix @@ -9,16 +9,16 @@ buildPythonPackage rec { pname = "dissect-util"; - version = "3.10"; + version = "3.11"; format = "pyproject"; - disabled = pythonOlder "3.10"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.util"; rev = "refs/tags/${version}"; - hash = "sha256-H89lPX//AlTEJLuZFzzn9wUc4lZC1TGd98t4+TYlbWs="; + hash = "sha256-PtmvXnmZ6f8YxEejqaVwtaoV7d1Oa7063ZFagH110yk="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dissect-volume/default.nix b/pkgs/development/python-modules/dissect-volume/default.nix index b82fad029b91d..3cf3282c0b5b7 100644 --- a/pkgs/development/python-modules/dissect-volume/default.nix +++ b/pkgs/development/python-modules/dissect-volume/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-volume"; - version = "3.6"; + version = "3.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.volume"; rev = "refs/tags/${version}"; - hash = "sha256-dKDefDPdmr20mo7YhZtPeMVkhLXQn5a5dLdRAEoe7+8="; + hash = "sha256-5ZO++l6BWA085U5IkghjCT46YhKc85SB7sNU2h4Fpec="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -43,6 +43,16 @@ buildPythonPackage rec { "dissect.volume" ]; + disabledTests = [ + # gzip.BadGzipFile: Not a gzipped file + "test_ddf_read" + "test_dm_thin" + "test_lvm_mirro" + "test_lvm_thin" + "test_md_raid0_zones" + "test_md_read" + ]; + meta = with lib; { description = "Dissect module implementing various utility functions for the other Dissect modules"; homepage = "https://github.com/fox-it/dissect.volume"; diff --git a/pkgs/development/python-modules/dissect/default.nix b/pkgs/development/python-modules/dissect/default.nix index 01b1907a95df1..e9b1c6b46a6e3 100644 --- a/pkgs/development/python-modules/dissect/default.nix +++ b/pkgs/development/python-modules/dissect/default.nix @@ -32,16 +32,16 @@ buildPythonPackage rec { pname = "dissect"; - version = "3.8.1"; + version = "3.9"; format = "pyproject"; - disabled = pythonOlder "3.8.1"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect"; rev = "refs/tags/${version}"; - hash = "sha256-WbKzmLeGsvzFA/bTTCqBEj/unbnzKQFzHFPRG411Cos="; + hash = "sha256-lNa6GiX0hCZFVyiokBzEKGsvimSkUkgR1bkQMhxUbDw="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/django-postgresql-netfields/default.nix b/pkgs/development/python-modules/django-postgresql-netfields/default.nix index 5564e0f6de22d..1f0600b68a84f 100644 --- a/pkgs/development/python-modules/django-postgresql-netfields/default.nix +++ b/pkgs/development/python-modules/django-postgresql-netfields/default.nix @@ -1,18 +1,23 @@ -{ lib +{ stdenv +, lib , buildPythonPackage , django , netaddr , six , fetchFromGitHub , pythonOlder +, djangorestframework # required for tests -#, djangorestframework -#, psycopg2 +, postgresql +, postgresqlTestHook +, psycopg2 +, pytestCheckHook +, pytest-django }: buildPythonPackage rec { pname = "django-postgresql-netfields"; - version = "1.3.0"; + version = "1.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +26,7 @@ buildPythonPackage rec { owner = "jimfunk"; repo = pname; rev = "v${version}"; - hash = "sha256-I+X4yfadtiiZlW7QhfwVbK1qyWn/khH9fWXszCo9uro="; + hash = "sha256-76vGvxxfNZQBCCsTkkSgQZ8PpFspWxJQDj/xq9iOSTU="; }; propagatedBuildInputs = [ @@ -30,23 +35,19 @@ buildPythonPackage rec { six ]; - # tests need a postgres database - doCheck = false; + doCheck = !stdenv.isDarwin; # could not create shared memory segment: Operation not permitted - # keeping the dependencies below as comment for reference - # checkPhase = '' - # python manage.py test - # ''; - - # buildInputs = [ - # djangorestframework - # psycopg2 - # ]; + nativeCheckInputs = [ + djangorestframework + postgresql + postgresqlTestHook + psycopg2 + pytestCheckHook + pytest-django + ]; - # Requires psycopg2 - # pythonImportsCheck = [ - # "netfields" - # ]; + postgresqlTestUserOptions = "LOGIN SUPERUSER"; + env.DJANGO_SETTINGS_MODULE = "testsettings"; meta = with lib; { description = "Django PostgreSQL netfields implementation"; diff --git a/pkgs/development/python-modules/django-redis/default.nix b/pkgs/development/python-modules/django-redis/default.nix index 39c430f1be2a0..e7aed3f22b591 100644 --- a/pkgs/development/python-modules/django-redis/default.nix +++ b/pkgs/development/python-modules/django-redis/default.nix @@ -20,7 +20,7 @@ let pname = "django-redis"; - version = "5.2.0"; + version = "5.3.0"; in buildPythonPackage { inherit pname version; @@ -31,7 +31,7 @@ buildPythonPackage { owner = "jazzband"; repo = "django-redis"; rev = version; - hash = "sha256-e8wCgfxBT+WKFY4H83CTMirTpQym3QAoeWnXbRCDO90="; + hash = "sha256-eX9rUUvpkRrkZ82YalWn8s9DTw6nsbGzi1A6ibRoQGw="; }; postPatch = '' @@ -67,11 +67,6 @@ buildPythonPackage { pytestCheckHook ]; - pytestFlagsArray = lib.optionals (pythonAtLeast "3.11") [ - # DeprecationWarning: 'cgi' is deprecated and slated for removal in Python 3.13 - "-W" "ignore::DeprecationWarning" - ]; - disabledTests = [ # ModuleNotFoundError: No module named 'test_cache_options' "test_custom_key_function" @@ -79,7 +74,7 @@ buildPythonPackage { "test_delete_pattern_calls_get_client_given_no_client" "test_delete_pattern_calls_make_pattern" "test_delete_pattern_calls_scan_iter_with_count_if_itersize_given" - "test_delete_pattern_calls_scan_iter_with_count_if_itersize_given" + "test_delete_pattern_calls_pipeline_delete_and_execute" "test_delete_pattern_calls_scan_iter" "test_delete_pattern_calls_delete_for_given_keys" ]; @@ -87,6 +82,7 @@ buildPythonPackage { meta = with lib; { description = "Full featured redis cache backend for Django"; homepage = "https://github.com/jazzband/django-redis"; + changelog = "https://github.com/jazzband/django-redis/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ hexa ]; }; diff --git a/pkgs/development/python-modules/django-reversion/default.nix b/pkgs/development/python-modules/django-reversion/default.nix index e85e89e2b6c94..2559cc1fbf5cb 100644 --- a/pkgs/development/python-modules/django-reversion/default.nix +++ b/pkgs/development/python-modules/django-reversion/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "django-reversion"; - version = "5.0.5"; + version = "5.0.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-JTxpGwpOC+He7Atiw4yfu3W25aj9gdO1iib0YTWXAQY="; + hash = "sha256-buJalwcN2hTz4IK4uZm/vstKnwgv8fhR40TQVqGMk0w="; }; propagatedBuildInputs = [ @@ -31,6 +31,7 @@ src = fetchPypi { meta = with lib; { description = "An extension to the Django web framework that provides comprehensive version control facilities"; homepage = "https://github.com/etianen/django-reversion"; + changelog = "https://github.com/etianen/django-reversion/blob/v${version}/CHANGELOG.rst"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/django-sesame/default.nix b/pkgs/development/python-modules/django-sesame/default.nix index 531d26158d17d..b0671d789510c 100644 --- a/pkgs/development/python-modules/django-sesame/default.nix +++ b/pkgs/development/python-modules/django-sesame/default.nix @@ -10,16 +10,16 @@ buildPythonPackage rec { pname = "django-sesame"; - version = "3.1"; + version = "3.2.1"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "aaugustin"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Pyyhm0th0cNEkM0sd6maCnf4qELsSO82c9CQuqQdn0w="; + hash = "sha256-R7ySuop7E1lkxtRSVNFfzyb3Ba1mW0o6PDiTxTztK/Y="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/django-treebeard/default.nix b/pkgs/development/python-modules/django-treebeard/default.nix index dd6e054b55c32..ec05953eae6e1 100644 --- a/pkgs/development/python-modules/django-treebeard/default.nix +++ b/pkgs/development/python-modules/django-treebeard/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "django-treebeard"; - version = "4.6.1"; + version = "4.7"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-hKs1BAJ31STrd5OeI1VoychWy1I8yWVXk7Zv6aPvRos="; + hash = "sha256-x1Gj+SQVjCiP6omvwlpxUZefrwG/Ef3HvjuFgJnfpW0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-types/default.nix b/pkgs/development/python-modules/django-types/default.nix new file mode 100644 index 0000000000000..5c16312538ace --- /dev/null +++ b/pkgs/development/python-modules/django-types/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +, poetry-core +}: + +buildPythonPackage rec { + pname = "django-types"; + version = "0.18.0"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-uOIzTIEIZNer8RzTzbHaOyAVtn5/EnAAfjN3f/G9hlQ="; + }; + + nativeBuildInputs = [ poetry-core ]; + + meta = with lib; { + description = "Type stubs for Django"; + homepage = "https://pypi.org/project/django-types"; + license = licenses.mit; + maintainers = with maintainers; [ thubrecht ]; + }; +} diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index c3df9cf4aef0c..d694ff7fb0338 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -42,14 +42,14 @@ buildPythonPackage rec { pname = "Django"; - version = "4.2.4"; + version = "4.2.5"; format = "pyproject"; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-fkIl7AZeDzVMz3NJoi0gneCcwcB0gyvp64TFHBeZxDI="; + hash = "sha256-XlwclUj/t3lrSopHgumi5aPfNhUln8G/0+vHO2RhRsE="; }; patches = [ diff --git a/pkgs/development/python-modules/dns-lexicon/default.nix b/pkgs/development/python-modules/dns-lexicon/default.nix new file mode 100644 index 0000000000000..bef030ca604d2 --- /dev/null +++ b/pkgs/development/python-modules/dns-lexicon/default.nix @@ -0,0 +1,84 @@ +{ buildPythonPackage +, fetchFromGitHub +, poetry-core +, beautifulsoup4 +, cryptography +, importlib-metadata +, pyyaml +, requests +, tldextract +, pytestCheckHook +, pytest-vcr +# Optional depedencies +, boto3 +, localzone +, softlayer +, zeep +, dnspython +, oci +, lib +}: + +buildPythonPackage rec { + pname = "dns_lexicon"; + version = "3.14.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "Analogj"; + repo = "lexicon"; + rev = "v${version}"; + hash = "sha256-flK2G9mdUWMUACQPo6TqYZ388EacIqkq//tCzUS+Eo8="; + }; + + nativeBuildInputs = [ poetry-core ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-vcr + ] ++ passthru.optional-dependencies.full; + + propagatedBuildInputs = [ + beautifulsoup4 + cryptography + importlib-metadata + pyyaml + requests + tldextract + ]; + + passthru.optional-dependencies = { + route53 = [ boto3 ]; + localzone = [ localzone ]; + softlayer = [ softlayer ]; + ddns = [ dnspython ]; + duckdns = [ dnspython ]; + oci = [ oci ]; + full = [ boto3 localzone softlayer zeep dnspython oci ]; + }; + + pytestFlagsArray = [ + "tests/" + ]; + + disabledTestPaths = [ + # Needs network access + "tests/providers/test_auto.py" + + # Needs network access (and an API token) + "tests/providers/test_namecheap.py" + ]; + + pythonImportsCheck = [ + "lexicon" + ]; + + meta = with lib; { + description = "Manipulate DNS records on various DNS providers in a standardized way"; + homepage = "https://github.com/AnalogJ/lexicon"; + changelog = "https://github.com/AnalogJ/lexicon/blob/v${version}/CHANGELOG.md"; + maintainers = with maintainers; [ aviallon ]; + license = with licenses; [ mit ]; + }; + +} diff --git a/pkgs/development/python-modules/docformatter/default.nix b/pkgs/development/python-modules/docformatter/default.nix index 52bdb7ccc9d73..5e0240034413c 100644 --- a/pkgs/development/python-modules/docformatter/default.nix +++ b/pkgs/development/python-modules/docformatter/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "docformatter"; - version = "1.6.4"; + version = "1.7.5"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-OQNE6Is1Pl0uoAkFYh4M+c8oNWL/uIh4X0hv8X0Qt/g="; + hash = "sha256-QUjeG84KwI5Y3MU1wrmjHBXU2tEJ0CuiR3Y/S+dX7Gs="; }; patches = [ diff --git a/pkgs/development/python-modules/docformatter/test-path.patch b/pkgs/development/python-modules/docformatter/test-path.patch index bd61c0ca829b6..2959d84704e84 100644 --- a/pkgs/development/python-modules/docformatter/test-path.patch +++ b/pkgs/development/python-modules/docformatter/test-path.patch @@ -1,13 +1,13 @@ diff --git a/tests/conftest.py b/tests/conftest.py -index 5f5a9aa..3289222 100644 +index 762d246..7f86763 100644 --- a/tests/conftest.py +++ b/tests/conftest.py -@@ -92,21 +92,9 @@ def run_docformatter(arguments, temporary_file): +@@ -101,21 +101,9 @@ def run_docformatter(arguments, temporary_file): Return subprocess object. """ - if "DOCFORMATTER_COVERAGE" in os.environ and int( -- os.environ["DOCFORMATTER_COVERAGE"] +- os.environ["DOCFORMATTER_COVERAGE"] - ): - DOCFORMATTER_COMMAND = [ - "coverage", diff --git a/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix b/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix index 1413cd3248033..2ce7b3e92074e 100644 --- a/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix +++ b/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "drf-spectacular-sidecar"; - version = "2023.3.1"; + version = "2023.9.1"; format = "setuptools"; src = fetchFromGitHub { owner = "tfranzel"; repo = "drf-spectacular-sidecar"; rev = version; - hash = "sha256-UTH6t/znN4nYnqDhtFFxXoBXX8Zo19pJE9iDsvw7bGE="; + hash = "sha256-EoQKbxzXEuKC50/W1/tBB2wASJZmNNwg9r1qhIB4Ws8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/drf-spectacular/default.nix b/pkgs/development/python-modules/drf-spectacular/default.nix index b90a35f4ea697..9e476ad5c188d 100644 --- a/pkgs/development/python-modules/drf-spectacular/default.nix +++ b/pkgs/development/python-modules/drf-spectacular/default.nix @@ -28,13 +28,13 @@ buildPythonPackage rec { pname = "drf-spectacular"; - version = "0.26.4"; + version = "0.26.5"; src = fetchFromGitHub { owner = "tfranzel"; repo = "drf-spectacular"; rev = "refs/tags/${version}"; - hash = "sha256-f8x4QOt2EbDv+NlYAmpzXrCdT+q4wLGIrDsuUd45j2U="; + hash = "sha256-sK+upLh0mi8eHKh1Wt9FoLRjqlHitTSX0Zl54S4Ce6E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dtw-python/default.nix b/pkgs/development/python-modules/dtw-python/default.nix new file mode 100644 index 0000000000000..f50102fe62105 --- /dev/null +++ b/pkgs/development/python-modules/dtw-python/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cython +, oldest-supported-numpy +, setuptools +, wheel +, scipy +, numpy +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "dtw-python"; + version = "1.3.0"; + format = "pyproject"; + + disable = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "DynamicTimeWarping"; + repo = "dtw-python"; + rev = "v${version}"; + hash = "sha256-7hQuo7dES9f08YZhCf+kxUkMlrr+bg1P7HHRCMv3bLk="; + }; + + nativeBuildInputs = [ + cython + oldest-supported-numpy + setuptools + wheel + ]; + + propagatedBuildInputs = [ + scipy + numpy + ]; + + # We need to run tests on real built package: https://github.com/NixOS/nixpkgs/issues/255262 + preCheck = "cd $out"; + nativeCheckInputs = [ pytestCheckHook ]; + # tests/ are not included to output package, so we have to set path explicitly + pytestFlagsArray = [ + "$src/tests" + ]; + + pythonImportsCheck = [ "dtw" ]; + + meta = with lib; { + description = "Python port of R's Comprehensive Dynamic Time Warp algorithms package"; + homepage = "https://github.com/DynamicTimeWarping/dtw-python"; + changelog = "https://github.com/DynamicTimeWarping/dtw-python/blob/${src.rev}/CHANGELOG.md"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ mbalatsko ]; + }; +} diff --git a/pkgs/development/python-modules/duckdb-engine/default.nix b/pkgs/development/python-modules/duckdb-engine/default.nix index f2b49cd0ea7be..ab82edb0893b7 100644 --- a/pkgs/development/python-modules/duckdb-engine/default.nix +++ b/pkgs/development/python-modules/duckdb-engine/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "duckdb-engine"; - version = "0.7.3"; + version = "0.9.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,9 +23,11 @@ buildPythonPackage rec { repo = "duckdb_engine"; owner = "Mause"; rev = "refs/tags/v${version}"; - hash = "sha256-Z9m1+Bc/csWKdPDuwf82xX0qOiD1Y5LBgJjUlLntAO8="; + hash = "sha256-T02nGF+YlughRQPinb0I3NC6xsarh4+qRhG8YfhTvhI="; }; + patches = [ ./remote_data.patch ]; + nativeBuildInputs = [ poetry-core ]; @@ -42,8 +44,11 @@ buildPythonPackage rec { disabledTests = [ # this test tries to download the httpfs extension "test_preload_extension" + "test_motherduck" # test should be skipped based on sqlalchemy version but isn't and fails "test_commit" + # rowcount no longer generates an attribute error. + "test_rowcount" ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/duckdb-engine/remote_data.patch b/pkgs/development/python-modules/duckdb-engine/remote_data.patch new file mode 100644 index 0000000000000..1c887acf6caea --- /dev/null +++ b/pkgs/development/python-modules/duckdb-engine/remote_data.patch @@ -0,0 +1,24 @@ +diff --git a/duckdb_engine/tests/test_basic.py b/duckdb_engine/tests/test_basic.py +index 302636f..ed20f12 100644 +--- a/duckdb_engine/tests/test_basic.py ++++ b/duckdb_engine/tests/test_basic.py +@@ -183,7 +183,6 @@ def test_get_views(engine: Engine) -> None: + + + @mark.skipif(os.uname().machine == "aarch64", reason="not supported on aarch64") +-@mark.remote_data + def test_preload_extension() -> None: + duckdb.default_connection.execute("INSTALL httpfs") + engine = create_engine( +diff --git a/duckdb_engine/tests/test_integration.py b/duckdb_engine/tests/test_integration.py +index 349c976..bf3dbaa 100644 +--- a/duckdb_engine/tests/test_integration.py ++++ b/duckdb_engine/tests/test_integration.py +@@ -24,7 +24,6 @@ def test_integration(engine: Engine) -> None: + conn.execute(text("select * from test_df")) + + +-@mark.remote_data + @mark.skipif( + "dev" in duckdb.__version__, reason="md extension not available for dev builds" # type: ignore[attr-defined] + ) diff --git a/pkgs/development/python-modules/duckdb/default.nix b/pkgs/development/python-modules/duckdb/default.nix index f582ae9c3fdf9..e9aac74d835e7 100644 --- a/pkgs/development/python-modules/duckdb/default.nix +++ b/pkgs/development/python-modules/duckdb/default.nix @@ -1,8 +1,10 @@ { lib , buildPythonPackage , duckdb +, fsspec , google-cloud-storage , numpy +, openssl , pandas , psutil , pybind11 @@ -21,13 +23,13 @@ buildPythonPackage rec { # 1. let nix control build cores # 2. unconstrain setuptools_scm version substituteInPlace setup.py \ - --replace "multiprocessing.cpu_count()" "$NIX_BUILD_CORES" \ - --replace "setuptools_scm<7.0.0" "setuptools_scm" + --replace "multiprocessing.cpu_count()" "$NIX_BUILD_CORES" - # avoid dependency on mypy - rm tests/stubs/test_stubs.py + # avoid dependency on mypy + rm tests/stubs/test_stubs.py ''; + BUILD_HTTPFS = 1; SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ @@ -35,12 +37,15 @@ buildPythonPackage rec { setuptools-scm ]; + buildInputs = [ openssl ]; + propagatedBuildInputs = [ numpy pandas ]; nativeCheckInputs = [ + fsspec google-cloud-storage psutil pytestCheckHook @@ -55,6 +60,10 @@ buildPythonPackage rec { export HOME="$(mktemp -d)" ''; + setupPyBuildFlags = [ + "--inplace" + ]; + pythonImportsCheck = [ "duckdb" ]; diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix index 004fceaaa8a10..72c9915cc8794 100644 --- a/pkgs/development/python-modules/dvc-data/default.nix +++ b/pkgs/development/python-modules/dvc-data/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dvc-data"; - version = "2.16.3"; + version = "2.18.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-cuUxVDc//O0FjPyBgXh8gBkCHSqfHELtTLT4VAu4HSA="; + hash = "sha256-JL72tenKmsWanHl6+olpx7SkFLmFoTyctl+2TnnKcAI="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dvc/default.nix b/pkgs/development/python-modules/dvc/default.nix index 66d6e1057b04a..c95bf2b6c4c04 100644 --- a/pkgs/development/python-modules/dvc/default.nix +++ b/pkgs/development/python-modules/dvc/default.nix @@ -55,14 +55,14 @@ buildPythonPackage rec { pname = "dvc"; - version = "3.22.0"; + version = "3.23.0"; format = "pyproject"; src = fetchFromGitHub { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-8L8ilGOPSfc6mW4JmmLM7VimwlFBQ6h5WIxaRnvWcm0="; + hash = "sha256-Ti4RWIN5y38ZpS91Q/4HDE549evQ8rL7P/bp9D7ql7U="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/dvclive/default.nix b/pkgs/development/python-modules/dvclive/default.nix index 7f07a851fe38a..a07eb1c2d07cd 100644 --- a/pkgs/development/python-modules/dvclive/default.nix +++ b/pkgs/development/python-modules/dvclive/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dvclive"; - version = "2.16.0"; + version = "3.0.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-VxZXZhbKtym1ow/dU3G4yu4X1GwCsXzcau/YocertzY="; + hash = "sha256-jcgNNraMgsqTPNCbBcqEewe3jAXer4wn0aKqiUos+k8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/ebooklib/default.nix b/pkgs/development/python-modules/ebooklib/default.nix new file mode 100644 index 0000000000000..63ea0b4d06d20 --- /dev/null +++ b/pkgs/development/python-modules/ebooklib/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, lxml +, six +}: + +buildPythonPackage rec { + pname = "ebooklib"; + version = "0.18"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "aerkalov"; + repo = "ebooklib"; + rev = "v${version}"; + hash = "sha256-Ciks/eeRpkqkWnyLgyHC+x/dSOcj/ZT45KUElKqv1F8="; + }; + + propagatedBuildInputs = [ + lxml + six + ]; + + pythonImportsCheck = [ "ebooklib" ]; + + meta = with lib; { + description = "Python E-book library for handling books in EPUB2/EPUB3 format"; + homepage = "https://github.com/aerkalov/ebooklib"; + changelog = "https://github.com/aerkalov/ebooklib/blob/${src.rev}/CHANGES.txt"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ Scrumplex ]; + }; +} diff --git a/pkgs/development/python-modules/ecs-logging/default.nix b/pkgs/development/python-modules/ecs-logging/default.nix index 07def603cb706..cd55d1c4c2b9c 100644 --- a/pkgs/development/python-modules/ecs-logging/default.nix +++ b/pkgs/development/python-modules/ecs-logging/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ecs-logging"; version = "2.1.0"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.8"; diff --git a/pkgs/development/python-modules/edk2-pytool-library/default.nix b/pkgs/development/python-modules/edk2-pytool-library/default.nix index c1bc530db0ff4..27d545acd8918 100644 --- a/pkgs/development/python-modules/edk2-pytool-library/default.nix +++ b/pkgs/development/python-modules/edk2-pytool-library/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "edk2-pytool-library"; - version = "0.18.0"; + version = "0.18.1"; format = "pyproject"; src = fetchFromGitHub { owner = "tianocore"; repo = "edk2-pytool-library"; rev = "v${version}"; - hash = "sha256-O7K439nAIHHTWSoR8mZWEu9sXcrhYfZto3RTgHZcOuA="; + hash = "sha256-Ps1gXeaatZ3wIPcJybpj5y9q5kpaiTc8IuEkGAV48OA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/elastic-transport/default.nix b/pkgs/development/python-modules/elastic-transport/default.nix index 7975b2f2abef4..c4d41f7d2fac2 100644 --- a/pkgs/development/python-modules/elastic-transport/default.nix +++ b/pkgs/development/python-modules/elastic-transport/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "elastic-transport"; - version = "8.4.0"; + version = "8.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "elastic"; repo = "elastic-transport-python"; rev = "refs/tags/v${version}"; - hash = "sha256-rZdl2gjY5Yg2Ls777tj12pPATMn//xVvEM4wkrZ3qUY="; + hash = "sha256-hrI8GJaI3K/3B0Vng0WvoabDP2Y8/60/tHNKo/Xq6JM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/elasticsearch8/default.nix b/pkgs/development/python-modules/elasticsearch8/default.nix index 6893a8353dff4..5df9db98faba3 100644 --- a/pkgs/development/python-modules/elasticsearch8/default.nix +++ b/pkgs/development/python-modules/elasticsearch8/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "elasticsearch8"; - version = "8.9.0"; + version = "8.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9j71MX3ITwfwFfIVvQIbXHu4r/3qz9SNAz8XfeAyWTc="; + hash = "sha256-Wb2l0FL7rm9Ck7HSWs9PmPyeShn9Hd9fCKnh/jWVy3o="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/emborg/default.nix b/pkgs/development/python-modules/emborg/default.nix index 0d7218ea3ead3..b4b0b9b2106a5 100644 --- a/pkgs/development/python-modules/emborg/default.nix +++ b/pkgs/development/python-modules/emborg/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , fetchpatch +, flit-core , pytestCheckHook , pythonOlder , borgbackup @@ -20,7 +21,7 @@ buildPythonPackage rec { pname = "emborg"; version = "1.37"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -31,6 +32,10 @@ buildPythonPackage rec { hash = "sha256-bHYs+vlNku/T5Hb9u77Xml9/FNj5vgqPeXSzcilsS+I="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ appdirs arrow diff --git a/pkgs/development/python-modules/enlighten/default.nix b/pkgs/development/python-modules/enlighten/default.nix index f6568e691fa1a..76ff49c6a4c05 100644 --- a/pkgs/development/python-modules/enlighten/default.nix +++ b/pkgs/development/python-modules/enlighten/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "enlighten"; - version = "1.11.2"; + version = "1.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-koSGHe5aJy4OGjdYzT87cYCxvRdUh12naHbyp/Rsy2E="; + hash = "sha256-a4r20HG13gUBOjjoDhaHJtxv+yhY3oF/d+QV+Fss6Bk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/env-canada/default.nix b/pkgs/development/python-modules/env-canada/default.nix index 332d4866e09a9..f7fec4c66fc97 100644 --- a/pkgs/development/python-modules/env-canada/default.nix +++ b/pkgs/development/python-modules/env-canada/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "env-canada"; - version = "0.5.36"; + version = "0.5.37"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "michaeldavie"; repo = "env_canada"; rev = "refs/tags/v${version}"; - hash = "sha256-5eA9fqL748VigNgy1G7bZtMstV7EI9LLPhv6xZnCEFA="; + hash = "sha256-HKtUSINJNREvu5t2jMEirkwMG6O9tBnWhACMv4L01TE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/es-client/default.nix b/pkgs/development/python-modules/es-client/default.nix index ffa9d07f495d6..e0a88d607c5b4 100644 --- a/pkgs/development/python-modules/es-client/default.nix +++ b/pkgs/development/python-modules/es-client/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "es-client"; - version = "8.9.0"; + version = "8.10.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "untergeek"; repo = "es_client"; rev = "refs/tags/v${version}"; - hash = "sha256-pzCjVkZ/NmHSe6X8dNH1YvjTu3njQaJe4CuguqrJNs8="; + hash = "sha256-EvE40HLNKYl38PZ2bShAhFCsX3DMYsMmusUTcAql9b4="; }; pythonRelaxDeps = true; diff --git a/pkgs/development/python-modules/esig/default.nix b/pkgs/development/python-modules/esig/default.nix new file mode 100644 index 0000000000000..f0183917c2c69 --- /dev/null +++ b/pkgs/development/python-modules/esig/default.nix @@ -0,0 +1,60 @@ +{ lib +, buildPythonPackage +, fetchPypi +, cmake +, ninja +, oldest-supported-numpy +, scikit-build +, setuptools +, numpy +, iisignature +, boost +}: + +buildPythonPackage rec { + pname = "esig"; + version = "0.9.8.3"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-BGZaJSrpNSwZMHBYFDmDVPZOtgam/EVyh5Y5FAB8e1o="; + }; + + buildInputs = [ + boost + ]; + + dontUseCmakeConfigure = true; + + nativeBuildInputs = [ + cmake + ninja + oldest-supported-numpy + scikit-build + setuptools + ]; + + propagatedBuildInputs = [ + numpy + ]; + + passthru.optional-dependencies = { + iisignature = [ + iisignature + ]; + }; + + # PyPI tarball has no tests + doCheck = false; + + pythonImportsCheck = [ "esig" ]; + + meta = with lib; { + description = "This package provides \"rough path\" tools for analysing vector time series"; + homepage = "https://github.com/datasig-ac-uk/esig"; + changelog = "https://github.com/datasig-ac-uk/esig/blob/release/CHANGELOG"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ mbalatsko ]; + }; +} diff --git a/pkgs/development/python-modules/exitcode/default.nix b/pkgs/development/python-modules/exitcode/default.nix new file mode 100644 index 0000000000000..e3d91f53de874 --- /dev/null +++ b/pkgs/development/python-modules/exitcode/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pythonOlder +}: + +buildPythonPackage rec { + pname = "exitcode"; + version = "0.1.0"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "rumpelsepp"; + repo = "exitcode"; + rev = "refs/tags/v${version}"; + hash = "sha256-MZeLwU1gODqH752y/nc9WkUArl48pyq9Vun7tX620No="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "exitcode" + ]; + + meta = with lib; { + description = "Preferred system exit codes as defined by sysexits.h"; + homepage = "https://github.com/rumpelsepp/exitcode"; + changelog = "https://github.com/rumpelsepp/exitcode/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/faadelays/default.nix b/pkgs/development/python-modules/faadelays/default.nix index 22f764ad4aced..e19b3192e3503 100644 --- a/pkgs/development/python-modules/faadelays/default.nix +++ b/pkgs/development/python-modules/faadelays/default.nix @@ -3,25 +3,38 @@ , buildPythonPackage , fetchPypi , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "faadelays"; - version = "0.0.7"; + version = "2023.9.1"; + format = "pyproject"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-osZqfSYlKPYZMelBR6YB331iRB4DTjCUlmX7pcrIiGk="; + hash = "sha256-ngMFd+BE3hKeaeGEX4xHpzDIrtGFDsSwxBbrc4ZMFas="; }; - propagatedBuildInputs = [ aiohttp ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + aiohttp + ]; # Project has no tests doCheck = false; - pythonImportsCheck = [ "faadelays" ]; + + pythonImportsCheck = [ + "faadelays" + ]; meta = with lib; { + changelog = "https://github.com/ntilley905/faadelays/releases/tag/v${version}"; description = "Python package to retrieve FAA airport status"; homepage = "https://github.com/ntilley905/faadelays"; license = licenses.mit; diff --git a/pkgs/development/python-modules/fake-useragent/default.nix b/pkgs/development/python-modules/fake-useragent/default.nix index c9b58a92c2292..50c4f5e968378 100644 --- a/pkgs/development/python-modules/fake-useragent/default.nix +++ b/pkgs/development/python-modules/fake-useragent/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "fake-useragent"; - version = "1.2.1"; + version = "1.3.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fake-useragent"; repo = "fake-useragent"; rev = "refs/tags/${version}"; - hash = "sha256-kOvVqdfK9swtjW8D7COrZksLCu1N8sQO8rzx5RZqCT0="; + hash = "sha256-erGX52ipM0scn3snICf6ipjgVbV8/H5xT4GP3AtvOwo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/ffcv/default.nix b/pkgs/development/python-modules/ffcv/default.nix index 08f80d198e4e2..861f2d0201901 100644 --- a/pkgs/development/python-modules/ffcv/default.nix +++ b/pkgs/development/python-modules/ffcv/default.nix @@ -13,14 +13,13 @@ buildPythonPackage rec { pname = "ffcv"; - version = "0.0.3"; + version = "1.0.0"; src = fetchFromGitHub { owner = "libffcv"; repo = pname; - # See https://github.com/libffcv/ffcv/issues/158. - rev = "131d56235eca3f1497bb84eeaec82c3434ef25d8"; - sha256 = "0f7q2x48lknnf98mqaa35my05qwvdgv0h8l9lpagdw6yhx0a6p2x"; + rev = "refs/tags/v${version}"; + hash = "sha256-L2mwGFivq/gtAw+1D6U2jbW6VxYgetHX7OUrjwyybqE="; }; # See https://github.com/libffcv/ffcv/issues/159. diff --git a/pkgs/development/python-modules/flow-record/default.nix b/pkgs/development/python-modules/flow-record/default.nix index 0f4cea423e460..3479f3b3d57bb 100644 --- a/pkgs/development/python-modules/flow-record/default.nix +++ b/pkgs/development/python-modules/flow-record/default.nix @@ -15,16 +15,16 @@ buildPythonPackage rec { pname = "flow-record"; - version = "3.11"; + version = "3.12"; format = "pyproject"; - disabled = pythonOlder "3.11"; + disabled = pythonOlder "3.12"; src = fetchFromGitHub { owner = "fox-it"; repo = "flow.record"; rev = "refs/tags/${version}"; - hash = "sha256-/mrsm7WoqnTIaGOHuIZk1eMXAMi38eVpctgi6+RQ3WQ="; + hash = "sha256-b9MCgs3Imo0DHtPyvQuRgYvsLWe8N2Y9TIWdU1E04L8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/formbox/default.nix b/pkgs/development/python-modules/formbox/default.nix index 387ee2bea4ed8..098d13e87c985 100644 --- a/pkgs/development/python-modules/formbox/default.nix +++ b/pkgs/development/python-modules/formbox/default.nix @@ -1,9 +1,9 @@ -{ lib, buildPythonPackage, pythonOlder, fetchFromSourcehut, bleach, markdown }: +{ lib, buildPythonPackage, pythonOlder, fetchFromSourcehut, flit-core, bleach, markdown }: buildPythonPackage rec { pname = "formbox"; version = "0.4.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchFromSourcehut { @@ -13,6 +13,7 @@ buildPythonPackage rec { hash = "sha256-zOvXmSeBiwc0Z5mRMwMsHLU3A/iP7rpjXm0T0I2gUTk="; }; + nativeBuildInputs = [ flit-core ]; propagatedBuildInputs = [ bleach markdown ]; doCheck = false; # there's no test pythonImportsCheck = [ "formbox" ]; diff --git a/pkgs/development/python-modules/frozendict/default.nix b/pkgs/development/python-modules/frozendict/default.nix index f262710119cae..3ed26a476b6e1 100644 --- a/pkgs/development/python-modules/frozendict/default.nix +++ b/pkgs/development/python-modules/frozendict/default.nix @@ -20,12 +20,6 @@ buildPythonPackage rec { hash = "sha256-4a0DvZOzNJqpop7wi+FagUR+8oaekz4EDNIYdUaAWC8="; }; - postPatch = '' - # https://github.com/Marco-Sulla/python-frozendict/pull/69 - substituteInPlace setup.py \ - --replace 'if impl == "PyPy":' 'if impl == "PyPy" or not src_path.exists():' - ''; - nativeCheckInputs = [ pytestCheckHook ]; @@ -48,6 +42,6 @@ buildPythonPackage rec { homepage = "https://github.com/Marco-Sulla/python-frozendict"; changelog = "https://github.com/Marco-Sulla/python-frozendict/releases/tag/v${version}"; license = licenses.lgpl3Only; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ pbsds ]; }; } diff --git a/pkgs/development/python-modules/fx2/default.nix b/pkgs/development/python-modules/fx2/default.nix index 1df4625a68184..a691f3723d5ae 100644 --- a/pkgs/development/python-modules/fx2/default.nix +++ b/pkgs/development/python-modules/fx2/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "fx2"; - version = "0.11"; + version = "unstable-2023-09-20"; src = fetchFromGitHub { owner = "whitequark"; repo = "libfx2"; - rev = "v${version}"; - hash = "sha256-uJpXsUMFqJY7mjj1rtfc0XWEfNDxO1xXobgBDGFHnp4="; + rev = "73fa811818d56a86b82c12e07327946aeddd2b3e"; + hash = "sha256-AGQPOVTdaUCUeVVNQTBmoNvz5CGxcBOK7+oL+X8AcIw="; }; nativeBuildInputs = [ sdcc ]; diff --git a/pkgs/development/python-modules/garminconnect/default.nix b/pkgs/development/python-modules/garminconnect/default.nix index 96580c18820b4..aff899a188786 100644 --- a/pkgs/development/python-modules/garminconnect/default.nix +++ b/pkgs/development/python-modules/garminconnect/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "garminconnect"; - version = "0.2.6"; + version = "0.2.8"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "cyberjunky"; repo = "python-garminconnect"; rev = "refs/tags/${version}"; - hash = "sha256-e/6fq9PkrfX2dz+QfgyKft6difkXfoj40WWiyK6h0n4="; + hash = "sha256-jNDFSA6Mz0+7UhEVrCKcKDEX3B7yk6igBf59A6YlW2M="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/garth/default.nix b/pkgs/development/python-modules/garth/default.nix index 0eaf2793caa82..45ba76913a32b 100644 --- a/pkgs/development/python-modules/garth/default.nix +++ b/pkgs/development/python-modules/garth/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "garth"; - version = "0.4.26"; + version = "0.4.38"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-Ezq9lZE6HTtuW396sKZ32mDvNjrkz6UHQGvLhXUjfnI="; + hash = "sha256-c+wSXADcgl7DpJJxGUus3oA4v+DmjGwjKfp0tJbcxb8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/get-video-properties/default.nix b/pkgs/development/python-modules/get-video-properties/default.nix index 89e01fedc13d9..63b9515cf7919 100644 --- a/pkgs/development/python-modules/get-video-properties/default.nix +++ b/pkgs/development/python-modules/get-video-properties/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, ffmpeg +, ffmpeg-headless }: buildPythonPackage rec { @@ -20,7 +20,10 @@ buildPythonPackage rec { postPatch = '' substituteInPlace videoprops/__init__.py \ - --replace "which('ffprobe')" "'${ffmpeg}/bin/ffprobe'" + --replace "which('ffprobe')" "'${ffmpeg-headless}/bin/ffprobe'" + + # unused and vulnerable to various CVEs + rm -r videoprops/binary_dependencies ''; pythonImportsCheck = [ "videoprops" ]; diff --git a/pkgs/development/python-modules/gidgethub/default.nix b/pkgs/development/python-modules/gidgethub/default.nix index 37a9d75beee7f..e109f4fa04871 100644 --- a/pkgs/development/python-modules/gidgethub/default.nix +++ b/pkgs/development/python-modules/gidgethub/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pythonOlder +, flit , uritemplate , pyjwt , pytestCheckHook @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "gidgethub"; version = "5.3.0"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -24,6 +25,10 @@ buildPythonPackage rec { hash = "sha256-ns59N/vOuBm4BWDn7Vj5NuSKZdN+xfVtt5FFFWtCaiU="; }; + nativeBuildInputs = [ + flit + ]; + propagatedBuildInputs = [ uritemplate pyjwt diff --git a/pkgs/development/python-modules/gitignore-parser/default.nix b/pkgs/development/python-modules/gitignore-parser/default.nix index 8ccc6a1cfba83..7cd21a98309bb 100644 --- a/pkgs/development/python-modules/gitignore-parser/default.nix +++ b/pkgs/development/python-modules/gitignore-parser/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "gitignore-parser"; - version = "0.1.6"; + version = "0.1.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "mherrmann"; repo = "gitignore_parser"; rev = "refs/tags/v${version}"; - hash = "sha256-RAtXh57WU67fKQhhItdOm25BYfh3ucc0eyWUHGksnLg="; + hash = "sha256-FgP1moyfxgPmPOWpSp6+UXZOzL5HDofg3ECh53x4iaE="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/gitlike-commands/default.nix b/pkgs/development/python-modules/gitlike-commands/default.nix new file mode 100644 index 0000000000000..f51adf2a184a6 --- /dev/null +++ b/pkgs/development/python-modules/gitlike-commands/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pythonOlder +}: + +buildPythonPackage rec { + pname = "gitlike-commands"; + version = "0.2.1"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "unixorn"; + repo = "gitlike-commands"; + rev = "refs/tags/v${version}"; + hash = "sha256-VjweN4gigzCNvg6TccZx2Xw1p7SusKplxUTZjItTQc0="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + # Module has no real tests + doCheck = false; + + pythonImportsCheck = [ + "gitlike_commands" + ]; + + meta = with lib; { + description = "Easy python module for creating git-style subcommand handling"; + homepage = "https://github.com/unixorn/gitlike-commands"; + changelog = "https://github.com/unixorn/gitlike-commands/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/gitpython/default.nix b/pkgs/development/python-modules/gitpython/default.nix index 8721df4bf36ab..43925e357a90a 100644 --- a/pkgs/development/python-modules/gitpython/default.nix +++ b/pkgs/development/python-modules/gitpython/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "gitpython"; - version = "3.1.33"; + version = "3.1.37"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "gitpython-developers"; repo = "GitPython"; rev = "refs/tags/${version}"; - hash = "sha256-SqpoI8QnynHRHUdenMrOAGib/SDpix4rSXfEes4xt/Y="; + hash = "sha256-w3aSgIaD6tkxhYctkvvsdKlWXS8xU4+F0cCYeYTNHig="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/glyphslib/default.nix b/pkgs/development/python-modules/glyphslib/default.nix index 17c7ba91f28b9..2a0276a3c7e3a 100644 --- a/pkgs/development/python-modules/glyphslib/default.nix +++ b/pkgs/development/python-modules/glyphslib/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "glyphslib"; - version = "6.4.0"; + version = "6.4.1"; format = "pyproject"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "googlefonts"; repo = "glyphsLib"; rev = "refs/tags/v${version}"; - hash = "sha256-vbyI5pSoQWFHG8aqZC4FExKzzIo6yxwl9DgGSgDz8xU="; + hash = "sha256-pDFPn1KDiZ5yw1UzPgi0+Syv3h606bsOOzLbdOiag8s="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix index 88f5dfc3e9ee5..ebadff4540055 100644 --- a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix +++ b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-ai-generativelanguage"; - version = "0.3.2"; + version = "0.3.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-PkQpWHUzvTnv7Ky+cRSHzaXTwh2rDvD0qq53tbxPBME="; + hash = "sha256-cnX9lGmtOrd5CdioC9bAVeHiMXjEsV6Z67ARSnV03P8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/pkgs/development/python-modules/google-auth-oauthlib/default.nix index 5d5c56188c886..29adb27c72bf7 100644 --- a/pkgs/development/python-modules/google-auth-oauthlib/default.nix +++ b/pkgs/development/python-modules/google-auth-oauthlib/default.nix @@ -33,8 +33,10 @@ buildPythonPackage rec { pytestCheckHook ]; - # some tests require loopback networking - __darwinAllowLocalNetworking = true; + disabledTests = lib.optionals stdenv.isDarwin [ + # This test fails if the hostname is not associated with an IP (e.g., in `/etc/hosts`). + "test_run_local_server_bind_addr" + ]; pythonImportsCheck = [ "google_auth_oauthlib" diff --git a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix index 0e9f76e4b6bf7..d7ed23f14cece 100644 --- a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-appengine-logging"; - version = "1.3.1"; + version = "1.3.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-s/X3l9a6zGBlTeIZAZAvinh49xaNdr5dR8d3X+DD4Kg="; + hash = "sha256-opifyg6IRjtWQyqoIeZLgcPRce43uEdxGJtI6Ll81JY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index 7c4a0df032e29..d64bd1bf73402 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "3.12.0"; + version = "3.12.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-5jxcN69FPuAZ7xiBcBu5+aE+q4OU9OlM+i9bd6vMnJI="; + hash = "sha256-uEWnQIGs4yybuukzgrAqaduFYKNW9h/WouX2MzSVgUg="; }; propagatedBuildInputs = [ @@ -43,6 +43,11 @@ buildPythonPackage rec { "google.cloud.bigquery_datatransfer_v1" ]; + disabledTests = [ + # Tests require project ID + "test_list_data_sources" + ]; + meta = with lib; { description = "BigQuery Data Transfer API client library"; homepage = "https://github.com/googleapis/python-bigquery-datatransfer"; diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index a79c74b3de08f..2ee87fac60c2c 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.31.0"; + version = "2.32.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-PGrG29a5tq41hn8zzJWdAy4Dju1O5ZPYhZ+CcsBraAY="; + hash = "sha256-aU+42neWNlPhxw+mCSi0oR+vjh8VgKOQJQU6PhvM5t4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index 6d7d35d678233..1a5d935f4a81c 100644 --- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-datacatalog"; - version = "3.15.1"; + version = "3.15.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XihIFu8TUrZgQqJ43LJVB0vCIjf89MpGfmDXS5yUuoM="; + hash = "sha256-GaGxn7Q5blqPWNWIl6pRV9lLzmGm5GGwqcyOuAWI0Ds="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-language/default.nix b/pkgs/development/python-modules/google-cloud-language/default.nix index a07053ea91729..54397f68cd8fa 100644 --- a/pkgs/development/python-modules/google-cloud-language/default.nix +++ b/pkgs/development/python-modules/google-cloud-language/default.nix @@ -40,8 +40,8 @@ buildPythonPackage rec { meta = with lib; { description = "Google Cloud Natural Language API client library"; - homepage = "https://github.com/googleapis/python-language"; - changelog = "https://github.com/googleapis/python-language/blob/v${version}/CHANGELOG.md"; + homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-language"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-language-v${version}/packages/google-cloud-language/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/google-cloud-logging/default.nix b/pkgs/development/python-modules/google-cloud-logging/default.nix index 3de689ac17128..2c4054a5085cc 100644 --- a/pkgs/development/python-modules/google-cloud-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-logging/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "google-cloud-logging"; - version = "3.6.0"; + version = "3.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-QhNCI5VoUN3WSHfIgELTH3hljnsGelqOPdKCNrcfPDI="; + hash = "sha256-0uroUD8Pb5SEhG34sIepU5zY0yo19n9QBTz9sCuYlh4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-os-config/default.nix b/pkgs/development/python-modules/google-cloud-os-config/default.nix index a25ef3587d84a..4c71548c0df83 100644 --- a/pkgs/development/python-modules/google-cloud-os-config/default.nix +++ b/pkgs/development/python-modules/google-cloud-os-config/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "google-cloud-os-config"; - version = "1.15.2"; + version = "1.15.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-WgrqxnVsbA0ppvfcqxW+kA8vjn71bMU9qAyZraqYt8g="; + hash = "sha256-KNM4wASyfgoBqhXa5k+8tf+AN9VljHDDK0U849N5qHI="; }; propagatedBuildInputs = [ @@ -37,8 +37,10 @@ buildPythonPackage rec { ]; disabledTests = [ + # Test requires a project ID "test_patch_deployment" "test_patch_job" + "test_list_patch_jobs" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index a1d430c022db9..6872b953efcac 100644 --- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "2.14.1"; + version = "2.14.2"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-3XFvKnaK1nUCz9mbmSXFH/1uFr6TtBCr7v/arBkL/oE="; + hash = "sha256-ojc4NmmI+vTSZSAPV8XeQxLvo9FLtDS5Km5UFxP12QY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gpiozero/default.nix b/pkgs/development/python-modules/gpiozero/default.nix index 587f3c9e30154..929ce0e24f5b5 100644 --- a/pkgs/development/python-modules/gpiozero/default.nix +++ b/pkgs/development/python-modules/gpiozero/default.nix @@ -4,25 +4,29 @@ , sphinx-rtd-theme , sphinxHook , colorzero -, mock , pythonOlder , pytestCheckHook }: buildPythonPackage rec { pname = "gpiozero"; - version = "1.6.2"; + version = "2.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "gpiozero"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-dmFc3DNTlEajYQ5e8QK2WfehwYwAsWyG2cxKg5ykEaI="; + hash = "sha256-6qSB9RMypNXNj+Ds1nyzB7iaeHXvF0swSubrJSn2L34="; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace " --cov" "" + ''; + outputs = [ "out" "doc" @@ -38,7 +42,6 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/gprof2dot/default.nix b/pkgs/development/python-modules/gprof2dot/default.nix index 45f9915c06c54..cd0ef5b174a65 100644 --- a/pkgs/development/python-modules/gprof2dot/default.nix +++ b/pkgs/development/python-modules/gprof2dot/default.nix @@ -3,18 +3,21 @@ , buildPythonPackage , python , graphviz +, pythonOlder }: buildPythonPackage rec { pname = "gprof2dot"; - version = "2021.02.21"; + version = "2022.07.29"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "jrfonseca"; repo = "gprof2dot"; - rev = version; - sha256 = "1jjhsjf5fdi1fkn7mvhnzkh6cynl8gcjrygd3cya5mmda3akhzic"; + rev = "refs/tags/${version}"; + hash = "sha256-nIsBO6KTyG2VZZRXrkU/T/a9Ki1x6hda5Vv3rZv/mJM="; }; makeWrapperArgs = [ @@ -22,7 +25,9 @@ buildPythonPackage rec { ]; # Needed so dot is on path of the test script - nativeCheckInputs = [ graphviz ]; + nativeCheckInputs = [ + graphviz + ]; checkPhase = '' runHook preCheck @@ -34,8 +39,9 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = "https://github.com/jrfonseca/gprof2dot"; description = "Python script to convert the output from many profilers into a dot graph"; + homepage = "https://github.com/jrfonseca/gprof2dot"; + changelog = "https://github.com/jrfonseca/gprof2dot/releases/tag/${version}"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ pmiddend ]; }; diff --git a/pkgs/development/python-modules/greynoise/default.nix b/pkgs/development/python-modules/greynoise/default.nix new file mode 100644 index 0000000000000..98247e8903ff7 --- /dev/null +++ b/pkgs/development/python-modules/greynoise/default.nix @@ -0,0 +1,62 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, click +, ansimarkup +, cachetools +, colorama +, click-default-group +, click-repl +, dict2xml +, jinja2 +, more-itertools +, requests +, six +, pytestCheckHook +, mock +, pythonOlder +}: + +buildPythonPackage rec { + pname = "greynoise"; + version = "2.0.1"; + format = "setuptools"; + + disable = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "GreyNoise-Intelligence"; + repo = "pygreynoise"; + rev = "v${version}"; + hash = "sha256-zevom7JqXnZuotXfGtfPOmQNh32dANS4Uc6tHUuq08s="; + }; + + propagatedBuildInputs = [ + click + ansimarkup + cachetools + colorama + click-default-group + click-repl + dict2xml + jinja2 + more-itertools + requests + six + ]; + + nativeCheckInputs = [ + pytestCheckHook + mock + ]; + + pythonImportsCheck = [ "greynoise" ]; + + meta = with lib; { + description = "Python3 library and command line for GreyNoise"; + homepage = "https://github.com/GreyNoise-Intelligence/pygreynoise"; + changelog = "https://github.com/GreyNoise-Intelligence/pygreynoise/blob/${src.rev}/CHANGELOG.rst"; + license = licenses.mit; + maintainers = with maintainers; [ mbalatsko ]; + }; +} diff --git a/pkgs/development/python-modules/griffe/default.nix b/pkgs/development/python-modules/griffe/default.nix index c94cda7685015..959c9d39b3a90 100644 --- a/pkgs/development/python-modules/griffe/default.nix +++ b/pkgs/development/python-modules/griffe/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "griffe"; - version = "0.36.2"; + version = "0.36.4"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-21u6QnmFoa3rCeFMkxdEh4OYtE4QmBr5O9PwV5tKgxg="; + hash = "sha256-H4iKxM6uwpAIISSxm4ux+qXsoPfHmpHBRx5MuGxwCE4="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix index fd01e1b1d8156..285a552ac9338 100644 --- a/pkgs/development/python-modules/gspread/default.nix +++ b/pkgs/development/python-modules/gspread/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, flitBuildHook +, flit-core , google-auth , google-auth-oauthlib , pytest-vcr @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "gspread"; - version = "5.11.1"; + version = "5.11.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,11 +21,11 @@ buildPythonPackage rec { owner = "burnash"; repo = "gspread"; rev = "refs/tags/v${version}"; - hash = "sha256-a8A47il9NrMdHkSX4YmQj4VIAYDXK5V+FUdwv+LGIfQ="; + hash = "sha256-O6uhT8zfCGiGr0v8pEMZ4uLuDAdFpiTie7EC3rphZQI="; }; nativeBuildInputs = [ - flitBuildHook + flit-core ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gudhi/default.nix b/pkgs/development/python-modules/gudhi/default.nix index 6fbba605da996..1e0932e62867d 100644 --- a/pkgs/development/python-modules/gudhi/default.nix +++ b/pkgs/development/python-modules/gudhi/default.nix @@ -38,7 +38,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DWITH_GUDHI_PYTHON=ON" "-DPython_ADDITIONAL_VERSIONS=3" ]; diff --git a/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix b/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix new file mode 100644 index 0000000000000..5d5eb8ba91067 --- /dev/null +++ b/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, gitlike-commands +, paho-mqtt +, poetry-core +, pyaml +, pydantic +, pythonOlder +, thelogrus +}: + +buildPythonPackage rec { + pname = "ha-mqtt-discoverable"; + version = "0.10.0"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "unixorn"; + repo = "ha-mqtt-discoverable"; + rev = "refs/tags/v${version}"; + hash = "sha256-0a39KTLZw3Y2D0TXlKCmvVeNoXAN/uLXQGDlA9iM9J0="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + gitlike-commands + paho-mqtt + pyaml + pydantic + thelogrus + ]; + + # Test require a running Mosquitto instance + doCheck = false; + + pythonImportsCheck = [ + "ha_mqtt_discoverable" + ]; + + meta = with lib; { + description = "Python module to create MQTT entities that are automatically discovered by Home Assistant"; + homepage = "https://github.com/unixorn/ha-mqtt-discoverable"; + changelog = "https://github.com/unixorn/ha-mqtt-discoverable/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 9a3d67da99733..dba6e4be3c4eb 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -2,6 +2,7 @@ , aiohttp , buildPythonPackage , fetchFromGitHub +, freezegun , orjson , pydevccu , pytest-aiohttp @@ -17,7 +18,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2023.9.3"; + version = "2023.10.4"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -26,9 +27,15 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-j8uM/vEfZO1C4jsYU68nTt/cmhRKsW2MTFG84g53vE4="; + hash = "sha256-SDkwKJVymWpl65TGVWpZL0KQhMdnjTLyOR+G3nyRWw0="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "setuptools~=68.2" "setuptools" \ + --replace "wheel~=0.41.2" "wheel" + ''; + nativeBuildInputs = [ setuptools wheel @@ -42,6 +49,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + freezegun pydevccu pytest-aiohttp pytestCheckHook diff --git a/pkgs/development/python-modules/hcloud/default.nix b/pkgs/development/python-modules/hcloud/default.nix index cfa94debf55ff..973e30668da40 100644 --- a/pkgs/development/python-modules/hcloud/default.nix +++ b/pkgs/development/python-modules/hcloud/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "hcloud"; - version = "1.28.0"; + version = "1.29.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BM6iy3dSjiy65uLi1Yr1qvaWcnrE/LQfyFkZLrzD8pw="; + hash = "sha256-yqwWuRip/QmWqn7Gm3Fth46DooNGhJGLQbnsJE/67bg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/heudiconv/default.nix b/pkgs/development/python-modules/heudiconv/default.nix index 514d4e2477b62..3cdf1463cd575 100644 --- a/pkgs/development/python-modules/heudiconv/default.nix +++ b/pkgs/development/python-modules/heudiconv/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "heudiconv"; - version = "0.13.1"; + version = "1.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-UUBRC6RToj4XVbJnxG+EKdue4NVpTAW31RNm9ieF1lU="; + hash = "sha256-cW6G2NtPZiyqqJ3w9a3Y/6blEaXtR9eGG5epPknimsw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/hist/default.nix b/pkgs/development/python-modules/hist/default.nix index 07f8035fb2a24..8d47c7de0f73b 100644 --- a/pkgs/development/python-modules/hist/default.nix +++ b/pkgs/development/python-modules/hist/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "hist"; - version = "2.7.1"; + version = "2.7.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-/74xTCvQPDQrnxaNznFa2PNigesjFyoAlwiCqTRP6Yg="; + hash = "sha256-JrGrgQ2LECIttdFh1KyvZKqgT+a6rtKWbUHB2sVgHQY="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/huey/default.nix b/pkgs/development/python-modules/huey/default.nix index a622017bebcf6..2ef88e7bf4867 100644 --- a/pkgs/development/python-modules/huey/default.nix +++ b/pkgs/development/python-modules/huey/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "huey"; - version = "2.4.5"; + version = "2.5.0"; format = "pyproject"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "coleifer"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-7ZMkA5WzWJKSwvpOoZYQO9JgedCdxNGrkFuPmYm4aRE="; + hash = "sha256-t767eqZ6U12mG8nWEYC9Hoq/jW2yfrPkCxB3/xLKQww="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/hyperpyyaml/default.nix b/pkgs/development/python-modules/hyperpyyaml/default.nix index 66207b734e45c..9395b299fea01 100644 --- a/pkgs/development/python-modules/hyperpyyaml/default.nix +++ b/pkgs/development/python-modules/hyperpyyaml/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , pyyaml , ruamel-yaml , pytestCheckHook @@ -9,25 +8,16 @@ buildPythonPackage rec { pname = "hyperpyyaml"; - version = "1.2.1"; + version = "1.2.2"; format = "setuptools"; src = fetchFromGitHub { owner = "speechbrain"; repo = "hyperpyyaml"; rev = "refs/tags/v${version}"; - hash = "sha256-tC4kLJAY9MVgjWwU2Qu0rPCVDw7CjKVIciRZgYhnR9I="; + hash = "sha256-eA4/wXmqlqomfRbJNi7dkBRoxneCbCbURSPvASF2sgA="; }; - patches = [ - # This patch is needed to comply with the newer versions of ruamel.yaml. - # PR to upstream this change: https://github.com/speechbrain/HyperPyYAML/pull/23 - (fetchpatch { - url = "https://github.com/speechbrain/HyperPyYAML/commit/95c6133686c42764770a77429eab55f6dfe5581c.patch"; - hash = "sha256-WrHDo17f5pYNXSSqI8t1tlAloYms9oLFup7D2qCKwWw="; - }) - ]; - propagatedBuildInputs = [ pyyaml ruamel-yaml diff --git a/pkgs/development/python-modules/hyperscan/default.nix b/pkgs/development/python-modules/hyperscan/default.nix new file mode 100644 index 0000000000000..342dda967cfee --- /dev/null +++ b/pkgs/development/python-modules/hyperscan/default.nix @@ -0,0 +1,54 @@ +{ lib +, pkgs +, buildPythonPackage +, fetchFromGitHub +, pdm-backend +, setuptools +, wheel +, pcre +, pkg-config +, pytestCheckHook +, pytest-mock +}: + +buildPythonPackage rec { + pname = "hyperscan"; + version = "0.6.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "darvid"; + repo = "python-hyperscan"; + rev = "v${version}"; + hash = "sha256-6PoV9rY9CkXkAMWN2QCnfU4S0OJD/6bzkqFgvEVqNjo="; + }; + + buildInputs = [ + (pkgs.hyperscan.override { withStatic = true; }) + # we need static pcre to be built, by default only shared library is built + (pcre.overrideAttrs { dontDisableStatic = 0; }) + ]; + + nativeBuildInputs = [ + pkg-config + pdm-backend + setuptools + wheel + ]; + + pythonImportsCheck = [ "hyperscan" ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-mock + ]; + + meta = with lib; { + description = "A CPython extension for the Hyperscan regular expression matching library"; + homepage = "https://github.com/darvid/python-hyperscan"; + changelog = "https://github.com/darvid/python-hyperscan/blob/${src.rev}/CHANGELOG.md"; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + license = licenses.mit; + maintainers = with maintainers; [ mbalatsko ]; + }; +} diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix index 16274bc3f00df..9b77a6be51d0d 100644 --- a/pkgs/development/python-modules/ibis-framework/default.nix +++ b/pkgs/development/python-modules/ibis-framework/default.nix @@ -130,6 +130,17 @@ buildPythonPackage rec { # tries to download duckdb extensions "--deselect=ibis/backends/duckdb/tests/test_register.py::test_register_sqlite" "--deselect=ibis/backends/duckdb/tests/test_register.py::test_read_sqlite" + + # duckdb does not respect sample_size=2 (reads 3 lines of csv). + "--deselect=ibis/backends/tests/test_register.py::test_csv_reregister_schema" + + # duckdb fails with: + # "This function can not be called with an active transaction!, commit or abort the existing one first" + "--deselect=ibis/backends/tests/test_udf.py::test_vectorized_udf" + "--deselect=ibis/backends/tests/test_udf.py::test_map_merge_udf" + "--deselect=ibis/backends/tests/test_udf.py::test_udf" + "--deselect=ibis/backends/tests/test_udf.py::test_map_udf" + # pyarrow13 is not supported yet. "--deselect=ibis/backends/tests/test_temporal.py::test_date_truncate" "--deselect=ibis/backends/tests/test_temporal.py::test_integer_to_interval_timestamp" diff --git a/pkgs/development/python-modules/icontract/default.nix b/pkgs/development/python-modules/icontract/default.nix index 0a200038032f1..3429aa52cc271 100644 --- a/pkgs/development/python-modules/icontract/default.nix +++ b/pkgs/development/python-modules/icontract/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "icontract"; - version = "2.6.2"; + version = "2.6.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Parquery"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-NUgMt/o9EpSQyOiAhYBVJtQKJn0Pd2lI45bKlo2z7mk="; + hash = "sha256-kLi00Yf/UkSaBTvc+GlgTw263M2SMkyzADnQYLbsMfw="; }; preCheck = '' @@ -52,12 +52,6 @@ buildPythonPackage rec { "tests/test_mypy_decorators.py" ]; - # Upstream adds some plain text files direct to the package's root directory - # https://github.com/Parquery/icontract/blob/master/setup.py#L63 - postInstall = '' - rm -f $out/{LICENSE.txt,README.rst,requirements.txt} - ''; - pythonImportsCheck = [ "icontract" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index 13e1e8d93f8fd..891d03cfc04c7 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "identify"; - version = "2.5.29"; + version = "2.5.30"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-eCOgOXzbjP2yTLKYcnjnWFes4P2jvr9rGfQuHuqxLDc="; + hash = "sha256-e3+yjd3jrcv4hU+0vCTl+bAzlYcfTdhLHr93briFxdI="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/iisignature/default.nix b/pkgs/development/python-modules/iisignature/default.nix new file mode 100644 index 0000000000000..1ddfd05b53266 --- /dev/null +++ b/pkgs/development/python-modules/iisignature/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, wheel +, numpy +}: + +buildPythonPackage rec { + pname = "iisignature"; + version = "0.24"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-C5MUxui4BIf68yMZH7NZhq1CJuhrDGfPCjspObaVucY="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + numpy + ]; + + # PyPI tarball has no tests + doCheck = false; + + pythonImportsCheck = [ "iisignature" ]; + + meta = with lib; { + description = "Iterated integral signature calculations"; + homepage = "https://pypi.org/project/iisignature"; + license = licenses.mit; + maintainers = with maintainers; [ mbalatsko ]; + }; +} diff --git a/pkgs/development/python-modules/indexed-bzip2/default.nix b/pkgs/development/python-modules/indexed-bzip2/default.nix new file mode 100644 index 0000000000000..d6c82e3aec9a5 --- /dev/null +++ b/pkgs/development/python-modules/indexed-bzip2/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "indexed_bzip2"; + version = "1.5.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-tKf9odadfQZQYJz//vWYpeB99Z8VLg+hEPvfEHXgdnM="; + }; + + # has no tests + doCheck = false; + + pythonImportsCheck = [ "indexed_bzip2" ]; + + meta = with lib; { + description = "Python library for parallel decompression and seeking within compressed bzip2 files"; + homepage = "https://github.com/mxmlnkn/indexed_bzip2"; + license = licenses.mit; # dual MIT and asl20, https://internals.rust-lang.org/t/rationale-of-apache-dual-licensing/8952 + maintainers = with lib.maintainers; [ mxmlnkn ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/python-modules/indexed-gzip/default.nix b/pkgs/development/python-modules/indexed-gzip/default.nix new file mode 100644 index 0000000000000..73ad916f35f83 --- /dev/null +++ b/pkgs/development/python-modules/indexed-gzip/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, cython +, zlib +}: + +buildPythonPackage rec { + pname = "indexed_gzip"; + version = "1.8.5"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-h9JgYq9KxmknaRuMgq+5YWA8tUaFk+lclkqdNAnr/cI="; + }; + + nativeBuildInputs = [ cython ]; + + buildInputs = [ zlib ]; + + # Too complicated to get to work, not a simple pytest call. + doCheck = false; + + pythonImportsCheck = [ "indexed_gzip" ]; + + meta = with lib; { + description = "Python library to seek within compressed gzip files"; + homepage = "https://github.com/pauldmccarthy/indexed_gzip"; + license = licenses.zlib; + maintainers = with lib.maintainers; [ mxmlnkn ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/python-modules/indexed-zstd/default.nix b/pkgs/development/python-modules/indexed-zstd/default.nix new file mode 100644 index 0000000000000..f9d643c8ff497 --- /dev/null +++ b/pkgs/development/python-modules/indexed-zstd/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, cython +, zstd +}: + +buildPythonPackage rec { + pname = "indexed_zstd"; + version = "1.6.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-icCerrv6ihBjSTS4Fsw7qhoA5ha8yegfMVRiIOhTvvY="; + }; + + nativeBuildInputs = [ cython ]; + + buildInputs = [ zstd.dev ]; + + # has no tests + doCheck = false; + + pythonImportsCheck = [ "indexed_zstd" ]; + + meta = with lib; { + description = "Python library to seek within compressed zstd files"; + homepage = "https://github.com/martinellimarco/indexed_zstd"; + license = licenses.mit; + maintainers = with lib.maintainers; [ mxmlnkn ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/python-modules/iniconfig/default.nix b/pkgs/development/python-modules/iniconfig/default.nix index 04f06c013d4b8..b9c6e8e205fa3 100644 --- a/pkgs/development/python-modules/iniconfig/default.nix +++ b/pkgs/development/python-modules/iniconfig/default.nix @@ -32,7 +32,9 @@ buildPythonPackage rec { "iniconfig" ]; - doCheck = false; # avoid circular import with pytest + # Requires pytest, which in turn requires this package - causes infinite + # recursion. See also: https://github.com/NixOS/nixpkgs/issues/63168 + doCheck = false; meta = with lib; { description = "brain-dead simple parsing of ini files"; diff --git a/pkgs/development/python-modules/iocextract/default.nix b/pkgs/development/python-modules/iocextract/default.nix index 5831ab80e14ba..3353d912b3938 100644 --- a/pkgs/development/python-modules/iocextract/default.nix +++ b/pkgs/development/python-modules/iocextract/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "iocextract"; - version = "1.16.0"; + version = "1.16.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "InQuest"; repo = "python-iocextract"; rev = "refs/tags/v${version}"; - hash = "sha256-jwMu4G146FpH6aFCiZK9tI/3CKnZYC2RCtO9QXXaquQ="; + hash = "sha256-cCp9ug/TuVY1zL+kiDlFGBmfFJyAmVwxLD36WT0oRAE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ipwhl/default.nix b/pkgs/development/python-modules/ipwhl/default.nix index 80068293145d7..6e6d0e21ef02d 100644 --- a/pkgs/development/python-modules/ipwhl/default.nix +++ b/pkgs/development/python-modules/ipwhl/default.nix @@ -1,10 +1,10 @@ { lib, buildPythonPackage, pythonOlder, fetchFromSourcehut -, kubo, packaging, tomli }: +, kubo, packaging, tomli, flit-core }: buildPythonPackage rec { pname = "ipwhl"; version = "1.1.0"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchFromSourcehut { @@ -14,6 +14,7 @@ buildPythonPackage rec { hash = "sha256-YaIYcoUnbiv9wUOFIzGj2sWGbh7NsqRQcqOR2X6+QZA="; }; + nativeBuildInputs = [ flit-core ]; buildInputs = [ kubo ]; propagatedBuildInputs = [ packaging tomli ]; doCheck = false; # there's no test diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix index 0ad58dc035874..4f8235bac5787 100644 --- a/pkgs/development/python-modules/jax/default.nix +++ b/pkgs/development/python-modules/jax/default.nix @@ -27,8 +27,8 @@ let in buildPythonPackage rec { pname = "jax"; - version = "0.4.16"; - format = "pyproject"; + version = "0.4.17"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -37,7 +37,7 @@ buildPythonPackage rec { repo = pname; # google/jax contains tags for jax and jaxlib. Only use jax tags! rev = "refs/tags/${pname}-v${version}"; - hash = "sha256-q+8CXGxK8JX0bUMK4KJB3qV/EaLHg68D1B5UrtRz0Eg="; + hash = "sha256-Lxi/lBBq7VlsT6CgnXPFcwbRU+T8630rBdm693E2jok="; }; nativeBuildInputs = [ @@ -100,6 +100,14 @@ buildPythonPackage rec { "test_for_loop_fixpoint_correctly_identifies_loop_varying_residuals_unrolled_for_loop" "testQdwhWithRandomMatrix3" "testScanGrad_jit_scan" + + # See https://github.com/google/jax/issues/17867. + "test_array" + "test_async" + "test_copy0" + "test_device_put" + "test_make_array_from_callback" + "test_make_array_from_single_device_arrays" ]; disabledTestPaths = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ diff --git a/pkgs/development/python-modules/jaxlib/bin.nix b/pkgs/development/python-modules/jaxlib/bin.nix index b9e8fac593061..ae1b10aab0f5c 100644 --- a/pkgs/development/python-modules/jaxlib/bin.nix +++ b/pkgs/development/python-modules/jaxlib/bin.nix @@ -39,7 +39,7 @@ in assert cudaSupport -> lib.versionAtLeast cudatoolkit.version "11.1" && lib.versionAtLeast cudnn.version "8.2" && stdenv.isLinux; let - version = "0.4.16"; + version = "0.4.17"; inherit (python) pythonVersion; @@ -60,15 +60,15 @@ let { "x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; - hash = "sha256-4XyaDnKEMhAbfPEvN3RCDEjXTWbOL6tWrTlyYeiboVs="; + hash = "sha256-Fg/OaLgqeabFImUujdmhCqycANFZnLfhZmca2QmqE54="; }; "aarch64-darwin" = getSrcFromPypi { platform = "macosx_11_0_arm64"; - hash = "sha256-IG2pCui/Yj+LDMbQwBVlu7yl2llqnaxMzz/MtBvBr6U="; + hash = "sha256-OSx3n5AsQ+Ggr0kVna/++bWvlSq6ABRj+Yz5WlnvF/8="; }; "x86_64-darwin" = getSrcFromPypi { platform = "macosx_10_14_x86_64"; - hash = "sha256-x5DqsmHqEb7Dl7dnxT5N0l30GKt5OPZpq3HGX9MFKmo="; + hash = "sha256-1L4axL8b4a4c2PX02kFKbQ3o3jbPLv/bV1jU1neJYHg="; }; }; @@ -78,7 +78,7 @@ let # https://github.com/google/jax/issues/12879 as to why this specific URL is the correct index. gpuSrc = fetchurl { url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn86-cp310-cp310-manylinux2014_x86_64.whl"; - hash = "sha256-eLOprP2kv6roodwRKZXVZFQCD1wC26TSTEDJBjMu/Uo="; + hash = "sha256-Ctdlr8mvlMcTnBSiyjEEvle5AGr+o1v6OI7XIqcTENM="; }; in diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index 6fb960f684c66..36b8f25ec5559 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -54,7 +54,7 @@ let inherit (cudaPackages) backendStdenv cudatoolkit cudaFlags cudnn nccl; pname = "jaxlib"; - version = "0.4.16"; + version = "0.4.17"; meta = with lib; { description = "JAX is Autograd and XLA, brought together for high-performance machine learning research."; @@ -151,7 +151,7 @@ let repo = "jax"; # google/jax contains tags for jax and jaxlib. Only use jaxlib tags! rev = "refs/tags/${pname}-v${version}"; - hash = "sha256-q+8CXGxK8JX0bUMK4KJB3qV/EaLHg68D1B5UrtRz0Eg="; + hash = "sha256-Lxi/lBBq7VlsT6CgnXPFcwbRU+T8630rBdm693E2jok="; }; nativeBuildInputs = [ @@ -264,10 +264,10 @@ let ]; sha256 = (if cudaSupport then { - x86_64-linux = "sha256-6HkrEWAPjGPj4zRxahl0FLiV7WZO/6zsdCX8STfV5EE="; + x86_64-linux = "sha256-nRvvFAuP/9D8BWWVPjuZijVtk+F9IrBBHsNc5Daluy4="; } else { - x86_64-linux = "sha256-MDnuJwJ/xKnC72Qub0ETYj5uQB2r8/AgGm10oqmzzcc="; - aarch64-linux = "sha256-aVUm612VNEsjZLDrtiOPTqSk1t+AhmOx+pOG3bZdOAw="; + x86_64-linux = "sha256-pPIJOELN62GqUuaKpcpaqHu7wbJHiZgtb2PVUPRr1Ek="; + aarch64-linux = "sha256-Q0PYZkOkUYUHVtSHZDlWitslDZbjNq6yRZv/ZkhTmyc="; }).${stdenv.system} or (throw "jaxlib: unsupported system: ${stdenv.system}"); }; diff --git a/pkgs/development/python-modules/jaxtyping/default.nix b/pkgs/development/python-modules/jaxtyping/default.nix index 7f94da78ba319..0d0621c56ec91 100644 --- a/pkgs/development/python-modules/jaxtyping/default.nix +++ b/pkgs/development/python-modules/jaxtyping/default.nix @@ -16,14 +16,14 @@ let self = buildPythonPackage rec { pname = "jaxtyping"; - version = "0.2.21"; - format = "pyproject"; + version = "0.2.22"; + pyproject = true; src = fetchFromGitHub { owner = "google"; repo = "jaxtyping"; rev = "refs/tags/v${version}"; - hash = "sha256-BacfFcrzXeS6LemU7P6oCZJGB/Zzq09kEPuz2rTIyfI="; + hash = "sha256-OYx7Eq5jxSGERHsk611+n+Nq2B915gpJLPZYdO7Lt+k="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jplephem/default.nix b/pkgs/development/python-modules/jplephem/default.nix index a2da6c10b3a83..dfb0594151efa 100644 --- a/pkgs/development/python-modules/jplephem/default.nix +++ b/pkgs/development/python-modules/jplephem/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "jplephem"; - version = "2.18"; + version = "2.19"; src = fetchPypi { inherit pname version; - hash = "sha256-SSkR6KTEeDB5GwO5oP/ff8ZfaF0cuzoXkLHqKIrn+uU="; + hash = "sha256-wWJFTGVtblID/5cB2CZnH6+fMgnZccu2jdtGAD3/bc8="; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/jq/default.nix b/pkgs/development/python-modules/jq/default.nix index 335b6e92781df..d7dc37b068528 100644 --- a/pkgs/development/python-modules/jq/default.nix +++ b/pkgs/development/python-modules/jq/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , cython , fetchFromGitHub +, fetchpatch , jq , pytestCheckHook , pythonOlder @@ -9,7 +10,7 @@ buildPythonPackage rec { pname = "jq"; - version = "1.4.1"; + version = "1.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,12 +19,17 @@ buildPythonPackage rec { owner = "mwilliamson"; repo = "jq.py"; rev = "refs/tags/${version}"; - hash = "sha256-prH3yUFh3swXGsxnoax09aYAXaiu8o2M21ZbOp9HDJY="; + hash = "sha256-mITk5y2AdUc9kZ/WrsnHxS1GRRmO4FDbPRgTtV2gIXI="; }; patches = [ # Removes vendoring ./jq-py-setup.patch + (fetchpatch { + url = "https://github.com/mwilliamson/jq.py/commit/805705dde4beb9db9a1743663d415198fb02eb1a.patch"; + includes = [ "tests/*" ]; + hash = "sha256-AgdpwmtOTeJ4nSbM6IknKaIVqqtWkpxTTtblXjlbWeA="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/json-schema-for-humans/default.nix b/pkgs/development/python-modules/json-schema-for-humans/default.nix index 0469943e334aa..dfbe2d7d638e1 100644 --- a/pkgs/development/python-modules/json-schema-for-humans/default.nix +++ b/pkgs/development/python-modules/json-schema-for-humans/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "json-schema-for-humans"; - version = "0.45.2"; + version = "0.46"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "coveooss"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-DmUQ06UabLcB67PyfRC/gmSkEY/V8kuZ/T/ZW1D11vA="; + hash = "sha256-wTO+d0O3SKT2jJ2zNubT2q76PdJ7+kT9RBEw5MMH1yg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/junos-eznc/default.nix b/pkgs/development/python-modules/junos-eznc/default.nix index d50dd571764b4..e6499c5196d1d 100644 --- a/pkgs/development/python-modules/junos-eznc/default.nix +++ b/pkgs/development/python-modules/junos-eznc/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "junos-eznc"; - version = "2.6.7"; + version = "2.6.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "Juniper"; repo = "py-junos-eznc"; rev = "refs/tags/${version}"; - hash = "sha256-+hGybznip5RpJm89MLg9JO4B/y50OIdgtmV2FIpZShU="; + hash = "sha256-5xZjuU2U3BodAMQiWZIJ27AZiAwoMm4yJ4qr3DjMd9o="; }; postPatch = '' diff --git a/pkgs/development/python-modules/jupyter-book/default.nix b/pkgs/development/python-modules/jupyter-book/default.nix index 81b89e77a8bb4..631a853833d46 100644 --- a/pkgs/development/python-modules/jupyter-book/default.nix +++ b/pkgs/development/python-modules/jupyter-book/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "jupyter-book"; version = "0.15.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/jupyter-cache/default.nix b/pkgs/development/python-modules/jupyter-cache/default.nix index cbeb05bde98fb..29a8bb0245845 100644 --- a/pkgs/development/python-modules/jupyter-cache/default.nix +++ b/pkgs/development/python-modules/jupyter-cache/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "jupyter-cache"; version = "0.6.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/jupyter-ydoc/default.nix b/pkgs/development/python-modules/jupyter-ydoc/default.nix index e3294150bf62e..03dae2dfa9ff9 100644 --- a/pkgs/development/python-modules/jupyter-ydoc/default.nix +++ b/pkgs/development/python-modules/jupyter-ydoc/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "jupyter-ydoc"; - version = "1.0.2"; + version = "1.1.1"; format = "pyproject"; src = fetchPypi { pname = "jupyter_ydoc"; inherit version; - hash = "sha256-D5W+3j8eCB4H1cV8A8ZY46Ukfg7xiIkHT776IN0+ylM="; + hash = "sha256-APizOm59VcvhK5G4emqGtnPikz13w6EmG7qLJHU2Rd0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix index 3f16022e21636..d6bdedc992ae5 100644 --- a/pkgs/development/python-modules/jupyterhub/default.nix +++ b/pkgs/development/python-modules/jupyterhub/default.nix @@ -201,7 +201,7 @@ buildPythonPackage rec { homepage = "https://jupyter.org/"; changelog = "https://github.com/jupyterhub/jupyterhub/blob/${version}/docs/source/reference/changelog.md"; license = licenses.bsd3; - maintainers = with maintainers; [ ixxie cstrahan ]; + maintainers = with maintainers; [ ixxie ]; # darwin: E OSError: dlopen(/nix/store/43zml0mlr17r5jsagxr00xxx91hz9lky-openpam-20170430/lib/libpam.so, 6): image not found broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; }; diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix index a3e0eba387f91..e5bc170509d22 100644 --- a/pkgs/development/python-modules/jupytext/default.nix +++ b/pkgs/development/python-modules/jupytext/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "jupytext"; - version = "1.15.1"; + version = "1.15.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "mwouts"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-XGjAPeMtg2Epu85JiqQPyZJVez5Z8uA+E40SFcZM7WY="; + hash = "sha256-GvMoz2BsYWk0atrT3xmSnbV7AuO5RJoM/bOJlZ5YIn4="; }; # Follow https://github.com/mwouts/jupytext/pull/1119 to see if the patch diff --git a/pkgs/development/python-modules/k-diffusion/default.nix b/pkgs/development/python-modules/k-diffusion/default.nix index 55a3ce36f80c0..272f2d5fc488d 100644 --- a/pkgs/development/python-modules/k-diffusion/default.nix +++ b/pkgs/development/python-modules/k-diffusion/default.nix @@ -3,13 +3,15 @@ , buildPythonPackage , clean-fid , clip-anytorch +, dctorch , einops , fetchFromGitHub , jsonmerge , kornia , pillow , pythonOlder -, resize-right +, rotary-embedding-torch +, safetensors , scikit-image , scipy , torch @@ -22,7 +24,7 @@ buildPythonPackage rec { pname = "k-diffusion"; - version = "0.0.16"; + version = "0.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -31,20 +33,22 @@ buildPythonPackage rec { owner = "crowsonkb"; repo = "k-diffusion"; rev = "refs/tags/v${version}"; - hash = "sha256-tOWDFt0/hGZF5HENiHPb9a2pBlXdSvDvCNTsCMZljC4="; + hash = "sha256-jcIA0HfEnVHk9XDXPevGBw81GsXlm1Ztp8ceNirShEA="; }; propagatedBuildInputs = [ accelerate clean-fid clip-anytorch + dctorch einops jsonmerge kornia pillow - resize-right + rotary-embedding-torch scikit-image scipy + safetensors torch torchdiffeq torchsde diff --git a/pkgs/development/python-modules/kaggle/default.nix b/pkgs/development/python-modules/kaggle/default.nix index 42cb7f83bb85b..e2cb5e76f0465 100644 --- a/pkgs/development/python-modules/kaggle/default.nix +++ b/pkgs/development/python-modules/kaggle/default.nix @@ -8,6 +8,7 @@ , requests , tqdm , urllib3 +, bleach }: buildPythonPackage rec { @@ -19,14 +20,6 @@ buildPythonPackage rec { sha256 = "sha256-g2TFbDYSXLgZWHbZEdC8nvvBcxZ+ljuenveTeJupp/4="; }; - # The version bounds in the setup.py file are unnecessarily restrictive. - # They have both python-slugify and slugify, don't know why - patchPhase = '' - substituteInPlace setup.py \ - --replace 'urllib3 >= 1.21.1, < 1.25' 'urllib3' \ - --replace " 'slugify'," " " - ''; - propagatedBuildInputs = [ certifi python-dateutil @@ -35,6 +28,7 @@ buildPythonPackage rec { six tqdm urllib3 + bleach ]; # Tests try to access the network. @@ -50,6 +44,6 @@ buildPythonPackage rec { description = "Official API for https://www.kaggle.com, accessible using a command line tool implemented in Python 3"; homepage = "https://github.com/Kaggle/kaggle-api"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ mbalatsko ]; }; } diff --git a/pkgs/development/python-modules/led-ble/default.nix b/pkgs/development/python-modules/led-ble/default.nix index a75bc1f59ab9c..653d75a46da47 100644 --- a/pkgs/development/python-modules/led-ble/default.nix +++ b/pkgs/development/python-modules/led-ble/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "led-ble"; - version = "1.0.0"; + version = "1.0.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-XAb/tJPUe/sNvcU7t63inMPBIz+AREioWXBuQa/c9T0="; + hash = "sha256-8DBA01QjW99OVYI9zC1Q+utnwzc10idUG7y+lmUbO4A="; }; postPatch = '' @@ -34,10 +34,11 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - async-timeout bleak bleak-retry-connector flux-led + ] ++ lib.optionals (pythonOlder "3.11") [ + async-timeout ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/levenshtein/default.nix b/pkgs/development/python-modules/levenshtein/default.nix index 3cdecde9e7021..47a9d2c39c3a2 100644 --- a/pkgs/development/python-modules/levenshtein/default.nix +++ b/pkgs/development/python-modules/levenshtein/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "levenshtein"; - version = "0.21.1"; + version = "0.22.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "Levenshtein"; rev = "refs/tags/v${version}"; - hash = "sha256-I1kVGbZI1hQRNv0e44giWiMqmeqaqFZks20IyFQ9VIU="; + hash = "sha256-rqbZ2+UfWhh5qEd1GL6W9edHPCSNnK3s/Y2aT3R5wCA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/liccheck/default.nix b/pkgs/development/python-modules/liccheck/default.nix index 0af550ef6f894..713fc3cca23cc 100644 --- a/pkgs/development/python-modules/liccheck/default.nix +++ b/pkgs/development/python-modules/liccheck/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "liccheck"; - version = "0.9.1"; + version = "0.9.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "dhatim"; repo = "python-license-check"; rev = "refs/tags/${version}"; - hash = "sha256-ZgwHcZI0vsNYJWPkUnoBogVPPIuifAX9hu4fa1fHSz4="; + hash = "sha256-2WJw5TVMjOr+GX4YV0nssOtQeYvDHBLnlWquJQWPL9I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/lifelines/default.nix b/pkgs/development/python-modules/lifelines/default.nix index 450138fdde686..d0dd1b757fae2 100644 --- a/pkgs/development/python-modules/lifelines/default.nix +++ b/pkgs/development/python-modules/lifelines/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "lifelines"; - version = "0.27.7"; + version = "0.27.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "CamDavidsonPilon"; repo = "lifelines"; rev = "refs/tags/v${version}"; - hash = "sha256-6ulg3R59QHy31CXit8tddi6F0vPKVRZDIu0zdS19xu0="; + hash = "sha256-2AjqN4TtBY1KtgFlY0E2UcFUHniHe2Hge+JaUQd4gO8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index 8276af406b142..0cc2d73d969b1 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2023.8.10"; + version = "2023.9.24"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-3AHc7Ej0IJ2WCQ8XVbWL0lwTQW6ng2ehemTcmJOQ86U="; + hash = "sha256-VJXIuGcgwAEObCCah+yc/o3IEpe4ln5F4wVwCy54Auc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/loca/default.nix b/pkgs/development/python-modules/loca/default.nix index 8ad0a4adbe74e..28a9020d74445 100644 --- a/pkgs/development/python-modules/loca/default.nix +++ b/pkgs/development/python-modules/loca/default.nix @@ -1,9 +1,9 @@ -{ lib, buildPythonPackage, pythonOlder, fetchFromSourcehut }: +{ lib, buildPythonPackage, pythonOlder, fetchFromSourcehut, flit-core }: buildPythonPackage rec { pname = "loca"; version = "2.0.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromSourcehut { @@ -13,6 +13,10 @@ buildPythonPackage rec { sha256 = "1l6jimw3wd81nz1jrzsfw1zzsdm0jm998xlddcqaq0h38sx69w8g"; }; + nativeBuildInputs = [ + flit-core + ]; + doCheck = false; # all checks are static analyses pythonImportsCheck = [ "loca" ]; diff --git a/pkgs/development/python-modules/localstack-ext/default.nix b/pkgs/development/python-modules/localstack-ext/default.nix index ed9b190b80f14..2e19ff0d9b342 100644 --- a/pkgs/development/python-modules/localstack-ext/default.nix +++ b/pkgs/development/python-modules/localstack-ext/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "localstack-ext"; - version = "1.4.0"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - hash = "sha256-/uesHiB/54wEfcWf4e9BW1ZvcVfAgAD7yGAlfYxv+6g="; + hash = "sha256-BLK41TRaYNtpeeDeGZhlvnvkQwWo0uGB19g34waRqFk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/looseversion/default.nix b/pkgs/development/python-modules/looseversion/default.nix index 19b5d10ca0e10..b16fd1a572d21 100644 --- a/pkgs/development/python-modules/looseversion/default.nix +++ b/pkgs/development/python-modules/looseversion/default.nix @@ -2,18 +2,23 @@ , buildPythonPackage , fetchPypi , pytestCheckHook +, hatchling }: buildPythonPackage rec { pname = "looseversion"; version = "1.3.0"; - format = "flit"; + format = "pyproject"; src = fetchPypi { inherit version pname; sha256 = "sha256-695l8/a7lTGoEBbG/vPrlaYRga3Ee3+UnpwOpHkRZp4="; }; + nativeBuildInputs = [ + hatchling + ]; + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/m3u8/default.nix b/pkgs/development/python-modules/m3u8/default.nix index 7ba084913ba7d..9ff8dfbf0e73f 100644 --- a/pkgs/development/python-modules/m3u8/default.nix +++ b/pkgs/development/python-modules/m3u8/default.nix @@ -4,17 +4,21 @@ , iso8601 , bottle , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "m3u8"; - version = "3.5.0"; + version = "3.6.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "globocom"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-9Xmbc1aL7SI24FFn0/5KJtAM3+Xyvd3bwUh8DU1wGKE="; + hash = "sha256-JLYRkibcvmNct2eIBfBP7z3gR680xhZL/Kn/1S7feoo="; }; propagatedBuildInputs = [ @@ -38,8 +42,9 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "https://github.com/globocom/m3u8"; description = "Python m3u8 parser"; + homepage = "https://github.com/globocom/m3u8"; + changelog = "https://github.com/globocom/m3u8/releases/tag//${version}"; license = licenses.mit; maintainers = with maintainers; [ Scriptkiddi ]; }; diff --git a/pkgs/development/python-modules/magic-filter/default.nix b/pkgs/development/python-modules/magic-filter/default.nix index bf85abee73c8b..e9d2fb8b86967 100644 --- a/pkgs/development/python-modules/magic-filter/default.nix +++ b/pkgs/development/python-modules/magic-filter/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "magic-filter"; - version = "1.0.11"; + version = "1.0.12"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "aiogram"; repo = "magic-filter"; rev = "refs/tags/v${version}"; - hash = "sha256-mfSq47UWOLyEDkAsdHsJuVl/rJ4KgiGPpDL7qSKEfws="; + hash = "sha256-MSYIZ/bzngRu6mG3EGblUotSCA+6bi+l3EymFA8NRZA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mandown/default.nix b/pkgs/development/python-modules/mandown/default.nix new file mode 100644 index 0000000000000..fd699821f6da0 --- /dev/null +++ b/pkgs/development/python-modules/mandown/default.nix @@ -0,0 +1,65 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, beautifulsoup4 +, comicon +, feedparser +, filetype +, lxml +, natsort +, pillow +, python-slugify +, requests +, typer +, pyside6 +}: + +buildPythonPackage rec { + pname = "mandown"; + version = "1.5.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "potatoeggy"; + repo = "mandown"; + rev = "v${version}"; + hash = "sha256-ph+1bb1jhqqDE2d4F8lTf7LAzN7DWpDTGn8qhCiccKA="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + beautifulsoup4 + comicon + feedparser + filetype + lxml + natsort + pillow + python-slugify + requests + typer + ]; + + passthru.optional-dependencies = { + gui = [ + pyside6 + ]; + }; + + postPatch = '' + substituteInPlace pyproject.toml --replace 'typer = "^0.7.0"' 'typer = "^0"' + ''; + + pythonImportsCheck = [ "mandown" ]; + + meta = with lib; { + description = "Comic/manga/webtoon downloader and CBZ/EPUB/MOBI/PDF converter"; + homepage = "https://github.com/potatoeggy/mandown"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ Scrumplex ]; + }; +} diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix index 03bc6015843d0..77f47543c52aa 100644 --- a/pkgs/development/python-modules/matrix-nio/default.nix +++ b/pkgs/development/python-modules/matrix-nio/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "matrix-nio"; - version = "0.20.1"; + version = "0.21.2"; format = "pyproject"; src = fetchFromGitHub { owner = "poljar"; repo = "matrix-nio"; rev = version; - hash = "sha256-6oMOfyl8yR8FMprPYD831eiXh9g/bqslvxDmVcrNK80="; + hash = "sha256-eK5DPmPZ/hv3i3lzoIuS9sJXKpUNhmBv4+Nw2u/RZi0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/maya/default.nix b/pkgs/development/python-modules/maya/default.nix index baa95f7c7de2f..15e619558016d 100644 --- a/pkgs/development/python-modules/maya/default.nix +++ b/pkgs/development/python-modules/maya/default.nix @@ -1,32 +1,58 @@ -{ lib, fetchPypi, fetchpatch, buildPythonPackage -, dateparser, humanize, pendulum, ruamel-yaml, tzlocal }: +{ lib +, fetchFromGitHub +, fetchpatch +, buildPythonPackage +, dateparser +, humanize +, pendulum +, pytz +, snaptime +, tzlocal +, pytestCheckHook +, freezegun +, pytest-mock +}: buildPythonPackage rec { pname = "maya"; - version = "0.3.3"; + version = "0.6.1"; - src = fetchPypi { - inherit pname version; - sha256 = "1x88k4irpckvd7jf2yvqjw1s52hjqbxym1r1d928yb3fkj7rvlxs"; + src = fetchFromGitHub { + owner = "kennethreitz"; + repo = "maya"; + rev = "refs/tags/v${version}"; + hash = "sha256-4fUyUqVQk/AcQL3xMnU1cQlF5yiD/N9NPAsUPuDTTNY="; }; - patches = [ - (fetchpatch { - # https://github.com/kennethreitz/maya/issues/112 - # Merged, so should be in next release. - url = "https://github.com/kennethreitz/maya/commit/f69a93b1103130139cdec30511777823957fb659.patch"; - sha256 = "152ba7amv9dhhx1wcklfalsdzsxggik9f7rsrikms921lq9xqc8h"; - }) - ]; + # fix humanize incompatibility + # https://github.com/timofurrer/maya/commit/d9cd563d1b1ba16bcff4dacb4ef49edd4e32fd1d.patch + # ^ does not apply on 0.6.1 + postPatch = '' + substituteInPlace maya/core.py \ + --replace \ + "humanize.time.abs_timedelta" \ + "humanize.time._abs_timedelta" + ''; - propagatedBuildInputs = [ dateparser humanize pendulum ruamel-yaml tzlocal ]; + propagatedBuildInputs = [ + dateparser + humanize + pendulum + pytz + snaptime + tzlocal + ]; - # No tests - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + freezegun + pytest-mock + ]; meta = with lib; { description = "Datetimes for Humans"; homepage = "https://github.com/kennethreitz/maya"; license = licenses.mit; + maintainers = with maintainers; [ pbsds ]; }; } diff --git a/pkgs/development/python-modules/mdformat-admon/default.nix b/pkgs/development/python-modules/mdformat-admon/default.nix index 1d285d89c70b8..a7fd0f940373b 100644 --- a/pkgs/development/python-modules/mdformat-admon/default.nix +++ b/pkgs/development/python-modules/mdformat-admon/default.nix @@ -24,7 +24,7 @@ let in python.pkgs.buildPythonPackage rec { pname = "mdformat-admon"; version = "1.0.2"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -35,6 +35,10 @@ in python.pkgs.buildPythonPackage rec { hash = "sha256-33Q3Re/axnoOHZ9XYA32mmK+efsSelJXW8sD7C1M/jU="; }; + nativeBuildInputs = with python.pkgs; [ + flit-core + ]; + buildInputs = with python.pkgs; [ mdformat ]; diff --git a/pkgs/development/python-modules/mdformat-footnote/default.nix b/pkgs/development/python-modules/mdformat-footnote/default.nix index cee0e1bd5e597..4d7b56f0c2fa2 100644 --- a/pkgs/development/python-modules/mdformat-footnote/default.nix +++ b/pkgs/development/python-modules/mdformat-footnote/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, flit-core , linkify-it-py , markdown-it-py , mdformat @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "mdformat-footnote"; version = "0.1.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,6 +23,10 @@ buildPythonPackage rec { hash = "sha256-DUCBWcmB5i6/HkqxjlU3aTRO7i0n2sj+e/doKB8ffeo="; }; + nativeBuildInputs = [ + flit-core + ]; + buildInputs = [ mdformat mdit-py-plugins diff --git a/pkgs/development/python-modules/mdformat-frontmatter/default.nix b/pkgs/development/python-modules/mdformat-frontmatter/default.nix index 67e0634fa1d2c..b073bb83a595c 100644 --- a/pkgs/development/python-modules/mdformat-frontmatter/default.nix +++ b/pkgs/development/python-modules/mdformat-frontmatter/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, flit-core , linkify-it-py , markdown-it-py , mdformat @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "mdformat-frontmatter"; version = "2.0.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,6 +24,10 @@ buildPythonPackage rec { hash = "sha256-PhT5whtvvcYSs5gHQEsIvV1evhx7jR+3DWFMHrF0uMw="; }; + nativeBuildInputs = [ + flit-core + ]; + buildInputs = [ mdformat mdit-py-plugins diff --git a/pkgs/development/python-modules/mdformat-mkdocs/default.nix b/pkgs/development/python-modules/mdformat-mkdocs/default.nix index 734045426526f..e8efd7bac91c0 100644 --- a/pkgs/development/python-modules/mdformat-mkdocs/default.nix +++ b/pkgs/development/python-modules/mdformat-mkdocs/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, flit-core , mdformat , mdformat-gfm , mdit-py-plugins @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "mdformat-mkdocs"; version = "1.0.4"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,6 +22,10 @@ buildPythonPackage rec { hash = "sha256-mGWeG8clWJ7obsvO+gYaVzfAyDOh9HNdyWW5KgOgfmM="; }; + nativeBuildInputs = [ + flit-core + ]; + buildInputs = [ mdformat mdformat-gfm diff --git a/pkgs/development/python-modules/mdformat-simple-breaks/default.nix b/pkgs/development/python-modules/mdformat-simple-breaks/default.nix index b4d293f6368f7..c5bbeeb46de98 100644 --- a/pkgs/development/python-modules/mdformat-simple-breaks/default.nix +++ b/pkgs/development/python-modules/mdformat-simple-breaks/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, flit-core , mdformat , mdit-py-plugins , pythonOlder @@ -9,7 +10,7 @@ buildPythonPackage rec { pname = "mdformat-simple-breaks"; version = "0.0.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,6 +21,10 @@ buildPythonPackage rec { hash = "sha256-4lJHB4r9lI2uGJ/BmFFc92sumTRKBBwiRmGBdQkzfd0="; }; + nativeBuildInputs = [ + flit-core + ]; + buildInputs = [ mdformat ]; diff --git a/pkgs/development/python-modules/mdformat-tables/default.nix b/pkgs/development/python-modules/mdformat-tables/default.nix index 747029eab276d..018371ada82fa 100644 --- a/pkgs/development/python-modules/mdformat-tables/default.nix +++ b/pkgs/development/python-modules/mdformat-tables/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, flit-core , mdformat , mdit-py-plugins , pytestCheckHook @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "mdformat-tables"; version = "0.4.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,6 +22,10 @@ buildPythonPackage rec { hash = "sha256-Q61GmaRxjxJh9GjyR8QCZOH0njFUtAWihZ9lFQJ2nQQ="; }; + nativeBuildInputs = [ + flit-core + ]; + buildInputs = [ mdformat ]; diff --git a/pkgs/development/python-modules/mecab-python3/default.nix b/pkgs/development/python-modules/mecab-python3/default.nix index baeb56992eb82..878f85600dd1d 100644 --- a/pkgs/development/python-modules/mecab-python3/default.nix +++ b/pkgs/development/python-modules/mecab-python3/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "mecab-python3"; - version = "1.0.6"; + version = "1.0.8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-FvOKzkhAIL00RqEAVIKWeMHnuX8XQLWLAKMdWVz/Al4="; + hash = "sha256-cJiLqyY2lkVvddPYkQx1rqR3qdCAVK1++FvlRw3T9ls="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mediafile/default.nix b/pkgs/development/python-modules/mediafile/default.nix index a3c2ad7794f59..00a657800da8d 100644 --- a/pkgs/development/python-modules/mediafile/default.nix +++ b/pkgs/development/python-modules/mediafile/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mediafile"; version = "0.10.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/mediapy/default.nix b/pkgs/development/python-modules/mediapy/default.nix index 28f754e98edf0..c37aa8f867e5e 100644 --- a/pkgs/development/python-modules/mediapy/default.nix +++ b/pkgs/development/python-modules/mediapy/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pythonOlder +, flit-core , ipython , matplotlib , numpy @@ -11,6 +12,7 @@ buildPythonPackage rec { pname = "mediapy"; version = "1.1.8"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -19,9 +21,10 @@ buildPythonPackage rec { hash = "sha256-mVhBM+NQEkLYByp/kCPFJCAY26La5CWjcPl6PgclA9A="; }; + nativeBuildInputs = [ flit-core ]; + propagatedBuildInputs = [ ipython matplotlib numpy pillow ]; - format = "flit"; pythonImportsCheck = [ "mediapy" ]; diff --git a/pkgs/development/python-modules/meilisearch/default.nix b/pkgs/development/python-modules/meilisearch/default.nix index 88ca28f4896bb..cb40f31941981 100644 --- a/pkgs/development/python-modules/meilisearch/default.nix +++ b/pkgs/development/python-modules/meilisearch/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "meilisearch"; - version = "0.28.2"; + version = "0.28.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "meilisearch"; repo = "meilisearch-python"; rev = "refs/tags/v${version}"; - hash = "sha256-S1ZBSkWqCU6EpFqLpxCN1ZNswJroF86+26WeyYPD0S0="; + hash = "sha256-ASrm21dW1lCiUZJReJYlot2sp9sO1HuGaWVZXDOC9i4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/meraki/default.nix b/pkgs/development/python-modules/meraki/default.nix index 2a7db95a730b0..cafa77c1e5169 100644 --- a/pkgs/development/python-modules/meraki/default.nix +++ b/pkgs/development/python-modules/meraki/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "meraki"; - version = "1.36.0"; + version = "1.37.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VkXA5eEIEcyPlyI566rwtmIGauxD4ra0Q4ccH4ojc0U="; + hash = "sha256-pq/+giQwxvMey5OS8OtKH8M5fKmDuweuod6+hviY7P8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/merge3/default.nix b/pkgs/development/python-modules/merge3/default.nix index e16a73eee3df4..e06556dddf358 100644 --- a/pkgs/development/python-modules/merge3/default.nix +++ b/pkgs/development/python-modules/merge3/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "merge3"; - version = "0.0.13"; + version = "0.0.14"; format = "pyproject"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "8abda1d2d49776323d23d09bfdd80d943a57d43d28d6152ffd2c87956a9b6b54"; + sha256 = "sha256-MEBumThvSmUoD7nEPmgYkPoqHYOcrCdZ0VbHzBYDAVk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index dcac8a6b277b8..984f4e0329fdf 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "2.2.6"; + version = "2.2.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = "refs/tags/${version}"; - hash = "sha256-JnheGeiLJMI0zsb+jiuMxjXg/3rDbMyA2XVtl1ujiso="; + hash = "sha256-2VkxKeoRgBCmA59XZT8wlrzvnJ6k2Q2ZLM72TB1atEw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/millheater/default.nix b/pkgs/development/python-modules/millheater/default.nix index adf1eca9d576d..7f2fe358c2fe3 100644 --- a/pkgs/development/python-modules/millheater/default.nix +++ b/pkgs/development/python-modules/millheater/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "millheater"; - version = "0.11.5"; + version = "0.11.6"; format = "setuptools"; disabled = pythonOlder "3.10"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pymill"; rev = "refs/tags/${version}"; - hash = "sha256-rDEzMxXsbHvxAmPx1IFC5S8jG8LO8TNuNq/ISkdPWsU="; + hash = "sha256-qd9JuZv1utwL523eiQ79P3hXuVQ8+teTatOJCtI6v00="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mindsdb-evaluator/default.nix b/pkgs/development/python-modules/mindsdb-evaluator/default.nix new file mode 100644 index 0000000000000..a6d2c883fc88c --- /dev/null +++ b/pkgs/development/python-modules/mindsdb-evaluator/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, poetry-core +, dataprep-ml +, numpy +, pandas +, scikit-learn +, type-infer +}: + +buildPythonPackage rec { + pname = "mindsdb-evaluator"; + version = "0.0.11"; + pyproject = true; + + disable = pythonOlder "3.8"; + + # using PyPI as git repository does not have release tags or branches + src = fetchPypi { + pname = "mindsdb_evaluator"; + inherit version; + hash = "sha256-pEfY+ocLEE8qcDjf6AzJxtXo1cqD2LhcBmlLjN0llTA="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + dataprep-ml + numpy + pandas + scikit-learn + type-infer + ]; + + pythonImportsCheck = [ "mindsdb_evaluator" ]; + + meta = with lib; { + description = "Model evaluation for Machine Learning pipelines"; + homepage = "https://pypi.org/project/mindsdb-evaluator/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ mbalatsko ]; + }; +} diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix index e76ffe0c80902..5181d8bef54e0 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.16"; + version = "7.1.17"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "minio"; repo = "minio-py"; rev = "refs/tags/${version}"; - hash = "sha256-avGCAaqP2gLlrLDFzUJZW/KaT2lrueVjgsAJSk1eyX0="; + hash = "sha256-I0Q1SkZ1zQ9s2HbMTc2EzUnnOti14zQBxHVJasaukug="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mirakuru/default.nix b/pkgs/development/python-modules/mirakuru/default.nix new file mode 100644 index 0000000000000..4376c9387fcf4 --- /dev/null +++ b/pkgs/development/python-modules/mirakuru/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, setuptools +, psutil +, netcat +, ps +, python-daemon +}: + +buildPythonPackage rec { + pname = "mirakuru"; + version = "2.5.1"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "ClearcodeHQ"; + repo = "mirakuru"; + rev = "refs/tags/v${version}"; + hash = "sha256-jBsSvIy2FaAYlDZLjJXl9hyCiK+nk/cM5j128f24dRc="; + }; + + nativeBuildInputs = [ setuptools ]; + + propagatedBuildInputs = [ psutil ]; + + nativeCheckInputs = [ + netcat.nc + ps + python-daemon + pytestCheckHook + ]; + pythonImportsCheck = [ "mirakuru" ]; + + meta = with lib; { + homepage = "https://pypi.org/project/mirakuru"; + description = "Process orchestration tool designed for functional and integration tests"; + changelog = "https://github.com/ClearcodeHQ/mirakuru/blob/v${version}/CHANGES.rst"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/mkdocstrings-python/default.nix b/pkgs/development/python-modules/mkdocstrings-python/default.nix index 3fc681de70ea4..1147d6f884511 100644 --- a/pkgs/development/python-modules/mkdocstrings-python/default.nix +++ b/pkgs/development/python-modules/mkdocstrings-python/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mkdocstrings-python"; - version = "1.7.0"; + version = "1.7.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "python"; rev = "refs/tags/${version}"; - hash = "sha256-akN9/h7jh0SFY1GZ1YlwMw33/RmycekMs0nWpUHLu6Y="; + hash = "sha256-/iDDHJl+rIkgXIvzSZ6pTXEzVukz+cMV9GUow+AxNh0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ml-dtypes/default.nix b/pkgs/development/python-modules/ml-dtypes/default.nix index 4a2948ca3e733..9b99c06ce40a8 100644 --- a/pkgs/development/python-modules/ml-dtypes/default.nix +++ b/pkgs/development/python-modules/ml-dtypes/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, fetchpatch , setuptools , pybind11 , numpy @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "ml-dtypes"; - version = "0.3.0"; + version = "0.3.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,13 +21,21 @@ buildPythonPackage rec { owner = "jax-ml"; repo = "ml_dtypes"; rev = "refs/tags/v${version}"; - hash = "sha256-crBTPQeRjgykkIpWx95ypyDeA/RRjWIasg9MR2r2yIU="; + hash = "sha256-tuqB5itrAkT2b76rgRAJaOeng4V83TzPu400DPYrdKU="; # Since this upstream patch (https://github.com/jax-ml/ml_dtypes/commit/1bfd097e794413b0d465fa34f2eff0f3828ff521), # the attempts to use the nixpkgs packaged eigen dependency have failed. # Hence, we rely on the bundled eigen library. fetchSubmodules = true; }; + patches = [ + # See https://github.com/jax-ml/ml_dtypes/issues/106. + (fetchpatch { + url = "https://github.com/jax-ml/ml_dtypes/commit/c082a2df6bc0686b35c4b4a303fd1990485e181f.patch"; + hash = "sha256-aVJy9vT00b98xOrJCdbCHSZBI3uyjafmN88Z2rjBS48="; + }) + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace "numpy~=1.21.2" "numpy" \ diff --git a/pkgs/development/python-modules/mobi/default.nix b/pkgs/development/python-modules/mobi/default.nix new file mode 100644 index 0000000000000..262e724a7b531 --- /dev/null +++ b/pkgs/development/python-modules/mobi/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub + +, loguru +, poetry-core +, setuptools +}: + +buildPythonPackage rec { + pname = "mobi"; + version = "0.3.3"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "iscc"; + repo = "mobi"; + rev = "v${version}"; + hash = "sha256-g1L72MkJdrKQRsEdew+Qsn8LfCn8+cmj2pmY6s4nv2U="; + }; + + nativeBuildInputs = [ + setuptools + poetry-core + ]; + + propagatedBuildInputs = [ + loguru + ]; + + pythonImportsCheck = [ + "mobi" + ]; + + meta = with lib; { + description = "Library for unpacking unencrypted mobi files"; + homepage = "https://github.com/iscc/mobi"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ paveloom ]; + }; +} diff --git a/pkgs/development/python-modules/more-itertools/default.nix b/pkgs/development/python-modules/more-itertools/default.nix index f524323618936..86a1b5d3d32d9 100644 --- a/pkgs/development/python-modules/more-itertools/default.nix +++ b/pkgs/development/python-modules/more-itertools/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "more-itertools"; version = "9.1.0"; - format = "flit"; + format = "pyproject"; src = fetchPypi { inherit pname version; hash = "sha256-yrqjQa0DieqDwXqUVmpTrkydBzSYYeyxTcbQNFz5rF0="; }; - nativeBuildInouts = [ + nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/mrsqm/default.nix b/pkgs/development/python-modules/mrsqm/default.nix index 3bbe69f2d4e50..0168dc107144b 100644 --- a/pkgs/development/python-modules/mrsqm/default.nix +++ b/pkgs/development/python-modules/mrsqm/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "mrsqm"; - version = "0.0.4"; + version = "0.0.5"; format = "setuptools"; disable = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-kg9GSgtBpnCF+09jyP5TRwZh0tifxx4WRtQGn8bLH8c="; + hash = "sha256-VlAbyTWQCj6fgndEPI1lQKvL+D6TJnqglIT8dRZyEWc="; }; buildInputs = [ fftw ]; diff --git a/pkgs/development/python-modules/msgpack/default.nix b/pkgs/development/python-modules/msgpack/default.nix index 18287c6419895..d44166b82f7de 100644 --- a/pkgs/development/python-modules/msgpack/default.nix +++ b/pkgs/development/python-modules/msgpack/default.nix @@ -4,6 +4,7 @@ , pytestCheckHook , pythonOlder , setuptools +, borgbackup }: buildPythonPackage rec { @@ -30,6 +31,12 @@ buildPythonPackage rec { "msgpack" ]; + passthru.tests = { + # borgbackup is sensible to msgpack versions: https://github.com/borgbackup/borg/issues/3753 + # please be mindful before bumping versions. + inherit borgbackup; + }; + meta = with lib; { description = "MessagePack serializer implementation"; homepage = "https://github.com/msgpack/msgpack-python"; diff --git a/pkgs/development/python-modules/msgspec/default.nix b/pkgs/development/python-modules/msgspec/default.nix index f5ae1860039c2..c4d7d2f73c635 100644 --- a/pkgs/development/python-modules/msgspec/default.nix +++ b/pkgs/development/python-modules/msgspec/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "msgspec"; - version = "0.18.2"; + version = "0.18.3"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "jcrist"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-t5TM7CgVIxdXR6jMOXh1XhpA9vBrYHBcR2iLYP4A/Jc="; + hash = "sha256-PtI+dlhDyFRHSOqdU0TUZtllAlTFtYwOsYQrFrDSFDY="; }; # Requires libasan to be accessible diff --git a/pkgs/development/python-modules/msldap/default.nix b/pkgs/development/python-modules/msldap/default.nix index 472ff27efc96e..bee82c34672e4 100644 --- a/pkgs/development/python-modules/msldap/default.nix +++ b/pkgs/development/python-modules/msldap/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "msldap"; - version = "0.5.5"; + version = "0.5.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ewE3rECsydNFgfh53X/oB/VyXd54nSpVsxMRZPGuR3I="; + hash = "sha256-NCcEUSDsvMUCV07Gzh18NaKSw4On0XPT3UytBeeT3qo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mypy-boto3-ebs/default.nix b/pkgs/development/python-modules/mypy-boto3-ebs/default.nix deleted file mode 100644 index 8b22c42f0f7bb..0000000000000 --- a/pkgs/development/python-modules/mypy-boto3-ebs/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, boto3 -, buildPythonPackage -, fetchPypi -, pythonOlder -, typing-extensions -}: - -buildPythonPackage rec { - pname = "mypy-boto3-ebs"; - version = "1.28.36"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-w9OLKJAn9UBnA7x+uedhplSV8plZRYlBpviU9Gv1Ny8="; - }; - - propagatedBuildInputs = [ - boto3 - typing-extensions - ]; - - # Project has no tests - doCheck = false; - - pythonImportsCheck = [ - "mypy_boto3_ebs" - ]; - - meta = with lib; { - description = "Type annotations for boto3.s3"; - homepage = "https://github.com/youtype/mypy_boto3_builder"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix deleted file mode 100644 index 91df8b1ce0bc6..0000000000000 --- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib -, boto3 -, buildPythonPackage -, cython_3 -, fetchPypi -, pythonOlder -, typing-extensions -}: - -buildPythonPackage rec { - pname = "mypy-boto3-s3"; - version = "1.28.52"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-F5y3VCzF72VvEyOtUesjevy6d9Hl7QfSGgE/427/uLI="; - }; - - nativeBuildInputs = [ - cython_3 - ]; - - propagatedBuildInputs = [ - boto3 - ] ++ lib.optionals (pythonOlder "3.12") [ - typing-extensions - ]; - - # Project has no tests - doCheck = false; - - pythonImportsCheck = [ - "mypy_boto3_s3" - ]; - - meta = with lib; { - description = "Type annotations for boto3.s3"; - homepage = "https://github.com/youtype/mypy_boto3_builder"; - changelog = "https://github.com/youtype/mypy_boto3_builder/releases/tag/${version}"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix new file mode 100644 index 0000000000000..e3436bbb6b1a7 --- /dev/null +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -0,0 +1,755 @@ +{ lib +, boto3 +, buildPythonPackage +, pythonOlder +, typing-extensions +, fetchPypi +}: +let + toUnderscore = str: builtins.replaceStrings [ "-" ] [ "_" ] str; + + buildMypyBoto3Package = serviceName: version: hash: + buildPythonPackage rec { + pname = "mypy-boto3-${serviceName}"; + inherit version; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version hash; + }; + + propagatedBuildInputs = [ + boto3 + ] ++ lib.optionals (pythonOlder "3.12") [ + typing-extensions + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "mypy_boto3_${toUnderscore serviceName}" + ]; + + meta = with lib; { + description = "Type annotations for boto3 ${serviceName}"; + homepage = "https://github.com/youtype/mypy_boto3_builder"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab mbalatsko ]; + }; + }; +in +rec { + mypy-boto3-accessanalyzer = buildMypyBoto3Package "accessanalyzer" "1.28.36" "sha256-1gfL7x81tTVZlYL8UwoI5k8pDotu1byCWqP31CruRIo="; + + mypy-boto3-account = buildMypyBoto3Package "account" "1.28.36" "sha256-RDGy7V+YgVlGufL+bFJ1xR5yi4xc2zkV+gTBdXdwkxk="; + + mypy-boto3-acm = buildMypyBoto3Package "acm" "1.28.37" "sha256-NDYWiS7MM7z6mCpRASWh42IGsSTUvVzIJU0eH5V7JUI="; + + mypy-boto3-acm-pca = buildMypyBoto3Package "acm-pca" "1.28.37" "sha256-l79J8dndeHBZTdXhYCUSa39lYFgcgM6/lIUQPx4HbRE="; + + mypy-boto3-alexaforbusiness = buildMypyBoto3Package "alexaforbusiness" "1.28.37" "sha256-Rk2BLp1oqwOG+Rd9lal53RArPjIo1XMkmXhZJLiI6Ik="; + + mypy-boto3-amp = buildMypyBoto3Package "amp" "1.28.36" "sha256-/iFfYQ2hwndbtOPnFx5GopCNOYi4uAAOTbD8Z8xFOoE="; + + mypy-boto3-amplify = buildMypyBoto3Package "amplify" "1.28.36" "sha256-ORwKl4j3M+O9a/JVrfal2lCBOe8QEcjAWscEhRqPrxc="; + + mypy-boto3-amplifybackend = buildMypyBoto3Package "amplifybackend" "1.28.36" "sha256-tx837SLt7DL1bD/bZl0egzVpClfJKaSY6p82yrcHWRQ="; + + mypy-boto3-amplifyuibuilder = buildMypyBoto3Package "amplifyuibuilder" "1.28.54" "sha256-5Y2AacuMzVHdPntUyDts21bUzttM9t8EdBcwV1MHhyU="; + + mypy-boto3-apigateway = buildMypyBoto3Package "apigateway" "1.28.36" "sha256-5GDltAso++KS+EKZPnvzrVFNAHN3SzDxxeE33mq6xoE="; + + mypy-boto3-apigatewaymanagementapi = buildMypyBoto3Package "apigatewaymanagementapi" "1.28.36" "sha256-yh5Xd7rKl6eUZBvnqgVU3BEThbIoVOWA15UEYoFicLo="; + + mypy-boto3-apigatewayv2 = buildMypyBoto3Package "apigatewayv2" "1.28.36" "sha256-ZSj0PoLQaUtqd0qLzU+Eg3YG0q6GwWEitKZCTfYergI="; + + mypy-boto3-appconfig = buildMypyBoto3Package "appconfig" "1.28.52" "sha256-OjHFaTlMso7dbUCyNfOtbIgpRQYmVm7n0PoUZjOaf18="; + + mypy-boto3-appconfigdata = buildMypyBoto3Package "appconfigdata" "1.28.36" "sha256-dGBUpgH/1QQ3nGxhkLWBW06ngmr+Iq2v9MqjrZ0vP1k="; + + mypy-boto3-appfabric = buildMypyBoto3Package "appfabric" "1.28.36" "sha256-WN7nEPs2KweoGu7XUycFpp8i/bOWSlcr+6BZFSFh6KM="; + + mypy-boto3-appflow = buildMypyBoto3Package "appflow" "1.28.42" "sha256-zUqO8SGKoA9umP2iKrw5VXC4pBBVqs4D9Ou/lJwEVBI="; + + mypy-boto3-appintegrations = buildMypyBoto3Package "appintegrations" "1.28.55" "sha256-Sii5aQ9Y1YvpW1QLMXOeboLXzSR7RCZA6hDGvI39yWM="; + + mypy-boto3-application-autoscaling = buildMypyBoto3Package "application-autoscaling" "1.28.36" "sha256-sxkmyfgk3FJPrS9SUJrHA4tNADM8g+wGaEEPnZjv2H4="; + + mypy-boto3-application-insights = buildMypyBoto3Package "application-insights" "1.28.36" "sha256-jNzhi3ashmQFH7QRi28UY5ZZ/su8RwzhU1XzmunOiro="; + + mypy-boto3-applicationcostprofiler = buildMypyBoto3Package "applicationcostprofiler" "1.28.36" "sha256-keA+JdfyJVGf388qcA0HTIq9bUiMeEbcg1/s/SI7mt4="; + + mypy-boto3-appmesh = buildMypyBoto3Package "appmesh" "1.28.36" "sha256-1Cf+Mzgg0KDqBRpCWeCR0lbR5q8KJM+p/p2we6925b0="; + + mypy-boto3-apprunner = buildMypyBoto3Package "apprunner" "1.28.55" "sha256-lBbqHhOqWoudqK4NDFNSpzR/UA/dLCHzFmZWQSNhJLY="; + + mypy-boto3-appstream = buildMypyBoto3Package "appstream" "1.28.49" "sha256-5TgCIA4bbUHgxMcLHrWPEyIIYhjlCXZlvW8mYubA0+I="; + + mypy-boto3-appsync = buildMypyBoto3Package "appsync" "1.28.36" "sha256-Qag3caLiBRlUWl+TbUQjGkoAbQk+CEbuzZAJgq21PdE="; + + mypy-boto3-arc-zonal-shift = buildMypyBoto3Package "arc-zonal-shift" "1.28.36" "sha256-hTGtmMTWhsMqo+Vq2Bxtfo1sGezi1vD05LsQyGOl9Ps="; + + mypy-boto3-athena = buildMypyBoto3Package "athena" "1.28.36" "sha256-p232qs49wdkbP3RkDWF80bSALl80iiLbLxbfzgsB7iY="; + + mypy-boto3-auditmanager = buildMypyBoto3Package "auditmanager" "1.28.38" "sha256-t32bXFUOsVNVs+1Sagx2PIO7/Re6gN2cOevLj+7gbqo="; + + mypy-boto3-autoscaling = buildMypyBoto3Package "autoscaling" "1.28.36" "sha256-3b2iUNeY/8ZcZZsyqHTNTsGMwWBxCeiOm+1Tpq+iYf8="; + + mypy-boto3-autoscaling-plans = buildMypyBoto3Package "autoscaling-plans" "1.28.36" "sha256-Hx/rpODs11SdfZTQTcOYAIsPbiLDpreqLdbBHGIEp5E="; + + mypy-boto3-backup = buildMypyBoto3Package "backup" "1.28.36" "sha256-LbGiDazOf32hEoxGTZlTtH9iTj+3ru+sCO0VAMCfN6E="; + + mypy-boto3-backup-gateway = buildMypyBoto3Package "backup-gateway" "1.28.36" "sha256-AGbffUSt3ndl5a0B5nl9CYgYExaM1JLT53T9jVJxeno="; + + mypy-boto3-backupstorage = buildMypyBoto3Package "backupstorage" "1.28.36" "sha256-Km6lRkCrsWep/kAlPXplbyfHyy5D5nnrd0j0v8FID00="; + + mypy-boto3-batch = buildMypyBoto3Package "batch" "1.28.36" "sha256-SEDD3Fjd4y337atj+RVUKIvpUd0oCvje8gOF1/Rg7Gs="; + + mypy-boto3-billingconductor = buildMypyBoto3Package "billingconductor" "1.28.41" "sha256-aUphZNHrTLUt4dOvg+GmZR7z3whq5jx2PVsjvcY0qS0="; + + mypy-boto3-braket = buildMypyBoto3Package "braket" "1.28.53" "sha256-fMNDKmjx/2hUJHWEWcveYbsbIkiWUXTQSv4itP8zOas="; + + mypy-boto3-budgets = buildMypyBoto3Package "budgets" "1.28.57" "sha256-Af6omXHyctUeXbEOQC/KoiE3ux88r/hyxlWQoMM1eF4="; + + mypy-boto3-ce = buildMypyBoto3Package "ce" "1.28.36" "sha256-lBrKm4s1QPGTuZHtHt+uNhX9zsMhNuV0l23822IYIDI="; + + mypy-boto3-chime = buildMypyBoto3Package "chime" "1.28.37" "sha256-fg8svfLvw+Rzhcr+HxrjHtXw9UE1vuccaOFvjfgxC58="; + + mypy-boto3-chime-sdk-identity = buildMypyBoto3Package "chime-sdk-identity" "1.28.37" "sha256-r+UvZ213ffIOdmZ1V8MNtZN/i3ozeKfwv7VIvJZ4CRg="; + + mypy-boto3-chime-sdk-media-pipelines = buildMypyBoto3Package "chime-sdk-media-pipelines" "1.28.54" "sha256-ewC4woDpDkGUBvPgjpcctkO860EJWHGvZrgCgXSsPbA="; + + mypy-boto3-chime-sdk-meetings = buildMypyBoto3Package "chime-sdk-meetings" "1.28.36" "sha256-OZijI8aLKnnZnXf3q8LmePd9ncIrDj2zRq19tNlNQTk="; + + mypy-boto3-chime-sdk-messaging = buildMypyBoto3Package "chime-sdk-messaging" "1.28.37" "sha256-qMLqjzniJfyVCfnMGiIPMRzQoIj309P5WDBjy1P7B8Y="; + + mypy-boto3-chime-sdk-voice = buildMypyBoto3Package "chime-sdk-voice" "1.28.36" "sha256-e627SiCiQV38AzvYusuNEsD9XoYkTYYbaTMJ2odKzAo="; + + mypy-boto3-cleanrooms = buildMypyBoto3Package "cleanrooms" "1.28.38" "sha256-fbuCwuzXiK9ekk30m90WZW7LcDFLeR/Ta9BvFnT/wnU="; + + mypy-boto3-cloud9 = buildMypyBoto3Package "cloud9" "1.28.47" "sha256-vV+cqYs7msRzBkIIz4uA123QM54gFpi1q9lXo997BOk="; + + mypy-boto3-cloudcontrol = buildMypyBoto3Package "cloudcontrol" "1.28.36" "sha256-DshOzjolyUCztdlOqxxvRlKIIJP6izeyhp2Wl6ObCrY="; + + mypy-boto3-clouddirectory = buildMypyBoto3Package "clouddirectory" "1.28.36" "sha256-ikyPoBWFRXl95QylMg3rstBymj3HKZqQs0orb14Uorg="; + + mypy-boto3-cloudformation = buildMypyBoto3Package "cloudformation" "1.28.48" "sha256-775Aczl4AIJCh8jVKmU4MRKGL5A7Fv1Ye1ETRJZSNxs="; + + mypy-boto3-cloudfront = buildMypyBoto3Package "cloudfront" "1.28.36" "sha256-lY3dwCA/xw6YIgmmJeglC3/mHubiKNqPqrrif6ZreDc="; + + mypy-boto3-cloudhsm = buildMypyBoto3Package "cloudhsm" "1.28.39" "sha256-1K3HPvtZSkQZD5/V9T0tXv6PC2NSoB5v5aR20OWV6kw="; + + mypy-boto3-cloudhsmv2 = buildMypyBoto3Package "cloudhsmv2" "1.28.36" "sha256-mxvW/ge2gEkGF0rz4LJZCkEIveNGkt9ud5bqs4WhlBs="; + + mypy-boto3-cloudsearch = buildMypyBoto3Package "cloudsearch" "1.28.36" "sha256-fEGcYuWWDHOalygjig2qdMn8A3T4vBYZIbZRHtRRQns="; + + mypy-boto3-cloudsearchdomain = buildMypyBoto3Package "cloudsearchdomain" "1.28.36" "sha256-yRUv7XlIpCqkyFw+whHh07LUw0aKbcRa0UkR6zpVtCA="; + + mypy-boto3-cloudtrail = buildMypyBoto3Package "cloudtrail" "1.28.36" "sha256-YUrRZ53Wdd4CCjq9VYRkAIGxu2wYTaqXF7Fp4DA7jM4="; + + mypy-boto3-cloudtrail-data = buildMypyBoto3Package "cloudtrail-data" "1.28.36" "sha256-aUZYh0fTrcv1d56HRdu7u4CzAMiCvVlN/tKY1e7piLM="; + + mypy-boto3-cloudwatch = buildMypyBoto3Package "cloudwatch" "1.28.36" "sha256-108mLOQPp+qUdIBWHlN2UO5pRrIIrAf2wM/a/BYAFEM="; + + mypy-boto3-codeartifact = buildMypyBoto3Package "codeartifact" "1.28.52" "sha256-kmPzmdQj79l+8KY7Q/E4qTxCxAEhEPivYiR1Hh04qm0="; + + mypy-boto3-codebuild = buildMypyBoto3Package "codebuild" "1.28.36" "sha256-po4qcd6jiYjqMQj7aP+eMzNJcmwjYP22Q92fHkx1q5U="; + + mypy-boto3-codecatalyst = buildMypyBoto3Package "codecatalyst" "1.28.36" "sha256-IuFxPWpE6zCGfbVfhTBtueUSspeVaq9TrESkfHdrxI8="; + + mypy-boto3-codecommit = buildMypyBoto3Package "codecommit" "1.28.36" "sha256-o/kVzldUZNfMmK3Ni5L0kOLjKLxsB93YwutqM5GvHqQ="; + + mypy-boto3-codedeploy = buildMypyBoto3Package "codedeploy" "1.28.55" "sha256-jkN9DCiS5fKhBq7752gRzHwmfdohQBZOSNGaA1OxVbc="; + + mypy-boto3-codeguru-reviewer = buildMypyBoto3Package "codeguru-reviewer" "1.28.36" "sha256-xUkKfYEBmqA0D8RKxbf8VF0XeYOgwNWh1y7ORnj1VpM="; + + mypy-boto3-codeguru-security = buildMypyBoto3Package "codeguru-security" "1.28.36" "sha256-EU6VTdhzWLofMEFF0vOXTDpJI/BkC3FpSAz1rbtbFWA="; + + mypy-boto3-codeguruprofiler = buildMypyBoto3Package "codeguruprofiler" "1.28.36" "sha256-DHUALwX0ec7rzaSsU0vASersuuHpJXY8cDI8cDhzgl0="; + + mypy-boto3-codepipeline = buildMypyBoto3Package "codepipeline" "1.28.36" "sha256-isqRkPLovlkHgmBuuYDPBTaBlOdu3LgwajD+z3luO8c="; + + mypy-boto3-codestar = buildMypyBoto3Package "codestar" "1.28.36" "sha256-+D1SBuI6JMA0ISBv5OiGkA43dOESGH4d4m8CUN4Uhxk="; + + mypy-boto3-codestar-connections = buildMypyBoto3Package "codestar-connections" "1.28.36" "sha256-1K0mrUUO0ycP7uBCqnESd/iGiElL0eqJfwLTpgPH5a0="; + + mypy-boto3-codestar-notifications = buildMypyBoto3Package "codestar-notifications" "1.28.36" "sha256-BYTeNmL6fKXD6Ym0Z3DOZvLaTqRwANDWfCcWs9TUZ+Y="; + + mypy-boto3-cognito-identity = buildMypyBoto3Package "cognito-identity" "1.28.36" "sha256-fJIKiNsKDcoDtTIRMxbxpcO6QZOl8KnCn2qTkb4owLI="; + + mypy-boto3-cognito-idp = buildMypyBoto3Package "cognito-idp" "1.28.56" "sha256-LmuBr551lvNWlyPbEFTAgZA4+XSeFX4tK8kbuabo2JU="; + + mypy-boto3-cognito-sync = buildMypyBoto3Package "cognito-sync" "1.28.36" "sha256-Hx+/3Q+FLMeDRu+ijTl80WbmqjW/jzpW8eDar8hu/ro="; + + mypy-boto3-comprehend = buildMypyBoto3Package "comprehend" "1.28.37" "sha256-OK8LtQoV2Ccqc4qjRBNJirRDM8wHR7VDzcgbaJNrGok="; + + mypy-boto3-comprehendmedical = buildMypyBoto3Package "comprehendmedical" "1.28.36" "sha256-6uyeuxkhRD5Xpfh5u09U28Zg1OzLyzwhgQZ/LRGI9lc="; + + mypy-boto3-compute-optimizer = buildMypyBoto3Package "compute-optimizer" "1.28.41" "sha256-TYY9yrw8Az+x01fp3mXc2zzX7YBdnAQQr1uy+E8FkdQ="; + + mypy-boto3-config = buildMypyBoto3Package "config" "1.28.36" "sha256-3NUJLfbriTXMsGyj+8XNbhI37BLVSm+sShaJJIz6I7s="; + + mypy-boto3-connect = buildMypyBoto3Package "connect" "1.28.55" "sha256-sA6ef9iOyRrCKwxsSHU19IaBwYiVKeTR0+k94wUX4gw="; + + mypy-boto3-connect-contact-lens = buildMypyBoto3Package "connect-contact-lens" "1.28.36" "sha256-7+DHcEkDov1/0mNu/mbKaCwwPfvGRYSEfp3+4tnOnuY="; + + mypy-boto3-connectcampaigns = buildMypyBoto3Package "connectcampaigns" "1.28.39" "sha256-4c074TlgMh8YxdOl9vb+Xs0JEs5k0mA5rYaF+BIH3Ps="; + + mypy-boto3-connectcases = buildMypyBoto3Package "connectcases" "1.28.36" "sha256-oYU/yw9CUltwPfvONhCvH6gCXirzKF26RZj9hdKTtPQ="; + + mypy-boto3-connectparticipant = buildMypyBoto3Package "connectparticipant" "1.28.39" "sha256-iOv8UX4eh07Dwk7zvtv1YXeDiX/RHhuEMGzLafBk+kI="; + + mypy-boto3-controltower = buildMypyBoto3Package "controltower" "1.28.36" "sha256-0j6Fa0hobGlNfvMDmlNrqp4EqIhnYTo9XJ41VpEY+Cs="; + + mypy-boto3-cur = buildMypyBoto3Package "cur" "1.28.36" "sha256-pWKHl8zKmx3ypQOiWtFzRb92630sLJVO0qmn5KEZJ14="; + + mypy-boto3-customer-profiles = buildMypyBoto3Package "customer-profiles" "1.28.39" "sha256-wAghxGUIThqLBfThNliSu39Dl8vmO8QCrfbxvQOuHxc="; + + mypy-boto3-databrew = buildMypyBoto3Package "databrew" "1.28.36" "sha256-LhvgmeMOlP4EAmx3Xd97ZiHi/FeChpGtZ1LIuGkTnMU="; + + mypy-boto3-dataexchange = buildMypyBoto3Package "dataexchange" "1.28.36" "sha256-cNgpRQTJ2JhPw+UZo+HiulWg1998kfgnAB/E6gyvetI="; + + mypy-boto3-datapipeline = buildMypyBoto3Package "datapipeline" "1.28.36" "sha256-IkO7QXwdEWmkzaCOrCWTzNv1xpvwOHGp9wlris/KEws="; + + mypy-boto3-datasync = buildMypyBoto3Package "datasync" "1.28.49" "sha256-BcW47DW0aHb+Gabj6fybaiZgtKotWNvNChyKyaagIw4="; + + mypy-boto3-dax = buildMypyBoto3Package "dax" "1.28.36" "sha256-t5DMgU3iSxWLSXpC9QaNonKKQpl0tr/gQPnPxO+dTbY="; + + mypy-boto3-detective = buildMypyBoto3Package "detective" "1.28.36" "sha256-RGSt2jtwDqC3qWh+Z6IfWoiVpoLDjSqLTSjo7+SUL3Q="; + + mypy-boto3-devicefarm = buildMypyBoto3Package "devicefarm" "1.28.36" "sha256-TSxUsHAhGY4rgscwesf6mnlya8kHb6MZGKPzhud/OC0="; + + mypy-boto3-devops-guru = buildMypyBoto3Package "devops-guru" "1.28.36" "sha256-Whn1VVBzBdav0D31XCH5izyVmZGg/ndPlOamIoY5U94="; + + mypy-boto3-directconnect = buildMypyBoto3Package "directconnect" "1.28.36" "sha256-YUZ2XsKaPLi4qDF1Cuf5/6BZ1Pi+xf65hTBc0NHfQTc="; + + mypy-boto3-discovery = buildMypyBoto3Package "discovery" "1.28.50" "sha256-bUFzZ+Ipw3hmaTvBBPlLRz48U+alvfLBiOKNljEap38="; + + mypy-boto3-dlm = buildMypyBoto3Package "dlm" "1.28.36" "sha256-i+OVrnJ+irxgIWi0ZEad6lPLNwT1cvfQ+0xKKXWe8z0="; + + mypy-boto3-dms = buildMypyBoto3Package "dms" "1.28.53" "sha256-CY3bGLiiciRnscCsqOSdFv04YKDG4gN7f/q3um7QwZ8="; + + mypy-boto3-docdb = buildMypyBoto3Package "docdb" "1.28.36" "sha256-Dbg80rvJBHkXEzLLWeEi7jN6OrVZiJ6+C6wYkhM72J0="; + + mypy-boto3-docdb-elastic = buildMypyBoto3Package "docdb-elastic" "1.28.36" "sha256-XvcexadEtui/Wh2sZnketqygNgpGfaSAGciM64Yc+Sk="; + + mypy-boto3-drs = buildMypyBoto3Package "drs" "1.28.47" "sha256-4JBlsWQLu1KsPSTxwy/ySNQM1ZlIaX1sORvES8Lut00="; + + mypy-boto3-ds = buildMypyBoto3Package "ds" "1.28.36" "sha256-l/k+1VhA6mi6mVRKCUis0gAv/dizqZB5JIqLmj9+IDI="; + + mypy-boto3-dynamodb = buildMypyBoto3Package "dynamodb" "1.28.55" "sha256-owOfitoHohj5fwxwqC7Zz0YaDLUTMZT88eDoexXImaU="; + + mypy-boto3-dynamodbstreams = buildMypyBoto3Package "dynamodbstreams" "1.28.36" "sha256-mqz+YRVZlSbwEKYbaC4ZbWw0qJTXpRObAphfI4sfRV4="; + + mypy-boto3-ebs = buildMypyBoto3Package "ebs" "1.28.36" "sha256-w9OLKJAn9UBnA7x+uedhplSV8plZRYlBpviU9Gv1Ny8="; + + mypy-boto3-ec2 = buildMypyBoto3Package "ec2" "1.28.58" "sha256-p4BGJSydAqtSMH8PFFc/IAwBquLHCq1I6vW50UNySRo="; + + mypy-boto3-ec2-instance-connect = buildMypyBoto3Package "ec2-instance-connect" "1.28.36" "sha256-oVcd5yqbg8Drozgmog4nonRSe4nOM7rwpqZi9HVYTL0="; + + mypy-boto3-ecr = buildMypyBoto3Package "ecr" "1.28.45" "sha256-NYShmgGLrNe26BR7ye9pMpZ4FcCRjGzzkp/1Xxyb5gE="; + + mypy-boto3-ecr-public = buildMypyBoto3Package "ecr-public" "1.28.36" "sha256-LiFZtqdGf9tC6Tj4ukclFyaq/bLos5jZCgPL1y/0VMU="; + + mypy-boto3-ecs = buildMypyBoto3Package "ecs" "1.28.41" "sha256-/aXw4fpS4o3/Jt+jfzm0p4zqZVcoSJLlk9EUMd3+SVo="; + + mypy-boto3-efs = buildMypyBoto3Package "efs" "1.28.53" "sha256-QhSddCRqWUly2w+GLZJHJn/TKpQHbQO88yKny6nj/ZI="; + + mypy-boto3-eks = buildMypyBoto3Package "eks" "1.28.36" "sha256-etvfyKLFr4lKE9DLvKQuHw2YHshhOBTXXTCvDv2hFxE="; + + mypy-boto3-elastic-inference = buildMypyBoto3Package "elastic-inference" "1.28.36" "sha256-BwI32rA8Y1lhc+k/XQh+LHPlFHmaCTr37OYvLFJMX1o="; + + mypy-boto3-elasticache = buildMypyBoto3Package "elasticache" "1.28.36" "sha256-6Ymobcuhh1dOqA9IoN9lWrj639ZKu/NQEP6ImlhapFA="; + + mypy-boto3-elasticbeanstalk = buildMypyBoto3Package "elasticbeanstalk" "1.28.36" "sha256-V2vSEaN7Kf2TPateMNtJ95a+Ad/CRcZOV2JsJlTOPIo="; + + mypy-boto3-elastictranscoder = buildMypyBoto3Package "elastictranscoder" "1.28.36" "sha256-lkz4up43fVyWCOO9dM4xI285wsAu1lnV4mICuJV8D4k="; + + mypy-boto3-elb = buildMypyBoto3Package "elb" "1.28.36" "sha256-c9Re0WZOn+LaK58VJk+YlI3YWn/wrgT+/TdqrOisBnM="; + + mypy-boto3-elbv2 = buildMypyBoto3Package "elbv2" "1.28.42" "sha256-NXyhMxuIbuyyDifzBicvDNQB3ysbVx+azsqpTBhfnZ8="; + + mypy-boto3-emr = buildMypyBoto3Package "emr" "1.28.36" "sha256-DrhDkqcxAAUTfheZRpPJQkFFzeDynByF2wn9jyZr0F4="; + + mypy-boto3-emr-containers = buildMypyBoto3Package "emr-containers" "1.28.36" "sha256-ZG7mf4C31COK7hobIbTLmd64Ydu2Al+NhSMrS8069jQ="; + + mypy-boto3-emr-serverless = buildMypyBoto3Package "emr-serverless" "1.28.54" "sha256-cDbUY1Ftlhyid7CiMEhY7ZepqH2bANrwlU8wdrdDqc4="; + + mypy-boto3-entityresolution = buildMypyBoto3Package "entityresolution" "1.28.48" "sha256-xCYg+Ik/VQpDjRR7QKlYyBffsGWZ7PSl531sTSvMv48="; + + mypy-boto3-es = buildMypyBoto3Package "es" "1.28.36" "sha256-NfMTzKYwYgZ+dbyIzxn+3poLWo8zjF8ANGWQFtMRTbk="; + + mypy-boto3-events = buildMypyBoto3Package "events" "1.28.46" "sha256-/a4rUcfBPQBFxqCnwt23NeZ655B3CEoo+SKHBZMJGtE="; + + mypy-boto3-evidently = buildMypyBoto3Package "evidently" "1.28.36" "sha256-U3igtB9eGBYv8VW+PQXD2fc16FKiYl8musH/ccrrMKA="; + + mypy-boto3-finspace = buildMypyBoto3Package "finspace" "1.28.36" "sha256-3l1/ACy5Z09z/ngQKdq3dgBTp05x+NUCRjj1z8I99/4="; + + mypy-boto3-finspace-data = buildMypyBoto3Package "finspace-data" "1.28.54" "sha256-V5Rxrp94hrUWZgpc+LDn1PwyzZREHDXq3NaZdZQaYoE="; + + mypy-boto3-firehose = buildMypyBoto3Package "firehose" "1.28.56" "sha256-IPwUkzEymLJ4NgB2OrD4mr5hZsmTaGjbbxCiHyFaaDw="; + + mypy-boto3-fis = buildMypyBoto3Package "fis" "1.28.36" "sha256-km9Ia9Hs/rZv3ljv+BVnR9pOxNK3u5luJOMaW670km0="; + + mypy-boto3-fms = buildMypyBoto3Package "fms" "1.28.36" "sha256-mzumkMcF2TMrcnHoPPA0SlrmwFAw0TR1cMvSXF28gvM="; + + mypy-boto3-forecast = buildMypyBoto3Package "forecast" "1.28.36" "sha256-DCa0GNn7XL3iVgGl5M6E7uyPFdyYjrHfqHakCS7clcc="; + + mypy-boto3-forecastquery = buildMypyBoto3Package "forecastquery" "1.28.36" "sha256-s2z8QZR9PP8Kj6yImCwUfh/gtbj4SKLn8wDTOYUVaEE="; + + mypy-boto3-frauddetector = buildMypyBoto3Package "frauddetector" "1.28.36" "sha256-Zn3rGHErin7nPYnyC0Ojr0Kkc5T+YDD2KmZinYNV9Jg="; + + mypy-boto3-fsx = buildMypyBoto3Package "fsx" "1.28.44" "sha256-t90+ngxgivF/KThwaB6/LNPZAHL2oLenhl6KUzSZSzU="; + + mypy-boto3-gamelift = buildMypyBoto3Package "gamelift" "1.28.36" "sha256-ADxlyEX5KgAewNFq7JhYECNIhaoKiPkdqWK2pnS+65A="; + + mypy-boto3-gamesparks = buildMypyBoto3Package "gamesparks" "1.28.36" "sha256-6lQXNJ55FYvkFA14rgJGhRMjBHA3YrOybnsKNecX7So="; + + mypy-boto3-glacier = buildMypyBoto3Package "glacier" "1.28.36" "sha256-L0a7CoD9I0wM8JvzaAxL8bm1SV1XmFi5lvs2SuGPtl4="; + + mypy-boto3-globalaccelerator = buildMypyBoto3Package "globalaccelerator" "1.28.36" "sha256-+nnFS/7kJHvqqiwqkWnYlgeIuSecicI1P+UtWyGUoGQ="; + + mypy-boto3-glue = buildMypyBoto3Package "glue" "1.28.36" "sha256-FhdxJSu2oiCgv9jmrXHahUhZnGEflf6KlIRvSjOG0q4="; + + mypy-boto3-grafana = buildMypyBoto3Package "grafana" "1.28.39" "sha256-OsEvT2f3LEvjz6aojIpG2scoZ80hETvk8t/BTumn+9M="; + + mypy-boto3-greengrass = buildMypyBoto3Package "greengrass" "1.28.36" "sha256-vH/viSZe2UcjtbwGN2Zcf9IB1boBHhL3zmy3IHN1rpg="; + + mypy-boto3-greengrassv2 = buildMypyBoto3Package "greengrassv2" "1.28.36" "sha256-VdsQUNg3a2PUaP8rgx3I1ZxUW4hqJsBCS0B8+7CfP1w="; + + mypy-boto3-groundstation = buildMypyBoto3Package "groundstation" "1.28.36" "sha256-M0HaOpC6zbIaN3VVcM9oE/QzL+me4d5Co5miJGMU3n8="; + + mypy-boto3-guardduty = buildMypyBoto3Package "guardduty" "1.28.53" "sha256-ctMp5+GrKYICPioPi5kB7cnxoP9QFIfbYiDxqf/pPCw="; + + mypy-boto3-health = buildMypyBoto3Package "health" "1.28.39" "sha256-yp8r38QxJVKxiZtrCgvUcuqz2HnTM2IvYjyYGTgAqYc="; + + mypy-boto3-healthlake = buildMypyBoto3Package "healthlake" "1.28.36" "sha256-RYbiExGphCkf8v+oC3ixOOFOnUrXE2bGnOvjRUGdQRQ="; + + mypy-boto3-honeycode = buildMypyBoto3Package "honeycode" "1.28.36" "sha256-pOWZ+WNmgWwGz1sPq/feZiQ2TlXDcpoWMXcDPSESJOY="; + + mypy-boto3-iam = buildMypyBoto3Package "iam" "1.28.37" "sha256-Ob1bi5pIy0fZCdRcE8cTwJnC+EcZYSoKhI16BJfG/PQ="; + + mypy-boto3-identitystore = buildMypyBoto3Package "identitystore" "1.28.40" "sha256-KPPWrEMuciHf3ms3SkUgAaEFNPa5WyFKm5fFfG4o9G8="; + + mypy-boto3-imagebuilder = buildMypyBoto3Package "imagebuilder" "1.28.36" "sha256-2fJtgGfwkY3V07kXAiyi61TUmvq3BVqiN+EFzxTQkvI="; + + mypy-boto3-importexport = buildMypyBoto3Package "importexport" "1.28.36" "sha256-806+dIMqKZ14MifNoDqKgj8MGPYBQVd8KnT+V+eOr/E="; + + mypy-boto3-inspector = buildMypyBoto3Package "inspector" "1.28.36" "sha256-plSUqqsTvOMxMeAYueWNpK8JFHdeOOr8DfgSZov9Gbw="; + + mypy-boto3-inspector2 = buildMypyBoto3Package "inspector2" "1.28.36" "sha256-O20aGL3EhyS5HNYlY6Jv1n0OIUWPr3L2VVjReHwpAGM="; + + mypy-boto3-internetmonitor = buildMypyBoto3Package "internetmonitor" "1.28.47" "sha256-qNv+Qi/5eZ5oUsysYokQufE3BgL32BzA9gdxWsJ6ocU="; + + mypy-boto3-iot = buildMypyBoto3Package "iot" "1.28.56" "sha256-dLDUJEflskkXKb6soxoKRoPxko/Qb9lWkKjPnVklUWc="; + + mypy-boto3-iot-data = buildMypyBoto3Package "iot-data" "1.28.36" "sha256-DDUn2TFgXeeltWJqH7g7D+gKLSQv832/J4lWBVyWmlQ="; + + mypy-boto3-iot-jobs-data = buildMypyBoto3Package "iot-jobs-data" "1.28.36" "sha256-bpKEm6reRSLi74HT9wMGN+xkJPTYSLxOGf8Z7QN1qMY="; + + mypy-boto3-iot-roborunner = buildMypyBoto3Package "iot-roborunner" "1.28.36" "sha256-DFaWmHPzlgZztGfbbxeyDWu2rGLm69r8Ejww5cvzkRQ="; + + mypy-boto3-iot1click-devices = buildMypyBoto3Package "iot1click-devices" "1.28.36" "sha256-GROHe78qVJLlPtw+wH73fzyBjTsrKkUbpVN0U26HsJs="; + + mypy-boto3-iot1click-projects = buildMypyBoto3Package "iot1click-projects" "1.28.36" "sha256-XAtVZ+j5k8eb1G79B+sin/W3bVfq+Vtr/P80BU2XnVQ="; + + mypy-boto3-iotanalytics = buildMypyBoto3Package "iotanalytics" "1.28.36" "sha256-jO+/523WSPqhQCAOr6nFiag/tCHL1Up1A0q76jZ7/qE="; + + mypy-boto3-iotdeviceadvisor = buildMypyBoto3Package "iotdeviceadvisor" "1.28.36" "sha256-0v8vHIOzHO7ZEZEA08hzukJV9EFSnTFh/1K1h3RhCyY="; + + mypy-boto3-iotevents = buildMypyBoto3Package "iotevents" "1.28.36" "sha256-27oaZTqmrBRJ3xlE9QKqLkau+dR30aYdeczVaWwK1Xs="; + + mypy-boto3-iotevents-data = buildMypyBoto3Package "iotevents-data" "1.28.36" "sha256-De7a/DdIEmK9jkd6CekBQ+ZNlp+5hyavdY5ISYNLM20="; + + mypy-boto3-iotfleethub = buildMypyBoto3Package "iotfleethub" "1.28.36" "sha256-AH9zk6pQ5OhupzG9lkZGSAX/ngrFovlldGkfn40TZh4="; + + mypy-boto3-iotfleetwise = buildMypyBoto3Package "iotfleetwise" "1.28.57" "sha256-KE8Q0jmXGhRAD3SmioxKVabyM0zLQEvhzogGEAMGvtU="; + + mypy-boto3-iotsecuretunneling = buildMypyBoto3Package "iotsecuretunneling" "1.28.36" "sha256-ANWiAgtmQCchCYvPPXUGdUHYLJOCoQAsFz8ybpZSceg="; + + mypy-boto3-iotsitewise = buildMypyBoto3Package "iotsitewise" "1.28.36" "sha256-Sr5hmTMLMDxxXwG6s+wv5kkq4NnFCTFjMisOwdniBN4="; + + mypy-boto3-iotthingsgraph = buildMypyBoto3Package "iotthingsgraph" "1.28.36" "sha256-msc7aVFDSQRUNeqHWFqJ+4haUvCq+VYCpmZONl7+ySA="; + + mypy-boto3-iottwinmaker = buildMypyBoto3Package "iottwinmaker" "1.28.36" "sha256-laSFI1ugTL+9bVVQLuMKvQ9WGgXGikvV3k1DsyTIJ00="; + + mypy-boto3-iotwireless = buildMypyBoto3Package "iotwireless" "1.28.36" "sha256-CAAkka/CEZ1D+MgK1cbWDm6mArcRPxAo98Rz3ti6oHk="; + + mypy-boto3-ivs = buildMypyBoto3Package "ivs" "1.28.39" "sha256-bsUwfBojGMRujL9yLhIqBLAxEpgz1H3KCSmhoQ/UrfM="; + + mypy-boto3-ivs-realtime = buildMypyBoto3Package "ivs-realtime" "1.28.47" "sha256-f5aHtTu7H0TY3XYW1OJIkwKlKe6iZj0nxEjwlbEmc/4="; + + mypy-boto3-ivschat = buildMypyBoto3Package "ivschat" "1.28.36" "sha256-WMq8phYMtEl8Ey7tDxBzVexuR4gmZQlO6qpDwYu8xwY="; + + mypy-boto3-kafka = buildMypyBoto3Package "kafka" "1.28.36" "sha256-93kbJxpiLQsnhudgnGoGUimUPfhGMN0cc1x8qqsA/Jc="; + + mypy-boto3-kafkaconnect = buildMypyBoto3Package "kafkaconnect" "1.28.39" "sha256-p2vmaWN7oBdsud3bCB2/rCme7IXKJ4xI/XSFj4AqmGo="; + + mypy-boto3-kendra = buildMypyBoto3Package "kendra" "1.28.46" "sha256-zeKYrDZdcdNISV2eukD7GN/sdve8R5PNbvOhZN5FyRI="; + + mypy-boto3-kendra-ranking = buildMypyBoto3Package "kendra-ranking" "1.28.36" "sha256-C1wYGskKNR6E4bL6OR8ERRwHZ8HpTbhCAoiBKIAsgME="; + + mypy-boto3-keyspaces = buildMypyBoto3Package "keyspaces" "1.28.36" "sha256-p5Tj7bqC/E552Mmr/G+QxOA4LyW4YK9VlztEhKNw/Fc="; + + mypy-boto3-kinesis = buildMypyBoto3Package "kinesis" "1.28.36" "sha256-Q3E8DOj2Oyy9GBEy5xNxAxvZDqwlCu9zV7I51NprhQQ="; + + mypy-boto3-kinesis-video-archived-media = buildMypyBoto3Package "kinesis-video-archived-media" "1.28.36" "sha256-v3hjhhFbCTKsfYTUvI57lEvnRSIX5POdjH/4hC+GthA="; + + mypy-boto3-kinesis-video-media = buildMypyBoto3Package "kinesis-video-media" "1.28.36" "sha256-Si9Dz0blHg5oq8Nnq/6V5NMmt3Zbl9rVt8/UcfwSgnU="; + + mypy-boto3-kinesis-video-signaling = buildMypyBoto3Package "kinesis-video-signaling" "1.28.36" "sha256-sOiEpuZ3AMYRK6daSsoK3ti9LN4v7GgBPSThWTh25Og="; + + mypy-boto3-kinesis-video-webrtc-storage = buildMypyBoto3Package "kinesis-video-webrtc-storage" "1.28.36" "sha256-AJPSjIIX+AQKXPPoNxTESszrC5ZzQhwHeb/eTF/LJkE="; + + mypy-boto3-kinesisanalytics = buildMypyBoto3Package "kinesisanalytics" "1.28.36" "sha256-K/NUI/VQjoxmiL3s7ASUBCBv9GWqKQYpz4o0+oohDFU="; + + mypy-boto3-kinesisanalyticsv2 = buildMypyBoto3Package "kinesisanalyticsv2" "1.28.36" "sha256-k+ftbXSH2gm76lsJvMdvAuAnWBVsLEh829o4x5rUQUQ="; + + mypy-boto3-kinesisvideo = buildMypyBoto3Package "kinesisvideo" "1.28.52" "sha256-X05ZXElPveZ44sea7a0F5oO+wIIpYgTISpUwvACPiEY="; + + mypy-boto3-kms = buildMypyBoto3Package "kms" "1.28.37" "sha256-l4RcfT1vhG8hlaWdapdDB6FqCFseZP56/kDppcBra48="; + + mypy-boto3-lakeformation = buildMypyBoto3Package "lakeformation" "1.28.55" "sha256-RgYc0eRv7agKmJVwqTqsx2ua0Y1B8UHbwQ1eCh5kumU="; + + mypy-boto3-lambda = buildMypyBoto3Package "lambda" "1.28.36" "sha256-cEmOb/a/1gt1hVPSf632kboWlXL6ygHCvUV9oLSLnP8="; + + mypy-boto3-lex-models = buildMypyBoto3Package "lex-models" "1.28.36" "sha256-pe4WZgqSF3iodWqXn94fzNChq946ZydQlwJF7CB0HMc="; + + mypy-boto3-lex-runtime = buildMypyBoto3Package "lex-runtime" "1.28.36" "sha256-pE1gAxoS2hb4N4H7irZNgXERAXBt/eWqF0CZZjszTyI="; + + mypy-boto3-lexv2-models = buildMypyBoto3Package "lexv2-models" "1.28.36" "sha256-6DXon6AyJugNzp9bKXfvspvWGdD11dV5qxBZa7AikbE="; + + mypy-boto3-lexv2-runtime = buildMypyBoto3Package "lexv2-runtime" "1.28.36" "sha256-6wP6YHyctJWXdPO8bmylwhxtJ3jltbWYyAxdu+5+X5w="; + + mypy-boto3-license-manager = buildMypyBoto3Package "license-manager" "1.28.36" "sha256-/XOD5I4y2PHzW9Y+akeF1Oovf04jeh4r4ZcxjUP4ZOU="; + + mypy-boto3-license-manager-linux-subscriptions = buildMypyBoto3Package "license-manager-linux-subscriptions" "1.28.36" "sha256-LuwZUXbQlSC1YSyfNuensyYVoKwy6cZzMbC2/bGJ5Pw="; + + mypy-boto3-license-manager-user-subscriptions = buildMypyBoto3Package "license-manager-user-subscriptions" "1.28.36" "sha256-KcTO20KTKnvcCykL5C4BqDFyj/Xrp0l6gH7JslRIzcQ="; + + mypy-boto3-lightsail = buildMypyBoto3Package "lightsail" "1.28.36" "sha256-3euT5o4jOo39mco4y7geAA7PBF6z7A3lj451xXnB98o="; + + mypy-boto3-location = buildMypyBoto3Package "location" "1.28.36" "sha256-Gl0Q4693qhG9Wii6KlQXw9B5hZcoYoNcsO6rptLGPHQ="; + + mypy-boto3-logs = buildMypyBoto3Package "logs" "1.28.52" "sha256-tR6bl5YSI7/iMUzhaIe70imFezlgph03JIDW1ogWi34="; + + mypy-boto3-lookoutequipment = buildMypyBoto3Package "lookoutequipment" "1.28.48" "sha256-RXWRC9LegKQlODn8zgQJEADZGSuCYMp4/HdFGUge3rU="; + + mypy-boto3-lookoutmetrics = buildMypyBoto3Package "lookoutmetrics" "1.28.36" "sha256-GDkmENl2VbNDdXS26ORGeEoK8YAURJJRVzoxAiFt9L8="; + + mypy-boto3-lookoutvision = buildMypyBoto3Package "lookoutvision" "1.28.36" "sha256-tcA34QM+t2tiaV7kmaNDZjGEbtc6Bs1ZRQoPjHFNojw="; + + mypy-boto3-m2 = buildMypyBoto3Package "m2" "1.28.36" "sha256-6UdS7JMp8vnbP/AHoiQJ+kTBZiPSvymziVeNQnkXNxg="; + + mypy-boto3-machinelearning = buildMypyBoto3Package "machinelearning" "1.28.36" "sha256-ucXN/rMMlxsRBvR0rhvF+X98qKzuvXXHSGRZSqds2Cc="; + + mypy-boto3-macie = buildMypyBoto3Package "macie" "1.28.36" "sha256-T7zd6G5Z4fz1/ZiCOwf+kWbXWCy35JaE3f2OUpWGNpE="; + + mypy-boto3-macie2 = buildMypyBoto3Package "macie2" "1.28.50" "sha256-OSQqQIDB1mPTZNk1eZFHm5Undcc+C4W/cHnXk26STWQ="; + + mypy-boto3-managedblockchain = buildMypyBoto3Package "managedblockchain" "1.28.58" "sha256-WurxI39UdFSgwdxaymDxsoO03bGZ1ooMaCCwOthnrPo="; + + mypy-boto3-managedblockchain-query = buildMypyBoto3Package "managedblockchain-query" "1.28.36" "sha256-3RQJLfH4XCw8ajN6NdEZqhnBjfYZvxqbZOISKaQyuq0="; + + mypy-boto3-marketplace-catalog = buildMypyBoto3Package "marketplace-catalog" "1.28.37" "sha256-Egrc6aap+HyguDM71bJrvFrtG0x3mxHjKqusw8PGTc8="; + + mypy-boto3-marketplace-entitlement = buildMypyBoto3Package "marketplace-entitlement" "1.28.36" "sha256-9pTcu/s4RykpnM/FsI/VuBLmLCz1/AVpWSTPORFVraY="; + + mypy-boto3-marketplacecommerceanalytics = buildMypyBoto3Package "marketplacecommerceanalytics" "1.28.36" "sha256-8omV1nyC83MRbAEwCOzDvyuTHARxCDJtMCkIJ76/42Q="; + + mypy-boto3-mediaconnect = buildMypyBoto3Package "mediaconnect" "1.28.36" "sha256-xJ/i8IAQvwsCD/8F8hVMGuVpI/8ZbiWCW6w2O9PMmwg="; + + mypy-boto3-mediaconvert = buildMypyBoto3Package "mediaconvert" "1.28.53" "sha256-nGLoDX8cgcCHad2hpZvOzNSkq+VfWvTQ6qGbsvqbnbc="; + + mypy-boto3-medialive = buildMypyBoto3Package "medialive" "1.28.45" "sha256-vcf1hxhHJ/F6S58p9Jb/Pic063aeLVc+HrzAnN9ph/A="; + + mypy-boto3-mediapackage = buildMypyBoto3Package "mediapackage" "1.28.36" "sha256-ezPUrghBEb7oInGgyP8JlEf2yKSOPHRznBZ7BcNP6Oc="; + + mypy-boto3-mediapackage-vod = buildMypyBoto3Package "mediapackage-vod" "1.28.36" "sha256-CYgKkn7AOmwBgaMNhq2ofKH5dQXu+hgC0In+UfWa9f0="; + + mypy-boto3-mediapackagev2 = buildMypyBoto3Package "mediapackagev2" "1.28.36" "sha256-oGwfsKI4PEhj5oJKr9pLvma7+nNSFyRlMzC2HYnVCsQ="; + + mypy-boto3-mediastore = buildMypyBoto3Package "mediastore" "1.28.37" "sha256-OptRBCGquVDgcG/7K70WZCdMhGCPSU8Gyb236ooUwhY="; + + mypy-boto3-mediastore-data = buildMypyBoto3Package "mediastore-data" "1.28.36" "sha256-X7PuP1LtOgJo/PJ5TBgq7O0iFAhBiVJRalNbQEWT7W4="; + + mypy-boto3-mediatailor = buildMypyBoto3Package "mediatailor" "1.28.36" "sha256-1w5g2gzMCvufKYjjXey3ZeokZTxuL97LqHdu3CoG2UA="; + + mypy-boto3-medical-imaging = buildMypyBoto3Package "medical-imaging" "1.28.36" "sha256-pAoO8V4SxZnUGou2Gf0p0Shpm7ZIvxdB9ZI8fhZU5U4="; + + mypy-boto3-memorydb = buildMypyBoto3Package "memorydb" "1.28.36" "sha256-GsdpyKFaQyakXnKJzi2cBE0Vb1gLyUhXQ5VeGlkhVmk="; + + mypy-boto3-meteringmarketplace = buildMypyBoto3Package "meteringmarketplace" "1.28.36" "sha256-LiZj7Dltu+C717k1Aywtkk1faeSUAFYCMiOe5Mgoy4A="; + + mypy-boto3-mgh = buildMypyBoto3Package "mgh" "1.28.36" "sha256-7AGJAF8dh5FQz46IRinvrTX/PEC8cBkS2G/LMndjNS4="; + + mypy-boto3-mgn = buildMypyBoto3Package "mgn" "1.28.36" "sha256-MMp+P5+6/vc/fSNFUVuKtZCZbyDh8XvGsPg1LFTtzxg="; + + mypy-boto3-migration-hub-refactor-spaces = buildMypyBoto3Package "migration-hub-refactor-spaces" "1.28.36" "sha256-xfTzLCtQPfBM01l96ks/nGGYNgYYTy6GA3I/qU/y0II="; + + mypy-boto3-migrationhub-config = buildMypyBoto3Package "migrationhub-config" "1.28.36" "sha256-p3FiriZZMmqWMMPGT4Zu/BRiDch1K4hGqMYM9dVWX7g="; + + mypy-boto3-migrationhuborchestrator = buildMypyBoto3Package "migrationhuborchestrator" "1.28.36" "sha256-x5vC9TZD5y/wyNCUS4KbcJk3tfMbD6GxhxJQj+DYVo4="; + + mypy-boto3-migrationhubstrategy = buildMypyBoto3Package "migrationhubstrategy" "1.28.36" "sha256-HvDtYoWRyBmQxzn/YZJ9nhXgpKAnnwfD8RtTG2RakDM="; + + mypy-boto3-mobile = buildMypyBoto3Package "mobile" "1.28.36" "sha256-SyBzpVCo90lFHeT9K9wbxMXNnJEccEY+bWsgnYcnA7Q="; + + mypy-boto3-mq = buildMypyBoto3Package "mq" "1.28.36" "sha256-nHADqvj4clxfJjeS0eiadhtaVKFKeXWLBG93QOwQkR8="; + + mypy-boto3-mturk = buildMypyBoto3Package "mturk" "1.28.36" "sha256-7h2xEOjgYe1QVV3mbxb7HMZJunHo4RtDdr2Jojr6XDU="; + + mypy-boto3-mwaa = buildMypyBoto3Package "mwaa" "1.28.36" "sha256-OyetpZbtbOjtUowUA7ahRY3OGgUEHD+Q7i4rej5CLIs="; + + mypy-boto3-neptune = buildMypyBoto3Package "neptune" "1.28.36" "sha256-NEu+SKj/eoYlE2bRigVIFcXS+NRcyTwhB+xP0+SLh/s="; + + mypy-boto3-neptunedata = buildMypyBoto3Package "neptunedata" "1.28.43" "sha256-IWYezgs1FUCYgGvmw6X/8u8QX5uHew5PXhv3gr9MzME="; + + mypy-boto3-network-firewall = buildMypyBoto3Package "network-firewall" "1.28.38" "sha256-MR+/d8G6cfpSEXsC9+mk1WXg/y1fQatMDV0uASI9bU0="; + + mypy-boto3-networkmanager = buildMypyBoto3Package "networkmanager" "1.28.36" "sha256-KESRmtzmmm/IMlQw8s7alP2PSupcdnXRtx2ZHETPzLA="; + + mypy-boto3-nimble = buildMypyBoto3Package "nimble" "1.28.36" "sha256-VDO5M5cFq0CLE4i017Peq9PFAOzKtld5ID8pgcZXBIA="; + + mypy-boto3-oam = buildMypyBoto3Package "oam" "1.28.36" "sha256-wZ1GYz84QiDvu1EWE8AFrGP/7VnzZbLsrVj8Zt3WehE="; + + mypy-boto3-omics = buildMypyBoto3Package "omics" "1.28.37" "sha256-bJALOo0sx1IwD1RBBx2CeW1JSW0IpqzF6i85ICO9SUM="; + + mypy-boto3-opensearch = buildMypyBoto3Package "opensearch" "1.28.36" "sha256-97rGlw+REicstwKchMVjN6EuZBxQuSwmhSfBnbHxsS4="; + + mypy-boto3-opensearchserverless = buildMypyBoto3Package "opensearchserverless" "1.28.36" "sha256-7V+wNpLTrYueSnPkOGD1ARqAewrNjbQzlIPDQJ/eEDY="; + + mypy-boto3-opsworks = buildMypyBoto3Package "opsworks" "1.28.36" "sha256-Dpp3frNgsAyzKqC0Etq/p7jpjV+1YMwBx2bFqchGpeI="; + + mypy-boto3-opsworkscm = buildMypyBoto3Package "opsworkscm" "1.28.36" "sha256-zrkTx2FkTuP880vcmBYwfkHDsPvLmYA3aUEZx7dbHRU="; + + mypy-boto3-organizations = buildMypyBoto3Package "organizations" "1.28.36" "sha256-IFR1uIVZVjJe2sWS9Tv75l67SXiB4Em74iKFz5giAWk="; + + mypy-boto3-osis = buildMypyBoto3Package "osis" "1.28.36" "sha256-TOEjsJmgoUEXd4H4s4y7Gx7gWxo4GeLWbDd7FA5Xc/o="; + + mypy-boto3-outposts = buildMypyBoto3Package "outposts" "1.28.51" "sha256-iA+7Mxkp3n6hUJuFhxZ/Nf4vjeQcd3PoOEmjzk2ITI8="; + + mypy-boto3-panorama = buildMypyBoto3Package "panorama" "1.28.36" "sha256-st4X3JA9Wf6zBqx9Gr2BxE9Z+1LeU0kiDpI8b+IVnjw="; + + mypy-boto3-payment-cryptography = buildMypyBoto3Package "payment-cryptography" "1.28.36" "sha256-2YvWtVCfr7tYJzml4LdYpEsFrSpLve+nAWF6s2xB6HQ="; + + mypy-boto3-payment-cryptography-data = buildMypyBoto3Package "payment-cryptography-data" "1.28.39" "sha256-aMYAPA0/z6O4fSOcp+IfIaC49NiPq/cmCGSGHCCiyBo="; + + mypy-boto3-pca-connector-ad = buildMypyBoto3Package "pca-connector-ad" "1.28.38" "sha256-fVexVJjucP+4UEsje+jQU+dbA0ycpQQxWc3dqKnENiY="; + + mypy-boto3-personalize = buildMypyBoto3Package "personalize" "1.28.36" "sha256-SCQqvz6rBi9Ohbw10A9BS3Yu0xPQLs03a0a0zC9mXoM="; + + mypy-boto3-personalize-events = buildMypyBoto3Package "personalize-events" "1.28.36" "sha256-Znmc+a37B+wlkDCT387ZGCyfQ6kLrQeVcHCkplAAOAo="; + + mypy-boto3-personalize-runtime = buildMypyBoto3Package "personalize-runtime" "1.28.36" "sha256-EICeLDJQzOWkm+Lk94pfY6KPi+HQY46AbGUxOi4dsxg="; + + mypy-boto3-pi = buildMypyBoto3Package "pi" "1.28.36" "sha256-sHhbm4A0BkC7h9SuYjOpIwQCLtvU5ukYzpgqNruvJnM="; + + mypy-boto3-pinpoint = buildMypyBoto3Package "pinpoint" "1.28.55" "sha256-Qi9wlrmtGVeGW/BXYJggG12q0g2Jw8pu2A9jd+3ryKI="; + + mypy-boto3-pinpoint-email = buildMypyBoto3Package "pinpoint-email" "1.28.36" "sha256-KGDy7obD+hVisnEStsIGmvUD6/Peyo83/mzKFsKd+xI="; + + mypy-boto3-pinpoint-sms-voice = buildMypyBoto3Package "pinpoint-sms-voice" "1.28.36" "sha256-NyUHn3+WgCp5AI0ly9F1gB2uyXICy5ot4HWPkv1sRjE="; + + mypy-boto3-pinpoint-sms-voice-v2 = buildMypyBoto3Package "pinpoint-sms-voice-v2" "1.28.36" "sha256-YO/15ikVJ0OJ4FuEubtcV4nc+NGBFMWwiZUgn28SgFQ="; + + mypy-boto3-pipes = buildMypyBoto3Package "pipes" "1.28.36" "sha256-wGVcXwhUGM729QsU3Tkmg8aD2s2cpg8/CTqOR1i8Lt4="; + + mypy-boto3-polly = buildMypyBoto3Package "polly" "1.28.36" "sha256-fntpy/+K4DYhfdv35hhanDS4oq1P0kNxxDFkkHQRmuU="; + + mypy-boto3-pricing = buildMypyBoto3Package "pricing" "1.28.36" "sha256-zmtifAqoWolmES6GVNRHvcvsC43AWpI4BZLipns8vqU="; + + mypy-boto3-privatenetworks = buildMypyBoto3Package "privatenetworks" "1.28.36" "sha256-JUaloEf/CtJBBwvf08tX1dfvMmo5zM85NFGKzLwd0zk="; + + mypy-boto3-proton = buildMypyBoto3Package "proton" "1.28.36" "sha256-TGSxplMR6PQJT8LOTNUct4VjDAMqtgBkg3HOOB8To7w="; + + mypy-boto3-qldb = buildMypyBoto3Package "qldb" "1.28.36" "sha256-y1UMibv5dwVuuvs2x3Cprc4gErqxUOYN6Loeaug6Tjw="; + + mypy-boto3-qldb-session = buildMypyBoto3Package "qldb-session" "1.28.36" "sha256-JGlIwudacKEBgKlf2iDn3iRTf/b869rS7fYaK3Q6Jgk="; + + mypy-boto3-quicksight = buildMypyBoto3Package "quicksight" "1.28.54" "sha256-NOQ9zNMTJYZNhEoE2xNcyG78x9eajyY0AUDsa5JW3Ls="; + + mypy-boto3-ram = buildMypyBoto3Package "ram" "1.28.36" "sha256-5ne0E27ct5g2LQs3rzEJ5vQdnu/10uIfeS9t4FAVU2U="; + + mypy-boto3-rbin = buildMypyBoto3Package "rbin" "1.28.36" "sha256-ADN+McM/ZuloBxZVug6Zc9w1Bij5pWhzQpP8if47re8="; + + mypy-boto3-rds = buildMypyBoto3Package "rds" "1.28.58" "sha256-pm5I8iTKxAKscXXy99EvF+ZnIpmposPnmo0yG3y3NQU="; + + mypy-boto3-rds-data = buildMypyBoto3Package "rds-data" "1.28.36" "sha256-rNDCwG1tnI3diKXH0sN2Qd/+J4UEh7aKBOWCIX4gvYs="; + + mypy-boto3-redshift = buildMypyBoto3Package "redshift" "1.28.36" "sha256-j0MCYKr0R42X1EtoGhNPM7lqTyoisvbYJPdCji8GvI8="; + + mypy-boto3-redshift-data = buildMypyBoto3Package "redshift-data" "1.28.36" "sha256-fEoxqvIsAs8mUTY/dSTAbQOxNlf4+1qpyZO28Fe2PLA="; + + mypy-boto3-redshift-serverless = buildMypyBoto3Package "redshift-serverless" "1.28.36" "sha256-fd7nHbR/4eo08/RN8u6GESyshRa81BIussx8Rdg0IHE="; + + mypy-boto3-rekognition = buildMypyBoto3Package "rekognition" "1.28.37" "sha256-6eNlzJDFLLP9YsFdogWE1vtXvSNP//N+f4KpnFfnpa4="; + + mypy-boto3-resiliencehub = buildMypyBoto3Package "resiliencehub" "1.28.36" "sha256-A6Nbwo6IxIBDbhCWqaKIDFYUvHCc1GRHh2IzCaYn6Nc="; + + mypy-boto3-resource-explorer-2 = buildMypyBoto3Package "resource-explorer-2" "1.28.36" "sha256-vTYcU6Lf5mhh3+PtwhLTb72MZwgrykAbXz8coSw7znM="; + + mypy-boto3-resource-groups = buildMypyBoto3Package "resource-groups" "1.28.36" "sha256-0q1trks0Xs22VuqE5nYnMVOmsPQ936UXMN3k7qo2kDc="; + + mypy-boto3-resourcegroupstaggingapi = buildMypyBoto3Package "resourcegroupstaggingapi" "1.28.36" "sha256-A2T8OZr2OibcP+WSCDk4NydfXA8UMI4DPRCnb4l+yWI="; + + mypy-boto3-robomaker = buildMypyBoto3Package "robomaker" "1.28.36" "sha256-zgk5TPyOtimF9axIjv8f0chrD2M7LZbeo6Huat6IUEs="; + + mypy-boto3-rolesanywhere = buildMypyBoto3Package "rolesanywhere" "1.28.36" "sha256-YQKGDMmakoxhIsarmBdvOlqno9Qtm5XqOOuBD3cnhsc="; + + mypy-boto3-route53 = buildMypyBoto3Package "route53" "1.28.36" "sha256-x/T2EZtPlnSFmRkRhU+GSKvRQHpXAL3c+JN6kdmFSuY="; + + mypy-boto3-route53-recovery-cluster = buildMypyBoto3Package "route53-recovery-cluster" "1.28.36" "sha256-UAHjH2z8jCvyR2vdM5igPc1gwkcxX7wb51qZbmHBe9c="; + + mypy-boto3-route53-recovery-control-config = buildMypyBoto3Package "route53-recovery-control-config" "1.28.36" "sha256-kcVRZWAIDRrHwGxd/tnWcCuu9fIgdmHzvHIG1XUdMMs="; + + mypy-boto3-route53-recovery-readiness = buildMypyBoto3Package "route53-recovery-readiness" "1.28.36" "sha256-iwncFBFaoMzDDApHHSBfbRaIHUOXaJJO9fWTEK6LAKY="; + + mypy-boto3-route53domains = buildMypyBoto3Package "route53domains" "1.28.36" "sha256-0g6Xh6GS06L6o0De4V/zQdw0DMOQMFFW7NMWEY7I5fQ="; + + mypy-boto3-route53resolver = buildMypyBoto3Package "route53resolver" "1.28.36" "sha256-o5wa4Jjskxw10OpjvVq62mdyi55nB8xsB1t52hEtrs8="; + + mypy-boto3-rum = buildMypyBoto3Package "rum" "1.28.36" "sha256-e342+/wBjUwNWBtQnlPoJtShgDbFXEEGd8B43UPSCFg="; + + mypy-boto3-s3 = buildMypyBoto3Package "s3" "1.28.55" "sha256-sAiAn0SOdAdQEtT8VLAXbeC09JvDjjneMMoOdk63UFY="; + + mypy-boto3-s3control = buildMypyBoto3Package "s3control" "1.28.36" "sha256-ZgJtq2jXRtgUXQrTfIZKSbF7TMTw/bV+bGlxte7kVA8="; + + mypy-boto3-s3outposts = buildMypyBoto3Package "s3outposts" "1.28.36" "sha256-56REWXuXLQP2mibMz1s2FbCZFqTRZNOsuUd0IZ3sOJI="; + + mypy-boto3-sagemaker = buildMypyBoto3Package "sagemaker" "1.28.57" "sha256-W3QJIXU+RPgr4IrgyJC7o0ox65W1Xyye5X5qpUCnAzo="; + + mypy-boto3-sagemaker-a2i-runtime = buildMypyBoto3Package "sagemaker-a2i-runtime" "1.28.36" "sha256-2qwf/dtIhBT5HSYDDEuSy4nqGQrBYEZ/1RiD5vMYPMI="; + + mypy-boto3-sagemaker-edge = buildMypyBoto3Package "sagemaker-edge" "1.28.36" "sha256-JsDQv4j8QB0wrXA3142LdNdYabJd8iB7PiLVZz0X3ss="; + + mypy-boto3-sagemaker-featurestore-runtime = buildMypyBoto3Package "sagemaker-featurestore-runtime" "1.28.57" "sha256-vcK8WdiV8m7cqJ7WkGAqYFLjRmKdqX0qCuxmZKYlrtw="; + + mypy-boto3-sagemaker-geospatial = buildMypyBoto3Package "sagemaker-geospatial" "1.28.36" "sha256-2JU0tA26pENaTJBsg13RV40+gsSRz+g1p/s+5LKtKTM="; + + mypy-boto3-sagemaker-metrics = buildMypyBoto3Package "sagemaker-metrics" "1.28.36" "sha256-DF36xuoA1csbTCz/NJ8UhU7NPYU/OgE0+Z1t5ppPKCA="; + + mypy-boto3-sagemaker-runtime = buildMypyBoto3Package "sagemaker-runtime" "1.28.39" "sha256-BQFdGoaL6GPAtCgFBTT4ajdkSWXsPrxYcLGndAcZw2k="; + + mypy-boto3-savingsplans = buildMypyBoto3Package "savingsplans" "1.28.36" "sha256-EuCyeSHWSlS2OC8DM5alD6IcZ3fewmJavMMHWXL12T0="; + + mypy-boto3-scheduler = buildMypyBoto3Package "scheduler" "1.28.36" "sha256-dMEm7KqoZFFtFnqXR6upXHQ/CeKQO1xQ+v7CoR4o7Xs="; + + mypy-boto3-schemas = buildMypyBoto3Package "schemas" "1.28.36" "sha256-gq8a1k0MEnXFdmB5IPE9zHYF1rfoSD3Vis7YOVyCTV8="; + + mypy-boto3-sdb = buildMypyBoto3Package "sdb" "1.28.36" "sha256-pbH5y/bS15S6BeTPIZ0bw8h0elfLeHdab/IxJF4DNYU="; + + mypy-boto3-secretsmanager = buildMypyBoto3Package "secretsmanager" "1.28.36" "sha256-fjkIh9Nb03CNjAzpQJUl2tCAU+qNpf0Ef3Lse88JP9M="; + + mypy-boto3-securityhub = buildMypyBoto3Package "securityhub" "1.28.43" "sha256-Ein8Q/bhJoThpGzGK9ow53WEWs5D5ARW/15s3qzLqnw="; + + mypy-boto3-securitylake = buildMypyBoto3Package "securitylake" "1.28.36" "sha256-YKtv/32/5ngUo4GUqeplkL5mmdcWP7rYrypLPJtebQ0="; + + mypy-boto3-serverlessrepo = buildMypyBoto3Package "serverlessrepo" "1.28.36" "sha256-oNSQAc9ZBX3+q1ycI0mg4lJ3jjqYkMfb0Cs/wjBRhrY="; + + mypy-boto3-service-quotas = buildMypyBoto3Package "service-quotas" "1.28.36" "sha256-qWw/5Q/S/60ZJ55wJf+1++YRnXS7fySFJSDLOm9neDE="; + + mypy-boto3-servicecatalog = buildMypyBoto3Package "servicecatalog" "1.28.37" "sha256-BOhaddv6XQwCRLuYk3ybTmFSdAQfWkqMVW6IvB4q/78="; + + mypy-boto3-servicecatalog-appregistry = buildMypyBoto3Package "servicecatalog-appregistry" "1.28.37" "sha256-rUHzIPXave2oWWyEDERmBfybNFyzw2RMxPFFidVqdh8="; + + mypy-boto3-servicediscovery = buildMypyBoto3Package "servicediscovery" "1.28.52" "sha256-WaiZXFpKr59w0XtjF6mVI7kGt1X+vmbeWiDBNwEaeRw="; + + mypy-boto3-ses = buildMypyBoto3Package "ses" "1.28.36" "sha256-HYAl9ock3b9chpYp+wd+sR1DElFN+jxipHc3lGoIFR8="; + + mypy-boto3-sesv2 = buildMypyBoto3Package "sesv2" "1.28.37" "sha256-TqnrgOc+YI6YA3BtJcN2BdU8Cm3By60yQJPxcWdQrEY="; + + mypy-boto3-shield = buildMypyBoto3Package "shield" "1.28.36" "sha256-io8Ux5jD5gyQwZDENXuT/5/R1iqTWd4c34zzQtBxNyk="; + + mypy-boto3-signer = buildMypyBoto3Package "signer" "1.28.36" "sha256-4Aji9L+AI66iB9NaiuV96YefuoEJ0s+BPdsOu/UwDpM="; + + mypy-boto3-simspaceweaver = buildMypyBoto3Package "simspaceweaver" "1.28.47" "sha256-13RYW3vObQUNBsBtp8uaZZ9JFAiwBwiaYQv8tJ0O85w="; + + mypy-boto3-sms = buildMypyBoto3Package "sms" "1.28.36" "sha256-xV29r8VmjvEQyyTYIdfkB9WbF08kjWbKdtLB5fXoWOo="; + + mypy-boto3-sms-voice = buildMypyBoto3Package "sms-voice" "1.28.36" "sha256-mtX0fSvFofCCD2gQhyc+YBWZbAoR497FAyjUezm4FgU="; + + mypy-boto3-snow-device-management = buildMypyBoto3Package "snow-device-management" "1.28.36" "sha256-mD1oojs3893aLdZQybDe41j5bG8dkMT92eq9fDbo5V8="; + + mypy-boto3-snowball = buildMypyBoto3Package "snowball" "1.28.36" "sha256-ngClAeGdx5U6b41iNIABhcrBWzv4t3PB0dkdavx2e2I="; + + mypy-boto3-sns = buildMypyBoto3Package "sns" "1.28.36" "sha256-SXWRhkEBpRR9XS+nFRBIwMTLSxmvN0prcKwu+KrkMGY="; + + mypy-boto3-sqs = buildMypyBoto3Package "sqs" "1.28.36" "sha256-2cFZ4CDw7yJabVhQo2c+iyNjJyQ7pf/g0Tdirk/cDiE="; + + mypy-boto3-ssm = buildMypyBoto3Package "ssm" "1.28.54" "sha256-cf246Qy7fhVgvU7M9w38JkqsdWQma4GI+YmNNpIJtJ8="; + + mypy-boto3-ssm-contacts = buildMypyBoto3Package "ssm-contacts" "1.28.36" "sha256-MK1Hp9196tv2vFaVtroRPAMSP5lgmBJJZjOi7sqK318="; + + mypy-boto3-ssm-incidents = buildMypyBoto3Package "ssm-incidents" "1.28.36" "sha256-0wYmsUl+q0s163UReHdCGSd18GOAhYh2aZKujT25aZc="; + + mypy-boto3-ssm-sap = buildMypyBoto3Package "ssm-sap" "1.28.36" "sha256-aQtr5rgXtokfiI/CoVxD1g4KmP9ii0hELER08sJOu3g="; + + mypy-boto3-sso = buildMypyBoto3Package "sso" "1.28.58" "sha256-EieqwoZ+kj3bbRDgwDDNZEPQXXFv3wFQUCYHivM6zeE="; + + mypy-boto3-sso-admin = buildMypyBoto3Package "sso-admin" "1.28.44" "sha256-BleFuvoN4f9/6Q/vvDRwgmRBP86F7i7tpaC6G3sXn1Y="; + + mypy-boto3-sso-oidc = buildMypyBoto3Package "sso-oidc" "1.28.52" "sha256-LGxlGXTsYZdBHiTFGzCCMvRW20Ny0kXMXLoP2YTAbKg="; + + mypy-boto3-stepfunctions = buildMypyBoto3Package "stepfunctions" "1.28.36" "sha256-jHlOmKvFyiPvE+NR9Gu4Sd5jS6ym81KG4x5Y3t5Atoc="; + + mypy-boto3-storagegateway = buildMypyBoto3Package "storagegateway" "1.28.36" "sha256-59qw52muZfYjmzO3quhIfgSk5xurzialMIEh+k+C69Q="; + + mypy-boto3-sts = buildMypyBoto3Package "sts" "1.28.58" "sha256-vv/scF8fC0Sdo8H1Ksdlhie7KJrs7BpECCZkecRuBTs="; + + mypy-boto3-support = buildMypyBoto3Package "support" "1.28.36" "sha256-HjzL3qwEiQSvJvaiB6pJN/GUMRNseuIqxM7rfrfwRKs="; + + mypy-boto3-support-app = buildMypyBoto3Package "support-app" "1.28.36" "sha256-p/v2QUgmGYRVKGUtrCt9i6c1LKCxqNoNKHnfbAw7qMU="; + + mypy-boto3-swf = buildMypyBoto3Package "swf" "1.28.36" "sha256-GO8hb3oVmSK0J8GB4ZT1RlqyBaRrOM2ZorOHkE3L8p0="; + + mypy-boto3-synthetics = buildMypyBoto3Package "synthetics" "1.28.36" "sha256-6vRCRKjNplmMqmUpvDC/JVPl4q/YUYealQdXOComXNQ="; + + mypy-boto3-textract = buildMypyBoto3Package "textract" "1.28.56" "sha256-xWQQAJJSeB/vsY2RAxw4z9lKjtVHJ91tvgZklwl/g74="; + + mypy-boto3-timestream-query = buildMypyBoto3Package "timestream-query" "1.28.36" "sha256-fslhEeOU6hSx6efMMesqkV4MyicL5hAvKBD1ZdyB1Dw="; + + mypy-boto3-timestream-write = buildMypyBoto3Package "timestream-write" "1.28.36" "sha256-dWA9lZ/vw96WA69hyECGnTTo9O+5qPyQWAUCSdevBUM="; + + mypy-boto3-tnb = buildMypyBoto3Package "tnb" "1.28.36" "sha256-sGoBXxbU2rLyTbW1olhS3jgrfcw10FtCNgHckcWiSpI="; + + mypy-boto3-transcribe = buildMypyBoto3Package "transcribe" "1.28.36" "sha256-oBof0qzgKgS58e+2teI6bBiIY3svwiyS+Ztzb3wRtLI="; + + mypy-boto3-transfer = buildMypyBoto3Package "transfer" "1.28.58" "sha256-aTpJa78Q/Z2xCtMCsExVqHsZwVlRlzBwKl3m/sWvXcM="; + + mypy-boto3-translate = buildMypyBoto3Package "translate" "1.28.36" "sha256-Q2FuBXtXWenPvkJ3PprDolsO6ur5QAAn0y1ORYEQIMM="; + + mypy-boto3-verifiedpermissions = buildMypyBoto3Package "verifiedpermissions" "1.28.36" "sha256-HpiBOyeWvB/T/MquJ0R8Uk647VqCAlmC0Tryw9iojjA="; + + mypy-boto3-voice-id = buildMypyBoto3Package "voice-id" "1.28.36" "sha256-B4R1U1eU4IZdB/Q+keSRL41zLvBMBJUiGw0RcCsC2l4="; + + mypy-boto3-vpc-lattice = buildMypyBoto3Package "vpc-lattice" "1.28.41" "sha256-azHtPlg9etjfZOpN2505djAq9enyrIkz5NcIQE+fl9U="; + + mypy-boto3-waf = buildMypyBoto3Package "waf" "1.28.36" "sha256-andRHQn1HAms2m57rIy+40iF7jz4nzGzYH24fP8qHSw="; + + mypy-boto3-waf-regional = buildMypyBoto3Package "waf-regional" "1.28.36" "sha256-WoIforrEs7OOroJB5YvPSw/M9tvrojNnbFJdG7BlzkU="; + + mypy-boto3-wafv2 = buildMypyBoto3Package "wafv2" "1.28.57" "sha256-7xrRaEm54cKtRZplu6l8UbTg+hF6Y5qP9/lgAV8D6AY="; + + mypy-boto3-wellarchitected = buildMypyBoto3Package "wellarchitected" "1.28.36" "sha256-Xsu8CV0MvpmbAMA6ZMoIPQHSMJn8okag1SxKW0SUv1I="; + + mypy-boto3-wisdom = buildMypyBoto3Package "wisdom" "1.28.36" "sha256-paheK7r4sqDjBbUVieh6E5gPAbmVaEFAC3NsWsCWxBA="; + + mypy-boto3-workdocs = buildMypyBoto3Package "workdocs" "1.28.36" "sha256-dQysUcm1xlXJbcM1vdYZ7+migQgjHl4gSqHoZDKnhHg="; + + mypy-boto3-worklink = buildMypyBoto3Package "worklink" "1.28.36" "sha256-oFjYLBxp/dZf1+IN5rj3usSUvZnRyhRMu63mRgdsrmI="; + + mypy-boto3-workmail = buildMypyBoto3Package "workmail" "1.28.50" "sha256-OfRyehgMROua9Ydcc8HBvBp4eddo0re1w0fciBVUuS4="; + + mypy-boto3-workmailmessageflow = buildMypyBoto3Package "workmailmessageflow" "1.28.36" "sha256-hfRjdhr/xJJNWYy4XDg8LT00sx/JGAEa4D+5GyR+FCo="; + + mypy-boto3-workspaces = buildMypyBoto3Package "workspaces" "1.28.44" "sha256-/LXeiuXeNTgfAf8BrzC/z0kdK201Htkau79BH0MQEO4="; + + mypy-boto3-workspaces-web = buildMypyBoto3Package "workspaces-web" "1.28.36" "sha256-kVVNGZYzZ2wIQVOCq3domqztTqsHY8FFHgeT5GCWtg0="; + + mypy-boto3-xray = buildMypyBoto3Package "xray" "1.28.47" "sha256-1OiTpbaBm2aAls4A7ZaZBNAM8DTRuQcwNKJDq3lOKMY="; + +} diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix index 0528aeaec52be..90fafe527bd7f 100644 --- a/pkgs/development/python-modules/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -119,6 +119,9 @@ buildPythonPackage rec { "mypyc/test/test_commandline.py" # fails to find hatchling "mypy/test/testpep561.py" + ] ++ lib.optionals stdenv.hostPlatform.isi686 [ + # https://github.com/python/mypy/issues/15221 + "mypyc/test/test_run.py" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/myst-nb/default.nix b/pkgs/development/python-modules/myst-nb/default.nix index 6ede481fba85b..33c06fc24619b 100644 --- a/pkgs/development/python-modules/myst-nb/default.nix +++ b/pkgs/development/python-modules/myst-nb/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "myst-nb"; version = "0.17.2"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/neo4j/default.nix b/pkgs/development/python-modules/neo4j/default.nix index 96790c04c4509..9e31ebadf6bda 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.12.0"; + version = "5.13.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-feKKBbULkWxEgUaMROvmQph2YTAgSOVDRz/OnpzG9Ac="; + hash = "sha256-ykbKNLMnbAGUavyfRtF3q97FRLaeuKOt0pcWHtJ9mCY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nestedtext/default.nix b/pkgs/development/python-modules/nestedtext/default.nix index 807060528eeea..185fffba413a8 100644 --- a/pkgs/development/python-modules/nestedtext/default.nix +++ b/pkgs/development/python-modules/nestedtext/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , docopt , fetchFromGitHub -, flitBuildHook +, flit-core , hypothesis , inform , nestedtext @@ -27,7 +27,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - flitBuildHook + flit-core ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/netio/default.nix b/pkgs/development/python-modules/netio/default.nix index 82e5d1641fd8f..30e9fc1af53a2 100644 --- a/pkgs/development/python-modules/netio/default.nix +++ b/pkgs/development/python-modules/netio/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, poetry-core , pyopenssl , pythonOlder , requests @@ -9,19 +10,20 @@ buildPythonPackage rec { pname = "netio"; - version = "1.0.10"; - format = "pyproject"; + version = "1.0.13"; + pyproject = true; disabled = pythonOlder "3.7"; - src = fetchPypi { - pname ="Netio"; - inherit version; - hash = "sha256-+fGs7ZwvspAW4GlO5Hx+gNb+7Mhl9HC4pijHyk+8PYs="; + src = fetchFromGitHub { + owner = "netioproducts"; + repo = "PyNetio"; + rev = "refs/tags/v${version}"; + hash = "sha256-s/X2WGhQXYsbo+ZPpkVSF/vclaThYYNHu0UY0yCnfPA="; }; nativeBuildInputs = [ - setuptools + poetry-core ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nextcord/default.nix b/pkgs/development/python-modules/nextcord/default.nix index 04fa54a28d6a2..4a5faf4c33a8e 100644 --- a/pkgs/development/python-modules/nextcord/default.nix +++ b/pkgs/development/python-modules/nextcord/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "nextcord"; - version = "2.5.0"; + version = "2.6.1"; format = "setuptools"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "nextcord"; repo = "nextcord"; rev = "refs/tags/v${version}"; - hash = "sha256-Oo1C2tasuNIpUaKACbapnoZs7WVS1uncS1akErzQrqI="; + hash = "sha256-bv4I+Ol/N4kbp/Ch7utaUpo0GmF+Mpx4zWmHL7uIveM="; }; patches = [ diff --git a/pkgs/development/python-modules/nibe/default.nix b/pkgs/development/python-modules/nibe/default.nix index 48a9365f8f269..f2a2c33105615 100644 --- a/pkgs/development/python-modules/nibe/default.nix +++ b/pkgs/development/python-modules/nibe/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "nibe"; - version = "2.3.0"; + version = "2.4.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "yozik04"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-IrPEXrrnbxJcIuy+Xq4iVEEblJ85d7M99zGr1DDJS2M="; + hash = "sha256-Ek5yYg6UweURg8BQhtpPFIcPBkblIIo66SRxWlJ8vG4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/nkdfu/default.nix b/pkgs/development/python-modules/nkdfu/default.nix index 340af281269e2..35d6fa16e1d35 100644 --- a/pkgs/development/python-modules/nkdfu/default.nix +++ b/pkgs/development/python-modules/nkdfu/default.nix @@ -1,15 +1,19 @@ -{ lib, buildPythonPackage, fetchPypi, fire, tqdm, intelhex, libusb1 }: +{ lib, buildPythonPackage, fetchPypi, flit-core, fire, tqdm, intelhex, libusb1 }: buildPythonPackage rec { pname = "nkdfu"; version = "0.2"; - format = "flit"; + format = "pyproject"; src = fetchPypi { inherit pname version; hash = "sha256-8l913dOCxHKFtpQ83p9RV3sUlu0oT5PVi14FSuYJ9fg="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ fire tqdm diff --git a/pkgs/development/python-modules/nomadnet/default.nix b/pkgs/development/python-modules/nomadnet/default.nix index 9415343d6ea78..18b4b3f7fa052 100644 --- a/pkgs/development/python-modules/nomadnet/default.nix +++ b/pkgs/development/python-modules/nomadnet/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "nomadnet"; - version = "0.3.7"; + version = "0.3.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "NomadNet"; rev = "refs/tags/${version}"; - hash = "sha256-cyD68GsAuJKmbVxWCCJVWz/VErB9LEdRzz9IT8ir+U0="; + hash = "sha256-w7NQH4CEfYQ4iwPtLQO5mYRnfWQbPuxb/qXRBP0V56Y="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ntc-templates/default.nix b/pkgs/development/python-modules/ntc-templates/default.nix index d668ba7217189..e8c1be951a4f6 100644 --- a/pkgs/development/python-modules/ntc-templates/default.nix +++ b/pkgs/development/python-modules/ntc-templates/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "ntc-templates"; - version = "3.2.0"; + version = "3.5.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "networktocode"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-uEGl245tmc+W/9G+IclSNu76VTJ7w3zw6BQkhmGgEnY="; + hash = "sha256-FhKMDSAW+MifAy2EnHePbSfY56rdK1SfOe85bFte6ps="; }; nativeBuildInputs = [ @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "TextFSM templates for parsing show commands of network devices"; homepage = "https://github.com/networktocode/ntc-templates"; + changelog = "https://github.com/networktocode/ntc-templates/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ hexa ]; }; diff --git a/pkgs/development/python-modules/numpyro/default.nix b/pkgs/development/python-modules/numpyro/default.nix index f301fdac7be91..612be673dbc19 100644 --- a/pkgs/development/python-modules/numpyro/default.nix +++ b/pkgs/development/python-modules/numpyro/default.nix @@ -9,19 +9,20 @@ , tqdm , funsor , pytestCheckHook -, tensorflow-probability +# TODO: uncomment when tensorflow-probability gets fixed. +# , tensorflow-probability }: buildPythonPackage rec { pname = "numpyro"; - version = "0.13.0"; + version = "0.13.2"; format = "setuptools"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit version pname; - hash = "sha256-n+5K6fZlatKkXGVxzKcVhmP5XNuJeeM+GcCJ1Kh/WMk="; + hash = "sha256-Um8LFVGAlMeOaN9uMwycHJzqEnTaxp8FYXIk+m2VTug="; }; propagatedBuildInputs = [ @@ -35,7 +36,8 @@ buildPythonPackage rec { nativeCheckInputs = [ funsor pytestCheckHook - tensorflow-probability + # TODO: uncomment when tensorflow-probability gets fixed. + # tensorflow-probability ]; pythonImportsCheck = [ @@ -62,6 +64,11 @@ buildPythonPackage rec { "test_model_transformation" ]; + # TODO: remove when tensorflow-probability gets fixed. + disabledTestPaths = [ + "test/test_distributions.py" + ]; + meta = with lib; { description = "Library for probabilistic programming with NumPy"; homepage = "https://num.pyro.ai/"; diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix index 37f7a1e44c21c..dce4276d57cd6 100644 --- a/pkgs/development/python-modules/oauthenticator/default.nix +++ b/pkgs/development/python-modules/oauthenticator/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "oauthenticator"; - version = "16.0.7"; + version = "16.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-opF7HdTJX4M7gTgB0VyWyyG/DO7lrVTvTcxMBX3a6UE="; + hash = "sha256-7JkV4idZ/euYGGPTg6I+pw2nNOuttmGJMlz3NvJO9Rw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index 62acb84d4f827..0c30ddd4f1ba2 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "oci"; - version = "2.112.1"; + version = "2.112.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "oracle"; repo = "oci-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-HPmAXLEoTEDVZh1npkcLQamEn/CehzM1FOgGOHUrBrg="; + hash = "sha256-Khh1/lpgBtUb1pfV7wNkHA6dWiBpAS899zB4Elp1ULY="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index 58d77f7712d03..5ed96beeace71 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -25,14 +25,15 @@ , tqdm , typing-extensions , unpaper +, wheel , installShellFiles }: buildPythonPackage rec { pname = "ocrmypdf"; - version = "14.4.0"; + version = "15.0.2"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; format = "pyproject"; @@ -46,7 +47,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-i1ZUBKR8dJXZkALUFwkzYcjtZ5Li66DfD2fupCGRQC4="; + hash = "sha256-DpsNH3djB35WlqDPauCy7Re8pbZLnUE/pPAix4WHPKM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -54,17 +55,18 @@ buildPythonPackage rec { patches = [ (substituteAll { src = ./paths.patch; - gs = "${lib.getBin ghostscript}/bin/gs"; - jbig2 = "${lib.getBin jbig2enc}/bin/jbig2"; - pngquant = "${lib.getBin pngquant}/bin/pngquant"; - tesseract = "${lib.getBin tesseract}/bin/tesseract"; - unpaper = "${lib.getBin unpaper}/bin/unpaper"; + gs = lib.getExe ghostscript; + jbig2 = lib.getExe jbig2enc; + pngquant = lib.getExe pngquant; + tesseract = lib.getExe tesseract; + unpaper = lib.getExe unpaper; }) ]; nativeBuildInputs = [ setuptools setuptools-scm + wheel installShellFiles ]; @@ -78,9 +80,6 @@ buildPythonPackage rec { pluggy reportlab rich - tqdm - ] ++ lib.optionals (pythonOlder "3.9") [ - importlib-resources ] ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ]; diff --git a/pkgs/development/python-modules/ocrmypdf/paths.patch b/pkgs/development/python-modules/ocrmypdf/paths.patch index 71d96c9a98ebb..6e6a1f8d79a02 100644 --- a/pkgs/development/python-modules/ocrmypdf/paths.patch +++ b/pkgs/development/python-modules/ocrmypdf/paths.patch @@ -1,69 +1,61 @@ diff --git a/src/ocrmypdf/_exec/ghostscript.py b/src/ocrmypdf/_exec/ghostscript.py -index 9e21c33c..21f134b3 100644 +index e28d23e9..183cd918 100644 --- a/src/ocrmypdf/_exec/ghostscript.py +++ b/src/ocrmypdf/_exec/ghostscript.py -@@ -32,15 +32,7 @@ log = logging.getLogger(__name__) - # Most reliable what to get the bitness of Python interpreter, according to Python docs - _IS_64BIT = sys.maxsize > 2**32 - --_GSWIN = None --if os.name == 'nt': -- if _IS_64BIT: -- _GSWIN = 'gswin64c' -- else: -- _GSWIN = 'gswin32c' -- --GS = _GSWIN if _GSWIN else 'gs' --del _GSWIN +@@ -67,7 +67,7 @@ log.addFilter(DuplicateFilter(log)) + + + # Ghostscript executable - gswin32c is not supported +-GS = 'gswin64c' if os.name == 'nt' else 'gs' +GS = '@gs@' - def version(): + def version() -> Version: diff --git a/src/ocrmypdf/_exec/jbig2enc.py b/src/ocrmypdf/_exec/jbig2enc.py -index 0f8f7392..db792b10 100644 +index 28d3dd1c..477a7d6c 100644 --- a/src/ocrmypdf/_exec/jbig2enc.py +++ b/src/ocrmypdf/_exec/jbig2enc.py -@@ -12,7 +12,7 @@ from ocrmypdf.subprocess import get_version, run +@@ -14,7 +14,7 @@ from ocrmypdf.subprocess import get_version, run - def version(): -- return get_version('jbig2', regex=r'jbig2enc (\d+(\.\d+)*).*') -+ return get_version('@jbig2@', regex=r'jbig2enc (\d+(\.\d+)*).*') + def version() -> Version: +- return Version(get_version('jbig2', regex=r'jbig2enc (\d+(\.\d+)*).*')) ++ return Version(get_version('@jbig2@', regex=r'jbig2enc (\d+(\.\d+)*).*')) def available(): -@@ -25,7 +25,7 @@ def available(): +@@ -27,7 +27,7 @@ def available(): - def convert_group(*, cwd, infiles, out_prefix): + def convert_group(*, cwd, infiles, out_prefix, threshold): args = [ - 'jbig2', + '@jbig2@', '-b', out_prefix, - '-s', # symbol mode (lossy) -@@ -44,7 +44,7 @@ def convert_group_mp(args): + '--symbol-mode', # symbol mode (lossy) +@@ -50,7 +50,7 @@ def convert_group_mp(args): - def convert_single(*, cwd, infile, outfile): -- args = ['jbig2', '-p', infile] -+ args = ['@jbig2@', '-p', infile] + def convert_single(*, cwd, infile, outfile, threshold): +- args = ['jbig2', '--pdf', '-t', str(threshold), infile] ++ args = ['@jbig2@', '--pdf', '-t', str(threshold), infile] with open(outfile, 'wb') as fstdout: proc = run(args, cwd=cwd, stdout=fstdout, stderr=PIPE) proc.check_returncode() diff --git a/src/ocrmypdf/_exec/pngquant.py b/src/ocrmypdf/_exec/pngquant.py -index 64e91139..ab5b9c49 100644 +index 8425caec..a027f041 100644 --- a/src/ocrmypdf/_exec/pngquant.py +++ b/src/ocrmypdf/_exec/pngquant.py -@@ -17,7 +17,7 @@ from ocrmypdf.subprocess import get_version, run +@@ -18,7 +18,7 @@ from ocrmypdf.subprocess import get_version, run - def version(): -- return get_version('pngquant', regex=r'(\d+(\.\d+)*).*') -+ return get_version('@pngquant@', regex=r'(\d+(\.\d+)*).*') + def version() -> Version: +- return Version(get_version('pngquant', regex=r'(\d+(\.\d+)*).*')) ++ return Version(get_version('@pngquant@', regex=r'(\d+(\.\d+)*).*')) def available(): -@@ -44,7 +44,7 @@ def input_as_png(input_file: Path): +@@ -45,7 +45,7 @@ def input_as_png(input_file: Path): def quantize(input_file: Path, output_file: Path, quality_min: int, quality_max: int): with input_as_png(input_file) as input_stream: args = [ @@ -73,19 +65,19 @@ index 64e91139..ab5b9c49 100644 '--skip-if-larger', '--quality', diff --git a/src/ocrmypdf/_exec/tesseract.py b/src/ocrmypdf/_exec/tesseract.py -index ad98836a..a12d3002 100644 +index 4eac3470..61315d14 100644 --- a/src/ocrmypdf/_exec/tesseract.py +++ b/src/ocrmypdf/_exec/tesseract.py -@@ -111,7 +111,7 @@ class TesseractVersion(Version): +@@ -114,7 +114,7 @@ class TesseractVersion(Version): - def version() -> str: -- return get_version('tesseract', regex=r'tesseract\s(.+)') -+ return get_version('@tesseract@', regex=r'tesseract\s(.+)') + def version() -> Version: +- return TesseractVersion(get_version('tesseract', regex=r'tesseract\s(.+)')) ++ return TesseractVersion(get_version('@tesseract@', regex=r'tesseract\s(.+)')) - def has_user_words() -> bool: -@@ -138,7 +138,7 @@ def get_languages() -> set[str]: + def has_thresholding() -> bool: +@@ -132,7 +132,7 @@ def get_languages() -> set[str]: msg += output return msg @@ -94,7 +86,7 @@ index ad98836a..a12d3002 100644 try: proc = run( args_tess, -@@ -160,7 +160,7 @@ def get_languages() -> set[str]: +@@ -154,7 +154,7 @@ def get_languages() -> set[str]: def tess_base_args(langs: list[str], engine_mode: int | None) -> list[str]: @@ -104,19 +96,19 @@ index ad98836a..a12d3002 100644 args.extend(['-l', '+'.join(langs)]) if engine_mode is not None: diff --git a/src/ocrmypdf/_exec/unpaper.py b/src/ocrmypdf/_exec/unpaper.py -index d7f24265..d14f85de 100644 +index 2944b4f4..55a36140 100644 --- a/src/ocrmypdf/_exec/unpaper.py +++ b/src/ocrmypdf/_exec/unpaper.py -@@ -66,7 +66,7 @@ class UnpaperImageTooLargeError(Exception): +@@ -69,7 +69,7 @@ class UnpaperImageTooLargeError(Exception): - def version() -> str: -- return get_version('unpaper') -+ return get_version('@unpaper@') + def version() -> Version: +- return Version(get_version('unpaper')) ++ return Version(get_version('@unpaper@')) SUPPORTED_MODES = {'1', 'L', 'RGB'} -@@ -120,7 +120,7 @@ def _setup_unpaper_io(input_file: Path) -> Iterator[tuple[Path, Path, Path]]: +@@ -123,7 +123,7 @@ def _setup_unpaper_io(input_file: Path) -> Iterator[tuple[Path, Path, Path]]: def run_unpaper( input_file: Path, output_file: Path, *, dpi: DecFloat, mode_args: list[str] ) -> None: diff --git a/pkgs/development/python-modules/oelint-parser/default.nix b/pkgs/development/python-modules/oelint-parser/default.nix new file mode 100644 index 0000000000000..fddfd74834e91 --- /dev/null +++ b/pkgs/development/python-modules/oelint-parser/default.nix @@ -0,0 +1,31 @@ +{ lib +, nix-update-script +, fetchPypi +, buildPythonPackage +, regex +}: + +buildPythonPackage rec { + pname = "oelint-parser"; + version = "2.11.3"; + format = "setuptools"; + + src = fetchPypi { + inherit version; + pname = "oelint_parser"; + hash = "sha256-iR/MDHt3SEG29hSLqA36EXe8EBRZVntt+u6bwoujy0s="; + }; + + propagatedBuildInputs = [ regex ]; + pythonImportsCheck = [ "oelint_parser" ]; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Alternative parser for bitbake recipes"; + homepage = "https://github.com/priv-kweihmann/oelint-parser"; + changelog = "https://github.com/priv-kweihmann/oelint-parser/releases/tag/v${version}"; + license = licenses.bsd2; + maintainers = with maintainers; [ otavio ]; + }; +} diff --git a/pkgs/development/python-modules/onnx/default.nix b/pkgs/development/python-modules/onnx/default.nix index 4d4b587314d3b..df15ebe77e449 100644 --- a/pkgs/development/python-modules/onnx/default.nix +++ b/pkgs/development/python-modules/onnx/default.nix @@ -66,10 +66,14 @@ in buildPythonPackage rec { --replace 'include(googletest)' "" substituteInPlace cmake/unittest.cmake \ --replace 'googletest)' ')' - - # remove this override in 1.15 that will enable to set the CMAKE_CXX_STANDARD with cmakeFlags - substituteInPlace CMakeLists.txt \ - --replace 'CMAKE_CXX_STANDARD 11' 'CMAKE_CXX_STANDARD 17' + '' + lib.optionalString stdenv.isLinux '' + # remove this override in 1.15 that will enable to set the CMAKE_CXX_STANDARD with cmakeFlags + substituteInPlace CMakeLists.txt \ + --replace 'CMAKE_CXX_STANDARD 11' 'CMAKE_CXX_STANDARD 17' + '' + lib.optionalString stdenv.isDarwin '' + # remove this override in 1.15 that will enable to set the CMAKE_CXX_STANDARD with cmakeFlags + substituteInPlace CMakeLists.txt \ + --replace 'CMAKE_CXX_STANDARD 11' 'CMAKE_CXX_STANDARD 14' ''; preConfigure = '' diff --git a/pkgs/development/python-modules/openai-whisper/default.nix b/pkgs/development/python-modules/openai-whisper/default.nix index 28a3b8035ce6c..68f692e4c37a2 100644 --- a/pkgs/development/python-modules/openai-whisper/default.nix +++ b/pkgs/development/python-modules/openai-whisper/default.nix @@ -5,7 +5,7 @@ , cudaSupport ? false # runtime -, ffmpeg +, ffmpeg-headless # propagates , numpy @@ -14,7 +14,6 @@ , tqdm , more-itertools , transformers -, ffmpeg-python , numba , openai-triton , scipy @@ -26,20 +25,20 @@ buildPythonPackage rec { pname = "whisper"; - version = "20230314"; + version = "20230918"; format = "setuptools"; src = fetchFromGitHub { owner = "openai"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-qQCELjRFeRCT1k1CBc3netRtFvt+an/EbkrgnmiX/mc="; + hash = "sha256-wBAanFVEIIzTcoX40P9eI26UdEu0SC/xuife/zi2Xho="; }; patches = [ (substituteAll { src = ./ffmpeg-path.patch; - inherit ffmpeg; + ffmpeg = ffmpeg-headless; }) ]; @@ -48,7 +47,6 @@ buildPythonPackage rec { tqdm more-itertools transformers - ffmpeg-python numba scipy tiktoken @@ -61,7 +59,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace requirements.txt \ - --replace "tiktoken==0.3.1" "tiktoken>=0.3.1" + --replace "tiktoken==0.3.3" "tiktoken>=0.3.3" '' # openai-triton is only needed for CUDA support. # triton needs CUDA to be build. @@ -80,7 +78,6 @@ buildPythonPackage rec { disabledTests = [ # requires network access to download models - "test_tokenizer" "test_transcribe" # requires NVIDIA drivers "test_dtw_cuda_equivalence" diff --git a/pkgs/development/python-modules/openai-whisper/ffmpeg-path.patch b/pkgs/development/python-modules/openai-whisper/ffmpeg-path.patch index 6ccde1dcabb82..784168d1f62dc 100644 --- a/pkgs/development/python-modules/openai-whisper/ffmpeg-path.patch +++ b/pkgs/development/python-modules/openai-whisper/ffmpeg-path.patch @@ -1,13 +1,13 @@ diff --git a/whisper/audio.py b/whisper/audio.py -index a6074e8..da18350 100644 +index 4f5b6e0..bfe7924 100644 --- a/whisper/audio.py +++ b/whisper/audio.py -@@ -41,7 +41,7 @@ def load_audio(file: str, sr: int = SAMPLE_RATE): - out, _ = ( - ffmpeg.input(file, threads=0) - .output("-", format="s16le", acodec="pcm_s16le", ac=1, ar=sr) -- .run(cmd=["ffmpeg", "-nostdin"], capture_stdout=True, capture_stderr=True) -+ .run(cmd=["@ffmpeg@/bin/ffmpeg", "-nostdin"], capture_stdout=True, capture_stderr=True) - ) - except ffmpeg.Error as e: - raise RuntimeError(f"Failed to load audio: {e.stderr.decode()}") from e +@@ -44,7 +44,7 @@ def load_audio(file: str, sr: int = SAMPLE_RATE): + # and resampling as necessary. Requires the ffmpeg CLI in PATH. + # fmt: off + cmd = [ +- "ffmpeg", ++ "@ffmpeg@/bin/ffmpeg", + "-nostdin", + "-threads", "0", + "-i", file, diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index 172ddb5970a95..89a02ae69f154 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "openai"; - version = "0.28.0"; + version = "0.28.1"; format = "setuptools"; disabled = pythonOlder "3.7.1"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-NDIHOX0W1nERvOWxnGBD42v+EjrND/9u90SS7KJzOW8="; + hash = "sha256-liJyeGxnYIC/jUQKdeATHpVJb/12KGbeM94Y2YQphfY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/opencensus/default.nix b/pkgs/development/python-modules/opencensus/default.nix index 5f710cfbd7d22..fa7141a8fb2ed 100644 --- a/pkgs/development/python-modules/opencensus/default.nix +++ b/pkgs/development/python-modules/opencensus/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "opencensus"; - version = "0.11.2"; + version = "0.11.3"; src = fetchPypi { inherit pname version; - hash = "sha256-YVQEKiNrns3VWiPfuydDuz3qzQaH4+A5HsLgx0lQ1m8="; + hash = "sha256-r3qYvVHmOWgUTXcvNG1pbtSYoy29xL4mfNYBHEzgXag="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix index cafaf385a733c..54b16712fef34 100644 --- a/pkgs/development/python-modules/opower/default.nix +++ b/pkgs/development/python-modules/opower/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "opower"; - version = "0.0.34"; + version = "0.0.35"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "tronikos"; repo = "opower"; rev = "refs/tags/v${version}"; - hash = "sha256-VIw0FRFhZpd9R5/j8ejgfy1p8/R2Gv8Wtjc3PDA4bqo="; + hash = "sha256-bS9KsPMuzQ+4AXsVzKiCevZujU4iW2hZ+eSJheM4NRI="; }; pythonRemoveDeps = [ diff --git a/pkgs/development/python-modules/oss2/default.nix b/pkgs/development/python-modules/oss2/default.nix index 52fc79baed4c0..62a98425a9d76 100644 --- a/pkgs/development/python-modules/oss2/default.nix +++ b/pkgs/development/python-modules/oss2/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "oss2"; - version = "2.18.1"; + version = "2.18.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "aliyun"; repo = "aliyun-oss-python-sdk"; rev = "refs/tags/${version}"; - hash = "sha256-4P2o10FhnLwRkhRYS+LzY+ugWPQgz+Tddn9XYR17018="; + hash = "sha256-xbbdzuaUvFnXA5glGr/1/s1Bm28d4XbtuvCKaj8Js68="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/paddleocr/default.nix b/pkgs/development/python-modules/paddleocr/default.nix index 9bd81077abfdb..c75d6e87e07a6 100644 --- a/pkgs/development/python-modules/paddleocr/default.nix +++ b/pkgs/development/python-modules/paddleocr/default.nix @@ -28,7 +28,7 @@ }: let - version = "2.7.0.1"; + version = "2.7.0"; in buildPythonPackage { pname = "paddleocr"; @@ -38,8 +38,8 @@ buildPythonPackage { src = fetchFromGitHub { owner = "PaddlePaddle"; repo = "PaddleOCR"; - rev = "254786752a2659e184822b4b2de5637a05236590"; - hash = "sha256-M/Fpk9swX9Gds7o5poM9Iv6LOhKoZNbe0Wv9JNMPOU0="; + rev = "v${version}"; + hash = "sha256-r7Y666KpY855NCSinCBBUz9PXHfZ56+oZW1/0ISpWe4="; }; patches = [ diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index 3df9474d37808..7fe1be6f7458d 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "panel"; - version = "1.2.2"; + version = "1.2.3"; format = "wheel"; @@ -25,7 +25,7 @@ buildPythonPackage rec { # tries to fetch even more artifacts src = fetchPypi { inherit pname version format; - hash = "sha256-RMRjxcUp6MTs001wdNfC/e6diOcgtqrSaVIOSQfPgTs="; + hash = "sha256-CAW6z0phPohpFjv4D1DlmomDiv52vb5qBatWN/Mmg/c="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/parametrize-from-file/default.nix b/pkgs/development/python-modules/parametrize-from-file/default.nix index 38370a1c805a0..4306579bc5179 100644 --- a/pkgs/development/python-modules/parametrize-from-file/default.nix +++ b/pkgs/development/python-modules/parametrize-from-file/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , fetchpatch +, flit-core , pytestCheckHook , coveralls , numpy @@ -16,7 +17,7 @@ buildPythonPackage rec { pname = "parametrize-from-file"; version = "0.17.0"; - format = "flit"; + format = "pyproject"; src = fetchPypi { inherit version; @@ -40,6 +41,10 @@ buildPythonPackage rec { --replace "more_itertools~=8.10" "more_itertools" ''; + nativeBuildInputs = [ + flit-core + ]; + nativeCheckInputs = [ numpy pytestCheckHook diff --git a/pkgs/development/python-modules/parver/default.nix b/pkgs/development/python-modules/parver/default.nix index d69a9a54e5011..b18d7db34766b 100644 --- a/pkgs/development/python-modules/parver/default.nix +++ b/pkgs/development/python-modules/parver/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "parver"; - version = "0.4"; + version = "0.5"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-1KPbuTxTNz7poLoFXkhYxEFpsgS5EuSdAD6tlduam8o="; + hash = "sha256-uf3h5ruc6fB+COnEvqjYglxeeOGKAFLQLgK/lRfrR3c="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/patiencediff/default.nix b/pkgs/development/python-modules/patiencediff/default.nix index 4837ffba7c27f..00d5518856777 100644 --- a/pkgs/development/python-modules/patiencediff/default.nix +++ b/pkgs/development/python-modules/patiencediff/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "patiencediff"; - version = "0.2.13"; + version = "0.2.14"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "breezy-team"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Hst/2hRqH8AIKD2EXtJo8m3diOxPBWAmNhtS3TUYT3I="; + hash = "sha256-KTOESjaj8fMxJZ7URqg6UMpiQppqZAlk4IPWEw4/Nvw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pdoc/default.nix b/pkgs/development/python-modules/pdoc/default.nix index fc9ce57cde03d..621c2842e70c4 100644 --- a/pkgs/development/python-modules/pdoc/default.nix +++ b/pkgs/development/python-modules/pdoc/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pdoc"; - version = "14.0.0"; + version = "14.1.0"; disabled = pythonOlder "3.8"; format = "pyproject"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mitmproxy"; repo = "pdoc"; rev = "v${version}"; - hash = "sha256-rMHp0diXvWIOyucuTAXO/IOljKhDYOZKtkih5+rUJCM="; + hash = "sha256-LQXhdzocw01URrmpDayK9rpsArvM/E44AE8Eok9DBwk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index 24f1be71cb3c2..93de496d51eee 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "19.4.2"; + version = "19.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-SJ3G301HO0TnrupzhK4K6JPDs25Nltv+lNj1nQB7gV4="; + hash = "sha256-ACfS444n/PcgieNbl9os720nGAUQDesBHpzVAgMMRew="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pep440/default.nix b/pkgs/development/python-modules/pep440/default.nix index c9753a47d81aa..0faa3c324b372 100644 --- a/pkgs/development/python-modules/pep440/default.nix +++ b/pkgs/development/python-modules/pep440/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pep440"; version = "0.1.2"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.8"; diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 51f13095ed087..3eba4ff828787 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.145"; + version = "2.1.148"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1rrIxOjOdGz+Xxb6QrH6Zth/eF+zaBOGFf4I9P17nbI="; + hash = "sha256-XRER28ObI9TsZ5h5LkAXhExGq+c4hpoEun2hagkpUXk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/piccolo-theme/default.nix b/pkgs/development/python-modules/piccolo-theme/default.nix index 0cb84c332a887..3b68065a23b2a 100644 --- a/pkgs/development/python-modules/piccolo-theme/default.nix +++ b/pkgs/development/python-modules/piccolo-theme/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "piccolo-theme"; - version = "0.17.0"; + version = "0.18.0"; src = fetchPypi { pname = "piccolo_theme"; inherit version; - hash = "sha256-sq/xWPLLAz4w6JdUfnB5E52hmj8gmrbg1oeBedyjCEE="; + hash = "sha256-tEgYrQaVcWZadmhV6JRuXnk8m9oJLNSfb0hA309bX1U="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pillow-heif/default.nix b/pkgs/development/python-modules/pillow-heif/default.nix new file mode 100644 index 0000000000000..fe243c6a03243 --- /dev/null +++ b/pkgs/development/python-modules/pillow-heif/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cmake +, pillow +, pytest +, nasm +, libheif +, libaom +, libde265 +, x265 +}: + +buildPythonPackage rec { + pname = "pillow_heif"; + version = "0.13.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "bigcat88"; + repo = "pillow_heif"; + rev = "refs/tags/v${version}"; + hash = "sha256-GbOW29rGpLMS7AfShuO6UCzcspdHtFS7hyNKori0otI="; + }; + + nativeBuildInputs = [ cmake nasm ]; + buildInputs = [ libheif libaom libde265 x265 ]; + propagatedBuildInputs = [ pillow ]; + nativeCheckInputs = [ pytest ]; + + dontUseCmakeConfigure = true; + + pythonImportsCheck = [ "pillow_heif" ]; + + meta = { + description = "Python library for working with HEIF images and plugin for Pillow"; + homepage = "https://github.com/bigcat88/pillow_heif"; + license = with lib.licenses; [ bsd3 lgpl3 ]; + maintainers = with lib.maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/development/python-modules/pinecone-client/default.nix b/pkgs/development/python-modules/pinecone-client/default.nix index 84f3798df846c..62fb96fb31aa8 100644 --- a/pkgs/development/python-modules/pinecone-client/default.nix +++ b/pkgs/development/python-modules/pinecone-client/default.nix @@ -13,11 +13,11 @@ }: buildPythonPackage rec { pname = "pinecone-client"; - version = "2.2.2"; + version = "2.2.4"; src = fetchPypi { inherit pname version; - hash = "sha256-OR/kE3VO/U4O8AFUtEJx1jxM3Uvt8IjSMRGlcl2GMhA="; + hash = "sha256-LBzB1mSLK+ZulE2y/6WRZqN7kWTRE1rVJdnNix4pgWg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pkgutil-resolve-name/default.nix b/pkgs/development/python-modules/pkgutil-resolve-name/default.nix index d70cfd1c4345c..ddb610b53bcfa 100644 --- a/pkgs/development/python-modules/pkgutil-resolve-name/default.nix +++ b/pkgs/development/python-modules/pkgutil-resolve-name/default.nix @@ -1,13 +1,15 @@ { buildPythonPackage , fetchPypi +, fetchpatch , lib , nix-update-script , pythonOlder +, flit-core }: buildPythonPackage rec { pname = "pkgutil-resolve-name"; version = "1.3.10"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,6 +19,18 @@ buildPythonPackage rec { hash = "sha256-NX1snmp1VlPP14iTgXwIU682XdUeyX89NYqBk3O70XQ="; }; + patches = [ + # Raise flit-core version constrains + (fetchpatch { # https://github.com/graingert/pkgutil-resolve-name/pull/5 + url = "https://github.com/graingert/pkgutil-resolve-name/commit/042834290c735fa836bb308ce9e93c9f64d67cbe.patch"; + hash = "sha256-M1rcrkdFcoFa3IncPnJaRhnXbelyk56QnMGtmgB6bvk="; + }) + ]; + + nativeBuildInputs = [ + flit-core + ]; + # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/plac/default.nix b/pkgs/development/python-modules/plac/default.nix index 752c7aab5e83b..a1822fe5157dc 100644 --- a/pkgs/development/python-modules/plac/default.nix +++ b/pkgs/development/python-modules/plac/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "plac"; - version = "1.3.5"; + version = "1.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,8 +15,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ialbert"; repo = pname; - rev = "v${version}"; - hash = "sha256-U3k97YJhQjulYNWcKVx96/5zND5VfsRjA3ZZHWhcDNg="; + rev = "refs/tags/v${version}"; + hash = "sha256-BH6NKbDMhlNuo+orIEweABNSVZv1K9VrZBrCIs6H6BU="; }; # tests are broken, see https://github.com/ialbert/plac/issues/74 diff --git a/pkgs/development/python-modules/playwright/default.nix b/pkgs/development/python-modules/playwright/default.nix index ec7a53f423a0b..7751452d5fb85 100644 --- a/pkgs/development/python-modules/playwright/default.nix +++ b/pkgs/development/python-modules/playwright/default.nix @@ -16,15 +16,15 @@ in buildPythonPackage rec { pname = "playwright"; # run ./pkgs/development/python-modules/playwright/update.sh to update - version = "1.37.0"; + version = "1.38.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "microsoft"; repo = "playwright-python"; - rev = "v${version}"; - hash = "sha256-7egK76A3+C+JPbCNFXDd4qTjepBRSZgtQmFrE/jWJN4="; + rev = "refs/tags/v${version}"; + hash = "sha256-K3ZLDnDtV9PWX0etVv6RIDHp0vZZ7b7DGJ1GjP2kfXU="; }; patches = [ diff --git a/pkgs/development/python-modules/plexapi/default.nix b/pkgs/development/python-modules/plexapi/default.nix index c2623977be4cd..57b4cb430b77a 100644 --- a/pkgs/development/python-modules/plexapi/default.nix +++ b/pkgs/development/python-modules/plexapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "plexapi"; - version = "4.15.1"; + version = "4.15.4"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pkkid"; repo = "python-plexapi"; rev = "refs/tags/${version}"; - hash = "sha256-mxVj98wbstUx/Abim7kzVVt/8kaAPVOhv4zt+PFgi3Y="; + hash = "sha256-NBV4jrLfU5vqQljQh28tJxgaNSo/ilph8xsjdVKCOJg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index f451b1f30c56a..8876eea828afd 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.32.2"; + version = "0.33.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = pname; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - hash = "sha256-kJ7HbGwmA6/OtSxpkvajf+VzjYK+uq6kMaja9CmVBt4="; + hash = "sha256-uJBUim5FlS+Jw3rGEKuorksVIgI5tVRAI7tESeYnGUc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/podcastparser/default.nix b/pkgs/development/python-modules/podcastparser/default.nix index 31472409ee71b..d844a19f902ee 100644 --- a/pkgs/development/python-modules/podcastparser/default.nix +++ b/pkgs/development/python-modules/podcastparser/default.nix @@ -1,26 +1,41 @@ -{ lib, buildPythonPackage, fetchFromGitHub, nose }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "podcastparser"; - version = "0.6.5"; + version = "0.6.10"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "gpodder"; repo = "podcastparser"; - rev = version; - sha256 = "1s83iq0mxcikxv6gi003iyavl1ai3siw1d7arijh0g28l0fff23a"; + rev = "refs/tags/${version}"; + hash = "sha256-P9wVyxTO0nz/DfuBhCE+VjhH1uYx4jBd30Ca26yBzbo="; }; - nativeCheckInputs = [ nose ]; - - checkPhase = '' - nosetests test_*.py + postPatch = '' + substituteInPlace pytest.ini \ + --replace "--cov=podcastparser --cov-report html --doctest-modules" "" ''; - meta = { - description = "podcastparser is a simple, fast and efficient podcast parser written in Python."; + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "podcastparser" + ]; + + meta = with lib; { + description = "Module to parse podcasts"; homepage = "http://gpodder.org/podcastparser/"; - license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ mic92 ]; + license = licenses.bsd2; + maintainers = with maintainers; [ mic92 ]; }; } diff --git a/pkgs/development/python-modules/podman/default.nix b/pkgs/development/python-modules/podman/default.nix new file mode 100644 index 0000000000000..677d6c2a72455 --- /dev/null +++ b/pkgs/development/python-modules/podman/default.nix @@ -0,0 +1,76 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fixtures +, pytestCheckHook +, pythonOlder +, pyxdg +, requests +, requests-mock +, setuptools +, tomli +, urllib3 +, wheel +}: + +buildPythonPackage rec { + pname = "podman"; + version = "4.7.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "containers"; + repo = "podman-py"; + rev = "refs/tags/v${version}"; + hash = "sha256-0p3o1pTqD5Y2JmyLcGS/OCb3HmRu5iqeFqoPlwAkNfY="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + pyxdg + requests + tomli + urllib3 + ]; + + nativeCheckInputs = [ + fixtures + pytestCheckHook + requests-mock + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + pythonImportsCheck = [ + "podman" + ]; + + disabledTests = [ + # Integration tests require a running container setup + "AdapterIntegrationTest" + "ContainersIntegrationTest" + "ImagesIntegrationTest" + "ManifestsIntegrationTest" + "NetworksIntegrationTest" + "PodsIntegrationTest" + "SecretsIntegrationTest" + "SystemIntegrationTest" + "VolumesIntegrationTest" + ]; + + meta = with lib; { + description = "Python bindings for Podman's RESTful API"; + homepage = "https://github.com/containers/podman-py"; + changelog = "https://github.com/containers/podman-py/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/policy-sentry/default.nix b/pkgs/development/python-modules/policy-sentry/default.nix index e358143afea37..26db669e94ba1 100644 --- a/pkgs/development/python-modules/policy-sentry/default.nix +++ b/pkgs/development/python-modules/policy-sentry/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "policy-sentry"; - version = "0.12.9"; + version = "0.12.10"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "salesforce"; repo = "policy_sentry"; rev = "refs/tags/${version}"; - hash = "sha256-mVB7qqADjf4XnDaQyL5C4/Z6hOxAMQbmr6fGnaXD+O0="; + hash = "sha256-Kha5fq5l1yXWjDZq9GFKk3gYRtrEyiCFjbEAdYGPSa8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix index ae20790af63cb..70cf9bc721ddb 100644 --- a/pkgs/development/python-modules/pontos/default.nix +++ b/pkgs/development/python-modules/pontos/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pontos"; - version = "23.9.0"; + version = "23.9.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-7AU2K4XQ7B29IY53+uh0yre8RaOZ2GFc8hpyLWQilTE="; + hash = "sha256-HRIGS2B6tc4qaOMTud5/uhEr1k7puqJUugDj1WuacqU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pony/default.nix b/pkgs/development/python-modules/pony/default.nix index 46cef25975228..892cb0829baf1 100644 --- a/pkgs/development/python-modules/pony/default.nix +++ b/pkgs/development/python-modules/pony/default.nix @@ -8,16 +8,16 @@ buildPythonPackage rec { pname = "pony"; - version = "0.7.16"; + version = "0.7.17"; format = "setuptools"; - disabled = pythonOlder "3.7" || pythonAtLeast "3.11"; + disabled = pythonOlder "3.8" || pythonAtLeast "3.12"; src = fetchFromGitHub { owner = "ponyorm"; repo = pname; - rev = "v${version}"; - hash = "sha256-yATIsX2nKsW5DBwg9/LznQqf+XPY3q46WZut18Sr0v0="; + rev = "refs/tags/v${version}"; + hash = "sha256-wBqw+YHKlxYplgsYL1pbkusHyPfCaVPcH/Yku6WDYbE="; }; nativeCheckInputs = [ @@ -26,7 +26,6 @@ buildPythonPackage rec { disabledTests = [ # Tests are outdated - "test_exception_msg" "test_method" ]; diff --git a/pkgs/development/python-modules/port-for/default.nix b/pkgs/development/python-modules/port-for/default.nix new file mode 100644 index 0000000000000..9efcd9acfaff0 --- /dev/null +++ b/pkgs/development/python-modules/port-for/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, setuptools +}: + +buildPythonPackage rec { + pname = "port-for"; + version = "0.7.1"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "kmike"; + repo = "port-for"; + rev = "refs/tags/v${version}"; + hash = "sha256-/45TQ2crmTupRgL9hgZGw5IvFKywezSIHqHFbeAkMoo="; + }; + + nativeBuildInputs = [ setuptools ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + pythonImportsCheck = [ "port_for" ]; + + meta = with lib; { + homepage = "https://github.com/kmike/port-for"; + description = "Command-line utility and library that helps with TCP port managment"; + changelog = "https://github.com/kmike/port-for/blob/v${version}/CHANGES.rst"; + license = licenses.mit; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/posthog/default.nix b/pkgs/development/python-modules/posthog/default.nix index d6136cf717236..0f20800ece0d4 100644 --- a/pkgs/development/python-modules/posthog/default.nix +++ b/pkgs/development/python-modules/posthog/default.nix @@ -14,7 +14,7 @@ }: let pname = "posthog"; - version = "3.0.1"; + version = "3.0.2"; in buildPythonPackage { inherit pname version; @@ -24,7 +24,7 @@ buildPythonPackage { owner = "PostHog"; repo = "posthog-python"; rev = "refs/tags/v${version}"; - hash = "sha256-GSHsa05DUcbIHg1HCoIn8d4NZoG+Iddqfgod2nP4fX0="; + hash = "sha256-QASqjphAWtYuIyhbFTYwv1gD+rXvrmp5W0Te4MFn1AA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pplpy/default.nix b/pkgs/development/python-modules/pplpy/default.nix index 190e28e714cd8..333c0df0a274c 100644 --- a/pkgs/development/python-modules/pplpy/default.nix +++ b/pkgs/development/python-modules/pplpy/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "pplpy"; - version = "0.8.7"; + version = "0.8.9"; src = fetchPypi { inherit pname version; - sha256 = "500bd0f4ae1a76956fae7fcba77854f5ec3e64fce76803664983763c3f2bd8bd"; + sha256 = "sha256-23o7Vx1u8FP3UTeXXpR8OhweRaMLq5Dq8hW05cwVeX4="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/prawcore/default.nix b/pkgs/development/python-modules/prawcore/default.nix index 3591476927cc8..9a8ecea7b3c24 100644 --- a/pkgs/development/python-modules/prawcore/default.nix +++ b/pkgs/development/python-modules/prawcore/default.nix @@ -1,27 +1,36 @@ { lib -, buildPythonPackage -, fetchPypi -, requests -, testfixtures -, mock -, requests-toolbelt , betamax -, betamax-serializers , betamax-matchers +, betamax-serializers +, buildPythonPackage +, fetchFromGitHub +, flit-core +, mock , pytestCheckHook , pythonOlder +, requests +, requests-toolbelt +, testfixtures }: buildPythonPackage rec { pname = "prawcore"; - version = "2.3.0"; - disabled = pythonOlder "3.6"; + version = "2.4.0"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "0vgmhjddqxnz5vy70dyqvakak51fg1nk6j3xavkc83d8nzacrwfs"; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "praw-dev"; + repo = "prawcore"; + rev = "refs/tags/v${version}"; + hash = "sha256-tECZRx6VgyiJDKHvj4Rf1sknFqUhz3sDFEsAMOeB7/g="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ requests ]; @@ -36,13 +45,15 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "prawcore" ]; + pythonImportsCheck = [ + "prawcore" + ]; meta = with lib; { description = "Low-level communication layer for PRAW"; homepage = "https://praw.readthedocs.org/"; + changelog = "https://github.com/praw-dev/prawcore/blob/v${version}/CHANGES.rst"; license = licenses.bsd2; - platforms = platforms.all; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/prayer-times-calculator/default.nix b/pkgs/development/python-modules/prayer-times-calculator/default.nix index 7e96bf4196b4e..672c4c393da33 100644 --- a/pkgs/development/python-modules/prayer-times-calculator/default.nix +++ b/pkgs/development/python-modules/prayer-times-calculator/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "prayer-times-calculator"; - version = "0.0.8"; + version = "0.0.9"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "uchagani"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Zk7lzZUfojJrsrLRS9cf9AhEfGGsxZJo2MnIIOv6Ezk="; + hash = "sha256-QIUMxs6NOqnljTi1UNp7bCQ9TgBy/u+BWEqgr2C854g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/primer3/default.nix b/pkgs/development/python-modules/primer3/default.nix index 84068a9d96719..f4495d9b2c14a 100644 --- a/pkgs/development/python-modules/primer3/default.nix +++ b/pkgs/development/python-modules/primer3/default.nix @@ -5,12 +5,13 @@ , cython , gcc , click +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "primer3"; - version = "2.0.0"; + version = "2.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +20,7 @@ buildPythonPackage rec { owner = "libnano"; repo = "primer3-py"; rev = "refs/tags/v${version}"; - hash = "sha256-Ku2PVrWYWPKnNXeUQmstQedJg1O0hsQl4/iEnAMMEaY="; + hash = "sha256-WYn88Xv7WSc67TfYCq+i05tG8aKtWLUgc6axntvLF+8="; }; nativeBuildInputs = [ @@ -28,10 +29,18 @@ buildPythonPackage rec { gcc ]; - # pytestCheckHook leads to a circular import issue nativeCheckInputs = [ click + pytestCheckHook ]; + # We are not sure why exactly this is need. It seems `pytestCheckHook` + # doesn't find extension modules installed in $out/${python.sitePackages}, + # and the tests rely upon them. This was initially reported upstream at + # https://github.com/libnano/primer3-py/issues/120 and we investigate this + # downstream at: https://github.com/NixOS/nixpkgs/issues/255262. + preCheck = '' + python setup.py build_ext --inplace + ''; pythonImportsCheck = [ "primer3" diff --git a/pkgs/development/python-modules/psychrolib/default.nix b/pkgs/development/python-modules/psychrolib/default.nix new file mode 100644 index 0000000000000..cda0523b9698a --- /dev/null +++ b/pkgs/development/python-modules/psychrolib/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "psychrolib"; + version = "2.5.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "psychrometrics"; + repo = "psychrolib"; + rev = "refs/tags/${version}"; + hash = "sha256-OkjoYIakF7NXluNTaJnUHk5cI5t8GnpqrbqHYwnLOts="; + }; + + sourceRoot = "${src.name}/src/python"; + + nativeBuildInputs = [ + setuptools + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "psychrolib" + ]; + + meta = with lib; { + description = "Library of psychrometric functions to calculate thermodynamic properties"; + homepage = "https://github.com/psychrometrics/psychrolib"; + changelog = "https://github.com/psychrometrics/psychrolib/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 059a67299896d..47bca9e9311e4 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "0.10.0.20230920"; + version = "0.10.0.20231002"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4Sp8uyJAJ+Sg0wv6TjNkMOCKlL/c/2ToWP1byG2BZtE="; + hash = "sha256-qO8/V0UZb9lWvPb0JbUABFCJbGFu5ulRMOFH4vrhDMw="; }; passthru.optional-dependencies = { diff --git a/pkgs/development/python-modules/pvlib/default.nix b/pkgs/development/python-modules/pvlib/default.nix index 46b1c99b0d06d..683295edbc7fc 100644 --- a/pkgs/development/python-modules/pvlib/default.nix +++ b/pkgs/development/python-modules/pvlib/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "pvlib"; - version = "0.10.1"; + version = "0.10.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi{ inherit pname version; - hash = "sha256-H3wiNCmnZ6+GjXMhDbeOL98Yy7V6s2oOFAKWJCb8XCk="; + hash = "sha256-gCOFP2heAtzpe38j1ljOz1yR1P8pRZ0eILVK8Kd3tFc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/py-dormakaba-dkey/default.nix b/pkgs/development/python-modules/py-dormakaba-dkey/default.nix index 27443d166e76f..405c1e61cad6a 100644 --- a/pkgs/development/python-modules/py-dormakaba-dkey/default.nix +++ b/pkgs/development/python-modules/py-dormakaba-dkey/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "py-dormakaba-dkey"; - version = "1.0.4"; + version = "1.0.5"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "emontnemery"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-1jIsKQa27XNVievU02jjanRWFtJDYsHolgPBab6qpM0="; + hash = "sha256-kS99du9EZwki6J2q+nI44rx/AWIPtq7wXR/61ZcyUSM="; }; patches = [ diff --git a/pkgs/development/python-modules/py-nextbusnext/default.nix b/pkgs/development/python-modules/py-nextbusnext/default.nix index 67e934dad1d1a..2d01e0cf8ffa2 100644 --- a/pkgs/development/python-modules/py-nextbusnext/default.nix +++ b/pkgs/development/python-modules/py-nextbusnext/default.nix @@ -2,31 +2,35 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "py-nextbusnext"; - version = "0.1.5"; - + version = "1.0.0"; format = "setuptools"; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "ViViDboarder"; repo = "py_nextbus"; - rev = "v${version}"; - hash = "sha256-uUHA8v5iTISmPaTgk0RvcLLRM34f3JXUjZClKGXdMoI="; + rev = "refs/tags/v${version}"; + hash = "sha256-044VDg7bQNNnRGiPZW9gwo3Bzq0LPYKTrd3EgmBOcGA="; }; nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "py_nextbus" ]; + pythonImportsCheck = [ + "py_nextbus" + ]; - meta = { + meta = with lib; { description = "Minimalistic Python client for the NextBus public API"; homepage = "https://github.com/ViViDboarder/py_nextbus"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ dotlambda ]; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index 951d5d849714a..94bf1eef12d8f 100644 --- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pytelegrambotapi"; - version = "4.13.0"; + version = "4.14.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "eternnoir"; repo = "pyTelegramBotAPI"; rev = "refs/tags/${version}"; - hash = "sha256-5P0DfQL8lwCY4nvp5efB7fO7YyBMTRaB4qflkc+Arso="; + hash = "sha256-R52j4JnoM0nlZvlcDox2Wz3WjTEstNaqbg8SPiPHD4c="; }; passthru.optional-dependencies = { diff --git a/pkgs/development/python-modules/pyathena/default.nix b/pkgs/development/python-modules/pyathena/default.nix index 5aab2c91702d4..1a517aaf6ff4c 100644 --- a/pkgs/development/python-modules/pyathena/default.nix +++ b/pkgs/development/python-modules/pyathena/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pyathena"; - version = "3.0.7"; + version = "3.0.8"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Mdb+pEkXbwRVx3wxpPdwkCweNO48/GuYiOLATbPUpwQ="; + hash = "sha256-DqRjtMSlyo2PB4ipOpPxFEWl/RuKlT3yWddzCS5NL98="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pybloom-live/default.nix b/pkgs/development/python-modules/pybloom-live/default.nix new file mode 100644 index 0000000000000..0499350a7c827 --- /dev/null +++ b/pkgs/development/python-modules/pybloom-live/default.nix @@ -0,0 +1,49 @@ +{ lib +, bitarray +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +, setuptools +, wheel +, xxhash +}: + +buildPythonPackage rec { + pname = "pybloom-live"; + version = "4.0.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "pybloom_live"; + inherit version; + hash = "sha256-mVRcXTsFvTiLVJHja4I7cGgwpoa6GLTBkGPQjeUyERA="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + bitarray + xxhash + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pybloom_live" + ]; + + meta = with lib; { + description = "A Probabilistic data structure"; + homepage = "https://github.com/joseph-fox/python-bloomfilter"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pycapnp/default.nix b/pkgs/development/python-modules/pycapnp/default.nix index cd2e8f450cd2b..b18fa3b3fc7f5 100644 --- a/pkgs/development/python-modules/pycapnp/default.nix +++ b/pkgs/development/python-modules/pycapnp/default.nix @@ -31,7 +31,10 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://capnproto.github.io/pycapnp/"; - maintainers = with maintainers; [ cstrahan lukeadams ]; + maintainers = with maintainers; [ ]; license = licenses.bsd2; + # No support for capnproto 1.0 yet + # https://github.com/capnproto/pycapnp/issues/323 + broken = lib.versionAtLeast capnproto.version "1.0"; }; } diff --git a/pkgs/development/python-modules/pycatch22/default.nix b/pkgs/development/python-modules/pycatch22/default.nix new file mode 100644 index 0000000000000..5fea89e740a34 --- /dev/null +++ b/pkgs/development/python-modules/pycatch22/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, pandas +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pycatch22"; + version = "0.4.3"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "DynamicsAndNeuralSystems"; + repo = "pycatch22"; + rev = "refs/tags/v${version}"; + hash = "sha256-wjMklOzU9I3Y2HdZ+rOTiffoKda+6X9zwDsmB+HXrSY="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pandas + ]; + + # This packages does not have real tests + # But we can run this file as smoketest + checkPhase = '' + runHook preCheck + + python tests/testing.py + + runHook postCheck + ''; + + pythonImportsCheck = [ + "pycatch22" + ]; + + meta = with lib; { + description = "Python implementation of catch22"; + homepage = "https://github.com/DynamicsAndNeuralSystems/pycatch22"; + changelog = "https://github.com/DynamicsAndNeuralSystems/pycatch22/releases/tag/v${version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ mbalatsko ]; + }; +} diff --git a/pkgs/development/python-modules/pycookiecheat/default.nix b/pkgs/development/python-modules/pycookiecheat/default.nix index 08085b03c87c1..4a539f5ee191c 100644 --- a/pkgs/development/python-modules/pycookiecheat/default.nix +++ b/pkgs/development/python-modules/pycookiecheat/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pycookiecheat"; - version = "0.5.0"; + version = "0.6.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "n8henrie"; repo = "pycookiecheat"; rev = "refs/tags/v${version}"; - hash = "sha256-3I7iw/dwF4lRqmVM3OR402InZCFoV9gzKpRQrx4F9KA="; + hash = "sha256-mSc5FqMM8BICVEdSdsIny9Bnk6qCRekPk4RkBusDoVA="; }; pythonRelaxDeps = [ @@ -51,10 +51,18 @@ buildPythonPackage rec { "pycookiecheat" ]; + preCheck = '' + export HOME=$(mktemp -d) + ''; + disabledTests = [ # Tests want to use playwright executable "test_no_cookies" "test_fake_cookie" + "test_firefox_cookies" + "test_load_firefox_cookie_db" + "test_firefox_no_cookies" + "test_firefox_get_default_profile" ] ++ lib.optionals stdenv.isDarwin [ "test_slack_config" ]; diff --git a/pkgs/development/python-modules/pyctr/default.nix b/pkgs/development/python-modules/pyctr/default.nix index bf72bf6b3a522..7f1a8d6d01b17 100644 --- a/pkgs/development/python-modules/pyctr/default.nix +++ b/pkgs/development/python-modules/pyctr/default.nix @@ -1,24 +1,35 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder -, pycryptodomex }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, pycryptodomex +}: buildPythonPackage rec { pname = "pyctr"; - version = "0.6.0"; + version = "0.7.1"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-05lMcsIeJIHI3LwHQTjr4M+bn1FG+GQscuGq34XxjK8="; + hash = "sha256-SnCps5nzrl+dkbloRbjhaOGDzKOsi8OHX2JXgoJ/XG0="; }; - propagatedBuildInputs = [ pycryptodomex ]; + propagatedBuildInputs = [ + pycryptodomex + ]; - pythonImportsCheck = [ "pyctr" ]; + pythonImportsCheck = [ + "pyctr" + ]; meta = with lib; { description = "Python library to interact with Nintendo 3DS files"; + homepage = "https://github.com/ihaveamac/pyctr"; + changelog = "https://github.com/ihaveamac/pyctr/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ rileyinman ]; - homepage = "https://github.com/ihaveamac/pyctr"; }; } diff --git a/pkgs/development/python-modules/pydata-sphinx-theme/default.nix b/pkgs/development/python-modules/pydata-sphinx-theme/default.nix index b2beabc547616..794ded6318e4b 100644 --- a/pkgs/development/python-modules/pydata-sphinx-theme/default.nix +++ b/pkgs/development/python-modules/pydata-sphinx-theme/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pydata-sphinx-theme"; - version = "0.14.0"; + version = "0.14.1"; format = "wheel"; @@ -23,7 +23,7 @@ buildPythonPackage rec { dist = "py3"; python = "py3"; pname = "pydata_sphinx_theme"; - hash = "sha256-vffSdZFOdnVijKK/brOiHQ76DmuZo6VCGDJZQHZ1TDM="; + hash = "sha256-xDYCe8dq4CPfTnBRfjuvkM3aWojuRrgYte8Mw4hKugQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pydrawise/default.nix b/pkgs/development/python-modules/pydrawise/default.nix index 4adda6c53ccca..24c5d3b21feb7 100644 --- a/pkgs/development/python-modules/pydrawise/default.nix +++ b/pkgs/development/python-modules/pydrawise/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pydrawise"; - version = "2023.8.0"; + version = "2023.9.4"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "dknowles2"; repo = "pydrawise"; rev = "refs/tags/${version}"; - hash = "sha256-cnQJ0enDgOB66rEZePmfTImFrPNMiXfggATM6hsL+ag="; + hash = "sha256-e6S5osxNh61KSLEq8NWZadXEcZT8DCKBavuIQjyJgAA="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/pyduotecno/default.nix b/pkgs/development/python-modules/pyduotecno/default.nix index 6c1db830955a7..ad6e0b5f31c41 100644 --- a/pkgs/development/python-modules/pyduotecno/default.nix +++ b/pkgs/development/python-modules/pyduotecno/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyduotecno"; - version = "2023.8.4"; + version = "2023.9.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Cereal2nd"; repo = "pyDuotecno"; rev = "refs/tags/${version}"; - hash = "sha256-VDDDG/D21yumWmcTC0mwXoGItB7OTdVCcjo01W1YZXY="; + hash = "sha256-UPyx/e06N2cAct6/r1y5LXAzKwANQ/ZpADQsjxBv6/Q="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pydyf/default.nix b/pkgs/development/python-modules/pydyf/default.nix index b44b691c83e15..0cf3c5677cdcb 100644 --- a/pkgs/development/python-modules/pydyf/default.nix +++ b/pkgs/development/python-modules/pydyf/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pydyf"; - version = "0.7.0"; + version = "0.8.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-paiMsG5b62Sh7yFH7oebDlE59f24J/2i/PFKAYx7EeY="; + hash = "sha256-sise8BYUG1SUGtZu1OA2p73/OcCzYJk7KDh1w/hU3Zo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyenphase/default.nix b/pkgs/development/python-modules/pyenphase/default.nix index ca106a91fac4b..716846949ade8 100644 --- a/pkgs/development/python-modules/pyenphase/default.nix +++ b/pkgs/development/python-modules/pyenphase/default.nix @@ -56,6 +56,11 @@ buildPythonPackage rec { syrupy ]; + disabledTests = [ + # https://github.com/pyenphase/pyenphase/issues/97 + "test_with_7_x_firmware" + ]; + pythonImportsCheck = [ "pyenphase" ]; diff --git a/pkgs/development/python-modules/pyerfa/default.nix b/pkgs/development/python-modules/pyerfa/default.nix index 4b9c5039f36af..fda4be537d921 100644 --- a/pkgs/development/python-modules/pyerfa/default.nix +++ b/pkgs/development/python-modules/pyerfa/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , jinja2 , oldest-supported-numpy , setuptools-scm @@ -8,20 +9,28 @@ , liberfa , packaging , numpy +, pytestCheckHook +, pytest-doctestplus }: buildPythonPackage rec { pname = "pyerfa"; format = "pyproject"; - version = "2.0.0.1"; - - doCheck = false; + version = "2.0.0.3"; src = fetchPypi { inherit pname version; - hash = "sha256-L9Rjf/4sHm7edILBP1g7p8cxGdeL75AXVEjOUGoO3jA="; + hash = "sha256-13+7+lg1DBlMy5nl2TqgXTwrFNWq2LZi2Txq2f/0Hzk="; }; + patches = [ + # Sort of helps maybe for https://github.com/liberfa/pyerfa/issues/112 + (fetchpatch { + url = "https://github.com/liberfa/pyerfa/commit/4866342b94c5e7344711146f1186a4c3e7534da8.patch"; + hash = "sha256-uPFFdLYfRweQdeEApBAw6Ulqh31NTQwwmnaU+x/M+C0="; + }) + ]; + nativeBuildInputs = [ jinja2 oldest-supported-numpy @@ -31,14 +40,32 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - liberfa numpy ]; + buildInputs = [ + liberfa + ]; preBuild = '' export PYERFA_USE_SYSTEM_LIBERFA=1 ''; + # See https://github.com/liberfa/pyerfa/issues/112#issuecomment-1721197483 + NIX_CFLAGS_COMPILE = "-O2"; + nativeCheckInputs = [ + pytestCheckHook + pytest-doctestplus + ]; + # Getting circular import errors without this, not clear yet why. This was mentioned to + # upstream at: https://github.com/liberfa/pyerfa/issues/112 and downstream at + # https://github.com/NixOS/nixpkgs/issues/255262 + preCheck = '' + cd $out + ''; + pythonImportsCheck = [ + "erfa" + ]; + meta = with lib; { description = "Python bindings for ERFA routines"; longDescription = '' diff --git a/pkgs/development/python-modules/pyfaidx/default.nix b/pkgs/development/python-modules/pyfaidx/default.nix index 3965a31e58c24..c1d081baaadbb 100644 --- a/pkgs/development/python-modules/pyfaidx/default.nix +++ b/pkgs/development/python-modules/pyfaidx/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "pyfaidx"; - version = "0.7.2.1"; + version = "0.7.2.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-MPDSCp49UzU/sg62m34i5vAaU+1PIbPhfdQI8L5QUaA="; + hash = "sha256-O3aTwFLIJpEAD+SpJHXbgv/DtachoSsQ37yHEZxLTTA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyfibaro/default.nix b/pkgs/development/python-modules/pyfibaro/default.nix index 595a997e62b2f..b1a38f11f6acc 100644 --- a/pkgs/development/python-modules/pyfibaro/default.nix +++ b/pkgs/development/python-modules/pyfibaro/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyfibaro"; - version = "0.7.3"; + version = "0.7.5"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "rappenze"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-pCj69lLcoNTyZRe6SVkFpPK2Ex8927WzAJ5OCot9xP4="; + hash = "sha256-hllYxPPbLu3dpjHwXfIvTMW0LWtcglTVfN7youZaXTw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyfiglet/default.nix b/pkgs/development/python-modules/pyfiglet/default.nix index 61420455dac34..0b3bdb7f6d345 100644 --- a/pkgs/development/python-modules/pyfiglet/default.nix +++ b/pkgs/development/python-modules/pyfiglet/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { - version = "1.0.1"; + version = "1.0.2"; pname = "pyfiglet"; src = fetchPypi { inherit pname version; - sha256 = "sha256-x9kIim+CG99pxY2XVzeAhadogWJrIwjmu9pwcSFgfxg="; + sha256 = "sha256-dYeIAYq4+q3cCYTh6gX/Mw08ZL5mPFE8wfEF9qMGbas="; }; doCheck = false; diff --git a/pkgs/development/python-modules/pyftpdlib/default.nix b/pkgs/development/python-modules/pyftpdlib/default.nix index e48513b55ce4c..f40dc187124ca 100644 --- a/pkgs/development/python-modules/pyftpdlib/default.nix +++ b/pkgs/development/python-modules/pyftpdlib/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyftpdlib"; - version = "1.5.7"; + version = "1.5.8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fqPOQTfbggmvH2ueoCBZD0YsY+18ehJAvVluTTp7ZW4="; + hash = "sha256-v22rtn3/MrP/BA4oJf/7xrjecDc7ydm1U0gMxNdQTWw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pygitguardian/default.nix b/pkgs/development/python-modules/pygitguardian/default.nix index 9eff246330348..14bea088c0980 100644 --- a/pkgs/development/python-modules/pygitguardian/default.nix +++ b/pkgs/development/python-modules/pygitguardian/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pygitguardian"; - version = "1.9.0"; + version = "1.10.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "GitGuardian"; repo = "py-gitguardian"; rev = "refs/tags/v${version}"; - hash = "sha256-lDs2H5GUf3fhTSX+20dD0FNW2oirkgQQk5t7GKSnKe4="; + hash = "sha256-o5Hur51Dh4HWI7f4BpfEi40/inVAJgYF3xXZGPMyF8E="; }; nativeBuildInputs = [ @@ -49,17 +49,21 @@ buildPythonPackage rec { disabledTests = [ # Tests require an API key - "test_health_check" - "test_multi_content_scan" + "test_compute_sca_files" "test_content_scan_exceptions" - "test_multi_content_exceptions" "test_content_scan" + "test_create_honeytoken" + "test_create_jwt" "test_extra_headers" + "test_health_check" + "test_multi_content_exceptions" + "test_multi_content_scan" "test_multiscan_parameters" "test_quota_overview" + "test_sca_client_scan_diff" + "test_sca_scan_directory_invalid_tar" + "test_sca_scan_directory" "test_versions_from_headers" - "test_create_honeytoken" - "test_create_jwt" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pygithub/default.nix b/pkgs/development/python-modules/pygithub/default.nix index a42c41a392ddf..cbfacc2c4f362 100644 --- a/pkgs/development/python-modules/pygithub/default.nix +++ b/pkgs/development/python-modules/pygithub/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pygithub"; - version = "1.59.1"; + version = "2.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "PyGithub"; repo = "PyGithub"; rev = "refs/tags/v${version}"; - hash = "sha256-tzM2+nLBHTbKlQ7HLmNRq4Kn62vmz1MaGyZsnaJSrgQ="; + hash = "sha256-ysa1RAWuFFQCF6bYwAUVFou7nxCKHLZbUtrUtXiSpPk="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/pygobject-stubs/default.nix b/pkgs/development/python-modules/pygobject-stubs/default.nix index 77ec68ea28842..f2c2668f4043b 100644 --- a/pkgs/development/python-modules/pygobject-stubs/default.nix +++ b/pkgs/development/python-modules/pygobject-stubs/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pygobject-stubs"; - version = "2.8.0"; + version = "2.9.0"; format = "pyproject"; src = fetchFromGitHub { owner = "pygobject"; repo = "pygobject-stubs"; - rev = "v${version}"; - hash = "sha256-8TB8eqXPhvoKtyQ8+hnCQnH4NwO2WC1NYAxmVj+FCvg="; + rev = "refs/tags/v${version}"; + hash = "sha256-A28vH5S5xxY7VIJORbgQ7jAi/wG4WiffNGryiumHWf0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyinsteon/default.nix b/pkgs/development/python-modules/pyinsteon/default.nix index dbf6ab12b44eb..8980da8e24bda 100644 --- a/pkgs/development/python-modules/pyinsteon/default.nix +++ b/pkgs/development/python-modules/pyinsteon/default.nix @@ -4,7 +4,6 @@ , async-generator , buildPythonPackage , fetchFromGitHub -, fetchpatch , pypubsub , pyserial , pyserial-asyncio @@ -17,7 +16,7 @@ buildPythonPackage rec { pname = "pyinsteon"; - version = "1.5.0"; + version = "1.5.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -26,18 +25,9 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-REm0E7+otqDypVslB5heHEaWA+q3Nh1O96gxFeCC3As="; + hash = "sha256-H2rgPA0GW6neFIHZVZxmAP50HJUPCWDZcJ90QxLGXJ8="; }; - patches = [ - # https://github.com/pyinsteon/pyinsteon/pull/361 - (fetchpatch { - name = "relax-setuptools-dependency.patch"; - url = "https://github.com/pyinsteon/pyinsteon/commit/676bc5fff11b73a4c3fd189a6ac6d3de9ca21ae0.patch"; - hash = "sha256-kTu1+IwDrcdqelyK/vfhxw8MQBis5I1jag7YTytKQhs="; - }) - ]; - nativeBuildInputs = [ setuptools wheel diff --git a/pkgs/development/python-modules/pyixapi/default.nix b/pkgs/development/python-modules/pyixapi/default.nix new file mode 100644 index 0000000000000..80111d561b65a --- /dev/null +++ b/pkgs/development/python-modules/pyixapi/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools-scm +, requests +, pyjwt +}: + +buildPythonPackage rec { + pname = "pyixapi"; + version = "0.2.1"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-c5a8Ldbzgh8gXuCDYbKk9zR6AoiBF3Y/VQvGlSwXpR4="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ + requests + pyjwt + ]; + + pythonImportsCheck = [ "pyixapi" ]; + + meta = with lib; { + homepage = "https://github.com/peering-manager/pyixapi/"; + changelog = "https://github.com/peering-manager/pyixapi/releases/tag/${version}"; + description = "Python API client library for IX-API"; + license = licenses.asl20; + maintainers = teams.wdz.members; + }; +} diff --git a/pkgs/development/python-modules/pykalman/default.nix b/pkgs/development/python-modules/pykalman/default.nix new file mode 100644 index 0000000000000..7073e9382d3de --- /dev/null +++ b/pkgs/development/python-modules/pykalman/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchPypi +, numpy +, scipy +, pytestCheckHook +, nose +}: + +buildPythonPackage rec { + pname = "pykalman"; + version = "0.9.5"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-gWr0dyDZJKTGAW+nS54sjCEWWgjZFpPDIqF0Ho4H+zg="; + }; + + patches = [ + # https://github.com/pykalman/pykalman/issues/83 + ./fix-masked-arrays-not-supported.patch + # python 3.11 issues fix: https://github.com/pykalman/pykalman/pull/101 + ./fix-p311-issues.patch + ]; + + propagatedBuildInputs = [ + numpy + scipy + ]; + + nativeCheckInputs = [ + pytestCheckHook + nose + ]; + pythonImportsCheck = [ "pykalman" ]; + + meta = with lib; { + description = "An implementation of the Kalman Filter, Kalman Smoother, and EM algorithm in Python"; + homepage = "https://github.com/pykalman/pykalman"; + license = licenses.bsd2; + maintainers = with maintainers; [ mbalatsko ]; + }; +} diff --git a/pkgs/development/python-modules/pykalman/fix-masked-arrays-not-supported.patch b/pkgs/development/python-modules/pykalman/fix-masked-arrays-not-supported.patch new file mode 100644 index 0000000000000..f6dc6679cc54a --- /dev/null +++ b/pkgs/development/python-modules/pykalman/fix-masked-arrays-not-supported.patch @@ -0,0 +1,14 @@ +--- a/pykalman/utils.py ++++ b/pykalman/utils.py +@@ -70,7 +70,10 @@ + cv_chol = linalg.cholesky(cv + min_covar * np.eye(n_dim), + lower=True) + cv_log_det = 2 * np.sum(np.log(np.diagonal(cv_chol))) +- cv_sol = solve_triangular(cv_chol, (X - mu).T, lower=True).T ++ try: ++ cv_sol = solve_triangular(cv_chol, (X - mu).T, lower=True).T ++ except ValueError: ++ cv_sol = np.linalg.solve(cv_chol, (X - mu).T).T + log_prob[:, c] = - .5 * (np.sum(cv_sol ** 2, axis=1) + \ + n_dim * np.log(2 * np.pi) + cv_log_det) + diff --git a/pkgs/development/python-modules/pykalman/fix-p311-issues.patch b/pkgs/development/python-modules/pykalman/fix-p311-issues.patch new file mode 100644 index 0000000000000..002c8b893aad2 --- /dev/null +++ b/pkgs/development/python-modules/pykalman/fix-p311-issues.patch @@ -0,0 +1,13 @@ +--- a/pykalman/utils.py ++++ b/pykalman/utils_copy.py +@@ -40,6 +40,10 @@ + from scipy import linalg + + ++# monkey patch ++if not hasattr(inspect, 'getargspec'): ++ inspect.getargspec = inspect.getfullargspec ++ + def array1d(X, dtype=None, order=None): + """Returns at least 1-d array with data from X""" + return np.asarray(np.atleast_1d(X), dtype=dtype, order=order) diff --git a/pkgs/development/python-modules/pykka/default.nix b/pkgs/development/python-modules/pykka/default.nix index dd6566548bbbf..b13aaa716f6d3 100644 --- a/pkgs/development/python-modules/pykka/default.nix +++ b/pkgs/development/python-modules/pykka/default.nix @@ -5,34 +5,44 @@ , poetry-core , pytestCheckHook , pytest-mock +, typing-extensions }: buildPythonPackage rec { pname = "pykka"; - version = "3.1.1"; + version = "4.0.0"; format = "pyproject"; - disabled = pythonOlder "3.6.1"; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "jodal"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-bvRjFpXufGygTgPfEOJOCXFbMy3dNlrTHlGoaIG/Fbs="; + hash = "sha256-xFEEv4UAKv/H//7OIBSb9juwmuH4xWd6BKBXaX2GwFU="; }; nativeBuildInputs = [ poetry-core ]; + propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [ + typing-extensions + ]; + nativeCheckInputs = [ pytestCheckHook pytest-mock ]; + pythonImportsCheck = [ + "pykka" + ]; + meta = with lib; { homepage = "https://www.pykka.org/"; description = "A Python implementation of the actor model"; - changelog = "https://github.com/jodal/pykka/blob/v${version}/docs/changes.rst"; + changelog = "https://github.com/jodal/pykka/releases/tag/v${version}"; maintainers = with maintainers; [ marsam ]; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix index 00d69542c8974..65a519f0bdffd 100644 --- a/pkgs/development/python-modules/pylitterbot/default.nix +++ b/pkgs/development/python-modules/pylitterbot/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pylitterbot"; - version = "2023.4.8"; + version = "2023.4.9"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "natekspencer"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-74EKgHocrEi37bh4WBoYyLKF1XYrwxT7e2oo3igTWms="; + hash = "sha256-QsxzwmAdhx0diPJ/bT+DgJSs70YQ77M76rq2opMq/Ew="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pymyq/default.nix b/pkgs/development/python-modules/pymyq/default.nix index afe7f7af628dc..192959065ee29 100644 --- a/pkgs/development/python-modules/pymyq/default.nix +++ b/pkgs/development/python-modules/pymyq/default.nix @@ -4,21 +4,28 @@ , buildPythonPackage , fetchFromGitHub , pkce +, poetry-core , pythonOlder }: buildPythonPackage rec { pname = "pymyq"; - version = "3.1.6"; + version = "3.1.11"; + pyproject = true; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { - owner = "arraylabs"; - repo = pname; + owner = "Python-MyQ"; + repo = "Python-MyQ"; rev = "refs/tags/v${version}"; - hash = "sha256-zhGCoZ7mkHlfDjEbQihtM23u+N6nfYsQhKmrloevzp8="; + hash = "sha256-hQnIrmt4CNxIL2+VenGaKL6xMOb/6IMq9NEFLvbbYsE="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ aiohttp beautifulsoup4 @@ -34,8 +41,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python wrapper for MyQ API"; - homepage = "https://github.com/arraylabs/pymyq"; - changelog = "https://github.com/arraylabs/pymyq/releases/tag/v${version}"; + homepage = "https://github.com/Python-MyQ/Python-MyQ"; + changelog = "https://github.com/Python-MyQ/Python-MyQ/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pynetdicom/default.nix b/pkgs/development/python-modules/pynetdicom/default.nix index f6cf6e4b999d7..4a78f020f3b7d 100644 --- a/pkgs/development/python-modules/pynetdicom/default.nix +++ b/pkgs/development/python-modules/pynetdicom/default.nix @@ -2,6 +2,7 @@ , stdenv , buildPythonPackage , fetchFromGitHub +, fetchpatch , pydicom , pyfakefs , pytestCheckHook @@ -23,6 +24,14 @@ buildPythonPackage rec { hash = "sha256-/JWQUtFBW4uqCbs/nUxj1pRBfTCXV4wcqTkqvzpdFrM="; }; + patches = [ + (fetchpatch { + name = "fix-python-3.11-test-attribute-errors"; + url = "https://github.com/pydicom/pynetdicom/pull/754/commits/2126bd932d6dfb3f07045eb9400acb7eaa1b3069.patch"; + hash = "sha256-t6Lg0sTZSWIE5q5pkBvEoHDQ+cklDn8SgNBcFk1myp4="; + }) + ]; + propagatedBuildInputs = [ pydicom ]; diff --git a/pkgs/development/python-modules/pynobo/default.nix b/pkgs/development/python-modules/pynobo/default.nix index 1be7a78c44f34..783415a2c2fb7 100644 --- a/pkgs/development/python-modules/pynobo/default.nix +++ b/pkgs/development/python-modules/pynobo/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "pynobo"; - version = "1.6.1"; + version = "1.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "echoromeo"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-T86d3HGu6hsc54+ocCbINsInH/qHL9+HhOXDQ0I8QGA="; + hash = "sha256-LJS4NJM+f+j53YzH8LradBDzHAsOprd4F7nH1cfC3B0="; }; # Project has no tests diff --git a/pkgs/development/python-modules/pyorthanc/default.nix b/pkgs/development/python-modules/pyorthanc/default.nix index 678c66d29b22c..edeb63a224593 100644 --- a/pkgs/development/python-modules/pyorthanc/default.nix +++ b/pkgs/development/python-modules/pyorthanc/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyorthanc"; - version = "1.11.5"; + version = "1.12.2"; disabled = pythonOlder "3.8"; format = "pyproject"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "gacou54"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-RZJ7BuQRJ+yaHFv9iq4uFvMtH8NvGvmpjmgmyvw9rGk="; + hash = "sha256-kgCHPp0nsbhzNw/bKwDeDc1mMcmdJUBmZExTZ01nlZY="; }; nativeBuildInputs = [ pythonRelaxDepsHook poetry-core ]; diff --git a/pkgs/development/python-modules/pyosmium/default.nix b/pkgs/development/python-modules/pyosmium/default.nix index 289f4d1c048e9..40090532fea1b 100644 --- a/pkgs/development/python-modules/pyosmium/default.nix +++ b/pkgs/development/python-modules/pyosmium/default.nix @@ -1,8 +1,8 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , cmake -, python , libosmium , protozero , boost @@ -32,6 +32,14 @@ buildPythonPackage rec { hash = "sha256-+YJQGPQm2FGOPhNzlXX2GM+ad4QdipJhwViOKGHtqBk="; }; + patches = [ + # Compatibility with recent pybind versions + (fetchpatch { + url = "https://github.com/osmcode/pyosmium/commit/31b1363389b423f49e14140ce868ecac83e92f69.patch"; + hash = "sha256-maBuwzyZ4/wVLLGVr4gZFZDKvJckUXiBluxZRPGETag="; + }) + ]; + nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix index 291bcee9c5007..99a336f99d8b7 100644 --- a/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyoverkiz"; - version = "1.11.0"; + version = "1.12.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "iMicknl"; repo = "python-overkiz-api"; rev = "refs/tags/v${version}"; - hash = "sha256-ZwDqctkbF3PUu4F9s7amdBoOYQ15jJk64HK4I7rJX/A="; + hash = "sha256-r2d/lc7x45usIhT09JSNnHSErJI4zrr+HuLhznoy1CM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pypoint/default.nix b/pkgs/development/python-modules/pypoint/default.nix index b19554ea48ff1..20b4ba6d0a7ad 100644 --- a/pkgs/development/python-modules/pypoint/default.nix +++ b/pkgs/development/python-modules/pypoint/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pypoint"; - version = "2.3.1"; + version = "2.3.2"; format = "setuptools"; src = fetchFromGitHub { owner = "fredrike"; repo = "pypoint"; rev = "v${version}"; - hash = "sha256-fO0un6YIK3jutzUxbu9mSqPZHfLa3pMtfxOy1iV3Qio="; + hash = "sha256-tQ5rQs6ECn9O9dVXKWhmy9BBpOzgqSmwpmbIRbJn2CQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyproj/default.nix b/pkgs/development/python-modules/pyproj/default.nix index e65313c753ef8..0d77ed937cf1f 100644 --- a/pkgs/development/python-modules/pyproj/default.nix +++ b/pkgs/development/python-modules/pyproj/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "pyproj"; - version = "3.6.0"; + version = "3.6.1"; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "pyproj4"; repo = "pyproj"; rev = "refs/tags/${version}"; - hash = "sha256-XMJg1azsvMtVnKuIulrrZ1Of3CFk2/EgQjkN1g0FpmQ="; + hash = "sha256-ynAhu89VpvtQJRkIeVyffQHhd+OvWSiZzaI/7nd6fXA="; }; # force pyproj to use ${proj} diff --git a/pkgs/development/python-modules/pyrisco/default.nix b/pkgs/development/python-modules/pyrisco/default.nix index 72fc5ab0a2007..0233d2d0d1c4f 100644 --- a/pkgs/development/python-modules/pyrisco/default.nix +++ b/pkgs/development/python-modules/pyrisco/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pyrisco"; - version = "0.5.7"; + version = "0.5.8"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "OnFreund"; repo = pname; rev = "v${version}"; - hash = "sha256-ySFHB+PZmjsqKJQrfFoupylowsOiV5B2feHX7nF8dUA="; + hash = "sha256-PQ1h9UVQ2DQMInxdAaLES7uDWAxwDra+YfAmz5jjV6g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyrogram/default.nix b/pkgs/development/python-modules/pyrogram/default.nix index 58598e1460bd5..c947cbaaa4eb6 100644 --- a/pkgs/development/python-modules/pyrogram/default.nix +++ b/pkgs/development/python-modules/pyrogram/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyrogram"; - version = "2.0.101"; + version = "2.0.106"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pyrogram"; repo = "pyrogram"; rev = "v${version}"; - hash = "sha256-HFOT8PqK7n42j2H8EJ5c7h9PL28icQwYErPNcxPgoM8="; + hash = "sha256-W/t3v5q0s+ba0Uly+JUaJl75uDQGeFaj2zDKGRMIMow="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pysensibo/default.nix b/pkgs/development/python-modules/pysensibo/default.nix index 0d79ed3116255..603800f9a1696 100644 --- a/pkgs/development/python-modules/pysensibo/default.nix +++ b/pkgs/development/python-modules/pysensibo/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pysensibo"; - version = "1.0.33"; + version = "1.0.35"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-A7IzAIV8dQVSmYTEp9yeySQ8eXnLFVkiuWFS3pe2YTA="; + hash = "sha256-E3XUQ7Ltu9zhjWVvl1LN+UUz8B2dAjLa0CZI9ca35nc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyserial-asyncio-fast/default.nix b/pkgs/development/python-modules/pyserial-asyncio-fast/default.nix new file mode 100644 index 0000000000000..d935b2c171551 --- /dev/null +++ b/pkgs/development/python-modules/pyserial-asyncio-fast/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# build-system +, setuptools +, wheel + +# dependencies +, pyserial + +# tests +, pytestCheckHook +, pytest-asyncio +}: + +buildPythonPackage rec { + pname = "pyserial-asyncio-fast"; + version = "0.11"; + pyproject = true; + + src = fetchFromGitHub { + owner = "bdraco"; + repo = "pyserial-asyncio-fast"; + rev = version; + hash = "sha256-B1CLk7ggI7l+DaMDlnMjl2tfh+evvaf1nxzBpmqMBZk="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + pyserial + ]; + + pythonImportsCheck = [ + "serial_asyncio_fast" + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + ]; + + meta = with lib; { + description = "Fast asyncio extension package for pyserial that implements eager writes"; + homepage = "https://github.com/bdraco/pyserial-asyncio-fast"; + license = licenses.bsd3; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/pyside6/default.nix b/pkgs/development/python-modules/pyside6/default.nix index be99c0a086fb8..e03516742527d 100644 --- a/pkgs/development/python-modules/pyside6/default.nix +++ b/pkgs/development/python-modules/pyside6/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, fetchpatch2 , cmake , ninja , python @@ -15,6 +16,15 @@ stdenv.mkDerivation rec { sourceRoot = "pyside-setup-everywhere-src-${version}/sources/${pname}"; + patches = [ + # Needed to build against qt 6.5.3, until pyside 6.5.3 is released + (fetchpatch2 { + url = "https://code.qt.io/cgit/pyside/pyside-setup.git/patch/sources/pyside6?id=63ef7628091c8827e3d0d688220d3ae165587eb2"; + hash = "sha256-TN1xdBkrzZhNontShMC1SKyJK6a8fOk/Di3zX3kv5+I="; + stripLen = 2; + }) + ]; + # FIXME: cmake/Macros/PySideModules.cmake supposes that all Qt frameworks on macOS # reside in the same directory as QtCore.framework, which is not true for Nix. postPatch = lib.optionalString stdenv.isLinux '' diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index 73a7a012c7930..de8736efedf84 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.40.0"; + version = "0.40.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-ST1UwgmlKhnLqr/cIvZRpNEYjxv9URInmkVbi6GA7/c="; + hash = "sha256-qKNsXN9nc3YS1gRNPPQUBgXDs01/rhdtRz707cfaYx8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytablewriter/default.nix b/pkgs/development/python-modules/pytablewriter/default.nix index 86af2ae0846fd..67ba86f6ad6ef 100644 --- a/pkgs/development/python-modules/pytablewriter/default.nix +++ b/pkgs/development/python-modules/pytablewriter/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "pytablewriter"; - version = "1.0.0"; + version = "1.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "thombashi"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-VDx7/kKRBho4oWvUXYe5K9CC4vUCDs91G05Wlpa47OE="; + hash = "sha256-bxqSZUEG3upWoXt1mo8GI9yd8FHAm111mOGSCCMRVYI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytensor/default.nix b/pkgs/development/python-modules/pytensor/default.nix index a3257131ac1ac..b3472f306ebb0 100644 --- a/pkgs/development/python-modules/pytensor/default.nix +++ b/pkgs/development/python-modules/pytensor/default.nix @@ -1,40 +1,51 @@ -{ stdenv -, lib +{ lib , buildPythonPackage -, cons +, fetchFromGitHub , cython +, versioneer +, cons , etuples -, fetchFromGitHub , filelock -, jax -, jaxlib , logical-unification , minikanren +, numpy +, scipy +, typing-extensions +, jax +, jaxlib , numba , numba-scipy -, numpy +, pytest-mock , pytestCheckHook , pythonOlder -, scipy -, typing-extensions +# Tensorflow is currently (2023/10/04) broken. +# Thus, we don't provide this optional test dependency. +# , tensorflow-probability +, stdenv }: buildPythonPackage rec { pname = "pytensor"; - version = "2.11.3"; - format = "setuptools"; + version = "2.17.1"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "pymc-devs"; - repo = pname; + repo = "pytensor"; rev = "refs/tags/rel-${version}"; - hash = "sha256-4GDur8S19i8pZkywKHZUelmd2e0jZmC5HzF7o2esDl4="; + hash = "sha256-xXS0uNR5rlmUjt9/TW/X/pQc5MS/MwHSQGCp7BkAVYg="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "versioneer[toml]==0.28" "versioneer[toml]" + ''; + nativeBuildInputs = [ cython + versioneer ]; propagatedBuildInputs = [ @@ -48,19 +59,18 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ jax jaxlib numba numba-scipy + pytest-mock pytestCheckHook + # Tensorflow is currently (2023/10/04) broken. + # Thus, we don't provide this optional test dependency. + # tensorflow-probability ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "--durations=50" "" - ''; - preBuild = '' export HOME=$(mktemp -d) ''; @@ -76,13 +86,14 @@ buildPythonPackage rec { "test_logsumexp_benchmark" "test_scan_multiple_output" "test_vector_taps_benchmark" + # Temporarily disabled because of broken tensorflow-probability + "test_tfp_ops" ]; disabledTestPaths = [ # Don't run the most compute-intense tests "tests/scan/" "tests/tensor/" - "tests/sandbox/" "tests/sparse/sandbox/" ]; diff --git a/pkgs/development/python-modules/pytest-celery/default.nix b/pkgs/development/python-modules/pytest-celery/default.nix index 2a6ad34d706ad..0af07db4ec1f8 100644 --- a/pkgs/development/python-modules/pytest-celery/default.nix +++ b/pkgs/development/python-modules/pytest-celery/default.nix @@ -1,10 +1,10 @@ -{ lib, buildPythonPackage, fetchFromGitHub }: +{ lib, buildPythonPackage, fetchFromGitHub, flit-core }: buildPythonPackage rec { pname = "pytest-celery"; version = "0.1.0"; - format = "flit"; + format = "pyproject"; src = fetchFromGitHub { owner = "celery"; @@ -19,6 +19,10 @@ buildPythonPackage rec { --replace '"celery >= 4.4.0"' "" ''; + nativeBuildInputs = [ + flit-core + ]; + # This package has nothing to test or import. doCheck = false; diff --git a/pkgs/development/python-modules/pytest-check/default.nix b/pkgs/development/python-modules/pytest-check/default.nix index dbbf42c9b6a0a..1f11f31e21398 100644 --- a/pkgs/development/python-modules/pytest-check/default.nix +++ b/pkgs/development/python-modules/pytest-check/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, flit-core , pytest , pytestCheckHook }: @@ -8,14 +9,18 @@ buildPythonPackage rec { pname = "pytest-check"; version = "2.1.4"; - format = "flit"; + format = "pyproject"; src = fetchPypi { inherit pname version; hash = "sha256-AbN/1wPaD6ZntwF68fBGDHRKhfHuh2de4+D5Ssw98XI="; }; - buildInputs = [ + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-cid/default.nix b/pkgs/development/python-modules/pytest-cid/default.nix index 29cf253fad2f7..eea7a6ead0ee5 100644 --- a/pkgs/development/python-modules/pytest-cid/default.nix +++ b/pkgs/development/python-modules/pytest-cid/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , buildPythonPackage , pythonOlder +, flit-core , py-cid , pytestCheckHook , pytest-cov @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "pytest-cid"; version = "1.1.2"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { @@ -25,6 +26,10 @@ buildPythonPackage rec { --replace "pytest >= 5.0, < 7.0" "pytest >= 5.0" ''; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ py-cid ]; diff --git a/pkgs/development/python-modules/pytest-md-report/default.nix b/pkgs/development/python-modules/pytest-md-report/default.nix index 89b035e74d83e..be52de50f415f 100644 --- a/pkgs/development/python-modules/pytest-md-report/default.nix +++ b/pkgs/development/python-modules/pytest-md-report/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pytest-md-report"; - version = "0.4.0"; + version = "0.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-iabj6WuS6+65O4ztagT1/H+U8/SKySQ9bQiOfvln1AQ="; + hash = "sha256-4946iE+VYaPndJtQLQE7Q7VSs4aXxrg3wL4p84oT5to="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-param-files/default.nix b/pkgs/development/python-modules/pytest-param-files/default.nix index bf629cc356abc..80dea1dbeaad2 100644 --- a/pkgs/development/python-modules/pytest-param-files/default.nix +++ b/pkgs/development/python-modules/pytest-param-files/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { hash = "sha256-Q7wWoggJN2w2a2umQHx5TsVcugqpovBEtOKruNMZQ8A="; }; - format = "flit"; + format = "pyproject"; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/pytest-postgresql/default.nix b/pkgs/development/python-modules/pytest-postgresql/default.nix new file mode 100644 index 0000000000000..6eed5ef6ad2c9 --- /dev/null +++ b/pkgs/development/python-modules/pytest-postgresql/default.nix @@ -0,0 +1,73 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, setuptools +, mirakuru +, port-for +, psycopg +, pytest +, postgresql +}: + +buildPythonPackage rec { + pname = "pytest-postgresql"; + version = "5.0.0"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "ClearcodeHQ"; + repo = "pytest-postgresql"; + rev = "refs/tags/v${version}"; + hash = "sha256-uWKp9yxTdlswoDPMlhx+2mF1cdhFzhGYKGHdXPGlz+w="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "--cov" "" \ + --replace "--max-worker-restart=0" "" + sed -i 's#/usr/lib/postgresql/.*/bin/pg_ctl#${postgresql}/bin/pg_ctl#' pytest_postgresql/plugin.py + ''; + + buildInputs = [ pytest ]; + + propagatedBuildInputs = [ + mirakuru + port-for + psycopg + setuptools # requires 'pkg_resources' at runtime + ]; + + nativeCheckInputs = [ + postgresql + pytestCheckHook + ]; + pytestFlagsArray = [ + "-p" + "no:postgresql" + ]; + disabledTestPaths = [ "tests/docker/test_noproc_docker.py" ]; # requires Docker + disabledTests = [ + # permissions issue running pg as Nixbld user + "test_executor_init_with_password" + # "ValueError: Pytest terminal summary report not found" + "test_postgres_options_config_in_cli" + "test_postgres_options_config_in_ini" + ]; + pythonImportsCheck = [ + "pytest_postgresql" + "pytest_postgresql.executor" + ]; + + + meta = with lib; { + homepage = "https://pypi.python.org/pypi/pytest-postgresql"; + description = "Pytest plugin that enables you to test code on a temporary PostgreSQL database"; + changelog = "https://github.com/ClearcodeHQ/pytest-postgresql/blob/v${version}/CHANGES.rst"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-raisin/default.nix b/pkgs/development/python-modules/pytest-raisin/default.nix index 2b3860c93f946..2da96d21c9ea3 100644 --- a/pkgs/development/python-modules/pytest-raisin/default.nix +++ b/pkgs/development/python-modules/pytest-raisin/default.nix @@ -1,14 +1,14 @@ { lib , buildPythonPackage , fetchFromGitHub -, flit-core +, flit , pytest }: buildPythonPackage rec { pname = "pytest-raisin"; version = "0.4"; - format = "flit"; + format = "pyproject"; src = fetchFromGitHub { owner = "wimglenn"; @@ -18,7 +18,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - flit-core + flit ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-repeat/default.nix b/pkgs/development/python-modules/pytest-repeat/default.nix index 9bd2ee22ad814..7db1992d5f852 100644 --- a/pkgs/development/python-modules/pytest-repeat/default.nix +++ b/pkgs/development/python-modules/pytest-repeat/default.nix @@ -1,34 +1,44 @@ { lib , buildPythonPackage , fetchPypi -, setuptools-scm , pytest +, pytestCheckHook +, pythonOlder +, setuptools-scm }: buildPythonPackage rec { pname = "pytest-repeat"; - version = "0.9.1"; + version = "0.9.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "5cd3289745ab3156d43eb9c8e7f7d00a926f3ae5c9cf425bec649b2fe15bad5b"; + hash = "sha256-eWc0Ra6ZruMzuBHH0AN660CPkzuImDdf8vT/8eO6aGs="; }; nativeBuildInputs = [ setuptools-scm ]; - nativeCheckInputs = [ + buildInputs = [ pytest ]; - checkPhase = '' - pytest - ''; + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pytest_repeat" + ]; meta = with lib; { description = "Pytest plugin for repeating tests"; homepage = "https://github.com/pytest-dev/pytest-repeat"; + changelog = "https://github.com/pytest-dev/pytest-repeat/blob/v${version}/CHANGES.rst"; license = licenses.mpl20; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/pytest-reverse/default.nix b/pkgs/development/python-modules/pytest-reverse/default.nix new file mode 100644 index 0000000000000..bd413c4d70500 --- /dev/null +++ b/pkgs/development/python-modules/pytest-reverse/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, pytest +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pytest-reverse"; + version = "1.7.0"; + format = "pyproject"; + + disable = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "adamchainz"; + repo = "pytest-reverse"; + rev = version; + hash = "sha256-r0aSbUgArHQkpaXUvMT6oyOxEliQRtSGuDt4IILzhH4="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + buildInputs = [ pytest ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "pytest_reverse" ]; + + meta = with lib; { + description = "Pytest plugin to reverse test order"; + homepage = "https://github.com/adamchainz/pytest-reverse"; + changelog = "https://github.com/adamchainz/pytest-reverse/blob/${version}/CHANGELOG.rst"; + license = licenses.mit; + maintainers = with maintainers; [ mbalatsko ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-spec/default.nix b/pkgs/development/python-modules/pytest-spec/default.nix new file mode 100644 index 0000000000000..4a73084bd4521 --- /dev/null +++ b/pkgs/development/python-modules/pytest-spec/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytest +, pytestCheckHook +, pytest-describe +, pytest-cov +}: + +buildPythonPackage rec { + pname = "pytest-spec"; + version = "unstable-2023-06-04"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pchomik"; + repo = "pytest-spec"; + rev = "e16e0550dd6bc557411e4312b7b42d53b26e69ef"; + hash = "sha256-dyDUdZJU4E4y1yCzunAX2c48Qv6ogu0b60U/5YbJvIU="; + }; + + postPatch = '' + sed -i '/addopts/d' setup.cfg + # TODO: upstream + substituteInPlace pyproject.toml \ + --replace "poetry>=0.12" "poetry-core" \ + --replace "poetry.masonry.api" "poetry.core.masonry.api" + ''; + + nativeBuildInputs = [ poetry-core ]; + + buildInputs = [ pytest ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-describe + ]; + + pytestFlagsArray = [ "--spec" ]; + + pythonImportsCheck = [ "pytest_spec" ]; + + meta = { + description = "A pytest plugin to display test execution output like a SPECIFICATION"; + homepage = "https://github.com/pchomik/pytest-spec"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ tomasajt ]; + }; +} diff --git a/pkgs/development/python-modules/python-fx/default.nix b/pkgs/development/python-modules/python-fx/default.nix index 729c5ed9a180b..d505e0a19654e 100644 --- a/pkgs/development/python-modules/python-fx/default.nix +++ b/pkgs/development/python-modules/python-fx/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "python-fx"; - version = "0.2.0"; + version = "0.3.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "cielong"; repo = "pyfx"; rev = "refs/tags/v${version}"; - hash = "sha256-nRMeYL0JGvCtUQBUMXUsZ4+F2KX+x/CbZ61sAidT9so="; + hash = "sha256-BXKH3AlYMNbMREW5Qx72PrbuZdXlmVS+knWWu/y9PsA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-keystoneclient/default.nix b/pkgs/development/python-modules/python-keystoneclient/default.nix index 92b9f6364e7a8..bfcb750197bcc 100644 --- a/pkgs/development/python-modules/python-keystoneclient/default.nix +++ b/pkgs/development/python-modules/python-keystoneclient/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "python-keystoneclient"; - version = "5.1.0"; + version = "5.2.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-ugm9/q+iohlkUKMnzT9G8qip3Z0huDj4y5sXqZdAxqE="; + hash = "sha256-cqQsOGniEouwxiashWw9vz447xbX6F3TVWe4LNJFOak="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix b/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix index 51385c4643426..27057d92ea12b 100644 --- a/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix +++ b/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "python-lsp-jsonrpc"; - version = "1.1.1"; + version = "1.1.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "python-lsp"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-XTvnDTaP5oweGSq1VItq+SEv7S/LrQq4YP1XQc3bxbk="; + hash = "sha256-5WN/31e6WCgXVzevMuQbNjyo/2jjWDF+m48nrLKS+64="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/python-ndn/default.nix b/pkgs/development/python-modules/python-ndn/default.nix index 4f7307f155e06..a96501dbbf3c8 100644 --- a/pkgs/development/python-modules/python-ndn/default.nix +++ b/pkgs/development/python-modules/python-ndn/default.nix @@ -4,16 +4,19 @@ , buildPythonPackage , fetchFromGitHub , lark +, poetry-core +, poetry-dynamic-versioning , pycryptodomex , pygtrie , pytestCheckHook +, pythonRelaxDepsHook , pythonOlder , setuptools }: buildPythonPackage rec { pname = "python-ndn"; - version = "0.3-3"; + version = "0.4.1"; format = "pyproject"; @@ -21,16 +24,19 @@ buildPythonPackage rec { owner = "named-data"; repo = pname; rev = "v${version}"; - hash = "sha256-XS71oIydyLYtx6OQGO5NrhjVSyZxnhufrZ1y/6TffPo="; + hash = "sha256-ArTP4LQu7VNjI/N13gMTc1SDiNmW5l4GdLYOk8JEfKg="; }; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.11"; nativeBuildInputs = [ setuptools + poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ + poetry-dynamic-versioning pycryptodomex lark pygtrie @@ -42,7 +48,11 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "ndn" ]; + pythonRelaxDeps = [ + "lark" + ]; + + pythonImportChecks = [ "ndn" ]; meta = with lib; { description = "An NDN client library with AsyncIO support"; diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix index d0cecb30bb95b..fdafe57d5ccf0 100644 --- a/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/pkgs/development/python-modules/python-openstackclient/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "python-openstackclient"; - version = "6.2.0"; + version = "6.3.0"; src = fetchPypi { inherit pname version; - hash = "sha256-fFOr4bc7RT9Z2ntzZ5w7dZtI5RuLBUhktf3qLqgnJ9Y="; + hash = "sha256-m6C9+NAwh+WFtAqNzEKc673V/ewkwdYKECv58zEyDfE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index a8e019ce88b70..7fa3607037571 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "0.33.2"; + version = "0.34.6"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -29,9 +29,14 @@ buildPythonPackage rec { owner = "humbertogontijo"; repo = "python-roborock"; rev = "refs/tags/v${version}"; - hash = "sha256-UAQlKfh6oljeWtEGYx7JiT1z9yFCAXRSlI4Ot6JUnoQ="; + hash = "sha256-c55E5J0PKk9FG3KDIO0R3vGQjYjj8u7zXz8o9oA1Grc="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "poetry-core==1.6.1" "poetry-core" + ''; + pythonRelaxDeps = [ "pycryptodome" ]; diff --git a/pkgs/development/python-modules/python-tds/default.nix b/pkgs/development/python-modules/python-tds/default.nix new file mode 100644 index 0000000000000..502ff14336666 --- /dev/null +++ b/pkgs/development/python-modules/python-tds/default.nix @@ -0,0 +1,74 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, six +, pytestCheckHook +, pyopenssl +, pyspnego +, namedlist +, pydes +, cryptography +}: + +buildPythonPackage rec { + pname = "python-tds"; + version = "1.13.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "denisenkom"; + repo = "pytds"; + rev = version; + hash = "sha256-ubAXCifSfNtxbFIJZD8IuK/8oPT9vo77YBCexoO9zsw="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "version.get_git_version()" '"${version}"' + ''; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + six + ]; + + nativeCheckInputs = [ + pytestCheckHook + pyopenssl + pyspnego + namedlist + pydes + cryptography + ]; + + disabledTests = [ + # ImportError: To use NTLM authentication you need to install ntlm-auth module + # ntlm-auth has been removed from nixpkgs + "test_ntlm" + + # TypeError: CertificateBuilder.add_extension() got an unexpected keyword argument 'extension' + # Tests are broken for pyOpenSSL>=23.0.0 + # https://github.com/denisenkom/pytds/blob/1.13.0/test_requirements.txt + "test_with_simple_server_req_encryption" + "test_both_server_and_client_encryption_on" + "test_server_has_enc_on_but_client_is_off" + "test_only_login_encrypted" + "test_server_encryption_not_supported" + "test_server_with_bad_name_in_cert" + "test_cert_with_san" + "test_encrypted_socket" + ]; + + pythonImportsCheck = [ "pytds" ]; + + meta = with lib; { + description = "Python DBAPI driver for MSSQL using pure Python TDS (Tabular Data Stream) protocol implementation"; + homepage = "https://python-tds.readthedocs.io/"; + license = licenses.mit; + maintainers = with maintainers; [ mbalatsko ]; + }; +} diff --git a/pkgs/development/python-modules/python-utils/default.nix b/pkgs/development/python-modules/python-utils/default.nix index 499a7660664dd..30803442d0815 100644 --- a/pkgs/development/python-modules/python-utils/default.nix +++ b/pkgs/development/python-modules/python-utils/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "python-utils"; - version = "3.7.0"; + version = "3.8.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "WoLpH"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-WSP5LQQZnm9k0v/xbsUHgQiwmhcb2Uw9BQurC1ieMjI="; + hash = "sha256-HoKdMDs67lsuVRb5d51wx6qyEjEM973yD6O6qMO+7MI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-xz/default.nix b/pkgs/development/python-modules/python-xz/default.nix new file mode 100644 index 0000000000000..b5a2ed4e21f92 --- /dev/null +++ b/pkgs/development/python-modules/python-xz/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "python-xz"; + version = "0.4.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-OYdGWTtwb6n6xZuMmI6rhgPh/iupGVERwLRSJ6OnfbM="; + }; + + nativeBuildInputs = [ setuptools-scm ]; + + # has no tests + doCheck = false; + + pythonImportsCheck = [ "xz" ]; + + meta = with lib; { + description = "Pure Python library for seeking within compressed xz files"; + homepage = "https://github.com/Rogdham/python-xz"; + license = licenses.mit; + maintainers = with lib.maintainers; [ mxmlnkn ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/python-modules/python_docs_theme/default.nix b/pkgs/development/python-modules/python_docs_theme/default.nix index 1e3776b906a5e..90cf78e4d69b1 100644 --- a/pkgs/development/python-modules/python_docs_theme/default.nix +++ b/pkgs/development/python-modules/python_docs_theme/default.nix @@ -1,9 +1,9 @@ -{ lib, buildPythonPackage, fetchFromGitHub, sphinx }: +{ lib, buildPythonPackage, fetchFromGitHub, flit-core, sphinx }: buildPythonPackage rec { pname = "python_docs_theme"; version = "2023.7"; - format = "flit"; + format = "pyproject"; src = fetchFromGitHub { owner = "python"; @@ -12,6 +12,8 @@ buildPythonPackage rec { sha256 = "sha256-43/TlgYm7Q4ZtY25MiLU9fd1atDmiDUeUK6AYfDfmag="; }; + nativeBuildInputs = [ flit-core ]; + propagatedBuildInputs = [ sphinx ]; pythonImportsCheck = [ "python_docs_theme" ]; diff --git a/pkgs/development/python-modules/pythonocc-core/default.nix b/pkgs/development/python-modules/pythonocc-core/default.nix index 7873574b0a1b2..cedf05029c9ce 100644 --- a/pkgs/development/python-modules/pythonocc-core/default.nix +++ b/pkgs/development/python-modules/pythonocc-core/default.nix @@ -1,4 +1,7 @@ -{ lib, stdenv, python, fetchFromGitHub +{ lib +, stdenv +, python +, fetchFromGitHub , cmake , Cocoa , fontconfig @@ -11,7 +14,6 @@ , libXmu , opencascade-occt , rapidjson -, smesh , swig4 }: @@ -34,7 +36,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake swig4 ]; buildInputs = [ - python opencascade-occt smesh + python opencascade-occt freetype libGL libGLU libX11 libXext libXmu libXi fontconfig rapidjson ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; @@ -42,10 +44,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-Wno-dev" "-DPYTHONOCC_INSTALL_DIRECTORY=${placeholder "out"}/${python.sitePackages}/OCC" - - "-DSMESH_INCLUDE_PATH=${smesh}/include/smesh" - "-DSMESH_LIB_PATH=${smesh}/lib" - "-DPYTHONOCC_WRAP_SMESH=TRUE" ]; passthru = { @@ -57,6 +55,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Python wrapper for the OpenCASCADE 3D modeling kernel"; homepage = "https://github.com/tpaviot/pythonocc-core"; + changelog = "https://github.com/tpaviot/pythonocc-core/releases/tag/${version}"; license = licenses.lgpl3; platforms = platforms.unix; maintainers = with maintainers; [ gebner ]; diff --git a/pkgs/development/python-modules/pytorch-lightning/default.nix b/pkgs/development/python-modules/pytorch-lightning/default.nix index 5d46e647dc8aa..9e0a7a2018dbf 100644 --- a/pkgs/development/python-modules/pytorch-lightning/default.nix +++ b/pkgs/development/python-modules/pytorch-lightning/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "pytorch-lightning"; - version = "2.0.8"; + version = "2.0.9"; format = "pyproject"; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "pytorch-lightning"; rev = "refs/tags/${version}"; - hash = "sha256-Z/5d7aUO9UO7c9PoekxP8PMajKlh//hk/YIp+BJMcho="; + hash = "sha256-2HjdqC7JU28nVAJdaEkwmJOTfWBCqHcM1a1sHIfF3ME="; }; preConfigure = '' diff --git a/pkgs/development/python-modules/pytrafikverket/default.nix b/pkgs/development/python-modules/pytrafikverket/default.nix index 3cb161c281c46..d8365a034ebc3 100644 --- a/pkgs/development/python-modules/pytrafikverket/default.nix +++ b/pkgs/development/python-modules/pytrafikverket/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pytrafikverket"; - version = "0.3.6"; + version = "0.3.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-HHvjwkJ+7QMu1lMe6ouV2j3Y67Vv9aoVaJaKDLXbJpU="; + hash = "sha256-9s4KbYFhQVf+16GT4hbGkmwxQhtMu60SwrLWHbdJXAY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index cde97a3074667..641ce68f9039e 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.68"; + version = "9.2.71"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Wsme663FssNGG/XhjkFi3tFeyli1yiofBQQiXi9P6nI="; + hash = "sha256-AnSd9+r4+Qz3CyIgA3tOXAYJROOvAR3nI/9fSFeYl24="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvmomi/default.nix b/pkgs/development/python-modules/pyvmomi/default.nix index e8dfc2745fb8c..7a740efe5a4e5 100644 --- a/pkgs/development/python-modules/pyvmomi/default.nix +++ b/pkgs/development/python-modules/pyvmomi/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyvmomi"; - version = "8.0.1.0.2"; + version = "8.0.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "vmware"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-NI2xkHo9A9zEvdbTt9vF91gavSnCuFjdjr6PxEvkSZM="; + hash = "sha256-IoYxk/lS7dhw0q3kfpq7y/oDNmc1dOra0YA3CiHe8YM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyweatherflowudp/default.nix b/pkgs/development/python-modules/pyweatherflowudp/default.nix new file mode 100644 index 0000000000000..9519831c6d2af --- /dev/null +++ b/pkgs/development/python-modules/pyweatherflowudp/default.nix @@ -0,0 +1,62 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pint +, poetry-core +, psychrolib +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pyweatherflowudp"; + version = "1.4.4"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "briis"; + repo = "pyweatherflowudp"; + rev = "refs/tags/v${version}"; + hash = "sha256-5WdkT4U/+uO9UUIxumrxCKZnK9MdQcvfaO9UfpmpxJE="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + pint + psychrolib + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pyweatherflowudp" + ]; + + disabledTests = [ + # Tests require network access + "test_flow_control" + "test_listen_and_stop" + "test_repetitive_listen_and_stop" + "test_process_message" + "test_listener_connection_errors" + "test_invalid_messages" + ]; + + meta = with lib; { + description = "Library to receive UDP Packets from Weatherflow Weatherstations"; + homepage = "https://github.com/briis/pyweatherflowudp"; + changelog = "https://github.com/briis/pyweatherflowudp/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} + diff --git a/pkgs/development/python-modules/pywerview/default.nix b/pkgs/development/python-modules/pywerview/default.nix index aeffc4f03954a..ac637d4501a89 100644 --- a/pkgs/development/python-modules/pywerview/default.nix +++ b/pkgs/development/python-modules/pywerview/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pywerview"; - version = "0.5.1"; + version = "0.5.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "the-useless-one"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-0vL1kMg4XRFq1CWR/2x5YYyfjm8YzjJaXkezehsT4hg="; + hash = "sha256-BWH9zYrlbzQC0/cc5k5BlXWyh38gI+hwwTCWhe1xgog="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pywlroots/default.nix b/pkgs/development/python-modules/pywlroots/default.nix index 68a4753ba06de..78f64f1a3e5ee 100644 --- a/pkgs/development/python-modules/pywlroots/default.nix +++ b/pkgs/development/python-modules/pywlroots/default.nix @@ -20,19 +20,19 @@ buildPythonPackage rec { pname = "pywlroots"; - version = "0.15.24"; + version = "0.16.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-TvYhxiAbK+mpcEE9y79WH96dzeDnvI0xPaUxSYQqyHE="; + hash = "sha256-W43RCJektumgvO9K3K3mHR1BiyZXsHj4fN2EkGlJChQ="; }; nativeBuildInputs = [ pkg-config ]; propagatedNativeBuildInputs = [ cffi ]; - buildInputs = [ libinput libxkbcommon pixman xorg.libxcb udev wayland wlroots ]; + buildInputs = [ libinput libxkbcommon pixman xorg.libxcb xorg.xcbutilwm udev wayland wlroots ]; propagatedBuildInputs = [ cffi pywayland xkbcommon ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/qcelemental/default.nix b/pkgs/development/python-modules/qcelemental/default.nix index 7b12781ba160c..9ac348304e5e1 100644 --- a/pkgs/development/python-modules/qcelemental/default.nix +++ b/pkgs/development/python-modules/qcelemental/default.nix @@ -6,22 +6,26 @@ , numpy , pint , pydantic +, poetry-core , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "qcelemental"; - version = "0.25.1"; - format = "setuptools"; + version = "0.26.0"; + + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4+DlP+BH0UdWcYRBBApdc3E18L2zPvsdY6GTW5WCGnQ="; + hash = "sha256-oU6FEM2/2mRe8UYcGv0C77WZMRcz27pfg/zR1haKbd0="; }; + nativeBuildInputs = [ poetry-core ]; + propagatedBuildInputs = [ networkx numpy diff --git a/pkgs/development/python-modules/qcengine/default.nix b/pkgs/development/python-modules/qcengine/default.nix index abb84e1e73750..5b240104ca896 100644 --- a/pkgs/development/python-modules/qcengine/default.nix +++ b/pkgs/development/python-modules/qcengine/default.nix @@ -8,18 +8,19 @@ , pythonOlder , pyyaml , qcelemental +, msgpack }: buildPythonPackage rec { pname = "qcengine"; - version = "0.26.0"; + version = "0.28.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-jBA3exH/qzEaKZeumvgKD0tKnDptZdlv1KykyUHs8Bg="; + hash = "sha256-ebZayF5VGHXjBFO3k2KegCNqAFygB3BXKvdvr8mF/Ss="; }; propagatedBuildInputs = [ @@ -28,6 +29,7 @@ buildPythonPackage rec { pydantic pyyaml qcelemental + msgpack ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/qcodes-loop/default.nix b/pkgs/development/python-modules/qcodes-loop/default.nix index 2590a557b8cea..ee9cb180a35a5 100644 --- a/pkgs/development/python-modules/qcodes-loop/default.nix +++ b/pkgs/development/python-modules/qcodes-loop/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , fetchpatch , fetchPypi , pythonOlder @@ -97,5 +98,7 @@ buildPythonPackage rec { homepage = "https://github.com/QCoDeS/Qcodes_loop"; license = licenses.mit; maintainers = with maintainers; [ evilmav ]; + # Some tests fail on this platform + broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/python-modules/qcs-api-client/default.nix b/pkgs/development/python-modules/qcs-api-client/default.nix index e140c949b631f..0b38510d66033 100644 --- a/pkgs/development/python-modules/qcs-api-client/default.nix +++ b/pkgs/development/python-modules/qcs-api-client/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "qcs-api-client"; - version = "0.21.6"; + version = "0.23.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "rigetti"; repo = "qcs-api-client-python"; rev = "refs/tags/v${version}"; - hash = "sha256-1vXqwir3lAM+m/HGHWuXl20muAOasEWo1H0RjUCShTM="; + hash = "sha256-Z+RCjpSpfYU3oU5HQ8CzZfwqUjMHvCKVn+p2tq+VDxQ="; }; patches = [ diff --git a/pkgs/development/python-modules/qpsolvers/default.nix b/pkgs/development/python-modules/qpsolvers/default.nix index 18141543c98c7..367416c296020 100644 --- a/pkgs/development/python-modules/qpsolvers/default.nix +++ b/pkgs/development/python-modules/qpsolvers/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , buildPythonPackage , unittestCheckHook +, flit-core , daqp , ecos , numpy @@ -14,7 +15,7 @@ buildPythonPackage rec { pname = "qpsolvers"; version = "3.4.0"; - format = "flit"; + format = "pyproject"; src = fetchFromGitHub { owner = "qpsolvers"; @@ -35,6 +36,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + flit-core quadprog unittestCheckHook ]; diff --git a/pkgs/development/python-modules/qtile-extras/default.nix b/pkgs/development/python-modules/qtile-extras/default.nix index 44e6a2dcc906c..9555ef07c36af 100644 --- a/pkgs/development/python-modules/qtile-extras/default.nix +++ b/pkgs/development/python-modules/qtile-extras/default.nix @@ -4,8 +4,10 @@ , setuptools-scm , pytestCheckHook , xorgserver +, imagemagick , pulseaudio , pytest-asyncio +, pytest-lazy-fixture , qtile , keyring , requests @@ -14,14 +16,14 @@ buildPythonPackage rec { pname = "qtile-extras"; - version = "0.22.1"; - format = "setuptools"; + version = "0.23.0"; + format = "pyproject"; src = fetchFromGitHub { owner = "elParaguayo"; repo = pname; rev = "v${version}"; - hash = "sha256-2dMpGLtwIp7+aoOgYav2SAjaKMiXHmmvsWTBEIMKEW4="; + hash = "sha256-WI1z8vrbZiJw6fDHK27mKA+1FyZEQTMttIDNzSIX+PU="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -31,9 +33,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook xorgserver + imagemagick ]; checkInputs = [ pytest-asyncio + pytest-lazy-fixture qtile pulseaudio keyring @@ -52,9 +56,21 @@ buildPythonPackage rec { "test_tvh_widget_recording" "test_tvh_widget_popup" "test_snapcast_options" + "test_snapcast_icon" + "test_snapcast_icon_colour" + "test_snapcast_http_error" + "test_syncthing_not_syncing" + "test_syncthing_is_syncing" + "test_syncthing_http_error" + "test_githubnotifications_colours" + "test_githubnotifications_logging" + "test_githubnotifications_icon" + "test_githubnotifications_reload_token" + "test_image_size_horizontal" + "test_image_size_vertical" + "test_image_size_mask" # ValueError: Namespace Gdk not available # AssertionError: Window never appeared... - "test_gloabl_menu" "test_statusnotifier_menu" # AttributeError: 'str' object has no attribute 'canonical' "test_strava_widget_display" @@ -67,6 +83,13 @@ buildPythonPackage rec { "test_upower_critical_battery" "test_upower_charging" "test_upower_show_text" + "test_global_menu" + "test_mpris2_popup" + # No network connection + "test_wifiicon_internet_check" + # AssertionErrors + "test_widget_init_config" + "test_decoration_output" ]; preCheck = '' export HOME=$(mktemp -d) diff --git a/pkgs/development/python-modules/qtile/default.nix b/pkgs/development/python-modules/qtile/default.nix index 1d8aaa55ba6e3..7e6d4a826eeb4 100644 --- a/pkgs/development/python-modules/qtile/default.nix +++ b/pkgs/development/python-modules/qtile/default.nix @@ -5,13 +5,16 @@ , dbus-next , dbus-python , glib +, iwlib +, libdrm , libinput , libxkbcommon , mpd2 , pango +, pixman , pkg-config , psutil -, pulseaudio +, pulsectl-asyncio , pygobject3 , python-dateutil , pywayland @@ -22,19 +25,20 @@ , wayland , wlroots , xcbutilcursor +, xcbutilwm , xcffib , xkbcommon }: buildPythonPackage rec { pname = "qtile"; - version = "0.22.1"; + version = "0.23.0"; src = fetchFromGitHub { owner = "qtile"; repo = "qtile"; rev = "v${version}"; - hash = "sha256-HOyExVKOqZ4OeNM1/AiXQeiUV+EbSJLEjWEibm07ff8="; + hash = "sha256-WxnpkKqYGGEsFTt/1iCSiCzdESJP6HFJ6BztaMsMbYo="; }; patches = [ @@ -48,37 +52,42 @@ buildPythonPackage rec { --replace libpango-1.0.so.0 ${pango.out}/lib/libpango-1.0.so.0 substituteInPlace libqtile/backend/x11/xcursors.py \ --replace libxcb-cursor.so.0 ${xcbutilcursor.out}/lib/libxcb-cursor.so.0 + substituteInPlace libqtile/backend/wayland/cffi/build.py \ + --replace /usr/include/pixman-1 ${lib.getDev pixman}/include \ + --replace /usr/include/libdrm ${lib.getDev libdrm}/include/libdrm ''; SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ pkg-config - setuptools-scm setuptools + setuptools-scm ]; propagatedBuildInputs = [ - xcffib (cairocffi.override { withXcffib = true; }) - python-dateutil - dbus-python dbus-next + dbus-python + iwlib mpd2 psutil - pyxdg + pulsectl-asyncio pygobject3 + python-dateutil pywayland pywlroots + pyxdg + xcffib xkbcommon - pulseaudio ]; buildInputs = [ libinput + libxkbcommon wayland wlroots - libxkbcommon + xcbutilwm ]; doCheck = false; # Requires X server #TODO this can be worked out with the existing NixOS testing infrastructure. diff --git a/pkgs/development/python-modules/quantile-python/default.nix b/pkgs/development/python-modules/quantile-python/default.nix new file mode 100644 index 0000000000000..98206ff8aaba2 --- /dev/null +++ b/pkgs/development/python-modules/quantile-python/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "quantile-python"; + version = "1.1"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-VYYp6IxJfvO5sQgTScGuamG1NZDjF3JCmP9UxnTbeWk="; + }; + + # package has no tests + doCheck = false; + + pythonImportsCheck = [ "quantile" ]; + + meta = with lib; { + description = "Python Implementation of Graham Cormode and S. Muthukrishnan's Effective Computation of Biased Quantiles over Data Streams in ICDE'05"; + homepage = "https://github.com/matttproud/python_quantile_estimation"; + license = licenses.asl20; + maintainers = with maintainers; [ mbalatsko ]; + }; +} diff --git a/pkgs/development/python-modules/quantiphy-eval/default.nix b/pkgs/development/python-modules/quantiphy-eval/default.nix index 68eba2e94627b..92e1f94c1adcf 100644 --- a/pkgs/development/python-modules/quantiphy-eval/default.nix +++ b/pkgs/development/python-modules/quantiphy-eval/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, flit-core , inform , pythonOlder , sly @@ -9,7 +10,7 @@ buildPythonPackage rec { pname = "quantiphy-eval"; version = "0.5"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -20,6 +21,10 @@ buildPythonPackage rec { hash = "sha256-7VHcuINhe17lRNkHUnZkVOEtD6mVWk5gu0NbrLZwprg="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ inform sly diff --git a/pkgs/development/python-modules/quantiphy/default.nix b/pkgs/development/python-modules/quantiphy/default.nix index b05a0428f976f..57ac30017ce44 100644 --- a/pkgs/development/python-modules/quantiphy/default.nix +++ b/pkgs/development/python-modules/quantiphy/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, flitBuildHook +, flit-core , pytestCheckHook , pythonOlder , inform @@ -27,7 +27,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - flitBuildHook + flit-core ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/radish-bdd/default.nix b/pkgs/development/python-modules/radish-bdd/default.nix index 331cc7c5e05ba..e5cdbaf92a10a 100644 --- a/pkgs/development/python-modules/radish-bdd/default.nix +++ b/pkgs/development/python-modules/radish-bdd/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "radish-bdd"; - version = "0.16.1"; + version = "0.16.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = pname; repo = "radish"; rev = "refs/tags/v${version}"; - hash = "sha256-fzxjDMmz5NMFRTQchlCOx2igqmhS6Zg0IU5HFO5a/0k="; + hash = "sha256-ZWAHPZmyPq/BRVT6pHkTRjp2SA36+wD6x6GW9OyfG7k="; }; propagatedBuildInputs = [ @@ -60,7 +60,8 @@ buildPythonPackage rec { meta = with lib; { description = "Behaviour-Driven-Development tool for python"; - homepage = "http://radish-bdd.io"; + homepage = "https://radish-bdd.github.io/"; + changelog = "https://github.com/radish-bdd/radish/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; }; diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index 07f2bdfb469bd..f640012d9a5ed 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "3.3.0"; + version = "3.3.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "RapidFuzz"; rev = "refs/tags/v${version}"; - hash = "sha256-5JlEd7X0I/OmL260v2OMVI3h99TIpglv6Nt3EciEBEM="; + hash = "sha256-C+jQN0QXZzH0IKdC3O5uPNAEd+XSffi3nkwFSv2HqPY="; }; nativeBuildInputs = [ @@ -55,9 +55,9 @@ buildPythonPackage rec { "-fno-lto" # work around https://github.com/NixOS/nixpkgs/issues/19098 ]); - propagatedBuildInputs = [ - numpy - ]; + passthru.optional-dependencies = { + full = [ numpy ]; + }; preCheck = '' export RAPIDFUZZ_IMPLEMENTATION=cpp diff --git a/pkgs/development/python-modules/rapidgzip/default.nix b/pkgs/development/python-modules/rapidgzip/default.nix new file mode 100644 index 0000000000000..ace2bad620168 --- /dev/null +++ b/pkgs/development/python-modules/rapidgzip/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, nasm +}: + +buildPythonPackage rec { + pname = "rapidgzip"; + version = "0.10.3"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-gtxF9V7OQb34Z0cCuTh/Lbe1ttCbdaY0zpM3KHHGGuw="; + }; + + nativeBuildInputs = [ nasm ]; + + # has no tests + doCheck = false; + + pythonImportsCheck = [ "rapidgzip" ]; + + meta = with lib; { + description = "Python library for parallel decompression and seeking within compressed gzip files"; + homepage = "https://github.com/mxmlnkn/rapidgzip"; + license = licenses.mit; # dual MIT and asl20, https://internals.rust-lang.org/t/rationale-of-apache-dual-licensing/8952 + maintainers = with lib.maintainers; [ mxmlnkn ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/python-modules/ratarmount/default.nix b/pkgs/development/python-modules/ratarmount/default.nix new file mode 100644 index 0000000000000..1555dfca2197a --- /dev/null +++ b/pkgs/development/python-modules/ratarmount/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, fusepy +, ratarmountcore +}: + +buildPythonPackage rec { + pname = "ratarmount"; + version = "0.14.0"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-P+p0h+KuOsunPsXbRwxzAhr1XcEqMjQxHeHmA29+pDQ="; + }; + + propagatedBuildInputs = [ ratarmountcore fusepy ]; + + checkPhase = '' + runHook preCheck + + python tests/tests.py + + runHook postCheck + ''; + + meta = with lib; { + description = "Mounts archives as read-only file systems by way of indexing"; + homepage = "https://github.com/mxmlnkn/ratarmount"; + license = licenses.mit; + maintainers = with lib.maintainers; [ mxmlnkn ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/python-modules/ratarmountcore/default.nix b/pkgs/development/python-modules/ratarmountcore/default.nix new file mode 100644 index 0000000000000..49ffdb17cfa5e --- /dev/null +++ b/pkgs/development/python-modules/ratarmountcore/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchgit +, pythonOlder +, pytestCheckHook +, indexed-bzip2 +, indexed-gzip +, indexed-zstd +, python-xz +, rapidgzip +, rarfile +, zstandard # Python bindings +, zstd # System tool +}: + +buildPythonPackage rec { + pname = "ratarmountcore"; + version = "0.6.0"; + + disabled = pythonOlder "3.6"; + + src = fetchgit { + url = "https://github.com/mxmlnkn/ratarmount"; + # The revision is hardcoded for now to fix problems with the tests, which are not worthy of a new release + # tag because releases do not officially contain tests. On the next release, use the commented revision, + # which points to a release tag, instead. + #rev = "core-v${version}"; + rev = "ea43572dfbac4770a27ef2169f72ff73ee4a4ae9"; + hash = "sha256-sPApM5OW+UbujFXHSL4ptMaegajz7FNtXz/KftTlw+U="; + fetchSubmodules = true; + }; + + sourceRoot = "${src.name}/core"; + + propagatedBuildInputs = [ indexed-gzip indexed-bzip2 indexed-zstd python-xz rapidgzip rarfile ]; + + pythonImportsCheck = [ "ratarmountcore" ]; + + nativeCheckInputs = [ pytestCheckHook zstandard zstd ]; + + meta = with lib; { + description = "Library for accessing archives by way of indexing"; + homepage = "https://github.com/mxmlnkn/ratarmount/tree/master/core"; + license = licenses.mit; + maintainers = with lib.maintainers; [ mxmlnkn ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/python-modules/ray/default.nix b/pkgs/development/python-modules/ray/default.nix index 702be7d2f1b0b..3893ad842fdb5 100644 --- a/pkgs/development/python-modules/ray/default.nix +++ b/pkgs/development/python-modules/ray/default.nix @@ -4,7 +4,6 @@ , aiosignal , attrs , autoPatchelfHook -, buildBazelPackage , buildPythonPackage , fetchPypi , click @@ -18,7 +17,6 @@ , frozenlist , fsspec , gpustat -, grpc , grpcio , gym , jsonschema @@ -32,7 +30,6 @@ , pandas , py-spy , prometheus-client -, protobuf3_20 , psutil , pyarrow , pydantic @@ -41,14 +38,12 @@ , pythonOlder , pythonRelaxDepsHook , pyyaml -, redis , requests , scikit-image , scipy , setproctitle , smart-open , starlette -, stdenv , tabulate , tensorboardx , uvicorn @@ -144,7 +139,6 @@ buildPythonPackage rec { packaging py-spy prometheus-client - protobuf3_20 psutil pydantic pyyaml diff --git a/pkgs/development/python-modules/requests-pkcs12/default.nix b/pkgs/development/python-modules/requests-pkcs12/default.nix index a4f59da74fc93..4c939064d7597 100644 --- a/pkgs/development/python-modules/requests-pkcs12/default.nix +++ b/pkgs/development/python-modules/requests-pkcs12/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "requests-pkcs12"; - version = "1.21"; + version = "1.22"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "m-click"; repo = "requests_pkcs12"; rev = version; - hash = "sha256-0avykVnMzClFqjDdC4BW9jnZzupinG5JUwq8TuCWkgo="; + hash = "sha256-YMFeWbPTwxP/+lYojXEbJf87FNHL6QrzOdOKF5JERSE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ring-doorbell/default.nix b/pkgs/development/python-modules/ring-doorbell/default.nix index 321615b4b85ed..bd37f1c530b70 100644 --- a/pkgs/development/python-modules/ring-doorbell/default.nix +++ b/pkgs/development/python-modules/ring-doorbell/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , oauthlib +, poetry-core , pytestCheckHook , pythonOlder , pytz @@ -12,17 +13,21 @@ buildPythonPackage rec { pname = "ring-doorbell"; - version = "0.7.3"; - format = "setuptools"; + version = "0.7.4"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { pname = "ring_doorbell"; inherit version; - hash = "sha256-HYRuQZpdtBkVfFBdqQupAjzQpLIBvKGm42cCumc03GM="; + hash = "sha256-hto3MwlC6ADjKkcB/4l/uFyw+0CgvLZM0sp3FF62XUA="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ oauthlib pytz diff --git a/pkgs/development/python-modules/rkm-codes/default.nix b/pkgs/development/python-modules/rkm-codes/default.nix index 558dcdc076a66..ca003ed906975 100644 --- a/pkgs/development/python-modules/rkm-codes/default.nix +++ b/pkgs/development/python-modules/rkm-codes/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, flitBuildHook +, flit-core , setuptools }: @@ -18,7 +18,7 @@ buildPythonPackage rec { format = "pyproject"; nativeBuildInputs = [ - flitBuildHook + flit-core ]; propagatedBuildInputs = [ setuptools diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix index c180e5349b045..d2c28c0dd357d 100644 --- a/pkgs/development/python-modules/rns/default.nix +++ b/pkgs/development/python-modules/rns/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "rns"; - version = "0.5.9"; + version = "0.6.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "Reticulum"; rev = "refs/tags/${version}"; - hash = "sha256-vzFN8b+F4CO/f/7CbUpX/Xj8wZMEpz2veUXsPHYzPxE="; + hash = "sha256-QD70/i/GBxVZ4w46AGqkUGuQDI1uFdwLU7UOBKnyJ2M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/rotary-embedding-torch/default.nix b/pkgs/development/python-modules/rotary-embedding-torch/default.nix new file mode 100644 index 0000000000000..1c93184a36e6f --- /dev/null +++ b/pkgs/development/python-modules/rotary-embedding-torch/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# build-system +, setuptools +, wheel + +# dependencies +, einops +, torch +}: + +buildPythonPackage rec { + pname = "rotary-embedding-torch"; + version = "0.3.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "lucidrains"; + repo = "rotary-embedding-torch"; + rev = version; + hash = "sha256-EozW8J1i/2ym1hwUMciaWVtp7kSWfG+mC5RkWLJdK3g="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + einops + torch + ]; + + pythonImportsCheck = [ + "rotary_embedding_torch" + ]; + + doCheck = false; # no tests + + meta = with lib; { + description = "Implementation of Rotary Embeddings, from the Roformer paper, in Pytorch"; + homepage = "https://github.com/lucidrains/rotary-embedding-torch"; + license = licenses.mit; + maintainers = teams.tts.members; + }; +} diff --git a/pkgs/development/python-modules/rsskey/default.nix b/pkgs/development/python-modules/rsskey/default.nix index 095ce2b5c8cc6..61cba286d1b11 100644 --- a/pkgs/development/python-modules/rsskey/default.nix +++ b/pkgs/development/python-modules/rsskey/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, flit-core , feedparser , httpx , loca @@ -11,13 +12,17 @@ buildPythonPackage rec { pname = "rsskey"; version = "0.2.0"; - format = "flit"; + format = "pyproject"; src = fetchPypi { inherit pname version; hash = "sha256-QedLuwd0ES2LWhZ72Cjh3+ZZ7HbRyNsyLN9lNFbY5dQ="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ feedparser httpx diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index bc37fc0550065..1594d9296f3df 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "s3fs"; - version = "2023.9.1"; + version = "2023.9.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-QuGCHtlMFgfISIU9HXFevNJcEzgLb1EMLLSYx+Wz5nQ="; + hash = "sha256-ZMzOrTKoFkIt2a4daTxdY1TZn2SuJsVjiPHY4ceFgyE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index b14c9f29fbb8c..d32ee63d36f2f 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.184.0.post0"; + version = "2.188.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "aws"; repo = "sagemaker-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-gQQsHJ9b5ZbbPW0nJRdudSwaL+Hc8kwBpK9um8QWQio="; + hash = "sha256-iWNAsqDGTkELQn5K45AYpdzexE3DimI5xYWt3Udd4EI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/schedule/default.nix b/pkgs/development/python-modules/schedule/default.nix index bdcb2010742aa..443b0f73d2df4 100644 --- a/pkgs/development/python-modules/schedule/default.nix +++ b/pkgs/development/python-modules/schedule/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "schedule"; - version = "1.2.0"; + version = "1.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-tK1peq+6cYTJ62oeLrxB94FUckKs3ozq6aCiWwTAki0="; + hash = "sha256-hDvAU4uZyT8CuLUOPjmIbAby0AOyT0jhqkyt+j80Enk="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index e58a165f5ccab..7312e53ed4137 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -14,7 +14,7 @@ , pythran , wheel , nose -, pytest +, pytestCheckHook , pytest-xdist , numpy , pybind11 @@ -107,7 +107,22 @@ in buildPythonPackage { __darwinAllowLocalNetworking = true; - nativeCheckInputs = [ nose pytest pytest-xdist ]; + nativeCheckInputs = [ + nose + pytestCheckHook + pytest-xdist + ]; + + # The following tests are broken on aarch64-darwin with newer compilers and library versions. + # See https://github.com/scipy/scipy/issues/18308 + disabledTests = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + "test_a_b_neg_int_after_euler_hypergeometric_transformation" + "test_dst4_definition_ortho" + "test_load_mat4_le" + "hyp2f1_test_case47" + "hyp2f1_test_case3" + "test_uint64_max" + ]; doCheck = !(stdenv.isx86_64 && stdenv.isDarwin); @@ -145,9 +160,38 @@ in buildPythonPackage { checkPhase = '' runHook preCheck + + # Adapted from pytestCheckHook because scipy uses a custom check phase. + # It needs to pass `$args` as a Python list to `scipy.test` rather than as + # arguments to pytest on the command-line. + args="" + if [ -n "$disabledTests" ]; then + disabledTestsString=$(_pytestComputeDisabledTestsString "''${disabledTests[@]}") + args+="'-k','$disabledTestsString'" + fi + + if [ -n "''${disabledTestPaths-}" ]; then + eval "disabledTestPaths=($disabledTestPaths)" + fi + + for path in ''${disabledTestPaths[@]}; do + if [ ! -e "$path" ]; then + echo "Disabled tests path \"$path\" does not exist. Aborting" + exit 1 + fi + args+="''${args:+,}'--ignore=\"$path\"'" + done + args+="''${args:+,}$(printf \'%s\', "''${pytestFlagsArray[@]}")" + args=''${args%,} + pushd "$out" export OMP_NUM_THREADS=$(( $NIX_BUILD_CORES / 4 )) - ${python.interpreter} -c "import scipy, sys; sys.exit(scipy.test('fast', verbose=10, parallel=$NIX_BUILD_CORES) != True)" + ${python.interpreter} -c "import scipy, sys; sys.exit(scipy.test( + 'fast', + verbose=10, + extra_argv=[$args], + parallel=$NIX_BUILD_CORES + ) != True)" popd runHook postCheck ''; diff --git a/pkgs/development/python-modules/scooby/default.nix b/pkgs/development/python-modules/scooby/default.nix index e4e6719a6741a..5a858e22326be 100644 --- a/pkgs/development/python-modules/scooby/default.nix +++ b/pkgs/development/python-modules/scooby/default.nix @@ -13,16 +13,16 @@ buildPythonPackage rec { pname = "scooby"; - version = "0.7.2"; + version = "0.7.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "banesullivan"; - repo = pname; + repo = "scooby"; rev = "refs/tags/v${version}"; - hash = "sha256-eY8Ysc20Q1OHKb/LU+4gqnSgNfHCytjOnnvB24EfQto="; + hash = "sha256-BgQwsgAYtRgxxjo7NHbgNME1maoZQpocGGBW7Vddr+o="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index 03b660fcc3141..7bfa428efaef5 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -109,6 +109,8 @@ buildPythonPackage rec { "test_peek_one_element" "test_peek_lifo" "test_callback_kwargs" + # Test fails on Hydra + "test_start_requests_laziness" ] ++ lib.optionals stdenv.isDarwin [ "test_xmliter_encoding" "test_download" diff --git a/pkgs/development/python-modules/screenlogicpy/default.nix b/pkgs/development/python-modules/screenlogicpy/default.nix index 7ed829df16794..fef2b05f9e8cf 100644 --- a/pkgs/development/python-modules/screenlogicpy/default.nix +++ b/pkgs/development/python-modules/screenlogicpy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "screenlogicpy"; - version = "0.8.2"; + version = "0.9.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "dieselrabbit"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-7w2cg+LfL3w2Xxf8s7lFxE/HkqZ6RBYp8LkZTOwgK+I="; + hash = "sha256-bBdOaAr9VH7UeY/UdeKS9oOevJwW2HChJiTGCNbbikM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/seasonal/default.nix b/pkgs/development/python-modules/seasonal/default.nix new file mode 100644 index 0000000000000..6e527407fc2ea --- /dev/null +++ b/pkgs/development/python-modules/seasonal/default.nix @@ -0,0 +1,63 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, numpy +, scipy +, pandas +, matplotlib +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "seasonal"; + version = "0.3.1"; + pyproject = true; + + disable = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "welch"; + repo = "seasonal"; + # There are no tags or releases, but this commit corresponds to the 0.3.1 version + # PyPI project contains only a wheel + rev = "2a2396014d46283d0c7aff34cde5dafb6c462c58"; + hash = "sha256-8YedGylH70pI0OyefiS1PG1yc+sg+tchlgcuNvxcNqE="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace 'setup_requires=["pytest-runner"],' "" + ''; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + numpy + scipy + ]; + + passthru.optional-dependencies = { + csv = [ + pandas + ]; + plot = [ + matplotlib + ]; + }; + + pythonImportsCheck = [ "seasonal" "seasonal.trend" "seasonal.periodogram" ]; + nativeCheckInputs = [ + pytestCheckHook + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + meta = with lib; { + description = "Robustly estimate trend and periodicity in a timeseries"; + homepage = "https://github.com/welch/seasonal"; + license = licenses.mit; + maintainers = with maintainers; [ mbalatsko ]; + }; +} diff --git a/pkgs/development/python-modules/sentence-splitter/default.nix b/pkgs/development/python-modules/sentence-splitter/default.nix new file mode 100644 index 0000000000000..a544a006ce805 --- /dev/null +++ b/pkgs/development/python-modules/sentence-splitter/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub + +, pytestCheckHook +, regex +}: + +buildPythonPackage rec { + pname = "sentence-splitter"; + version = "1.4"; + + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "mediacloud"; + repo = "sentence-splitter"; + rev = version; + hash = "sha256-FxRi8fhKB9++lCTFpCAug0fxjkSVTKChLY84vkshR34="; + }; + + propagatedBuildInputs = [ + regex + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "sentence_splitter" + ]; + + meta = with lib; { + description = "Text to sentence splitter using heuristic algorithm by Philipp Koehn and Josh Schroeder"; + homepage = "https://github.com/mediacloud/sentence-splitter"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ paveloom ]; + }; +} diff --git a/pkgs/development/python-modules/sentence-transformers/default.nix b/pkgs/development/python-modules/sentence-transformers/default.nix index 4554b36d12071..9c439149964df 100644 --- a/pkgs/development/python-modules/sentence-transformers/default.nix +++ b/pkgs/development/python-modules/sentence-transformers/default.nix @@ -47,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Multilingual Sentence & Image Embeddings with BERT"; homepage = "https://github.com/UKPLab/sentence-transformers"; + changelog = "https://github.com/UKPLab/sentence-transformers/releases/tag/${src.rev}"; license = licenses.asl20; maintainers = with maintainers; [ dit7ya ]; }; diff --git a/pkgs/development/python-modules/setupmeta/default.nix b/pkgs/development/python-modules/setupmeta/default.nix index 258f958ce03f3..09a3f565d543d 100644 --- a/pkgs/development/python-modules/setupmeta/default.nix +++ b/pkgs/development/python-modules/setupmeta/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "setupmeta"; - version = "3.4.0"; + version = "3.5.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "codrsquad"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-HNGoLCTidgnaU5QA+0d/PQuCswigjdvQC3/w19i+Xuc="; + hash = "sha256-r3pGlcdem+c5I2dKrRueksesqq9HTk0oEr/xJuM7vuc="; }; preBuild = '' diff --git a/pkgs/development/python-modules/setuptools-odoo/default.nix b/pkgs/development/python-modules/setuptools-odoo/default.nix index a9129334208f2..5e262daa580e3 100644 --- a/pkgs/development/python-modules/setuptools-odoo/default.nix +++ b/pkgs/development/python-modules/setuptools-odoo/default.nix @@ -1,20 +1,25 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchFromGitHub -, lib -, nix-update-script -, pytestCheckHook , git +, pytestCheckHook +, pythonOlder , setuptools-scm , writeScript }: + buildPythonPackage rec { pname = "setuptools-odoo"; - version = "3.1.12"; + version = "3.2.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "acsone"; repo = pname; - rev = version; - hash = "sha256-GIX21gOENE0r3yFIyzwjaoEcb0XvuCqiPU8F3GLxNt4="; + rev = "refs/tags/${version}"; + hash = "sha256-aS2a1G9lssgGk3uqWgPPWpOpEnqUkCUzWsqPLQfU55k="; }; propagatedBuildInputs = [ @@ -23,6 +28,7 @@ buildPythonPackage rec { # HACK https://github.com/NixOS/nixpkgs/pull/229460 SETUPTOOLS_SCM_PRETEND_VERSION = version; + patchPhase = '' runHook prePatch @@ -55,7 +61,11 @@ buildPythonPackage rec { preBuildHooks+=(setuptoolsOdooHook) ''; - nativeCheckInputs = [ pytestCheckHook git ]; + nativeCheckInputs = [ + pytestCheckHook + git + ]; + disabledTests = [ "test_addon1_uncommitted_change" "test_addon1" @@ -65,12 +75,11 @@ buildPythonPackage rec { "test_odoo_addon5_wheel" ]; - passthru.updateScript = nix-update-script { }; - - meta = { + meta = with lib; { description = "Setuptools plugin for Odoo addons"; homepage = "https://github.com/acsone/setuptools-odoo"; - license = lib.licenses.lgpl3Only; - maintainers = with lib.maintainers; [ yajo ]; + changelog = "https://github.com/acsone/setuptools-odoo/blob/${version}/CHANGES.rst"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ yajo ]; }; } diff --git a/pkgs/development/python-modules/simple-rest-client/default.nix b/pkgs/development/python-modules/simple-rest-client/default.nix index 673028a763876..325454c30ea71 100644 --- a/pkgs/development/python-modules/simple-rest-client/default.nix +++ b/pkgs/development/python-modules/simple-rest-client/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "simple-rest-client"; - version = "1.1.3"; + version = "1.2.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "allisson"; repo = "python-simple-rest-client"; rev = version; - hash = "sha256-HdGYLDrqQvd7hvjwhC5dY2amdHUZHTYJvD1QP89lcXU="; + hash = "sha256-IaLo7nBMIabi4ZjZ4ZLJliCL/dzidaCBCmn0cq7Fzdw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/simple-websocket/default.nix b/pkgs/development/python-modules/simple-websocket/default.nix index a72bf1591a815..ecb4803599129 100644 --- a/pkgs/development/python-modules/simple-websocket/default.nix +++ b/pkgs/development/python-modules/simple-websocket/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "simple-websocket"; - version = "0.9.0"; + version = "0.10.1"; format = "pyproject"; src = fetchFromGitHub { owner = "miguelgrinberg"; repo = "simple-websocket"; rev = "refs/tags/v${version}"; - hash = "sha256-pGPHS3MbDZgXBOtsZ87ULlkGdHHfaOSDLTNN4l5wKhE="; + hash = "sha256-OdgMYi2UobIlE4cDl5aNtVaFiHPTpf5TcuohG+TCSpg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/simplemma/default.nix b/pkgs/development/python-modules/simplemma/default.nix new file mode 100644 index 0000000000000..6c7f5f7c1afb2 --- /dev/null +++ b/pkgs/development/python-modules/simplemma/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub + +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "simplemma"; + version = "0.9.1"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "adbar"; + repo = "simplemma"; + rev = "v${version}"; + hash = "sha256-2IvAJ+tRnlYISymYXznCGAoUTKkM/PoYwpZpuMSXRYQ="; + }; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "simplemma" + ]; + + meta = with lib; { + description = "Simple multilingual lemmatizer for Python, especially useful for speed and efficiency"; + homepage = "https://github.com/adbar/simplemma"; + license = licenses.mit; + maintainers = with maintainers; [ paveloom ]; + }; +} diff --git a/pkgs/development/python-modules/sip/4.x.nix b/pkgs/development/python-modules/sip/4.x.nix index d90d4ff20416e..0e1db82e8af0f 100644 --- a/pkgs/development/python-modules/sip/4.x.nix +++ b/pkgs/development/python-modules/sip/4.x.nix @@ -1,17 +1,25 @@ -{ lib, fetchurl, buildPythonPackage, python, isPyPy, pythonAtLeast, sip-module ? "sip" }: +{ lib, fetchurl, fetchpatch, buildPythonPackage, python, isPyPy, pythonAtLeast, sip-module ? "sip" }: buildPythonPackage rec { pname = sip-module; version = "4.19.25"; format = "other"; - disabled = isPyPy || pythonAtLeast "3.11"; + disabled = isPyPy; src = fetchurl { url = "https://www.riverbankcomputing.com/static/Downloads/sip/${version}/sip-${version}.tar.gz"; sha256 = "04a23cgsnx150xq86w1z44b6vr2zyazysy9mqax0fy346zlr77dk"; }; + patches = lib.optionals (pythonAtLeast "3.11") [ + (fetchpatch { + name = "sip-4-python3-11.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/python3-11.patch?h=sip4&id=67b5907227e68845cdfafcf050fedb89ed653585"; + sha256 = "sha256-cmuz2y5+T8EM/h03G2oboSnnOwrUjVKt2TUQaC9YAdE="; + }) + ]; + configurePhase = '' ${python.executable} ./configure.py \ --sip-module ${sip-module} \ diff --git a/pkgs/development/python-modules/skodaconnect/default.nix b/pkgs/development/python-modules/skodaconnect/default.nix index 759f568237a12..989dfbc8ee885 100644 --- a/pkgs/development/python-modules/skodaconnect/default.nix +++ b/pkgs/development/python-modules/skodaconnect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "skodaconnect"; - version = "1.3.6"; + version = "1.3.7"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "lendy007"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-gV/+mt6XxY1UcA1H8zM4pG1ugrDo0m876e3XG1yV32A="; + hash = "sha256-FJnByPP1hUs6ECuZh9aMJksq32xhPcWWolSFBzP7Zd8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index 14211eadd65dd..58372e493acbe 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.22.0"; + version = "3.23.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-PRJgOAC1IJjQb1c4FAbpV8bxOPL9PTbAxNXo2MABRzc="; + hash = "sha256-OsPwLOnmN3kvPmbM6lOaiTWwWvy7b9pgn1X536dCkWk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/snaptime/default.nix b/pkgs/development/python-modules/snaptime/default.nix new file mode 100644 index 0000000000000..8555e3640d559 --- /dev/null +++ b/pkgs/development/python-modules/snaptime/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python-dateutil +, pytz +}: + +buildPythonPackage rec { + pname = "snaptime"; + version = "0.2.4"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-4/HriQQ9WNMHIauYy2UCPxpMJ0DjsZdwQpixY8ktUIs="; + }; + + propagatedBuildInputs = [ + python-dateutil + pytz + ]; + + pythonImportsCheck = [ "snaptime" ]; + + # no tests on Pypi, no tags on github + doCheck = false; + + meta = with lib; { + description = "Transform timestamps with a simple DSL"; + homepage = "https://github.com/zartstrom/snaptime"; + license = licenses.mit; + maintainers = with maintainers; [ pbsds ]; + }; +} diff --git a/pkgs/development/python-modules/softlayer/default.nix b/pkgs/development/python-modules/softlayer/default.nix index d51ecb3d3e595..767d91b1220b3 100644 --- a/pkgs/development/python-modules/softlayer/default.nix +++ b/pkgs/development/python-modules/softlayer/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "softlayer"; - version = "6.1.8"; + version = "6.1.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = pname; repo = "softlayer-python"; rev = "refs/tags/v${version}"; - hash = "sha256-6LZ2vy6nkyWA7xbUl4aNi2ygRWDJTj7J9Af0GTvNLd4="; + hash = "sha256-mYezVJSBtZuNT6mG544dJhRFh26M4nN4nE3tUVB3cZQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/solo-python/default.nix b/pkgs/development/python-modules/solo-python/default.nix index b0166c303d7dd..fef12eb963a3f 100644 --- a/pkgs/development/python-modules/solo-python/default.nix +++ b/pkgs/development/python-modules/solo-python/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, flit , click , cryptography , ecdsa @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "solo-python"; version = "0.1.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -26,6 +27,10 @@ buildPythonPackage rec { hash = "sha256-XVPYr7JwxeZfZ68+vQ7a7MNiAfJ2bvMbM3R1ryVJ+OU="; }; + nativeBuildInputs = [ + flit + ]; + propagatedBuildInputs = [ click cryptography diff --git a/pkgs/development/python-modules/spacy-pkuseg/default.nix b/pkgs/development/python-modules/spacy-pkuseg/default.nix index 809e0145f2dff..b904569010f7e 100644 --- a/pkgs/development/python-modules/spacy-pkuseg/default.nix +++ b/pkgs/development/python-modules/spacy-pkuseg/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "spacy-pkuseg"; - version = "0.0.32"; + version = "0.0.33"; disabled = !isPy3k; src = fetchPypi { inherit version; pname = "spacy_pkuseg"; - hash = "sha256-9y2TZROOkIOl54u6jocZD4WtP5Ct3bVfacWKqGLISEw="; + hash = "sha256-8TFWrE4ERg8aw17f0DbplwTbutGa0KObBsNA+AKinmI="; }; # Does not seem to have actual tests, but unittest discover diff --git a/pkgs/development/python-modules/spectral-cube/default.nix b/pkgs/development/python-modules/spectral-cube/default.nix index 252f25ddad2f2..abeb5d0f9277b 100644 --- a/pkgs/development/python-modules/spectral-cube/default.nix +++ b/pkgs/development/python-modules/spectral-cube/default.nix @@ -63,5 +63,7 @@ buildPythonPackage rec { changelog = "https://github.com/radio-astro-tools/spectral-cube/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ smaret ]; + # Tests fail to start, according to Hydra + broken = true; }; } diff --git a/pkgs/development/python-modules/sphinx-design/default.nix b/pkgs/development/python-modules/sphinx-design/default.nix index 4e585353687b8..ad109b1d30fbc 100644 --- a/pkgs/development/python-modules/sphinx-design/default.nix +++ b/pkgs/development/python-modules/sphinx-design/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "sphinx-design"; version = "0.5.0"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.8"; diff --git a/pkgs/development/python-modules/sphinx-external-toc/default.nix b/pkgs/development/python-modules/sphinx-external-toc/default.nix index cc0163ba3d6eb..0aff8f37caa44 100644 --- a/pkgs/development/python-modules/sphinx-external-toc/default.nix +++ b/pkgs/development/python-modules/sphinx-external-toc/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "sphinx-external-toc"; version = "0.3.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/sphinx-hoverxref/default.nix b/pkgs/development/python-modules/sphinx-hoverxref/default.nix index f11db7fc9739f..d6237387bf88c 100644 --- a/pkgs/development/python-modules/sphinx-hoverxref/default.nix +++ b/pkgs/development/python-modules/sphinx-hoverxref/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "sphinx-hoverxref"; version = "1.3.0"; - format = "flit"; + format = "pyproject"; outputs = [ "out" "doc" ]; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/sphinx-inline-tabs/default.nix b/pkgs/development/python-modules/sphinx-inline-tabs/default.nix index 4803e8d4c1a00..0f44efae97962 100644 --- a/pkgs/development/python-modules/sphinx-inline-tabs/default.nix +++ b/pkgs/development/python-modules/sphinx-inline-tabs/default.nix @@ -1,13 +1,14 @@ { lib , buildPythonPackage , fetchFromGitHub +, flit-core , sphinx }: buildPythonPackage rec { pname = "sphinx-inline-tabs"; version = "2023.04.21"; - format = "flit"; + format = "pyproject"; src = fetchFromGitHub { owner = "pradyunsg"; @@ -16,6 +17,10 @@ buildPythonPackage rec { hash = "sha256-1oZheHDNOQU0vWL3YClQrJe94WyUJ72bCAF1UKtjJ0w="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ sphinx ]; diff --git a/pkgs/development/python-modules/sphinx-mdinclude/default.nix b/pkgs/development/python-modules/sphinx-mdinclude/default.nix index ca7e574c82fb4..d20446e91bb04 100644 --- a/pkgs/development/python-modules/sphinx-mdinclude/default.nix +++ b/pkgs/development/python-modules/sphinx-mdinclude/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "sphinx-mdinclude"; version = "0.5.3"; - format = "flit"; + format = "pyproject"; src = fetchPypi { pname = "sphinx_mdinclude"; diff --git a/pkgs/development/python-modules/sphinx-notfound-page/default.nix b/pkgs/development/python-modules/sphinx-notfound-page/default.nix index c6255bbc53838..edc8e2ce6b058 100644 --- a/pkgs/development/python-modules/sphinx-notfound-page/default.nix +++ b/pkgs/development/python-modules/sphinx-notfound-page/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "sphinx-notfound-page"; version = "0.8.3"; - format = "flit"; + format = "pyproject"; outputs = [ "out" "doc" ]; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/sphinx-pytest/default.nix b/pkgs/development/python-modules/sphinx-pytest/default.nix index 6d05a38d63a7f..ecb2cbf55e777 100644 --- a/pkgs/development/python-modules/sphinx-pytest/default.nix +++ b/pkgs/development/python-modules/sphinx-pytest/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { hash = "sha256-vRHPq6BAuhn5QvHG2BGen9v6ezA3RgFVtustsNxU+n8="; }; - format = "flit"; + format = "pyproject"; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/sqlparse/default.nix b/pkgs/development/python-modules/sqlparse/default.nix index 193fa3439b563..795647098caf4 100644 --- a/pkgs/development/python-modules/sqlparse/default.nix +++ b/pkgs/development/python-modules/sqlparse/default.nix @@ -5,6 +5,12 @@ , installShellFiles , pytestCheckHook , isPy3k + +# for passthru.tests +, django +, django_4 +, django-silk +, pgadmin4 }: buildPythonPackage rec { @@ -28,6 +34,10 @@ buildPythonPackage rec { installManPage docs/sqlformat.1 ''; + passthru.tests = { + inherit django django_4 django-silk pgadmin4; + }; + meta = with lib; { description = "Non-validating SQL parser for Python"; longDescription = '' diff --git a/pkgs/development/python-modules/sqltrie/default.nix b/pkgs/development/python-modules/sqltrie/default.nix index 77ad7ab0425f9..b18731c172f90 100644 --- a/pkgs/development/python-modules/sqltrie/default.nix +++ b/pkgs/development/python-modules/sqltrie/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "sqltrie"; - version = "0.7.0"; + version = "0.8.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-+o0JY572q3qSX4FeXsk9ke0hn94Om/N6HN3HNoUgSkc="; + hash = "sha256-9EjvMEpvGjYPUt5qCxv8xXiIxHxXfPEmluA3ZdQU2xI="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/srsly/default.nix b/pkgs/development/python-modules/srsly/default.nix index b9abe30062bfa..c3549ca3df024 100644 --- a/pkgs/development/python-modules/srsly/default.nix +++ b/pkgs/development/python-modules/srsly/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "srsly"; - version = "2.4.7"; + version = "2.4.8"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-k8LMRYh3gmHMsj3QVDsk3tgQFd2KtOwTfNfQSWUDXQg="; + hash = "sha256-sk2VplAJwkR+C0nNoEOsU/7PTwnjWNh6V0RkWPkbipE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ssdpy/default.nix b/pkgs/development/python-modules/ssdpy/default.nix new file mode 100644 index 0000000000000..ba9d32d710b18 --- /dev/null +++ b/pkgs/development/python-modules/ssdpy/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, pytestCheckHook +, pytest-mock +}: + +buildPythonPackage rec { + pname = "ssdpy"; + version = "0.4.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "MoshiBin"; + repo = "ssdpy"; + rev = version; + hash = "sha256-luOanw4aOepGxoGtmnWZosq9JyHLJb3E+25tPkkL1w0="; + }; + + nativeBuildInputs = [ setuptools ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-mock + ]; + + pythonImportsCheck = [ "ssdpy" ]; + + disabledTests = [ + # They all require network access + "test_client_json_output" + "test_discover" + "test_server_ipv4" + "test_server_ipv6" + "test_server_binds_iface" + "test_server_bind_address_ipv6" + "test_server_extra_fields" + ]; + + meta = with lib; { + changelog = "https://github.com/MoshiBin/ssdpy/releases/tag/${version}"; + description = "A lightweight, compatible SSDP library for Python"; + homepage = "https://github.com/MoshiBin/ssdpy"; + license = licenses.mit; + maintainers = with maintainers; [ mjm ]; + }; +} diff --git a/pkgs/development/python-modules/steamodd/default.nix b/pkgs/development/python-modules/steamodd/default.nix index 7db250e5ac33e..edc489b297e8e 100644 --- a/pkgs/development/python-modules/steamodd/default.nix +++ b/pkgs/development/python-modules/steamodd/default.nix @@ -1,17 +1,19 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub }: buildPythonPackage rec { pname = "steamodd"; - version = "4.23"; + version = "5.0"; format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "b95b288a8249937b9183539eef76563a6b1df286a1db04f25141e46d8814eae9"; + src = fetchFromGitHub { + owner = "Lagg"; + repo = "steamodd"; + rev = "refs/tags/v${version}"; + hash = "sha256-ySAyCOI1ISuBQ/5+UHSQVji76ZDRGjdVwlBAY9tnSmE="; }; # tests require API key diff --git a/pkgs/development/python-modules/stix2-patterns/default.nix b/pkgs/development/python-modules/stix2-patterns/default.nix new file mode 100644 index 0000000000000..3817a96fe99cd --- /dev/null +++ b/pkgs/development/python-modules/stix2-patterns/default.nix @@ -0,0 +1,64 @@ +{ lib +, antlr4-python3-runtime +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, setuptools +, pytestCheckHook +, wheel +, six +}: + +buildPythonPackage rec { + pname = "stix2-patterns"; + version = "2.0.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "oasis-open"; + repo = "cti-pattern-validator"; + rev = "refs/tags/v${version}"; + hash = "sha256-lFgnvI5a7U7/Qj4Pqjr3mx4TNDnC2/Ru7tVG7VggR7Y="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "antlr4-python3-runtime~=" "antlr4-python3-runtime>=" + ''; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + antlr4-python3-runtime + six + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "stix2patterns" + ]; + + disabledTestPaths = [ + # Exception: Could not deserialize ATN with version (expected 4) + "stix2patterns/test/v20/test_inspector.py" + "stix2patterns/test/v21/test_inspector.py" + "stix2patterns/test/v20/test_validator.py" + "stix2patterns/test/v21/test_validator.py" + ]; + + meta = with lib; { + description = "Validate patterns used to express cyber observable content in STIX Indicators"; + homepage = "https://github.com/oasis-open/cti-pattern-validator"; + changelog = "https://github.com/oasis-open/cti-pattern-validator/blob/${version}/CHANGELOG.rst"; + license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/streamlit/default.nix b/pkgs/development/python-modules/streamlit/default.nix index 95a11c70592b9..58a10bdb148bb 100755 --- a/pkgs/development/python-modules/streamlit/default.nix +++ b/pkgs/development/python-modules/streamlit/default.nix @@ -12,7 +12,7 @@ , packaging , pandas , pillow -, protobuf3 +, protobuf , pyarrow , pydeck , pympler @@ -60,7 +60,7 @@ buildPythonPackage rec { packaging pandas pillow - protobuf3 + protobuf pyarrow pydeck pympler diff --git a/pkgs/development/python-modules/syncedlyrics/default.nix b/pkgs/development/python-modules/syncedlyrics/default.nix index 267db53c14f7b..a8482b18d56a4 100644 --- a/pkgs/development/python-modules/syncedlyrics/default.nix +++ b/pkgs/development/python-modules/syncedlyrics/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "syncedlyrics"; - version = "0.6.0"; + version = "0.6.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "rtcq"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-SVB6hlVBk+0nNfJjp5zdv4A6FmVt1/NV4ov6qS1DlLI="; + hash = "sha256-oMG3TqCJfEyfF5zK8hNhyhQ1z7G+S+De8hI1GLCfctM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/syrupy/default.nix b/pkgs/development/python-modules/syrupy/default.nix index cd9d2addc6041..8759f35625966 100644 --- a/pkgs/development/python-modules/syrupy/default.nix +++ b/pkgs/development/python-modules/syrupy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "syrupy"; - version = "4.2.1"; + version = "4.5.0"; format = "pyproject"; disabled = lib.versionOlder python.version "3.8.1"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tophat"; repo = "syrupy"; rev = "refs/tags/v${version}"; - hash = "sha256-MXUuLw4+J/9JtXY1DYwBjj2sgAbO2cXQi1HnVRx3BhM="; + hash = "sha256-HRCURqnFzo1l+PjX1LtXTSVZGA36OaRgmy4xKizeuOg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/systemd/default.nix b/pkgs/development/python-modules/systemd/default.nix index ed8eb472dc50b..da81905fca37f 100644 --- a/pkgs/development/python-modules/systemd/default.nix +++ b/pkgs/development/python-modules/systemd/default.nix @@ -36,7 +36,9 @@ buildPythonPackage rec { export NIX_REDIRECTS=/etc/machine-id=$(realpath machine-id) \ LD_PRELOAD=${libredirect}/lib/libredirect.so - pytest $out/${python.sitePackages}/systemd + # Those tests assume /etc/machine-id to be available + # But our redirection technique does not work apparently + pytest $out/${python.sitePackages}/systemd -k 'not test_get_machine and not test_get_machine_app_specific and not test_reader_this_machine' ''; pythonImportsCheck = [ @@ -51,6 +53,6 @@ buildPythonPackage rec { homepage = "https://www.freedesktop.org/software/systemd/python-systemd/"; changelog = "https://github.com/systemd/python-systemd/blob/v${version}/NEWS"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ raitobezarius ]; }; } diff --git a/pkgs/development/python-modules/tabledata/default.nix b/pkgs/development/python-modules/tabledata/default.nix index 5e7b00c99efad..b178665628a60 100644 --- a/pkgs/development/python-modules/tabledata/default.nix +++ b/pkgs/development/python-modules/tabledata/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "tabledata"; - version = "1.3.1"; + version = "1.3.3"; src = fetchFromGitHub { owner = "thombashi"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-oDo+wj5MO5Zopya2lp+sU/LAnFGZy6OIdW4YgcAmw1Q="; + hash = "sha256-84KrXnks76mvIjcEeQPpwd8rPO5SMbH/jfqERaFTrWo="; }; propagatedBuildInputs = [ dataproperty typepy ]; diff --git a/pkgs/development/python-modules/tagoio-sdk/default.nix b/pkgs/development/python-modules/tagoio-sdk/default.nix index e6b9ab2d72167..a4fac1a315fdb 100644 --- a/pkgs/development/python-modules/tagoio-sdk/default.nix +++ b/pkgs/development/python-modules/tagoio-sdk/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "tagoio-sdk"; - version = "4.1.1"; + version = "4.2.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "tago-io"; repo = "sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-GHjkw7B/T+XZ3F3XCI0INpx9NWjORr0lbuGse/W25wY="; + hash = "sha256-ebNiEvQ1U0RLrH3OOt/oRRPElg+9jibj7fsEEd1hdmU="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/tank-utility/default.nix b/pkgs/development/python-modules/tank-utility/default.nix index ab4573594d95c..03d9c6c77d732 100644 --- a/pkgs/development/python-modules/tank-utility/default.nix +++ b/pkgs/development/python-modules/tank-utility/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "tank-utility"; - version = "1.4.1"; + version = "1.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,16 +20,10 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "krismolendyke"; repo = pname; - rev = version; - hash = "sha256-2cxAaSyreIzQzCUtiolEV7JbGFKL8Mob3337J0jlMsU="; + rev = "refs/tags/${version}"; + hash = "sha256-h9y3X+FSzSFt+bd/chz+x0nocHaKZ8DvreMxAYMs8/E="; }; - postPatch = '' - # urllib3[secure] is not picked-up - substituteInPlace setup.py \ - --replace "urllib3[secure]" "urllib3" - ''; - propagatedBuildInputs = [ requests urllib3 @@ -49,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for the Tank Utility API"; homepage = "https://github.com/krismolendyke/tank-utility"; + changelog = "https://github.com/krismolendyke/tank-utility/blob/${version}/HISTORY.rst"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/tbats/default.nix b/pkgs/development/python-modules/tbats/default.nix new file mode 100644 index 0000000000000..8976fef859d34 --- /dev/null +++ b/pkgs/development/python-modules/tbats/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, numpy +, pmdarima +, scikit-learn +, scipy +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "tbats"; + version = "1.1.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "intive-DataScience"; + repo = "tbats"; + rev = version; + hash = "sha256-f6QqDq/ffbnFBZRAT6KQRlqvZZSE+Pff2/o+htVabZI="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + numpy + pmdarima + scikit-learn + scipy + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + pytestFlagsArray = [ + # test_R folder is just for comparison of results with R lib + # we need only test folder + "test/" + + # several tests has same name, so we use --deselect instead of disableTests + + # Test execution is too long > 15 min + "--deselect=test/tbats/TBATS_test.py::TestTBATS::test_fit_predict_trigonometric_seasonal" + ]; + + pythonImportsCheck = [ "tbats" ]; + + meta = with lib; { + description = "BATS and TBATS forecasting methods"; + homepage = "https://github.com/intive-DataScience/tbats"; + changelog = "https://github.com/intive-DataScience/tbats/releases/tag/${src.rev}"; + license = licenses.mit; + maintainers = with maintainers; [ mbalatsko ]; + }; +} diff --git a/pkgs/development/python-modules/tempest/default.nix b/pkgs/development/python-modules/tempest/default.nix index 8f6b8c7552f85..3c8217239f233 100644 --- a/pkgs/development/python-modules/tempest/default.nix +++ b/pkgs/development/python-modules/tempest/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "tempest"; - version = "35.0.0"; + version = "36.0.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-TKGgOAOqa+1f3yXIkWxt2bVx4UT/IfQpc9rNB4fLkw0="; + hash = "sha256-97Z5C7IluOXSkkUamFuljzzvD3QxdHZ/p8mXE9jW/2I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix index 9e33acfc991e5..e73413de08013 100644 --- a/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/pkgs/development/python-modules/teslajsonpy/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "3.9.3"; + version = "3.9.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "zabuldon"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-kA2MFYryz61Mm/sPfH1NuLKnz4whtdNb6hGPYQZgQKQ="; + hash = "sha256-QqC/vPPl9R1n4rtiR+t1oy4V+bPr1QgAwIgpuxiwxj8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/textdistance/default.nix b/pkgs/development/python-modules/textdistance/default.nix index 5b50bd0a3ad02..2c2d5ee23adf6 100644 --- a/pkgs/development/python-modules/textdistance/default.nix +++ b/pkgs/development/python-modules/textdistance/default.nix @@ -1,22 +1,32 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: buildPythonPackage rec { pname = "textdistance"; - version = "4.5.0"; + version = "4.6.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Nk1D9PZjV0JmLj5s9TcqhoWUFshKPJsu+dZtRPWkOFw="; + hash = "sha256-cyxQMVzU7pRjg4ZDzxnWkiEwLDYDHqpgcMMMwKpdqMo="; }; # There aren't tests doCheck = false; - pythonImportsCheck = [ "textdistance" ]; + pythonImportsCheck = [ + "textdistance" + ]; meta = with lib; { description = "Python library for comparing distance between two or more sequences"; homepage = "https://github.com/life4/textdistance"; + changelog = "https://github.com/life4/textdistance/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/thelogrus/default.nix b/pkgs/development/python-modules/thelogrus/default.nix new file mode 100644 index 0000000000000..1dc3f301dfea1 --- /dev/null +++ b/pkgs/development/python-modules/thelogrus/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, dateutils +, fetchFromGitHub +, poetry-core +, pyaml +, pythonOlder +}: + +buildPythonPackage rec { + pname = "thelogrus"; + version = "0.7.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "unixorn"; + repo = "thelogrus"; + rev = "refs/tags/v${version}"; + hash = "sha256-96/EjDh5XcTsfUcTnsltsT6LMYbyKuM/eNyeq2Pukfo="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + dateutils + pyaml + ]; + + # Module has no unit tests + doCheck = false; + + pythonImportsCheck = [ + "thelogrus" + ]; + + meta = with lib; { + description = "Python 3 version of logrus"; + homepage = "https://github.com/unixorn/thelogrus"; + changelog = "https://github.com/unixorn/thelogrus/blob/${version}/ChangeLog.md"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/threadpoolctl/default.nix b/pkgs/development/python-modules/threadpoolctl/default.nix index bfe40429127f9..54d7fa1282931 100644 --- a/pkgs/development/python-modules/threadpoolctl/default.nix +++ b/pkgs/development/python-modules/threadpoolctl/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, flit +, flit-core , pytestCheckHook , numpy , scipy @@ -13,7 +13,7 @@ buildPythonPackage rec { version = "3.1.0"; disabled = pythonOlder "3.6"; - format = "flit"; + format = "pyproject"; src = fetchFromGitHub { owner = "joblib"; @@ -22,6 +22,10 @@ buildPythonPackage rec { hash = "sha256-/qt7cgFbvpc1BLZC7a4S0RToqSggKXAqF1Xr6xOqzw8="; }; + nativeBuildInputs = [ + flit-core + ]; + nativeCheckInputs = [ pytestCheckHook numpy diff --git a/pkgs/development/python-modules/tidyexc/default.nix b/pkgs/development/python-modules/tidyexc/default.nix index b4f7ed0ef5825..5e14812fe7bc6 100644 --- a/pkgs/development/python-modules/tidyexc/default.nix +++ b/pkgs/development/python-modules/tidyexc/default.nix @@ -2,12 +2,13 @@ , buildPythonPackage , fetchPypi , pythonOlder +, flit }: buildPythonPackage rec { pname = "tidyexc"; version = "0.10.0"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -16,6 +17,10 @@ buildPythonPackage rec { sha256 = "1gl1jmihafawg7hvnn4xb20vd2x5qpvca0m1wr2gk0m2jj42yiq6"; }; + nativeBuildInputs = [ + flit + ]; + pythonImportsCheck = [ "tidyexc" ]; diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix index 655f6b8eb1073..b1102c44e95d7 100644 --- a/pkgs/development/python-modules/tifffile/default.nix +++ b/pkgs/development/python-modules/tifffile/default.nix @@ -55,6 +55,9 @@ buildPythonPackage rec { "tifffile" ]; + # flaky, often killed due to OOM or timeout + env.SKIP_LARGE = "1"; + meta = with lib; { description = "Read and write image data from and to TIFF files"; homepage = "https://github.com/cgohlke/tifffile/"; diff --git a/pkgs/development/python-modules/tinycss2/default.nix b/pkgs/development/python-modules/tinycss2/default.nix index 4c21305ac0942..35c8578cab440 100644 --- a/pkgs/development/python-modules/tinycss2/default.nix +++ b/pkgs/development/python-modules/tinycss2/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tinycss2"; version = "1.1.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/tldextract/default.nix b/pkgs/development/python-modules/tldextract/default.nix index 1b2c1a7e6ba0a..04a6762c8c906 100644 --- a/pkgs/development/python-modules/tldextract/default.nix +++ b/pkgs/development/python-modules/tldextract/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "tldextract"; - version = "3.5.0"; + version = "3.6.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-TfHGW5W+YdWUKOhhHpVeVObx1Eg9Po1XM9OpBiFV6RA="; + hash = "sha256-pdi2WDeR2sominWS6892QVL6SWF5g8SZFu6d6Zs2YiI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/tokenizers/Cargo.lock b/pkgs/development/python-modules/tokenizers/Cargo.lock index d069413137e8f..841e6b5e09573 100644 --- a/pkgs/development/python-modules/tokenizers/Cargo.lock +++ b/pkgs/development/python-modules/tokenizers/Cargo.lock @@ -3,24 +3,6 @@ version = 3 [[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "aes" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" -dependencies = [ - "cfg-if", - "cipher", - "cpufeatures", - "opaque-debug", -] - -[[package]] name = "aho-corasick" version = "0.7.20" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -30,63 +12,12 @@ dependencies = [ ] [[package]] -name = "anstream" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e579a7752471abc2a8268df8b20005e3eadd975f585398f17efcfd8d4927371" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "is-terminal", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" - -[[package]] -name = "anstyle-parse" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" -dependencies = [ - "windows-sys 0.48.0", -] - -[[package]] -name = "anstyle-wincon" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcd8291a340dd8ac70e18878bc4501dd7b4ff970cfa21c207d36ece51ea88fd" -dependencies = [ - "anstyle", - "windows-sys 0.48.0", -] - -[[package]] -name = "atty" -version = "0.2.14" +name = "aho-corasick" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", + "memchr", ] [[package]] @@ -102,100 +33,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] -name = "base64" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" - -[[package]] -name = "base64ct" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" - -[[package]] name = "bitflags" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - -[[package]] -name = "bumpalo" -version = "3.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "bytes" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" - -[[package]] -name = "bzip2" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" -dependencies = [ - "bzip2-sys", - "libc", -] - -[[package]] -name = "bzip2-sys" -version = "0.1.11+1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - -[[package]] -name = "cached-path" -version = "0.6.1" +name = "bitflags" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "097968e38f1319207f057d0f4d76452e4f4f847a5de61c5215379f297fa034f3" -dependencies = [ - "flate2", - "fs2", - "glob", - "indicatif 0.16.2", - "log", - "rand", - "reqwest", - "serde", - "serde_json", - "sha2", - "tar", - "tempfile", - "thiserror", - "zip", -] +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ - "jobserver", + "libc", ] [[package]] @@ -205,116 +60,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "cipher" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" -dependencies = [ - "generic-array", -] - -[[package]] -name = "clap" -version = "4.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b802d85aaf3a1cdb02b224ba472ebdea62014fccfcb269b95a4d76443b5ee5a" -dependencies = [ - "clap_builder", - "clap_derive", - "once_cell", -] - -[[package]] -name = "clap_builder" -version = "4.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14a1a858f532119338887a4b8e1af9c60de8249cd7bafd68036a489e261e37b6" -dependencies = [ - "anstream", - "anstyle", - "bitflags", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_derive" -version = "4.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.15", -] - -[[package]] -name = "clap_lex" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "console" -version = "0.15.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" -dependencies = [ - "encode_unicode", - "lazy_static", - "libc", - "unicode-width", - "windows-sys 0.42.0", -] - -[[package]] -name = "constant_time_eq" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" - -[[package]] -name = "core-foundation" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" - -[[package]] -name = "cpufeatures" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "280a9f2d8b3a38871a3c8a46fb80db65e5e5ed97da80c4d08bf27fb63e35e181" -dependencies = [ - "libc", -] - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] - -[[package]] name = "crossbeam-channel" version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -337,9 +82,9 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.14" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", "cfg-if", @@ -350,24 +95,14 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if", ] [[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] name = "darling" version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -434,65 +169,19 @@ dependencies = [ ] [[package]] -name = "digest" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" -dependencies = [ - "block-buffer", - "crypto-common", - "subtle", -] - -[[package]] -name = "dirs" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] name = "either" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" - -[[package]] -name = "encode_unicode" -version = "0.3.6" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - -[[package]] -name = "encoding_rs" -version = "0.8.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" -dependencies = [ - "cfg-if", -] +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "env_logger" -version = "0.7.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" dependencies = [ - "atty", "humantime", + "is-terminal", "log", "regex", "termcolor", @@ -500,13 +189,13 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" dependencies = [ "errno-dragonfly", "libc", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -524,40 +213,12 @@ name = "esaxx-rs" version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f748b253ceca9fed5f42f8b5ceb3851e93102199bc25b64b65369f76e5c0a35" -dependencies = [ - "cc", -] [[package]] name = "fastrand" -version = "1.9.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "filetime" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.2.16", - "windows-sys 0.48.0", -] - -[[package]] -name = "flate2" -version = "1.0.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" -dependencies = [ - "crc32fast", - "miniz_oxide", -] +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" [[package]] name = "fnv" @@ -566,102 +227,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "form_urlencoded" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "fs2" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "futures-channel" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" -dependencies = [ - "futures-core", -] - -[[package]] -name = "futures-core" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" - -[[package]] -name = "futures-io" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" - -[[package]] -name = "futures-sink" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" - -[[package]] -name = "futures-task" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" - -[[package]] -name = "futures-util" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" -dependencies = [ - "futures-core", - "futures-io", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] name = "getrandom" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "libc", @@ -669,154 +238,16 @@ dependencies = [ ] [[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "h2" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66b91535aa35fea1523ad1b86cb6b53c28e0ae566ba4a460f4457e936cad7c6f" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" - -[[package]] -name = "hmac" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" -dependencies = [ - "digest", -] - -[[package]] -name = "http" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" -dependencies = [ - "bytes", - "http", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" - -[[package]] -name = "httpdate" -version = "1.0.2" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "humantime" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" -dependencies = [ - "quick-error", -] - -[[package]] -name = "hyper" -version = "0.14.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper-tls" -version = "0.5.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes", - "hyper", - "native-tls", - "tokio", - "tokio-native-tls", -] +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "ident_case" @@ -825,91 +256,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] -name = "idna" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown", -] - -[[package]] -name = "indicatif" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7baab56125e25686df467fe470785512329883aab42696d661247aca2a2896e4" -dependencies = [ - "console", - "lazy_static", - "number_prefix 0.3.0", - "regex", -] - -[[package]] -name = "indicatif" -version = "0.16.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d207dc617c7a380ab07ff572a6e52fa202a2a8f355860ac9c38e23f8196be1b" -dependencies = [ - "console", - "lazy_static", - "number_prefix 0.4.0", - "regex", -] - -[[package]] name = "indoc" version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" [[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" -dependencies = [ - "hermit-abi 0.3.1", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "ipnet" -version = "2.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" - -[[package]] name = "is-terminal" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", + "hermit-abi", "rustix", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -932,27 +292,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" - -[[package]] -name = "jobserver" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" -dependencies = [ - "libc", -] - -[[package]] -name = "js-sys" -version = "0.3.61" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" -dependencies = [ - "wasm-bindgen", -] +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "lazy_static" @@ -962,21 +304,21 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.141" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "linux-raw-sys" -version = "0.3.1" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ "autocfg", "scopeguard", @@ -984,12 +326,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "macro_rules_attribute" @@ -1018,66 +357,40 @@ dependencies = [ [[package]] name = "matrixmultiply" -version = "0.3.2" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add85d4dd35074e6fedc608f8c8f513a3548619a9024b751949ef0e8e45a4d84" +checksum = "090126dc04f95dc0d1c1c91f61bdd474b3930ca064c1edc8a849da2c6cbe1e77" dependencies = [ + "autocfg", "rawpointer", ] [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" [[package]] name = "memoffset" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] [[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] name = "minimal-lexical" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] -name = "miniz_oxide" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" -dependencies = [ - "libc", - "log", - "wasi", - "windows-sys 0.45.0", -] - -[[package]] name = "monostate" -version = "0.1.6" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0230b703f1ac35df1e24f6d0d2255472bcccaf657ecdfa4f1fcbcad1ad5bb98a" +checksum = "15f370ae88093ec6b11a710dec51321a61d420fafd1bad6e30d01bd9c920e8ee" dependencies = [ "monostate-impl", "serde", @@ -1085,31 +398,13 @@ dependencies = [ [[package]] name = "monostate-impl" -version = "0.1.6" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8795add3e14028f11f8e848bd3294898a8294767b3776b6f733560d33bd2530b" +checksum = "371717c0a5543d6a800cac822eac735aa7d2d2fbb41002e9856a4089532dbdce" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", -] - -[[package]] -name = "native-tls" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" -dependencies = [ - "lazy_static", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", + "syn 2.0.31", ] [[package]] @@ -1131,8 +426,8 @@ version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adb12d4e967ec485a5f71c6311fe28158e9d6f4bc4a447b474184d0f91a8fa32" dependencies = [ - "matrixmultiply 0.3.2", - "num-complex 0.4.3", + "matrixmultiply 0.3.7", + "num-complex 0.4.4", "num-integer", "num-traits", "rawpointer", @@ -1160,9 +455,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" +checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" dependencies = [ "num-traits", ] @@ -1179,44 +474,32 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", ] [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi", "libc", ] [[package]] -name = "number_prefix" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17b02fc0ff9a9e4b35b3342880f48e896ebf69f2967921fe8646bf5b7125956a" - -[[package]] -name = "number_prefix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" - -[[package]] name = "numpy" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96b0fee4571867d318651c24f4a570c3f18408cf95f16ccb576b3ce85496a46e" +checksum = "437213adf41bbccf4aeae535fbfcdad0f6fed241e1ae182ebe97fa1f3ce19389" dependencies = [ "libc", "ndarray 0.15.6", - "num-complex 0.4.3", + "num-complex 0.4.4", "num-integer", "num-traits", "pyo3", @@ -1225,9 +508,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "onig" @@ -1235,7 +518,7 @@ version = "6.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", "once_cell", "onig_sys", @@ -1252,56 +535,6 @@ dependencies = [ ] [[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - -[[package]] -name = "openssl" -version = "0.10.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e30d8bc91859781f0a943411186324d580f2bbeb71b452fe91ae344806af3f1" -dependencies = [ - "bitflags", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.15", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-sys" -version = "0.9.85" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d3d193fb1488ad46ffe3aaabc912cc931d02ee8518fe2959aea8ef52718b0c0" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] name = "parking_lot" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1313,69 +546,28 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.7" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.2.16", + "redox_syscall", "smallvec", - "windows-sys 0.45.0", -] - -[[package]] -name = "password-hash" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" -dependencies = [ - "base64ct", - "rand_core", - "subtle", + "windows-targets", ] [[package]] name = "paste" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" - -[[package]] -name = "pbkdf2" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" -dependencies = [ - "digest", - "hmac", - "password-hash", - "sha2", -] - -[[package]] -name = "percent-encoding" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" - -[[package]] -name = "pin-project-lite" -version = "0.2.9" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "pkg-config" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "ppv-lite86" @@ -1385,18 +577,18 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.56" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] [[package]] name = "pyo3" -version = "0.18.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b1ac5b3731ba34fdaa9785f8d74d17448cd18f30cf19e0c7e7b1fdb5272109" +checksum = "e681a6cfdc4adcc93b4d3cf993749a4552018ee0a9b65fc0ccfad74352c72a38" dependencies = [ "cfg-if", "indoc", @@ -1411,9 +603,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.18.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cb946f5ac61bb61a5014924910d936ebd2b23b705f7a4a3c40b05c720b079a3" +checksum = "076c73d0bc438f7a4ef6fdd0c3bb4732149136abd952b110ac93e4edb13a6ba5" dependencies = [ "once_cell", "target-lexicon", @@ -1421,9 +613,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.18.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd4d7c5337821916ea2a1d21d1092e8443cf34879e53a0ac653fbb98f44ff65c" +checksum = "e53cee42e77ebe256066ba8aa77eff722b3bb91f3419177cf4cd0f304d3284d9" dependencies = [ "libc", "pyo3-build-config", @@ -1431,9 +623,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.18.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9d39c55dab3fc5a4b25bbd1ac10a2da452c4aca13bb450f22818a002e29648d" +checksum = "dfeb4c99597e136528c6dd7d5e3de5434d1ceaf487436a3f03b2d56b6fc9efd1" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -1443,9 +635,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.18.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97daff08a4c48320587b5224cc98d609e3c27b6d437315bd40b605c98eeb5918" +checksum = "947dc12175c254889edc0c02e399476c2f652b4b9ebd123aa655c224de259536" dependencies = [ "proc-macro2", "quote", @@ -1453,16 +645,10 @@ dependencies = [ ] [[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - -[[package]] name = "quote" -version = "1.0.26" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -1538,86 +724,41 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags", -] - -[[package]] -name = "redox_syscall" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] -name = "redox_users" -version = "0.4.3" +name = "regex" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" dependencies = [ - "getrandom", - "redox_syscall 0.2.16", - "thiserror", + "aho-corasick 1.0.5", + "memchr", + "regex-automata", + "regex-syntax", ] [[package]] -name = "regex" -version = "1.7.3" +name = "regex-automata" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" +checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" dependencies = [ - "aho-corasick", + "aho-corasick 1.0.5", "memchr", "regex-syntax", ] [[package]] name = "regex-syntax" -version = "0.6.29" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - -[[package]] -name = "reqwest" -version = "0.11.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b71749df584b7f4cac2c426c127a7c785a5106cc98f7a8feb044115f0fa254" -dependencies = [ - "base64 0.21.0", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-tls", - "ipnet", - "js-sys", - "log", - "mime", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "serde", - "serde_json", - "serde_urlencoded", - "tokio", - "tokio-native-tls", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "winreg", -] +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "rustc-hash" @@ -1627,151 +768,65 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.37.11" +version = "0.38.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85597d61f83914ddeba6a47b3b8ffe7365107221c2e557ed94426489fefb5f77" +checksum = "c0c3dde1fc030af041adc40e79c0e7fbcf431dd24870053d187d7c66e4b87453" dependencies = [ - "bitflags", + "bitflags 2.4.0", "errno", - "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" - -[[package]] -name = "schannel" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" -dependencies = [ - "windows-sys 0.42.0", -] +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "security-framework" -version = "2.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" -dependencies = [ - "bitflags", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.8.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" -dependencies = [ - "core-foundation-sys", - "libc", -] +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.160" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.160" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.31", ] [[package]] name = "serde_json" -version = "1.0.96" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" dependencies = [ - "form_urlencoded", "itoa", "ryu", "serde", ] [[package]] -name = "sha1" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sha2" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "slab" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" -dependencies = [ - "autocfg", -] - -[[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" - -[[package]] -name = "socket2" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" -dependencies = [ - "libc", - "winapi", -] +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "spm_precompiled" @@ -1779,7 +834,7 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5851699c4033c63636f7ea4cf7b7c1f1bf06d0cc03cfb42e711de5a5c46cf326" dependencies = [ - "base64 0.13.1", + "base64", "nom", "serde", "unicode-segmentation", @@ -1792,12 +847,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] -name = "subtle" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" - -[[package]] name = "syn" version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1810,9 +859,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.15" +version = "2.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" +checksum = "718fa2415bcb8d8bd775917a1bf12a7931b6dfa890753378538118181e0cb398" dependencies = [ "proc-macro2", "quote", @@ -1820,33 +869,22 @@ dependencies = [ ] [[package]] -name = "tar" -version = "0.4.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" -dependencies = [ - "filetime", - "libc", - "xattr", -] - -[[package]] name = "target-lexicon" -version = "0.12.6" +version = "0.12.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae9980cab1db3fceee2f6c6f643d5d8de2997c58ee8d25fb0cc8a9e9e7348e5" +checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" [[package]] name = "tempfile" -version = "3.5.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if", "fastrand", - "redox_syscall 0.3.5", + "redox_syscall", "rustix", - "windows-sys 0.45.0", + "windows-sys", ] [[package]] @@ -1860,67 +898,32 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", -] - -[[package]] -name = "time" -version = "0.3.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" -dependencies = [ - "serde", - "time-core", + "syn 2.0.31", ] [[package]] -name = "time-core" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] name = "tokenizers" -version = "0.13.3" +version = "0.14.0" dependencies = [ - "aho-corasick", - "cached-path", - "clap", + "aho-corasick 0.7.20", "derive_builder", - "dirs", "esaxx-rs", "getrandom", - "indicatif 0.15.0", "itertools 0.9.0", "lazy_static", "log", @@ -1933,7 +936,6 @@ dependencies = [ "rayon-cond", "regex", "regex-syntax", - "reqwest", "serde", "serde_json", "spm_precompiled", @@ -1945,7 +947,7 @@ dependencies = [ [[package]] name = "tokenizers-python" -version = "0.13.3" +version = "0.14.0" dependencies = [ "env_logger", "itertools 0.9.0", @@ -1962,103 +964,10 @@ dependencies = [ ] [[package]] -name = "tokio" -version = "1.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" -dependencies = [ - "autocfg", - "bytes", - "libc", - "mio", - "num_cpus", - "pin-project-lite", - "socket2", - "windows-sys 0.45.0", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", - "tracing", -] - -[[package]] -name = "tower-service" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - -[[package]] -name = "tracing" -version = "0.1.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" -dependencies = [ - "cfg-if", - "pin-project-lite", - "tracing-core", -] - -[[package]] -name = "tracing-core" -version = "0.1.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" -dependencies = [ - "once_cell", -] - -[[package]] -name = "try-lock" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" - -[[package]] -name = "typenum" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" - -[[package]] -name = "unicode-bidi" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" - -[[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unicode-normalization-alignments" @@ -2076,12 +985,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[package]] name = "unicode_categories" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2094,127 +997,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" [[package]] -name = "url" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "want" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" -dependencies = [ - "log", - "try-lock", -] - -[[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] -name = "wasm-bindgen" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 1.0.109", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" - -[[package]] -name = "web-sys" -version = "0.3.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] name = "winapi" version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2247,215 +1035,66 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - -[[package]] -name = "windows-sys" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.0", -] - -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", + "windows-targets", ] [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" - -[[package]] -name = "winreg" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" -dependencies = [ - "winapi", -] - -[[package]] -name = "xattr" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" -dependencies = [ - "libc", -] - -[[package]] -name = "zip" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0445d0fbc924bb93539b4316c11afb121ea39296f99a3c4c9edad09e3658cdef" -dependencies = [ - "aes", - "byteorder", - "bzip2", - "constant_time_eq", - "crc32fast", - "crossbeam-utils", - "flate2", - "hmac", - "pbkdf2", - "sha1", - "time", - "zstd", -] - -[[package]] -name = "zstd" -version = "0.11.2+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" -dependencies = [ - "zstd-safe", -] - -[[package]] -name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" -dependencies = [ - "libc", - "zstd-sys", -] - -[[package]] -name = "zstd-sys" -version = "2.0.8+zstd.1.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" -dependencies = [ - "cc", - "libc", - "pkg-config", -] +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" diff --git a/pkgs/development/python-modules/tokenizers/default.nix b/pkgs/development/python-modules/tokenizers/default.nix index fd6153b940afd..149f86a284fa8 100644 --- a/pkgs/development/python-modules/tokenizers/default.nix +++ b/pkgs/development/python-modules/tokenizers/default.nix @@ -60,21 +60,18 @@ let in buildPythonPackage rec { pname = "tokenizers"; - version = "0.13.3"; + version = "0.14.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; - rev = "python-v${version}"; - hash = "sha256-QZG5jmr3vbyQs4mVBjwVDR31O66dUM+p39R0htJ1umk="; + rev = "v${version}"; + hash = "sha256-zCpKNMzIdQ0lLWdn4cENtBEMTA7+fg+N6wQGvio9llE="; }; - postPatch = '' - ln -s ${./Cargo.lock} Cargo.lock - ''; - cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; }; @@ -85,6 +82,7 @@ buildPythonPackage rec { pkg-config setuptools-rust rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook cargo rustc ]; diff --git a/pkgs/development/python-modules/tplink-omada-client/default.nix b/pkgs/development/python-modules/tplink-omada-client/default.nix index bde5f96cf7cb0..b2be7b6f3e7a1 100644 --- a/pkgs/development/python-modules/tplink-omada-client/default.nix +++ b/pkgs/development/python-modules/tplink-omada-client/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tplink-omada-client"; - version = "1.3.4"; + version = "1.3.5"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "tplink_omada_client"; inherit version; - hash = "sha256-ckb5pKAT4HfozKtgu7MpNGUdJuOLzkUjTfA/6h6imO4="; + hash = "sha256-tCyYaYJIkuJBGgE3xxc/jMir1mc7UDRXZ3i1Ai1/mxs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index 5d677d2f5db2d..e342615d6d664 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.33.2"; + version = "4.34.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -60,7 +60,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-i2ruOOkuEHHwzGT2Iqy+Pt1sBBUx43eiNkwf2Iqdcfc="; + hash = "sha256-hDZU/3bQ1k4uL3kDEW3+pB4g8jhC8ospRqE55jIqrP0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/transmission-rpc/default.nix b/pkgs/development/python-modules/transmission-rpc/default.nix index ab411add0bfb1..24345b5f63d5b 100644 --- a/pkgs/development/python-modules/transmission-rpc/default.nix +++ b/pkgs/development/python-modules/transmission-rpc/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "transmission-rpc"; - version = "7.0.0"; + version = "7.0.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Trim21"; repo = "transmission-rpc"; rev = "refs/tags/v${version}"; - hash = "sha256-66TKUi4rNZDMWPncyxgHY6oW62DVOQLSWO1RevHG7EY="; + hash = "sha256-wBTx4gy6c6TMtc2m+xibEzCgYJJiMMZ16+pq3H06hgs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/treelib/default.nix b/pkgs/development/python-modules/treelib/default.nix new file mode 100644 index 0000000000000..cf32b37a23195 --- /dev/null +++ b/pkgs/development/python-modules/treelib/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, six +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "treelib"; + version = "1.7.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "caesar0301"; + repo = "treelib"; + rev = "v${version}"; + hash = "sha256-FIdJWpkOmUVZb+IkYocu1nn+oSPROrkcHeiw9wZupgM="; + }; + + propagatedBuildInputs = [ + six + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "treelib" ]; + + meta = with lib; { + description = "An efficient implementation of tree data structure in python 2/3"; + homepage = "https://github.com/caesar0301/treelib"; + changelog = "https://github.com/caesar0301/treelib/releases/tag/${src.rev}"; + license = licenses.asl20; + maintainers = with maintainers; [ mbalatsko ]; + }; +} diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index f2cb97b1fd736..e0b14f2fc453a 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "trytond"; - version = "6.8.3"; + version = "6.8.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-n0Fdu2IjdyAt9qJ40l9kVRbV8NMXU1R5aR+9rmXEgC8="; + hash = "sha256-jZTc9Cc5XC1KScpniVtbBPdfwo3LodVNOo/zQSDBWY4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tsfresh/default.nix b/pkgs/development/python-modules/tsfresh/default.nix new file mode 100644 index 0000000000000..7678152a23fe9 --- /dev/null +++ b/pkgs/development/python-modules/tsfresh/default.nix @@ -0,0 +1,93 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, requests +, numpy +, pandas +, scipy +, statsmodels +, patsy +, scikit-learn +, tqdm +, dask +, distributed +, stumpy +, cloudpickle +, pytestCheckHook +, pytest-xdist +, mock +, matplotlib +, seaborn +, ipython +, notebook +, pandas-datareader +}: + +buildPythonPackage rec { + pname = "tsfresh"; + version = "0.20.1"; + pyproject = true; + + disable = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "blue-yonder"; + repo = "tsfresh"; + rev = "v${version}"; + hash = "sha256-JmdP/6aTnuYsBRiRq9zZng3xNYhOdr9V8bp1trAv508="; + }; + + patches = [ + # The pyscaffold is not a build dependency but just a python project bootstrapping tool, so we do not need it + ./remove-pyscaffold.patch + ./remove-pytest-coverage-flags.patch + ]; + + propagatedBuildInputs = [ + requests + numpy + pandas + scipy + statsmodels + patsy + scikit-learn + tqdm + dask + distributed + stumpy + cloudpickle + ] ++ dask.optional-dependencies.dataframe; + + nativeCheckInputs = [ + pytestCheckHook + pytest-xdist + mock + matplotlib + seaborn + ipython + notebook + pandas-datareader + ]; + + disabledTests = [ + # touches network + "test_relevant_extraction" + "test_characteristics_downloaded_robot_execution_failures" + "test_index" + "test_binary_target_is_default" + "test_characteristics_downloaded_robot_execution_failures" + "test_extraction_runs_through" + "test_multilabel_target_on_request" + ]; + + pythonImportsCheck = [ "tsfresh" ]; + + meta = with lib; { + description = "Automatic extraction of relevant features from time series"; + homepage = "https://github.com/blue-yonder/tsfresh"; + changelog = "https://github.com/blue-yonder/tsfresh/blob/${src.rev}/CHANGES.rst"; + license = licenses.mit; + maintainers = with maintainers; [ mbalatsko ]; + }; +} diff --git a/pkgs/development/python-modules/tsfresh/remove-pyscaffold.patch b/pkgs/development/python-modules/tsfresh/remove-pyscaffold.patch new file mode 100644 index 0000000000000..b77f35cca7045 --- /dev/null +++ b/pkgs/development/python-modules/tsfresh/remove-pyscaffold.patch @@ -0,0 +1,14 @@ +diff --git a/setup.cfg b/setup.cfg +index e29e54e..75c3210 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -29,9 +29,6 @@ classifier = + + [options] + packages = find: +-# DON'T CHANGE THE FOLLOWING LINE! IT WILL BE UPDATED BY PYSCAFFOLD! +-setup_requires = +- pyscaffold>=3.3a0,<4 + # Add here dependencies of your project (semicolon/line-separated), e.g. + install_requires = + requests>=2.9.1 diff --git a/pkgs/development/python-modules/tsfresh/remove-pytest-coverage-flags.patch b/pkgs/development/python-modules/tsfresh/remove-pytest-coverage-flags.patch new file mode 100644 index 0000000000000..86b29606a6e32 --- /dev/null +++ b/pkgs/development/python-modules/tsfresh/remove-pytest-coverage-flags.patch @@ -0,0 +1,15 @@ +diff --git a/setup.cfg b/setup.cfg +index e29e54e..fe8892f 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -99,10 +99,6 @@ extras = True + # e.g. --cov-report html (or xml) for html/xml output or --junitxml junit.xml + # in order to write a coverage file that can be read by Jenkins. + junit_family = xunit2 +-addopts = +- --cov tsfresh --cov-report term-missing +- --verbose +- #-n auto + testpaths = tests + filterwarnings = + diff --git a/pkgs/development/python-modules/ttls/default.nix b/pkgs/development/python-modules/ttls/default.nix index c47b9203fd481..b4e5dcc1ec2e1 100644 --- a/pkgs/development/python-modules/ttls/default.nix +++ b/pkgs/development/python-modules/ttls/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "ttls"; - version = "1.7.0"; + version = "1.8.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "jschlyter"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Gsr1ww/00/N1YyK9U0iryBfdio2niUP8TboyB13B6H8="; + hash = "sha256-7w+VFxqv1htN5rKvMbcBV6uYqT3PT0ocv3S9Om2Ol3k="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/turnt/default.nix b/pkgs/development/python-modules/turnt/default.nix index 1fe1d303856d5..b003f134004a0 100644 --- a/pkgs/development/python-modules/turnt/default.nix +++ b/pkgs/development/python-modules/turnt/default.nix @@ -1,15 +1,19 @@ -{ lib, buildPythonPackage, fetchPypi, click, tomli }: +{ lib, buildPythonPackage, fetchPypi, flit, click, tomli }: buildPythonPackage rec { pname = "turnt"; version = "1.11.0"; - format = "flit"; + format = "pyproject"; src = fetchPypi { inherit pname version; hash = "sha256-XN+qzRgZMSdeBmW0OM36mQ79sRCuP8E++SqH8FOoEq0="; }; + nativeBuildInputs = [ + flit + ]; + propagatedBuildInputs = [ click tomli diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 6d2cfc72c43b4..078d1775e0a1d 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "8.8.0"; + version = "8.9.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-fWAVTaie+6lz5cX7hg0s22kHXelIfhh5FNTfxxbUEPw="; + hash = "sha256-apdLWv4UV4MTAx+kyi/MaOibmBYjwMamaI9b6IGKIl0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/twitchapi/default.nix b/pkgs/development/python-modules/twitchapi/default.nix index 7df76ab5dfc9d..f9db5fa4ecc8c 100644 --- a/pkgs/development/python-modules/twitchapi/default.nix +++ b/pkgs/development/python-modules/twitchapi/default.nix @@ -1,7 +1,9 @@ { lib , buildPythonPackage , pythonOlder -, fetchPypi +, fetchFromGitHub +, setuptools +, wheel , aiohttp , python-dateutil , typing-extensions @@ -9,18 +11,24 @@ buildPythonPackage rec { pname = "twitchapi"; - version = "3.11.0"; + version = "4.0.1"; disabled = pythonOlder "3.7"; - format = "setuptools"; + format = "pyproject"; - src = fetchPypi { - pname = "twitchAPI"; - inherit version; - hash = "sha256-TkQzF32nt89uBvC6aj/b5f2DQkOVDz7UyeUXRyVYumM="; + src = fetchFromGitHub { + owner = "Teekeks"; + repo = "pyTwitchAPI"; + rev = "refs/tags/v${version}"; + hash = "sha256-WrZb734K51NYqlcMCRr8HO8E7XByioltd4vanTN8HUg="; }; + nativeBuildInputs = [ + setuptools + wheel + ]; + propagatedBuildInputs = [ aiohttp python-dateutil @@ -35,11 +43,11 @@ buildPythonPackage rec { "twitchAPI.oauth" "twitchAPI.pubsub" "twitchAPI.twitch" - "twitchAPI.types" + "twitchAPI.type" ]; meta = with lib; { - changelog = "https://github.com/Teekeks/pyTwitchAPI/blob/v${version}/docs/changelog.rst"; + changelog = "https://github.com/Teekeks/pyTwitchAPI/blob/${src.rev}/docs/changelog.rst"; description = "Python implementation of the Twitch Helix API, its Webhook, PubSub and EventSub"; homepage = "https://github.com/Teekeks/pyTwitchAPI"; license = licenses.mit; diff --git a/pkgs/development/python-modules/types-aiobotocore-packages/default.nix b/pkgs/development/python-modules/types-aiobotocore-packages/default.nix new file mode 100644 index 0000000000000..7bc93024121e1 --- /dev/null +++ b/pkgs/development/python-modules/types-aiobotocore-packages/default.nix @@ -0,0 +1,752 @@ +{ lib +, buildPythonPackage +, pythonOlder +, aiobotocore +, botocore +, typing-extensions +, fetchPypi +}: +let + toUnderscore = str: builtins.replaceStrings [ "-" ] [ "_" ] str; + + buildTypesAiobotocorePackage = serviceName: version: hash: + buildPythonPackage rec { + pname = "types-aiobotocore-${serviceName}"; + inherit version; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version hash; + }; + + propagatedBuildInputs = [ + aiobotocore + botocore + ] ++ lib.optionals (pythonOlder "3.12") [ + typing-extensions + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "types_aiobotocore_${toUnderscore serviceName}" + ]; + + meta = with lib; { + description = "Type annotations for aiobotocore ${serviceName}"; + homepage = "https://github.com/youtype/mypy_boto3_builder"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ mbalatsko ]; + }; + }; +in +rec { + types-aiobotocore-accessanalyzer = buildTypesAiobotocorePackage "accessanalyzer" "2.6.0" "sha256-Bit55lGYI8+VOEm+6NKlfxWldFWdiAFwRZjJsgwuv7Q="; + + types-aiobotocore-account = buildTypesAiobotocorePackage "account" "2.5.2.post3" "sha256-zuBKsuPD3Sjl8KWKIlMgKtzfmtVc8ZZyIMKyPC2QjmY="; + + types-aiobotocore-acm = buildTypesAiobotocorePackage "acm" "2.5.4" "sha256-B7SsW+FtSOMfFFdfmH9iv/i9R/qj6ImAr95gpPAf3G4="; + + types-aiobotocore-acm-pca = buildTypesAiobotocorePackage "acm-pca" "2.6.0" "sha256-AO3CEqWkLBTkx4k8YamcUUCg2TwHODCMjz6ujubzLjA="; + + types-aiobotocore-alexaforbusiness = buildTypesAiobotocorePackage "alexaforbusiness" "2.6.0" "sha256-Pjfm+q8Wq7BT3QfFcLuODteOZdvNXSegde1sc6z2UOk="; + + types-aiobotocore-amp = buildTypesAiobotocorePackage "amp" "2.6.0" "sha256-EZ/wSfcWnT7DoSRegMZnzukVLlTFYP2UsR+rEiLwtnE="; + + types-aiobotocore-amplify = buildTypesAiobotocorePackage "amplify" "2.6.0" "sha256-IkvRE9xD0y8l48rWuV1cvnOQ7eHr0hYsrD3NusofgyI="; + + types-aiobotocore-amplifybackend = buildTypesAiobotocorePackage "amplifybackend" "2.6.0" "sha256-4sSNDhmNuOnYPq0X/G8m0XDP08W+MUQ3xiWK9Yc8U6Q="; + + types-aiobotocore-amplifyuibuilder = buildTypesAiobotocorePackage "amplifyuibuilder" "2.6.0" "sha256-K1esoNUDYWzqK12X6o5c12XJQGGDNlCyUiVsNsUaQhI="; + + types-aiobotocore-apigateway = buildTypesAiobotocorePackage "apigateway" "2.6.0" "sha256-r4eDPDqkcQhApN/+4xjDuillQnDOqu2xqyACYHqXRpw="; + + types-aiobotocore-apigatewaymanagementapi = buildTypesAiobotocorePackage "apigatewaymanagementapi" "2.6.0" "sha256-sAJW4q/mUaRsiN7Yt/uBMbxDfKhTSdiZaDd7nvvM3og="; + + types-aiobotocore-apigatewayv2 = buildTypesAiobotocorePackage "apigatewayv2" "2.6.0" "sha256-cNNVvAX1o+ZieUaW59yp5ELFf2S96XdCOLeVe91oFI8="; + + types-aiobotocore-appconfig = buildTypesAiobotocorePackage "appconfig" "2.6.0" "sha256-qliKZTlmnPwRdhQs26M0PlCM91Mn7cHCmccCAhDtryU="; + + types-aiobotocore-appconfigdata = buildTypesAiobotocorePackage "appconfigdata" "2.6.0" "sha256-DcLOpKbUl/YOinXXtlo2su0uMh0Ja5cGrpbmKuQVGvw="; + + types-aiobotocore-appfabric = buildTypesAiobotocorePackage "appfabric" "2.6.0" "sha256-yQvNa3iBsoAD4oBVmt0ZNjziBEhzTUE6E6FFLluxTZw="; + + types-aiobotocore-appflow = buildTypesAiobotocorePackage "appflow" "2.6.0" "sha256-ILdWiqipfSnSjdToIq++JIu1WUmv+lMX72Ymo9KGZ9s="; + + types-aiobotocore-appintegrations = buildTypesAiobotocorePackage "appintegrations" "2.6.0" "sha256-ZPNB2PUpeTttagX1rRmgINgahj3cNuBdKQMvdFNK15Y="; + + types-aiobotocore-application-autoscaling = buildTypesAiobotocorePackage "application-autoscaling" "2.6.0" "sha256-p5EgvysfhIHz4ZALV8tJz/7ZkRIu2BIZwENiiVho67w="; + + types-aiobotocore-application-insights = buildTypesAiobotocorePackage "application-insights" "2.6.0" "sha256-PUDqMFJu2BG3WVCS6SYyltrSr64VblVAgrCYQ6FR2sk="; + + types-aiobotocore-applicationcostprofiler = buildTypesAiobotocorePackage "applicationcostprofiler" "2.6.0" "sha256-bGlbP0d38vFHkITC84N43Vt1Nrsf3+ByWSvvteDejBw="; + + types-aiobotocore-appmesh = buildTypesAiobotocorePackage "appmesh" "2.6.0" "sha256-Lcoc/IJ9o1glV8gNNA/t9B3J6K5Qz/50fqPMsF78WVI="; + + types-aiobotocore-apprunner = buildTypesAiobotocorePackage "apprunner" "2.6.0" "sha256-zyesnbNmSrQEsBVQJouP05zxhBTikGZVCR/VFdEkHNE="; + + types-aiobotocore-appstream = buildTypesAiobotocorePackage "appstream" "2.6.0" "sha256-+4LWBHHwL1R4jBGHChSUOq9vFc+k7NmRXvo8ZjDIyXk="; + + types-aiobotocore-appsync = buildTypesAiobotocorePackage "appsync" "2.6.0" "sha256-JFrBy9Ck/Ni4lwHV47fkzt/YI5cX9FvTeaT0tNgzdqs="; + + types-aiobotocore-arc-zonal-shift = buildTypesAiobotocorePackage "arc-zonal-shift" "2.6.0" "sha256-qTW58yyFwbBYyisuL4NkaEXqblJ3vevXI1lHZVX4mZY="; + + types-aiobotocore-athena = buildTypesAiobotocorePackage "athena" "2.6.0" "sha256-xmTKI8q82UohBE+Wh+j1xivsY8wmrcvOlDAlwTpJmxE="; + + types-aiobotocore-auditmanager = buildTypesAiobotocorePackage "auditmanager" "2.6.0" "sha256-a+47CFM19RM3Y+9wLLe8D4II7rKeDQ93dy68jqJqBD4="; + + types-aiobotocore-autoscaling = buildTypesAiobotocorePackage "autoscaling" "2.6.0" "sha256-s0ClcRgYJcd5GZXYWMn2FieNXebdlS9206mLtKCSy44="; + + types-aiobotocore-autoscaling-plans = buildTypesAiobotocorePackage "autoscaling-plans" "2.6.0" "sha256-ZhOokFIm5KHBc5X+Lp19z5N7BudTQHU5KjHGYCrW/aE="; + + types-aiobotocore-backup = buildTypesAiobotocorePackage "backup" "2.6.0" "sha256-rmm10kZXRkmj0TxqARf+57Nz8LapZF7TaH9GGwhIHys="; + + types-aiobotocore-backup-gateway = buildTypesAiobotocorePackage "backup-gateway" "2.6.0" "sha256-/YH0nuyWaEVPlZFxJarGkWOnLcpiIvvf/GCmxMOaybI="; + + types-aiobotocore-backupstorage = buildTypesAiobotocorePackage "backupstorage" "2.6.0" "sha256-OC1xWUT0BjBoelAxHkprhD54kF+YbK30H/42Q3XxdwY="; + + types-aiobotocore-batch = buildTypesAiobotocorePackage "batch" "2.6.0" "sha256-/5yrgR7NbQ6GbkC9SsHaAhDa3juBjyRt705wHTu6Mr8="; + + types-aiobotocore-billingconductor = buildTypesAiobotocorePackage "billingconductor" "2.6.0" "sha256-bDEICyyIUCRxbTWZFXHsj5yncQI+F+geC92vvsrKCxw="; + + types-aiobotocore-braket = buildTypesAiobotocorePackage "braket" "2.6.0" "sha256-aobQZov192xNkN7cwIKLgJnhxltyLpWw1oKk2m1HkV8="; + + types-aiobotocore-budgets = buildTypesAiobotocorePackage "budgets" "2.6.0" "sha256-0tFKq0VomVAD9NRtlQzilQEZHFOZp40vtTKfoBqjpyU="; + + types-aiobotocore-ce = buildTypesAiobotocorePackage "ce" "2.6.0" "sha256-eKYNFMlDt9uUaqsK8PPTpt1wghN3nGgM+idQBVei8eY="; + + types-aiobotocore-chime = buildTypesAiobotocorePackage "chime" "2.6.0" "sha256-5d9LUaSDvYI/Nrsmg4MnM0ucXmyzUQKV4DpX9pZst2s="; + + types-aiobotocore-chime-sdk-identity = buildTypesAiobotocorePackage "chime-sdk-identity" "2.6.0" "sha256-UXVS4iTbkv9/xmL5AFv3xlWtWk5qN/dam/ic4mg3+cI="; + + types-aiobotocore-chime-sdk-media-pipelines = buildTypesAiobotocorePackage "chime-sdk-media-pipelines" "2.6.0" "sha256-+2AioI5B/K5QhDsaBSAFyNW0Fd49EA8ZBVrULd3u7qQ="; + + types-aiobotocore-chime-sdk-meetings = buildTypesAiobotocorePackage "chime-sdk-meetings" "2.6.0" "sha256-oxlFkYpDoi7pidqzDOYdeTazVl/HjnuZmnjMGZa/WIE="; + + types-aiobotocore-chime-sdk-messaging = buildTypesAiobotocorePackage "chime-sdk-messaging" "2.6.0" "sha256-THOQl3ZUILwLRwYlBb7fQDgpYz7wkMyd+tSLEmHHBVY="; + + types-aiobotocore-chime-sdk-voice = buildTypesAiobotocorePackage "chime-sdk-voice" "2.6.0" "sha256-RwMXK2NrM4BDzeg5lcpxfVzxFzrqjZw+xhZnJL81Uqw="; + + types-aiobotocore-cleanrooms = buildTypesAiobotocorePackage "cleanrooms" "2.6.0" "sha256-i2XmS1m6YO7dOaMZKb0WRQB2WpRue+OCLbdR59oWA1Q="; + + types-aiobotocore-cloud9 = buildTypesAiobotocorePackage "cloud9" "2.6.0" "sha256-W3ni8q7n4l8+SP/RyxibCTptextx4Vd8bmiQ3lhgszQ="; + + types-aiobotocore-cloudcontrol = buildTypesAiobotocorePackage "cloudcontrol" "2.6.0" "sha256-qWbYfegOQ6QcEWA/gce9ZiIOBIVeWIj1qjfsksncDxY="; + + types-aiobotocore-clouddirectory = buildTypesAiobotocorePackage "clouddirectory" "2.6.0" "sha256-5TzDHj/t0tqxbRYfnGRP9LNq9pSFj7aidadVB03ZY1k="; + + types-aiobotocore-cloudformation = buildTypesAiobotocorePackage "cloudformation" "2.6.0" "sha256-EyiQY0NCVa3XuRpBH7aXEA7cBx8BzyRP917f/Ogx0mw="; + + types-aiobotocore-cloudfront = buildTypesAiobotocorePackage "cloudfront" "2.6.0" "sha256-f9nqoXlg7sgY2QCkE1/+Q72N/8Besrl6gncmU+vNt/I="; + + types-aiobotocore-cloudhsm = buildTypesAiobotocorePackage "cloudhsm" "2.6.0" "sha256-a3QRjQhW+cRJykNjhhJREGwuZxR0b+WxgRuS2yuGcTQ="; + + types-aiobotocore-cloudhsmv2 = buildTypesAiobotocorePackage "cloudhsmv2" "2.6.0" "sha256-FyktFlTQAbS6YnoXljvtn6CabJHGLkRv1jCgb9dbz+s="; + + types-aiobotocore-cloudsearch = buildTypesAiobotocorePackage "cloudsearch" "2.6.0" "sha256-eKLM+GYjbm3cweMtF/XI6k+P8t9gaJeRCeMHQbc832g="; + + types-aiobotocore-cloudsearchdomain = buildTypesAiobotocorePackage "cloudsearchdomain" "2.6.0" "sha256-wn03HlgBaZIAkw8gxPehSKpcfQGOhYp0U1CF/84M/lg="; + + types-aiobotocore-cloudtrail = buildTypesAiobotocorePackage "cloudtrail" "2.6.0" "sha256-/vpOE8tU7SsjHmn/YyVfku05ZGBZIiVuFsG6aK47K28="; + + types-aiobotocore-cloudtrail-data = buildTypesAiobotocorePackage "cloudtrail-data" "2.6.0" "sha256-8W7TrB1EXp5JeBQ9xqkqFhf+Frflpd5bfVxpqju2ZPM="; + + types-aiobotocore-cloudwatch = buildTypesAiobotocorePackage "cloudwatch" "2.6.0" "sha256-ntQkDjM3I3wuMH5jsifODEwRna2ctRW1M9bzyEjIF7w="; + + types-aiobotocore-codeartifact = buildTypesAiobotocorePackage "codeartifact" "2.6.0" "sha256-NuMqaomry4ezNNRKBLOJ0xNwGUO2Prl4nf/5O38oyqI="; + + types-aiobotocore-codebuild = buildTypesAiobotocorePackage "codebuild" "2.6.0" "sha256-dYe3uLk0ssQPQPEo+3glh+ic6recgV5WPIN09lLuuA4="; + + types-aiobotocore-codecatalyst = buildTypesAiobotocorePackage "codecatalyst" "2.6.0" "sha256-7MKRVJ4fgberRmkHWHfvrfzU2+BYhMZxgb2ge7NAQp4="; + + types-aiobotocore-codecommit = buildTypesAiobotocorePackage "codecommit" "2.6.0" "sha256-7StmPVxVNfFpqQmjyM4cn9NBrAsuUjxRkP0WgGCnuso="; + + types-aiobotocore-codedeploy = buildTypesAiobotocorePackage "codedeploy" "2.6.0" "sha256-4TUcqf3kuRqsMjhfrUTX3/aOSl43NtwmbSgM6KtjAlk="; + + types-aiobotocore-codeguru-reviewer = buildTypesAiobotocorePackage "codeguru-reviewer" "2.6.0" "sha256-qD42WySh9NpQBOveTRGP3hIp8zD1Y1DzSiM7kbbfR88="; + + types-aiobotocore-codeguru-security = buildTypesAiobotocorePackage "codeguru-security" "2.6.0" "sha256-1qgsFoogu8MnWoCeKnqy4KIY7UdMeUPnaS1zVSVl2Mg="; + + types-aiobotocore-codeguruprofiler = buildTypesAiobotocorePackage "codeguruprofiler" "2.6.0" "sha256-7Nbb+l7y5ccrVGymZ46nKwnGoa5nThrIOZ1AG0ykPEw="; + + types-aiobotocore-codepipeline = buildTypesAiobotocorePackage "codepipeline" "2.6.0" "sha256-cIvM4g/CldgLuN10a3lNhISz08gT6VxZHMS5xo+B2IA="; + + types-aiobotocore-codestar = buildTypesAiobotocorePackage "codestar" "2.6.0" "sha256-6b3QfRecmprhRU+loWafrcL1mWNLFmZXZOAhUMkpGqU="; + + types-aiobotocore-codestar-connections = buildTypesAiobotocorePackage "codestar-connections" "2.6.0" "sha256-D/icEGVsuYSU7hCw2VEojLTkdaBcK6SoEZqpvD/NKV0="; + + types-aiobotocore-codestar-notifications = buildTypesAiobotocorePackage "codestar-notifications" "2.6.0" "sha256-7vWHwrG7Z80Zb3ncGBqN4ItKAVWLR0XHITJxMmE8y8Y="; + + types-aiobotocore-cognito-identity = buildTypesAiobotocorePackage "cognito-identity" "2.6.0" "sha256-C1JRefgyuiKDOJMhShyDPDjfKp5S5OMCaHcnORLxnvY="; + + types-aiobotocore-cognito-idp = buildTypesAiobotocorePackage "cognito-idp" "2.6.0" "sha256-ks8MmuhrmdTS509vgxZ0raZqISMPaAItEjf93ppWhrU="; + + types-aiobotocore-cognito-sync = buildTypesAiobotocorePackage "cognito-sync" "2.6.0" "sha256-pOLa8tDqPexDigPbRqTjnr7/ricz92/Ml79AyUXvXBg="; + + types-aiobotocore-comprehend = buildTypesAiobotocorePackage "comprehend" "2.6.0" "sha256-qXIwjiNksQbQiTtwaKWNHaUCras/moRuFXN3sOEPYMc="; + + types-aiobotocore-comprehendmedical = buildTypesAiobotocorePackage "comprehendmedical" "2.6.0" "sha256-C98s7dkFRgj8m4M+MmjvCWwrdohkLJafgo9j2ACQ2l4="; + + types-aiobotocore-compute-optimizer = buildTypesAiobotocorePackage "compute-optimizer" "2.6.0" "sha256-4MRGtyFWceAuspTW6Xqwjf2ta0VC1SIoK/U80QZw7UA="; + + types-aiobotocore-config = buildTypesAiobotocorePackage "config" "2.6.0" "sha256-qW+R5X/fu784kjARjISaNxwzIJn74SXfUaPEuGqsM1M="; + + types-aiobotocore-connect = buildTypesAiobotocorePackage "connect" "2.6.0" "sha256-d+7VqW5H0hyINQVXoy6djyFmkGzlhLnEpzURuPQLyBc="; + + types-aiobotocore-connect-contact-lens = buildTypesAiobotocorePackage "connect-contact-lens" "2.6.0" "sha256-3d2WJQpohaiwdsKOS2u5kNhHVsgELMxgjunHAk6v7Y8="; + + types-aiobotocore-connectcampaigns = buildTypesAiobotocorePackage "connectcampaigns" "2.6.0" "sha256-lsDs0yxFf4ForZ2bU719LFCDHzR9lOE211XuYGYKZCw="; + + types-aiobotocore-connectcases = buildTypesAiobotocorePackage "connectcases" "2.6.0" "sha256-/MRl46K5h5mtboGhWDop0psxPyxhm3tKhzvMpr91d/w="; + + types-aiobotocore-connectparticipant = buildTypesAiobotocorePackage "connectparticipant" "2.6.0" "sha256-3E+8scTPCcNm8RDoxGWSm/u6drT12aiFqf3LbxWTy8w="; + + types-aiobotocore-controltower = buildTypesAiobotocorePackage "controltower" "2.6.0" "sha256-Df25Lah8FBdCrbWMC+Y9ayQCO3ijG8cMdypA2+sE3oY="; + + types-aiobotocore-cur = buildTypesAiobotocorePackage "cur" "2.6.0" "sha256-i+n53Eejdz26WGsHBmLR3V0ZxOBHPtTTzoxH0mmKPig="; + + types-aiobotocore-customer-profiles = buildTypesAiobotocorePackage "customer-profiles" "2.6.0" "sha256-i1mv2M3bboOF3+iIKYhp4raYb7mHiQTirlWsttB/dXY="; + + types-aiobotocore-databrew = buildTypesAiobotocorePackage "databrew" "2.6.0" "sha256-WMVPGbQkdbKc2T+gR9P3oWUxl5VSVf4IdcLeuW9SNUo="; + + types-aiobotocore-dataexchange = buildTypesAiobotocorePackage "dataexchange" "2.6.0" "sha256-okcgm0Lx5s2AM2mprVwNjeI1TTmlR73FgjWbYa9uRdE="; + + types-aiobotocore-datapipeline = buildTypesAiobotocorePackage "datapipeline" "2.6.0" "sha256-k0tYIWqPEnETISThasPHa9AaWdAs0p+hfrUuCI7VTJk="; + + types-aiobotocore-datasync = buildTypesAiobotocorePackage "datasync" "2.6.0" "sha256-C138viPl57+Z79k1C0c4IjgdpMd4PhO352fUs6/YnE0="; + + types-aiobotocore-dax = buildTypesAiobotocorePackage "dax" "2.6.0" "sha256-1BtV4vajDTlmNhX4oh1h81+1MsIe63gxnkd1oWn0yeI="; + + types-aiobotocore-detective = buildTypesAiobotocorePackage "detective" "2.6.0" "sha256-UP8rTuCwNq6Eu5gYrMj5c+JaNy9grOOL9RRi/QsDvzE="; + + types-aiobotocore-devicefarm = buildTypesAiobotocorePackage "devicefarm" "2.6.0" "sha256-Mc4Kl4dZyn9y+9V44QilacOHN9+E1M79uNLATsoH2Ks="; + + types-aiobotocore-devops-guru = buildTypesAiobotocorePackage "devops-guru" "2.6.0" "sha256-pPn7O3oK75zRmOFMQmyzmRcjpRTswrVhdbkcqaI5Sj8="; + + types-aiobotocore-directconnect = buildTypesAiobotocorePackage "directconnect" "2.6.0" "sha256-LwbqLf3BEwW/+f6vsddXt+FiyGkRKIPXfaqW5rtDrig="; + + types-aiobotocore-discovery = buildTypesAiobotocorePackage "discovery" "2.6.0" "sha256-mBruXgMAELLGyEg7ON8PFesERMf5og8As58U9pvIKRc="; + + types-aiobotocore-dlm = buildTypesAiobotocorePackage "dlm" "2.6.0" "sha256-JLOVu9OlJgrfTBlmzVNN5saYO8AFk8N54hRzDAjq7WI="; + + types-aiobotocore-dms = buildTypesAiobotocorePackage "dms" "2.6.0" "sha256-cWGwdGBTgEag5SeRDLvAJtCS1dAxtt5R0uanPI6RjkY="; + + types-aiobotocore-docdb = buildTypesAiobotocorePackage "docdb" "2.6.0" "sha256-yYm/H31gRIDV+r2H+8cTHkc5h40aFFUQ7zlX1wyLPAI="; + + types-aiobotocore-docdb-elastic = buildTypesAiobotocorePackage "docdb-elastic" "2.6.0" "sha256-ro0xv2HHzTXA6tRNnr3eQjCj5iaqc1wOcsKny8j/hoQ="; + + types-aiobotocore-drs = buildTypesAiobotocorePackage "drs" "2.6.0" "sha256-4CeNeftLpPSZYqw09LcPRC+8yVp+84azRHQ8O0JFOOo="; + + types-aiobotocore-ds = buildTypesAiobotocorePackage "ds" "2.6.0" "sha256-HZEA8fivN05Puxycyl+2z4kIJMbGtF0J7ohLOwx+IzM="; + + types-aiobotocore-dynamodb = buildTypesAiobotocorePackage "dynamodb" "2.6.0" "sha256-dFo/YsEQg7TXB5NENmFOv37R3B2GoN0TlIiULWEQr9I="; + + types-aiobotocore-dynamodbstreams = buildTypesAiobotocorePackage "dynamodbstreams" "2.6.0" "sha256-8wsE774l7M8Qb3UiaxkAdN6sdnXs5oS4cFhncW0joBI="; + + types-aiobotocore-ebs = buildTypesAiobotocorePackage "ebs" "2.6.0" "sha256-95lUlfOjLVgHufSv3UvaKB1K0F2N0cvtCcKh96VBtqg="; + + types-aiobotocore-ec2 = buildTypesAiobotocorePackage "ec2" "2.6.0" "sha256-hSuwPcQEk9Qgkc/JtcZp2vqLXnMQN9gtzjkuC1Bv1C4="; + + types-aiobotocore-ec2-instance-connect = buildTypesAiobotocorePackage "ec2-instance-connect" "2.6.0" "sha256-0Lwxob43TzJHNcriUEa3BAZE64iqS9Js4TtfL20YRj0="; + + types-aiobotocore-ecr = buildTypesAiobotocorePackage "ecr" "2.6.0" "sha256-bMPp7QPa2f8GCRmX3y78XvZTUyYNfYxXDKj5lckBBvE="; + + types-aiobotocore-ecr-public = buildTypesAiobotocorePackage "ecr-public" "2.6.0" "sha256-O2RieTv4vyZ6/mR8BRltfbGcPUjAyIIqriskSlmNcb4="; + + types-aiobotocore-ecs = buildTypesAiobotocorePackage "ecs" "2.6.0" "sha256-C660Ync/6dV8c9i+N7bgV0TYaPScrJ40KPdG3LItGGs="; + + types-aiobotocore-efs = buildTypesAiobotocorePackage "efs" "2.6.0" "sha256-jhIpP0cJEv2SqvmBJtxNVoWF4AOWci2sPj04dN3N+bo="; + + types-aiobotocore-eks = buildTypesAiobotocorePackage "eks" "2.6.0" "sha256-MXMbA1QAyRMhTqihwKztK3EoRp1iesCvPEz30Xc/in8="; + + types-aiobotocore-elastic-inference = buildTypesAiobotocorePackage "elastic-inference" "2.6.0" "sha256-xjMVOk0fzyvDoSNb+kxVQT9emfvIG/6Ws3h3MfCCTOY="; + + types-aiobotocore-elasticache = buildTypesAiobotocorePackage "elasticache" "2.6.0" "sha256-7iUYuPOerdp1+fxI/KdC4sEWDOTJQAgYYheEmSvjBFo="; + + types-aiobotocore-elasticbeanstalk = buildTypesAiobotocorePackage "elasticbeanstalk" "2.6.0" "sha256-yCF9EHyTsf1hmoeSGrNiM2Dd8gtGlcX79zqF25btN04="; + + types-aiobotocore-elastictranscoder = buildTypesAiobotocorePackage "elastictranscoder" "2.6.0" "sha256-vRVH67/SbkncE4q3gssGce4NtTYgFM56RLzDKyvBCpc="; + + types-aiobotocore-elb = buildTypesAiobotocorePackage "elb" "2.6.0" "sha256-+mFIAOecS21QFsnB+V1EFyGLv6uW+oMzkRi051HvPGA="; + + types-aiobotocore-elbv2 = buildTypesAiobotocorePackage "elbv2" "2.6.0" "sha256-OIWzkp7AC2bK55bl3WvL2Zk7M0WRPc8jVHekPAGDtyw="; + + types-aiobotocore-emr = buildTypesAiobotocorePackage "emr" "2.6.0" "sha256-TWCgT2xBi3UajaF6L+m61Q27YV8RCm+e/jRVnZKjwrI="; + + types-aiobotocore-emr-containers = buildTypesAiobotocorePackage "emr-containers" "2.6.0" "sha256-pBr9zVqEbP0na385scKW28d0qIB+7HQdYC5QTdhxHNA="; + + types-aiobotocore-emr-serverless = buildTypesAiobotocorePackage "emr-serverless" "2.6.0" "sha256-mdpuehCY0ki+sZSlNS0kIwijZphoyQixNWY4WKEcrMs="; + + types-aiobotocore-entityresolution = buildTypesAiobotocorePackage "entityresolution" "2.6.0" "sha256-lFbcxmw7Le/rVVL70cOY/vEUShSRnsOdul+eI1jzX7Y="; + + types-aiobotocore-es = buildTypesAiobotocorePackage "es" "2.6.0" "sha256-A/1kM0X4bKrPIXBpir9FuEkuYmUb/K06gfut6faGN0A="; + + types-aiobotocore-events = buildTypesAiobotocorePackage "events" "2.6.0" "sha256-X0r0VZ/ZWYrn2NdE5dJrcS74OyWIvWMDJGSNheIOm0A="; + + types-aiobotocore-evidently = buildTypesAiobotocorePackage "evidently" "2.6.0" "sha256-ec9XPmiGjhH+MsW81JtH13KACasiWqtmxOC/O8ewbgE="; + + types-aiobotocore-finspace = buildTypesAiobotocorePackage "finspace" "2.6.0" "sha256-fPG/13VJzvdfoADYZXTZ2ssdJrKQ/MEic6rhsNUE4tU="; + + types-aiobotocore-finspace-data = buildTypesAiobotocorePackage "finspace-data" "2.6.0" "sha256-2mAHrKw7Hur/nrVQpuRwGae5CumbjbQb4V9Z6NlsSmo="; + + types-aiobotocore-firehose = buildTypesAiobotocorePackage "firehose" "2.6.0" "sha256-viWUrt2F0O1jVhkxK5G776A4r7d4jJJVI/5UsUS+cao="; + + types-aiobotocore-fis = buildTypesAiobotocorePackage "fis" "2.6.0" "sha256-4T/EcdB+5TV8PnX1Z9c8Ato19kznO3yQPZohuWD1+J8="; + + types-aiobotocore-fms = buildTypesAiobotocorePackage "fms" "2.6.0" "sha256-VIGEXyDyUEWshdYFUJ3VmCS1z/ZBOKq2PYCosalPZAw="; + + types-aiobotocore-forecast = buildTypesAiobotocorePackage "forecast" "2.6.0" "sha256-rMjrKtR8BWtAYoyBY52o/5wbZCHqX1aFMRsVCunZTeo="; + + types-aiobotocore-forecastquery = buildTypesAiobotocorePackage "forecastquery" "2.6.0" "sha256-rh53/1tmYyADrkUtQjrwrcEe78ji6II0yYnMQO38AOU="; + + types-aiobotocore-frauddetector = buildTypesAiobotocorePackage "frauddetector" "2.6.0" "sha256-ICRkb+GIWginbc2LvsJTzBaEXDlwg+JOqWQwNRzu+CI="; + + types-aiobotocore-fsx = buildTypesAiobotocorePackage "fsx" "2.6.0" "sha256-vZiK+Kat3RKN/OcKny5qLF+pYljoVlJGG9Kdlb75GWk="; + + types-aiobotocore-gamelift = buildTypesAiobotocorePackage "gamelift" "2.6.0" "sha256-9qk0jvEAU6vh++k18ccjrZNLnYlOqiAGuVvBGS5QetQ="; + + types-aiobotocore-gamesparks = buildTypesAiobotocorePackage "gamesparks" "2.6.0" "sha256-9iV7bpGMnzz9TH+g1YpPjbKBSKY3rcL/OJvMOzwLC1M="; + + types-aiobotocore-glacier = buildTypesAiobotocorePackage "glacier" "2.6.0" "sha256-shUgv/KntAP0kuD8pJFLEAp/aIukEsLhte6C5odtNJs="; + + types-aiobotocore-globalaccelerator = buildTypesAiobotocorePackage "globalaccelerator" "2.6.0" "sha256-U/74XOX/pXh4JJ4n6Fu6quL6gQwz+zt9bOWj/QYOS+8="; + + types-aiobotocore-glue = buildTypesAiobotocorePackage "glue" "2.6.0" "sha256-K2asnioD1r9BJCX2PaNaN+fKDyA+oQhvdM0h0LgxbEY="; + + types-aiobotocore-grafana = buildTypesAiobotocorePackage "grafana" "2.6.0" "sha256-acNr8U/E2Eq4wp68Td0k8xdORhT6ZOJBOi0enBnaacE="; + + types-aiobotocore-greengrass = buildTypesAiobotocorePackage "greengrass" "2.6.0" "sha256-9mqnIWlLUoz28qp8AH8LiNdDgcJ04P0Z+jxNb/91jUg="; + + types-aiobotocore-greengrassv2 = buildTypesAiobotocorePackage "greengrassv2" "2.6.0" "sha256-+G6nPOY2Suxa8LPTG8SHOZfwaIJQIyVGTRcsAQYXZzY="; + + types-aiobotocore-groundstation = buildTypesAiobotocorePackage "groundstation" "2.6.0" "sha256-VGGDcARvtSeukjgVB9jwSamIrlrNCF+0pNszN6VkMC0="; + + types-aiobotocore-guardduty = buildTypesAiobotocorePackage "guardduty" "2.6.0" "sha256-3bScTMTc7PMrHvZpfPYENj55w2JjnK/pVuNLcxCjw5Q="; + + types-aiobotocore-health = buildTypesAiobotocorePackage "health" "2.6.0" "sha256-WBxZlnWrZ6b0MIEomvgUDqiKNe9KIIgOrNrRhRw07EA="; + + types-aiobotocore-healthlake = buildTypesAiobotocorePackage "healthlake" "2.6.0" "sha256-8ofimJ4eTxq8yQjCc23FQ2OktMCNwlIBCn+eC+HLqlc="; + + types-aiobotocore-honeycode = buildTypesAiobotocorePackage "honeycode" "2.6.0" "sha256-dCjt22yHlShPdG6Jipy3m4Rx3G4OLPiuUi1gyubcQ/g="; + + types-aiobotocore-iam = buildTypesAiobotocorePackage "iam" "2.6.0" "sha256-NPvYTwvZY5MjfdIlTMRZEQ1S9IvxvQjoi5K2LOlSrMM="; + + types-aiobotocore-identitystore = buildTypesAiobotocorePackage "identitystore" "2.6.0" "sha256-u4d+/kVZ+qtLyueNSGy6a2VoB0jIYdKZqvCQQfarbx4="; + + types-aiobotocore-imagebuilder = buildTypesAiobotocorePackage "imagebuilder" "2.6.0" "sha256-uhkFIVr68n0ShrpZY9qyghd0XgMb0ZT6fF9WdjtF7g0="; + + types-aiobotocore-importexport = buildTypesAiobotocorePackage "importexport" "2.6.0" "sha256-m0fUuupB8Eb9pJQnuir4THb4TdDstKcxHQRgz8Ce2Zg="; + + types-aiobotocore-inspector = buildTypesAiobotocorePackage "inspector" "2.6.0" "sha256-dJQnb6AwtmScEIun0QB9CiiPkbdKti9+mc5LN3vf7e0="; + + types-aiobotocore-inspector2 = buildTypesAiobotocorePackage "inspector2" "2.6.0" "sha256-kAhdyymMdbrPoCFzKiVCFzBlfpmz4aGlZ1Ilkrc8EiQ="; + + types-aiobotocore-internetmonitor = buildTypesAiobotocorePackage "internetmonitor" "2.6.0" "sha256-3oJbkuU013LR7DUXvr8y0nbYh3caAF1c4GtgM1CizdU="; + + types-aiobotocore-iot = buildTypesAiobotocorePackage "iot" "2.6.0" "sha256-Rt6dsE/9aR5AZC47G3RayV56VVobDWEah64cNHsaYII="; + + types-aiobotocore-iot-data = buildTypesAiobotocorePackage "iot-data" "2.6.0" "sha256-KpgEjoEsCSiC6aKyHy64it0k87XYICbxMhUFYUjCBuo="; + + types-aiobotocore-iot-jobs-data = buildTypesAiobotocorePackage "iot-jobs-data" "2.6.0" "sha256-IQRarMn1ZAh+kUG1I4Cyt/6WrIoby07g3qcSzpWUWWM="; + + types-aiobotocore-iot-roborunner = buildTypesAiobotocorePackage "iot-roborunner" "2.6.0" "sha256-BFSV0lfXriD43UFXjdomHIQO60TjrYWmL6+htf9Z3mE="; + + types-aiobotocore-iot1click-devices = buildTypesAiobotocorePackage "iot1click-devices" "2.6.0" "sha256-MRRil8KuR88NvjAOQHQSftplzk7+sdAJBb1Koxj1j8o="; + + types-aiobotocore-iot1click-projects = buildTypesAiobotocorePackage "iot1click-projects" "2.6.0" "sha256-6YRdsbNw685KvSLCPP6cpCVA5zqht9gF/SthHHtjxfI="; + + types-aiobotocore-iotanalytics = buildTypesAiobotocorePackage "iotanalytics" "2.6.0" "sha256-uhxX742flhdDM7zoYm6yggc41NW7glGPijiql4XKJa4="; + + types-aiobotocore-iotdeviceadvisor = buildTypesAiobotocorePackage "iotdeviceadvisor" "2.6.0" "sha256-jrOVxsJHgpEvyLhreMrzttu3yQ4FXm4+MVDlNNIKWVU="; + + types-aiobotocore-iotevents = buildTypesAiobotocorePackage "iotevents" "2.6.0" "sha256-M3wUbFFGsYQesy7ASen+b6yokGkjXY0P5wpGexO2CGg="; + + types-aiobotocore-iotevents-data = buildTypesAiobotocorePackage "iotevents-data" "2.6.0" "sha256-ESm7ZCtEvHo/r9LXnBaIAVAb4bQkGjIlmUNlo/JuzjE="; + + types-aiobotocore-iotfleethub = buildTypesAiobotocorePackage "iotfleethub" "2.6.0" "sha256-0NMp62HDGZ0FHVtyHOvgfMUaedqZG9bY46d2OrpGK7E="; + + types-aiobotocore-iotfleetwise = buildTypesAiobotocorePackage "iotfleetwise" "2.6.0" "sha256-jbLoJOgFRNSPaFv/diM8L0mTGIB2IjAzHqx/QH7lriQ="; + + types-aiobotocore-iotsecuretunneling = buildTypesAiobotocorePackage "iotsecuretunneling" "2.6.0" "sha256-8zvG95bDvJWNRmw9sCdBfPxQPdb4TNAzqMcth+hliLI="; + + types-aiobotocore-iotsitewise = buildTypesAiobotocorePackage "iotsitewise" "2.6.0" "sha256-1i4Z4CE9PG7JByR9RpPazu7RmPIjNeDecnz5LH2ls2A="; + + types-aiobotocore-iotthingsgraph = buildTypesAiobotocorePackage "iotthingsgraph" "2.6.0" "sha256-6161RDBwnvqvBtJWs5bPieI6AdwKFCmiT6ixKRE9GuM="; + + types-aiobotocore-iottwinmaker = buildTypesAiobotocorePackage "iottwinmaker" "2.6.0" "sha256-/h85AoG+poq4t0EvpXdofWfbaEBD6CiCxhdaGKLi4C0="; + + types-aiobotocore-iotwireless = buildTypesAiobotocorePackage "iotwireless" "2.6.0" "sha256-kuOboqDTHpdSW6vD/JGOdLL2U639wM+2V2KaSm1j0xo="; + + types-aiobotocore-ivs = buildTypesAiobotocorePackage "ivs" "2.6.0" "sha256-CiMKW2suhsU2dZsLQkL3hK2qKRJ56FS4Ix7Dt347bMA="; + + types-aiobotocore-ivs-realtime = buildTypesAiobotocorePackage "ivs-realtime" "2.6.0" "sha256-y4RRQdjaJS9GLW7HUNC9f3kWCOAGijlisrlB0MYQ1As="; + + types-aiobotocore-ivschat = buildTypesAiobotocorePackage "ivschat" "2.6.0" "sha256-5ANdk601wY6vtjYbe8CxtY9lK4Fe6wbl5uB6Mq6uqII="; + + types-aiobotocore-kafka = buildTypesAiobotocorePackage "kafka" "2.6.0" "sha256-cvmNob4pGa18W/2uh16zFJ58f0MHRDL2LwOKrsO16uI="; + + types-aiobotocore-kafkaconnect = buildTypesAiobotocorePackage "kafkaconnect" "2.6.0" "sha256-pOk51+FrlKDNPPDaa1mf3HjpCqlUskeRYITkFp91l6M="; + + types-aiobotocore-kendra = buildTypesAiobotocorePackage "kendra" "2.6.0" "sha256-1WeJI++z4QiF0bZ4FyNgoNWY6X62ZCyq7PGNM9urFn4="; + + types-aiobotocore-kendra-ranking = buildTypesAiobotocorePackage "kendra-ranking" "2.6.0" "sha256-uaeHdW8lew6jq2KQApkY76eWRkYVLffN0h71icP9viE="; + + types-aiobotocore-keyspaces = buildTypesAiobotocorePackage "keyspaces" "2.6.0" "sha256-vbWWkLbVnzfWHp3Yy3S6mh0+tHrkA/5Krw4GVSdILls="; + + types-aiobotocore-kinesis = buildTypesAiobotocorePackage "kinesis" "2.6.0" "sha256-n5u7dzAnZ7YRGIC2qyynlsALR7tONulc0ZmimW+xotk="; + + types-aiobotocore-kinesis-video-archived-media = buildTypesAiobotocorePackage "kinesis-video-archived-media" "2.6.0" "sha256-mjY7GbQ20pzL38tQMoluJISpaxk/IreluvmX7XsLfTg="; + + types-aiobotocore-kinesis-video-media = buildTypesAiobotocorePackage "kinesis-video-media" "2.6.0" "sha256-8kK4JurIaid4k0BkpoZkaosn7cOIyMTt0RXnoJZUtSc="; + + types-aiobotocore-kinesis-video-signaling = buildTypesAiobotocorePackage "kinesis-video-signaling" "2.6.0" "sha256-nUOb5NwCsz/7Z0bUMUsxysn2bgNi+yTvyGGCkwzCU1o="; + + types-aiobotocore-kinesis-video-webrtc-storage = buildTypesAiobotocorePackage "kinesis-video-webrtc-storage" "2.6.0" "sha256-Tw+ozecMKAw56x47Wqq3wwwcmDT+5LvoUDAZSX0z2I4="; + + types-aiobotocore-kinesisanalytics = buildTypesAiobotocorePackage "kinesisanalytics" "2.6.0" "sha256-QY5tN7QVP2WC7P/se6wNrnLp3sJVIr/rTEs9ePpADPE="; + + types-aiobotocore-kinesisanalyticsv2 = buildTypesAiobotocorePackage "kinesisanalyticsv2" "2.6.0" "sha256-aedmxGOuU70uX/+bQL8coUWBpk9IQHAL7VqusH8zPbs="; + + types-aiobotocore-kinesisvideo = buildTypesAiobotocorePackage "kinesisvideo" "2.6.0" "sha256-wyT6YahL3sRGHQcBTAyLd7l75wVWRp2waS+Q46Me/ok="; + + types-aiobotocore-kms = buildTypesAiobotocorePackage "kms" "2.6.0" "sha256-mY26ICYSENAruEn4986zxi5R9ong4nyuRAHgMZDliqo="; + + types-aiobotocore-lakeformation = buildTypesAiobotocorePackage "lakeformation" "2.6.0" "sha256-CR3Uopf6izBTlR16yIA3CUikWrS3OzkFZFpbJNDhBVs="; + + types-aiobotocore-lambda = buildTypesAiobotocorePackage "lambda" "2.6.0" "sha256-pkZMQu5himEPO7z/AF7INb7H7jjmkyQV1ql2epF4yYA="; + + types-aiobotocore-lex-models = buildTypesAiobotocorePackage "lex-models" "2.6.0" "sha256-sIQ85LzkQgMvVfAKEc5HxIXx85Tckx4HVXcex2hxZ6I="; + + types-aiobotocore-lex-runtime = buildTypesAiobotocorePackage "lex-runtime" "2.6.0" "sha256-IZvLF0Wg7od/LqC2bcCxtvNun0n9JViuXE/CQMoBdMc="; + + types-aiobotocore-lexv2-models = buildTypesAiobotocorePackage "lexv2-models" "2.6.0" "sha256-9eebhFQqnsParfZ1poJJX/ehx1lNHIynFwXEzAo10JM="; + + types-aiobotocore-lexv2-runtime = buildTypesAiobotocorePackage "lexv2-runtime" "2.6.0" "sha256-ot+oM2a+CA/92d+tY54tqdOlsZWReknv+Pt3Aw8V1GU="; + + types-aiobotocore-license-manager = buildTypesAiobotocorePackage "license-manager" "2.6.0" "sha256-iNlzgcjg3VrIZJEi2f+7msFqrfWsUS24k7OERB28uRo="; + + types-aiobotocore-license-manager-linux-subscriptions = buildTypesAiobotocorePackage "license-manager-linux-subscriptions" "2.6.0" "sha256-1exWgnbG5ikd1pHWClPGq3Luku5qyTtG6pwvqL/zWdk="; + + types-aiobotocore-license-manager-user-subscriptions = buildTypesAiobotocorePackage "license-manager-user-subscriptions" "2.6.0" "sha256-0fLwCr5eDRxcGZdw3sqExh8awX1qu5XmEYMD63xhD3w="; + + types-aiobotocore-lightsail = buildTypesAiobotocorePackage "lightsail" "2.6.0" "sha256-eiibXP8S+xvn+PTX8cd3WiN6yL2JmjK9EG9BryexFjY="; + + types-aiobotocore-location = buildTypesAiobotocorePackage "location" "2.6.0" "sha256-3zQZyDgaMuj5SAQ7Nc+XzF5dUi1E9bAjv9mIscJxfqM="; + + types-aiobotocore-logs = buildTypesAiobotocorePackage "logs" "2.6.0" "sha256-qyA1uCrAFGZHMlfL8Dou1YkM6rb9xwcrDQmteSqOadM="; + + types-aiobotocore-lookoutequipment = buildTypesAiobotocorePackage "lookoutequipment" "2.6.0" "sha256-ilPodAPj7J6xVCPEjsBQcQ4I5dNMEM2/hM1j8PJMUto="; + + types-aiobotocore-lookoutmetrics = buildTypesAiobotocorePackage "lookoutmetrics" "2.6.0" "sha256-m/13nELWqdPNkZXmA3FhArlOKhB1CcbTaAsI9Iqzrik="; + + types-aiobotocore-lookoutvision = buildTypesAiobotocorePackage "lookoutvision" "2.6.0" "sha256-gW+GFoQhI1Mj412Gh3MXfoSMKpNscUB4AqC9WMF4ACI="; + + types-aiobotocore-m2 = buildTypesAiobotocorePackage "m2" "2.6.0" "sha256-DoFG4FxvJFnN54G5F2LZY5M0aYlCU9H5wwnAsiHaRmc="; + + types-aiobotocore-machinelearning = buildTypesAiobotocorePackage "machinelearning" "2.6.0" "sha256-VZajCqSzofQLUBrXbMzdaPmbIDNp5YuUUk1wberVcFs="; + + types-aiobotocore-macie = buildTypesAiobotocorePackage "macie" "2.6.0" "sha256-gbl7jEgjk4twoxGM+WRg4MZ/nkGg7btiPOsPptR7yfw="; + + types-aiobotocore-macie2 = buildTypesAiobotocorePackage "macie2" "2.6.0" "sha256-IX2KY/guFLJ6jL4gRdTS6cQbNuFJuz8xa4QzqZ8j5h8="; + + types-aiobotocore-managedblockchain = buildTypesAiobotocorePackage "managedblockchain" "2.6.0" "sha256-k/J7hBJDfGXMFR9jn7Tiec8bClrXIz6XyLMqLJad6oU="; + + types-aiobotocore-managedblockchain-query = buildTypesAiobotocorePackage "managedblockchain-query" "2.6.0" "sha256-swmAlpVrP1eSvJatWaJL6QDfgZ0xzBttrpHt1aNULUk="; + + types-aiobotocore-marketplace-catalog = buildTypesAiobotocorePackage "marketplace-catalog" "2.6.0" "sha256-9yD3FIFrRDMAckbztjrKeUEyXCUOggF5UfsPe5hcQ1Q="; + + types-aiobotocore-marketplace-entitlement = buildTypesAiobotocorePackage "marketplace-entitlement" "2.6.0" "sha256-Q6S9pTfquW+Hv4uB9tbS/TEsC/i7iDfA+LyZCHq3cRI="; + + types-aiobotocore-marketplacecommerceanalytics = buildTypesAiobotocorePackage "marketplacecommerceanalytics" "2.6.0" "sha256-iyHFWN8tWgQoShTO6bJQB89K+4JVWjMihzjMr2Lssvw="; + + types-aiobotocore-mediaconnect = buildTypesAiobotocorePackage "mediaconnect" "2.6.0" "sha256-hEwlISpSm6r+a1MXxSH3UrBOiNu+Cx9d1T2RsFfrcyA="; + + types-aiobotocore-mediaconvert = buildTypesAiobotocorePackage "mediaconvert" "2.6.0" "sha256-VdxG2yvN6g9UAn54OP6uafHGN+iHjNrfO4H5f5h6w18="; + + types-aiobotocore-medialive = buildTypesAiobotocorePackage "medialive" "2.6.0" "sha256-hrfqkhKWIcP+fjDaeFjvk6c6GBTgsY3yxPodx9fFpxk="; + + types-aiobotocore-mediapackage = buildTypesAiobotocorePackage "mediapackage" "2.6.0" "sha256-c7XLKvwiQL6e0tWH0DmOyauTz3q5b0hOVpjVzR1rmH8="; + + types-aiobotocore-mediapackage-vod = buildTypesAiobotocorePackage "mediapackage-vod" "2.6.0" "sha256-zw2mJFQgX9xqjsvldssfMeulgCEY0kqaNg+nUe9PpCc="; + + types-aiobotocore-mediapackagev2 = buildTypesAiobotocorePackage "mediapackagev2" "2.6.0" "sha256-fdZn+f03iIzzkpSCdTh2uUY4WcU1DcyRxozP7SSkGyo="; + + types-aiobotocore-mediastore = buildTypesAiobotocorePackage "mediastore" "2.6.0" "sha256-KoZKeJPlIWhgifauIOSSLZaSJWn3E0lSNUOhKPfI0Go="; + + types-aiobotocore-mediastore-data = buildTypesAiobotocorePackage "mediastore-data" "2.6.0" "sha256-HT/Kvi15YJLEno70ayEXQLPi9Y6NlRD8134IRJ7gdRY="; + + types-aiobotocore-mediatailor = buildTypesAiobotocorePackage "mediatailor" "2.6.0" "sha256-3F1Gpd2kOU1rS7iSyDr0pkRECqYsyeeEQKDH2OO9H/A="; + + types-aiobotocore-medical-imaging = buildTypesAiobotocorePackage "medical-imaging" "2.6.0" "sha256-zUXGqquEveHHDqA8XeJX++Yc42rnyW9Vzt5A7LOImfk="; + + types-aiobotocore-memorydb = buildTypesAiobotocorePackage "memorydb" "2.6.0" "sha256-FJ9aeZRCY+bhot3cU3qX4EuFAowPCc7kT2D0FGVTpys="; + + types-aiobotocore-meteringmarketplace = buildTypesAiobotocorePackage "meteringmarketplace" "2.6.0" "sha256-WsWw1y5XueMQnRTWYQP73GawsSzEsliPzu9Xlij3UAo="; + + types-aiobotocore-mgh = buildTypesAiobotocorePackage "mgh" "2.6.0" "sha256-7wvX7X/NdB+GlWDogT2benTSC7ZCdVv97Zi6r+s5B2E="; + + types-aiobotocore-mgn = buildTypesAiobotocorePackage "mgn" "2.6.0" "sha256-e6TTldFkZXf8A8bV7RKkIl6AD/lCC9elB6mT3WeWEiM="; + + types-aiobotocore-migration-hub-refactor-spaces = buildTypesAiobotocorePackage "migration-hub-refactor-spaces" "2.6.0" "sha256-HVoia2UZMrjgH6aUQGit+MueUk0qW3KjWKYJy2pHlp0="; + + types-aiobotocore-migrationhub-config = buildTypesAiobotocorePackage "migrationhub-config" "2.6.0" "sha256-hXju28oSNGlQ0qCwFD+qoyWFpKMbFkGWEXteOVOKiII="; + + types-aiobotocore-migrationhuborchestrator = buildTypesAiobotocorePackage "migrationhuborchestrator" "2.6.0" "sha256-mo4vH/xsbRf1UViSRu4P2YzI+7LFkkzXsHeZZLdXg+U="; + + types-aiobotocore-migrationhubstrategy = buildTypesAiobotocorePackage "migrationhubstrategy" "2.6.0" "sha256-eU4j+9z++Kgp2TaUX214XGuIXPxCriKu9w+XW8mZp+c="; + + types-aiobotocore-mobile = buildTypesAiobotocorePackage "mobile" "2.6.0" "sha256-HKolI0fcGWye3Xow73qXOJRQ/Wb23ZXWLYyfA94zZT0="; + + types-aiobotocore-mq = buildTypesAiobotocorePackage "mq" "2.6.0" "sha256-61iFbkOYLF6y1QUGePVAVEFqGgTmPbLYS7VDbvzmInA="; + + types-aiobotocore-mturk = buildTypesAiobotocorePackage "mturk" "2.6.0" "sha256-pdRp9XjLVLCHeMSMV+NycKNt9kbH93/ZJKbiwNlb+A4="; + + types-aiobotocore-mwaa = buildTypesAiobotocorePackage "mwaa" "2.6.0" "sha256-3/LXxvsVmKHpZPr1BISTndLFPmF3LF75kihknSt2cMk="; + + types-aiobotocore-neptune = buildTypesAiobotocorePackage "neptune" "2.6.0" "sha256-2EIBP4NhRy+/OeFuPP/SIf1q6BhlKU9CFH7AM+y3558="; + + types-aiobotocore-network-firewall = buildTypesAiobotocorePackage "network-firewall" "2.6.0" "sha256-3bVNQSzaMhkpiN1mhS9Lz2EfeEJpkSIcPCKPC6s02Uo="; + + types-aiobotocore-networkmanager = buildTypesAiobotocorePackage "networkmanager" "2.6.0" "sha256-Pwmgi4ybpOtLWlY62+QcBHT0iF/6B4Hxbv4CQPA+7/o="; + + types-aiobotocore-nimble = buildTypesAiobotocorePackage "nimble" "2.6.0" "sha256-x+wmTG6jeK8KpSDdhOZkbkRZ7ai7N4xaU4cEmHhO5xA="; + + types-aiobotocore-oam = buildTypesAiobotocorePackage "oam" "2.6.0" "sha256-Q/msYeaXs9MxXj6X0p8Gw08/Y4FvvV2xAbEXU6iqi2g="; + + types-aiobotocore-omics = buildTypesAiobotocorePackage "omics" "2.6.0" "sha256-UB0y0l2fb58yNJr36WpCeTDETAcdQkYd2ueETFEQSTo="; + + types-aiobotocore-opensearch = buildTypesAiobotocorePackage "opensearch" "2.6.0" "sha256-ynRq7qRVNgpsP4lp6pbZqTv3zrF5Zu1v+STvv/yPgKw="; + + types-aiobotocore-opensearchserverless = buildTypesAiobotocorePackage "opensearchserverless" "2.6.0" "sha256-M2tvTKjIg8aEP3KZvrMTCgiJqb6oWL9T5ylkj+Fr184="; + + types-aiobotocore-opsworks = buildTypesAiobotocorePackage "opsworks" "2.6.0" "sha256-XY9DqNQUjFaumcOd2dvX/kV2sWt67Ni26H5SzCarr2E="; + + types-aiobotocore-opsworkscm = buildTypesAiobotocorePackage "opsworkscm" "2.6.0" "sha256-k1QO54TXJJG5jAvPcoEyZEdEXSmLzHdSPDyF60Zmf78="; + + types-aiobotocore-organizations = buildTypesAiobotocorePackage "organizations" "2.6.0" "sha256-kDxDdLaWlaNLfSCOc5Kho73cbk33FnK9c12PYKhdbFQ="; + + types-aiobotocore-osis = buildTypesAiobotocorePackage "osis" "2.6.0" "sha256-Q8EIdCvT0Zjj9udUNpWZzgNClVjNBWTW3V7emhdf+yg="; + + types-aiobotocore-outposts = buildTypesAiobotocorePackage "outposts" "2.6.0" "sha256-tXAQ+tNeZUF1snrB+76Ku+j1Wdslah38s0YMBOINrlo="; + + types-aiobotocore-panorama = buildTypesAiobotocorePackage "panorama" "2.6.0" "sha256-/XJsZV5Yhp5BMSheF9zVf+MSJsH2zUrpnrkSwo+4PfI="; + + types-aiobotocore-payment-cryptography = buildTypesAiobotocorePackage "payment-cryptography" "2.6.0" "sha256-x6uUO578BIDl1kFdyKXSPnegKLAX3FG4U5rDjsQpVQQ="; + + types-aiobotocore-payment-cryptography-data = buildTypesAiobotocorePackage "payment-cryptography-data" "2.6.0" "sha256-+eHgcPA+egPBR06Mddw0RXuivpiprPMnBhPfCmh0sS4="; + + types-aiobotocore-personalize = buildTypesAiobotocorePackage "personalize" "2.6.0" "sha256-5s0KmOdQyPtcFtb+XkR/zHEiEdZcDwZwldwUy+dvC4s="; + + types-aiobotocore-personalize-events = buildTypesAiobotocorePackage "personalize-events" "2.6.0" "sha256-+9wtXNgXQhACa8NYfcjbZcJj0j9PlOavxs+c4NXy0kE="; + + types-aiobotocore-personalize-runtime = buildTypesAiobotocorePackage "personalize-runtime" "2.6.0" "sha256-tvLfXhaFpdivIBtFYp0G4/QihOMSGXK1nVDFKuMJCto="; + + types-aiobotocore-pi = buildTypesAiobotocorePackage "pi" "2.6.0" "sha256-j0ngXkDGIhSh/b1RPn+NY6V2BAUZJdvuT18iALwRkAY="; + + types-aiobotocore-pinpoint = buildTypesAiobotocorePackage "pinpoint" "2.6.0" "sha256-Txme0jlgoF9IYywdKqv71kcEqBfF1juTJcagi/2wQ20="; + + types-aiobotocore-pinpoint-email = buildTypesAiobotocorePackage "pinpoint-email" "2.6.0" "sha256-c6tqmW7i5AXrH2PFyVPCpBkDaiMdTu2fmbHeuc3SzPg="; + + types-aiobotocore-pinpoint-sms-voice = buildTypesAiobotocorePackage "pinpoint-sms-voice" "2.6.0" "sha256-qvVYusxMw+ZrMJAKXqk1HzEDYHsvaUthnYMDF6b0xbQ="; + + types-aiobotocore-pinpoint-sms-voice-v2 = buildTypesAiobotocorePackage "pinpoint-sms-voice-v2" "2.6.0" "sha256-ErqAFQYtKfsNABPm+KpOKm88Mh5MmXou6bqJfsqXdt0="; + + types-aiobotocore-pipes = buildTypesAiobotocorePackage "pipes" "2.6.0" "sha256-vOszu7z/DiZwXrdqoiLUlpLQLNNuRbskI59BBippizI="; + + types-aiobotocore-polly = buildTypesAiobotocorePackage "polly" "2.6.0" "sha256-AKP23N3xMzdOti6J7vONDM/cwdqTHYkiM6c/njspSXI="; + + types-aiobotocore-pricing = buildTypesAiobotocorePackage "pricing" "2.6.0" "sha256-PccslOI6F2k50g03j22AYN3xtTsTW3ie4W4pEaT2XwY="; + + types-aiobotocore-privatenetworks = buildTypesAiobotocorePackage "privatenetworks" "2.6.0" "sha256-3e6/IA6QYgGhipt5XP/b4h3soko1tLntMieXOmeWjlI="; + + types-aiobotocore-proton = buildTypesAiobotocorePackage "proton" "2.6.0" "sha256-rtJ+idGSdRVZafFNppQgIQUobKzClCKHf4RqlBtppBw="; + + types-aiobotocore-qldb = buildTypesAiobotocorePackage "qldb" "2.6.0" "sha256-AqV8yAUYTT8nc3jQkq0qDzZRKxewsrxIR/kVJiX3fwI="; + + types-aiobotocore-qldb-session = buildTypesAiobotocorePackage "qldb-session" "2.6.0" "sha256-N4YntFIEyhhryAaIFY8Gu4Uehw6D/VcTeIlBxx7ej4c="; + + types-aiobotocore-quicksight = buildTypesAiobotocorePackage "quicksight" "2.6.0" "sha256-DOum/vx6URynxImQN9SRhAr5rFgZdSJMdtAMom5YHe8="; + + types-aiobotocore-ram = buildTypesAiobotocorePackage "ram" "2.6.0" "sha256-pZ/h8/1njNNp9+nhpbU/VhGevrZkSrWnhWm3weHAxWQ="; + + types-aiobotocore-rbin = buildTypesAiobotocorePackage "rbin" "2.6.0" "sha256-TOI2FQdO71XT1NESXGrZN+UI6c7CGRmsBbp4ipuQwhg="; + + types-aiobotocore-rds = buildTypesAiobotocorePackage "rds" "2.6.0" "sha256-M0IDOMbqGdLl0WSipPirjDn3Fr4AQ06+j3m0Ci3jyBE="; + + types-aiobotocore-rds-data = buildTypesAiobotocorePackage "rds-data" "2.6.0" "sha256-GYddRqZeBP5f6chzZON9y59KcBiss9eWa8rVGo53C0g="; + + types-aiobotocore-redshift = buildTypesAiobotocorePackage "redshift" "2.6.0" "sha256-6znZQUxNKE7SB6G+9l4iQSP9hZt+plKFA8VkE1scxrU="; + + types-aiobotocore-redshift-data = buildTypesAiobotocorePackage "redshift-data" "2.6.0" "sha256-FRJeBjA5dfnnZ586VShmPt0CBgi5+ZYbldOUZIGR2L0="; + + types-aiobotocore-redshift-serverless = buildTypesAiobotocorePackage "redshift-serverless" "2.6.0" "sha256-lMNUId8z4h/m0FmusvEjYoQj+PUSLaiOREd27vF3qxI="; + + types-aiobotocore-rekognition = buildTypesAiobotocorePackage "rekognition" "2.6.0" "sha256-8luG3yWj82hmMq5KYjNG58pbiDBMk+D6ykgzqE752T8="; + + types-aiobotocore-resiliencehub = buildTypesAiobotocorePackage "resiliencehub" "2.6.0" "sha256-nXZ7ZrpEOSdXdcuGVMNI7hjx6oisnnej18vALIEEzGQ="; + + types-aiobotocore-resource-explorer-2 = buildTypesAiobotocorePackage "resource-explorer-2" "2.6.0" "sha256-cjBd3Ns1ckr7DT9gpaeb8CbXOrmwU3gENN5Is5BwrZI="; + + types-aiobotocore-resource-groups = buildTypesAiobotocorePackage "resource-groups" "2.6.0" "sha256-GcbI21WVdMmwMcpbBkma4VrLsLVRP24/Uk43+4vE864="; + + types-aiobotocore-resourcegroupstaggingapi = buildTypesAiobotocorePackage "resourcegroupstaggingapi" "2.6.0" "sha256-pW8/wn2Qk1jf1d2kYZ84yEaNUcl6xgHw+yuT0bHnsBE="; + + types-aiobotocore-robomaker = buildTypesAiobotocorePackage "robomaker" "2.6.0" "sha256-aKO/fGT4UANiYkZOUuOQ4ungKpW8p+yAT5+42WHgp3M="; + + types-aiobotocore-rolesanywhere = buildTypesAiobotocorePackage "rolesanywhere" "2.6.0" "sha256-jTAe8nMwbXwb+1uf9ITVIKtKyOLIwFH6yi+2IYYVIyU="; + + types-aiobotocore-route53 = buildTypesAiobotocorePackage "route53" "2.6.0" "sha256-RMIrcFD+1RbA3AcRw3TSjENBzmHQL1zHX7FoOFA+UP0="; + + types-aiobotocore-route53-recovery-cluster = buildTypesAiobotocorePackage "route53-recovery-cluster" "2.6.0" "sha256-mBwT11n8moLt/j46AayYES6rjVo3Tpa5UWJ4Klb1N0g="; + + types-aiobotocore-route53-recovery-control-config = buildTypesAiobotocorePackage "route53-recovery-control-config" "2.6.0" "sha256-qYYT1FRpqxtR9LPGMOH+p0+kbeGvfrlIE6rp5Nupioc="; + + types-aiobotocore-route53-recovery-readiness = buildTypesAiobotocorePackage "route53-recovery-readiness" "2.6.0" "sha256-66kGFeDv4PkKYd4UEL4Feqw5LnygBMGvHqctC4EWnNU="; + + types-aiobotocore-route53domains = buildTypesAiobotocorePackage "route53domains" "2.6.0" "sha256-TQ7aNPrky6O+xQefuSkHyFN0XJC5u3xMaT0yrjwYv3E="; + + types-aiobotocore-route53resolver = buildTypesAiobotocorePackage "route53resolver" "2.6.0" "sha256-55qUjFm6ryLjGAmxGLFkl9dPHXjDWyIINZQRQXe4bnk="; + + types-aiobotocore-rum = buildTypesAiobotocorePackage "rum" "2.6.0" "sha256-e8LzXHMfEgkcJKx5a/I//L4/oCz1l7N487wNoTtBP1Y="; + + types-aiobotocore-s3 = buildTypesAiobotocorePackage "s3" "2.6.0" "sha256-MIp/lGwJah2Jj/2KFfoeW2uQlV1DZbP8TYcdsNvEMU8="; + + types-aiobotocore-s3control = buildTypesAiobotocorePackage "s3control" "2.6.0" "sha256-eyiAFFT5KOtTDT2EZNah1KRdcWw1v1titjHwG3DnRj4="; + + types-aiobotocore-s3outposts = buildTypesAiobotocorePackage "s3outposts" "2.6.0" "sha256-g4wAsVc3gqiovsXZtEey4XKmLp/UkIeKD1pEjiey5DE="; + + types-aiobotocore-sagemaker = buildTypesAiobotocorePackage "sagemaker" "2.6.0" "sha256-GUcRyWviI+JCG7XTGBQcUljxAdjBzso76d5A3ql5lbA="; + + types-aiobotocore-sagemaker-a2i-runtime = buildTypesAiobotocorePackage "sagemaker-a2i-runtime" "2.6.0" "sha256-7znJt8gJGnBbTndTPeFOpN6iytOPTJPgvA/tHeYQVoo="; + + types-aiobotocore-sagemaker-edge = buildTypesAiobotocorePackage "sagemaker-edge" "2.6.0" "sha256-O3oCXuvREHW7lcwDzbJRogb9Qa2Wfb8C5/rbpjhVm8A="; + + types-aiobotocore-sagemaker-featurestore-runtime = buildTypesAiobotocorePackage "sagemaker-featurestore-runtime" "2.6.0" "sha256-mcU7ZGAGzbV7i8H1qMWFI9vm/8APRfmaAncxKBJL+NU="; + + types-aiobotocore-sagemaker-geospatial = buildTypesAiobotocorePackage "sagemaker-geospatial" "2.6.0" "sha256-uKvgKNZHFZIYsE0hMWjuHN+QzI/eQcCn4HD2C8H+d2I="; + + types-aiobotocore-sagemaker-metrics = buildTypesAiobotocorePackage "sagemaker-metrics" "2.6.0" "sha256-Hnq9JAdPiqfhb/uLQhMk7JWZ8xHko06KqHXh9f6al/8="; + + types-aiobotocore-sagemaker-runtime = buildTypesAiobotocorePackage "sagemaker-runtime" "2.6.0" "sha256-/7Zzo383eWFjEHxZST1QKzTNHunhR8mjSE2uEHUw9IE="; + + types-aiobotocore-savingsplans = buildTypesAiobotocorePackage "savingsplans" "2.6.0" "sha256-6sIHmILzIg1aOskXnjbDDzbkygXDwFcnd9mfuuhRFZQ="; + + types-aiobotocore-scheduler = buildTypesAiobotocorePackage "scheduler" "2.6.0" "sha256-2BnFCPgaAWxBsc+79oQT+DDj6IM7cV7F+LjqsFG6BBc="; + + types-aiobotocore-schemas = buildTypesAiobotocorePackage "schemas" "2.6.0" "sha256-TW57DJw0QgnPrIWlOlAvESYSEPUD/UKbXVs+NYW+7r0="; + + types-aiobotocore-sdb = buildTypesAiobotocorePackage "sdb" "2.6.0" "sha256-cLciwg4d5EZKYquNitl3yD+8eJnemEiF27LcXfxy0Zs="; + + types-aiobotocore-secretsmanager = buildTypesAiobotocorePackage "secretsmanager" "2.6.0" "sha256-dvte4Yjl+a/UqL5v7xJ9626igVjx/ZPdM2SsLGsVdDk="; + + types-aiobotocore-securityhub = buildTypesAiobotocorePackage "securityhub" "2.6.0" "sha256-36BIOCHnkFyEp3MPa5NfjNJNBeqVMCmx9C907Bw3YWQ="; + + types-aiobotocore-securitylake = buildTypesAiobotocorePackage "securitylake" "2.6.0" "sha256-DKmk2ddd7b0g6mnt0d37Y1ofb6dgN/6XFBCElqdQ9+A="; + + types-aiobotocore-serverlessrepo = buildTypesAiobotocorePackage "serverlessrepo" "2.6.0" "sha256-PRzh/JFCHUqXTSAR4IoftxvkRBsVq4XEX7ihC9FzqSI="; + + types-aiobotocore-service-quotas = buildTypesAiobotocorePackage "service-quotas" "2.6.0" "sha256-GcDl3LIy+urPEzXINmU4g7xgk8IIIJ6fBFFXhv18eSA="; + + types-aiobotocore-servicecatalog = buildTypesAiobotocorePackage "servicecatalog" "2.6.0" "sha256-5IoQuLh6bh3mlzInR+Aci6yIRCSYJXfbvv49FEs2tPA="; + + types-aiobotocore-servicecatalog-appregistry = buildTypesAiobotocorePackage "servicecatalog-appregistry" "2.6.0" "sha256-l0xrQXkDYmB3+RFtwJ70l6GgKeA0z1V107HG8Ddvb8U="; + + types-aiobotocore-servicediscovery = buildTypesAiobotocorePackage "servicediscovery" "2.6.0" "sha256-KLdOmaO6x7AmQInP1RRAf8s5rlpD0PpDHeBnor5gl2A="; + + types-aiobotocore-ses = buildTypesAiobotocorePackage "ses" "2.6.0" "sha256-QNjpM0m1PKSQx2f1eNkOeNP7pHN0PfHZlMFVQbGOgGU="; + + types-aiobotocore-sesv2 = buildTypesAiobotocorePackage "sesv2" "2.6.0" "sha256-5g1LUvS324evqH+Rv+pUKlePnE3QqMqpiLCrknxjQX8="; + + types-aiobotocore-shield = buildTypesAiobotocorePackage "shield" "2.6.0" "sha256-5NbnrGPo9jTCIxq7ubNX/OuKZOXU0PoSwgTjfuMvnKY="; + + types-aiobotocore-signer = buildTypesAiobotocorePackage "signer" "2.6.0" "sha256-AZRsUZpKhzPiHoUcboBeX5zYlVD9kY6F4n6/ifRTpr8="; + + types-aiobotocore-simspaceweaver = buildTypesAiobotocorePackage "simspaceweaver" "2.6.0" "sha256-WrkKQxXI7eIaX4GimyDyBqDWVjw0eF3jJTA40JScvG0="; + + types-aiobotocore-sms = buildTypesAiobotocorePackage "sms" "2.6.0" "sha256-I//ZK5HolYkCfpTCPYhEDALfcn9AYcLk7x7vfRjTDlo="; + + types-aiobotocore-sms-voice = buildTypesAiobotocorePackage "sms-voice" "2.6.0" "sha256-Qz+ZXVBSe3kHgGlqQjgxWoQhnguqauxmPKaISQbAG/8="; + + types-aiobotocore-snow-device-management = buildTypesAiobotocorePackage "snow-device-management" "2.6.0" "sha256-Fh35RpHExkL/PeqEnWNR2pJYWERDJzOF9oE3SvIxxQ4="; + + types-aiobotocore-snowball = buildTypesAiobotocorePackage "snowball" "2.6.0" "sha256-Wia4Xc/Kt8j6X5rZ9vvxupr6tCv1XQQQFOwRnugL0lE="; + + types-aiobotocore-sns = buildTypesAiobotocorePackage "sns" "2.6.0" "sha256-hDPU7e14iYcpt8dXzjx7PgT4TQloAn2ZYrq6cMtMncc="; + + types-aiobotocore-sqs = buildTypesAiobotocorePackage "sqs" "2.6.0" "sha256-J5QSpJQjhO6T2uGpDstHdEVJTLuTIxilmYmKdtB7u6g="; + + types-aiobotocore-ssm = buildTypesAiobotocorePackage "ssm" "2.6.0" "sha256-NxTwgcrDNOHZ8PReIgfTOGLTl7bL1948NKAyjJ0QYKc="; + + types-aiobotocore-ssm-contacts = buildTypesAiobotocorePackage "ssm-contacts" "2.6.0" "sha256-fWnCKnG6ikXzDx40HFxlh9DyLVlX9pBB4CMcJxUt+Ps="; + + types-aiobotocore-ssm-incidents = buildTypesAiobotocorePackage "ssm-incidents" "2.6.0" "sha256-6wkvuRGT91a0Ggxt13amMzjWd6Pj62w4nrvWQNQ0GxI="; + + types-aiobotocore-ssm-sap = buildTypesAiobotocorePackage "ssm-sap" "2.6.0" "sha256-7NkEDcuph8xxjlDjuEiSuhvM5srAeY4QfAKLwFLhCsU="; + + types-aiobotocore-sso = buildTypesAiobotocorePackage "sso" "2.6.0" "sha256-pM6yxg0MxTXjSWZ/CLsatlIMx4tO0p9ZKRzOhyJYXWc="; + + types-aiobotocore-sso-admin = buildTypesAiobotocorePackage "sso-admin" "2.6.0" "sha256-idc5d/Kvjhd7RkTHuErSoP/f64/Q1+jg0TE3UMiL4pQ="; + + types-aiobotocore-sso-oidc = buildTypesAiobotocorePackage "sso-oidc" "2.6.0" "sha256-3eJaNx/Tzy9XQtHSPGKlkMG7klB2KDgL60knGghWAn8="; + + types-aiobotocore-stepfunctions = buildTypesAiobotocorePackage "stepfunctions" "2.6.0" "sha256-7y8SiLa09lDqnMZtlG0Qw5tvAvQMvTNqMuCpRecOpXc="; + + types-aiobotocore-storagegateway = buildTypesAiobotocorePackage "storagegateway" "2.6.0" "sha256-Umq4Slts9RHPJRJCWRAIAizLxB9Clcz8GomLsUr5gNE="; + + types-aiobotocore-sts = buildTypesAiobotocorePackage "sts" "2.6.0" "sha256-iRwalkojzQCUiAQcxl8hEYFFbnIxhuaJfrATnK18ltI="; + + types-aiobotocore-support = buildTypesAiobotocorePackage "support" "2.6.0" "sha256-+4rnAV2Qr29bvWRO6TnSaRZkUVCoefB3SDXc2Ye9kpE="; + + types-aiobotocore-support-app = buildTypesAiobotocorePackage "support-app" "2.6.0" "sha256-CXYfdtO1TdmEz39v2AEeCTJmgiA/EF1gmaBBYGRgYV0="; + + types-aiobotocore-swf = buildTypesAiobotocorePackage "swf" "2.6.0" "sha256-x9cBjUe4LC9uSsFpPciZP1QlUEqfNo3xZFKUqPuVV6E="; + + types-aiobotocore-synthetics = buildTypesAiobotocorePackage "synthetics" "2.6.0" "sha256-Wew0A2xIYOGXzfZf3sBpHnRW/dZD1s6wHveNMwYj1s4="; + + types-aiobotocore-textract = buildTypesAiobotocorePackage "textract" "2.6.0" "sha256-vWUMopzR+1095nN6POsHShvCKZIcUwfW11oMOJ9R94c="; + + types-aiobotocore-timestream-query = buildTypesAiobotocorePackage "timestream-query" "2.6.0" "sha256-4QpCK14NogeYR9DB877zh760GEXYieiyOgepB9DZd+8="; + + types-aiobotocore-timestream-write = buildTypesAiobotocorePackage "timestream-write" "2.6.0" "sha256-bBcMTJOVFq1mJQZtc9M/EMT45Xxxk2DqDgVHfM3qt3A="; + + types-aiobotocore-tnb = buildTypesAiobotocorePackage "tnb" "2.6.0" "sha256-c4Y5kilT50Ips16/YhwduNbm89gB4iLHFv8eN8T4NDM="; + + types-aiobotocore-transcribe = buildTypesAiobotocorePackage "transcribe" "2.6.0" "sha256-HB1CKe9mkD0+0TdFXmdiphDUqc+4xbwBIXSu0PulBE4="; + + types-aiobotocore-transfer = buildTypesAiobotocorePackage "transfer" "2.6.0" "sha256-59SvnKQ+WpAKUZNYunFywLLah1aBnF0maZrFbALXcIM="; + + types-aiobotocore-translate = buildTypesAiobotocorePackage "translate" "2.6.0" "sha256-cgxE6GYG9c4234RAiyFfF22NPHJ29oytOvLpETnjdS4="; + + types-aiobotocore-verifiedpermissions = buildTypesAiobotocorePackage "verifiedpermissions" "2.6.0" "sha256-yg4zDBjgSB7JuuS2DXIUe3PFQq9stIfEJSMF1IP2BWI="; + + types-aiobotocore-voice-id = buildTypesAiobotocorePackage "voice-id" "2.6.0" "sha256-Pnn3CGL5rr3MtzaakjDXmReVKXnyB76IxSnAPnKU45I="; + + types-aiobotocore-vpc-lattice = buildTypesAiobotocorePackage "vpc-lattice" "2.6.0" "sha256-kxniFLA2e7aDKulF5z1Ap3z6wbE3eY3QVqhK+CVhrcE="; + + types-aiobotocore-waf = buildTypesAiobotocorePackage "waf" "2.6.0" "sha256-adKf+AbPmeN57r93T36IewoiLZ+05CbpuS7NxCkQgMw="; + + types-aiobotocore-waf-regional = buildTypesAiobotocorePackage "waf-regional" "2.6.0" "sha256-56SIq8Q6B405aqKU8UMddGHyrJeFaVKZSG4ImBWBZLU="; + + types-aiobotocore-wafv2 = buildTypesAiobotocorePackage "wafv2" "2.6.0" "sha256-nAGK0tN42UhDUmpztGeAPRS5FuuTt+LugQmcgkR0oLA="; + + types-aiobotocore-wellarchitected = buildTypesAiobotocorePackage "wellarchitected" "2.6.0" "sha256-p/2uqdRwKgsS2EUCr8ZLds6WHUjVQz8mEv35qcyMTYA="; + + types-aiobotocore-wisdom = buildTypesAiobotocorePackage "wisdom" "2.6.0" "sha256-EInqI5EqriiI2L/tdQiy3/jY8tnZ6+QOk9PdEyDuSj4="; + + types-aiobotocore-workdocs = buildTypesAiobotocorePackage "workdocs" "2.6.0" "sha256-cNegCM7a4QlI+NLzIRIoGHYzQqbFkNRKqDKLOqE3OUY="; + + types-aiobotocore-worklink = buildTypesAiobotocorePackage "worklink" "2.6.0" "sha256-hMPU0wmTi0BQ+AWo4T6DIOl6FrAQbzdal8rcPoY3wP0="; + + types-aiobotocore-workmail = buildTypesAiobotocorePackage "workmail" "2.6.0" "sha256-W/kHZMLFQ7kv8i/3urxbjdXc7RorMyy5joJNtFPAhVU="; + + types-aiobotocore-workmailmessageflow = buildTypesAiobotocorePackage "workmailmessageflow" "2.6.0" "sha256-Mc3h0CSmJRoV+ncwhtd4Tu5LSoasWqK8V9hXK5+XYfs="; + + types-aiobotocore-workspaces = buildTypesAiobotocorePackage "workspaces" "2.6.0" "sha256-xtsxrIzhjJSoGqd1fEgXP55bRtDsJTtdoWn8eooHCmY="; + + types-aiobotocore-workspaces-web = buildTypesAiobotocorePackage "workspaces-web" "2.6.0" "sha256-J3lsLnwcttamV4NroDuXz9EupXrsoN/SumKrykQkwVU="; + + types-aiobotocore-xray = buildTypesAiobotocorePackage "xray" "2.6.0" "sha256-DPirH1s636ZW6VKyD4wMiJEfM+u9NknH0ODLQagaLrs="; +} diff --git a/pkgs/development/python-modules/types-aiobotocore/default.nix b/pkgs/development/python-modules/types-aiobotocore/default.nix new file mode 100644 index 0000000000000..638a00c60903a --- /dev/null +++ b/pkgs/development/python-modules/types-aiobotocore/default.nix @@ -0,0 +1,1824 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, wheel +, botocore-stubs +, typing-extensions +, types-aiobotocore-accessanalyzer +, types-aiobotocore-account +, types-aiobotocore-acm +, types-aiobotocore-acm-pca +, aiobotocore +, botocore +, types-aiobotocore-alexaforbusiness +, types-aiobotocore-amp +, types-aiobotocore-amplify +, types-aiobotocore-amplifybackend +, types-aiobotocore-amplifyuibuilder +, types-aiobotocore-apigateway +, types-aiobotocore-apigatewaymanagementapi +, types-aiobotocore-apigatewayv2 +, types-aiobotocore-appconfig +, types-aiobotocore-appconfigdata +, types-aiobotocore-appfabric +, types-aiobotocore-appflow +, types-aiobotocore-appintegrations +, types-aiobotocore-application-autoscaling +, types-aiobotocore-application-insights +, types-aiobotocore-applicationcostprofiler +, types-aiobotocore-appmesh +, types-aiobotocore-apprunner +, types-aiobotocore-appstream +, types-aiobotocore-appsync +, types-aiobotocore-arc-zonal-shift +, types-aiobotocore-athena +, types-aiobotocore-auditmanager +, types-aiobotocore-autoscaling +, types-aiobotocore-autoscaling-plans +, types-aiobotocore-backup +, types-aiobotocore-backup-gateway +, types-aiobotocore-backupstorage +, types-aiobotocore-batch +, types-aiobotocore-billingconductor +, types-aiobotocore-braket +, types-aiobotocore-budgets +, types-aiobotocore-ce +, types-aiobotocore-chime +, types-aiobotocore-chime-sdk-identity +, types-aiobotocore-chime-sdk-media-pipelines +, types-aiobotocore-chime-sdk-meetings +, types-aiobotocore-chime-sdk-messaging +, types-aiobotocore-chime-sdk-voice +, types-aiobotocore-cleanrooms +, types-aiobotocore-cloud9 +, types-aiobotocore-cloudcontrol +, types-aiobotocore-clouddirectory +, types-aiobotocore-cloudformation +, types-aiobotocore-cloudfront +, types-aiobotocore-cloudhsm +, types-aiobotocore-cloudhsmv2 +, types-aiobotocore-cloudsearch +, types-aiobotocore-cloudsearchdomain +, types-aiobotocore-cloudtrail +, types-aiobotocore-cloudtrail-data +, types-aiobotocore-cloudwatch +, types-aiobotocore-codeartifact +, types-aiobotocore-codebuild +, types-aiobotocore-codecatalyst +, types-aiobotocore-codecommit +, types-aiobotocore-codedeploy +, types-aiobotocore-codeguru-reviewer +, types-aiobotocore-codeguru-security +, types-aiobotocore-codeguruprofiler +, types-aiobotocore-codepipeline +, types-aiobotocore-codestar +, types-aiobotocore-codestar-connections +, types-aiobotocore-codestar-notifications +, types-aiobotocore-cognito-identity +, types-aiobotocore-cognito-idp +, types-aiobotocore-cognito-sync +, types-aiobotocore-comprehend +, types-aiobotocore-comprehendmedical +, types-aiobotocore-compute-optimizer +, types-aiobotocore-config +, types-aiobotocore-connect +, types-aiobotocore-connect-contact-lens +, types-aiobotocore-connectcampaigns +, types-aiobotocore-connectcases +, types-aiobotocore-connectparticipant +, types-aiobotocore-controltower +, types-aiobotocore-cur +, types-aiobotocore-customer-profiles +, types-aiobotocore-databrew +, types-aiobotocore-dataexchange +, types-aiobotocore-datapipeline +, types-aiobotocore-datasync +, types-aiobotocore-dax +, types-aiobotocore-detective +, types-aiobotocore-devicefarm +, types-aiobotocore-devops-guru +, types-aiobotocore-directconnect +, types-aiobotocore-discovery +, types-aiobotocore-dlm +, types-aiobotocore-dms +, types-aiobotocore-docdb +, types-aiobotocore-docdb-elastic +, types-aiobotocore-drs +, types-aiobotocore-ds +, types-aiobotocore-dynamodb +, types-aiobotocore-dynamodbstreams +, types-aiobotocore-ebs +, types-aiobotocore-ec2 +, types-aiobotocore-ec2-instance-connect +, types-aiobotocore-ecr +, types-aiobotocore-ecr-public +, types-aiobotocore-ecs +, types-aiobotocore-efs +, types-aiobotocore-eks +, types-aiobotocore-elastic-inference +, types-aiobotocore-elasticache +, types-aiobotocore-elasticbeanstalk +, types-aiobotocore-elastictranscoder +, types-aiobotocore-elb +, types-aiobotocore-elbv2 +, types-aiobotocore-emr +, types-aiobotocore-emr-containers +, types-aiobotocore-emr-serverless +, types-aiobotocore-entityresolution +, types-aiobotocore-es +, types-aiobotocore-events +, types-aiobotocore-evidently +, types-aiobotocore-finspace +, types-aiobotocore-finspace-data +, types-aiobotocore-firehose +, types-aiobotocore-fis +, types-aiobotocore-fms +, types-aiobotocore-forecast +, types-aiobotocore-forecastquery +, types-aiobotocore-frauddetector +, types-aiobotocore-fsx +, types-aiobotocore-gamelift +, types-aiobotocore-gamesparks +, types-aiobotocore-glacier +, types-aiobotocore-globalaccelerator +, types-aiobotocore-glue +, types-aiobotocore-grafana +, types-aiobotocore-greengrass +, types-aiobotocore-greengrassv2 +, types-aiobotocore-groundstation +, types-aiobotocore-guardduty +, types-aiobotocore-health +, types-aiobotocore-healthlake +, types-aiobotocore-honeycode +, types-aiobotocore-iam +, types-aiobotocore-identitystore +, types-aiobotocore-imagebuilder +, types-aiobotocore-importexport +, types-aiobotocore-inspector +, types-aiobotocore-inspector2 +, types-aiobotocore-internetmonitor +, types-aiobotocore-iot +, types-aiobotocore-iot-data +, types-aiobotocore-iot-jobs-data +, types-aiobotocore-iot-roborunner +, types-aiobotocore-iot1click-devices +, types-aiobotocore-iot1click-projects +, types-aiobotocore-iotanalytics +, types-aiobotocore-iotdeviceadvisor +, types-aiobotocore-iotevents +, types-aiobotocore-iotevents-data +, types-aiobotocore-iotfleethub +, types-aiobotocore-iotfleetwise +, types-aiobotocore-iotsecuretunneling +, types-aiobotocore-iotsitewise +, types-aiobotocore-iotthingsgraph +, types-aiobotocore-iottwinmaker +, types-aiobotocore-iotwireless +, types-aiobotocore-ivs +, types-aiobotocore-ivs-realtime +, types-aiobotocore-ivschat +, types-aiobotocore-kafka +, types-aiobotocore-kafkaconnect +, types-aiobotocore-kendra +, types-aiobotocore-kendra-ranking +, types-aiobotocore-keyspaces +, types-aiobotocore-kinesis +, types-aiobotocore-kinesis-video-archived-media +, types-aiobotocore-kinesis-video-media +, types-aiobotocore-kinesis-video-signaling +, types-aiobotocore-kinesis-video-webrtc-storage +, types-aiobotocore-kinesisanalytics +, types-aiobotocore-kinesisanalyticsv2 +, types-aiobotocore-kinesisvideo +, types-aiobotocore-kms +, types-aiobotocore-lakeformation +, types-aiobotocore-lambda +, types-aiobotocore-lex-models +, types-aiobotocore-lex-runtime +, types-aiobotocore-lexv2-models +, types-aiobotocore-lexv2-runtime +, types-aiobotocore-license-manager +, types-aiobotocore-license-manager-linux-subscriptions +, types-aiobotocore-license-manager-user-subscriptions +, types-aiobotocore-lightsail +, types-aiobotocore-location +, types-aiobotocore-logs +, types-aiobotocore-lookoutequipment +, types-aiobotocore-lookoutmetrics +, types-aiobotocore-lookoutvision +, types-aiobotocore-m2 +, types-aiobotocore-machinelearning +, types-aiobotocore-macie +, types-aiobotocore-macie2 +, types-aiobotocore-managedblockchain +, types-aiobotocore-managedblockchain-query +, types-aiobotocore-marketplace-catalog +, types-aiobotocore-marketplace-entitlement +, types-aiobotocore-marketplacecommerceanalytics +, types-aiobotocore-mediaconnect +, types-aiobotocore-mediaconvert +, types-aiobotocore-medialive +, types-aiobotocore-mediapackage +, types-aiobotocore-mediapackage-vod +, types-aiobotocore-mediapackagev2 +, types-aiobotocore-mediastore +, types-aiobotocore-mediastore-data +, types-aiobotocore-mediatailor +, types-aiobotocore-medical-imaging +, types-aiobotocore-memorydb +, types-aiobotocore-meteringmarketplace +, types-aiobotocore-mgh +, types-aiobotocore-mgn +, types-aiobotocore-migration-hub-refactor-spaces +, types-aiobotocore-migrationhub-config +, types-aiobotocore-migrationhuborchestrator +, types-aiobotocore-migrationhubstrategy +, types-aiobotocore-mobile +, types-aiobotocore-mq +, types-aiobotocore-mturk +, types-aiobotocore-mwaa +, types-aiobotocore-neptune +, types-aiobotocore-network-firewall +, types-aiobotocore-networkmanager +, types-aiobotocore-nimble +, types-aiobotocore-oam +, types-aiobotocore-omics +, types-aiobotocore-opensearch +, types-aiobotocore-opensearchserverless +, types-aiobotocore-opsworks +, types-aiobotocore-opsworkscm +, types-aiobotocore-organizations +, types-aiobotocore-osis +, types-aiobotocore-outposts +, types-aiobotocore-panorama +, types-aiobotocore-payment-cryptography +, types-aiobotocore-payment-cryptography-data +, types-aiobotocore-personalize +, types-aiobotocore-personalize-events +, types-aiobotocore-personalize-runtime +, types-aiobotocore-pi +, types-aiobotocore-pinpoint +, types-aiobotocore-pinpoint-email +, types-aiobotocore-pinpoint-sms-voice +, types-aiobotocore-pinpoint-sms-voice-v2 +, types-aiobotocore-pipes +, types-aiobotocore-polly +, types-aiobotocore-pricing +, types-aiobotocore-privatenetworks +, types-aiobotocore-proton +, types-aiobotocore-qldb +, types-aiobotocore-qldb-session +, types-aiobotocore-quicksight +, types-aiobotocore-ram +, types-aiobotocore-rbin +, types-aiobotocore-rds +, types-aiobotocore-rds-data +, types-aiobotocore-redshift +, types-aiobotocore-redshift-data +, types-aiobotocore-redshift-serverless +, types-aiobotocore-rekognition +, types-aiobotocore-resiliencehub +, types-aiobotocore-resource-explorer-2 +, types-aiobotocore-resource-groups +, types-aiobotocore-resourcegroupstaggingapi +, types-aiobotocore-robomaker +, types-aiobotocore-rolesanywhere +, types-aiobotocore-route53 +, types-aiobotocore-route53-recovery-cluster +, types-aiobotocore-route53-recovery-control-config +, types-aiobotocore-route53-recovery-readiness +, types-aiobotocore-route53domains +, types-aiobotocore-route53resolver +, types-aiobotocore-rum +, types-aiobotocore-s3 +, types-aiobotocore-s3control +, types-aiobotocore-s3outposts +, types-aiobotocore-sagemaker +, types-aiobotocore-sagemaker-a2i-runtime +, types-aiobotocore-sagemaker-edge +, types-aiobotocore-sagemaker-featurestore-runtime +, types-aiobotocore-sagemaker-geospatial +, types-aiobotocore-sagemaker-metrics +, types-aiobotocore-sagemaker-runtime +, types-aiobotocore-savingsplans +, types-aiobotocore-scheduler +, types-aiobotocore-schemas +, types-aiobotocore-sdb +, types-aiobotocore-secretsmanager +, types-aiobotocore-securityhub +, types-aiobotocore-securitylake +, types-aiobotocore-serverlessrepo +, types-aiobotocore-service-quotas +, types-aiobotocore-servicecatalog +, types-aiobotocore-servicecatalog-appregistry +, types-aiobotocore-servicediscovery +, types-aiobotocore-ses +, types-aiobotocore-sesv2 +, types-aiobotocore-shield +, types-aiobotocore-signer +, types-aiobotocore-simspaceweaver +, types-aiobotocore-sms +, types-aiobotocore-sms-voice +, types-aiobotocore-snow-device-management +, types-aiobotocore-snowball +, types-aiobotocore-sns +, types-aiobotocore-sqs +, types-aiobotocore-ssm +, types-aiobotocore-ssm-contacts +, types-aiobotocore-ssm-incidents +, types-aiobotocore-ssm-sap +, types-aiobotocore-sso +, types-aiobotocore-sso-admin +, types-aiobotocore-sso-oidc +, types-aiobotocore-stepfunctions +, types-aiobotocore-storagegateway +, types-aiobotocore-sts +, types-aiobotocore-support +, types-aiobotocore-support-app +, types-aiobotocore-swf +, types-aiobotocore-synthetics +, types-aiobotocore-textract +, types-aiobotocore-timestream-query +, types-aiobotocore-timestream-write +, types-aiobotocore-tnb +, types-aiobotocore-transcribe +, types-aiobotocore-transfer +, types-aiobotocore-translate +, types-aiobotocore-verifiedpermissions +, types-aiobotocore-voice-id +, types-aiobotocore-vpc-lattice +, types-aiobotocore-waf +, types-aiobotocore-waf-regional +, types-aiobotocore-wafv2 +, types-aiobotocore-wellarchitected +, types-aiobotocore-wisdom +, types-aiobotocore-workdocs +, types-aiobotocore-worklink +, types-aiobotocore-workmail +, types-aiobotocore-workmailmessageflow +, types-aiobotocore-workspaces +, types-aiobotocore-workspaces-web +, types-aiobotocore-xray +}: + +buildPythonPackage rec { + pname = "types-aiobotocore"; + version = "2.6.0"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-GF3YDuyhnEx0JpOxU/tRAnFu+98p0TF5NCU1CXnR2bE="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + botocore-stubs + typing-extensions + ]; + + passthru.optional-dependencies = { + accessanalyzer = [ + types-aiobotocore-accessanalyzer + ]; + account = [ + types-aiobotocore-account + ]; + acm = [ + types-aiobotocore-acm + ]; + acm-pca = [ + types-aiobotocore-acm-pca + ]; + aiobotocore = [ + aiobotocore + botocore + ]; + alexaforbusiness = [ + types-aiobotocore-alexaforbusiness + ]; + all = [ + types-aiobotocore-accessanalyzer + types-aiobotocore-account + types-aiobotocore-acm + types-aiobotocore-acm-pca + types-aiobotocore-alexaforbusiness + types-aiobotocore-amp + types-aiobotocore-amplify + types-aiobotocore-amplifybackend + types-aiobotocore-amplifyuibuilder + types-aiobotocore-apigateway + types-aiobotocore-apigatewaymanagementapi + types-aiobotocore-apigatewayv2 + types-aiobotocore-appconfig + types-aiobotocore-appconfigdata + types-aiobotocore-appfabric + types-aiobotocore-appflow + types-aiobotocore-appintegrations + types-aiobotocore-application-autoscaling + types-aiobotocore-application-insights + types-aiobotocore-applicationcostprofiler + types-aiobotocore-appmesh + types-aiobotocore-apprunner + types-aiobotocore-appstream + types-aiobotocore-appsync + types-aiobotocore-arc-zonal-shift + types-aiobotocore-athena + types-aiobotocore-auditmanager + types-aiobotocore-autoscaling + types-aiobotocore-autoscaling-plans + types-aiobotocore-backup + types-aiobotocore-backup-gateway + types-aiobotocore-backupstorage + types-aiobotocore-batch + types-aiobotocore-billingconductor + types-aiobotocore-braket + types-aiobotocore-budgets + types-aiobotocore-ce + types-aiobotocore-chime + types-aiobotocore-chime-sdk-identity + types-aiobotocore-chime-sdk-media-pipelines + types-aiobotocore-chime-sdk-meetings + types-aiobotocore-chime-sdk-messaging + types-aiobotocore-chime-sdk-voice + types-aiobotocore-cleanrooms + types-aiobotocore-cloud9 + types-aiobotocore-cloudcontrol + types-aiobotocore-clouddirectory + types-aiobotocore-cloudformation + types-aiobotocore-cloudfront + types-aiobotocore-cloudhsm + types-aiobotocore-cloudhsmv2 + types-aiobotocore-cloudsearch + types-aiobotocore-cloudsearchdomain + types-aiobotocore-cloudtrail + types-aiobotocore-cloudtrail-data + types-aiobotocore-cloudwatch + types-aiobotocore-codeartifact + types-aiobotocore-codebuild + types-aiobotocore-codecatalyst + types-aiobotocore-codecommit + types-aiobotocore-codedeploy + types-aiobotocore-codeguru-reviewer + types-aiobotocore-codeguru-security + types-aiobotocore-codeguruprofiler + types-aiobotocore-codepipeline + types-aiobotocore-codestar + types-aiobotocore-codestar-connections + types-aiobotocore-codestar-notifications + types-aiobotocore-cognito-identity + types-aiobotocore-cognito-idp + types-aiobotocore-cognito-sync + types-aiobotocore-comprehend + types-aiobotocore-comprehendmedical + types-aiobotocore-compute-optimizer + types-aiobotocore-config + types-aiobotocore-connect + types-aiobotocore-connect-contact-lens + types-aiobotocore-connectcampaigns + types-aiobotocore-connectcases + types-aiobotocore-connectparticipant + types-aiobotocore-controltower + types-aiobotocore-cur + types-aiobotocore-customer-profiles + types-aiobotocore-databrew + types-aiobotocore-dataexchange + types-aiobotocore-datapipeline + types-aiobotocore-datasync + types-aiobotocore-dax + types-aiobotocore-detective + types-aiobotocore-devicefarm + types-aiobotocore-devops-guru + types-aiobotocore-directconnect + types-aiobotocore-discovery + types-aiobotocore-dlm + types-aiobotocore-dms + types-aiobotocore-docdb + types-aiobotocore-docdb-elastic + types-aiobotocore-drs + types-aiobotocore-ds + types-aiobotocore-dynamodb + types-aiobotocore-dynamodbstreams + types-aiobotocore-ebs + types-aiobotocore-ec2 + types-aiobotocore-ec2-instance-connect + types-aiobotocore-ecr + types-aiobotocore-ecr-public + types-aiobotocore-ecs + types-aiobotocore-efs + types-aiobotocore-eks + types-aiobotocore-elastic-inference + types-aiobotocore-elasticache + types-aiobotocore-elasticbeanstalk + types-aiobotocore-elastictranscoder + types-aiobotocore-elb + types-aiobotocore-elbv2 + types-aiobotocore-emr + types-aiobotocore-emr-containers + types-aiobotocore-emr-serverless + types-aiobotocore-entityresolution + types-aiobotocore-es + types-aiobotocore-events + types-aiobotocore-evidently + types-aiobotocore-finspace + types-aiobotocore-finspace-data + types-aiobotocore-firehose + types-aiobotocore-fis + types-aiobotocore-fms + types-aiobotocore-forecast + types-aiobotocore-forecastquery + types-aiobotocore-frauddetector + types-aiobotocore-fsx + types-aiobotocore-gamelift + types-aiobotocore-gamesparks + types-aiobotocore-glacier + types-aiobotocore-globalaccelerator + types-aiobotocore-glue + types-aiobotocore-grafana + types-aiobotocore-greengrass + types-aiobotocore-greengrassv2 + types-aiobotocore-groundstation + types-aiobotocore-guardduty + types-aiobotocore-health + types-aiobotocore-healthlake + types-aiobotocore-honeycode + types-aiobotocore-iam + types-aiobotocore-identitystore + types-aiobotocore-imagebuilder + types-aiobotocore-importexport + types-aiobotocore-inspector + types-aiobotocore-inspector2 + types-aiobotocore-internetmonitor + types-aiobotocore-iot + types-aiobotocore-iot-data + types-aiobotocore-iot-jobs-data + types-aiobotocore-iot-roborunner + types-aiobotocore-iot1click-devices + types-aiobotocore-iot1click-projects + types-aiobotocore-iotanalytics + types-aiobotocore-iotdeviceadvisor + types-aiobotocore-iotevents + types-aiobotocore-iotevents-data + types-aiobotocore-iotfleethub + types-aiobotocore-iotfleetwise + types-aiobotocore-iotsecuretunneling + types-aiobotocore-iotsitewise + types-aiobotocore-iotthingsgraph + types-aiobotocore-iottwinmaker + types-aiobotocore-iotwireless + types-aiobotocore-ivs + types-aiobotocore-ivs-realtime + types-aiobotocore-ivschat + types-aiobotocore-kafka + types-aiobotocore-kafkaconnect + types-aiobotocore-kendra + types-aiobotocore-kendra-ranking + types-aiobotocore-keyspaces + types-aiobotocore-kinesis + types-aiobotocore-kinesis-video-archived-media + types-aiobotocore-kinesis-video-media + types-aiobotocore-kinesis-video-signaling + types-aiobotocore-kinesis-video-webrtc-storage + types-aiobotocore-kinesisanalytics + types-aiobotocore-kinesisanalyticsv2 + types-aiobotocore-kinesisvideo + types-aiobotocore-kms + types-aiobotocore-lakeformation + types-aiobotocore-lambda + types-aiobotocore-lex-models + types-aiobotocore-lex-runtime + types-aiobotocore-lexv2-models + types-aiobotocore-lexv2-runtime + types-aiobotocore-license-manager + types-aiobotocore-license-manager-linux-subscriptions + types-aiobotocore-license-manager-user-subscriptions + types-aiobotocore-lightsail + types-aiobotocore-location + types-aiobotocore-logs + types-aiobotocore-lookoutequipment + types-aiobotocore-lookoutmetrics + types-aiobotocore-lookoutvision + types-aiobotocore-m2 + types-aiobotocore-machinelearning + types-aiobotocore-macie + types-aiobotocore-macie2 + types-aiobotocore-managedblockchain + types-aiobotocore-managedblockchain-query + types-aiobotocore-marketplace-catalog + types-aiobotocore-marketplace-entitlement + types-aiobotocore-marketplacecommerceanalytics + types-aiobotocore-mediaconnect + types-aiobotocore-mediaconvert + types-aiobotocore-medialive + types-aiobotocore-mediapackage + types-aiobotocore-mediapackage-vod + types-aiobotocore-mediapackagev2 + types-aiobotocore-mediastore + types-aiobotocore-mediastore-data + types-aiobotocore-mediatailor + types-aiobotocore-medical-imaging + types-aiobotocore-memorydb + types-aiobotocore-meteringmarketplace + types-aiobotocore-mgh + types-aiobotocore-mgn + types-aiobotocore-migration-hub-refactor-spaces + types-aiobotocore-migrationhub-config + types-aiobotocore-migrationhuborchestrator + types-aiobotocore-migrationhubstrategy + types-aiobotocore-mobile + types-aiobotocore-mq + types-aiobotocore-mturk + types-aiobotocore-mwaa + types-aiobotocore-neptune + types-aiobotocore-network-firewall + types-aiobotocore-networkmanager + types-aiobotocore-nimble + types-aiobotocore-oam + types-aiobotocore-omics + types-aiobotocore-opensearch + types-aiobotocore-opensearchserverless + types-aiobotocore-opsworks + types-aiobotocore-opsworkscm + types-aiobotocore-organizations + types-aiobotocore-osis + types-aiobotocore-outposts + types-aiobotocore-panorama + types-aiobotocore-payment-cryptography + types-aiobotocore-payment-cryptography-data + types-aiobotocore-personalize + types-aiobotocore-personalize-events + types-aiobotocore-personalize-runtime + types-aiobotocore-pi + types-aiobotocore-pinpoint + types-aiobotocore-pinpoint-email + types-aiobotocore-pinpoint-sms-voice + types-aiobotocore-pinpoint-sms-voice-v2 + types-aiobotocore-pipes + types-aiobotocore-polly + types-aiobotocore-pricing + types-aiobotocore-privatenetworks + types-aiobotocore-proton + types-aiobotocore-qldb + types-aiobotocore-qldb-session + types-aiobotocore-quicksight + types-aiobotocore-ram + types-aiobotocore-rbin + types-aiobotocore-rds + types-aiobotocore-rds-data + types-aiobotocore-redshift + types-aiobotocore-redshift-data + types-aiobotocore-redshift-serverless + types-aiobotocore-rekognition + types-aiobotocore-resiliencehub + types-aiobotocore-resource-explorer-2 + types-aiobotocore-resource-groups + types-aiobotocore-resourcegroupstaggingapi + types-aiobotocore-robomaker + types-aiobotocore-rolesanywhere + types-aiobotocore-route53 + types-aiobotocore-route53-recovery-cluster + types-aiobotocore-route53-recovery-control-config + types-aiobotocore-route53-recovery-readiness + types-aiobotocore-route53domains + types-aiobotocore-route53resolver + types-aiobotocore-rum + types-aiobotocore-s3 + types-aiobotocore-s3control + types-aiobotocore-s3outposts + types-aiobotocore-sagemaker + types-aiobotocore-sagemaker-a2i-runtime + types-aiobotocore-sagemaker-edge + types-aiobotocore-sagemaker-featurestore-runtime + types-aiobotocore-sagemaker-geospatial + types-aiobotocore-sagemaker-metrics + types-aiobotocore-sagemaker-runtime + types-aiobotocore-savingsplans + types-aiobotocore-scheduler + types-aiobotocore-schemas + types-aiobotocore-sdb + types-aiobotocore-secretsmanager + types-aiobotocore-securityhub + types-aiobotocore-securitylake + types-aiobotocore-serverlessrepo + types-aiobotocore-service-quotas + types-aiobotocore-servicecatalog + types-aiobotocore-servicecatalog-appregistry + types-aiobotocore-servicediscovery + types-aiobotocore-ses + types-aiobotocore-sesv2 + types-aiobotocore-shield + types-aiobotocore-signer + types-aiobotocore-simspaceweaver + types-aiobotocore-sms + types-aiobotocore-sms-voice + types-aiobotocore-snow-device-management + types-aiobotocore-snowball + types-aiobotocore-sns + types-aiobotocore-sqs + types-aiobotocore-ssm + types-aiobotocore-ssm-contacts + types-aiobotocore-ssm-incidents + types-aiobotocore-ssm-sap + types-aiobotocore-sso + types-aiobotocore-sso-admin + types-aiobotocore-sso-oidc + types-aiobotocore-stepfunctions + types-aiobotocore-storagegateway + types-aiobotocore-sts + types-aiobotocore-support + types-aiobotocore-support-app + types-aiobotocore-swf + types-aiobotocore-synthetics + types-aiobotocore-textract + types-aiobotocore-timestream-query + types-aiobotocore-timestream-write + types-aiobotocore-tnb + types-aiobotocore-transcribe + types-aiobotocore-transfer + types-aiobotocore-translate + types-aiobotocore-verifiedpermissions + types-aiobotocore-voice-id + types-aiobotocore-vpc-lattice + types-aiobotocore-waf + types-aiobotocore-waf-regional + types-aiobotocore-wafv2 + types-aiobotocore-wellarchitected + types-aiobotocore-wisdom + types-aiobotocore-workdocs + types-aiobotocore-worklink + types-aiobotocore-workmail + types-aiobotocore-workmailmessageflow + types-aiobotocore-workspaces + types-aiobotocore-workspaces-web + types-aiobotocore-xray + ]; + amp = [ + types-aiobotocore-amp + ]; + amplify = [ + types-aiobotocore-amplify + ]; + amplifybackend = [ + types-aiobotocore-amplifybackend + ]; + amplifyuibuilder = [ + types-aiobotocore-amplifyuibuilder + ]; + apigateway = [ + types-aiobotocore-apigateway + ]; + apigatewaymanagementapi = [ + types-aiobotocore-apigatewaymanagementapi + ]; + apigatewayv2 = [ + types-aiobotocore-apigatewayv2 + ]; + appconfig = [ + types-aiobotocore-appconfig + ]; + appconfigdata = [ + types-aiobotocore-appconfigdata + ]; + appfabric = [ + types-aiobotocore-appfabric + ]; + appflow = [ + types-aiobotocore-appflow + ]; + appintegrations = [ + types-aiobotocore-appintegrations + ]; + application-autoscaling = [ + types-aiobotocore-application-autoscaling + ]; + application-insights = [ + types-aiobotocore-application-insights + ]; + applicationcostprofiler = [ + types-aiobotocore-applicationcostprofiler + ]; + appmesh = [ + types-aiobotocore-appmesh + ]; + apprunner = [ + types-aiobotocore-apprunner + ]; + appstream = [ + types-aiobotocore-appstream + ]; + appsync = [ + types-aiobotocore-appsync + ]; + arc-zonal-shift = [ + types-aiobotocore-arc-zonal-shift + ]; + athena = [ + types-aiobotocore-athena + ]; + auditmanager = [ + types-aiobotocore-auditmanager + ]; + autoscaling = [ + types-aiobotocore-autoscaling + ]; + autoscaling-plans = [ + types-aiobotocore-autoscaling-plans + ]; + backup = [ + types-aiobotocore-backup + ]; + backup-gateway = [ + types-aiobotocore-backup-gateway + ]; + backupstorage = [ + types-aiobotocore-backupstorage + ]; + batch = [ + types-aiobotocore-batch + ]; + billingconductor = [ + types-aiobotocore-billingconductor + ]; + braket = [ + types-aiobotocore-braket + ]; + budgets = [ + types-aiobotocore-budgets + ]; + ce = [ + types-aiobotocore-ce + ]; + chime = [ + types-aiobotocore-chime + ]; + chime-sdk-identity = [ + types-aiobotocore-chime-sdk-identity + ]; + chime-sdk-media-pipelines = [ + types-aiobotocore-chime-sdk-media-pipelines + ]; + chime-sdk-meetings = [ + types-aiobotocore-chime-sdk-meetings + ]; + chime-sdk-messaging = [ + types-aiobotocore-chime-sdk-messaging + ]; + chime-sdk-voice = [ + types-aiobotocore-chime-sdk-voice + ]; + cleanrooms = [ + types-aiobotocore-cleanrooms + ]; + cloud9 = [ + types-aiobotocore-cloud9 + ]; + cloudcontrol = [ + types-aiobotocore-cloudcontrol + ]; + clouddirectory = [ + types-aiobotocore-clouddirectory + ]; + cloudformation = [ + types-aiobotocore-cloudformation + ]; + cloudfront = [ + types-aiobotocore-cloudfront + ]; + cloudhsm = [ + types-aiobotocore-cloudhsm + ]; + cloudhsmv2 = [ + types-aiobotocore-cloudhsmv2 + ]; + cloudsearch = [ + types-aiobotocore-cloudsearch + ]; + cloudsearchdomain = [ + types-aiobotocore-cloudsearchdomain + ]; + cloudtrail = [ + types-aiobotocore-cloudtrail + ]; + cloudtrail-data = [ + types-aiobotocore-cloudtrail-data + ]; + cloudwatch = [ + types-aiobotocore-cloudwatch + ]; + codeartifact = [ + types-aiobotocore-codeartifact + ]; + codebuild = [ + types-aiobotocore-codebuild + ]; + codecatalyst = [ + types-aiobotocore-codecatalyst + ]; + codecommit = [ + types-aiobotocore-codecommit + ]; + codedeploy = [ + types-aiobotocore-codedeploy + ]; + codeguru-reviewer = [ + types-aiobotocore-codeguru-reviewer + ]; + codeguru-security = [ + types-aiobotocore-codeguru-security + ]; + codeguruprofiler = [ + types-aiobotocore-codeguruprofiler + ]; + codepipeline = [ + types-aiobotocore-codepipeline + ]; + codestar = [ + types-aiobotocore-codestar + ]; + codestar-connections = [ + types-aiobotocore-codestar-connections + ]; + codestar-notifications = [ + types-aiobotocore-codestar-notifications + ]; + cognito-identity = [ + types-aiobotocore-cognito-identity + ]; + cognito-idp = [ + types-aiobotocore-cognito-idp + ]; + cognito-sync = [ + types-aiobotocore-cognito-sync + ]; + comprehend = [ + types-aiobotocore-comprehend + ]; + comprehendmedical = [ + types-aiobotocore-comprehendmedical + ]; + compute-optimizer = [ + types-aiobotocore-compute-optimizer + ]; + config = [ + types-aiobotocore-config + ]; + connect = [ + types-aiobotocore-connect + ]; + connect-contact-lens = [ + types-aiobotocore-connect-contact-lens + ]; + connectcampaigns = [ + types-aiobotocore-connectcampaigns + ]; + connectcases = [ + types-aiobotocore-connectcases + ]; + connectparticipant = [ + types-aiobotocore-connectparticipant + ]; + controltower = [ + types-aiobotocore-controltower + ]; + cur = [ + types-aiobotocore-cur + ]; + customer-profiles = [ + types-aiobotocore-customer-profiles + ]; + databrew = [ + types-aiobotocore-databrew + ]; + dataexchange = [ + types-aiobotocore-dataexchange + ]; + datapipeline = [ + types-aiobotocore-datapipeline + ]; + datasync = [ + types-aiobotocore-datasync + ]; + dax = [ + types-aiobotocore-dax + ]; + detective = [ + types-aiobotocore-detective + ]; + devicefarm = [ + types-aiobotocore-devicefarm + ]; + devops-guru = [ + types-aiobotocore-devops-guru + ]; + directconnect = [ + types-aiobotocore-directconnect + ]; + discovery = [ + types-aiobotocore-discovery + ]; + dlm = [ + types-aiobotocore-dlm + ]; + dms = [ + types-aiobotocore-dms + ]; + docdb = [ + types-aiobotocore-docdb + ]; + docdb-elastic = [ + types-aiobotocore-docdb-elastic + ]; + drs = [ + types-aiobotocore-drs + ]; + ds = [ + types-aiobotocore-ds + ]; + dynamodb = [ + types-aiobotocore-dynamodb + ]; + dynamodbstreams = [ + types-aiobotocore-dynamodbstreams + ]; + ebs = [ + types-aiobotocore-ebs + ]; + ec2 = [ + types-aiobotocore-ec2 + ]; + ec2-instance-connect = [ + types-aiobotocore-ec2-instance-connect + ]; + ecr = [ + types-aiobotocore-ecr + ]; + ecr-public = [ + types-aiobotocore-ecr-public + ]; + ecs = [ + types-aiobotocore-ecs + ]; + efs = [ + types-aiobotocore-efs + ]; + eks = [ + types-aiobotocore-eks + ]; + elastic-inference = [ + types-aiobotocore-elastic-inference + ]; + elasticache = [ + types-aiobotocore-elasticache + ]; + elasticbeanstalk = [ + types-aiobotocore-elasticbeanstalk + ]; + elastictranscoder = [ + types-aiobotocore-elastictranscoder + ]; + elb = [ + types-aiobotocore-elb + ]; + elbv2 = [ + types-aiobotocore-elbv2 + ]; + emr = [ + types-aiobotocore-emr + ]; + emr-containers = [ + types-aiobotocore-emr-containers + ]; + emr-serverless = [ + types-aiobotocore-emr-serverless + ]; + entityresolution = [ + types-aiobotocore-entityresolution + ]; + es = [ + types-aiobotocore-es + ]; + essential = [ + types-aiobotocore-cloudformation + types-aiobotocore-dynamodb + types-aiobotocore-ec2 + types-aiobotocore-lambda + types-aiobotocore-rds + types-aiobotocore-s3 + types-aiobotocore-sqs + ]; + events = [ + types-aiobotocore-events + ]; + evidently = [ + types-aiobotocore-evidently + ]; + finspace = [ + types-aiobotocore-finspace + ]; + finspace-data = [ + types-aiobotocore-finspace-data + ]; + firehose = [ + types-aiobotocore-firehose + ]; + fis = [ + types-aiobotocore-fis + ]; + fms = [ + types-aiobotocore-fms + ]; + forecast = [ + types-aiobotocore-forecast + ]; + forecastquery = [ + types-aiobotocore-forecastquery + ]; + frauddetector = [ + types-aiobotocore-frauddetector + ]; + fsx = [ + types-aiobotocore-fsx + ]; + gamelift = [ + types-aiobotocore-gamelift + ]; + gamesparks = [ + types-aiobotocore-gamesparks + ]; + glacier = [ + types-aiobotocore-glacier + ]; + globalaccelerator = [ + types-aiobotocore-globalaccelerator + ]; + glue = [ + types-aiobotocore-glue + ]; + grafana = [ + types-aiobotocore-grafana + ]; + greengrass = [ + types-aiobotocore-greengrass + ]; + greengrassv2 = [ + types-aiobotocore-greengrassv2 + ]; + groundstation = [ + types-aiobotocore-groundstation + ]; + guardduty = [ + types-aiobotocore-guardduty + ]; + health = [ + types-aiobotocore-health + ]; + healthlake = [ + types-aiobotocore-healthlake + ]; + honeycode = [ + types-aiobotocore-honeycode + ]; + iam = [ + types-aiobotocore-iam + ]; + identitystore = [ + types-aiobotocore-identitystore + ]; + imagebuilder = [ + types-aiobotocore-imagebuilder + ]; + importexport = [ + types-aiobotocore-importexport + ]; + inspector = [ + types-aiobotocore-inspector + ]; + inspector2 = [ + types-aiobotocore-inspector2 + ]; + internetmonitor = [ + types-aiobotocore-internetmonitor + ]; + iot = [ + types-aiobotocore-iot + ]; + iot-data = [ + types-aiobotocore-iot-data + ]; + iot-jobs-data = [ + types-aiobotocore-iot-jobs-data + ]; + iot-roborunner = [ + types-aiobotocore-iot-roborunner + ]; + iot1click-devices = [ + types-aiobotocore-iot1click-devices + ]; + iot1click-projects = [ + types-aiobotocore-iot1click-projects + ]; + iotanalytics = [ + types-aiobotocore-iotanalytics + ]; + iotdeviceadvisor = [ + types-aiobotocore-iotdeviceadvisor + ]; + iotevents = [ + types-aiobotocore-iotevents + ]; + iotevents-data = [ + types-aiobotocore-iotevents-data + ]; + iotfleethub = [ + types-aiobotocore-iotfleethub + ]; + iotfleetwise = [ + types-aiobotocore-iotfleetwise + ]; + iotsecuretunneling = [ + types-aiobotocore-iotsecuretunneling + ]; + iotsitewise = [ + types-aiobotocore-iotsitewise + ]; + iotthingsgraph = [ + types-aiobotocore-iotthingsgraph + ]; + iottwinmaker = [ + types-aiobotocore-iottwinmaker + ]; + iotwireless = [ + types-aiobotocore-iotwireless + ]; + ivs = [ + types-aiobotocore-ivs + ]; + ivs-realtime = [ + types-aiobotocore-ivs-realtime + ]; + ivschat = [ + types-aiobotocore-ivschat + ]; + kafka = [ + types-aiobotocore-kafka + ]; + kafkaconnect = [ + types-aiobotocore-kafkaconnect + ]; + kendra = [ + types-aiobotocore-kendra + ]; + kendra-ranking = [ + types-aiobotocore-kendra-ranking + ]; + keyspaces = [ + types-aiobotocore-keyspaces + ]; + kinesis = [ + types-aiobotocore-kinesis + ]; + kinesis-video-archived-media = [ + types-aiobotocore-kinesis-video-archived-media + ]; + kinesis-video-media = [ + types-aiobotocore-kinesis-video-media + ]; + kinesis-video-signaling = [ + types-aiobotocore-kinesis-video-signaling + ]; + kinesis-video-webrtc-storage = [ + types-aiobotocore-kinesis-video-webrtc-storage + ]; + kinesisanalytics = [ + types-aiobotocore-kinesisanalytics + ]; + kinesisanalyticsv2 = [ + types-aiobotocore-kinesisanalyticsv2 + ]; + kinesisvideo = [ + types-aiobotocore-kinesisvideo + ]; + kms = [ + types-aiobotocore-kms + ]; + lakeformation = [ + types-aiobotocore-lakeformation + ]; + lambda = [ + types-aiobotocore-lambda + ]; + lex-models = [ + types-aiobotocore-lex-models + ]; + lex-runtime = [ + types-aiobotocore-lex-runtime + ]; + lexv2-models = [ + types-aiobotocore-lexv2-models + ]; + lexv2-runtime = [ + types-aiobotocore-lexv2-runtime + ]; + license-manager = [ + types-aiobotocore-license-manager + ]; + license-manager-linux-subscriptions = [ + types-aiobotocore-license-manager-linux-subscriptions + ]; + license-manager-user-subscriptions = [ + types-aiobotocore-license-manager-user-subscriptions + ]; + lightsail = [ + types-aiobotocore-lightsail + ]; + location = [ + types-aiobotocore-location + ]; + logs = [ + types-aiobotocore-logs + ]; + lookoutequipment = [ + types-aiobotocore-lookoutequipment + ]; + lookoutmetrics = [ + types-aiobotocore-lookoutmetrics + ]; + lookoutvision = [ + types-aiobotocore-lookoutvision + ]; + m2 = [ + types-aiobotocore-m2 + ]; + machinelearning = [ + types-aiobotocore-machinelearning + ]; + macie = [ + types-aiobotocore-macie + ]; + macie2 = [ + types-aiobotocore-macie2 + ]; + managedblockchain = [ + types-aiobotocore-managedblockchain + ]; + managedblockchain-query = [ + types-aiobotocore-managedblockchain-query + ]; + marketplace-catalog = [ + types-aiobotocore-marketplace-catalog + ]; + marketplace-entitlement = [ + types-aiobotocore-marketplace-entitlement + ]; + marketplacecommerceanalytics = [ + types-aiobotocore-marketplacecommerceanalytics + ]; + mediaconnect = [ + types-aiobotocore-mediaconnect + ]; + mediaconvert = [ + types-aiobotocore-mediaconvert + ]; + medialive = [ + types-aiobotocore-medialive + ]; + mediapackage = [ + types-aiobotocore-mediapackage + ]; + mediapackage-vod = [ + types-aiobotocore-mediapackage-vod + ]; + mediapackagev2 = [ + types-aiobotocore-mediapackagev2 + ]; + mediastore = [ + types-aiobotocore-mediastore + ]; + mediastore-data = [ + types-aiobotocore-mediastore-data + ]; + mediatailor = [ + types-aiobotocore-mediatailor + ]; + medical-imaging = [ + types-aiobotocore-medical-imaging + ]; + memorydb = [ + types-aiobotocore-memorydb + ]; + meteringmarketplace = [ + types-aiobotocore-meteringmarketplace + ]; + mgh = [ + types-aiobotocore-mgh + ]; + mgn = [ + types-aiobotocore-mgn + ]; + migration-hub-refactor-spaces = [ + types-aiobotocore-migration-hub-refactor-spaces + ]; + migrationhub-config = [ + types-aiobotocore-migrationhub-config + ]; + migrationhuborchestrator = [ + types-aiobotocore-migrationhuborchestrator + ]; + migrationhubstrategy = [ + types-aiobotocore-migrationhubstrategy + ]; + mobile = [ + types-aiobotocore-mobile + ]; + mq = [ + types-aiobotocore-mq + ]; + mturk = [ + types-aiobotocore-mturk + ]; + mwaa = [ + types-aiobotocore-mwaa + ]; + neptune = [ + types-aiobotocore-neptune + ]; + network-firewall = [ + types-aiobotocore-network-firewall + ]; + networkmanager = [ + types-aiobotocore-networkmanager + ]; + nimble = [ + types-aiobotocore-nimble + ]; + oam = [ + types-aiobotocore-oam + ]; + omics = [ + types-aiobotocore-omics + ]; + opensearch = [ + types-aiobotocore-opensearch + ]; + opensearchserverless = [ + types-aiobotocore-opensearchserverless + ]; + opsworks = [ + types-aiobotocore-opsworks + ]; + opsworkscm = [ + types-aiobotocore-opsworkscm + ]; + organizations = [ + types-aiobotocore-organizations + ]; + osis = [ + types-aiobotocore-osis + ]; + outposts = [ + types-aiobotocore-outposts + ]; + panorama = [ + types-aiobotocore-panorama + ]; + payment-cryptography = [ + types-aiobotocore-payment-cryptography + ]; + payment-cryptography-data = [ + types-aiobotocore-payment-cryptography-data + ]; + personalize = [ + types-aiobotocore-personalize + ]; + personalize-events = [ + types-aiobotocore-personalize-events + ]; + personalize-runtime = [ + types-aiobotocore-personalize-runtime + ]; + pi = [ + types-aiobotocore-pi + ]; + pinpoint = [ + types-aiobotocore-pinpoint + ]; + pinpoint-email = [ + types-aiobotocore-pinpoint-email + ]; + pinpoint-sms-voice = [ + types-aiobotocore-pinpoint-sms-voice + ]; + pinpoint-sms-voice-v2 = [ + types-aiobotocore-pinpoint-sms-voice-v2 + ]; + pipes = [ + types-aiobotocore-pipes + ]; + polly = [ + types-aiobotocore-polly + ]; + pricing = [ + types-aiobotocore-pricing + ]; + privatenetworks = [ + types-aiobotocore-privatenetworks + ]; + proton = [ + types-aiobotocore-proton + ]; + qldb = [ + types-aiobotocore-qldb + ]; + qldb-session = [ + types-aiobotocore-qldb-session + ]; + quicksight = [ + types-aiobotocore-quicksight + ]; + ram = [ + types-aiobotocore-ram + ]; + rbin = [ + types-aiobotocore-rbin + ]; + rds = [ + types-aiobotocore-rds + ]; + rds-data = [ + types-aiobotocore-rds-data + ]; + redshift = [ + types-aiobotocore-redshift + ]; + redshift-data = [ + types-aiobotocore-redshift-data + ]; + redshift-serverless = [ + types-aiobotocore-redshift-serverless + ]; + rekognition = [ + types-aiobotocore-rekognition + ]; + resiliencehub = [ + types-aiobotocore-resiliencehub + ]; + resource-explorer-2 = [ + types-aiobotocore-resource-explorer-2 + ]; + resource-groups = [ + types-aiobotocore-resource-groups + ]; + resourcegroupstaggingapi = [ + types-aiobotocore-resourcegroupstaggingapi + ]; + robomaker = [ + types-aiobotocore-robomaker + ]; + rolesanywhere = [ + types-aiobotocore-rolesanywhere + ]; + route53 = [ + types-aiobotocore-route53 + ]; + route53-recovery-cluster = [ + types-aiobotocore-route53-recovery-cluster + ]; + route53-recovery-control-config = [ + types-aiobotocore-route53-recovery-control-config + ]; + route53-recovery-readiness = [ + types-aiobotocore-route53-recovery-readiness + ]; + route53domains = [ + types-aiobotocore-route53domains + ]; + route53resolver = [ + types-aiobotocore-route53resolver + ]; + rum = [ + types-aiobotocore-rum + ]; + s3 = [ + types-aiobotocore-s3 + ]; + s3control = [ + types-aiobotocore-s3control + ]; + s3outposts = [ + types-aiobotocore-s3outposts + ]; + sagemaker = [ + types-aiobotocore-sagemaker + ]; + sagemaker-a2i-runtime = [ + types-aiobotocore-sagemaker-a2i-runtime + ]; + sagemaker-edge = [ + types-aiobotocore-sagemaker-edge + ]; + sagemaker-featurestore-runtime = [ + types-aiobotocore-sagemaker-featurestore-runtime + ]; + sagemaker-geospatial = [ + types-aiobotocore-sagemaker-geospatial + ]; + sagemaker-metrics = [ + types-aiobotocore-sagemaker-metrics + ]; + sagemaker-runtime = [ + types-aiobotocore-sagemaker-runtime + ]; + savingsplans = [ + types-aiobotocore-savingsplans + ]; + scheduler = [ + types-aiobotocore-scheduler + ]; + schemas = [ + types-aiobotocore-schemas + ]; + sdb = [ + types-aiobotocore-sdb + ]; + secretsmanager = [ + types-aiobotocore-secretsmanager + ]; + securityhub = [ + types-aiobotocore-securityhub + ]; + securitylake = [ + types-aiobotocore-securitylake + ]; + serverlessrepo = [ + types-aiobotocore-serverlessrepo + ]; + service-quotas = [ + types-aiobotocore-service-quotas + ]; + servicecatalog = [ + types-aiobotocore-servicecatalog + ]; + servicecatalog-appregistry = [ + types-aiobotocore-servicecatalog-appregistry + ]; + servicediscovery = [ + types-aiobotocore-servicediscovery + ]; + ses = [ + types-aiobotocore-ses + ]; + sesv2 = [ + types-aiobotocore-sesv2 + ]; + shield = [ + types-aiobotocore-shield + ]; + signer = [ + types-aiobotocore-signer + ]; + simspaceweaver = [ + types-aiobotocore-simspaceweaver + ]; + sms = [ + types-aiobotocore-sms + ]; + sms-voice = [ + types-aiobotocore-sms-voice + ]; + snow-device-management = [ + types-aiobotocore-snow-device-management + ]; + snowball = [ + types-aiobotocore-snowball + ]; + sns = [ + types-aiobotocore-sns + ]; + sqs = [ + types-aiobotocore-sqs + ]; + ssm = [ + types-aiobotocore-ssm + ]; + ssm-contacts = [ + types-aiobotocore-ssm-contacts + ]; + ssm-incidents = [ + types-aiobotocore-ssm-incidents + ]; + ssm-sap = [ + types-aiobotocore-ssm-sap + ]; + sso = [ + types-aiobotocore-sso + ]; + sso-admin = [ + types-aiobotocore-sso-admin + ]; + sso-oidc = [ + types-aiobotocore-sso-oidc + ]; + stepfunctions = [ + types-aiobotocore-stepfunctions + ]; + storagegateway = [ + types-aiobotocore-storagegateway + ]; + sts = [ + types-aiobotocore-sts + ]; + support = [ + types-aiobotocore-support + ]; + support-app = [ + types-aiobotocore-support-app + ]; + swf = [ + types-aiobotocore-swf + ]; + synthetics = [ + types-aiobotocore-synthetics + ]; + textract = [ + types-aiobotocore-textract + ]; + timestream-query = [ + types-aiobotocore-timestream-query + ]; + timestream-write = [ + types-aiobotocore-timestream-write + ]; + tnb = [ + types-aiobotocore-tnb + ]; + transcribe = [ + types-aiobotocore-transcribe + ]; + transfer = [ + types-aiobotocore-transfer + ]; + translate = [ + types-aiobotocore-translate + ]; + verifiedpermissions = [ + types-aiobotocore-verifiedpermissions + ]; + voice-id = [ + types-aiobotocore-voice-id + ]; + vpc-lattice = [ + types-aiobotocore-vpc-lattice + ]; + waf = [ + types-aiobotocore-waf + ]; + waf-regional = [ + types-aiobotocore-waf-regional + ]; + wafv2 = [ + types-aiobotocore-wafv2 + ]; + wellarchitected = [ + types-aiobotocore-wellarchitected + ]; + wisdom = [ + types-aiobotocore-wisdom + ]; + workdocs = [ + types-aiobotocore-workdocs + ]; + worklink = [ + types-aiobotocore-worklink + ]; + workmail = [ + types-aiobotocore-workmail + ]; + workmailmessageflow = [ + types-aiobotocore-workmailmessageflow + ]; + workspaces = [ + types-aiobotocore-workspaces + ]; + workspaces-web = [ + types-aiobotocore-workspaces-web + ]; + xray = [ + types-aiobotocore-xray + ]; + }; + + # Package has no tests + doCheck = false; + + meta = with lib; { + description = "Type annotations for aiobotocore generated with mypy-boto3-builder"; + homepage = "https://pypi.org/project/types-aiobotocore/"; + license = licenses.mit; + maintainers = with maintainers; [ mbalatsko ]; + }; +} diff --git a/pkgs/development/python-modules/types-awscrt/default.nix b/pkgs/development/python-modules/types-awscrt/default.nix index ea56034cf9c2f..ce82a75f52d4b 100644 --- a/pkgs/development/python-modules/types-awscrt/default.nix +++ b/pkgs/development/python-modules/types-awscrt/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "types-awscrt"; - version = "0.19.1"; + version = "0.19.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "types_awscrt"; inherit version; - hash = "sha256-YYM6oUDnJKkJgCVhD0uM3j3PZbhCYx10RzePn1204f0="; + hash = "sha256-2MN5QgunWx5DaH0SsLdypbsX81KFmivvaqjwq94SP1U="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/types-protobuf/default.nix b/pkgs/development/python-modules/types-protobuf/default.nix index 4da64fcf8e597..e644b715544fb 100644 --- a/pkgs/development/python-modules/types-protobuf/default.nix +++ b/pkgs/development/python-modules/types-protobuf/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-protobuf"; - version = "4.24.0.1"; + version = "4.24.0.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-kK3qO2k9akDY7wdcWP5rXMbgH+FJYwGn5vxwOY3P+S4="; + hash = "sha256-WYuyKQubDqZfT2NWmgneqkR17de7DYWJBXo43rCxn08="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/types-pytz/default.nix b/pkgs/development/python-modules/types-pytz/default.nix index 54848a027df93..9433d55512ec1 100644 --- a/pkgs/development/python-modules/types-pytz/default.nix +++ b/pkgs/development/python-modules/types-pytz/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-pytz"; - version = "2023.3.1.0"; + version = "2023.3.1.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-jn0hmMukSnLfdiiIfJD2ilaOFEXxTbZGMa9Qw8q4wJA="; + hash = "sha256-zCPQGSzUnI9rukTuDIHkWGqPMCBJcPwIlNIJprCNq5o="; }; # Modules doesn't have tests diff --git a/pkgs/development/python-modules/types-redis/default.nix b/pkgs/development/python-modules/types-redis/default.nix index 92ffba08b6842..1b59386174eba 100644 --- a/pkgs/development/python-modules/types-redis/default.nix +++ b/pkgs/development/python-modules/types-redis/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "types-redis"; - version = "4.6.0.6"; + version = "4.6.0.7"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-eGWoQ4ApN6st3KM1ecTiVb/nP4evhYJOrXpnKbqS/FI="; + hash = "sha256-KMQVPdtcnU8Q3vRKJFRnPDYdLV/DzYZ887sVIPP1mjg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index 14481ff78da0a..0bbee57a78e05 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.31.0.2"; + version = "2.31.0.7"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-aqP3+vDqUtcouxjAoNFSLZv9jHLSb/b2G/w9BqQRz0A="; + hash = "sha256-TZMNyrvCRS49cHKOWBrErIwtE/YlCa2RFGc/VCr4y04="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/types-s3transfer/default.nix b/pkgs/development/python-modules/types-s3transfer/default.nix new file mode 100644 index 0000000000000..56c27732187f0 --- /dev/null +++ b/pkgs/development/python-modules/types-s3transfer/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, poetry-core +}: + +buildPythonPackage rec { + pname = "types-s3transfer"; + version = "0.7.0"; + pyproject = true; + + src = fetchPypi { + pname = "types_s3transfer"; + inherit version; + hash = "sha256-rKDySG0KOlA3zVuPPiCkUiopV5qN0YMoH/CqHE4siqc="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "s3transfer-stubs" + ]; + + meta = with lib; { + description = "Type annotations and code completion for s3transfer"; + homepage = "https://github.com/youtype/types-s3transfer"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/ua-parser/default.nix b/pkgs/development/python-modules/ua-parser/default.nix index e9c9a561739c0..ba0f75ce6f356 100644 --- a/pkgs/development/python-modules/ua-parser/default.nix +++ b/pkgs/development/python-modules/ua-parser/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "ua-parser"; - version = "0.16.1"; + version = "0.18.0"; format = "setuptools"; @@ -16,7 +16,7 @@ buildPythonPackage rec { repo = "uap-python"; rev = version; fetchSubmodules = true; - hash = "sha256-vyzeRi/wYEyezSU+EigJATgrNvABGCWVWlSFhKGipLE="; + hash = "sha256-GiuGPnyYL0HQ/J2OpDTD1/panZCuzKtD3mKW5op5lXA="; }; patches = [ diff --git a/pkgs/development/python-modules/unearth/default.nix b/pkgs/development/python-modules/unearth/default.nix index bcf6f5afa788f..4602a30fde98c 100644 --- a/pkgs/development/python-modules/unearth/default.nix +++ b/pkgs/development/python-modules/unearth/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "unearth"; - version = "0.10.0"; + version = "0.11.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1bFSpasqo+UUmhHPezulxdSTF23KOPZsqJadrdWo9kU="; + hash = "sha256-ryBymzmNLzuDklHXReT0DyPLCb1reX4Kb/bu1GynBCI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/universal-silabs-flasher/default.nix b/pkgs/development/python-modules/universal-silabs-flasher/default.nix index 348fa01ffbe16..420b9f078c15f 100644 --- a/pkgs/development/python-modules/universal-silabs-flasher/default.nix +++ b/pkgs/development/python-modules/universal-silabs-flasher/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "universal-silabs-flasher"; - version = "0.0.13"; + version = "0.0.14"; format = "pyproject"; src = fetchFromGitHub { owner = "NabuCasa"; repo = "universal-silabs-flasher"; rev = "v${version}"; - hash = "sha256-qiaDPCnVb6JQ2fZRFK+QF4o8K2UbIWGNKl5oo6MQUW0="; + hash = "sha256-0c9b571gJXFOAe5ct8O/qy7D6rDosmBHDYEv6odLQ2s="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/upcloud-api/default.nix b/pkgs/development/python-modules/upcloud-api/default.nix index 5c0409be3728f..17fec99811e38 100644 --- a/pkgs/development/python-modules/upcloud-api/default.nix +++ b/pkgs/development/python-modules/upcloud-api/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "upcloud-api"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "UpCloudLtd"; repo = "upcloud-python-api"; rev = "refs/tags/v${version}"; - hash = "sha256-35vPODc/oL+JPMnStFutIRYVTUkYAXKRt/KXBW0Yc+U="; + hash = "sha256-fMsI0aZ8jA08rrNPm8HmfYz/a3HLUExvvXIeDGPh2e8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index 1e5de05abe493..a906ce2d76f94 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "uproot"; - version = "5.0.11"; + version = "5.0.12"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = "uproot5"; rev = "refs/tags/v${version}"; - hash = "sha256-qp1iffElJSAwqaycelnILBzeW8kG7Yy0R1bjMumW8UU="; + hash = "sha256-5RJPRrnPRRj1KXeyCqrGwaurXPx0aT6gso1o7gQ1aNs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/userpath/default.nix b/pkgs/development/python-modules/userpath/default.nix index edf92f5711666..5f4a31d39b190 100644 --- a/pkgs/development/python-modules/userpath/default.nix +++ b/pkgs/development/python-modules/userpath/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "userpath"; - version = "1.9.0"; + version = "1.9.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-heMnRUMXRHfGLVcB7UOj7xBRgkqd13aWitxBHlhkDdE="; + hash = "sha256-zoF2co2YyRS2QBeBvzsj/M2WjRZHU5yHiMcBA3XgJ5Y="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/volvooncall/default.nix b/pkgs/development/python-modules/volvooncall/default.nix index 27356372fce02..33efbf4082ac2 100644 --- a/pkgs/development/python-modules/volvooncall/default.nix +++ b/pkgs/development/python-modules/volvooncall/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "volvooncall"; - version = "0.10.3"; + version = "0.10.4"; format = "setuptools"; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "molobrakos"; repo = "volvooncall"; rev = "refs/tags/v${version}"; - hash = "sha256-FLrsU3u/0+T09cu2zU2fLjuAy9PWAikgbaW8xBALjwU="; + hash = "sha256-xr3g93rt3jvxVZrZY7cFh5eBP3k0arsejsgvx8p5EV4="; }; patches = [ @@ -69,6 +69,7 @@ buildPythonPackage rec { homepage = "https://github.com/molobrakos/volvooncall"; changelog = "https://github.com/molobrakos/volvooncall/releases/tag/v${version}"; license = licenses.unlicense; + mainProgram = "voc"; maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/walrus/default.nix b/pkgs/development/python-modules/walrus/default.nix new file mode 100644 index 0000000000000..73376590bda3d --- /dev/null +++ b/pkgs/development/python-modules/walrus/default.nix @@ -0,0 +1,52 @@ +{ lib +, pkgs +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, redis +, unittestCheckHook +}: + +buildPythonPackage rec { + pname = "walrus"; + version = "0.9.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "coleifer"; + repo = "walrus"; + rev = "refs/tags/${version}"; + hash = "sha256-jinYMGSBAY8HTg92qU/iU5vGIrrDr5SeQG0XjsBVfcc="; + }; + + propagatedBuildInputs = [ + redis + ]; + + nativeCheckInputs = [ + unittestCheckHook + ]; + + preCheck = '' + ${pkgs.redis}/bin/redis-server & + REDIS_PID=$! + ''; + + postCheck = '' + kill $REDIS_PID + ''; + + pythonImportsCheck = [ + "walrus" + ]; + + meta = with lib; { + description = "Lightweight Python utilities for working with Redis"; + homepage = "https://github.com/coleifer/walrus"; + changelog = "https://github.com/coleifer/walrus/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ mbalatsko ]; + }; +} diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix index 0c06b49894791..2622b1800684e 100644 --- a/pkgs/development/python-modules/wandb/default.nix +++ b/pkgs/development/python-modules/wandb/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { pname = "wandb"; - version = "0.15.10"; + version = "0.15.11"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -61,7 +61,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-MuYaeg7+lMOOSalnLyKsCw+f44daDDayvyKvY8z697c="; + hash = "sha256-WaVgyF+pQgFCqIsi5Tcu+btyUKU2e3/qJi4Ma8dnx8M="; }; patches = [ diff --git a/pkgs/development/python-modules/webauthn/default.nix b/pkgs/development/python-modules/webauthn/default.nix index 2ef7d52e2a359..57c7857ca71bb 100644 --- a/pkgs/development/python-modules/webauthn/default.nix +++ b/pkgs/development/python-modules/webauthn/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "webauthn"; - version = "1.10.1"; + version = "1.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "duo-labs"; repo = "py_webauthn"; rev = "refs/tags/v${version}"; - hash = "sha256-ZfHFyjdZeKuKX/aokhB6L93HbBFnlrvuJZ2V4uRmNck="; + hash = "sha256-mZBnTmjlmR9jOOmu6uY114UZpm05ny2ZMEF0NXhVrME="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/webrtc-noise-gain/default.nix b/pkgs/development/python-modules/webrtc-noise-gain/default.nix new file mode 100644 index 0000000000000..63b02a1bfd0d2 --- /dev/null +++ b/pkgs/development/python-modules/webrtc-noise-gain/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, stdenv + +# build-system +, pybind11 +, setuptools + +# native dependencies +, abseil-cpp +, darwin + +# tests +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "webrtc-noise-gain"; + version = "1.2.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "rhasspy"; + repo = "webrtc-noise-gain"; + rev = "v${version}"; + hash = "sha256-DFEtuO49zXNixLwBjQ/WOiARDhMAXVH+5hfc3eSdPIo="; + }; + + nativeBuildInputs = [ + pybind11 + setuptools + ]; + + buildInputs = [ + abseil-cpp + ] ++ lib.optionals (stdenv.isDarwin) [ + darwin.apple_sdk.frameworks.CoreServices + ]; + + pythonImportsCheck = [ + "webrtc_noise_gain" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Tiny wrapper around webrtc-audio-processing for noise suppression/auto gain only"; + homepage = "https://github.com/rhasspy/webrtc-noise-gain"; + changelog = "https://github.com/rhasspy/webrtc-noise-gain/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix index a1d1522bb9a00..496e73090c944 100644 --- a/pkgs/development/python-modules/weconnect/default.nix +++ b/pkgs/development/python-modules/weconnect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "weconnect"; - version = "0.58.0"; + version = "0.58.3"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-python"; rev = "refs/tags/v${version}"; - hash = "sha256-2+RvDAKIUsQwmVrqcgt0RXOF+Z+lZ6oSyZyI+HTcZBs="; + hash = "sha256-fSrmprt3aiYa8gRXOWKHKXah3zSqhRvD32nVdMrihwA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/whodap/default.nix b/pkgs/development/python-modules/whodap/default.nix index a666d0a156b5d..a322c327b2300 100644 --- a/pkgs/development/python-modules/whodap/default.nix +++ b/pkgs/development/python-modules/whodap/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "whodap"; - version = "0.1.9"; + version = "0.1.10"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pogzyb"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-0Wxx33AO9g4ACAUwkFkLo2AemK7PxXvZXWgHpu+E96c="; + hash = "sha256-5XDTl8NPrYWs7gPTJRDVCiZN3cWQ53/ojhJivBPHUL0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/wikipedia-api/default.nix b/pkgs/development/python-modules/wikipedia-api/default.nix new file mode 100644 index 0000000000000..bb1fbd67dabb2 --- /dev/null +++ b/pkgs/development/python-modules/wikipedia-api/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "Wikipedia-API"; + version = "0.6.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "martin-majlis"; + repo = "Wikipedia-API"; + rev = "v${version}"; + hash = "sha256-cmwyQhKbkIpZXkKqqT0X2Lp8OFma2joeb4uxDRPiQe8="; + }; + + propagatedBuildInputs = [ + requests + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "wikipediaapi" ]; + + meta = with lib; { + description = "Python wrapper for Wikipedia"; + homepage = "https://github.com/martin-majlis/Wikipedia-API"; + changelog = "https://github.com/martin-majlis/Wikipedia-API/blob/${src.rev}/CHANGES.rst"; + license = licenses.mit; + maintainers = with maintainers; [ mbalatsko ]; + }; +} diff --git a/pkgs/development/python-modules/wsgidav/default.nix b/pkgs/development/python-modules/wsgidav/default.nix index 9dc51364bc654..bff7c88f1463a 100644 --- a/pkgs/development/python-modules/wsgidav/default.nix +++ b/pkgs/development/python-modules/wsgidav/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "wsgidav"; - version = "4.2.0"; + version = "4.3.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "mar10"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-1S3Zi92YRcu/PKNWJIn2ayr5Wbc+/+E7irFBQpMrKW8="; + hash = "sha256-DEUoKoFELIOg5KX6hL1VgR18dtsery4ZzKksrxl0D7Q="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/wyoming/default.nix b/pkgs/development/python-modules/wyoming/default.nix index feb7106c513c4..b7ae51379cdc5 100644 --- a/pkgs/development/python-modules/wyoming/default.nix +++ b/pkgs/development/python-modules/wyoming/default.nix @@ -1,16 +1,21 @@ { lib , buildPythonPackage , fetchPypi + +# tests +, wyoming-faster-whisper +, wyoming-openwakeword +, wyoming-piper }: buildPythonPackage rec { pname = "wyoming"; - version = "1.1.0"; + version = "1.2.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-I5GgDu9HRj6fIX66q3RuDeB13h6dpwxrSBxKhzE+Fus="; + hash = "sha256-mgNhc8PMRrwfvGZEcgIvQ/P2dysdDo2juvZccvb2C/g="; }; pythonImportsCheck = [ @@ -20,6 +25,14 @@ buildPythonPackage rec { # no tests doCheck = false; + passthru.tests = { + inherit + wyoming-faster-whisper + wyoming-openwakeword + wyoming-piper + ; + }; + meta = with lib; { description = "Protocol for Rhasspy Voice Assistant"; homepage = "https://pypi.org/project/wyoming/"; diff --git a/pkgs/development/python-modules/xdg-base-dirs/default.nix b/pkgs/development/python-modules/xdg-base-dirs/default.nix index f2ca5bf0a5094..b2eb4094c9272 100644 --- a/pkgs/development/python-modules/xdg-base-dirs/default.nix +++ b/pkgs/development/python-modules/xdg-base-dirs/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "xdg-base-dirs"; - version = "6.0.0"; + version = "6.0.1"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "srstevenson"; repo = "xdg-base-dirs"; rev = version; - hash = "sha256-yVuruSKv99IZGNCpY9cKwAe6gJNAWjL+Lol2D1/0hiI="; + hash = "sha256-nbdF1tjVqlxwiGW0pySS6HyJbmNuQ7mVdQYfhofO4Dk="; }; nativeBuildInputs = [ @@ -28,6 +28,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "xdg_base_dirs" ]; + # remove coverage flags from pytest config + postPatch = '' + sed -i /addopts/d pyproject.toml + ''; + meta = with lib; { description = "An implementation of the XDG Base Directory Specification in Python"; homepage = "https://github.com/srstevenson/xdg-base-dirs"; diff --git a/pkgs/development/python-modules/xgboost/default.nix b/pkgs/development/python-modules/xgboost/default.nix index 5d0b3b5612213..2a65992e048d2 100644 --- a/pkgs/development/python-modules/xgboost/default.nix +++ b/pkgs/development/python-modules/xgboost/default.nix @@ -4,17 +4,19 @@ , cmake , numpy , scipy +, hatchling , stdenv , xgboost }: buildPythonPackage { pname = "xgboost"; + format = "pyproject"; inherit (xgboost) version src meta; disabled = pythonOlder "3.8"; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake hatchling ]; buildInputs = [ xgboost ]; propagatedBuildInputs = [ numpy scipy ]; diff --git a/pkgs/development/python-modules/xknxproject/default.nix b/pkgs/development/python-modules/xknxproject/default.nix index 7de6ca3bc8038..64ad5a1ebf821 100644 --- a/pkgs/development/python-modules/xknxproject/default.nix +++ b/pkgs/development/python-modules/xknxproject/default.nix @@ -2,17 +2,17 @@ , buildPythonPackage , cryptography , fetchFromGitHub -, fetchpatch , pytestCheckHook , pythonOlder , pyzipper , setuptools +, striprtf , wheel }: buildPythonPackage rec { pname = "xknxproject"; - version = "3.2.0"; + version = "3.3.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,17 +21,9 @@ buildPythonPackage rec { owner = "XKNX"; repo = "xknxproject"; rev = "refs/tags/${version}"; - hash = "sha256-ZLBvhuLXEOgqS7tRwP/e1Dv1/EMqxqXgpAZtLQGIt/o="; + hash = "sha256-RH5RQHLpfrI9fRg6OfPZ7/BPHQuHCrkJlwW/EJitdPo="; }; - patches = [ - (fetchpatch { - name = "unpin-setuptools.patch"; - url = "https://github.com/XKNX/xknxproject/commit/53fecaf757d682fda00b04c3a2a1f3da86d9705f.patch"; - hash = "sha256-EpfgEq4pIx7ahqJZalzo30ruj8NlZYHcKHxFXCGL98w="; - }) - ]; - nativeBuildInputs = [ setuptools wheel @@ -40,6 +32,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cryptography pyzipper + striprtf ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix index 42af3b86d4bca..a8e595e497923 100644 --- a/pkgs/development/python-modules/xmlschema/default.nix +++ b/pkgs/development/python-modules/xmlschema/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "xmlschema"; - version = "2.3.1"; + version = "2.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "xmlschema"; rev = "refs/tags/v${version}"; - hash = "sha256-0xXA3IguVAyFp5dFvuzAQhzJlGMmNthmPXcja9FYV44="; + hash = "sha256-ETWD+i0VJbmfSHFvOsRkuzScKZdEyr6It3+U5Q7cQbQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/y-py/default.nix b/pkgs/development/python-modules/y-py/default.nix index accb1844b4c6d..97747ccfdf5b5 100644 --- a/pkgs/development/python-modules/y-py/default.nix +++ b/pkgs/development/python-modules/y-py/default.nix @@ -11,19 +11,19 @@ buildPythonPackage rec { pname = "y-py"; - version = "0.6.0"; + version = "0.6.2"; format = "pyproject"; src = fetchPypi { pname = "y_py"; inherit version; - hash = "sha256-RoNhaffcKVffhRPP5LwgCRdbOkc+Ywr0IajnXuHEj5g="; + hash = "sha256-R1eoKlBAags6MzqgEiAZozG9bxbkn+1n3KQj+Siz/U0="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-tpUDGBIHqXsKPsK+1h2sNuiV2I0pGVBokKh+hdFazRQ="; + hash = "sha256-RXwrDSPU0wiprsUJwoDzti14H/+bSwy4hK4tYhNVfYw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix index ed411bc3a7de0..19d40b4f8051a 100644 --- a/pkgs/development/python-modules/yalexs/default.nix +++ b/pkgs/development/python-modules/yalexs/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "yalexs"; - version = "1.9.0"; + version = "1.10.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-9rXAFMFpKF+oIKXSFLVCLDfdpMF837xRIEe3aH7ditc="; + hash = "sha256-7LFKqC8IHzXKKU5Pw6Qud9jqJFc0lSEJFn636T6CsfQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/yamlordereddictloader/default.nix b/pkgs/development/python-modules/yamlordereddictloader/default.nix index 9de933fda157e..631d61e3f5946 100644 --- a/pkgs/development/python-modules/yamlordereddictloader/default.nix +++ b/pkgs/development/python-modules/yamlordereddictloader/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "yamlordereddictloader"; - version = "0.4.0"; + version = "0.4.2"; src = fetchPypi { inherit pname version; - sha256 = "03h8wa6pzqjiw25s3jv9gydn77gs444mf31lrgvpgy53kswz0c3z"; + sha256 = "sha256-Nq8vYhD8/12k/EwS4dgV+XPc60EETnleHwYRXWNLyhM="; }; propagatedBuildInputs = [ pyyaml ]; diff --git a/pkgs/development/python-modules/ypy-websocket/default.nix b/pkgs/development/python-modules/ypy-websocket/default.nix index 70b9d9bfb0bf8..b1840800622f1 100644 --- a/pkgs/development/python-modules/ypy-websocket/default.nix +++ b/pkgs/development/python-modules/ypy-websocket/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "ypy-websocket"; - version = "0.12.3"; + version = "0.12.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "y-crdt"; repo = "ypy-websocket"; rev = "refs/tags/v${version}"; - hash = "sha256-gBLRjqsI2xx2z8qfaix4Gsm1rlNcjZ5g1PNVW7N4Q5k="; + hash = "sha256-48x+MUhev9dErC003XOP3oGKd5uOghlBFgcR8Nm/0xs="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/ytmusicapi/default.nix b/pkgs/development/python-modules/ytmusicapi/default.nix index 8334fba45ffbd..7f3591468c0b5 100644 --- a/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/pkgs/development/python-modules/ytmusicapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ytmusicapi"; - version = "1.2.1"; + version = "1.3.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "sigma67"; repo = "ytmusicapi"; rev = "refs/tags/${version}"; - hash = "sha256-YgV3kCvCOLNXb3cWBVXRuzH4guuvPpXVojOnSnrXj20="; + hash = "sha256-dJckAQ0sWdP7I10khcyKGKsIcDTXQxZtP7B8JHlIZEo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index ad624789d13ed..71e83806ffe8f 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.112.0"; + version = "0.115.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = "refs/tags/${version}"; - hash = "sha256-A/5c3SV9rn71RZgjHq4NJDphg8u0ZlHtCbFHe5+UybI="; + hash = "sha256-3dKF0DERxybhDZiwPpre1yrumZGILp0EIWur9WIkhhQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/zeversolarlocal/default.nix b/pkgs/development/python-modules/zeversolarlocal/default.nix index 04063837b4206..b1e515d763206 100644 --- a/pkgs/development/python-modules/zeversolarlocal/default.nix +++ b/pkgs/development/python-modules/zeversolarlocal/default.nix @@ -1,7 +1,9 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , flit-core +, dos2unix , httpx , pytest-asyncio , pytest-mock @@ -12,7 +14,7 @@ buildPythonPackage rec { pname = "zeversolarlocal"; version = "1.1.0"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,6 +25,7 @@ buildPythonPackage rec { nativeBuildInputs = [ flit-core + dos2unix ]; propagatedBuildInputs = [ @@ -35,6 +38,20 @@ buildPythonPackage rec { pytestCheckHook ]; + # the patch below won't apply unless we fix the line endings + prePatch = '' + dos2unix pyproject.toml + ''; + + patches = [ + # Raise the flit-core limit + # https://github.com/sander76/zeversolarlocal/pull/4 + (fetchpatch { + url = "https://github.com/sander76/zeversolarlocal/commit/bff072ea046de07eced77bc79eb8e90dfef1f53f.patch"; + hash = "sha256-tzFCwPzhAfwVfN5mLY/DMwRv7zGzx3ScBe+kKzkYcvo="; + }) + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace "--cov zeversolarlocal --cov-report xml:cov.xml --cov-report term-missing -vv" "" diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 698e93d760765..7413ddbfedaf9 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.103"; + version = "0.0.104"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-H6LkCjpyj1uk05aIvO2TNJoAEXsPZlsIHo+t5rO5ikY="; + hash = "sha256-oPg+eQ89GhNX5ADTK9JvgXuBhH7HZs3Ktuami2v2a38="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zigpy-xbee/default.nix b/pkgs/development/python-modules/zigpy-xbee/default.nix index a94eb4e4c5458..fe0eb86075826 100644 --- a/pkgs/development/python-modules/zigpy-xbee/default.nix +++ b/pkgs/development/python-modules/zigpy-xbee/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "zigpy-xbee"; - version = "0.18.2"; + version = "0.18.3"; # https://github.com/Martiusweb/asynctest/issues/152 # broken by upstream python bug with asynctest and # is used exclusively by home-assistant with python 3.8 @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy-xbee"; rev = "refs/tags/${version}"; - hash = "sha256-aglKQWIMh0IyrcGt+PZVtzcgs88YbtZB7Tfg7hlB+18="; + hash = "sha256-+qtbOC3rsse57kqd4RLl9EKXzru0vdgIIPSl1OQ652U="; }; buildInputs = [ @@ -36,8 +36,8 @@ buildPythonPackage rec { ]; disabledTests = [ - # https://github.com/zigpy/zigpy-xbee/issues/126 - "test_form_network" + # fixed in https://github.com/zigpy/zigpy-xbee/commit/f85233fc28ae01c08267965e99a29e43b00e1561 + "test_shutdown" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix index 6b5c0fd41a853..f31c8b006b543 100644 --- a/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/pkgs/development/python-modules/zigpy-znp/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "zigpy-znp"; - version = "0.11.4"; + version = "0.11.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-wt7ZsMXOh+CbhJCUMS7RhzozYlyINRs0xOF7ecwkNCU="; + hash = "sha256-Ti8H9FC8/xYS4je+d7EgRmDvBTmlOdiWUbuX+cbE2hY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index 4828ff4264c5e..dde789fd289cc 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.57.1"; + version = "0.57.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-aVrLiWPjc4xn2GvKmZCrRJGGbxP545PKqAH9rPq8IPo="; + hash = "sha256-v4H8syWbXqmfvOznRECgSjYi246+socPJTffb79MXK4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/zwave-js-server-python/default.nix b/pkgs/development/python-modules/zwave-js-server-python/default.nix index 7e98b142b44f9..105dbbbe04249 100644 --- a/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.51.2"; + version = "0.52.1"; format = "setuptools"; disabled = pythonOlder "3.11"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-SRBH7HdsgS60Z8y6ef5/VCunzMGBEWw0u1jR7wSByNc="; + hash = "sha256-+zGLWti99mYTyPkSxiYgE5RqVvEr2PGt8vFwesjcquo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 60aaf0de1eb8f..853469be7ee3a 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -423,7 +423,7 @@ let seqinr = [ pkgs.zlib.dev ]; webp = [ pkgs.pkg-config ]; seqminer = with pkgs; [ zlib.dev bzip2 ]; - sf = with pkgs; [ gdal proj geos ]; + sf = with pkgs; [ gdal proj geos libtiff curl ]; terra = with pkgs; [ gdal proj geos ]; showtext = with pkgs; [ zlib libpng icu freetype.dev ]; simplexreg = [ pkgs.gsl ]; diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 029329723fc0b..ff9e3b1968cfa 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -630,6 +630,9 @@ in re2 = attrs: { buildInputs = [ re2 ]; + buildFlags = [ + "--enable-system-libraries" + ]; }; rest-client = attrs: { diff --git a/pkgs/development/tools/algolia-cli/default.nix b/pkgs/development/tools/algolia-cli/default.nix index 5e7f69d42604a..a3d5e1353ddc6 100644 --- a/pkgs/development/tools/algolia-cli/default.nix +++ b/pkgs/development/tools/algolia-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "algolia-cli"; - version = "1.3.7"; + version = "1.4.0"; src = fetchFromGitHub { owner = "algolia"; repo = "cli"; rev = "v${version}"; - hash = "sha256-Mg8GSomBP0jt+16S18tOq2f7HkVpCZbNz/A/g9Afk/I="; + hash = "sha256-85J4evMEhfkfQ3IoeHulufI9wbwAqW8QmEmJfs5hUpc="; }; vendorHash = "sha256-cNuBTH7L2K4TgD0H9FZ9CjhE5AGXADaniGLD9Lhrtrk="; diff --git a/pkgs/development/tools/altair-graphql-client/default.nix b/pkgs/development/tools/altair-graphql-client/default.nix index dad7c397c5b19..bf8904f36dcc4 100644 --- a/pkgs/development/tools/altair-graphql-client/default.nix +++ b/pkgs/development/tools/altair-graphql-client/default.nix @@ -1,4 +1,4 @@ -{ lib, appimageTools, fetchurl }: +{ lib, appimageTools, makeWrapper, fetchurl }: let pname = "altair"; @@ -17,6 +17,10 @@ appimageTools.wrapType2 { extraInstallCommands = '' mv $out/bin/${pname}-${version} $out/bin/${pname} + source "${makeWrapper}/nix-support/setup-hook" + wrapProgram $out/bin/${pname} \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications substituteInPlace $out/share/applications/${pname}.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' diff --git a/pkgs/development/tools/amqpcat/default.nix b/pkgs/development/tools/amqpcat/default.nix index a7c30cc9e4b6d..774af838b63ae 100644 --- a/pkgs/development/tools/amqpcat/default.nix +++ b/pkgs/development/tools/amqpcat/default.nix @@ -1,14 +1,14 @@ -{ stdenv, lib, fetchFromGitHub, crystal, openssl, testers, amqpcat }: +{ lib, fetchFromGitHub, crystal, openssl, testers, amqpcat }: crystal.buildCrystalPackage rec { pname = "amqpcat"; - version = "0.2.4"; + version = "0.2.5"; src = fetchFromGitHub { owner = "cloudamqp"; repo = "amqpcat"; rev = "v${version}"; - hash = "sha256-Ec8LlOYYp3fXYgvps/ikeB4MqBEXTw1BAF5nJyL7dI0="; + hash = "sha256-AXX4aF5717lSIO0/2jNDPXXLtM/h//BlxO+cX71aWG4="; }; format = "shards"; @@ -28,6 +28,5 @@ crystal.buildCrystalPackage rec { homepage = "https://github.com/cloudamqp/amqpcat"; license = licenses.mit; maintainers = with maintainers; [ aaronjheng ]; - broken = stdenv.isDarwin; # Linking errors. Hope someone can help fix it. }; } diff --git a/pkgs/development/tools/amqpcat/shards.nix b/pkgs/development/tools/amqpcat/shards.nix index 3321c4c9e170b..4cfa4933f11fe 100644 --- a/pkgs/development/tools/amqpcat/shards.nix +++ b/pkgs/development/tools/amqpcat/shards.nix @@ -1,12 +1,12 @@ { amq-protocol = { url = "https://github.com/cloudamqp/amq-protocol.cr.git"; - rev = "v0.3.24"; - sha256 = "011xia60wkmbjsk8j4qnswx0lg1i7vrchjwnxlksjv3npp2z98a3"; + rev = "v1.1.4"; + sha256 = "1x10zh371wmwi55rpdymfhf7hbh900zc94b64hkk12pp20mws55r"; }; amqp-client = { url = "https://github.com/cloudamqp/amqp-client.cr.git"; - rev = "v0.6.2"; - sha256 = "0h9c2v7ks776msm3dn2d68y85i6mm4gm5s3jlrs8dlp36kndkplc"; + rev = "v1.0.11"; + sha256 = "0d08k9jjd9jw40slj71wi9p6773d1djva9zjb40pskcgg2wfirx3"; }; } diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index c18d42b60ffd9..8b74bb1d3994f 100644 --- a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tarpaulin"; - version = "0.27.0"; + version = "0.27.1"; src = fetchFromGitHub { owner = "xd009642"; repo = "tarpaulin"; rev = version; - hash = "sha256-yvZVViD7QbVTQ/gEcoSrE7jdQH7gR20LpXWsC8DHE9w="; + hash = "sha256-Mr1thOGqpLcMUBbmD6YzU9WlyOvlPHSqyiU/wtb4edo="; }; - cargoHash = "sha256-0uowFaPkDUkDozd2DCsOfZzz3gMQpkL6PdKBzy1d+wg="; + cargoHash = "sha256-UrDyAS/SIrXWsYucmjj6URjqjjWB40wxLF0rXHmB2Tw="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 3c1fa26e27da7..11332fc835f6c 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -22,14 +22,14 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.4.47"; + version = "2.5.6"; format = "setuptools"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-v4epPGUII2xu5e8yM4dCmEmu0ShmOIPd3h+UsFzdt6Q="; + hash = "sha256-X+JEhoFKT+nxgxABojC8jZiGp8bubJWi0qWNfU9kwDc="; }; patches = [ @@ -83,6 +83,7 @@ buildPythonApplication rec { prettytable pycep-parser pyyaml + rustworkx semantic-version spdx-tools tabulate diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index f8bc11d63a6ac..d6c6740e2a26c 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { lib, stdenvNoCC, fetchurl, makeBinaryWrapper, jre }: stdenvNoCC.mkDerivation rec { - version = "10.12.3"; + version = "10.12.4"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "sha256-drJO3sZlh2G9f80cvPD41YjhHZt74lmV9bSIhUDrTKo="; + sha256 = "sha256-ecWTB/4Lc7zgkQI6nN5VvKfRizeMEdyGUyL0fxiAHhk="; }; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index 6812f79f83b8e..c0d4749fe5260 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.14.3"; + version = "2.14.5"; dontConfigure = true; dontBuild = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "sha256-GungnnWT4SoAGRmgFXooAwtha8hlEARNgUlqSrYHQ7o="; + sha256 = "sha256-axB3BmHmyBDHxBeiwxUpSnhXpdZHfvYQkae7oW1OSzg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index f59a7e9ab7dd8..47b28f3b019cd 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.216.1"; + version = "0.217.2"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "sha256-Nx6BAeaJGbrfjmH5dSb8Cb1TG2SDeF+lCeGOLW27cJs="; + sha256 = "sha256-0Zu4uPxNDUUeyOLrjdQaCdiRbngtCtHx1qIqtLBmCdA="; }; postPatch = '' diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index 6cee7ef029df6..bd56eb539e002 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -131,6 +131,7 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; lib.intersectLists (x86 ++ power ++ s390x ++ armv7 ++ aarch64 ++ mips) (darwin ++ freebsd ++ illumos ++ linux); - broken = stdenv.isDarwin || stdenv.hostPlatform.isStatic; # https://hydra.nixos.org/build/128521440/nixlog/2 + badPlatforms = [ lib.systems.inspect.platformPatterns.isStatic ]; + broken = stdenv.isDarwin; # https://hydra.nixos.org/build/128521440/nixlog/2 }; } diff --git a/pkgs/development/tools/api-linter/default.nix b/pkgs/development/tools/api-linter/default.nix index aa24b6d78f423..69f25e8f317f4 100644 --- a/pkgs/development/tools/api-linter/default.nix +++ b/pkgs/development/tools/api-linter/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "api-linter"; - version = "1.56.1"; + version = "1.57.1"; src = fetchFromGitHub { owner = "googleapis"; repo = "api-linter"; rev = "v${version}"; - hash = "sha256-X8S8hfdfoqWRhJIuhNEZFXIAW1k5nFvE5v/7homO1Ow="; + hash = "sha256-wDHn+1JYP7u96NZNryuneMeojcTd0JXKCikuCFBLcZI="; }; - vendorHash = "sha256-6MvXVHg4EH5S37JnY0jnAFjDplQINWPFyd54c1W/oAE="; + vendorHash = "sha256-qoUDBBoiddAGAIQa6Q87ne2+Cass8rA2rUpxH3QB9nM="; subPackages = [ "cmd/api-linter" ]; @@ -23,7 +23,7 @@ buildGoModule rec { "-w" ]; - # reference: https://github.com/googleapis/api-linter/blob/v1.56.1/.github/workflows/release.yaml#L76 + # reference: https://github.com/googleapis/api-linter/blob/v1.57.1/.github/workflows/release.yaml#L76 preBuild = '' cat > cmd/api-linter/version.go <<EOF package main diff --git a/pkgs/development/tools/asmfmt/default.nix b/pkgs/development/tools/asmfmt/default.nix index 61b5d624c8ff8..a6f15c15c0b59 100644 --- a/pkgs/development/tools/asmfmt/default.nix +++ b/pkgs/development/tools/asmfmt/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-YxIVqPGsqxvOY0Qz4Jw5FuO9IbplCICjChosnHrSCgc="; }; - vendorSha256 = null; + vendorHash = null; # This package comes with its own version of goimports, gofmt and goreturns # but these binaries are outdated and are offered by other packages. diff --git a/pkgs/development/tools/azure-static-sites-client/default.nix b/pkgs/development/tools/azure-static-sites-client/default.nix index b11504bfb1ed6..5ac8f971cf35a 100644 --- a/pkgs/development/tools/azure-static-sites-client/default.nix +++ b/pkgs/development/tools/azure-static-sites-client/default.nix @@ -6,7 +6,7 @@ , icu70 , libkrb5 , lttng-ust -, openssl_1_1 +, openssl , zlib , azure-static-sites-client # "latest", "stable" or "backup" @@ -37,9 +37,9 @@ stdenv.mkDerivation { buildInputs = [ curl icu70 - openssl_1_1 libkrb5 lttng-ust + openssl stdenv.cc.cc.lib zlib ]; @@ -58,7 +58,7 @@ stdenv.mkDerivation { patchelf --add-needed 'libgssapi_krb5.so' \ --add-needed 'liblttng-ust.so' \ - --add-needed 'libssl.so.1.1' \ + --add-needed 'libssl.so.3' \ "$out/bin/StaticSitesClient" runHook postInstall diff --git a/pkgs/development/tools/azure-static-sites-client/versions.json b/pkgs/development/tools/azure-static-sites-client/versions.json index b0e308dd1f677..854cbd8a92c69 100644 --- a/pkgs/development/tools/azure-static-sites-client/versions.json +++ b/pkgs/development/tools/azure-static-sites-client/versions.json @@ -1,58 +1,58 @@ [ { "version": "latest", - "buildId": "1.0.023121", - "publishDate": "2023-05-01T20:32:05.431065Z", + "buildId": "1.0.024471", + "publishDate": "2023-09-13T13:29:09.6126059Z", "files": { "linux-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.023121/linux/StaticSitesClient", - "sha": "99c8b876922587ee0729d103ba5509ae88ec6b457c2d7d7bf69da26b1428ef6b" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024471/linux/StaticSitesClient", + "sha": "5f96bf5b6d192703f340c76cd664eb12a1f5752ecf7783428bf0b16d6d6f4c84" }, "win-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.023121/windows/StaticSitesClient.exe", - "sha": "7c24aa28e7e9758a08ee6a33fa085e46d4b92101b5396e78a1eba218853aff76" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024471/windows/StaticSitesClient.exe", + "sha": "b2f76fd169ca61e82576e88797c5414d5ee308bc368baa60ad2ac731bb157af9" }, "osx-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.023121/macOS/StaticSitesClient", - "sha": "cf2d799edcd87aeb4e9cab83bf8906770c1d05277130131740b50a95e31786f7" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024471/macOS/StaticSitesClient", + "sha": "3fab8406268e51c3c1060b6c0fcc13a6cfa4d1335624c871719430b50d3fe2aa" } } }, { "version": "stable", - "buildId": "1.0.023121", - "publishDate": "2023-05-01T20:32:05.431065Z", + "buildId": "1.0.023911", + "publishDate": "2023-07-19T16:29:13.2087179Z", "files": { "linux-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.023121/linux/StaticSitesClient", - "sha": "99c8b876922587ee0729d103ba5509ae88ec6b457c2d7d7bf69da26b1428ef6b" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.023911/linux/StaticSitesClient", + "sha": "b3073cc39bc362b3838512b3b5f3b3af3a6b1c6f768c323592cd88dc5527046f" }, "win-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.023121/windows/StaticSitesClient.exe", - "sha": "7c24aa28e7e9758a08ee6a33fa085e46d4b92101b5396e78a1eba218853aff76" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.023911/windows/StaticSitesClient.exe", + "sha": "5f9548aa7f0060f9fce6abdaddea23d5e970e76ce54f1213df6a133764e56337" }, "osx-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.023121/macOS/StaticSitesClient", - "sha": "cf2d799edcd87aeb4e9cab83bf8906770c1d05277130131740b50a95e31786f7" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.023911/macOS/StaticSitesClient", + "sha": "515b60de77132cacc5ef355cc654eaf2a2c3c1ab1ec1d071f6b8ed3062d8ea4e" } } }, { "version": "backup", - "buildId": "1.0.022851", - "publishDate": "2023-04-04T18:55:18.5999465Z", + "buildId": "1.0.023911", + "publishDate": "2023-07-19T16:29:13.2087179Z", "files": { "linux-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022851/linux/StaticSitesClient", - "sha": "dbbf2785549d2e002f69057c54d4df378c1e52e5e564d484f6871440ef336689" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.023911/linux/StaticSitesClient", + "sha": "b3073cc39bc362b3838512b3b5f3b3af3a6b1c6f768c323592cd88dc5527046f" }, "win-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022851/windows/StaticSitesClient.exe", - "sha": "a3d37f5793ce433ba8cd7743285d9e6f9c0174c2d09c530483a6a50f8a448637" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.023911/windows/StaticSitesClient.exe", + "sha": "5f9548aa7f0060f9fce6abdaddea23d5e970e76ce54f1213df6a133764e56337" }, "osx-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022851/macOS/StaticSitesClient", - "sha": "9de09ad2b000c6943a8103c323e95a0fb8fea1a3c2bd406859cc59b4b6cec548" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.023911/macOS/StaticSitesClient", + "sha": "515b60de77132cacc5ef355cc654eaf2a2c3c1ab1ec1d071f6b8ed3062d8ea4e" } } } diff --git a/pkgs/development/tools/bacon/default.nix b/pkgs/development/tools/bacon/default.nix index 6dae41dfd6dbd..b7f4f7c5d95cd 100644 --- a/pkgs/development/tools/bacon/default.nix +++ b/pkgs/development/tools/bacon/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "bacon"; - version = "2.12.1"; + version = "2.13.0"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-oD60D98mPQV454uld+g6FVKAxpyjwrfMAVfQcVPp9Fg="; + hash = "sha256-KFBb5poogtFnYePu9E5XBE0sKKev2Fuxaqj5ypscuqA="; }; - cargoHash = "sha256-lX1IXVGVCe/7jbkjIu+ammWi0BgE+r1tpsZaqz4WLPY="; + cargoHash = "sha256-OA8068ISy2WoC34Q0ANrWX27ESErntCfZ5IrO8Lvm10="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices diff --git a/pkgs/development/tools/bearer/default.nix b/pkgs/development/tools/bearer/default.nix index fb97a5b15ab60..371d6e675fd91 100644 --- a/pkgs/development/tools/bearer/default.nix +++ b/pkgs/development/tools/bearer/default.nix @@ -39,7 +39,7 @@ buildGoModule rec { description = "Code security scanning tool (SAST) to discover, filter and prioritize security and privacy risks"; homepage = "https://github.com/bearer/bearer"; changelog = "https://github.com/Bearer/bearer/releases/tag/v${version}"; - license = with licenses; [ elastic ]; + license = with licenses; [ elastic20 ]; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix index fca02e80ee50e..545236b561c8e 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix @@ -4,6 +4,7 @@ , bazel_self , lr, xe, zip, unzip, bash, writeCBin, coreutils , which, gawk, gnused, gnutar, gnugrep, gzip, findutils +, diffutils, gnupatch # updater , python3, writeScript # Apple dependencies @@ -110,10 +111,12 @@ let [ bash coreutils + diffutils file findutils gawk gnugrep + gnupatch gnused gnutar gzip diff --git a/pkgs/development/tools/build-managers/bob/default.nix b/pkgs/development/tools/build-managers/bob/default.nix index 2a8a1eda465a6..97e67ce977985 100644 --- a/pkgs/development/tools/build-managers/bob/default.nix +++ b/pkgs/development/tools/build-managers/bob/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "bob"; @@ -17,6 +17,14 @@ buildGoModule rec { excludedPackages = [ "example/server-db" "test/e2e" "tui-example" ]; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd bob \ + --bash <($out/bin/bob completion) \ + --zsh <($out/bin/bob completion -z) + ''; + # tests require network access doCheck = false; diff --git a/pkgs/development/tools/build-managers/buck2/default.nix b/pkgs/development/tools/build-managers/buck2/default.nix index 24a7db6b22477..7fa99a962264e 100644 --- a/pkgs/development/tools/build-managers/buck2/default.nix +++ b/pkgs/development/tools/build-managers/buck2/default.nix @@ -38,7 +38,7 @@ let buildHashes = builtins.fromJSON (builtins.readFile ./hashes.json); # our version of buck2; this should be a git tag - version = "2023-09-15"; + version = "2023-10-01"; # the platform-specific, statically linked binary — which is also # zstd-compressed @@ -63,7 +63,7 @@ let # tooling prelude-src = let - prelude-hash = "1cdbe261a4e669d9bb25bac5617b17919b2bb05c"; + prelude-hash = "75aa81a92edd2bf477538f9a3f0fe6a47e811842"; name = "buck2-prelude-${version}.tar.gz"; hash = buildHashes."_prelude"; url = "https://github.com/facebook/buck2-prelude/archive/${prelude-hash}.tar.gz"; diff --git a/pkgs/development/tools/build-managers/buck2/hashes.json b/pkgs/development/tools/build-managers/buck2/hashes.json index 8fafcf99bc5cd..53df40eb622ea 100644 --- a/pkgs/development/tools/build-managers/buck2/hashes.json +++ b/pkgs/development/tools/build-managers/buck2/hashes.json @@ -1,7 +1,7 @@ { "_comment": "@generated by pkgs/development/tools/build-managers/buck2/update.sh" -, "_prelude": "sha256-M+QlMVemxkdajUEnsLzvkFyZ6rW59n2uFafftDze0tc=" -, "x86_64-linux": "sha256-cMHNeR6jdYiumJZgNQviCNtzv3DfvJISG6AbWdQYquo=" -, "x86_64-darwin": "sha256-03QD4rXmBgEY95b63Yzimhj7sRoeEomT3N5n0xYzweU=" -, "aarch64-linux": "sha256-nATdxVVNH7RVJ7ck3tDjcf4Ask0aZkH1sy/2eKtJpKM=" -, "aarch64-darwin": "sha256-+l0W5918KRYwBi/5pqSr10RaVH79QT5qx/cZRDaZ0EY=" +, "_prelude": "sha256-SshYnziEP/2jdoeLZYkQOvH56VBOJZaf0TUt++tLO1U=" +, "x86_64-linux": "sha256-eztjSDjgtXZWeDSPsKNSUGlIR+g8DsByIjDpcGNXB2s=" +, "x86_64-darwin": "sha256-buC0mShgDPU1+oeuNdjP6hNq1MoJDIPaEHCGL+Rcsr8=" +, "aarch64-linux": "sha256-52Ld12TzC51OutjZY+idpd7GhFr2tPksz1pda4F9Zag=" +, "aarch64-darwin": "sha256-b9peYBF9FZbSdMiwC8E/+y15pWlFe37/Euj5v8q3v1E=" } diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix index 789cc3fcabe10..8c9261628bfee 100644 --- a/pkgs/development/tools/build-managers/dub/default.nix +++ b/pkgs/development/tools/build-managers/dub/default.nix @@ -4,7 +4,7 @@ assert dcompiler != null; stdenv.mkDerivation rec { pname = "dub"; - version = "1.30.0"; + version = "1.33.0"; enableParallelBuilding = true; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "dlang"; repo = "dub"; rev = "v${version}"; - sha256 = "sha256-iVl7bjblvIxvrUX7Phq6h4AIAmZjNVkGYYFA1hhsE7c="; + sha256 = "sha256-4Mha7WF6cg3DIccfpvOnheuvgfziv/7wo8iFsPXO4yY="; }; dubvar = "\\$DUB"; @@ -137,6 +137,7 @@ stdenv.mkDerivation rec { rm -r test/path-subpackage-ref rm -r test/sdl-package-simple rm -r test/dpath-variable # requires execution of dpath-variable.sh + rm -r test/use-c-sources ./test/run-unittest.sh ''; @@ -150,7 +151,7 @@ stdenv.mkDerivation rec { description = "Package and build manager for D applications and libraries"; homepage = "https://code.dlang.org/"; license = licenses.mit; - maintainers = with maintainers; [ ThomasMader ]; + maintainers = with maintainers; [ ThomasMader jtbx ]; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; } diff --git a/pkgs/development/tools/build-managers/goredo/default.nix b/pkgs/development/tools/build-managers/goredo/default.nix index d7ddc7ae1f9c9..e1c2b402df69d 100644 --- a/pkgs/development/tools/build-managers/goredo/default.nix +++ b/pkgs/development/tools/build-managers/goredo/default.nix @@ -9,11 +9,11 @@ buildGoModule rec { pname = "goredo"; - version = "1.30.0"; + version = "1.31.0"; src = fetchurl { url = "http://www.goredo.cypherpunks.ru/download/${pname}-${version}.tar.zst"; - hash = "sha256-glsg2q8jFd4z6CuKzlZ3afJx/S7Aw6LCxFAS/uHLlUg="; + hash = "sha256-z7u71VFMoq4VwHohMnYx/ahBSkRZHoI8MZet9gO+XVw="; }; patches = [ ./fix-tests.diff ]; @@ -24,7 +24,7 @@ buildGoModule rec { inherit (sharness) SHARNESS_TEST_SRCDIR; - vendorSha256 = null; + vendorHash = null; modRoot = "./src"; subPackages = [ "." ]; diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index b0b5e10729bf2..9da89e890ce09 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -128,16 +128,16 @@ rec { # https://docs.gradle.org/current/userguide/compatibility.html gradle_8 = gen { - version = "8.3"; - nativeVersion = "0.22-milestone-24"; - sha256 = "09cjyss4bcnig1wzhxpwyn4kznkawzaha7fy0jg5nqzw2ysma62r"; + version = "8.4"; + nativeVersion = "0.22-milestone-25"; + sha256 = "1bkjxw7i0lm17pdyyvka4xpl6z0cdj0izagphync6839i2pg66iy"; defaultJava = jdk17; }; gradle_7 = gen { - version = "7.6.2"; - nativeVersion = "0.22-milestone-24"; - sha256 = "1b7riri2ysr1bvfskmmb8phfx8c2b719kqhf189fvrszw63na6x0"; + version = "7.6.3"; + nativeVersion = "0.22-milestone-25"; + sha256 = "1b6gk0yiyvf86vigd05mz7ryqs8yrpswk9bmpwrnqcp45r3jw33l"; defaultJava = jdk17; }; diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix index 59ceeb8761a61..d1c0b303edccd 100644 --- a/pkgs/development/tools/build-managers/mill/default.nix +++ b/pkgs/development/tools/build-managers/mill/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mill"; - version = "0.11.2"; + version = "0.11.4"; src = fetchurl { url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}-assembly"; - hash = "sha256-7RYMj/vfyzBQhZUpWzEaZYN27ZhYCRyKhQUhlH8tE0U="; + hash = "sha256-4X+ufTHECOmM797SN0VFAE8b9mnHkdOqSJ8h29PujLU="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/build-managers/moon/default.nix b/pkgs/development/tools/build-managers/moon/default.nix index 181bd708a6250..1514b29f3ab53 100644 --- a/pkgs/development/tools/build-managers/moon/default.nix +++ b/pkgs/development/tools/build-managers/moon/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "moon"; - version = "1.13.4"; + version = "1.14.3"; src = fetchFromGitHub { owner = "moonrepo"; repo = pname; rev = "v${version}"; - hash = "sha256-K7uCgdTg/RTd3X8ve7xTsxDn3H9p6WS93ijCRnJPsJs="; + hash = "sha256-DP54+0pTKdimaivKVr2ABWSRMPgeoXkT7HHzKwBkXu0="; }; - cargoHash = "sha256-JPbqBifhLx+FK2J9+pZysuFIiumBma3YVW/Y8KdNq+M="; + cargoHash = "sha256-6mE/CrX3u10DFh3UrOOtkubo0oAs/+F4gAiSDbZmVjU="; env = { RUSTFLAGS = "-C strip=symbols"; diff --git a/pkgs/development/tools/build-managers/msbuild/default.nix b/pkgs/development/tools/build-managers/msbuild/default.nix index 83cdcead353f3..1b561470af79d 100644 --- a/pkgs/development/tools/build-managers/msbuild/default.nix +++ b/pkgs/development/tools/build-managers/msbuild/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, makeWrapper, glibcLocales, mono, dotnetPackages, unzip, dotnetCorePackages, writeText, roslyn }: +{ lib, stdenv, fetchurl, fetchpatch, makeWrapper, glibcLocales, mono, nuget, unzip, dotnetCorePackages, writeText, roslyn }: let @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - dotnetPackages.Nuget + nuget glibcLocales ]; diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix index 47772d955afbd..993e955df4eb0 100644 --- a/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "sbt-extras"; - rev = "99b0d2138b498b3d553c0b23d5d18cad3e40e028"; - version = "2023-09-14"; + rev = "7b70bbfc1cbe04172b5299ac092050d78d615a5a"; + version = "2023-09-18"; src = fetchFromGitHub { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "hejhCclA/HSyEC4MgX3h61fB8jsfIErGAnxqUrqNBLU="; + sha256 = "Uu1eyshAWkc9VgxPHa6V0+o4At/hDS/OuIJluHlxZjE="; }; dontBuild = true; diff --git a/pkgs/development/tools/build-managers/xmake/default.nix b/pkgs/development/tools/build-managers/xmake/default.nix index fc092b52f589a..6d8222e387e42 100644 --- a/pkgs/development/tools/build-managers/xmake/default.nix +++ b/pkgs/development/tools/build-managers/xmake/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "xmake"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { url = "https://github.com/xmake-io/xmake/releases/download/v${version}/xmake-v${version}.tar.gz"; - hash = "sha256-rA0wiL2kZs+rOSCLXAaX50epK9aL+We4FYgr2/TxRKo="; + hash = "sha256-BC6RazVbT1sr4RLQ1ZR4hHZGXDqFSvuqpt5vPyMDylA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index df44b63f9d233..8ee0811f98715 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -17,13 +17,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.31.3"; + version = "1.32.0"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - hash = "sha256-Uqs4MlKwFz4EGd6HTGXqcLTSfYPJTpgKKyXmA3B3RjU="; + hash = "sha256-Sjmh7zVaZ8ATgDr1VN0U03rHlPBvv3lVDxKmAahjJ2M="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/development/tools/buildpack/default.nix b/pkgs/development/tools/buildpack/default.nix index 6756fe150893d..0f09d28140686 100644 --- a/pkgs/development/tools/buildpack/default.nix +++ b/pkgs/development/tools/buildpack/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pack"; - version = "0.30.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "buildpacks"; repo = pname; rev = "v${version}"; - hash = "sha256-o9c1MUxyZpqk10UbW5y9JqX2Z62K7hDeSEiFGIUnoAs="; + hash = "sha256-v46Yfj0gRT84R1vttKkpan28dkeJWHNgzKzI+ZVCiNc="; }; - vendorHash = "sha256-k2ZgFjSO3yHS0pO7xZx6a5E4J35ou2AmjbiV2M9OGTk="; + vendorHash = "sha256-KZ2nAd+5D5PFgSDhNeHg6Hnp+h7HqZ2CRsKUek0KZhM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/butane/default.nix b/pkgs/development/tools/butane/default.nix index 71344ea3ca320..affe321dc911d 100644 --- a/pkgs/development/tools/butane/default.nix +++ b/pkgs/development/tools/butane/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { hash = "sha256-HkvDJVSGve6t1gEek8FvfIK20r5TOHRJ71KsGUj95fM="; }; - vendorSha256 = null; + vendorHash = null; doCheck = false; diff --git a/pkgs/development/tools/castxml/default.nix b/pkgs/development/tools/castxml/default.nix index b8fc56163066e..9bfe91677a2eb 100644 --- a/pkgs/development/tools/castxml/default.nix +++ b/pkgs/development/tools/castxml/default.nix @@ -17,13 +17,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "castxml"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "CastXML"; repo = "CastXML"; rev = "v${finalAttrs.version}"; - hash = "sha256-dyB2h6Yix2lZbVFVCz8nWNNubFSEVBlRpjVrBRec4Xo="; + hash = "sha256-x27koa0q+rDqPmfHMf7v7KTx3bfDgqS/FkPAX5auqaw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/changie/default.nix b/pkgs/development/tools/changie/default.nix index eaad0131f97e4..734a766c431b0 100644 --- a/pkgs/development/tools/changie/default.nix +++ b/pkgs/development/tools/changie/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "changie"; - version = "1.13.1"; + version = "1.14.0"; src = fetchFromGitHub { owner = "miniscruff"; repo = "changie"; rev = "v${version}"; - hash = "sha256-euwOATFDY+5kwNLhdNbpIv5p3zoJtuoh5JzzIRj2MyM="; + hash = "sha256-ulbpitTCIuRg50GAin54RNVMUl8ZuwYW1SnenvemckA="; }; vendorHash = "sha256-giOL4/ZofaylhX+s7y75RR7d3WDxNCmr25JHBZZkH9s="; diff --git a/pkgs/development/tools/clang-tools/default.nix b/pkgs/development/tools/clang-tools/default.nix index b259b683dde7b..ece8f93b57a1f 100644 --- a/pkgs/development/tools/clang-tools/default.nix +++ b/pkgs/development/tools/clang-tools/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, llvmPackages }: +{ lib, stdenv, llvmPackages, enableLibcxx ? false }: +# enableLibcxx will use the c++ headers from clang instead of gcc. +# This shouldn't have any effect on platforms that use clang as the default compiler already. let unwrapped = llvmPackages.clang-unwrapped; @@ -9,7 +11,7 @@ in stdenv.mkDerivation { pname = "clang-tools"; version = lib.getVersion unwrapped; dontUnpack = true; - clang = llvmPackages.clang; + clang = if enableLibcxx then llvmPackages.libcxxClang else llvmPackages.clang; installPhase = '' runHook preInstall diff --git a/pkgs/development/tools/cocoapods/Gemfile-beta.lock b/pkgs/development/tools/cocoapods/Gemfile-beta.lock index bfc2b4c58baf3..ec60a9ec8a058 100644 --- a/pkgs/development/tools/cocoapods/Gemfile-beta.lock +++ b/pkgs/development/tools/cocoapods/Gemfile-beta.lock @@ -3,22 +3,22 @@ GEM specs: CFPropertyList (3.0.6) rexml - activesupport (7.0.5) + activesupport (7.0.8) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - addressable (2.8.4) + addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) algoliasearch (1.27.5) httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) atomos (0.1.3) claide (1.1.0) - cocoapods (1.12.1) + cocoapods (1.13.0) addressable (~> 2.8) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.12.1) + cocoapods-core (= 1.13.0) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.6.0, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -32,8 +32,8 @@ GEM molinillo (~> 0.8.0) nap (~> 1.0) ruby-macho (>= 2.3.0, < 3.0) - xcodeproj (>= 1.21.0, < 2.0) - cocoapods-core (1.12.1) + xcodeproj (>= 1.23.0, < 2.0) + cocoapods-core (1.13.0) activesupport (>= 5.0, < 8) addressable (~> 2.8) algoliasearch (~> 1.0) @@ -62,22 +62,22 @@ GEM fuzzy_match (2.0.4) gh_inspector (1.1.3) httpclient (2.8.3) - i18n (1.13.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) json (2.6.3) - minitest (5.18.0) + minitest (5.20.0) molinillo (0.8.0) nanaimo (0.3.0) nap (1.1.0) netrc (0.11.0) public_suffix (4.0.7) - rexml (3.2.5) + rexml (3.2.6) ruby-macho (2.5.1) typhoeus (1.4.0) ethon (>= 0.9.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - xcodeproj (1.22.0) + xcodeproj (1.23.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) diff --git a/pkgs/development/tools/cocoapods/Gemfile.lock b/pkgs/development/tools/cocoapods/Gemfile.lock index 4c842e36c1acb..60028105ba775 100644 --- a/pkgs/development/tools/cocoapods/Gemfile.lock +++ b/pkgs/development/tools/cocoapods/Gemfile.lock @@ -3,22 +3,22 @@ GEM specs: CFPropertyList (3.0.6) rexml - activesupport (7.0.5) + activesupport (7.0.8) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - addressable (2.8.4) + addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) algoliasearch (1.27.5) httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) atomos (0.1.3) claide (1.1.0) - cocoapods (1.12.1) + cocoapods (1.13.0) addressable (~> 2.8) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.12.1) + cocoapods-core (= 1.13.0) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.6.0, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -32,8 +32,8 @@ GEM molinillo (~> 0.8.0) nap (~> 1.0) ruby-macho (>= 2.3.0, < 3.0) - xcodeproj (>= 1.21.0, < 2.0) - cocoapods-core (1.12.1) + xcodeproj (>= 1.23.0, < 2.0) + cocoapods-core (1.13.0) activesupport (>= 5.0, < 8) addressable (~> 2.8) algoliasearch (~> 1.0) @@ -62,22 +62,22 @@ GEM fuzzy_match (2.0.4) gh_inspector (1.1.3) httpclient (2.8.3) - i18n (1.13.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) json (2.6.3) - minitest (5.18.0) + minitest (5.20.0) molinillo (0.8.0) nanaimo (0.3.0) nap (1.1.0) netrc (0.11.0) public_suffix (4.0.7) - rexml (3.2.5) + rexml (3.2.6) ruby-macho (2.5.1) typhoeus (1.4.0) ethon (>= 0.9.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - xcodeproj (1.22.0) + xcodeproj (1.23.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) diff --git a/pkgs/development/tools/cocoapods/gemset-beta.nix b/pkgs/development/tools/cocoapods/gemset-beta.nix index 8862a620a833f..ddf14e02e7a2e 100644 --- a/pkgs/development/tools/cocoapods/gemset-beta.nix +++ b/pkgs/development/tools/cocoapods/gemset-beta.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c7k5i6531z5il4q1jnbrv7x7zcl3bgnxp5fzl71rzigk6zn53ym"; + sha256 = "188kbwkn1lbhz40ala8ykp20jzqphgc68g3d8flin8cqa2xid0s5"; type = "gem"; }; - version = "7.0.5"; + version = "7.0.8"; }; addressable = { dependencies = ["public_suffix"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15s8van7r2ad3dq6i03l3z4hqnvxcq75a3h72kxvf9an53sqma20"; + sha256 = "05r1fwy487klqkya7vzia8hnklcxy4vr92m9dmni3prfwk6zpw33"; type = "gem"; }; - version = "2.8.4"; + version = "2.8.5"; }; algoliasearch = { dependencies = ["httpclient" "json"]; @@ -69,10 +69,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c25gpi6vrv4fvhwfqscjq5pqqg3g3s3vjm6z8xmgbi9bl9m7ws8"; + sha256 = "1mwcdg1i4126jf2qcsp4mhd1vqzqd8ck08wpyassz1sg0a8yxw4j"; type = "gem"; }; - version = "1.12.1"; + version = "1.13.0"; }; cocoapods-core = { dependencies = ["activesupport" "addressable" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "public_suffix" "typhoeus"]; @@ -80,10 +80,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03hz6i56603j3zlxy9is74bgs88isrnj9y7xc6wakr4c0m238hv9"; + sha256 = "1g944vch2mllh8lijbfgl0c2kn9gi5vsg9y9v67x0qca5b1bx4id"; type = "gem"; }; - version = "1.12.1"; + version = "1.13.0"; }; cocoapods-deintegrate = { groups = ["default"]; @@ -244,10 +244,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yk33slipi3i1kydzrrchbi7cgisaxym6pgwlzx7ir8vjk6wl90x"; + sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx"; type = "gem"; }; - version = "1.13.0"; + version = "1.14.1"; }; json = { groups = ["default"]; @@ -264,10 +264,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ic7i5z88zcaqnpzprf7saimq2f6sad57g5mkkqsrqrcd6h3mx06"; + sha256 = "0bkmfi9mb49m0fkdhl2g38i3xxa02d411gg0m8x0gvbwfmmg5ym3"; type = "gem"; }; - version = "5.18.0"; + version = "5.20.0"; }; molinillo = { groups = ["default"]; @@ -324,10 +324,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; type = "gem"; }; - version = "3.2.5"; + version = "3.2.6"; }; ruby-macho = { groups = ["default"]; @@ -367,9 +367,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s7hxaqd1fi4rlmm2jbrglyvka1r95frlxan61vfcnd8n6pxynpi"; + sha256 = "176ndahc5fssyx04q176vy6wngs1av4vrsdrkdpjij700hqll8hn"; type = "gem"; }; - version = "1.22.0"; + version = "1.23.0"; }; } diff --git a/pkgs/development/tools/cocoapods/gemset.nix b/pkgs/development/tools/cocoapods/gemset.nix index 2a4f3e62890ee..c0e5c50fa5033 100644 --- a/pkgs/development/tools/cocoapods/gemset.nix +++ b/pkgs/development/tools/cocoapods/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c7k5i6531z5il4q1jnbrv7x7zcl3bgnxp5fzl71rzigk6zn53ym"; + sha256 = "188kbwkn1lbhz40ala8ykp20jzqphgc68g3d8flin8cqa2xid0s5"; type = "gem"; }; - version = "7.0.5"; + version = "7.0.8"; }; addressable = { dependencies = ["public_suffix"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15s8van7r2ad3dq6i03l3z4hqnvxcq75a3h72kxvf9an53sqma20"; + sha256 = "05r1fwy487klqkya7vzia8hnklcxy4vr92m9dmni3prfwk6zpw33"; type = "gem"; }; - version = "2.8.4"; + version = "2.8.5"; }; algoliasearch = { dependencies = ["httpclient" "json"]; @@ -67,10 +67,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c25gpi6vrv4fvhwfqscjq5pqqg3g3s3vjm6z8xmgbi9bl9m7ws8"; + sha256 = "1mwcdg1i4126jf2qcsp4mhd1vqzqd8ck08wpyassz1sg0a8yxw4j"; type = "gem"; }; - version = "1.12.1"; + version = "1.13.0"; }; cocoapods-core = { dependencies = ["activesupport" "addressable" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "public_suffix" "typhoeus"]; @@ -78,10 +78,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03hz6i56603j3zlxy9is74bgs88isrnj9y7xc6wakr4c0m238hv9"; + sha256 = "1g944vch2mllh8lijbfgl0c2kn9gi5vsg9y9v67x0qca5b1bx4id"; type = "gem"; }; - version = "1.12.1"; + version = "1.13.0"; }; cocoapods-deintegrate = { groups = ["default"]; @@ -232,10 +232,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yk33slipi3i1kydzrrchbi7cgisaxym6pgwlzx7ir8vjk6wl90x"; + sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx"; type = "gem"; }; - version = "1.13.0"; + version = "1.14.1"; }; json = { groups = ["default"]; @@ -252,10 +252,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ic7i5z88zcaqnpzprf7saimq2f6sad57g5mkkqsrqrcd6h3mx06"; + sha256 = "0bkmfi9mb49m0fkdhl2g38i3xxa02d411gg0m8x0gvbwfmmg5ym3"; type = "gem"; }; - version = "5.18.0"; + version = "5.20.0"; }; molinillo = { groups = ["default"]; @@ -308,10 +308,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; type = "gem"; }; - version = "3.2.5"; + version = "3.2.6"; }; ruby-macho = { groups = ["default"]; @@ -351,9 +351,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s7hxaqd1fi4rlmm2jbrglyvka1r95frlxan61vfcnd8n6pxynpi"; + sha256 = "176ndahc5fssyx04q176vy6wngs1av4vrsdrkdpjij700hqll8hn"; type = "gem"; }; - version = "1.22.0"; + version = "1.23.0"; }; } diff --git a/pkgs/development/tools/cocogitto/default.nix b/pkgs/development/tools/cocogitto/default.nix index 94d84ffc0c4c0..1ed22b7eb4f9b 100644 --- a/pkgs/development/tools/cocogitto/default.nix +++ b/pkgs/development/tools/cocogitto/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cocogitto"; - version = "5.5.0"; + version = "5.6.0"; src = fetchFromGitHub { owner = "oknozor"; repo = pname; rev = version; - sha256 = "sha256-kzG22TDWGmqXuX9wr4w6PP0chbjAEqQO38jF8BGVu6w="; + sha256 = "sha256-dOiXrHD1ZVhMQNwo7hD/f53Ct5+Lwxq/zbApll5O2qo="; }; - cargoHash = "sha256-sBwR0I8eNEBglPSeSNqc7qv3eXbzcgZNBPC74Kulhbw="; + cargoHash = "sha256-oO7xqjxlQg0s40WmWNZpEpqdRia4NGGlYbBO8ejW9BE="; # Test depend on git configuration that would likely exist in a normal user environment # and might be failing to create the test repository it works in. diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix index 006661aa80296..e48d2d8ae8a22 100644 --- a/pkgs/development/tools/conftest/default.nix +++ b/pkgs/development/tools/conftest/default.nix @@ -6,15 +6,15 @@ buildGoModule rec { pname = "conftest"; - version = "0.45.0"; + version = "0.46.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "conftest"; rev = "refs/tags/v${version}"; - hash = "sha256-e8aKjW1SCpmYcfiI1uH5tOjmQqS5kbhPEtRVR/FeWwA="; + hash = "sha256-51OGcic3clPYjj4bmiRVmViqJUEuwzkTtNl9U3OPAdI="; }; - vendorHash = "sha256-kSweCT/8boHb6Go18FBpLtbYI0unUU59QWLgQCrbpfs="; + vendorHash = "sha256-nDRg1gF6igE2FJ+s39j5EQ5/h9QkuSF2Bo9zxR3WkBE="; ldflags = [ "-s" diff --git a/pkgs/development/tools/container2wasm/default.nix b/pkgs/development/tools/container2wasm/default.nix new file mode 100644 index 0000000000000..633baceb589ad --- /dev/null +++ b/pkgs/development/tools/container2wasm/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "container2wasm"; + version = "0.5.1"; + + src = fetchFromGitHub { + owner = "ktock"; + repo = "container2wasm"; + rev = "refs/tags/v${version}"; + hash = "sha256-ba40Nu2tVrRSvVeGxlrn0Bw+xQqWeli40lwBWOXSNTA="; + }; + + vendorHash = "sha256-tyfLWmxAzFc0JuSem8L0HPG4wy9Gxdp8F/J3DyOx6rQ="; + + ldflags = [ + "-s" + "-w" + "-X=github.com/ktock/container2wasm/version.Version=${version}" + ]; + + subPackages = [ + "cmd/c2w" + ]; + + meta = with lib; { + description = "Container to WASM converter"; + homepage = "https://github.com/ktock/container2wasm"; + changelog = "https://github.com/ktock/container2wasm/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ dit7ya ]; + mainProgram = "c2w"; + }; +} diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index 226aaed2e7cb3..4caf0cae4a56b 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -13,16 +13,16 @@ }: buildGoModule rec { pname = "buildkite-agent"; - version = "3.50.3"; + version = "3.55.0"; src = fetchFromGitHub { owner = "buildkite"; repo = "agent"; rev = "v${version}"; - sha256 = "sha256-TO+JhzswqQp847M3sDwS8/X9QgMr/6gP+IeewshncIA="; + sha256 = "sha256-HvpEEutvdVHyzDtHdlc7ZB9xwnCKYWKbH/A1gAtR+Wk="; }; - vendorHash = "sha256-tWz9yCzekPQ0c58X4H0Git5knIU4SEKc1UPhiO9xUro="; + vendorHash = "sha256-bIOS9Ja+mue6LNXUGmkLobh+lLiJfBDtNrAX3fp0jMY="; postPatch = '' substituteInPlace clicommand/agent_start.go --replace /bin/bash ${bash}/bin/bash diff --git a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix index 7c2a9302297ac..5e30c977c41e7 100644 --- a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.103.1"; + version = "0.105.1"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-K8uhI/lX0xCvCLKv4mpahZm0ukTInzMjFBnPumRp2gc="; + sha256 = "sha256-F0T/4KUz0iU/THE8iRSdKe0Wo3HWQMYOd5vmbO61SzA="; }; - vendorHash = "sha256-0otC2+f0PMBZ+0Xiyq4kBd2YCJjAvDhThB3W9gIjHOY="; + vendorHash = "sha256-+cxh3/TQqm6n7hUYhW2B3pdfdtzRuepZmLNSGVPA3H0="; ldflags = [ "-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}" diff --git a/pkgs/development/tools/continuous-integration/dagger/default.nix b/pkgs/development/tools/continuous-integration/dagger/default.nix index 816702d263ed2..9b695e53819d6 100644 --- a/pkgs/development/tools/continuous-integration/dagger/default.nix +++ b/pkgs/development/tools/continuous-integration/dagger/default.nix @@ -1,17 +1,17 @@ -{ lib, buildGoModule, fetchFromGitHub, testers, dagger }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles, testers, dagger }: buildGoModule rec { pname = "dagger"; - version = "0.8.4"; + version = "0.8.7"; src = fetchFromGitHub { owner = "dagger"; repo = "dagger"; rev = "v${version}"; - hash = "sha256-iFuPbSat555QHPqqP6j/6uTid19x1+OtRHADmGxTYzs="; + hash = "sha256-vlHLqqUMZAuBgI5D1L2g6u3PDZsUp5oUez4x9ydOUtM="; }; - vendorHash = "sha256-DWmHq8BIR00QTh3ZcbEgTtbHwTmsMFAhV7kQVRSKNdQ="; + vendorHash = "sha256-B8Qvyvh9MRGFDBvc/Hu+IitBBdHvEU3QjLJuIy1S04A="; proxyVendor = true; subPackages = [ @@ -20,6 +20,15 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-X github.com/dagger/dagger/engine.Version=${version}" ]; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd dagger \ + --bash <($out/bin/dagger completion bash) \ + --fish <($out/bin/dagger completion fish) \ + --zsh <($out/bin/dagger completion zsh) + ''; + passthru.tests.version = testers.testVersion { package = dagger; command = "dagger version"; diff --git a/pkgs/development/tools/continuous-integration/gitea-actions-runner/default.nix b/pkgs/development/tools/continuous-integration/gitea-actions-runner/default.nix index cd2a9788f4064..68093f39e4f86 100644 --- a/pkgs/development/tools/continuous-integration/gitea-actions-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitea-actions-runner/default.nix @@ -7,17 +7,17 @@ buildGoModule rec { pname = "gitea-actions-runner"; - version = "0.2.5"; + version = "0.2.6"; src = fetchFromGitea { domain = "gitea.com"; owner = "gitea"; repo = "act_runner"; rev = "v${version}"; - hash = "sha256-HWJrgZJfI5fOeZvQkmpd6wciJWh1JOmZMlyGHSbgHpc="; + hash = "sha256-GE9yqp5zWJ4lL0L/w3oSvU72AiHBNb+yh2qBPKPe9X0="; }; - vendorHash = "sha256-Z61kTbKHSUpt2F6jVUUK4KwMJ0ILT1FI4/62AkNQuZI="; + vendorHash = "sha256-NoaLq5pCwTuPd9ne5LYcvJsgUXAqcfkcW3Ck2K350JE="; ldflags = [ "-s" diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index e50ade55d9b82..b6e11c7eb4b10 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitLab, fetchurl, bash }: let - version = "16.3.0"; + version = "16.4.0"; in buildGoModule rec { inherit version; @@ -17,13 +17,13 @@ buildGoModule rec { # For patchShebangs buildInputs = [ bash ]; - vendorHash = "sha256-tMhzq9ygUmNi9+mlI9Gvr2nDyG9HQbs8PVusSgadZIE="; + vendorHash = "sha256-RIxGgS+7gNvexZLLtXymGZaODhax/oSi1gAUxXHZBp4="; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "sha256-YAnHOIpUN1OuNefjCIccZOLwPNMxVBuCRQgX0Tb5bos="; + sha256 = "sha256-XYlrIUBT/zlnGYxckv36dqSEEpxUom/OJfqnL/HwYDo="; }; patches = [ diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 46d4e911c0771..c90845ddcd73f 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.414.1"; + version = "2.414.2"; src = fetchurl { url = "https://get.jenkins.io/war-stable/${version}/jenkins.war"; - hash = "sha256-8lI/m1/lAZn2j2D5a2vvnKEA4YCZ4+PaeppJroxHsBU="; + hash = "sha256-kiu/Ymn92tYUu2VAJB7QzlUjpKUyginhX157t//VZbg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix index 1bebbc7311009..f768064fbe870 100644 --- a/pkgs/development/tools/coursier/default.nix +++ b/pkgs/development/tools/coursier/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "coursier"; - version = "2.1.6"; + version = "2.1.7"; src = fetchurl { url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; - sha256 = "HBjtR2OTzWgMdm8oBfBuJaxP4arAokOMUnRECEsTvg8="; + sha256 = "aih4gkfSFTyZtw61NfB2JcNjfmxYWi1kWNGooI+110E="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/cpm-cmake/default.nix b/pkgs/development/tools/cpm-cmake/default.nix index d4c6a6d72cde5..2e85a90c3f1d2 100644 --- a/pkgs/development/tools/cpm-cmake/default.nix +++ b/pkgs/development/tools/cpm-cmake/default.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "cpm-cmake"; - version = "0.38.2"; + version = "0.38.5"; src = fetchFromGitHub { owner = "cpm-cmake"; repo = "cpm.cmake"; rev = "v${finalAttrs.version}"; - hash = "sha256-/qractCyItq1dNc8rBoipwmt4SGkdylxHu0Lnt4Jb/Q="; + hash = "sha256-PpfOpfEb8wxqaFFh8h0H4nn8bbBr7s0dWcRiREGddQ4="; }; dontConfigure = true; diff --git a/pkgs/development/tools/dapper/default.nix b/pkgs/development/tools/dapper/default.nix index d2b36efdaedca..c2b6066f61bd0 100644 --- a/pkgs/development/tools/dapper/default.nix +++ b/pkgs/development/tools/dapper/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { rev = "v${version}"; sha256 = "sha256-V+lHnOmIWjI1qmoJ7+pp+cGmJAtSeY+r2I9zykswQzM="; }; - vendorSha256 = null; + vendorHash = null; patchPhase = '' substituteInPlace main.go --replace 0.0.0 ${version} diff --git a/pkgs/development/tools/database/atlas/default.nix b/pkgs/development/tools/database/atlas/default.nix index ee5d4f89d63e9..337f0393dca9a 100644 --- a/pkgs/development/tools/database/atlas/default.nix +++ b/pkgs/development/tools/database/atlas/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "atlas"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "ariga"; repo = "atlas"; rev = "v${version}"; - hash = "sha256-6Y6b8BBfCErbKJqhR7zhltbysibUlY7KAyZe7g5mRxQ="; + hash = "sha256-dOqL/9sJUbaHqF3N5PEL7f6LxQQWNL0FvaH5BxQp4Xg="; }; modRoot = "cmd/atlas"; diff --git a/pkgs/development/tools/database/beekeeper-studio/default.nix b/pkgs/development/tools/database/beekeeper-studio/default.nix index fdc01addcc3c4..6070b5bc32b6e 100644 --- a/pkgs/development/tools/database/beekeeper-studio/default.nix +++ b/pkgs/development/tools/database/beekeeper-studio/default.nix @@ -8,7 +8,7 @@ let src = fetchurl { url = "https://github.com/beekeeper-studio/beekeeper-studio/releases/download/v${version}/Beekeeper-Studio-${version}.AppImage"; name = "${pname}-${version}.AppImage"; - sha512 = "sha512-an4Gqx2mx/rnkLe/LUAz3qRdrqWBcrWcdCiNi8Hz1OKBp1SWN3acU8RppIM0uwlrcBkjnigbbM5DZ2o+svA23A=="; + hash = "sha512-an4Gqx2mx/rnkLe/LUAz3qRdrqWBcrWcdCiNi8Hz1OKBp1SWN3acU8RppIM0uwlrcBkjnigbbM5DZ2o+svA23A=="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix index d7eecde5e1629..bad6a1644b9d8 100644 --- a/pkgs/development/tools/database/dbmate/default.nix +++ b/pkgs/development/tools/database/dbmate/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dbmate"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "amacneil"; repo = "dbmate"; rev = "refs/tags/v${version}"; - hash = "sha256-s3J5Mf+eCChIGmm89nq1heoJKscCA9nINGAGe0/qxaI="; + hash = "sha256-5dYWCcCQymwzWGY67lds5QQzHHkKt3OGkvqXDLwt/q8="; }; - vendorHash = "sha256-ohSwDFisNXnq+mqGD2v4X58lumHvpyTyJxME418GSMY="; + vendorHash = "sha256-1sfIwawsWefh+nj4auqRjU4dWuDbgpvhAc8cF8DhICg="; doCheck = false; diff --git a/pkgs/development/tools/database/prqlc/default.nix b/pkgs/development/tools/database/prqlc/default.nix index dcb72c4e42c48..fe3df4ee9a295 100644 --- a/pkgs/development/tools/database/prqlc/default.nix +++ b/pkgs/development/tools/database/prqlc/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "prqlc"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "prql"; repo = "prql"; rev = version; - hash = "sha256-9BDBuAaer92BAwQexkZOyt99VXEbJT6/87DoCqVzjcQ="; + hash = "sha256-t/l1fMZpGCLtxjCtOMv4eaj6oNyFX9BFgfc3OwYrxs0="; }; - cargoHash = "sha256-LeMl9t2ZYsBFuGnxJVvfmnjKFVIVO8ChmXQhXcSYV6s="; + cargoHash = "sha256-bdPjLOHh5qC1/LNfsUC26h4v3EuwiM9HqoQxeeNCOIw="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/database/termdbms/default.nix b/pkgs/development/tools/database/termdbms/default.nix index a8c56c51dbc56..4cfc905c6c158 100644 --- a/pkgs/development/tools/database/termdbms/default.nix +++ b/pkgs/development/tools/database/termdbms/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "mathaou"; repo = "termdbms"; rev = "d46e72c796e8aee0def71b8e3499b0ebe5ca3385"; - sha256 = "1c3xgidhmvlcdw7v5gcqzv27cb58f1ix8sfd4r14rfz7c8kbv37v"; + hash = "sha256-+4y9JmLnu0xCJs1p1GNwqCx2xP6YvbIPb4zuClt8fbA="; }; - vendorSha256 = "0h9aw68niizd9gs0i890g6ij13af04qgpfy1g5pskyr4ryx0gn26"; + vendorHash = "sha256-RtgHus8k+6lvecG7+zABTo0go3kgoQj0S+3HaJHhKkE="; patches = [ ./viewer.patch ]; diff --git a/pkgs/development/tools/database/webdis/default.nix b/pkgs/development/tools/database/webdis/default.nix index aa51196643ea0..eec952817e90b 100644 --- a/pkgs/development/tools/database/webdis/default.nix +++ b/pkgs/development/tools/database/webdis/default.nix @@ -1,14 +1,21 @@ -{ lib, stdenv, fetchFromGitHub, hiredis, http-parser, jansson, libevent, fetchpatch }: +{ lib +, stdenv +, fetchFromGitHub +, hiredis +, http-parser +, jansson +, libevent +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "webdis"; - version = "0.1.21"; + version = "0.1.22"; src = fetchFromGitHub { owner = "nicolasff"; - repo = pname; - rev = version; - sha256 = "sha256-HSAxmOtljwhQiW/spe0MEF7JK+bZe+oSUJhwp5y1fEQ="; + repo = "webdis"; + rev = finalAttrs.version; + hash = "sha256-83nZMqRK1uEWR1xn9lzbTyM0kuAkhmvm999cGu6Yu3k="; }; buildInputs = [ hiredis http-parser jansson libevent ]; @@ -18,11 +25,11 @@ stdenv.mkDerivation rec { "CONFDIR=${placeholder "out"}/share/webdis" ]; - meta = with lib; { + meta = { description = "A Redis HTTP interface with JSON output"; homepage = "https://webd.is/"; - license = licenses.bsd2; - platforms = platforms.unix; - maintainers = with maintainers; [ wucke13 ]; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ wucke13 ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/development/tools/dockfmt/default.nix b/pkgs/development/tools/dockfmt/default.nix index 18dfed5f2fbcb..e2a2210fa6497 100644 --- a/pkgs/development/tools/dockfmt/default.nix +++ b/pkgs/development/tools/dockfmt/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { hash = "sha256-wEC9kENcE3u+Mb7uLbx/VBUup6PBnCY5cxTYvkJcavg="; }; - vendorSha256 = null; + vendorHash = null; ldflags = [ "-w" diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index d3f80124bd6cf..31e6a3e71d54d 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.98.0"; + version = "1.99.0"; vendorHash = null; @@ -31,7 +31,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "sha256-M9kSQoYcJudL/y/Yc6enVT/rJusd+oe3BdjkaLRQ0gU="; + sha256 = "sha256-xwkbekTnwisgr1gkUewMkz0E5iQg6bWgVz8tne7ME9Y="; }; meta = with lib; { diff --git a/pkgs/development/tools/dtools/default.nix b/pkgs/development/tools/dtools/default.nix index d605e4d4ef403..4d64760d39ff3 100644 --- a/pkgs/development/tools/dtools/default.nix +++ b/pkgs/development/tools/dtools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "dtools"; - version = "2.103.1"; + version = "2.105.2"; src = fetchFromGitHub { owner = "dlang"; repo = "tools"; rev = "v${version}"; - sha256 = "sha256-XM4gUxcarQCOBR8W/o0iWAI54PyLDkH6CsDce22Cnu4="; + sha256 = "sha256-Y8jSwd6tldCnq3yEuO/xUYrSV+lp7tBPMiheMA06f0M="; name = "dtools"; }; @@ -34,18 +34,18 @@ stdenv.mkDerivation rec { doCheck = true; checkPhase = '' - $makeCmd test_rdmd + $makeCmd test_rdmd ''; installPhase = '' - $makeCmd INSTALL_DIR=$out install + $makeCmd INSTALL_DIR=$out install ''; meta = with lib; { description = "Ancillary tools for the D programming language compiler"; homepage = "https://github.com/dlang/tools"; license = lib.licenses.boost; - maintainers = with maintainers; [ ThomasMader ]; + maintainers = with maintainers; [ ThomasMader jtbx ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index 225a2981a604a..c9d2cc352e15f 100644 --- a/pkgs/development/tools/earthly/default.nix +++ b/pkgs/development/tools/earthly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "earthly"; - version = "0.7.17"; + version = "0.7.19"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - hash = "sha256-JkZVuOlN9lDTdJ2076+STLU+UcoAAmWdqsBDGMtUJyw="; + hash = "sha256-Qs2Ik559KOhkwTSaEoYLqy4m9y/mRp7XThArKOkH3uI="; }; - vendorHash = "sha256-R3UxfshCAca73xRnjen5Dg8/gbTrTpZsz9HB18/MxEQ="; + vendorHash = "sha256-h3/FmhcXwRvDoOwJ643ze3GrV13tIhnnIMynQgf5emg="; subPackages = [ "cmd/earthly" "cmd/debugger" ]; CGO_ENABLED = 0; diff --git a/pkgs/development/tools/electron/.gitignore b/pkgs/development/tools/electron/.gitignore new file mode 100644 index 0000000000000..14d86ad623010 --- /dev/null +++ b/pkgs/development/tools/electron/.gitignore @@ -0,0 +1 @@ +/cache diff --git a/pkgs/development/tools/electron/binary/default.nix b/pkgs/development/tools/electron/binary/default.nix index 5bc91ce1fbf9c..94c7b2750a902 100644 --- a/pkgs/development/tools/electron/binary/default.nix +++ b/pkgs/development/tools/electron/binary/default.nix @@ -1,29 +1,9 @@ -{ lib, stdenv -, libXScrnSaver -, makeWrapper -, fetchurl -, wrapGAppsHook -, glib -, gtk3 -, unzip -, atomEnv -, libuuid -, at-spi2-atk -, at-spi2-core -, libdrm -, mesa -, libxkbcommon -, libappindicator-gtk3 -, libxshmfence -, libglvnd -, wayland -}@args: +{ callPackage }: let - mkElectron = import ./generic.nix args; + mkElectron = callPackage ./generic.nix { }; in rec { - electron-bin = electron_26-bin; electron_10-bin = mkElectron "10.4.7" { @@ -142,13 +122,13 @@ rec { headers = "03mb1v5xzn2lp317r0mik9dx2nnxc7m26imygk13dgmafydd6aah"; }; - electron_22-bin = mkElectron "22.3.24" { - armv7l-linux = "bf986ec2e04c1f81a753dc17d71d231e16e0903d9114b1a73b1df0f18281d549"; - aarch64-linux = "055776ed281fa2db76a9e663677155b9631e4c6ac57c1e86938c789913c72fe7"; - x86_64-linux = "0c48912ff2bcbfe7e7c80eae76b82e2ba1e03cc872c0c6817faa560155447edd"; - x86_64-darwin = "a2adc99b44fbded082cbb5f1c49eceaf0c6f678c5ba951332b2c902b4fa7f63e"; - aarch64-darwin = "2ac36fdd664cb53c6cbc8ac67ac66e95e6418db4009636fbb865df97b711c818"; - headers = "1817viv29v1lgph9rcknm6rz64x6w2l8p0ng681644cv4m5gjsq1"; + electron_22-bin = mkElectron "22.3.25" { + armv7l-linux = "d90184e22f9d57fa4f207d5e5006bbfb6df1b9e10760333c3f72353ffa5ef3d1"; + aarch64-linux = "08c4e127d06d73ad91fa308c811ace9d4f8607fe15ba0b2694261d32a2127a8c"; + x86_64-linux = "f1d0f66b13d5b7b9e3f7d9b22891bf0b5b6f87e45c46054cd3fa74636c19e921"; + x86_64-darwin = "945839af7ad0656d6c3462f6b47d871ce3d3860c112b2f574f62624b5b67ca8a"; + aarch64-darwin = "3b0d7cb9ca7dda2b178af0084814f82c331df6abac63f19c3c6d72759db1e826"; + headers = "0dbwdfrrd3r2kkfq000gwx5q0w01ndgpglkjw7i2q8b3pr5b2n62"; }; electron_23-bin = mkElectron "23.3.13" { @@ -160,30 +140,30 @@ rec { headers = "04k25z0d6xs2ar5mbbnr0phcs97kvxg28df3njhaniws6wf6qcmg"; }; - electron_24-bin = mkElectron "24.8.3" { - armv7l-linux = "93dc26ce72b2b4cafaf1c09091c23c764294a95da040b515963c5a269fc4112a"; - aarch64-linux = "6684c37e427335818db146bb7b9c860be72ea582064fad349a54c62042676439"; - x86_64-linux = "fcc2754fecdc6ffb814938ae7c806c8ab7d68c748d5906ae3e4b0f3d90eda2e1"; - x86_64-darwin = "73f1913a9594057a47d473ff697c36ebb3d7d2fa012a24d301624af15fe9f251"; - aarch64-darwin = "1b276595078b2733c33570a0d27309117711d176629580c09bd31e5e3edb21f2"; - headers = "1rd0nww6gxvdzw6ja17gv5kd0wszjs9bcfspkp0iamsp5d9ixjf8"; + electron_24-bin = mkElectron "24.8.5" { + armv7l-linux = "12063cec367c7ec5b018eb308aaf34cfc73997f325cd37d19703caba842520e2"; + aarch64-linux = "a36978af2296a9594035a8dd59c1f7199c68f3f530013a919fc10baec7471668"; + x86_64-linux = "bdb2ecc81462018a69f105eb0d121deff48b54831af31b7da664fc193969f352"; + x86_64-darwin = "5eb6f9f9f1860bb76267c85b0bc12cc0bd6158b3cc88a2b484e4896e80f6f693"; + aarch64-darwin = "49f8a31e3863496d009740ecb4ce95c08870874c284de7a13e8d12c6056c1c48"; + headers = "11909wjni9wvlinvp0d7gypmv4sqg7xv0bn5x2x8h4sfgqydzwr6"; }; - electron_25-bin = mkElectron "25.8.1" { - armv7l-linux = "dd3390de2426a1cea9d3176e404b8fb250844a9b0e48cf01822fa66f3c3c4a48"; - aarch64-linux = "931208419f859f528e19805ae14b5b075213bc40dd20da9e03d8b71d849c147d"; - x86_64-linux = "de556aef0a80a8fe7b2b39d74ab0bdecc65d72bba3b7349460d18ef2a22fa323"; - x86_64-darwin = "fe61a3221d4c5dc9415dc2cce81010db61bb4a5ab5021d1023f48786dbaf0b28"; - aarch64-darwin = "985f4beee009ef6dbe7af75009a1b281aff591b989ee544bd4d2c814f9c4428d"; - headers = "1kkkxida3cbril65lmm0lkps787mhrrylzvp0j35rc1ip32b7sda"; + electron_25-bin = mkElectron "25.8.4" { + armv7l-linux = "6301e6fde3e7c8149a5eca84c3817ba9ad3ffcb72e79318a355f025d7d3f8408"; + aarch64-linux = "fbb6e06417b1741b94d59a6de5dcf3262bfb3fc98cffbcad475296c42d1cbe94"; + x86_64-linux = "0cbbcaf90f3dc79dedec97d073ffe954530316523479c31b11781a141f8a87f6"; + x86_64-darwin = "d4015cd251e58ef074d1f7f3e99bfbbe4cd6b690981f376fc642b2de955e8750"; + aarch64-darwin = "5d83e2094a26bfe22e4c80e660ab088ec94ae3cc2d518c6efcac338f48cc0266"; + headers = "10nbnjkmry1dn103jpc3p3jijq8l6zh3cm6k5fqk94nrbmjjdah9"; }; - electron_26-bin = mkElectron "26.2.1" { - armv7l-linux = "27469331e1b19f732f67e4b3ae01bba527b2744e31efec1ef76748c45fe7f262"; - aarch64-linux = "fe634b9095120d5b5d2c389ca016c378d1c3ba4f49b33912f9a6d8eb46f76163"; - x86_64-linux = "be4ca43f4dbc82cacb4c48a04f3c4589fd560a80a77dbb9bdf6c81721c0064df"; - x86_64-darwin = "007413187793c94cd248f52d3e00e2d95ed73b7a3b2c5a618f22eba7af94cd1a"; - aarch64-darwin = "4e095994525a0e97e897aad9c1940c8160ce2c9aaf7b6792f31720abc3e04ee6"; - headers = "02z604nzcm8iw29s5lsgjlzwn666h3ikxpdfjg2h0mffm82d0wfk"; + electron_26-bin = mkElectron "26.2.4" { + armv7l-linux = "300e1a3e84d81277f9ab7f5060b980b2b1387979d6f07ea9d78bce5139430420"; + aarch64-linux = "a401d68820d1c87006b683d98cfb691ffac1218c815757a3c5a0a4c2f3f08888"; + x86_64-linux = "d2226ee3fb8bcd17abfe9747ba6c8d6ae2719a6256896d4861e3cb670ec2beeb"; + x86_64-darwin = "a1e33c66a13913306e80812a9051ce7e5632d7cc13ff76910cc8daa791580589"; + aarch64-darwin = "dda224e19ff2d2c99624e1da7d20fa24b92a34b49fac8dcef15542e183bc89c6"; + headers = "0019pwm7n8vwhdflh1yy0lrgfgg92p9l40iw4xxnhm6ppic1f5kk"; }; } diff --git a/pkgs/development/tools/electron/binary/generic.nix b/pkgs/development/tools/electron/binary/generic.nix index 615ec9243bb2d..f7e8f6461a4cf 100644 --- a/pkgs/development/tools/electron/binary/generic.nix +++ b/pkgs/development/tools/electron/binary/generic.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , libXScrnSaver , makeWrapper , fetchurl @@ -6,17 +7,23 @@ , glib , gtk3 , unzip -, atomEnv -, libuuid , at-spi2-atk -, at-spi2-core , libdrm , mesa , libxkbcommon -, libappindicator-gtk3 , libxshmfence , libglvnd -, wayland +, alsa-lib +, cairo +, cups +, dbus +, expat +, gdk-pixbuf +, nss +, nspr +, xorg +, pango +, systemd }: version: hashes: @@ -64,13 +71,35 @@ let passthru.headers = headersFetcher version hashes.headers; }; - electronLibPath = with lib; makeLibraryPath ( - [ libuuid at-spi2-atk at-spi2-core libappindicator-gtk3 wayland ] - ++ optionals (versionAtLeast version "9.0.0") [ libdrm mesa ] - ++ optionals (versionOlder version "10.0.0") [ libXScrnSaver ] - ++ optionals (versionAtLeast version "11.0.0") [ libxkbcommon ] - ++ optionals (versionAtLeast version "12.0.0") [ libxshmfence ] - ++ optionals (versionAtLeast version "17.0.0") [ libglvnd ] + electronLibPath = lib.makeLibraryPath ([ + alsa-lib + at-spi2-atk + cairo + cups + dbus + expat + gdk-pixbuf + glib + gtk3 + nss + nspr + xorg.libX11 + xorg.libxcb + xorg.libXcomposite + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXrandr + xorg.libxkbfile + pango + stdenv.cc.cc.lib + systemd + ] + ++ lib.optionals (lib.versionAtLeast version "9.0.0") [ libdrm mesa ] + ++ lib.optionals (lib.versionOlder version "10.0.0") [ libXScrnSaver ] + ++ lib.optionals (lib.versionAtLeast version "11.0.0") [ libxkbcommon ] + ++ lib.optionals (lib.versionAtLeast version "12.0.0") [ libxshmfence ] + ++ lib.optionals (lib.versionAtLeast version "17.0.0") [ libglvnd ] ); linux = { @@ -95,7 +124,7 @@ let postFixup = '' patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${atomEnv.libPath}:${electronLibPath}:$out/libexec/electron" \ + --set-rpath "${electronLibPath}:$out/libexec/electron" \ $out/libexec/electron/.electron-wrapped \ ${lib.optionalString (lib.versionAtLeast version "15.0.0") "$out/libexec/electron/.chrome_crashpad_handler-wrapped" } ''; diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix new file mode 100644 index 0000000000000..66701b12a6482 --- /dev/null +++ b/pkgs/development/tools/electron/common.nix @@ -0,0 +1,204 @@ +{ lib +, stdenv +, chromium +, nodejs +, python3 +, fetchYarnDeps +, fetchNpmDeps +, fixup_yarn_lock +, npmHooks +, yarn +, substituteAll +, libnotify +, unzip +, pkgs +, pkgsBuildHost + +, info +}: + +let + fetchdep = dep: let + opts = removeAttrs dep ["fetcher"]; + in pkgs.${dep.fetcher} opts; + +in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: { + packageName = "electron"; + inherit (info) version; + buildTargets = [ "electron:electron_dist_zip" ]; + + nativeBuildInputs = base.nativeBuildInputs ++ [ nodejs yarn fixup_yarn_lock unzip npmHooks.npmConfigHook ]; + buildInputs = base.buildInputs ++ [ libnotify ]; + + electronOfflineCache = fetchYarnDeps { + yarnLock = (fetchdep info.deps."src/electron") + "/yarn.lock"; + sha256 = info.electron_yarn_hash; + }; + npmDeps = fetchNpmDeps { + src = fetchdep info.deps."src"; + sourceRoot = "source/third_party/node"; + hash = info.chromium_npm_hash; + }; + + src = null; + + patches = base.patches ++ [ + (substituteAll { + name = "version.patch"; + src = if lib.versionAtLeast info.version "27" then ./version.patch else ./version-old.patch; + inherit (info) version; + }) + ]; + + unpackPhase = '' + runHook preUnpack + '' + ( + lib.concatStrings (lib.mapAttrsToList (path: dep: '' + mkdir -p ${builtins.dirOf path} + cp -r ${fetchdep dep}/. ${path} + chmod u+w -R ${path} + '') info.deps) + ) + '' + sourceRoot=src + runHook postUnpack + ''; + + npmRoot = "third_party/node"; + + postPatch = '' + mkdir -p third_party/jdk/current/bin + + echo 'build_with_chromium = true' >> build/config/gclient_args.gni + echo 'checkout_google_benchmark = false' >> build/config/gclient_args.gni + echo 'checkout_android = false' >> build/config/gclient_args.gni + echo 'checkout_android_prebuilts_build_tools = false' >> build/config/gclient_args.gni + echo 'checkout_android_native_support = false' >> build/config/gclient_args.gni + echo 'checkout_ios_webkit = false' >> build/config/gclient_args.gni + echo 'checkout_nacl = false' >> build/config/gclient_args.gni + echo 'checkout_openxr = false' >> build/config/gclient_args.gni + echo 'checkout_rts_model = false' >> build/config/gclient_args.gni + echo 'checkout_src_internal = false' >> build/config/gclient_args.gni + echo 'cros_boards = ""' >> build/config/gclient_args.gni + echo 'cros_boards_with_qemu_images = ""' >> build/config/gclient_args.gni + echo 'generate_location_tags = true' >> build/config/gclient_args.gni + + echo 'LASTCHANGE=${info.deps."src".rev}-refs/heads/master@{#0}' > build/util/LASTCHANGE + echo "$SOURCE_DATE_EPOCH" > build/util/LASTCHANGE.committime + + cat << EOF > gpu/config/gpu_lists_version.h + /* Generated by lastchange.py, do not edit.*/ + #ifndef GPU_CONFIG_GPU_LISTS_VERSION_H_ + #define GPU_CONFIG_GPU_LISTS_VERSION_H_ + #define GPU_LISTS_VERSION "${info.deps."src".rev}" + #endif // GPU_CONFIG_GPU_LISTS_VERSION_H_ + EOF + + cat << EOF > skia/ext/skia_commit_hash.h + /* Generated by lastchange.py, do not edit.*/ + #ifndef SKIA_EXT_SKIA_COMMIT_HASH_H_ + #define SKIA_EXT_SKIA_COMMIT_HASH_H_ + #define SKIA_COMMIT_HASH "${info.deps."src/third_party/skia".rev}-" + #endif // SKIA_EXT_SKIA_COMMIT_HASH_H_ + EOF + + echo -n '${info.deps."src/third_party/dawn".rev}' > gpu/webgpu/DAWN_VERSION + + ( + cd electron + export HOME=$TMPDIR/fake_home + yarn config --offline set yarn-offline-mirror $electronOfflineCache + fixup_yarn_lock yarn.lock + yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive + ) + + ( + cd .. + PATH=$PATH:${lib.makeBinPath (with pkgsBuildHost; [ jq git ])} + config=src/electron/patches/config.json + for key in $(jq -r "keys[]" $config) + do + value=$(jq -r ".\"$key\"" $config) + echo patching $value + for patch in $(cat $key/.patches) + do + git apply -p1 --directory=$value $key/$patch + done + done + ) + '' + base.postPatch; + + preConfigure = '' + ( + cd third_party/node + grep patch update_npm_deps | sh + ) + '' + (base.preConfigure or ""); + + gnFlags = rec { + # build/args/release.gn + is_component_build = false; + is_official_build = true; + rtc_use_h264 = proprietary_codecs; + is_component_ffmpeg = true; + + # build/args/all.gn + is_electron_build = true; + root_extra_deps = [ "//electron" ]; + node_module_version = info.modules; + v8_promise_internal_field_count = 1; + v8_embedder_string = "-electron.0"; + v8_enable_snapshot_native_code_counters = false; + v8_scriptormodule_legacy_lifetime = true; + v8_enable_javascript_promise_hooks = true; + enable_cdm_host_verification = false; + proprietary_codecs = true; + ffmpeg_branding = "Chrome"; + enable_printing = true; + angle_enable_vulkan_validation_layers = false; + dawn_enable_vulkan_validation_layers = false; + enable_pseudolocales = false; + allow_runtime_configurable_key_storage = true; + enable_cet_shadow_stack = false; + is_cfi = false; + use_qt = false; + + enable_widevine = false; + use_perfetto_client_library = false; + enable_check_raw_ptr_fields = false; + } // lib.optionalAttrs (lib.versionOlder info.version "26") { + use_gnome_keyring = false; + }; + + installPhase = '' + mkdir -p $libExecPath + unzip -d $libExecPath out/Release/dist.zip + ''; + + requiredSystemFeatures = [ "big-parallel" ]; + + passthru = { + inherit info; + headers = stdenv.mkDerivation rec { + name = "node-v${info.node}-headers.tar.xz"; + nativeBuildInputs = [ python3 ]; + src = fetchdep info.deps."src/third_party/electron_node"; + buildPhase = '' + make tar-headers + ''; + installPhase = '' + mv ${name} $out + ''; + }; + }; + + meta = with lib; { + description = "Cross platform desktop application shell"; + homepage = "https://github.com/electron/electron"; + platforms = lib.platforms.linux; + license = licenses.mit; + maintainers = with maintainers; [ yuka ]; + mainProgram = "electron"; + hydraPlatforms = lib.optionals (!(hasInfix "alpha" info.version) && !(hasInfix "beta" info.version)) ["aarch64-linux" "x86_64-linux"]; + timeout = 172800; # 48 hours (increased from the Hydra default of 10h) + }; +}) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix new file mode 100644 index 0000000000000..8c97837160d1c --- /dev/null +++ b/pkgs/development/tools/electron/default.nix @@ -0,0 +1,12 @@ +{ lib, callPackage }: + +let + versions = lib.importJSON ./info.json; +in + lib.mapAttrs' (version: info: + lib.nameValuePair "electron_${version}" ( + let + electron-unwrapped = callPackage ./common.nix { inherit info; }; + in callPackage ./wrapper.nix { inherit electron-unwrapped; } + ) + ) versions diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json new file mode 100644 index 0000000000000..021f0ee2427df --- /dev/null +++ b/pkgs/development/tools/electron/info.json @@ -0,0 +1,2558 @@ +{ + "27": { + "deps": { + "src/electron": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-oLzqasdnnsAizie6fl56bWs1m+IzWn5/7mGimUVYrQU=", + "owner": "electron", + "repo": "electron", + "rev": "v27.0.0-beta.8" + }, + "src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5X2g/SjWsEER6gla4TG6BvGWsVLAr3HR4W74QTTM4k8=", + "url": "https://chromium.googlesource.com/chromium/src.git", + "rev": "118.0.5993.18", + "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -r $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; " + }, + "src/third_party/clang-format/script": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-7VvofDDQe+SoMRBfVk26q+C+OPyOE7QH35wVWkfDKxs=", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git", + "rev": "e5337933f2951cacd3aeacd238ce4578163ca0b9" + }, + "src/third_party/libc++/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-YP1LAUaV8epDAsd9LOovdXUyzpaLgffOJcGM6VmTaKc=", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git", + "rev": "84fb809dd6dae36d556dc0bb702c6cc2ce9d4b80" + }, + "src/third_party/libc++abi/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-CBUw50T/jFMXU0cR+BQH6JyEY3mHamLM6kA8YdvI24Q=", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git", + "rev": "331847d7a5e6f8706689cf5d468e6e58c868fa10" + }, + "src/third_party/libunwind/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-rqmY4JNm4zuYqXs7o+1QhNnaNX4Cmt7PTJMGploHPnY=", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git", + "rev": "a321409e66c212098e755cfae1a978bbcff1ccbb" + }, + "src/chrome/test/data/perf/canvas_bench": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-svOuyBGKloBLM11xLlWCDsB4PpRjdKTBdW2UEW4JQjM=", + "url": "https://chromium.googlesource.com/chromium/canvas_bench.git", + "rev": "a7b40ea5ae0239517d78845a5fc9b12976bfc732" + }, + "src/chrome/test/data/perf/frame_rate/content": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-t4kcuvH0rkPBkcdiMsoNQaRwU09eU+oSvyHDiAHrKXo=", + "url": "https://chromium.googlesource.com/chromium/frame_rate/content.git", + "rev": "c10272c88463efeef6bb19c9ec07c42bc8fe22b9" + }, + "src/chrome/test/data/xr/webvr_info": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-BsAPwc4oEWri0TlqhyxqFNqKdfgVSrB0vQyISmYY4eg=", + "url": "https://chromium.googlesource.com/external/github.com/toji/webvr.info.git", + "rev": "c58ae99b9ff9e2aa4c524633519570bf33536248" + }, + "src/docs/website": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-6/LSJGUVZuJe1WIBJEJO/dXZYnsby+X3EzeBbvWjUZU=", + "url": "https://chromium.googlesource.com/website.git", + "rev": "243c1406199960e001e1dceccafc6fc2db6897f9" + }, + "src/media/cdm/api": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-6J6aSYW0or99VAgMNJJOdJqMJspoG7w1HxDN50MV5bw=", + "url": "https://chromium.googlesource.com/chromium/cdm.git", + "rev": "fef0b5aa1bd31efb88dfab804bdbe614f3d54f28" + }, + "src/net/third_party/quiche/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-hB3gUqi/9SI9PGNkXNpli/TifI1kJEBScqRFIw7hm4c=", + "url": "https://quiche.googlesource.com/quiche.git", + "rev": "7d201495d8a5ef115787765fb12af0d5575281c1" + }, + "src/third_party/angle": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-TP2ZFHIPbyPWnVBS6R8VsKNnmRDLP29sXD1G6Uo4LMg=", + "url": "https://chromium.googlesource.com/angle/angle.git", + "rev": "17c4741d70dd5a98724a5a8316dc7e05a9b6d48e" + }, + "src/third_party/angle/third_party/glmark2/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-L7+zWM0qn8WFhmON7DGvarTsN1YHt1sn5+hazTOZrrk=", + "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2", + "rev": "ca8de51fedb70bace5351c6b002eb952c747e889" + }, + "src/third_party/angle/third_party/rapidjson/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-btUl1a/B0sXwf/+hyvCvVJjWqIkXfVYCpHm3TeBuOxk=", + "url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson", + "rev": "781a4e667d84aeedbeb8184b7b62425ea66ec59f" + }, + "src/third_party/angle/third_party/VK-GL-CTS/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-LWGll3KiMYndiLZBizhN+mzELjYpSxvtIctH+LO+20Q=", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS", + "rev": "385ae8bed1f99e497cdf2f3a5640905b90e69292" + }, + "src/third_party/anonymous_tokens/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-TcNIocV0p53NJCudvy8wf+fIPIP2tnkoBf1F7mEBFLs=", + "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git", + "rev": "8c8d20953d502db31fec2353b199e6c22ef0236e" + }, + "src/third_party/content_analysis_sdk/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-auHBX00DSvyMyhEsZGkpKh9KOO2RcaeP9PK6kmmMYls=", + "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git", + "rev": "8d5118720805fdce0dd3ee2999c964501de4532c" + }, + "src/third_party/dav1d/libdav1d": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-KSo2s3M3S13gY84NlAdnPsjoKfJZy7ipTlWSvUHD9Ak=", + "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git", + "rev": "f8ae94eca0f53502a2cddd29a263c1edea4822a0" + }, + "src/third_party/dawn": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-iCCvQVwf+MLZR6Zz/ML7H9uQ0FiSSCw1gZZeGC6zRLo=", + "url": "https://dawn.googlesource.com/dawn.git", + "rev": "ec2cc40563739fa6e6ff0e12c58ac0fdbe0a132f" + }, + "src/third_party/dawn/third_party/glfw": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-TwAPRjQxIz3J+zbNxzCp5Tek7MwisxdekMpY5QGsKyg=", + "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw", + "rev": "62e175ef9fae75335575964c845a302447c012c7" + }, + "src/third_party/dawn/third_party/dxc": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-u29t+pF7aRfhRmi36YyEPcQU7gIDqsjrf38+C0YIpFk=", + "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler", + "rev": "50c4c887f1ccfa1a4bfb158b7dbc93058659ed01" + }, + "src/third_party/dawn/third_party/dxheaders": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-0Miw1Cy/jmOo7bLFBOHuTRDV04cSeyvUEyPkpVsX9DA=", + "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers", + "rev": "980971e835876dc0cde415e8f9bc646e64667bf7" + }, + "src/third_party/dawn/third_party/khronos/OpenGL-Registry": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-K3PcRIiD3AmnbiSm5TwaLs4Gu9hxaN8Y91WMKK8pOXE=", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry", + "rev": "5bae8738b23d06968e7c3a41308568120943ae77" + }, + "src/third_party/dawn/third_party/khronos/EGL-Registry": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Z6DwLfgQ1wsJXz0KKJyVieOatnDmx3cs0qJ6IEgSq1A=", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/EGL-Registry", + "rev": "7dea2ed79187cd13f76183c4b9100159b9e3e071" + }, + "src/third_party/dawn/third_party/webgpu-cts": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-gbZpmcbqLisjLb6vnKKvHS6eRqjqvavvTRgxJsaE/RQ=", + "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts", + "rev": "5dfa3b88f0863c3949f713804e0461c9cc34a030" + }, + "src/third_party/highway/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-kNb9UVcFq2BIf9nftUgN8ciFFCzRCou/sLwVf08jf3E=", + "url": "https://chromium.googlesource.com/external/github.com/google/highway.git", + "rev": "8f20644eca693cfb74aa795b0006b6779c370e7a" + }, + "src/third_party/google_benchmark/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-h2ryAQAuHI54Cni88L85e7Np4KATGVTRdDcmUvCNeWc=", + "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git", + "rev": "b177433f3ee2513b1075140c723d73ab8901790f" + }, + "src/third_party/boringssl/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-P0Aj2Puy6S1aRIHrAhmokiAmSmHfuWQR6UW/AbQFW+M=", + "url": "https://boringssl.googlesource.com/boringssl.git", + "rev": "85081c6b3c0b26129893c1bff6bfa42bc3ba2d2c" + }, + "src/third_party/breakpad/breakpad": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-8AkC/8oX4OWAcV21laJ0AeMRB9G04rFc6UJFy7Wus4A=", + "url": "https://chromium.googlesource.com/breakpad/breakpad.git", + "rev": "8988364bcddd9b194b0bf931c10bc125987330ed" + }, + "src/third_party/cast_core/public/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-AalRQhJmornCqmvE2+36J/3LubaA0jr6P1PXy32lX4I=", + "url": "https://chromium.googlesource.com/cast_core/public", + "rev": "71f51fd6fa45fac73848f65421081edd723297cd" + }, + "src/third_party/catapult": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-AK85yVeCR3GKGtdW8G9Of+6UMJirJ9BNVyp9pffft7s=", + "url": "https://chromium.googlesource.com/catapult.git", + "rev": "f16ca3c78e46cefa982100444844da3fcb25390e" + }, + "src/third_party/ced/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ySG74Rj2i2c/PltEgHVEDq+N8yd9gZmxNktc56zIUiY=", + "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git", + "rev": "ba412eaaacd3186085babcd901679a48863c7dd5" + }, + "src/third_party/chromium-variations": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-2lP3uGdqIZY3DpxGzfDhR2dW+o3Arduaeu56Au7h/5Q=", + "url": "https://chromium.googlesource.com/chromium-variations.git", + "rev": "e0c145ca93c0439a65bcb1607e813edfbc97520b" + }, + "src/third_party/cld_3/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-C3MOMBUy9jgkT9BAi/Fgm2UH4cxRuwSBEcRl3hzM2Ss=", + "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git", + "rev": "b48dc46512566f5a2d41118c8c1116c4f96dc661" + }, + "src/third_party/colorama/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-6ZTdPYSHdQOLYMSnE+Tp7PgsVTs3U2awGu9Qb4Rg/tk=", + "url": "https://chromium.googlesource.com/external/colorama.git", + "rev": "3de9f013df4b470069d03d250224062e8cf15c49" + }, + "src/third_party/cpu_features/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-E8LoVzhe+TAmARWZTSuINlsVhzpUJMxPPCGe/dHZcyA=", + "url": "https://chromium.googlesource.com/external/github.com/google/cpu_features.git", + "rev": "936b9ab5515dead115606559502e3864958f7f6e" + }, + "src/third_party/cpuinfo/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-oZjA2cMQMyhFcI+m6eOmdZ9A1oPAbyISeLxNyaoGivk=", + "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git", + "rev": "c13d0bbb266d200a13532b5915d704c30d21081b" + }, + "src/third_party/crc32c/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-urg0bmnfMfHagLPELp4WrNCz1gBZ6DFOWpDue1KsMtc=", + "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git", + "rev": "fa5ade41ee480003d9c5af6f43567ba22e4e17e6" + }, + "src/third_party/cros_system_api": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-wq7fJVNRSiyaADrCYB0TEmWQ//BJg4GYiHZNtMb1QlI=", + "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git", + "rev": "81ac4449008dffea00e4e8f251f87fabc5abe0d3" + }, + "src/third_party/crossbench": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-s/+y5bMj+CRnljFZ5aWKirPCsRUjckLOZ5F65WnPYSY=", + "url": "https://chromium.googlesource.com/crossbench.git", + "rev": "06981428c28d66678ebec13ca1fac3785cf51bb1" + }, + "src/third_party/depot_tools": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-EXxlQGA7qwjuZ2Qg/rZinkllkdfCbKXz8c4JJEr4mtU=", + "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git", + "rev": "7e251262409b3401809e57c5314dd158210355b8" + }, + "src/third_party/devtools-frontend/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Uc8Rww8zppFWxZZSnSGwyaB5m7WqZMXhHv84wSl7f7o=", + "url": "https://chromium.googlesource.com/devtools/devtools-frontend", + "rev": "666c79779cdc48a2fd41d7cbc5ee79ecd289e79a" + }, + "src/third_party/dom_distiller_js/dist": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-yuEBD2XQlV3FGI/i7lTmJbCqzeBiuG1Qow8wvsppGJw=", + "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git", + "rev": "199de96b345ada7c6e7e6ba3d2fa7a6911b8767d" + }, + "src/third_party/eigen3/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-c/4bf5+sJEgsKOJ34wPDNm1+6QUzETZZr/nE4SG5nKA=", + "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git", + "rev": "66e8f38891841bf88ee976a316c0c78a52f0cee5" + }, + "src/third_party/farmhash/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5n58VEUxa/K//jAfZqG4cXyfxrp50ogWDNYcgiXVHdc=", + "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git", + "rev": "816a4ae622e964763ca0862d9dbd19324a1eaf45" + }, + "src/third_party/ffmpeg": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-uRgHTVaCAEaoqY20SmePQbApPmjimgggm5922KKfnbc=", + "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git", + "rev": "0ba37733400593b162e5ae9ff26b384cff49c250" + }, + "src/third_party/flac": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-gvTFPNOlBfozptaH7lTb9iD/09AmpdT3kCl9ClszjEs=", + "url": "https://chromium.googlesource.com/chromium/deps/flac.git", + "rev": "689da3a7ed50af7448c3f1961d1791c7c1d9c85c" + }, + "src/third_party/flatbuffers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-yibx1WMAwNajROMGVqox3naMU09RSayxUaTCJ860euo=", + "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git", + "rev": "28861d1d7d5ec6ce34d4bbdc10bec4aace341167" + }, + "src/third_party/fontconfig/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-7PFmgr/+KNEYxCMuxMD2Zi9Ydcbp88IU7exr55a392Q=", + "url": "https://chromium.googlesource.com/external/fontconfig.git", + "rev": "2fb3419a92156569bc1ec707401258c922cd0d99" + }, + "src/third_party/fp16/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-m2d9bqZoGWzuUPGkd29MsrdscnJRtuIkLIMp3fMmtRY=", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git", + "rev": "0a92994d729ff76a58f692d3028ca1b64b145d91" + }, + "src/third_party/gemmlowp/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-O5wD8wxgis0qYMaY+xZ21GBDVQFphMRvInCOswS6inA=", + "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git", + "rev": "13d57703abca3005d97b19df1f2db731607a7dc2" + }, + "src/third_party/grpc/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-64JEVCx/PCM0dvv7kAQvSjLc0QbRAZVBDzwD/FAV6T8=", + "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git", + "rev": "822dab21d9995c5cf942476b35ca12a1aa9d2737" + }, + "src/third_party/freetype/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-RRieGqEeAk5AYzJqPRpF25FmxMpEYwR7AQWLzXkED50=", + "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git", + "rev": "45903920b984540bb629bc89f4c010159c23a89a" + }, + "src/third_party/freetype-testing/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-2aHPchIK5Oce5+XxdXVCC+8EM6i0XT0rFbjSIVa2L1A=", + "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git", + "rev": "7a69b1a2b028476f840ab7d4a2ffdfe4eb2c389f" + }, + "src/third_party/fxdiv/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-LjX5kivfHbqCIA5pF9qUvswG1gjOFo3CMpX0VR+Cn38=", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git", + "rev": "63058eff77e11aa15bf531df5dd34395ec3017c8" + }, + "src/third_party/harfbuzz-ng/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-+fClyD9Rsge9qdGF8WCv8taLTWNL8iManpXZUzDL2LM=", + "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git", + "rev": "db700b5670d9475cc8ed4880cc9447b232c5e432" + }, + "src/third_party/emoji-segmenter/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-oT9mAKoKnrsFsBAeTRfPOXM76HRQQabFAlPpfKUGFhs=", + "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git", + "rev": "9ba6d25d0d9313569665d4a9d2b34f0f39f9a50e" + }, + "src/third_party/ots/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-kiUXrXsaGOzPkKh0dVmU1I13WHt0Stzj7QLMqHN9FbU=", + "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git", + "rev": "46bea9879127d0ff1c6601b078e2ce98e83fcd33" + }, + "src/third_party/libgav1/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-dT8/Mdit3Qc5Sno6DYKv1qSNr+6Lhiy24ZNNBKoVq8I=", + "url": "https://chromium.googlesource.com/codecs/libgav1.git", + "rev": "df0023cc95b8e606a2fd243522d823401ef86637" + }, + "src/third_party/googletest/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-VYRjcM3dDY2FarviXyFMgSkXCqKfWXwtGAj2Msgm7zg=", + "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git", + "rev": "af29db7ec28d6df1c7f0f745186884091e602e07" + }, + "src/third_party/hunspell_dictionaries": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-67mvpJRFFa9eMfyqFMURlbxOaTJBICnk+gl0b0mEHl8=", + "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git", + "rev": "41cdffd71c9948f63c7ad36e1fb0ff519aa7a37e" + }, + "src/third_party/icu": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-6do7X9xUCMe2mFQoffazdC5W9UJdHp424QEThqX6P48=", + "url": "https://chromium.googlesource.com/chromium/deps/icu.git", + "rev": "985b9a6f70e13f3db741fed121e4dcc3046ad494" + }, + "src/third_party/jsoncpp/source": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-bSLNcoYBz3QCt5VuTR056V9mU2PmBuYBa0W6hFg2m8Q=", + "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git", + "rev": "42e892d96e47b1f6e29844cc705e148ec4856448" + }, + "src/third_party/leveldatabase/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-TTX2FrmcWsgqrh4uzqMyGnnnG51cVC2ILfdLxD65MLY=", + "url": "https://chromium.googlesource.com/external/leveldb.git", + "rev": "068d5ee1a3ac40dabd00d211d5013af44be55bea" + }, + "src/third_party/libFuzzer/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Zp8Ea/7GwmEl964MEIk3UM6IR5+FtUz8InlqZaOniDA=", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git", + "rev": "26cc39e59b2bf5cbc20486296248a842c536878d" + }, + "src/third_party/fuzztest/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-tVtrSbLxnHrbh027cafNbqkfjq/afQxw57rW9yGsRe0=", + "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git", + "rev": "25f44f341f701eccc29d22f69313a54363c6099b" + }, + "src/third_party/libaddressinput/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-xvUUQSPrvqUp5DI9AqlRTWurwDW087c6v4RvI+4sfOQ=", + "url": "https://chromium.googlesource.com/external/libaddressinput.git", + "rev": "e8712e415627f22d0b00ebee8db99547077f39bd" + }, + "src/third_party/libaom/source/libaom": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Z8td6FIvHibTQsB6x/A/69xduogj2b2lteiQB6l56vE=", + "url": "https://aomedia.googlesource.com/aom.git", + "rev": "5f8db64abce68a3698fb732697ae50880bc9cac4" + }, + "src/third_party/libavif/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-3zNhKl8REWsRlblXIFD7zn7qvrc/pa4wHZI0oEc3pKE=", + "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git", + "rev": "d1c26facaf5a8a97919ceee06814d05d10e25622" + }, + "src/third_party/libavifinfo/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-yTv1AGtWfxXcywZycpsQBkBRLwuUJMPFKtpj7nrsc4A=", + "url": "https://aomedia.googlesource.com/libavifinfo.git", + "rev": "707919b2f8ac1920b2f7ae252c233f9c6dcf84e1" + }, + "src/third_party/nearby/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5d7c8WvkjmBuwcwqhxQf0wRE3qaF8fFsiqUE1sHh0nc=", + "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git", + "rev": "8725391822b8901784b379a4573ab8828e7091d3" + }, + "src/third_party/beto-core/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-qgsPK7RyVqGRji0sTcMck1JqX9iCsYIExGoGwNZyVT0=", + "url": "https://beto-core.googlesource.com/beto-core.git", + "rev": "b902b346037ea3f4aadf8177021f6f917b16e648" + }, + "src/third_party/securemessage/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-GS4ccnuiqxMs/LVYAtvSlVAYFp4a5GoZsxcriTX3k78=", + "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git", + "rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84" + }, + "src/third_party/speedometer/v3.0": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-PqrwtPFU3TI840za3UU8p+t4ZdyX0l79esEA602Mbq0=", + "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git", + "rev": "5107c739c1b2a008e7293e3b489c4f80a8fb2e01" + }, + "src/third_party/ukey2/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-aaLs6ZS+CdBlCJ6ZhsmdAPFxiBIij6oufsDcNeRSV1E=", + "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git", + "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47" + }, + "src/third_party/cros-components/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-s8pfcu5SkxXFCat76TJaDi1NTTQckZ1F+T8URCxOUdI=", + "url": "https://chromium.googlesource.com/external/google3/cros_components.git", + "rev": "bf7aaccb73b26c11e8bf21cb7d90314338e1743f" + }, + "src/third_party/libdrm/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-NUxS2rBJ0nFblvHRQUfKT933+DAws5RUTDb+RLxRF4M=", + "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git", + "rev": "98e1db501173303e58ef6a1def94ab7a2d84afc1" + }, + "src/third_party/expat/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-FXTDGAK03jc2wvazhRKqtsFRKZUYS/9HLpZNp4JfZJI=", + "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git", + "rev": "441f98d02deafd9b090aea568282b28f66a50e36" + }, + "src/third_party/libipp/libipp": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-gxU92lHLd6uxO8T3QWhZIK0hGy97cki705DV0VimCPY=", + "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git", + "rev": "2209bb84a8e122dab7c02fe66cc61a7b42873d7f" + }, + "src/third_party/libjpeg_turbo": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-bcmp8RqQYp4lRI9NfdfYgrAJsDLecJEhgRu9oosB9lQ=", + "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git", + "rev": "30bdb85e302ecfc52593636b2f44af438e05e784" + }, + "src/third_party/liblouis/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY=", + "url": "https://chromium.googlesource.com/external/liblouis-github.git", + "rev": "9700847afb92cb35969bdfcbbfbbb74b9c7b3376" + }, + "src/third_party/libphonenumber/dist": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-3hSnTFTD3KAdbyxfKg12qbIYTmw6YlTCH64gMP/HUJo=", + "url": "https://chromium.googlesource.com/external/libphonenumber.git", + "rev": "140dfeb81b753388e8a672900fb7a971e9a0d362" + }, + "src/third_party/libprotobuf-mutator/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ZyPweW+V5foxFQwjjMLkaRUo+FNV+kEDGIH/4oRV614=", + "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git", + "rev": "a304ec48dcf15d942607032151f7e9ee504b5dcf" + }, + "src/third_party/libsrtp": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-pfLFh2JGk/g0ZZxBKTaYW9/PBpkCm0rtJeyNePUMTTc=", + "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git", + "rev": "5b7c744eb8310250ccc534f3f86a2015b3887a0a" + }, + "src/third_party/libsync/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Mkl6C1LxF3RYLwYbxiSfoQPt8QKFwQWj/Ati2sNJ32E=", + "url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git", + "rev": "f4f4387b6bf2387efbcfd1453af4892e8982faf6" + }, + "src/third_party/libvpx/source/libvpx": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-jYy35aQyO+1iNwTT2lzLHwJc7avryC6q2f3uPAEKKVg=", + "url": "https://chromium.googlesource.com/webm/libvpx.git", + "rev": "6da1bd01d64d3d246b633bf25c766dfe751345b7" + }, + "src/third_party/libwebm/source": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-u/5nkJed0DzdhR5OLL2kIhZhOnrbyzL1Kx37vV/jcEo=", + "url": "https://chromium.googlesource.com/webm/libwebm.git", + "rev": "e4fbea0c9751ae8aa86629b197a28d8276a2b0da" + }, + "src/third_party/libwebp/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-79peh0y3eeiW5cVQqVq0mUgDcGZ9BlY+OXkPZylKARY=", + "url": "https://chromium.googlesource.com/webm/libwebp.git", + "rev": "2af26267cdfcb63a88e5c74a85927a12d6ca1d76" + }, + "src/third_party/libyuv": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-jxs9kHI40gRFhm9cU6uS1Rxj+LLUUqT9b3myihxgW7s=", + "url": "https://chromium.googlesource.com/libyuv/libyuv.git", + "rev": "04821d1e7d60845525e8db55c7bcd41ef5be9406" + }, + "src/third_party/lss": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-hE8uZf9Fst66qJkoVYChiB8G41ie+k9M4X0W+5JUSdw=", + "url": "https://chromium.googlesource.com/linux-syscall-support.git", + "rev": "ce877209e11aa69dcfffbd53ef90ea1d07136521" + }, + "src/third_party/material_color_utilities/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-oi28dWuTd6ijn/RKSPukDr5GSzYiCTM2klFb7WSMDHY=", + "url": "https://chromium.googlesource.com/external/github.com/material-foundation/material-color-utilities.git", + "rev": "234a000e507d586c20df6e3bf5b9e035bc5ce7b1" + }, + "src/third_party/minigbm/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-9HwvjTETerbQ7YKXH9kUB2eWa8PxGWMAJfx1jAluhrs=", + "url": "https://chromium.googlesource.com/chromiumos/platform/minigbm.git", + "rev": "3018207f4d89395cc271278fb9a6558b660885f5" + }, + "src/third_party/nasm": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-L+b3X3vsfpY6FSlIK/AHhxhmq2cXd50vND6uT6yn8Qs=", + "url": "https://chromium.googlesource.com/chromium/deps/nasm.git", + "rev": "7fc833e889d1afda72c06220e5bed8fb43b2e5ce" + }, + "src/third_party/neon_2_sse/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-299ZptvdTmCnIuVVBkrpf5ZTxKPwgcGUob81tEI91F0=", + "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git", + "rev": "a15b489e1222b2087007546b4912e21293ea86ff" + }, + "src/third_party/openh264/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-J7Eqe2QevZh1xfap19W8AVCcwfRu7ztknnbKFJUAH1c=", + "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264", + "rev": "09a4f3ec842a8932341b195c5b01e141c8a16eb7" + }, + "src/third_party/openscreen/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-JkOKXDRuzZxc+xhnUNwhz6Y7ElhxrTdCfyEJEtbWjvM=", + "url": "https://chromium.googlesource.com/openscreen", + "rev": "91b081e995ec03894ce54eded84ebd3b45247d13" + }, + "src/third_party/openscreen/src/third_party/tinycbor/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-fMKBFUSKmODQyg4hKIa1hwnEKIV6WBbY1Gb8DOSnaHA=", + "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git", + "rev": "d393c16f3eb30d0c47e6f9d92db62272f0ec4dc7" + }, + "src/third_party/pdfium": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-9qxj8TgFVf64aFTx/DwkUVa41682OSfVnBj9eubMafs=", + "url": "https://pdfium.googlesource.com/pdfium.git", + "rev": "d7470394271b6a6856e28ec905b19a12100f2797" + }, + "src/third_party/perfetto": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-/8WQO0r10Hz3yLNh1MtjE8rGfzbpDkUowA2OPwEuRvA=", + "url": "https://android.googlesource.com/platform/external/perfetto.git", + "rev": "43b72e3ce703b676c9c923b04540472d10790f56" + }, + "src/third_party/pthreadpool/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Pfvievhma1rOpbLdSrIX4KaZyRpdvrnjRzzPYl3fDQo=", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/pthreadpool.git", + "rev": "1787867f6183f056420e532eec640cba25efafea" + }, + "src/third_party/pyelftools": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-I/7p3IEvfP/gkes4kx18PvWwhAKilQKb67GXoW4zFB4=", + "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git", + "rev": "19b3e610c86fcadb837d252c794cb5e8008826ae" + }, + "src/third_party/quic_trace/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Nf9ZDLcE1JunhbpEMHhrY2ROnbgrvVZoRkPwWq1DU0g=", + "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git", + "rev": "caa0a6eaba816ecb737f9a70782b7c80b8ac8dbc" + }, + "src/third_party/pywebsocket3/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-WEqqu2/7fLqcf/2/IcD7/FewRSZ6jTgVlVBvnihthYQ=", + "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git", + "rev": "50602a14f1b6da17e0b619833a13addc6ea78bc2" + }, + "src/third_party/re2/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-9V/Q5o24sL1TJUDNifUqpyrQ2zTSrhU0Bxo9qDwd0+4=", + "url": "https://chromium.googlesource.com/external/github.com/google/re2.git", + "rev": "87d09ef4f0307e53f1d3796843f4b90d41cfccaa" + }, + "src/third_party/ruy/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-hNco0Jol4vQS1bkYiXaoZ1IPHwoRq3DD3iY0TeLygew=", + "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git", + "rev": "c04e5e52ae6b144f74ac032652e3c538bda15c9b" + }, + "src/third_party/skia": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-6JN+orZM77HNPDQ9VlZws1Zq8GuwDI83eXXauKknOTc=", + "url": "https://skia.googlesource.com/skia.git", + "rev": "bd56a010b6941116cd1900276bf5201f9a9c73da" + }, + "src/third_party/smhasher/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-RyC//me08hwGXRrWcK8GZ1uhIkBq4FByA7fHCVDsniw=", + "url": "https://chromium.googlesource.com/external/smhasher.git", + "rev": "e87738e57558e0ec472b2fc3a643b838e5b6e88f" + }, + "src/third_party/snappy/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5fV6NfO8vmqK+iCwpLtE2YjYOzjsshctauyjNIOxrH0=", + "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git", + "rev": "c9f9edf6d75bb065fa47468bf035e051a57bec7c" + }, + "src/third_party/sqlite/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-35rSG+ptFMC62FsprLvAqfXZknKu40Ee6H2qpAcA3wI=", + "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git", + "rev": "b7e480172bb2411f9afedefdcc69a57a12f18b7b" + }, + "src/third_party/swiftshader": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-PCPb5opTATGCCQmw8TGF09TbLL8QES+So+yaL68H//I=", + "url": "https://swiftshader.googlesource.com/SwiftShader.git", + "rev": "32f9332d1d7aacbdba7c1aa5df894bb1890bb2cc" + }, + "src/third_party/text-fragments-polyfill/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-4rW2u1cQAF4iPWHAt1FvVXIpz2pmI901rEPks/w/iFA=", + "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git", + "rev": "c036420683f672d685e27415de0a5f5e85bdc23f" + }, + "src/third_party/tflite/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-3gawK1S5+nr5yOAHgYozLWSoT1TbJmB6Md1fID6du9w=", + "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git", + "rev": "91946956f81a2d9fd12a6d6baba20c997d3f8890" + }, + "src/third_party/vulkan-deps": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-xYX77wsgG+2TzS0AinFJndnID5P3/anY4TPh3cjRaIY=", + "url": "https://chromium.googlesource.com/vulkan-deps", + "rev": "4b7a5f2a3522cbc4e4334cdc64bfaf3f832b89c3" + }, + "src/third_party/vulkan-deps/glslang/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Y9AmEtFPj+sp/a5YnHChqlqgW/1kdaJ1CEbBB5r2cuI=", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang", + "rev": "e3a711b6fc942307be7cb634698015dfd13c37fe" + }, + "src/third_party/vulkan-deps/spirv-cross/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-I8RXVat6//rlpmZuuC99Ar/Rct6MFce4FGKgQA2gBj0=", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross", + "rev": "54997fb4bc3adeb47b9b9f7bb67f1c25eaca2204" + }, + "src/third_party/vulkan-deps/spirv-headers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-OqLxyrTzg1Q2zmQd0YalWtl7vX5lRJFmE2VH7fHC8/8=", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers", + "rev": "d790ced752b5bfc06b6988baadef6eb2d16bdf96" + }, + "src/third_party/vulkan-deps/spirv-tools/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-wFdAzbOQdOqeuVaWl5036qkli1gkSiL5JHH82Z5cFL4=", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools", + "rev": "4c16c35b16bbd462a0e89707ebeecc0bce956b2f" + }, + "src/third_party/vulkan-deps/vulkan-headers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-9+tHkkHsP5ft6+tbofOYV1yBFDpFlJz4Q6YS8c6T5As=", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers", + "rev": "2634c969d7dc0e983f005f7f2e665cce8449efe6" + }, + "src/third_party/vulkan-deps/vulkan-loader/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-q7/dYKQ3O0aSs326YbEeLlS+SciFWugBGm/G+b8RNd0=", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader", + "rev": "d34bfafff23602e857064bea6d99a35eb63f37f2" + }, + "src/third_party/vulkan-deps/vulkan-tools/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-tcaJmosHwTo38keV5qkumkLB1o1qq8v2ZmSsi2zDGoE=", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools", + "rev": "389110e4600669d82bca042859fddf898387c0d2" + }, + "src/third_party/vulkan-deps/vulkan-utility-libraries/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-7M47ZCbNwIppaotMfJTFTRsYNvSZNc0FUufoyXyUu/g=", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries", + "rev": "dd26ae7065a9ed60c8ab517ed79bf7935394aec7" + }, + "src/third_party/vulkan-deps/vulkan-validation-layers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-lj6MIQctcK6gsJlLdLwQ9PHbiAtTbNIPinii8vGZdGk=", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers", + "rev": "b89f48ae89ec064c91e8b77468cebc18c3faa682" + }, + "src/third_party/vulkan_memory_allocator": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-FdRPPdLZHj3RX3YzcmF58JJuIqeWQV3TDiiXPEW2lsc=", + "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git", + "rev": "e87036508bb156f9986ea959323de1869e328f58" + }, + "src/third_party/wayland/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-aVcy7bW1cqEKbowlVgfa9FI8/oG7k5CzPZbRl+cPcX8=", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git", + "rev": "a8c7553ec9af6462474524fd2bb4e9a7dc7217dd" + }, + "src/third_party/wayland-protocols/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-3QK+ZN6IFUFkDxySSoQwP1J3JnTlD7JPaUk6Tr/d/k4=", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git", + "rev": "4624cfaaf563cd7be5e2e2087c8de6d3a48ea867" + }, + "src/third_party/wayland-protocols/kde": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Dmcp/2ms/k7NxPPmPkp0YNfM9z2Es1ZO0uX10bc7N2Y=", + "url": "https://chromium.googlesource.com/external/github.com/KDE/plasma-wayland-protocols.git", + "rev": "0b07950714b3a36c9b9f71fc025fc7783e82926e" + }, + "src/third_party/wayland-protocols/gtk": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-75XNnLkF5Lt1LMRGT+T61k0/mLa3kkynfN+QWvZ0LiQ=", + "url": "https://chromium.googlesource.com/external/github.com/GNOME/gtk.git", + "rev": "40ebed3a03aef096addc0af09fec4ec529d882a0" + }, + "src/third_party/webdriver/pylib": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-WIqWXIKVgElgg8P8laLAlUrgwodGdeVcwohZxnPKedw=", + "url": "https://chromium.googlesource.com/external/github.com/SeleniumHQ/selenium/py.git", + "rev": "fc5e7e70c098bfb189a9a74746809ad3c5c34e04" + }, + "src/third_party/webgl/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-h4by/1pp9oQGetZNnc1Rt5X5izgQf8ZUZDfsxQacqC0=", + "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git", + "rev": "eab0468fc0405b21e59bea30a441d8e38c9db2b7" + }, + "src/third_party/webgpu-cts/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Wch3opAvU/6rJVptOKxOJssev8NhNpbYZddScTlzuMw=", + "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git", + "rev": "4c8d2f67ecd03fbd3cb4c517ef8461427b6d635d" + }, + "src/third_party/webrtc": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-GEv2JBC7GJeNOC3kG/Z3R4dTWOgSkMIt6Eytj8jfRGI=", + "url": "https://webrtc.googlesource.com/src.git", + "rev": "5afcec093c1403fe9e3872706d04671cbc6d2983" + }, + "src/third_party/wuffs/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-HP8Vf1C9DuA9H+busf3lFoF9SsYqviLKv0l73CxmNEI=", + "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git", + "rev": "fe9d08f2b6e80af691bfb1a718e144c49a1b9eba" + }, + "src/third_party/weston/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-sfJm1CBGXX13pFcqeOVPqWlXrUfwjRl+rYf2BoT8Bt8=", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git", + "rev": "775f8a1edf357f59e6b2e284297f396f4fac95a4" + }, + "src/third_party/xdg-utils": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-t3uV9JkkQQIwmezzSoEdTMLSizZdLQB7eLKTRQGH4kQ=", + "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git", + "rev": "d80274d5869b17b8c9067a1022e4416ee7ed5e0d" + }, + "src/third_party/xnnpack/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-vsn3lrog5affus0qxc4TK2Z/tdd/E6hBYeUQRWoDZPQ=", + "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git", + "rev": "b9d4073a6913891ce9cbd8965c8d506075d2a45a" + }, + "src/tools/page_cycler/acid3": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-s/49EaYQRsyxuLejXc1zGDYTD7uO0ddaQIJBP50Bvw0=", + "url": "https://chromium.googlesource.com/chromium/deps/acid3.git", + "rev": "a926d0a32e02c4c03ae95bb798e6c780e0e184ba" + }, + "src/third_party/zstd/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-yzv/R/GnqlXLeAjBEIev+8uM7MC0HeK0MfppnMTJ7Eg=", + "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git", + "rev": "25822342be59d831bad65426ae51f5cc22157b09" + }, + "src/v8": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5lGIgzBWnKwRCKRmLrTTyaSfFgKZsd0f01zxqDvhkzA=", + "url": "https://chromium.googlesource.com/v8/v8.git", + "rev": "748d3360122aeb3bcb450fb4b7c1b18049cab004" + }, + "src/third_party/nan": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-tur5CExvwuSmwqBwH9o8OZWzDuifRybjEb+4/tm6exk=", + "owner": "nodejs", + "repo": "nan", + "rev": "16fa32231e2ccd89d2804b3f765319128b20c4ac" + }, + "src/third_party/electron_node": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-SI4qIix+sXWIS3WJyJoTdPb1cmSIhpLAmfa9iX/5Jlg=", + "owner": "nodejs", + "repo": "node", + "rev": "v18.17.1" + }, + "src/third_party/squirrel.mac": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-4GfKQg0u3c9GI+jl3ixESNqWXQJKRMi+00QT0s2Shqw=", + "owner": "Squirrel", + "repo": "Squirrel.Mac", + "rev": "0e5d146ba13101a1302d59ea6e6e0b3cace4ae38" + }, + "src/third_party/squirrel.mac/vendor/ReactiveObjC": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-/MCqC1oFe3N9TsmfVLgl+deR6qHU6ZFQQjudb9zB5Mo=", + "owner": "ReactiveCocoa", + "repo": "ReactiveObjC", + "rev": "74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76" + }, + "src/third_party/squirrel.mac/vendor/Mantle": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-ogFkMJybf2Ue606ojXJu6Gy5aXSi1bSKm60qcTAIaPk=", + "owner": "Mantle", + "repo": "Mantle", + "rev": "78d3966b3c331292ea29ec38661b25df0a245948" + } + }, + "version": "27.0.0-beta.8", + "modules": "118", + "chrome": "118.0.5993.18", + "node": "18.17.1", + "chromium": { + "version": "118.0.5993.18", + "deps": { + "gn": { + "version": "2023-08-10", + "url": "https://gn.googlesource.com/gn", + "rev": "cc56a0f98bb34accd5323316e0292575ff17a5d4", + "sha256": "1ly7z48v147bfdb1kqkbc98myxpgqq3g6vgr8bjx1ikrk17l82ab" + } + } + }, + "chromium_npm_hash": "sha256-5cjqpYB45nw2gop54VP+tL7/0w63nQGfQ4x6a6KS7XQ=", + "electron_yarn_hash": "039zdwb38982h6qinhipja8abza33ihihb4i5fadpsgh0cl7ldsy" + }, + "26": { + "deps": { + "src/electron": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-i3S0sIbt8wLRXDo4R3M3epsVD7VUsYWqzdNeG/gRzXE=", + "owner": "electron", + "repo": "electron", + "rev": "v26.2.4" + }, + "src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-iIul2qfkAEx0JYYhjxTEIVGxSAlIeNJ3pFGfJqx0jMw=", + "url": "https://chromium.googlesource.com/chromium/src.git", + "rev": "116.0.5845.190", + "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -r $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; " + }, + "src/third_party/clang-format/script": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-IL6ReGM6+urkXfGYe1BBOv+0XgCZv5i3Lib1q9COhig=", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git", + "rev": "f97059df7f8b205064625cdb5f97b56668a125ef" + }, + "src/buildtools/third_party/libc++/trunk": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Sdhhr/tSo7B1tvFY7jFUw82pDrF0n5cEMq567WzD1uE=", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git", + "rev": "055b2e17ae4f0e2c025ad0c7508b01787df17758" + }, + "src/buildtools/third_party/libc++abi/trunk": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-pZy10+P+RWGQavLqCI4M4bGHcxPnKulwC3WSE5lIXfU=", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git", + "rev": "8d21803b9076b16d46c32e2f10da191ee758520c" + }, + "src/buildtools/third_party/libunwind/trunk": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-DVacn5wSGeXLfjEQoCo2qLySgzkA79cdWktDkZ2dLY8=", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git", + "rev": "b5a43ecdac82a248f8a700a68c722b4d98708377" + }, + "src/chrome/test/data/perf/canvas_bench": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-svOuyBGKloBLM11xLlWCDsB4PpRjdKTBdW2UEW4JQjM=", + "url": "https://chromium.googlesource.com/chromium/canvas_bench.git", + "rev": "a7b40ea5ae0239517d78845a5fc9b12976bfc732" + }, + "src/chrome/test/data/perf/frame_rate/content": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-t4kcuvH0rkPBkcdiMsoNQaRwU09eU+oSvyHDiAHrKXo=", + "url": "https://chromium.googlesource.com/chromium/frame_rate/content.git", + "rev": "c10272c88463efeef6bb19c9ec07c42bc8fe22b9" + }, + "src/chrome/test/data/xr/webvr_info": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-BsAPwc4oEWri0TlqhyxqFNqKdfgVSrB0vQyISmYY4eg=", + "url": "https://chromium.googlesource.com/external/github.com/toji/webvr.info.git", + "rev": "c58ae99b9ff9e2aa4c524633519570bf33536248" + }, + "src/docs/website": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-+iC1NPdw6LzzPbtLgO9ipvkeJjDAfBIODOtyIURlUX8=", + "url": "https://chromium.googlesource.com/website.git", + "rev": "715769197cbe967605f24842ffcfb733d31b40fd" + }, + "src/media/cdm/api": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-6J6aSYW0or99VAgMNJJOdJqMJspoG7w1HxDN50MV5bw=", + "url": "https://chromium.googlesource.com/chromium/cdm.git", + "rev": "fef0b5aa1bd31efb88dfab804bdbe614f3d54f28" + }, + "src/net/third_party/quiche/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-GMlLTzjU592zIc8hhFyAupY95+qR49r8x0q2l80XHDI=", + "url": "https://quiche.googlesource.com/quiche.git", + "rev": "037705cdfae29714daa24852021c2e5998a54446" + }, + "src/third_party/angle": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-v4eIJssxzb2hE4NrKZMyhbzxwNc3koqcADVcBrw8iT8=", + "url": "https://chromium.googlesource.com/angle/angle.git", + "rev": "b48983ab8c74d2fcd9ef17c80727affb9e690c53" + }, + "src/third_party/angle/third_party/glmark2/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-L7+zWM0qn8WFhmON7DGvarTsN1YHt1sn5+hazTOZrrk=", + "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2", + "rev": "ca8de51fedb70bace5351c6b002eb952c747e889" + }, + "src/third_party/angle/third_party/rapidjson/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-btUl1a/B0sXwf/+hyvCvVJjWqIkXfVYCpHm3TeBuOxk=", + "url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson", + "rev": "781a4e667d84aeedbeb8184b7b62425ea66ec59f" + }, + "src/third_party/angle/third_party/VK-GL-CTS/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-aiSGPLKRUErLohhLlcY/fWIJuUMzazDPIxiohiuCs6o=", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS", + "rev": "f29bd2feeafff80013d4b52a8abbc960cbbb7dbd" + }, + "src/third_party/anonymous_tokens/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-TcNIocV0p53NJCudvy8wf+fIPIP2tnkoBf1F7mEBFLs=", + "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git", + "rev": "8c8d20953d502db31fec2353b199e6c22ef0236e" + }, + "src/third_party/content_analysis_sdk/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-p4N3zAUoM/ApBlYvLsCcH9QLArz7T4+miDGVuTbrZEc=", + "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git", + "rev": "b8744f00646d175057f0be7443c7c72a311b5381" + }, + "src/third_party/dav1d/libdav1d": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-KSo2s3M3S13gY84NlAdnPsjoKfJZy7ipTlWSvUHD9Ak=", + "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git", + "rev": "f8ae94eca0f53502a2cddd29a263c1edea4822a0" + }, + "src/third_party/dawn": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-rX6wJVOoTnkpniDWjwMoneszAokXXkdcpXNE/JXayEY=", + "url": "https://dawn.googlesource.com/dawn.git", + "rev": "5318d39e47819212769b974ed3a0b42e373df59e" + }, + "src/third_party/dawn/third_party/glfw": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-TwAPRjQxIz3J+zbNxzCp5Tek7MwisxdekMpY5QGsKyg=", + "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw", + "rev": "62e175ef9fae75335575964c845a302447c012c7" + }, + "src/third_party/dawn/third_party/webgpu-cts": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-DoS9lSP9nVxeKpAtvWQbdYRSaiF0m+MXysfRC8bxqrY=", + "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts", + "rev": "b033a4f1ae4a0e19ae4d5563fae023001bbf570f" + }, + "src/third_party/highway/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-kNb9UVcFq2BIf9nftUgN8ciFFCzRCou/sLwVf08jf3E=", + "url": "https://chromium.googlesource.com/external/github.com/google/highway.git", + "rev": "8f20644eca693cfb74aa795b0006b6779c370e7a" + }, + "src/third_party/google_benchmark/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-h2ryAQAuHI54Cni88L85e7Np4KATGVTRdDcmUvCNeWc=", + "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git", + "rev": "b177433f3ee2513b1075140c723d73ab8901790f" + }, + "src/third_party/boringssl/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ZPao/g4Tqc6s/ZLDe3FDuw8rmO0ON07/t7y1c/C2bAs=", + "url": "https://boringssl.googlesource.com/boringssl.git", + "rev": "ae88f198a49d77993e9c44b017d0e69c810dc668" + }, + "src/third_party/breakpad/breakpad": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-8AkC/8oX4OWAcV21laJ0AeMRB9G04rFc6UJFy7Wus4A=", + "url": "https://chromium.googlesource.com/breakpad/breakpad.git", + "rev": "8988364bcddd9b194b0bf931c10bc125987330ed" + }, + "src/third_party/cast_core/public/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-pyjxQQYnsASHV2SxwZeIqkZJSpTrqyGg7Uee/GRp9VU=", + "url": "https://chromium.googlesource.com/cast_core/public", + "rev": "e42ef68aa05ac0c163805f60b9b19284f3c2dee3" + }, + "src/third_party/catapult": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-MkkIztmLGRmxkRAPGZgeb+cc4Dn9Z24p+umwFzAxhpQ=", + "url": "https://chromium.googlesource.com/catapult.git", + "rev": "cef5cf05b2410be6cae210e4ae7de0ab808736c3" + }, + "src/third_party/ced/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ySG74Rj2i2c/PltEgHVEDq+N8yd9gZmxNktc56zIUiY=", + "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git", + "rev": "ba412eaaacd3186085babcd901679a48863c7dd5" + }, + "src/third_party/cld_3/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-C3MOMBUy9jgkT9BAi/Fgm2UH4cxRuwSBEcRl3hzM2Ss=", + "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git", + "rev": "b48dc46512566f5a2d41118c8c1116c4f96dc661" + }, + "src/third_party/colorama/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-6ZTdPYSHdQOLYMSnE+Tp7PgsVTs3U2awGu9Qb4Rg/tk=", + "url": "https://chromium.googlesource.com/external/colorama.git", + "rev": "3de9f013df4b470069d03d250224062e8cf15c49" + }, + "src/third_party/cpu_features/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-E8LoVzhe+TAmARWZTSuINlsVhzpUJMxPPCGe/dHZcyA=", + "url": "https://chromium.googlesource.com/external/github.com/google/cpu_features.git", + "rev": "936b9ab5515dead115606559502e3864958f7f6e" + }, + "src/third_party/cpuinfo/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-1XazrNQwwIFeiUgFxiZq8lU1jdlusdld9ddssVLccEM=", + "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git", + "rev": "f44a9dabb2192ffb203ddd0c71f6373c7d82faed" + }, + "src/third_party/crc32c/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-urg0bmnfMfHagLPELp4WrNCz1gBZ6DFOWpDue1KsMtc=", + "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git", + "rev": "fa5ade41ee480003d9c5af6f43567ba22e4e17e6" + }, + "src/third_party/cros_system_api": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-SlIa4iN8FAGrR5/T2JlPA0RRDkwKmJ+z6FAe83Doo9c=", + "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git", + "rev": "ea8d35b6f6762ff618dabf307be7a03971afa02e" + }, + "src/third_party/crossbench": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-IM81ppJX/ib//P2ESbQXMSL+BiOSVKbdXZdcMsq4xn0=", + "url": "https://chromium.googlesource.com/crossbench.git", + "rev": "cdc33384bfa900dfec28e6cf7b5f22cd7ff2c92f" + }, + "src/third_party/depot_tools": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-UuF8ft26lKDc4tOmYN8yyGQ6J8YFFcK0oJ5aVskooLQ=", + "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git", + "rev": "fc75af35d41df6c7742caef751428aa875199990" + }, + "src/third_party/devtools-frontend/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-xq+qY3WZPRCGSmdk71wVCOAFbK4f4C87IVkSQkA5oeA=", + "url": "https://chromium.googlesource.com/devtools/devtools-frontend", + "rev": "f7c236f0555abbe40cebfdc2d4148ea8dfdf0f10" + }, + "src/third_party/dom_distiller_js/dist": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-yuEBD2XQlV3FGI/i7lTmJbCqzeBiuG1Qow8wvsppGJw=", + "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git", + "rev": "199de96b345ada7c6e7e6ba3d2fa7a6911b8767d" + }, + "src/third_party/eigen3/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ycpxfxQBCMZzPBJNwkJanLUoRenC6Ja4k2KnxPZ73aA=", + "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git", + "rev": "7d7576f3262fa15c34d5575637bd8d7ff4a83f16" + }, + "src/third_party/farmhash/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5n58VEUxa/K//jAfZqG4cXyfxrp50ogWDNYcgiXVHdc=", + "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git", + "rev": "816a4ae622e964763ca0862d9dbd19324a1eaf45" + }, + "src/third_party/ffmpeg": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-dvn/4ufK0lbfB9GKpNKKS/aImSVRBAyEss5cWm8iA84=", + "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git", + "rev": "881c5c3f6412020c37e97e178e0f5da9ddd2ae90" + }, + "src/third_party/flac": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-gvTFPNOlBfozptaH7lTb9iD/09AmpdT3kCl9ClszjEs=", + "url": "https://chromium.googlesource.com/chromium/deps/flac.git", + "rev": "689da3a7ed50af7448c3f1961d1791c7c1d9c85c" + }, + "src/third_party/flatbuffers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-sKBf+en13jDX84/2adz10Z248MifhZg+YaMABIqaduE=", + "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git", + "rev": "13fc75cb6b7b44793f3f5b4ba025ff403d012c9f" + }, + "src/third_party/fontconfig/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-0R+FEhtGXFiQWHEPRrJqaBW1JVfCojYI4NPDvYMBhoU=", + "url": "https://chromium.googlesource.com/external/fontconfig.git", + "rev": "06929a556fdc39c8fe12965b69070c8df520a33e" + }, + "src/third_party/fp16/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-m2d9bqZoGWzuUPGkd29MsrdscnJRtuIkLIMp3fMmtRY=", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git", + "rev": "0a92994d729ff76a58f692d3028ca1b64b145d91" + }, + "src/third_party/gemmlowp/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-O5wD8wxgis0qYMaY+xZ21GBDVQFphMRvInCOswS6inA=", + "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git", + "rev": "13d57703abca3005d97b19df1f2db731607a7dc2" + }, + "src/third_party/grpc/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-64JEVCx/PCM0dvv7kAQvSjLc0QbRAZVBDzwD/FAV6T8=", + "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git", + "rev": "822dab21d9995c5cf942476b35ca12a1aa9d2737" + }, + "src/third_party/freetype/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-JN7Mw+Osobx3LqAf7lR1EK3Tv2M0JCvd/8oNFEENH/k=", + "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git", + "rev": "3829fdaae5f12590f93807e9bcb866be131a201a" + }, + "src/third_party/freetype-testing/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-2aHPchIK5Oce5+XxdXVCC+8EM6i0XT0rFbjSIVa2L1A=", + "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git", + "rev": "7a69b1a2b028476f840ab7d4a2ffdfe4eb2c389f" + }, + "src/third_party/fxdiv/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-LjX5kivfHbqCIA5pF9qUvswG1gjOFo3CMpX0VR+Cn38=", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git", + "rev": "63058eff77e11aa15bf531df5dd34395ec3017c8" + }, + "src/third_party/harfbuzz-ng/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-+fClyD9Rsge9qdGF8WCv8taLTWNL8iManpXZUzDL2LM=", + "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git", + "rev": "db700b5670d9475cc8ed4880cc9447b232c5e432" + }, + "src/third_party/emoji-segmenter/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-oT9mAKoKnrsFsBAeTRfPOXM76HRQQabFAlPpfKUGFhs=", + "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git", + "rev": "9ba6d25d0d9313569665d4a9d2b34f0f39f9a50e" + }, + "src/third_party/ots/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-kiUXrXsaGOzPkKh0dVmU1I13WHt0Stzj7QLMqHN9FbU=", + "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git", + "rev": "46bea9879127d0ff1c6601b078e2ce98e83fcd33" + }, + "src/third_party/libgav1/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-DY2BBK+bH1lGZNEl3rMDsPb7Z52YMIQy/3N0achugE0=", + "url": "https://chromium.googlesource.com/codecs/libgav1.git", + "rev": "cd53f7c0d6a1c005e38874d143c8876d375bae70" + }, + "src/third_party/googletest/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-VYRjcM3dDY2FarviXyFMgSkXCqKfWXwtGAj2Msgm7zg=", + "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git", + "rev": "af29db7ec28d6df1c7f0f745186884091e602e07" + }, + "src/third_party/hunspell_dictionaries": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-67mvpJRFFa9eMfyqFMURlbxOaTJBICnk+gl0b0mEHl8=", + "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git", + "rev": "41cdffd71c9948f63c7ad36e1fb0ff519aa7a37e" + }, + "src/third_party/icu": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-SPWi626Y5WL+cBiedyofb7FRxzM+maQ+1Mp5sx/i1EA=", + "url": "https://chromium.googlesource.com/chromium/deps/icu.git", + "rev": "e8c3bc9ea97d4423ad0515e5f1c064f486dae8b1" + }, + "src/third_party/jsoncpp/source": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-bSLNcoYBz3QCt5VuTR056V9mU2PmBuYBa0W6hFg2m8Q=", + "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git", + "rev": "42e892d96e47b1f6e29844cc705e148ec4856448" + }, + "src/third_party/leveldatabase/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-TTX2FrmcWsgqrh4uzqMyGnnnG51cVC2ILfdLxD65MLY=", + "url": "https://chromium.googlesource.com/external/leveldb.git", + "rev": "068d5ee1a3ac40dabd00d211d5013af44be55bea" + }, + "src/third_party/libFuzzer/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Zp8Ea/7GwmEl964MEIk3UM6IR5+FtUz8InlqZaOniDA=", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git", + "rev": "26cc39e59b2bf5cbc20486296248a842c536878d" + }, + "src/third_party/fuzztest/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-SiZAiHQt37PdWYiVOexqoQnRqk+EbsZk8ELJ9eJ1iSk=", + "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git", + "rev": "0e6385f1b48865f35889749046083586e110e390" + }, + "src/third_party/libaddressinput/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-xvUUQSPrvqUp5DI9AqlRTWurwDW087c6v4RvI+4sfOQ=", + "url": "https://chromium.googlesource.com/external/libaddressinput.git", + "rev": "e8712e415627f22d0b00ebee8db99547077f39bd" + }, + "src/third_party/libaom/source/libaom": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-pghv17RmD8w7eWiSB2pdR3ZWSFyhFEky0p7jfGKIu34=", + "url": "https://aomedia.googlesource.com/aom.git", + "rev": "414a2fcbb1bb0f4ac471613e12004651f4d67c25" + }, + "src/third_party/libavif/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-roT/0RLGNKlz8gx209UtyM3YpM29y27P4zjZJMqnUPY=", + "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git", + "rev": "781d6a6467d82d8ba36256f31b6593a33c03345d" + }, + "src/third_party/libavifinfo/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-9HrWIuA3nuvqT6Hy8DHoBRCEKEG/p9UHY5gPYd/5oaI=", + "url": "https://aomedia.googlesource.com/libavifinfo.git", + "rev": "8ed46385f4b6fb0b4680d791002cbd674b2b9cb6" + }, + "src/third_party/nearby/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-WLmEKIxTm7Aae/riw2HLcNmITvBHG4Z6fDA1Ue9J0tM=", + "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git", + "rev": "44fb9b4fa24e1140202c53a7c56bea90a0426adb" + }, + "src/third_party/beto-core/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-qlExr/AFxJL7JLDz7bDCCk9Ios++5/n/iT9Mv8YnYxY=", + "url": "https://beto-core.googlesource.com/beto-core.git", + "rev": "45756ea770c41085d5c71156b2c46da0b10117d6" + }, + "src/third_party/securemessage/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-GS4ccnuiqxMs/LVYAtvSlVAYFp4a5GoZsxcriTX3k78=", + "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git", + "rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84" + }, + "src/third_party/ukey2/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-aaLs6ZS+CdBlCJ6ZhsmdAPFxiBIij6oufsDcNeRSV1E=", + "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git", + "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47" + }, + "src/third_party/cros-components/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-a58NnOGa2bcQ2WNULnFyjyYnw3QXUAWjsB7UAxuRakg=", + "url": "https://chromium.googlesource.com/external/google3/cros_components.git", + "rev": "81d1ad8e0ba89d207657f124de3d0829829484d7" + }, + "src/third_party/libdrm/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-NUxS2rBJ0nFblvHRQUfKT933+DAws5RUTDb+RLxRF4M=", + "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git", + "rev": "98e1db501173303e58ef6a1def94ab7a2d84afc1" + }, + "src/third_party/expat/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-FXTDGAK03jc2wvazhRKqtsFRKZUYS/9HLpZNp4JfZJI=", + "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git", + "rev": "441f98d02deafd9b090aea568282b28f66a50e36" + }, + "src/third_party/libipp/libipp": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-gxU92lHLd6uxO8T3QWhZIK0hGy97cki705DV0VimCPY=", + "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git", + "rev": "2209bb84a8e122dab7c02fe66cc61a7b42873d7f" + }, + "src/third_party/libjpeg_turbo": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-QnXMR9qqRiYfV1sUJvKVvLQ9A022lYKbsrI9HOU9LCs=", + "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git", + "rev": "aa4075f116e4312537d0d3e9dbd5e31096539f94" + }, + "src/third_party/liblouis/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY=", + "url": "https://chromium.googlesource.com/external/liblouis-github.git", + "rev": "9700847afb92cb35969bdfcbbfbbb74b9c7b3376" + }, + "src/third_party/libphonenumber/dist": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-3hSnTFTD3KAdbyxfKg12qbIYTmw6YlTCH64gMP/HUJo=", + "url": "https://chromium.googlesource.com/external/libphonenumber.git", + "rev": "140dfeb81b753388e8a672900fb7a971e9a0d362" + }, + "src/third_party/libprotobuf-mutator/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ZyPweW+V5foxFQwjjMLkaRUo+FNV+kEDGIH/4oRV614=", + "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git", + "rev": "a304ec48dcf15d942607032151f7e9ee504b5dcf" + }, + "src/third_party/libsrtp": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-pfLFh2JGk/g0ZZxBKTaYW9/PBpkCm0rtJeyNePUMTTc=", + "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git", + "rev": "5b7c744eb8310250ccc534f3f86a2015b3887a0a" + }, + "src/third_party/libsync/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Mkl6C1LxF3RYLwYbxiSfoQPt8QKFwQWj/Ati2sNJ32E=", + "url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git", + "rev": "f4f4387b6bf2387efbcfd1453af4892e8982faf6" + }, + "src/third_party/libvpx/source/libvpx": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-nBNbZSpuoOTNgddVhw9twbxtLTgjDypY5AtxQlzf1HE=", + "url": "https://chromium.googlesource.com/webm/libvpx.git", + "rev": "2245df50a6d360d33fccd51479c48f2210ed607a" + }, + "src/third_party/libwebm/source": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-u/5nkJed0DzdhR5OLL2kIhZhOnrbyzL1Kx37vV/jcEo=", + "url": "https://chromium.googlesource.com/webm/libwebm.git", + "rev": "e4fbea0c9751ae8aa86629b197a28d8276a2b0da" + }, + "src/third_party/libwebp/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-isuuqzfc7cBxVEFrpHQP79B3s/5Jwu3qC4x3VPw7MuE=", + "url": "https://chromium.googlesource.com/webm/libwebp.git", + "rev": "4619a48fc3292743d7ce9658bee4245406734109" + }, + "src/third_party/libyuv": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-jxs9kHI40gRFhm9cU6uS1Rxj+LLUUqT9b3myihxgW7s=", + "url": "https://chromium.googlesource.com/libyuv/libyuv.git", + "rev": "04821d1e7d60845525e8db55c7bcd41ef5be9406" + }, + "src/third_party/lss": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-hE8uZf9Fst66qJkoVYChiB8G41ie+k9M4X0W+5JUSdw=", + "url": "https://chromium.googlesource.com/linux-syscall-support.git", + "rev": "ce877209e11aa69dcfffbd53ef90ea1d07136521" + }, + "src/third_party/material_color_utilities/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Cv1TjvOcswhp60LXblrLwY5jrudqKuDUqs1c//x49YE=", + "url": "https://chromium.googlesource.com/external/github.com/material-foundation/material-color-utilities.git", + "rev": "bd6537fb1c4aa2164d97f96e78a9c826e360a0ed" + }, + "src/third_party/minigbm/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-9HwvjTETerbQ7YKXH9kUB2eWa8PxGWMAJfx1jAluhrs=", + "url": "https://chromium.googlesource.com/chromiumos/platform/minigbm.git", + "rev": "3018207f4d89395cc271278fb9a6558b660885f5" + }, + "src/third_party/nasm": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-L+b3X3vsfpY6FSlIK/AHhxhmq2cXd50vND6uT6yn8Qs=", + "url": "https://chromium.googlesource.com/chromium/deps/nasm.git", + "rev": "7fc833e889d1afda72c06220e5bed8fb43b2e5ce" + }, + "src/third_party/neon_2_sse/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-299ZptvdTmCnIuVVBkrpf5ZTxKPwgcGUob81tEI91F0=", + "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git", + "rev": "a15b489e1222b2087007546b4912e21293ea86ff" + }, + "src/third_party/openh264/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-J7Eqe2QevZh1xfap19W8AVCcwfRu7ztknnbKFJUAH1c=", + "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264", + "rev": "09a4f3ec842a8932341b195c5b01e141c8a16eb7" + }, + "src/third_party/openscreen/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-+Ea+CVr59WUyVk7sLdelPPwt/n5CLBNnAOW6XD7k/qM=", + "url": "https://chromium.googlesource.com/openscreen", + "rev": "2a4dbe656f38bf7617df013b54c683e461ed064d" + }, + "src/third_party/openscreen/src/third_party/tinycbor/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-fMKBFUSKmODQyg4hKIa1hwnEKIV6WBbY1Gb8DOSnaHA=", + "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git", + "rev": "d393c16f3eb30d0c47e6f9d92db62272f0ec4dc7" + }, + "src/third_party/pdfium": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-xYvjBv4gkVhpx8a4C1kmp6/Ngd0w9BFKizsTFR0weHM=", + "url": "https://pdfium.googlesource.com/pdfium.git", + "rev": "6c2c8ce87dfbf69b533e97f78807dff28c95f014" + }, + "src/third_party/perfetto": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-mkfzktiI1aEOcBF8S1LPH9lEXaWFURV/q9RrcXrP4Yk=", + "url": "https://android.googlesource.com/platform/external/perfetto.git", + "rev": "271c226bfba2965bb5c72fd6964f016ed1f85c05" + }, + "src/third_party/pthreadpool/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Pfvievhma1rOpbLdSrIX4KaZyRpdvrnjRzzPYl3fDQo=", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/pthreadpool.git", + "rev": "1787867f6183f056420e532eec640cba25efafea" + }, + "src/third_party/pyelftools": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-I/7p3IEvfP/gkes4kx18PvWwhAKilQKb67GXoW4zFB4=", + "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git", + "rev": "19b3e610c86fcadb837d252c794cb5e8008826ae" + }, + "src/third_party/quic_trace/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Nf9ZDLcE1JunhbpEMHhrY2ROnbgrvVZoRkPwWq1DU0g=", + "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git", + "rev": "caa0a6eaba816ecb737f9a70782b7c80b8ac8dbc" + }, + "src/third_party/pywebsocket3/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-WEqqu2/7fLqcf/2/IcD7/FewRSZ6jTgVlVBvnihthYQ=", + "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git", + "rev": "50602a14f1b6da17e0b619833a13addc6ea78bc2" + }, + "src/third_party/re2/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-j2v1NVMGqMieHdj/5/mgC+flpWCzxoCwLLmtZa3N5+0=", + "url": "https://chromium.googlesource.com/external/github.com/google/re2.git", + "rev": "7c5e396af825562ec8321fdbf2f1cf276b26e3ae" + }, + "src/third_party/ruy/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-voWwpijTX+AZJPGH5Rgy4ISKpFV3i86/KJBU9S1IT0g=", + "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git", + "rev": "caa244343de289f913c505100e6a463d46c174de" + }, + "src/third_party/skia": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-y0v/eFfrFlEcVGT1W173bgqlFfWzz32TACAdV68uqrY=", + "url": "https://skia.googlesource.com/skia.git", + "rev": "bb40886d43b5fcbcdfb5587a2d20db418622990a" + }, + "src/third_party/smhasher/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-RyC//me08hwGXRrWcK8GZ1uhIkBq4FByA7fHCVDsniw=", + "url": "https://chromium.googlesource.com/external/smhasher.git", + "rev": "e87738e57558e0ec472b2fc3a643b838e5b6e88f" + }, + "src/third_party/snappy/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5fV6NfO8vmqK+iCwpLtE2YjYOzjsshctauyjNIOxrH0=", + "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git", + "rev": "c9f9edf6d75bb065fa47468bf035e051a57bec7c" + }, + "src/third_party/sqlite/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-35rSG+ptFMC62FsprLvAqfXZknKu40Ee6H2qpAcA3wI=", + "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git", + "rev": "b7e480172bb2411f9afedefdcc69a57a12f18b7b" + }, + "src/third_party/swiftshader": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-KDBfCZeWZWdx+nkMQO4UxjYl96eLo2qksqC9mL+U+ls=", + "url": "https://swiftshader.googlesource.com/SwiftShader.git", + "rev": "b8f1a3ad5f9e077cd4c67e2f612e42bc8ef2fd30" + }, + "src/third_party/text-fragments-polyfill/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-4rW2u1cQAF4iPWHAt1FvVXIpz2pmI901rEPks/w/iFA=", + "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git", + "rev": "c036420683f672d685e27415de0a5f5e85bdc23f" + }, + "src/third_party/tflite/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-roL+P9fJskz+9h2vK0eYud7J+IFPD1+ByHIL95JPahs=", + "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git", + "rev": "f3e12f6b28647da499edb69794745f14869f0df9" + }, + "src/third_party/vulkan-deps": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-disqOHrly1sqqBrDdRbpPlRE9EHSSdMxJXr+Kn7sia0=", + "url": "https://chromium.googlesource.com/vulkan-deps", + "rev": "73a4816c4b451e0e47b35478ba204acb7848b6b9" + }, + "src/third_party/vulkan-deps/glslang/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-EKV4kjmLfChKmx3ozAVNx8CJii6hQGAUTTPQmLevkX0=", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang", + "rev": "6a7ec4be7b8a22ab16cea0f294b5973dbcdd637a" + }, + "src/third_party/vulkan-deps/spirv-cross/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-8Xw0pKn6puTpALAkKMHQKbzBLENm37Iep8JnslooJI8=", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross", + "rev": "2d3a152081ca6e6bea7093940d0f81088fe4d01c" + }, + "src/third_party/vulkan-deps/spirv-headers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-JwgV3kDFvljDoWagDRjTIRRZRX5f6r9UUUxnCj1GEyc=", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers", + "rev": "6e09e44cd88a5297433411b2ee52f4cf9f50fa90" + }, + "src/third_party/vulkan-deps/spirv-tools/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-/JyTxpmh57gr1OrzCvLvbPL/iqQeplA5mKpvY6+x1Ag=", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools", + "rev": "a63ac9f73d29cd27cdb6e3388d98d1d934e512bb" + }, + "src/third_party/vulkan-deps/vulkan-headers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-4erHZKx4jksAtyG8ZHtlVoEY3EqE4p2pEtcGHqv7G7A=", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers", + "rev": "c1a8560c5cf5e7bd6dbc71fe69b1a317411c36b8" + }, + "src/third_party/vulkan-deps/vulkan-loader/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-PfVpvtBc80ZdL1SUJuoo8BGk90XSXX3l4mRVv3jdARA=", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader", + "rev": "db51885950c860961279168997b5cde12a77abf9" + }, + "src/third_party/vulkan-deps/vulkan-tools/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-L+WNkMyIJNKjCRuhgoU6OvjcfQpwAtPtquIngYYrf1M=", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools", + "rev": "0cab6e8055fb0f3a54d8314552fd523a3da57c2c" + }, + "src/third_party/vulkan-deps/vulkan-validation-layers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Ycvj5oOTE1fKHWk5Ubzr4lrzHQUjQXjguR2onXv3T5g=", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers", + "rev": "e2be2287f4820ed578d1adeca981736146a74d9a" + }, + "src/third_party/vulkan_memory_allocator": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-rARuPHa/gEAOTM8/Fnob0bU0Jv+UKLiwe3o0UGWYlME=", + "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git", + "rev": "ebe84bec02c041d28f902da0214bf442743fc907" + }, + "src/third_party/wayland/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-aVcy7bW1cqEKbowlVgfa9FI8/oG7k5CzPZbRl+cPcX8=", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git", + "rev": "a8c7553ec9af6462474524fd2bb4e9a7dc7217dd" + }, + "src/third_party/wayland-protocols/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-3QK+ZN6IFUFkDxySSoQwP1J3JnTlD7JPaUk6Tr/d/k4=", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git", + "rev": "4624cfaaf563cd7be5e2e2087c8de6d3a48ea867" + }, + "src/third_party/wayland-protocols/kde": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Dmcp/2ms/k7NxPPmPkp0YNfM9z2Es1ZO0uX10bc7N2Y=", + "url": "https://chromium.googlesource.com/external/github.com/KDE/plasma-wayland-protocols.git", + "rev": "0b07950714b3a36c9b9f71fc025fc7783e82926e" + }, + "src/third_party/wayland-protocols/gtk": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-75XNnLkF5Lt1LMRGT+T61k0/mLa3kkynfN+QWvZ0LiQ=", + "url": "https://chromium.googlesource.com/external/github.com/GNOME/gtk.git", + "rev": "40ebed3a03aef096addc0af09fec4ec529d882a0" + }, + "src/third_party/webdriver/pylib": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-WIqWXIKVgElgg8P8laLAlUrgwodGdeVcwohZxnPKedw=", + "url": "https://chromium.googlesource.com/external/github.com/SeleniumHQ/selenium/py.git", + "rev": "fc5e7e70c098bfb189a9a74746809ad3c5c34e04" + }, + "src/third_party/webgl/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-jn0HFVHFGjbScUchFBynMekZIktPp25k8O/HfjvJHRU=", + "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git", + "rev": "b934957d2423492a9a8682f48517f07607503f3f" + }, + "src/third_party/webgpu-cts/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-AW0VnZF9W1otb9+UGLGwrjXI6yqz7X0lqAMYtHVX6L8=", + "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git", + "rev": "82ed433cbcb632d6700551067a6d3acc6c2ab46e" + }, + "src/third_party/webrtc": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-1A5kogfs9QnEtfTbLuhDJZ30UyspHAZ4a5ULDIf021U=", + "url": "https://webrtc.googlesource.com/src.git", + "rev": "44bc8e96ed88005fec89a1cc479e291fea30d1b3" + }, + "src/third_party/wuffs/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-HP8Vf1C9DuA9H+busf3lFoF9SsYqviLKv0l73CxmNEI=", + "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git", + "rev": "fe9d08f2b6e80af691bfb1a718e144c49a1b9eba" + }, + "src/third_party/weston/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-EKl6oIM8Vml9wtSIb9ExFIuuJohbU/rsG3JVS5thaUU=", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git", + "rev": "420cfd00f2de91de74bd9d4d8348e43c582d29f0" + }, + "src/third_party/xdg-utils": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-t3uV9JkkQQIwmezzSoEdTMLSizZdLQB7eLKTRQGH4kQ=", + "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git", + "rev": "d80274d5869b17b8c9067a1022e4416ee7ed5e0d" + }, + "src/third_party/xnnpack/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-vsn3lrog5affus0qxc4TK2Z/tdd/E6hBYeUQRWoDZPQ=", + "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git", + "rev": "b9d4073a6913891ce9cbd8965c8d506075d2a45a" + }, + "src/tools/page_cycler/acid3": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-+7Ynz7k/dWdd4Wo7Rjzvc8GY9gTsjzjG3GdNsuDKszY=", + "url": "https://chromium.googlesource.com/chromium/deps/acid3.git", + "rev": "6be0a66a1ebd7ebc5abc1b2f405a945f6d871521" + }, + "src/v8": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ZiUQKEuFP8RUJS/gIMiOsJOf+/mKvHbpdDe1l2NWCxM=", + "url": "https://chromium.googlesource.com/v8/v8.git", + "rev": "65d8fbecd82df64fe857a112d75ee7628a3d559c" + }, + "src/third_party/nan": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-tur5CExvwuSmwqBwH9o8OZWzDuifRybjEb+4/tm6exk=", + "owner": "nodejs", + "repo": "nan", + "rev": "16fa32231e2ccd89d2804b3f765319128b20c4ac" + }, + "src/third_party/electron_node": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-VwG8Q+PZudblqG+m4uuWEowNWlq/MUuyEpFs8k8NbHE=", + "owner": "nodejs", + "repo": "node", + "rev": "v18.16.1" + }, + "src/third_party/squirrel.mac": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-4GfKQg0u3c9GI+jl3ixESNqWXQJKRMi+00QT0s2Shqw=", + "owner": "Squirrel", + "repo": "Squirrel.Mac", + "rev": "0e5d146ba13101a1302d59ea6e6e0b3cace4ae38" + }, + "src/third_party/squirrel.mac/vendor/ReactiveObjC": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-/MCqC1oFe3N9TsmfVLgl+deR6qHU6ZFQQjudb9zB5Mo=", + "owner": "ReactiveCocoa", + "repo": "ReactiveObjC", + "rev": "74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76" + }, + "src/third_party/squirrel.mac/vendor/Mantle": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-ogFkMJybf2Ue606ojXJu6Gy5aXSi1bSKm60qcTAIaPk=", + "owner": "Mantle", + "repo": "Mantle", + "rev": "78d3966b3c331292ea29ec38661b25df0a245948" + } + }, + "version": "26.2.4", + "modules": "116", + "chrome": "116.0.5845.190", + "node": "18.16.1", + "chromium": { + "version": "116.0.5845.190", + "deps": { + "gn": { + "version": "2023-06-09", + "url": "https://gn.googlesource.com/gn", + "rev": "4bd1a77e67958fb7f6739bd4542641646f264e5d", + "sha256": "14h9jqspb86sl5lhh6q0kk2rwa9zcak63f8drp7kb3r4dx08vzsw" + } + } + }, + "electron_yarn_hash": "05wkb1m0yjbai4153y49kwr1v2lj14fg75aqlvmmrhf3bxp9lg5g", + "chromium_npm_hash": "sha256-5cjqpYB45nw2gop54VP+tL7/0w63nQGfQ4x6a6KS7XQ=" + }, + "25": { + "deps": { + "src/electron": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-EILoAkFGLQVEbjO+pumbdI5wLkL5jdKdBS24MGwDV78=", + "owner": "electron", + "repo": "electron", + "rev": "v25.8.4" + }, + "src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-nh8LrBKsfW6K/scG1GPUyp/tYiXOxZkmjtuTyAXC4zI=", + "url": "https://chromium.googlesource.com/chromium/src.git", + "rev": "114.0.5735.289", + "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -r $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; " + }, + "src/buildtools/clang_format/script": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-IL6ReGM6+urkXfGYe1BBOv+0XgCZv5i3Lib1q9COhig=", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git", + "rev": "f97059df7f8b205064625cdb5f97b56668a125ef" + }, + "src/buildtools/third_party/libc++/trunk": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-i/FGU9F7HlGJJuwoFMV4V05pf4pvsqNxrPBN223YjZQ=", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git", + "rev": "bff81b702ff4b7f74b1c0ed02a4bcf6c2744a90b" + }, + "src/buildtools/third_party/libc++abi/trunk": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Zka8AHFtHA4AC/Pbzc3pVqz/k2GYZYc8CeP1IXxGBUM=", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git", + "rev": "307bd163607c315d46103ebe1d68aab44bf93986" + }, + "src/buildtools/third_party/libunwind/trunk": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-u6FMD83JBBusQuWU7Hx5HREvLIFWUA4iN4If8poaHbE=", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git", + "rev": "2795322d57001de8125cfdf18cef804acff69e35" + }, + "src/chrome/test/data/perf/canvas_bench": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-svOuyBGKloBLM11xLlWCDsB4PpRjdKTBdW2UEW4JQjM=", + "url": "https://chromium.googlesource.com/chromium/canvas_bench.git", + "rev": "a7b40ea5ae0239517d78845a5fc9b12976bfc732" + }, + "src/chrome/test/data/perf/frame_rate/content": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-t4kcuvH0rkPBkcdiMsoNQaRwU09eU+oSvyHDiAHrKXo=", + "url": "https://chromium.googlesource.com/chromium/frame_rate/content.git", + "rev": "c10272c88463efeef6bb19c9ec07c42bc8fe22b9" + }, + "src/chrome/test/data/xr/webvr_info": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-BsAPwc4oEWri0TlqhyxqFNqKdfgVSrB0vQyISmYY4eg=", + "url": "https://chromium.googlesource.com/external/github.com/toji/webvr.info.git", + "rev": "c58ae99b9ff9e2aa4c524633519570bf33536248" + }, + "src/docs/website": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-0rI5HUWxfNU0mrWJ4ndzL1gnn4E67UVPFpqkEpQjgW0=", + "url": "https://chromium.googlesource.com/website.git", + "rev": "40cfbbdee67c7010ae103011fe5797858e692a79" + }, + "src/media/cdm/api": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-6J6aSYW0or99VAgMNJJOdJqMJspoG7w1HxDN50MV5bw=", + "url": "https://chromium.googlesource.com/chromium/cdm.git", + "rev": "fef0b5aa1bd31efb88dfab804bdbe614f3d54f28" + }, + "src/net/third_party/quiche/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-dUSUlZR7svBw35TX/ywZaa1Ko/yTeV/gE+GudhX981E=", + "url": "https://quiche.googlesource.com/quiche.git", + "rev": "02c69dd28eef7ef2618782e8d54d53c14ae64382" + }, + "src/third_party/angle": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-EpR25A5wDGnhK9EI2eSx8OsLtA4YvtDREi6x8ZfIVsM=", + "url": "https://chromium.googlesource.com/angle/angle.git", + "rev": "ce590bee825a18785f86d096f2c7be06428ccf88" + }, + "src/third_party/angle/third_party/glmark2/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-L7+zWM0qn8WFhmON7DGvarTsN1YHt1sn5+hazTOZrrk=", + "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2", + "rev": "ca8de51fedb70bace5351c6b002eb952c747e889" + }, + "src/third_party/angle/third_party/rapidjson/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-btUl1a/B0sXwf/+hyvCvVJjWqIkXfVYCpHm3TeBuOxk=", + "url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson", + "rev": "781a4e667d84aeedbeb8184b7b62425ea66ec59f" + }, + "src/third_party/angle/third_party/VK-GL-CTS/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-XcaAnz36QOg+A5XcyGg0Z9dLFjsDSUa0GzZpEuQYMTg=", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS", + "rev": "e3b9db9ad121f46b7943d0152a25d5ee9afaa13c" + }, + "src/third_party/content_analysis_sdk/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-p4N3zAUoM/ApBlYvLsCcH9QLArz7T4+miDGVuTbrZEc=", + "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git", + "rev": "b8744f00646d175057f0be7443c7c72a311b5381" + }, + "src/third_party/dav1d/libdav1d": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-FivzwqCvlY89q2znGvfNks+hje/iUFHcKPb19FyAZhM=", + "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git", + "rev": "d426d1c91075b9c552b12dd052af1cd0368f05a2" + }, + "src/third_party/dawn": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-HoLI1IlG+ThNERz6xr1doIzNhPWNcZabiyPEn15kvoM=", + "url": "https://dawn.googlesource.com/dawn.git", + "rev": "bf86a1c8d463d7b9a556b10a80d17990d413831c" + }, + "src/third_party/dawn/third_party/glfw": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-TwAPRjQxIz3J+zbNxzCp5Tek7MwisxdekMpY5QGsKyg=", + "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw", + "rev": "62e175ef9fae75335575964c845a302447c012c7" + }, + "src/third_party/dawn/third_party/webgpu-cts": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-+FRGgJSs7sVEZ6B6PZPxmXvmsKtt/sC/ZAjw+NdOwPQ=", + "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts", + "rev": "c7d833badcd37dc46a999ebeebbbde1368ff15b5" + }, + "src/third_party/highway/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-kNb9UVcFq2BIf9nftUgN8ciFFCzRCou/sLwVf08jf3E=", + "url": "https://chromium.googlesource.com/external/github.com/google/highway.git", + "rev": "8f20644eca693cfb74aa795b0006b6779c370e7a" + }, + "src/third_party/google_benchmark/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-h2ryAQAuHI54Cni88L85e7Np4KATGVTRdDcmUvCNeWc=", + "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git", + "rev": "b177433f3ee2513b1075140c723d73ab8901790f" + }, + "src/third_party/boringssl/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-oeV7oMNpPbQyi5RiRJm/KAVmO7JZ1QRdYoNgFXh7Snc=", + "url": "https://boringssl.googlesource.com/boringssl.git", + "rev": "4b6d950d8921d6dd5365de0797fcc97302b9561b" + }, + "src/third_party/breakpad/breakpad": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-+3Y4jCpcZ/++1Etpu/ZNuJvtTEX/Xn4HNfmx4nzcTtA=", + "url": "https://chromium.googlesource.com/breakpad/breakpad.git", + "rev": "bfde407de559c10d6cef861b3873ff287c24e761" + }, + "src/third_party/cast_core/public/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-pyjxQQYnsASHV2SxwZeIqkZJSpTrqyGg7Uee/GRp9VU=", + "url": "https://chromium.googlesource.com/cast_core/public", + "rev": "e42ef68aa05ac0c163805f60b9b19284f3c2dee3" + }, + "src/third_party/catapult": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-vK7rlGshfzPzaEdAxlP5vQ4USR/fC3BzPCh/rn0aAf4=", + "url": "https://chromium.googlesource.com/catapult.git", + "rev": "cae7ec667dee9f5c012b54ee9ffee94eb7beda14" + }, + "src/third_party/ced/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ySG74Rj2i2c/PltEgHVEDq+N8yd9gZmxNktc56zIUiY=", + "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git", + "rev": "ba412eaaacd3186085babcd901679a48863c7dd5" + }, + "src/third_party/cld_3/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-C3MOMBUy9jgkT9BAi/Fgm2UH4cxRuwSBEcRl3hzM2Ss=", + "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git", + "rev": "b48dc46512566f5a2d41118c8c1116c4f96dc661" + }, + "src/third_party/colorama/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-6ZTdPYSHdQOLYMSnE+Tp7PgsVTs3U2awGu9Qb4Rg/tk=", + "url": "https://chromium.googlesource.com/external/colorama.git", + "rev": "3de9f013df4b470069d03d250224062e8cf15c49" + }, + "src/third_party/cpuinfo/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ZXsJVhqyeH/9dN0/1Cq0TCjmzwmsePX9YyuuaI9+puI=", + "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git", + "rev": "beb46ca0319882f262e682dd596880c92830687f" + }, + "src/third_party/crc32c/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-urg0bmnfMfHagLPELp4WrNCz1gBZ6DFOWpDue1KsMtc=", + "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git", + "rev": "fa5ade41ee480003d9c5af6f43567ba22e4e17e6" + }, + "src/third_party/cros_system_api": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-0tnidX0O+jn1xbJMuSPsGPqwZBCKmfjWZY3aQdjM1gE=", + "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git", + "rev": "73d6b816cacd86b886b4cc1e60f12ac1960f1d90" + }, + "src/third_party/crossbench": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-IM81ppJX/ib//P2ESbQXMSL+BiOSVKbdXZdcMsq4xn0=", + "url": "https://chromium.googlesource.com/crossbench.git", + "rev": "cdc33384bfa900dfec28e6cf7b5f22cd7ff2c92f" + }, + "src/third_party/depot_tools": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-7jPow77ejToE55KvQ7/eO0alMdMHcypfSyPceFAbZkw=", + "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git", + "rev": "6e714e6dfe62110c95fafed4bdeb365a69c6a77e" + }, + "src/third_party/devtools-frontend/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-jDE3eGkpcJYE5lt/dpIpKa6me3ZZnfY/9boL/YBnHoc=", + "url": "https://chromium.googlesource.com/devtools/devtools-frontend", + "rev": "3f60fe50e4790d1154659b9628e811bbcdf1aa4f" + }, + "src/third_party/dom_distiller_js/dist": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-yuEBD2XQlV3FGI/i7lTmJbCqzeBiuG1Qow8wvsppGJw=", + "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git", + "rev": "199de96b345ada7c6e7e6ba3d2fa7a6911b8767d" + }, + "src/third_party/eigen3/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Jf8sFjSMuXeiXm53srR2HahbBXszLOawdYk5H1UrK4c=", + "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git", + "rev": "554fe02ae3f3fbc2fd320c26a522f1e59b2d6342" + }, + "src/third_party/farmhash/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5n58VEUxa/K//jAfZqG4cXyfxrp50ogWDNYcgiXVHdc=", + "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git", + "rev": "816a4ae622e964763ca0862d9dbd19324a1eaf45" + }, + "src/third_party/ffmpeg": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-UjrZJBtOQiiqxtLb8x24axord3OFvyCcRcgDwiYE/jw=", + "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git", + "rev": "8d21d41d8bec5c0b266ee305d1a708dc5c23b594" + }, + "src/third_party/flac": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-gvTFPNOlBfozptaH7lTb9iD/09AmpdT3kCl9ClszjEs=", + "url": "https://chromium.googlesource.com/chromium/deps/flac.git", + "rev": "689da3a7ed50af7448c3f1961d1791c7c1d9c85c" + }, + "src/third_party/flatbuffers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-OQ8E+i30WRz/lPJmVDiF7+TPo4gZVu2Of9loxz3tswI=", + "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git", + "rev": "a56f9ec50e908362e20254fcef28e62a2f148d91" + }, + "src/third_party/fontconfig/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-0R+FEhtGXFiQWHEPRrJqaBW1JVfCojYI4NPDvYMBhoU=", + "url": "https://chromium.googlesource.com/external/fontconfig.git", + "rev": "06929a556fdc39c8fe12965b69070c8df520a33e" + }, + "src/third_party/fp16/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-m2d9bqZoGWzuUPGkd29MsrdscnJRtuIkLIMp3fMmtRY=", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git", + "rev": "0a92994d729ff76a58f692d3028ca1b64b145d91" + }, + "src/third_party/gemmlowp/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-O5wD8wxgis0qYMaY+xZ21GBDVQFphMRvInCOswS6inA=", + "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git", + "rev": "13d57703abca3005d97b19df1f2db731607a7dc2" + }, + "src/third_party/grpc/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-64JEVCx/PCM0dvv7kAQvSjLc0QbRAZVBDzwD/FAV6T8=", + "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git", + "rev": "822dab21d9995c5cf942476b35ca12a1aa9d2737" + }, + "src/third_party/freetype/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-qJBw5ocv4+2Xx8bU47QK8sw9Sl636iI+16cbaSNatHU=", + "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git", + "rev": "0a3836c97d5e84d6721ac0fd2839e8ae1b7be8d9" + }, + "src/third_party/freetype-testing/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-2aHPchIK5Oce5+XxdXVCC+8EM6i0XT0rFbjSIVa2L1A=", + "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git", + "rev": "7a69b1a2b028476f840ab7d4a2ffdfe4eb2c389f" + }, + "src/third_party/fxdiv/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-LjX5kivfHbqCIA5pF9qUvswG1gjOFo3CMpX0VR+Cn38=", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git", + "rev": "63058eff77e11aa15bf531df5dd34395ec3017c8" + }, + "src/third_party/harfbuzz-ng/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-WaR7U7PeHIffa+ZG85QG7pii/dLOI4+23xK0/hUf1ok=", + "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git", + "rev": "2175f5d050743317c563ec9414e0f83a47f7fbc4" + }, + "src/third_party/emoji-segmenter/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-oT9mAKoKnrsFsBAeTRfPOXM76HRQQabFAlPpfKUGFhs=", + "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git", + "rev": "9ba6d25d0d9313569665d4a9d2b34f0f39f9a50e" + }, + "src/third_party/ots/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-kiUXrXsaGOzPkKh0dVmU1I13WHt0Stzj7QLMqHN9FbU=", + "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git", + "rev": "46bea9879127d0ff1c6601b078e2ce98e83fcd33" + }, + "src/third_party/libgav1/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-DY2BBK+bH1lGZNEl3rMDsPb7Z52YMIQy/3N0achugE0=", + "url": "https://chromium.googlesource.com/codecs/libgav1.git", + "rev": "cd53f7c0d6a1c005e38874d143c8876d375bae70" + }, + "src/third_party/googletest/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-VYRjcM3dDY2FarviXyFMgSkXCqKfWXwtGAj2Msgm7zg=", + "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git", + "rev": "af29db7ec28d6df1c7f0f745186884091e602e07" + }, + "src/third_party/hunspell_dictionaries": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-67mvpJRFFa9eMfyqFMURlbxOaTJBICnk+gl0b0mEHl8=", + "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git", + "rev": "41cdffd71c9948f63c7ad36e1fb0ff519aa7a37e" + }, + "src/third_party/icu": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-47Xxb5IFbRmdO3oADjn13fm7aIYFXh2R4YVZIJAy22U=", + "url": "https://chromium.googlesource.com/chromium/deps/icu.git", + "rev": "d8daa943f64cd5dd2a55e9baf2e655ab4bfa5ae9" + }, + "src/third_party/jsoncpp/source": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-bSLNcoYBz3QCt5VuTR056V9mU2PmBuYBa0W6hFg2m8Q=", + "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git", + "rev": "42e892d96e47b1f6e29844cc705e148ec4856448" + }, + "src/third_party/leveldatabase/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-TTX2FrmcWsgqrh4uzqMyGnnnG51cVC2ILfdLxD65MLY=", + "url": "https://chromium.googlesource.com/external/leveldb.git", + "rev": "068d5ee1a3ac40dabd00d211d5013af44be55bea" + }, + "src/third_party/libFuzzer/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-HG3KHhKQnr4hdnUK/2QhcxRdNxh38fhU54JKKzqZaio=", + "url": "https://chromium.googlesource.com/chromium/llvm-project/compiler-rt/lib/fuzzer.git", + "rev": "debe7d2d1982e540fbd6bd78604bf001753f9e74" + }, + "src/third_party/centipede/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-yFZOn/Ga+D/b/1TwuOZdO/H4/GuX/HRB18rgYg7+rmE=", + "url": "https://chromium.googlesource.com/external/github.com/google/centipede.git", + "rev": "a5a9071410e6e8134855b88461d0eb2c77d48cdd" + }, + "src/third_party/libaddressinput/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-xvUUQSPrvqUp5DI9AqlRTWurwDW087c6v4RvI+4sfOQ=", + "url": "https://chromium.googlesource.com/external/libaddressinput.git", + "rev": "e8712e415627f22d0b00ebee8db99547077f39bd" + }, + "src/third_party/libaom/source/libaom": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-j8b0xM7hHNqYIeUQjf+c7LyzcfZVJx64Xqo9gIRtsYU=", + "url": "https://aomedia.googlesource.com/aom.git", + "rev": "5a0903824082f41123e8365b5b99ddb6ced8971c" + }, + "src/third_party/libavif/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-3Oe8ouucu2eHpXov3WchwKQIqjhzuSFfNZ7ChEkQiTE=", + "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git", + "rev": "1af8cea3d1b3a05ecbcb0e39d99a7f0183e6ce13" + }, + "src/third_party/nearby/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-GfxGDSh2qkjIGgXgwH0xWAnjswOmGEVaXlci+tZS53g=", + "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git", + "rev": "37000006c224476104276bf74038d60967593814" + }, + "src/third_party/securemessage/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-GS4ccnuiqxMs/LVYAtvSlVAYFp4a5GoZsxcriTX3k78=", + "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git", + "rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84" + }, + "src/third_party/ukey2/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-aaLs6ZS+CdBlCJ6ZhsmdAPFxiBIij6oufsDcNeRSV1E=", + "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git", + "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47" + }, + "src/third_party/cros-components/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-HgBDDfYvxYtHPfWlAs4aFCzDyhdcWnSP9nvCl8/UDfU=", + "url": "https://chromium.googlesource.com/external/google3/cros_components.git", + "rev": "0971e0c09f748dd476089b0e5136fe0b84e0bb4c" + }, + "src/third_party/libdrm/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ML89TBKDPHOd0YOVBmvLac+tyqgA5khDFK5vq4CCru8=", + "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git", + "rev": "b9ca37b3134861048986b75896c0915cbf2e97f9" + }, + "src/third_party/expat/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-FXTDGAK03jc2wvazhRKqtsFRKZUYS/9HLpZNp4JfZJI=", + "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git", + "rev": "441f98d02deafd9b090aea568282b28f66a50e36" + }, + "src/third_party/libipp/libipp": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-gxU92lHLd6uxO8T3QWhZIK0hGy97cki705DV0VimCPY=", + "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git", + "rev": "2209bb84a8e122dab7c02fe66cc61a7b42873d7f" + }, + "src/third_party/libjpeg_turbo": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-QnXMR9qqRiYfV1sUJvKVvLQ9A022lYKbsrI9HOU9LCs=", + "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git", + "rev": "aa4075f116e4312537d0d3e9dbd5e31096539f94" + }, + "src/third_party/liblouis/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY=", + "url": "https://chromium.googlesource.com/external/liblouis-github.git", + "rev": "9700847afb92cb35969bdfcbbfbbb74b9c7b3376" + }, + "src/third_party/libphonenumber/dist": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-3hSnTFTD3KAdbyxfKg12qbIYTmw6YlTCH64gMP/HUJo=", + "url": "https://chromium.googlesource.com/external/libphonenumber.git", + "rev": "140dfeb81b753388e8a672900fb7a971e9a0d362" + }, + "src/third_party/libprotobuf-mutator/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ZyPweW+V5foxFQwjjMLkaRUo+FNV+kEDGIH/4oRV614=", + "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git", + "rev": "a304ec48dcf15d942607032151f7e9ee504b5dcf" + }, + "src/third_party/libsrtp": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-pfLFh2JGk/g0ZZxBKTaYW9/PBpkCm0rtJeyNePUMTTc=", + "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git", + "rev": "5b7c744eb8310250ccc534f3f86a2015b3887a0a" + }, + "src/third_party/libsync/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Mkl6C1LxF3RYLwYbxiSfoQPt8QKFwQWj/Ati2sNJ32E=", + "url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git", + "rev": "f4f4387b6bf2387efbcfd1453af4892e8982faf6" + }, + "src/third_party/libvpx/source/libvpx": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-hIXEvCqbeMShGL1hCpJAMPbpuVfFM6Z4z5DPR3kfwb4=", + "url": "https://chromium.googlesource.com/webm/libvpx.git", + "rev": "27171320f5e36f7b18071bfa1d9616863ca1b4e8" + }, + "src/third_party/libwebm/source": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-u/5nkJed0DzdhR5OLL2kIhZhOnrbyzL1Kx37vV/jcEo=", + "url": "https://chromium.googlesource.com/webm/libwebm.git", + "rev": "e4fbea0c9751ae8aa86629b197a28d8276a2b0da" + }, + "src/third_party/libwebp/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-zBMivj2tF5AWC+E/rHHEtxBel0i1YwGGBus+4h3PCYY=", + "url": "https://chromium.googlesource.com/webm/libwebp.git", + "rev": "fd7b5d48464475408d32d2611bdb6947d4246b97" + }, + "src/third_party/libyuv": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-LLmTW05GxoXgNkLRHp3e6gb7glMgJo1moc6lPLVHk6w=", + "url": "https://chromium.googlesource.com/libyuv/libyuv.git", + "rev": "77c2121f7e6b8e694d6e908bbbe9be24214097da" + }, + "src/third_party/lss": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-hE8uZf9Fst66qJkoVYChiB8G41ie+k9M4X0W+5JUSdw=", + "url": "https://chromium.googlesource.com/linux-syscall-support.git", + "rev": "ce877209e11aa69dcfffbd53ef90ea1d07136521" + }, + "src/third_party/material_color_utilities/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Cv1TjvOcswhp60LXblrLwY5jrudqKuDUqs1c//x49YE=", + "url": "https://chromium.googlesource.com/external/github.com/material-foundation/material-color-utilities.git", + "rev": "bd6537fb1c4aa2164d97f96e78a9c826e360a0ed" + }, + "src/third_party/minigbm/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-9HwvjTETerbQ7YKXH9kUB2eWa8PxGWMAJfx1jAluhrs=", + "url": "https://chromium.googlesource.com/chromiumos/platform/minigbm.git", + "rev": "3018207f4d89395cc271278fb9a6558b660885f5" + }, + "src/third_party/nasm": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-L+b3X3vsfpY6FSlIK/AHhxhmq2cXd50vND6uT6yn8Qs=", + "url": "https://chromium.googlesource.com/chromium/deps/nasm.git", + "rev": "7fc833e889d1afda72c06220e5bed8fb43b2e5ce" + }, + "src/third_party/neon_2_sse/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-299ZptvdTmCnIuVVBkrpf5ZTxKPwgcGUob81tEI91F0=", + "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git", + "rev": "a15b489e1222b2087007546b4912e21293ea86ff" + }, + "src/third_party/openh264/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-J7Eqe2QevZh1xfap19W8AVCcwfRu7ztknnbKFJUAH1c=", + "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264", + "rev": "09a4f3ec842a8932341b195c5b01e141c8a16eb7" + }, + "src/third_party/openscreen/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-MSJbCxYEJmhUrBUobKBgUhPV5yMhxxtKgU4NE2h9mFs=", + "url": "https://chromium.googlesource.com/openscreen", + "rev": "0964c1e903264ae2c388fc0eda3309c22b46e1a2" + }, + "src/third_party/openscreen/src/third_party/tinycbor/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-fMKBFUSKmODQyg4hKIa1hwnEKIV6WBbY1Gb8DOSnaHA=", + "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git", + "rev": "d393c16f3eb30d0c47e6f9d92db62272f0ec4dc7" + }, + "src/third_party/pdfium": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-3FXPYcZZtfwzlkkakKczjoYbDURBA/QDCVdOn+98864=", + "url": "https://pdfium.googlesource.com/pdfium.git", + "rev": "9505810f66cc3dde86c30d072de53ca6fc8a45de" + }, + "src/third_party/perfetto": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-AJWzQUYiml374LUZyku0ZTEM+lXAKsjc1YbsLfCfMGo=", + "url": "https://android.googlesource.com/platform/external/perfetto.git", + "rev": "f2da6df2f144e41e1c1428f11e8b388eaf8a2209" + }, + "src/third_party/pthreadpool/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Pfvievhma1rOpbLdSrIX4KaZyRpdvrnjRzzPYl3fDQo=", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/pthreadpool.git", + "rev": "1787867f6183f056420e532eec640cba25efafea" + }, + "src/third_party/pyelftools": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-I/7p3IEvfP/gkes4kx18PvWwhAKilQKb67GXoW4zFB4=", + "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git", + "rev": "19b3e610c86fcadb837d252c794cb5e8008826ae" + }, + "src/third_party/quic_trace/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Nf9ZDLcE1JunhbpEMHhrY2ROnbgrvVZoRkPwWq1DU0g=", + "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git", + "rev": "caa0a6eaba816ecb737f9a70782b7c80b8ac8dbc" + }, + "src/third_party/pywebsocket3/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-WEqqu2/7fLqcf/2/IcD7/FewRSZ6jTgVlVBvnihthYQ=", + "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git", + "rev": "50602a14f1b6da17e0b619833a13addc6ea78bc2" + }, + "src/third_party/re2/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-9dMTr5VuQfteKK/xIqZUqLnGu26ZYlFUfZTZNgzKUN4=", + "url": "https://chromium.googlesource.com/external/github.com/google/re2.git", + "rev": "11073deb73b3d01018308863c0bcdfd0d51d3e70" + }, + "src/third_party/ruy/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Sv2rfq3ghddpcJHn7Z2FTXpwKdzgJOiSGu6HhV6nXIQ=", + "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git", + "rev": "363f252289fb7a1fba1703d99196524698cb884d" + }, + "src/third_party/skia": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-7kD6XLaeriWGXM69rCcqPoAkX0NAFOFhFX/SBm710cA=", + "url": "https://skia.googlesource.com/skia.git", + "rev": "ea1a1635fcf5b1f68b59cd3f8649a0abfab65cfd" + }, + "src/third_party/smhasher/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-RyC//me08hwGXRrWcK8GZ1uhIkBq4FByA7fHCVDsniw=", + "url": "https://chromium.googlesource.com/external/smhasher.git", + "rev": "e87738e57558e0ec472b2fc3a643b838e5b6e88f" + }, + "src/third_party/snappy/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5fV6NfO8vmqK+iCwpLtE2YjYOzjsshctauyjNIOxrH0=", + "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git", + "rev": "c9f9edf6d75bb065fa47468bf035e051a57bec7c" + }, + "src/third_party/sqlite/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-MO4fd5ROy8vtUeGYeWaMT6uO/zYUruPCPjHnZT9elcI=", + "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git", + "rev": "f6752b7ed1fe3cc1491c0c47ec5804ee2bd0e59b" + }, + "src/third_party/swiftshader": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-H2A42dNT1DgRknyL3lzHlWbxURskjTqzvqd097w4Tho=", + "url": "https://swiftshader.googlesource.com/SwiftShader.git", + "rev": "23e97b79fb9193bf88e79c16c6a577c680edb2d6" + }, + "src/third_party/text-fragments-polyfill/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-4rW2u1cQAF4iPWHAt1FvVXIpz2pmI901rEPks/w/iFA=", + "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git", + "rev": "c036420683f672d685e27415de0a5f5e85bdc23f" + }, + "src/third_party/tflite/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-TdBBSPfUCIst1G6BixqcOx9dQiN6f1wmSRS9Gjh4K1U=", + "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git", + "rev": "ab14323eaf8522fa608fe047d99249bc844c47cd" + }, + "src/third_party/vulkan-deps": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-4Mwtu/Qmz0wAm8YCWYq9ogzKLg7nEwgka3+OFI/s+fs=", + "url": "https://chromium.googlesource.com/vulkan-deps", + "rev": "a52479099cf2862650df9dbc12e2e202e345901e" + }, + "src/third_party/vulkan-deps/glslang/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-UOJ4O1zRbW0qxj2oxSKSdvOwZOD907Q0flXxQjYavuQ=", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang", + "rev": "9c7fd1a33e5cecbe465e1cd70170167d5e40d398" + }, + "src/third_party/vulkan-deps/spirv-cross/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-UmzXWpjwGgLijP+BumSK1OW+8OrtWjBXgIt4vzI8ZvQ=", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross", + "rev": "fc9bee27f445644635e83ef111ef54944bb6e3af" + }, + "src/third_party/vulkan-deps/spirv-headers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-a7OjEH3WczZa8VFvPGGh/J+8nmtYDf0eSUuxU20XSJI=", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers", + "rev": "cfbe4feef20c3c0628712c2792624f0221e378ac" + }, + "src/third_party/vulkan-deps/spirv-tools/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-UfcBkLIDSEgKyEz11Tsf3FIM+R6ZboWmDVKR1xu6q6o=", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools", + "rev": "25ad5e19f193429b737433d5f6151062ddbc1680" + }, + "src/third_party/vulkan-deps/vulkan-headers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-bilEf59jBDgl5WUgOZpRSMkp33C/rssj37rdvHaxRGU=", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers", + "rev": "8a397558c4d2a4bf9e64e900c45a7e65664c32b2" + }, + "src/third_party/vulkan-deps/vulkan-loader/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-gLNrvpBDnKOr03e5TKxMUVCQ70fI27x3MSLVjMkw2d8=", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader", + "rev": "f035e57c171ce9009f2c47b5488a66c653843501" + }, + "src/third_party/vulkan-deps/vulkan-tools/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-VEBPgOGdrzQoIYU7BTioa6m/OH1TUGXGaF7FH5B/h2M=", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools", + "rev": "df10a2759b4b60d59b735882217a749d8e5be660" + }, + "src/third_party/vulkan-deps/vulkan-validation-layers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-JqLhqdqKX2n0ifLfS7ymOL2kcelUjdmsLKqmkqPwTQU=", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers", + "rev": "3d530f6921f7a9defa297eec25fcef77c9b96282" + }, + "src/third_party/vulkan_memory_allocator": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-rARuPHa/gEAOTM8/Fnob0bU0Jv+UKLiwe3o0UGWYlME=", + "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git", + "rev": "ebe84bec02c041d28f902da0214bf442743fc907" + }, + "src/third_party/wayland/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-fcZtJP/8Ck+9WyPvt3AhogwPae5+gAxdIaEMp7eSr44=", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git", + "rev": "c7473676b8abc682e820546287044cee3bca9147" + }, + "src/third_party/wayland-protocols/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-3QK+ZN6IFUFkDxySSoQwP1J3JnTlD7JPaUk6Tr/d/k4=", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git", + "rev": "4624cfaaf563cd7be5e2e2087c8de6d3a48ea867" + }, + "src/third_party/wayland-protocols/kde": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Dmcp/2ms/k7NxPPmPkp0YNfM9z2Es1ZO0uX10bc7N2Y=", + "url": "https://chromium.googlesource.com/external/github.com/KDE/plasma-wayland-protocols.git", + "rev": "0b07950714b3a36c9b9f71fc025fc7783e82926e" + }, + "src/third_party/wayland-protocols/gtk": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-75XNnLkF5Lt1LMRGT+T61k0/mLa3kkynfN+QWvZ0LiQ=", + "url": "https://chromium.googlesource.com/external/github.com/GNOME/gtk.git", + "rev": "40ebed3a03aef096addc0af09fec4ec529d882a0" + }, + "src/third_party/webdriver/pylib": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-WIqWXIKVgElgg8P8laLAlUrgwodGdeVcwohZxnPKedw=", + "url": "https://chromium.googlesource.com/external/github.com/SeleniumHQ/selenium/py.git", + "rev": "fc5e7e70c098bfb189a9a74746809ad3c5c34e04" + }, + "src/third_party/webgl/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-BRF0/WxbwxTby1o+zFHU42s7xYJUmcsgfu4DFX97jRU=", + "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git", + "rev": "d1b65aa5a88f6efd900604dfcda840154e9f16e2" + }, + "src/third_party/webgpu-cts/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-pSwkkIcfrWP6NKNFtHlyq2Z7zYqbKU6V/GXMqH6rYBs=", + "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git", + "rev": "7d2d22292ce5af280c8c5849ed7f0679d7ab70e9" + }, + "src/third_party/webrtc": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-J/XEHY4y9j4bg0+ORkDydVOvtncPLMN/9cy073lpMOM=", + "url": "https://webrtc.googlesource.com/src.git", + "rev": "151be743d4c83671565f9c1eada3f4a0b2e44dea" + }, + "src/third_party/wuffs/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-HP8Vf1C9DuA9H+busf3lFoF9SsYqviLKv0l73CxmNEI=", + "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git", + "rev": "fe9d08f2b6e80af691bfb1a718e144c49a1b9eba" + }, + "src/third_party/weston/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-EKl6oIM8Vml9wtSIb9ExFIuuJohbU/rsG3JVS5thaUU=", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git", + "rev": "420cfd00f2de91de74bd9d4d8348e43c582d29f0" + }, + "src/third_party/xdg-utils": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-t3uV9JkkQQIwmezzSoEdTMLSizZdLQB7eLKTRQGH4kQ=", + "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git", + "rev": "d80274d5869b17b8c9067a1022e4416ee7ed5e0d" + }, + "src/third_party/xnnpack/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-vsn3lrog5affus0qxc4TK2Z/tdd/E6hBYeUQRWoDZPQ=", + "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git", + "rev": "b9d4073a6913891ce9cbd8965c8d506075d2a45a" + }, + "src/tools/page_cycler/acid3": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-+7Ynz7k/dWdd4Wo7Rjzvc8GY9gTsjzjG3GdNsuDKszY=", + "url": "https://chromium.googlesource.com/chromium/deps/acid3.git", + "rev": "6be0a66a1ebd7ebc5abc1b2f405a945f6d871521" + }, + "src/v8": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-pmam8TVqtxmfc0V1gy2R1jhW+dF2ybzeKbGZKAbJveY=", + "url": "https://chromium.googlesource.com/v8/v8.git", + "rev": "978934af4a291282d994fc184d5dc03a82deb5df" + }, + "src/third_party/nan": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-tur5CExvwuSmwqBwH9o8OZWzDuifRybjEb+4/tm6exk=", + "owner": "nodejs", + "repo": "nan", + "rev": "16fa32231e2ccd89d2804b3f765319128b20c4ac" + }, + "src/third_party/electron_node": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-XBm+WYXQ8DM1HU6NFciGSfkbHDXPbTyg0gScQCbbpQU=", + "owner": "nodejs", + "repo": "node", + "rev": "v18.15.0" + }, + "src/third_party/squirrel.mac": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-4GfKQg0u3c9GI+jl3ixESNqWXQJKRMi+00QT0s2Shqw=", + "owner": "Squirrel", + "repo": "Squirrel.Mac", + "rev": "0e5d146ba13101a1302d59ea6e6e0b3cace4ae38" + }, + "src/third_party/squirrel.mac/vendor/ReactiveObjC": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-/MCqC1oFe3N9TsmfVLgl+deR6qHU6ZFQQjudb9zB5Mo=", + "owner": "ReactiveCocoa", + "repo": "ReactiveObjC", + "rev": "74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76" + }, + "src/third_party/squirrel.mac/vendor/Mantle": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-ogFkMJybf2Ue606ojXJu6Gy5aXSi1bSKm60qcTAIaPk=", + "owner": "Mantle", + "repo": "Mantle", + "rev": "78d3966b3c331292ea29ec38661b25df0a245948" + } + }, + "version": "25.8.4", + "modules": "116", + "chrome": "114.0.5735.289", + "node": "18.15.0", + "chromium": { + "version": "114.0.5735.289", + "deps": { + "gn": { + "version": "2023-04-19", + "url": "https://gn.googlesource.com/gn", + "rev": "5a004f9427a050c6c393c07ddb85cba8ff3849fa", + "sha256": "01xrh9m9m6x8lz0vxwdw2mrhrvnw93zpg09hwdhqakj06agf4jjk" + } + } + }, + "electron_yarn_hash": "0fq44b91ha1lbgakwfz16z0g10y66c7m8gvlkg1ci81rzjrj0qpz", + "chromium_npm_hash": "sha256-WFkyT1V4jNkWUyyHF68yEe50GhdlNZJBXuQvVVGPk6A=" + } +} diff --git a/pkgs/development/tools/electron/update.py b/pkgs/development/tools/electron/update.py new file mode 100755 index 0000000000000..60b5a43d66746 --- /dev/null +++ b/pkgs/development/tools/electron/update.py @@ -0,0 +1,279 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i python -p python3.pkgs.joblib python3.pkgs.click python3.pkgs.click-log nix nix-prefetch-git nix-universal-prefetch prefetch-yarn-deps prefetch-npm-deps + +import logging +import click_log +import click +import random +import traceback +import csv +import base64 +import os +import re +import tempfile +import subprocess +import json +import sys +from joblib import Parallel, delayed, Memory +from codecs import iterdecode +from datetime import datetime +from urllib.request import urlopen + +os.chdir(os.path.dirname(__file__)) + +depot_tools_checkout = tempfile.TemporaryDirectory() +subprocess.check_call([ + "nix-prefetch-git", + "--builder", "--quiet", + "--url", "https://chromium.googlesource.com/chromium/tools/depot_tools", + "--out", depot_tools_checkout.name, + "--rev", "7a69b031d58081d51c9e8e89557b343bba8518b1"]) +sys.path.append(depot_tools_checkout.name) + +import gclient_eval +import gclient_utils + +memory = Memory("cache", verbose=0) + +@memory.cache +def get_repo_hash(fetcher, args): + cmd = ['nix-universal-prefetch', fetcher] + for arg_name, arg in args.items(): + cmd.append(f'--{arg_name}') + cmd.append(arg) + + print(" ".join(cmd), file=sys.stderr) + out = subprocess.check_output(cmd) + return out.decode('utf-8').strip() + +@memory.cache +def _get_yarn_hash(file): + print(f'prefetch-yarn-deps', file=sys.stderr) + with tempfile.TemporaryDirectory() as tmp_dir: + with open(tmp_dir + '/yarn.lock', 'w') as f: + f.write(file) + return subprocess.check_output(['prefetch-yarn-deps', tmp_dir + '/yarn.lock']).decode('utf-8').strip() +def get_yarn_hash(repo, yarn_lock_path = 'yarn.lock'): + return _get_yarn_hash(repo.get_file(yarn_lock_path)) + +@memory.cache +def _get_npm_hash(file): + print(f'prefetch-npm-deps', file=sys.stderr) + with tempfile.TemporaryDirectory() as tmp_dir: + with open(tmp_dir + '/package-lock.json', 'w') as f: + f.write(file) + return subprocess.check_output(['prefetch-npm-deps', tmp_dir + '/package-lock.json']).decode('utf-8').strip() +def get_npm_hash(repo, package_lock_path = 'package-lock.json'): + return _get_npm_hash(repo.get_file(package_lock_path)) + +class Repo: + def __init__(self): + self.deps = {} + self.hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" + + def get_deps(self, repo_vars, path): + print("evaluating " + json.dumps(self, default = vars), file=sys.stderr) + + deps_file = self.get_file("DEPS") + evaluated = gclient_eval.Parse(deps_file, filename='DEPS') + + repo_vars = dict(evaluated["vars"]) | repo_vars + + prefix = f"{path}/" if evaluated.get("use_relative_paths", False) else "" + + self.deps = { + prefix + dep_name: repo_from_dep(dep) + for dep_name, dep in evaluated["deps"].items() + if (gclient_eval.EvaluateCondition(dep["condition"], repo_vars) if "condition" in dep else True) and repo_from_dep(dep) != None + } + + for key in evaluated.get("recursedeps", []): + dep_path = prefix + key + if dep_path in self.deps and dep_path != "src/third_party/squirrel.mac": + self.deps[dep_path].get_deps(repo_vars, dep_path) + + def prefetch(self): + self.hash = get_repo_hash(self.fetcher, self.args) + + def prefetch_all(self): + return sum([dep.prefetch_all() for [_, dep] in self.deps.items()], [delayed(self.prefetch)()]) + + def flatten_repr(self): + return { + "fetcher": self.fetcher, + "hash": self.hash, + **self.args + } + + def flatten(self, path): + out = { + path: self.flatten_repr() + } + for dep_path, dep in self.deps.items(): + out |= dep.flatten(dep_path) + return out + +class GitRepo(Repo): + def __init__(self, url, rev): + super().__init__() + self.fetcher = 'fetchgit' + self.args = { + "url": url, + "rev": rev, + } + +class GitHubRepo(Repo): + def __init__(self, owner, repo, rev): + super().__init__() + self.fetcher = 'fetchFromGitHub' + self.args = { + "owner": owner, + "repo": repo, + "rev": rev, + } + + def get_file(self, filepath): + return urlopen(f"https://raw.githubusercontent.com/{self.args['owner']}/{self.args['repo']}/{self.args['rev']}/{filepath}").read().decode('utf-8') + +class GitilesRepo(Repo): + def __init__(self, url, rev): + super().__init__() + self.fetcher = 'fetchFromGitiles' + #self.fetcher = 'fetchgit' + self.args = { + "url": url, + "rev": rev, + #"fetchSubmodules": "false", + } + + if url == "https://chromium.googlesource.com/chromium/src.git": + self.args['postFetch'] = "rm -r $out/third_party/blink/web_tests; " + self.args['postFetch'] += "rm -r $out/third_party/hunspell/tests; " + self.args['postFetch'] += "rm -r $out/content/test/data; " + self.args['postFetch'] += "rm -r $out/courgette/testdata; " + self.args['postFetch'] += "rm -r $out/extensions/test/data; " + self.args['postFetch'] += "rm -r $out/media/test/data; " + + def get_file(self, filepath): + return base64.b64decode(urlopen(f"{self.args['url']}/+/{self.args['rev']}/{filepath}?format=TEXT").read()).decode('utf-8') + +def repo_from_dep(dep): + if "url" in dep: + url, rev = gclient_utils.SplitUrlRevision(dep["url"]) + + search_object = re.search(r'https://github.com/(.+)/(.+?)(\.git)?$', url) + if search_object: + return GitHubRepo(search_object.group(1), search_object.group(2), rev) + + if re.match(r'https://.+.googlesource.com', url): + return GitilesRepo(url, rev) + + return GitRepo(url, rev) + else: + # Not a git dependency; skip + return None + +def get_gn_source(repo): + gn_pattern = r"'gn_version': 'git_revision:([0-9a-f]{40})'" + gn_commit = re.search(gn_pattern, repo.get_file("DEPS")).group(1) + gn = subprocess.check_output([ + "nix-prefetch-git", + "--quiet", + "https://gn.googlesource.com/gn", + "--rev", gn_commit + ]) + gn = json.loads(gn) + return { + "gn": { + "version": datetime.fromisoformat(gn["date"]).date().isoformat(), + "url": gn["url"], + "rev": gn["rev"], + "sha256": gn["sha256"] + } + } + +def get_electron_info(major_version): + electron_releases = json.loads(urlopen("https://releases.electronjs.org/releases.json").read()) + major_version_releases = filter(lambda item: item["version"].startswith(f"{major_version}."), electron_releases) + m = max(major_version_releases, key=lambda item: item["date"]) + + rev=f"v{m['version']}" + + electron_repo = GitHubRepo("electron", "electron", rev) + electron_repo.recurse = True + + electron_repo.get_deps({ + f"checkout_{platform}": platform == "linux" + for platform in ["ios", "chromeos", "android", "mac", "win", "linux"] + }, "src/electron") + + return (major_version, m, electron_repo) + +logger = logging.getLogger(__name__) +click_log.basic_config(logger) + +@click.group() +def cli(): + pass + +@cli.command("eval") +@click.option("--version", help="The major version, e.g. '23'") +def eval(version): + (_, _, repo) = electron_repo = get_electron_info(version) + tree = electron_repo.flatten("src/electron") + print(json.dumps(tree, indent=4, default = vars)) + +def get_update(repo): + (major_version, m, electron_repo) = repo + + tasks = electron_repo.prefetch_all() + a = lambda: ( + ("electron_yarn_hash", get_yarn_hash(electron_repo)) + ) + tasks.append(delayed(a)()) + a = lambda: ( + ("chromium_npm_hash", get_npm_hash(electron_repo.deps["src"], "third_party/node/package-lock.json")) + ) + tasks.append(delayed(a)()) + random.shuffle(tasks) + + task_results = {n[0]: n[1] for n in Parallel(n_jobs=3, require='sharedmem', return_as="generator")(tasks) if n != None} + + tree = electron_repo.flatten("src/electron") + + return (f"{major_version}", { + "deps": tree, + **{key: m[key] for key in ["version", "modules", "chrome", "node"]}, + "chromium": { + "version": m['chrome'], + "deps": get_gn_source(electron_repo.deps["src"]) + }, + **task_results + }) + +@cli.command("update") +@click.option("--version", help="The major version, e.g. '23'") +def update(version): + try: + with open('info.json', 'r') as f: + old_info = json.loads(f.read()) + except: + old_info = {} + repo = get_electron_info(version) + update = get_update(repo) + out = old_info | { update[0]: update[1] } + with open('info.json', 'w') as f: + f.write(json.dumps(out, indent=4, default = vars)) + f.write('\n') + +@cli.command("update-all") +def update_all(): + repos = Parallel(n_jobs=2, require='sharedmem')(delayed(get_electron_info)(major_version) for major_version in range(27, 24, -1)) + out = {n[0]: n[1] for n in Parallel(n_jobs=2, require='sharedmem')(delayed(get_update)(repo) for repo in repos)} + + with open('info.json', 'w') as f: + f.write(json.dumps(out, indent=4, default = vars)) + f.write('\n') + +if __name__ == "__main__": + cli() diff --git a/pkgs/development/tools/electron/version-old.patch b/pkgs/development/tools/electron/version-old.patch new file mode 100644 index 0000000000000..00562225d7677 --- /dev/null +++ b/pkgs/development/tools/electron/version-old.patch @@ -0,0 +1,42 @@ +diff --git a/electron/BUILD.gn b/electron/BUILD.gn +index c905891eb8..f2cf11fe88 100644 +--- a/electron/BUILD.gn ++++ b/electron/BUILD.gn +@@ -111,8 +111,6 @@ electron_version = exec_script("script/print-version.py", + [], + "trim string", + [ +- ".git/packed-refs", +- ".git/HEAD", + "script/lib/get-version.js", + ]) + +diff --git a/electron/script/lib/get-version.js b/electron/script/lib/get-version.js +index 45a120482b..ddaf8ab60e 100644 +--- a/electron/script/lib/get-version.js ++++ b/electron/script/lib/get-version.js +@@ -1,22 +1 @@ +-const { spawnSync } = require('child_process'); +-const path = require('path'); +- +-module.exports.getElectronVersion = () => { +- // Find the nearest tag to the current HEAD +- // This is equivilant to our old logic of "use a value in package.json" for the following reasons +- // +- // 1. Whenever we updated the package.json we ALSO pushed a tag with the same version +- // 2. Whenever we _reverted_ a bump all we actually did was push a commit that deleted the tag and changed the version number back +- // +- // The only difference in the "git describe" technique is that technically a commit can "change" it's version +- // number if a tag is created / removed retroactively. i.e. the first time a commit is pushed it will be 1.2.3 +- // and after the tag is made rebuilding the same commit will result in it being 1.2.4 +- const output = spawnSync('git', ['describe', '--tags', '--abbrev=0'], { +- cwd: path.resolve(__dirname, '..', '..') +- }); +- if (output.status !== 0) { +- console.error(output.stderr); +- throw new Error('Failed to get current electron version'); +- } +- return output.stdout.toString().trim().replace(/^v/g, ''); +-}; ++module.exports.getElectronVersion = () => "@version@"; + diff --git a/pkgs/development/tools/electron/version.patch b/pkgs/development/tools/electron/version.patch new file mode 100644 index 0000000000000..6edb64a23eaf0 --- /dev/null +++ b/pkgs/development/tools/electron/version.patch @@ -0,0 +1,42 @@ +diff --git a/electron/BUILD.gn b/electron/BUILD.gn +index c905891eb8..f2cf11fe88 100644 +--- a/electron/BUILD.gn ++++ b/electron/BUILD.gn +@@ -111,8 +111,6 @@ electron_version = exec_script("script/print-version.py", + [], + "trim string", + [ +- ".git/packed-refs", +- ".git/HEAD", + "script/lib/get-version.js", + ]) + +diff --git a/electron/script/lib/get-version.js b/electron/script/lib/get-version.js +index 45a120482b..ddaf8ab60e 100644 +--- a/electron/script/lib/get-version.js ++++ b/electron/script/lib/get-version.js +@@ -1,22 +1 @@ +-const { spawnSync } = require('node:child_process'); +-const path = require('node:path'); +- +-module.exports.getElectronVersion = () => { +- // Find the nearest tag to the current HEAD +- // This is equivilant to our old logic of "use a value in package.json" for the following reasons +- // +- // 1. Whenever we updated the package.json we ALSO pushed a tag with the same version +- // 2. Whenever we _reverted_ a bump all we actually did was push a commit that deleted the tag and changed the version number back +- // +- // The only difference in the "git describe" technique is that technically a commit can "change" it's version +- // number if a tag is created / removed retroactively. i.e. the first time a commit is pushed it will be 1.2.3 +- // and after the tag is made rebuilding the same commit will result in it being 1.2.4 +- const output = spawnSync('git', ['describe', '--tags', '--abbrev=0'], { +- cwd: path.resolve(__dirname, '..', '..') +- }); +- if (output.status !== 0) { +- console.error(output.stderr); +- throw new Error('Failed to get current electron version'); +- } +- return output.stdout.toString().trim().replace(/^v/g, ''); +-}; ++module.exports.getElectronVersion = () => "@version@"; + diff --git a/pkgs/development/tools/electron/wrapper.nix b/pkgs/development/tools/electron/wrapper.nix new file mode 100644 index 0000000000000..5ecb0387b6a88 --- /dev/null +++ b/pkgs/development/tools/electron/wrapper.nix @@ -0,0 +1,37 @@ +{ stdenv +, electron-unwrapped +, wrapGAppsHook +, makeWrapper +, gsettings-desktop-schemas +, glib +, gtk3 +, gtk4 +}: + +stdenv.mkDerivation { + pname = "electron"; + inherit (electron-unwrapped) version; + + nativeBuildInputs = [ wrapGAppsHook makeWrapper ]; + buildInputs = [ + # needed for GSETTINGS_SCHEMAS_PATH + gsettings-desktop-schemas glib gtk3 gtk4 + ]; + dontWrapGApps = true; + + buildCommand = '' + gappsWrapperArgsHook + mkdir -p $out/bin + makeWrapper "${electron-unwrapped}/libexec/electron/electron" "$out/bin/electron" \ + "''${gappsWrapperArgs[@]}" \ + --set CHROME_DEVEL_SANDBOX $out/libexec/electron/chrome-sandbox + + ln -s ${electron-unwrapped}/libexec $out/libexec + ''; + + passthru = { + unwrapped = electron-unwrapped; + inherit (electron-unwrapped) headers; + }; + inherit (electron-unwrapped) meta; +} diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 0d6411606f81d..0521218a7fd25 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.19.3"; + version = "0.19.4"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-asumFkpJ9B9jrzQEKaYhGO4MzkCFS1hb4sjybFNFJ+M="; + hash = "sha256-27CrfdZFz+HyIHiUJDpCP9JKJ4BneDQhU0zl1qSp4nc="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; diff --git a/pkgs/development/tools/espup/default.nix b/pkgs/development/tools/espup/default.nix index f71ef18487f11..fdc21ffe63ec4 100644 --- a/pkgs/development/tools/espup/default.nix +++ b/pkgs/development/tools/espup/default.nix @@ -9,7 +9,7 @@ , zstd , stdenv , darwin -, runCommand +, testers , espup }: @@ -62,15 +62,8 @@ rustPlatform.buildRustPackage rec { --zsh <($out/bin/espup completions zsh) ''; - passthru.tests = { - simple = runCommand "${pname}-test" { } '' - if [[ `${espup}/bin/espup --version` != *"${version}"* ]]; then - echo "Error: program version does not match package version" - exit 1 - fi - - touch $out - ''; + passthru.tests.version = testers.testVersion { + package = espup; }; meta = with lib; { @@ -78,5 +71,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/esp-rs/espup/"; license = with licenses; [ mit asl20 ]; maintainers = with maintainers; [ knightpp ]; + mainProgram = "espup"; }; } diff --git a/pkgs/development/tools/faas-cli/default.nix b/pkgs/development/tools/faas-cli/default.nix index a30f79094237e..2dfd3f5de4ea1 100644 --- a/pkgs/development/tools/faas-cli/default.nix +++ b/pkgs/development/tools/faas-cli/default.nix @@ -18,13 +18,13 @@ let in buildGoModule rec { pname = "faas-cli"; - version = "0.16.12"; + version = "0.16.14"; src = fetchFromGitHub { owner = "openfaas"; repo = "faas-cli"; rev = version; - sha256 = "sha256-1vjqSHm4/MrlbdPTNlFznQqgtu4aYsHnlw366gBgaHA="; + sha256 = "sha256-6zMmm1I2lYt/+9OcesW54Pw0V5bdRYQK5eSYAtZ7Xmo="; }; vendorHash = null; diff --git a/pkgs/development/tools/fermyon-spin/default.nix b/pkgs/development/tools/fermyon-spin/default.nix index 0c5adb141648a..d7c4e27b0e7f3 100644 --- a/pkgs/development/tools/fermyon-spin/default.nix +++ b/pkgs/development/tools/fermyon-spin/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { sha256 = packageHash; }; - nativeBuildInputs = [ + nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; @@ -51,6 +51,7 @@ in stdenv.mkDerivation rec { description = "Framework for building, deploying, and running fast, secure, and composable cloud microservices with WebAssembly."; homepage = "https://github.com/fermyon/spin"; license = with licenses; [ asl20 ]; + mainProgram = "spin"; maintainers = with maintainers; [ mglolenstine ]; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 54f2056732b9c..af3aff1e59102 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation (finalAttrs: { pname = "flyway"; - version = "9.22.0"; + version = "9.22.2"; src = fetchurl { url = "mirror://maven/org/flywaydb/flyway-commandline/${finalAttrs.version}/flyway-commandline-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-vdg66ETDfa0WG1TrRWJ9XpMSCE9sd5GlYAJY2TERC5Y="; + sha256 = "sha256-IaURrRP1Q/Neu/HmPfCDsL6rZ59Gll5AzgniQhRK3GU="; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/pkgs/development/tools/frugal/default.nix b/pkgs/development/tools/frugal/default.nix index 43c36322eb089..edc2d6e2c3ad5 100644 --- a/pkgs/development/tools/frugal/default.nix +++ b/pkgs/development/tools/frugal/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "frugal"; - version = "3.16.27"; + version = "3.17.0"; src = fetchFromGitHub { owner = "Workiva"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZHDx6xE/apYF05CXtGJxlp2AWfeEAkWi3zloTFFr78M="; + sha256 = "sha256-r7/ZcqabSmpvhr3JKgCXaSD5378q2JOEmZyOfeLN3Nw="; }; subPackages = [ "." ]; diff --git a/pkgs/development/tools/fsautocomplete/default.nix b/pkgs/development/tools/fsautocomplete/default.nix index beb21a027497f..8b5d147791966 100644 --- a/pkgs/development/tools/fsautocomplete/default.nix +++ b/pkgs/development/tools/fsautocomplete/default.nix @@ -5,13 +5,13 @@ let in buildDotnetModule rec { pname = "fsautocomplete"; - version = "0.63.1"; + version = "0.64.0"; src = fetchFromGitHub { owner = "fsharp"; repo = "FsAutoComplete"; rev = "v${version}"; - sha256 = "sha256-+ymdt0FPrhZu5mUjRHhfzMtROX0eBVYsAOiB6g06mn0="; + sha256 = "sha256-C01CsGHRy0/FFEofEN8xLM/QgnMI8aq2tr4qkEbxlsQ="; }; nugetDeps = ./deps.nix; diff --git a/pkgs/development/tools/fsautocomplete/deps.nix b/pkgs/development/tools/fsautocomplete/deps.nix index 3833946651ccb..ecf2396eb9d00 100644 --- a/pkgs/development/tools/fsautocomplete/deps.nix +++ b/pkgs/development/tools/fsautocomplete/deps.nix @@ -39,7 +39,7 @@ (fetchNuGet { pname = "Fake.IO.Zip"; version = "5.23.1"; sha256 = "0iac86jlxb5bwgiich3zzvr7bz5aw8xq53ly263mwxhv9lrsd815"; }) (fetchNuGet { pname = "Fake.Net.Http"; version = "5.23.1"; sha256 = "1g0dpxi5b78qh7myz09pmjxzb0iblj3rqx5mpaammbppbbazvzdk"; }) (fetchNuGet { pname = "Fake.Tools.Git"; version = "5.23.1"; sha256 = "0cg1sbp7zl1d18cjhbs94ix8580hr6gyaxjw17q246lbaj9bfg8l"; }) - (fetchNuGet { pname = "fantomas"; version = "6.1.0"; sha256 = "0qk983ybs66infm6q60qsn6sl9i17i6rjavsygcld6w3vfzza9kx"; }) + (fetchNuGet { pname = "fantomas"; version = "6.2.0"; sha256 = "0jmr63c2a4maf1blcsiyxz9najrc31xk1ignc7j7l2sswis6hx7k"; }) (fetchNuGet { pname = "Fantomas.Client"; version = "0.9.0"; sha256 = "1zixwk61fyk7y9q6f8266kwxi6byr8fmyp1lf57qhbbvhq2waj9d"; }) (fetchNuGet { pname = "Fantomas.Core"; version = "6.2.0"; sha256 = "07yl2hr06zk1nl66scm24di3nf1zbrnd6329prwirnv370rz4q92"; }) (fetchNuGet { pname = "Fantomas.FCS"; version = "6.2.0"; sha256 = "1hhsa7hbxsm2d8ap4sqzwlzjmf4wsgg74i731rprr0nshjvd8ic7"; }) diff --git a/pkgs/development/tools/fx/default.nix b/pkgs/development/tools/fx/default.nix index 872485d8450d9..9af1c4d8ee074 100644 --- a/pkgs/development/tools/fx/default.nix +++ b/pkgs/development/tools/fx/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fx"; - version = "30.0.3"; + version = "30.2.0"; src = fetchFromGitHub { owner = "antonmedv"; repo = pname; rev = version; - hash = "sha256-bTXxzGf7mXQ0VfAQhaKAOYtOVAEVC71R3eRJej0zfJs="; + hash = "sha256-1U3XaqRJpwC41R8hiF7vQ32DOTGGxhaU1ZWiXzys8/M="; }; - vendorHash = "sha256-FyV3oaI4MKl0LKJf23XIeUmvFsa1DvQw2pq5Heza3Ws="; + vendorHash = "sha256-6wVcdzTYnB0Bd/YLPcbryKxCXu5genzQQ96znbn2ahw="; meta = with lib; { description = "Terminal JSON viewer"; diff --git a/pkgs/development/tools/gauge/default.nix b/pkgs/development/tools/gauge/default.nix index d752151b356df..2884ee13ee426 100644 --- a/pkgs/development/tools/gauge/default.nix +++ b/pkgs/development/tools/gauge/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gauge"; - version = "1.5.2"; + version = "1.5.4"; src = fetchFromGitHub { owner = "getgauge"; repo = "gauge"; rev = "v${version}"; - hash = "sha256-gdqb9atksAU2bjNdoOfxb3XYl3H/1F51Xnfnm78J3CQ="; + hash = "sha256-BJyc8umtJUsZgj4jdoYf6PSaDg41mnrZNd6rAdewWro="; }; - vendorHash = "sha256-PmidtbtX+x5cxuop+OCrfdPP5EiJnyvFyxHveGVGAEo="; + vendorHash = "sha256-K0LoAJzYzQorKp3o1oH5qruMBbJiCQrduBgoZ0naaLc="; excludedPackages = [ "build" "man" ]; diff --git a/pkgs/development/tools/gci/default.nix b/pkgs/development/tools/gci/default.nix index d89f648ac9410..b4b226a57cc39 100644 --- a/pkgs/development/tools/gci/default.nix +++ b/pkgs/development/tools/gci/default.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "gci"; - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = "daixiang0"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qNkSAbVhX4P+DqCtxXSnxYjZwq/nMYsDpEif+q1oTIA="; + sha256 = "sha256-1JYmnMXm2ywGZAVhcfzvF1I1h0pBvijbeVmqKzgiz8U="; }; - vendorHash = "sha256-g7htGfU6C2rzfu8hAn6SGr0ZRwB8ZzSf9CgHYmdupE8="; + vendorHash = "sha256-bPRcOvwbWEpcJUlIqQNeoYME4ky0YE5LlyWhSTWCIHQ="; meta = with lib; { description = "Controls golang package import order and makes it always deterministic"; diff --git a/pkgs/development/tools/gdlv/default.nix b/pkgs/development/tools/gdlv/default.nix index 619e8ec192a34..0992dc90b6866 100644 --- a/pkgs/development/tools/gdlv/default.nix +++ b/pkgs/development/tools/gdlv/default.nix @@ -2,25 +2,32 @@ , stdenv , buildGoModule , fetchFromGitHub -, OpenGL +, Foundation +, CoreGraphics +, Metal , AppKit }: buildGoModule rec { pname = "gdlv"; - version = "1.8.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "aarzilli"; repo = "gdlv"; rev = "v${version}"; - sha256 = "sha256-G1/Wbz836yfGZ/1ArICrNbWU6eh4SHXDmo4FKkjUszY="; + hash = "sha256-OPsQOFwV6jIX4ZOVwJmpTeQUr/zkfkqCr86HmPhYarI="; }; - vendorSha256 = null; + preBuild = lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11.0") '' + export MACOSX_DEPLOYMENT_TARGET=10.15 + ''; + + vendorHash = null; + subPackages = "."; - buildInputs = lib.optionals stdenv.isDarwin [ OpenGL AppKit ]; + buildInputs = lib.optionals stdenv.isDarwin [ Foundation CoreGraphics Metal AppKit ]; meta = with lib; { description = "GUI frontend for Delve"; diff --git a/pkgs/development/tools/gi-crystal/default.nix b/pkgs/development/tools/gi-crystal/default.nix index eee07206a2a10..441bbaba15585 100644 --- a/pkgs/development/tools/gi-crystal/default.nix +++ b/pkgs/development/tools/gi-crystal/default.nix @@ -5,13 +5,13 @@ }: crystal.buildCrystalPackage rec { pname = "gi-crystal"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "hugopl"; repo = "gi-crystal"; rev = "v${version}"; - hash = "sha256-DIH8L8P8lkWzzVUj1Tbf9oTUvu9X7OT66APyUHiDkYk="; + hash = "sha256-9px6JRdVzsUoU5wlO+blH1OBGKskozF3WvqLV/EYiiA="; }; # Make sure gi-crystal picks up the name of the so or dylib and not the leading nix store path diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/development/tools/ginkgo/default.nix index 0b5b542ca07f4..de44dfa246dbd 100644 --- a/pkgs/development/tools/ginkgo/default.nix +++ b/pkgs/development/tools/ginkgo/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "ginkgo"; - version = "2.12.0"; + version = "2.12.1"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-ikZ3vuoGYCbjvcpqol11WZ1PfxqSm1VNfdLDJIlNeP0="; + sha256 = "sha256-2nPTCd5kV6qxv4fkneu6A4gzFsRQSJiDfzh08ona0r8="; }; - vendorHash = "sha256-huXVFvSd2KkNqb6BWsTY2megnD9dJLy7edX2mGBv0rU="; + vendorHash = "sha256-wUpWvq6iiS9HkCi4ztXLNs1nCgAomyUo8YaFcElnfeI="; # integration tests expect more file changes # types tests are missing CodeLocation diff --git a/pkgs/development/tools/gllvm/default.nix b/pkgs/development/tools/gllvm/default.nix index c09ec90207bb7..14b24d91dac53 100644 --- a/pkgs/development/tools/gllvm/default.nix +++ b/pkgs/development/tools/gllvm/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-CoreqnMRuPuv+Ci1uyF3HJCJFwK2jwB79okynv6AHTA="; }; - vendorSha256 = null; + vendorHash = null; nativeCheckInputs = with llvmPackages; [ clang diff --git a/pkgs/development/tools/go-bindata/default.nix b/pkgs/development/tools/go-bindata/default.nix index e08cab6a0f95d..5d3e5d714f255 100644 --- a/pkgs/development/tools/go-bindata/default.nix +++ b/pkgs/development/tools/go-bindata/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { homepage = "https://github.com/kevinburke/go-bindata"; changelog = "https://github.com/kevinburke/go-bindata/blob/v${version}/CHANGELOG.md"; description = "A small utility which generates Go code from any file, useful for embedding binary data in a Go program"; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; license = licenses.cc0; }; } diff --git a/pkgs/development/tools/go-mockery/default.nix b/pkgs/development/tools/go-mockery/default.nix index 49425e5125e37..a0cfddc7bab07 100644 --- a/pkgs/development/tools/go-mockery/default.nix +++ b/pkgs/development/tools/go-mockery/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-mockery"; - version = "2.33.3"; + version = "2.34.1"; src = fetchFromGitHub { owner = "vektra"; repo = "mockery"; rev = "v${version}"; - sha256 = "sha256-ctq4DPlLsV9HCa2Vc+soQJu3DdrTyaHoSN9pZZtk+Mw="; + sha256 = "sha256-c1imyCv/eqyTEHz6H18McKY+59swG84PcLG6HI1uQmE="; }; preCheck = '' diff --git a/pkgs/development/tools/goa/default.nix b/pkgs/development/tools/goa/default.nix index e3edc73465e64..09e6a648fb4ff 100644 --- a/pkgs/development/tools/goa/default.nix +++ b/pkgs/development/tools/goa/default.nix @@ -5,15 +5,15 @@ buildGoModule rec { pname = "goa"; - version = "3.12.4"; + version = "3.13.0"; src = fetchFromGitHub { owner = "goadesign"; repo = "goa"; rev = "v${version}"; - sha256 = "sha256-ox4UPwotJBA8qxZpqyKmOW2bqbSWHX+yIpGvFnf2Rzo="; + sha256 = "sha256-iGp3Nkew1Xrvq9Hvhu645e4oguZaHxCXi+mJkdS1mp8="; }; - vendorHash = "sha256-AIhAMgpVLMxeYoj4Jl4O92/etOtFD++ddV18R8aYRuY="; + vendorHash = "sha256-QtMBJk0T8+ExX5S/DvltHQfxET5bo563pJoalBx4SAs="; subPackages = [ "cmd/goa" ]; diff --git a/pkgs/development/tools/gocode-gomod/default.nix b/pkgs/development/tools/gocode-gomod/default.nix index c07d38b607335..9c1752b9ad117 100644 --- a/pkgs/development/tools/gocode-gomod/default.nix +++ b/pkgs/development/tools/gocode-gomod/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { sha256 = "YAOYrPPKgnjCErq8+iW0Le51clGBv0MJy2Nnn7UVo/s="; }; - vendorSha256 = null; + vendorHash = null; postInstall = '' mv $out/bin/gocode $out/bin/gocode-gomod diff --git a/pkgs/development/tools/gocyclo/default.nix b/pkgs/development/tools/gocyclo/default.nix index b8e0bb1c4f56f..6dc87ccdc91c6 100644 --- a/pkgs/development/tools/gocyclo/default.nix +++ b/pkgs/development/tools/gocyclo/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-1IwtGUqshpLDyxH5NNkGUads1TKLs48eslNnFylGUPA="; }; - vendorSha256 = null; + vendorHash = null; meta = with lib; { description = "Calculate cyclomatic complexities of functions in Go source code"; diff --git a/pkgs/development/tools/godef/default.nix b/pkgs/development/tools/godef/default.nix index 99fe932013e7d..085e996f350f3 100644 --- a/pkgs/development/tools/godef/default.nix +++ b/pkgs/development/tools/godef/default.nix @@ -7,7 +7,7 @@ buildGoModule rec { subPackages = [ "." ]; - vendorSha256 = null; + vendorHash = null; doCheck = false; diff --git a/pkgs/development/tools/gogetdoc/default.nix b/pkgs/development/tools/gogetdoc/default.nix index 6f7c189ea9d2e..adbb01ea7e3db 100644 --- a/pkgs/development/tools/gogetdoc/default.nix +++ b/pkgs/development/tools/gogetdoc/default.nix @@ -8,7 +8,7 @@ buildGoModule rec { version = "2019-02-28"; rev = "b37376c5da6aeb900611837098f40f81972e63e4"; - vendorSha256 = null; + vendorHash = null; doCheck = false; diff --git a/pkgs/development/tools/gojsontoyaml/default.nix b/pkgs/development/tools/gojsontoyaml/default.nix index 02f5421ca004c..88708f5b19fb2 100644 --- a/pkgs/development/tools/gojsontoyaml/default.nix +++ b/pkgs/development/tools/gojsontoyaml/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-ebxz2uTH7XwD3j6JnsfET6aCGYjvsCjow/sU9pagg50="; }; - vendorSha256 = null; + vendorHash = null; meta = with lib; { description = "Simply tool to convert json to yaml written in Go"; diff --git a/pkgs/development/tools/gomacro/default.nix b/pkgs/development/tools/gomacro/default.nix index e96fccd0a3b5b..c172945b9067f 100644 --- a/pkgs/development/tools/gomacro/default.nix +++ b/pkgs/development/tools/gomacro/default.nix @@ -8,11 +8,12 @@ buildGoModule rec { src = fetchFromGitHub { owner = "cosmos72"; repo = "gomacro"; - sha256 = "0ci486zqrhzvs3njn2ygaxsgjx3fn8bbj2q3sd80xvjiyjvq866g"; inherit rev; + hash = "sha256-zxiEt/RR7g5Q0wMLuRaybnT5dFfPCyvt0PvDjL9BJDI="; }; - vendorSha256 = "1ib4h57drikyy5aq4ms6vc1p29djlpjrh7xd3bgyykr9zmm2w1kx"; + vendorHash = "sha256-fQYuav0pT+/fGq0fmOWlsiVxA9tGV4JV8X7G3E6BZMU="; + subPackages = [ "." ]; meta = with lib; { diff --git a/pkgs/development/tools/gopkgs/default.nix b/pkgs/development/tools/gopkgs/default.nix index a5413c6a9c05c..7b57354e3ea74 100644 --- a/pkgs/development/tools/gopkgs/default.nix +++ b/pkgs/development/tools/gopkgs/default.nix @@ -4,16 +4,16 @@ buildGoModule rec { pname = "gopkgs"; version = "2.1.2"; - subPackages = [ "cmd/gopkgs" ]; - src = fetchFromGitHub { rev = "v${version}"; owner = "uudashr"; repo = "gopkgs"; - sha256 = "1jak1bg6k5iasscw68ra875k59k3iqhka2ykabsd427k1j3mypln"; + hash = "sha256-ll5fhwzzCNL0UtMLNSGOY6Yyy0EqI8OZ1iqWad4KU8k="; }; - vendorSha256 = "1pwsc488ldw039by8nqpni801zry7dnf0rx4hhd73xpv2w7s8n2r"; + vendorHash = "sha256-WVikDxf79nEahKRn4Gw7Pv8AULQXW+RXGoA3ihBhmt8="; + + subPackages = [ "cmd/gopkgs" ]; doCheck = false; diff --git a/pkgs/development/tools/gore/default.nix b/pkgs/development/tools/gore/default.nix index 87b86b9b02312..4c6eac9f652a3 100644 --- a/pkgs/development/tools/gore/default.nix +++ b/pkgs/development/tools/gore/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gore"; - version = "0.5.6"; + version = "0.5.7"; src = fetchFromGitHub { owner = "motemen"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Z2WOgkgi/JK/s0961FvgboJwYtxbFdRSzzPiE74SVaY="; + sha256 = "sha256-J6rXz62y/qj4GFXnUwpfx9UEUQaUVQjf7KQCSzmNsws="; }; - vendorHash = "sha256-1ftO+Bjc+vqB/azn4K6iRNrCLrz+QjpPzNfja3yvOrs="; + vendorHash = "sha256-MpmDQ++32Rop1yYcibEr7hQJ7YAU1QvITzTSstL5V9w="; doCheck = false; diff --git a/pkgs/development/tools/gox/default.nix b/pkgs/development/tools/gox/default.nix index 065f5bee224bb..2cd8bbd8e06cd 100644 --- a/pkgs/development/tools/gox/default.nix +++ b/pkgs/development/tools/gox/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { sha256 = "0mkh81hd7kn45dz7b6yhzqsg2mvg1g6pwx89jjigxrnqhyg9vrl7"; }; - vendorSha256 = null; + vendorHash = null; # This is required for wrapProgram. allowGoReference = true; diff --git a/pkgs/development/tools/hclfmt/default.nix b/pkgs/development/tools/hclfmt/default.nix index c479ef547b60f..c5737a0996095 100644 --- a/pkgs/development/tools/hclfmt/default.nix +++ b/pkgs/development/tools/hclfmt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hclfmt"; - version = "2.17.0"; + version = "2.18.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "hcl"; rev = "v${version}"; - hash = "sha256-6OALbouj1b6Jbtv0znpkfgYS4MyBpxQ56Sen3OJYaHs="; + hash = "sha256-X2XHsw30rWRUJCNRGc+UKqmZGtl3dx3TLFtjtr63uVM="; }; - vendorHash = "sha256-SjewF3q4vQ3oWR+vxqpZVP6St8db/GXezTDWYUeK2g8="; + vendorHash = "sha256-DA1IKaC+YSBzCfEMqHsHfwu1o5qvYFaFgDoGG0RZnoo="; # The code repository includes other tools which are not useful. Only build # hclfmt. diff --git a/pkgs/development/tools/headache/default.nix b/pkgs/development/tools/headache/default.nix index f156c5950b04c..7ed2492901361 100644 --- a/pkgs/development/tools/headache/default.nix +++ b/pkgs/development/tools/headache/default.nix @@ -1,21 +1,23 @@ -{ lib, fetchFromGitHub, ocamlPackages }: +{ lib, fetchFromGitHub, nix-update-script, ocamlPackages }: with ocamlPackages; buildDunePackage rec { pname = "headache"; - version = "1.06"; + version = "1.07"; src = fetchFromGitHub { owner = "frama-c"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BA7u09MKYMyspFX8AcAkDVA6UUG5DKAdbIDdt+b3Fc4="; + sha256 = "sha256-RL80ggcJSJFu2UTECUNP6KufRhR8ZnG7sQeYzhrw37g="; }; - duneVersion = "3"; + propagatedBuildInputs = [ + camomile + ]; - propagatedBuildInputs = [ camomile ]; + passthru.updateScript = nix-update-script { }; meta = with lib; { homepage = "https://github.com/frama-c/${pname}"; diff --git a/pkgs/development/tools/hjson-go/default.nix b/pkgs/development/tools/hjson-go/default.nix index bab12da8eb6af..9237871599cbf 100644 --- a/pkgs/development/tools/hjson-go/default.nix +++ b/pkgs/development/tools/hjson-go/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { hash = "sha256-WR6wLa/Za5MgcH1enHG/74uq/7PdaY/OzvJdgMgDFIk="; }; - vendorSha256 = null; + vendorHash = null; ldflags = [ "-s" diff --git a/pkgs/development/tools/hostess/default.nix b/pkgs/development/tools/hostess/default.nix index 0d32f835f87fa..7bf78c403318c 100644 --- a/pkgs/development/tools/hostess/default.nix +++ b/pkgs/development/tools/hostess/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { subPackages = [ "." ]; - vendorSha256 = null; + vendorHash = null; meta = with lib; { description = "An idempotent command-line utility for managing your /etc/hosts* file."; diff --git a/pkgs/development/tools/img/default.nix b/pkgs/development/tools/img/default.nix index 17daf49ff230c..b14e6e3b2615c 100644 --- a/pkgs/development/tools/img/default.nix +++ b/pkgs/development/tools/img/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { sha256 = "0r5hihzp2679ki9hr3p0f085rafy2hc8kpkdhnd4m5k4iibqib08"; }; - vendorSha256 = null; + vendorHash = null; postPatch = '' V={newgidmap,newgidmap} \ diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix index 3c6d85e8ddcc2..4a57c0f5a0c3a 100644 --- a/pkgs/development/tools/jq/default.nix +++ b/pkgs/development/tools/jq/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, removeReferencesTo , autoreconfHook , bison , onigurumaSupport ? true @@ -9,18 +10,14 @@ stdenv.mkDerivation rec { pname = "jq"; - version = "1.6"; + version = "1.7"; # Note: do not use fetchpatch or fetchFromGitHub to keep this package available in __bootPackages src = fetchurl { - url = "https://github.com/stedolan/jq/releases/download/jq-${version}/jq-${version}.tar.gz"; - sha256 = "sha256-XejI4pqqP7nMa0e7JymfJxNU67clFOOsytx9OLW7qnI="; + url = "https://github.com/jqlang/jq/releases/download/jq-${version}/jq-${version}.tar.gz"; + hash = "sha256-QCoNaXXZRub05ITRqEMgQUoP+Ots9J0sEdFE1NNE22I="; }; - patches = [ - ./fix-tests-when-building-without-regex-supports.patch - ]; - outputs = [ "bin" "doc" "man" "dev" "lib" "out" ]; # Upstream script that writes the version that's eventually compiled @@ -39,7 +36,7 @@ stdenv.mkDerivation rec { ''; buildInputs = lib.optionals onigurumaSupport [ oniguruma ]; - nativeBuildInputs = [ autoreconfHook bison ]; + nativeBuildInputs = [ removeReferencesTo autoreconfHook bison ]; # Darwin requires _REENTRANT be defined to use functions like `lgamma_r`. # Otherwise, configure will detect that they’re in libm, but the build will fail @@ -59,6 +56,12 @@ stdenv.mkDerivation rec { # jq is linked to libjq: ++ lib.optional (!stdenv.isDarwin) "LDFLAGS=-Wl,-rpath,\\\${libdir}"; + # Break the dependency cycle: $dev refers to $bin via propagated-build-outputs, and + # $bin refers to $dev because of https://github.com/jqlang/jq/commit/583e4a27188a2db097dd043dd203b9c106bba100 + postFixup = '' + remove-references-to -t "$dev" "$bin/bin/jq" + ''; + doInstallCheck = true; installCheckTarget = "check"; @@ -71,11 +74,11 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A lightweight and flexible command-line JSON processor"; - homepage = "https://stedolan.github.io/jq/"; + homepage = "https://jqlang.github.io/jq/"; license = licenses.mit; - maintainers = with maintainers; [ raskin globin artturin ]; + maintainers = with maintainers; [ raskin artturin ncfavier ]; platforms = platforms.unix; - downloadPage = "https://stedolan.github.io/jq/download/"; + downloadPage = "https://jqlang.github.io/jq/download/"; mainProgram = "jq"; }; } diff --git a/pkgs/development/tools/jq/fix-tests-when-building-without-regex-supports.patch b/pkgs/development/tools/jq/fix-tests-when-building-without-regex-supports.patch deleted file mode 100644 index ac7614ed80b27..0000000000000 --- a/pkgs/development/tools/jq/fix-tests-when-building-without-regex-supports.patch +++ /dev/null @@ -1,38 +0,0 @@ -From f6a69a6e52b68a92b816a28eb20719a3d0cb51ae Mon Sep 17 00:00:00 2001 -From: Dmitry Bogatov <git#v1@kaction.cc> -Date: Sat, 27 Mar 2021 00:00:00 +0000 -Subject: [PATCH] Disable some tests when building without regex support - ---- - Makefile.am | 5 ++++- - configure.ac | 1 + - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index f5c1db594..f3f44bb9e 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -130,7 +130,10 @@ endif - - ### Tests (make check) - --TESTS = tests/optionaltest tests/mantest tests/jqtest tests/onigtest tests/shtest tests/utf8test tests/base64test -+TESTS = tests/optionaltest tests/jqtest tests/shtest tests/utf8test tests/base64test -+if WITH_ONIGURUMA -+TESTS += tests/mantest tests/onigtest -+endif - TESTS_ENVIRONMENT = NO_VALGRIND=$(NO_VALGRIND) - - # This is a magic make variable that causes it to treat tests/man.test as a -diff --git a/configure.ac b/configure.ac -index 0441d4a2c..987d94e0a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -278,6 +278,7 @@ AC_SUBST(onig_CFLAGS) - AC_SUBST(onig_LDFLAGS) - - AM_CONDITIONAL([BUILD_ONIGURUMA], [test "x$build_oniguruma" = xyes]) -+AM_CONDITIONAL([WITH_ONIGURUMA], [test "x$with_oniguruma" = xyes]) - AC_SUBST([BUNDLER], ["$bundle_cmd"]) - - AC_CONFIG_MACRO_DIR([config/m4]) diff --git a/pkgs/development/tools/jql/default.nix b/pkgs/development/tools/jql/default.nix index 83f25c44ab253..4d980d521d629 100644 --- a/pkgs/development/tools/jql/default.nix +++ b/pkgs/development/tools/jql/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "jql"; - version = "7.0.3"; + version = "7.0.4"; src = fetchFromGitHub { owner = "yamafaktory"; repo = pname; rev = "jql-v${version}"; - hash = "sha256-9VQtPYAw/MtYZxfosWPQOy29YjvzVGP/mhje42dAb8U="; + hash = "sha256-Qy4ozTRdDF8ENyk4AB2a/4AuMSLJd/3w/q9TjGgrkPE="; }; - cargoHash = "sha256-erGqHW3LyXTcy6MZH24F7OKknissH4es2VmWdEFwe0Y="; + cargoHash = "sha256-or69dz+wMhp8CPLzip6c6S7HpilAE2DAVkv/3IJMJWQ="; meta = with lib; { description = "A JSON Query Language CLI tool built with Rust"; diff --git a/pkgs/development/tools/jsonnet-bundler/default.nix b/pkgs/development/tools/jsonnet-bundler/default.nix index e627c98505039..256d90fd76522 100644 --- a/pkgs/development/tools/jsonnet-bundler/default.nix +++ b/pkgs/development/tools/jsonnet-bundler/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-vjb5wEiJw48s7FUarpA94ZauFC7iEgRDAkRTwRIZ8pA="; }; - vendorSha256 = null; + vendorHash = null; ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; diff --git a/pkgs/development/tools/kafkactl/default.nix b/pkgs/development/tools/kafkactl/default.nix index 67e507d01da65..b602f2b4fc6d8 100644 --- a/pkgs/development/tools/kafkactl/default.nix +++ b/pkgs/development/tools/kafkactl/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "kafkactl"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "deviceinsight"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Yh+82gtHACTfctnIHQS+t7Pn+eZ5ZY5ySh/ae6g81lU="; + hash = "sha256-8/MqcJ7kxlmVkZCa7PWZ6kzo6D/9Zwx2rOJs675mJUE="; }; vendorHash = "sha256-5LHL0L7xTmy3yBs7rtrC1uvUjLKBU8LpjQaHyeRyFhw="; diff --git a/pkgs/development/tools/kcli/default.nix b/pkgs/development/tools/kcli/default.nix index 77c773cea1b9e..fa4e887451360 100644 --- a/pkgs/development/tools/kcli/default.nix +++ b/pkgs/development/tools/kcli/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0whijr2r2j5bvfy8jgmpxsa0zvwk5kfjlpnkw4za5k35q7bjffls"; }; - vendorSha256 = null; #vendorSha256 = ""; + vendorHash = null; subPackages = [ "." ]; diff --git a/pkgs/development/tools/kdash/default.nix b/pkgs/development/tools/kdash/default.nix index 0269598a3e90d..a4917cbe2266c 100644 --- a/pkgs/development/tools/kdash/default.nix +++ b/pkgs/development/tools/kdash/default.nix @@ -12,13 +12,13 @@ rustPlatform.buildRustPackage rec { pname = "kdash"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "kdash-rs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PjkRE4JWDxiDKpENN/yDnO45CegxLPov/EhxnUbmpOg="; + sha256 = "sha256-1vBa6BAn9+T1C3ZxseMvLQHIlU0WUYShUQE3YKleoc4="; }; nativeBuildInputs = [ perl python3 pkg-config ]; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl xorg.xcbutil ] ++ lib.optional stdenv.isDarwin AppKit; - cargoHash = "sha256-nCFXhAaVrIkm6XOSa1cDCxukbf/CVmwPEu6gk7VybVQ="; + cargoHash = "sha256-dtuUkS5Je8u4DcjNgQFVVX+ACP0RBLXUYNB+EwKajzo="; meta = with lib; { description = "A simple and fast dashboard for Kubernetes"; diff --git a/pkgs/development/tools/konstraint/default.nix b/pkgs/development/tools/konstraint/default.nix index 65358728fa11d..cbe77811fabae 100644 --- a/pkgs/development/tools/konstraint/default.nix +++ b/pkgs/development/tools/konstraint/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "konstraint"; - version = "0.30.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "plexsystems"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lO9yXIqasVYf+FHQeodS9nlqEPp+rpU/NckSMhQ5wqY="; + sha256 = "sha256-4OEc5NfCF8DHCyQfQL2ZmSFBkwYr32dGThVZHsRutVA="; }; - vendorHash = "sha256-MWg0RHKXxkZ52MqRglBuR5P9bRDg8RKG9XRux1PjJ1g="; + vendorHash = "sha256-5B1gA8cigwBNYNYmLb9Jq9wXl/d3hP3+brJFecnKxCY="; # Exclude go within .github folder excludedPackages = ".github"; diff --git a/pkgs/development/tools/kubeprompt/default.nix b/pkgs/development/tools/kubeprompt/default.nix index 3624a45f9340a..28f628389d292 100644 --- a/pkgs/development/tools/kubeprompt/default.nix +++ b/pkgs/development/tools/kubeprompt/default.nix @@ -8,17 +8,17 @@ buildGoModule rec { owner = "jlesquembre"; repo = pname; rev = version; - sha256 = "0ib61af6fwsl35gmid9jj0fp8zxgzrw4qk32r03hxzkh9g7r3kla"; + hash = "sha256-is6Rz0tw/g4HyGJMTHj+r390HZAytVhfGVRzZ5wKZkU="; }; + vendorHash = "sha256-UUMulGnqfIshN2WIejZgwrWWlywj5TpnAQ4A5/d0NCE="; + ldflags = [ "-w" "-s" "-X github.com/jlesquembre/kubeprompt/pkg/version.Version=${version}" ]; - vendorSha256 = "089lfkvyf00f05kkmr935jbrddf2c0v7m2356whqnz7ad6a2whsi"; - doCheck = false; meta = with lib; { diff --git a/pkgs/development/tools/language-servers/ccls/default.nix b/pkgs/development/tools/language-servers/ccls/default.nix index a401fc47eac9e..6afbc1d4d9abe 100644 --- a/pkgs/development/tools/language-servers/ccls/default.nix +++ b/pkgs/development/tools/language-servers/ccls/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "ccls"; - version = "0.20220729"; + version = "0.20230717"; src = fetchFromGitHub { owner = "MaskRay"; repo = "ccls"; rev = version; - sha256 = "sha256-eSWgk6KdEyjDLPc27CsOCXDU7AKMoXNyzoA6dSwZ5TI="; + sha256 = "sha256-u499fHd2lyqOYXJApFdiIXHQGF+QEVlQ4E8jm5VMb3w="; }; nativeBuildInputs = [ cmake llvmPackages.llvm.dev ]; diff --git a/pkgs/development/tools/language-servers/gopls/default.nix b/pkgs/development/tools/language-servers/gopls/default.nix index 55b473cd881a8..0c02135827228 100644 --- a/pkgs/development/tools/language-servers/gopls/default.nix +++ b/pkgs/development/tools/language-servers/gopls/default.nix @@ -24,5 +24,6 @@ buildGoModule rec { homepage = "https://github.com/golang/tools/tree/master/gopls"; license = licenses.bsd3; maintainers = with maintainers; [ mic92 rski SuperSandro2000 zimbatm ]; + mainProgram = "gopls"; }; } diff --git a/pkgs/development/tools/language-servers/millet/Cargo.lock b/pkgs/development/tools/language-servers/millet/Cargo.lock index ba83ab4a9eb9f..3c7e5cc534fc8 100644 --- a/pkgs/development/tools/language-servers/millet/Cargo.lock +++ b/pkgs/development/tools/language-servers/millet/Cargo.lock @@ -28,7 +28,7 @@ dependencies = [ [[package]] name = "analysis" -version = "0.13.3" +version = "0.13.4" dependencies = [ "config", "diagnostic", @@ -118,7 +118,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chain-map" -version = "0.13.3" +version = "0.13.4" dependencies = [ "fast-hash", "str-util", @@ -131,7 +131,7 @@ source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a7847 [[package]] name = "cm-syntax" -version = "0.13.3" +version = "0.13.4" dependencies = [ "lex-util", "paths", @@ -160,7 +160,7 @@ dependencies = [ [[package]] name = "config" -version = "0.13.3" +version = "0.13.4" dependencies = [ "fast-hash", "serde", @@ -188,7 +188,7 @@ checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" [[package]] name = "cov-mark" -version = "0.13.3" +version = "0.13.4" dependencies = [ "fast-hash", "once_cell", @@ -427,7 +427,7 @@ dependencies = [ [[package]] name = "input" -version = "0.13.3" +version = "0.13.4" dependencies = [ "cm-syntax", "config", @@ -475,7 +475,7 @@ checksum = "3752f229dcc5a481d60f385fa479ff46818033d881d2d801aa27dffcfb5e8306" [[package]] name = "lang-srv" -version = "0.13.3" +version = "0.13.4" dependencies = [ "analysis", "anyhow", @@ -503,7 +503,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "lex-util" -version = "0.13.3" +version = "0.13.4" [[package]] name = "libc" @@ -575,7 +575,7 @@ dependencies = [ [[package]] name = "millet-cli" -version = "0.13.3" +version = "0.13.4" dependencies = [ "analysis", "codespan-reporting", @@ -593,7 +593,7 @@ dependencies = [ [[package]] name = "millet-ls" -version = "0.13.3" +version = "0.13.4" dependencies = [ "anyhow", "env_logger", @@ -613,7 +613,7 @@ dependencies = [ [[package]] name = "mlb-hir" -version = "0.13.3" +version = "0.13.4" dependencies = [ "fast-hash", "paths", @@ -624,7 +624,7 @@ dependencies = [ [[package]] name = "mlb-statics" -version = "0.13.3" +version = "0.13.4" dependencies = [ "config", "diagnostic", @@ -648,7 +648,7 @@ dependencies = [ [[package]] name = "mlb-syntax" -version = "0.13.3" +version = "0.13.4" dependencies = [ "lex-util", "paths", @@ -711,7 +711,7 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "panic-hook" -version = "0.13.3" +version = "0.13.4" dependencies = [ "better-panic", ] @@ -924,7 +924,7 @@ dependencies = [ [[package]] name = "slash-var-path" -version = "0.13.3" +version = "0.13.4" dependencies = [ "fast-hash", "str-util", @@ -932,14 +932,14 @@ dependencies = [ [[package]] name = "sml-comment" -version = "0.13.3" +version = "0.13.4" dependencies = [ "sml-syntax", ] [[package]] name = "sml-dynamics" -version = "0.13.3" +version = "0.13.4" dependencies = [ "fast-hash", "fmt-util", @@ -950,7 +950,7 @@ dependencies = [ [[package]] name = "sml-dynamics-tests" -version = "0.13.3" +version = "0.13.4" dependencies = [ "config", "pretty_assertions", @@ -966,7 +966,7 @@ dependencies = [ [[package]] name = "sml-file-syntax" -version = "0.13.3" +version = "0.13.4" dependencies = [ "config", "elapsed", @@ -980,7 +980,7 @@ dependencies = [ [[package]] name = "sml-fixity" -version = "0.13.3" +version = "0.13.4" dependencies = [ "fast-hash", "once_cell", @@ -989,7 +989,7 @@ dependencies = [ [[package]] name = "sml-hir" -version = "0.13.3" +version = "0.13.4" dependencies = [ "la-arena", "sml-lab", @@ -1000,7 +1000,7 @@ dependencies = [ [[package]] name = "sml-hir-lower" -version = "0.13.3" +version = "0.13.4" dependencies = [ "config", "cov-mark", @@ -1015,14 +1015,14 @@ dependencies = [ [[package]] name = "sml-lab" -version = "0.13.3" +version = "0.13.4" dependencies = [ "str-util", ] [[package]] name = "sml-lex" -version = "0.13.3" +version = "0.13.4" dependencies = [ "cov-mark", "diagnostic", @@ -1037,7 +1037,7 @@ source = "git+https://github.com/azdavis/sml-libs.git#0d94e3ce13f2a489dff86151f7 [[package]] name = "sml-naive-fmt" -version = "0.13.3" +version = "0.13.4" dependencies = [ "fast-hash", "sml-comment", @@ -1046,11 +1046,11 @@ dependencies = [ [[package]] name = "sml-namespace" -version = "0.13.3" +version = "0.13.4" [[package]] name = "sml-parse" -version = "0.13.3" +version = "0.13.4" dependencies = [ "diagnostic", "event-parse", @@ -1062,14 +1062,14 @@ dependencies = [ [[package]] name = "sml-path" -version = "0.13.3" +version = "0.13.4" dependencies = [ "str-util", ] [[package]] name = "sml-scon" -version = "0.13.3" +version = "0.13.4" dependencies = [ "num-bigint", "num-traits", @@ -1078,7 +1078,7 @@ dependencies = [ [[package]] name = "sml-statics" -version = "0.13.3" +version = "0.13.4" dependencies = [ "chain-map", "config", @@ -1101,7 +1101,7 @@ dependencies = [ [[package]] name = "sml-statics-types" -version = "0.13.3" +version = "0.13.4" dependencies = [ "chain-map", "code-h2-md-map", @@ -1120,7 +1120,7 @@ dependencies = [ [[package]] name = "sml-symbol-kind" -version = "0.13.3" +version = "0.13.4" dependencies = [ "sml-namespace", "sml-statics-types", @@ -1128,7 +1128,7 @@ dependencies = [ [[package]] name = "sml-syntax" -version = "0.13.3" +version = "0.13.4" dependencies = [ "code-h2-md-map", "fast-hash", @@ -1139,7 +1139,7 @@ dependencies = [ [[package]] name = "sml-ty-var-scope" -version = "0.13.3" +version = "0.13.4" dependencies = [ "fast-hash", "sml-hir", @@ -1210,7 +1210,7 @@ dependencies = [ [[package]] name = "tests" -version = "0.13.3" +version = "0.13.4" dependencies = [ "analysis", "cm-syntax", @@ -1554,7 +1554,7 @@ dependencies = [ [[package]] name = "xtask" -version = "0.13.3" +version = "0.13.4" dependencies = [ "anyhow", "flate2", diff --git a/pkgs/development/tools/language-servers/millet/default.nix b/pkgs/development/tools/language-servers/millet/default.nix index 98685dac45f4a..27b7a7a5675b9 100644 --- a/pkgs/development/tools/language-servers/millet/default.nix +++ b/pkgs/development/tools/language-servers/millet/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "millet"; - version = "0.13.3"; + version = "0.13.4"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - hash = "sha256-zbj1wFaPmxhPHIo+P3kbx0S0kksWDK+TgJ68ntzvcek="; + hash = "sha256-TLv2czZsZDOk8i8/0VxALflC/WV+MvRlbgbxB4kKsW0="; }; cargoLock = { diff --git a/pkgs/development/tools/language-servers/perlnavigator/default.nix b/pkgs/development/tools/language-servers/perlnavigator/default.nix index ddeb1a9e0b930..adaa30747f6ef 100644 --- a/pkgs/development/tools/language-servers/perlnavigator/default.nix +++ b/pkgs/development/tools/language-servers/perlnavigator/default.nix @@ -4,12 +4,12 @@ }: let - version = "0.6.0"; + version = "0.6.3"; src = fetchFromGitHub { owner = "bscan"; repo = "PerlNavigator"; rev = "v${version}"; - hash = "sha256-RMxM8g3ZdSt1B8WgwmcQgjpPZOCrVYYkhOt610SgbIw="; + hash = "sha256-CNsgFf+W7YQwAR++GwfTka4Cy8woRu02BQIJRmRAxK4="; }; browser-ext = buildNpmPackage { pname = "perlnavigator-web-server"; diff --git a/pkgs/development/tools/language-servers/postgres-lsp/default.nix b/pkgs/development/tools/language-servers/postgres-lsp/default.nix index e1bc93d4e246c..167b86216f300 100644 --- a/pkgs/development/tools/language-servers/postgres-lsp/default.nix +++ b/pkgs/development/tools/language-servers/postgres-lsp/default.nix @@ -6,16 +6,25 @@ rustPlatform.buildRustPackage rec { pname = "postgres-lsp"; - version = "unstable-2023-08-23"; + version = "unstable-2023-09-21"; - src = fetchFromGitHub { + src = (fetchFromGitHub { owner = "supabase"; repo = "postgres_lsp"; - rev = "47dd0132b12661ab6c97f5fba892e567a5109c84"; - hash = "sha256-aV3QAp6DkNrHiDe1Ytiu6UyTWrelV6vO83Baiv4ONLg="; + rev = "f25f23a683c4e14dea52e3e423584588ab349081"; + hash = "sha256-z8WIUfgnPYdzhBit1V6A5UktjoYCblTKXxwpbHOmFJA="; + fetchSubmodules = true; + }).overrideAttrs { + # workaround to be able to fetch git@github.com submodules + # https://github.com/NixOS/nixpkgs/issues/195117 + env = { + GIT_CONFIG_COUNT = 1; + GIT_CONFIG_KEY_0 = "url.https://github.com/.insteadOf"; + GIT_CONFIG_VALUE_0 = "git@github.com:"; + }; }; - cargoHash = "sha256-9d/KiQ7IXhmYvTb97FKJh/cGTdnxAgCXSx4+V74b+RE="; + cargoHash = "sha256-Nyxiere6/e5Y7YcgHitVkaiS1w3JXkbohIcBNc00YXY="; nativeBuildInputs = [ protobuf diff --git a/pkgs/development/tools/language-servers/pylyzer/default.nix b/pkgs/development/tools/language-servers/pylyzer/default.nix index 1383cfe314462..db4f582488b74 100644 --- a/pkgs/development/tools/language-servers/pylyzer/default.nix +++ b/pkgs/development/tools/language-servers/pylyzer/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "pylyzer"; - version = "0.0.45"; + version = "0.0.47"; src = fetchFromGitHub { owner = "mtshiba"; repo = "pylyzer"; rev = "v${version}"; - hash = "sha256-YEw8EU+YUBqfKL2RM1komz6D1/2GshNQtQso7rN0yCM="; + hash = "sha256-edLzBQvyanF7ozkDH+aqUF8j8r2cNKBKxLvEyPoCRIc="; }; - cargoHash = "sha256-5NaeSu/9mAQoqN/7mXrZomlzR/JjUxcIy9fRdV2H8yM="; + cargoHash = "sha256-moTOErMKe7+3lAAOfz3F3cGzYB+xXqtNLPO3134JFl0="; nativeBuildInputs = [ git diff --git a/pkgs/development/tools/language-servers/ruff-lsp/default.nix b/pkgs/development/tools/language-servers/ruff-lsp/default.nix index abd9bbb52c97d..0676305659d33 100644 --- a/pkgs/development/tools/language-servers/ruff-lsp/default.nix +++ b/pkgs/development/tools/language-servers/ruff-lsp/default.nix @@ -3,6 +3,7 @@ , pythonOlder , buildPythonPackage , fetchFromGitHub +, fetchpatch , ruff , pygls , lsprotocol @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "ruff-lsp"; - version = "0.0.39"; + version = "0.0.40"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "astral-sh"; repo = "ruff-lsp"; rev = "v${version}"; - hash = "sha256-hbnSx59uSzXHeAhZPZnCzxl+mCZIdr29uUPfQCsm/Ww="; + hash = "sha256-CQ4SDIGhUTn7fdvoGag+XM7HcY+qJyp9McyzpoTQ0tM="; }; postPatch = '' diff --git a/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock b/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock index 5977d079c1790..52f5b366b4209 100644 --- a/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock +++ b/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock @@ -30,9 +30,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.5" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" +checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" dependencies = [ "memchr", ] @@ -83,9 +83,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d495b6dc0184693324491a5ac05f559acc97bf937ab31d7a1c33dd0016be6d2b" +checksum = "bb42b2197bf15ccb092b62c74515dbd8b86d0effd934795f6687c93b6e679a2c" dependencies = [ "flate2", "futures-core", @@ -102,7 +102,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.37", ] [[package]] @@ -225,9 +225,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "bytemuck" @@ -320,9 +320,9 @@ checksum = "aeea139b89efab957972956e5d3e4efb66a6c261f726abf6911040cc8ef700f7" [[package]] name = "chrono" -version = "0.4.30" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defd4e7873dbddba6c7c91e199c7fcb946abc4a6a4ac3195400bcfb01b5de877" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", @@ -481,9 +481,9 @@ dependencies = [ [[package]] name = "curl-sys" -version = "0.4.65+curl-8.2.1" +version = "0.4.66+curl-8.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "961ba061c9ef2fe34bbd12b807152d96f0badd2bebe7b90ce6c8c8b7572a0986" +checksum = "70c44a72e830f0e40ad90dda8a6ab6ed6314d39776599a58a2e5e37fbc6db5b9" dependencies = [ "cc", "libc", @@ -491,7 +491,7 @@ dependencies = [ "openssl-sys", "pkg-config", "vcpkg", - "winapi", + "windows-sys", ] [[package]] @@ -548,7 +548,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.37", ] [[package]] @@ -600,7 +600,7 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.37", ] [[package]] @@ -811,7 +811,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.37", ] [[package]] @@ -964,9 +964,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "http" @@ -1397,9 +1397,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.147" +version = "0.2.148" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" [[package]] name = "libm" @@ -1650,7 +1650,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.37", ] [[package]] @@ -1882,7 +1882,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.37", ] [[package]] @@ -1997,9 +1997,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" dependencies = [ "unicode-ident", ] @@ -2227,9 +2227,9 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustix" -version = "0.38.13" +version = "0.38.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662" +checksum = "747c788e9ce8e92b12cd485c49ddf90723550b654b32508f979b71a7b1ecda4f" dependencies = [ "bitflags 2.4.0", "errno", @@ -2261,9 +2261,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.101.4" +version = "0.101.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" +checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe" dependencies = [ "ring", "untrusted", @@ -2386,14 +2386,14 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.37", ] [[package]] name = "serde_json" -version = "1.0.106" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cc66a619ed80bf7a0f6b17dd063a84b88f6dea1813737cf469aef1d081142c2" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ "itoa", "ryu", @@ -2408,7 +2408,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.37", ] [[package]] @@ -2512,9 +2512,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" [[package]] name = "socket2" @@ -2528,9 +2528,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" dependencies = [ "libc", "windows-sys", @@ -2617,7 +2617,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.32", + "syn 2.0.37", ] [[package]] @@ -2628,9 +2628,9 @@ checksum = "09eab8a83bff89ba2200bd4c59be45c7c787f988431b936099a5a266c957f2f9" [[package]] name = "supports-color" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4950e7174bffabe99455511c39707310e7e9b440364a2fcb1cc21521be57b354" +checksum = "d6398cde53adc3c4557306a96ce67b302968513830a77a95b2b17305d9719a89" dependencies = [ "is-terminal", "is_ci", @@ -2671,9 +2671,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.32" +version = "2.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" +checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" dependencies = [ "proc-macro2", "quote", @@ -2749,7 +2749,7 @@ checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.37", ] [[package]] @@ -2876,7 +2876,7 @@ dependencies = [ "mio", "num_cpus", "pin-project-lite", - "socket2 0.5.3", + "socket2 0.5.4", "tokio-macros", "windows-sys", ] @@ -2889,7 +2889,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.37", ] [[package]] @@ -2940,9 +2940,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" dependencies = [ "bytes", "futures-core", @@ -3062,7 +3062,7 @@ checksum = "84fd902d4e0b9a4b27f2f440108dc034e1758628a9b702f8ec61ad66355422fa" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.37", ] [[package]] @@ -3092,7 +3092,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.37", ] [[package]] @@ -3268,7 +3268,7 @@ dependencies = [ [[package]] name = "typst-lsp" -version = "0.10.0" +version = "0.10.1" dependencies = [ "anyhow", "async-compression", @@ -3321,7 +3321,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.37", ] [[package]] @@ -3358,8 +3358,8 @@ dependencies = [ [[package]] name = "typstfmt_lib" -version = "0.2.4" -source = "git+https://github.com/astrale-sharp/typstfmt?tag=0.2.4#41c834c0021b6f5fb7c603cd4f33a36657a988c9" +version = "0.2.5" +source = "git+https://github.com/astrale-sharp/typstfmt?tag=0.2.5#98b08f5ab033e657c8e81f95c86b111f4fd662a4" dependencies = [ "globmatch", "itertools 0.10.5", @@ -3415,9 +3415,9 @@ checksum = "2281c8c1d221438e373249e065ca4989c4c36952c211ff21a0ee91c44a3869e7" [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-math-class" @@ -3637,7 +3637,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.37", "wasm-bindgen-shared", ] @@ -3671,7 +3671,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.37", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3775,9 +3775,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ "winapi", ] diff --git a/pkgs/development/tools/language-servers/typst-lsp/default.nix b/pkgs/development/tools/language-servers/typst-lsp/default.nix index f6568e0ada636..24d9dfcb00003 100644 --- a/pkgs/development/tools/language-servers/typst-lsp/default.nix +++ b/pkgs/development/tools/language-servers/typst-lsp/default.nix @@ -1,38 +1,27 @@ { lib , rustPlatform , fetchFromGitHub -, fetchpatch , stdenv , darwin }: rustPlatform.buildRustPackage rec { pname = "typst-lsp"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "nvarner"; repo = "typst-lsp"; rev = "v${version}"; - hash = "sha256-rsG7YZjy4UgFGsehlslsrOAD5YMpVVBI2MERlxgniVA="; + hash = "sha256-ZQLxZzWVGwFtU68ASlzBDMz8RHrA0h925u6UDk7vPe4="; }; - patches = [ - # git information isn't available with fetchFromGitHub - # https://github.com/nvarner/typst-lsp/pull/303 - (fetchpatch { - name = "fix-build-when-git-information-is-not-available.patch"; - url = "https://github.com/nvarner/typst-lsp/commit/420de6235eb1aa492337a8cc43b04134a3ffab00.patch"; - hash = "sha256-Rs9pzSUg4YNGzYnX8tbOmCwbPyZ9P18Eyg451fa2Iqg="; - }) - ]; - cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "typst-0.8.0" = "sha256-q2b/PoNwpzarJbIPzokYgZRD2/Oe/XB40C4VXdwL/NA="; "typst-syntax-0.7.0" = "sha256-yrtOmlFAKOqAmhCP7n0HQCOQpU3DWyms5foCdUb9QTg="; - "typstfmt_lib-0.2.4" = "sha256-d0vlZqg0RcRvZM7xYdMLX2/UeolUbqZ9H4drJRRKBmc="; + "typstfmt_lib-0.2.5" = "sha256-+iQOS+WPCWevUFurLfuC5mhuRdJ/1ZsekFoFDzZviag="; }; }; @@ -53,6 +42,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A brand-new language server for Typst"; homepage = "https://github.com/nvarner/typst-lsp"; + mainProgram = "typst-lsp"; changelog = "https://github.com/nvarner/typst-lsp/releases/tag/${src.rev}"; license = with licenses; [ asl20 mit ]; maintainers = with maintainers; [ figsoda GaetanLepage ]; diff --git a/pkgs/development/tools/literate-programming/Literate/default.nix b/pkgs/development/tools/literate-programming/Literate/default.nix index 1a71b9bc857ff..1aabc4c86b3d9 100644 --- a/pkgs/development/tools/literate-programming/Literate/default.nix +++ b/pkgs/development/tools/literate-programming/Literate/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation { buildInputs = [ ldc dub ]; + HOME = "home"; + installPhase = "install -D bin/lit $out/bin/lit"; meta = with lib; { diff --git a/pkgs/development/tools/memray/default.nix b/pkgs/development/tools/memray/default.nix index 438383ef86339..1a7fb2a91dcc0 100644 --- a/pkgs/development/tools/memray/default.nix +++ b/pkgs/development/tools/memray/default.nix @@ -8,13 +8,13 @@ python3.pkgs.buildPythonApplication rec { pname = "memray"; - version = "1.9.1"; + version = "1.10.0"; format = "setuptools"; src = fetchFromGitHub { owner = "bloomberg"; repo = pname; - rev = "refs/tags/v${version}"; + rev = "refs/tags/${version}"; hash = "sha256-DaJ1Hhg7q4ckA5feUx0twOsmy28v5aBBCTUAkn43xAo="; }; @@ -66,6 +66,6 @@ python3.pkgs.buildPythonApplication rec { license = licenses.asl20; maintainers = with maintainers; [ fab ]; platforms = platforms.linux; - changelog = "https://github.com/bloomberg/memray/releases/tag/v${version}"; + changelog = "https://github.com/bloomberg/memray/releases/tag/${version}"; }; } diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix index dea45a573d889..2e61e9a771bc0 100644 --- a/pkgs/development/tools/micronaut/default.nix +++ b/pkgs/development/tools/micronaut/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "4.0.5"; + version = "4.1.1"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip"; - sha256 = "sha256-h2llX5g4f8jSU1pmvzLEn2yLZBte/EoEfYBW9lqfuWk="; + sha256 = "sha256-GlNyzR2kRmeGyheaRcz+CPEh11atHeeVn/Rwn+q1gRA="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix index 984e2ec346e4a..4cd859ed3f5fe 100644 --- a/pkgs/development/tools/misc/act/default.nix +++ b/pkgs/development/tools/misc/act/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "act"; - version = "0.2.50"; + version = "0.2.52"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-NVzONabM1EUsA+PUyJ7hBOZmqs5RYfE0teNO6BMBu7M="; + hash = "sha256-mw0Ul6m8mgx2I3ExoDs5luN4PQXAI0NADTSYt+DFCs8="; }; - vendorHash = "sha256-+MQofGGja4JUSWCctY0CWQ2aYpVrXj4/knqd/TW0PtI="; + vendorHash = "sha256-WoeJ4yB3bTx6I+Ga5X7ZhPfjw3NERp1v/ot5pPsYYLw="; doCheck = false; diff --git a/pkgs/development/tools/misc/ast-grep/default.nix b/pkgs/development/tools/misc/ast-grep/default.nix deleted file mode 100644 index 0b0b7e47ba93d..0000000000000 --- a/pkgs/development/tools/misc/ast-grep/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, stdenv -}: - -rustPlatform.buildRustPackage rec { - pname = "ast-grep"; - version = "0.11.1"; - - src = fetchFromGitHub { - owner = "ast-grep"; - repo = "ast-grep"; - rev = version; - hash = "sha256-1ThEJ8VEcXNScY4zmmXz7BVYs6irE1h9HDxkVvmVq1k="; - }; - - cargoHash = "sha256-3myUFgKktvD9S0Bp7ixsZb59p3iDwmiEKUFD7wB+7IM="; - - # error: linker `aarch64-linux-gnu-gcc` not found - postPatch = '' - rm .cargo/config.toml - ''; - - checkFlags = [ - # disable flaky test - "--skip=test::test_load_parser_mac" - ]; - - meta = with lib; { - mainProgram = "sg"; - description = "A fast and polyglot tool for code searching, linting, rewriting at large scale"; - homepage = "https://ast-grep.github.io/"; - changelog = "https://github.com/ast-grep/ast-grep/blob/${src.rev}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ montchr lord-valen cafkafk ]; - }; -} diff --git a/pkgs/development/tools/misc/autoconf-archive/default.nix b/pkgs/development/tools/misc/autoconf-archive/default.nix index 9b5ca5de570f7..3fbfabcee265f 100644 --- a/pkgs/development/tools/misc/autoconf-archive/default.nix +++ b/pkgs/development/tools/misc/autoconf-archive/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "autoconf-archive"; - version = "2022.09.03"; + version = "2023.02.20"; src = fetchurl { url = "mirror://gnu/autoconf-archive/autoconf-archive-${version}.tar.xz"; - sha256 = "sha256-4HRU8A2MrnkHvtQtB0d5iSeAmUdoTZTDcgek1joy9CM="; + hash = "sha256-cdQEhHmuKPH1eUYZw9ct+cAd9JscYo74X943WW3DGjM="; }; strictDeps = true; diff --git a/pkgs/development/tools/misc/blackfire/php-probe.nix b/pkgs/development/tools/misc/blackfire/php-probe.nix index b8f1c5d306d10..1e6c2b94f2329 100644 --- a/pkgs/development/tools/misc/blackfire/php-probe.nix +++ b/pkgs/development/tools/misc/blackfire/php-probe.nix @@ -12,42 +12,42 @@ let phpMajor = lib.versions.majorMinor php.version; - version = "1.89.0"; + version = "1.90.0"; hashes = { "x86_64-linux" = { system = "amd64"; hash = { - "8.1" = "sha256-hRxg33h78MssWo5CuOxN7X0oPxFU6RMkncs751N1lWg="; - "8.2" = "sha256-uAat8nfTnYiLfAzn0CRrYwrtXQgHYjZIaSnGI8CNSzI="; + "8.1" = "sha256-Cq44SJXe8B/RtVGFDDljDBPVs85ELa1K8B7q1u5SEug="; + "8.2" = "sha256-YZ6rEYfssG8bF40wpEGvW5zb1aoIpo3pM+AEZ7yU74E="; }; }; "i686-linux" = { system = "i386"; hash = { - "8.1" = "sha256-DpCfuq4RpI8078Kq8YJYNONpZT2k85jVIjoiFU2Mj64="; - "8.2" = "sha256-IWkxjy2GBaFUeIJULRsrLrskh5CNW2DDTK5FJKGRuFM="; + "8.1" = "sha256-Gc0kin1z4WLT67lQjfQb1yxZ45bo/q9KV4RQN5zmnTc="; + "8.2" = "sha256-46OF4GMwHFG1CPQJfHI7OrMYGw2hJXgRIFLKcnaKnaI="; }; }; "aarch64-linux" = { system = "arm64"; hash = { - "8.1" = "sha256-cTIbsHHJvKIFgXTlH5jog1uoaUVD4ZkPLj78xtEXqVs="; - "8.2" = "sha256-IDtVd1aE4rUSLKJRHfdbSB0DUm7rCziTG0jmsmMxaGc="; + "8.1" = "sha256-rV4YoqGOOQWK2WR5RY7SQ/xePpD54vA4+Km8rFNpv4g="; + "8.2" = "sha256-9NuJfa/n3/tyiSn7lcrOUhD+eYUuanJsrzVAJ9cYWhs="; }; }; "aarch64-darwin" = { system = "arm64"; hash = { - "8.1" = "sha256-HzLdzqoXkN/D+Dh8RnKiMcV56yaO3IHH5EVbaj4QFpI="; - "8.2" = "sha256-9Agz1s1/576gz7bRPzCPmox09K16KOR1Ah0eozN6itc="; + "8.1" = "sha256-G9cep5apYGFEdTOka3QClteCmEUktLtV8I+oIBzsZ9U="; + "8.2" = "sha256-3wGiekRaGUEHdTpUniPz0Nay2AM0DOQfgFUAC1ezBCs="; }; }; "x86_64-darwin" = { system = "amd64"; hash = { - "8.1" = "sha256-GB+IVCISDAtnXSHNXfxXa7eQcx+dRMiP3LC0haha6bI="; - "8.2" = "sha256-8EpMJ6kTNw5LDS18zSPUj0r1MsUsAoMPuo4Yn6sWbg8="; + "8.1" = "sha256-BKdngfG78U0lHa7MTW1kndeM2umyEn7ns5T4mglLWnA="; + "8.2" = "sha256-02kXdXqj8HuJG0NblkwYPvgiAmbxC19X0xQ7XU2anhg="; }; }; }; diff --git a/pkgs/development/tools/misc/chruby/default.nix b/pkgs/development/tools/misc/chruby/default.nix index cbe223513272e..31e7134e7e87d 100644 --- a/pkgs/development/tools/misc/chruby/default.nix +++ b/pkgs/development/tools/misc/chruby/default.nix @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { description = "Changes the current Ruby"; homepage = "https://github.com/postmodern/chruby"; license = licenses.mit; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; mainProgram = "chruby-exec"; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/misc/complgen/default.nix b/pkgs/development/tools/misc/complgen/default.nix index ac49d7446baba..f69b36fc4bc14 100644 --- a/pkgs/development/tools/misc/complgen/default.nix +++ b/pkgs/development/tools/misc/complgen/default.nix @@ -5,21 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "complgen"; - version = "0.1.3"; + version = "0.1.5"; src = fetchFromGitHub { owner = "adaszko"; repo = "complgen"; rev = "v${version}"; - hash = "sha256-YKJleWnUZodPuJcWX8w06PH6q1SzeUXL8AjYr9i7+sY="; + hash = "sha256-zNYNwPPVlsvQiHy28rWB7OlnriJVktoFrDkJaIO9z8E="; }; - cargoHash = "sha256-ytwhIcm4NeHDRzKNHaxo4ke+gridXKmiKHkPnACXV8o="; - - # Cargo.lock is outdated - postConfigure = '' - cargo metadata --offline - ''; + cargoHash = "sha256-BkflZ/d4TAZjjkQB5f0+rL4Zt7uWBLM3gM2UNKYZz+Q="; meta = with lib; { description = "Generate {bash,fish,zsh} completions from a single EBNF-like grammar"; diff --git a/pkgs/development/tools/misc/dart-sass/default.nix b/pkgs/development/tools/misc/dart-sass/default.nix index 2234e7bb35cda..f379844fa2281 100644 --- a/pkgs/development/tools/misc/dart-sass/default.nix +++ b/pkgs/development/tools/misc/dart-sass/default.nix @@ -13,23 +13,23 @@ let sass-language = fetchFromGitHub { owner = "sass"; repo = "sass"; - rev = "refs/tags/embedded-protocol-2.0.0"; - hash = "sha256-3qk3XbI/DpNj4oa/3ar5hqEY8LNmQsokinuKt4xV7ck="; + rev = "refs/tags/embedded-protocol-2.2.0"; + hash = "sha256-rSjhQZnLL4UXhp8rBIcaEtQyE81utTfljJTkyhQW5wA="; }; in buildDartApplication rec { pname = "dart-sass"; - version = "1.66.1"; + version = "1.68.0"; src = fetchFromGitHub { owner = "sass"; repo = pname; rev = version; - hash = "sha256-2bqYoWG8xGh7HGZyCPLNz/ZWXH29Be12YfYgGTCIVx8="; + hash = "sha256-Q7pXYcEOqROxVMw5irB23i44PwhFz7YWBVJcftzu998="; }; pubspecLockFile = ./pubspec.lock; - vendorHash = "sha256-oLHHKV5tTgEkCzqRscBXMNafKg4jdH2U9MhVY/Myfv4="; + vendorHash = "sha256-ypKiiLW4Zr0rhTLTXzOoRqZsFC3nGzqUhPFdKKIWDmk="; nativeBuildInputs = [ buf diff --git a/pkgs/development/tools/misc/dart-sass/pubspec.lock b/pkgs/development/tools/misc/dart-sass/pubspec.lock index e2fa02f62d966..295a1e9295bc2 100644 --- a/pkgs/development/tools/misc/dart-sass/pubspec.lock +++ b/pkgs/development/tools/misc/dart-sass/pubspec.lock @@ -21,10 +21,10 @@ packages: dependency: "direct dev" description: name: archive - sha256: "0c8368c9b3f0abbc193b9d6133649a614204b528982bebc7026372d61677ce3a" + sha256: e0902a06f0e00414e4e3438a084580161279f137aeb862274710f29ec10cf01e url: "https://pub.dev" source: hosted - version: "3.3.7" + version: "3.3.9" args: dependency: "direct main" description: @@ -145,6 +145,14 @@ packages: url: "https://pub.dev" source: hosted version: "6.3.0" + ffi: + dependency: transitive + description: + name: ffi + sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878" + url: "https://pub.dev" + source: hosted + version: "2.1.0" file: dependency: transitive description: @@ -277,10 +285,10 @@ packages: dependency: "direct main" description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" mime: dependency: transitive description: @@ -289,6 +297,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.4" + native_synchronization: + dependency: "direct main" + description: + name: native_synchronization + sha256: ff200fe0a64d733ff7d4dde2005271c297db81007604c8cd21037959858133ab + url: "https://pub.dev" + source: hosted + version: "0.2.0" node_interop: dependency: "direct main" description: @@ -597,10 +613,10 @@ packages: dependency: transitive description: name: webkit_inspection_protocol - sha256: "67d3a8b6c79e1987d19d848b0892e582dbb0c66c57cc1fef58a177dd2aa2823d" + sha256: "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.2.1" xml: dependency: transitive description: diff --git a/pkgs/development/tools/misc/devspace/default.nix b/pkgs/development/tools/misc/devspace/default.nix index 7a099a2258c3d..4f657ff3b6d4d 100644 --- a/pkgs/development/tools/misc/devspace/default.nix +++ b/pkgs/development/tools/misc/devspace/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-xAK06bpl8BGsVUu6O1C2l+tzeiCQoRUMIUtwntUZVvU="; }; - vendorSha256 = null; + vendorHash = null; ldflags = [ "-s" diff --git a/pkgs/development/tools/misc/funzzy/default.nix b/pkgs/development/tools/misc/funzzy/default.nix index 7b144d5ba76fa..cc70cbeaf9559 100644 --- a/pkgs/development/tools/misc/funzzy/default.nix +++ b/pkgs/development/tools/misc/funzzy/default.nix @@ -7,26 +7,21 @@ rustPlatform.buildRustPackage rec { pname = "funzzy"; - version = "1.0.1"; + version = "1.1.1"; src = fetchFromGitHub { owner = "cristianoliveira"; repo = "funzzy"; rev = "v${version}"; - hash = "sha256-Qqj/omtjUVtsjMh2LMmwlJ4d8fIwMT7mdD4odzI49u8="; + hash = "sha256-sgfMxSbOBn2Ps6hqrFDm3x9QOnMvtMgO7gAt6kk0cIs="; }; - cargoHash = "sha256-pv05r5irKULRvik8kWyuT7/sr7GUDj0oExyyoGrMD6k="; + cargoHash = "sha256-If8iBvwiaH1jK8z06ORY/lx+7HAT4InxbjoLe289kws="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; - # Cargo.lock is outdated - preConfigure = '' - cargo metadata --offline - ''; - meta = with lib; { description = "A lightweight watcher"; homepage = "https://github.com/cristianoliveira/funzzy"; diff --git a/pkgs/development/tools/misc/go-md2man/default.nix b/pkgs/development/tools/misc/go-md2man/default.nix index a1481fe2d3850..e86577ba859b8 100644 --- a/pkgs/development/tools/misc/go-md2man/default.nix +++ b/pkgs/development/tools/misc/go-md2man/default.nix @@ -4,7 +4,7 @@ buildGoModule rec { pname = "go-md2man"; version = "2.0.2"; - vendorSha256 = null; + vendorHash = null; src = fetchFromGitHub { rev = "v${version}"; diff --git a/pkgs/development/tools/misc/gperf/3.0.x.nix b/pkgs/development/tools/misc/gperf/3.0.x.nix index f83b245417ee5..8a2fdf6ec4b31 100644 --- a/pkgs/development/tools/misc/gperf/3.0.x.nix +++ b/pkgs/development/tools/misc/gperf/3.0.x.nix @@ -10,7 +10,18 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook ]; - patches = [ ./gperf-ar-fix.patch ]; + patches = [ + ./gperf-ar-fix.patch + # Clang 16 defaults to C++17, which does not allow `register` as a storage class specifier. + ./gperf-c++17-register-fix.patch + ]; + + # Replace the conditional inclusion of `string.h` on VMS with unconditional inclusion on all + # platforms. Otherwise, clang 16 fails to build gperf due to use of undeclared library functions. + postPatch = '' + sed '/#ifdef VMS/{N;N;N;N;N;s/.*/#include <string.h>/}' -i lib/getopt.c + ''; + meta = { description = "Perfect hash function generator"; diff --git a/pkgs/development/tools/misc/kibana/7.x.nix b/pkgs/development/tools/misc/kibana/7.x.nix index eaf5247a41652..a4faa31a4214c 100644 --- a/pkgs/development/tools/misc/kibana/7.x.nix +++ b/pkgs/development/tools/misc/kibana/7.x.nix @@ -15,12 +15,12 @@ let info = lib.splitString "-" stdenv.hostPlatform.system; arch = elemAt info 0; plat = elemAt info 1; - shas = + hashes = { - x86_64-linux = "d3d5e8906e64ae3c469e4df80e1c692ce1912e36f68ddf36b99b7019faf34aebaa329061904a6d2b6a32486c6e19d1c5f2ea30c25479a7960ed93bc1c0cb1691"; - x86_64-darwin = "72a4499efbbbdf425f92beafc1b1d416e66e6ded60e76d9c9af9c3c13ce11862ba54dffbfbd5cbdef6afaad50f0d57532d3524f83acd88840aecc6891f748732"; - aarch64-linux = "ce1b584e1cf98f8fb0e602352564a71efef4f53936dde7a056caed62675a6216624f0db2bc24d8239b8d01f06306bf173dda7a08a1787ba061db01ca0d88359a"; - aarch64-darwin = "72a4499efbbbdf425f92beafc1b1d416e66e6ded60e76d9c9af9c3c13ce11862ba54dffbfbd5cbdef6afaad50f0d57532d3524f83acd88840aecc6891f748732"; + x86_64-linux = "sha512-09XokG5krjxGnk34DhxpLOGRLjb2jd82uZtwGfrzSuuqMpBhkEptK2oySGxuGdHF8uowwlR5p5YO2TvBwMsWkQ=="; + x86_64-darwin = "sha512-cqRJnvu730Jfkr6vwbHUFuZube1g522cmvnDwTzhGGK6VN/7+9XL3vavqtUPDVdTLTUk+DrNiIQK7MaJH3SHMg=="; + aarch64-linux = "sha512-zhtYThz5j4+w5gI1JWSnHv709Tk23eegVsrtYmdaYhZiTw2yvCTYI5uNAfBjBr8XPdp6CKF4e6Bh2wHKDYg1mg=="; + aarch64-darwin = "sha512-cqRJnvu730Jfkr6vwbHUFuZube1g522cmvnDwTzhGGK6VN/7+9XL3vavqtUPDVdTLTUk+DrNiIQK7MaJH3SHMg=="; }; in stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://artifacts.elastic.co/downloads/kibana/${pname}-${version}-${plat}-${arch}.tar.gz"; - sha512 = shas.${stdenv.hostPlatform.system} or (throw "Unknown architecture"); + hash = hashes.${stdenv.hostPlatform.system} or (throw "Unknown architecture"); }; patches = [ @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Visualize logs and time-stamped data"; homepage = "http://www.elasticsearch.org/overview/kibana"; - license = licenses.elastic; + license = licenses.elastic20; maintainers = with maintainers; [ offline basvandijk ]; platforms = with platforms; unix; }; diff --git a/pkgs/development/tools/misc/linuxkit/default.nix b/pkgs/development/tools/misc/linuxkit/default.nix index 3a7a7836df986..73ea58a17e4d7 100644 --- a/pkgs/development/tools/misc/linuxkit/default.nix +++ b/pkgs/development/tools/misc/linuxkit/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-8x9oJaYb/mN2TUaVrGOYi5/6TETD78jif0SwCSc0kyo="; }; - vendorSha256 = null; + vendorHash = null; modRoot = "./src/cmd/linuxkit"; diff --git a/pkgs/development/tools/misc/msitools/default.nix b/pkgs/development/tools/misc/msitools/default.nix index 84d699311b5ea..66571e887e418 100644 --- a/pkgs/development/tools/misc/msitools/default.nix +++ b/pkgs/development/tools/misc/msitools/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "msitools"; - version = "0.102"; + version = "0.103"; src = fetchurl { url = "mirror://gnome/sources/msitools/${lib.versions.majorMinor version}/msitools-${version}.tar.xz"; - hash = "sha256-+khaQhOX71/gLfWrk/ztkav2hXMPQPlMcVe0MNJKNJg="; + hash = "sha256-0XYi7rvzf6TAm1m+C8jbCLJr4wCmcxx02h684mK86Dk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/misc/nix-build-uncached/default.nix b/pkgs/development/tools/misc/nix-build-uncached/default.nix index 840bea3eb3e9b..960b744dc738b 100644 --- a/pkgs/development/tools/misc/nix-build-uncached/default.nix +++ b/pkgs/development/tools/misc/nix-build-uncached/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-n9Koi01Te77bpYbRX46UThyD2FhCu9OGHd/6xDQLqjQ="; }; - vendorSha256 = null; + vendorHash = null; doCheck = false; diff --git a/pkgs/development/tools/misc/one_gadget/Gemfile.lock b/pkgs/development/tools/misc/one_gadget/Gemfile.lock index db20c8b0ffdce..202e17ebdb77b 100644 --- a/pkgs/development/tools/misc/one_gadget/Gemfile.lock +++ b/pkgs/development/tools/misc/one_gadget/Gemfile.lock @@ -1,10 +1,10 @@ GEM remote: https://rubygems.org/ specs: - bindata (2.4.4) - elftools (1.1.0) + bindata (2.4.15) + elftools (1.1.3) bindata (~> 2) - one_gadget (1.7.2) + one_gadget (1.8.1) elftools (>= 1.0.2, < 1.2.0) PLATFORMS @@ -14,4 +14,4 @@ DEPENDENCIES one_gadget BUNDLED WITH - 2.1.4 + 2.4.19 diff --git a/pkgs/development/tools/misc/one_gadget/default.nix b/pkgs/development/tools/misc/one_gadget/default.nix index c3d0a6b57b454..6ad2c909c39a1 100644 --- a/pkgs/development/tools/misc/one_gadget/default.nix +++ b/pkgs/development/tools/misc/one_gadget/default.nix @@ -1,10 +1,16 @@ -{ lib, bundlerApp, bundlerUpdateScript }: +{ lib, binutils, bundlerApp, bundlerUpdateScript, makeWrapper }: bundlerApp { pname = "one_gadget"; gemdir = ./.; exes = [ "one_gadget" ]; + nativeBuildInputs = [ makeWrapper ]; + + postBuild = '' + wrapProgram $out/bin/one_gadget --prefix PATH : ${binutils}/bin + ''; + passthru.updateScript = bundlerUpdateScript "one_gadget"; meta = with lib; { diff --git a/pkgs/development/tools/misc/one_gadget/gemset.nix b/pkgs/development/tools/misc/one_gadget/gemset.nix index 89425f805b43e..98227bdbe7e5d 100644 --- a/pkgs/development/tools/misc/one_gadget/gemset.nix +++ b/pkgs/development/tools/misc/one_gadget/gemset.nix @@ -4,10 +4,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kz42nvxnk1j9cj0i8lcnhprcgdqsqska92g6l19ziadydfk2gqy"; + sha256 = "04y4zgh4bbcb8wmkxwfqg4saky1d1f3xw8z6yk543q13h8ky8rz5"; type = "gem"; }; - version = "2.4.4"; + version = "2.4.15"; }; elftools = { dependencies = ["bindata"]; @@ -15,10 +15,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kdf0ck4rzxpd006y09rfwppdrqb3sxww4gzfpv2053yq4mkimbn"; + sha256 = "0p96wj4sz3sfv9yxyl8z530554bkbf82vj24w6x7yf91qa1p8z6i"; type = "gem"; }; - version = "1.1.0"; + version = "1.1.3"; }; one_gadget = { dependencies = ["elftools"]; @@ -26,9 +26,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07s2nigjw1yik895gliz3a7ps0m9j5nccq82zwdd30sv740jmf5b"; + sha256 = "0dwsmjhr9i8gwwbbpiyddbhcx74cvqqk90a5l8zbsjhjfs679irc"; type = "gem"; }; - version = "1.7.2"; + version = "1.8.1"; }; } diff --git a/pkgs/development/tools/misc/orogene/default.nix b/pkgs/development/tools/misc/orogene/default.nix index a3e0deffa8a86..2433507f3f5fa 100644 --- a/pkgs/development/tools/misc/orogene/default.nix +++ b/pkgs/development/tools/misc/orogene/default.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage rec { pname = "orogene"; - version = "0.3.27"; + version = "0.3.33"; src = fetchFromGitHub { owner = "orogene"; repo = "orogene"; rev = "v${version}"; - hash = "sha256-y58S8oou1GBR1Cx77IzLvLmZ/MN88P9k1RGCFOVbHHc="; + hash = "sha256-HG+/m/ZomlGu/ATHqZjhjo/pjncVBZLOP6UlcCOyLKc="; fetchSubmodules = true; }; - cargoHash = "sha256-hZQxzhq61h83geLazhEkoaB1oRz/xSXuwW7BuBWxfHs="; + cargoHash = "sha256-iygP+x1uEHUpUGaxQjt50sFd5ZWpFxOqPvnkGqIvh6A="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix index 33a15ba5132bd..d0deaa76fc5f9 100644 --- a/pkgs/development/tools/misc/patchelf/unstable.nix +++ b/pkgs/development/tools/misc/patchelf/unstable.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "patchelf"; - version = "unstable-2023-09-19"; + version = "unstable-2023-09-27"; src = fetchFromGitHub { owner = "NixOS"; repo = "patchelf"; - rev = "afd3cc94450dc6845e923f9221fa38818538219e"; - sha256 = "sha256-ZTy3Dw2HkKokBUXz3ftoGCYncVQ/K3lons9mIt+HVvQ="; + rev = "917ea45b79de04f69059f42a8e2621f7caeae1c9"; + sha256 = "sha256-pP/DBhsYFpYQ7RqB4+1Iy9B1jPlC1rNT3aZhhr1Z9EU="; }; # Drop test that fails on musl (?) diff --git a/pkgs/development/tools/misc/rsonpath/default.nix b/pkgs/development/tools/misc/rsonpath/default.nix index b078030d8cecf..30f04fe959873 100644 --- a/pkgs/development/tools/misc/rsonpath/default.nix +++ b/pkgs/development/tools/misc/rsonpath/default.nix @@ -5,22 +5,22 @@ rustPlatform.buildRustPackage rec { pname = "rsonpath"; - version = "0.8.0"; + version = "0.8.2"; src = fetchFromGitHub { owner = "v0ldek"; repo = "rsonpath"; rev = "v${version}"; - hash = "sha256-WrapSvWoaBVxlpCxau70Et5K9tRs84xsXBDWsuoFI+E="; + hash = "sha256-3/xhYfo23aps3UjjUEcuLYg8JALfIpbCf6LO0F2IS20="; }; - cargoHash = "sha256-fGu6eypizOGHCiyAeH7nCLHyfVLMBPNU1xmqfVGhSzw="; + cargoHash = "sha256-2HVPqSkQU90ZAFG0tPbysCVIkd433fpTtTO1y4+ZUTU="; cargoBuildFlags = [ "-p=rsonpath" ]; cargoTestFlags = cargoBuildFlags; meta = with lib; { - description = "Blazing fast Rust JSONPath query engine"; + description = "Experimental JSONPath engine for querying massive streamed datasets"; homepage = "https://github.com/v0ldek/rsonpath"; changelog = "https://github.com/v0ldek/rsonpath/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/development/tools/misc/runme/default.nix b/pkgs/development/tools/misc/runme/default.nix index dfae5be83c536..00d3c115c3e2f 100644 --- a/pkgs/development/tools/misc/runme/default.nix +++ b/pkgs/development/tools/misc/runme/default.nix @@ -1,5 +1,5 @@ { lib -, buildGoModule +, buildGo121Module , fetchFromGitHub , installShellFiles , nodejs @@ -9,18 +9,18 @@ , runme }: -buildGoModule rec { +buildGo121Module rec { pname = "runme"; - version = "1.7.3"; + version = "1.7.5"; src = fetchFromGitHub { owner = "stateful"; repo = "runme"; rev = "v${version}"; - hash = "sha256-3NCD9kagcxW8Ahet20imFYqo3G7nkR1iPM0C5tQX72o="; + hash = "sha256-cy4IUsCMh0sFpHLFce3DW4KAMYT2/BtvKBHKPpkCggQ="; }; - vendorHash = "sha256-sGk2K0I9onGFpDwboRugNHjFictisY4Q0NTNnOT3BW4="; + vendorHash = "sha256-vfLLL/sV8Jg/QE4oT45XLXAwvlLep3ehtPwXbpwo5PQ="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/development/tools/misc/scc/default.nix b/pkgs/development/tools/misc/scc/default.nix index 40b41d8df9ed9..aef335756f871 100644 --- a/pkgs/development/tools/misc/scc/default.nix +++ b/pkgs/development/tools/misc/scc/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-QViB9lS/znrFb7GoV0RUf1SwS7veTKlmFozWKM1zc+Y="; }; - vendorSha256 = null; + vendorHash = null; # scc has a scripts/ sub-package that's for testing. excludedPackages = [ "scripts" ]; diff --git a/pkgs/development/tools/misc/src-cli/default.nix b/pkgs/development/tools/misc/src-cli/default.nix index d8d3ffd4bf533..28088a89b3382 100644 --- a/pkgs/development/tools/misc/src-cli/default.nix +++ b/pkgs/development/tools/misc/src-cli/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "src-cli"; - version = "5.1.2"; + version = "5.2.0"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "src-cli"; rev = version; - hash = "sha256-byfmZQDYn76/0K/ByKePXF+eWVZNCnAqu5k6UN7Iijg="; + hash = "sha256-QUcN71Zvg9BSQHXu8ANye9BOX5cDgMgl2jfhUgz/GVE="; }; - vendorHash = "sha256-DASjCyOY9+USRYrnIS+Li4zhBnZNoyxUgN9LqhIAMh8="; + vendorHash = "sha256-YhaxgEGYKrRZagnpoMi/mGWXVkbp5fUjQ73xDFdTElw="; subPackages = [ "cmd/src" diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/development/tools/misc/terraform-ls/default.nix index 22f30c28770bd..9e67586220822 100644 --- a/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/pkgs/development/tools/misc/terraform-ls/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terraform-ls"; - version = "0.31.5"; + version = "0.32.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - hash = "sha256-vpPvmWcmA0m2D1M67pcpJwT7oRM1IL56e7LgWWl+YFE="; + hash = "sha256-GZZUqTs0CXWYJs6R2Iy0TkAO1FJ/b60UTNVWq0n0bgo="; }; - vendorHash = "sha256-jrpgMweoA/ZzSDdjc/ZvZcYArg8f6XPZCbznz6yGPfI="; + vendorHash = "sha256-z/7WQKoUNaugtDuvCjurUM6BgKYLt3nJMg8pnkj+Wsg="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/development/tools/misc/terraform-lsp/default.nix b/pkgs/development/tools/misc/terraform-lsp/default.nix index 1f35f7696232b..332913e711309 100644 --- a/pkgs/development/tools/misc/terraform-lsp/default.nix +++ b/pkgs/development/tools/misc/terraform-lsp/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "111350jbq0dp0qhk48j12hrlisd1fwzqpcv357igrbqf6ki7r78q"; }; - vendorSha256 = null; + vendorHash = null; ldflags = [ "-s" "-w" "-X main.Version=${version}" "-X main.GitCommit=${src.rev}" ]; diff --git a/pkgs/development/tools/misc/terramate/default.nix b/pkgs/development/tools/misc/terramate/default.nix index 92de3805149b9..b6efe2732dcac 100644 --- a/pkgs/development/tools/misc/terramate/default.nix +++ b/pkgs/development/tools/misc/terramate/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "terramate"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "terramate-io"; repo = "terramate"; rev = "v${version}"; - hash = "sha256-bi/O4yG9m8uefY9CSn3yFmotxlFZz53cJG8SI1Zk1/4="; + hash = "sha256-aOKUC1FtDDhdUbPUSLW6GrSwh6r29Y2ObC6y487W4Zc="; }; vendorHash = "sha256-gl5xsaSkGXlh+MfieVBPHGAbYZVF3GBbIkmvVhlJvqw="; diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index 3d4e643674540..e33a288286ee2 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -15,16 +15,16 @@ let in rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "5.9.2"; + version = "5.10.0"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "texlab"; rev = "refs/tags/v${version}"; - hash = "sha256-ZWvxi000wxjCzAe8PnzLb3z7smBc95gky0WyrkzVmEc="; + hash = "sha256-MTWaGgDIDo3CaRHyHWqliKsPdbU/TZPsyfF7SoHTnhk="; }; - cargoHash = "sha256-ohovhwm/lIcNRorHtiluBVVVLIsaft/godDmte2hl9M="; + cargoHash = "sha256-8Vrp4d5luf91pKpUC4wWn4otsanqopCHwCjcnfTzyLk="; outputs = [ "out" ] ++ lib.optional (!isCross) "man"; diff --git a/pkgs/development/tools/misc/topiary/Cargo.lock b/pkgs/development/tools/misc/topiary/Cargo.lock index 0314a5cdf35b9..0b0af1fcb05db 100644 --- a/pkgs/development/tools/misc/topiary/Cargo.lock +++ b/pkgs/development/tools/misc/topiary/Cargo.lock @@ -3,6 +3,21 @@ version = 3 [[package]] +name = "addr2line" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] name = "aho-corasick" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -43,15 +58,15 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" +checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" [[package]] name = "anstyle-parse" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" dependencies = [ "utf8parse", ] @@ -77,9 +92,9 @@ dependencies = [ [[package]] name = "assert_cmd" -version = "2.0.11" +version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d6b683edf8d1119fe420a94f8a7e389239666aa72e65495d91c00462510151" +checksum = "88903cb14723e4d4003335bb7f8a14f27691649105346a0f0957466c096adfe6" dependencies = [ "anstyle", "bstr", @@ -91,6 +106,18 @@ dependencies = [ ] [[package]] +name = "async-scoped" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e7a6a57c8aeb40da1ec037f5d455836852f7a57e69e1b1ad3d8f38ac1d6cadf" +dependencies = [ + "futures", + "pin-project", + "slab", + "tokio", +] + +[[package]] name = "async-stream" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -109,40 +136,49 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.26", ] [[package]] -name = "atty" -version = "0.2.14" +name = "autocfg" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" dependencies = [ - "hermit-abi 0.1.19", + "addr2line", + "cc", + "cfg-if", "libc", - "winapi", + "miniz_oxide", + "object", + "rustc-demangle", ] [[package]] -name = "autocfg" -version = "1.1.0" +name = "bitflags" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "1.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" [[package]] name = "bstr" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5" +checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" dependencies = [ "memchr", - "once_cell", "regex-automata", "serde", ] @@ -167,9 +203,12 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] [[package]] name = "cfg-if" @@ -206,36 +245,9 @@ dependencies = [ [[package]] name = "clap" -version = "2.34.0" +version = "4.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "ansi_term", - "atty", - "bitflags", - "strsim 0.8.0", - "textwrap 0.11.0", - "unicode-width", - "vec_map", -] - -[[package]] -name = "clap" -version = "3.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" -dependencies = [ - "bitflags", - "clap_lex 0.2.4", - "indexmap", - "textwrap 0.16.0", -] - -[[package]] -name = "clap" -version = "4.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca8f255e4b8027970e78db75e78831229c9815fdbfa67eb1a1b777a62e24b4a0" +checksum = "c27cdf28c0f604ba3f512b0c9a409f8de8513e4816705deb0498b627e7c3a3fd" dependencies = [ "clap_builder", "clap_derive", @@ -244,36 +256,36 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.3" +version = "4.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acd4f3c17c83b0ba34ffbc4f8bbd74f079413f747f84a6f89292f138057e36ab" +checksum = "08a9f1ab5e9f01a9b81f202e8562eb9a10de70abf9eaeac1be465c28b75aa4aa" dependencies = [ "anstream", "anstyle", - "bitflags", - "clap_lex 0.5.0", - "strsim 0.10.0", + "clap_lex", + "strsim", + "terminal_size", ] [[package]] -name = "clap_derive" -version = "4.3.2" +name = "clap_complete" +version = "4.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f" +checksum = "4110a1e6af615a9e6d0a36f805d5c99099f8bab9b8042f5bc1fa220a4a89e36f" dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "syn 2.0.18", + "clap", ] [[package]] -name = "clap_lex" -version = "0.2.4" +name = "clap_derive" +version = "4.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" dependencies = [ - "os_str_bytes", + "heck", + "proc-macro2", + "quote", + "syn 2.0.26", ] [[package]] @@ -290,20 +302,20 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "criterion" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb" +checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" dependencies = [ "anes", - "atty", "cast", "ciborium", - "clap 3.2.25", + "clap", "criterion-plot", "futures", - "itertools", - "lazy_static", + "is-terminal", + "itertools 0.10.5", "num-traits", + "once_cell", "oorandom", "plotters", "rayon", @@ -322,7 +334,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" dependencies = [ "cast", - "itertools", + "itertools 0.10.5", ] [[package]] @@ -348,9 +360,9 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.14" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", "cfg-if", @@ -361,45 +373,14 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if", ] [[package]] -name = "csv" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086" -dependencies = [ - "csv-core", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "csv-core" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" -dependencies = [ - "memchr", -] - -[[package]] -name = "ctor" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[package]] name = "diff" version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -421,16 +402,6 @@ dependencies = [ ] [[package]] -name = "dirs-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if", - "dirs-sys-next", -] - -[[package]] name = "dirs-sys" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -443,17 +414,6 @@ dependencies = [ ] [[package]] -name = "dirs-sys-next" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] name = "doc-comment" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -466,12 +426,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] -name = "encode_unicode" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" - -[[package]] name = "env_logger" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -485,6 +439,12 @@ dependencies = [ ] [[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] name = "errno" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -515,6 +475,15 @@ dependencies = [ ] [[package]] +name = "float-cmp" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" +dependencies = [ + "num-traits", +] + +[[package]] name = "futures" version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -570,7 +539,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.26", ] [[package]] @@ -615,6 +584,12 @@ dependencies = [ ] [[package]] +name = "gimli" +version = "0.27.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" + +[[package]] name = "half" version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -622,18 +597,9 @@ checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "heck" -version = "0.3.3" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" [[package]] name = "heck" @@ -643,27 +609,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "humantime" @@ -673,15 +621,21 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "indexmap" -version = "1.9.3" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" dependencies = [ - "autocfg", + "equivalent", "hashbrown", ] [[package]] +name = "indoc" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c785eefb63ebd0e33416dfcb8d6da0bf27ce752843a45632a67bf10d4d4b5c4" + +[[package]] name = "instant" version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -696,20 +650,19 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.1", + "hermit-abi", "libc", "windows-sys", ] [[package]] name = "is-terminal" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", - "rustix", + "hermit-abi", + "rustix 0.38.4", "windows-sys", ] @@ -723,10 +676,19 @@ dependencies = [ ] [[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + +[[package]] name = "itoa" -version = "1.0.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "js-sys" @@ -738,16 +700,10 @@ dependencies = [ ] [[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] name = "libc" -version = "0.2.146" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "linux-raw-sys" @@ -756,6 +712,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] +name = "linux-raw-sys" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" + +[[package]] name = "log" version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -769,14 +731,29 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memoffset" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] [[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] + +[[package]] +name = "normalize-line-endings" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" + +[[package]] name = "num-traits" version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -787,15 +764,24 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi", "libc", ] [[package]] +name = "object" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +dependencies = [ + "memchr", +] + +[[package]] name = "once_cell" version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -814,34 +800,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] -name = "os_str_bytes" -version = "6.5.1" +name = "pad" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac" +checksum = "d2ad9b889f1b12e0b9ee24db044b5129150d5eada288edc800f789928dc8c0e3" +dependencies = [ + "unicode-width", +] [[package]] -name = "output_vt100" -version = "0.1.3" +name = "pin-project" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" dependencies = [ - "winapi", + "pin-project-internal", ] [[package]] -name = "pad" -version = "0.1.6" +name = "pin-project-internal" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2ad9b889f1b12e0b9ee24db044b5129150d5eada288edc800f789928dc8c0e3" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ - "unicode-width", + "proc-macro2", + "quote", + "syn 2.0.26", ] [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -851,9 +842,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "plotters" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b639e642295546c50fcd545198c9d64ee2a38620a628724a3b266d5fbf97" +checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" dependencies = [ "num-traits", "plotters-backend", @@ -864,15 +855,15 @@ dependencies = [ [[package]] name = "plotters-backend" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142" +checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" [[package]] name = "plotters-svg" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a81d2759aae1dae668f783c308bc5c8ebd191ff4184aaa1b37f65a6ae5a56f" +checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" dependencies = [ "plotters-backend", ] @@ -885,8 +876,11 @@ checksum = "09963355b9f467184c04017ced4a2ba2d75cbcb4e7462690d388233253d4b1a9" dependencies = [ "anstyle", "difflib", - "itertools", + "float-cmp", + "itertools 0.10.5", + "normalize-line-endings", "predicates-core", + "regex", ] [[package]] @@ -907,13 +901,11 @@ dependencies = [ [[package]] name = "pretty_assertions" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755" +checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" dependencies = [ - "ctor", "diff", - "output_vt100", "yansi", ] @@ -925,62 +917,22 @@ checksum = "8ff1fec61082821f8236cf6c0c14e8172b62ce8a72a0eedc30d3b247bb68dc11" dependencies = [ "ansi_term", "pad", - "prettytable-rs", - "structopt", -] - -[[package]] -name = "prettytable-rs" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eea25e07510aa6ab6547308ebe3c036016d162b8da920dbb079e3ba8acf3d95a" -dependencies = [ - "csv", - "encode_unicode", - "is-terminal", - "lazy_static", - "term", - "unicode-width", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", ] [[package]] name = "proc-macro2" -version = "1.0.60" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.28" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +checksum = "5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0" dependencies = [ "proc-macro2", ] @@ -1013,7 +965,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -1022,7 +974,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -1038,52 +990,71 @@ dependencies = [ [[package]] name = "regex" -version = "1.8.4" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" +checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" dependencies = [ "aho-corasick", "memchr", + "regex-automata", "regex-syntax", ] [[package]] name = "regex-automata" -version = "0.1.10" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] [[package]] name = "regex-syntax" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustix" -version = "0.37.20" +version = "0.37.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0" +checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", "io-lifetimes", "libc", - "linux-raw-sys", + "linux-raw-sys 0.3.8", "windows-sys", ] [[package]] -name = "rustversion" -version = "1.0.12" +name = "rustix" +version = "0.38.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" +checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" +dependencies = [ + "bitflags 2.3.3", + "errno", + "libc", + "linux-raw-sys 0.4.3", + "windows-sys", +] [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "same-file" @@ -1096,15 +1067,15 @@ dependencies = [ [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.164" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" +checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" dependencies = [ "serde_derive", ] @@ -1120,20 +1091,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.164" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" +checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.26", ] [[package]] name = "serde_json" -version = "1.0.96" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" dependencies = [ "itoa", "ryu", @@ -1142,9 +1113,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d" +checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" dependencies = [ "serde", ] @@ -1160,41 +1131,11 @@ dependencies = [ [[package]] name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] -name = "strsim" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] -name = "structopt" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" -dependencies = [ - "clap 2.34.0", - "lazy_static", - "structopt-derive", -] - -[[package]] -name = "structopt-derive" -version = "0.4.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" -dependencies = [ - "heck 0.3.3", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] name = "syn" version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1207,9 +1148,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.18" +version = "2.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" +checksum = "45c3457aacde3c65315de5031ec191ce46604304d2446e803d71ade03308d970" dependencies = [ "proc-macro2", "quote", @@ -1226,28 +1167,27 @@ dependencies = [ "cfg-if", "fastrand", "redox_syscall 0.3.5", - "rustix", + "rustix 0.37.23", "windows-sys", ] [[package]] -name = "term" -version = "0.7.0" +name = "termcolor" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" dependencies = [ - "dirs-next", - "rustversion", - "winapi", + "winapi-util", ] [[package]] -name = "termcolor" -version = "1.2.0" +name = "terminal_size" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" dependencies = [ - "winapi-util", + "rustix 0.37.23", + "windows-sys", ] [[package]] @@ -1258,9 +1198,9 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "test-log" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f0c854faeb68a048f0f2dc410c5ddae3bf83854ef0e4977d58306a5edef50e" +checksum = "d9601d162c1d77e62c1ea0bc8116cd1caf143ce3af947536c3c9052a1677fe0c" dependencies = [ "proc-macro2", "quote", @@ -1268,38 +1208,23 @@ dependencies = [ ] [[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" - -[[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.26", ] [[package]] @@ -1314,15 +1239,14 @@ dependencies = [ [[package]] name = "tokio" -version = "1.28.2" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ - "autocfg", + "backtrace", "num_cpus", "pin-project-lite", "tokio-macros", - "windows-sys", ] [[package]] @@ -1333,7 +1257,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.26", ] [[package]] @@ -1362,9 +1286,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec" +checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" dependencies = [ "serde", "serde_spanned", @@ -1374,18 +1298,18 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.10" +version = "0.19.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739" +checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" dependencies = [ "indexmap", "serde", @@ -1396,13 +1320,13 @@ dependencies = [ [[package]] name = "topiary" -version = "0.2.3" +version = "0.3.0" dependencies = [ - "clap 4.3.3", + "clap", "criterion", "env_logger", "futures", - "itertools", + "itertools 0.11.0", "log", "pretty_assertions", "prettydiff", @@ -1418,6 +1342,7 @@ dependencies = [ "tree-sitter-json", "tree-sitter-nickel", "tree-sitter-ocaml", + "tree-sitter-ocamllex", "tree-sitter-query", "tree-sitter-rust", "tree-sitter-toml", @@ -1427,26 +1352,42 @@ dependencies = [ [[package]] name = "topiary-cli" -version = "0.2.3" +version = "0.3.0" dependencies = [ "assert_cmd", - "clap 4.3.3", + "async-scoped", + "clap", + "clap_complete", "directories", "env_logger", + "futures", + "indoc", + "itertools 0.11.0", "log", + "predicates", "serde-toml-merge", "tempfile", "tokio", "toml", "topiary", + "topiary-queries", + "tree-sitter-bash", + "tree-sitter-facade", + "tree-sitter-json", + "tree-sitter-nickel", + "tree-sitter-ocaml", + "tree-sitter-ocamllex", + "tree-sitter-query", + "tree-sitter-rust", + "tree-sitter-toml", ] [[package]] name = "topiary-playground" -version = "0.2.3" +version = "0.3.0" dependencies = [ "cfg-if", - "itertools", + "itertools 0.11.0", "topiary", "tree-sitter-facade", "wasm-bindgen", @@ -1454,6 +1395,10 @@ dependencies = [ ] [[package]] +name = "topiary-queries" +version = "0.3.0" + +[[package]] name = "tree-sitter" version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1466,7 +1411,7 @@ dependencies = [ [[package]] name = "tree-sitter-bash" version = "0.19.0" -source = "git+https://github.com/tree-sitter/tree-sitter-bash#b338fa9f4807b9e0336cd4dde04948a8c324a4cf" +source = "git+https://github.com/tree-sitter/tree-sitter-bash#1b0321ee85701d5036c334a6f04761cdc672e64c" dependencies = [ "cc", "tree-sitter", @@ -1486,9 +1431,8 @@ dependencies = [ [[package]] name = "tree-sitter-json" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90b04c4e1a92139535eb9fca4ec8fa9666cc96b618005d3ae35f3c957fa92f92" +version = "0.20.0" +source = "git+https://github.com/tree-sitter/tree-sitter-json.git#ca3f8919800e3c1ad4508de3bfd7b0b860ce434f" dependencies = [ "cc", "tree-sitter", @@ -1505,8 +1449,17 @@ dependencies = [ [[package]] name = "tree-sitter-ocaml" -version = "0.20.1" -source = "git+https://github.com/tree-sitter/tree-sitter-ocaml#f1106bf834703f1f2f795da1a3b5f8f40174ffcc" +version = "0.20.4" +source = "git+https://github.com/tree-sitter/tree-sitter-ocaml.git#694c57718fd85d514f8b81176038e7a4cfabcaaf" +dependencies = [ + "cc", + "tree-sitter", +] + +[[package]] +name = "tree-sitter-ocamllex" +version = "0.20.2" +source = "git+https://github.com/314eter/tree-sitter-ocamllex.git#4b9898ccbf198602bb0dec9cd67cc1d2c0a4fad2" dependencies = [ "cc", "tree-sitter", @@ -1515,7 +1468,7 @@ dependencies = [ [[package]] name = "tree-sitter-query" version = "0.1.0" -source = "git+https://github.com/nvim-treesitter/tree-sitter-query#e97504446f14f529d5a8e649667d3d60391e4dfd" +source = "git+https://github.com/nvim-treesitter/tree-sitter-query#3a9808b22742d5bd906ef5d1a562f2f1ae57406d" dependencies = [ "cc", "tree-sitter", @@ -1523,9 +1476,8 @@ dependencies = [ [[package]] name = "tree-sitter-rust" -version = "0.20.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "797842733e252dc11ae5d403a18060bf337b822fc2ae5ddfaa6ff4d9cc20bda6" +version = "0.20.4" +source = "git+https://github.com/tree-sitter/tree-sitter-rust.git#17a6b15562b09db1f27b8f5f26f17edbb2aac097" dependencies = [ "cc", "tree-sitter", @@ -1533,9 +1485,8 @@ dependencies = [ [[package]] name = "tree-sitter-toml" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca517f578a98b23d20780247cc2688407fa81effad5b627a5a364ec3339b53e8" +version = "0.5.1" +source = "git+https://github.com/tree-sitter/tree-sitter-toml.git#342d9be207c2dba869b9967124c679b5e6fd0ebe" dependencies = [ "cc", "tree-sitter", @@ -1549,15 +1500,9 @@ checksum = "ccb97dac3243214f8d8507998906ca3e2e0b900bf9bf4870477f125b82e68f6e" [[package]] name = "unicode-ident" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" - -[[package]] -name = "unicode-segmentation" -version = "1.10.1" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unicode-width" @@ -1572,18 +1517,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] name = "wait-timeout" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1737,9 +1670,9 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.48.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -1794,9 +1727,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "winnow" -version = "0.4.6" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699" +checksum = "81fac9742fd1ad1bd9643b991319f72dd031016d44b77039a26977eb667141e7" dependencies = [ "memchr", ] diff --git a/pkgs/development/tools/misc/topiary/default.nix b/pkgs/development/tools/misc/topiary/default.nix index af463c6d4dd5e..2128115165baa 100644 --- a/pkgs/development/tools/misc/topiary/default.nix +++ b/pkgs/development/tools/misc/topiary/default.nix @@ -6,23 +6,27 @@ rustPlatform.buildRustPackage rec { pname = "topiary"; - version = "0.2.3"; + version = "0.3.0"; src = fetchFromGitHub { owner = "tweag"; repo = pname; rev = "v${version}"; - hash = "sha256-RYJaZGJijaS4a9gJmEvi4jVDN0sglUJHuy04pGdv5YE="; + hash = "sha256-zt4uXkO6Y0Yc1Wt8l5O79oKbgNLrgip40ftD7UfUPwo="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "tree-sitter-bash-0.19.0" = "sha256-Po2r+wUWJwC+ODk/xotYI7PsmjC3TFSu1dU0FrrnAXQ="; + "tree-sitter-bash-0.19.0" = "sha256-a0/KyHV2jUpytsZSHI7tVw8GfYnuqVjfs5KScLZkB0I="; "tree-sitter-facade-0.9.3" = "sha256-M/npshnHJkU70pP3I4WMXp3onlCSWM5mMIqXP45zcUs="; + "tree-sitter-json-0.20.0" = "sha256-cyrea0Y13OVGkXbYE0Cwc7nUsDGEZyoQmPAS9wVuHw0="; "tree-sitter-nickel-0.0.1" = "sha256-aYsEx1Y5oDEqSPCUbf1G3J5Y45ULT9OkD+fn6stzrOU="; - "tree-sitter-ocaml-0.20.1" = "sha256-5X2c2Deb8xNlp0LPQKFWIT3jwxKuuKdFlp9b3iA818Y="; - "tree-sitter-query-0.1.0" = "sha256-Gv882sbL2fmR++h4/I7dFCp+g6pddRCaLyX7+loEoHU="; + "tree-sitter-ocaml-0.20.4" = "sha256-j3Hv2qOMxeBNOW+WIgIYzG3zMIFWPQpoHe94b2rT+A8="; + "tree-sitter-ocamllex-0.20.2" = "sha256-YhmEE7I7UF83qMuldHqc/fD/no/7YuZd6CaAIaZ1now="; + "tree-sitter-query-0.1.0" = "sha256-5N7FT0HTK3xzzhAlk3wBOB9xlEpKSNIfakgFnsxEi18="; + "tree-sitter-rust-0.20.4" = "sha256-seWoMuA87ZWCq3mUXopVeDCcTxX/Bh+B4PFLVa0CBQA="; + "tree-sitter-toml-0.5.1" = "sha256-5nLNBxFeOGE+gzbwpcrTVnuL1jLUA0ZLBVw2QrOLsDQ="; "web-tree-sitter-sys-1.3.0" = "sha256-9rKB0rt0y9TD/HLRoB9LjEP9nO4kSWR9ylbbOXo2+2M="; }; }; @@ -31,16 +35,11 @@ rustPlatform.buildRustPackage rec { cargoTestFlags = cargoBuildFlags; env = { - TOPIARY_LANGUAGE_DIR = "${placeholder "out"}/share/languages"; + TOPIARY_LANGUAGE_DIR = "${placeholder "out"}/share/queries"; }; - # Cargo.lock is outdated - postPatch = '' - ln -sf ${./Cargo.lock} Cargo.lock - ''; - postInstall = '' - install -Dm444 languages/* -t $out/share/languages + install -Dm444 queries/* -t $out/share/queries ''; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix index e09ecac29b3a8..f281a70f8029d 100644 --- a/pkgs/development/tools/misc/ycmd/default.nix +++ b/pkgs/development/tools/misc/ycmd/default.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation { description = "A code-completion and comprehension server"; homepage = "https://github.com/ycm-core/ycmd"; license = licenses.gpl3; - maintainers = with maintainers; [ rasendubi cstrahan lnl7 siriobalmelli ]; + maintainers = with maintainers; [ rasendubi lnl7 siriobalmelli ]; platforms = platforms.all; }; } diff --git a/pkgs/development/tools/mix2nix/default.nix b/pkgs/development/tools/mix2nix/default.nix index 80ec10ce44ea6..694afbc812076 100644 --- a/pkgs/development/tools/mix2nix/default.nix +++ b/pkgs/development/tools/mix2nix/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mix2nix"; - version = "0.1.5"; + version = "0.1.8"; src = fetchFromGitHub { owner = "ydlr"; repo = "mix2nix"; rev = version; - sha256 = "0flsw8r4x27qxyrlazzjmjq3zkkppgw9krcdcqj7wbq06r2dck3q"; + hash = "sha256-iWy5q6ERzg8hRZs+bFtR6drZ9yI8Qh1v+47q3q2fFTM="; }; nativeBuildInputs = [ elixir ]; diff --git a/pkgs/development/tools/mold/default.nix b/pkgs/development/tools/mold/default.nix index 18007e302a0d8..4ba0bfdd2a7c8 100644 --- a/pkgs/development/tools/mold/default.nix +++ b/pkgs/development/tools/mold/default.nix @@ -59,6 +59,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/rui314/mold/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ azahi nitsky paveloom ]; + mainProgram = "mold"; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/mongosh/package-lock.json b/pkgs/development/tools/mongosh/package-lock.json index f3af35f3e10f4..13776023623d3 100644 --- a/pkgs/development/tools/mongosh/package-lock.json +++ b/pkgs/development/tools/mongosh/package-lock.json @@ -1,15 +1,15 @@ { "name": "mongosh", - "version": "1.10.6", + "version": "2.0.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "mongosh", - "version": "1.10.6", + "version": "2.0.1", "license": "Apache-2.0", "dependencies": { - "@mongosh/cli-repl": "1.10.6" + "@mongosh/cli-repl": "2.0.1" }, "bin": { "mongosh": "bin/mongosh.js" @@ -122,44 +122,45 @@ "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" }, "node_modules/@aws-sdk/client-cognito-identity": { - "version": "3.398.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.398.0.tgz", - "integrity": "sha512-Pr/S1f8R2FsJ8DwBC6g0CSdtZNNV5dMHhlIi+t8YAmCJvP4KT+UhzFjbvQRINlBRLFuGUuP7p5vRcGVELD3+wA==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.418.0.tgz", + "integrity": "sha512-8Gib2gMbfCfxNz/FgSRijl47pnmV/rVvyRNoYtk24xndUydhyXKFTB0cqGVDpPv7eRb3wWQ9YZYVuaBDnEdZ1A==", "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/client-sts": "3.398.0", - "@aws-sdk/credential-provider-node": "3.398.0", - "@aws-sdk/middleware-host-header": "3.398.0", - "@aws-sdk/middleware-logger": "3.398.0", - "@aws-sdk/middleware-recursion-detection": "3.398.0", - "@aws-sdk/middleware-signing": "3.398.0", - "@aws-sdk/middleware-user-agent": "3.398.0", - "@aws-sdk/types": "3.398.0", - "@aws-sdk/util-endpoints": "3.398.0", - "@aws-sdk/util-user-agent-browser": "3.398.0", - "@aws-sdk/util-user-agent-node": "3.398.0", - "@smithy/config-resolver": "^2.0.5", - "@smithy/fetch-http-handler": "^2.0.5", - "@smithy/hash-node": "^2.0.5", - "@smithy/invalid-dependency": "^2.0.5", - "@smithy/middleware-content-length": "^2.0.5", - "@smithy/middleware-endpoint": "^2.0.5", - "@smithy/middleware-retry": "^2.0.5", - "@smithy/middleware-serde": "^2.0.5", - "@smithy/middleware-stack": "^2.0.0", - "@smithy/node-config-provider": "^2.0.5", - "@smithy/node-http-handler": "^2.0.5", - "@smithy/protocol-http": "^2.0.5", - "@smithy/smithy-client": "^2.0.5", - "@smithy/types": "^2.2.2", - "@smithy/url-parser": "^2.0.5", + "@aws-sdk/client-sts": "3.418.0", + "@aws-sdk/credential-provider-node": "3.418.0", + "@aws-sdk/middleware-host-header": "3.418.0", + "@aws-sdk/middleware-logger": "3.418.0", + "@aws-sdk/middleware-recursion-detection": "3.418.0", + "@aws-sdk/middleware-signing": "3.418.0", + "@aws-sdk/middleware-user-agent": "3.418.0", + "@aws-sdk/region-config-resolver": "3.418.0", + "@aws-sdk/types": "3.418.0", + "@aws-sdk/util-endpoints": "3.418.0", + "@aws-sdk/util-user-agent-browser": "3.418.0", + "@aws-sdk/util-user-agent-node": "3.418.0", + "@smithy/config-resolver": "^2.0.10", + "@smithy/fetch-http-handler": "^2.1.5", + "@smithy/hash-node": "^2.0.9", + "@smithy/invalid-dependency": "^2.0.9", + "@smithy/middleware-content-length": "^2.0.11", + "@smithy/middleware-endpoint": "^2.0.9", + "@smithy/middleware-retry": "^2.0.12", + "@smithy/middleware-serde": "^2.0.9", + "@smithy/middleware-stack": "^2.0.2", + "@smithy/node-config-provider": "^2.0.12", + "@smithy/node-http-handler": "^2.1.5", + "@smithy/protocol-http": "^3.0.5", + "@smithy/smithy-client": "^2.1.6", + "@smithy/types": "^2.3.3", + "@smithy/url-parser": "^2.0.9", "@smithy/util-base64": "^2.0.0", "@smithy/util-body-length-browser": "^2.0.0", "@smithy/util-body-length-node": "^2.1.0", - "@smithy/util-defaults-mode-browser": "^2.0.5", - "@smithy/util-defaults-mode-node": "^2.0.5", - "@smithy/util-retry": "^2.0.0", + "@smithy/util-defaults-mode-browser": "^2.0.10", + "@smithy/util-defaults-mode-node": "^2.0.12", + "@smithy/util-retry": "^2.0.2", "@smithy/util-utf8": "^2.0.0", "tslib": "^2.5.0" }, @@ -168,41 +169,42 @@ } }, "node_modules/@aws-sdk/client-sso": { - "version": "3.398.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.398.0.tgz", - "integrity": "sha512-CygL0jhfibw4kmWXG/3sfZMFNjcXo66XUuPC4BqZBk8Rj5vFoxp1vZeMkDLzTIk97Nvo5J5Bh+QnXKhub6AckQ==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.418.0.tgz", + "integrity": "sha512-fakz3YeSW/kCAOJ5w4ObrrQBxsYO8sU8i6WHLv6iWAsYZKAws2Mqa8g89P61+GitSH4z9waksdLouS6ep78/5A==", "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/middleware-host-header": "3.398.0", - "@aws-sdk/middleware-logger": "3.398.0", - "@aws-sdk/middleware-recursion-detection": "3.398.0", - "@aws-sdk/middleware-user-agent": "3.398.0", - "@aws-sdk/types": "3.398.0", - "@aws-sdk/util-endpoints": "3.398.0", - "@aws-sdk/util-user-agent-browser": "3.398.0", - "@aws-sdk/util-user-agent-node": "3.398.0", - "@smithy/config-resolver": "^2.0.5", - "@smithy/fetch-http-handler": "^2.0.5", - "@smithy/hash-node": "^2.0.5", - "@smithy/invalid-dependency": "^2.0.5", - "@smithy/middleware-content-length": "^2.0.5", - "@smithy/middleware-endpoint": "^2.0.5", - "@smithy/middleware-retry": "^2.0.5", - "@smithy/middleware-serde": "^2.0.5", - "@smithy/middleware-stack": "^2.0.0", - "@smithy/node-config-provider": "^2.0.5", - "@smithy/node-http-handler": "^2.0.5", - "@smithy/protocol-http": "^2.0.5", - "@smithy/smithy-client": "^2.0.5", - "@smithy/types": "^2.2.2", - "@smithy/url-parser": "^2.0.5", + "@aws-sdk/middleware-host-header": "3.418.0", + "@aws-sdk/middleware-logger": "3.418.0", + "@aws-sdk/middleware-recursion-detection": "3.418.0", + "@aws-sdk/middleware-user-agent": "3.418.0", + "@aws-sdk/region-config-resolver": "3.418.0", + "@aws-sdk/types": "3.418.0", + "@aws-sdk/util-endpoints": "3.418.0", + "@aws-sdk/util-user-agent-browser": "3.418.0", + "@aws-sdk/util-user-agent-node": "3.418.0", + "@smithy/config-resolver": "^2.0.10", + "@smithy/fetch-http-handler": "^2.1.5", + "@smithy/hash-node": "^2.0.9", + "@smithy/invalid-dependency": "^2.0.9", + "@smithy/middleware-content-length": "^2.0.11", + "@smithy/middleware-endpoint": "^2.0.9", + "@smithy/middleware-retry": "^2.0.12", + "@smithy/middleware-serde": "^2.0.9", + "@smithy/middleware-stack": "^2.0.2", + "@smithy/node-config-provider": "^2.0.12", + "@smithy/node-http-handler": "^2.1.5", + "@smithy/protocol-http": "^3.0.5", + "@smithy/smithy-client": "^2.1.6", + "@smithy/types": "^2.3.3", + "@smithy/url-parser": "^2.0.9", "@smithy/util-base64": "^2.0.0", "@smithy/util-body-length-browser": "^2.0.0", "@smithy/util-body-length-node": "^2.1.0", - "@smithy/util-defaults-mode-browser": "^2.0.5", - "@smithy/util-defaults-mode-node": "^2.0.5", - "@smithy/util-retry": "^2.0.0", + "@smithy/util-defaults-mode-browser": "^2.0.10", + "@smithy/util-defaults-mode-node": "^2.0.12", + "@smithy/util-retry": "^2.0.2", "@smithy/util-utf8": "^2.0.0", "tslib": "^2.5.0" }, @@ -211,44 +213,45 @@ } }, "node_modules/@aws-sdk/client-sts": { - "version": "3.398.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.398.0.tgz", - "integrity": "sha512-/3Pa9wLMvBZipKraq3AtbmTfXW6q9kyvhwOno64f1Fz7kFb8ijQFMGoATS70B2pGEZTlxkUqJFWDiisT6Q6dFg==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.418.0.tgz", + "integrity": "sha512-L0n0Hw+Pm+BhXTN1bYZ0y4JAMArYgazdHf1nUSlEHndgZicCCuQtlMLxfo3i/IbtWi0dzfZcZ9d/MdAM8p4Jyw==", "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/credential-provider-node": "3.398.0", - "@aws-sdk/middleware-host-header": "3.398.0", - "@aws-sdk/middleware-logger": "3.398.0", - "@aws-sdk/middleware-recursion-detection": "3.398.0", - "@aws-sdk/middleware-sdk-sts": "3.398.0", - "@aws-sdk/middleware-signing": "3.398.0", - "@aws-sdk/middleware-user-agent": "3.398.0", - "@aws-sdk/types": "3.398.0", - "@aws-sdk/util-endpoints": "3.398.0", - "@aws-sdk/util-user-agent-browser": "3.398.0", - "@aws-sdk/util-user-agent-node": "3.398.0", - "@smithy/config-resolver": "^2.0.5", - "@smithy/fetch-http-handler": "^2.0.5", - "@smithy/hash-node": "^2.0.5", - "@smithy/invalid-dependency": "^2.0.5", - "@smithy/middleware-content-length": "^2.0.5", - "@smithy/middleware-endpoint": "^2.0.5", - "@smithy/middleware-retry": "^2.0.5", - "@smithy/middleware-serde": "^2.0.5", - "@smithy/middleware-stack": "^2.0.0", - "@smithy/node-config-provider": "^2.0.5", - "@smithy/node-http-handler": "^2.0.5", - "@smithy/protocol-http": "^2.0.5", - "@smithy/smithy-client": "^2.0.5", - "@smithy/types": "^2.2.2", - "@smithy/url-parser": "^2.0.5", + "@aws-sdk/credential-provider-node": "3.418.0", + "@aws-sdk/middleware-host-header": "3.418.0", + "@aws-sdk/middleware-logger": "3.418.0", + "@aws-sdk/middleware-recursion-detection": "3.418.0", + "@aws-sdk/middleware-sdk-sts": "3.418.0", + "@aws-sdk/middleware-signing": "3.418.0", + "@aws-sdk/middleware-user-agent": "3.418.0", + "@aws-sdk/region-config-resolver": "3.418.0", + "@aws-sdk/types": "3.418.0", + "@aws-sdk/util-endpoints": "3.418.0", + "@aws-sdk/util-user-agent-browser": "3.418.0", + "@aws-sdk/util-user-agent-node": "3.418.0", + "@smithy/config-resolver": "^2.0.10", + "@smithy/fetch-http-handler": "^2.1.5", + "@smithy/hash-node": "^2.0.9", + "@smithy/invalid-dependency": "^2.0.9", + "@smithy/middleware-content-length": "^2.0.11", + "@smithy/middleware-endpoint": "^2.0.9", + "@smithy/middleware-retry": "^2.0.12", + "@smithy/middleware-serde": "^2.0.9", + "@smithy/middleware-stack": "^2.0.2", + "@smithy/node-config-provider": "^2.0.12", + "@smithy/node-http-handler": "^2.1.5", + "@smithy/protocol-http": "^3.0.5", + "@smithy/smithy-client": "^2.1.6", + "@smithy/types": "^2.3.3", + "@smithy/url-parser": "^2.0.9", "@smithy/util-base64": "^2.0.0", "@smithy/util-body-length-browser": "^2.0.0", "@smithy/util-body-length-node": "^2.1.0", - "@smithy/util-defaults-mode-browser": "^2.0.5", - "@smithy/util-defaults-mode-node": "^2.0.5", - "@smithy/util-retry": "^2.0.0", + "@smithy/util-defaults-mode-browser": "^2.0.10", + "@smithy/util-defaults-mode-node": "^2.0.12", + "@smithy/util-retry": "^2.0.2", "@smithy/util-utf8": "^2.0.0", "fast-xml-parser": "4.2.5", "tslib": "^2.5.0" @@ -258,14 +261,14 @@ } }, "node_modules/@aws-sdk/credential-provider-cognito-identity": { - "version": "3.398.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.398.0.tgz", - "integrity": "sha512-MFUhy1YayHg5ypRTk4OTfDumQRP+OJBagaGv14kA8DzhKH1sNrU4HV7A7y2J4SvkN5hG/KnLJqxpakCtB2/O2g==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.418.0.tgz", + "integrity": "sha512-MakYZsT7fkG1W9IgkBz7PTXG/e6YD2oSEk+hPgwfdMv0YX76qjTU02B2qbbKSGtXichX73MNUPOvygF5XAi6oA==", "dependencies": { - "@aws-sdk/client-cognito-identity": "3.398.0", - "@aws-sdk/types": "3.398.0", + "@aws-sdk/client-cognito-identity": "3.418.0", + "@aws-sdk/types": "3.418.0", "@smithy/property-provider": "^2.0.0", - "@smithy/types": "^2.2.2", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" }, "engines": { @@ -273,13 +276,13 @@ } }, "node_modules/@aws-sdk/credential-provider-env": { - "version": "3.398.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.398.0.tgz", - "integrity": "sha512-Z8Yj5z7FroAsR6UVML+XUdlpoqEe9Dnle8c2h8/xWwIC2feTfIBhjLhRVxfbpbM1pLgBSNEcZ7U8fwq5l7ESVQ==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.418.0.tgz", + "integrity": "sha512-e74sS+x63EZUBO+HaI8zor886YdtmULzwKdctsZp5/37Xho1CVUNtEC+fYa69nigBD9afoiH33I4JggaHgrekQ==", "dependencies": { - "@aws-sdk/types": "3.398.0", + "@aws-sdk/types": "3.418.0", "@smithy/property-provider": "^2.0.0", - "@smithy/types": "^2.2.2", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" }, "engines": { @@ -287,19 +290,19 @@ } }, "node_modules/@aws-sdk/credential-provider-ini": { - "version": "3.398.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.398.0.tgz", - "integrity": "sha512-AsK1lStK3nB9Cn6S6ODb1ktGh7SRejsNVQVKX3t5d3tgOaX+aX1Iwy8FzM/ZEN8uCloeRifUGIY9uQFygg5mSw==", - "dependencies": { - "@aws-sdk/credential-provider-env": "3.398.0", - "@aws-sdk/credential-provider-process": "3.398.0", - "@aws-sdk/credential-provider-sso": "3.398.0", - "@aws-sdk/credential-provider-web-identity": "3.398.0", - "@aws-sdk/types": "3.398.0", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.418.0.tgz", + "integrity": "sha512-LTAeKKV85unlSqGNIeqEZ4N9gufaSoH+670n5YTUEk564zHCkUQW0PJomzLF5jKBco6Yfzv6rPBTukd+x9XWqw==", + "dependencies": { + "@aws-sdk/credential-provider-env": "3.418.0", + "@aws-sdk/credential-provider-process": "3.418.0", + "@aws-sdk/credential-provider-sso": "3.418.0", + "@aws-sdk/credential-provider-web-identity": "3.418.0", + "@aws-sdk/types": "3.418.0", "@smithy/credential-provider-imds": "^2.0.0", "@smithy/property-provider": "^2.0.0", - "@smithy/shared-ini-file-loader": "^2.0.0", - "@smithy/types": "^2.2.2", + "@smithy/shared-ini-file-loader": "^2.0.6", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" }, "engines": { @@ -307,20 +310,20 @@ } }, "node_modules/@aws-sdk/credential-provider-node": { - "version": "3.398.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.398.0.tgz", - "integrity": "sha512-odmI/DSKfuWUYeDnGTCEHBbC8/MwnF6yEq874zl6+owoVv0ZsYP8qBHfiJkYqrwg7wQ7Pi40sSAPC1rhesGwzg==", - "dependencies": { - "@aws-sdk/credential-provider-env": "3.398.0", - "@aws-sdk/credential-provider-ini": "3.398.0", - "@aws-sdk/credential-provider-process": "3.398.0", - "@aws-sdk/credential-provider-sso": "3.398.0", - "@aws-sdk/credential-provider-web-identity": "3.398.0", - "@aws-sdk/types": "3.398.0", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.418.0.tgz", + "integrity": "sha512-VveTjtSC6m8YXj3fQDkMKEZuHv+CR2Z4u/NAN51Fi4xOtIWUtOBj5rfZ8HmBYoBjRF0DtRlPXuMiNnXAzTctfQ==", + "dependencies": { + "@aws-sdk/credential-provider-env": "3.418.0", + "@aws-sdk/credential-provider-ini": "3.418.0", + "@aws-sdk/credential-provider-process": "3.418.0", + "@aws-sdk/credential-provider-sso": "3.418.0", + "@aws-sdk/credential-provider-web-identity": "3.418.0", + "@aws-sdk/types": "3.418.0", "@smithy/credential-provider-imds": "^2.0.0", "@smithy/property-provider": "^2.0.0", - "@smithy/shared-ini-file-loader": "^2.0.0", - "@smithy/types": "^2.2.2", + "@smithy/shared-ini-file-loader": "^2.0.6", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" }, "engines": { @@ -328,14 +331,14 @@ } }, "node_modules/@aws-sdk/credential-provider-process": { - "version": "3.398.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.398.0.tgz", - "integrity": "sha512-WrkBL1W7TXN508PA9wRXPFtzmGpVSW98gDaHEaa8GolAPHMPa5t2QcC/z/cFpglzrcVv8SA277zu9Z8tELdZhg==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.418.0.tgz", + "integrity": "sha512-xPbdm2WKz1oH6pTkrJoUmr3OLuqvvcPYTQX0IIlc31tmDwDWPQjXGGFD/vwZGIZIkKaFpFxVMgAzfFScxox7dw==", "dependencies": { - "@aws-sdk/types": "3.398.0", + "@aws-sdk/types": "3.418.0", "@smithy/property-provider": "^2.0.0", - "@smithy/shared-ini-file-loader": "^2.0.0", - "@smithy/types": "^2.2.2", + "@smithy/shared-ini-file-loader": "^2.0.6", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" }, "engines": { @@ -343,16 +346,16 @@ } }, "node_modules/@aws-sdk/credential-provider-sso": { - "version": "3.398.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.398.0.tgz", - "integrity": "sha512-2Dl35587xbnzR/GGZqA2MnFs8+kS4wbHQO9BioU0okA+8NRueohNMdrdQmQDdSNK4BfIpFspiZmFkXFNyEAfgw==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.418.0.tgz", + "integrity": "sha512-tUF5Hg/HfaU5t+E7IuvohYlodSIlBXa28xAJPPFxhKrUnvP6AIoW6JLazOtCIQjQgJYEUILV29XX+ojUuITcaw==", "dependencies": { - "@aws-sdk/client-sso": "3.398.0", - "@aws-sdk/token-providers": "3.398.0", - "@aws-sdk/types": "3.398.0", + "@aws-sdk/client-sso": "3.418.0", + "@aws-sdk/token-providers": "3.418.0", + "@aws-sdk/types": "3.418.0", "@smithy/property-provider": "^2.0.0", - "@smithy/shared-ini-file-loader": "^2.0.0", - "@smithy/types": "^2.2.2", + "@smithy/shared-ini-file-loader": "^2.0.6", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" }, "engines": { @@ -360,13 +363,13 @@ } }, "node_modules/@aws-sdk/credential-provider-web-identity": { - "version": "3.398.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.398.0.tgz", - "integrity": "sha512-iG3905Alv9pINbQ8/MIsshgqYMbWx+NDQWpxbIW3W0MkSH3iAqdVpSCteYidYX9G/jv2Um1nW3y360ib20bvNg==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.418.0.tgz", + "integrity": "sha512-do7ang565n9p3dS1JdsQY01rUfRx8vkxQqz5M8OlcEHBNiCdi2PvSjNwcBdrv/FKkyIxZb0TImOfBSt40hVdxQ==", "dependencies": { - "@aws-sdk/types": "3.398.0", + "@aws-sdk/types": "3.418.0", "@smithy/property-provider": "^2.0.0", - "@smithy/types": "^2.2.2", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" }, "engines": { @@ -374,24 +377,24 @@ } }, "node_modules/@aws-sdk/credential-providers": { - "version": "3.398.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.398.0.tgz", - "integrity": "sha512-355vXmImn2e85mIWSYDVb101AF2lIVHKNCaH6sV1U/8i0ZOXh2cJYNdkRYrxNt1ezDB0k97lSKvuDx7RDvJyRg==", - "dependencies": { - "@aws-sdk/client-cognito-identity": "3.398.0", - "@aws-sdk/client-sso": "3.398.0", - "@aws-sdk/client-sts": "3.398.0", - "@aws-sdk/credential-provider-cognito-identity": "3.398.0", - "@aws-sdk/credential-provider-env": "3.398.0", - "@aws-sdk/credential-provider-ini": "3.398.0", - "@aws-sdk/credential-provider-node": "3.398.0", - "@aws-sdk/credential-provider-process": "3.398.0", - "@aws-sdk/credential-provider-sso": "3.398.0", - "@aws-sdk/credential-provider-web-identity": "3.398.0", - "@aws-sdk/types": "3.398.0", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.418.0.tgz", + "integrity": "sha512-atEybTA0jvP9CpBCPKCoiPz1hjJ/lbRxf67r+fpAqPtfQKutGq/jZm78Yz5kV9F/NJEW2mK2GR/BslCAHc4H8g==", + "dependencies": { + "@aws-sdk/client-cognito-identity": "3.418.0", + "@aws-sdk/client-sso": "3.418.0", + "@aws-sdk/client-sts": "3.418.0", + "@aws-sdk/credential-provider-cognito-identity": "3.418.0", + "@aws-sdk/credential-provider-env": "3.418.0", + "@aws-sdk/credential-provider-ini": "3.418.0", + "@aws-sdk/credential-provider-node": "3.418.0", + "@aws-sdk/credential-provider-process": "3.418.0", + "@aws-sdk/credential-provider-sso": "3.418.0", + "@aws-sdk/credential-provider-web-identity": "3.418.0", + "@aws-sdk/types": "3.418.0", "@smithy/credential-provider-imds": "^2.0.0", "@smithy/property-provider": "^2.0.0", - "@smithy/types": "^2.2.2", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" }, "engines": { @@ -399,13 +402,13 @@ } }, "node_modules/@aws-sdk/middleware-host-header": { - "version": "3.398.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.398.0.tgz", - "integrity": "sha512-m+5laWdBaxIZK2ko0OwcCHJZJ5V1MgEIt8QVQ3k4/kOkN9ICjevOYmba751pHoTnbOYB7zQd6D2OT3EYEEsUcA==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.418.0.tgz", + "integrity": "sha512-LrMTdzalkPw/1ujLCKPLwCGvPMCmT4P+vOZQRbSEVZPnlZk+Aj++aL/RaHou0jL4kJH3zl8iQepriBt4a7UvXQ==", "dependencies": { - "@aws-sdk/types": "3.398.0", - "@smithy/protocol-http": "^2.0.5", - "@smithy/types": "^2.2.2", + "@aws-sdk/types": "3.418.0", + "@smithy/protocol-http": "^3.0.5", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" }, "engines": { @@ -413,12 +416,12 @@ } }, "node_modules/@aws-sdk/middleware-logger": { - "version": "3.398.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.398.0.tgz", - "integrity": "sha512-CiJjW+FL12elS6Pn7/UVjVK8HWHhXMfvHZvOwx/Qkpy340sIhkuzOO6fZEruECDTZhl2Wqn81XdJ1ZQ4pRKpCg==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.418.0.tgz", + "integrity": "sha512-StKGmyPVfoO/wdNTtKemYwoJsqIl4l7oqarQY7VSf2Mp3mqaa+njLViHsQbirYpyqpgUEusOnuTlH5utxJ1NsQ==", "dependencies": { - "@aws-sdk/types": "3.398.0", - "@smithy/types": "^2.2.2", + "@aws-sdk/types": "3.418.0", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" }, "engines": { @@ -426,13 +429,13 @@ } }, "node_modules/@aws-sdk/middleware-recursion-detection": { - "version": "3.398.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.398.0.tgz", - "integrity": "sha512-7QpOqPQAZNXDXv6vsRex4R8dLniL0E/80OPK4PPFsrCh9btEyhN9Begh4i1T+5lL28hmYkztLOkTQ2N5J3hgRQ==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.418.0.tgz", + "integrity": "sha512-kKFrIQglBLUFPbHSDy1+bbe3Na2Kd70JSUC3QLMbUHmqipXN8KeXRfAj7vTv97zXl0WzG0buV++WcNwOm1rFjg==", "dependencies": { - "@aws-sdk/types": "3.398.0", - "@smithy/protocol-http": "^2.0.5", - "@smithy/types": "^2.2.2", + "@aws-sdk/types": "3.418.0", + "@smithy/protocol-http": "^3.0.5", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" }, "engines": { @@ -440,13 +443,13 @@ } }, "node_modules/@aws-sdk/middleware-sdk-sts": { - "version": "3.398.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.398.0.tgz", - "integrity": "sha512-+JH76XHEgfVihkY+GurohOQ5Z83zVN1nYcQzwCFnCDTh4dG4KwhnZKG+WPw6XJECocY0R+H0ivofeALHvVWJtQ==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.418.0.tgz", + "integrity": "sha512-cW8ijrCTP+mgihvcq4+TbhAcE/we5lFl4ydRqvTdtcSnYQAVQADg47rnTScQiFsPFEB3NKq7BGeyTJF9MKolPA==", "dependencies": { - "@aws-sdk/middleware-signing": "3.398.0", - "@aws-sdk/types": "3.398.0", - "@smithy/types": "^2.2.2", + "@aws-sdk/middleware-signing": "3.418.0", + "@aws-sdk/types": "3.418.0", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" }, "engines": { @@ -454,16 +457,16 @@ } }, "node_modules/@aws-sdk/middleware-signing": { - "version": "3.398.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.398.0.tgz", - "integrity": "sha512-O0KqXAix1TcvZBFt1qoFkHMUNJOSgjJTYS7lFTRKSwgsD27bdW2TM2r9R8DAccWFt5Amjkdt+eOwQMIXPGTm8w==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.418.0.tgz", + "integrity": "sha512-onvs5KoYQE8OlOE740RxWBGtsUyVIgAo0CzRKOQO63ZEYqpL1Os+MS1CGzdNhvQnJgJruE1WW+Ix8fjN30zKPA==", "dependencies": { - "@aws-sdk/types": "3.398.0", + "@aws-sdk/types": "3.418.0", "@smithy/property-provider": "^2.0.0", - "@smithy/protocol-http": "^2.0.5", + "@smithy/protocol-http": "^3.0.5", "@smithy/signature-v4": "^2.0.0", - "@smithy/types": "^2.2.2", - "@smithy/util-middleware": "^2.0.0", + "@smithy/types": "^2.3.3", + "@smithy/util-middleware": "^2.0.2", "tslib": "^2.5.0" }, "engines": { @@ -471,14 +474,29 @@ } }, "node_modules/@aws-sdk/middleware-user-agent": { - "version": "3.398.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.398.0.tgz", - "integrity": "sha512-nF1jg0L+18b5HvTcYzwyFgfZQQMELJINFqI0mi4yRKaX7T5a3aGp5RVLGGju/6tAGTuFbfBoEhkhU3kkxexPYQ==", - "dependencies": { - "@aws-sdk/types": "3.398.0", - "@aws-sdk/util-endpoints": "3.398.0", - "@smithy/protocol-http": "^2.0.5", - "@smithy/types": "^2.2.2", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.418.0.tgz", + "integrity": "sha512-Jdcztg9Tal9SEAL0dKRrnpKrm6LFlWmAhvuwv0dQ7bNTJxIxyEFbpqdgy7mpQHsLVZgq1Aad/7gT/72c9igyZw==", + "dependencies": { + "@aws-sdk/types": "3.418.0", + "@aws-sdk/util-endpoints": "3.418.0", + "@smithy/protocol-http": "^3.0.5", + "@smithy/types": "^2.3.3", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/region-config-resolver": { + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.418.0.tgz", + "integrity": "sha512-lJRZ/9TjZU6yLz+mAwxJkcJZ6BmyYoIJVo1p5+BN//EFdEmC8/c0c9gXMRzfISV/mqWSttdtccpAyN4/goHTYA==", + "dependencies": { + "@smithy/node-config-provider": "^2.0.12", + "@smithy/types": "^2.3.3", + "@smithy/util-config-provider": "^2.0.0", + "@smithy/util-middleware": "^2.0.2", "tslib": "^2.5.0" }, "engines": { @@ -486,43 +504,43 @@ } }, "node_modules/@aws-sdk/token-providers": { - "version": "3.398.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.398.0.tgz", - "integrity": "sha512-nrYgjzavGCKJL/48Vt0EL+OlIc5UZLfNGpgyUW9cv3XZwl+kXV0QB+HH0rHZZLfpbBgZ2RBIJR9uD5ieu/6hpQ==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.418.0.tgz", + "integrity": "sha512-9P7Q0VN0hEzTngy3Sz5eya2qEOEf0Q8qf1vB3um0gE6ID6EVAdz/nc/DztfN32MFxk8FeVBrCP5vWdoOzmd72g==", "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/middleware-host-header": "3.398.0", - "@aws-sdk/middleware-logger": "3.398.0", - "@aws-sdk/middleware-recursion-detection": "3.398.0", - "@aws-sdk/middleware-user-agent": "3.398.0", - "@aws-sdk/types": "3.398.0", - "@aws-sdk/util-endpoints": "3.398.0", - "@aws-sdk/util-user-agent-browser": "3.398.0", - "@aws-sdk/util-user-agent-node": "3.398.0", - "@smithy/config-resolver": "^2.0.5", - "@smithy/fetch-http-handler": "^2.0.5", - "@smithy/hash-node": "^2.0.5", - "@smithy/invalid-dependency": "^2.0.5", - "@smithy/middleware-content-length": "^2.0.5", - "@smithy/middleware-endpoint": "^2.0.5", - "@smithy/middleware-retry": "^2.0.5", - "@smithy/middleware-serde": "^2.0.5", - "@smithy/middleware-stack": "^2.0.0", - "@smithy/node-config-provider": "^2.0.5", - "@smithy/node-http-handler": "^2.0.5", + "@aws-sdk/middleware-host-header": "3.418.0", + "@aws-sdk/middleware-logger": "3.418.0", + "@aws-sdk/middleware-recursion-detection": "3.418.0", + "@aws-sdk/middleware-user-agent": "3.418.0", + "@aws-sdk/types": "3.418.0", + "@aws-sdk/util-endpoints": "3.418.0", + "@aws-sdk/util-user-agent-browser": "3.418.0", + "@aws-sdk/util-user-agent-node": "3.418.0", + "@smithy/config-resolver": "^2.0.10", + "@smithy/fetch-http-handler": "^2.1.5", + "@smithy/hash-node": "^2.0.9", + "@smithy/invalid-dependency": "^2.0.9", + "@smithy/middleware-content-length": "^2.0.11", + "@smithy/middleware-endpoint": "^2.0.9", + "@smithy/middleware-retry": "^2.0.12", + "@smithy/middleware-serde": "^2.0.9", + "@smithy/middleware-stack": "^2.0.2", + "@smithy/node-config-provider": "^2.0.12", + "@smithy/node-http-handler": "^2.1.5", "@smithy/property-provider": "^2.0.0", - "@smithy/protocol-http": "^2.0.5", - "@smithy/shared-ini-file-loader": "^2.0.0", - "@smithy/smithy-client": "^2.0.5", - "@smithy/types": "^2.2.2", - "@smithy/url-parser": "^2.0.5", + "@smithy/protocol-http": "^3.0.5", + "@smithy/shared-ini-file-loader": "^2.0.6", + "@smithy/smithy-client": "^2.1.6", + "@smithy/types": "^2.3.3", + "@smithy/url-parser": "^2.0.9", "@smithy/util-base64": "^2.0.0", "@smithy/util-body-length-browser": "^2.0.0", "@smithy/util-body-length-node": "^2.1.0", - "@smithy/util-defaults-mode-browser": "^2.0.5", - "@smithy/util-defaults-mode-node": "^2.0.5", - "@smithy/util-retry": "^2.0.0", + "@smithy/util-defaults-mode-browser": "^2.0.10", + "@smithy/util-defaults-mode-node": "^2.0.12", + "@smithy/util-retry": "^2.0.2", "@smithy/util-utf8": "^2.0.0", "tslib": "^2.5.0" }, @@ -531,11 +549,11 @@ } }, "node_modules/@aws-sdk/types": { - "version": "3.398.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.398.0.tgz", - "integrity": "sha512-r44fkS+vsEgKCuEuTV+TIk0t0m5ZlXHNjSDYEUvzLStbbfUFiNus/YG4UCa0wOk9R7VuQI67badsvvPeVPCGDQ==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.418.0.tgz", + "integrity": "sha512-y4PQSH+ulfFLY0+FYkaK4qbIaQI9IJNMO2xsxukW6/aNoApNymN1D2FSi2la8Qbp/iPjNDKsG8suNPm9NtsWXQ==", "dependencies": { - "@smithy/types": "^2.2.2", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" }, "engines": { @@ -543,11 +561,11 @@ } }, "node_modules/@aws-sdk/util-endpoints": { - "version": "3.398.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.398.0.tgz", - "integrity": "sha512-Fy0gLYAei/Rd6BrXG4baspCnWTUSd0NdokU1pZh4KlfEAEN1i8SPPgfiO5hLk7+2inqtCmqxVJlfqbMVe9k4bw==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.418.0.tgz", + "integrity": "sha512-sYSDwRTl7yE7LhHkPzemGzmIXFVHSsi3AQ1KeNEk84eBqxMHHcCc2kqklaBk2roXWe50QDgRMy1ikZUxvtzNHQ==", "dependencies": { - "@aws-sdk/types": "3.398.0", + "@aws-sdk/types": "3.418.0", "tslib": "^2.5.0" }, "engines": { @@ -566,24 +584,24 @@ } }, "node_modules/@aws-sdk/util-user-agent-browser": { - "version": "3.398.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.398.0.tgz", - "integrity": "sha512-A3Tzx1tkDHlBT+IgxmsMCHbV8LM7SwwCozq2ZjJRx0nqw3MCrrcxQFXldHeX/gdUMO+0Oocb7HGSnVODTq+0EA==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.418.0.tgz", + "integrity": "sha512-c4p4mc0VV/jIeNH0lsXzhJ1MpWRLuboGtNEpqE4s1Vl9ck2amv9VdUUZUmHbg+bVxlMgRQ4nmiovA4qIrqGuyg==", "dependencies": { - "@aws-sdk/types": "3.398.0", - "@smithy/types": "^2.2.2", + "@aws-sdk/types": "3.418.0", + "@smithy/types": "^2.3.3", "bowser": "^2.11.0", "tslib": "^2.5.0" } }, "node_modules/@aws-sdk/util-user-agent-node": { - "version": "3.398.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.398.0.tgz", - "integrity": "sha512-RTVQofdj961ej4//fEkppFf4KXqKGMTCqJYghx3G0C/MYXbg7MGl7LjfNGtJcboRE8pfHHQ/TUWBDA7RIAPPlQ==", + "version": "3.418.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.418.0.tgz", + "integrity": "sha512-BXMskXFtg+dmzSCgmnWOffokxIbPr1lFqa1D9kvM3l3IFRiFGx2IyDg+8MAhq11aPDLvoa/BDuQ0Yqma5izOhg==", "dependencies": { - "@aws-sdk/types": "3.398.0", - "@smithy/node-config-provider": "^2.0.5", - "@smithy/types": "^2.2.2", + "@aws-sdk/types": "3.418.0", + "@smithy/node-config-provider": "^2.0.12", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" }, "engines": { @@ -607,104 +625,40 @@ } }, "node_modules/@babel/code-frame": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.10.tgz", - "integrity": "sha512-/KKIMG4UEL35WmI9OlvMhurwtytjvXoFcGNrOvyG9zIzA8YmPjVtIZUf7b05+TPO7G7/GEmLHDaoCgACHl9hhA==", + "version": "7.22.13", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz", + "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==", "dependencies": { - "@babel/highlight": "^7.22.10", + "@babel/highlight": "^7.22.13", "chalk": "^2.4.2" }, "engines": { "node": ">=6.9.0" } }, - "node_modules/@babel/code-frame/node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dependencies": { - "color-convert": "^1.9.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/code-frame/node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/code-frame/node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/@babel/code-frame/node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==" - }, - "node_modules/@babel/code-frame/node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/@babel/code-frame/node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/code-frame/node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/@babel/compat-data": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.9.tgz", - "integrity": "sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.20.tgz", + "integrity": "sha512-BQYjKbpXjoXwFW5jGqiizJQQT/aC7pFm9Ok1OWssonuguICi264lbgMzRp2ZMmRSlfkX6DsWDDcsrctK8Rwfiw==", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.22.11", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.11.tgz", - "integrity": "sha512-lh7RJrtPdhibbxndr6/xx0w8+CVlY5FJZiaSz908Fpy+G0xkBFTvwLcKJFF4PJxVfGhVWNebikpWGnOoC71juQ==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.20.tgz", + "integrity": "sha512-Y6jd1ahLubuYweD/zJH+vvOY141v4f9igNQAQ+MBgq9JlHS2iTsZKn1aMsb3vGccZsXI16VzTBw52Xx0DWmtnA==", "dependencies": { "@ampproject/remapping": "^2.2.0", - "@babel/code-frame": "^7.22.10", - "@babel/generator": "^7.22.10", - "@babel/helper-compilation-targets": "^7.22.10", - "@babel/helper-module-transforms": "^7.22.9", - "@babel/helpers": "^7.22.11", - "@babel/parser": "^7.22.11", - "@babel/template": "^7.22.5", - "@babel/traverse": "^7.22.11", - "@babel/types": "^7.22.11", + "@babel/code-frame": "^7.22.13", + "@babel/generator": "^7.22.15", + "@babel/helper-compilation-targets": "^7.22.15", + "@babel/helper-module-transforms": "^7.22.20", + "@babel/helpers": "^7.22.15", + "@babel/parser": "^7.22.16", + "@babel/template": "^7.22.15", + "@babel/traverse": "^7.22.20", + "@babel/types": "^7.22.19", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -728,11 +682,11 @@ } }, "node_modules/@babel/generator": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.10.tgz", - "integrity": "sha512-79KIf7YiWjjdZ81JnLujDRApWtl7BxTqWD88+FFdQEIOG8LJ0etDOM7CXuIgGJa55sGOwZVwuEsaLEm0PJ5/+A==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.15.tgz", + "integrity": "sha512-Zu9oWARBqeVOW0dZOjXc3JObrzuqothQ3y/n1kUtrjCoCPLkXUwMvOo/F/TCfoHMbWIFlWwpZtkZVb9ga4U2pA==", "dependencies": { - "@babel/types": "^7.22.10", + "@babel/types": "^7.22.15", "@jridgewell/gen-mapping": "^0.3.2", "@jridgewell/trace-mapping": "^0.3.17", "jsesc": "^2.5.1" @@ -742,12 +696,12 @@ } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.10.tgz", - "integrity": "sha512-JMSwHD4J7SLod0idLq5PKgI+6g/hLD/iuWBq08ZX49xE14VpVEojJ5rHWptpirV2j020MvypRLAXAO50igCJ5Q==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz", + "integrity": "sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==", "dependencies": { "@babel/compat-data": "^7.22.9", - "@babel/helper-validator-option": "^7.22.5", + "@babel/helper-validator-option": "^7.22.15", "browserslist": "^4.21.9", "lru-cache": "^5.1.1", "semver": "^6.3.1" @@ -765,9 +719,9 @@ } }, "node_modules/@babel/helper-environment-visitor": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz", - "integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz", + "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==", "engines": { "node": ">=6.9.0" } @@ -796,26 +750,26 @@ } }, "node_modules/@babel/helper-module-imports": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz", - "integrity": "sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz", + "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==", "dependencies": { - "@babel/types": "^7.22.5" + "@babel/types": "^7.22.15" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz", - "integrity": "sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.20.tgz", + "integrity": "sha512-dLT7JVWIUUxKOs1UnJUBR3S70YK+pKX6AbJgB2vMIvEkZkrfJDbYDJesnPshtKV4LhDOR3Oc5YULeDizRek+5A==", "dependencies": { - "@babel/helper-environment-visitor": "^7.22.5", - "@babel/helper-module-imports": "^7.22.5", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-module-imports": "^7.22.15", "@babel/helper-simple-access": "^7.22.5", "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/helper-validator-identifier": "^7.22.5" + "@babel/helper-validator-identifier": "^7.22.20" }, "engines": { "node": ">=6.9.0" @@ -863,40 +817,40 @@ } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz", - "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz", + "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-option": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz", - "integrity": "sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz", + "integrity": "sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helpers": { - "version": "7.22.11", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.11.tgz", - "integrity": "sha512-vyOXC8PBWaGc5h7GMsNx68OH33cypkEDJCHvYVVgVbbxJDROYVtexSk0gK5iCF1xNjRIN2s8ai7hwkWDq5szWg==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.15.tgz", + "integrity": "sha512-7pAjK0aSdxOwR+CcYAqgWOGy5dcfvzsTIfFTb2odQqW47MDfv14UaJDY6eng8ylM2EaeKXdxaSWESbkmaQHTmw==", "dependencies": { - "@babel/template": "^7.22.5", - "@babel/traverse": "^7.22.11", - "@babel/types": "^7.22.11" + "@babel/template": "^7.22.15", + "@babel/traverse": "^7.22.15", + "@babel/types": "^7.22.15" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/highlight": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.10.tgz", - "integrity": "sha512-78aUtVcT7MUscr0K5mIEnkwxPE0MaxkR5RxRwuHaQ+JuU5AmTPhY+do2mdzVTnIJJpyBglql2pehuBIWHug+WQ==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz", + "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==", "dependencies": { - "@babel/helper-validator-identifier": "^7.22.5", + "@babel/helper-validator-identifier": "^7.22.20", "chalk": "^2.4.2", "js-tokens": "^4.0.0" }, @@ -904,74 +858,10 @@ "node": ">=6.9.0" } }, - "node_modules/@babel/highlight/node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dependencies": { - "color-convert": "^1.9.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/@babel/highlight/node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==" - }, - "node_modules/@babel/highlight/node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/@babel/highlight/node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/@babel/parser": { - "version": "7.22.11", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.11.tgz", - "integrity": "sha512-R5zb8eJIBPJriQtbH/htEQy4k7E2dHWlD2Y2VT07JCzwYZHBxV5ZYtM0UhXSNMT74LyxuM+b1jdL7pSesXbC/g==", + "version": "7.22.16", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.16.tgz", + "integrity": "sha512-+gPfKv8UWeKKeJTUxe59+OobVcrYHETCsORl61EmSkmgymguYk/X5bp7GuUIXaFsc6y++v8ZxPsLSSuujqDphA==", "bin": { "parser": "bin/babel-parser.js" }, @@ -980,9 +870,9 @@ } }, "node_modules/@babel/plugin-transform-destructuring": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.10.tgz", - "integrity": "sha512-dPJrL0VOyxqLM9sritNbMSGx/teueHF/htMKrPT7DNxccXxRDPYqlgPFFdr8u+F+qUZOkZoXue/6rL5O5GduEw==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.15.tgz", + "integrity": "sha512-HzG8sFl1ZVGTme74Nw+X01XsUTqERVQ6/RLHo3XjGRzm7XD6QTtfS3NJotVgCGy8BzkDqRjRBD8dAyJn5TuvSQ==", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" }, @@ -994,9 +884,9 @@ } }, "node_modules/@babel/plugin-transform-parameters": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.5.tgz", - "integrity": "sha512-AVkFUBurORBREOmHRKo06FjHYgjrabpdqRSwq6+C7R5iTCZOsM4QbcB27St0a4U6fffyAOqh3s/qEfybAhfivg==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.15.tgz", + "integrity": "sha512-hjk7qKIqhyzhhUvRT683TYQOFa/4cQKwQy7ALvTpODswN40MljzNDa0YldevS6tGbxwaEKVn502JmY0dP7qEtQ==", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" }, @@ -1022,31 +912,31 @@ } }, "node_modules/@babel/template": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz", - "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", + "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", "dependencies": { - "@babel/code-frame": "^7.22.5", - "@babel/parser": "^7.22.5", - "@babel/types": "^7.22.5" + "@babel/code-frame": "^7.22.13", + "@babel/parser": "^7.22.15", + "@babel/types": "^7.22.15" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.22.11", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.11.tgz", - "integrity": "sha512-mzAenteTfomcB7mfPtyi+4oe5BZ6MXxWcn4CX+h4IRJ+OOGXBrWU6jDQavkQI9Vuc5P+donFabBfFCcmWka9lQ==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.20.tgz", + "integrity": "sha512-eU260mPZbU7mZ0N+X10pxXhQFMGTeLb9eFS0mxehS8HZp9o1uSnFeWQuG1UPrlxgA7QoUzFhOnilHDp0AXCyHw==", "dependencies": { - "@babel/code-frame": "^7.22.10", - "@babel/generator": "^7.22.10", - "@babel/helper-environment-visitor": "^7.22.5", + "@babel/code-frame": "^7.22.13", + "@babel/generator": "^7.22.15", + "@babel/helper-environment-visitor": "^7.22.20", "@babel/helper-function-name": "^7.22.5", "@babel/helper-hoist-variables": "^7.22.5", "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/parser": "^7.22.11", - "@babel/types": "^7.22.11", + "@babel/parser": "^7.22.16", + "@babel/types": "^7.22.19", "debug": "^4.1.0", "globals": "^11.1.0" }, @@ -1055,12 +945,12 @@ } }, "node_modules/@babel/types": { - "version": "7.22.11", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.11.tgz", - "integrity": "sha512-siazHiGuZRz9aB9NpHy9GOs9xiQPKnMzgdr493iI1M67vRXpnEq8ZOOKzezC5q7zwuQ6sDhdSp4SD9ixKSqKZg==", + "version": "7.22.19", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.19.tgz", + "integrity": "sha512-P7LAw/LbojPzkgp5oznjE6tQEIWbp4PkkfrZDINTro9zgBRtI324/EYsiSI7lhPbpIQ+DCeR2NNmMWANGGfZsg==", "dependencies": { "@babel/helper-string-parser": "^7.22.5", - "@babel/helper-validator-identifier": "^7.22.5", + "@babel/helper-validator-identifier": "^7.22.19", "to-fast-properties": "^2.0.0" }, "engines": { @@ -1124,9 +1014,9 @@ } }, "node_modules/@mongodb-js/devtools-connect": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@mongodb-js/devtools-connect/-/devtools-connect-2.3.1.tgz", - "integrity": "sha512-kdcJj6ao5jCeVbnndDJQIMD0HWBEhU7JB7Vcz7atnmJKA9cRgpSptvkAwfCAXXAYp4a+T2XcyP6BD6msM2jTJg==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/@mongodb-js/devtools-connect/-/devtools-connect-2.4.2.tgz", + "integrity": "sha512-cgRXxwZRO7K+gFVyrqcsWWrBfyaffVkafoXK91T1W+QsQxXZH1uoka2Pdle/5ugiGmuvEuKGQ9c+G8so4AKosQ==", "dependencies": { "lodash.merge": "^4.6.2", "mongodb-connection-string-url": "^2.6.0", @@ -1138,7 +1028,7 @@ }, "peerDependencies": { "@mongodb-js/oidc-plugin": "^0.3.0", - "mongodb": "^5.4.0", + "mongodb": "^5.8.1 || ^6.0.0", "mongodb-log-writer": "^1.2.0" } }, @@ -1151,7 +1041,6 @@ "version": "0.3.0", "resolved": "https://registry.npmjs.org/@mongodb-js/oidc-plugin/-/oidc-plugin-0.3.0.tgz", "integrity": "sha512-XIriu5WYwBJWiHFpIpiXz7FkeA0+jUyGB4KBs6v0U8JGlkkoAJY9lWuzBt0surjcl/dBWvpsZYun6492fMb2kw==", - "peer": true, "dependencies": { "abort-controller": "^3.0.0", "express": "^4.18.2", @@ -1166,18 +1055,17 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.1.0.tgz", "integrity": "sha512-Xfijy7HvfzzqiOAhAepF4SGN5e9leLkMvg/OPOF97XemjfVCYN/oWa75wnkc6mltMSTwY+XlbhWgUOJmkFspSw==", - "optional": true, "dependencies": { "sparse-bitfield": "^3.0.3" } }, "node_modules/@mongosh/arg-parser": { - "version": "1.10.6", - "resolved": "https://registry.npmjs.org/@mongosh/arg-parser/-/arg-parser-1.10.6.tgz", - "integrity": "sha512-z6rXCrsG3mvH8TyFn+j0pZwAlYPhTOYNgiG7X/Jf3YZdtGbu31HFXdG0SQcHpt+3D9AMLQDMrABSrHLDM4PqJA==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@mongosh/arg-parser/-/arg-parser-2.0.1.tgz", + "integrity": "sha512-rPMof8rQXyzoZNG/ZQsQPTArPsPCBEf/fdjbNbebn+Vgq2bsz8AF7vVIr5aF6bwgJlYcNZcoAytdLIK1NOO0XA==", "dependencies": { - "@mongosh/errors": "1.10.6", - "@mongosh/i18n": "1.10.6", + "@mongosh/errors": "2.0.1", + "@mongosh/i18n": "2.0.1", "mongodb-connection-string-url": "^2.6.0" }, "engines": { @@ -1185,9 +1073,9 @@ } }, "node_modules/@mongosh/async-rewriter2": { - "version": "1.10.6", - "resolved": "https://registry.npmjs.org/@mongosh/async-rewriter2/-/async-rewriter2-1.10.6.tgz", - "integrity": "sha512-1cd08jGwxj5TWdOSaLHnh82aT3IAzE7SpdXNdPIS6x9f1bddljnW21HT7aqVyuaG5RtU9kckf8eqE0pbD65taQ==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@mongosh/async-rewriter2/-/async-rewriter2-2.0.1.tgz", + "integrity": "sha512-xiQNRUGSRbkQ6iJZkrB71m0r49Yi2ersnjmZTKl+lYEi/P7+8xiQFnJt1oGH8Acwj+STEarI2L+kxReazDwlIw==", "dependencies": { "@babel/core": "^7.22.8", "@babel/plugin-transform-destructuring": "^7.22.5", @@ -1204,12 +1092,12 @@ } }, "node_modules/@mongosh/autocomplete": { - "version": "1.10.6", - "resolved": "https://registry.npmjs.org/@mongosh/autocomplete/-/autocomplete-1.10.6.tgz", - "integrity": "sha512-mb1KgTMyfFb/WrBvaKLuBI3GbnlEkxC4JNqWSHW91nwvsrBY0rr13lSI/ENJX3CsrjzIC1DyxcY6J2um2UC7dw==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@mongosh/autocomplete/-/autocomplete-2.0.1.tgz", + "integrity": "sha512-IJUhc9nVM0Uc7C31L145G0+R3eNDF3uOeX3VZiJm+fJyf1ALbS10dcZ2+/dJ30b6pcluGPv4y6k/3MAd+mdExw==", "dependencies": { "@mongodb-js/mongodb-constants": "^0.2.2", - "@mongosh/shell-api": "1.10.6", + "@mongosh/shell-api": "2.0.1", "semver": "^7.5.4" }, "engines": { @@ -1217,24 +1105,24 @@ } }, "node_modules/@mongosh/cli-repl": { - "version": "1.10.6", - "resolved": "https://registry.npmjs.org/@mongosh/cli-repl/-/cli-repl-1.10.6.tgz", - "integrity": "sha512-zb3LvlWsxxorgyPl18jatdVQreBtYd3A/+h1XGiNQtwjZ0eKkw4MSZudmz+z0SfTqRVPDMJ7Fgxk2m522e1HWA==", - "dependencies": { - "@mongosh/arg-parser": "1.10.6", - "@mongosh/autocomplete": "1.10.6", - "@mongosh/editor": "1.10.6", - "@mongosh/errors": "1.10.6", - "@mongosh/history": "1.10.6", - "@mongosh/i18n": "1.10.6", - "@mongosh/js-multiline-to-singleline": "1.10.6", - "@mongosh/logging": "1.10.6", - "@mongosh/service-provider-core": "1.10.6", - "@mongosh/service-provider-server": "1.10.6", - "@mongosh/shell-api": "1.10.6", - "@mongosh/shell-evaluator": "1.10.6", - "@mongosh/snippet-manager": "1.10.6", - "@mongosh/types": "1.10.6", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@mongosh/cli-repl/-/cli-repl-2.0.1.tgz", + "integrity": "sha512-eDvMgOT5KXoFHL5KyFnknIpPF/2m1unyktkRnV/abJKKKhp1HGw87iKQtxMhPobctNSgieMJ0zsmxxSWL9sS/Q==", + "dependencies": { + "@mongosh/arg-parser": "2.0.1", + "@mongosh/autocomplete": "2.0.1", + "@mongosh/editor": "2.0.1", + "@mongosh/errors": "2.0.1", + "@mongosh/history": "2.0.1", + "@mongosh/i18n": "2.0.1", + "@mongosh/js-multiline-to-singleline": "2.0.1", + "@mongosh/logging": "2.0.1", + "@mongosh/service-provider-core": "2.0.1", + "@mongosh/service-provider-server": "2.0.1", + "@mongosh/shell-api": "2.0.1", + "@mongosh/shell-evaluator": "2.0.1", + "@mongosh/snippet-manager": "2.0.1", + "@mongosh/types": "2.0.1", "analytics-node": "^5.1.2", "ansi-escape-sequences": "^5.1.2", "askcharacter": "^1.0.0", @@ -1242,7 +1130,7 @@ "is-recoverable-error": "^1.0.3", "js-yaml": "^4.1.0", "mongodb-connection-string-url": "^2.6.0", - "mongodb-log-writer": "^1.3.0", + "mongodb-log-writer": "^1.4.0", "numeral": "^2.0.6", "pretty-repl": "^4.0.0", "semver": "^7.5.4", @@ -1264,15 +1152,15 @@ } }, "node_modules/@mongosh/editor": { - "version": "1.10.6", - "resolved": "https://registry.npmjs.org/@mongosh/editor/-/editor-1.10.6.tgz", - "integrity": "sha512-HcHGSuVB9Jh27fi27flMtVCj7K0hiTmA1Wauv3IRwLOm+5QsMahXRt8sDIb86kw0mYtDke/UD2lWbbg351skPQ==", - "dependencies": { - "@mongosh/js-multiline-to-singleline": "1.10.6", - "@mongosh/service-provider-core": "1.10.6", - "@mongosh/shell-api": "1.10.6", - "@mongosh/shell-evaluator": "1.10.6", - "@mongosh/types": "1.10.6", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@mongosh/editor/-/editor-2.0.1.tgz", + "integrity": "sha512-hSa6dED3QBFqS0sBJslMbMIhzidJ9vHl8P/EyqwlZe8A1JniNvzCYZJCvImn/asFOpkugVbK1/ylhmLAMlu4nQ==", + "dependencies": { + "@mongosh/js-multiline-to-singleline": "2.0.1", + "@mongosh/service-provider-core": "2.0.1", + "@mongosh/shell-api": "2.0.1", + "@mongosh/shell-evaluator": "2.0.1", + "@mongosh/types": "2.0.1", "js-beautify": "^1.14.0" }, "engines": { @@ -1280,22 +1168,17 @@ } }, "node_modules/@mongosh/errors": { - "version": "1.10.6", - "resolved": "https://registry.npmjs.org/@mongosh/errors/-/errors-1.10.6.tgz", - "integrity": "sha512-QWkp+1pTbsritSk2eAgw5+6m6h+GtP9n7C+LaiVhOB7HfYSCNdI9OVvZXpBzRC9Cw0rMORUc1BwUL/OioRtaYw==", - "dependencies": { - "chalk": "^4.1.2", - "handlebars": "^4.7.7", - "typescript": "^5.0.4" - }, + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@mongosh/errors/-/errors-2.0.1.tgz", + "integrity": "sha512-hr1jvonFgjLz1ZdtIRma69dnNKdGXSOxAoZwj091jGChI4OZfGVvUIqd8pLGdfxnFHil6Rr58MwFRtlL6gQhPA==", "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/history": { - "version": "1.10.6", - "resolved": "https://registry.npmjs.org/@mongosh/history/-/history-1.10.6.tgz", - "integrity": "sha512-lP6HauOMmmEr1TuHWbmBxFLT4ZHsEX3QxxvNU232LmH1XKNHOyr7G9oafAz/TnA49h+QNaRusKJwLEVMeI7Eaw==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@mongosh/history/-/history-2.0.1.tgz", + "integrity": "sha512-elOd9I2/QuMc+JORH3VfIQWZ6jCzTIzkZcncHOwMHQ01TxmSf4QTyxzWyM+BjSYXev0XTc71h0WngIoq3Kx1OQ==", "dependencies": { "mongodb-connection-string-url": "^2.6.0", "mongodb-redact": "^0.2.2" @@ -1305,11 +1188,11 @@ } }, "node_modules/@mongosh/i18n": { - "version": "1.10.6", - "resolved": "https://registry.npmjs.org/@mongosh/i18n/-/i18n-1.10.6.tgz", - "integrity": "sha512-xj9/3MV6+jzcg+9HnInmAAtYLQF+2B8WNjrs3i+QHY0zl2C/2Fr59g8lL/btArtEbhCG0S0KYerYQ+9whI8qvg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@mongosh/i18n/-/i18n-2.0.1.tgz", + "integrity": "sha512-6PMyQ457E206cYHgXEf1ylkwa/pE/0cV5Os7/lx4sTYAy08AUhBvzQcGOAQ8l6RWDO7my4fB9GfKi0U26MlK7Q==", "dependencies": { - "@mongosh/errors": "1.10.6", + "@mongosh/errors": "2.0.1", "mustache": "^4.0.0" }, "engines": { @@ -1317,9 +1200,9 @@ } }, "node_modules/@mongosh/js-multiline-to-singleline": { - "version": "1.10.6", - "resolved": "https://registry.npmjs.org/@mongosh/js-multiline-to-singleline/-/js-multiline-to-singleline-1.10.6.tgz", - "integrity": "sha512-4kX7y6kAMCM/wwt1J6v6t6/rLQn5bZ8Xfc8HJA4bDiWVMt7FyjlrqShtkDXEzOcBpn2NMTKFrW8nmh1Bj3WZ2w==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@mongosh/js-multiline-to-singleline/-/js-multiline-to-singleline-2.0.1.tgz", + "integrity": "sha512-2AcyjuuHYwEht7ghVFFZGE05Bnu7OOso2SasqbL/KlIdh+dnKlhwmFMOQn5l/2pIfWenwuurl5fUMpcMPyrsTQ==", "dependencies": { "@babel/core": "^7.16.12", "@babel/types": "^7.21.2" @@ -1329,15 +1212,15 @@ } }, "node_modules/@mongosh/logging": { - "version": "1.10.6", - "resolved": "https://registry.npmjs.org/@mongosh/logging/-/logging-1.10.6.tgz", - "integrity": "sha512-QHvdyo2JC+1vb4y+G6civdx6UQSih5Ze+Myi63sHTNkTTEx7wf4qkRQm6qHNf++THxEjOB6Xmiq6V2J7WSfw4Q==", - "dependencies": { - "@mongodb-js/devtools-connect": "^2.3.1", - "@mongosh/errors": "1.10.6", - "@mongosh/history": "1.10.6", - "@mongosh/types": "1.10.6", - "mongodb-log-writer": "^1.3.0", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@mongosh/logging/-/logging-2.0.1.tgz", + "integrity": "sha512-QmczNhg3VM3O9IOa4si9dcjosAhqyOd2wiulU0AlBZ4e6ZTaj3wSnBbs+c1AD+8pFz1u+GMgI1/0bCVI/Krpnw==", + "dependencies": { + "@mongodb-js/devtools-connect": "^2.4.1", + "@mongosh/errors": "2.0.1", + "@mongosh/history": "2.0.1", + "@mongosh/types": "2.0.1", + "mongodb-log-writer": "^1.4.0", "mongodb-redact": "^0.2.2" }, "engines": { @@ -1345,56 +1228,57 @@ } }, "node_modules/@mongosh/service-provider-core": { - "version": "1.10.6", - "resolved": "https://registry.npmjs.org/@mongosh/service-provider-core/-/service-provider-core-1.10.6.tgz", - "integrity": "sha512-x91v6CnrTRr7Y61sUG5jLLqjcizggBiDHjpwxxauVvDrcziTWDXc9gEolJcgLqs2Roch3sQBc96BWfCwzJkfGw==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@mongosh/service-provider-core/-/service-provider-core-2.0.1.tgz", + "integrity": "sha512-TV1UnH69rx0L6K7TIT7cDgQ0fPnyVju2GLIMWGiCmb93txcXF/EgTuP/q1m8ZRW7JoaQMOOj8zXn4ZbsAkJ9Uw==", "dependencies": { "@aws-sdk/credential-providers": "^3.347.1", - "@mongosh/errors": "1.10.6", - "bson": "^5.3.0", - "mongodb": "^5.7.0", + "@mongosh/errors": "2.0.1", + "bson": "^6.0.0", + "mongodb": "^6.0.0", "mongodb-build-info": "^1.6.2" }, "engines": { "node": ">=14.15.1" }, "optionalDependencies": { - "mongodb-client-encryption": "^2.8.0" + "mongodb-client-encryption": "^6.0.0" } }, "node_modules/@mongosh/service-provider-server": { - "version": "1.10.6", - "resolved": "https://registry.npmjs.org/@mongosh/service-provider-server/-/service-provider-server-1.10.6.tgz", - "integrity": "sha512-0L+byNyYYNORyDR64BTG5HgRBW3nle/vjJl0aSEvf2vWsUnZF9lijjTXw52JT8VQAoM8+i9xddwZodF/AMXP7Q==", - "dependencies": { - "@mongodb-js/devtools-connect": "^2.3.1", - "@mongosh/errors": "1.10.6", - "@mongosh/service-provider-core": "1.10.6", - "@mongosh/types": "1.10.6", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@mongosh/service-provider-server/-/service-provider-server-2.0.1.tgz", + "integrity": "sha512-CmOJKFtZDM0sroI+w4QdXiKub5Lf2HheAVx8QgGBshI/8npRnaXN9nSOww/p3p585BCmKiw9CLf/QXJSGXj6fA==", + "dependencies": { + "@mongodb-js/devtools-connect": "^2.4.1", + "@mongodb-js/oidc-plugin": "^0.3.0", + "@mongosh/errors": "2.0.1", + "@mongosh/service-provider-core": "2.0.1", + "@mongosh/types": "2.0.1", "@types/sinon-chai": "^3.2.4", "aws4": "^1.11.0", - "mongodb": "^5.7.0", + "mongodb": "^6.0.0", "mongodb-connection-string-url": "^2.6.0", - "saslprep": "npm:@mongodb-js/saslprep@^1.1.0" + "socks": "^2.7.1" }, "engines": { "node": ">=14.15.1" }, "optionalDependencies": { - "kerberos": "^2.0.0", - "mongodb-client-encryption": "^2.8.0" + "kerberos": "2.0.1", + "mongodb-client-encryption": "^6.0.0" } }, "node_modules/@mongosh/shell-api": { - "version": "1.10.6", - "resolved": "https://registry.npmjs.org/@mongosh/shell-api/-/shell-api-1.10.6.tgz", - "integrity": "sha512-bqC4mObT0Vt2ynmqYFBmbWOmxqZlHl3JMGambpSAst1aQM3uUDWWbmf1s9icyfvUwAzbXe7698nUuOkxW+2/Vw==", - "dependencies": { - "@mongosh/arg-parser": "1.10.6", - "@mongosh/errors": "1.10.6", - "@mongosh/history": "1.10.6", - "@mongosh/i18n": "1.10.6", - "@mongosh/service-provider-core": "1.10.6", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@mongosh/shell-api/-/shell-api-2.0.1.tgz", + "integrity": "sha512-llVF/BEzfLHOgxCsmidv9GJzQnQDcO02/op6jG0JDYAIBQPMZhg1OpGEF5Ju/5220sH/gqQhajOYM2rFlbyBSw==", + "dependencies": { + "@mongosh/arg-parser": "2.0.1", + "@mongosh/errors": "2.0.1", + "@mongosh/history": "2.0.1", + "@mongosh/i18n": "2.0.1", + "@mongosh/service-provider-core": "2.0.1", "mongodb-redact": "^0.2.2" }, "engines": { @@ -1402,27 +1286,27 @@ } }, "node_modules/@mongosh/shell-evaluator": { - "version": "1.10.6", - "resolved": "https://registry.npmjs.org/@mongosh/shell-evaluator/-/shell-evaluator-1.10.6.tgz", - "integrity": "sha512-djFpyX5vnyivF7Sf4ywwsPDJ0xZjOFOK+lYFTqXVrO8POvoDNYbKsaXs4Y6Ktd0mA5O1Zj/bXNbPDWHirpXy6g==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@mongosh/shell-evaluator/-/shell-evaluator-2.0.1.tgz", + "integrity": "sha512-kWkE6uLf3WtWHU/sgqWQjJ7nsDhFdWW9L4wtoiKfGjGgYu8bHY/PM0PI0RUGBGagpx/OXfZ4P95J6T0BTqMdHA==", "dependencies": { - "@mongosh/async-rewriter2": "1.10.6", - "@mongosh/history": "1.10.6", - "@mongosh/shell-api": "1.10.6" + "@mongosh/async-rewriter2": "2.0.1", + "@mongosh/history": "2.0.1", + "@mongosh/shell-api": "2.0.1" }, "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/snippet-manager": { - "version": "1.10.6", - "resolved": "https://registry.npmjs.org/@mongosh/snippet-manager/-/snippet-manager-1.10.6.tgz", - "integrity": "sha512-QcOf5XTwAQ3FDeBL9Jniew1pKTDBehLb9eq5hOmNuNtoLrNAu10gsqBkfEPrQ4x3F+TJpaIVQo3ULAahSYSitA==", - "dependencies": { - "@mongosh/errors": "1.10.6", - "@mongosh/shell-api": "1.10.6", - "@mongosh/types": "1.10.6", - "bson": "^5.3.0", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@mongosh/snippet-manager/-/snippet-manager-2.0.1.tgz", + "integrity": "sha512-r+l2U4C0XiE/jZzAEvYIenKidWGLcAqnE3ZgK/GhR5qE6uM3Jz+75+m6z7ufCzotS/nrDDjKALcKSIamzRFWRA==", + "dependencies": { + "@mongosh/errors": "2.0.1", + "@mongosh/shell-api": "2.0.1", + "@mongosh/types": "2.0.1", + "bson": "^6.0.0", "cross-spawn": "^7.0.3", "escape-string-regexp": "^4.0.0", "joi": "^17.4.0", @@ -1434,11 +1318,11 @@ } }, "node_modules/@mongosh/types": { - "version": "1.10.6", - "resolved": "https://registry.npmjs.org/@mongosh/types/-/types-1.10.6.tgz", - "integrity": "sha512-v6gRl1ek8ioWhyo8tTs1EQwGdGKSUBmUXbPSRjqFqVITkJ8kFDu0+qRoms2m4VHvIv9ml//VqHHvBTj8Mjxx9A==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@mongosh/types/-/types-2.0.1.tgz", + "integrity": "sha512-T/xz+RCcilt+NixGwsCh9VreiZmUUT5ZIHeD0NdOICKu/PBl5aDenZDa+94u+qOEN6IUexqT6u6mEhmnJiVDDg==", "dependencies": { - "@mongodb-js/devtools-connect": "^2.3.1" + "@mongodb-js/devtools-connect": "^2.4.1" }, "engines": { "node": ">=14.15.1" @@ -1477,11 +1361,11 @@ "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==" }, "node_modules/@smithy/abort-controller": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-2.0.5.tgz", - "integrity": "sha512-byVZ2KWLMPYAZGKjRpniAzLcygJO4ruClZKdJTuB0eCB76ONFTdptBHlviHpAZXknRz7skYWPfcgO9v30A1SyA==", + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-2.0.9.tgz", + "integrity": "sha512-8liHOEbx99xcy4VndeQNQhyA0LS+e7UqsuRnDTSIA26IKBv/7vA9w09KOd4fgNULrvX0r3WpA6cwsQTRJpSWkg==", "dependencies": { - "@smithy/types": "^2.2.2", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" }, "engines": { @@ -1489,13 +1373,14 @@ } }, "node_modules/@smithy/config-resolver": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-2.0.5.tgz", - "integrity": "sha512-n0c2AXz+kjALY2FQr7Zy9zhYigXzboIh1AuUUVCqFBKFtdEvTwnwPXrTDoEehLiRTUHNL+4yzZ3s+D0kKYSLSg==", + "version": "2.0.10", + "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-2.0.10.tgz", + "integrity": "sha512-MwToDsCltHjumkCuRn883qoNeJUawc2b8sX9caSn5vLz6J5crU1IklklNxWCaMO2z2nDL91Po4b/aI1eHv5PfA==", "dependencies": { - "@smithy/types": "^2.2.2", + "@smithy/node-config-provider": "^2.0.12", + "@smithy/types": "^2.3.3", "@smithy/util-config-provider": "^2.0.0", - "@smithy/util-middleware": "^2.0.0", + "@smithy/util-middleware": "^2.0.2", "tslib": "^2.5.0" }, "engines": { @@ -1503,14 +1388,14 @@ } }, "node_modules/@smithy/credential-provider-imds": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-2.0.5.tgz", - "integrity": "sha512-KFcf/e0meFkQNyteJ65f1G19sgUEY1e5zL7hyAEUPz2SEfBmC9B37WyRq87G3MEEsvmAWwCRu7nFFYUKtR3svQ==", - "dependencies": { - "@smithy/node-config-provider": "^2.0.5", - "@smithy/property-provider": "^2.0.5", - "@smithy/types": "^2.2.2", - "@smithy/url-parser": "^2.0.5", + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-2.0.12.tgz", + "integrity": "sha512-S3lUNe+2fEFwKcmiQniXGPXt69vaHvQCw8kYQOBL4OvJsgwfpkIYDZdroHbTshYi0M6WaKL26Mw+hvgma6dZqA==", + "dependencies": { + "@smithy/node-config-provider": "^2.0.12", + "@smithy/property-provider": "^2.0.10", + "@smithy/types": "^2.3.3", + "@smithy/url-parser": "^2.0.9", "tslib": "^2.5.0" }, "engines": { @@ -1518,34 +1403,34 @@ } }, "node_modules/@smithy/eventstream-codec": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-2.0.5.tgz", - "integrity": "sha512-iqR6OuOV3zbQK8uVs9o+9AxhVk8kW9NAxA71nugwUB+kTY9C35pUd0A5/m4PRT0Y0oIW7W4kgnSR3fdYXQjECw==", + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-2.0.9.tgz", + "integrity": "sha512-sy0pcbKnawt1iu+qCoSFbs/h9PAaUgvlJEO3lqkE1HFFj4p5RgL98vH+9CyDoj6YY82cG5XsorFmcLqQJHTOYw==", "dependencies": { "@aws-crypto/crc32": "3.0.0", - "@smithy/types": "^2.2.2", + "@smithy/types": "^2.3.3", "@smithy/util-hex-encoding": "^2.0.0", "tslib": "^2.5.0" } }, "node_modules/@smithy/fetch-http-handler": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-2.0.5.tgz", - "integrity": "sha512-EzFoMowdBNy1VqtvkiXgPFEdosIAt4/4bgZ8uiDiUyfhmNXq/3bV+CagPFFBsgFOR/X2XK4zFZHRsoa7PNHVVg==", + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-2.1.5.tgz", + "integrity": "sha512-BIeCHGfr5JCGN+EMTwZK74ELvjPXOIrI7OLM5OhZJJ6AmZyRv2S9ANJk18AtLwht0TsSm+8WoXIEp8LuxNgUyA==", "dependencies": { - "@smithy/protocol-http": "^2.0.5", - "@smithy/querystring-builder": "^2.0.5", - "@smithy/types": "^2.2.2", + "@smithy/protocol-http": "^3.0.5", + "@smithy/querystring-builder": "^2.0.9", + "@smithy/types": "^2.3.3", "@smithy/util-base64": "^2.0.0", "tslib": "^2.5.0" } }, "node_modules/@smithy/hash-node": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-2.0.5.tgz", - "integrity": "sha512-mk551hIywBITT+kXruRNXk7f8Fy7DTzBjZJSr/V6nolYKmUHIG3w5QU6nO9qPYEQGKc/yEPtkpdS28ndeG93lA==", + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-2.0.9.tgz", + "integrity": "sha512-XP3yWd5wyCtiVmsY5Nuq/FUwyCEQ6YG7DsvRh7ThldNukGpCzyFdP8eivZJVjn4Fx7oYrrOnVoYZ0WEgpW1AvQ==", "dependencies": { - "@smithy/types": "^2.2.2", + "@smithy/types": "^2.3.3", "@smithy/util-buffer-from": "^2.0.0", "@smithy/util-utf8": "^2.0.0", "tslib": "^2.5.0" @@ -1555,11 +1440,11 @@ } }, "node_modules/@smithy/invalid-dependency": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-2.0.5.tgz", - "integrity": "sha512-0wEi+JT0hM+UUwrJVYbqjuGFhy5agY/zXyiN7BNAJ1XoCDjU5uaNSj8ekPWsXd/d4yM6NSe8UbPd8cOc1+3oBQ==", + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-2.0.9.tgz", + "integrity": "sha512-RuJqhYf8nViK96IIO9JbTtjDUuFItVfuuJhWw2yk7fv67yltQ7fZD6IQ2OsHHluoVmstnQJuCg5raXJR696Ubw==", "dependencies": { - "@smithy/types": "^2.2.2", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" } }, @@ -1575,12 +1460,12 @@ } }, "node_modules/@smithy/middleware-content-length": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-2.0.5.tgz", - "integrity": "sha512-E7VwV5H02fgZIUGRli4GevBCAPvkyEI/fgl9SU47nPPi3DAAX3nEtUb8xfGbXjOcJ5BdSUoWWZn42tEd/blOqA==", + "version": "2.0.11", + "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-2.0.11.tgz", + "integrity": "sha512-Malj4voNTL4+a5ZL3a6+Ij7JTUMTa2R7c3ZIBzMxN5OUUgAspU7uFi1Q97f4B0afVh2joQBAWH5IQJUG25nl8g==", "dependencies": { - "@smithy/protocol-http": "^2.0.5", - "@smithy/types": "^2.2.2", + "@smithy/protocol-http": "^3.0.5", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" }, "engines": { @@ -1588,14 +1473,14 @@ } }, "node_modules/@smithy/middleware-endpoint": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-2.0.5.tgz", - "integrity": "sha512-tyzDuoNTbsMQCq5Xkc4QOt6e2GACUllQIV8SQ5fc59FtOIV9/vbf58/GxVjZm2o8+MMbdDBANjTDZe/ijZKfyA==", - "dependencies": { - "@smithy/middleware-serde": "^2.0.5", - "@smithy/types": "^2.2.2", - "@smithy/url-parser": "^2.0.5", - "@smithy/util-middleware": "^2.0.0", + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-2.0.9.tgz", + "integrity": "sha512-72/o8R6AAO4+nyTI6h4z6PYGTSA4dr1M7tZz29U8DEUHuh1YkhC77js0P6RyF9G0wDLuYqxb+Yh0crI5WG2pJg==", + "dependencies": { + "@smithy/middleware-serde": "^2.0.9", + "@smithy/types": "^2.3.3", + "@smithy/url-parser": "^2.0.9", + "@smithy/util-middleware": "^2.0.2", "tslib": "^2.5.0" }, "engines": { @@ -1603,15 +1488,16 @@ } }, "node_modules/@smithy/middleware-retry": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-2.0.5.tgz", - "integrity": "sha512-ulIfbFyzQTVnJbLjUl1CTSi0etg6tej/ekwaLp0Gn8ybUkDkKYa+uB6CF/m2J5B6meRwyJlsryR+DjaOVyiicg==", - "dependencies": { - "@smithy/protocol-http": "^2.0.5", - "@smithy/service-error-classification": "^2.0.0", - "@smithy/types": "^2.2.2", - "@smithy/util-middleware": "^2.0.0", - "@smithy/util-retry": "^2.0.0", + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-2.0.12.tgz", + "integrity": "sha512-YQ/ufXX4/d9/+Jf1QQ4J+CVeupC7BW52qldBTvRV33PDX9vxndlAwkFwzBcmnUFC3Hjf1//HW6I77EItcjNSCA==", + "dependencies": { + "@smithy/node-config-provider": "^2.0.12", + "@smithy/protocol-http": "^3.0.5", + "@smithy/service-error-classification": "^2.0.2", + "@smithy/types": "^2.3.3", + "@smithy/util-middleware": "^2.0.2", + "@smithy/util-retry": "^2.0.2", "tslib": "^2.5.0", "uuid": "^8.3.2" }, @@ -1620,11 +1506,11 @@ } }, "node_modules/@smithy/middleware-serde": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-2.0.5.tgz", - "integrity": "sha512-in0AA5sous74dOfTGU9rMJBXJ0bDVNxwdXtEt5lh3FVd2sEyjhI+rqpLLRF1E4ixbw3RSEf80hfRpcPdjg4vvQ==", + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-2.0.9.tgz", + "integrity": "sha512-GVbauxrr6WmtCaesakktg3t5LR/yDbajpC7KkWc8rtCpddMI4ShAVO5Q6DqwX8MDFi4CLaY8H7eTGcxhl3jbLg==", "dependencies": { - "@smithy/types": "^2.2.2", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" }, "engines": { @@ -1632,10 +1518,11 @@ } }, "node_modules/@smithy/middleware-stack": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-2.0.0.tgz", - "integrity": "sha512-31XC1xNF65nlbc16yuh3wwTudmqs6qy4EseQUGF8A/p2m/5wdd/cnXJqpniy/XvXVwkHPz/GwV36HqzHtIKATQ==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-2.0.3.tgz", + "integrity": "sha512-AlhPmbwpkC4lQBVaVHXczmjFvsAhDHhrakqLt038qFLotnJcvDLhmMzAtu23alBeOSkKxkTQq0LsAt2N0WpAbw==", "dependencies": { + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" }, "engines": { @@ -1643,13 +1530,13 @@ } }, "node_modules/@smithy/node-config-provider": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-2.0.5.tgz", - "integrity": "sha512-LRtjV9WkhONe2lVy+ipB/l1GX60ybzBmFyeRUoLUXWKdnZ3o81jsnbKzMK8hKq8eFSWPk+Lmyx6ZzCQabGeLxg==", + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-2.0.12.tgz", + "integrity": "sha512-df9y9ywv+JmS40Y60ZqJ4jfZiTCmyHQffwzIqjBjLJLJl0imf9F6DWBd+jiEWHvlohR+sFhyY+KL/qzKgnAq1A==", "dependencies": { - "@smithy/property-provider": "^2.0.5", - "@smithy/shared-ini-file-loader": "^2.0.5", - "@smithy/types": "^2.2.2", + "@smithy/property-provider": "^2.0.10", + "@smithy/shared-ini-file-loader": "^2.0.11", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" }, "engines": { @@ -1657,14 +1544,14 @@ } }, "node_modules/@smithy/node-http-handler": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-2.0.5.tgz", - "integrity": "sha512-lZm5DZf4b3V0saUw9WTC4/du887P6cy2fUyQgQQKRRV6OseButyD5yTzeMmXE53CaXJBMBsUvvIQ0hRVxIq56w==", - "dependencies": { - "@smithy/abort-controller": "^2.0.5", - "@smithy/protocol-http": "^2.0.5", - "@smithy/querystring-builder": "^2.0.5", - "@smithy/types": "^2.2.2", + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-2.1.5.tgz", + "integrity": "sha512-52uF+BrZaFiBh+NT/bADiVDCQO91T+OwDRsuaAeWZC1mlCXFjAPPQdxeQohtuYOe9m7mPP/xIMNiqbe8jvndHA==", + "dependencies": { + "@smithy/abort-controller": "^2.0.9", + "@smithy/protocol-http": "^3.0.5", + "@smithy/querystring-builder": "^2.0.9", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" }, "engines": { @@ -1672,11 +1559,11 @@ } }, "node_modules/@smithy/property-provider": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-2.0.5.tgz", - "integrity": "sha512-cAFSUhX6aiHcmpWfrCLKvwBtgN1F6A0N8qY/8yeSi0LRLmhGqsY1/YTxFE185MCVzYbqBGXVr9TBv4RUcIV4rA==", + "version": "2.0.10", + "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-2.0.10.tgz", + "integrity": "sha512-YMBVfh0ZMmJtbsUn+WfSwR32iRljZPdRN0Tn2GAcdJ+ejX8WrBXD7Z0jIkQDrQZr8fEuuv5x8WxMIj+qVbsPQw==", "dependencies": { - "@smithy/types": "^2.2.2", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" }, "engines": { @@ -1684,11 +1571,11 @@ } }, "node_modules/@smithy/protocol-http": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-2.0.5.tgz", - "integrity": "sha512-d2hhHj34mA2V86doiDfrsy2fNTnUOowGaf9hKb0hIPHqvcnShU4/OSc4Uf1FwHkAdYF3cFXTrj5VGUYbEuvMdw==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-3.0.5.tgz", + "integrity": "sha512-3t3fxj+ip4EPHRC2fQ0JimMxR/qCQ1LSQJjZZVZFgROnFLYWPDgUZqpoi7chr+EzatxJVXF/Rtoi5yLHOWCoZQ==", "dependencies": { - "@smithy/types": "^2.2.2", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" }, "engines": { @@ -1696,11 +1583,11 @@ } }, "node_modules/@smithy/querystring-builder": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-2.0.5.tgz", - "integrity": "sha512-4DCX9krxLzATj+HdFPC3i8pb7XTAWzzKqSw8aTZMjXjtQY+vhe4azMAqIvbb6g7JKwIkmkRAjK6EXO3YWSnJVQ==", + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-2.0.9.tgz", + "integrity": "sha512-Yt6CPF4j3j1cuwod/DRflbuXxBFjJm7gAjy6W1RE21Rz5/kfGFqiZBXWmmXwGtnnhiLThYwoHK4S6/TQtnx0Fg==", "dependencies": { - "@smithy/types": "^2.2.2", + "@smithy/types": "^2.3.3", "@smithy/util-uri-escape": "^2.0.0", "tslib": "^2.5.0" }, @@ -1709,11 +1596,11 @@ } }, "node_modules/@smithy/querystring-parser": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-2.0.5.tgz", - "integrity": "sha512-C2stCULH0r54KBksv3AWcN8CLS3u9+WsEW8nBrvctrJ5rQTNa1waHkffpVaiKvcW2nP0aIMBPCobD/kYf/q9mA==", + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-2.0.9.tgz", + "integrity": "sha512-U6z4N743s4vrcxPW8p8+reLV0PjMCYEyb1/wtMVvv3VnbJ74gshdI8SR1sBnEh95cF8TxonmX5IxY25tS9qGfg==", "dependencies": { - "@smithy/types": "^2.2.2", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" }, "engines": { @@ -1721,19 +1608,22 @@ } }, "node_modules/@smithy/service-error-classification": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-2.0.0.tgz", - "integrity": "sha512-2z5Nafy1O0cTf69wKyNjGW/sNVMiqDnb4jgwfMG8ye8KnFJ5qmJpDccwIbJNhXIfbsxTg9SEec2oe1cexhMJvw==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-2.0.2.tgz", + "integrity": "sha512-GTUd2j63gKy7A+ggvSdn2hc4sejG7LWfE+ZMF17vzWoNyqERWbRP7HTPS0d0Lwg1p6OQCAzvNigSrEIWVFt6iA==", + "dependencies": { + "@smithy/types": "^2.3.3" + }, "engines": { "node": ">=14.0.0" } }, "node_modules/@smithy/shared-ini-file-loader": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-2.0.5.tgz", - "integrity": "sha512-Mvtk6FwMtfbKRC4YuSsIqRYp9WTxsSUJVVo2djgyhcacKGMqicHDWSAmgy3sDrKv+G/G6xTZCPwm6pJARtdxVg==", + "version": "2.0.11", + "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-2.0.11.tgz", + "integrity": "sha512-Sf0u5C5px6eykXi6jImDTp+edvG3REtPjXnFWU/J+b7S2wkXwUqFXqBL5DdM4zC1F+M8u57ZT7NRqDwMOw7/Tw==", "dependencies": { - "@smithy/types": "^2.2.2", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" }, "engines": { @@ -1741,15 +1631,15 @@ } }, "node_modules/@smithy/signature-v4": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-2.0.5.tgz", - "integrity": "sha512-ABIzXmUDXK4n2c9cXjQLELgH2RdtABpYKT+U131e2I6RbCypFZmxIHmIBufJzU2kdMCQ3+thBGDWorAITFW04A==", + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-2.0.9.tgz", + "integrity": "sha512-RkHP0joSI1j2EI+mU55sOi33/aMMkKdL9ZY+SWrPxsiCe1oyzzuy79Tpn8X7uT+t0ilNmQlwPpkP/jUy940pEA==", "dependencies": { - "@smithy/eventstream-codec": "^2.0.5", + "@smithy/eventstream-codec": "^2.0.9", "@smithy/is-array-buffer": "^2.0.0", - "@smithy/types": "^2.2.2", + "@smithy/types": "^2.3.3", "@smithy/util-hex-encoding": "^2.0.0", - "@smithy/util-middleware": "^2.0.0", + "@smithy/util-middleware": "^2.0.2", "@smithy/util-uri-escape": "^2.0.0", "@smithy/util-utf8": "^2.0.0", "tslib": "^2.5.0" @@ -1759,13 +1649,13 @@ } }, "node_modules/@smithy/smithy-client": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-2.0.5.tgz", - "integrity": "sha512-kCTFr8wfOAWKDzGvfBElc6shHigWtHNhMQ1IbosjC4jOlayFyZMSs2PysKB+Ox/dhQ41KqOzgVjgiQ+PyWqHMQ==", + "version": "2.1.7", + "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-2.1.7.tgz", + "integrity": "sha512-r6T/oiBQ8vCbGqObH4/h0YqD0jFB1hAS9KFRmuTfaNJueu/L2hjmjqFjv3PV5lkbNHTgUYraSv4cFQ1naxiELQ==", "dependencies": { - "@smithy/middleware-stack": "^2.0.0", - "@smithy/types": "^2.2.2", - "@smithy/util-stream": "^2.0.5", + "@smithy/middleware-stack": "^2.0.3", + "@smithy/types": "^2.3.3", + "@smithy/util-stream": "^2.0.12", "tslib": "^2.5.0" }, "engines": { @@ -1773,9 +1663,9 @@ } }, "node_modules/@smithy/types": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/@smithy/types/-/types-2.2.2.tgz", - "integrity": "sha512-4PS0y1VxDnELGHGgBWlDksB2LJK8TG8lcvlWxIsgR+8vROI7Ms8h1P4FQUx+ftAX2QZv5g1CJCdhdRmQKyonyw==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@smithy/types/-/types-2.3.3.tgz", + "integrity": "sha512-zTdIPR9PvFVNRdIKMQu4M5oyTaycIbUqLheQqaOi9rTWPkgjGO2wDBxMA1rBHQB81aqAEv+DbSS4jfKyQMnXRA==", "dependencies": { "tslib": "^2.5.0" }, @@ -1784,12 +1674,12 @@ } }, "node_modules/@smithy/url-parser": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-2.0.5.tgz", - "integrity": "sha512-OdMBvZhpckQSkugCXNJQCvqJ71wE7Ftxce92UOQLQ9pwF6hoS5PLL7wEfpnuEXtStzBqJYkzu1C1ZfjuFGOXAA==", + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-2.0.9.tgz", + "integrity": "sha512-NBnJ0NiY8z6E82Xd5VYUFQfKwK/wA/+QkKmpYUYP+cpH3aCzE6g2gvixd9vQKYjsIdRfNPCf+SFAozt8ljozOw==", "dependencies": { - "@smithy/querystring-parser": "^2.0.5", - "@smithy/types": "^2.2.2", + "@smithy/querystring-parser": "^2.0.9", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" } }, @@ -1848,12 +1738,13 @@ } }, "node_modules/@smithy/util-defaults-mode-browser": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-2.0.5.tgz", - "integrity": "sha512-yciP6TPttLsj731aHTvekgyuCGXQrEAJibEwEWAh3kzaDsfGAVCuZSBlyvC2Dl3TZmHKCOQwHV8mIE7KQCTPuQ==", + "version": "2.0.11", + "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-2.0.11.tgz", + "integrity": "sha512-0syV1Mz/mCQ7CG/MHKQfH+w86xq59jpD0EOXv5oe0WBXLmq2lWPpVHl2Y6+jQ+/9fYzyZ5NF+NC/WEIuiv690A==", "dependencies": { - "@smithy/property-provider": "^2.0.5", - "@smithy/types": "^2.2.2", + "@smithy/property-provider": "^2.0.10", + "@smithy/smithy-client": "^2.1.7", + "@smithy/types": "^2.3.3", "bowser": "^2.11.0", "tslib": "^2.5.0" }, @@ -1862,15 +1753,16 @@ } }, "node_modules/@smithy/util-defaults-mode-node": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.0.5.tgz", - "integrity": "sha512-M07t99rWasXt+IaDZDyP3BkcoEm/mgIE1RIMASrE49LKSNxaVN7PVcgGc77+4uu2kzBAyqJKy79pgtezuknyjQ==", - "dependencies": { - "@smithy/config-resolver": "^2.0.5", - "@smithy/credential-provider-imds": "^2.0.5", - "@smithy/node-config-provider": "^2.0.5", - "@smithy/property-provider": "^2.0.5", - "@smithy/types": "^2.2.2", + "version": "2.0.13", + "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.0.13.tgz", + "integrity": "sha512-6BtCHYdw5Z8r6KpW8tRCc3yURgvcQwfIEeHhR70BeSOfx8T/TXPPjb8A+K45+KASspa3fzrsSxeIwB0sAeMoHA==", + "dependencies": { + "@smithy/config-resolver": "^2.0.10", + "@smithy/credential-provider-imds": "^2.0.12", + "@smithy/node-config-provider": "^2.0.12", + "@smithy/property-provider": "^2.0.10", + "@smithy/smithy-client": "^2.1.7", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" }, "engines": { @@ -1889,10 +1781,11 @@ } }, "node_modules/@smithy/util-middleware": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-2.0.0.tgz", - "integrity": "sha512-eCWX4ECuDHn1wuyyDdGdUWnT4OGyIzV0LN1xRttBFMPI9Ff/4heSHVxneyiMtOB//zpXWCha1/SWHJOZstG7kA==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-2.0.2.tgz", + "integrity": "sha512-UGPZM+Ja/vke5pc/S8G0LNiHpVirtjppsXO+GK9m9wbzRGzPJTfnZA/gERUUN/AfxEy/8SL7U1kd7u4t2X8K1w==", "dependencies": { + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" }, "engines": { @@ -1900,11 +1793,12 @@ } }, "node_modules/@smithy/util-retry": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-2.0.0.tgz", - "integrity": "sha512-/dvJ8afrElasuiiIttRJeoS2sy8YXpksQwiM/TcepqdRVp7u4ejd9C4IQURHNjlfPUT7Y6lCDSa2zQJbdHhVTg==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-2.0.2.tgz", + "integrity": "sha512-ovWiayUB38moZcLhSFFfUgB2IMb7R1JfojU20qSahjxAgfOZvDWme3eOYUMtAVnouZ9kYJiFgHLy27qRH4NeeA==", "dependencies": { - "@smithy/service-error-classification": "^2.0.0", + "@smithy/service-error-classification": "^2.0.2", + "@smithy/types": "^2.3.3", "tslib": "^2.5.0" }, "engines": { @@ -1912,13 +1806,13 @@ } }, "node_modules/@smithy/util-stream": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-2.0.5.tgz", - "integrity": "sha512-ylx27GwI05xLpYQ4hDIfS15vm+wYjNN0Sc2P0FxuzgRe8v0BOLHppGIQ+Bezcynk8C9nUzsUue3TmtRhjut43g==", + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-2.0.12.tgz", + "integrity": "sha512-FOCpRLaj6gvSyUC5mJAACT+sPMPmp9sD1o+hVbUH/QxwZfulypA3ZIFdAg/59/IY0d/1Q4CTztsiHEB5LgjN4g==", "dependencies": { - "@smithy/fetch-http-handler": "^2.0.5", - "@smithy/node-http-handler": "^2.0.5", - "@smithy/types": "^2.2.2", + "@smithy/fetch-http-handler": "^2.1.5", + "@smithy/node-http-handler": "^2.1.5", + "@smithy/types": "^2.3.3", "@smithy/util-base64": "^2.0.0", "@smithy/util-buffer-from": "^2.0.0", "@smithy/util-hex-encoding": "^2.0.0", @@ -1953,9 +1847,9 @@ } }, "node_modules/@types/babel__core": { - "version": "7.20.1", - "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.1.tgz", - "integrity": "sha512-aACu/U/omhdk15O4Nfb+fHgH/z3QsfQzpnvRZhYhThms83ZnAOZz7zZAWO7mn2yyNQaA4xTO8GLK3uqFU4bYYw==", + "version": "7.20.2", + "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.2.tgz", + "integrity": "sha512-pNpr1T1xLUc2l3xJKuPtsEky3ybxN3m4fJkknfIpTCTfIZCDW57oAg+EfCgIIp2rvCe0Wn++/FfodDS4YXxBwA==", "dependencies": { "@babel/parser": "^7.20.7", "@babel/types": "^7.20.7", @@ -1965,39 +1859,39 @@ } }, "node_modules/@types/babel__generator": { - "version": "7.6.4", - "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz", - "integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==", + "version": "7.6.5", + "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.5.tgz", + "integrity": "sha512-h9yIuWbJKdOPLJTbmSpPzkF67e659PbQDba7ifWm5BJ8xTv+sDmS7rFmywkWOvXedGTivCdeGSIIX8WLcRTz8w==", "dependencies": { "@babel/types": "^7.0.0" } }, "node_modules/@types/babel__template": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz", - "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==", + "version": "7.4.2", + "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.2.tgz", + "integrity": "sha512-/AVzPICMhMOMYoSx9MoKpGDKdBRsIXMNByh1PXSZoa+v6ZoLa8xxtsT/uLQ/NJm0XVAWl/BvId4MlDeXJaeIZQ==", "dependencies": { "@babel/parser": "^7.1.0", "@babel/types": "^7.0.0" } }, "node_modules/@types/babel__traverse": { - "version": "7.20.1", - "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.1.tgz", - "integrity": "sha512-MitHFXnhtgwsGZWtT68URpOvLN4EREih1u3QtQiN4VdAxWKRVvGCSvw/Qth0M0Qq3pJpnGOu5JaM/ydK7OGbqg==", + "version": "7.20.2", + "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.2.tgz", + "integrity": "sha512-ojlGK1Hsfce93J0+kn3H5R73elidKUaZonirN33GSmgTUMpzI/MIFfSpF3haANe3G1bEBS9/9/QEqwTzwqFsKw==", "dependencies": { "@babel/types": "^7.20.7" } }, "node_modules/@types/chai": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.5.tgz", - "integrity": "sha512-mEo1sAde+UCE6b2hxn332f1g1E8WfYRu6p5SvTKr2ZKC1f7gFJXk4h5PyGP9Dt6gCaG8y8XhwnXWC6Iy2cmBng==" + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.6.tgz", + "integrity": "sha512-VOVRLM1mBxIRxydiViqPcKn6MIxZytrbMpd6RJLIWKxUNr3zux8no0Oc7kJx0WAPIitgZ0gkrDS+btlqQpubpw==" }, "node_modules/@types/node": { - "version": "20.5.6", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.5.6.tgz", - "integrity": "sha512-Gi5wRGPbbyOTX+4Y2iULQ27oUPrefaB0PxGQJnfyWN3kvEDGM3mIB5M/gQLmitZf7A9FmLeaqxD3L1CXpm3VKQ==" + "version": "20.6.4", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.6.4.tgz", + "integrity": "sha512-nU6d9MPY0NBUMiE/nXd2IIoC4OLvsLpwAjheoAeuzgvDZA1Cb10QYg+91AF6zQiKWRN5i1m07x6sMe0niBznoQ==" }, "node_modules/@types/sinon": { "version": "10.0.16", @@ -2044,7 +1938,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", - "peer": true, "dependencies": { "event-target-shim": "^5.0.0" }, @@ -2056,7 +1949,6 @@ "version": "1.3.8", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", - "peer": true, "dependencies": { "mime-types": "~2.1.34", "negotiator": "0.6.3" @@ -2179,17 +2071,14 @@ } }, "node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dependencies": { - "color-convert": "^2.0.1" + "color-convert": "^1.9.0" }, "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" + "node": ">=4" } }, "node_modules/argparse": { @@ -2208,8 +2097,7 @@ "node_modules/array-flatten": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", - "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==", - "peer": true + "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==" }, "node_modules/askcharacter": { "version": "1.0.0", @@ -2278,7 +2166,6 @@ "version": "1.6.51", "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz", "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==", - "peer": true, "engines": { "node": ">=0.6" } @@ -2307,7 +2194,6 @@ "version": "1.20.1", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz", "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==", - "peer": true, "dependencies": { "bytes": "3.1.2", "content-type": "~1.0.4", @@ -2331,7 +2217,6 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "peer": true, "dependencies": { "ms": "2.0.0" } @@ -2339,8 +2224,7 @@ "node_modules/body-parser/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "peer": true + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, "node_modules/bowser": { "version": "2.11.0", @@ -2351,7 +2235,6 @@ "version": "0.2.0", "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.2.0.tgz", "integrity": "sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw==", - "peer": true, "dependencies": { "big-integer": "^1.6.44" }, @@ -2368,9 +2251,9 @@ } }, "node_modules/browserslist": { - "version": "4.21.10", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz", - "integrity": "sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==", + "version": "4.21.11", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.11.tgz", + "integrity": "sha512-xn1UXOKUz7DjdGlg9RrUr0GGiWzI97UQJnugHtH0OLDfJB7jMgoIkYvRIEO1l9EeEERVqeqLYOcFBW9ldjypbQ==", "funding": [ { "type": "opencollective", @@ -2386,10 +2269,10 @@ } ], "dependencies": { - "caniuse-lite": "^1.0.30001517", - "electron-to-chromium": "^1.4.477", + "caniuse-lite": "^1.0.30001538", + "electron-to-chromium": "^1.4.526", "node-releases": "^2.0.13", - "update-browserslist-db": "^1.0.11" + "update-browserslist-db": "^1.0.13" }, "bin": { "browserslist": "cli.js" @@ -2399,11 +2282,11 @@ } }, "node_modules/bson": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/bson/-/bson-5.4.0.tgz", - "integrity": "sha512-WRZ5SQI5GfUuKnPTNmAYPiKIof3ORXAF4IRU5UcgmivNIon01rWQlw5RUH954dpu8yGL8T59YShVddIPaU/gFA==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/bson/-/bson-6.1.0.tgz", + "integrity": "sha512-yiQ3KxvpVoRpx1oD1uPz4Jit9tAVTJgjdmjDKtUErkOoL9VNoF8Dd58qtAOL5E40exx2jvAT9sqdRSK/r+SHlA==", "engines": { - "node": ">=14.20.1" + "node": ">=16.20.1" } }, "node_modules/buffer": { @@ -2434,7 +2317,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/bundle-name/-/bundle-name-3.0.0.tgz", "integrity": "sha512-PKA4BeSvBpQKQ8iPOGCSiell+N8P+Tf1DlwqmYhpe2gAhKPHn8EYOxVT+ShuGmhg8lN8XiSlS80yiExKXrURlw==", - "peer": true, "dependencies": { "run-applescript": "^5.0.0" }, @@ -2449,7 +2331,6 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", - "peer": true, "engines": { "node": ">= 0.8" } @@ -2458,7 +2339,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", - "peer": true, "dependencies": { "function-bind": "^1.1.1", "get-intrinsic": "^1.0.2" @@ -2468,9 +2348,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001523", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001523.tgz", - "integrity": "sha512-I5q5cisATTPZ1mc588Z//pj/Ox80ERYDfR71YnvY7raS/NOk8xXlZcB0sF7JdqaV//kOaa6aus7lRfpdnt1eBA==", + "version": "1.0.30001538", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001538.tgz", + "integrity": "sha512-HWJnhnID+0YMtGlzcp3T9drmBJUVDchPJ08tpUGFLs9CYlwWPH2uLgpHn8fND5pCgXVtnGS3H4QR9XLMHVNkHw==", "funding": [ { "type": "opencollective", @@ -2487,18 +2367,24 @@ ] }, "node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" }, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" + "node": ">=4" + } + }, + "node_modules/chalk/node_modules/escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "engines": { + "node": ">=0.8.0" } }, "node_modules/charenc": { @@ -2518,20 +2404,17 @@ } }, "node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" + "color-name": "1.1.3" } }, "node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==" }, "node_modules/commander": { "version": "10.0.1", @@ -2559,7 +2442,6 @@ "version": "0.5.4", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", - "peer": true, "dependencies": { "safe-buffer": "5.2.1" }, @@ -2571,7 +2453,6 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", - "peer": true, "engines": { "node": ">= 0.6" } @@ -2585,7 +2466,6 @@ "version": "0.5.0", "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==", - "peer": true, "engines": { "node": ">= 0.6" } @@ -2593,8 +2473,7 @@ "node_modules/cookie-signature": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==", - "peer": true + "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==" }, "node_modules/cross-spawn": { "version": "7.0.3", @@ -2666,7 +2545,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/default-browser/-/default-browser-4.0.0.tgz", "integrity": "sha512-wX5pXO1+BrhMkSbROFsyxUm0i/cJEScyNhA4PPxc41ICuv05ZZB/MX28s8aZx6xjmatvebIapF6hLEKEcpneUA==", - "peer": true, "dependencies": { "bundle-name": "^3.0.0", "default-browser-id": "^3.0.0", @@ -2684,7 +2562,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/default-browser-id/-/default-browser-id-3.0.0.tgz", "integrity": "sha512-OZ1y3y0SqSICtE8DE4S8YOE9UZOJ8wO16fKWVP5J1Qz42kV9jcnMVFrEE/noXb/ss3Q4pZIH79kxofzyNNtUNA==", - "peer": true, "dependencies": { "bplist-parser": "^0.2.0", "untildify": "^4.0.0" @@ -2700,7 +2577,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz", "integrity": "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==", - "peer": true, "engines": { "node": ">=12" }, @@ -2712,7 +2588,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", - "peer": true, "engines": { "node": ">= 0.8" } @@ -2721,7 +2596,6 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", - "peer": true, "engines": { "node": ">= 0.8", "npm": "1.2.8000 || >= 1.4.16" @@ -2756,13 +2630,12 @@ "node_modules/ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", - "peer": true + "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "node_modules/electron-to-chromium": { - "version": "1.4.502", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.502.tgz", - "integrity": "sha512-xqeGw3Gr6o3uyHy/yKjdnDQHY2RQvXcGC2cfHjccK1IGkH6cX1WQBN8EeC/YpwPhGkBaikDTecJ8+ssxSVRQlw==" + "version": "1.4.528", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.528.tgz", + "integrity": "sha512-UdREXMXzLkREF4jA8t89FQjA8WHI6ssP38PMY4/4KhXFQbtImnghh4GkCgrtiZwLKUKVD2iTVXvDVQjfomEQuA==" }, "node_modules/emphasize": { "version": "4.2.0", @@ -2778,11 +2651,74 @@ "url": "https://github.com/sponsors/wooorm" } }, + "node_modules/emphasize/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/emphasize/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/emphasize/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/emphasize/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "node_modules/emphasize/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/emphasize/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/encodeurl": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", - "peer": true, "engines": { "node": ">= 0.8" } @@ -2807,8 +2743,7 @@ "node_modules/escape-html": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", - "peer": true + "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==" }, "node_modules/escape-string-regexp": { "version": "4.0.0", @@ -2825,7 +2760,6 @@ "version": "1.8.1", "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", - "peer": true, "engines": { "node": ">= 0.6" } @@ -2834,7 +2768,6 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==", - "peer": true, "engines": { "node": ">=6" } @@ -2843,7 +2776,6 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/execa/-/execa-7.2.0.tgz", "integrity": "sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==", - "peer": true, "dependencies": { "cross-spawn": "^7.0.3", "get-stream": "^6.0.1", @@ -2875,7 +2807,6 @@ "version": "4.18.2", "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz", "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==", - "peer": true, "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", @@ -2917,7 +2848,6 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "peer": true, "dependencies": { "ms": "2.0.0" } @@ -2925,8 +2855,7 @@ "node_modules/express/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "peer": true + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, "node_modules/fast-xml-parser": { "version": "4.2.5", @@ -2971,7 +2900,6 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", - "peer": true, "dependencies": { "debug": "2.6.9", "encodeurl": "~1.0.2", @@ -2989,7 +2917,6 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "peer": true, "dependencies": { "ms": "2.0.0" } @@ -2997,13 +2924,12 @@ "node_modules/finalhandler/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "peer": true + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, "node_modules/follow-redirects": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", - "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", + "version": "1.15.3", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz", + "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==", "funding": [ { "type": "individual", @@ -3031,7 +2957,6 @@ "version": "0.2.0", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", - "peer": true, "engines": { "node": ">= 0.6" } @@ -3040,7 +2965,6 @@ "version": "0.5.2", "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", - "peer": true, "engines": { "node": ">= 0.6" } @@ -3086,8 +3010,7 @@ "node_modules/function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "peer": true + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" }, "node_modules/gensync": { "version": "1.0.0-beta.2", @@ -3115,7 +3038,6 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz", "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==", - "peer": true, "dependencies": { "function-bind": "^1.1.1", "has": "^1.0.3", @@ -3130,7 +3052,6 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", - "peer": true, "engines": { "node": ">=10" }, @@ -3186,31 +3107,10 @@ "resolved": "https://registry.npmjs.org/handle-backspaces/-/handle-backspaces-1.0.0.tgz", "integrity": "sha512-w11NXUn51gVN50nTW5MOuhKuko9xZonnHDe5LlapaOZvuyxDXVDn9b1ZtG0IJTABGbL/UGeSitqHgo9Bb7nDhQ==" }, - "node_modules/handlebars": { - "version": "4.7.8", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz", - "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==", - "dependencies": { - "minimist": "^1.2.5", - "neo-async": "^2.6.2", - "source-map": "^0.6.1", - "wordwrap": "^1.0.0" - }, - "bin": { - "handlebars": "bin/handlebars" - }, - "engines": { - "node": ">=0.4.7" - }, - "optionalDependencies": { - "uglify-js": "^3.1.4" - } - }, "node_modules/has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "peer": true, "dependencies": { "function-bind": "^1.1.1" }, @@ -3219,18 +3119,17 @@ } }, "node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", "engines": { - "node": ">=8" + "node": ">=4" } }, "node_modules/has-proto": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", - "peer": true, "engines": { "node": ">= 0.4" }, @@ -3242,7 +3141,6 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", - "peer": true, "engines": { "node": ">= 0.4" }, @@ -3275,7 +3173,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", - "peer": true, "dependencies": { "depd": "2.0.0", "inherits": "2.0.4", @@ -3291,7 +3188,6 @@ "version": "4.3.1", "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-4.3.1.tgz", "integrity": "sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==", - "peer": true, "engines": { "node": ">=14.18.0" } @@ -3300,7 +3196,6 @@ "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "peer": true, "dependencies": { "safer-buffer": ">= 2.1.2 < 3" }, @@ -3356,7 +3251,6 @@ "version": "1.9.1", "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", - "peer": true, "engines": { "node": ">= 0.10" } @@ -3376,7 +3270,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz", "integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==", - "peer": true, "bin": { "is-docker": "cli.js" }, @@ -3391,7 +3284,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-inside-container/-/is-inside-container-1.0.0.tgz", "integrity": "sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==", - "peer": true, "dependencies": { "is-docker": "^3.0.0" }, @@ -3429,7 +3321,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz", "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==", - "peer": true, "engines": { "node": "^12.20.0 || ^14.13.1 || >=16.0.0" }, @@ -3441,7 +3332,6 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", - "peer": true, "dependencies": { "is-docker": "^2.0.0" }, @@ -3453,7 +3343,6 @@ "version": "2.2.1", "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==", - "peer": true, "bin": { "is-docker": "cli.js" }, @@ -3470,9 +3359,9 @@ "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" }, "node_modules/joi": { - "version": "17.9.2", - "resolved": "https://registry.npmjs.org/joi/-/joi-17.9.2.tgz", - "integrity": "sha512-Itk/r+V4Dx0V3c7RLFdRh12IOjySm2/WGPMubBT92cQvRfYZhPM2W0hZlctjj72iES8jsRCwp7S/cRmWBnJ4nw==", + "version": "17.10.2", + "resolved": "https://registry.npmjs.org/joi/-/joi-17.10.2.tgz", + "integrity": "sha512-hcVhjBxRNW/is3nNLdGLIjkgXetkeGc2wyhydhz8KumG23Aerk4HPjU5zaPAMRqXQFc0xNqXTC7+zQjxr0GlKA==", "dependencies": { "@hapi/hoek": "^9.0.0", "@hapi/topo": "^5.0.0", @@ -3487,10 +3376,9 @@ "integrity": "sha512-bF7vcQxbODoGK1imE2P9GS9aw4zD0Sd+Hni68IMZLj7zRnquH7dXUmMw9hDI5S/Jzt7q+IyTXN0rSg2GI0IKhQ==" }, "node_modules/jose": { - "version": "4.14.4", - "resolved": "https://registry.npmjs.org/jose/-/jose-4.14.4.tgz", - "integrity": "sha512-j8GhLiKmUAh+dsFXlX1aJCbt5KMibuKb+d7j1JaOJG6s2UjX1PQlW+OKB/sD4a/5ZYF4RcmYmLSndOoU3Lt/3g==", - "peer": true, + "version": "4.14.6", + "resolved": "https://registry.npmjs.org/jose/-/jose-4.14.6.tgz", + "integrity": "sha512-EqJPEUlZD0/CSUMubKtMaYUOtWe91tZXTWMJZoKSbLk+KtdhNdcvppH8lA9XwVu2V4Ailvsj0GBZJ2ZwDjfesQ==", "funding": { "url": "https://github.com/sponsors/panva" } @@ -3631,7 +3519,6 @@ "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", - "peer": true, "engines": { "node": ">= 0.6" } @@ -3644,20 +3531,17 @@ "node_modules/merge-descriptors": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==", - "peer": true + "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==" }, "node_modules/merge-stream": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "peer": true + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==" }, "node_modules/methods": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==", - "peer": true, "engines": { "node": ">= 0.6" } @@ -3666,7 +3550,6 @@ "version": "1.6.0", "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", - "peer": true, "bin": { "mime": "cli.js" }, @@ -3678,7 +3561,6 @@ "version": "1.52.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "peer": true, "engines": { "node": ">= 0.6" } @@ -3687,7 +3569,6 @@ "version": "2.1.35", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "peer": true, "dependencies": { "mime-db": "1.52.0" }, @@ -3699,7 +3580,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz", "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==", - "peer": true, "engines": { "node": ">=12" }, @@ -3737,6 +3617,7 @@ "version": "1.2.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "optional": true, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -3795,26 +3676,25 @@ "optional": true }, "node_modules/mongodb": { - "version": "5.8.1", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-5.8.1.tgz", - "integrity": "sha512-wKyh4kZvm6NrCPH8AxyzXm3JBoEf4Xulo0aUWh3hCgwgYJxyQ1KLST86ZZaSWdj6/kxYUA3+YZuyADCE61CMSg==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.1.0.tgz", + "integrity": "sha512-AvzNY0zMkpothZ5mJAaIo2bGDjlJQqqAbn9fvtVgwIIUPEfdrqGxqNjjbuKyrgQxg2EvCmfWdjq+4uj96c0YPw==", "dependencies": { - "bson": "^5.4.0", - "mongodb-connection-string-url": "^2.6.0", - "socks": "^2.7.1" + "@mongodb-js/saslprep": "^1.1.0", + "bson": "^6.1.0", + "mongodb-connection-string-url": "^2.6.0" }, "engines": { - "node": ">=14.20.1" - }, - "optionalDependencies": { - "@mongodb-js/saslprep": "^1.1.0" + "node": ">=16.20.1" }, "peerDependencies": { "@aws-sdk/credential-providers": "^3.188.0", - "@mongodb-js/zstd": "^1.0.0", - "kerberos": "^1.0.0 || ^2.0.0", - "mongodb-client-encryption": ">=2.3.0 <3", - "snappy": "^7.2.2" + "@mongodb-js/zstd": "^1.1.0", + "gcp-metadata": "^5.2.0", + "kerberos": "^2.0.1", + "mongodb-client-encryption": ">=6.0.0 <7", + "snappy": "^7.2.2", + "socks": "^2.7.1" }, "peerDependenciesMeta": { "@aws-sdk/credential-providers": { @@ -3823,6 +3703,9 @@ "@mongodb-js/zstd": { "optional": true }, + "gcp-metadata": { + "optional": true + }, "kerberos": { "optional": true }, @@ -3831,44 +3714,33 @@ }, "snappy": { "optional": true + }, + "socks": { + "optional": true } } }, "node_modules/mongodb-build-info": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/mongodb-build-info/-/mongodb-build-info-1.6.2.tgz", - "integrity": "sha512-kSEu/dJNABTnrrrnyACTyPxsXYa8hfxuhhv1xMYhTi5c9Y0n76levzp/YMHVuFeQ4fE52HeEHBXksKQZfQ6wbw==", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/mongodb-build-info/-/mongodb-build-info-1.7.0.tgz", + "integrity": "sha512-mKpWHe7VsYJYOgZ9ik4vIu3cOBKsDK5b8zSTqnZI5JG1briTYadB103b0yPGn1mQ+JppxzqH3EbRHW0xeOhkVw==", "dependencies": { "mongodb-connection-string-url": "^2.2.0" } }, "node_modules/mongodb-client-encryption": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/mongodb-client-encryption/-/mongodb-client-encryption-2.9.0.tgz", - "integrity": "sha512-OGMfTnS+JJ49ksWdExQ5048ynaQJLhPjbOi3i44PbU2sdufKH0Z4YZqn1pvd/eQ4WgLfbmSws3u9kAiFNFxpOg==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/mongodb-client-encryption/-/mongodb-client-encryption-6.0.0.tgz", + "integrity": "sha512-GtqkqlSq19acX006/U1odA3l+gwhvABeoTUlvvgtvSs6qcN3qSHPnur3Z5N4oKOv6fZ7EtT8rIsWP2riI0+Eyg==", "hasInstallScript": true, "optional": true, "dependencies": { "bindings": "^1.5.0", "node-addon-api": "^4.3.0", - "prebuild-install": "^7.1.1", - "socks": "^2.7.1" + "prebuild-install": "^7.1.1" }, "engines": { - "node": ">=12.9.0" - }, - "peerDependencies": { - "@aws-sdk/credential-providers": "^3.186.0", - "gcp-metadata": "^5.2.0", - "mongodb": ">=3.4.0" - }, - "peerDependenciesMeta": { - "@aws-sdk/credential-providers": { - "optional": true - }, - "gcp-metadata": { - "optional": true - } + "node": ">=16.20.1" } }, "node_modules/mongodb-connection-string-url": { @@ -3895,11 +3767,11 @@ } }, "node_modules/mongodb-log-writer": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/mongodb-log-writer/-/mongodb-log-writer-1.3.0.tgz", - "integrity": "sha512-XFV4tjpZlf9iaHlCFyV49/I2ILeWEbTXJd7Q1gFYXMw07Y9aTp6sDP2tyezMzm5xU0cFwcgRel23pznbJxinkg==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/mongodb-log-writer/-/mongodb-log-writer-1.4.0.tgz", + "integrity": "sha512-hQrn8Xu58Z9uLmd2oncvu/b5KNxxKaW6MUrVRI/xObz/yzYNVWF3V4rgK9Ort72nOCmMD3PWOS+ZoZBtxgKibA==", "dependencies": { - "bson": "^4.5.1 || ^5.0.0", + "bson": "^4.5.1 || ^5.0.0 || ^6.0.0", "heap-js": "^2.3.0" } }, @@ -3934,16 +3806,10 @@ "version": "0.6.3", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", - "peer": true, "engines": { "node": ">= 0.6" } }, - "node_modules/neo-async": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", - "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==" - }, "node_modules/node-abi": { "version": "3.47.0", "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.47.0.tgz", @@ -4032,7 +3898,6 @@ "version": "5.1.0", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.1.0.tgz", "integrity": "sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==", - "peer": true, "dependencies": { "path-key": "^4.0.0" }, @@ -4047,7 +3912,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz", "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==", - "peer": true, "engines": { "node": ">=12" }, @@ -4067,7 +3931,6 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-2.2.0.tgz", "integrity": "sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw==", - "peer": true, "engines": { "node": ">= 6" } @@ -4076,7 +3939,6 @@ "version": "1.12.3", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", - "peer": true, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -4085,7 +3947,6 @@ "version": "5.0.3", "resolved": "https://registry.npmjs.org/oidc-token-hash/-/oidc-token-hash-5.0.3.tgz", "integrity": "sha512-IF4PcGgzAr6XXSff26Sk/+P4KZFJVuHAJZj3wgO3vX2bMdNVp/QXTP3P7CEm9V1IdG8lDLY3HhiqpsE/nOwpPw==", - "peer": true, "engines": { "node": "^10.13.0 || >=12.0.0" } @@ -4094,7 +3955,6 @@ "version": "2.4.1", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", - "peer": true, "dependencies": { "ee-first": "1.1.1" }, @@ -4114,7 +3974,6 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz", "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==", - "peer": true, "dependencies": { "mimic-fn": "^4.0.0" }, @@ -4129,7 +3988,6 @@ "version": "9.1.0", "resolved": "https://registry.npmjs.org/open/-/open-9.1.0.tgz", "integrity": "sha512-OS+QTnw1/4vrf+9hh1jc1jnYjzSG4ttTBB8UxOwAnInG3Uo4ssetzC1ihqaIHjLJnA5GGlRl6QlZXOTQhRBUvg==", - "peer": true, "dependencies": { "default-browser": "^4.0.0", "define-lazy-prop": "^3.0.0", @@ -4144,10 +4002,9 @@ } }, "node_modules/openid-client": { - "version": "5.4.3", - "resolved": "https://registry.npmjs.org/openid-client/-/openid-client-5.4.3.tgz", - "integrity": "sha512-sVQOvjsT/sbSfYsQI/9liWQGVZH/Pp3rrtlGEwgk/bbHfrUDZ24DN57lAagIwFtuEu+FM9Ev7r85s8S/yPjimQ==", - "peer": true, + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/openid-client/-/openid-client-5.5.0.tgz", + "integrity": "sha512-Y7Xl8BgsrkzWLHkVDYuroM67hi96xITyEDSkmWaGUiNX6CkcXC3XyQGdv5aWZ6dukVKBFVQCADi9gCavOmU14w==", "dependencies": { "jose": "^4.14.4", "lru-cache": "^6.0.0", @@ -4162,7 +4019,6 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "peer": true, "dependencies": { "yallist": "^4.0.0" }, @@ -4173,8 +4029,7 @@ "node_modules/openid-client/node_modules/yallist": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "peer": true + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, "node_modules/os-dns-native": { "version": "1.2.0", @@ -4193,7 +4048,6 @@ "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", - "peer": true, "engines": { "node": ">= 0.8" } @@ -4209,8 +4063,7 @@ "node_modules/path-to-regexp": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==", - "peer": true + "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==" }, "node_modules/picocolors": { "version": "1.0.0", @@ -4257,6 +4110,70 @@ "node": ">=14" } }, + "node_modules/pretty-repl/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/pretty-repl/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/pretty-repl/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/pretty-repl/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "node_modules/pretty-repl/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/pretty-repl/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/proto-list": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", @@ -4266,7 +4183,6 @@ "version": "2.0.7", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", - "peer": true, "dependencies": { "forwarded": "0.2.0", "ipaddr.js": "1.9.1" @@ -4297,7 +4213,6 @@ "version": "6.11.0", "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", - "peer": true, "dependencies": { "side-channel": "^1.0.4" }, @@ -4312,7 +4227,6 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", - "peer": true, "engines": { "node": ">= 0.6" } @@ -4321,7 +4235,6 @@ "version": "2.5.1", "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz", "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==", - "peer": true, "dependencies": { "bytes": "3.1.2", "http-errors": "2.0.0", @@ -4382,7 +4295,6 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/run-applescript/-/run-applescript-5.0.0.tgz", "integrity": "sha512-XcT5rBksx1QdIhlFOCtgZkB99ZEouFZ1E2Kc2LHqNW13U3/74YGdkQRmThTwxy4QIyookibDKYZOPqX//6BlAg==", - "peer": true, "dependencies": { "execa": "^5.0.0" }, @@ -4397,7 +4309,6 @@ "version": "5.1.1", "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", - "peer": true, "dependencies": { "cross-spawn": "^7.0.3", "get-stream": "^6.0.0", @@ -4420,7 +4331,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", - "peer": true, "engines": { "node": ">=10.17.0" } @@ -4429,7 +4339,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", - "peer": true, "engines": { "node": ">=8" }, @@ -4441,7 +4350,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "peer": true, "engines": { "node": ">=6" } @@ -4450,7 +4358,6 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", - "peer": true, "dependencies": { "path-key": "^3.0.0" }, @@ -4462,7 +4369,6 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", - "peer": true, "dependencies": { "mimic-fn": "^2.1.0" }, @@ -4477,7 +4383,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", - "peer": true, "engines": { "node": ">=6" } @@ -4504,17 +4409,7 @@ "node_modules/safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "peer": true - }, - "node_modules/saslprep": { - "name": "@mongodb-js/saslprep", - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.1.0.tgz", - "integrity": "sha512-Xfijy7HvfzzqiOAhAepF4SGN5e9leLkMvg/OPOF97XemjfVCYN/oWa75wnkc6mltMSTwY+XlbhWgUOJmkFspSw==", - "dependencies": { - "sparse-bitfield": "^3.0.3" - } + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "node_modules/semver": { "version": "7.5.4", @@ -4550,7 +4445,6 @@ "version": "0.18.0", "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", - "peer": true, "dependencies": { "debug": "2.6.9", "depd": "2.0.0", @@ -4574,7 +4468,6 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "peer": true, "dependencies": { "ms": "2.0.0" } @@ -4582,14 +4475,12 @@ "node_modules/send/node_modules/debug/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "peer": true + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, "node_modules/serve-static": { "version": "1.15.0", "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", - "peer": true, "dependencies": { "encodeurl": "~1.0.2", "escape-html": "~1.0.3", @@ -4603,8 +4494,7 @@ "node_modules/setprototypeof": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", - "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", - "peer": true + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" }, "node_modules/shebang-command": { "version": "2.0.0", @@ -4629,7 +4519,6 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", - "peer": true, "dependencies": { "call-bind": "^1.0.0", "get-intrinsic": "^1.0.2", @@ -4642,8 +4531,7 @@ "node_modules/signal-exit": { "version": "3.0.7", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "peer": true + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" }, "node_modules/simple-concat": { "version": "1.0.1", @@ -4712,14 +4600,6 @@ "npm": ">= 3.0.0" } }, - "node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/sparse-bitfield": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz", @@ -4732,7 +4612,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", - "peer": true, "engines": { "node": ">= 0.8" } @@ -4761,7 +4640,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz", "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==", - "peer": true, "engines": { "node": ">=12" }, @@ -4784,14 +4662,14 @@ "integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==" }, "node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dependencies": { - "has-flag": "^4.0.0" + "has-flag": "^3.0.0" }, "engines": { - "node": ">=8" + "node": ">=4" } }, "node_modules/system-ca": { @@ -4804,9 +4682,9 @@ } }, "node_modules/tar": { - "version": "6.1.15", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.15.tgz", - "integrity": "sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.0.tgz", + "integrity": "sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==", "dependencies": { "chownr": "^2.0.0", "fs-minipass": "^2.0.0", @@ -4867,7 +4745,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/titleize/-/titleize-3.0.0.tgz", "integrity": "sha512-KxVu8EYHDPBdUYdKZdKtU2aj2XfEx9AfjXxE/Aj0vT06w2icA09Vus1rh6eSu1y01akYg6BjIK/hxyLJINoMLQ==", - "peer": true, "engines": { "node": ">=12" }, @@ -4887,7 +4764,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", - "peer": true, "engines": { "node": ">=0.6" } @@ -4924,7 +4800,6 @@ "version": "1.6.18", "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", - "peer": true, "dependencies": { "media-typer": "0.3.0", "mime-types": "~2.1.24" @@ -4933,35 +4808,10 @@ "node": ">= 0.6" } }, - "node_modules/typescript": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", - "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=14.17" - } - }, - "node_modules/uglify-js": { - "version": "3.17.4", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz", - "integrity": "sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==", - "optional": true, - "bin": { - "uglifyjs": "bin/uglifyjs" - }, - "engines": { - "node": ">=0.8.0" - } - }, "node_modules/unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", - "peer": true, "engines": { "node": ">= 0.8" } @@ -4970,15 +4820,14 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz", "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==", - "peer": true, "engines": { "node": ">=8" } }, "node_modules/update-browserslist-db": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz", - "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==", + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz", + "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==", "funding": [ { "type": "opencollective", @@ -5014,7 +4863,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==", - "peer": true, "engines": { "node": ">= 0.4.0" } @@ -5031,7 +4879,6 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", - "peer": true, "engines": { "node": ">= 0.8" } @@ -5085,11 +4932,6 @@ "node-forge": "^1.2.1" } }, - "node_modules/wordwrap": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==" - }, "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", diff --git a/pkgs/development/tools/mongosh/source.json b/pkgs/development/tools/mongosh/source.json index 5555d11e80282..3715df3bf3051 100644 --- a/pkgs/development/tools/mongosh/source.json +++ b/pkgs/development/tools/mongosh/source.json @@ -1,6 +1,6 @@ { - "version": "1.10.6", - "integrity": "sha512-rReUz89EF5eERhPZo29nYpKAux1u5iK3ug74wtsr7kE9SOJs5XGWS2gh8LKSMK9uieeDKRYX8+nFIa4bl1Ls2Q==", - "filename": "mongosh-1.10.6.tgz", - "deps": "sha256-j1l6PVPkp5Ju0uBB6dKfQP8fbwttWpPR3VPviu4a/Zg=" + "version": "2.0.1", + "integrity": "sha512-Xvlzso5vJAYfbO/N/6CCmcEnpHAv/PF4D6RqAvr8BFoPjCmYFwKDjOHEHjaPtrJYY1gWEDN5gaukZfqcAxiDFg==", + "filename": "mongosh-2.0.1.tgz", + "deps": "sha256-wICy0PoMQ6ypiZL/4Yf2l9KNXC9LNNdzy8EmhwK3kws=" } diff --git a/pkgs/development/tools/mysql-shell/default.nix b/pkgs/development/tools/mysql-shell/default.nix index 837d560f4dc42..b12e13d28011a 100644 --- a/pkgs/development/tools/mysql-shell/default.nix +++ b/pkgs/development/tools/mysql-shell/default.nix @@ -36,26 +36,30 @@ let pythonDeps = with python3.pkgs; [ certifi paramiko pyyaml ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mysql-shell"; version = "8.0.34"; srcs = [ (fetchurl { - url = "https://cdn.mysql.com//Downloads/MySQL-Shell/mysql-shell-${version}-src.tar.gz"; - hash = "sha256-QY1PmhGw3PhqZ79+H/Xbb9uOvmrBlFQRS7idnV5OXF0="; + url = "https://cdn.mysql.com//Downloads/MySQL-${lib.versions.majorMinor finalAttrs.version}/mysql-${finalAttrs.version}.tar.gz"; + hash = "sha256-5l0Do8QmGLX7+ZBCrtMyCUAumyeqYsfIdD/9R4jY2x0="; }) (fetchurl { - url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor version}/mysql-${version}.tar.gz"; - hash = "sha256-5l0Do8QmGLX7+ZBCrtMyCUAumyeqYsfIdD/9R4jY2x0="; + url = "https://cdn.mysql.com//Downloads/MySQL-Shell/mysql-shell-${finalAttrs.version}-src.tar.gz"; + hash = "sha256-QY1PmhGw3PhqZ79+H/Xbb9uOvmrBlFQRS7idnV5OXF0="; }) ]; - sourceRoot = "mysql-shell-${version}-src"; + sourceRoot = "mysql-shell-${finalAttrs.version}-src"; + + postUnpack = '' + mv mysql-${finalAttrs.version} mysql + ''; postPatch = '' - substituteInPlace ../mysql-${version}/cmake/libutils.cmake --replace /usr/bin/libtool libtool - substituteInPlace ../mysql-${version}/cmake/os/Darwin.cmake --replace /usr/bin/libtool libtool + substituteInPlace ../mysql/cmake/libutils.cmake --replace /usr/bin/libtool libtool + substituteInPlace ../mysql/cmake/os/Darwin.cmake --replace /usr/bin/libtool libtool substituteInPlace cmake/libutils.cmake --replace /usr/bin/libtool libtool ''; @@ -93,20 +97,19 @@ stdenv.mkDerivation rec { echo "Building mysqlclient mysqlxclient" cmake -DWITH_BOOST=system -DWITH_SYSTEM_LIBS=ON -DWITH_ROUTER=OFF -DWITH_UNIT_TESTS=OFF \ - -DFORCE_UNSUPPORTED_COMPILER=1 -S ../mysql-${version} -B ../mysql-${version}/build + -DFORCE_UNSUPPORTED_COMPILER=1 -S ../mysql -B ../mysql/build - cmake --build ../mysql-${version}/build --parallel ''${NIX_BUILD_CORES:-1} --target mysqlclient mysqlxclient + cmake --build ../mysql/build --parallel ''${NIX_BUILD_CORES:-1} --target mysqlclient mysqlxclient ''; cmakeFlags = [ - "-DMYSQL_SOURCE_DIR=../mysql-${version}" - "-DMYSQL_BUILD_DIR=../mysql-${version}/build" - "-DMYSQL_CONFIG_EXECUTABLE=../../mysql-${version}/build/scripts/mysql_config" + "-DMYSQL_SOURCE_DIR=../mysql" + "-DMYSQL_BUILD_DIR=../mysql/build" + "-DMYSQL_CONFIG_EXECUTABLE=../../mysql/build/scripts/mysql_config" "-DWITH_ZSTD=system" "-DWITH_LZ4=system" "-DWITH_ZLIB=system" "-DWITH_PROTOBUF=${protobuf}" - "-DHAVE_V8=0" # V8 10.x required. "-DHAVE_PYTHON=1" ]; @@ -115,10 +118,10 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://dev.mysql.com/doc/mysql-shell/${lib.versions.majorMinor version}/en/"; + homepage = "https://dev.mysql.com/doc/mysql-shell/${lib.versions.majorMinor finalAttrs.version}/en/"; description = "A new command line scriptable shell for MySQL"; license = licenses.gpl2; maintainers = with maintainers; [ aaronjheng ]; mainProgram = "mysqlsh"; }; -} +}) diff --git a/pkgs/development/tools/neil/default.nix b/pkgs/development/tools/neil/default.nix index 1052e174a7253..60efba29b3c25 100644 --- a/pkgs/development/tools/neil/default.nix +++ b/pkgs/development/tools/neil/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "neil"; - version = "0.1.55"; + version = "0.2.61"; src = fetchFromGitHub { owner = "babashka"; repo = "neil"; rev = "v${version}"; - sha256 = "sha256-+0+d0XZhZeRTAXRvA3QcWvbuOqlhNbFo2gTnROevJtU="; + sha256 = "sha256-MoQf7dxdmUlIZZMjuKBJOCu61L8qiAlmVssf6pUhqA8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/ocaml/dune/3.nix b/pkgs/development/tools/ocaml/dune/3.nix index 73795811d5141..d49f8878b7d29 100644 --- a/pkgs/development/tools/ocaml/dune/3.nix +++ b/pkgs/development/tools/ocaml/dune/3.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "3.10.0"; + version = "3.11.0"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - hash = "sha256-n/AzhKmKjfeYUsxnTwtHOLqK7BcCm24u61FPiV5xA1U="; + hash = "sha256-G5x9fhNKjTqdcVYT8CkQ7PMRZ98boibt6SGl+nsNZRM="; }; nativeBuildInputs = [ ocaml findlib ]; diff --git a/pkgs/development/tools/ocaml/merlin/4.x.nix b/pkgs/development/tools/ocaml/merlin/4.x.nix index 6cd8154877eb5..ef9330054f359 100644 --- a/pkgs/development/tools/ocaml/merlin/4.x.nix +++ b/pkgs/development/tools/ocaml/merlin/4.x.nix @@ -15,7 +15,7 @@ }: let - merlinVersion = if lib.versionAtLeast ocaml.version "4.14" then "4.10" else "4.7"; + merlinVersion = if lib.versionAtLeast ocaml.version "4.14" then "4.12" else "4.7"; hashes = { "4.7-412" = "sha256-0U3Ia7EblKULNy8AuXFVKACZvGN0arYJv7BWiBRgT0Y="; @@ -26,10 +26,18 @@ let "4.9-500" = "sha256-uQfGazoxTxclHSiTfjji+tKJv8MKqRdHMPD/xfMZlSY="; "4.10-414" = "sha256-/a1OqASISpb06eh2gsam1rE3wovM4CT8ybPV86XwR2c="; "4.10-500" = "sha256-m9+Qz8DT94yNSwpamTVLQKISHtRVBWnZD3t/yyujSZ0="; + "4.12-414" = "sha256-tgMUT4KyFeJubYVY1Sdv9ZvPB1JwcqEGcCuwuMqXHRQ="; + "4.12-500" = "sha256-j49R7KVzNKlXDL7WibTHxPG4VSOVv0uaz5/yMZZjkH8="; + "4.12-501" = "sha256-zMwzI1SXQDWQ9PaKL4o3J6JlRjmEs7lkXrwauy+QiMA="; }; - ocamlVersionShorthand = lib.substring 0 3 - (lib.concatStrings (lib.splitVersion ocaml.version)); + ocamlVersionShorthand = + let + v = lib.splitVersion ocaml.version; + major = builtins.elemAt v 0; + minor = builtins.elemAt v 1; + minor_prefix = if builtins.stringLength minor < 2 then "0" else ""; + in "${toString major}${minor_prefix}${toString minor}"; version = "${merlinVersion}-${ocamlVersionShorthand}"; in diff --git a/pkgs/development/tools/ocaml/ocp-index/default.nix b/pkgs/development/tools/ocaml/ocp-index/default.nix index 5b37febbb9982..98e8b06e795b0 100644 --- a/pkgs/development/tools/ocaml/ocp-index/default.nix +++ b/pkgs/development/tools/ocaml/ocp-index/default.nix @@ -2,9 +2,7 @@ buildDunePackage rec { pname = "ocp-index"; - version = "1.3.4"; - - duneVersion = "3"; + version = "1.3.5"; minimalOCamlVersion = "4.08"; @@ -12,11 +10,9 @@ buildDunePackage rec { owner = "OCamlPro"; repo = "ocp-index"; rev = version; - sha256 = "sha256-a7SBGHNKUstfrdHx9KI33tYpvzTwIGhs4Hfie5EeKww="; + hash = "sha256-Zn3BPaMB68V363OljFFdmLyYf+S0wFJK44L8t1TSG1Q="; }; - strictDeps = true; - nativeBuildInputs = [ cppo ]; buildInputs = [ cmdliner re ]; diff --git a/pkgs/development/tools/oq/default.nix b/pkgs/development/tools/oq/default.nix index 3c2a0223dd41a..8e23e72912b0d 100644 --- a/pkgs/development/tools/oq/default.nix +++ b/pkgs/development/tools/oq/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchpatch , crystal , jq , libxml2 @@ -17,6 +18,13 @@ crystal.buildCrystalPackage rec { sha256 = "sha256-W0iGE1yVOphooiab689AFT3rhGGdXqEFyYIhrx11RTE="; }; + patches = [ + (fetchpatch { + url = "https://github.com/Blacksmoke16/oq/commit/4f9ef2a73770465bfe2348795461fc8a90a7b9b0.diff"; + hash = "sha256-Ljvf2+1vsGv6wJHl27T7DufI9rTUCY/YQZziOWpW8Do="; + }) + ]; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ libxml2 ]; nativeCheckInputs = [ jq ]; diff --git a/pkgs/development/tools/osslsigncode/default.nix b/pkgs/development/tools/osslsigncode/default.nix index 773db2e7bb8f4..1df3c26e37744 100644 --- a/pkgs/development/tools/osslsigncode/default.nix +++ b/pkgs/development/tools/osslsigncode/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "osslsigncode"; - version = "2.6"; + version = "2.7"; src = fetchFromGitHub { owner = "mtrojnar"; repo = pname; rev = version; - sha256 = "sha256-Lt99RO/pTEtksIuulkKTm48+1xUKZOHrnlbDZGi3VWk="; + sha256 = "sha256-TW4/alnAW3vifAKf02RlnpOq1uW7nc+Sjs0g1BfplLk="; }; nativeBuildInputs = [ cmake pkg-config python3 ]; diff --git a/pkgs/development/tools/oxlint/default.nix b/pkgs/development/tools/oxlint/default.nix index d6f03843b21eb..48534355f4619 100644 --- a/pkgs/development/tools/oxlint/default.nix +++ b/pkgs/development/tools/oxlint/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "oxlint"; - version = "0.0.12"; + version = "0.0.13"; src = fetchFromGitHub { owner = "web-infra-dev"; repo = "oxc"; rev = "oxlint_v${version}"; - hash = "sha256-/8h06MpkrOBg+bQ7yi9MDiYFGFhgFLjtBXBxvaOCnwI="; + hash = "sha256-2Ne0RqwAX0uHWJLAgDRTipSjjWl2Va71uo06IgI9f0Y="; }; - cargoHash = "sha256-syc+kQq0kiuXUw7MFw02GoZM91syS0P5sQI6ns8z0ys="; + cargoHash = "sha256-WI8EvFEz0lflt93YZbGORCLLop7k44yI9r2I1y+Gjkk="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index 18dd6370bc78d..5d948190ee19e 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -31,7 +31,7 @@ buildGoModule rec { description = "A tool for creating identical machine images for multiple platforms from a single source configuration"; homepage = "https://www.packer.io"; license = licenses.mpl20; - maintainers = with maintainers; [ cstrahan zimbatm ma27 techknowlogick qjoly ]; + maintainers = with maintainers; [ zimbatm ma27 techknowlogick qjoly ]; changelog = "https://github.com/hashicorp/packer/blob/v${version}/CHANGELOG.md"; }; } diff --git a/pkgs/development/tools/packet-sd/default.nix b/pkgs/development/tools/packet-sd/default.nix index fb2cc85ec5d20..5f61b584489c6 100644 --- a/pkgs/development/tools/packet-sd/default.nix +++ b/pkgs/development/tools/packet-sd/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { sha256 = "sha256-2k8AsmyhQNNZCzpVt6JdgvI8IFb5pRi4ic6Yn2NqHMM="; }; - vendorSha256 = null; + vendorHash = null; subPackages = [ "." ]; diff --git a/pkgs/development/tools/paging-calculator/default.nix b/pkgs/development/tools/paging-calculator/default.nix index eeb45802e381f..b3cf805881429 100644 --- a/pkgs/development/tools/paging-calculator/default.nix +++ b/pkgs/development/tools/paging-calculator/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "paging-calculator"; - version = "0.2.0"; + version = "0.3.0"; src = fetchCrate { inherit pname version; - hash = "sha256-GxugaNLkLy71X/E9EAn/2p2ReSHvs5TvXAxg8csu9uc="; + hash = "sha256-uoijIA9xmifxHlMRo5Rh/Qy1wxiiCNLJnDysI01uPvk="; }; - cargoHash = "sha256-a1yryyKCcNQVurqnb+AZiBQ0rilNsuXmSsFoaaBe+r8="; + cargoHash = "sha256-RbBlZCRVXZLXvz+/olkh2MqJiWq63AwLvo+/5UGRuyM="; meta = { description = "CLI utility that helps calculating page table indices from a virtual address"; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index 68574a248b778..0140f12364398 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -93,6 +93,7 @@ tree-sitter-tsq = lib.importJSON ./tree-sitter-tsq.json; tree-sitter-turtle = lib.importJSON ./tree-sitter-turtle.json; tree-sitter-typescript = lib.importJSON ./tree-sitter-typescript.json; + tree-sitter-typst = lib.importJSON ./tree-sitter-typst.json; tree-sitter-verilog = lib.importJSON ./tree-sitter-verilog.json; tree-sitter-vim = lib.importJSON ./tree-sitter-vim.json; tree-sitter-vue = lib.importJSON ./tree-sitter-vue.json; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bash.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bash.json index 090ee63616ec7..d10cb04e0f295 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bash.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bash.json @@ -1,9 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-bash", - "rev": "b6667bed364733c8a8f8e5973749f86cfa04ba2a", - "date": "2021-03-04T14:15:26-08:00", - "path": "/nix/store/nvlvdv02wdy4dq4w19bvzq6nlkgvpj20-tree-sitter-bash", - "sha256": "18c030bb65r50i6z37iy7jb9z9i8i36y7b08dbc9bchdifqsijs5", + "rev": "c0f5797a728fc4ebd78a8b0e436b1494a8ab5f51", + "date": "2023-08-18T05:23:36-04:00", + "path": "/nix/store/4x7nwivwmyibiq0y1k5wpswsl1npqgb4-tree-sitter-bash", + "sha256": "11gjjaf9hrsw3rd774c3gq27im2j9gxmkn59wcpg4nwni60p0vjh", + "hash": "sha256-UG5wgYmWW/Iu46nYWftLUtR4BH6DkXNaHlxnmJyS8oU=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-beancount.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-beancount.json index 12c9be942eac8..93e266b4343cc 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-beancount.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-beancount.json @@ -1,9 +1,10 @@ { "url": "https://github.com/polarmutex/tree-sitter-beancount", - "rev": "6d580bc408741ce2ba1a566c972e9ff414c65456", - "date": "2023-01-27T21:26:56-05:00", - "path": "/nix/store/8sfwfmc20bs3vmfns5qb82jf63h625hb-tree-sitter-beancount", - "sha256": "0q4f1qqd8m7x4qxj4bpwgk8fxksh60n1m4payvhd0y0xrrhb06v8", + "rev": "358e5ecbb87109eef7fd596ea518a4ff74cb9b31", + "date": "2023-07-02T15:37:32-04:00", + "path": "/nix/store/h24aaxhp4hhp7f21by7shjvx7v4k513z-tree-sitter-beancount", + "sha256": "1pa673dzsv41rxlqb2a5w7r31rw9z3m6a54yx22wm75cwr9hagxz", + "hash": "sha256-vz8FU+asnMqF6J4UZer4iecw8uFFiYVpz4Fs/ds4Rt0=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bibtex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bibtex.json index 24fc75ec25cdd..3b1ebf2fe4d46 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bibtex.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bibtex.json @@ -4,6 +4,7 @@ "date": "2021-03-26T15:53:50+01:00", "path": "/nix/store/pg00zy53rni7znda2vbyyhkkclgja3kq-tree-sitter-bibtex", "sha256": "0m7f3dkqbmy8x1bhl11m8f4p6n76wfvh99rp46zrqv39355nw1y2", + "hash": "sha256-wgduSxlpbJy/ITenBLfj5lhziUM1BApX6MjXhWcb7lQ=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json index 078677407d12d..0329b6e5e4f32 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json @@ -4,6 +4,7 @@ "date": "2022-09-15T09:14:12+01:00", "path": "/nix/store/sscjjlp833rqqvfpgh84wsnq59jmy90c-tree-sitter-c-sharp", "sha256": "0lijbi5q49g50ji00p2lb45rvd76h07sif3xjl9b31yyxwillr6l", + "hash": "sha256-1GRKI+/eh7ESlX24qA+A5rSdC1lUXACiBOUlgktcMlI=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json index bac7aeb259e8e..0b347648c6fbd 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json @@ -1,9 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-c", - "rev": "a015709e7d1bb4f823a2fc53175e0cbee96c1c3e", - "date": "2023-05-22T07:31:22+02:00", - "path": "/nix/store/mrl2pdg4jxn4hcyz6lpsnl47m0fxqwl8-tree-sitter-c", - "sha256": "086cz0ky1f0ds14v9m8nif57cil9ssvqym8c51la7qv4329dgs5b", + "rev": "93ef1785bbf854cf964e6e53d6e1e6885a4d8ebc", + "date": "2023-08-09T15:22:48-04:00", + "path": "/nix/store/ni6ry3r1gqpgcn6xgc1nga110hl313m3-tree-sitter-c", + "sha256": "0bshiwf7rvbafgdv9lj1hgmq3wc8i45gis34n6p6qlb9r6g5jzz6", + "hash": "sha256-5n9ZnslpUWyusWTo+AqJiPGB64NB0rTbc2rtfByPUC8=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json index 30916569c7070..66ef359104cdc 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json @@ -4,6 +4,7 @@ "date": "2023-05-05T15:36:48+09:00", "path": "/nix/store/fx50ap0gdspwcpgf0zni4j1pzz29abk5-tree-sitter-clojure", "sha256": "0hcl4svn0q4979mx0nn3hhi27xfxj1lz7g1926lcjx6sv1z4ihmj", + "hash": "sha256-ssJIftjadMmoESm882mQ3fUjIoTDWtBrOolgYLcmlEE=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json index fbad37d135dc2..d66b68664042d 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json @@ -1,9 +1,10 @@ { "url": "https://github.com/uyha/tree-sitter-cmake", - "rev": "399605a02bcd5daa309ce63a6459c600dce3473f", - "date": "2023-02-05T17:55:52+01:00", - "path": "/nix/store/myib3gz6xjmp68mq0cc1gxmfkdh3hz2y-tree-sitter-cmake", - "sha256": "00zs5s2dvyqki7ghmhp5n9ssrjbsaklzvzg5rvh6fikxyk4wm77f", + "rev": "73ab4b8e9522f014a67f87f585e820d36fa47408", + "date": "2023-08-15T15:07:39+00:00", + "path": "/nix/store/rzb3dvqw2ngdbqbpv1zshxm2q9g09f9j-tree-sitter-cmake", + "sha256": "1z49jdachwxwbzrrapskpi2kxq3ydihfj45ab9892gbamfij2zp5", + "hash": "sha256-5X4ho6tqPZFQWqoQ6WBsfuA+RbxTX5XzX7xzyFSTifw=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-comment.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-comment.json index cd2e2543047ff..ed34fe8a5d56f 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-comment.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-comment.json @@ -1,9 +1,10 @@ { "url": "https://github.com/stsewd/tree-sitter-comment", - "rev": "f08e7d44b2923e9da2bf487a2f365d08677d368e", - "date": "2023-04-10T20:11:04-05:00", - "path": "/nix/store/swaxl1n782g3gvvbxj0d659krb2zrxaw-tree-sitter-comment", - "sha256": "1r9bzf6fxc2cjb8ndrkvirpqgk9wixandcsp2311dxvyfk3phy5z", + "rev": "ef429992748f89e176243411e94b8ffc8777d118", + "date": "2023-06-03T20:48:17-05:00", + "path": "/nix/store/0kg71dvg10f1m2f08z1b2wh1ap4w4hw6-tree-sitter-comment", + "sha256": "1d5g69i8jplyg888yr7wzjb46cqnchwf4kdzgb83him7cwfx9wax", + "hash": "sha256-XfHUHWenRjjQer9N4jhkFjNDlvz8ZI8Qep5eiWIyr7Q=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-commonlisp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-commonlisp.json index ed62f80e237d4..5026e1d70f03a 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-commonlisp.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-commonlisp.json @@ -1,9 +1,10 @@ { "url": "https://github.com/thehamsta/tree-sitter-commonlisp", - "rev": "c7e814975ab0d0d04333d1f32391c41180c58919", - "date": "2022-01-28T21:33:11+01:00", - "path": "/nix/store/1696bj1f92y8vqfk71cha8bzk9cx9rls-tree-sitter-commonlisp", - "sha256": "1hq3pwrp8509scgn983g0mi8pjy2q21pms30xlc3q7yyjxvpsw7b", + "rev": "5153dbbc70e4cc2324320c1bdae020d31079c7c0", + "date": "2023-08-26T00:52:05+02:00", + "path": "/nix/store/w5assc5jjkg8j9gj7zgqlm07h5y8gxp7-tree-sitter-commonlisp", + "sha256": "195g5qp38j9371zxq9d7blf02bp1bnrbkb6jgi5x0gywdxrbdq6i", + "hash": "sha256-0eC2cm/cP9BLfNKsubJd4S4BHF2nJdx/OCNJNC4ur6Q=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json index 496866c12ca89..7aeb707a28a68 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json @@ -1,9 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-cpp", - "rev": "70aed2e9e83eb7320ab7c454d3084300bf587037", - "date": "2023-05-09T10:48:30+02:00", - "path": "/nix/store/v44wqlm6vlz3rw9v402hxykz6fvc4n22-tree-sitter-cpp", - "sha256": "1h2g7jy0znnzqrfgjnkz33hys4wcgxj6cqk3zcyb1zs77nmwn16y", + "rev": "a90f170f92d5d70e7c2d4183c146e61ba5f3a457", + "date": "2023-08-16T02:46:22-04:00", + "path": "/nix/store/vd49n2vnhsbmc8gdds9zh6psq93jj6cp-tree-sitter-cpp", + "sha256": "0lj5l0pahfixw5lqbw83r01s67szlc6a4ra8yg8s7cbci7rk7lvv", + "hash": "sha256-e9Mz84lssaPR80hlogyjXx+jA8gD8YVp4T06qC6gRVI=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json index c0942a7f908c7..a59d21058007d 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json @@ -1,9 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-css", - "rev": "769203d0f9abe1a9a691ac2b9fe4bb4397a73c51", - "date": "2022-08-31T10:51:16-07:00", - "path": "/nix/store/a91kqixk4gmh40ak98jjnfrlzm3ngvax-tree-sitter-css", - "sha256": "05875jmkkklx0b5g1h4qc8cbgcj8mr1n8slw7hsn0wssn7yn42z5", + "rev": "fec7d3757ab8f46a0ffe298be99b16ad5b9fa229", + "date": "2023-08-20T03:59:13-04:00", + "path": "/nix/store/dn0igch37dalqfrjdqzs2yj40a14ixql-tree-sitter-css", + "sha256": "0gvad0cpcxwmzgv75arcw40r5dxy6b3aq9kp91xf4bjlkfyajzvz", + "hash": "sha256-f3+pvJtULuJ6SHcmrMYyvreSAeEsq3L2+5V3dhloaj8=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json index 922e565f138d0..646422b5df17e 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json @@ -1,9 +1,10 @@ { "url": "https://github.com/thehamsta/tree-sitter-cuda", - "rev": "9c20a3120c405db9efda9349cd005c29f2aace3c", - "date": "2023-05-22T10:54:56+02:00", - "path": "/nix/store/zzix5y046a7vj6s16cdkp0v2fhfr24fq-tree-sitter-cuda", - "sha256": "0z9va82k7n8rlnk6g9q52sxaw2lcb05arl3l5dqmji5s53sq5q1c", + "rev": "275cfb95013b88382e11490aef1e7c9b17a95ef7", + "date": "2023-09-24T01:01:27+02:00", + "path": "/nix/store/cxvih9bkbpr3k2bcfzmcym6w3jw4k6p0-tree-sitter-cuda", + "sha256": "170qqhxnf5j34g1as5r5zamazvxss8rcmbxi92gkcgnindhgviny", + "hash": "sha256-3sb9YLPRPjafSLGvyjLSuu+vqvolF63CI0MWZzvEGJw=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cue.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cue.json index 16b8e17422ff7..2429e08f4b091 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cue.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cue.json @@ -1,9 +1,10 @@ { "url": "https://github.com/eonpatapon/tree-sitter-cue", - "rev": "0deecf48944aa54bb73e5383ba8acfbf9f2c44b4", - "date": "2023-06-01T08:40:59+02:00", - "path": "/nix/store/rxrhvk8icz9l668bl5sjwxfsz8yy9d7z-tree-sitter-cue", - "sha256": "0wbwsdilw39plw5nvn6bkr27ximf57dgd32jpp4ryz69bmifw8cv", + "rev": "2df92e6755337e9234ad18ffef37f35d95e2ba9d", + "date": "2023-09-14T09:23:14+02:00", + "path": "/nix/store/96raymr29j4w3z8czzslb5n0w11789if-tree-sitter-cue", + "sha256": "195g75hrmgj17r7csjbwqrwqc21k4nbmrr4rjpcpfidnq0c9pia6", + "hash": "sha256-RsWbGMC2RXfZlZnkXJclMwiGecZ8Sc1OPkG+mmE5r6Q=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json index 5df6aaa2e7cd4..738b30cbd116b 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json @@ -1,9 +1,10 @@ { "url": "https://github.com/usernobody14/tree-sitter-dart", - "rev": "1a525edd89026cc6f0a954b4718ce20fd7e45b15", - "date": "2023-05-23T15:35:37-06:00", - "path": "/nix/store/kv98km1sar3gxlzi3inyqln7i9701wgi-tree-sitter-dart", - "sha256": "0i2d6khh7gv48fpnc0f550gyxpzm328b8065sri7lhab0rjf17ai", + "rev": "7e447dc18a2d293498670fb5ea16138648c883e5", + "date": "2023-09-07T18:39:30-06:00", + "path": "/nix/store/fjmckpx1h2m3y8d63x05qn5lzgci37p8-tree-sitter-dart", + "sha256": "1hc2c2qmydka3iqz56md766lfy4s0xy2pr97hvdgvgq472jss984", + "hash": "sha256-BCWtpTgEv/3ahiflK3wHmnhHjTmtmvJxHGo2X7FggsE=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-devicetree.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-devicetree.json index ff06fbb8e7887..f3530c58c62ee 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-devicetree.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-devicetree.json @@ -4,6 +4,7 @@ "date": "2023-04-23T12:18:55-05:00", "path": "/nix/store/m39bl3vasy0b1r0qzdn8flb480ys8laq-tree-sitter-devicetree", "sha256": "11r46v3zw03p1fldhawn9zwyzpi7h57pjw9sydwq7b1fgdmdxvn7", + "hash": "sha256-x+7eansurIN58zpxeU+BJ97v+U+WK9ioC3cA/sc2JIc=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dockerfile.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dockerfile.json index 072f0eab727b2..f089eea145054 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dockerfile.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dockerfile.json @@ -4,6 +4,7 @@ "date": "2022-01-27T11:20:14-07:00", "path": "/nix/store/3whf6fv79zqk5w0d6jbzfgs5jzm4cll4-tree-sitter-dockerfile", "sha256": "0kf4c4xs5naj8lpcmr3pbdvwj526wl9p6zphxxpimbll7qv6qfnd", + "hash": "sha256-zTpsNj6Urhpv7/B+cxPlRhTJd1t35MouRVLZojthxE0=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dot.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dot.json index 4bb30edf84f0e..6665c2fefcd4b 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dot.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dot.json @@ -4,6 +4,7 @@ "date": "2022-08-25T12:15:36+08:00", "path": "/nix/store/p0lcm171skxdr4qbhqwl5slx76k9hap6-tree-sitter-dot", "sha256": "013brrljrhgpnks1r0cdvj93l303kb68prm18gpl96pvhjfci063", + "hash": "sha256-w4DInIT7mkTvQ6Hmi8yaAww6ktyNgRz0tPfBLGnOawQ=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-eex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-eex.json index 0bfb77c762fc6..34dc023949d29 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-eex.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-eex.json @@ -4,6 +4,7 @@ "date": "2022-01-12T10:01:23-08:00", "path": "/nix/store/an5vj0gnziy44ckklm9hxp9wbydisk4l-tree-sitter-eex", "sha256": "19n07ywavwkh4p189d18wxhch45qgn094b7mkdymh60zr7cbmyjh", + "hash": "sha256-UPq62MkfGFh9m/UskoB9uBDIYOcotITCJXDyrbg/wKY=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elisp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elisp.json index de3a66c3b3834..970cf5370bf0a 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elisp.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elisp.json @@ -4,6 +4,7 @@ "date": "2023-03-28T08:47:56-07:00", "path": "/nix/store/mbb6q2yma6vszbzpw5hbpzf0iwg9y7vi-tree-sitter-elisp", "sha256": "1m6lb60mlyk38pizcncp58f69kyf36b47rxnysf1l4193nscjqw6", + "hash": "sha256-hmPJtB0pEBqc9rbnQ5YZzs9kHCqXWfbjRWN6WoFZ1NQ=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json index 861c030f1a793..a421c98aeeb4d 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json @@ -4,6 +4,7 @@ "date": "2023-03-14T10:58:34+01:00", "path": "/nix/store/d8k07yvr8q14rc21fvhcnqrlpcwhlnmk-tree-sitter-elixir", "sha256": "0m10vykaj36yxk0wwh0vk0pzvpdmac4apgihmxn3j0dwwgirchf0", + "hash": "sha256-wEGW4+O8ATlsrzC+qwhTtd39L5gbQM7B7N4MqabfIFQ=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json index 2b6ffbe795c77..94e99286fc3da 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json @@ -1,9 +1,10 @@ { "url": "https://github.com/elm-tooling/tree-sitter-elm", - "rev": "692c50c0b961364c40299e73c1306aecb5d20f40", - "date": "2023-04-15T15:07:51+02:00", - "path": "/nix/store/hmjs76plv6a64c2mgfxq79mh0ak2a45a-tree-sitter-elm", - "sha256": "0y5mz26ax2gzlv8cbrncn4bip9gin330a2zmynq9f1yfwv4nxfnh", + "rev": "b075803c445191af3cf7dbfdc84efef5f5bbc0f5", + "date": "2023-07-30T13:11:47+02:00", + "path": "/nix/store/mlg7amv3vmydvk9b21669zrk825pczlw-tree-sitter-elm", + "sha256": "1kn78h4w27r5kmf3vy3cc42xm0h0fj44cf4p6nfcl3jfqr9s7n1a", + "hash": "sha256-KtijU8ZODsqcNZc4Roh0AILaBWFs+D1cnSUfwQlEx84=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json index 3b2eb8b387689..4491070428a0f 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json @@ -4,6 +4,7 @@ "date": "2023-02-06T19:11:08+01:00", "path": "/nix/store/mch0z6q00g2pp5vjjcdcl2xzs1h96jzh-tree-sitter-embedded-template", "sha256": "0gf33p08a6hqbxwy9zlp8y65gds2d6siqpgasc58ladh5p5n99j9", + "hash": "sha256-SaZkyy2wKYoK0+pdHLVpQrdXjEeX/uR5XxgahcAdwz0=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-erlang.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-erlang.json index ddc0c9323d7a0..2b1a7b6c87615 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-erlang.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-erlang.json @@ -4,6 +4,7 @@ "date": "2022-10-20T12:35:01+02:00", "path": "/nix/store/lcpjcmkb2js7mmvpd9w9c4gql0yqvdaj-tree-sitter-erlang", "sha256": "10hv3brjvrvg81qxi956mrc16riknhaqmxb6vpl46k0zsm6cgj36", + "hash": "sha256-ZsjHTNUfTEPo3Wb1ihW0M2YTWK6mpNhxQG/nLfMaG4I=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json index f30b880b64519..e954be4a24d23 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json @@ -4,6 +4,7 @@ "date": "2022-06-22T09:39:24-04:00", "path": "/nix/store/v8by7ilv9fyv20rp714xq7vhwwi7vz0g-tree-sitter-fennel", "sha256": "02ja5narbahc02f6gmnr5j2sg5sbjcc71hbny6n0nd57kcnapfgd", + "hash": "sha256-7bmrLJunNAus8XbBcBiTS5enhSzZ1mecAAyqlZUtSgo=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json index a63b6eddc5f47..a1047117557c1 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json @@ -4,6 +4,7 @@ "date": "2023-02-12T14:42:20+00:00", "path": "/nix/store/hg229jskwvgmfgi9awznvp9cj5riacay-tree-sitter-fish", "sha256": "1yxvibmmpkwswwrg1mzvcnfj6y0rpccrwyg27k4wpr2630ma9xcw", + "hash": "sha256-nPWkKhhG5MvJPOJ5nhm7GXgjnWX71/Ay55rPW+uKu/s=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fortran.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fortran.json index 99a272d33122b..d6cc94339f437 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fortran.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fortran.json @@ -1,9 +1,10 @@ { "url": "https://github.com/stadelmanma/tree-sitter-fortran", - "rev": "31552ac43ecaffa443a12ebea68cc526d334892f", - "date": "2023-02-26T07:44:33-05:00", - "path": "/nix/store/5ihp07ibidlf9q5chyj3m483x9823048-tree-sitter-fortran", - "sha256": "08x2smw31ijd6c4dg7sf09nb466h827dyy8mv702p3h6aj31sb7b", + "rev": "f73d473e3530862dee7cbb38520f28824e7804f6", + "date": "2023-08-30T10:25:35+01:00", + "path": "/nix/store/mkvh0z39lc89c3bgd91asxjwwiwskyp8-tree-sitter-fortran", + "sha256": "1nvxdrzkzs1hz0fki5g7a2h7did66jghaknfakqn92fa20pagl1b", + "hash": "sha256-K9CnLhDKiWTxVM5OBZ80psV2oFDnlTgd+DDoP39ufds=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gdscript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gdscript.json index 0c1606a96a849..2ac4b39f3710b 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gdscript.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gdscript.json @@ -4,6 +4,7 @@ "date": "2023-02-08T15:20:29-08:00", "path": "/nix/store/62skx6k41f6k95qf32b7yjd9m516z3lk-tree-sitter-gdscript", "sha256": "0f4g5vnls2rkwnry47cvpmhsymf1s109sbzdf4x7h94k58f5ggw4", + "hash": "sha256-hL9XHCqTJHg6ce0vnUDQwVWvYb2bHeKz5TMLTe0ujzg=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glimmer.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glimmer.json index 4e4935dfababf..ffafe86908936 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glimmer.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glimmer.json @@ -4,6 +4,7 @@ "date": "2022-06-24T09:27:51-04:00", "path": "/nix/store/m0hr0x0s3j7r6dn1kv6c77c9qbl4ggkw-tree-sitter-glimmer", "sha256": "07dzpjyc644clh2x3r48w3mi3i68pkac5mwzha2iaxly9fndm0zk", + "hash": "sha256-84ParEuedhWFgp/XwtS8yMQR6+CI5NEFpIwQw7y8vx0=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json index 44551e6c11788..c6e1437552f9a 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json @@ -1,9 +1,10 @@ { "url": "https://github.com/thehamsta/tree-sitter-glsl", - "rev": "190c86e633e6a6dfdb8a96f8b8460e347ff93f1c", - "date": "2023-05-20T13:31:53+02:00", - "path": "/nix/store/hj5f27mzk311bbjb448azsw2wwrax171-tree-sitter-glsl", - "sha256": "0ag7w0cp22253hzlm9017fsxmryhn8b8m0vrpsmh5kd05xss413k", + "rev": "ec6100d2bdf22363ca8a711a212f2144ea49233f", + "date": "2023-09-24T00:29:42+02:00", + "path": "/nix/store/lk8wn775vpa8aq8vm9fid6dvpijnk9sg-tree-sitter-glsl", + "sha256": "0grvl3dibfcy3rqyn621pdlr1dkgqifzalvhh8bqs7s6znmhwns0", + "hash": "sha256-QFsOq/1GH40XgnBT9V3Eb7aQabtBGOtxHp65FdugOz8=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json index cac2c99f932cf..bbda8ba6b40d7 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json @@ -1,9 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-go", - "rev": "64457ea6b73ef5422ed1687178d4545c3e91334a", - "date": "2022-12-08T10:45:14+01:00", - "path": "/nix/store/4kdv3qc219w96wcciypw0znkv2izbpd2-tree-sitter-go", - "sha256": "16d32m78y8jricba9xav35c9y0k2r29irj5xyqgq24323yln9jnz", + "rev": "bbaa67a180cfe0c943e50c55130918be8efb20bd", + "date": "2023-07-26T05:48:29-04:00", + "path": "/nix/store/v9xq4ym9925y1qdgd4frcnbklphvw8mp-tree-sitter-go", + "sha256": "0wlhwcdlaj74japyn8wjza0fbwckqwbqv8iyyqdk0a5jf047rdqv", + "hash": "sha256-G7d8CHCyKDAb9j6ijRfHk/HlgPqSI+uvkuRIRRvjkHI=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-godot-resource.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-godot-resource.json index 19b3463215ee0..06e95d787663e 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-godot-resource.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-godot-resource.json @@ -4,6 +4,7 @@ "date": "2021-12-20T22:40:16-08:00", "path": "/nix/store/3lmwkk16jmjnkx8lrl33i7a19hjca2jz-tree-sitter-godot-resource", "sha256": "0agnvg95fx60xkr5fivl1x3yhcw6ca58f7bpx3dq6fl7pyfgrky2", + "hash": "sha256-ws/8nL+HOoPb6Hcdh4pihjPoRw90R1fy7MB0V9Lb9ik=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gomod.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gomod.json index 0cbafe8edec24..6080553537af0 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gomod.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gomod.json @@ -4,6 +4,7 @@ "date": "2022-05-16T16:12:37-04:00", "path": "/nix/store/1aj3kwndjrimfijq0fxx6khn5r6ics3a-tree-sitter-go-mod", "sha256": "1hblbi2bs4hlil703myqhvvq2y1x41rc3w903hg2bhbazh7x8yyf", + "hash": "sha256-znvUD/xqwSUeHCDxwXIgPXiB94bY1wEOjRQSvURcdME=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gowork.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gowork.json index 6f6b954897792..05eca90427d3a 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gowork.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gowork.json @@ -4,6 +4,7 @@ "date": "2022-10-04T10:19:22+02:00", "path": "/nix/store/v8ny6m450z2g2ijk6gkbc3m1nsxcvck8-tree-sitter-go-work", "sha256": "1nn6nfw24v4m38g9ac528cn608bbxffkll1y525a7i9rdpnmx1sf", + "hash": "sha256-Tode7W05xaOKKD5QOp3rayFgLEOiMJUeGpVsIrizxto=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-graphql.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-graphql.json index b543c81fbd689..eb16f2cd9c29c 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-graphql.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-graphql.json @@ -4,6 +4,7 @@ "date": "2021-05-10T09:09:29-05:00", "path": "/nix/store/am2ld0br0yhdny5c2ndp6l0bl3c78wwq-tree-sitter-graphql", "sha256": "0xvrd6p9rxdjpqfq575ap6hpl2f7dad5i4d4m05w1qk9jx33vw9n", + "hash": "sha256-NvE9Rpdp4sALqKSRWJpqxwl6obmqnIIdvrL1nK5peXc=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json index c8058bb6084a8..200e63638eed9 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json @@ -1,9 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-haskell", - "rev": "c5cb0c860a399308305f44792bc4853737c40c07", - "date": "2023-05-06T16:49:31+02:00", - "path": "/nix/store/hh393wfdf43mghdgslq9315cqry1gim6-tree-sitter-haskell", - "sha256": "0an4d5q0vjl9amk4cwhs9d9cb3i4d1n20hzda165b88cq720lk7m", + "rev": "d7ac98f49e3ed7e17541256fe3881a967d7ffdd3", + "date": "2023-09-25T03:05:10+02:00", + "path": "/nix/store/8hjdhpw9g27hasl5czx80j7s3j65601k-tree-sitter-haskell", + "sha256": "0610dpnnrmwdxhj0cz4mnajx4aaxhr77w4vc756605zgv54djisw", + "hash": "sha256-XEfZSNnvF2BMOWwTfk6GXSnSpbKVfAYk7I3XbO1tIBg=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hcl.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hcl.json index ea3ff4c2b0d0c..738b02ffdb69d 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hcl.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hcl.json @@ -1,9 +1,10 @@ { "url": "https://github.com/MichaHoffmann/tree-sitter-hcl", - "rev": "6b74f88b3d396e0f101c93f807e0b3667cd3e3a2", - "date": "2022-12-02T21:24:38+01:00", - "path": "/nix/store/nn324j92ywapf4smjhkjyljlf6f5f96q-tree-sitter-hcl", - "sha256": "1dm129c91qyg955mpxy408wa7cmxyvh5n79c8rlb3yhc77f4z2px", + "rev": "636dbe70301ecbab8f353c8c78b3406fe4f185f5", + "date": "2023-07-25T19:21:31+02:00", + "path": "/nix/store/k5rmjfpgn4vpxxqc05xb5fflcck9645v-tree-sitter-hcl", + "sha256": "1yydi61jki7xpabi0aq6ykz4w4cya15g8rp34apb6qq9hm4lm9di", + "hash": "sha256-saVKSYUJY7OuIuNm9EpQnhFO/vQGKxCXuv3EKYOJzfs=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json index 791c2469e7d9a..273dc4f69ecd7 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json @@ -4,6 +4,7 @@ "date": "2022-09-24T18:53:08-07:00", "path": "/nix/store/vb6x1b9lc90ys55cwshdz5dxmwvzyjvv-tree-sitter-heex", "sha256": "00330rgg67fq0d9gk1yswj78d9mn1jvvjmmy1k7cxpvm5993p3sw", + "hash": "sha256-XI87Uip1387ODL5WubcMtqaGjuTah/lSA9gd814GYwA=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hjson.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hjson.json index d3ee4fba8cf5e..7fd16a4f1aecf 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hjson.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hjson.json @@ -4,6 +4,7 @@ "date": "2021-08-02T21:41:53+01:00", "path": "/nix/store/cvbkxylvkpgxcmkv87fvknlfxg4q09bg-tree-sitter-hjson", "sha256": "0zqf4bxqd2bpzdsw4kghq0jmn7l4sgdlrrlhc567b03p6kfdzi1n", + "hash": "sha256-NsTf3DR3gHVMYZDmTNvThB5bJcDwTcJ1+3eJhvsiDn8=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json index 086a96b1d6e02..c00a9ac832cae 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json @@ -1,9 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-html", - "rev": "86c253e675e7fdd1c0482efe0706f24bafbc3a7d", - "date": "2023-04-17T11:50:54+02:00", - "path": "/nix/store/a046axd86r1bd974b7c3ylyni4b90wma-tree-sitter-html", - "sha256": "12brygy11q1gkbpj9m4alg91jji6avc5j71lwv3m773c94jpbqlq", + "rev": "e5d7d7decbbdec5a4c90bbc69436b3828f5646e7", + "date": "2023-07-10T14:25:09-04:00", + "path": "/nix/store/fv14r2cf4i369jfjb74d7y3cbxyyg762-tree-sitter-html", + "sha256": "0ghgv712gq9bdaa4msz347cffgdbb5fc6a13q73dl9gwdjx0zl4c", + "hash": "sha256-jNAPumz8JdrGwSMow1xZqz3n2CHj60qUaivhJ8LZDz4=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-http.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-http.json index 08afd5267cc09..ae2366b33fa44 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-http.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-http.json @@ -4,6 +4,7 @@ "date": "2023-05-04T18:36:43-04:00", "path": "/nix/store/7d2x9w6nqlhvgk70jahwlp6zg19iriij-tree-sitter-http", "sha256": "0vhipdljx3s2pgzdk2a1zgqf8dd7p3bdbjckcb6z01hdg2p9v121", + "hash": "sha256-QYSdrngNBvDNYpPJ1da4pzXk8PtBidn+u0KPLmm7EW4=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json index 27500324f8a89..c522ab892bf02 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json @@ -4,6 +4,7 @@ "date": "2023-04-29T13:15:11+09:00", "path": "/nix/store/53gscixcapdpckbr4gfx26ax0jk84xcp-tree-sitter-janet-simple", "sha256": "0hy1dm2jzghd7mi74n4b1ac5bhm809mcg3bcl9f300bh5m79qnyq", + "hash": "sha256-2FucTi1wATBcomyNx2oCqMJVmAqLWHJiPQ2+L0VtwUM=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json index e1ee2b77840a8..b6aa4cf02f9bf 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json @@ -4,6 +4,7 @@ "date": "2022-09-19T09:37:51+02:00", "path": "/nix/store/478mfssm2335hdflgba22n4f0dir7xmr-tree-sitter-java", "sha256": "0440xh8x8rkbdlc1f1ail9wzl4583l29ic43x9lzl8290bm64q5l", + "hash": "sha256-tGBi6gJJIPpp6oOwmAQdqBD6eaJRBRcYbWtm1BHsgBA=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json index 494c06cc446fa..95e9ca95234b1 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json @@ -1,9 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-javascript", - "rev": "5720b249490b3c17245ba772f6be4a43edb4e3b7", - "date": "2023-02-24T13:50:01+01:00", - "path": "/nix/store/ddv5a3159sgib21v066wrfpb8lvlnb85-tree-sitter-javascript", - "sha256": "19bbxpg98bzbg7rh7y4kcfzg8lv7yp00pv1mqfyy913dfx4hnadd", + "rev": "f1e5a09b8d02f8209a68249c93f0ad647b228e6e", + "date": "2023-08-25T01:24:52-04:00", + "path": "/nix/store/iiwzzd2b6ngim7lwpy2zdgzik7lm2w1y-tree-sitter-javascript", + "sha256": "0jslqjlmfx0xdgwhqam0lgw22r521iynp8l10pfan2bmqxmbdcjm", + "hash": "sha256-VbK2asd1CavcBYGia30MomQh+KOgKgz5ax10V6nEVEs=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json index 3f9b7203f3ff2..1442cb58f4a8a 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json @@ -1,9 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-jsdoc", - "rev": "189a6a4829beb9cdbe837260653b4a3dfb0cc3db", - "date": "2021-03-04T14:39:14-08:00", - "path": "/nix/store/dpm11vziss6jbgp3dxvmgkb0dgg1ygc8-tree-sitter-jsdoc", - "sha256": "0qpsy234p30j6955wpjlaqwbr21bi56p0ln5vhrd84s99ac7s6b6", + "rev": "d01984de49927c979b46ea5c01b78c8ddd79baf9", + "date": "2023-08-20T17:54:07-04:00", + "path": "/nix/store/8fz1cj9fs1b3y85rd3mbpkhwsh07k6hq-tree-sitter-jsdoc", + "sha256": "11w3a6jfvf8fq1jg90bsnhj89gvx32kv1gy4gb5y32spx6h87f1v", + "hash": "sha256-O7iDoOlXi+HLesS/sKcYfb+EJLR6gfRkwA657aRRg4c=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json index 25a9d89ad4248..2a32a4b3cd25f 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json @@ -1,9 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-json", - "rev": "40a81c01a40ac48744e0c8ccabbaba1920441199", - "date": "2023-04-21T17:11:30-07:00", - "path": "/nix/store/9wcmgficprni47bm3qj9k18bhmjqi6hx-tree-sitter-json", - "sha256": "0zji769g3nikqlwn0vb0h93908a7w59da4jf807r9g2s6fvmz4vx", + "rev": "ca3f8919800e3c1ad4508de3bfd7b0b860ce434f", + "date": "2023-07-10T15:59:29-04:00", + "path": "/nix/store/3pkcya9skyx0k9k54sbp1sbqk9gpzwr4-tree-sitter-json", + "sha256": "038zdq2zf4phk082lrw466qd9fbkn1017n3nj53fbp1m8rmxwakk", + "hash": "sha256-cyrea0Y13OVGkXbYE0Cwc7nUsDGEZyoQmPAS9wVuHw0=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json5.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json5.json index cd9bc3e8dc80f..37d884b2d1b81 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json5.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json5.json @@ -4,6 +4,7 @@ "date": "2021-08-24T18:08:31-04:00", "path": "/nix/store/0qhffwc84sp97d8im4lfrd06jsyvmzc4-tree-sitter-json5", "sha256": "1la7bq5vi21gy0kf4zpwh0c0jfyv1bb62a3v7158hnxdyd5ijz07", + "hash": "sha256-B3wZS/OtW4hKOHsoYdYK2zsJGID8fuIm8C+IuAteR9E=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsonnet.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsonnet.json index 2f78dada29b8f..6a6114aeacb25 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsonnet.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsonnet.json @@ -1,9 +1,10 @@ { "url": "https://github.com/sourcegraph/tree-sitter-jsonnet", - "rev": "fdc775714afa27fdef823adbaba6ab98f5ae66f2", - "date": "2023-02-07T11:40:49-05:00", - "path": "/nix/store/7ls5cjd7jpd4pvwvac1yvzwj8lnwh9s0-tree-sitter-jsonnet", - "sha256": "0kyicx2zqf443fxyjby0i9c9fml210kxan2f2ylml2z2f83m4ni9", + "rev": "d34615fa12cc1d1cfc1f1f1a80acc9db80ee4596", + "date": "2023-08-15T11:57:41-04:00", + "path": "/nix/store/4hf1f6klnr5wd4p1va1x5v8ndmcc7z7b-tree-sitter-jsonnet", + "sha256": "0vw4k1hxq6dhy3ahh40h06k67h073ryxl7513cn81lb6sfgf6c4f", + "hash": "sha256-jjDjntNm0YAsG6Ec2n0eB8BjpgEQEAjV8LAZ3GGYhG8=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json index 37b125108ef3e..345c66b33ca1a 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json @@ -1,9 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-julia", - "rev": "e2f449e2bcc95f1d07ceb62d67f986005f73a6be", - "date": "2023-02-03T12:13:41-05:00", - "path": "/nix/store/wlmmi1411yhfirxhpnwdrm18ksm8rkyh-tree-sitter-julia", - "sha256": "1gwfy5hx168bgcdpzhvb5vjqal4mg3zksw7r4cmzyy31gfyc8yb5", + "rev": "0c088d1ad270f02c4e84189247ac7001e86fe342", + "date": "2023-09-04T11:11:28-05:00", + "path": "/nix/store/4zj06y16xi9ab4syip4cxcfw2wb2x5zm-tree-sitter-julia", + "sha256": "16l2flg1pzfcqd02k05y90ydmnki5vzp2m9rf2j2afr8slnawjaq", + "hash": "sha256-WEmuLNUoOyWkcDlVcf8ucdraPEi+gClAw8z9Gx51gpo=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kotlin.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kotlin.json index f7e29af84f15e..2c73ae9d6ea0d 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kotlin.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kotlin.json @@ -4,6 +4,7 @@ "date": "2021-10-12T01:11:47+02:00", "path": "/nix/store/49cvpcypxjzpb0srcpd383ay9f0g19dy-tree-sitter-kotlin", "sha256": "1sisvx7cp95d309ykhimn8bhbwd1lzcwrpz3s0mdsb2i44p69469", + "hash": "sha256-yZBkLiFRLN0q0OPfzNmnofEFF7I1wukTGK2ky07fOuo=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json index 651ddbefa3037..1ae0d28cde670 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json @@ -4,6 +4,7 @@ "date": "2022-10-26T10:55:26+02:00", "path": "/nix/store/zhx1vnr3xdrb0ry6kfjsfrzs6c3nf8i9-tree-sitter-latex", "sha256": "0lc42x604f04x3kkp88vyqa5dx90wqyisiwl7nn861lyxl6phjnf", + "hash": "sha256-zkp4De2eBoOsPZRHHT3mIPVWFPYboTvn6AQ4AkwXhFE=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ledger.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ledger.json index 652446789dca0..02d5ca9f0cdec 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ledger.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ledger.json @@ -4,6 +4,7 @@ "date": "2023-05-07T23:13:39-04:00", "path": "/nix/store/hdf6hzhb4h9p28hx26iqqz0cwf471aq8-tree-sitter-ledger", "sha256": "12mfn42nhn0i8gf39aqbqfkccqc1mbn5z1vw5gh98pc9392jccq4", + "hash": "sha256-BDMmRRqJXZTgK3yHX+yqgWHGpsMLqzTcQxFYaAWxroo=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-llvm.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-llvm.json index 8b0e1bf124b7b..4fbad29a92d4e 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-llvm.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-llvm.json @@ -1,9 +1,10 @@ { "url": "https://github.com/benwilliamgraham/tree-sitter-llvm", - "rev": "d47c95d78ef0e7495a74d214dd6fcddf6e402dfc", - "date": "2023-05-03T15:12:41-04:00", - "path": "/nix/store/fp1hrlrvj29ndsyp7dbvg4bgmja891s6-tree-sitter-llvm", - "sha256": "1d863cy214w26hlj22y60a4nw3j5qmr9a174f8vfgcc0lk9dzbh8", + "rev": "1b96e58faf558ce057d4dc664b904528aee743cb", + "date": "2023-09-08T15:05:51-04:00", + "path": "/nix/store/hifa2i7b634kl47ldahvryj4n5fm3gwk-tree-sitter-llvm", + "sha256": "1sl3i37vzwbyn5ac12lrccmny0dg814my848cb25xdp8n47s5q7l", + "hash": "sha256-9OCiD7Hotl7EYoggX0lArwFvK2OZisBUsX7xv8+Ig+o=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json index 63c9a2afa9950..379628e12e05d 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json @@ -1,9 +1,10 @@ { "url": "https://github.com/MunifTanjim/tree-sitter-lua", - "rev": "dcc44f7473ecec4d7b99af0a9529705d98a769f1", - "date": "2023-05-13T02:02:51+06:00", - "path": "/nix/store/079khfz0609hqllhwp08c2y96j2jkbwr-tree-sitter-lua", - "sha256": "13rmng6y6q653s0yk1ahbppjmxwcbr80h5kgr53q43bq9khjrjxx", + "rev": "9668709211b2e683f27f414454a8b51bf0a6bda1", + "date": "2023-09-07T13:41:24+06:00", + "path": "/nix/store/lahwsbw8a5lp7jg68wx7mfkhzz6sxzxl-tree-sitter-lua", + "sha256": "0iqqfncsli57ih5inllfzg5s8f9px7wdnddh6lkz4ycvmbq71pp6", + "hash": "sha256-5t5w8KqbefInNbA12/jpNzmky/uOUhsLjKdEqpl1GEc=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-make.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-make.json index 468146ac47d09..04d1eeeb505e0 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-make.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-make.json @@ -4,6 +4,7 @@ "date": "2021-12-16T17:14:17+00:00", "path": "/nix/store/v01s3lfi1w3bm433gf6zi0wb0r603906-tree-sitter-make", "sha256": "07gz4x12xhigar2plr3jgazb2z4f9xp68nscmvy9a7wafak9l2m9", + "hash": "sha256-qQqapnKKH5X8rkxbZG5PjnyxvnpyZHpFVi/CLkIn/x0=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json index 4adf56ae3d924..2be685060e15a 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json @@ -1,9 +1,10 @@ { "url": "https://github.com/MDeiml/tree-sitter-markdown", - "rev": "fa6bfd51727e4bef99f7eec5f43947f73d64ea7d", - "date": "2023-03-06T00:22:35+01:00", - "path": "/nix/store/8biwal105haahabfl6q01q2dm3danjzn-tree-sitter-markdown", - "sha256": "0wryvq7153a3jx9qs1plm5crlgd88sm1ymlqc3gs09mr2n456z9z", + "rev": "aaf76797aa8ecd9a5e78e0ec3681941de6c945ee", + "date": "2023-07-22T13:25:09+02:00", + "path": "/nix/store/5j100a9ksm598pvzzpdw91mmwxi11d03-tree-sitter-markdown", + "sha256": "1kksp7vx29f8qflg3sc1gi22xv24g7n9jz93v3fqvc4frx8iyyp0", + "hash": "sha256-4HofUc+OsI3d2CN9mex5ROwuRHyB6fGow8gl0fe5es4=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nickel.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nickel.json index 026cbb65cb2e9..5db0b861a8fc3 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nickel.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nickel.json @@ -1,9 +1,10 @@ { "url": "https://github.com/nickel-lang/tree-sitter-nickel", - "rev": "3a794388773f2424a97b2186828aa3fac4c66ce6", - "date": "2023-05-17T14:02:29+02:00", - "path": "/nix/store/m4siaf1k6xbr3smyyjm7f047szzp99sw-tree-sitter-nickel", - "sha256": "1m28gjdamysxr9grjzwpmj1qiniff4vy1nka9i3zjyskbm71pf1l", + "rev": "b759233581fd8bae239e905c67a9ba453205da78", + "date": "2023-09-14T10:23:29+02:00", + "path": "/nix/store/s035753cs69k3pxcxn6pgmynfs9rlnxr-tree-sitter-nickel", + "sha256": "1y118sbpxqw045ys7y5g8iywa11b3jyldc8rzkc79c2jbavdvsp0", + "hash": "sha256-4OrdtlpSsHTY/BmxRr0cKwTFfUSv+KN9IYDjfpdGIfg=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json index 308292cfd570b..94a93fbb2bc7f 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json @@ -1,9 +1,10 @@ { "url": "https://github.com/cstrahan/tree-sitter-nix", - "rev": "02878b40ac77d2889833519c6b6e9e63cfc690e6", - "date": "2023-03-11T16:31:57-06:00", - "path": "/nix/store/mlasmj51yygqms5fwsd34fjb2h16q8q0-tree-sitter-nix", - "sha256": "1y737sif7hjnssif28xn16paf1kpamgsqh82k4j6grzbp11j4kpl", + "rev": "66e3e9ce9180ae08fc57372061006ef83f0abde7", + "date": "2023-07-13T16:23:24+12:00", + "path": "/nix/store/s4wax7d0axrm8npq02lk4n1g75hzjhp0-tree-sitter-nix", + "sha256": "06671j6kx0b5z35mkmyygvxmjd8af9ac7kbl0w1bfwk177arz3zs", + "hash": "sha256-+o+f1TlhcrcCB3TNw1RyCjVZ+37e11nL+GWBPo0Mxxg=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json index 514c5a082535d..797b2b19ea949 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json @@ -4,6 +4,7 @@ "date": "2023-02-12T20:47:35+01:00", "path": "/nix/store/w7drx78c8w9claw3c6h7vlxdhyvfj8j6-tree-sitter-norg", "sha256": "1wl6h5pin861msgmg5q3k0h62fl73svdwn0ppn4vp7a37s9p5xvm", + "hash": "sha256-dfdykz5DnbuJvRdY3rYehzphIJgDl1efrsEgG2+BhvI=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json index 7e8b2d5d93150..32750a9f2da4c 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json @@ -1,9 +1,10 @@ { "url": "https://github.com/LhKipp/tree-sitter-nu", - "rev": "3133b2f391be10698c4fd6bc3d16f94cf2cb39b2", - "date": "2023-02-18T19:56:18+01:00", - "path": "/nix/store/x4yfa2dvs7gzi62qqs084jx38mhla0ym-tree-sitter-nu", - "sha256": "096jz9bb0dihi1civ8x1milyhdmx5chzwyrg84wj1jv94fkfmjk0", + "rev": "c125aaa83c14f936a20f60c0e86537b81b9f01c9", + "date": "2023-09-19T21:59:06+02:00", + "path": "/nix/store/s0fcpv3w2wkra74y675arsvi3g0xbng2-tree-sitter-nu", + "sha256": "1ckbbzq9rk6iz23xs283rw7j2w7lg8fgp552qkiqa3fc7fmyrfk0", + "hash": "sha256-YLrsqzvMDYXjxKKU+xx69HAhD88DCd2H+NHMnPBfa7I=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json index d0ed96c6e568a..24f45bacb80d4 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json @@ -1,9 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-ocaml", - "rev": "de07323343946c32759933cb3b7c78e821098cad", - "date": "2022-12-14T19:50:15+01:00", - "path": "/nix/store/h6h50380i2gp7j00i525vgs9llv58jzs-tree-sitter-ocaml", - "sha256": "021vnbpzzb4cca3ncd4qhzy583vynhndn3qhwayxrpgdl61m44i6", + "rev": "694c57718fd85d514f8b81176038e7a4cfabcaaf", + "date": "2023-07-17T22:31:47+02:00", + "path": "/nix/store/2nq7apr98j81va00y74mfhcrqqdb7gwh-tree-sitter-ocaml", + "sha256": "03zqsdm6yy7g3ml0lganh4qg6vfc301255kg756y1icclgdfywcg", + "hash": "sha256-j3Hv2qOMxeBNOW+WIgIYzG3zMIFWPQpoHe94b2rT+A8=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json index afee94a44aaf9..817231cc84251 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json @@ -1,9 +1,10 @@ { "url": "https://github.com/milisims/tree-sitter-org", - "rev": "081179c52b3e8175af62b9b91dc099d010c38770", - "date": "2022-10-21T23:23:29-04:00", - "path": "/nix/store/7jy3jqyd02kryfgz16k3zxg2kmjz0wqf-tree-sitter-org", - "sha256": "0h9krbaq9j6ijf86sg0w221s0zbpbx5f7m1l0whzjahbrqpnqgxl", + "rev": "64cfbc213f5a83da17632c95382a5a0a2f3357c1", + "date": "2023-06-19T18:05:11-04:00", + "path": "/nix/store/9hdl3i24q6af6wxmkg89ww4rwkl45la7-tree-sitter-org", + "sha256": "1l62p4a3b22pa7b5mzmy497pk5b8w01hx6zinfwpbnzg2rjdwkgz", + "hash": "sha256-/03eZBbv23W5s/GbDgPgaJV5TyK+/lrWUVeINRS5wtA=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json index df19bf623ed34..be45f9a7aee70 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json @@ -1,9 +1,10 @@ { "url": "https://github.com/ganezdragon/tree-sitter-perl", - "rev": "60aa138f9e1db15becad53070f4d5898b0e8a98c", - "date": "2023-04-13T01:12:55+05:30", - "path": "/nix/store/dd6ymbx86sw0g6dp1lns65avs50kr9kr-tree-sitter-perl", - "sha256": "1br66y8prhq7k7fi50sl8v51y8s29wf590g44kh5a574dx51960s", + "rev": "ba2a3411ab2270df7f6da8689d50a1fe29811d06", + "date": "2023-07-29T21:08:04+05:30", + "path": "/nix/store/rfnlnycbqxp4hwzgig60l9i0w89p2g5a-tree-sitter-perl", + "sha256": "1kkap2vqa95z5fh63qvy1jd87d5s6qb79bqm91p210i9yj5270zr", + "hash": "sha256-+YMjivQpgiBuSBWvdBY2urSDmgx+42GgK78khbe4as4=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pgn.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pgn.json index 786fec353d5f9..ee5733041b82c 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pgn.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pgn.json @@ -4,6 +4,7 @@ "date": "2021-08-25T17:57:38-04:00", "path": "/nix/store/fj882ab2hl3qrz45zvq366na6d2gqv8v-tree-sitter-pgn", "sha256": "1c4602jmq3p7p7splzip76863l1z3rgbjlbksqv0diqjxp7c42gq", + "hash": "sha256-+AnCzu0SxwY21nNRuV4eP9BhkDk3fnr1uecOXKUAhrA=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json index 3577739841c72..c407d303c1dbd 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json @@ -1,9 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-php", - "rev": "1a40581b7a899201d7c2b4684ee34490bc306bd6", - "date": "2023-03-14T02:52:52-07:00", - "path": "/nix/store/nxhb4hdr16bfylq1jkzjznh65bkd0g8x-tree-sitter-php", - "sha256": "1hm7mpv0sggqzgbixh4r3bpap3dsh1zsy6msyknhdpkhblch4a5m", + "rev": "a05c6112a1dfdd9e586cb275700931e68d3c7c85", + "date": "2023-09-16T22:44:24-04:00", + "path": "/nix/store/sswg2fpbb5l59g0kdhzxks2k2mqamv1w-tree-sitter-php", + "sha256": "1z54hgzkcqrjh6w7bp5hh8g27wli04x0pq8imwal8ml1gi7bvpzn", + "hash": "sha256-9t+9TnyBVkQVrxHhCzoBkfIjHoKw3HW4gTJjNv+DpPw=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pioasm.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pioasm.json index 9c753e26305ef..52fedbf7a4cc6 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pioasm.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pioasm.json @@ -4,6 +4,7 @@ "date": "2021-08-27T17:22:56-04:00", "path": "/nix/store/nhxzw33vljxh5i90d0fb5nzdfjp5h9bl-tree-sitter-pioasm", "sha256": "1lxvgc0zkd2sv8dxp2fy6b1k3gqrbkxgqy25lw9sbd4kij7463m2", + "hash": "sha256-og5DjoyTtKUTp0V4/PpcGb8xwzLeidsb2lq0+QF7u9M=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-prisma.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-prisma.json index c5eb9c7812fe2..84f6abe3e4be3 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-prisma.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-prisma.json @@ -4,6 +4,7 @@ "date": "2023-01-05T15:24:25+01:00", "path": "/nix/store/hj6bbz4zdfwi7ps72zbbv0hg132g13gr-tree-sitter-prisma", "sha256": "19zb3dkwp2kpyivygqxk8yph0jpl7hn9zzcry15mshn2n0rs9sih", + "hash": "sha256-MOqkM7DCQl1L8Jn9nyw89EoAr0ez4+d39HeKy2cb66c=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pug.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pug.json index 91688801bda66..ca5e0cfebaa02 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pug.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pug.json @@ -1,9 +1,10 @@ { "url": "https://github.com/zealot128/tree-sitter-pug", - "rev": "884e225b5ecca5d885ae627275f16ef648acd42e", - "date": "2023-02-05T22:06:33+01:00", - "path": "/nix/store/29x0z42g27xbd2ddj2n7yf5shr9f9iwl-tree-sitter-pug", - "sha256": "047kcjyf8y981ix22fmnd1qgsaqvxlvqgsxfkvrv1x9hgd5dbxx8", + "rev": "a7ff31a38908df9b9f34828d21d6ca5e12413e18", + "date": "2023-07-27T08:31:48+02:00", + "path": "/nix/store/g068db1k301bva5rxcmkrm7gm616m4pw-tree-sitter-pug", + "sha256": "0iz5gsw7m887i7kps2kqaz2mf55gj3xcb4x705p95f7ia9ipcg2q", + "hash": "sha256-WDx2Y1LxuJJuAaeTxfqQrxRXxVd4Cn3niQeherh+5Uc=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json index a23fe01bd1b5b..ce43cb5dda88d 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json @@ -1,9 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-python", - "rev": "62827156d01c74dc1538266344e788da74536b8a", - "date": "2023-02-28T17:23:11+01:00", - "path": "/nix/store/vnh5j5nb3crn0zfc71i35fig0blsilsl-tree-sitter-python", - "sha256": "038l9zdn821s2igwfiwxq2ajkc1d66iri4zj9afazbma7kh5fnw5", + "rev": "a901729099257aac932d79c60adb5e8a53fa7e6c", + "date": "2023-09-21T03:55:53-04:00", + "path": "/nix/store/arzga89mcw3yns4cxdy7rwyr6qrfyymp-tree-sitter-python", + "sha256": "1kkpaf8gmkb9nkggdlhqjm8ddi20p8dckrrh80c6r4j3rpf46641", + "hash": "sha256-gRhD3M1DkmwYQDDnyRq6QMTWUJUY0vbetGnN+pBTd84=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql-dbscheme.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql-dbscheme.json index 3838c8c6abbba..86a69e6f67312 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql-dbscheme.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql-dbscheme.json @@ -4,6 +4,7 @@ "date": "2022-08-29T08:49:16+02:00", "path": "/nix/store/k58fls33kiwgbf8vn4488x5l79c9a18x-tree-sitter-ql-dbscheme", "sha256": "1kpkjg97s5j1dx79r3fk0i2bxhpm9sdawgb1drqnjgz4qsshp7f2", + "hash": "sha256-wp0LtcbkP2lxbmE9rppO9cK+RATTjZxOb0EWfdKT884=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json index d7fcdc683b202..a03f115be9574 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json @@ -4,6 +4,7 @@ "date": "2022-08-17T11:53:16+02:00", "path": "/nix/store/id24yb922kcjnqx160b5hga65k9zmnkh-tree-sitter-ql", "sha256": "18yv6sag794k0l7i0wxaffxhay6zgwnap5bbhi48h04q1cvas0yr", + "hash": "sha256-2QOtNguYAIhIhGuVqyx/33gFu3OqcxAPBZOk85Q226M=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-query.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-query.json index c6075cc1d3cd4..1dbdb3291d2f9 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-query.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-query.json @@ -4,6 +4,7 @@ "date": "2023-03-09T05:33:03-08:00", "path": "/nix/store/3p8d4hl2bnm1fzn0nx7zc62l73118vm2-tree-sitter-query", "sha256": "0xd00idgmyr55yd10xaxma1pwahlvn7gqy78zf8zknfbqvd3rzqs", + "hash": "sha256-Gv882sbL2fmR++h4/I7dFCp+g6pddRCaLyX7+loEoHU=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json index 957fcc66b9275..7ec43650bb3ba 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json @@ -1,9 +1,10 @@ { "url": "https://github.com/r-lib/tree-sitter-r", - "rev": "80efda55672d1293aa738f956c7ae384ecdc31b4", - "date": "2022-11-10T09:19:03-08:00", - "path": "/nix/store/x7rjhqp9qxh9xwq2l38jz5wbkbzz0vfl-tree-sitter-r", - "sha256": "1n7yxi2wf9xj8snw0b85a5w40vhf7x1pwirnwfk78ilr6hhz4ix9", + "rev": "c55f8b4dfaa32c80ddef6c0ac0e79b05cb0cbf57", + "date": "2023-07-26T18:01:44-07:00", + "path": "/nix/store/ydqli8jal8g3nbr78nl8rimb0m5r7b50-tree-sitter-r", + "sha256": "0si338c05z3bapxkb7zwk30rza5w0saw0jyk0pljxi32869w8s9m", + "hash": "sha256-NWnEk0FixC7pBdNLwJUGvKifwZj8nzX7VWv8AhgaI2o=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json index 3a2c6f258ae3d..fec31ced29cc8 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json @@ -1,9 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-regex", - "rev": "e1cfca3c79896ff79842f057ea13e529b66af636", - "date": "2022-01-03T09:37:11-08:00", - "path": "/nix/store/24lr7jzznsd3z7cld007aww25kbwcf51-tree-sitter-regex", - "sha256": "0j6j0h8ciyhgmcq9iy3843anyfvd7s0biqzgbsqgwbgbqbg2nfwl", + "rev": "2354482d7e2e8f8ff33c1ef6c8aa5690410fbc96", + "date": "2023-07-19T17:58:43-04:00", + "path": "/nix/store/bvsgqya54sh9qxcida01iwcsl5schqhh-tree-sitter-regex", + "sha256": "1b5sbjzdhkvpqaq2jsb347mrspjzmif9sqmvs82mp2g08bmr122z", + "hash": "sha256-X4iQ60LgiVsF0rtinVysX16d6yFjaSmwwndP2L5cuqw=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rego.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rego.json index ad605c788b378..16f2d8b4b3de6 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rego.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rego.json @@ -4,6 +4,7 @@ "date": "2022-11-18T14:07:12+02:00", "path": "/nix/store/ky8xv5v5i273n0zqin0mnsx810382wfn-tree-sitter-rego", "sha256": "18qw5ahx6qcfq9gs6gcakl178gnnryksv6gyamyd6vypz20kwz6b", + "hash": "sha256-y3w+gfjXb9N8Vf6ZrafP1j50Ap2KPaNfwo5h06EqHKM=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rst.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rst.json index 5d58925b7077f..f8401f3ed865f 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rst.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rst.json @@ -4,6 +4,7 @@ "date": "2022-08-26T17:09:42-05:00", "path": "/nix/store/y831a05hzw8dsajijwkahgwwcf4ima8l-tree-sitter-rst", "sha256": "0f53jmpjh2kcl9srwwwb7a5k24729ig96m87qjj99myqfnzahw43", + "hash": "sha256-g3CovnXY15SkxAdVk15M4hAxizqLc551omwKKG+Vozg=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json index 86320373d7ea3..2cb04c8940d1c 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json @@ -4,6 +4,7 @@ "date": "2021-03-03T16:54:30-08:00", "path": "/nix/store/ragrvqj7hm98r74v5b3fljvc47gd3nhj-tree-sitter-ruby", "sha256": "0m3h4928rbs300wcb6776h9r88hi32rybbhcaf6rdympl5nzi83v", + "hash": "sha256-e6D4baG3+paNUwyu5bMYESKUEzTnmMU4AEOvjEQicFQ=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json index 2b3f88a96ba04..c95bab92d3092 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json @@ -1,9 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-rust", - "rev": "0a70e15da977489d954c219af9b50b8a722630ee", - "date": "2023-04-25T13:09:18+02:00", - "path": "/nix/store/ymkvfvgf2wkxzsffxhyv7m8bq8j2f39f-tree-sitter-rust", - "sha256": "0m979bkrb7r58dapnm5plarvk3x3mvn5yyslrnrh6qgci7xmicqa", + "rev": "48e053397b587de97790b055a1097b7c8a4ef846", + "date": "2023-09-21T23:15:14+00:00", + "path": "/nix/store/m01z8llh3nckvr7iiyap5mr91iisx6r1-tree-sitter-rust", + "sha256": "0jc8sisfj50jra89y3p6pv0b2smn125m4nvkaidz1cnympajbpc6", + "hash": "sha256-ht0l1a3esvBbVHNbUosItmqxwL7mDp+QyhIU6XTUiEk=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json index d07e41339fb29..699ff6af97169 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json @@ -1,9 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-scala", - "rev": "5aefc0ae4c174fa74d6e973faefa28692e081954", - "date": "2023-05-23T22:52:07-04:00", - "path": "/nix/store/2gag459nfdm3c0p1a79wj9m3mnpzqn83-tree-sitter-scala", - "sha256": "064hch4v9pkl2ylkb6imfxz0a5dfl6rc37m76rxcdzmiwcr7fmfw", + "rev": "d50b6ca5cc3d925e3d1f497199cb8d8383ddae8a", + "date": "2023-08-20T03:15:51-04:00", + "path": "/nix/store/nb0987awf0a098gl9b43whbjlgxc428h-tree-sitter-scala", + "sha256": "0hs6gmkq5cx9qrmgfz1mh0c34flwffc0k2mhwf13laawswnywfkz", + "hash": "sha256-fzruLddcKTqC47CKCZhznDoyGIA1fPdqxqmzgmd9RkM=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json index c46c2d2cf9ea8..be1d9fa8e1a61 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json @@ -1,9 +1,10 @@ { "url": "https://github.com/6cdh/tree-sitter-scheme", - "rev": "6abcfe33d976ebe3e244ca80273c7e8a070441b5", - "date": "2023-04-22T18:14:27+08:00", - "path": "/nix/store/18v6jgrcfdl3sgg7p02dpzkc3lj9mpn6-tree-sitter-scheme", - "sha256": "0iazh55cmznw2mkffnzwkpq4f8vkb1hxiapkgflmcnaq9wb6jp7a", + "rev": "85b6188fb77c03dfb01d13e58e2844450506860c", + "date": "2023-09-01T09:52:02+08:00", + "path": "/nix/store/0ckxw6q3nh5vb2lmibzy2kw2p4kcrqf4-tree-sitter-scheme", + "sha256": "0rrygynsispdpkc5npvfcxri4x9n5w7j3ffbh27j5j8yw2jr1s5z", + "hash": "sha256-v+iQpeAeySKPgMu5IQ8vNnUSc2duX1vYvO3qqK1/Pmc=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scss.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scss.json index 0b2637a143894..0c3c6df0b6b23 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scss.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scss.json @@ -4,6 +4,7 @@ "date": "2022-02-03T21:48:21+00:00", "path": "/nix/store/s49l3jbhjni3l1d0m3xrpzml39aq9yr3-tree-sitter-scss", "sha256": "15r3jiv36hzx2pmjmp63am3pbc01s52z36xfraa1aw4wlx7lqnq4", + "hash": "sha256-BFtMT6eccBWUyq6b8UXRAbB1R1XD3CrrFf1DM3aUI5c=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-smithy.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-smithy.json index 09d2c55c97de5..609520882b072 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-smithy.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-smithy.json @@ -1,9 +1,10 @@ { "url": "https://github.com/indoorvivants/tree-sitter-smithy", - "rev": "084537ae85d186448c447de959a4955c0b855d2b", - "date": "2022-10-09T13:04:45+01:00", - "path": "/nix/store/4r9gfwad9f769y0ivivprlpqjbq8di8s-tree-sitter-smithy", - "sha256": "17l94ay7vv2b1iihnzssbw3i027yvk5a44waqlyzgf2bkqk7iqs0", + "rev": "cf8c7eb9faf7c7049839585eac19c94af231e6a0", + "date": "2023-01-31T21:16:56+00:00", + "path": "/nix/store/y5j99bx1b6h25k1lnzs6s4gkg0mhll06-tree-sitter-smithy", + "sha256": "0k7gfpa3pcj1ji34k0kwk1xbadkgjadfg36xfwns1fmlwzmr7jnx", + "hash": "sha256-3cqT6+e0uqAtd92M55qSbza1eph8gklGlEGyO9R170w=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-solidity.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-solidity.json index c00aa925b2ad1..7034af3f1c194 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-solidity.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-solidity.json @@ -4,6 +4,7 @@ "date": "2022-12-14T12:24:29+01:00", "path": "/nix/store/37x7jqscpg36xncjy7i4zbvmx42dc1wh-tree-sitter-solidity", "sha256": "1bg7q7l5jv5xrr7pfzg6i3bfgs6mrzzflh3rf4lqcd373xf8290q", + "hash": "sha256-GCSBXB9nNIYpcXlA6v7P1ejn1ojmfXdPzr1sWejB560=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sparql.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sparql.json index 4180f58440735..42199274dd420 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sparql.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sparql.json @@ -4,6 +4,7 @@ "date": "2021-08-16T15:50:03+02:00", "path": "/nix/store/vvgvb1jcv0qrn3xj0jbf83qwi1lh2m68-tree-sitter-sparql", "sha256": "012c1pi4vc6hkvllymvl2yah3ix8k4pi7997iydy949fc33aa5i8", + "hash": "sha256-KBalxmAukeSbjyelEy+ZqMcBlRd0V0/pntCwTeINTAQ=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json index 96a5359359862..41073e08e8c01 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json @@ -1,9 +1,10 @@ { "url": "https://github.com/derekstride/tree-sitter-sql", - "rev": "63a6bad6d4ca2192cf252e10db73627414546732", - "date": "2023-05-23T15:22:05+00:00", - "path": "/nix/store/wkbdy34zr3ccs0pf0is1xc5223k3riai-tree-sitter-sql", - "sha256": "1g7ldcvwmw5rp97i12drcr26b8biczpphhgl08c4gack787sxgrk", + "rev": "39750c48bf9ad63bcc1399554355b0aa0aaa1c33", + "date": "2023-09-07T13:39:32+00:00", + "path": "/nix/store/x1swbby8g0l0r7szdlgiqsqj3sdjambc-tree-sitter-sql", + "sha256": "1dnvmazyinchqj8gsv836m1kclycri0ypi4bf712nx3avw4ajwfz", + "hash": "sha256-33GpCN9qdCvCcYvE60HMzFM2QzUDbf2QxJDZ6L+q27Y=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json index 22a0fa2394897..ec2da6b0fd02b 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json @@ -1,9 +1,10 @@ { "url": "https://github.com/madskjeldgaard/tree-sitter-supercollider", - "rev": "90c6d9f777d2b8c4ce497c48b5f270a44bcf3ea0", - "date": "2022-04-14T11:41:40+02:00", - "path": "/nix/store/hzdm20x9fpc8bqd6bphq1akbdmdcpq7s-tree-sitter-supercollider", - "sha256": "1g0q32crsnzxnwh5bjfjm0dkxpnvdj76idjc8s4ba7hinwa8jpv0", + "rev": "3b35bd0fded4423c8fb30e9585c7bacbcd0e8095", + "date": "2023-05-30T21:04:53+02:00", + "path": "/nix/store/fzb78sqxbxcyldz5m7yx6zirxsvxn5cc-tree-sitter-supercollider", + "sha256": "0ib8mja321zwbw59i45xa66p39gikn8n1pihhv26hm5xgdkwwr4r", + "hash": "sha256-mWTOZ3u9VGjEhjDeYJGd8aVxjVG9kJgKX/wHMZSsaEU=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-surface.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-surface.json index d12ff52a55631..047ede66e4322 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-surface.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-surface.json @@ -4,6 +4,7 @@ "date": "2021-08-15T10:33:50-07:00", "path": "/nix/store/7i1klj80jbcvwgad7nrbcs7hvn68f125-tree-sitter-surface", "sha256": "122v1d2zb0w2k5h7xqgm1c42rwfrp59dzyb2lly7kxmylyazmshy", + "hash": "sha256-Hur6lae+9nk8pWL531K52fEsCAv14X5gmYKD9UULW4g=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json index 995cfbd67791d..7ffb07e2e731c 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json @@ -4,6 +4,7 @@ "date": "2023-04-03T22:59:58+05:30", "path": "/nix/store/lqqls8g9zhiv2v32if429cwycn092zq6-tree-sitter-svelte", "sha256": "1kp91sarydq41zznwxwxdv2i2pflgzhmpfv0iqgq47fma9bcv2wy", + "hash": "sha256-novNVlLVHYIfjmC7W+F/1F0RxW6dd27/DwQ3n5UO6c4=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tiger.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tiger.json index 13a37b6591f5c..70a6bdf840dc7 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tiger.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tiger.json @@ -1,9 +1,10 @@ { "url": "https://github.com/ambroisie/tree-sitter-tiger", - "rev": "4a099243ed68a4fc72fdad8ea3ce57ec411ebfe3", - "date": "2023-04-01T17:11:28+01:00", - "path": "/nix/store/f8nmndxp42jf09lp1v2m3grj1h6f447y-tree-sitter-tiger", - "sha256": "0riyjsqdk4kiyl58vanfg7k64n55czcncsjx696l3gph2dyfjxnb", + "rev": "a7f11d946b44244f71df41d2a78af0665d618dae", + "date": "2023-08-29T21:54:01+01:00", + "path": "/nix/store/ynxdy89llzc9kqqw0h2fmv81dna7wrxq-tree-sitter-tiger", + "sha256": "100cpj00w021hk0cgn5qbgqa6yn8ji58hl77qf3054h2jxzxnsnc", + "hash": "sha256-zGrbf5cCkgKGw+dQiEqUyHqj8Fu42MfAhEEADoC8DIA=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json index 89007c421c08f..69890d3d33fd9 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json @@ -4,6 +4,7 @@ "date": "2023-03-28T17:13:15-04:00", "path": "/nix/store/biqm93z4n1ravfi5bs466fbp4bxadjmk-tree-sitter-tlaplus", "sha256": "0md800h54792nv1mfzdw7wyjzz8wx5cvl6mzlb8l70p0ihjfrk1s", + "hash": "sha256-OszsJIzggkPRor8aulnpHP0vPT+8fVfDtiIdUiAAqFU=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-toml.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-toml.json index 34eb4ffe03a1a..5a329320368a5 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-toml.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-toml.json @@ -4,6 +4,7 @@ "date": "2022-04-21T16:26:30-07:00", "path": "/nix/store/is4vnj1s94455s9msasbn7px7jjfr0ai-tree-sitter-toml", "sha256": "00pigsc947qc2p6g21iki6xy4h497arq53fp2fjgiw50bqmknrsp", + "hash": "sha256-V2c7K16g8PikE9eNgrM6iUDiu4kzBvHMFQwfkph+8QI=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tsq.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tsq.json index 6119c6e1603da..7aa30ca2812d6 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tsq.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tsq.json @@ -4,6 +4,7 @@ "date": "2021-05-18T15:57:40-04:00", "path": "/nix/store/j59y4s3bsv6d5nbmhhdgb043hmk8157k-tree-sitter-tsq", "sha256": "03bch2wp2jwxk69zjplvm0gbyw06qqdy7il9qkiafvhrbh03ayd9", + "hash": "sha256-qXk1AFwZbqfixInG4xvGBnC/HqibXvmTmZ1LcbmAbA0=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-turtle.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-turtle.json index 6430be302fbf9..6797d3fc63629 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-turtle.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-turtle.json @@ -4,6 +4,7 @@ "date": "2021-08-16T15:17:50+02:00", "path": "/nix/store/c90hph3wfyhjmri3qbfb5lpy1bl855zv-tree-sitter-turtle", "sha256": "1l5djvz90sq9w14kfcrffdigqs61r1p8v17xpj92sxz8z3ngpgmr", + "hash": "sha256-ub777Pjody2SvP2EjW7IwWj8YnMuMzdJ4AlrkP6WrdA=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json index 8749314f36e9d..f27faebc4d499 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json @@ -1,9 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-typescript", - "rev": "286e90c32060032225f636a573d0e999f7766c97", - "date": "2023-04-21T18:31:50-07:00", - "path": "/nix/store/cf6q6c3mclp70bplsdykgxbpjrnb2yh2-tree-sitter-typescript", - "sha256": "06kq9c26my2h53fv7qlmkpaia21ahbyd0lsrn9l4hric7b3ca3wn", + "rev": "b1bf4825d9eaa0f3bdeb1e52f099533328acfbdf", + "date": "2023-07-19T03:17:33-04:00", + "path": "/nix/store/c858575avx33nmi4annm51fhasv43xm9-tree-sitter-typescript", + "sha256": "1r74108lxyp8hsq0pysy0na4kgn06b4xk4yrlq77fw8jr6vs54m1", + "hash": "sha256-oZKit8kScXcOptmT2ckywL5JlAVe+wuwhuj6ThEI5OQ=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typst.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typst.json new file mode 100644 index 0000000000000..d85d551b9a88c --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typst.json @@ -0,0 +1,12 @@ +{ + "url": "https://github.com/uben0/tree-sitter-typst", + "rev": "b8f3ac3a00247b5be0da2123e6b2d79e3dca4aff", + "date": "2023-09-17T16:51:18+02:00", + "path": "/nix/store/k4sh7jiqrry4960ygjbs72qvi9amd3s8-tree-sitter-typst", + "sha256": "1qihml8jkc32ra1ijmrc1crjmqxspdq163k0hhy9rrq6sqgyh33w", + "hash": "sha256-fAzoH9YG55w8hGAOE3C7uuMqMwssVxmDymKwKRGtMOI=", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json index 563fd8b045482..d802999df25c8 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json @@ -1,9 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-verilog", - "rev": "4457145e795b363f072463e697dfe2f6973c9a52", - "date": "2022-09-07T16:11:11-07:00", - "path": "/nix/store/z29mm9c88dd2iybsy648wh4m6z593kvk-tree-sitter-verilog", - "sha256": "0lfw8p04c85xyd85jfi3gajzrzsl5xcgc44nwxa43x4g3d7f104p", + "rev": "902031343056bc0b11f3e47b33f036a9cf59f58d", + "date": "2023-07-28T00:21:49-04:00", + "path": "/nix/store/nnd12xzsd387bng3yp4zlgvsaya24r7x-tree-sitter-verilog", + "sha256": "1mrgdi0aj2bm4f2jdz93r1c3m1hiymjfhd2pc14xlz6waxpd48zg", + "hash": "sha256-7yPSblfcfNpJYFc06GT1EYY6WMgj/SaFI3UJqUBsL9c=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json index bb7f0a3c9cf4c..eec5937247b69 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json @@ -4,6 +4,7 @@ "date": "2023-05-05T08:51:55+02:00", "path": "/nix/store/dazqp112dyrxh96yizdm382fsz1rmsdj-tree-sitter-viml", "sha256": "1fsngbgpvq4mg0qfwkpdn4qqi3djg2kv4a8g49yw2i8a3d88yg7x", + "hash": "sha256-/TyPUBsKRcF9Ig8psqd4so2IMbHtTu4weJXgfd96Vrs=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vue.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vue.json index f40c0054c9481..6d71408535802 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vue.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vue.json @@ -4,6 +4,7 @@ "date": "2021-04-04T11:51:48+08:00", "path": "/nix/store/9bw35fa56xli7r2k3b3bzzlm7vkpxzcy-tree-sitter-vue", "sha256": "0l0kqy9ajm5izqcywd39aavgmc281s8qrhmjkbwl6r8arfj8vsrm", + "hash": "sha256-NeuNpMsKZUP5mrLCjJEOSLD6tlJpNO4Z/rFUqZLHE1A=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json index 1af8d46943035..15b26649a73b1 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json @@ -1,9 +1,10 @@ { "url": "https://github.com/winglang/wing", - "rev": "e578973d6f60091ba3458095edceb37bae2d04e2", - "date": "2023-06-27T12:28:26+00:00", - "path": "/nix/store/ppjabjz0dgmsr3k0wm07z7391vz7m120-wing", - "sha256": "0089rxdzxi43qal2310dpyzw1a3zl08qbm5b8md8cgwmvycija9a", + "rev": "60c61fd6b6e2e6dbea7c206653d3e360435bfee2", + "date": "2023-09-25T21:05:07+00:00", + "path": "/nix/store/rb1g46ia45yjh9bsf6d99nzgs0yf8vl9-wing", + "sha256": "0hig7ll1rph3i4fqwpcxadyjxa9d0ipscmhs33jdir2brhw93vmp", + "hash": "sha256-t+6ROMxL5NjkGBpWpm8ELakufVOdXY4diQPeHCg9L0I=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yaml.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yaml.json index 1942b47e081d4..e7e4b42987d50 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yaml.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yaml.json @@ -4,6 +4,7 @@ "date": "2021-05-11T12:47:24+08:00", "path": "/nix/store/7d7m4zs4ydnwbn3xnfm3pvpy7gvkrmg8-tree-sitter-yaml", "sha256": "0wyvjh62zdp5bhd2y8k7k7x4wz952l55i1c8d94rhffsbbf9763f", + "hash": "sha256-bpiT3FraOZhJaoiFWAoVJX1O+plnIi8aXOW2LwyU23M=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yang.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yang.json index 2eaa5f7f51b11..441acd3efcb75 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yang.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yang.json @@ -4,6 +4,7 @@ "date": "2022-11-21T21:25:21+01:00", "path": "/nix/store/ypd2cggg44l0sx0snvkgjbspkfcyscmf-tree-sitter-yang", "sha256": "1vwcsp20dhccr2ag5s09j3jz9cnlkndb2hdn0h3va7md8ka0lhp8", + "hash": "sha256-6EIK1EStHrUHBLZBsZqd1LL05ZAJ6PKUyIzBBsTVjO8=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json index b0047a63bdf60..874cb0a1368a8 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json @@ -4,6 +4,7 @@ "date": "2023-04-25T05:51:06-03:00", "path": "/nix/store/fzz8x1pa11zksamgk199fw0j7dkbsz0s-tree-sitter-zig", "sha256": "0whj44fl6hmcyap5bjqhy90rd6xnnxgsy3vn1z3mvq8d2mwbnxbb", + "hash": "sha256-a3W7eBUN4V3HD3YPr1+3tpuWQfIQy1Wu8qxCQx0hEnI=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix index 39b064cf4b39e..b2267f33c7bf1 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -143,6 +143,10 @@ let repo = "tree-sitter-sql"; branch = "gh-pages"; }; + "tree-sitter-typst" = { + orga = "uben0"; + repo = "tree-sitter-typst"; + }; "tree-sitter-vim" = { orga = "vigoux"; repo = "tree-sitter-viml"; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/known-build-systems.json b/pkgs/development/tools/poetry2nix/poetry2nix/known-build-systems.json index 10c7b9e4ca4cc..201aae3c92096 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/known-build-systems.json +++ b/pkgs/development/tools/poetry2nix/poetry2nix/known-build-systems.json @@ -4,7 +4,6 @@ "flit", "flit-core", "pbr", - "flitBuildHook", "cython", "hatchling", "hatch-vcs", diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json index 176881caeed1f..04174d1c43540 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json @@ -316,7 +316,7 @@ "setuptools" ], "aiohttp-remotes": [ - "flitBuildHook", + "flit-core", "setuptools" ], "aiohttp-retry": [ @@ -348,7 +348,7 @@ "setuptools" ], "aiojobs": [ - "flitBuildHook", + "flit-core", "setuptools" ], "aiokafka": [ @@ -428,7 +428,6 @@ ], "aioprocessing": [ "flit-core", - "flitBuildHook", "setuptools" ], "aiopulse": [ @@ -476,7 +475,7 @@ "setuptools" ], "aiorun": [ - "flitBuildHook", + "flit-core", "setuptools" ], "aiosenseme": [ @@ -920,7 +919,7 @@ "setuptools" ], "argon2-cffi": [ - "flitBuildHook", + "flit-core", "setuptools" ], "argon2-cffi-bindings": [ @@ -1143,7 +1142,7 @@ "setuptools" ], "asyncstdlib": [ - "flitBuildHook", + "flit-core", "setuptools" ], "asynctest": [ @@ -2014,7 +2013,7 @@ "setuptools" ], "bash-kernel": [ - "flitBuildHook", + "flit-core", "setuptools" ], "bashlex": [ @@ -3297,7 +3296,6 @@ ], "confuse": [ "flit-core", - "flitBuildHook", "setuptools" ], "connect-box": [ @@ -4859,7 +4857,6 @@ ], "ecs-logging": [ "flit-core", - "flitBuildHook", "setuptools" ], "ed25519": [ @@ -5162,7 +5159,7 @@ "exceptiongroup": [ "flit-core", "flit-scm", - "flitBuildHook", + "flit-core", "setuptools" ], "exchangelib": [ @@ -5293,7 +5290,7 @@ "setuptools" ], "fastapi": [ - "flitBuildHook", + "flit-core", "hatchling", "setuptools" ], @@ -5897,7 +5894,7 @@ "setuptools" ], "formbox": [ - "flitBuildHook", + "flit-core", "setuptools" ], "formencode": [ @@ -6004,7 +6001,7 @@ "setuptools" ], "furo": [ - "flitBuildHook", + "flit-core", "setuptools" ], "fuse": [ @@ -6248,7 +6245,7 @@ "setuptools" ], "gidgethub": [ - "flitBuildHook", + "flit-core", "setuptools" ], "gigalixir": [ @@ -7612,14 +7609,14 @@ "setuptools" ], "ipfshttpclient": [ - "flitBuildHook", + "flit-core", "setuptools" ], "iptools": [ "setuptools" ], "ipwhl": [ - "flitBuildHook", + "flit-core", "setuptools" ], "ipwhois": [ @@ -8068,7 +8065,6 @@ ], "jupyter-book": [ "flit-core", - "flitBuildHook", "setuptools" ], "jupyter-c-kernel": [ @@ -8755,7 +8751,7 @@ "setuptools" ], "loca": [ - "flitBuildHook", + "flit-core", "setuptools" ], "localimport": [ @@ -9166,7 +9162,6 @@ ], "mediafile": [ "flit-core", - "flitBuildHook", "setuptools" ], "mediapy": [ @@ -9536,7 +9531,6 @@ ], "more-itertools": [ "flit-core", - "flitBuildHook", "setuptools" ], "more-properties": [ @@ -9830,12 +9824,10 @@ ], "myst-nb": [ "flit-core", - "flitBuildHook", "setuptools" ], "myst-parser": [ "flit-core", - "flitBuildHook", "setuptools" ], "nad-receiver": [ @@ -10140,7 +10132,7 @@ "setuptools" ], "nkdfu": [ - "flitBuildHook", + "flit-core", "setuptools" ], "nltk": [ @@ -11239,7 +11231,6 @@ ], "pep440": [ "flit-core", - "flitBuildHook", "setuptools" ], "pep440-version-utils": [ @@ -11281,7 +11272,6 @@ ], "pex": [ "flit-core", - "flitBuildHook", "setuptools" ], "pexif": [ @@ -14144,15 +14134,15 @@ "setuptools" ], "pytest-celery": [ - "flitBuildHook", + "flit-core", "setuptools" ], "pytest-check": [ - "flitBuildHook", + "flit-core", "setuptools" ], "pytest-cid": [ - "flitBuildHook", + "flit-core", "setuptools" ], "pytest-clarity": [ @@ -14310,7 +14300,6 @@ ], "pytest-param-files": [ "flit-core", - "flitBuildHook", "setuptools" ], "pytest-profiling": [ @@ -14332,7 +14321,6 @@ ], "pytest-raisin": [ "flit-core", - "flitBuildHook", "setuptools" ], "pytest-random-order": [ @@ -16016,7 +16004,7 @@ "setuptools" ], "rsskey": [ - "flitBuildHook", + "flit-core", "setuptools" ], "rst2ansi": [ @@ -16878,7 +16866,7 @@ "setuptools" ], "solo-python": [ - "flitBuildHook", + "flit-core", "setuptools" ], "somajo": [ @@ -17012,19 +17000,17 @@ ], "sphinx-design": [ "flit-core", - "flitBuildHook", "setuptools" ], "sphinx-external-toc": [ "flit-core", - "flitBuildHook", "setuptools" ], "sphinx-fortran": [ "setuptools" ], "sphinx-inline-tabs": [ - "flitBuildHook", + "flit-core", "setuptools" ], "sphinx-jinja": [ @@ -17042,7 +17028,6 @@ ], "sphinx-mdinclude": [ "flit-core", - "flitBuildHook", "setuptools" ], "sphinx-multitoc-numbering": [ @@ -17053,7 +17038,6 @@ ], "sphinx-pytest": [ "flit-core", - "flitBuildHook", "setuptools" ], "sphinx-rtd-theme": [ @@ -17434,7 +17418,7 @@ "setuptools" ], "structlog": [ - "flitBuildHook", + "flit-core", "hatch-fancy-pypi-readme", "hatch-vcs", "hatchling", @@ -17952,7 +17936,7 @@ "setuptools" ], "threadpoolctl": [ - "flitBuildHook", + "flit-core", "setuptools" ], "threat9-test-bed": [ @@ -18023,7 +18007,6 @@ ], "tinycss2": [ "flit-core", - "flitBuildHook", "setuptools" ], "tinydb": [ @@ -18343,7 +18326,7 @@ "setuptools" ], "turnt": [ - "flitBuildHook", + "flit-core", "setuptools" ], "tusker": [ @@ -19848,7 +19831,6 @@ ], "zeversolarlocal": [ "flit-core", - "flitBuildHook", "setuptools" ], "zfec": [ diff --git a/pkgs/development/tools/prettierd/default.nix b/pkgs/development/tools/prettierd/default.nix index b3ba24db42c89..7e55e5be101a2 100644 --- a/pkgs/development/tools/prettierd/default.nix +++ b/pkgs/development/tools/prettierd/default.nix @@ -8,18 +8,18 @@ }: mkYarnPackage rec { pname = "prettierd"; - version = "0.23.4"; + version = "0.25.1"; src = fetchFromGitHub { owner = "fsouza"; repo = "prettierd"; rev = "v${version}"; - hash = "sha256-GTukjkA/53N9ICdfCJr5HAqhdL5T0pth6zAk8Fu/cis="; + hash = "sha256-aoRfZ9SJazz0ir1fyHypn3aYqK9DJOLLVPMuFcOm/20="; }; offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-32wMwkVgO5DQuROWnujVGNeCAUq1D6jJurecsD2ROOU="; + hash = "sha256-HsWsRIONRNY9akZ2LXlWcPhH6N5qCKnesaDX1gQp+NU="; }; packageJSON = ./package.json; diff --git a/pkgs/development/tools/prettierd/package.json b/pkgs/development/tools/prettierd/package.json index 8769bac80c7bb..5ba4d0980034a 100644 --- a/pkgs/development/tools/prettierd/package.json +++ b/pkgs/development/tools/prettierd/package.json @@ -1,6 +1,6 @@ { "name": "@fsouza/prettierd", - "version": "0.23.4", + "version": "0.25.1", "description": "prettier, as a daemon", "bin": { "prettierd": "./bin/prettierd" @@ -24,14 +24,13 @@ }, "homepage": "https://github.com/fsouza/prettierd", "devDependencies": { - "@types/node": "^20.2.5", - "@types/prettier": "^2.7.2", - "typescript": "^5.0.4" + "@types/node": "^20.6.3", + "@types/prettier": "^3.0.0", + "typescript": "^5.2.2" }, "dependencies": { - "core_d": "^5.0.1", - "nanolru": "^1.0.0", - "prettier": "^2.8.8" + "core_d": "^6.0.0", + "prettier": "^3.0.3" }, "files": [ "bin", @@ -40,7 +39,7 @@ "README.md" ], "optionalDependencies": { - "@babel/parser": "^7.22.3", - "@typescript-eslint/typescript-estree": "^5.59.7" + "@babel/parser": "^7.22.16", + "@typescript-eslint/typescript-estree": "^6.7.2" } } diff --git a/pkgs/development/tools/prototool/default.nix b/pkgs/development/tools/prototool/default.nix index d0f141f524047..3e7c9b0b87dbe 100644 --- a/pkgs/development/tools/prototool/default.nix +++ b/pkgs/development/tools/prototool/default.nix @@ -8,12 +8,12 @@ buildGoModule rec { owner = "uber"; repo = pname; rev = "v${version}"; - sha256 = "02ih9pqnziwl2k4z6c59w1p4bxmb3xki5y33pdfkxqn2467s792g"; + hash = "sha256-T6SjjyHC4j5du2P4Emcfq/ZFbuCpMPPJFJTHb/FNMAo="; }; - nativeBuildInputs = [ makeWrapper ]; + vendorHash = "sha256-W924cy6bd3V/ep3JmzUCV7iuYNukEetr90SKmLMH0j8="; - vendorSha256 = "0gyj0yrri2j4yxmyn4d4vdhaxf2p08srpjcxg9zpaxwv5rrvipav"; + nativeBuildInputs = [ makeWrapper ]; doCheck = false; diff --git a/pkgs/development/tools/pscale/default.nix b/pkgs/development/tools/pscale/default.nix index f0da1953ad0d1..f7dbb7360634a 100644 --- a/pkgs/development/tools/pscale/default.nix +++ b/pkgs/development/tools/pscale/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "pscale"; - version = "0.155.0"; + version = "0.156.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-ZQ4DpGCkxvF9VJJNr6Xye717MrVW2aRYAlq4oib3nV8="; + sha256 = "sha256-1VlG+0jzx6Yho0bc3RypXgOFoM+NgOQ2RX4FB5ZllSw="; }; - vendorHash = "sha256-OeXX16PsDPjQP+piMYhbnANfdBoYamA21yoMM1pWiCA="; + vendorHash = "sha256-T5UmaS7PPZdkPpFxJIqpF5pH24uFrHbrbsI5gfElUOY="; ldflags = [ "-s" "-w" diff --git a/pkgs/development/tools/pyenv/default.nix b/pkgs/development/tools/pyenv/default.nix index 4ccb71973cb15..a314b2f533be7 100644 --- a/pkgs/development/tools/pyenv/default.nix +++ b/pkgs/development/tools/pyenv/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "pyenv"; - version = "2.3.26"; + version = "2.3.28"; src = fetchFromGitHub { owner = "pyenv"; repo = "pyenv"; rev = "refs/tags/v${version}"; - hash = "sha256-3pLH8/k+9T8lDBw/qd9WcYE4o3SwG/WXGWR0sLGUWLE="; + hash = "sha256-KxYxHNoXk4RVA5+mpE3hjrl1c+7Ei/km/zrMIvvV+1M="; }; postPatch = '' diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix index 9c5ca6a16a32e..1e138fec44201 100644 --- a/pkgs/development/tools/qtcreator/default.nix +++ b/pkgs/development/tools/qtcreator/default.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { pname = "qtcreator"; - version = "11.0.2"; + version = "11.0.3"; src = fetchurl { url = "https://download.qt.io/official_releases/${pname}/${lib.versions.majorMinor version}/${version}/qt-creator-opensource-src-${version}.tar.xz"; - hash = "sha256-nemSXfzgrR5vzDevdEHhBS3d0V+XIGSTdY2DA0eaLQM="; + hash = "sha256-X1AeZOg2t+PlC5iz68NFsgE5al/ZLklzjau14mjVzxw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/quick-lint-js/default.nix b/pkgs/development/tools/quick-lint-js/default.nix index f1a4338fcca27..5cef44df99012 100644 --- a/pkgs/development/tools/quick-lint-js/default.nix +++ b/pkgs/development/tools/quick-lint-js/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "quick-lint-js"; - version = "2.15.0"; + version = "2.16.0"; src = fetchFromGitHub { owner = "quick-lint"; repo = "quick-lint-js"; rev = version; - sha256 = "sha256-jymn3xqFwAKskBivkm9s/pLkPLpX1haQhNuH18xgiYw="; + sha256 = "sha256-IfcX7DLRAsBMXitEgsEOjKtiXnX4bX03Md8/14gv3aY="; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/pkgs/development/tools/quicktemplate/default.nix b/pkgs/development/tools/quicktemplate/default.nix index 2086464d7b3ad..a339c8e289618 100644 --- a/pkgs/development/tools/quicktemplate/default.nix +++ b/pkgs/development/tools/quicktemplate/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0xzsvhpllmzmyfg8sj1dpp02826j1plmyrdvqbwryzhf2ci33nqr"; }; - vendorSha256 = null; + vendorHash = null; meta = with lib; { homepage = "https://github.com/valyala/quicktemplate"; diff --git a/pkgs/development/tools/rain/default.nix b/pkgs/development/tools/rain/default.nix index 831c191801ad6..2943d45e26ac1 100644 --- a/pkgs/development/tools/rain/default.nix +++ b/pkgs/development/tools/rain/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "rain"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "aws-cloudformation"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vvLvsZhdkxgTREEwLFdF1MwKj1A4rHgJ3y9VdKOl5HE="; + sha256 = "sha256-sAqWVGzEQJwf7ioQjOFs+1hAn69LmDCMSu0ym59aDsU="; }; vendorHash = "sha256-xmpjoNfz+4d7Un0J6yEhkQG2Ax8hL0dw4OQmwrKq3QI="; diff --git a/pkgs/development/tools/reftools/default.nix b/pkgs/development/tools/reftools/default.nix index 44c6605c1ac16..151f1accccf20 100644 --- a/pkgs/development/tools/reftools/default.nix +++ b/pkgs/development/tools/reftools/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-fHWtUoVK3G0Kn69O6/D0blM6Q/u4LuLinT6sxF18nFo="; }; - vendorSha256 = null; + vendorHash = null; doCheck = false; diff --git a/pkgs/development/tools/regclient/default.nix b/pkgs/development/tools/regclient/default.nix index 383410de8700f..81969db7771a5 100644 --- a/pkgs/development/tools/regclient/default.nix +++ b/pkgs/development/tools/regclient/default.nix @@ -4,16 +4,16 @@ let bins = [ "regbot" "regctl" "regsync" ]; in buildGoModule rec { pname = "regclient"; - version = "0.5.1"; + version = "0.5.2"; tag = "v${version}"; src = fetchFromGitHub { owner = "regclient"; repo = "regclient"; rev = tag; - sha256 = "sha256-mlwEUVMUXK2V8jzwDb51xjJElHhqioAsbq65R7rNS/Q="; + sha256 = "sha256-PC3eHTmhjNjf3ENeP3ODrR2Ynlzg4FqJL6L8cKvD67A="; }; - vendorHash = "sha256-AeC5Zv30BLkqaAPnWDrpGaJnhFoNJ9UgQaLEUmqXgb0="; + vendorHash = "sha256-OPB/xGdaq1yv4ATrKbLcqqJj84s0cYrJdmKFHZ3EkHY="; outputs = [ "out" ] ++ bins; diff --git a/pkgs/development/tools/reindeer/default.nix b/pkgs/development/tools/reindeer/default.nix index 5f024ef75408d..375a8d978d36d 100644 --- a/pkgs/development/tools/reindeer/default.nix +++ b/pkgs/development/tools/reindeer/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "reindeer"; - version = "unstable-2023-09-16"; + version = "unstable-2023-09-20"; src = fetchFromGitHub { owner = "facebookincubator"; repo = pname; - rev = "3e72020a556320180053d16425d19ffe089916a3"; - sha256 = "sha256-M3yFIcB4Zdjl+xgp40hNj5cWQhxrv8mfMC2dggNxeqY="; + rev = "d2946997e49e9358d520f008085cfbe235855c12"; + sha256 = "sha256-2agiaRAis6wVGbY3wj+T5RumGlKF9YaHByLwU100dlc="; }; - cargoSha256 = "sha256-608rF338ukoti8Xa+7p84dyG0XNXJFJkuZqNAqqGJj4="; + cargoSha256 = "sha256-rgXQYcqXckm1EL7OX/HtRfEdzTV09lM+YurcPYd/8FE="; nativeBuildInputs = [ pkg-config ]; buildInputs = diff --git a/pkgs/development/tools/renderdoc/default.nix b/pkgs/development/tools/renderdoc/default.nix index 6fed8e0389bc9..8a79722a98946 100644 --- a/pkgs/development/tools/renderdoc/default.nix +++ b/pkgs/development/tools/renderdoc/default.nix @@ -32,13 +32,13 @@ let in mkDerivation rec { pname = "renderdoc"; - version = "1.28"; + version = "1.29"; src = fetchFromGitHub { owner = "baldurk"; repo = "renderdoc"; rev = "v${version}"; - sha256 = "sha256-a8f/lbNcsWdYAmhNnTelyYX5J/XhINHRfguRFXQa3uY="; + sha256 = "sha256-ViZMAuqbXN7upyVLc4arQy2EASHeoYViMGpCwZPEWuo="; }; buildInputs = [ diff --git a/pkgs/development/tools/renderizer/default.nix b/pkgs/development/tools/renderizer/default.nix index d9987137ce650..07001487ab8c7 100644 --- a/pkgs/development/tools/renderizer/default.nix +++ b/pkgs/development/tools/renderizer/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { "-s" "-w" "-X main.version=${version}" "-X main.commitHash=${src.rev}" "-X main.date=19700101T000000" ]; - vendorSha256 = null; + vendorHash = null; meta = with lib; { description = "CLI to render Go template text files"; diff --git a/pkgs/development/tools/revive/default.nix b/pkgs/development/tools/revive/default.nix index cd2023ed0a12b..b7b0181bd12e7 100644 --- a/pkgs/development/tools/revive/default.nix +++ b/pkgs/development/tools/revive/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "revive"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromGitHub { owner = "mgechev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+ac/Sq+4Ox/R3N7cMM+QADWf9jZJwYJEOvHDdkB5X9Q="; + sha256 = "sha256-TNmxS9LoOOWHGAFrBdCKmVEWCEoIpic84L66dIFQWJg="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -18,7 +18,7 @@ buildGoModule rec { rm -rf $out/.git ''; }; - vendorHash = "sha256-00w07PgPf+4eclxx6/fY9SbmOEU8FPxIOmg/i9NBboM="; + vendorHash = "sha256-iCd4J37wJbTkKiWRD6I7qNr5grNhWZLx5ymcOOJlNKg="; ldflags = [ "-s" @@ -35,7 +35,7 @@ buildGoModule rec { # The following tests fail when built by nix: # - # $ nix log /nix/store/build-revive.1.3.3.drv | grep FAIL + # $ nix log /nix/store/build-revive.1.3.4.drv | grep FAIL # # --- FAIL: TestAll (0.01s) # --- FAIL: TestTimeEqual (0.00s) diff --git a/pkgs/development/tools/rome/default.nix b/pkgs/development/tools/rome/default.nix deleted file mode 100644 index 5d5e82942e79c..0000000000000 --- a/pkgs/development/tools/rome/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, stdenv -, darwin -, nix-update-script -}: - -rustPlatform.buildRustPackage rec { - pname = "rome"; - version = "12.1.3"; - - src = fetchFromGitHub { - owner = "rome"; - repo = "tools"; - rev = "cli/v${version}"; - hash = "sha256-BlHpdfbyx6nU44vasEw0gRZ0ickyD2eUXPfeFZHSCbI="; - }; - - cargoHash = "sha256-jHdoRymKPjBonT4TvAiTNzGBuTcNoPsvdFKEf33dpVc="; - - cargoBuildFlags = [ "--package" "rome_cli" ]; - - env = { - RUSTFLAGS = "-C strip=symbols"; - ROME_VERSION = version; - }; - - buildInputs = - lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - - nativeBuildInputs = [ pkg-config ]; - - # need to manually unset the ROME_VERSION before checkPhase otherwise some tests fail - preCheck = '' - unset ROME_VERSION; - ''; - - # these test fail - checkFlags = [ - "--skip parser::tests::uncompleted_markers_panic" - "--skip commands::check::fs_error_infinite_symlink_exapansion" - "--skip commands::check::fs_error_dereferenced_symlink" - ]; - - passthru.updateScript = nix-update-script { - extraArgs = [ "--version-regex" "cli%2Fv(.*)" ]; - }; - - meta = with lib; { - description = "A formatter, linter, bundler, and more for JavaScript, TypeScript, JSON, HTML, Markdown, and CSS"; - homepage = "https://rome.tools"; - changelog = "https://github.com/rome/tools/blob/${src.rev}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ dit7ya felschr ]; - }; -} diff --git a/pkgs/development/tools/ruff/Cargo.lock b/pkgs/development/tools/ruff/Cargo.lock index 488aaa2df9e26..c0c7795d90b2b 100644 --- a/pkgs/development/tools/ruff/Cargo.lock +++ b/pkgs/development/tools/ruff/Cargo.lock @@ -28,9 +28,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.5" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" +checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" dependencies = [ "memchr", ] @@ -272,9 +272,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.30" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defd4e7873dbddba6c7c91e199c7fcb946abc4a6a4ac3195400bcfb01b5de877" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", @@ -313,9 +313,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.3" +version = "4.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84ed82781cea27b43c9b106a979fe450a13a31aab0500595fb3fc06616de08e6" +checksum = "824956d0dca8334758a5b7f7e50518d66ea319330cbceedcf76905c2f6ab30e3" dependencies = [ "clap_builder", "clap_derive", @@ -323,9 +323,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.2" +version = "4.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08" +checksum = "122ec64120a49b4563ccaedcbea7818d069ed8e9aa6d829b82d8a4128936b2ab" dependencies = [ "anstream", "anstyle", @@ -383,7 +383,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.37", ] [[package]] @@ -516,7 +516,7 @@ dependencies = [ "clap", "criterion-plot", "is-terminal", - "itertools", + "itertools 0.10.5", "num-traits", "once_cell", "oorandom", @@ -535,7 +535,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" dependencies = [ "cast", - "itertools", + "itertools 0.10.5", ] [[package]] @@ -608,7 +608,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.33", + "syn 2.0.37", ] [[package]] @@ -619,7 +619,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core", "quote", - "syn 2.0.33", + "syn 2.0.37", ] [[package]] @@ -810,19 +810,19 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flake8-to-ruff" -version = "0.0.290" +version = "0.0.292" dependencies = [ "anyhow", "clap", "colored", "configparser", - "itertools", + "itertools 0.11.0", "log", "once_cell", "pep440_rs", "pretty_assertions", "regex", - "ruff", + "ruff_linter", "ruff_workspace", "rustc-hash", "serde", @@ -1035,9 +1035,9 @@ dependencies = [ [[package]] name = "indicatif" -version = "0.17.6" +version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b297dc40733f23a0e52728a58fa9489a5b7638a324932de16b41adc3ef80730" +checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25" dependencies = [ "console", "instant", @@ -1049,9 +1049,9 @@ dependencies = [ [[package]] name = "indoc" -version = "2.0.3" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c785eefb63ebd0e33416dfcb8d6da0bf27ce752843a45632a67bf10d4d4b5c4" +checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" [[package]] name = "inotify" @@ -1075,9 +1075,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.31.0" +version = "1.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0770b0a3d4c70567f0d58331f3088b0e4c4f56c9b8d764efe654b4a5d46de3a" +checksum = "1aa511b2e298cd49b1856746f6bb73e17036bcd66b25f5e92cdcdbec9bd75686" dependencies = [ "console", "globset", @@ -1120,7 +1120,7 @@ dependencies = [ "pmutil 0.6.1", "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.37", ] [[package]] @@ -1144,6 +1144,15 @@ dependencies = [ ] [[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + +[[package]] name = "itoa" version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1189,7 +1198,7 @@ dependencies = [ "diff", "ena", "is-terminal", - "itertools", + "itertools 0.10.5", "lalrpop-util", "petgraph", "regex", @@ -1251,8 +1260,7 @@ checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libcst" version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7773d520d4292e200ab1838f2daabe2feed7549f93b0a3c7582160a09e79ffde" +source = "git+https://github.com/Instagram/LibCST.git?rev=03179b55ebe7e916f1722e18e8f0b87c01616d1f#03179b55ebe7e916f1722e18e8f0b87c01616d1f" dependencies = [ "chic", "libcst_derive", @@ -1266,8 +1274,7 @@ dependencies = [ [[package]] name = "libcst_derive" version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520197c50ba477f258cd7005ec5ed3a7393693ae6bec664990c7c8d9306a7c0d" +source = "git+https://github.com/Instagram/LibCST.git?rev=03179b55ebe7e916f1722e18e8f0b87c01616d1f#03179b55ebe7e916f1722e18e8f0b87c01616d1f" dependencies = [ "quote", "syn 1.0.109", @@ -1328,9 +1335,9 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "memchr" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memoffset" @@ -1446,27 +1453,6 @@ dependencies = [ ] [[package]] -name = "num-bigint" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] name = "num-traits" version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1476,16 +1462,6 @@ dependencies = [ ] [[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] name = "number_prefix" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1606,9 +1582,9 @@ checksum = "9fa00462b37ead6d11a82c9d568b26682d78e0477dc02d1966c013af80969739" [[package]] name = "pep440_rs" -version = "0.3.11" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05bf2c44c4cd12f03b2c3ca095f3aa21f44e43c16021c332e511884719705be" +checksum = "887f66cc62717ea72caac4f1eb4e6f392224da3ffff3f40ec13ab427802746d6" dependencies = [ "lazy_static", "regex", @@ -1720,7 +1696,7 @@ checksum = "52a40bc70c2c58040d2d8b167ba9a5ff59fc9dab7ad44771cfde3dcfde7a09c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.37", ] [[package]] @@ -1749,7 +1725,7 @@ checksum = "09963355b9f467184c04017ced4a2ba2d75cbcb4e7462690d388233253d4b1a9" dependencies = [ "anstyle", "difflib", - "itertools", + "itertools 0.10.5", "predicates-core", ] @@ -1889,9 +1865,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -1899,14 +1875,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] @@ -2020,72 +1994,6 @@ dependencies = [ ] [[package]] -name = "ruff" -version = "0.0.290" -dependencies = [ - "annotate-snippets 0.9.1", - "anyhow", - "bitflags 2.4.0", - "chrono", - "clap", - "colored", - "fern", - "glob", - "globset", - "imperative", - "insta", - "is-macro", - "itertools", - "libcst", - "log", - "memchr", - "natord", - "num-bigint", - "num-traits", - "once_cell", - "path-absolutize", - "pathdiff", - "pep440_rs", - "pretty_assertions", - "pyproject-toml", - "quick-junit", - "regex", - "result-like", - "ruff_cache", - "ruff_diagnostics", - "ruff_index", - "ruff_macros", - "ruff_notebook", - "ruff_python_ast", - "ruff_python_codegen", - "ruff_python_index", - "ruff_python_literal", - "ruff_python_parser", - "ruff_python_semantic", - "ruff_python_stdlib", - "ruff_python_trivia", - "ruff_source_file", - "ruff_text_size", - "rustc-hash", - "schemars", - "semver", - "serde", - "serde_json", - "similar", - "smallvec", - "strum", - "strum_macros", - "tempfile", - "test-case", - "thiserror", - "toml", - "typed-arena", - "unicode-width", - "unicode_names2", - "wsl", -] - -[[package]] name = "ruff_benchmark" version = "0.0.0" dependencies = [ @@ -2093,7 +2001,7 @@ dependencies = [ "criterion", "mimalloc", "once_cell", - "ruff", + "ruff_linter", "ruff_python_ast", "ruff_python_formatter", "ruff_python_index", @@ -2112,14 +2020,15 @@ dependencies = [ "filetime", "glob", "globset", - "itertools", + "itertools 0.11.0", "regex", "ruff_macros", + "seahash", ] [[package]] name = "ruff_cli" -version = "0.0.290" +version = "0.0.292" dependencies = [ "annotate-snippets 0.9.1", "anyhow", @@ -2139,7 +2048,7 @@ dependencies = [ "insta", "insta-cmd", "is-macro", - "itertools", + "itertools 0.11.0", "itoa", "log", "mimalloc", @@ -2147,10 +2056,10 @@ dependencies = [ "path-absolutize", "rayon", "regex", - "ruff", "ruff_cache", "ruff_diagnostics", "ruff_formatter", + "ruff_linter", "ruff_macros", "ruff_notebook", "ruff_python_ast", @@ -2186,16 +2095,16 @@ dependencies = [ "imara-diff", "indicatif", "indoc", - "itertools", + "itertools 0.11.0", "libcst", "once_cell", "pretty_assertions", "rayon", "regex", - "ruff", "ruff_cli", "ruff_diagnostics", "ruff_formatter", + "ruff_linter", "ruff_notebook", "ruff_python_ast", "ruff_python_codegen", @@ -2234,6 +2143,8 @@ version = "0.0.0" dependencies = [ "drop_bomb", "insta", + "ruff_cache", + "ruff_macros", "ruff_text_size", "rustc-hash", "schemars", @@ -2252,14 +2163,79 @@ dependencies = [ ] [[package]] +name = "ruff_linter" +version = "0.0.292" +dependencies = [ + "aho-corasick", + "annotate-snippets 0.9.1", + "anyhow", + "bitflags 2.4.0", + "chrono", + "clap", + "colored", + "fern", + "glob", + "globset", + "imperative", + "insta", + "is-macro", + "itertools 0.11.0", + "libcst", + "log", + "memchr", + "natord", + "once_cell", + "path-absolutize", + "pathdiff", + "pep440_rs", + "pretty_assertions", + "pyproject-toml", + "quick-junit", + "regex", + "result-like", + "ruff_cache", + "ruff_diagnostics", + "ruff_index", + "ruff_macros", + "ruff_notebook", + "ruff_python_ast", + "ruff_python_codegen", + "ruff_python_index", + "ruff_python_literal", + "ruff_python_parser", + "ruff_python_semantic", + "ruff_python_stdlib", + "ruff_python_trivia", + "ruff_source_file", + "ruff_text_size", + "rustc-hash", + "schemars", + "semver", + "serde", + "serde_json", + "similar", + "smallvec", + "strum", + "strum_macros", + "tempfile", + "test-case", + "thiserror", + "toml", + "typed-arena", + "unicode-width", + "unicode_names2", + "wsl", +] + +[[package]] name = "ruff_macros" version = "0.0.0" dependencies = [ - "itertools", + "itertools 0.11.0", "proc-macro2", "quote", "ruff_python_trivia", - "syn 2.0.33", + "syn 2.0.37", ] [[package]] @@ -2268,7 +2244,7 @@ version = "0.0.0" dependencies = [ "anyhow", "insta", - "itertools", + "itertools 0.11.0", "once_cell", "ruff_diagnostics", "ruff_source_file", @@ -2288,10 +2264,8 @@ dependencies = [ "bitflags 2.4.0", "insta", "is-macro", - "itertools", + "itertools 0.11.0", "memchr", - "num-bigint", - "num-traits", "once_cell", "ruff_python_parser", "ruff_python_trivia", @@ -2323,10 +2297,12 @@ dependencies = [ "clap", "countme", "insta", - "itertools", + "itertools 0.11.0", "memchr", "once_cell", + "ruff_cache", "ruff_formatter", + "ruff_macros", "ruff_python_ast", "ruff_python_index", "ruff_python_parser", @@ -2334,6 +2310,7 @@ dependencies = [ "ruff_source_file", "ruff_text_size", "rustc-hash", + "schemars", "serde", "serde_json", "similar", @@ -2348,7 +2325,7 @@ dependencies = [ name = "ruff_python_index" version = "0.0.0" dependencies = [ - "itertools", + "itertools 0.11.0", "ruff_python_ast", "ruff_python_parser", "ruff_python_trivia", @@ -2363,9 +2340,8 @@ dependencies = [ "bitflags 2.4.0", "hexf-parse", "is-macro", - "itertools", + "itertools 0.11.0", "lexical-parse-float", - "num-traits", "rand", "unic-ucd-category", ] @@ -2375,13 +2351,12 @@ name = "ruff_python_parser" version = "0.0.0" dependencies = [ "anyhow", + "bitflags 2.4.0", "insta", "is-macro", - "itertools", + "itertools 0.11.0", "lalrpop", "lalrpop-util", - "num-bigint", - "num-traits", "ruff_python_ast", "ruff_text_size", "rustc-hash", @@ -2407,7 +2382,6 @@ version = "0.0.0" dependencies = [ "bitflags 2.4.0", "is-macro", - "num-traits", "ruff_index", "ruff_python_ast", "ruff_python_parser", @@ -2430,12 +2404,11 @@ name = "ruff_python_trivia" version = "0.0.0" dependencies = [ "insta", - "memchr", + "itertools 0.11.0", "ruff_python_ast", "ruff_python_parser", "ruff_source_file", "ruff_text_size", - "smallvec", "unicode-ident", ] @@ -2484,14 +2457,15 @@ dependencies = [ "console_log", "js-sys", "log", - "ruff", "ruff_diagnostics", "ruff_formatter", + "ruff_linter", "ruff_python_ast", "ruff_python_codegen", "ruff_python_formatter", "ruff_python_index", "ruff_python_parser", + "ruff_python_trivia", "ruff_source_file", "ruff_text_size", "ruff_workspace", @@ -2511,14 +2485,19 @@ dependencies = [ "glob", "globset", "ignore", - "itertools", + "itertools 0.11.0", "log", + "once_cell", "path-absolutize", "pep440_rs", "regex", - "ruff", "ruff_cache", + "ruff_formatter", + "ruff_linter", "ruff_macros", + "ruff_python_ast", + "ruff_python_formatter", + "ruff_source_file", "rustc-hash", "schemars", "serde", @@ -2565,22 +2544,12 @@ checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", "ring", - "rustls-webpki 0.101.4", + "rustls-webpki", "sct", ] [[package]] name = "rustls-webpki" -version = "0.100.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e98ff011474fa39949b7e5c0428f9b4937eda7da7848bbb947786b7be0b27dab" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "rustls-webpki" version = "0.101.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" @@ -2612,9 +2581,9 @@ dependencies = [ [[package]] name = "schemars" -version = "0.8.13" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "763f8cd0d4c71ed8389c90cb8100cba87e763bd01a8e614d4f0af97bcd50a161" +checksum = "1f7b0ce13155372a76ee2e1c5ffba1fe61ede73fbea5630d61eee6fac4929c0c" dependencies = [ "dyn-clone", "schemars_derive", @@ -2624,9 +2593,9 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.13" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0f696e21e10fa546b7ffb1c9672c6de8fbc7a81acf59524386d8639bf12737" +checksum = "e85e2a16b12bdb763244c69ab79363d71db2b4b918a2def53f80b02e0574b13c" dependencies = [ "proc-macro2", "quote", @@ -2657,10 +2626,16 @@ dependencies = [ ] [[package]] +name = "seahash" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" + +[[package]] name = "semver" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "ad977052201c6de01a8ef2aa3378c4bd23217a056337d1d6da40468d267a4fb0" [[package]] name = "serde" @@ -2690,7 +2665,7 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.37", ] [[package]] @@ -2706,9 +2681,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.106" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cc66a619ed80bf7a0f6b17dd063a84b88f6dea1813737cf469aef1d081142c2" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ "itoa", "ryu", @@ -2752,7 +2727,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.37", ] [[package]] @@ -2793,9 +2768,9 @@ checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] name = "smallvec" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" [[package]] name = "spin" @@ -2847,7 +2822,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.33", + "syn 2.0.37", ] [[package]] @@ -2863,9 +2838,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.33" +version = "2.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9caece70c63bfba29ec2fed841a09851b14a235c60010fa4de58089b6c025668" +checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" dependencies = [ "proc-macro2", "quote", @@ -2935,57 +2910,57 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "test-case" -version = "3.1.0" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a1d6e7bde536b0412f20765b76e921028059adfd1b90d8974d33fd3c91b25df" +checksum = "c8f1e820b7f1d95a0cdbf97a5df9de10e1be731983ab943e56703ac1b8e9d425" dependencies = [ "test-case-macros", ] [[package]] name = "test-case-core" -version = "3.1.0" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d10394d5d1e27794f772b6fc854c7e91a2dc26e2cbf807ad523370c2a59c0cee" +checksum = "54c25e2cb8f5fcd7318157634e8838aa6f7e4715c96637f969fabaccd1ef5462" dependencies = [ "cfg-if", "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.37", ] [[package]] name = "test-case-macros" -version = "3.1.0" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeb9a44b1c6a54c1ba58b152797739dba2a83ca74e18168a68c980eb142f9404" +checksum = "37cfd7bbc88a0104e304229fba519bdc45501a30b760fb72240342f1289ad257" dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.37", "test-case-core", ] [[package]] name = "thiserror" -version = "1.0.48" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" +checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.48" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" +checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.37", ] [[package]] @@ -3107,7 +3082,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.37", ] [[package]] @@ -3217,9 +3192,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" @@ -3232,9 +3207,9 @@ dependencies = [ [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "unicode-xid" @@ -3258,16 +3233,16 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "ureq" -version = "2.7.1" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b11c96ac7ee530603dcdf68ed1557050f374ce55a5a07193ebf8cbc9f8927e9" +checksum = "f5ccd538d4a604753ebc2f17cd9946e89b77bf87f6a8e2309667c6f2e87855e3" dependencies = [ "base64", "flate2", "log", "once_cell", "rustls", - "rustls-webpki 0.100.2", + "rustls-webpki", "url", "webpki-roots", ] @@ -3310,7 +3285,7 @@ checksum = "f7e1ba1f333bd65ce3c9f27de592fcbc256dafe3af2717f56d7c87761fbaccf4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.37", ] [[package]] @@ -3404,7 +3379,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.37", "wasm-bindgen-shared", ] @@ -3438,7 +3413,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.37", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3485,12 +3460,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.23.1" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" -dependencies = [ - "rustls-webpki 0.100.2", -] +checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" [[package]] name = "which" @@ -3505,9 +3477,9 @@ dependencies = [ [[package]] name = "wild" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b116685a6be0c52f5a103334cbff26db643826c7b3735fc0a3ba9871310a74" +checksum = "10d01931a94d5a115a53f95292f51d316856b68a035618eb831bbba593a30b67" dependencies = [ "glob", ] diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 2c4c9eaba42db..b7c5ab87a6443 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -10,18 +10,19 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.290"; + version = "0.0.292"; src = fetchFromGitHub { owner = "astral-sh"; repo = pname; rev = "v${version}"; - hash = "sha256-w2RqT0n++ggeNoEcrZSAF0056ctDBKGkV+GAscQcwOc="; + hash = "sha256-4D7p5ZMdyemDBaWcCO62bhuPPcIypegqP0YZeX+GJRQ="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { + "libcst-0.1.0" = "sha256-f4lR1vf0iL6WS7yXUzWUt/tax+xjU6rylG1EgeLex88="; "unicode_names2-0.6.0" = "sha256-eWg9+ISm/vztB0KIdjhq5il2ZnwGJQCleCYfznCI3Wg="; }; }; diff --git a/pkgs/development/tools/rust/cargo-audit/default.nix b/pkgs/development/tools/rust/cargo-audit/default.nix index 0de93c3da525e..6c085ad23fd1c 100644 --- a/pkgs/development/tools/rust/cargo-audit/default.nix +++ b/pkgs/development/tools/rust/cargo-audit/default.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-audit"; - version = "0.18.1"; + version = "0.18.2"; src = fetchCrate { inherit pname version; - hash = "sha256-XK2SsyT4CyDjCF56v/g7tX5SZKC3krBQNs/ddeFu35A="; + hash = "sha256-mBY4M0phjwWS2qWTlVSjLpD0lzMDutMRMbAerbMSXmI="; }; - cargoHash = "sha256-1Uifk1W7NCmHAbUl83GpMUBD6WWUl1J/HjtGv4dEuiA="; + cargoHash = "sha256-bBcyJxlb18Bf76GOR6anTNQYqRpYs3dkGVy9rC5au5k="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/rust/cargo-binstall/default.nix b/pkgs/development/tools/rust/cargo-binstall/default.nix index c7d450fb390a3..177029648f128 100644 --- a/pkgs/development/tools/rust/cargo-binstall/default.nix +++ b/pkgs/development/tools/rust/cargo-binstall/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-binstall"; - version = "1.3.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "cargo-bins"; repo = "cargo-binstall"; rev = "v${version}"; - hash = "sha256-BuJpxsB7tF/MSF8g17cHOyHIwbd2JmlQYe1uG9qJGt8="; + hash = "sha256-x+fjngKdSS3ujWs2FbdcRSLi99wEuhi3f7uf7wEAvY8="; }; - cargoHash = "sha256-H+svFw/JEYB8fbmX/5WWGb7qQnm1WBNCuqgJZYDWD00="; + cargoHash = "sha256-p/O8v08GjccJGMTvSdAFgOZAMG9jjXmvlJykzyne84w="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/rust/cargo-careful/default.nix b/pkgs/development/tools/rust/cargo-careful/default.nix index d64aeb320d971..9d4aa2d956004 100644 --- a/pkgs/development/tools/rust/cargo-careful/default.nix +++ b/pkgs/development/tools/rust/cargo-careful/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-careful"; - version = "0.3.4"; + version = "0.4.0"; src = fetchFromGitHub { owner = "RalfJung"; repo = "cargo-careful"; rev = "v${version}"; - hash = "sha256-BW1Q54DlEAle4iVUXvKdz5PRhdWe736K7yo/KRKAUys="; + hash = "sha256-5FteKVlEx5NSj3lzRRj3qerkyK+UdJfTWtG6xEzI4t4="; }; - cargoHash = "sha256-r5dCJT0tDo+IlDpVV90eGswIKLEWuSCogiS9Qvch2tA="; + cargoHash = "sha256-gs8o+tWvC4cgIITpfvJqfTquyYaEbvNMeZEJKFzd83I="; meta = with lib; { description = "A tool to execute Rust code carefully, with extra checking along the way"; diff --git a/pkgs/development/tools/rust/cargo-component/Cargo.lock b/pkgs/development/tools/rust/cargo-component/Cargo.lock index 6a68dfb2e61c5..a85663a817525 100644 --- a/pkgs/development/tools/rust/cargo-component/Cargo.lock +++ b/pkgs/development/tools/rust/cargo-component/Cargo.lock @@ -31,9 +31,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.5" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" +checksum = "0f2135563fb5c609d2b2b87c1e8ce7bc41b0b45430fa9661f457981503dd5bf0" dependencies = [ "memchr", ] @@ -69,9 +69,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" +checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46" [[package]] name = "anstyle-parse" @@ -218,13 +218,13 @@ dependencies = [ [[package]] name = "async-recursion" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" +checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.37", ] [[package]] @@ -241,7 +241,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.37", ] [[package]] @@ -316,7 +316,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.37", ] [[package]] @@ -348,9 +348,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.3" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" [[package]] name = "base64ct" @@ -429,9 +429,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "byteorder" @@ -441,9 +441,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "camino" @@ -480,14 +480,14 @@ dependencies = [ "serde_json", "tokio", "tokio-util", - "toml_edit", + "toml_edit 0.20.0", "url", "warg-client", "warg-crypto", "warg-protocol", "warg-server", "wasm-metadata", - "wasmparser 0.112.0", + "wasmparser 0.113.1", "wat", "wit-bindgen-rust-lib", "wit-component", @@ -517,7 +517,7 @@ dependencies = [ "semver", "serde", "tokio", - "toml_edit", + "toml_edit 0.20.0", "unicode-width", "url", "warg-client", @@ -535,7 +535,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.37", "wit-bindgen-core", "wit-bindgen-rust", "wit-bindgen-rust-lib", @@ -553,9 +553,9 @@ dependencies = [ [[package]] name = "cargo_metadata" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7daec1a2a2129eeba1644b220b4647ec537b0b5d4bfd6876fcc5a540056b592" +checksum = "fb9ac64500cc83ce4b9f8dafa78186aa008c8dea77a09b94cd307fd0cd5022a8" dependencies = [ "camino", "cargo-platform", @@ -582,9 +582,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.27" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f56b4c72906975ca04becb8a30e102dfecddd0c06181e3e95ddc444be28881f8" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", @@ -604,20 +604,19 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.1" +version = "4.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c8d502cbaec4595d2e7d5f61e318f05417bd2b66fdc3809498f0d3fdf0bea27" +checksum = "b1d7b8d5ec32af0fadc644bf1fd509a688c2103b185644bb1e29d164e0703136" dependencies = [ "clap_builder", "clap_derive", - "once_cell", ] [[package]] name = "clap_builder" -version = "4.4.1" +version = "4.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5891c7bc0edb3e1c2204fc5e94009affabeb1821c9e5fdc3959536c5c0bb984d" +checksum = "5179bb514e4d7c2051749d8fcefa2ed6d06a9f4e6d69faf3805f5d80b8cf8d56" dependencies = [ "anstream", "anstyle", @@ -627,14 +626,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9fd1a5729c4548118d7d70ff234a44868d00489a4b6597b0b020918a0e91a1a" +checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.37", ] [[package]] @@ -700,9 +699,9 @@ dependencies = [ [[package]] name = "crypto-bigint" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4c2f4e1afd912bc40bfd6fed5d9dc1f288e0ba01bfcc835cc5bc3eb13efe15" +checksum = "740fe28e594155f10cfc383984cbefd529d7396050557148f79cb0f621204124" dependencies = [ "generic-array", "rand_core", @@ -741,7 +740,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.29", + "syn 2.0.37", ] [[package]] @@ -752,7 +751,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core", "quote", - "syn 2.0.29", + "syn 2.0.37", ] [[package]] @@ -882,9 +881,9 @@ dependencies = [ [[package]] name = "enumflags2" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c041f5090df68b32bcd905365fd51769c8b9d553fe87fde0b683534f10c01bd2" +checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" dependencies = [ "enumflags2_derive", "serde", @@ -892,13 +891,13 @@ dependencies = [ [[package]] name = "enumflags2_derive" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" +checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.37", ] [[package]] @@ -1088,7 +1087,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.37", ] [[package]] @@ -1193,12 +1192,11 @@ checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" [[package]] name = "headers" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" +checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" dependencies = [ - "base64 0.13.1", - "bitflags 1.3.2", + "base64 0.21.4", "bytes", "headers-core", "http", @@ -1256,6 +1254,15 @@ dependencies = [ ] [[package]] +name = "home" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +dependencies = [ + "windows-sys", +] + +[[package]] name = "http" version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1438,7 +1445,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi", - "rustix 0.38.10", + "rustix 0.38.13", "windows-sys", ] @@ -1503,9 +1510,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.147" +version = "0.2.148" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" [[package]] name = "linux-keyutils" @@ -1525,9 +1532,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.5" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" +checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" [[package]] name = "lock_api" @@ -1565,7 +1572,7 @@ dependencies = [ "proc-macro2", "quote", "regex-syntax 0.6.29", - "syn 2.0.29", + "syn 2.0.37", ] [[package]] @@ -1585,9 +1592,9 @@ checksum = "ed1202b2a6f884ae56f04cff409ab315c5ce26b5e58d7412e484f01fd52f52ef" [[package]] name = "memchr" -version = "2.6.2" +version = "2.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5486aed0026218e61b8a01d5fbd5a0a134649abb71a0e53b7bc088529dced86e" +checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" [[package]] name = "memoffset" @@ -1618,7 +1625,7 @@ checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.37", ] [[package]] @@ -1806,9 +1813,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "memchr", ] @@ -1848,7 +1855,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.37", ] [[package]] @@ -1859,9 +1866,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.92" +version = "0.9.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db7e971c2c2bba161b2d2fdf37080177eff520b3bc044787c7f1f5f9e78d869b" +checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" dependencies = [ "cc", "libc", @@ -2029,7 +2036,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.37", ] [[package]] @@ -2084,14 +2091,14 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "predicates" -version = "3.0.3" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09963355b9f467184c04017ced4a2ba2d75cbcb4e7462690d388233253d4b1a9" +checksum = "6dfc28575c2e3f19cb3c73b93af36460ae898d426eba6fc15b9bd2a5220758a0" dependencies = [ "anstyle", "difflib", "float-cmp", - "itertools 0.10.5", + "itertools 0.11.0", "normalize-line-endings", "predicates-core", "regex", @@ -2149,14 +2156,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit", + "toml_edit 0.19.15", ] [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" dependencies = [ "unicode-ident", ] @@ -2336,9 +2343,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.4" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" +checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" dependencies = [ "aho-corasick", "memchr", @@ -2348,9 +2355,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" +checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" dependencies = [ "aho-corasick", "memchr", @@ -2375,7 +2382,7 @@ version = "0.11.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" dependencies = [ - "base64 0.21.3", + "base64 0.21.4", "bytes", "encoding_rs", "futures-core", @@ -2461,14 +2468,14 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.10" +version = "0.38.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6248e1caa625eb708e266e06159f135e8c26f2bb7ceb72dc4b2766d0340964" +checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662" dependencies = [ "bitflags 2.4.0", "errno", "libc", - "linux-raw-sys 0.4.5", + "linux-raw-sys 0.4.7", "windows-sys", ] @@ -2599,14 +2606,14 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.37", ] [[package]] name = "serde_json" -version = "1.0.105" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ "itoa", "ryu", @@ -2631,7 +2638,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.37", ] [[package]] @@ -2661,7 +2668,7 @@ version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ca3b16a3d82c4088f343b7480a93550b3eabe1a358569c2dfe38bbcead07237" dependencies = [ - "base64 0.21.3", + "base64 0.21.4", "chrono", "hex", "indexmap 1.9.3", @@ -2681,7 +2688,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.37", ] [[package]] @@ -2771,9 +2778,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" dependencies = [ "libc", "windows-sys", @@ -2829,9 +2836,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.29" +version = "2.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" +checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" dependencies = [ "proc-macro2", "quote", @@ -2853,7 +2860,7 @@ dependencies = [ "cfg-if", "fastrand 2.0.0", "redox_syscall 0.3.5", - "rustix 0.38.10", + "rustix 0.38.13", "windows-sys", ] @@ -2874,22 +2881,22 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "thiserror" -version = "1.0.47" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" +checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.47" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" +checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.37", ] [[package]] @@ -2959,7 +2966,7 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.3", + "socket2 0.5.4", "tokio-macros", "windows-sys", ] @@ -2972,7 +2979,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.37", ] [[package]] @@ -3001,14 +3008,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.6" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.19.15", ] [[package]] @@ -3022,9 +3029,22 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.14" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap 2.0.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ff63e60a958cefbb518ae1fd6566af80d9d4be430a33f3723dfc47d1d411d95" dependencies = [ "indexmap 2.0.0", "serde", @@ -3051,9 +3071,9 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ae70283aba8d2a8b411c695c437fe25b8b5e44e23e780662002fc72fb47a82" +checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" dependencies = [ "bitflags 2.4.0", "bytes", @@ -3107,7 +3127,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.37", ] [[package]] @@ -3153,9 +3173,9 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "uds_windows" @@ -3184,9 +3204,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" @@ -3268,9 +3288,9 @@ checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" [[package]] name = "walkdir" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", "winapi-util", @@ -3337,7 +3357,7 @@ version = "0.1.0" source = "git+https://github.com/bytecodealliance/registry#028c5520e1bceb74db7c2a79b42e1e0624813294" dependencies = [ "anyhow", - "base64 0.21.3", + "base64 0.21.4", "digest", "hex", "leb128", @@ -3375,7 +3395,7 @@ version = "0.1.0" source = "git+https://github.com/bytecodealliance/registry#028c5520e1bceb74db7c2a79b42e1e0624813294" dependencies = [ "anyhow", - "base64 0.21.3", + "base64 0.21.4", "hex", "indexmap 2.0.0", "pbjson-types", @@ -3460,7 +3480,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.37", "wasm-bindgen-shared", ] @@ -3494,7 +3514,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.37", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3507,18 +3527,18 @@ checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "wasm-encoder" -version = "0.32.0" +version = "0.33.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba64e81215916eaeb48fee292f29401d69235d62d8b8fd92a7b2844ec5ae5f7" +checksum = "b39de0723a53d3c8f54bed106cfbc0d06b3e4d945c5c5022115a61e3b29183ae" dependencies = [ "leb128", ] [[package]] name = "wasm-metadata" -version = "0.10.3" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08dc59d1fa569150851542143ca79438ca56845ccb31696c70225c638e063471" +checksum = "9fab01638cbecc57afec7b53ce0e28620b44d7ae1dea53120c96dd08486c07ce" dependencies = [ "anyhow", "indexmap 2.0.0", @@ -3526,7 +3546,7 @@ dependencies = [ "serde_json", "spdx", "wasm-encoder", - "wasmparser 0.112.0", + "wasmparser 0.113.1", ] [[package]] @@ -3554,9 +3574,9 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.112.0" +version = "0.113.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e986b010f47fcce49cf8ea5d5f9e5d2737832f12b53ae8ae785bbe895d0877bf" +checksum = "a128cea7b8516703ab41b10a0b1aa9ba18d0454cd3792341489947ddeee268db" dependencies = [ "indexmap 2.0.0", "semver", @@ -3564,9 +3584,9 @@ dependencies = [ [[package]] name = "wast" -version = "64.0.0" +version = "65.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a259b226fd6910225aa7baeba82f9d9933b6d00f2ce1b49b80fa4214328237cc" +checksum = "5fd8c1cbadf94a0b0d1071c581d3cfea1b7ed5192c79808dd15406e508dd0afb" dependencies = [ "leb128", "memchr", @@ -3576,9 +3596,9 @@ dependencies = [ [[package]] name = "wat" -version = "1.0.71" +version = "1.0.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53253d920ab413fca1c7dc2161d601c79b4fdf631d0ba51dd4343bf9b556c3f6" +checksum = "3209e35eeaf483714f4c6be93f4a03e69aad5f304e3fa66afa7cb90fe1c8051f" dependencies = [ "wast", ] @@ -3595,13 +3615,14 @@ dependencies = [ [[package]] name = "which" -version = "4.4.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" dependencies = [ "either", - "libc", + "home", "once_cell", + "rustix 0.38.13", ] [[package]] @@ -3750,23 +3771,23 @@ dependencies = [ "serde", "tokio", "tokio-util", - "toml_edit", + "toml_edit 0.20.0", "url", "warg-client", "warg-crypto", "warg-protocol", "warg-server", "wasm-metadata", - "wasmparser 0.112.0", + "wasmparser 0.113.1", "wit-component", "wit-parser", ] [[package]] name = "wit-bindgen" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8a3e8e965dc50e6eb4410d9a11720719fadc6a1713803ea5f3be390b81c8279" +checksum = "b4f7c5d6f59ae013fc4c013c76eab667844a46e86b51987acb71b1e32953211a" dependencies = [ "bitflags 2.4.0", "wit-bindgen-rust-macro", @@ -3774,9 +3795,9 @@ dependencies = [ [[package]] name = "wit-bindgen-core" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77255512565dfbd0b61de466e854918041d1da53c7bc049d6188c6e02643dc1e" +checksum = "7f0371c47784e7559efb422f74473e395b49f7101725584e2673657e0b4fc104" dependencies = [ "anyhow", "wit-component", @@ -3785,9 +3806,9 @@ dependencies = [ [[package]] name = "wit-bindgen-rust" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "399c60e6ea8598d1380e792f13d557007834f0fb799fea6503408cbc5debb4ae" +checksum = "eeab5a09a85b1641690922ce05d79d868a2f2e78e9415a5302f58b9846fab8f1" dependencies = [ "anyhow", "heck", @@ -3799,9 +3820,9 @@ dependencies = [ [[package]] name = "wit-bindgen-rust-lib" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd9fb7a43c7dc28b0b727d6ae01bf369981229b7539e768fba2b7a4df13feeeb" +checksum = "a13c89c9c1a93e164318745841026f63f889376f38664f86a7f678930280e728" dependencies = [ "heck", "wit-bindgen-core", @@ -3809,13 +3830,13 @@ dependencies = [ [[package]] name = "wit-bindgen-rust-macro" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44cea5ed784da06da0e55836a6c160e7502dbe28771c2368a595e8606243bf22" +checksum = "a70c97e09751a9a95a592bd8ef84e953e5cdce6ebbfdb35ceefa5cc511da3b71" dependencies = [ "anyhow", "proc-macro2", - "syn 2.0.29", + "syn 2.0.37", "wit-bindgen-core", "wit-bindgen-rust", "wit-bindgen-rust-lib", @@ -3824,9 +3845,9 @@ dependencies = [ [[package]] name = "wit-component" -version = "0.14.0" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66d9f2d16dd55d1a372dcfd4b7a466ea876682a5a3cb97e71ec9eef04affa876" +checksum = "af872ef43ecb73cc49c7bd2dd19ef9117168e183c78cf70000dca0e14b6a5473" dependencies = [ "anyhow", "bitflags 2.4.0", @@ -3836,15 +3857,15 @@ dependencies = [ "serde_json", "wasm-encoder", "wasm-metadata", - "wasmparser 0.112.0", + "wasmparser 0.113.1", "wit-parser", ] [[package]] name = "wit-parser" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e8b849bea13cc2315426b16efe6eb6813466d78f5fde69b0bb150c9c40e0dc" +checksum = "1dcd022610436a1873e60bfdd9b407763f2404adf7d1cb57912c7ae4059e57a5" dependencies = [ "anyhow", "id-arena", @@ -3852,6 +3873,8 @@ dependencies = [ "log", "pulldown-cmark", "semver", + "serde", + "serde_json", "unicode-xid", "url", ] diff --git a/pkgs/development/tools/rust/cargo-component/default.nix b/pkgs/development/tools/rust/cargo-component/default.nix index d3469cc740f9f..d1a1b4a49f082 100644 --- a/pkgs/development/tools/rust/cargo-component/default.nix +++ b/pkgs/development/tools/rust/cargo-component/default.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage { pname = "cargo-component"; - version = "unstable-2023-09-06"; + version = "unstable-2023-09-20"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "cargo-component"; - rev = "aa6e3c1168273b5cf6221fa0206f07f2ffb8567d"; - hash = "sha256-80076K+KfvFxyUxneEGAs8U7b+DoJLgUioIOTv+PWtI="; + rev = "9bfbdeabee2e91894059c1f061f0c18931428823"; + hash = "sha256-ZLhW2aIpibU4YX5f40BqQ0tKENY4row+FIl3d/hi3dY="; }; cargoLock = { diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix index 0221509d93cc6..915ae7a148c2b 100644 --- a/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/pkgs/development/tools/rust/cargo-deny/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deny"; - version = "0.14.2"; + version = "0.14.3"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-deny"; rev = version; - hash = "sha256-IA5LaagNsAkSP7ut5iqUUI8DJMr7U+nwqVsCWR8mOnY="; + hash = "sha256-syBf90xPcwp86xJDHtLMZXCsqh4P0mcaAcNnvjYudn8="; }; - cargoHash = "sha256-xiVZNBIdnRorMZDabpfE6Pans3Nh56VA29fYRu7N5cE="; + cargoHash = "sha256-YmHHuFubac0j0ptFGOr7GI1PYR4KhShrEwdqikG4RlQ="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/rust/cargo-dist/default.nix b/pkgs/development/tools/rust/cargo-dist/default.nix index 47e62a2c366b3..22466ca34bdcd 100644 --- a/pkgs/development/tools/rust/cargo-dist/default.nix +++ b/pkgs/development/tools/rust/cargo-dist/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-dist"; - version = "0.2.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "axodotdev"; repo = "cargo-dist"; rev = "v${version}"; - hash = "sha256-uHkmwmEVV3+VPvp5WIc+PbwYvhYZHStiMun1yguPelw="; + hash = "sha256-h3ga4H9gIS3H6krPqXyYHMIhlxFQPbEfZV8cpQWWhpw="; }; - cargoHash = "sha256-8bgb8CCkoqECyd9CW2OkPQmhqfiIOuelsXhOcm1d9kQ="; + cargoHash = "sha256-RP4/bcKA+5tjBFkR6DGNUPLpi/1fZAsRZeLMRSg1aes="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix index c806fa2170c23..248fa29f8db32 100644 --- a/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/pkgs/development/tools/rust/cargo-expand/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "1.0.70"; + version = "1.0.72"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "sha256-Fnxe53YOoCiW9hIPU7dWpJoA/PnfnvRPkHiWM+4yMu8="; + sha256 = "sha256-W9mrqF5zQWvCEsgm3fNPG0p/ZHgL1agTAfYW1t9tajo="; }; - cargoHash = "sha256-zbn3pfU8r3p3Czetjg2ueItaMtYyPhksNIe7EdxJdLU="; + cargoHash = "sha256-4gV69Ld60hBErfVXgrKfoeI6QrnYrg6w5hHqRufUlG8="; meta = with lib; { description = "A utility and Cargo subcommand designed to let people expand macros in their Rust source code"; diff --git a/pkgs/development/tools/rust/cargo-insta/default.nix b/pkgs/development/tools/rust/cargo-insta/default.nix index 5db787197a1d6..18842a94a9976 100644 --- a/pkgs/development/tools/rust/cargo-insta/default.nix +++ b/pkgs/development/tools/rust/cargo-insta/default.nix @@ -5,24 +5,24 @@ rustPlatform.buildRustPackage rec { pname = "cargo-insta"; - version = "1.31.0"; + version = "1.32.0"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "insta"; rev = "refs/tags/${version}"; - hash = "sha256-hQaVUBw8X60DW1Ox4GzO+OCWMHmVYuCkjH5x/sMULiE="; + hash = "sha256-s6d0q4K2UTG+BWzvH5KOAllzYAkEapEuDoiI9KQW31I="; }; sourceRoot = "${src.name}/cargo-insta"; - cargoHash = "sha256-q6Ups4SDGjT5Zc9ujhRpRdh3uWq99lizgA7gpPVSl+A="; + cargoHash = "sha256-ZQUzoKE3OGaY22VYiku7GqjGN9jUNx09a0EcgCRzzcM="; meta = with lib; { description = "A Cargo subcommand for snapshot testing"; homepage = "https://github.com/mitsuhiko/insta"; changelog = "https://github.com/mitsuhiko/insta/blob/${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with lib.maintainers; [ figsoda oxalica matthiasbeyer ]; + maintainers = with maintainers; [ figsoda oxalica matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix index 24e8f458b60b7..f591540785cd8 100644 --- a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix +++ b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix @@ -25,7 +25,7 @@ let pname = "cargo-llvm-cov"; - version = "0.5.31"; + version = "0.5.33"; owner = "taiki-e"; homepage = "https://github.com/${owner}/${pname}"; @@ -36,7 +36,7 @@ let cargoLock = fetchurl { name = "Cargo.lock"; url = "https://crates.io/api/v1/crates/${pname}/${version}/download"; - sha256 = "sha256-BbrdyJgZSIz6GaTdQv1GiFHufRBSbcoHcqqEmr/HvAM="; + sha256 = "sha256-FDr1Yx2k9yTqnQbtkT8h8DErPe54/lswfbzZKM0Knpk="; downloadToTemp = true; postFetch = '' tar xzf $downloadedFile ${pname}-${version}/Cargo.lock @@ -54,7 +54,7 @@ rustPlatform.buildRustPackage { inherit owner; repo = pname; rev = "v${version}"; - sha256 = "sha256-wRo94JVn4InkhrMHFSsEvm2FFIxUsltA57sMMOcL8b0="; + sha256 = "sha256-nlrQIzQc63XdUqWiHFXqjwzzNhgpEba7Rw4VE1d0yBU="; }; # Upstream doesn't include the lockfile so we need to add it back @@ -62,7 +62,7 @@ rustPlatform.buildRustPackage { cp ${cargoLock} source/Cargo.lock ''; - cargoSha256 = "sha256-XcsognndhHenYnlJCNMbrNh+S8FX7qxXUjuV1j2qsmY="; + cargoSha256 = "sha256-etMpCnbdSzaZnlzGlVnTL84VxInYFpuA4xrt8qNqbsQ="; # `cargo-llvm-cov` reads these environment variables to find these binaries, # which are needed to run the tests diff --git a/pkgs/development/tools/rust/cargo-llvm-lines/default.nix b/pkgs/development/tools/rust/cargo-llvm-lines/default.nix index 4ef31f87c893f..4a0be763b9e68 100644 --- a/pkgs/development/tools/rust/cargo-llvm-lines/default.nix +++ b/pkgs/development/tools/rust/cargo-llvm-lines/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-llvm-lines"; - version = "0.4.33"; + version = "0.4.35"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - hash = "sha256-EgUnVnSELdiRU63saQ0o2IE4vs6tcQ/AfE4aMyegJBk="; + hash = "sha256-lxS9j733dhoM5bQSuo9jGOIHaKtcHzCDR5E9ko8U8xI="; }; - cargoHash = "sha256-zq95Dzcbz08/8lumAyTfSzCEHCWWlp8Fw7R6fnfTOrk="; + cargoHash = "sha256-d5b/ggk/FxCgUJrYCtrmSPAwLftMKzuOhg+0mQQ+ntM="; meta = with lib; { description = "Count the number of lines of LLVM IR across all instantiations of a generic function"; diff --git a/pkgs/development/tools/rust/cargo-machete/default.nix b/pkgs/development/tools/rust/cargo-machete/default.nix index 5078ddf6043ca..75d83e7be5afc 100644 --- a/pkgs/development/tools/rust/cargo-machete/default.nix +++ b/pkgs/development/tools/rust/cargo-machete/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-machete"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "bnjbvr"; repo = "cargo-machete"; rev = "v${version}"; - hash = "sha256-AOi4SnFkt82iQIP3bp/9JIaYiqjiEjKvJKUvrLQJTX8="; + hash = "sha256-LDhC/vwhyY4KD1RArCxl+nZl5IVj0zAjxlRLwWpnTvI="; }; - cargoHash = "sha256-Q/2py0zgCYgnxFpcJD5PfNfIfIEUjtjFPjxDe25f0BQ="; + cargoHash = "sha256-vygAznYd/mtArSkLjoIpIxS4RiE3drRfKwNhD1w7KoY="; # tests require internet access doCheck = false; diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index 6a749efe51fac..f057155988c8a 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.37.1"; + version = "0.37.2"; src = fetchFromGitHub { owner = "sagiegurari"; repo = "cargo-make"; rev = version; - hash = "sha256-y8N9bOkS5JgUwnhCo7c48ApgeQ8PVbIN7G1IdTOK0JI="; + hash = "sha256-uYMPRbh2stIkNxehPnJPryIo+bGxDG7g+l4bTkEQWoY="; }; - cargoHash = "sha256-jbBpA4yrhkOcpJvJM8K1dw/+lfaKIbKd/XxSsEFLlv4="; + cargoHash = "sha256-CXGar3Xp6iBldBGOxjXRBGBwjNh4Kv6SwIkaNKEnkQs="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-modules/default.nix b/pkgs/development/tools/rust/cargo-modules/default.nix index be530890da519..cbab6f02fce63 100644 --- a/pkgs/development/tools/rust/cargo-modules/default.nix +++ b/pkgs/development/tools/rust/cargo-modules/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-modules"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "regexident"; repo = pname; rev = version; - hash = "sha256-3yvrIUvAlnAjEMnBTgDTY8gRW7rILu2Yns/A7lse2Qw="; + hash = "sha256-GbBPIJh2TnIpzpuSLZlrxEVN5hWFakeERKNeTcYbjSY="; }; - cargoHash = "sha256-Coh+gg2s4esdByQG6iNlG/VqftP+Gg0qaPoPArim1yQ="; + cargoHash = "sha256-g8Edt2rmOSfoJ3UsZIUyTOIxXgf6iQD+TueK89d18CQ="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/pkgs/development/tools/rust/cargo-nextest/default.nix b/pkgs/development/tools/rust/cargo-nextest/default.nix index c4e87e9d670a2..0dc2a708afe38 100644 --- a/pkgs/development/tools/rust/cargo-nextest/default.nix +++ b/pkgs/development/tools/rust/cargo-nextest/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-nextest"; - version = "0.9.58"; + version = "0.9.59"; src = fetchFromGitHub { owner = "nextest-rs"; repo = "nextest"; rev = "cargo-nextest-${version}"; - hash = "sha256-D3mSDh6IliKbtxitMRXy1L4YH/qZfdXtXiPvf45mTno="; + hash = "sha256-32n1z5e40qkhHBAbwGhXa7L5NfkkN72AIKF796y82+g="; }; - cargoHash = "sha256-TjQHSaBVM4pJoTp6Vdz6WGWIyw5uC6UG7Wle6LsXP+4="; + cargoHash = "sha256-sme7VE5JnjIWONaFYIOnv72UjUC/S+VezNSmRunmDv0="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/development/tools/rust/cargo-pgrx/default.nix b/pkgs/development/tools/rust/cargo-pgrx/default.nix index d6cd2f39b61ba..3bb615f3c1102 100644 --- a/pkgs/development/tools/rust/cargo-pgrx/default.nix +++ b/pkgs/development/tools/rust/cargo-pgrx/default.nix @@ -2,17 +2,17 @@ let pname = "cargo-pgrx"; - version = "0.10.0"; + version = "0.10.2"; in rustPlatform.buildRustPackage rec { inherit version pname; src = fetchCrate { inherit version pname; - hash = "sha256-iqKcYp0dsay3/OE+N6KLjGEnloaImyS5xNaVciOYERc="; + hash = "sha256-FqjfbJmSy5UCpPPPk4bkEyvQCnaH9zYtkI7txgIn+ls="; }; - cargoHash = "sha256-IWqHt6RL5ICBarmVx7QNjt3JrS0JYi/odEjPkLYMsPI="; + cargoHash = "sha256-syZ3cQq8qDHBLvqmNDGoxeK6zXHJ47Jwkw3uhaXNCzI="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-run-bin/default.nix b/pkgs/development/tools/rust/cargo-run-bin/default.nix index afe21ea80f597..ac611a60e448a 100644 --- a/pkgs/development/tools/rust/cargo-run-bin/default.nix +++ b/pkgs/development/tools/rust/cargo-run-bin/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-run-bin"; - version = "1.2.0"; + version = "1.3.2"; src = fetchCrate { inherit pname version; - hash = "sha256-roeim5enxqklJOW7Qqr+Gci5lUIOW9kn3tlCm8qrEJk="; + hash = "sha256-NWXyy2VgVjEftD2Zl6TbpJnXVTi4UUNSomHCv9Gnkrk="; }; - cargoHash = "sha256-A/HlFse2wWOH85oZQvlRaePdF/4YfSL3qroDYGwwi9U="; + cargoHash = "sha256-eiRKWV+xMyyv61FIBJWt0B12e6mn+G1kW0LpyCMuWWc="; # multiple impurities in tests doCheck = false; diff --git a/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock b/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock index 24af540157cfc..69c75963f3a1b 100644 --- a/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock +++ b/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock @@ -8,16 +8,16 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" dependencies = [ - "gimli", + "gimli 0.27.3", ] [[package]] name = "addr2line" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ - "gimli", + "gimli 0.28.0", ] [[package]] @@ -28,23 +28,11 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - -[[package]] -name = "ahash" version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" dependencies = [ "cfg-if 1.0.0", - "const-random", "getrandom", "once_cell", "version_check", @@ -52,23 +40,14 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.4" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" +checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" dependencies = [ "memchr", ] [[package]] -name = "aligned" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80a21b9440a626c7fc8573a9e3d3a06b75c7c97754c2949bc7857b90353ca655" -dependencies = [ - "as-slice", -] - -[[package]] name = "allocator-api2" version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -112,9 +91,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" +checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" [[package]] name = "anstyle-parse" @@ -151,12 +130,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] -name = "anymap2" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c" - -[[package]] name = "arc-swap" version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -181,15 +154,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] -name = "as-slice" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "516b6b4f0e40d50dcda9365d53964ec74560ad4284da2e7fc97122cd83174516" -dependencies = [ - "stable_deref_trait", -] - -[[package]] name = "asn1-rs" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -292,7 +256,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -303,7 +267,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -539,7 +503,7 @@ dependencies = [ "hyper-rustls 0.23.2", "lazy_static", "pin-project-lite", - "rustls 0.20.8", + "rustls 0.20.9", "tokio", "tower", "tracing", @@ -648,7 +612,7 @@ checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" dependencies = [ "async-trait", "axum-core", - "base64 0.21.2", + "base64 0.21.4", "bitflags 1.3.2", "bytes", "futures-util", @@ -670,7 +634,7 @@ dependencies = [ "sha1", "sync_wrapper", "tokio", - "tokio-tungstenite 0.20.0", + "tokio-tungstenite", "tower", "tower-layer", "tower-service", @@ -748,7 +712,7 @@ dependencies = [ "http-body", "hyper", "pin-project-lite", - "rustls 0.20.8", + "rustls 0.20.9", "rustls-pemfile", "tokio", "tokio-rustls 0.23.4", @@ -773,16 +737,16 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ - "addr2line 0.20.0", + "addr2line 0.21.0", "cc", "cfg-if 1.0.0", "libc", "miniz_oxide", - "object 0.31.1", + "object 0.32.1", "rustc-demangle", ] @@ -800,9 +764,9 @@ checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5" [[package]] name = "base64" -version = "0.21.2" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" [[package]] name = "base64-simd" @@ -919,7 +883,7 @@ version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af254ed2da4936ef73309e9597180558821cb16ae9bba4cb24ce6b612d8d80ed" dependencies = [ - "base64 0.21.2", + "base64 0.21.4", "bollard-stubs", "bytes", "futures-core", @@ -954,17 +918,17 @@ dependencies = [ [[package]] name = "bson" -version = "2.6.1" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aeb8bae494e49dbc330dd23cf78f6f7accee22f640ce3ab17841badaa4ce232" +checksum = "58da0ae1e701ea752cc46c1bb9f39d5ecefc7395c3ecd526261a566d4f16e0c2" dependencies = [ - "ahash 0.7.6", + "ahash", "base64 0.13.1", "bitvec", "hex", "indexmap 1.9.3", "js-sys", - "lazy_static", + "once_cell", "rand", "serde", "serde_bytes", @@ -975,12 +939,12 @@ dependencies = [ [[package]] name = "bstr" -version = "1.6.0" +version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" +checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" dependencies = [ "memchr", - "regex-automata 0.3.6", + "regex-automata 0.3.8", "serde", ] @@ -1007,9 +971,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "bytes-utils" @@ -1022,6 +986,12 @@ dependencies = [ ] [[package]] +name = "byteyarn" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7534301c0ea17abb4db06d75efc7b4b0fa360fce8e175a4330d721c71c942ff" + +[[package]] name = "camino" version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1094,40 +1064,15 @@ dependencies = [ ] [[package]] -name = "cargo-generate" -version = "0.18.3" +name = "cargo-lock" +version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7b2f627381dc7523340c606559dddf6083cb2e6134368381da5778638f906d8" +checksum = "e11c675378efb449ed3ce8de78d75d0d80542fc98487c26aba28eb3b82feac72" dependencies = [ - "anyhow", - "clap", - "console", - "dialoguer", - "env_logger", - "git2", - "gix-config", - "heck", - "home", - "ignore", - "indicatif", - "liquid", - "liquid-core", - "liquid-derive", - "liquid-lib", - "log", - "names", - "paste", - "path-absolutize", - "regex", - "remove_dir_all", - "rhai", - "sanitize-filename", - "semver 1.0.18", + "semver 1.0.19", "serde", - "tempfile", - "thiserror", - "toml 0.7.6", - "walkdir", + "toml 0.7.8", + "url", ] [[package]] @@ -1141,38 +1086,39 @@ dependencies = [ [[package]] name = "cargo-shuttle" -version = "0.26.0" +version = "0.28.0" dependencies = [ "anyhow", "assert_cmd", "async-trait", "bollard", - "cargo-generate", "cargo_metadata", "chrono", "clap", "clap_complete", "crossbeam-channel", - "crossterm", + "crossterm 0.27.0", "dialoguer", "dirs 5.0.1", "dunce", "flate2", "futures", "git2", + "gix", + "globset", "headers", "home", "ignore", "indicatif", "indoc", - "openssl", "portpicker", + "regex", "reqwest", "reqwest-middleware", "reqwest-retry", "rexpect", "rmp-serde", - "semver 1.0.18", + "semver 1.0.19", "serde", "serde_json", "shuttle-common", @@ -1182,17 +1128,17 @@ dependencies = [ "strum", "tar", "tempfile", - "test-context", "tokio", - "tokio-tungstenite 0.19.0", + "tokio-tungstenite", "tokiotest-httpserver", - "toml 0.5.11", - "toml_edit 0.16.2", + "toml 0.7.8", + "toml_edit", "tonic", "tracing", "tracing-subscriber", "url", "uuid", + "walkdir", "webbrowser", ] @@ -1204,7 +1150,7 @@ checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a" dependencies = [ "camino", "cargo-platform", - "semver 1.0.18", + "semver 1.0.19", "serde", "serde_json", "thiserror", @@ -1227,6 +1173,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" [[package]] +name = "cfg-expr" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e70d3ad08698a0568b0562f22710fe6bfc1f4a61a367c77d0398c562eadd453a" +dependencies = [ + "smallvec", + "target-lexicon", +] + +[[package]] name = "cfg-if" version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1240,22 +1196,22 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "defd4e7873dbddba6c7c91e199c7fcb946abc4a6a4ac3195400bcfb01b5de877" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", "serde", - "winapi", + "windows-targets 0.48.5", ] [[package]] name = "clap" -version = "4.2.7" +version = "4.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34d21f9bf1b425d2968943631ec91202fe5e837264063503708b83013f8fc938" +checksum = "fb690e81c7840c0d7aade59f242ea3b41b9bc27bcd5997890e7702ae4b32e487" dependencies = [ "clap_builder", "clap_derive", @@ -1264,43 +1220,48 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.2.7" +version = "4.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "914c8c79fb560f238ef6429439a30023c862f7a28e688c58f7203f12b29970bd" +checksum = "5ed2e96bc16d8d740f6f48d663eddf4b8a0983e79210fd55479b7bcd0a69860e" dependencies = [ "anstream", "anstyle", - "bitflags 1.3.2", "clap_lex", "strsim", ] [[package]] name = "clap_complete" -version = "4.3.2" +version = "4.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc443334c81a804575546c5a8a79b4913b50e28d69232903604cada1de817ce" +checksum = "4110a1e6af615a9e6d0a36f805d5c99099f8bab9b8042f5bc1fa220a4a89e36f" dependencies = [ "clap", ] [[package]] name = "clap_derive" -version = "4.2.0" +version = "4.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" +checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] name = "clap_lex" -version = "0.4.1" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" + +[[package]] +name = "clru" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" +checksum = "b8191fa7302e03607ff0e237d4246cc043ff5b3cb9409d995172ba3bea16b807" [[package]] name = "colorchoice" @@ -1335,7 +1296,7 @@ version = "6.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e959d788268e3bf9d35ace83e81b124190378e4c91c9067524675e33394b8ba" dependencies = [ - "crossterm", + "crossterm 0.26.1", "strum", "strum_macros", "unicode-width", @@ -1367,28 +1328,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" [[package]] -name = "const-random" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368a7a772ead6ce7e1de82bfb04c485f3db8ec744f72925af5735e29a22cc18e" -dependencies = [ - "const-random-macro", - "proc-macro-hack", -] - -[[package]] -name = "const-random-macro" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d7d6ab3c3a2282db210df5f02c4dab6e0a7057af0fb7ebd4070f30fe05c0ddb" -dependencies = [ - "getrandom", - "once_cell", - "proc-macro-hack", - "tiny-keccak", -] - -[[package]] name = "constant_time_eq" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1482,7 +1421,7 @@ dependencies = [ "cranelift-codegen-shared", "cranelift-entity", "cranelift-isle", - "gimli", + "gimli 0.27.3", "hashbrown 0.13.2", "log", "regalloc2", @@ -1552,7 +1491,7 @@ dependencies = [ "cranelift-codegen", "cranelift-entity", "cranelift-frontend", - "itertools", + "itertools 0.10.5", "log", "smallvec", "wasmparser", @@ -1653,19 +1592,29 @@ dependencies = [ ] [[package]] -name = "crossterm_winapi" -version = "0.9.1" +name = "crossterm" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" +checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" dependencies = [ + "bitflags 2.4.0", + "crossterm_winapi", + "libc", + "mio", + "parking_lot 0.12.1", + "signal-hook", + "signal-hook-mio", "winapi", ] [[package]] -name = "crunchy" -version = "0.2.2" +name = "crossterm_winapi" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" +checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" +dependencies = [ + "winapi", +] [[package]] name = "crypto-common" @@ -1708,15 +1657,6 @@ dependencies = [ ] [[package]] -name = "cvt" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2ae9bf77fbf2d39ef573205d554d87e86c12f1994e9ea335b0651b9b278bcf1" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] name = "darling" version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1753,9 +1693,9 @@ dependencies = [ [[package]] name = "dashmap" -version = "5.5.0" +version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6943ae99c34386c84a470c499d3414f66502a41340aa895406e0d2e4a207b91d" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if 1.0.0", "hashbrown 0.14.0", @@ -1830,14 +1770,15 @@ dependencies = [ [[package]] name = "dialoguer" -version = "0.10.4" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59c6f2989294b9a498d3ad5491a79c6deb604617378e1cdc4bfc1c1361fe2f87" +checksum = "658bce805d770f407bc62102fca7c2c64ceef2fbcb2b8bd19d2765ce093980de" dependencies = [ "console", "fuzzy-matcher", "shell-words", "tempfile", + "thiserror", "zeroize", ] @@ -1944,7 +1885,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -1982,9 +1923,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "encoding_rs" -version = "0.8.32" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" dependencies = [ "cfg-if 1.0.0", ] @@ -2002,6 +1943,18 @@ dependencies = [ ] [[package]] +name = "enum-as-inner" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] name = "env_logger" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2022,9 +1975,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" +checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" dependencies = [ "errno-dragonfly", "libc", @@ -2065,6 +2018,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" [[package]] +name = "faster-hex" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "239f7bfb930f820ab16a9cd95afc26f88264cf6905c960b340a615384aa3338a" +dependencies = [ + "serde", +] + +[[package]] name = "fastrand" version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2086,7 +2048,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b0377f1edc77dbd1118507bc7a66e4ab64d2b90c66f90726dc801e73a8c68f9" dependencies = [ "cfg-if 1.0.0", - "rustix 0.38.8", + "rustix 0.38.13", "windows-sys 0.48.0", ] @@ -2153,21 +2115,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] name = "form_urlencoded" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2200,21 +2147,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d167b646a876ba8fda6b50ac645cfd96242553cbaf0ca4fccaa39afcbf0801f" dependencies = [ "io-lifetimes 1.0.11", - "rustix 0.38.8", - "windows-sys 0.48.0", -] - -[[package]] -name = "fs_at" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13865faf9bae9729a623b591520adb9c5b1b0ecbec8a48394f47f6801a458f9f" -dependencies = [ - "aligned", - "cfg-if 1.0.0", - "cvt", - "libc", - "nix 0.26.2", + "rustix 0.38.13", "windows-sys 0.48.0", ] @@ -2291,7 +2224,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -2377,6 +2310,12 @@ dependencies = [ ] [[package]] +name = "gimli" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" + +[[package]] name = "git2" version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2386,54 +2325,164 @@ dependencies = [ "libc", "libgit2-sys", "log", - "openssl-probe", - "openssl-sys", "url", ] [[package]] +name = "gix" +version = "0.54.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad6d32e74454459690d57d18ea4ebec1629936e6b130b51d12cb4a81630ac953" +dependencies = [ + "gix-actor", + "gix-attributes", + "gix-commitgraph", + "gix-config", + "gix-credentials", + "gix-date", + "gix-diff", + "gix-discover", + "gix-features", + "gix-filter", + "gix-fs", + "gix-glob", + "gix-hash", + "gix-hashtable", + "gix-ignore", + "gix-index", + "gix-lock", + "gix-macros", + "gix-negotiate", + "gix-object", + "gix-odb", + "gix-pack", + "gix-path", + "gix-pathspec", + "gix-prompt", + "gix-protocol", + "gix-ref", + "gix-refspec", + "gix-revision", + "gix-revwalk", + "gix-sec", + "gix-submodule", + "gix-tempfile", + "gix-trace", + "gix-transport", + "gix-traverse", + "gix-url", + "gix-utils", + "gix-validate", + "gix-worktree", + "gix-worktree-state", + "once_cell", + "parking_lot 0.12.1", + "reqwest", + "smallvec", + "thiserror", + "unicode-normalization", +] + +[[package]] name = "gix-actor" -version = "0.19.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc22b0cdc52237667c301dd7cdc6ead8f8f73c9f824e9942c8ebd6b764f6c0bf" +checksum = "08c60e982c5290897122d4e2622447f014a2dadd5a18cb73d50bb91b31645e27" dependencies = [ "bstr", "btoi", "gix-date", "itoa", - "nom", + "thiserror", + "winnow", +] + +[[package]] +name = "gix-attributes" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2451665e70709ba4753b623ef97511ee98c4a73816b2c5b5df25678d607ed820" +dependencies = [ + "bstr", + "byteyarn", + "gix-glob", + "gix-path", + "gix-quote", + "gix-trace", + "smallvec", + "thiserror", + "unicode-bom", +] + +[[package]] +name = "gix-bitmap" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ccab4bc576844ddb51b78d81b4a42d73e6229660fa614dfc3d3999c874d1959" +dependencies = [ + "thiserror", +] + +[[package]] +name = "gix-chunk" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b42ea64420f7994000130328f3c7a2038f639120518870436d31b8bde704493" +dependencies = [ + "thiserror", +] + +[[package]] +name = "gix-command" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f28f654184b5f725c5737c7e4f466cbd8f0102ac352d5257eeab19647ee4256" +dependencies = [ + "bstr", +] + +[[package]] +name = "gix-commitgraph" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e75a975ee22cf0a002bfe9b5d5cb3d2a88e263a8a178cd7509133cff10f4df8a" +dependencies = [ + "bstr", + "gix-chunk", + "gix-features", + "gix-hash", + "memmap2", "thiserror", ] [[package]] name = "gix-config" -version = "0.20.1" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fbad5ce54a8fc997acc50febd89ec80fa6e97cb7f8d0654cb229936407489d8" +checksum = "c171514b40487d3f677ae37efc0f45ac980e3169f23c27eb30a70b47fdf88ab5" dependencies = [ "bstr", "gix-config-value", - "gix-features 0.28.1", + "gix-features", "gix-glob", "gix-path", "gix-ref", "gix-sec", - "log", "memchr", - "nom", "once_cell", "smallvec", "thiserror", "unicode-bom", + "winnow", ] [[package]] name = "gix-config-value" -version = "0.10.2" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d09154c0c8677e4da0ec35e896f56ee3e338e741b9599fae06075edd83a4081c" +checksum = "ea7505b97f4d8e7933e29735a568ba2f86d8de466669d9f0e8321384f9972f47" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "bstr", "gix-path", "libc", @@ -2441,10 +2490,26 @@ dependencies = [ ] [[package]] +name = "gix-credentials" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46900b884cc5af6a6c141ee741607c0c651a4e1d33614b8d888a1ba81cc0bc8a" +dependencies = [ + "bstr", + "gix-command", + "gix-config-value", + "gix-path", + "gix-prompt", + "gix-sec", + "gix-url", + "thiserror", +] + +[[package]] name = "gix-date" -version = "0.4.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b96271912ce39822501616f177dea7218784e6c63be90d5f36322ff3a722aae2" +checksum = "fc7df669639582dc7c02737642f76890b03b5544e141caba68a7d6b4eb551e0d" dependencies = [ "bstr", "itoa", @@ -2453,71 +2518,152 @@ dependencies = [ ] [[package]] +name = "gix-diff" +version = "0.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "788ddb152c388206e81f36bcbb574e7ed7827c27d8fa62227b34edc333d8928c" +dependencies = [ + "gix-hash", + "gix-object", + "thiserror", +] + +[[package]] +name = "gix-discover" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69507643d75a0ea9a402fcf73ced517d2b95cc95385904ac09d03e0b952fde33" +dependencies = [ + "bstr", + "dunce", + "gix-hash", + "gix-path", + "gix-ref", + "gix-sec", + "thiserror", +] + +[[package]] name = "gix-features" -version = "0.28.1" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b76f9a80f6dd7be66442ae86e1f534effad9546676a392acc95e269d0c21c22" +checksum = "9b9ff423ae4983f762659040d13dd7a5defbd54b6a04ac3cc7347741cec828cd" dependencies = [ - "gix-hash 0.10.4", + "bytes", + "crc32fast", + "flate2", + "gix-hash", + "gix-trace", "libc", + "once_cell", + "prodash", "sha1_smol", + "thiserror", "walkdir", ] [[package]] -name = "gix-features" -version = "0.29.0" +name = "gix-filter" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf69b0f5c701cc3ae22d3204b671907668f6437ca88862d355eaf9bc47a4f897" +checksum = "1be40d28cd41445bb6cd52c4d847d915900e5466f7433eaee6a9e0a3d1d88b08" dependencies = [ - "gix-hash 0.11.4", - "libc", + "bstr", + "encoding_rs", + "gix-attributes", + "gix-command", + "gix-hash", + "gix-object", + "gix-packetline-blocking", + "gix-path", + "gix-quote", + "gix-trace", + "smallvec", + "thiserror", ] [[package]] name = "gix-fs" -version = "0.1.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b37a1832f691fdc09910bd267f9a2e413737c1f9ec68c6e31f9e802616278a9" +checksum = "09815faba62fe9b32d918b75a554686c98e43f7d48c43a80df58eb718e5c6635" dependencies = [ - "gix-features 0.29.0", + "gix-features", ] [[package]] name = "gix-glob" -version = "0.5.5" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93e43efd776bc543f46f0fd0ca3d920c37af71a764a16f2aebd89765e9ff2993" +checksum = "a9d76e85f11251dcf751d2c5e918a14f562db5be6f727fd24775245653e9b19d" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "bstr", + "gix-features", + "gix-path", ] [[package]] name = "gix-hash" -version = "0.10.4" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a258595457bc192d1f1c59d0d168a1e34e2be9b97a614e14995416185de41a7" +checksum = "2ccf425543779cddaa4a7c62aba3fa9d90ea135b160be0a72dd93c063121ad4a" dependencies = [ - "hex", + "faster-hex", "thiserror", ] [[package]] -name = "gix-hash" -version = "0.11.4" +name = "gix-hashtable" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b422ff2ad9a0628baaad6da468cf05385bf3f5ab495ad5a33cce99b9f41092f" +checksum = "409268480841ad008e81c17ca5a293393fbf9f2b6c2f85b8ab9de1f0c5176a16" dependencies = [ - "hex", + "gix-hash", + "hashbrown 0.14.0", + "parking_lot 0.12.1", +] + +[[package]] +name = "gix-ignore" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048f443a1f6b02da4205c34d2e287e3fd45d75e8e2f06cfb216630ea9bff5e3" +dependencies = [ + "bstr", + "gix-glob", + "gix-path", + "unicode-bom", +] + +[[package]] +name = "gix-index" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f54d63a9d13c13088f41f5a3accbec284e492ac8f4f707fcc307c139622e17b7" +dependencies = [ + "bitflags 2.4.0", + "bstr", + "btoi", + "filetime", + "gix-bitmap", + "gix-features", + "gix-fs", + "gix-hash", + "gix-lock", + "gix-object", + "gix-traverse", + "itoa", + "memmap2", + "smallvec", "thiserror", ] [[package]] name = "gix-lock" -version = "5.0.1" +version = "10.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c693d7f05730fa74a7c467150adc7cea393518410c65f0672f80226b8111555" +checksum = "47fc96fa8b6b6d33555021907c81eb3b27635daecf6e630630bdad44f8feaa95" dependencies = [ "gix-tempfile", "gix-utils", @@ -2525,71 +2671,280 @@ dependencies = [ ] [[package]] +name = "gix-macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d8acb5ee668d55f0f2d19a320a3f9ef67a6999ad483e11135abcc2464ed18b6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.32", +] + +[[package]] +name = "gix-negotiate" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f1697bf9911c6d1b8d709b9e6ef718cb5ea5821a1b7991520125a8134448004" +dependencies = [ + "bitflags 2.4.0", + "gix-commitgraph", + "gix-date", + "gix-hash", + "gix-object", + "gix-revwalk", + "smallvec", + "thiserror", +] + +[[package]] name = "gix-object" -version = "0.28.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8df068db9180ee935fbb70504848369e270bdcb576b05c0faa8b9fd3b86fc017" +checksum = "1e7e19616c67967374137bae83e950e9b518a9ea8a605069bd6716ada357fd6f" dependencies = [ "bstr", "btoi", "gix-actor", - "gix-features 0.28.1", - "gix-hash 0.10.4", + "gix-date", + "gix-features", + "gix-hash", "gix-validate", - "hex", "itoa", - "nom", "smallvec", "thiserror", + "winnow", +] + +[[package]] +name = "gix-odb" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d6a392c6ba3a2f133cdc63120e9bc7aec81eef763db372c817de31febfe64bf" +dependencies = [ + "arc-swap", + "gix-date", + "gix-features", + "gix-hash", + "gix-object", + "gix-pack", + "gix-path", + "gix-quote", + "parking_lot 0.12.1", + "tempfile", + "thiserror", +] + +[[package]] +name = "gix-pack" +version = "0.43.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7536203a45b31e1bc5694bbf90ba8da1b736c77040dd6a520db369f371eb1ab3" +dependencies = [ + "clru", + "gix-chunk", + "gix-features", + "gix-hash", + "gix-hashtable", + "gix-object", + "gix-path", + "gix-tempfile", + "memmap2", + "parking_lot 0.12.1", + "smallvec", + "thiserror", +] + +[[package]] +name = "gix-packetline" +version = "0.16.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6df0b75361353e7c0a6d72d49617a37379a7a22cba4569ae33a7720a4c8755a" +dependencies = [ + "bstr", + "faster-hex", + "thiserror", +] + +[[package]] +name = "gix-packetline-blocking" +version = "0.16.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d8395f7501c84d6a1fe902035fdfd8cd86d89e2dd6be0200ec1a72fd3c92d39" +dependencies = [ + "bstr", + "faster-hex", + "thiserror", ] [[package]] name = "gix-path" -version = "0.7.3" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a1d370115171e3ae03c5c6d4f7d096f2981a40ddccb98dfd704c773530ba73b" +dependencies = [ + "bstr", + "gix-trace", + "home", + "once_cell", + "thiserror", +] + +[[package]] +name = "gix-pathspec" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3e26c9b47c51be73f98d38c84494bd5fb99334c5d6fda14ef5d036d50a9e5fd" +dependencies = [ + "bitflags 2.4.0", + "bstr", + "gix-attributes", + "gix-config-value", + "gix-glob", + "gix-path", + "thiserror", +] + +[[package]] +name = "gix-prompt" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32370dce200bb951df013e03dff35b4233fc7a89458642b047629b91734a7e19" +checksum = "5c9a913769516f5e9d937afac206fb76428e3d7238e538845842887fda584678" +dependencies = [ + "gix-command", + "gix-config-value", + "parking_lot 0.12.1", + "rustix 0.38.13", + "thiserror", +] + +[[package]] +name = "gix-protocol" +version = "0.40.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7b700dc20cc9be8a5130a1fd7e10c34117ffa7068431c8c24d963f0a2e0c9b" dependencies = [ "bstr", + "btoi", + "gix-credentials", + "gix-date", + "gix-features", + "gix-hash", + "gix-transport", + "maybe-async", + "thiserror", + "winnow", +] + +[[package]] +name = "gix-quote" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "475c86a97dd0127ba4465fbb239abac9ea10e68301470c9791a6dd5351cdc905" +dependencies = [ + "bstr", + "btoi", "thiserror", ] [[package]] name = "gix-ref" -version = "0.27.2" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4e909396ed3b176823991ccc391c276ae2a015e54edaafa3566d35123cfac9d" +checksum = "22e6b749660b613641769edc1954132eb8071a13c32224891686091bef078de4" dependencies = [ "gix-actor", - "gix-features 0.28.1", - "gix-hash 0.10.4", + "gix-date", + "gix-features", + "gix-fs", + "gix-hash", "gix-lock", "gix-object", "gix-path", "gix-tempfile", "gix-validate", "memmap2", - "nom", + "thiserror", + "winnow", +] + +[[package]] +name = "gix-refspec" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0895cb7b1e70f3c3bd4550c329e9f5caf2975f97fcd4238e05754e72208ef61e" +dependencies = [ + "bstr", + "gix-hash", + "gix-revision", + "gix-validate", + "smallvec", + "thiserror", +] + +[[package]] +name = "gix-revision" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8c4b15cf2ab7a35f5bcb3ef146187c8d36df0177e171ca061913cbaaa890e89" +dependencies = [ + "bstr", + "gix-date", + "gix-hash", + "gix-hashtable", + "gix-object", + "gix-revwalk", + "gix-trace", + "thiserror", +] + +[[package]] +name = "gix-revwalk" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9870c6b1032f2084567710c3b2106ac603377f8d25766b8a6b7c33e6e3ca279" +dependencies = [ + "gix-commitgraph", + "gix-date", + "gix-hash", + "gix-hashtable", + "gix-object", + "smallvec", "thiserror", ] [[package]] name = "gix-sec" -version = "0.6.2" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8ffa5bf0772f9b01de501c035b6b084cf9b8bb07dec41e3afc6a17336a65f47" +checksum = "92b9542ac025a8c02ed5d17b3fc031a111a384e859d0be3532ec4d58c40a0f28" dependencies = [ - "bitflags 1.3.2", - "dirs 4.0.0", + "bitflags 2.4.0", "gix-path", "libc", - "windows 0.43.0", + "windows", +] + +[[package]] +name = "gix-submodule" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0150e82e9282d3f2ab2dd57a22f9f6c3447b9d9856e5321ac92d38e3e0e2b7" +dependencies = [ + "bstr", + "gix-config", + "gix-path", + "gix-pathspec", + "gix-refspec", + "gix-url", + "thiserror", ] [[package]] name = "gix-tempfile" -version = "5.0.3" +version = "10.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71a0d32f34e71e86586124225caefd78dabc605d0486de580d717653addf182" +checksum = "5ae0978f3e11dc57290ee75ac2477c815bca1ce2fa7ed5dc5f16db067410ac4d" dependencies = [ "gix-fs", "libc", @@ -2599,6 +2954,61 @@ dependencies = [ ] [[package]] +name = "gix-trace" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96b6d623a1152c3facb79067d6e2ecdae48130030cf27d6eb21109f13bd7b836" + +[[package]] +name = "gix-transport" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9ec726e6a245e68ace59a34126a1d679de60360676612985e70b0d3b102fb4e" +dependencies = [ + "base64 0.21.4", + "bstr", + "gix-command", + "gix-credentials", + "gix-features", + "gix-packetline", + "gix-quote", + "gix-sec", + "gix-url", + "reqwest", + "thiserror", +] + +[[package]] +name = "gix-traverse" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ef04ab3643acba289b5cedd25d6f53c0430770b1d689d1d654511e6fb81ba0" +dependencies = [ + "gix-commitgraph", + "gix-date", + "gix-hash", + "gix-hashtable", + "gix-object", + "gix-revwalk", + "smallvec", + "thiserror", +] + +[[package]] +name = "gix-url" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6125ecf46e8c68bf7202da6cad239831daebf0247ffbab30210d72f3856e420f" +dependencies = [ + "bstr", + "gix-features", + "gix-path", + "home", + "thiserror", + "url", +] + +[[package]] name = "gix-utils" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2609,15 +3019,53 @@ dependencies = [ [[package]] name = "gix-validate" -version = "0.7.7" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba9b3737b2cef3dcd014633485f0034b0f1a931ee54aeb7d8f87f177f3c89040" +checksum = "e05cab2b03a45b866156e052aa38619f4ece4adcb2f79978bfc249bc3b21b8c5" dependencies = [ "bstr", "thiserror", ] [[package]] +name = "gix-worktree" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f5e32972801bd82d56609e6fc84efc358fa1f11f25c5e83b7807ee2280f14fe" +dependencies = [ + "bstr", + "gix-attributes", + "gix-features", + "gix-fs", + "gix-glob", + "gix-hash", + "gix-ignore", + "gix-index", + "gix-object", + "gix-path", +] + +[[package]] +name = "gix-worktree-state" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3aeb06960f2c5ac9e4cdb6b38eb3c2b99d5e525e68285fef21ed17dfbd597ad" +dependencies = [ + "bstr", + "gix-features", + "gix-filter", + "gix-fs", + "gix-glob", + "gix-hash", + "gix-index", + "gix-object", + "gix-path", + "gix-worktree", + "io-close", + "thiserror", +] + +[[package]] name = "glob" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2637,6 +3085,12 @@ dependencies = [ ] [[package]] +name = "guppy-workspace-hack" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92620684d99f750bae383ecb3be3748142d6095760afd5cbcf2261e9a279d780" + +[[package]] name = "h2" version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2667,7 +3121,7 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash 0.8.3", + "ahash", ] [[package]] @@ -2676,27 +3130,26 @@ version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" dependencies = [ - "ahash 0.8.3", + "ahash", "allocator-api2", ] [[package]] name = "hashlink" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "312f66718a2d7789ffef4f4b7b213138ed9f1eb3aa1d0d82fc99f88fb3ffd26f" +checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ "hashbrown 0.14.0", ] [[package]] name = "headers" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" +checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" dependencies = [ - "base64 0.13.1", - "bitflags 1.3.2", + "base64 0.21.4", "bytes", "headers-core", "http", @@ -2883,7 +3336,7 @@ dependencies = [ "http", "hyper", "log", - "rustls 0.20.8", + "rustls 0.20.9", "rustls-native-certs", "tokio", "tokio-rustls 0.23.4", @@ -2898,7 +3351,7 @@ dependencies = [ "futures-util", "http", "hyper", - "rustls 0.21.6", + "rustls 0.21.7", "rustls-native-certs", "tokio", "tokio-rustls 0.24.1", @@ -2940,7 +3393,7 @@ dependencies = [ "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows 0.48.0", + "windows", ] [[package]] @@ -3061,7 +3514,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3d50eb225913c1903c788287ddd0b16369771e5abc988756a5e5927390ba04f" dependencies = [ - "base64 0.21.2", + "base64 0.21.4", "hyper", "hyper-rustls 0.24.1", "ring", @@ -3071,6 +3524,16 @@ dependencies = [ ] [[package]] +name = "io-close" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cadcf447f06744f8ce713d2d6239bb5bde2c357a452397a9ed90c625da390bc" +dependencies = [ + "libc", + "winapi", +] + +[[package]] name = "io-extras" version = "0.17.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3122,7 +3585,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi", - "rustix 0.38.8", + "rustix 0.38.13", "windows-sys 0.48.0", ] @@ -3136,6 +3599,15 @@ dependencies = [ ] [[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + +[[package]] name = "itoa" version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3207,7 +3679,7 @@ version = "8.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" dependencies = [ - "base64 0.21.2", + "base64 0.21.4", "pem", "ring", "serde", @@ -3216,16 +3688,6 @@ dependencies = [ ] [[package]] -name = "kstring" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3066350882a1cd6d950d055997f379ac37fd39f81cd4d8ed186032eb3c5747" -dependencies = [ - "serde", - "static_assertions", -] - -[[package]] name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3254,9 +3716,7 @@ checksum = "a80df2e11fb4a61f4ba2ab42dbe7f74468da143f1a75c74e11dee7c813f694fa" dependencies = [ "cc", "libc", - "libssh2-sys", "libz-sys", - "openssl-sys", "pkg-config", ] @@ -3278,20 +3738,6 @@ dependencies = [ ] [[package]] -name = "libssh2-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee" -dependencies = [ - "cc", - "libc", - "libz-sys", - "openssl-sys", - "pkg-config", - "vcpkg", -] - -[[package]] name = "libz-sys" version = "1.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3323,66 +3769,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" - -[[package]] -name = "liquid" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69f68ae1011499ae2ef879f631891f21c78e309755f4a5e483c4a8f12e10b609" -dependencies = [ - "doc-comment", - "liquid-core", - "liquid-derive", - "liquid-lib", - "serde", -] - -[[package]] -name = "liquid-core" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e0724dfcaad5cfb7965ea0f178ca0870b8d7315178f4a7179f5696f7f04d5f" -dependencies = [ - "anymap2", - "itertools", - "kstring", - "liquid-derive", - "num-traits", - "pest", - "pest_derive", - "regex", - "serde", - "time", -] - -[[package]] -name = "liquid-derive" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc2fb41a9bb4257a3803154bdf7e2df7d45197d1941c9b1a90ad815231630721" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.29", -] - -[[package]] -name = "liquid-lib" -version = "0.26.4" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2a17e273a6fb1fb6268f7a5867ddfd0bd4683c7e19b51084f3d567fad4348c0" -dependencies = [ - "itertools", - "liquid-core", - "once_cell", - "percent-encoding", - "regex", - "time", - "unicode-segmentation", -] +checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" [[package]] name = "lock_api" @@ -3455,6 +3844,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed1202b2a6f884ae56f04cff409ab315c5ce26b5e58d7412e484f01fd52f52ef" [[package]] +name = "maybe-async" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f1b8c13cb1f814b634a96b2c725449fe7ed464a7b8781de8688be5ffbd3f305" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] name = "maybe-owned" version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3471,9 +3871,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" [[package]] name = "memfd" @@ -3486,9 +3886,9 @@ dependencies = [ [[package]] name = "memmap2" -version = "0.5.10" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" +checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" dependencies = [ "libc", ] @@ -3588,7 +3988,7 @@ dependencies = [ "percent-encoding", "rand", "rustc_version_runtime", - "rustls 0.20.8", + "rustls 0.20.9", "rustls-pemfile", "serde", "serde_bytes", @@ -3603,8 +4003,8 @@ dependencies = [ "tokio", "tokio-rustls 0.23.4", "tokio-util", - "trust-dns-proto", - "trust-dns-resolver", + "trust-dns-proto 0.21.2", + "trust-dns-resolver 0.21.2", "typed-builder", "uuid", "webpki-roots 0.22.6", @@ -3617,12 +4017,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] -name = "names" -version = "0.14.0" +name = "nbuild-core" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bddcd3bf5144b6392de80e04c347cd7fab2508f6df16a85fc496ecd5cec39bc" +checksum = "5e5ab1b0a3450a5031ae7d555bb0c71dd3b15bf8a2f2af79e00aec91f69a4a0e" dependencies = [ - "rand", + "cargo-lock", + "cargo_metadata", + "target-spec", + "thiserror", + "tracing", ] [[package]] @@ -3646,18 +4050,6 @@ dependencies = [ ] [[package]] -name = "nix" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" -dependencies = [ - "bitflags 1.3.2", - "cfg-if 1.0.0", - "libc", - "static_assertions", -] - -[[package]] name = "nom" version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3668,24 +4060,6 @@ dependencies = [ ] [[package]] -name = "nom8" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8" -dependencies = [ - "memchr", -] - -[[package]] -name = "normpath" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec60c60a693226186f5d6edf073232bfb6464ed97eb22cf3b01c1e8198fd97f5" -dependencies = [ - "windows-sys 0.48.0", -] - -[[package]] name = "nu-ansi-term" version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3697,9 +4071,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", @@ -3802,9 +4176,9 @@ dependencies = [ [[package]] name = "object" -version = "0.31.1" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "memchr", ] @@ -3831,60 +4205,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] -name = "openssl" -version = "0.10.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "729b745ad4a5575dd06a3e1af1414bd330ee561c01b3899eb584baeaa8def17e" -dependencies = [ - "bitflags 1.3.2", - "cfg-if 1.0.0", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.29", -] - -[[package]] name = "openssl-probe" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] -name = "openssl-src" -version = "111.27.0+1.1.1v" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e8f197c82d7511c5b014030c9b1efeda40d7d5f99d23b4ceed3524a5e63f02" -dependencies = [ - "cc", -] - -[[package]] -name = "openssl-sys" -version = "0.9.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "866b5f16f90776b9bb8dc1e1802ac6f0513de3a7a7465867bfbc563dc737faac" -dependencies = [ - "cc", - "libc", - "openssl-src", - "pkg-config", - "vcpkg", -] - -[[package]] name = "opentelemetry" version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4058,24 +4384,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] -name = "path-absolutize" -version = "3.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f1d4993b16f7325d90c18c3c6a3327db7808752db8d208cea0acee0abd52c52" -dependencies = [ - "path-dedot", -] - -[[package]] -name = "path-dedot" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d55e486337acb9973cdea3ec5638c1b3bcb22e573b2b7b41969e0c744d5a15e" -dependencies = [ - "once_cell", -] - -[[package]] name = "pbkdf2" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4109,50 +4417,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] -name = "pest" -version = "2.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1acb4a4365a13f749a93f1a094a7805e5cfa0955373a9de860d962eaa3a5fe5a" -dependencies = [ - "thiserror", - "ucd-trie", -] - -[[package]] -name = "pest_derive" -version = "2.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "666d00490d4ac815001da55838c500eafb0320019bbaa44444137c48b443a853" -dependencies = [ - "pest", - "pest_generator", -] - -[[package]] -name = "pest_generator" -version = "2.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68ca01446f50dbda87c1786af8770d535423fa8a53aec03b8f4e3d7eb10e0929" -dependencies = [ - "pest", - "pest_meta", - "proc-macro2", - "quote", - "syn 2.0.29", -] - -[[package]] -name = "pest_meta" -version = "2.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56af0a30af74d0445c0bf6d9d051c979b516a1a5af790d251daee76005420a48" -dependencies = [ - "once_cell", - "pest", - "sha2 0.10.7", -] - -[[package]] name = "petgraph" version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4179,14 +4443,14 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] name = "pin-project-lite" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -4232,9 +4496,9 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "portable-atomic" -version = "1.4.2" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f32154ba0af3a075eefa1eda8bb414ee928f62303a54ea85b8d6638ff1a6ee9e" +checksum = "31114a898e107c51bb1609ffaf55a0e011cf6a4d7f1170d0015a165082c0338b" [[package]] name = "portpicker" @@ -4259,7 +4523,7 @@ checksum = "09963355b9f467184c04017ced4a2ba2d75cbcb4e7462690d388233253d4b1a9" dependencies = [ "anstyle", "difflib", - "itertools", + "itertools 0.10.5", "predicates-core", ] @@ -4324,12 +4588,6 @@ dependencies = [ ] [[package]] -name = "proc-macro-hack" -version = "0.5.20+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" - -[[package]] name = "proc-macro2" version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4339,6 +4597,12 @@ dependencies = [ ] [[package]] +name = "prodash" +version = "26.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "794b5bf8e2d19b53dcdcec3e4bba628e20f5b6062503ba89281fa7037dd7bbcf" + +[[package]] name = "proptest" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4376,7 +4640,7 @@ checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" dependencies = [ "bytes", "heck", - "itertools", + "itertools 0.10.5", "lazy_static", "log", "multimap", @@ -4397,7 +4661,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" dependencies = [ "anyhow", - "itertools", + "itertools 0.10.5", "proc-macro2", "quote", "syn 1.0.109", @@ -4581,13 +4845,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.8.4" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" +checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.4", + "regex-automata 0.3.8", + "regex-syntax 0.7.5", ] [[package]] @@ -4601,9 +4866,14 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" +checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.7.5", +] [[package]] name = "regex-syntax" @@ -4613,33 +4883,17 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" - -[[package]] -name = "remove_dir_all" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23895cfadc1917fed9c6ed76a8c2903615fa3704f7493ff82b364c6540acc02b" -dependencies = [ - "aligned", - "cfg-if 1.0.0", - "cvt", - "fs_at", - "lazy_static", - "libc", - "normpath", - "windows-sys 0.45.0", -] +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "reqwest" -version = "0.11.19" +version = "0.11.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20b9b67e2ca7dd9e9f9285b759de30ff538aab981abaaf7bc9bd90b84a0126c3" +checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" dependencies = [ - "base64 0.21.2", + "base64 0.21.4", "bytes", "encoding_rs", "futures-core", @@ -4657,7 +4911,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.6", + "rustls 0.21.7", "rustls-pemfile", "serde", "serde_json", @@ -4665,6 +4919,7 @@ dependencies = [ "tokio", "tokio-rustls 0.24.1", "tower-service", + "trust-dns-resolver 0.22.0", "url", "wasm-bindgen", "wasm-bindgen-futures", @@ -4690,9 +4945,9 @@ dependencies = [ [[package]] name = "reqwest-retry" -version = "0.2.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48d0fd6ef4c6d23790399fe15efc8d12cd9f3d4133958f9bd7801ee5cbaec6c4" +checksum = "9af20b65c2ee9746cc575acb6bd28a05ffc0d15e25c992a8f4462d8686aacb4f" dependencies = [ "anyhow", "async-trait", @@ -4723,9 +4978,9 @@ dependencies = [ [[package]] name = "retry-policies" -version = "0.1.2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e09bbcb5003282bcb688f0bae741b278e9c7e8f378f561522c9806c58e075d9b" +checksum = "a715dc4d0e8aea3085a9a94d76e79c79c7df7c9f6be609da841a6d2489ca3687" dependencies = [ "anyhow", "chrono", @@ -4739,39 +4994,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01ff60778f96fb5a48adbe421d21bf6578ed58c0872d712e7e08593c195adff8" dependencies = [ "comma", - "nix 0.25.1", + "nix", "regex", "tempfile", "thiserror", ] [[package]] -name = "rhai" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd29fa1f740be6dc91982013957e08c3c4232d7efcfe19e12da87d50bad47758" -dependencies = [ - "ahash 0.8.3", - "bitflags 1.3.2", - "instant", - "num-traits", - "rhai_codegen", - "smallvec", - "smartstring", -] - -[[package]] -name = "rhai_codegen" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db74e3fdd29d969a0ec1f8e79171a6f0f71d0429293656901db382d248c4c021" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] name = "ring" version = "0.16.20" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4851,7 +5080,7 @@ dependencies = [ "quote", "rust-embed-utils", "shellexpand", - "syn 2.0.29", + "syn 2.0.32", "walkdir", ] @@ -4892,7 +5121,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.18", + "semver 1.0.19", ] [[package]] @@ -4946,22 +5175,22 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.8" +version = "0.38.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" +checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662" dependencies = [ "bitflags 2.4.0", "errno", "libc", - "linux-raw-sys 0.4.5", + "linux-raw-sys 0.4.7", "windows-sys 0.48.0", ] [[package]] name = "rustls" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" dependencies = [ "log", "ring", @@ -4971,13 +5200,13 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.6" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb" +checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", "ring", - "rustls-webpki 0.101.3", + "rustls-webpki 0.101.4", "sct", ] @@ -4999,14 +5228,14 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64 0.21.2", + "base64 0.21.4", ] [[package]] name = "rustls-webpki" -version = "0.100.1" +version = "0.100.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" +checksum = "e98ff011474fa39949b7e5c0428f9b4937eda7da7848bbb947786b7be0b27dab" dependencies = [ "ring", "untrusted", @@ -5014,9 +5243,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.101.3" +version = "0.101.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "261e9e0888cba427c3316e6322805653c9425240b6fd96cee7cb671ab70ab8d0" +checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" dependencies = [ "ring", "untrusted", @@ -5032,7 +5261,7 @@ dependencies = [ "bitflags 1.3.2", "doc-comment", "finl_unicode", - "itertools", + "itertools 0.10.5", "lazy_static", "rustc-hash", "strsim", @@ -5073,16 +5302,6 @@ dependencies = [ ] [[package]] -name = "sanitize-filename" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08c502bdb638f1396509467cb0580ef3b29aa2a45c5d43e5d84928241280296c" -dependencies = [ - "lazy_static", - "regex", -] - -[[package]] name = "schannel" version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5141,9 +5360,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "ad977052201c6de01a8ef2aa3378c4bd23217a056337d1d6da40468d267a4fb0" dependencies = [ "serde", ] @@ -5156,9 +5375,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.171" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] @@ -5174,20 +5393,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.171" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] name = "serde_json" -version = "1.0.105" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" +checksum = "2cc66a619ed80bf7a0f6b17dd063a84b88f6dea1813737cf469aef1d081142c2" dependencies = [ "indexmap 2.0.0", "itoa", @@ -5213,7 +5432,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -5352,7 +5571,7 @@ dependencies = [ [[package]] name = "shuttle-admin" -version = "0.26.0" +version = "0.28.0" dependencies = [ "anyhow", "clap", @@ -5362,14 +5581,14 @@ dependencies = [ "serde_json", "shuttle-common", "tokio", - "toml 0.5.11", + "toml 0.7.8", "tracing", "tracing-subscriber", ] [[package]] name = "shuttle-auth" -version = "0.26.0" +version = "0.28.0" dependencies = [ "anyhow", "async-trait", @@ -5397,8 +5616,34 @@ dependencies = [ ] [[package]] +name = "shuttle-builder" +version = "0.28.0" +dependencies = [ + "async-trait", + "clap", + "flate2", + "hex", + "nbuild-core", + "os_pipe", + "portpicker", + "pretty_assertions", + "shuttle-common", + "shuttle-common-tests", + "shuttle-proto", + "tar", + "tempfile", + "thiserror", + "tokio", + "toml 0.7.8", + "tonic", + "tracing", + "tracing-subscriber", + "ulid", +] + +[[package]] name = "shuttle-codegen" -version = "0.26.0" +version = "0.28.0" dependencies = [ "pretty_assertions", "proc-macro-error", @@ -5408,14 +5653,14 @@ dependencies = [ "serde", "serde_json", "shuttle-common-tests", - "syn 2.0.29", + "syn 2.0.32", "tokio", "trybuild", ] [[package]] name = "shuttle-common" -version = "0.26.0" +version = "0.28.0" dependencies = [ "anyhow", "async-trait", @@ -5425,7 +5670,7 @@ dependencies = [ "cap-std", "chrono", "comfy-table", - "crossterm", + "crossterm 0.27.0", "headers", "http", "http-body", @@ -5443,6 +5688,7 @@ dependencies = [ "ring", "rmp-serde", "rustrict", + "semver 1.0.19", "serde", "serde_json", "sqlx", @@ -5451,7 +5697,7 @@ dependencies = [ "tokio", "tonic", "tower", - "tower-http 0.4.3", + "tower-http 0.4.4", "tracing", "tracing-fluent-assertions", "tracing-opentelemetry", @@ -5463,7 +5709,7 @@ dependencies = [ [[package]] name = "shuttle-common-tests" -version = "0.26.0" +version = "0.28.0" dependencies = [ "cargo-shuttle", "hyper", @@ -5479,7 +5725,7 @@ dependencies = [ [[package]] name = "shuttle-deployer" -version = "0.26.0" +version = "0.28.0" dependencies = [ "anyhow", "async-trait", @@ -5518,10 +5764,10 @@ dependencies = [ "thiserror", "tokio", "tokio-stream", - "toml 0.5.11", + "toml 0.7.8", "tonic", "tower", - "tower-http 0.4.3", + "tower-http 0.4.4", "tracing", "tracing-opentelemetry", "tracing-subscriber", @@ -5533,13 +5779,12 @@ dependencies = [ [[package]] name = "shuttle-gateway" -version = "0.26.0" +version = "0.28.0" dependencies = [ "anyhow", "async-trait", "axum", "axum-server", - "base64 0.13.1", "bollard", "chrono", "clap", @@ -5563,11 +5808,12 @@ dependencies = [ "rcgen", "reqwest", "ring", - "rustls 0.20.8", + "rustls 0.20.9", "rustls-pemfile", "serde", "serde_json", "shuttle-common", + "shuttle-orchestrator", "shuttle-proto", "snailquote", "sqlx", @@ -5576,7 +5822,7 @@ dependencies = [ "tokio", "tonic", "tower", - "tower-http 0.4.3", + "tower-http 0.4.4", "tower-sanitize-path", "tracing", "tracing-opentelemetry", @@ -5591,7 +5837,7 @@ dependencies = [ [[package]] name = "shuttle-logger" -version = "0.26.0" +version = "0.28.0" dependencies = [ "async-trait", "chrono", @@ -5616,11 +5862,16 @@ dependencies = [ ] [[package]] +name = "shuttle-orchestrator" +version = "0.28.0" + +[[package]] name = "shuttle-proto" -version = "0.26.0" +version = "0.28.0" dependencies = [ "anyhow", "chrono", + "dunce", "home", "prost", "prost-types", @@ -5635,7 +5886,7 @@ dependencies = [ [[package]] name = "shuttle-provisioner" -version = "0.26.0" +version = "0.28.0" dependencies = [ "aws-config", "aws-sdk-rds", @@ -5661,7 +5912,7 @@ dependencies = [ [[package]] name = "shuttle-resource-recorder" -version = "0.26.0" +version = "0.28.0" dependencies = [ "async-trait", "chrono", @@ -5685,7 +5936,7 @@ dependencies = [ [[package]] name = "shuttle-runtime" -version = "0.26.0" +version = "0.28.0" dependencies = [ "anyhow", "async-trait", @@ -5719,7 +5970,7 @@ dependencies = [ [[package]] name = "shuttle-service" -version = "0.26.0" +version = "0.28.0" dependencies = [ "anyhow", "async-trait", @@ -5731,7 +5982,7 @@ dependencies = [ "strfmt", "thiserror", "tokio", - "toml 0.5.11", + "toml 0.7.8", "tracing", ] @@ -5789,9 +6040,9 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] @@ -5809,17 +6060,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] -name = "smartstring" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29" -dependencies = [ - "autocfg", - "static_assertions", - "version_check", -] - -[[package]] name = "snailquote" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5876,11 +6116,11 @@ dependencies = [ [[package]] name = "sqlformat" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c12bc9199d1db8234678b7051747c07f517cdcf019262d1847b94ec8b1aee3e" +checksum = "6b7b278788e7be4d0d29c0f39497a0eef3fba6bbc8e70d8bf7fde46edeaa9e85" dependencies = [ - "itertools", + "itertools 0.11.0", "nom", "unicode_categories", ] @@ -5904,7 +6144,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd4cef4251aabbae751a3710927945901ee1d97ee96d757f6880ebb9a79bfd53" dependencies = [ - "ahash 0.8.3", + "ahash", "atoi", "byteorder", "bytes", @@ -5927,7 +6167,7 @@ dependencies = [ "once_cell", "paste", "percent-encoding", - "rustls 0.21.6", + "rustls 0.21.7", "rustls-pemfile", "serde", "serde_json", @@ -5989,7 +6229,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ca69bf415b93b60b80dc8fda3cb4ef52b2336614d8da2de5456cc942a110482" dependencies = [ "atoi", - "base64 0.21.2", + "base64 0.21.4", "bitflags 2.4.0", "byteorder", "bytes", @@ -6033,7 +6273,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0db2df1b8731c3651e204629dd55e52adbae0462fa1bdcbed56a2302c18181e" dependencies = [ "atoi", - "base64 0.21.2", + "base64 0.21.4", "bitflags 2.4.0", "byteorder", "chrono", @@ -6098,12 +6338,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] name = "strfmt" version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6111,10 +6345,11 @@ checksum = "7a8348af2d9fc3258c8733b8d9d8db2e56f54b2363a4b5b81585c7875ed65e65" [[package]] name = "stringprep" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3737bde7edce97102e0e2b15365bf7a20bfdb5f60f4f9e8d7004258a51a8da" +checksum = "bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6" dependencies = [ + "finl_unicode", "unicode-bidi", "unicode-normalization", ] @@ -6166,9 +6401,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.29" +version = "2.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" +checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" dependencies = [ "proc-macro2", "quote", @@ -6204,9 +6439,9 @@ dependencies = [ "cap-std", "fd-lock", "io-lifetimes 2.0.2", - "rustix 0.38.8", + "rustix 0.38.13", "windows-sys 0.48.0", - "winx 0.36.1", + "winx 0.36.2", ] [[package]] @@ -6239,6 +6474,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" [[package]] +name = "target-spec" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bf4306559bd50cb358e7af5692694d6f6fad95cf2c0bea2571dd419f5298e12" +dependencies = [ + "cfg-expr", + "guppy-workspace-hack", + "target-lexicon", +] + +[[package]] name = "task-local-extensions" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6249,15 +6495,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.5.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if 1.0.0", - "fastrand 1.9.0", + "fastrand 2.0.0", "redox_syscall 0.3.5", - "rustix 0.37.23", - "windows-sys 0.45.0", + "rustix 0.38.13", + "windows-sys 0.48.0", ] [[package]] @@ -6298,22 +6544,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.47" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" +checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.47" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" +checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -6328,9 +6574,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a79d09ac6b08c1ab3906a2f7cc2e81a0e27c7ae89c63812df75e52bef0751e07" +checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" dependencies = [ "deranged", "itoa", @@ -6349,23 +6595,14 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75c65469ed6b3a4809d987a41eb1dc918e9bc1d92211cbad7ae82931846f7451" +checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" dependencies = [ "time-core", ] [[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - -[[package]] name = "tinyvec" version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6417,7 +6654,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -6426,7 +6663,7 @@ version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ - "rustls 0.20.8", + "rustls 0.20.9", "tokio", "webpki", ] @@ -6437,7 +6674,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.6", + "rustls 0.21.7", "tokio", ] @@ -6454,9 +6691,9 @@ dependencies = [ [[package]] name = "tokio-test" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53474327ae5e166530d17f2d956afcb4f8a004de581b3cae10f12006bc8163e3" +checksum = "e89b3cbabd3ae862100094ae433e1def582cf86451b4e9bf83aa7ac1d8a7d719" dependencies = [ "async-stream", "bytes", @@ -6467,29 +6704,17 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec509ac96e9a0c43427c74f003127d953a265737636129424288d27cb5c4b12c" -dependencies = [ - "futures-util", - "log", - "rustls 0.21.6", - "tokio", - "tokio-rustls 0.24.1", - "tungstenite 0.19.0", - "webpki-roots 0.23.1", -] - -[[package]] -name = "tokio-tungstenite" version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b2dbec703c26b00d74844519606ef15d09a7d6857860f84ad223dec002ddea2" dependencies = [ "futures-util", "log", + "rustls 0.21.7", "tokio", - "tungstenite 0.20.0", + "tokio-rustls 0.24.1", + "tungstenite", + "webpki-roots 0.23.1", ] [[package]] @@ -6535,24 +6760,18 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.6" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" dependencies = [ "serde", "serde_spanned", - "toml_datetime 0.6.3", - "toml_edit 0.19.14", + "toml_datetime", + "toml_edit", ] [[package]] name = "toml_datetime" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5" - -[[package]] -name = "toml_datetime" version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" @@ -6562,26 +6781,14 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.16.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd30deba9a1cd7153c22aecf93e86df639e7b81c622b0af8d9255e989991a7b7" -dependencies = [ - "indexmap 1.9.3", - "itertools", - "nom8", - "toml_datetime 0.5.1", -] - -[[package]] -name = "toml_edit" -version = "0.19.14" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ "indexmap 2.0.0", "serde", "serde_spanned", - "toml_datetime 0.6.3", + "toml_datetime", "winnow", ] @@ -6688,11 +6895,11 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ae70283aba8d2a8b411c695c437fe25b8b5e44e23e780662002fc72fb47a82" +checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" dependencies = [ - "base64 0.21.2", + "base64 0.21.4", "bitflags 2.4.0", "bytes", "futures-core", @@ -6752,7 +6959,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -6838,7 +7045,7 @@ dependencies = [ "async-trait", "cfg-if 1.0.0", "data-encoding", - "enum-as-inner", + "enum-as-inner 0.4.0", "futures-channel", "futures-io", "futures-util", @@ -6855,6 +7062,31 @@ dependencies = [ ] [[package]] +name = "trust-dns-proto" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26" +dependencies = [ + "async-trait", + "cfg-if 1.0.0", + "data-encoding", + "enum-as-inner 0.5.1", + "futures-channel", + "futures-io", + "futures-util", + "idna 0.2.3", + "ipnet", + "lazy_static", + "rand", + "smallvec", + "thiserror", + "tinyvec", + "tokio", + "tracing", + "url", +] + +[[package]] name = "trust-dns-resolver" version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6871,7 +7103,27 @@ dependencies = [ "smallvec", "thiserror", "tokio", - "trust-dns-proto", + "trust-dns-proto 0.21.2", +] + +[[package]] +name = "trust-dns-resolver" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aff21aa4dcefb0a1afbfac26deb0adc93888c7d295fb63ab273ef276ba2b7cfe" +dependencies = [ + "cfg-if 1.0.0", + "futures-util", + "ipconfig", + "lazy_static", + "lru-cache", + "parking_lot 0.12.1", + "resolv-conf", + "smallvec", + "thiserror", + "tokio", + "tracing", + "trust-dns-proto 0.22.0", ] [[package]] @@ -6882,9 +7134,9 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "trybuild" -version = "1.0.83" +version = "1.0.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6df60d81823ed9c520ee897489573da4b1d79ffbe006b8134f46de1a1aa03555" +checksum = "a5c89fd17b7536f2cf66c97cff6e811e89e728ca0ed13caeed610c779360d8b4" dependencies = [ "basic-toml", "glob", @@ -6906,27 +7158,6 @@ dependencies = [ [[package]] name = "tungstenite" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15fba1a6d6bb030745759a9a2a588bfe8490fc8b4751a277db3a0be1c9ebbf67" -dependencies = [ - "byteorder", - "bytes", - "data-encoding", - "http", - "httparse", - "log", - "rand", - "rustls 0.21.6", - "sha1", - "thiserror", - "url", - "utf-8", - "webpki", -] - -[[package]] -name = "tungstenite" version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e862a1c4128df0112ab625f55cd5c934bcb4312ba80b39ae4b4835a3fd58e649" @@ -6938,6 +7169,7 @@ dependencies = [ "httparse", "log", "rand", + "rustls 0.21.7", "sha1", "thiserror", "url", @@ -6962,16 +7194,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] -name = "ucd-trie" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" - -[[package]] name = "ulid" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13a3aaa69b04e5b66cc27309710a569ea23593612387d67daaf102e73aa974fd" +checksum = "0f9d3475df4ff8a8f7804c0fc3394b44fdcfc4fb635717bf05fbb7c41c83a376" dependencies = [ "rand", "serde", @@ -7000,9 +7226,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-bom" -version = "1.1.4" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63ec69f541d875b783ca40184d655f2927c95f0bffd486faa83cd3ac3529ec32" +checksum = "98e90c70c9f0d4d1ee6d0a7d04aa06cb9bbd53d8cfbdd62a0269a7c2eb640552" [[package]] name = "unicode-ident" @@ -7051,9 +7277,9 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "url" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", "idna 0.4.0", @@ -7108,7 +7334,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", "uuid", ] @@ -7261,7 +7487,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", "wasm-bindgen-shared", ] @@ -7295,7 +7521,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -7308,9 +7534,9 @@ checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "wasm-encoder" -version = "0.31.1" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41763f20eafed1399fff1afb466496d3a959f58241436cfdc17e3f5ca954de16" +checksum = "1ba64e81215916eaeb48fee292f29401d69235d62d8b8fd92a7b2844ec5ae5f7" dependencies = [ "leb128", ] @@ -7388,7 +7614,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a66f6967ff6d89a4aa0abe11a145c7a2538f10d9dca6a0718dba6470166c8182" dependencies = [ "anyhow", - "base64 0.21.2", + "base64 0.21.4", "bincode", "directories-next", "file-per-thread-logger", @@ -7434,7 +7660,7 @@ dependencies = [ "cranelift-frontend", "cranelift-native", "cranelift-wasm", - "gimli", + "gimli 0.27.3", "log", "object 0.30.4", "target-lexicon", @@ -7451,7 +7677,7 @@ checksum = "78a205f0f0ea33bcb56756718a9a9ca1042614237d6258893c519f6fed593325" dependencies = [ "anyhow", "cranelift-entity", - "gimli", + "gimli 0.27.3", "indexmap 1.9.3", "log", "object 0.30.4", @@ -7486,7 +7712,7 @@ dependencies = [ "bincode", "cfg-if 1.0.0", "cpp_demangle", - "gimli", + "gimli 0.27.3", "ittapi", "log", "object 0.30.4", @@ -7595,9 +7821,9 @@ dependencies = [ [[package]] name = "wast" -version = "63.0.0" +version = "64.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2560471f60a48b77fccefaf40796fda61c97ce1e790b59dfcec9dc3995c9f63a" +checksum = "a259b226fd6910225aa7baeba82f9d9933b6d00f2ce1b49b80fa4214328237cc" dependencies = [ "leb128", "memchr", @@ -7607,11 +7833,11 @@ dependencies = [ [[package]] name = "wat" -version = "1.0.70" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bdc306c2c4c2f2bf2ba69e083731d0d2a77437fc6a350a19db139636e7e416c" +checksum = "53253d920ab413fca1c7dc2161d601c79b4fdf631d0ba51dd4343bf9b556c3f6" dependencies = [ - "wast 63.0.0", + "wast 64.0.0", ] [[package]] @@ -7643,9 +7869,9 @@ dependencies = [ [[package]] name = "webpki" -version = "0.22.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +checksum = "f0e74f82d49d545ad128049b7e88f6576df2da6b02e9ce565c6f533be576957e" dependencies = [ "ring", "untrusted", @@ -7666,7 +7892,7 @@ version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" dependencies = [ - "rustls-webpki 0.100.1", + "rustls-webpki 0.100.2", ] [[package]] @@ -7675,7 +7901,7 @@ version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888" dependencies = [ - "rustls-webpki 0.101.3", + "rustls-webpki 0.101.4", ] [[package]] @@ -7686,13 +7912,14 @@ checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" [[package]] name = "which" -version = "4.4.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" dependencies = [ "either", - "libc", + "home", "once_cell", + "rustix 0.38.13", ] [[package]] @@ -7782,21 +8009,6 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.43.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04662ed0e3e5630dfa9b26e4cb823b817f1a9addda855d973a9458c236556244" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" @@ -7938,9 +8150,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.14" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d09770118a7eb1ccaf4a594a221334119a44a814fcb0d31c5b85e83e97227a97" +checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" dependencies = [ "memchr", ] @@ -7968,9 +8180,9 @@ dependencies = [ [[package]] name = "winx" -version = "0.36.1" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4857cedf8371f690bb6782a3e2b065c54d1b6661be068aaf3eac8b45e813fdf8" +checksum = "357bb8e2932df531f83b052264b050b81ba0df90ee5a59b2d1d3949f344f81e5" dependencies = [ "bitflags 2.4.0", "windows-sys 0.48.0", diff --git a/pkgs/development/tools/rust/cargo-shuttle/default.nix b/pkgs/development/tools/rust/cargo-shuttle/default.nix index db18ac85ab65a..b8d5cf5270466 100644 --- a/pkgs/development/tools/rust/cargo-shuttle/default.nix +++ b/pkgs/development/tools/rust/cargo-shuttle/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-shuttle"; - version = "0.26.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "shuttle-hq"; repo = "shuttle"; rev = "v${version}"; - hash = "sha256-O6erIv+6DbxioB4F1Mfaj51zSswQErcUuFdA+A7DQRA="; + hash = "sha256-iBUd42MEfDFMhHXBrgrJaihUeYTRpVt4jFQaKCKhNlc="; }; cargoLock = { diff --git a/pkgs/development/tools/rust/cargo-tally/default.nix b/pkgs/development/tools/rust/cargo-tally/default.nix index 3c83dd5437a53..11b82f3fd8725 100644 --- a/pkgs/development/tools/rust/cargo-tally/default.nix +++ b/pkgs/development/tools/rust/cargo-tally/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tally"; - version = "1.0.29"; + version = "1.0.30"; src = fetchCrate { inherit pname version; - sha256 = "sha256-SCxigQ6jhT+r6ixgCGwWDtvU8WUJ+5eWYe8DIWPBWhY="; + hash = "sha256-5k4nx4VSYN4jscCwj5NVYnV5/GS0PRCA23xR6STHr88="; }; - cargoSha256 = "sha256-ZX2T+wKIgYJqOK6118wmsMBKigtJvPqJ2hVtyh23zUk="; + cargoHash = "sha256-eyGDizffuIPpa797YplD6763/JlVtoMAxybK9KsgmLE="; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ DiskArbitration diff --git a/pkgs/development/tools/rust/duckscript/default.nix b/pkgs/development/tools/rust/duckscript/default.nix index 563a744d5dbfd..1069d81b5b249 100644 --- a/pkgs/development/tools/rust/duckscript/default.nix +++ b/pkgs/development/tools/rust/duckscript/default.nix @@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec { pname = "duckscript_cli"; - version = "0.8.20"; + version = "0.9.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-o9GKcRBtQn0m8pQHlokACGVBArd4khtoJ6e4Q2hcT14="; + hash = "sha256-jpAZpx8VooYapSLApWWMLTj7c3wqw/S1w1zHN3OGzMs="; }; nativeBuildInputs = [ pkg-config ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ]; - cargoHash = "sha256-dG7bBg/pRcSWWV0NK8gWbXAmsNipHQKUwmTHHFdUsrc="; + cargoHash = "sha256-n40V75yIuSC1abq4/cYFqj9JqGj/uJ36ZSz8APovE6o="; meta = with lib; { description = "Simple, extendable and embeddable scripting language."; diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix index 8780b8892fa1f..4b66ecfa4674c 100644 --- a/pkgs/development/tools/rust/maturin/default.nix +++ b/pkgs/development/tools/rust/maturin/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "maturin"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - hash = "sha256-uaDTL6dfH+zqjMbLtgLaZRe91mDuyKA0afw+3LFF+1U="; + hash = "sha256-hxtT5cL1PTXkTXGB0nVPhMI8Vlqrk4q2MHW0KGosFwc="; }; - cargoHash = "sha256-DF8O3YrHr0tBStnmnUUUF4QaZcoXYCCweZoEig4etQA="; + cargoHash = "sha256-IZWh/Bp9TdB+flc1PXVkwrIdOr83TFk6X6O5M0FVaO4="; buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ]; diff --git a/pkgs/development/tools/rust/rtthost/default.nix b/pkgs/development/tools/rust/rtthost/default.nix new file mode 100644 index 0000000000000..0fa47e544ae71 --- /dev/null +++ b/pkgs/development/tools/rust/rtthost/default.nix @@ -0,0 +1,33 @@ +{ lib +, stdenv +, rustPlatform +, fetchCrate +, pkg-config +, libusb1 +, DarwinTools +, AppKit +}: + +rustPlatform.buildRustPackage rec { + pname = "rtthost"; + version = "0.20.0"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-h/D2LW8tQ2WfVrP+HOLs3Gg7HS2Rd0zXBxbnxvEeiWk="; + }; + + cargoHash = "sha256-cEzp33y1wuOrKHJBdAPxWUc1ANpT7Sg1MZmaCno1WKA="; + + nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; + + buildInputs = [ libusb1 ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; + + meta = with lib; { + description = "RTT (Real-Time Transfer) client"; + homepage = "https://probe.rs/"; + changelog = "https://github.com/probe-rs/probe-rs/blob/v${version}/CHANGELOG.md"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ samueltardieu ]; + }; +} diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 2a002feb2aac3..e8a3993787ff6 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2023-09-11"; - cargoSha256 = "sha256-bdF88QG++8ieFLG9H6D6nR6d9GHna36HMskp6TnTA4c="; + version = "2023-09-25"; + cargoSha256 = "sha256-XasY8wXX/OfShbOo8SmwBZAAAYSp8s9ICBuG8ExDAF0="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-6GjjGVCn0lNlGQifjM8AqRRMzVxf/KNyQqmAl8a9HME="; + sha256 = "sha256-QQnECNVhYrkG5hHaMh9m0r719CQIfEVFnYNix701DUQ="; }; cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ]; diff --git a/pkgs/development/tools/rust/rust-script/default.nix b/pkgs/development/tools/rust/rust-script/default.nix index a70c67037ff22..6551c838e3d8f 100644 --- a/pkgs/development/tools/rust/rust-script/default.nix +++ b/pkgs/development/tools/rust/rust-script/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rust-script"; - version = "0.31.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "fornwall"; repo = pname; rev = version; - sha256 = "sha256-W0+UaP0aROfGuvWhPcq6QYJZ6XgUAp4XARTzr3Pch/o="; + sha256 = "sha256-VyiVa1aeJslH1Vkg0TvON7VDiJVMIIbrlmx2FRDz75o="; }; - cargoSha256 = "sha256-dNtAee7lyrlamZEtkrrGgs25xW74UixI4NdeD35wzJU="; + cargoSha256 = "sha256-K7wT5Og1nx+UcsehLbpUx0NlvoaicMDd02SkUoAncwI="; # tests require network access doCheck = false; diff --git a/pkgs/development/tools/rust/svd2rust/default.nix b/pkgs/development/tools/rust/svd2rust/default.nix index d11a798fb7915..c9445882282da 100644 --- a/pkgs/development/tools/rust/svd2rust/default.nix +++ b/pkgs/development/tools/rust/svd2rust/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "svd2rust"; - version = "0.30.0"; + version = "0.30.1"; src = fetchCrate { inherit pname version; - hash = "sha256-/fB6Ay9t5WkBtHVYne/dbj+PXurMpzKAb7/OFD4j7U4="; + hash = "sha256-Yjdrz/8uonM2kRCNAe6YZNPDDVmjqDiEk8CwgZUbBCg="; }; - cargoHash = "sha256-PD2UsLVfc6D726BpE6a1MKjspL3/g2D9sweCmVXtH1E="; + cargoHash = "sha256-875B7e/RCXs84yiwou5NZgxmjolxCKkQsUcRxXnV+Qo="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' diff --git a/pkgs/development/tools/rye/Cargo.lock b/pkgs/development/tools/rye/Cargo.lock index 058cbe8ced7ca..892612190b109 100644 --- a/pkgs/development/tools/rye/Cargo.lock +++ b/pkgs/development/tools/rye/Cargo.lock @@ -335,7 +335,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.29", ] [[package]] @@ -394,6 +394,40 @@ dependencies = [ ] [[package]] +name = "crossbeam-channel" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +dependencies = [ + "autocfg", + "cfg-if", + "crossbeam-utils", + "memoffset", + "scopeguard", +] + +[[package]] name = "crossbeam-utils" version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -602,7 +636,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.29", ] [[package]] @@ -1144,6 +1178,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[package]] name = "minijinja" version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1230,6 +1273,16 @@ dependencies = [ ] [[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] name = "number_prefix" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1447,9 +1500,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.56" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] @@ -1481,9 +1534,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.27" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -1566,6 +1619,28 @@ dependencies = [ ] [[package]] +name = "rayon" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "num_cpus", +] + +[[package]] name = "redox_syscall" version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1697,7 +1772,7 @@ dependencies = [ [[package]] name = "rye" -version = "0.13.0" +version = "0.15.2" dependencies = [ "age", "anyhow", @@ -1740,6 +1815,7 @@ dependencies = [ "toml_edit", "url", "walkdir", + "whattheshell", "which", "winapi", "zip", @@ -1840,7 +1916,7 @@ checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.29", ] [[package]] @@ -1964,9 +2040,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.15" +version = "2.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" dependencies = [ "proc-macro2", "quote", @@ -1975,15 +2051,16 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.29.4" +version = "0.29.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "751e810399bba86e9326f5762b7f32ac5a085542df78da6a78d94e07d14d7c11" +checksum = "a8d0e9cc2273cc8d31377bdd638d72e3ac3e5607b18621062b169d02787f1bab" dependencies = [ "cfg-if", "core-foundation-sys", "libc", "ntapi", "once_cell", + "rayon", "winapi", ] @@ -2023,22 +2100,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.29", ] [[package]] @@ -2156,7 +2233,7 @@ checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.29", ] [[package]] @@ -2304,6 +2381,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] +name = "whattheshell" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d2a141eb1ec499706110282b3f2d2b44f28872b6efec92ee76e3b3fc900745d" +dependencies = [ + "sysinfo", + "thiserror", +] + +[[package]] name = "which" version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2538,7 +2625,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.29", ] [[package]] diff --git a/pkgs/development/tools/rye/default.nix b/pkgs/development/tools/rye/default.nix index 714a54cfa23e1..fb5cc68d9e70a 100644 --- a/pkgs/development/tools/rye/default.nix +++ b/pkgs/development/tools/rye/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "rye"; - version = "0.13.0"; + version = "0.15.2"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "rye"; rev = "refs/tags/${version}"; - hash = "sha256-B53oTAgy+y+FWk7y+unJPt7Mc7m4nwnTX+5wqL6AX+4="; + hash = "sha256-q7/obBE16aKb8BHf5ycXSgXTMLWAFwxSnJ3qV35TdL8="; }; cargoLock = { diff --git a/pkgs/development/tools/sentry-cli/default.nix b/pkgs/development/tools/sentry-cli/default.nix index 5f7fa29befabc..c84ceff3e613a 100644 --- a/pkgs/development/tools/sentry-cli/default.nix +++ b/pkgs/development/tools/sentry-cli/default.nix @@ -9,13 +9,13 @@ }: rustPlatform.buildRustPackage rec { pname = "sentry-cli"; - version = "2.20.7"; + version = "2.21.1"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-cli"; rev = version; - sha256 = "sha256-H1WRjNMYcWqc9Y8H7agzA7uMhvlA4DXpJOUpbUG+xxU="; + sha256 = "sha256-GMK3fAmYYxwwlXXbCluDFu8YWId77F4mrdxXIIO+jc8="; }; doCheck = false; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; nativeBuildInputs = [ pkg-config ]; - cargoHash = "sha256-WLnvyQQ51dIsD5g3FjHJhA+EqB1UEHghwxI/TVYwNdo="; + cargoHash = "sha256-wUQ9HbBNNB66394RPHaoGJkFrL28xW5CIXDzGnMIPKY="; meta = with lib; { homepage = "https://docs.sentry.io/cli/"; diff --git a/pkgs/development/tools/sq/default.nix b/pkgs/development/tools/sq/default.nix index 058c84b3c910b..75e18ba664b39 100644 --- a/pkgs/development/tools/sq/default.nix +++ b/pkgs/development/tools/sq/default.nix @@ -2,16 +2,16 @@ buildGo121Module rec { pname = "sq"; - version = "0.42.0"; + version = "0.42.1"; src = fetchFromGitHub { owner = "neilotoole"; repo = pname; rev = "v${version}"; - hash = "sha256-IL3041R35WL+sYCpTjfPXUpd7GTcQoaILYBufwH1WoE="; + hash = "sha256-3Hu0vMulGWyNWgNlekYuTRxxxBbRkWj2RE0MWZzNXFk="; }; - vendorHash = "sha256-ez5qhGgK0q3oDT0L0Fs+JKJjMbNoJukzCoir2a9ro48="; + vendorHash = "sha256-qEwK40BcUetsQOIefdjM/dgjTNuHO1EZgVk53/dfOlc="; proxyVendor = true; diff --git a/pkgs/development/tools/statik/default.nix b/pkgs/development/tools/statik/default.nix index a5af2ed2d31ce..e77cf8f3bb0b1 100644 --- a/pkgs/development/tools/statik/default.nix +++ b/pkgs/development/tools/statik/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "ahsNiac/3I2+PUqc90E73Brb99M68ewh9nWXoupfE3g="; }; - vendorSha256 = null; + vendorHash = null; # Avoid building example subPackages = [ "." "fs" ]; diff --git a/pkgs/development/tools/symfony-cli/default.nix b/pkgs/development/tools/symfony-cli/default.nix index acae7f04f6afe..d626027ee1862 100644 --- a/pkgs/development/tools/symfony-cli/default.nix +++ b/pkgs/development/tools/symfony-cli/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "symfony-cli"; - version = "5.5.8"; - vendorHash = "sha256-hOYVIynWsbsindNJRbXX4NkC3FW3RErORCSLlV1bCWc="; + version = "5.5.10"; + vendorHash = "sha256-eeVi/O4p7bF4CPqJBCpLfx1Yc5vZZ3b8RV5ERcIL8H4="; src = fetchFromGitHub { owner = "symfony-cli"; repo = "symfony-cli"; rev = "v${version}"; - hash = "sha256-K2DttdK8g5NI+XlGwIA9HTPTLlMGgGc1K625FquIhi4="; + hash = "sha256-n0R+J41lJYxswMnknYAAEKwwIqOremZF73cRBYfD3CE="; }; ldflags = [ diff --git a/pkgs/development/tools/tabnine/sources.json b/pkgs/development/tools/tabnine/sources.json index 7ec3dd45378a9..96a791ff0981d 100644 --- a/pkgs/development/tools/tabnine/sources.json +++ b/pkgs/development/tools/tabnine/sources.json @@ -1,17 +1,17 @@ { - "version": "4.4.282", + "version": "4.10.0", "platforms": { "x86_64-linux": { "name": "x86_64-unknown-linux-musl", - "hash": "sha256-ddf30gAKYztw6RD5fPK/eb7AoYp/SiN9hDDEuUT3LZE=" + "hash": "sha256-sVjSrQsdOtWvuYZqLSmlsbu2yKe7MYBOxctrKlltlwY=" }, "aarch64-darwin": { "name": "aarch64-apple-darwin", - "hash": "sha256-fZyovA6Oq/jGF1OAzm/6nfldaVtZyor9IJGQtVmCVLM=" + "hash": "sha256-HMPK09rOwRbsRwiHwjXZnDt4evEz2CP8zAReg/bhgTg=" }, "x86_64-darwin": { "name": "x86_64-apple-darwin", - "hash": "sha256-4oVDbUtl+zkaL9kDCdfAvCCDlJRZG8ho0LufKx7nTkg=" + "hash": "sha256-8y96VXWvHYTO+qs8x6ND5tD3Mb4qBXwdcIeYBLOkCdc=" } } } diff --git a/pkgs/development/tools/textql/default.nix b/pkgs/development/tools/textql/default.nix index 3a1a6bcd05dac..74953d0e3fabb 100644 --- a/pkgs/development/tools/textql/default.nix +++ b/pkgs/development/tools/textql/default.nix @@ -8,7 +8,7 @@ buildGoModule rec { owner = "dinedal"; repo = "textql"; rev = "fca00ecc76c8d9891b195ad2c1359d39f0213604"; - sha256 = "1v1nq7q2jr7d7kimlbykmh9d73cw750ybcz7v7l091qxjsii3irm"; + hash = "sha256-NccRo5YdhwTo2eez5UE5nI3TEqzTL1rjPO1kKfDBNuw="; }; patches = [ @@ -19,7 +19,7 @@ buildGoModule rec { }) ]; - vendorSha256 = "1h77wfs3plgcsysb13jk526gnbcw2j0xbbrvc68mz6nk1mj6scgw"; + vendorHash = "sha256-/DFtZA3Tml+RYTuv1YEUnC37jChTjrC01+zRO7Tj58A="; postInstall = '' install -Dm644 -t $out/share/man/man1 ${src}/man/textql.1 diff --git a/pkgs/development/tools/treefmt/default.nix b/pkgs/development/tools/treefmt/default.nix index 221c9847cba86..2567afc4082b8 100644 --- a/pkgs/development/tools/treefmt/default.nix +++ b/pkgs/development/tools/treefmt/default.nix @@ -1,16 +1,16 @@ { lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "treefmt"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "numtide"; repo = "treefmt"; rev = "v${version}"; - hash = "sha256-v+hXWyrY0GfSgXeqgYLgoOmeiHsZyhRO9Fmj5rPiNJ8="; + hash = "sha256-PALt0tSCYbViC1RHrri0IiD4TUjMnkIwgd3Pe+K9i3Q="; }; - cargoSha256 = "sha256-/WyaZxRFYJmz/qRp2s2v8swdwAtuNR7KXND20IzQoy8="; + cargoSha256 = "sha256-MkjLAaktc0A0yJqixpgnrn8NOHVmcaQL65L0TvrEPRg="; meta = { description = "one CLI to format the code tree"; diff --git a/pkgs/development/tools/trunk-io/default.nix b/pkgs/development/tools/trunk-io/default.nix index d9be944f61fb4..78b5247a49113 100644 --- a/pkgs/development/tools/trunk-io/default.nix +++ b/pkgs/development/tools/trunk-io/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "trunk-io"; version = "1.2.7"; src = fetchurl { - url = "https://trunk.io/releases/launcher/${version}/trunk"; + url = "https://trunk.io/releases/launcher/${finalAttrs.version}/trunk"; hash = "sha256-i2m+6Y6gvkHYwzESJv0DkLcHkXqz+g4e43TV6u1UTj8="; }; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { license = licenses.unfree; maintainers = with maintainers; [ aaronjheng ]; }; -} +}) diff --git a/pkgs/development/tools/ttfb/default.nix b/pkgs/development/tools/ttfb/default.nix index abfc5440734cf..550a8f1a87621 100644 --- a/pkgs/development/tools/ttfb/default.nix +++ b/pkgs/development/tools/ttfb/default.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage rec { pname = "ttfb"; - version = "1.6.0"; + version = "1.7.0"; src = fetchCrate { inherit pname version; - hash = "sha256-o7kzQ8jtAqDwTUPtjeNqgotxREeWl7jQG+EDrYWJL/Q="; + hash = "sha256-GxjG8pyE2rY0h1dpAo+HRUbP31I5Pm4h1fAb6R7V+qU="; }; - cargoHash = "sha256-ayyYrrFDVOYVjVo5TLaRn2mvmywe5BjQ7kRVV2r0iK8="; + cargoHash = "sha256-YdbVtVKt0bKb1R5IQxf9J/0ZA3ZHH+oZ8ryX6f4cGsY="; # The bin feature activates all dependencies of the binary. Otherwise, # only the library is build. diff --git a/pkgs/development/tools/turso-cli/default.nix b/pkgs/development/tools/turso-cli/default.nix index e680ca3f5feca..0859e1a362c20 100644 --- a/pkgs/development/tools/turso-cli/default.nix +++ b/pkgs/development/tools/turso-cli/default.nix @@ -1,28 +1,48 @@ { lib, - buildGoModule, + stdenv, + buildGo121Module, fetchFromGitHub, + installShellFiles, }: -buildGoModule rec { +buildGo121Module rec { pname = "turso-cli"; - version = "0.82.0"; + version = "0.85.3"; src = fetchFromGitHub { owner = "tursodatabase"; repo = "turso-cli"; rev = "v${version}"; - hash = "sha256-JFuD10EhR1/nmYPMnNsR/8PUR5ScvWyS+vhg7ZO5TpI="; + hash = "sha256-dJpHrqPyikkUnE4Un1fGOEJL49U5IiInYeSWmI04r18="; }; - vendorHash = "sha256-Y/pg8+w6B1YQqaZ5wj8QZxiBHAG0Tf3Zec5WlVyA4eI="; + vendorHash = "sha256-Hv4CacBrRX2YT3AkbNzyWrA9Ex6YMDPrPvezukwMkTE="; - # Test_setDatabasesCache fails due to /homeless-shelter: read-only file system error. - doCheck = false; + nativeBuildInputs = [ installShellFiles ]; + + # Build with production code + tags = ["prod"]; + # Include version for `turso --version` reporting + preBuild = '' + echo "v${version}" > internal/cmd/version.txt + ''; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd turso \ + --bash <($out/bin/turso completion bash) \ + --fish <($out/bin/turso completion fish) \ + --zsh <($out/bin/turso completion zsh) + ''; meta = with lib; { description = "This is the command line interface (CLI) to Turso."; homepage = "https://turso.tech"; + mainProgram = "turso"; license = licenses.mit; - maintainers = with maintainers; [ zestsystem kashw2 ]; + maintainers = with maintainers; [ zestsystem kashw2 fryuni ]; }; } diff --git a/pkgs/development/tools/twilio-cli/default.nix b/pkgs/development/tools/twilio-cli/default.nix index 01b4732dc970d..e83bb95d1f23b 100644 --- a/pkgs/development/tools/twilio-cli/default.nix +++ b/pkgs/development/tools/twilio-cli/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "twilio-cli"; - version = "5.14.0"; + version = "5.15.0"; src = fetchzip { url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz"; - sha256 = "sha256-b+CL3Rxkzbk7wSUNXk+x0dQvjZWmOuVh/qWdrIhvJFo="; + sha256 = "sha256-KV5afgfQmQOJAPLNUjELB0+JZ8Qlz9wqOphZm/IBJcc="; }; buildInputs = [ nodejs ]; diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/development/tools/typos/default.nix index f3752cb90a935..7d7eae9452eb7 100644 --- a/pkgs/development/tools/typos/default.nix +++ b/pkgs/development/tools/typos/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.16.12"; + version = "1.16.17"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - hash = "sha256-zi1SVEl+EZacPOEjpOIG9KiXY2790fO63gGyc2jKNoE="; + hash = "sha256-T7JekWWSGetaREhbYeh5LygXWaI5vwSSmMIFvzBtB3k="; }; - cargoHash = "sha256-UQVERFAaGyrWIp+3fxZ0Bpbv7ZTPYQiTCRgaYnU8Zq0="; + cargoHash = "sha256-aYhdTNtvKfvgmt9Y1YTNEKYQy3m5bH9tsUbbL87crqw="; meta = with lib; { description = "Source code spell checker"; diff --git a/pkgs/development/tools/unityhub/default.nix b/pkgs/development/tools/unityhub/default.nix index 5b0c4f55f3149..1f3f0765db2b1 100644 --- a/pkgs/development/tools/unityhub/default.nix +++ b/pkgs/development/tools/unityhub/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "unityhub"; - version = "3.5.1"; + version = "3.5.2"; src = fetchurl { url = "https://hub-dist.unity3d.com/artifactory/hub-debian-prod-local/pool/main/u/unity/unityhub_amd64/unityhub-amd64-${version}.deb"; - sha256 = "sha256-R/Ehf379Vbh/fN6iJO6BKsUuGMe2ogJdlWosElR+7f8="; + sha256 = "sha256-MiehcBs+Egfen7MzkzzWxLuTrWrHkqIj1y47sPI3Y74="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/vendir/default.nix b/pkgs/development/tools/vendir/default.nix index 0a7ff7210505d..482ff69ee0abd 100644 --- a/pkgs/development/tools/vendir/default.nix +++ b/pkgs/development/tools/vendir/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vendir"; - version = "0.34.4"; + version = "0.35.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-vendir"; rev = "v${version}"; - sha256 = "sha256-HdKMPXZIz1n8+170E3Aj7BYquVGgnPwRKJ5CZcqN35M="; + sha256 = "sha256-aN8O+5zzGGLWAPk/oNFOnBBv2rsljWaxTKlC19XTt58="; }; vendorHash = null; diff --git a/pkgs/development/tools/vultr/default.nix b/pkgs/development/tools/vultr/default.nix index 8a584ce669cbf..71a0484557876 100644 --- a/pkgs/development/tools/vultr/default.nix +++ b/pkgs/development/tools/vultr/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-kyB6gUbc32NsSDqDy1zVT4HXn0pWxHdBOEBOSaI0Xro="; }; - vendorSha256 = null; + vendorHash = null; # There are not test files doCheck = false; diff --git a/pkgs/development/tools/wasmedge/default.nix b/pkgs/development/tools/wasmedge/default.nix index 3ead4400afa51..3bea40fdb642e 100644 --- a/pkgs/development/tools/wasmedge/default.nix +++ b/pkgs/development/tools/wasmedge/default.nix @@ -41,7 +41,6 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DWASMEDGE_BUILD_TESTS=OFF" # Tests are downloaded using git ] ++ lib.optionals stdenv.isDarwin [ "-DWASMEDGE_FORCE_DISABLE_LTO=ON" diff --git a/pkgs/development/tools/watchman/default.nix b/pkgs/development/tools/watchman/default.nix index 6bd12510c13da..973a48a84bc85 100644 --- a/pkgs/development/tools/watchman/default.nix +++ b/pkgs/development/tools/watchman/default.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Watches files and takes action when they change"; homepage = "https://facebook.github.io/watchman"; - maintainers = with maintainers; [ cstrahan kylesferrazza ]; + maintainers = with maintainers; [ kylesferrazza ]; platforms = platforms.unix; license = licenses.mit; }; diff --git a/pkgs/development/tools/wp4nix/default.nix b/pkgs/development/tools/wp4nix/default.nix index 61ea2c802d333..08a202784ce01 100644 --- a/pkgs/development/tools/wp4nix/default.nix +++ b/pkgs/development/tools/wp4nix/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { sha256 = "sha256-WJteeFUMr684yZEtUP13MqRjJ1UAeo48AzOPdLEE65w="; }; - vendorSha256 = null; + vendorHash = null; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/development/tools/wxformbuilder/default.nix b/pkgs/development/tools/wxformbuilder/default.nix index 2fccd17f2813a..c8e05c1fc10bb 100644 --- a/pkgs/development/tools/wxformbuilder/default.nix +++ b/pkgs/development/tools/wxformbuilder/default.nix @@ -10,7 +10,7 @@ }: stdenv.mkDerivation (finalAttrs: { - pname = "wxFormBuilder"; + pname = "wxformbuilder"; version = "unstable-2023-04-21"; src = fetchFromGitHub { @@ -47,13 +47,14 @@ stdenv.mkDerivation (finalAttrs: { postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p $out/{Applications,bin} mv $out/wxFormBuilder.app $out/Applications - makeWrapper $out/{Applications/wxFormBuilder.app/Contents/MacOS,bin}/wxFormBuilder + makeWrapper $out/Applications/wxFormBuilder.app/Contents/MacOS/wxFormBuilder $out/bin/wxformbuilder ''; meta = with lib; { description = "RAD tool for wxWidgets GUI design"; homepage = "https://github.com/wxFormBuilder/wxFormBuilder"; license = licenses.gpl2Only; + mainProgram = "wxformbuilder"; maintainers = with maintainers; [ matthuszagh wegank ]; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index a18f88d6d158e..2e870975d3396 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yq-go"; - version = "4.35.1"; + version = "4.35.2"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - hash = "sha256-L0F3e2SsBAI6b3lrBJl9W2392ZlW0jHwJJ7MlvJ64es="; + hash = "sha256-iQJx++MeyXT7hS4NATvzYq+YErTEKYCajAzcn1QIWDU="; }; - vendorHash = "sha256-XJW7ftx+V7H22EraQZlRFi+Li8fsl7ZALVnaiuE1rXI="; + vendorHash = "sha256-nh7boYBNYvNe+uMxV460bkmWQ61VYuvFYQ5CIaNEv98="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/ytt/default.nix b/pkgs/development/tools/ytt/default.nix index 46bcf160c3831..e89e00fa0110a 100644 --- a/pkgs/development/tools/ytt/default.nix +++ b/pkgs/development/tools/ytt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ytt"; - version = "0.45.4"; + version = "0.46.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-ytt"; rev = "v${version}"; - sha256 = "sha256-mv0o0Wyfpzifl7yqQy8AWKlzUlr3S4IdYVzwsf17boM="; + sha256 = "sha256-ZCWdOvwWXSeFzRQiiObuJqvz0ngAJ8n/0LeoGCv2vu4="; }; vendorHash = null; diff --git a/pkgs/development/tools/zsv/default.nix b/pkgs/development/tools/zsv/default.nix index 7c262ba2035a4..d9575d92bb389 100644 --- a/pkgs/development/tools/zsv/default.nix +++ b/pkgs/development/tools/zsv/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zsv"; - version = "0.3.6-alpha"; + version = "0.3.8-alpha"; src = fetchFromGitHub { owner = "liquidaty"; repo = "zsv"; rev = "v${version}"; - hash = "sha256-P4xgWmNPBmuB87jsQvoyuRFCYkD4n/mTd04ZPfaf5ZE="; + hash = "sha256-+6oZvMlfLVTDLRlqOpgdZP2YxT6Zlt13wBMFlryBrXY="; }; nativeBuildInputs = [ perl ]; @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "World's fastest (simd) CSV parser, with an extensible CLI"; homepage = "https://github.com/liquidaty/zsv"; + changelog = "https://github.com/liquidaty/zsv/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ marsam ]; platforms = platforms.all; diff --git a/pkgs/development/web/bloomrpc/default.nix b/pkgs/development/web/bloomrpc/default.nix index 037e7f4931a1c..fc14b131be8a9 100644 --- a/pkgs/development/web/bloomrpc/default.nix +++ b/pkgs/development/web/bloomrpc/default.nix @@ -7,7 +7,7 @@ let src = fetchurl { url = "https://github.com/uw-labs/${pname}/releases/download/${version}/BloomRPC-${version}.AppImage"; name = "${pname}-${version}.AppImage"; - sha512 = "PebdYDpcplPN5y3mRu1mG6CXenYfYvBXNLgIGEr7ZgKnR5pIaOfJNORSNYSdagdGDb/B1sxuKfX4+4f2cqgb6Q=="; + hash = "sha512-PebdYDpcplPN5y3mRu1mG6CXenYfYvBXNLgIGEr7ZgKnR5pIaOfJNORSNYSdagdGDb/B1sxuKfX4+4f2cqgb6Q=="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index 8b88adeed422f..8b6c7c962c485 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -12,7 +12,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "1.0.2"; + version = "1.0.4"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -51,19 +51,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - hash = "sha256-QvoEakfR5wmP10d6MDpfS8THke975bVyZc5pLVliUbQ="; + hash = "sha256-ko0DFCYUfuww3qrz4yUde6Mr4yPVcMJwwGdrG9Fiwhg="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-izVtW28QE7Tty6DfQDKmw1oqD5GOolTzCeIUmtgI1Uw="; + hash = "sha256-0KFAvfyTJU1z/KeKVbxFx6+Ijz4YzMsCMiytom730QI="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - hash = "sha256-e/VXNCq2CwNsM7ruk8IGSwU/swkVhcvvQRv/yiIQtCU="; + hash = "sha256-YEIXthisgNx+99wZF8hZ1T3MU20Yeyms3/q1UGDAwso="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-kHv8PU48Le4lG3pf304hXggAtx/I5uBeu4aHmLsbdgw="; + hash = "sha256-lEEIrmIEcIdE2SqnKlVxpiq9ae2wNRepHY61jWqk584="; }; }; updateScript = writeShellScript "update-bun" '' @@ -75,7 +75,7 @@ stdenvNoCC.mkDerivation rec { exit 0 fi for platform in ${lib.escapeShellArgs meta.platforms}; do - update-source-version "bun" "0" "${lib.fakeSha256}" --source-key="sources.$platform" + update-source-version "bun" "0" "${lib.fakeHash}" --source-key="sources.$platform" update-source-version "bun" "$NEW_VERSION" --source-key="sources.$platform" done ''; diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index 6802f218b5232..dedd94230b8c8 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -18,7 +18,7 @@ let availableBinaries = { x86_64-linux = { platform = "linux-x64"; - checksum = "sha256-9f5Ewd63pLpMbewtQ0u4WsRnZQEn1lfh6b/jZ8yDSMU="; + checksum = "sha256-9o0nprGcJhudS1LNm+T7Vf0Dwd1RBauYKI+w1FBQ3ZM="; }; aarch64-linux = { platform = "linux-arm64"; @@ -30,7 +30,7 @@ let inherit (binary) platform checksum; in stdenv.mkDerivation rec { pname = "cypress"; - version = "12.17.4"; + version = "13.2.0"; src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/${platform}/cypress.zip"; diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index f068c3e8d5f80..9e201961f1d3a 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -3,6 +3,8 @@ , callPackage , fetchFromGitHub , rustPlatform +, cmake +, protobuf , installShellFiles , libiconv , darwin @@ -11,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.36.0"; + version = "1.37.1"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - hash = "sha256-PV0Q/OtO4AkY3NMwIQIwU0DCkFqXifJFuHb+Q3rIQLI="; + hash = "sha256-ZfICDkW6q4OLvpSZnRpa6i324OuLNuOHXuSOQ7/aUJ8="; }; - cargoHash = "sha256-w0Wr/mwn4Hdfxr7eBdZtpj3MbsMHDwAK2F7XaYEaMCk="; + cargoHash = "sha256-n+6Hz9Q20vq1Bf/Ny7I3IpGbkEECjjBG8xHN1v0z0Pw="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds @@ -28,7 +30,15 @@ rustPlatform.buildRustPackage rec { substituteInPlace .cargo/config.toml --replace '"-C", "link-arg=-fuse-ld=lld"' "" ''; - nativeBuildInputs = [ installShellFiles ]; + # uses zlib-ng but can't dynamically link yet + # https://github.com/rust-lang/libz-sys/issues/158 + nativeBuildInputs = [ + # required by libz-ng-sys crate + cmake + # required by deno_kv crate + protobuf + installShellFiles + ]; buildInputs = lib.optionals stdenv.isDarwin ( [ libiconv darwin.libobjc ] ++ (with darwin.apple_sdk.frameworks; [ Security CoreServices Metal Foundation QuartzCore ]) diff --git a/pkgs/development/web/deno/librusty_v8.nix b/pkgs/development/web/deno/librusty_v8.nix index 6e9fc0a669fd6..522fe48a3b4f2 100644 --- a/pkgs/development/web/deno/librusty_v8.nix +++ b/pkgs/development/web/deno/librusty_v8.nix @@ -11,11 +11,11 @@ let }; in fetch_librusty_v8 { - version = "0.74.3"; + version = "0.78.0"; shas = { - x86_64-linux = "sha256-8pa8nqA6rbOSBVnp2Q8/IQqh/rfYQU57hMgwU9+iz4A="; - aarch64-linux = "sha256-3kXOV8rlCNbNBdXgOtd3S94qO+JIKyOByA4WGX+XVP0="; - x86_64-darwin = "sha256-iBBVKZiSoo08YEQ8J/Rt1/5b7a+2xjtuS6QL/Wod5nQ="; - aarch64-darwin = "sha256-Djnuc3l/jQKvBf1aej8LG5Ot2wPT0m5Zo1B24l1UHsM="; + x86_64-linux = "sha256-1df7bH3ZdgIasZvvNH3iKQ4lmcGNq6ldgMV9nDgOC14="; + aarch64-linux = "sha256-riSyGvOGwqL1hSAXpUvBju/3DN20THtg0NuIzn1m1M8="; + x86_64-darwin = "sha256-4Nnkrj9GfliYUInb7SssqzFIDbV0XVxdEBC28klqBDM="; + aarch64-darwin = "sha256-oepRKVb05zAUeZo2RN3Vca0CUQ+Fd1duIU3xOG+FEJw="; }; } diff --git a/pkgs/development/web/deno/update/common.ts b/pkgs/development/web/deno/update/common.ts index 1b4e3509ea7cd..a31805269cb21 100644 --- a/pkgs/development/web/deno/update/common.ts +++ b/pkgs/development/web/deno/update/common.ts @@ -48,8 +48,8 @@ export const getLatestVersion = (owner: string, repo: string) => export const genValueRegExp = (key: string, regex: RegExp) => new RegExp(`(?<=${key} = ")(${regex.source}|)(?=")`); -export const logger = (name: string) => - (...a: any) => console.log(`[${name}]`, ...a); +export const logger = (name: string) => (...a: any) => + console.log(`[${name}]`, ...a); export const read = Deno.readTextFile; export const write = Deno.writeTextFile; diff --git a/pkgs/development/web/deno/update/librusty_v8.ts b/pkgs/development/web/deno/update/librusty_v8.ts index d9d57d2908dbc..b38e0a28f1ab5 100644 --- a/pkgs/development/web/deno/update/librusty_v8.ts +++ b/pkgs/development/web/deno/update/librusty_v8.ts @@ -1,11 +1,5 @@ -import * as toml from "https://deno.land/std@0.148.0/encoding/toml.ts"; -import { - getExistingVersion, - logger, - run, - write, -} from "./common.ts"; - +import * as toml from "https://deno.land/std@0.202.0/toml/mod.ts"; +import { getExistingVersion, logger, run, write } from "./common.ts"; const log = logger("librusty_v8"); @@ -18,14 +12,14 @@ interface PrefetchResult { sha256: string; } -const getLibrustyV8Version = async ( +const getCargoLock = async ( owner: string, repo: string, version: string, ) => - fetch(`https://github.com/${owner}/${repo}/raw/${version}/Cargo.toml`) + fetch(`https://github.com/${owner}/${repo}/raw/${version}/Cargo.lock`) .then((res) => res.text()) - .then((txt) => toml.parse(txt).workspace.dependencies.v8.version); + .then((txt) => toml.parse(txt)); const fetchArchShaTasks = (version: string, arches: Architecture[]) => arches.map( @@ -74,7 +68,10 @@ export async function updateLibrustyV8( ) { log("Starting librusty_v8 update"); // 0.0.0 - const version = await getLibrustyV8Version(owner, repo, denoVersion); + const cargoLockData = await getCargoLock(owner, repo, denoVersion); + console.log(cargoLockData); + const packageItem = cargoLockData.package.find(({ name }) => name === "v8"); + const version = packageItem.version; if (typeof version !== "string") { throw "no librusty_v8 version"; } diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index cea718dbe23b4..1fb8dc031e130 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.1.92"; + version = "0.1.102"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-uW87hlSwHMJ6SIfranaH383EKwvewfNKbuGA4znVEeg="; + hash = "sha256-OIqAX/Cgh+jpHbjIg7wApTlKGChYx82oq8oUGguDsrE="; }; - vendorHash = "sha256-Y1merBgVui0Ot3gb2UbTiLmxlaI4egbsI6vQJgF4mCE="; + vendorHash = "sha256-XECl5evFO9ml28sILdWS2sQfNDf8ixsvQhiTShOcKKQ="; subPackages = [ "." ]; diff --git a/pkgs/development/web/function-runner/default.nix b/pkgs/development/web/function-runner/default.nix index 7e6d3b661834f..bd2ad2862cd7e 100644 --- a/pkgs/development/web/function-runner/default.nix +++ b/pkgs/development/web/function-runner/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "function-runner"; - version = "3.6.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "Shopify"; repo = pname; rev = "v${version}"; - sha256 = "sha256-z03+3x1xGYSa+WVEuHBgUQ9NdqG3rCziNYcwTjWBNV8="; + sha256 = "sha256-cKlzv9mL6UGXHvYbQR4OcZgdjZLV5Q7EoQbW7Fx8ESo="; }; - cargoHash = "sha256-4sgf7WfaX7jnV8YynZNLi/N8MfkuAc4tk/8eiKEyyxI="; + cargoHash = "sha256-/4/zaeNQ45YYBILxm11qD9rPFZxilA8kLoyWG370Knk="; meta = with lib; { description = "A CLI tool which allows you to run Wasm Functions intended for the Shopify Functions infrastructure"; diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix index 0eb1ab4ce3f6c..13a50dc12db35 100644 --- a/pkgs/development/web/nodejs/v18.nix +++ b/pkgs/development/web/nodejs/v18.nix @@ -8,20 +8,13 @@ let in buildNodejs { inherit enableNpm; - version = "18.17.1"; - sha256 = "sha256-8hXPA9DwDwesC2dMaBn4BMFULhbxUtoEmAAirsz15lo="; + version = "18.18.0"; + sha256 = "sha256-5NTbrDY02Z+JLwDbR9p4+YSTwzlYLoqV+y3Vn1z+D5A="; patches = [ ./disable-darwin-v8-system-instrumentation.patch ./bypass-darwin-xcrun-node16.patch ./revert-arm64-pointer-auth.patch ./node-npm-build-npm-package-logic.patch ./trap-handler-backport.patch - # Fixes target toolchain arguments being passed to the host toolchain when - # cross-compiling. For example, -m64 is not available on aarch64. - (fetchpatch { - name = "common-gypi-cross.patch"; - url = "https://github.com/nodejs/node/pull/48597.patch"; - hash = "sha256-FmHmwlTxPw5mTW6t4zuy9vr4FxopjU4Kx+F1aqabG1s="; - }) ]; } diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix index 7c4b390cc66b5..a4c83d32a3439 100644 --- a/pkgs/development/web/nodejs/v20.nix +++ b/pkgs/development/web/nodejs/v20.nix @@ -8,8 +8,8 @@ let in buildNodejs { inherit enableNpm; - version = "20.6.1"; - sha256 = "sha256-Ouxeco2qOIAMNDsSkiHTSIBkolKaObtUZ7xVviJsais="; + version = "20.8.0"; + sha256 = "sha256-QSvoR65t9hAQup2jzD5r5bZ6oALjVOkZ9Z7INgNxcEw="; patches = [ ./revert-arm64-pointer-auth.patch ./disable-darwin-v8-system-instrumentation-node19.patch diff --git a/pkgs/development/web/playwright-test/node-packages.json b/pkgs/development/web/playwright-test/node-packages.json index b079fb119e9ec..c931097f5bff9 100644 --- a/pkgs/development/web/playwright-test/node-packages.json +++ b/pkgs/development/web/playwright-test/node-packages.json @@ -1,3 +1,3 @@ [ - {"@playwright/test": "1.37.0"} + {"@playwright/test": "1.38.0"} ] diff --git a/pkgs/development/web/playwright-test/node-packages.nix b/pkgs/development/web/playwright-test/node-packages.nix index 63abea2981b06..af235b2210515 100644 --- a/pkgs/development/web/playwright-test/node-packages.nix +++ b/pkgs/development/web/playwright-test/node-packages.nix @@ -4,15 +4,6 @@ let sources = { - "@types/node-20.5.0" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "20.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-20.5.0.tgz"; - sha512 = "Mgq7eCtoTjT89FqNoTzzXg2XvCi5VMhRV6+I2aYanc6kQCBImeNaAYRs/DyoVqk1YEUJK5gN9VO7HRIdz4Wo3Q=="; - }; - }; "fsevents-2.3.2" = { name = "fsevents"; packageName = "fsevents"; @@ -22,30 +13,39 @@ let sha512 = "xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA=="; }; }; - "playwright-core-1.37.0" = { + "playwright-1.38.0" = { + name = "playwright"; + packageName = "playwright"; + version = "1.38.0"; + src = fetchurl { + url = "https://registry.npmjs.org/playwright/-/playwright-1.38.0.tgz"; + sha512 = "fJGw+HO0YY+fU/F1N57DMO+TmXHTrmr905J05zwAQE9xkuwP/QLDk63rVhmyxh03dYnEhnRbsdbH9B0UVVRB3A=="; + }; + }; + "playwright-core-1.38.0" = { name = "playwright-core"; packageName = "playwright-core"; - version = "1.37.0"; + version = "1.38.0"; src = fetchurl { - url = "https://registry.npmjs.org/playwright-core/-/playwright-core-1.37.0.tgz"; - sha512 = "1c46jhTH/myQw6sesrcuHVtLoSNfJv8Pfy9t3rs6subY7kARv0HRw5PpyfPYPpPtQvBOmgbE6K+qgYUpj81LAA=="; + url = "https://registry.npmjs.org/playwright-core/-/playwright-core-1.38.0.tgz"; + sha512 = "f8z1y8J9zvmHoEhKgspmCvOExF2XdcxMW8jNRuX4vkQFrzV4MlZ55iwb5QeyiFQgOFCUolXiRHgpjSEnqvO48g=="; }; }; }; in { - "@playwright/test-1.37.0" = nodeEnv.buildNodePackage { + "@playwright/test-1.38.0" = nodeEnv.buildNodePackage { name = "_at_playwright_slash_test"; packageName = "@playwright/test"; - version = "1.37.0"; + version = "1.38.0"; src = fetchurl { - url = "https://registry.npmjs.org/@playwright/test/-/test-1.37.0.tgz"; - sha512 = "181WBLk4SRUyH1Q96VZl7BP6HcK0b7lbdeKisn3N/vnjitk+9HbdlFz/L5fey05vxaAhldIDnzo8KUoy8S3mmQ=="; + url = "https://registry.npmjs.org/@playwright/test/-/test-1.38.0.tgz"; + sha512 = "xis/RXXsLxwThKnlIXouxmIvvT3zvQj1JE39GsNieMUrMpb3/GySHDh2j8itCG22qKVD4MYLBp7xB73cUW/UUw=="; }; dependencies = [ - sources."@types/node-20.5.0" sources."fsevents-2.3.2" - sources."playwright-core-1.37.0" + sources."playwright-1.38.0" + sources."playwright-core-1.38.0" ]; buildInputs = globalBuildInputs; meta = { diff --git a/pkgs/development/web/playwright/driver.nix b/pkgs/development/web/playwright/driver.nix index 1046647a277a9..9dc0401a2e2d6 100644 --- a/pkgs/development/web/playwright/driver.nix +++ b/pkgs/development/web/playwright/driver.nix @@ -30,15 +30,15 @@ let { pname = "playwright-driver"; # run ./pkgs/development/python-modules/playwright/update.sh to update - version = "1.37.0"; + version = "1.38.0"; src = fetchurl { url = "https://playwright.azureedge.net/builds/driver/${filename}"; sha256 = { - x86_64-linux = "1lkmanr402ar9njwb7dgyzparjyr1r9krz9ad7b8c6hi3fjvrj0y"; - aarch64-linux = "13nfva9jfmjyjxm1my0aq8ngn6ha0fdrpfv28gm351n0j9cjlvqh"; - x86_64-darwin = "0q1qmgypngxs9ipb6dlhk1xccyzw6frzr835ijifpypgp4xmz2gi"; - aarch64-darwin = "1mq1868s06wgfgi3nhdrzsdqi3cl08lrkiz5q06mg1s724b2sf0v"; + x86_64-linux = "1zs8mfn41k5kv1r6vw8x3hw7z7ghmwfrvdhx9lvcllhrdiqzqkbm"; + aarch64-linux = "0m2mnvhfqyqjwmb0jdmwdsw0xacr85g5wy0dipl0i8ylb9zjzq7z"; + x86_64-darwin = "0jik9d80ina2439nmnd4frmmcjimyqr888gwrm6i136hla27i3a9"; + aarch64-darwin = "1ma2f51hz5xjp55yn9x1s4qg62df12lrr4dy4kdqc6wiqdxc96f3"; }.${system} or throwSystem; }; diff --git a/pkgs/development/web/postman/darwin.nix b/pkgs/development/web/postman/darwin.nix index f213dd3d8e234..96ac764082b21 100644 --- a/pkgs/development/web/postman/darwin.nix +++ b/pkgs/development/web/postman/darwin.nix @@ -11,12 +11,12 @@ let dist = { aarch64-darwin = { arch = "arm64"; - sha256 = "sha256-zBjA+IekQONwZJ+2hQhJIBA+qu/rRYOtm6y1aBaxQrA="; + sha256 = "sha256-Dy37gqClpV/9GzlpX6FjF+grDN/txbZO7G5BpEA2sms="; }; x86_64-darwin = { arch = "64"; - sha256 = "sha256-YBI8F/wABFBqfwIGSBr7UqD/zDGaESL9/v/DpCSy1m0="; + sha256 = "sha256-gYlgrq3IyQtcecv9kuh1bHP1TVTPM8Apx2ZU5JLSSkQ="; }; }.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix index e3e9951afb94a..354ea84968315 100644 --- a/pkgs/development/web/postman/default.nix +++ b/pkgs/development/web/postman/default.nix @@ -2,7 +2,7 @@ let pname = "postman"; - version = "10.15.0"; + version = "10.18.6"; meta = with lib; { homepage = "https://www.getpostman.com"; description = "API Development Environment"; diff --git a/pkgs/development/web/postman/linux.nix b/pkgs/development/web/postman/linux.nix index 6a242531edb87..b7cba5d4f93b6 100644 --- a/pkgs/development/web/postman/linux.nix +++ b/pkgs/development/web/postman/linux.nix @@ -36,6 +36,11 @@ , libxkbcommon , libdrm , mesa +# It's unknown which version of openssl that postman expects but it seems that +# OpenSSL 3+ seems to work fine (cf. +# https://github.com/NixOS/nixpkgs/issues/254325). If postman breaks apparently +# around OpenSSL stuff then try changing this dependency version. +, openssl , xorg , pname , version @@ -48,12 +53,12 @@ let dist = { aarch64-linux = { arch = "arm64"; - sha256 = "sha256-cBueTCZHZZGU3Z/UKLBIw4XCvCz9Hm4MxdIMY9+2ulk="; + sha256 = "sha256-shiUW7o6H0aaGCgHm3oVqjLZNsB4KIn7EIxWRVCAWi0="; }; x86_64-linux = { arch = "64"; - sha256 = "sha256-svk60K4pZh0qRdx9+5OUTu0xgGXMhqvQTGTcmqBOMq8="; + sha256 = "sha256-R6mejxuxSZv37nyjnt/oGvgqCw1pULCHCWnlw+pq8iY="; }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -149,5 +154,6 @@ stdenv.mkDerivation rec { patchelf --set-rpath "${lib.makeLibraryPath buildInputs}:$ORIGIN" $file done popd + wrapProgram $out/bin/postman --set PATH ${lib.makeBinPath [ openssl ]} ''; } diff --git a/pkgs/development/web/twitter-bootstrap/default.nix b/pkgs/development/web/twitter-bootstrap/default.nix index aad89980645dd..86b35decf6769 100644 --- a/pkgs/development/web/twitter-bootstrap/default.nix +++ b/pkgs/development/web/twitter-bootstrap/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "bootstrap"; - version = "5.3.1"; + version = "5.3.2"; src = fetchurl { url = "https://github.com/twbs/bootstrap/releases/download/v${finalAttrs.version}/bootstrap-${finalAttrs.version}-dist.zip"; - hash = "sha256-SfxkgJujf07f2vq0ViDhjGgRDCeg32L0RKDHHTWBp6Q="; + hash = "sha256-hUlReGqLkaBeQ9DyIATFyddhdeFv1vUNeTnnsBhMPgk="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/games/aaaaxy/default.nix b/pkgs/games/aaaaxy/default.nix index 62ac8ac20c7a7..c2fcc8a646c45 100644 --- a/pkgs/games/aaaaxy/default.nix +++ b/pkgs/games/aaaaxy/default.nix @@ -19,17 +19,17 @@ buildGoModule rec { pname = "aaaaxy"; - version = "1.4.45"; + version = "1.4.50"; src = fetchFromGitHub { owner = "divVerent"; repo = pname; rev = "v${version}"; - hash = "sha256-93ffxzYSVumfk7J8K9Ma2WYWaGQLBIxSkds8OKzOCcw="; + hash = "sha256-J4SCmIwGlVD8MHs13NO3JFKfH1rvh2dgVV0/8BX9IcY="; fetchSubmodules = true; }; - vendorHash = "sha256-wUH0ohccMjdeGpm9bcw8K7Ss0FZGXaPfxeJCKYkEhJ8="; + vendorHash = "sha256-dugSK/5mowBfRqnzI3sZqCm69E0WtX2Tydh6Q06+vLU="; buildInputs = [ alsa-lib diff --git a/pkgs/games/atlauncher/default.nix b/pkgs/games/atlauncher/default.nix index 4f45477ecec93..5e94a821c02d0 100644 --- a/pkgs/games/atlauncher/default.nix +++ b/pkgs/games/atlauncher/default.nix @@ -1,12 +1,17 @@ -{ copyDesktopItems, fetchurl, jre, lib, makeDesktopItem, makeWrapper, stdenv, steam-run, withSteamRun ? true, writeShellScript }: +{ copyDesktopItems, fetchurl, jre, lib, makeDesktopItem, makeWrapper, stdenv, udev, xorg }: stdenv.mkDerivation (finalAttrs: { pname = "atlauncher"; - version = "3.4.30.0"; + version = "3.4.34.0"; src = fetchurl { url = "https://github.com/ATLauncher/ATLauncher/releases/download/v${finalAttrs.version}/ATLauncher-${finalAttrs.version}.jar"; - hash = "sha256-eSb+qH/ZoPpeOyIuoJsEpecG7uUyh0vkqZzNuxriRuI="; + hash = "sha256-gHUYZaxADchikoCmAfqFjVbMYhhiwg2BZKctmww1Mlw="; + }; + + env.ICON = fetchurl { + url = "https://atlauncher.com/assets/images/logo.svg"; + hash = "sha256-XoqpsgLmkpa2SdjZvPkgg6BUJulIBIeu6mBsJJCixfo="; }; dontUnpack = true; @@ -14,33 +19,29 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ ]; nativeBuildInputs = [ copyDesktopItems makeWrapper ]; - installPhase = - let - # hack to use steam-run along with the exec - steamrun = writeShellScript "steamrun" '' - shift - exec ${steam-run}/bin/steam-run "''$@" - ''; - in - '' - runHook preInstall - mkdir -p $out/bin - makeWrapper ${jre}/bin/java $out/bin/atlauncher \ - --add-flags "-jar $src --working-dir=\$HOME/.atlauncher" \ - --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}" ${ - lib.strings.optionalString withSteamRun ''--run "${steamrun} \\"'' - } - runHook postInstall - ''; + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share/java + cp $src $out/share/java/ATLauncher.jar + + makeWrapper ${jre}/bin/java $out/bin/${finalAttrs.pname} \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ xorg.libXxf86vm udev ]}" \ + --add-flags "-jar $out/share/java/ATLauncher.jar" \ + --add-flags "--working-dir \"\''${XDG_DATA_HOME:-\$HOME/.local/share}/ATLauncher\"" \ + --add-flags "--no-launcher-update" + + mkdir -p $out/share/icons/hicolor/scalable/apps + cp $ICON $out/share/icons/hicolor/scalable/apps/${finalAttrs.pname}.svg + + runHook postInstall + ''; desktopItems = [ (makeDesktopItem { name = finalAttrs.pname; - exec = "${finalAttrs.pname} --no-launcher-update true"; - icon = fetchurl { - url = "https://avatars.githubusercontent.com/u/7068667"; - hash = "sha256-YmEkxf4rZxN3jhiib0UtdUDDcn9lw7IMbiEucBL7b9o="; - }; + exec = finalAttrs.pname; + icon = finalAttrs.pname; desktopName = "ATLauncher"; categories = [ "Game" ]; }) diff --git a/pkgs/games/blightmud/default.nix b/pkgs/games/blightmud/default.nix index d536aa7b8ea69..3267c36a370ea 100644 --- a/pkgs/games/blightmud/default.nix +++ b/pkgs/games/blightmud/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "blightmud"; - version = "5.2.0"; + version = "5.3.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-sLqkDuohCgHJTMte1WIa2Yu43oWXVvnIpeiDBoQpKY8="; + sha256 = "sha256-e9Uo0IJYL9/6/nNL27zfUYnsTwDaOJOcR2CY6t++jDE="; }; - cargoHash = "sha256-ffADKoMysYY2vwX3asHnjR2EiND4RJsf/W334PWvkGs="; + cargoHash = "sha256-QSgTpmSojZrwZ0RsUL6c2xO310RZX3gkyGl6oNf6pYI="; buildFeatures = lib.optional withTTS "tts"; @@ -43,6 +43,7 @@ rustPlatform.buildRustPackage rec { "test_lua_script" "timer_test" "validate_assertion_fail" + "regex_smoke_test" ]; skipFlag = test: "--skip " + test; in diff --git a/pkgs/games/boohu/default.nix b/pkgs/games/boohu/default.nix index 6b3c0e04f982a..708d8d7510bcb 100644 --- a/pkgs/games/boohu/default.nix +++ b/pkgs/games/boohu/default.nix @@ -1,20 +1,17 @@ -{lib, fetchurl, buildGoPackage}: - -buildGoPackage rec { +{ lib, fetchurl, buildGoModule }: +buildGoModule rec { pname = "boohu"; - version = "0.13.0"; - - goPackagePath = "git.tuxfamily.org/boohu/boohu.git"; + version = "0.14.0"; src = fetchurl { - url = "https://download.tuxfamily.org/boohu/downloads/${pname}-${version}.tar.gz"; - sha256 = "0q89yv4klldjpli6y9xpyr6k8nsn7qa68gp90vb3dgxynn91sh68"; + url = "https://download.tuxfamily.org/boohu/downloads/boohu-${version}.tar.gz"; + hash = "sha256-IB59C5/uuHP6LtKLypjpgHOo0MR9bFdCbudaRa+h7lI="; }; - goDeps = ./deps.nix; + vendorHash = "sha256-AVK4zE/Hs9SN8Qj2WYj/am2B0R74QKYoMNf3sRRjnU4="; - postInstall = "mv $out/bin/boohu.git $out/bin/boohu"; + ldflags = [ "-s" "-w" ]; meta = with lib; { description = "A new coffee-break roguelike game"; @@ -27,6 +24,6 @@ buildGoPackage rec { homepage = "https://download.tuxfamily.org/boohu/index.html"; license = licenses.isc; platforms = platforms.unix; - maintainers = with maintainers; []; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/games/boohu/deps.nix b/pkgs/games/boohu/deps.nix deleted file mode 100644 index c2dc3b41b9733..0000000000000 --- a/pkgs/games/boohu/deps.nix +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - goPackagePath = "github.com/nsf/termbox-go"; - fetch = { - type = "git"; - url = "https://github.com/nsf/termbox-go"; - rev = "93860e16131719fa9722e7c448dbf8c0e3210a0d"; - sha256 = "03hz060cy8qrl4kgr80pbq6xvr38z4c6ghr3y81i8g854rvp6426"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "f93a0d58d5fd95e53f82782d07bb0c79d23e1290"; - sha256 = "1sq97q71vgwnbg1fphsmqrzkbfn6mjal6d8a3qgwv4nbgppwaz25"; - }; - } -] diff --git a/pkgs/games/brutalmaze/default.nix b/pkgs/games/brutalmaze/default.nix index d9c904d99a3b6..8f8930ce0c630 100644 --- a/pkgs/games/brutalmaze/default.nix +++ b/pkgs/games/brutalmaze/default.nix @@ -3,7 +3,7 @@ python3Packages.buildPythonApplication rec { pname = "brutalmaze"; version = "1.1.1"; - format = "flit"; + format = "pyproject"; disabled = python3Packages.pythonOlder "3.7"; src = fetchFromSourcehut { @@ -13,6 +13,10 @@ python3Packages.buildPythonApplication rec { sha256 = "1m105iq378mypj64syw59aldbm6bj4ma4ynhc50gafl656fabg4y"; }; + nativeBuildInputs = with python3Packages; [ + flit-core + ]; + propagatedBuildInputs = with python3Packages; [ loca palace diff --git a/pkgs/games/chiaki4deck/default.nix b/pkgs/games/chiaki4deck/default.nix index 4608df45d1e03..249255950223d 100644 --- a/pkgs/games/chiaki4deck/default.nix +++ b/pkgs/games/chiaki4deck/default.nix @@ -19,13 +19,13 @@ mkDerivation rec { pname = "chiaki4deck"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromGitHub { owner = "streetpea"; repo = pname; rev = "v${version}"; - hash = "sha256-DXer39+j8QaI1IAIcLhVzSVNyGvwoT93knRibpFsEeY="; + hash = "sha256-ayU2mYDpgGMgDK5AI5gwgu6h+YLKPG7P32ECWdL5wA4="; fetchSubmodules = true; }; diff --git a/pkgs/games/clonehero/default.nix b/pkgs/games/clonehero/default.nix index 36d76195fb9ad..0f7ae45a6683f 100644 --- a/pkgs/games/clonehero/default.nix +++ b/pkgs/games/clonehero/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { version = "1.0.0.4080"; src = fetchurl { - url = "https://pubdl.clonehero.net/clonehero-v${finalAttrs.version}-final/clonehero-linux.tar.xz"; + url = "https://github.com/clonehero-game/releases/releases/download/V${finalAttrs.version}/CloneHero-linux.tar.xz"; hash = "sha256-YWLV+wgQ9RfKRSSWh/x0PMjB6tFA4YpHb9WtYOOgZZI="; }; diff --git a/pkgs/games/cockatrice/default.nix b/pkgs/games/cockatrice/default.nix index 1388d830a9e7d..0d8b925faa2bb 100644 --- a/pkgs/games/cockatrice/default.nix +++ b/pkgs/games/cockatrice/default.nix @@ -4,13 +4,13 @@ mkDerivation rec { pname = "cockatrice"; - version = "2021-02-03-Development-2.8.1-beta"; + version = "2023-09-14-Release-2.9.0"; src = fetchFromGitHub { owner = "Cockatrice"; repo = "Cockatrice"; rev = version; - sha256 = "0g1d7zq4lh4jf08mvvgp6m2r2gdvy4y1mhf46c0s8607h2l8vavh"; + sha256 = "sha256-mzYh0qRKiHY64LnoOfF4kDEO06IW1SrCqEiOlu81Fso="; }; buildInputs = [ diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix index b08d4baf2a460..b8e333cd79c24 100644 --- a/pkgs/games/ddnet/default.nix +++ b/pkgs/games/ddnet/default.nix @@ -34,19 +34,19 @@ stdenv.mkDerivation rec { pname = "ddnet"; - version = "17.2.1"; + version = "17.3"; src = fetchFromGitHub { owner = "ddnet"; repo = pname; rev = version; - hash = "sha256-FJnwabNEEGZDM9wNWMGclFv2IMlXg4Ob3PEbGiGQKKc="; + hash = "sha256-PV7xX4xYAIOT8xF7SM/bCO98p5gYJwT2U+dEXKhaIf4="; }; cargoDeps = rustPlatform.fetchCargoTarball { name = "${pname}-${version}"; inherit src; - hash = "sha256-hUrsumBiKovSD7xT1PgH2Q+7HYgyxnFnz33YJPdd5+c="; + hash = "sha256-Mck5letI7gOqeuMsZPzdys0VD8cWESznzezR2ZQXbDE="; }; nativeBuildInputs = [ diff --git a/pkgs/games/doom-ports/doomretro/default.nix b/pkgs/games/doom-ports/doomretro/default.nix index c584f64b5d3e5..f01a788b8f8dc 100644 --- a/pkgs/games/doom-ports/doomretro/default.nix +++ b/pkgs/games/doom-ports/doomretro/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "doomretro"; - version = "4.9.2"; + version = "5.0.4"; src = fetchFromGitHub { owner = "bradharding"; repo = "doomretro"; rev = "v${finalAttrs.version}"; - hash = "sha256-thH18+Og5kSiMdzgPdGyUwBchpjpd9xfFfUlUQMAl1A="; + hash = "sha256-O8FuLFziwVNk2dcj52Xq/FG2vtei06iL8BG2jVugcxs="; }; nativeBuildInputs = [ diff --git a/pkgs/games/doom-ports/gzdoom/default.nix b/pkgs/games/doom-ports/gzdoom/default.nix index aaa800269a75e..cd8d5d933d5a0 100644 --- a/pkgs/games/doom-ports/gzdoom/default.nix +++ b/pkgs/games/doom-ports/gzdoom/default.nix @@ -14,6 +14,7 @@ , libjpeg , libsndfile , libvpx +, libwebp , mpg123 , ninja , openal @@ -25,14 +26,14 @@ stdenv.mkDerivation rec { pname = "gzdoom"; - version = "4.10.0"; + version = "4.11.0"; src = fetchFromGitHub { owner = "ZDoom"; repo = "gzdoom"; rev = "g${version}"; fetchSubmodules = true; - hash = "sha256-F3p2X/hjPV9fuaA7T2bQTP6SlKcfc8GniJgv8BcopGw="; + hash = "sha256-F3FXV76jpwkOE6QoNi1+TjLOt9x7q3pcZq3hQmRfL5E="; }; outputs = [ "out" "doc" ]; @@ -55,6 +56,7 @@ stdenv.mkDerivation rec { libjpeg libsndfile libvpx + libwebp mpg123 openal vulkan-loader diff --git a/pkgs/games/dwarf-fortress/update.sh b/pkgs/games/dwarf-fortress/update.sh index 0ef9a40c7a5d7..5b99dff8aa77a 100755 --- a/pkgs/games/dwarf-fortress/update.sh +++ b/pkgs/games/dwarf-fortress/update.sh @@ -38,5 +38,5 @@ done | jq --slurp --raw-input \ # Append $tmp1 to game.json. There should be a better way to handle # this but all other attempts failed for me. -jq -M --argfile a "$tmp1" '. + $a' < "$(dirname "$0")/game.json" > "$tmp2" +jq -M --slurpfile a "$tmp1" '. + $a[]' < "$(dirname "$0")/game.json" > "$tmp2" cat "$tmp2" > "$(dirname "$0")/game.json" diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index a25c6fa9050f2..051e097eb3a34 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -1,7 +1,23 @@ -{ lib, stdenv, fetchurl, makeWrapper, pkg-config, nasm, makeDesktopItem -, alsa-lib, flac, gtk2, libvorbis, libvpx, libGLU, libGL -, SDL2, SDL2_mixer -, AGL, Cocoa, GLUT, OpenGL +{ lib +, stdenv +, fetchurl +, makeWrapper +, pkg-config +, nasm +, makeDesktopItem +, alsa-lib +, flac +, gtk2 +, libvorbis +, libvpx +, libGLU +, libGL +, SDL2 +, SDL2_mixer +, AGL +, Cocoa +, GLUT +, OpenGL }: let @@ -18,13 +34,13 @@ let in stdenv.mkDerivation rec { pname = "eduke32"; - version = "20221225"; - rev = "10166"; - revExtra = "122aee012"; + version = "20230926"; + rev = "10459"; + revExtra = "8feaf6c25"; src = fetchurl { url = "https://dukeworld.com/eduke32/synthesis/${version}-${rev}-${revExtra}/eduke32_src_${version}-${rev}-${revExtra}.tar.xz"; - sha256 = "sha256-3pBYZJqoH7XBkJ537wPwBSmNaZprvOlVtAKTo8EOT3Q="; + hash = "sha256-GQOpDQm2FeaOMyYu9L5zhrM6XFvZAHMAwn1tSK7RCB8="; }; buildInputs = [ @@ -49,7 +65,7 @@ in stdenv.mkDerivation rec { ++ lib.optional (stdenv.hostPlatform.system == "i686-linux") nasm; postPatch = '' - substituteInPlace source/imgui/src/imgui_impl_sdl.cpp \ + substituteInPlace source/imgui/src/imgui_impl_sdl2.cpp \ --replace '#include <SDL.h>' '#include <SDL2/SDL.h>' \ --replace '#include <SDL_syswm.h>' '#include <SDL2/SDL_syswm.h>' \ --replace '#include <SDL_vulkan.h>' '#include <SDL2/SDL_vulkan.h>' diff --git a/pkgs/games/etlegacy/default.nix b/pkgs/games/etlegacy/default.nix index ee5d31874c685..befbbc5ed2914 100644 --- a/pkgs/games/etlegacy/default.nix +++ b/pkgs/games/etlegacy/default.nix @@ -100,7 +100,6 @@ stdenv.mkDerivation { ''; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DCROSS_COMPILE32=0" "-DBUILD_SERVER=1" "-DBUILD_CLIENT=1" diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index 9a0f47de09972..a016676ac1d13 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -2,56 +2,56 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.89.tar.xz", + "name": "factorio_alpha_x64-1.1.92.tar.xz", "needsAuth": true, - "sha256": "1mv3lnxw8ihja1zm0kh2ghxb551pknmzjlz58iqxpkhlqmn3qi1q", + "sha256": "1arirh9180bmix2dglqlgcm036mbjanc4sxx0kc92j2grpw7xf53", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.89/alpha/linux64", - "version": "1.1.89" + "url": "https://factorio.com/get-download/1.1.92/alpha/linux64", + "version": "1.1.92" }, "stable": { - "name": "factorio_alpha_x64-1.1.87.tar.xz", + "name": "factorio_alpha_x64-1.1.91.tar.xz", "needsAuth": true, - "sha256": "166mfblhxa6l3nglwwl77d1k3rkfcisp9bkps6y5zb2hmsmr00s6", + "sha256": "0dcanryqmikhllp8lwhdapbm9scrgfgnvgwdf18wn8asr652vz39", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.87/alpha/linux64", - "version": "1.1.87" + "url": "https://factorio.com/get-download/1.1.91/alpha/linux64", + "version": "1.1.91" } }, "demo": { "experimental": { - "name": "factorio_demo_x64-1.1.88.tar.xz", + "name": "factorio_demo_x64-1.1.92.tar.xz", "needsAuth": false, - "sha256": "0m1rx7khfg3p0bj8gp30cqipwqjk1sjj13mzzxh67crwcjzxps9z", + "sha256": "02mqj2hlpsd0kgg0rav4k70pqh2sk4g2879c2nhp61ms79kdizh4", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.88/demo/linux64", - "version": "1.1.88" + "url": "https://factorio.com/get-download/1.1.92/demo/linux64", + "version": "1.1.92" }, "stable": { - "name": "factorio_demo_x64-1.1.87.tar.xz", + "name": "factorio_demo_x64-1.1.91.tar.xz", "needsAuth": false, - "sha256": "1n5q4wgp2z18vpkvim8yxg4w9wc28mw9gfnqwq6fcwafz90xy9sq", + "sha256": "1j9nzc3rs9q43vh9i0jgpyhgnjjif98sdgk4r47m0qrxjb4pnfx0", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.87/demo/linux64", - "version": "1.1.87" + "url": "https://factorio.com/get-download/1.1.91/demo/linux64", + "version": "1.1.91" } }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.89.tar.xz", + "name": "factorio_headless_x64-1.1.92.tar.xz", "needsAuth": false, - "sha256": "1an4g5sry47xmlqr53jans75ngrp819b07rrq4xkzdzmka0lkrcq", + "sha256": "04j3p2r1r0h3fak3vxxq3d7qqpyjlg57n3c8sm6gadg4q4h15aw8", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.89/headless/linux64", - "version": "1.1.89" + "url": "https://factorio.com/get-download/1.1.92/headless/linux64", + "version": "1.1.92" }, "stable": { - "name": "factorio_headless_x64-1.1.87.tar.xz", + "name": "factorio_headless_x64-1.1.91.tar.xz", "needsAuth": false, - "sha256": "1k2pk0s2nf4xy168kzf798ha7x4zc5ijpvxp61xlq7xddm5qicv0", + "sha256": "0v8zg3q79n15242fr79f9amg0icw3giy4aiaf43am5hxzcdb5212", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.87/headless/linux64", - "version": "1.1.87" + "url": "https://factorio.com/get-download/1.1.91/headless/linux64", + "version": "1.1.91" } } } diff --git a/pkgs/games/fheroes2/default.nix b/pkgs/games/fheroes2/default.nix index 4e9e5ab965b1a..37af4339694f4 100644 --- a/pkgs/games/fheroes2/default.nix +++ b/pkgs/games/fheroes2/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "fheroes2"; - version = "1.0.7"; + version = "1.0.8"; src = fetchFromGitHub { owner = "ihhub"; repo = "fheroes2"; rev = version; - sha256 = "sha256-DRwCTy87mC1bXpOEaPGQc+dJaPOaKzlmJv9d/BntR7s="; + sha256 = "sha256-lDMKMh0ztRI3sIV4+xIc25JcY5Opj5dY7pKiPx86qD0="; }; nativeBuildInputs = [ imagemagick ]; diff --git a/pkgs/games/gotypist/default.nix b/pkgs/games/gotypist/default.nix index 7840a56d361a5..24afb9317c5b4 100644 --- a/pkgs/games/gotypist/default.nix +++ b/pkgs/games/gotypist/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0khl2f6bl121slw9mlf4qzsdarpk1v3vry11f3dvz7pb1q6zjj11"; }; - vendorSha256 = null; + vendorHash = null; meta = with lib; { description = "A touch-typing tutor"; diff --git a/pkgs/games/harmonist/default.nix b/pkgs/games/harmonist/default.nix index c08ed624959d1..cbb556cbc9480 100644 --- a/pkgs/games/harmonist/default.nix +++ b/pkgs/games/harmonist/default.nix @@ -25,6 +25,6 @@ buildGoModule rec { ''; homepage = "https://harmonist.tuxfamily.org/"; license = licenses.isc; - maintainers = with maintainers; [ aaronjheng ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/games/ldmud/default.nix b/pkgs/games/ldmud/default.nix index e676ce1a5cd7f..41348fa0bcfaa 100644 --- a/pkgs/games/ldmud/default.nix +++ b/pkgs/games/ldmud/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "ldmud"; - version = "3.6.6"; + version = "3.6.7"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-2TaFt+T9B5Df6KWRQcbhY1E1D6NISb0oqLgyX47f5lI="; + sha256 = "sha256-PkrjP7tSZMaj61Hsn++7+CumhqFPLbf0+eAI6afP9HA="; }; sourceRoot = "${src.name}/src"; diff --git a/pkgs/games/lunar-client/default.nix b/pkgs/games/lunar-client/default.nix index 599edb1acffd7..24fbdf63968cf 100644 --- a/pkgs/games/lunar-client/default.nix +++ b/pkgs/games/lunar-client/default.nix @@ -5,11 +5,11 @@ let pname = "lunar-client"; - version = "3.0.10"; + version = "3.1.0"; src = fetchurl { url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage"; - hash = "sha256-mbEV+iciL4+PtfvStyXZXK5Zb91N9H1VJ5amZj+2EyA="; + hash = "sha256-6OAGNkMyHOZI5wh92OtalnvUVFWNAS9PvkFS0e4YXhk="; }; appimageContents = appimageTools.extract { inherit pname version src; }; diff --git a/pkgs/games/lzwolf/default.nix b/pkgs/games/lzwolf/default.nix index 7598022f31b1a..37bcc7fc8e06e 100644 --- a/pkgs/games/lzwolf/default.nix +++ b/pkgs/games/lzwolf/default.nix @@ -38,7 +38,6 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DGPL=ON" ]; diff --git a/pkgs/games/minesweep-rs/default.nix b/pkgs/games/minesweep-rs/default.nix index a448597d9b1ec..19fdae615ae99 100644 --- a/pkgs/games/minesweep-rs/default.nix +++ b/pkgs/games/minesweep-rs/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "minesweep-rs"; - version = "6.0.31"; + version = "6.0.34"; src = fetchFromGitHub { owner = "cpcloud"; repo = pname; rev = "v${version}"; - hash = "sha256-1jC2tudU5epMOzDR//yjSLNe+5nWzqhWDD2Zxdn5+F4="; + hash = "sha256-qYt4LrSQYFr3C0Mkks5aBOYFp60Y3OjFamXxaD5h+mU="; }; - cargoHash = "sha256-qH464zNpI/Y5SXplTwhPu9TjbqfExQYs/Lh75lPUoh4="; + cargoHash = "sha256-s2WvRXxEm+/QceHpJA41ZRts6NCcG04kib3L78KwBPg="; meta = with lib; { description = "Sweep some mines for fun, and probably not for profit"; diff --git a/pkgs/games/nanosaur/default.nix b/pkgs/games/nanosaur/default.nix index 5460d3d87e025..4ec59b726ee3c 100644 --- a/pkgs/games/nanosaur/default.nix +++ b/pkgs/games/nanosaur/default.nix @@ -20,8 +20,6 @@ stdenv.mkDerivation rec { SDL2 ]; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; - installPhase = '' runHook preInstall mkdir -p "$out/bin" diff --git a/pkgs/games/nanosaur2/default.nix b/pkgs/games/nanosaur2/default.nix index 423d40e71c6cf..7ab77623e6533 100644 --- a/pkgs/games/nanosaur2/default.nix +++ b/pkgs/games/nanosaur2/default.nix @@ -20,8 +20,6 @@ stdenv.mkDerivation rec { SDL2 ]; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; - installPhase = '' runHook preInstall mkdir -p "$out/bin" diff --git a/pkgs/games/openmw/tes3mp.nix b/pkgs/games/openmw/tes3mp.nix index f236bc8cd5e5c..8b6c96c5286f6 100644 --- a/pkgs/games/openmw/tes3mp.nix +++ b/pkgs/games/openmw/tes3mp.nix @@ -26,7 +26,6 @@ let }; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DCRABNET_ENABLE_DLL=OFF" ]; diff --git a/pkgs/games/osu-lazer/bin.nix b/pkgs/games/osu-lazer/bin.nix index c1c9a61430e01..7af729487a08f 100644 --- a/pkgs/games/osu-lazer/bin.nix +++ b/pkgs/games/osu-lazer/bin.nix @@ -7,21 +7,21 @@ let pname = "osu-lazer-bin"; - version = "2023.914.0"; + version = "2023.924.1"; name = "${pname}-${version}"; osu-lazer-bin-src = { aarch64-darwin = { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip"; - sha256 = "sha256-F+KQmr6XQAwo/QXhRog5bH2pYmP47jBZ5+x/ehD0E3Y="; + sha256 = "sha256-ZCTKVad1XArHxTa9nZfrSf6xFd0TNwryw9v+Doehurg="; }; x86_64-darwin = { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip"; - sha256 = "sha256-gdLL8awOJ29kyabKQ1qRuhIbtUFpVxo3Posg8WjTPJA="; + sha256 = "sha256-tvEUePRmOOwWugvZ32LOcptQCI/0LZv7uWG8mLjoy5c="; }; x86_64-linux = { url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage"; - sha256 = "sha256-5hrzR1HkWjKpB8JmaOpc+hFg9o4bE+WXMKPBGdMWIFw="; + sha256 = "sha256-oEfH6ctsiMrV6p8p7OdwNUBzGK7AERlmuAL1MXc0o4w="; }; }.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported."); diff --git a/pkgs/games/otto-matic/default.nix b/pkgs/games/otto-matic/default.nix index 800b97b2b86ee..c56db251a1b01 100644 --- a/pkgs/games/otto-matic/default.nix +++ b/pkgs/games/otto-matic/default.nix @@ -21,8 +21,6 @@ stdenv.mkDerivation rec { SDL2 ]; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; - installPhase = '' runHook preInstall diff --git a/pkgs/games/prismlauncher/wrapper.nix b/pkgs/games/prismlauncher/wrapper.nix index c95a5c00bcf06..4b0aa418fb6a3 100644 --- a/pkgs/games/prismlauncher/wrapper.nix +++ b/pkgs/games/prismlauncher/wrapper.nix @@ -3,6 +3,7 @@ , symlinkJoin , prismlauncher-unwrapped , wrapQtAppsHook +, addOpenGLRunpath , qtbase # needed for wrapQtAppsHook , qtsvg , qtwayland @@ -85,7 +86,7 @@ symlinkJoin { in [ "--prefix PRISMLAUNCHER_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks}" ] ++ lib.optionals stdenv.isLinux [ - "--set LD_LIBRARY_PATH /run/opengl-driver/lib:${lib.makeLibraryPath runtimeLibs}" + "--set LD_LIBRARY_PATH ${addOpenGLRunpath.driverLink}/lib:${lib.makeLibraryPath runtimeLibs}" # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 "--prefix PATH : ${lib.makeBinPath runtimePrograms}" ]; diff --git a/pkgs/games/r2modman/default.nix b/pkgs/games/r2modman/default.nix index 4e5096eb96f82..e48ce9e49ffff 100644 --- a/pkgs/games/r2modman/default.nix +++ b/pkgs/games/r2modman/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "r2modman"; - version = "3.1.43"; + version = "3.1.44"; src = fetchFromGitHub { owner = "ebkr"; repo = "r2modmanPlus"; rev = "v${version}"; - hash = "sha256-qZeBF58VB/wW0N2MZgZfiIJdDqHUdfruAoCuDEFeCPA="; + hash = "sha256-jiYrJtdM2LPwYDAgoGa0hGJcYNRiAKIuDuKZmSZ7OR4="; }; offlineCache = fetchYarnDeps { diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index bf378cd188de2..8173fb5fe1d2f 100644 --- a/pkgs/games/sgt-puzzles/default.nix +++ b/pkgs/games/sgt-puzzles/default.nix @@ -1,16 +1,16 @@ { lib, stdenv, fetchurl, desktop-file-utils , gtk3, libX11, cmake, imagemagick -, pkg-config, perl, wrapGAppsHook, nixosTests +, pkg-config, perl, wrapGAppsHook, nixosTests, writeScript , isMobile ? false }: stdenv.mkDerivation rec { pname = "sgt-puzzles"; - version = "20220913.27dd36e"; + version = "20230918.2d9e414"; src = fetchurl { url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz"; - hash = "sha256-fj1XWuXcW01uuC5dK2wDIrweyruSRdfEZBfmEj99zZE="; + hash = "sha256-YsvJ/5DTevRb+sCxWc/KcD2X5IXwAXvWGVfokr06nUM="; }; sgt-puzzles-menu = fetchurl { @@ -59,7 +59,18 @@ stdenv.mkDerivation rec { install -Dm644 ${sgt-puzzles-menu} -t $out/etc/xdg/menus/applications-merged/ ''; - passthru.tests.sgtpuzzles = nixosTests.sgtpuzzles; + passthru = { + tests.sgt-puzzles = nixosTests.sgt-puzzles; + updateScript = writeScript "update-sgt-puzzles" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl pcre common-updater-scripts + + set -eu -o pipefail + + version="$(curl -sI 'https://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles.tar.gz' | grep -Fi Location: | pcregrep -o1 'puzzles-([0-9a-f.]*).tar.gz')" + update-source-version sgt-puzzles "$version" + ''; + }; meta = with lib; { description = "Simon Tatham's portable puzzle collection"; diff --git a/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix b/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix index 21d542f0d8cdd..9d598798defe0 100644 --- a/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix +++ b/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix @@ -31,7 +31,7 @@ , gdk-pixbuf }: let - version = "0.21.1"; + version = "0.22.1"; pname = "space-station-14-launcher"; in buildDotnetModule rec { @@ -44,7 +44,7 @@ buildDotnetModule rec { owner = "space-wizards"; repo = "SS14.Launcher"; rev = "v${version}"; - hash = "sha256-uJ/47cQZsGgrExemWCWeSM/U6eW2HoKWHCsVE2KypVQ="; + hash = "sha256-I+Kj8amgFxT6yEXI5s1y0n1rgfzIrLtMOkYjguu6wpo="; fetchSubmodules = true; }; @@ -121,7 +121,7 @@ buildDotnetModule rec { postInstall = '' mkdir -p $out/lib/space-station-14-launcher/loader - cp -r SS14.Loader/bin/${buildType}/*/* $out/lib/space-station-14-launcher/loader/ + cp -r SS14.Loader/bin/${buildType}/*/*/* $out/lib/space-station-14-launcher/loader/ icoFileToHiColorTheme SS14.Launcher/Assets/icon.ico space-station-14-launcher $out ''; diff --git a/pkgs/games/srb2/cmake.patch b/pkgs/games/srb2/cmake.patch index adb070a13c19c..91af532e86fb3 100644 --- a/pkgs/games/srb2/cmake.patch +++ b/pkgs/games/srb2/cmake.patch @@ -1,19 +1,61 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 915912af5..f5c2cf9cc 100644 +index 80a3bdcd6..380a1573a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -91,11 +91,6 @@ if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL Windows) +@@ -61,7 +61,7 @@ option( + "Link dependencies using CMake's find_package and do not use internal builds" + ${SRB2_CONFIG_SYSTEM_LIBRARIES_DEFAULT} + ) +-option(SRB2_CONFIG_ENABLE_TESTS "Build the test suite" ON) ++option(SRB2_CONFIG_ENABLE_TESTS "Build the test suite" OFF) + # This option isn't recommended for distribution builds and probably won't work (yet). + cmake_dependent_option( + SRB2_CONFIG_SHARED_INTERNAL_LIBRARIES +@@ -80,25 +80,6 @@ option(SRB2_CONFIG_ZDEBUG "Compile with ZDEBUG defined." OFF) + option(SRB2_CONFIG_PROFILEMODE "Compile for profiling (GCC only)." OFF) + set(SRB2_CONFIG_ASSET_DIRECTORY "" CACHE PATH "Path to directory that contains all asset files for the installer. If set, assets will be part of installation and cpack.") + +-if(SRB2_CONFIG_ENABLE_TESTS) +- # https://github.com/catchorg/Catch2 +- CPMAddPackage( +- NAME Catch2 +- VERSION 3.4.0 +- GITHUB_REPOSITORY catchorg/Catch2 +- OPTIONS +- "CATCH_INSTALL_DOCS OFF" +- ) +- list(APPEND CMAKE_MODULE_PATH "${Catch2_SOURCE_DIR}/extras") +- include(CTest) +- include(Catch) +- add_executable(srb2tests) +- # To add tests, use target_sources to add individual test files to the target in subdirs. +- target_link_libraries(srb2tests PRIVATE Catch2::Catch2 Catch2::Catch2WithMain) +- target_compile_features(srb2tests PRIVATE c_std_11 cxx_std_17) +- catch_discover_tests(srb2tests) +-endif() +- + # Enable CCache + # (Set USE_CCACHE=ON to use, CCACHE_OPTIONS for options) + if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL Windows) +@@ -113,12 +94,6 @@ if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL Windows) + message(WARNING "USE_CCACHE was set but ccache is not found (set CCACHE_TOOL_PATH)") endif() endif() - else() +-else() - CPMAddPackage( - NAME Ccache.cmake - GITHUB_REPOSITORY TheLartians/Ccache.cmake - VERSION 1.2 - ) endif() - + # Dependencies --- -2.40.1 - +@@ -179,7 +154,7 @@ include(GitUtilities) + if("${SRB2_SDL2_EXE_NAME}" STREQUAL "") + # cause a reconfigure if the branch changes + get_git_dir(SRB2_GIT_DIR) +- configure_file("${SRB2_GIT_DIR}/HEAD" HEAD COPYONLY) ++ #configure_file("${SRB2_GIT_DIR}/HEAD" HEAD COPYONLY) + + git_current_branch(SRB2_GIT_REVISION) + diff --git a/pkgs/games/srb2/default.nix b/pkgs/games/srb2/default.nix index 4213039f8877a..fdb374a917511 100644 --- a/pkgs/games/srb2/default.nix +++ b/pkgs/games/srb2/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "srb2"; - version = "2.2.11"; + version = "2.2.13"; src = fetchFromGitHub { owner = "STJr"; repo = "SRB2"; rev = "SRB2_release_${finalAttrs.version}"; - hash = "sha256-tyiXivJWjNnL+4YynUV6k6iaMs8o9HkHrp+qFj2+qvQ="; + hash = "sha256-OSkkjCz7ZW5+0vh6l7+TpnHLzXmd/5QvTidRQSHJYX8="; }; nativeBuildInputs = [ @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://github.com/STJr/SRB2/releases/download/SRB2_release_${finalAttrs.version}/SRB2-v${lib.replaceStrings ["."] [""] finalAttrs.version}-Full.zip"; - hash = "sha256-KsJIkCczD/HyIwEy5dI3zsHbWFCMBaCoCHizfupFoWM="; + hash = "sha256-g7kaNRE1tjcF5J2v+kTnrDzz4zs5f1b/NH67ce2ifUo="; }; sourceRoot = "."; @@ -77,8 +77,10 @@ stdenv.mkDerivation (finalAttrs: { ]; patches = [ - # Fix unknown command "CPMAddPackage" by not using Ccache.cmake + # Make the build work without internet connectivity + # See: https://build.opensuse.org/request/show/1109889 ./cmake.patch + ./thirdparty.patch ]; desktopItems = [ @@ -111,5 +113,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = platforms.linux; license = licenses.gpl2Plus; maintainers = with maintainers; [ zeratax donovanglover ]; + mainProgram = "srb2"; }; }) diff --git a/pkgs/games/srb2/thirdparty.patch b/pkgs/games/srb2/thirdparty.patch new file mode 100644 index 0000000000000..bb550290d85d5 --- /dev/null +++ b/pkgs/games/srb2/thirdparty.patch @@ -0,0 +1,12 @@ +diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt +index f33b3bf3f..1214f179c 100644 +--- a/thirdparty/CMakeLists.txt ++++ b/thirdparty/CMakeLists.txt +@@ -16,6 +16,5 @@ if(NOT "${SRB2_CONFIG_SYSTEM_LIBRARIES}") + include("cpm-png.cmake") + include("cpm-curl.cmake") + include("cpm-openmpt.cmake") ++ include("cpm-libgme.cmake") + endif() +- +-include("cpm-libgme.cmake") diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/default.nix index b0991af79cbe5..424781dd89580 100644 --- a/pkgs/games/ultrastardx/default.nix +++ b/pkgs/games/ultrastardx/default.nix @@ -31,12 +31,13 @@ let in stdenv.mkDerivation rec { pname = "ultrastardx"; - version = "2021-04-03"; + version = "2023.9.0"; + src = fetchFromGitHub { owner = "UltraStar-Deluxe"; repo = "USDX"; - rev = "d49e916705092f3d765d85d276b283b9e7e232a6"; - sha256 = "0sdcz2vc8i2z50nj7zbkdpxx2mvx0m0927lfsj7d7qr0p8vkm0wa"; + rev = "v${version}"; + hash = "sha256-KvYfWdpgN72F8Y5iFNba0SCjPoS33O3FAdrrC49xoGo="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; @@ -77,7 +78,7 @@ in stdenv.mkDerivation rec { dontPatchELF = true; meta = with lib; { - homepage = "http://ultrastardx.sourceforge.net/"; + homepage = "https://usdx.eu/"; description = "Free and open source karaoke game"; license = licenses.gpl2Plus; maintainers = with maintainers; [ Profpatsch ]; diff --git a/pkgs/games/vassal/default.nix b/pkgs/games/vassal/default.nix index ff52410e4f30c..a3e7516c6f812 100644 --- a/pkgs/games/vassal/default.nix +++ b/pkgs/games/vassal/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "VASSAL"; - version = "3.6.19"; + version = "3.7.0"; src = fetchzip { url = "https://github.com/vassalengine/vassal/releases/download/${version}/${pname}-${version}-linux.tar.bz2"; - sha256 = "sha256-JqMX0RUx1Yndo1pkLA4YnijgkojBaelt6T7gP+CUBSI="; + sha256 = "sha256-GmqPnay/K36cJgP622ht18csaohcUYZpvMD8LaOH4eM="; }; buildInputs = [ diff --git a/pkgs/games/vcmi/default.nix b/pkgs/games/vcmi/default.nix index abd0551081fdc..ad5aa48c7c5d3 100644 --- a/pkgs/games/vcmi/default.nix +++ b/pkgs/games/vcmi/default.nix @@ -27,14 +27,14 @@ stdenv.mkDerivation rec { pname = "vcmi"; - version = "1.2.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "vcmi"; repo = "vcmi"; rev = version; fetchSubmodules = true; - hash = "sha256-F1g3ric23jKetl5aBG5NRpT4LnGXhBKZmGp2hg6Io9s="; + hash = "sha256-dwTQRpu+IrKhuiiw/uYBt8i/BYlQ5XCy/jUhDAo6aa4="; }; nativeBuildInputs = [ @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DENABLE_LUA:BOOL=ON" - "-DENABLE_ERM:BOOL=ON" + "-DENABLE_ERM:BOOL=OFF" "-DENABLE_GITVERSION:BOOL=OFF" "-DENABLE_PCH:BOOL=OFF" "-DENABLE_TEST:BOOL=OFF" diff --git a/pkgs/misc/cups/drivers/cnijfilter2/default.nix b/pkgs/misc/cups/drivers/cnijfilter2/default.nix index 8390d5e0ba847..8520ba7aff2e3 100644 --- a/pkgs/misc/cups/drivers/cnijfilter2/default.nix +++ b/pkgs/misc/cups/drivers/cnijfilter2/default.nix @@ -145,6 +145,6 @@ stdenv.mkDerivation { homepage = "https://hk.canon/en/support/0101048401/1"; license = licenses.unfree; platforms = [ "i686-linux" "x86_64-linux" ]; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/misc/drivers/epsonscan2/default.nix b/pkgs/misc/drivers/epsonscan2/default.nix index 325cbbd8707c4..69c4c03b95e65 100644 --- a/pkgs/misc/drivers/epsonscan2/default.nix +++ b/pkgs/misc/drivers/epsonscan2/default.nix @@ -97,7 +97,6 @@ stdenv.mkDerivation { ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" # The non-free (Debian) packages uses this directory structure so do the same when compiling # from source so we can easily merge them. "-DCMAKE_INSTALL_LIBDIR=lib/${system}-gnu" diff --git a/pkgs/misc/dumb/default.nix b/pkgs/misc/dumb/default.nix index 2a554d99b287f..f80dea534a67a 100644 --- a/pkgs/misc/dumb/default.nix +++ b/pkgs/misc/dumb/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { }; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE='Release'" "-DBUILD_EXAMPLES='OFF'" ]; diff --git a/pkgs/misc/dxvk/dxvk.nix b/pkgs/misc/dxvk/dxvk.nix index b7bc4f2fc1275..129090faaf473 100644 --- a/pkgs/misc/dxvk/dxvk.nix +++ b/pkgs/misc/dxvk/dxvk.nix @@ -46,12 +46,12 @@ let ]; }; "default" = rec { - version = "2.2"; + version = "2.3"; src = fetchFromGitHub { owner = "doitsujin"; repo = "dxvk"; rev = "v${version}"; - hash = "sha256-GKRd66DvcA+7p3/wDqAUi02ZLRSVZ/fvJM0PQDEKVMA="; + hash = "sha256-RU+B0XfphD5HHW/vSzqHLUaGS3E31d5sOLp3lMmrCB8="; fetchSubmodules = true; # Needed for the DirectX headers and libdisplay-info }; patches = [ ]; diff --git a/pkgs/misc/flashfocus/default.nix b/pkgs/misc/flashfocus/default.nix index d300711deb2a4..753f82f6bd44c 100644 --- a/pkgs/misc/flashfocus/default.nix +++ b/pkgs/misc/flashfocus/default.nix @@ -1,12 +1,14 @@ -{ lib, python3, fetchPypi, netcat-openbsd, nix-update-script }: +{ lib, python3Packages, fetchPypi, netcat-openbsd, nix-update-script }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "flashfocus"; - version = "2.3.1"; + version = "2.4.1"; + + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-XT3CKJWn1uKnPPsJC+MWlEAd8sWdVTEXz5b3n0UUedY="; + sha256 = "sha256-O6jRQ6e96b8CuumTD6TGELaz26No7WFZgGSnNSlqzuE="; }; postPatch = '' @@ -14,8 +16,9 @@ python3.pkgs.buildPythonApplication rec { --replace "nc" "${lib.getExe netcat-openbsd}" ''; - nativeBuildInputs = with python3.pkgs; [ + nativeBuildInputs = with python3Packages; [ pythonRelaxDepsHook + setuptools ]; pythonRelaxDeps = [ @@ -23,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { "xcffib" ]; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = with python3Packages; [ i3ipc xcffib click diff --git a/pkgs/misc/lilypond/unstable.nix b/pkgs/misc/lilypond/unstable.nix index 11e91ddb377c1..a839ef5e8eb17 100644 --- a/pkgs/misc/lilypond/unstable.nix +++ b/pkgs/misc/lilypond/unstable.nix @@ -1,10 +1,10 @@ { lib, fetchurl, lilypond }: lilypond.overrideAttrs (oldAttrs: rec { - version = "2.25.7"; + version = "2.25.8"; src = fetchurl { url = "https://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz"; - sha256 = "sha256-b7prbe4lnUfiLGcmWbrjXTTXqJTX4PsAMBbSvZgHLwI="; + hash = "sha256-pycbGmVp3HVKOAGpe4gEmBWjMT2BqrSqKISsAZCEkx0="; }; passthru.updateScript = { diff --git a/pkgs/misc/mnemonicode/default.nix b/pkgs/misc/mnemonicode/default.nix index 352dd038fb5a4..4ecacaf418a1d 100644 --- a/pkgs/misc/mnemonicode/default.nix +++ b/pkgs/misc/mnemonicode/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation { ''; license = licenses.mit; platforms = platforms.all; - maintainers = [ maintainers.cstrahan ]; + maintainers = [ ]; }; } diff --git a/pkgs/misc/scrcpy/default.nix b/pkgs/misc/scrcpy/default.nix index 9602b6364974f..b43e6400c8dc0 100644 --- a/pkgs/misc/scrcpy/default.nix +++ b/pkgs/misc/scrcpy/default.nix @@ -72,6 +72,6 @@ stdenv.mkDerivation rec { ]; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ deltaevo lukeadams msfjarvis ]; + maintainers = with maintainers; [ deltaevo msfjarvis ]; }; } diff --git a/pkgs/misc/urbit/default.nix b/pkgs/misc/urbit/default.nix index 81dd6b81badc0..3a9488a5951a1 100644 --- a/pkgs/misc/urbit/default.nix +++ b/pkgs/misc/urbit/default.nix @@ -10,15 +10,15 @@ let in stdenv.mkDerivation rec { pname = "urbit"; - version = "2.11"; + version = "2.12"; src = fetchzip { url = "https://github.com/urbit/vere/releases/download/vere-v${version}/${platform}.tgz"; sha256 = { - x86_64-linux = "sha256-k2zmcjZ9NXmwZf93LIAg1jx4IRprKUgdkvwzxEOKWDY="; - aarch64-linux = "sha256-atMBXyXwavpSDTZxUnXIq+NV4moKGRWLaFTM9Kuzt94="; - x86_64-darwin = "sha256-LSJ9jVY3fETlpRAkyUWa/2vZ5xAFmmMssvbzUfIBY/4="; - aarch64-darwin = "sha256-AViUt2N+YCgMWOcv3ZI0GfdYVOiRLbhseQ7TTq4zCiQ="; + x86_64-linux = "sha256-N8RYlafw0HcmtGAQMKQb1cG7AivOpWS/5rU8CESJWAw="; + aarch64-linux = "sha256-RsBtwxSdqHVXMk7or1nPAFWd6Ypa0SqjpTihv8riyk4="; + x86_64-darwin = "sha256-/QPI66/gl3mlQHc+8zrEyP4/Hv5vwXlEx1cW2mP33IY="; + aarch64-darwin = "sha256-+2DYohaBxVcR1ZOjuk6GWcNpzb6aJMXq6BxwWw1OeIY="; }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/os-specific/darwin/coconutbattery/default.nix b/pkgs/os-specific/darwin/coconutbattery/default.nix index 69302baa92eb7..4850b2b4c04ed 100644 --- a/pkgs/os-specific/darwin/coconutbattery/default.nix +++ b/pkgs/os-specific/darwin/coconutbattery/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "coconutbattery"; - version = "3.9.12"; + version = "3.9.14"; src = fetchzip { url = "https://coconut-flavour.com/downloads/coconutBattery_${builtins.replaceStrings [ "." ] [ "" ] finalAttrs.version}.zip"; - hash = "sha256-8WxGjZbxUqchSIfvpK2RLifn7/TD5nau5hgMzLUiV2o="; + hash = "sha256-zKSPKwDBwxlyNJFurCLLGtba9gpizJCjOOAd81vdD5Q="; }; dontPatch = true; diff --git a/pkgs/os-specific/darwin/raycast/default.nix b/pkgs/os-specific/darwin/raycast/default.nix index 4824bcff4f853..30fc882f00901 100644 --- a/pkgs/os-specific/darwin/raycast/default.nix +++ b/pkgs/os-specific/darwin/raycast/default.nix @@ -6,12 +6,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "raycast"; - version = "1.57.1"; + version = "1.59.0"; src = fetchurl { name = "Raycast.dmg"; url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal"; - hash = "sha256-ePHaNujW39LjMc+R2TZ1favJXeroHpbeuRNwmv8HgXc="; + hash = "sha256-EA8DzfJtd1lM0/N1bQ8x9GQ8KiILwRKPIFKk6XlaBhg="; }; dontPatch = true; diff --git a/pkgs/os-specific/darwin/rectangle/default.nix b/pkgs/os-specific/darwin/rectangle/default.nix index b59c6051de72a..6ea01f7c64d96 100644 --- a/pkgs/os-specific/darwin/rectangle/default.nix +++ b/pkgs/os-specific/darwin/rectangle/default.nix @@ -7,11 +7,11 @@ stdenvNoCC.mkDerivation rec { pname = "rectangle"; - version = "0.71"; + version = "0.73"; src = fetchurl { url = "https://github.com/rxhanson/Rectangle/releases/download/v${version}/Rectangle${version}.dmg"; - hash = "sha256-QsvEBTuLh5GyVzNTKaJAVwPNtYCc/3yH+U8VgXE4nk0="; + hash = "sha256-D+heCrJVo2xsKY9XtEuhrG/59yFIJTGhKJIfN9Vhc+M="; }; sourceRoot = "."; diff --git a/pkgs/os-specific/darwin/yabai/default.nix b/pkgs/os-specific/darwin/yabai/default.nix index 14d3ccbc04690..585891b13cd90 100644 --- a/pkgs/os-specific/darwin/yabai/default.nix +++ b/pkgs/os-specific/darwin/yabai/default.nix @@ -17,7 +17,7 @@ let pname = "yabai"; - version = "5.0.8"; + version = "5.0.9"; test-version = testers.testVersion { package = yabai; @@ -53,7 +53,7 @@ in src = fetchzip { url = "https://github.com/koekeishiya/yabai/releases/download/v${version}/yabai-v${version}.tar.gz"; - hash = "sha256-w4MTHHYWwBq0/WkemYIeV49aA/DzFxXITD8gF5St0Yo="; + hash = "sha256-6dqQ+kau/aUAM4oPSkcgZJlJModcjKOXPlTB32MvoLQ="; }; nativeBuildInputs = [ @@ -89,7 +89,7 @@ in owner = "koekeishiya"; repo = "yabai"; rev = "v${version}"; - hash = "sha256-VahfeKYz/cATb0RF9QykngMtRpCh392jY8aJuggpqMU="; + hash = "sha256-uy1KOBJa9BNK5bd+5q5okMouAV0H3DUXrG3Mvr5U6oc="; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix index 07705f568a1d7..da559b5fcc1c5 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix @@ -1,13 +1,24 @@ -{lib, stdenv, fetchurl, alsa-lib, gettext, makeWrapper, ncurses, libsamplerate, pciutils, which, fftw}: +{lib, stdenv, fetchurl, fetchpatch, alsa-lib, gettext, makeWrapper, ncurses, libsamplerate, pciutils, which, fftw}: stdenv.mkDerivation rec { pname = "alsa-utils"; - version = "1.2.9"; + version = "1.2.10"; src = fetchurl { url = "mirror://alsa/utils/${pname}-${version}.tar.bz2"; - sha256 = "sha256-52I9RSVZX5LhHOJe6al/IEChTG5NzQJ6qW4Gy854F70="; + sha256 = "sha256-EEti7H8Cp84WynefSBVhbfHMIZM1A3g6kQe1lE+DBjo="; }; + patches = [ + # Backport fixes for musl libc. Remove on next release + (fetchpatch { + url = "https://github.com/alsa-project/alsa-utils/commit/8c229270f6bae83b705a03714c46067a7aa57b02.patch"; + hash = "sha256-sUaBHY8EHf4805nF6tyNV5jYXcJf3O+r04VXFu4dUCE="; + }) + (fetchpatch { + url = "https://github.com/alsa-project/alsa-utils/commit/0925ad7f09b2dc77015784f9ac2f5e34dd0dd5c3.patch"; + hash = "sha256-bgGU9On82AUbOjo+KN6WfuhqUAWM87OHnKN7plpG284="; + }) + ]; nativeBuildInputs = [ gettext makeWrapper ]; buildInputs = [ alsa-lib ncurses libsamplerate fftw ]; diff --git a/pkgs/os-specific/linux/bolt/default.nix b/pkgs/os-specific/linux/bolt/default.nix index 2765b6647a7f0..748db1a62b5bf 100644 --- a/pkgs/os-specific/linux/bolt/default.nix +++ b/pkgs/os-specific/linux/bolt/default.nix @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { pname = "bolt"; - version = "0.9.5"; + version = "0.9.6"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "bolt"; repo = "bolt"; rev = version; - sha256 = "sha256-j1UO8lkVoS56hwPQXH8aIr1UegM6PdtaBXKZn50GP60="; + sha256 = "sha256-sJBY/pXUX5InLynsvAmapW54UF/WGn9eDlluWXjhubQ="; }; patches = [ diff --git a/pkgs/os-specific/linux/bpftune/default.nix b/pkgs/os-specific/linux/bpftune/default.nix index b9daff531a56a..c2fd9d3f6a5eb 100644 --- a/pkgs/os-specific/linux/bpftune/default.nix +++ b/pkgs/os-specific/linux/bpftune/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "bpftune"; - version = "unstable-2023-08-22"; + version = "unstable-2023-09-11"; src = fetchFromGitHub { owner = "oracle"; repo = "bpftune"; - rev = "ae3047976d6ba8c3ec7c21ec8c85b92d11c64169"; - hash = "sha256-yXfS3zrUxRlmWsXyDpPhvYDqgYFQTAZ2dlmiQp6/zVQ="; + rev = "22926812a555eac910eac0699100bac0f8776f1b"; + hash = "sha256-BflJc5lYWYFIo9LzKfb34F4V1qOI8ywVjnzOLz605DI="; }; postPatch = '' @@ -32,6 +32,8 @@ stdenv.mkDerivation rec { substituteInPlace include/bpftune/libbpftune.h \ --replace /usr/lib64/bpftune/ "$out/lib/bpftune/" \ --replace /usr/local/lib64/bpftune/ "$out/lib/bpftune/" + substituteInPlace src/libbpftune.c \ + --replace /lib/modules /run/booted-system/kernel-modules/lib/modules substituteInPlace src/Makefile sample_tuner/Makefile \ --replace 'BPF_INCLUDE := /usr/include' 'BPF_INCLUDE := ${lib.getDev libbpf}/include' \ diff --git a/pkgs/os-specific/linux/conntrack-tools/default.nix b/pkgs/os-specific/linux/conntrack-tools/default.nix index 18a0b99722754..42741fae5b6c9 100644 --- a/pkgs/os-specific/linux/conntrack-tools/default.nix +++ b/pkgs/os-specific/linux/conntrack-tools/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "conntrack-tools"; - version = "1.4.7"; + version = "1.4.8"; src = fetchurl { - url = "https://www.netfilter.org/projects/conntrack-tools/files/${pname}-${version}.tar.bz2"; - sha256 = "sha256-CZ3rz1foFpDO1X9Ra0k1iKc1GPSMFNZW+COym0/CS10="; + url = "https://www.netfilter.org/projects/conntrack-tools/files/${pname}-${version}.tar.xz"; + hash = "sha256-BnZ39MX2VkgZ547TqdSomAk16pJz86uyKkIOowq13tY="; }; buildInputs = [ diff --git a/pkgs/os-specific/linux/ddcci/default.nix b/pkgs/os-specific/linux/ddcci/default.nix index f9a71fece7483..ce435b3874f3f 100644 --- a/pkgs/os-specific/linux/ddcci/default.nix +++ b/pkgs/os-specific/linux/ddcci/default.nix @@ -1,26 +1,17 @@ -{ lib, stdenv, fetchFromGitLab, kernel, fetchpatch }: +{ lib, stdenv, fetchFromGitLab, kernel }: stdenv.mkDerivation rec { pname = "ddcci-driver"; - version = "0.4.3"; + version = "0.4.4"; name = "${pname}-${kernel.version}-${version}"; src = fetchFromGitLab { owner = "${pname}-linux"; repo = "${pname}-linux"; rev = "v${version}"; - hash = "sha256-1Z6V/AorD4aslLKaaCZpmkD2OiQnmpu3iroOPlNPtLE="; + hash = "sha256-4pCfXJcteWwU6cK8OOSph4XlhKTk289QqLxsSWY7cac="; }; - patches = [ - # https://gitlab.com/ddcci-driver-linux/ddcci-driver-linux/-/merge_requests/12 - (fetchpatch { - name = "kernel-6.2-6.3.patch"; - url = "https://gitlab.com/ddcci-driver-linux/ddcci-driver-linux/-/commit/1ef6079679acc455f75057dd7097b5b494a241dc.patch"; - hash = "sha256-2C2leS20egGY3J2tq96gsUQXYw13wBJ3ZWrdIXxmEYs="; - }) - ]; - hardeningDisable = [ "pic" ]; nativeBuildInputs = kernel.moduleBuildDependencies; diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix index a6f0adc5df30f..463795936e728 100644 --- a/pkgs/os-specific/linux/displaylink/default.nix +++ b/pkgs/os-specific/linux/displaylink/default.nix @@ -8,7 +8,9 @@ , makeWrapper , requireFile , substituteAll +, nixosTests }: + let arch = if stdenv.hostPlatform.system == "x86_64-linux" then "x64" @@ -20,22 +22,22 @@ let in stdenv.mkDerivation rec { pname = "displaylink"; - version = "5.7.0-61.129"; + version = "5.8.0-63.33"; src = requireFile rec { - name = "displaylink-570.zip"; - sha256 = "807f1c203ac1e71c6f1f826493b9bb32e277f07cb2cf48537bf8cfdc68dd1515"; + name = "displaylink-580.zip"; + sha256 = "05m8vm6i9pc9pmvar021lw3ls60inlmq92nling0vj28skm55i92"; message = '' In order to install the DisplayLink drivers, you must first comply with DisplayLink's EULA and download the binaries and sources from here: - https://www.synaptics.com/products/displaylink-graphics/downloads/ubuntu-5.7 + https://www.synaptics.com/products/displaylink-graphics/downloads/ubuntu-5.8 Once you have downloaded the file, please use the following commands and re-run the installation: - mv \$PWD/"DisplayLink USB Graphics Software for Ubuntu5.7-EXE.zip" \$PWD/${name} + mv \$PWD/"DisplayLink USB Graphics Software for Ubuntu5.8-EXE.zip" \$PWD/${name} nix-prefetch-url file://\$PWD/${name} ''; }; @@ -67,6 +69,12 @@ stdenv.mkDerivation rec { dontStrip = true; dontPatchELF = true; + passthru = { + tests = { + inherit (nixosTests) displaylink; + }; + }; + meta = with lib; { description = "DisplayLink DL-5xxx, DL-41xx and DL-3x00 Driver for Linux"; homepage = "https://www.displaylink.com/"; @@ -74,5 +82,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ abbradar ]; platforms = [ "x86_64-linux" "i686-linux" ]; hydraPlatforms = []; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; } diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix index 78acb45bb3c76..c3bd0c64a4ba6 100644 --- a/pkgs/os-specific/linux/dpdk/default.nix +++ b/pkgs/os-specific/linux/dpdk/default.nix @@ -68,7 +68,7 @@ in stdenv.mkDerivation rec { ] # kni kernel driver is currently not compatble with 5.11 ++ lib.optional (mod && kernel.kernelOlder "5.11") "-Ddisable_drivers=kni" - ++ lib.optional (!shared) "-Ddefault_library=static" + ++ [(if shared then "-Ddefault_library=shared" else "-Ddefault_library=static")] ++ lib.optional (machine != null) "-Dmachine=${machine}" ++ lib.optional mod "-Dkernel_dir=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ++ lib.optional (withExamples != []) "-Dexamples=${builtins.concatStringsSep "," withExamples}"; diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix index 230f73ef416d0..c85a75d1f17f4 100644 --- a/pkgs/os-specific/linux/ell/default.nix +++ b/pkgs/os-specific/linux/ell/default.nix @@ -3,18 +3,20 @@ , autoreconfHook , pkg-config , dbus +, fetchpatch +, sysctl }: stdenv.mkDerivation rec { pname = "ell"; - version = "0.57"; + version = "0.58"; outputs = [ "out" "dev" ]; src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/ell/ell.git"; rev = version; - sha256 = "sha256-9d9WMCByQ1TKWpzWe5msts1LG+BKKqwCgaMBbD74/+4="; + hash = "sha256-CwUwwvyT541aIvypVMqRhHkVJLna121Cme+v7c0FLWo="; }; nativeBuildInputs = [ @@ -24,8 +26,18 @@ stdenv.mkDerivation rec { nativeCheckInputs = [ dbus + # required as the sysctl test works on some machines + sysctl ]; + patches = [ + # /proc/sys/net/core/somaxconn doesn't always exist in the nix build environment + (fetchpatch { + name = "skip-sysctl-test-if-sysfs-not-available.patch"; + url = "https://patchwork.kernel.org/project/ell/patch/526DA75D-01AB-4D85-BF5C-5F25E5C39480@kloenk.dev/raw/"; + hash = "sha256-YYGYWQ67cbMLt6RnqZmHt+tpvVIDKPbSCqPIouk6alU="; + }) + ]; enableParallelBuilding = true; # tests sporadically fail on musl diff --git a/pkgs/os-specific/linux/evdi/0000-fix-drm-path.patch b/pkgs/os-specific/linux/evdi/0000-fix-drm-path.patch deleted file mode 100644 index a389b73185ddc..0000000000000 --- a/pkgs/os-specific/linux/evdi/0000-fix-drm-path.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/module/Makefile b/module/Makefile -index fe573de..c8022c8 100644 ---- a/module/Makefile -+++ b/module/Makefile -@@ -50,7 +50,7 @@ ifneq ($(KERNELRELEASE),) - # inside kbuild - # Note: this can be removed once it is in kernel tree and Kconfig is properly used - CONFIG_DRM_EVDI := m --ccflags-y := -isystem include/uapi/drm include/drm $(CFLAGS) $(EL8FLAG) $(EL9FLAG) $(RPIFLAG) -+ccflags-y := -isystem include/uapi/drm $(CFLAGS) $(EL8FLAG) $(EL9FLAG) $(RPIFLAG) - evdi-y := evdi_platform_drv.o evdi_platform_dev.o evdi_sysfs.o evdi_modeset.o evdi_connector.o evdi_encoder.o evdi_drm_drv.o evdi_fb.o evdi_gem.o evdi_painter.o evdi_params.o evdi_cursor.o evdi_debug.o evdi_i2c.o - evdi-$(CONFIG_COMPAT) += evdi_ioc32.o - obj-$(CONFIG_DRM_EVDI) := evdi.o -diff --git a/module/evdi_drm.h b/module/evdi_drm.h -index 29b8427..5012693 100644 ---- a/module/evdi_drm.h -+++ b/module/evdi_drm.h -@@ -12,12 +12,11 @@ - - #ifdef __KERNEL__ - #include <linux/types.h> -+#include <drm/drm.h> - #else - #include <stdint.h> - #endif - --#include "drm.h" -- - /* Output events sent from driver to evdi lib */ - #define DRM_EVDI_EVENT_UPDATE_READY 0x80000000 - #define DRM_EVDI_EVENT_DPMS 0x80000001 diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix index 71ab8bea79e00..ebb6fbe2cc6be 100644 --- a/pkgs/os-specific/linux/evdi/default.nix +++ b/pkgs/os-specific/linux/evdi/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchFromGitHub, kernel, libdrm, python3 }: + let python3WithLibs = python3.withPackages (ps: with ps; [ pybind11 @@ -6,13 +7,13 @@ let in stdenv.mkDerivation rec { pname = "evdi"; - version = "1.13.1"; + version = "1.14.1"; src = fetchFromGitHub { owner = "DisplayLink"; repo = pname; rev = "v${version}"; - hash = "sha256-Or4hhnFOtC8vmB4kFUHbFHn2wg/NsUMY3d2Tiea6YbY="; + hash = "sha256-em3Y56saB7K3Wr31Y0boc38xGb57gdveN0Cstgy8y20="; }; env.NIX_CFLAGS_COMPILE = "-Wno-error -Wno-error=sign-compare"; @@ -35,11 +36,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - patches = [ - ./0000-fix-drm-path.patch - ]; - meta = with lib; { + changelog = "https://github.com/DisplayLink/evdi/releases/tag/v${version}"; description = "Extensible Virtual Display Interface"; maintainers = with maintainers; [ ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/eventstat/default.nix b/pkgs/os-specific/linux/eventstat/default.nix index 88ac5add34a74..2c139cd3c865c 100644 --- a/pkgs/os-specific/linux/eventstat/default.nix +++ b/pkgs/os-specific/linux/eventstat/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ColinIanKing/eventstat"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/os-specific/linux/fan2go/default.nix b/pkgs/os-specific/linux/fan2go/default.nix index 48da98cf59120..c7176183018ae 100644 --- a/pkgs/os-specific/linux/fan2go/default.nix +++ b/pkgs/os-specific/linux/fan2go/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "markusressel"; repo = pname; rev = version; - sha256 = "w2Qwu3ZmBkoA86xa7V6pnIBAbfG9mtkAHePkQjefRW8="; + hash = "sha256-w2Qwu3ZmBkoA86xa7V6pnIBAbfG9mtkAHePkQjefRW8="; }; - vendorSha256 = "6OEdl7ie0dTjXrG//Fvcg4ZyTW/mhrUievDljY2zi/4="; + vendorHash = "sha256-6OEdl7ie0dTjXrG//Fvcg4ZyTW/mhrUievDljY2zi/4="; postConfigure = '' substituteInPlace vendor/github.com/md14454/gosensors/gosensors.go \ diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix index 6c7afffd9cec8..a64a0574d8ffb 100644 --- a/pkgs/os-specific/linux/hwdata/default.nix +++ b/pkgs/os-specific/linux/hwdata/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hwdata"; - version = "0.373"; + version = "0.374"; src = fetchFromGitHub { owner = "vcrhonek"; repo = "hwdata"; rev = "v${version}"; - hash = "sha256-KXZodSvY4Szt/gp0iRkx+ngziCaUYvkjnkvjwPj3OwI="; + hash = "sha256-RvjYd8iD6JkGhh6TDy/Qo+UzLxbhPvIJvhl/Rw14lbk="; }; postPatch = '' diff --git a/pkgs/os-specific/linux/ifmetric/default.nix b/pkgs/os-specific/linux/ifmetric/default.nix index f5d55db5e41bd..d4672b9be21b8 100644 --- a/pkgs/os-specific/linux/ifmetric/default.nix +++ b/pkgs/os-specific/linux/ifmetric/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = [ maintainers.anna328p ]; platforms = platforms.linux; + mainProgram = "ifmetric"; }; } diff --git a/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/pkgs/os-specific/linux/intel-compute-runtime/default.nix index 1615ae39f7a3a..dacfb76eb9af8 100644 --- a/pkgs/os-specific/linux/intel-compute-runtime/default.nix +++ b/pkgs/os-specific/linux/intel-compute-runtime/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, patchelf , cmake , pkg-config , intel-gmmlib @@ -12,13 +11,13 @@ stdenv.mkDerivation rec { pname = "intel-compute-runtime"; - version = "23.22.26516.18"; + version = "23.30.26918.20"; src = fetchFromGitHub { owner = "intel"; repo = "compute-runtime"; rev = version; - sha256 = "sha256-SeNmCXqoUqTo1F3ia+4fAMHWJgdEz/PsNFEkrqM+0k4="; + hash = "sha256-dEznHRgAcJa/BBTD/AWJHlA7fNj2IXHHrYcKM4M+/1o="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/os-specific/linux/iomelt/default.nix b/pkgs/os-specific/linux/iomelt/default.nix index 860a7b446328b..0084a397d075d 100644 --- a/pkgs/os-specific/linux/iomelt/default.nix +++ b/pkgs/os-specific/linux/iomelt/default.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "A simple yet effective way to benchmark disk IO in Linux systems"; homepage = "http://www.iomelt.com"; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; license = licenses.artistic2; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index 792fef69cbd25..1b983bb90e1e7 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { pname = "iwd"; - version = "2.7"; + version = "2.8"; src = fetchgit { url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git"; rev = version; - sha256 = "sha256-UsyJYQB6YzwcL6H1nyCW8ZTpBzacZMAp39mCfsZqwHY="; + sha256 = "sha256-i+2R8smgLXooApj0Z5e03FybhYgw1X/kIsJkrDzW8y4="; }; outputs = [ "out" "man" "doc" ] diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index b1c0d3ba50db6..ff40e585b1d8d 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -111,12 +111,12 @@ let in { inherit makeLinuxHeaders; - linuxHeaders = let version = "6.4"; in + linuxHeaders = let version = "6.5"; in makeLinuxHeaders { inherit version; src = fetchurl { url = "mirror://kernel/linux/kernel/v${lib.versions.major version}.x/linux-${version}.tar.xz"; - hash = "sha256-j6BYjwws7KRMrHeg45ukjJ8AprncaXYcAqXT76yNp/M="; + hash = "sha256-eldLvCCALqdrUsp/rwcmf3IEXoYbGJFcUnKpjCer+IQ="; }; patches = [ ./no-relocs.patch # for building x86 kernel headers on non-ELF platforms diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 2e55826773692..038a3105a1826 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -1012,6 +1012,7 @@ let X86_AMD_PLATFORM_DEVICE = yes; X86_PLATFORM_DRIVERS_DELL = whenAtLeast "5.12" yes; + X86_PLATFORM_DRIVERS_HP = whenAtLeast "6.1" yes; LIRC = mkMerge [ (whenOlder "4.16" module) (whenAtLeast "4.17" yes) ]; diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json new file mode 100644 index 0000000000000..e491c7fd6a4eb --- /dev/null +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -0,0 +1,38 @@ +{ + "testing": { + "version": "6.6-rc4", + "hash": "sha256:0r7cfigh7rcrnzpdi40s6jnzhjgiamb6prixl4n2x8489n6zxfr9" + }, + "6.5": { + "version": "6.5.5", + "hash": "sha256:15gg8sb6cfgk1afwj7fl7mj4nkj14w43vzwvw0qsg3nzyxwh7wcc" + }, + "6.4": { + "version": "6.4.16", + "hash": "sha256:0zgj1z97jyx7wf12zrnlcp0mj4cl43ais9qsy6dh1jwylf2fq9ln" + }, + "6.1": { + "version": "6.1.55", + "hash": "sha256:1h0mzx52q9pvdv7rhnvb8g68i7bnlc9rf8gy9qn4alsxq4g28zm8" + }, + "5.15": { + "version": "5.15.133", + "hash": "sha256:1paxzzcagc7s8i491zjny43rxhfamafyly438kj8hyw96iwmx17g" + }, + "5.10": { + "version": "5.10.197", + "hash": "sha256:1awkm7lln5gf6kld9z5h4mg39bd778jsdswwlwb7iv7bn03lafhq" + }, + "5.4": { + "version": "5.4.257", + "hash": "sha256:1w1x91slzg9ggakqhyxnmvz77v2cwfk8bz0knrpgz9qya9q5jxrf" + }, + "4.19": { + "version": "4.19.295", + "hash": "sha256:1b1qslpk1kka7nxam48s22xsqd9qmp716hmibgfsjxl5y3jc4cmp" + }, + "4.14": { + "version": "4.14.326", + "hash": "sha256:0y0lvzidw775mgx211wnc1c6223iqv8amz5y9jkz9h7l3l7y8p2m" + } +} diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix deleted file mode 100644 index dc0ead44be431..0000000000000 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args: - -with lib; - -buildLinux (args // rec { - version = "4.14.325"; - - # modDirVersion needs to be x.y.z, will automatically add .0 if needed - modDirVersion = versions.pad 3 version; - - # branchVersion needs to be x.y - extraMeta.branch = versions.majorMinor version; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "117p1mdha57f6d3kdwac9jrbmib7g77q4xhir8ghl6fmrs1f2sav"; - }; -} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix deleted file mode 100644 index 6048caf8fa867..0000000000000 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args: - -with lib; - -buildLinux (args // rec { - version = "4.19.294"; - - # modDirVersion needs to be x.y.z, will automatically add .0 if needed - modDirVersion = versions.pad 3 version; - - # branchVersion needs to be x.y - extraMeta.branch = versions.majorMinor version; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "03x0xsb8a369zdr81hg6xdl5n5v48k6iwnhj6r29725777lvvbfc"; - }; -} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix deleted file mode 100644 index 213bf7e670f39..0000000000000 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args: - -with lib; - -buildLinux (args // rec { - version = "5.10.195"; - - # modDirVersion needs to be x.y.z, will automatically add .0 if needed - modDirVersion = versions.pad 3 version; - - # branchVersion needs to be x.y - extraMeta.branch = versions.majorMinor version; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0n4vg2i9sq89wnz85arlyvwysh9s83cgzs5bk2wh98bivi5fwfs1"; - }; -} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix deleted file mode 100644 index d86b0cf0ce648..0000000000000 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args: - -with lib; - -buildLinux (args // rec { - version = "5.15.132"; - - # modDirVersion needs to be x.y.z, will automatically add .0 if needed - modDirVersion = versions.pad 3 version; - - # branchVersion needs to be x.y - extraMeta.branch = versions.majorMinor version; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1b0qjsaqjw2rk86shmmrj2aasblkn27acjmc761vnjg7sv2baxs1"; - }; -} // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix deleted file mode 100644 index 0013636076a01..0000000000000 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args: - -with lib; - -buildLinux (args // rec { - version = "5.4.256"; - - # modDirVersion needs to be x.y.z, will automatically add .0 if needed - modDirVersion = versions.pad 3 version; - - # branchVersion needs to be x.y - extraMeta.branch = versions.majorMinor version; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0fim5q9xakwnjfg48bpsic9r2r8dvrjlalqqkm9vh1rml9mhi967"; - }; -} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-6.1.nix b/pkgs/os-specific/linux/kernel/linux-6.1.nix deleted file mode 100644 index df99c98685107..0000000000000 --- a/pkgs/os-specific/linux/kernel/linux-6.1.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args: - -with lib; - -buildLinux (args // rec { - version = "6.1.54"; - - # modDirVersion needs to be x.y.z, will automatically add .0 if needed - modDirVersion = versions.pad 3 version; - - # branchVersion needs to be x.y - extraMeta.branch = versions.majorMinor version; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "09sfrq2l8f777mx2n9mhb6bgz1064bl04921byqnmk87si31w653"; - }; -} // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-6.4.nix b/pkgs/os-specific/linux/kernel/linux-6.4.nix deleted file mode 100644 index d41cd21fbef92..0000000000000 --- a/pkgs/os-specific/linux/kernel/linux-6.4.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, fetchurl, buildLinux, ... } @ args: - -with lib; - -buildLinux (args // rec { - version = "6.4.16"; - - # modDirVersion needs to be x.y.z, will automatically add .0 if needed - modDirVersion = versions.pad 3 version; - - # branchVersion needs to be x.y - extraMeta.branch = versions.majorMinor version; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "0zgj1z97jyx7wf12zrnlcp0mj4cl43ais9qsy6dh1jwylf2fq9ln"; - }; -} // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-6.5.nix b/pkgs/os-specific/linux/kernel/linux-6.5.nix deleted file mode 100644 index 28557090de613..0000000000000 --- a/pkgs/os-specific/linux/kernel/linux-6.5.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, fetchurl, buildLinux, ... } @ args: - -with lib; - -buildLinux (args // rec { - version = "6.5.4"; - - # modDirVersion needs to be x.y.z, will automatically add .0 if needed - modDirVersion = versions.pad 3 version; - - # branchVersion needs to be x.y - extraMeta.branch = versions.majorMinor version; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "0s8nzd8yaq06bq8byk7aakbk95gh0rhlif26h1biw94v48anrxxx"; - }; -} // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index 19b46d873086e..249f89a449b33 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.186-rt91"; # updated by ./update-rt.sh + version = "5.10.194-rt95"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -17,14 +17,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "1qqv91r13akgik1q4jybf8czskxxizk6lpv4rsvjn9sx2dm2jq0y"; + sha256 = "15fr7krhpmqz0xqjg78m2xvfllbni3xh8xyhxh9ni31ppd3mw394"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1h5p0p3clq0gmaszvddmfll17adv02wfp2bfrd5x3aigvigwfmjb"; + sha256 = "02p01a9jpv92v0dfg6hj90wcrgy3sqjpaadrw44mnsqk4q5ndh70"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix index 6d3955f201283..0050e77bb5659 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.15.129-rt67"; # updated by ./update-rt.sh + version = "5.15.133-rt69"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "0ribh1jalbnapfrjzjk5kqg6nypalkn5ayin5cwkwiziwiycj3km"; + sha256 = "1paxzzcagc7s8i491zjny43rxhfamafyly438kj8hyw96iwmx17g"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1qh2v8i2sa334mkfwx9k8jjvqpp21bj2wmvvdib8wfxbnjnj3vzy"; + sha256 = "0iikbpb1wcf7fm18j230cd4p4cksr0k6041c8w0gvznws8mr3dww"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix index cd1249605ec3e..22e07bfd0f568 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.4.254-rt85"; # updated by ./update-rt.sh + version = "5.4.257-rt87"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -14,14 +14,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "1iyrm2xql15ifhy2b939ywrrc44yd41b79sjjim4vqxmc6lqsq2i"; + sha256 = "1w1x91slzg9ggakqhyxnmvz77v2cwfk8bz0knrpgz9qya9q5jxrf"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0vq5lrqqy7yspznbbkla2cjakz7w1n8qvg31a856qs6abynwrw6x"; + sha256 = "0rgkk5ibagsyz9in12clzn7szsw1i3m96s8wy5yxwa26aaa2wki7"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix b/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix index d599c3bda3112..f45926020b5b1 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "6.1.46-rt14"; # updated by ./update-rt.sh + version = "6.1.54-rt15"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz"; - sha256 = "15m228bllks2p8gpsmvplx08yxzp7bij9fnmnafqszylrk7ppxpm"; + sha256 = "09sfrq2l8f777mx2n9mhb6bgz1064bl04921byqnmk87si31w653"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0mrpsy175iz0b51hwgqbj15w83lm3m57il3gqwb489gln7mpzy17"; + sha256 = "0ihdid1ihg26kjini66j87vh4220gl8xm9dai7zignha2zh238kh"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix deleted file mode 100644 index 9a3b32a7f2d2c..0000000000000 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, buildPackages, fetchzip, perl, buildLinux, nixosTests, ... } @ args: - -with lib; - -buildLinux (args // rec { - version = "6.6-rc1"; - extraMeta.branch = lib.versions.majorMinor version; - - # modDirVersion needs to be x.y.z, will always add .0 - modDirVersion = versions.pad 3 version; - - src = fetchzip { - url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - hash = "sha256-DRai7HhWVtRB0GiRCvCv2JM2TFKRsZ60ohD6GW0b8As="; - }; - - # Should the testing kernels ever be built on Hydra? - extraMeta.hydraPlatforms = []; - -} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/mainline.nix b/pkgs/os-specific/linux/kernel/mainline.nix new file mode 100644 index 0000000000000..4e1d5b8a9e87c --- /dev/null +++ b/pkgs/os-specific/linux/kernel/mainline.nix @@ -0,0 +1,27 @@ +{ branch, lib, fetchurl, fetchzip, buildLinux, ... } @ args: + +let + allKernels = builtins.fromJSON (builtins.readFile ./kernels-org.json); + thisKernel = allKernels.${branch}; + inherit (thisKernel) version; + + src = + # testing kernels are a special case because they don't have tarballs on the CDN + if branch == "testing" + then fetchzip { + url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; + inherit (thisKernel) hash; + } + else fetchurl { + url = "mirror://kernel/linux/kernel/v${lib.versions.major version}.x/linux-${version}.tar.xz"; + inherit (thisKernel) hash; + }; + + args' = (builtins.removeAttrs args ["branch"]) // { + inherit src version; + + modDirVersion = lib.versions.pad 3 version; + extraMeta.branch = branch; + } // (args.argsOverride or {}); +in +buildLinux args' diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index f941ca9f007ad..ab3b4e56066e9 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -19,6 +19,16 @@ patch = ./bridge-stp-helper.patch; }; + # Reverts the buggy commit causing https://bugzilla.kernel.org/show_bug.cgi?id=217802 + dell_xps_regression = { + name = "dell_xps_regression"; + patch = fetchpatch { + name = "Revert-101bd907b424-misc-rtsx-judge-ASPM-Mode-to-set.patch"; + url = "https://raw.githubusercontent.com/openSUSE/kernel-source/1b02b1528a26f4e9b577e215c114d8c5e773ee10/patches.suse/Revert-101bd907b424-misc-rtsx-judge-ASPM-Mode-to-set.patch"; + sha256 = "sha256-RHJdQ4p0msTOVPR+/dYiKuwwEoG9IpIBqT4dc5cJjf8="; + }; + }; + request_key_helper = { name = "request-key-helper"; patch = ./request-key-helper.patch; diff --git a/pkgs/os-specific/linux/kernel/update-mainline.py b/pkgs/os-specific/linux/kernel/update-mainline.py new file mode 100755 index 0000000000000..30b9ebec984ce --- /dev/null +++ b/pkgs/os-specific/linux/kernel/update-mainline.py @@ -0,0 +1,130 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i python3 -p "python3.withPackages (ps: [ ps.beautifulsoup4 ps.lxml ])" +import json +import os +import pathlib +import subprocess +import sys +import urllib.request +from dataclasses import dataclass +from enum import Enum + +from bs4 import BeautifulSoup, NavigableString, Tag + +HERE = pathlib.Path(__file__).parent +ROOT = HERE.parent.parent.parent.parent +VERSIONS_FILE = HERE / "kernels-org.json" + + +class KernelNature(Enum): + MAINLINE = 1 + STABLE = 2 + LONGTERM = 3 + + +@dataclass +class KernelRelease: + nature: KernelNature + version: str + branch: str + date: str + link: str + eol: bool = False + + +def parse_release(release: Tag) -> KernelRelease | None: + columns: list[Tag] = list(release.find_all("td")) + try: + nature = KernelNature[columns[0].get_text().rstrip(":").upper()] + except KeyError: + return None + + version = columns[1].get_text().rstrip(" [EOL]") + date = columns[2].get_text() + link = columns[3].find("a") + if link is not None and isinstance(link, Tag): + link = link.attrs.get("href") + assert link is not None, f"link for kernel {version} is non-existent" + eol = bool(release.find(class_="eolkernel")) + + return KernelRelease( + nature=nature, + branch=get_branch(version), + version=version, + date=date, + link=link, + eol=eol, + ) + + +def get_branch(version: str): + # This is a testing kernel. + if "rc" in version: + return "testing" + else: + major, minor, *_ = version.split(".") + return f"{major}.{minor}" + + +def get_hash(kernel: KernelRelease): + if kernel.branch == "testing": + args = ["--unpack"] + else: + args = [] + + hash = ( + subprocess.check_output(["nix-prefetch-url", kernel.link] + args) + .decode() + .strip() + ) + return f"sha256:{hash}" + + +def commit(message): + return subprocess.check_call(["git", "commit", "-m", message, VERSIONS_FILE]) + + +def main(): + kernel_org = urllib.request.urlopen("https://kernel.org/") + soup = BeautifulSoup(kernel_org.read().decode(), "lxml") + release_table = soup.find(id="releases") + if not release_table or isinstance(release_table, NavigableString): + print(release_table, file=sys.stderr) + print("Failed to find the release table on https://kernel.org", file=sys.stderr) + sys.exit(1) + + releases = release_table.find_all("tr") + parsed_releases = filter(None, [parse_release(release) for release in releases]) + all_kernels = json.load(VERSIONS_FILE.open()) + + for kernel in parsed_releases: + branch = get_branch(kernel.version) + nixpkgs_branch = branch.replace(".", "_") + + old_version = all_kernels.get(branch, {}).get("version") + if old_version == kernel.version: + print(f"linux_{nixpkgs_branch}: {kernel.version} is latest, skipping...") + continue + + if old_version is None: + message = f"linux_{nixpkgs_branch}: init at {kernel.version}" + else: + message = f"linux_{nixpkgs_branch}: {old_version} -> {kernel.version}" + + print(message, file=sys.stderr) + + all_kernels[branch] = { + "version": kernel.version, + "hash": get_hash(kernel), + } + + with VERSIONS_FILE.open("w") as fd: + json.dump(all_kernels, fd, indent=4) + fd.write("\n") # makes editorconfig happy + + if os.environ.get("COMMIT") == "1": + commit(message) + + +if __name__ == "__main__": + main() diff --git a/pkgs/os-specific/linux/kernel/update.sh b/pkgs/os-specific/linux/kernel/update.sh index 4171b7492b7b5..37e1cc1a5cd4b 100755 --- a/pkgs/os-specific/linux/kernel/update.sh +++ b/pkgs/os-specific/linux/kernel/update.sh @@ -1,72 +1,14 @@ #!/usr/bin/env bash -set -e +cd "$(dirname "$(readlink -f "$0")")" || exit -# Get the latest versions from kernel.org -LINUXSED='s/.*linux-\([0-9]\+\(.[0-9]\+\)*\).*/\1/p' -KDATA="$(curl -s https://www.kernel.org | sed -n -e '/Download complete/p')" -VERSIONS=($(sed -n -e $LINUXSED <<< "$KDATA" | sort -Vr)) +echo "Update linux (mainline)" +COMMIT=1 ./update-mainline.py || echo "update-mainline failed with exit code $?" -# Remove mainline version if there is a stable update -# Note due to sorting these two will always exist at the bottom -if grep -q "^${VERSIONS[1]}" <<< "${VERSIONS[0]}"; then - VERSIONS=(${VERSIONS[@]:0:1} ${VERSIONS[@]:2}) -fi +echo "Update linux-rt" +COMMIT=1 ./update-rt.sh || echo "update-rt failed with exit code $?" -# Inspect each file and see if it has the latest version -NIXPKGS="$(git rev-parse --show-toplevel)" -ls $NIXPKGS/pkgs/os-specific/linux/kernel | while read FILE; do - KERNEL="$(sed -n -e $LINUXSED <<< "$FILE")" - [ -z "$KERNEL" ] && continue +echo "Update linux-libre" +COMMIT=1 ./update-libre.sh || echo "update-libre failed with exit code $?" - # Find the matching new kernel version - MATCHING="" - for V in "${VERSIONS[@]}"; do - if grep -q "^$KERNEL" <<< "$V"; then - MATCHING="$V" - break - fi - done - if [ -z "$MATCHING" ]; then - echo "Out-of-support $KERNEL" - continue - fi - - # Inspect the nix expression to check for changes - DATA="$(<$NIXPKGS/pkgs/os-specific/linux/kernel/$FILE)" - URL="$(sed -n -e 's/.*url = "\(.*\)";.*/\1/p' <<< "$DATA" | sed -e "s/\${version}/$MATCHING/g")" - OLDVER=$(sed -n -e 's/.*version = "\(.*\)".*/\1/p' <<< "$DATA") - if [ "$OLDVER" = "$V" ]; then - echo "No updates for $KERNEL" - continue - fi - - # Download the new file for the hash - if ! HASH="$(nix-prefetch-url $URL 2>/dev/null)"; then - echo "Failed to get hash of $URL" - continue - fi - sed -i -e "s/sha256 = \".*\"/sha256 = \"$HASH\"/g" $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE - - # Rewrite the expression - sed -i -e '/version = /d' $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE - sed -i -e "\#buildLinux (args // rec {#a \ version = \"$V\";" $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE - - # Commit the changes - git add -u $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE - git commit -m "linux: $OLDVER -> $V" >/dev/null 2>&1 - - echo "Updated $OLDVER -> $V" -done - -# Allowing errors again: one broken update script shouldn't inhibit the -# update of other kernel variants. -set +e - -echo Update linux-rt -COMMIT=1 $NIXPKGS/pkgs/os-specific/linux/kernel/update-rt.sh || echo "update-rt failed with exit code $?" - -echo Update linux-libre -COMMIT=1 $NIXPKGS/pkgs/os-specific/linux/kernel/update-libre.sh || echo "update-libre failed with exit code $?" - -echo Update linux-hardened -COMMIT=1 $NIXPKGS/pkgs/os-specific/linux/kernel/hardened/update.py || echo "update-hardened failed with exit code $?" +echo "Update linux-hardened" +COMMIT=1 ./hardened/update.py || echo "update-hardened failed with exit code $?" diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index c3fd01670a2a4..843ec92b7c6ec 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -3,14 +3,14 @@ let # These names are how they are designated in https://xanmod.org. ltsVariant = { - version = "6.1.53"; - hash = "sha256-+70dp+zVOvfKJv9hEy3FpEs2ldrxHiWbokaUnXrNj5o="; + version = "6.1.55"; + hash = "sha256-kmiMbzH1hyteicjk1WfCQPYhLsVAbl1t5LJ83rUNZ1k="; variant = "lts"; }; mainVariant = { - version = "6.5.3"; - hash = "sha256-2giaFyN3kWzQ9cl1mTM9ecSlwoQS+dm3/LvbTAHjZ/A="; + version = "6.5.5"; + hash = "sha256-XjSuhZ5ooXOVllKc29Pd+PlOK6OtcgVMVFzxOx5nkIw="; variant = "main"; }; @@ -52,7 +52,7 @@ let extraMeta = { branch = lib.versions.majorMinor version; - maintainers = with lib.maintainers; [ fortuneteller2k lovesegfault atemu shawn8901 ]; + maintainers = with lib.maintainers; [ fortuneteller2k lovesegfault atemu shawn8901 zzzsy ]; description = "Built with custom settings and new features built to provide a stable, responsive and smooth desktop experience"; broken = stdenv.isAarch64; }; diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index ff54d8cfec09a..2006b8f1e6d72 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -4,16 +4,16 @@ let # comments with variant added for update script # ./update-zen.py zen zenVariant = { - version = "6.5.4"; #zen + version = "6.5.5"; #zen suffix = "zen1"; #zen - sha256 = "1s0a2706xk60k9w6dr3zx2ma8bsny1dkvv0fmsk3kd8ghyg3xswh"; #zen + sha256 = "069hxkww14dpz7k5hd93qnv6clc0dkpd3ncf1wzr5k84a0i9syj8"; #zen isLqx = false; }; # ./update-zen.py lqx lqxVariant = { - version = "6.5.4"; #lqx + version = "6.5.5"; #lqx suffix = "lqx2"; #lqx - sha256 = "0zz7jn2fic7llppv4ih91jfz0k0q6c04xsyqljhiw6279dsv8h7c"; #lqx + sha256 = "18gji7l3mgm8z0vi99q5xzrmpmw7jm1sqm2mc6abs51bi5vwir09"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { @@ -74,10 +74,10 @@ let HZ = freeform "1000"; HZ_1000 = yes; } // lib.optionalAttrs (isLqx) { - # Google's BBRv2 TCP congestion Control - TCP_CONG_BBR2 = yes; - DEFAULT_BBR2 = yes; - DEFAULT_TCP_CONG = freeform "bbr2"; + # Google's BBRv3 TCP congestion Control + TCP_CONG_BBR = yes; + DEFAULT_BBR = yes; + DEFAULT_TCP_CONG = freeform "bbr"; # PDS Process Scheduler SCHED_ALT = yes; diff --git a/pkgs/os-specific/linux/libpsm2/default.nix b/pkgs/os-specific/linux/libpsm2/default.nix index 683448cbe41b6..0dab09de4c1ca 100644 --- a/pkgs/os-specific/linux/libpsm2/default.nix +++ b/pkgs/os-specific/linux/libpsm2/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "libpsm2"; - version = "11.2.230"; + version = "12.0.1"; preConfigure= '' export UDEVDIR=$out/etc/udev @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "opa-psm2"; rev = "PSM2_${version}"; - sha256 = "sha256-dMfGq067TqstGAWNSZZaZCwvChTyPUsvaPVjFGGzp64="; + sha256 = "sha256-MzocxY+X2a5rJvTo+gFU0U10YzzazR1IxzgEporJyhI="; }; postInstall = '' diff --git a/pkgs/os-specific/linux/mbpfan/default.nix b/pkgs/os-specific/linux/mbpfan/default.nix index 9a56249de39af..50fc74d7fa0a0 100644 --- a/pkgs/os-specific/linux/mbpfan/default.nix +++ b/pkgs/os-specific/linux/mbpfan/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/dgraziotin/mbpfan"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/os-specific/linux/microcode/amd.nix b/pkgs/os-specific/linux/microcode/amd.nix index 051ad131be93c..3c82cdec29fb7 100644 --- a/pkgs/os-specific/linux/microcode/amd.nix +++ b/pkgs/os-specific/linux/microcode/amd.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sourceRoot = "."; - buildInputs = [ libarchive ]; + nativeBuildInputs = [ libarchive ]; buildPhase = '' mkdir -p kernel/x86/microcode diff --git a/pkgs/os-specific/linux/minimal-bootstrap/bash/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/bash/default.nix index dea5ad9f017fe..35c4da7acf939 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/bash/default.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/bash/default.nix @@ -4,15 +4,14 @@ , fetchurl , bootBash , gnumake +, gnupatch , gnused , gnugrep , gnutar , gawk , gzip -, gcc -, glibc -, binutils -, linux-headers +, diffutils +, tinycc , derivationWithMeta , bash , coreutils @@ -25,19 +24,26 @@ let url = "mirror://gnu/bash/bash-${version}.tar.gz"; sha256 = "132qng0jy600mv1fs95ylnlisx2wavkkgpb19c6kmz7lnmjhjwhk"; }; + + patches = [ + # flush output for generated code + ./mksignames-flush.patch + ]; in bootBash.runCommand "${pname}-${version}" { inherit pname version; nativeBuildInputs = [ - gcc - binutils + coreutils + tinycc.compiler gnumake + gnupatch gnused gnugrep gnutar gawk gzip + diffutils ]; passthru.runCommand = name: env: buildCommand: @@ -78,22 +84,23 @@ bootBash.runCommand "${pname}-${version}" { tar xzf ${src} cd bash-${version} + # Patch + ${lib.concatMapStringsSep "\n" (f: "patch -Np1 -i ${f}") patches} + # Configure - export CC="gcc -I${glibc}/include -I${linux-headers}/include" - export LIBRARY_PATH="${glibc}/lib" - export LIBS="-lc -lnss_files -lnss_dns -lresolv" - export ac_cv_func_dlopen=no + export CC="tcc -B ${tinycc.libs}/lib" + export AR="tcc -ar" + export LD=tcc bash ./configure \ --prefix=$out \ --build=${buildPlatform.config} \ --host=${hostPlatform.config} \ - --disable-nls \ - --disable-net-redirections + --without-bash-malloc # Build - make SHELL=bash + make -j $NIX_BUILD_CORES SHELL=bash # Install - make install + make -j $NIX_BUILD_CORES install ln -s bash $out/bin/sh '' diff --git a/pkgs/os-specific/linux/minimal-bootstrap/bash/mksignames-flush.patch b/pkgs/os-specific/linux/minimal-bootstrap/bash/mksignames-flush.patch new file mode 100644 index 0000000000000..6e64dfa7fa3a7 --- /dev/null +++ b/pkgs/os-specific/linux/minimal-bootstrap/bash/mksignames-flush.patch @@ -0,0 +1,10 @@ +--- a/support/mksignames.c ++++ b/support/mksignames.c +@@ -68,6 +68,7 @@ write_signames (stream) + fprintf (stream, "};\n\n"); + fprintf (stream, "#define initialize_signames()\n\n"); + #endif ++ fflush(stream); + } + + int diff --git a/pkgs/os-specific/linux/minimal-bootstrap/binutils/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/binutils/default.nix index f386ebbaf8e93..71e391efb5501 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/binutils/default.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/binutils/default.nix @@ -3,35 +3,29 @@ , hostPlatform , fetchurl , bash +, coreutils , gnumake , gnupatch +, gnused , gnugrep -, gnutar , gawk -, bzip2 -, sed -, mesBootstrap ? false, tinycc ? null -, gcc ? null, glibc ? null, binutils ? null, linux-headers +, diffutils +, gnutar +, xz +, tinycc }: -assert mesBootstrap -> tinycc != null; -assert !mesBootstrap -> gcc != null && glibc != null && binutils != null; + let - pname = "binutils" + lib.optionalString mesBootstrap "-mes"; - version = "2.20.1"; - rev = "a"; + # Based on https://github.com/ZilchOS/bootstrap-from-tcc/blob/2e0c68c36b3437386f786d619bc9a16177f2e149/using-nix/2a1-static-binutils.nix + pname = "binutils"; + version = "2.41"; src = fetchurl { - url = "mirror://gnu/binutils/binutils-${version}${rev}.tar.bz2"; - sha256 = "0r7dr0brfpchh5ic0z9r4yxqn4ybzmlh25sbp30cacqk8nb7rlvi"; + url = "mirror://gnu/binutils/binutils-${version}.tar.xz"; + hash = "sha256-rppXieI0WeWWBuZxRyPy0//DHAMXQZHvDQFb3wYAdFA="; }; patches = [ - # Enables building binutils using TCC and Mes C Library - (fetchurl { - url = "https://git.savannah.gnu.org/cgit/guix.git/plain/gnu/packages/patches/binutils-boot-2.20.1a.patch?id=50249cab3a98839ade2433456fe618acc6f804a5"; - sha256 = "086sf6an2k56axvs4jlky5n3hs2l3rq8zq5d37h0b69cdyh7igpn"; - }) - # Make binutils output deterministic by default. ./deterministic.patch ]; @@ -40,10 +34,10 @@ let "--prefix=${placeholder "out"}" "--build=${buildPlatform.config}" "--host=${hostPlatform.config}" - "--disable-nls" - "--disable-shared" - "--disable-werror" "--with-sysroot=/" + "--enable-deterministic-archives" + # depends on bison + "--disable-gprofng" # Turn on --enable-new-dtags by default to make the linker set # RUNPATH instead of RPATH on binaries. This is important because @@ -60,15 +54,16 @@ bash.runCommand "${pname}-${version}" { inherit pname version; nativeBuildInputs = [ - (if mesBootstrap then tinycc.compiler else gcc) + tinycc.compiler gnumake gnupatch + gnused gnugrep - gnutar gawk - bzip2 - sed - ] ++ lib.optional (!mesBootstrap) binutils; + diffutils + gnutar + xz + ]; passthru.tests.get-version = result: bash.runCommand "${pname}-get-version-${version}" {} '' @@ -85,32 +80,35 @@ bash.runCommand "${pname}-${version}" { }; } '' # Unpack - cp ${src} binutils.tar.bz2 - bunzip2 binutils.tar.bz2 + cp ${src} binutils.tar.xz + unxz binutils.tar.xz tar xf binutils.tar rm binutils.tar cd binutils-${version} # Patch ${lib.concatMapStringsSep "\n" (f: "patch -Np1 -i ${f}") patches} + sed -i 's|/bin/sh|${bash}/bin/bash|' \ + missing install-sh mkinstalldirs + # see libtool's 74c8993c178a1386ea5e2363a01d919738402f30 + sed -i 's/| \$NL2SP/| sort | $NL2SP/' ltmain.sh + # alias makeinfo to true + mkdir aliases + ln -s ${coreutils}/bin/true aliases/makeinfo + export PATH="$(pwd)/aliases/:$PATH" # Configure - ${if mesBootstrap then '' - export CC="tcc -B ${tinycc.libs}/lib -D __GLIBC_MINOR__=6 -D MES_BOOTSTRAP=1" - export AR="tcc -ar" - '' else '' - export CC="gcc -B ${glibc}/lib -I${glibc}/include -I${linux-headers}/include" - export CPP="gcc -E -I${glibc}/include -I${linux-headers}/include" - export AR="ar" - export LIBRARY_PATH="${glibc}/lib" - export LIBS="-lc -lnss_files -lnss_dns -lresolv" - ''} - export SED=sed + export CC="tcc -B ${tinycc.libs}/lib" + export AR="tcc -ar" + export lt_cv_sys_max_cmd_len=32768 + export CFLAGS="-D__LITTLE_ENDIAN__=1" bash ./configure ${lib.concatStringsSep " " configureFlags} # Build - make + make -j $NIX_BUILD_CORES all-libiberty all-gas all-bfd all-libctf all-zlib all-gprof + make all-ld # race condition on ld/.deps/ldwrite.Po, serialize + make -j $NIX_BUILD_CORES # Install - make install + make -j $NIX_BUILD_CORES install '' diff --git a/pkgs/os-specific/linux/minimal-bootstrap/bzip2/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/bzip2/default.nix index 84fb7a0a1b733..05da061ac263d 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/bzip2/default.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/bzip2/default.nix @@ -3,7 +3,7 @@ , bash , tinycc , gnumake -, gnupatch +, gnutar , gzip }: let @@ -14,16 +14,6 @@ let url = "https://sourceware.org/pub/bzip2/bzip2-${version}.tar.gz"; sha256 = "0s92986cv0p692icqlw1j42y9nld8zd83qwhzbqd61p1dqbh6nmb"; }; - - patches = [ - # mes libc has no time support, so we remove that. - # It also does not have fch{own,mod}, which we don't care about in the bootstrap - # anyway, so we can null-op those calls. - (fetchurl { - url = "https://github.com/fosslinux/live-bootstrap/raw/87e9d7db9d22b400d1c05247254ac39ee2577e80/sysa/bzip2-1.0.8/patches/mes-libc.patch"; - sha256 = "14dciwib28h413skzfkh7samzh8x87dmwhldyxxphff04pvl1j3c"; - }) - ]; in bash.runCommand "${pname}-${version}" { inherit pname version; @@ -31,13 +21,13 @@ bash.runCommand "${pname}-${version}" { nativeBuildInputs = [ tinycc.compiler gnumake - gnupatch + gnutar gzip ]; passthru.tests.get-version = result: bash.runCommand "${pname}-get-version-${version}" {} '' - ${result}/bin/bzip2 --version --help + ${result}/bin/bzip2 --help mkdir $out ''; @@ -50,21 +40,16 @@ bash.runCommand "${pname}-${version}" { }; } '' # Unpack - cp ${src} bzip2.tar.gz - gunzip bzip2.tar.gz - untar --file bzip2.tar - rm bzip2.tar + tar xzf ${src} cd bzip2-${version} - # Patch - ${lib.concatMapStringsSep "\n" (f: "patch -Np0 -i ${f}") patches} - # Build make \ - CC="tcc -B ${tinycc.libs}/lib -I ." \ + -j $NIX_BUILD_CORES \ + CC="tcc -B ${tinycc.libs}/lib" \ AR="tcc -ar" \ bzip2 bzip2recover # Install - make install PREFIX=$out + make install -j $NIX_BUILD_CORES PREFIX=$out '' diff --git a/pkgs/os-specific/linux/minimal-bootstrap/coreutils/musl.nix b/pkgs/os-specific/linux/minimal-bootstrap/coreutils/musl.nix new file mode 100644 index 0000000000000..dece020a5e795 --- /dev/null +++ b/pkgs/os-specific/linux/minimal-bootstrap/coreutils/musl.nix @@ -0,0 +1,74 @@ +{ lib +, buildPlatform +, hostPlatform +, fetchurl +, bash +, tinycc +, gnumake +, gnugrep +, gnused +, gawk +, gnutar +, gzip +}: +let + pname = "coreutils"; + version = "9.4"; + + src = fetchurl { + url = "mirror://gnu/coreutils/coreutils-${version}.tar.gz"; + hash = "sha256-X2ANkJOXOwr+JTk9m8GMRPIjJlf0yg2V6jHHAutmtzk="; + }; + + configureFlags = [ + "--prefix=${placeholder "out"}" + "--build=${buildPlatform.config}" + "--host=${hostPlatform.config}" + # musl 1.1.x doesn't use 64bit time_t + "--disable-year2038" + # libstdbuf.so fails in static builds + "--enable-no-install-program=stdbuf" + ]; +in +bash.runCommand "${pname}-${version}" { + inherit pname version; + + nativeBuildInputs = [ + tinycc.compiler + gnumake + gnused + gnugrep + gawk + gnutar + gzip + ]; + + passthru.tests.get-version = result: + bash.runCommand "${pname}-get-version-${version}" {} '' + ${result}/bin/cat --version + mkdir $out + ''; + + meta = with lib; { + description = "The GNU Core Utilities"; + homepage = "https://www.gnu.org/software/coreutils"; + license = licenses.gpl3Plus; + maintainers = teams.minimal-bootstrap.members; + platforms = platforms.unix; + }; +} '' + # Unpack + tar xzf ${src} + cd coreutils-${version} + + # Configure + export CC="tcc -B ${tinycc.libs}/lib" + export LD=tcc + bash ./configure ${lib.concatStringsSep " " configureFlags} + + # Build + make -j $NIX_BUILD_CORES AR="tcc -ar" MAKEINFO="true" + + # Install + make -j $NIX_BUILD_CORES install MAKEINFO="true" +'' diff --git a/pkgs/os-specific/linux/minimal-bootstrap/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/default.nix index 55900f86d21c5..5da47e46edaa8 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/default.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/default.nix @@ -17,46 +17,46 @@ lib.makeScope bash = callPackage ./bash { bootBash = bash_2_05; - gcc = gcc2; - glibc = glibc22; - gawk = gawk-mes; + tinycc = tinycc-musl; + coreutils = coreutils-musl; + gnumake = gnumake-musl; + gnutar = gnutar-musl; }; binutils = callPackage ./binutils { bash = bash_2_05; - gcc = gcc2; - binutils = binutils-mes; - glibc = glibc22; - sed = heirloom.sed; - gawk = gawk-mes; - }; - binutils-mes = callPackage ./binutils { - bash = bash_2_05; - tinycc = tinycc-mes; - sed = heirloom.sed; - gawk = gawk-mes; - mesBootstrap = true; + tinycc = tinycc-musl; + gnumake = gnumake-musl; + gnutar = gnutar-musl; }; bzip2 = callPackage ./bzip2 { bash = bash_2_05; - tinycc = tinycc-mes; + tinycc = tinycc-musl; + gnumake = gnumake-musl; + gnutar = gnutar-musl; }; coreutils = callPackage ./coreutils { tinycc = tinycc-mes; }; + coreutils-musl = callPackage ./coreutils/musl.nix { + bash = bash_2_05; + tinycc = tinycc-musl; + gnumake = gnumake-musl; + gnutar = gnutar-musl; + }; diffutils = callPackage ./diffutils { bash = bash_2_05; - gcc = gcc2; - glibc = glibc22; - gawk = gawk-mes; + tinycc = tinycc-musl; + gnumake = gnumake-musl; + gnutar = gnutar-musl; }; findutils = callPackage ./findutils { bash = bash_2_05; - gcc = gcc2; - glibc = glibc22; - gawk = gawk-mes; + tinycc = tinycc-musl; + gnumake = gnumake-musl; + gnutar = gnutar-musl; }; gawk-mes = callPackage ./gawk/mes.nix { @@ -67,34 +67,34 @@ lib.makeScope gawk = callPackage ./gawk { bash = bash_2_05; - gcc = gcc2; - glibc = glibc22; + tinycc = tinycc-musl; + gnumake = gnumake-musl; + gnutar = gnutar-musl; bootGawk = gawk-mes; }; gcc2 = callPackage ./gcc/2.nix { bash = bash_2_05; gcc = gcc2-mes; - binutils = binutils-mes; glibc = glibc22; }; gcc2-mes = callPackage ./gcc/2.nix { bash = bash_2_05; tinycc = tinycc-mes; - binutils = binutils-mes; mesBootstrap = true; }; gcc46 = callPackage ./gcc/4.6.nix { - gcc = gcc2; - glibc = glibc22; + tinycc = tinycc-musl; + gnumake = gnumake-musl; + gnutar = gnutar-musl; + # FIXME: not sure why new gawk doesn't work gawk = gawk-mes; }; inherit (callPackage ./glibc { bash = bash_2_05; gnused = gnused-mes; - gawk = gawk-mes; }) glibc22; gnugrep = callPackage ./gnugrep { @@ -104,26 +104,37 @@ lib.makeScope gnumake = callPackage ./gnumake { tinycc = tinycc-mes; }; + gnumake-musl = callPackage ./gnumake/musl.nix { + bash = bash_2_05; + tinycc = tinycc-musl; + gawk = gawk-mes; + gnumakeBoot = gnumake; + }; + gnupatch = callPackage ./gnupatch { tinycc = tinycc-mes; }; gnused = callPackage ./gnused { bash = bash_2_05; - gcc = gcc2; - glibc = glibc22; + tinycc = tinycc-musl; gnused = gnused-mes; }; - gnused-mes = callPackage ./gnused { + gnused-mes = callPackage ./gnused/mes.nix { bash = bash_2_05; tinycc = tinycc-mes; - mesBootstrap = true; }; - gnutar = callPackage ./gnutar { + gnutar = callPackage ./gnutar/mes.nix { bash = bash_2_05; tinycc = tinycc-mes; gnused = gnused-mes; }; + gnutar-musl = callPackage ./gnutar/musl.nix { + bash = bash_2_05; + tinycc = tinycc-musl; + gnused = gnused-mes; + }; + gzip = callPackage ./gzip { bash = bash_2_05; tinycc = tinycc-mes; @@ -144,9 +155,15 @@ lib.makeScope mes = lib.recurseIntoAttrs (callPackage ./mes { }); mes-libc = callPackage ./mes/libc.nix { }; + musl11 = callPackage ./musl/1.1.nix { + bash = bash_2_05; + tinycc = tinycc-mes; + gnused = gnused-mes; + }; + musl = callPackage ./musl { gcc = gcc46; - gawk = gawk-mes; + gnumake = gnumake-musl; }; stage0-posix = callPackage ./stage0-posix { }; @@ -155,12 +172,16 @@ lib.makeScope tinycc-bootstrappable = lib.recurseIntoAttrs (callPackage ./tinycc/bootstrappable.nix { }); tinycc-mes = lib.recurseIntoAttrs (callPackage ./tinycc/mes.nix { }); + tinycc-musl = lib.recurseIntoAttrs (callPackage ./tinycc/musl.nix { + bash = bash_2_05; + musl = musl11; + }); xz = callPackage ./xz { bash = bash_2_05; - tinycc = tinycc-mes; - gawk = gawk-mes; - inherit (heirloom) sed; + tinycc = tinycc-musl; + gnumake = gnumake-musl; + gnutar = gnutar-musl; }; inherit (callPackage ./utils.nix { }) derivationWithMeta writeTextFile writeText; @@ -169,8 +190,8 @@ lib.makeScope echo ${bash.tests.get-version} echo ${bash_2_05.tests.get-version} echo ${binutils.tests.get-version} - echo ${binutils-mes.tests.get-version} echo ${bzip2.tests.get-version} + echo ${coreutils-musl.tests.get-version} echo ${diffutils.tests.get-version} echo ${findutils.tests.get-version} echo ${gawk-mes.tests.get-version} @@ -182,11 +203,13 @@ lib.makeScope echo ${gnused.tests.get-version} echo ${gnused-mes.tests.get-version} echo ${gnutar.tests.get-version} + echo ${gnutar-musl.tests.get-version} echo ${gzip.tests.get-version} echo ${heirloom.tests.get-version} echo ${mes.compiler.tests.get-version} echo ${musl.tests.hello-world} echo ${tinycc-mes.compiler.tests.chain} + echo ${tinycc-musl.compiler.tests.hello-world} echo ${xz.tests.get-version} mkdir ''${out} ''; diff --git a/pkgs/os-specific/linux/minimal-bootstrap/diffutils/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/diffutils/default.nix index 7545a52524a30..24cd643b34972 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/diffutils/default.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/diffutils/default.nix @@ -3,38 +3,35 @@ , hostPlatform , fetchurl , bash -, gcc -, glibc -, binutils -, linux-headers +, tinycc , gnumake , gnugrep , gnused , gawk , gnutar -, gzip +, xz }: let pname = "diffutils"; - version = "2.8.1"; + # last version that can be built by tinycc-musl 0.9.27 + version = "3.8"; src = fetchurl { - url = "mirror://gnu/diffutils/diffutils-${version}.tar.gz"; - sha256 = "0nizs9r76aiymzasmj1jngl7s71jfzl9xfziigcls8k9n141f065"; + url = "mirror://gnu/diffutils/diffutils-${version}.tar.xz"; + hash = "sha256-pr3X0bMSZtEcT03mwbdI1GB6sCMa9RiPwlM9CuJDj+w="; }; in bash.runCommand "${pname}-${version}" { inherit pname version; nativeBuildInputs = [ - gcc - binutils + tinycc.compiler gnumake gnused gnugrep gawk gnutar - gzip + xz ]; passthru.tests.get-version = result: @@ -52,21 +49,23 @@ bash.runCommand "${pname}-${version}" { }; } '' # Unpack - tar xzf ${src} + cp ${src} diffutils.tar.xz + unxz diffutils.tar.xz + tar xf diffutils.tar + rm diffutils.tar cd diffutils-${version} # Configure - export C_INCLUDE_PATH="${glibc}/include:${linux-headers}/include" - export LIBRARY_PATH="${glibc}/lib" - export LIBS="-lc -lnss_files -lnss_dns -lresolv" + export CC="tcc -B ${tinycc.libs}/lib" + export LD=tcc bash ./configure \ --prefix=$out \ --build=${buildPlatform.config} \ --host=${hostPlatform.config} # Build - make + make -j $NIX_BUILD_CORES AR="tcc -ar" # Install - make install + make -j $NIX_BUILD_CORES install '' diff --git a/pkgs/os-specific/linux/minimal-bootstrap/findutils/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/findutils/default.nix index cf26abd213830..97418d218fb92 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/findutils/default.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/findutils/default.nix @@ -3,38 +3,34 @@ , hostPlatform , fetchurl , bash -, gcc -, glibc -, binutils -, linux-headers +, tinycc , gnumake , gnugrep , gnused , gawk , gnutar -, gzip +, xz }: let pname = "findutils"; - version = "4.4.2"; + version = "4.9.0"; src = fetchurl { - url = "mirror://gnu/findutils/findutils-${version}.tar.gz"; - sha256 = "0amn0bbwqvsvvsh6drfwz20ydc2czk374lzw5kksbh6bf78k4ks3"; + url = "mirror://gnu/findutils/findutils-${version}.tar.xz"; + hash = "sha256-or+4wJ1DZ3DtxZ9Q+kg+eFsWGjt7nVR1c8sIBl/UYv4="; }; in bash.runCommand "${pname}-${version}" { inherit pname version; nativeBuildInputs = [ - gcc - binutils + tinycc.compiler gnumake gnused gnugrep gawk gnutar - gzip + xz ]; passthru.tests.get-version = result: @@ -52,21 +48,28 @@ bash.runCommand "${pname}-${version}" { }; } '' # Unpack - tar xzf ${src} + cp ${src} findutils.tar.xz + unxz findutils.tar.xz + tar xf findutils.tar + rm findutils.tar cd findutils-${version} + # Patch + # configure fails to accurately detect PATH_MAX support + sed -i 's/chdir_long/chdir/' gl/lib/save-cwd.c + # Configure - export C_INCLUDE_PATH="${glibc}/include:${linux-headers}/include" - export LIBRARY_PATH="${glibc}/lib" - export LIBS="-lc -lnss_files -lnss_dns -lresolv" + export CC="tcc -B ${tinycc.libs}/lib" + export AR="tcc -ar" + export LD=tcc bash ./configure \ --prefix=$out \ --build=${buildPlatform.config} \ --host=${hostPlatform.config} # Build - make + make -j $NIX_BUILD_CORES # Install - make install + make -j $NIX_BUILD_CORES install '' diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gawk/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/gawk/default.nix index 935414f21760a..879b98bf00c54 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/gawk/default.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/gawk/default.nix @@ -3,10 +3,7 @@ , hostPlatform , fetchurl , bash -, gcc -, glibc -, binutils -, linux-headers +, tinycc , gnumake , gnugrep , gnused @@ -17,21 +14,18 @@ let inherit (import ./common.nix { inherit lib; }) meta; pname = "gawk"; - # >= 4.2.0 fails to cleanly build. may be worth investigating in the future. - # for now this version is sufficient to build glibc 2.16 - version = "4.1.4"; + version = "5.2.2"; src = fetchurl { url = "mirror://gnu/gawk/gawk-${version}.tar.gz"; - sha256 = "0dadjkpyyizmyd0l098qps8lb39r0vrz3xl3hwz2cmjs5c70h0wc"; + hash = "sha256-lFrvfM/xAfILIqEIArwAXplKsrjqPnJMwaGXxi9B9lA="; }; in bash.runCommand "${pname}-${version}" { inherit pname version meta; nativeBuildInputs = [ - gcc - binutils + tinycc.compiler gnumake gnused gnugrep @@ -51,18 +45,17 @@ bash.runCommand "${pname}-${version}" { cd gawk-${version} # Configure - export C_INCLUDE_PATH="${glibc}/include:${linux-headers}/include" - export LIBRARY_PATH="${glibc}/lib" - export LIBS="-lc -lnss_files -lnss_dns -lresolv" + export CC="tcc -B ${tinycc.libs}/lib" + export AR="tcc -ar" + export LD=tcc bash ./configure \ --prefix=$out \ --build=${buildPlatform.config} \ --host=${hostPlatform.config} # Build - make gawk + make -j $NIX_BUILD_CORES # Install - install -D gawk $out/bin/gawk - ln -s gawk $out/bin/awk + make -j $NIX_BUILD_CORES install '' diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gcc/4.6.nix b/pkgs/os-specific/linux/minimal-bootstrap/gcc/4.6.nix index ce348352b67ea..4af069523f2c7 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/gcc/4.6.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/gcc/4.6.nix @@ -3,9 +3,7 @@ , hostPlatform , fetchurl , bash -, gcc -, glibc -, linux-headers +, tinycc , binutils , gnumake , gnupatch @@ -32,23 +30,10 @@ let }; patches = [ - # This patch enables building gcc-4.6.4 using gcc-2.95.3 and glibc-2.2.5 - # * Tweak Makefile to allow overriding NATIVE_SYSTEM_HEADER_DIR using #:makeflags - # * Add missing limits.h include. - # * Add SSIZE_MAX define. The SSIZE_MAX define has been added to Mes - # upstream and can be removed with the next Mes release. - # * Remove -fbuilding-libgcc flag, it assumes features being present from a - # newer gcc or glibc. - # * [MES_BOOTSTRAP_GCC]: Disable threads harder. - (fetchurl { - url = "https://git.savannah.gnu.org/cgit/guix.git/plain/gnu/packages/patches/gcc-boot-4.6.4.patch?id=50249cab3a98839ade2433456fe618acc6f804a5"; - sha256 = "1zzd8gnihw6znrgb6c6pfsmm0vix89xw3giv1nnsykm57j0v3z0d"; - }) - ./libstdc++-target.patch + # Remove hardcoded NATIVE_SYSTEM_HEADER_DIR + ./no-system-headers.patch ]; - # To reduce the set of pre-built bootstrap inputs, build - # GMP & co. from GCC. gmpVersion = "4.3.2"; gmp = fetchurl { url = "mirror://gnu/gmp/gmp-${gmpVersion}.tar.gz"; @@ -71,7 +56,7 @@ bash.runCommand "${pname}-${version}" { inherit pname version; nativeBuildInputs = [ - gcc + tinycc.compiler binutils gnumake gnupatch @@ -84,10 +69,6 @@ bash.runCommand "${pname}-${version}" { gzip ]; - # condition in ./libcpp/configure requires `env` which is not available in this coreutils - am_cv_CXX_dependencies_compiler_type = "gcc"; - am_cv_CC_dependencies_compiler_type = "gcc"; - passthru.tests.get-version = result: bash.runCommand "${pname}-get-version-${version}" {} '' ${result}/bin/gcc --version @@ -118,18 +99,21 @@ bash.runCommand "${pname}-${version}" { ${lib.concatMapStringsSep "\n" (f: "patch -Np1 -i ${f}") patches} # Configure - export C_INCLUDE_PATH="${gcc}/lib/gcc-lib/${hostPlatform.config}/${gcc.version}/include:${linux-headers}/include:${glibc}/include:$(pwd)/mpfr/src" + export CC="tcc -B ${tinycc.libs}/lib" + export C_INCLUDE_PATH="${tinycc.libs}/include:$(pwd)/mpfr/src" export CPLUS_INCLUDE_PATH="$C_INCLUDE_PATH" - export LDFLAGS="-B${glibc}/lib -Wl,-dynamic-linker -Wl,${glibc}" - export LDFLAGS_FOR_TARGET=$LDFLAGS - export LIBRARY_PATH="${glibc}/lib:${gcc}/lib" - export LIBS="-lc -lnss_files -lnss_dns -lresolv" + + # Avoid "Link tests are not allowed after GCC_NO_EXECUTABLES" + export lt_cv_shlibpath_overrides_runpath=yes + export ac_cv_func_memcpy=yes + export ac_cv_func_strerror=yes + bash ./configure \ --prefix=$out \ --build=${buildPlatform.config} \ --host=${hostPlatform.config} \ - --with-native-system-header-dir=${glibc}/include \ - --with-build-sysroot=${glibc}/include \ + --with-native-system-header-dir=${tinycc.libs}/include \ + --with-build-sysroot=${tinycc.libs}/include \ --disable-bootstrap \ --disable-decimal-float \ --disable-libatomic \ @@ -146,7 +130,7 @@ bash.runCommand "${pname}-${version}" { --disable-multilib \ --disable-plugin \ --disable-threads \ - --enable-languages=c,c++ \ + --enable-languages=c \ --enable-static \ --disable-shared \ --enable-threads=single \ @@ -154,8 +138,8 @@ bash.runCommand "${pname}-${version}" { --disable-build-with-cxx # Build - make + make -j $NIX_BUILD_CORES # Install - make install + make -j $NIX_BUILD_CORES install '' diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gcc/no-system-headers.patch b/pkgs/os-specific/linux/minimal-bootstrap/gcc/no-system-headers.patch new file mode 100644 index 0000000000000..318553bf916bc --- /dev/null +++ b/pkgs/os-specific/linux/minimal-bootstrap/gcc/no-system-headers.patch @@ -0,0 +1,11 @@ +--- a/gcc/Makefile.in ++++ b/gcc/Makefile.in +@@ -440,7 +440,7 @@ LINKER_PLUGIN_API_H = $(srcdir)/../include/plugin-api.h + LTO_SYMTAB_H = $(srcdir)/../include/lto-symtab.h + + # Default native SYSTEM_HEADER_DIR, to be overridden by targets. +-NATIVE_SYSTEM_HEADER_DIR = /usr/include ++# NATIVE_SYSTEM_HEADER_DIR = /usr/include + # Default cross SYSTEM_HEADER_DIR, to be overridden by targets. + CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@ + diff --git a/pkgs/os-specific/linux/minimal-bootstrap/glibc/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/glibc/default.nix index 5c4ff386add56..bc68009992477 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/glibc/default.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/glibc/default.nix @@ -12,13 +12,13 @@ , gzip , gawk , heirloom -, binutils-mes +, binutils , linux-headers }: let pname = "glibc"; - buildGlibc = { version, src, patches, configureFlags, gcc, binutils, CC, CPP }: + buildGlibc = { version, src, patches, configureFlags, gcc, CC, CPP }: bash.runCommand "${pname}-${version}" { inherit pname version; @@ -114,7 +114,6 @@ in ]; gcc = gcc2-mes; - binutils = binutils-mes; CC = "gcc -D MES_BOOTSTRAP=1 -D BOOTSTRAP_GLIBC=1 -L $(pwd)"; CPP = "gcc -E -D MES_BOOTSTRAP=1 -D BOOTSTRAP_GLIBC=1"; }; diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gnumake/musl.nix b/pkgs/os-specific/linux/minimal-bootstrap/gnumake/musl.nix new file mode 100644 index 0000000000000..504095732e8ce --- /dev/null +++ b/pkgs/os-specific/linux/minimal-bootstrap/gnumake/musl.nix @@ -0,0 +1,82 @@ +{ lib +, buildPlatform +, hostPlatform +, fetchurl +, bash +, tinycc +, gnumakeBoot +, gnupatch +, gnused +, gnugrep +, gawk +, gnutar +, gzip +}: +let + pname = "gnumake-musl"; + version = "4.4.1"; + + src = fetchurl { + url = "mirror://gnu/make/make-${version}.tar.gz"; + hash = "sha256-3Rb7HWe/q3mnL16DkHNcSePo5wtJRaFasfgd23hlj7M="; + }; + + patches = [ + # Replaces /bin/sh with sh, see patch file for reasoning + ./0001-No-impure-bin-sh.patch + # Purity: don't look for library dependencies (of the form `-lfoo') in /lib + # and /usr/lib. It's a stupid feature anyway. Likewise, when searching for + # included Makefiles, don't look in /usr/include and friends. + ./0002-remove-impure-dirs.patch + ]; +in +bash.runCommand "${pname}-${version}" { + inherit pname version; + + nativeBuildInputs = [ + tinycc.compiler + gnumakeBoot + gnupatch + gnused + gnugrep + gawk + gnutar + gzip + ]; + + passthru.tests.get-version = result: + bash.runCommand "${pname}-get-version-${version}" {} '' + ${result}/bin/make --version + mkdir $out + ''; + + meta = with lib; { + description = "A tool to control the generation of non-source files from sources"; + homepage = "https://www.gnu.org/software/make"; + license = licenses.gpl3Plus; + maintainers = teams.minimal-bootstrap.members; + mainProgram = "make"; + platforms = platforms.unix; + }; +} '' + # Unpack + tar xzf ${src} + cd make-${version} + + # Patch + ${lib.concatMapStringsSep "\n" (f: "patch -Np1 -i ${f}") patches} + + # Configure + export CC="tcc -B ${tinycc.libs}/lib" + export LD=tcc + bash ./configure \ + --prefix=$out \ + --build=${buildPlatform.config} \ + --host=${hostPlatform.config} + + # Build + make AR="tcc -ar" + + # Install + make install +'' diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gnused/common.nix b/pkgs/os-specific/linux/minimal-bootstrap/gnused/common.nix new file mode 100644 index 0000000000000..658f05923ac3e --- /dev/null +++ b/pkgs/os-specific/linux/minimal-bootstrap/gnused/common.nix @@ -0,0 +1,12 @@ +{ lib }: + +{ + meta = with lib; { + description = "GNU sed, a batch stream editor"; + homepage = "https://www.gnu.org/software/sed"; + license = licenses.gpl3Plus; + maintainers = teams.minimal-bootstrap.members; + mainProgram = "sed"; + platforms = platforms.unix; + }; +} diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gnused/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/gnused/default.nix index b5647b96ee3c5..ee566f93c1643 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/gnused/default.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/gnused/default.nix @@ -4,41 +4,34 @@ , fetchurl , bash , gnumake -, mesBootstrap ? false, tinycc ? null -, gcc ? null, glibc ? null, binutils ? null, gnused ? null, linux-headers, gnugrep +, tinycc +, gnused +, gnugrep +, gnutar +, gzip }: -assert mesBootstrap -> tinycc != null; -assert !mesBootstrap -> gcc != null && glibc != null && binutils != null && gnused != null; + let - pname = "gnused" + lib.optionalString mesBootstrap "-mes"; - # last version that can be compiled with mes-libc - version = "4.0.9"; + inherit (import ./common.nix { inherit lib; }) meta; + pname = "gnused"; + # last version that can be bootstrapped with our slightly buggy gnused-mes + version = "4.2"; src = fetchurl { url = "mirror://gnu/sed/sed-${version}.tar.gz"; - sha256 = "0006gk1dw2582xsvgx6y6rzs9zw8b36rhafjwm288zqqji3qfrf3"; - }; - - # Thanks to the live-bootstrap project! - # See https://github.com/fosslinux/live-bootstrap/blob/1bc4296091c51f53a5598050c8956d16e945b0f5/sysa/sed-4.0.9/sed-4.0.9.kaem - makefile = fetchurl { - url = "https://github.com/fosslinux/live-bootstrap/raw/1bc4296091c51f53a5598050c8956d16e945b0f5/sysa/sed-4.0.9/mk/main.mk"; - sha256 = "0w1f5ri0g5zla31m6l6xyzbqwdvandqfnzrsw90dd6ak126w3mya"; + hash = "sha256-20XNY/0BDmUFN9ZdXfznaJplJ0UjZgbl5ceCk3Jn2YM="; }; in bash.runCommand "${pname}-${version}" { - inherit pname version; + inherit pname version meta; nativeBuildInputs = [ gnumake - ] ++ lib.optionals mesBootstrap [ tinycc.compiler - ] ++ lib.optionals (!mesBootstrap) [ - gcc - glibc - binutils gnused gnugrep + gnutar + gzip ]; passthru.tests.get-version = result: @@ -46,51 +39,25 @@ bash.runCommand "${pname}-${version}" { ${result}/bin/sed --version mkdir ''${out} ''; - - meta = with lib; { - description = "GNU sed, a batch stream editor"; - homepage = "https://www.gnu.org/software/sed"; - license = licenses.gpl3Plus; - maintainers = teams.minimal-bootstrap.members; - mainProgram = "sed"; - platforms = platforms.unix; - }; } ('' # Unpack - ungz --file ${src} --output sed.tar - untar --file sed.tar - rm sed.tar + tar xzf ${src} cd sed-${version} -'' + lib.optionalString mesBootstrap '' - # Configure - cp ${makefile} Makefile - catm config.h - - # Build - make \ - CC="tcc -B ${tinycc.libs}/lib" \ - LIBC=mes - -'' + lib.optionalString (!mesBootstrap) '' # Configure - export CC="gcc -I${glibc}/include -I${linux-headers}/include" - export LIBRARY_PATH="${glibc}/lib" - export LIBS="-lc -lnss_files -lnss_dns -lresolv" - chmod +x configure + export CC="tcc -B ${tinycc.libs}/lib" + export LD=tcc ./configure \ --build=${buildPlatform.config} \ --host=${hostPlatform.config} \ --disable-shared \ --disable-nls \ --disable-dependency-tracking \ - --without-included-regex \ --prefix=$out # Build - make + make AR="tcc -ar" -'' + '' # Install - make install PREFIX=$out + make install '') diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gnused/mes.nix b/pkgs/os-specific/linux/minimal-bootstrap/gnused/mes.nix new file mode 100644 index 0000000000000..031b5b5f0db07 --- /dev/null +++ b/pkgs/os-specific/linux/minimal-bootstrap/gnused/mes.nix @@ -0,0 +1,59 @@ +{ lib +, buildPlatform +, hostPlatform +, fetchurl +, bash +, gnumake +, tinycc +}: + +let + inherit (import ./common.nix { inherit lib; }) meta; + pname = "gnused-mes"; + # last version that can be compiled with mes-libc + version = "4.0.9"; + + src = fetchurl { + url = "mirror://gnu/sed/sed-${version}.tar.gz"; + sha256 = "0006gk1dw2582xsvgx6y6rzs9zw8b36rhafjwm288zqqji3qfrf3"; + }; + + # Thanks to the live-bootstrap project! + # See https://github.com/fosslinux/live-bootstrap/blob/1bc4296091c51f53a5598050c8956d16e945b0f5/sysa/sed-4.0.9/sed-4.0.9.kaem + makefile = fetchurl { + url = "https://github.com/fosslinux/live-bootstrap/raw/1bc4296091c51f53a5598050c8956d16e945b0f5/sysa/sed-4.0.9/mk/main.mk"; + sha256 = "0w1f5ri0g5zla31m6l6xyzbqwdvandqfnzrsw90dd6ak126w3mya"; + }; +in +bash.runCommand "${pname}-${version}" { + inherit pname version meta; + + nativeBuildInputs = [ + gnumake + tinycc.compiler + ]; + + passthru.tests.get-version = result: + bash.runCommand "${pname}-get-version-${version}" {} '' + ${result}/bin/sed --version + mkdir ''${out} + ''; +} ('' + # Unpack + ungz --file ${src} --output sed.tar + untar --file sed.tar + rm sed.tar + cd sed-${version} + + # Configure + cp ${makefile} Makefile + catm config.h + + # Build + make \ + CC="tcc -B ${tinycc.libs}/lib" \ + LIBC=mes + + # Install + make install PREFIX=$out +'') diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gnutar/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/gnutar/mes.nix index e07561b3e7e5c..e07561b3e7e5c 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/gnutar/default.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/gnutar/mes.nix diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gnutar/musl.nix b/pkgs/os-specific/linux/minimal-bootstrap/gnutar/musl.nix new file mode 100644 index 0000000000000..0818a0de39a2b --- /dev/null +++ b/pkgs/os-specific/linux/minimal-bootstrap/gnutar/musl.nix @@ -0,0 +1,70 @@ +{ lib +, buildPlatform +, hostPlatform +, fetchurl +, bash +, tinycc +, gnumake +, gnugrep +, gnused +}: +let + # gnutar with musl preserves modify times, allowing make to not try + # rebuilding pregenerated files + pname = "gnutar-musl"; + version = "1.12"; + + src = fetchurl { + url = "mirror://gnu/tar/tar-${version}.tar.gz"; + hash = "sha256-xsN+iIsTbM76uQPFEUn0t71lnWnUrqISRfYQU6V6pgo="; + }; +in +bash.runCommand "${pname}-${version}" { + inherit pname version; + + nativeBuildInputs = [ + tinycc.compiler + gnumake + gnused + gnugrep + ]; + + passthru.tests.get-version = result: + bash.runCommand "${pname}-get-version-${version}" {} '' + ${result}/bin/tar --version + mkdir $out + ''; + + meta = with lib; { + description = "GNU implementation of the `tar' archiver"; + homepage = "https://www.gnu.org/software/tar"; + license = licenses.gpl3Plus; + maintainers = teams.minimal-bootstrap.members; + mainProgram = "tar"; + platforms = platforms.unix; + }; +} '' + # Unpack + ungz --file ${src} --output tar.tar + untar --file tar.tar + rm tar.tar + cd tar-${version} + + # Configure + export CC="tcc -B ${tinycc.libs}/lib" + export LD=tcc + export ac_cv_sizeof_unsigned_long=4 + export ac_cv_sizeof_long_long=8 + export ac_cv_header_netdb_h=no + bash ./configure \ + --prefix=$out \ + --build=${buildPlatform.config} \ + --host=${hostPlatform.config} \ + --disable-nls + + # Build + make AR="tcc -ar" + + # Install + make install +'' diff --git a/pkgs/os-specific/linux/minimal-bootstrap/musl/1.1.nix b/pkgs/os-specific/linux/minimal-bootstrap/musl/1.1.nix new file mode 100644 index 0000000000000..704ee42edeb16 --- /dev/null +++ b/pkgs/os-specific/linux/minimal-bootstrap/musl/1.1.nix @@ -0,0 +1,116 @@ +{ lib +, buildPlatform +, hostPlatform +, fetchurl +, bash +, tinycc +, gnumake +, gnupatch +, gnused +, gnugrep +, gnutar +, gzip +}: + +let + inherit (import ./common.nix { inherit lib; }) pname meta; + version = "1.1.24"; + + src = fetchurl { + url = "https://musl.libc.org/releases/musl-${version}.tar.gz"; + hash = "sha256-E3DJqBKyzyp9koAlEMygBYzDfmanvt1wBR8KNAFQIqM="; + }; + + # Thanks to the live-bootstrap project! + # See https://github.com/fosslinux/live-bootstrap/blob/d98f97e21413efc32c770d0356f1feda66025686/sysa/musl-1.1.24/musl-1.1.24.sh + liveBootstrap = "https://github.com/fosslinux/live-bootstrap/raw/d98f97e21413efc32c770d0356f1feda66025686/sysa/musl-1.1.24"; + patches = [ + (fetchurl { + url = "${liveBootstrap}/patches/avoid_set_thread_area.patch"; + hash = "sha256-TsbBZXk4/KMZG9EKi7cF+sullVXrxlizLNH0UHGXsPs="; + }) + (fetchurl { + url = "${liveBootstrap}/patches/avoid_sys_clone.patch"; + hash = "sha256-/ZmH64J57MmbxdfQ4RNjamAiBdkImMTlHsHdgV4gMj4="; + }) + (fetchurl { + url = "${liveBootstrap}/patches/fenv.patch"; + hash = "sha256-vMVGjoN4deAJW5gsSqA207SJqAbvhrnOsGK49DdEiTI="; + }) + (fetchurl { + url = "${liveBootstrap}/patches/makefile.patch"; + hash = "sha256-03iYBAUnsrEdLIIhhhq5mM6BGnPn2EfUmIHu51opxbw="; + }) + (fetchurl { + url = "${liveBootstrap}/patches/musl_weak_symbols.patch"; + hash = "sha256-/d9a2eUkpe9uyi1ye6T4CiYc9MR3FZ9na0Gb90+g4v0="; + }) + (fetchurl { + url = "${liveBootstrap}/patches/set_thread_area.patch"; + hash = "sha256-RIZYqbbRSx4X/0iFUhriwwBRmoXVR295GNBUjf2UrM0="; + }) + (fetchurl { + url = "${liveBootstrap}/patches/sigsetjmp.patch"; + hash = "sha256-wd2Aev1zPJXy3q933aiup5p1IMKzVJBquAyl3gbK4PU="; + }) + # FIXME: this patch causes the build to fail + # (fetchurl { + # url = "${liveBootstrap}/patches/stdio_flush_on_exit.patch"; + # hash = "sha256-/z5ze3h3QTysay8nRvyvwPv3pmTcKptdkBIaMCoeLDg="; + # }) + # HACK: always flush stdio immediately + ./always-flush.patch + (fetchurl { + url = "${liveBootstrap}/patches/va_list.patch"; + hash = "sha256-UmcMIl+YCi3wIeVvjbsCyqFlkyYsM4ECNwTfXP+s7vg="; + }) + ]; +in +bash.runCommand "${pname}-${version}" { + inherit pname version meta; + + nativeBuildInputs = [ + tinycc.compiler + gnumake + gnupatch + gnused + gnugrep + gnutar + gzip + ]; +} '' + # Unpack + tar xzf ${src} + cd musl-${version} + + # Patch + ${lib.concatMapStringsSep "\n" (f: "patch -Np0 -i ${f}") patches} + # tcc does not support complex types + rm -rf src/complex + # Configure fails without this + mkdir -p /dev + # https://github.com/ZilchOS/bootstrap-from-tcc/blob/2e0c68c36b3437386f786d619bc9a16177f2e149/using-nix/2a3-intermediate-musl.nix + sed -i 's|/bin/sh|${bash}/bin/bash|' \ + tools/*.sh + chmod 755 tools/*.sh + # patch popen/system to search in PATH instead of hardcoding /bin/sh + sed -i 's|posix_spawn(&pid, "/bin/sh",|posix_spawnp(\&pid, "sh",|' \ + src/stdio/popen.c src/process/system.c + sed -i 's|execl("/bin/sh", "sh", "-c",|execlp("sh", "-c",|'\ + src/misc/wordexp.c + + # Configure + bash ./configure \ + --prefix=$out \ + --build=${buildPlatform.config} \ + --host=${hostPlatform.config} \ + --disable-shared \ + CC=tcc + + # Build + make AR="tcc -ar" RANLIB=true CFLAGS="-DSYSCALL_NO_TLS" + + # Install + make install + cp ${tinycc.libs}/lib/libtcc1.a $out/lib +'' diff --git a/pkgs/os-specific/linux/minimal-bootstrap/musl/always-flush.patch b/pkgs/os-specific/linux/minimal-bootstrap/musl/always-flush.patch new file mode 100644 index 0000000000000..cdeddf962d9d6 --- /dev/null +++ b/pkgs/os-specific/linux/minimal-bootstrap/musl/always-flush.patch @@ -0,0 +1,12 @@ +diff --git src/env/__libc_start_main.c src/env/__libc_start_main.c +index 8fbe526..9476c22 100644 +--- src/env/__libc_start_main.c ++++ src/env/__libc_start_main.c +@@ -91,6 +91,7 @@ static int libc_start_main_stage2(int (*main)(int,char **,char **), int argc, ch + __libc_start_init(); + + /* Pass control to the application */ ++ setbuf(stdout, NULL); + exit(main(argc, argv, envp)); + return 0; + } diff --git a/pkgs/os-specific/linux/minimal-bootstrap/musl/common.nix b/pkgs/os-specific/linux/minimal-bootstrap/musl/common.nix new file mode 100644 index 0000000000000..52db5f9474251 --- /dev/null +++ b/pkgs/os-specific/linux/minimal-bootstrap/musl/common.nix @@ -0,0 +1,13 @@ +{ lib }: + +{ + pname = "musl"; + + meta = with lib; { + description = "An efficient, small, quality libc implementation"; + homepage = "https://musl.libc.org"; + license = licenses.mit; + maintainers = teams.minimal-bootstrap.members; + platforms = platforms.unix; + }; +} diff --git a/pkgs/os-specific/linux/minimal-bootstrap/musl/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/musl/default.nix index c252d60328e91..787d6bcab55ab 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/musl/default.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/musl/default.nix @@ -8,12 +8,11 @@ , gnumake , gnugrep , gnused -, gawk , gnutar , gzip }: let - pname = "musl"; + inherit (import ./common.nix { inherit lib; }) pname meta; version = "1.2.4"; src = fetchurl { @@ -22,7 +21,7 @@ let }; in bash.runCommand "${pname}-${version}" { - inherit pname version; + inherit pname version meta; nativeBuildInputs = [ gcc @@ -30,7 +29,6 @@ bash.runCommand "${pname}-${version}" { gnumake gnused gnugrep - gawk gnutar gzip ]; @@ -50,14 +48,6 @@ bash.runCommand "${pname}-${version}" { ./test mkdir $out ''; - - meta = with lib; { - description = "An efficient, small, quality libc implementation"; - homepage = "https://musl.libc.org"; - license = licenses.mit; - maintainers = teams.minimal-bootstrap.members; - platforms = platforms.unix; - }; } '' # Unpack tar xzf ${src} @@ -80,8 +70,8 @@ bash.runCommand "${pname}-${version}" { --host=${hostPlatform.config} # Build - make + make -j $NIX_BUILD_CORES # Install - make install + make -j $NIX_BUILD_CORES install '' diff --git a/pkgs/os-specific/linux/minimal-bootstrap/tinycc/ignore-duplicate-symbols.patch b/pkgs/os-specific/linux/minimal-bootstrap/tinycc/ignore-duplicate-symbols.patch new file mode 100644 index 0000000000000..0aec8b465bf2b --- /dev/null +++ b/pkgs/os-specific/linux/minimal-bootstrap/tinycc/ignore-duplicate-symbols.patch @@ -0,0 +1,13 @@ +--- tccelf.c ++++ tccelf.c +@@ -710,8 +710,9 @@ ST_FUNC int set_elf_sym(Section *s, addr_t value, unsigned long size, + #if 0 + printf("new_bind=%x new_shndx=%x new_vis=%x old_bind=%x old_shndx=%x old_vis=%x\n", + sym_bind, shndx, new_vis, esym_bind, esym->st_shndx, esym_vis); +-#endif + tcc_error_noabort("'%s' defined twice", name); ++#endif ++ goto do_patch; + } + } else { + esym->st_other = other; diff --git a/pkgs/os-specific/linux/minimal-bootstrap/tinycc/ignore-static-inside-array.patch b/pkgs/os-specific/linux/minimal-bootstrap/tinycc/ignore-static-inside-array.patch new file mode 100644 index 0000000000000..8dc2fe3fcfb4d --- /dev/null +++ b/pkgs/os-specific/linux/minimal-bootstrap/tinycc/ignore-static-inside-array.patch @@ -0,0 +1,21 @@ +--- tccgen.c ++++ tccgen.c +@@ -4941,7 +4941,7 @@ static int post_type(CType *type, AttributeDef *ad, int storage, int td) + next(); + n = -1; + t1 = 0; +- if (td & TYPE_PARAM) while (1) { ++ while (1) { + /* XXX The optional type-quals and static should only be accepted + in parameter decls. The '*' as well, and then even only + in prototypes (not function defs). */ +@@ -4972,7 +4972,8 @@ static int post_type(CType *type, AttributeDef *ad, int storage, int td) + } + break; + +- } else if (tok != ']') { ++ } ++ if (tok != ']') { + if (!local_stack || (storage & VT_STATIC)) + vpushi(expr_const()); + else { diff --git a/pkgs/os-specific/linux/minimal-bootstrap/tinycc/musl.nix b/pkgs/os-specific/linux/minimal-bootstrap/tinycc/musl.nix new file mode 100644 index 0000000000000..4d26faac20b16 --- /dev/null +++ b/pkgs/os-specific/linux/minimal-bootstrap/tinycc/musl.nix @@ -0,0 +1,155 @@ +{ lib +, fetchurl +, callPackage +, bash +, tinycc-bootstrappable +, musl +, gnupatch +, gnutar +, gzip +}: +let + pname = "tinycc-musl"; + # next commit introduces use of realpath (unsupported in mes-libc) + version = "unstable-2023-07-10"; + rev = "fd6d2180c5c801bb0b4c5dde27d61503059fc97d"; + + src = fetchurl { + url = "https://repo.or.cz/tinycc.git/snapshot/${rev}.tar.gz"; + hash = "sha256-R81SNbEmh4s9FNQxCWZwUiMCYRkkwOHAdRf0aMnnRiA="; + }; + + patches = [ + ./ignore-duplicate-symbols.patch + ./ignore-static-inside-array.patch + ./static-link.patch + ]; + + meta = with lib; { + description = "Small, fast, and embeddable C compiler and interpreter"; + homepage = "https://repo.or.cz/w/tinycc.git"; + license = licenses.lgpl21Only; + maintainers = teams.minimal-bootstrap.members; + platforms = [ "i686-linux" ]; + }; + + tinycc-musl = bash.runCommand "${pname}-${version}" { + inherit pname version meta; + + nativeBuildInputs = [ + tinycc-bootstrappable.compiler + gnupatch + gnutar + gzip + ]; + } '' + # Unpack + tar xzf ${src} + cd tinycc-${builtins.substring 0 7 rev} + + # Patch + ${lib.concatMapStringsSep "\n" (f: "patch -Np0 -i ${f}") patches} + + # Configure + touch config.h + + # Build + # We first have to recompile using tcc-0.9.26 as tcc-0.9.27 is not self-hosting, + # but when linked with musl it is. + ln -s ${musl}/lib/libtcc1.a ./libtcc1.a + + tcc \ + -B ${tinycc-bootstrappable.libs}/lib \ + -DC2STR \ + -o c2str \ + conftest.c + ./c2str include/tccdefs.h tccdefs_.h + + tcc -v \ + -static \ + -o tcc-musl \ + -D TCC_TARGET_I386=1 \ + -D CONFIG_TCCDIR=\"\" \ + -D CONFIG_TCC_CRTPREFIX=\"{B}\" \ + -D CONFIG_TCC_ELFINTERP=\"/musl/loader\" \ + -D CONFIG_TCC_LIBPATHS=\"{B}\" \ + -D CONFIG_TCC_SYSINCLUDEPATHS=\"${musl}/include\" \ + -D TCC_LIBGCC=\"libc.a\" \ + -D TCC_LIBTCC1=\"libtcc1.a\" \ + -D CONFIG_TCC_STATIC=1 \ + -D CONFIG_USE_LIBGCC=1 \ + -D TCC_VERSION=\"0.9.27\" \ + -D ONE_SOURCE=1 \ + -D TCC_MUSL=1 \ + -D CONFIG_TCC_PREDEFS=1 \ + -D CONFIG_TCC_SEMLOCK=0 \ + -B . \ + -B ${tinycc-bootstrappable.libs}/lib \ + tcc.c + # libtcc1.a + rm -f libtcc1.a + tcc -c -D HAVE_CONFIG_H=1 lib/libtcc1.c + tcc -ar cr libtcc1.a libtcc1.o + + # Rebuild tcc-musl with itself + ./tcc-musl \ + -v \ + -static \ + -o tcc-musl \ + -D TCC_TARGET_I386=1 \ + -D CONFIG_TCCDIR=\"\" \ + -D CONFIG_TCC_CRTPREFIX=\"{B}\" \ + -D CONFIG_TCC_ELFINTERP=\"/musl/loader\" \ + -D CONFIG_TCC_LIBPATHS=\"{B}\" \ + -D CONFIG_TCC_SYSINCLUDEPATHS=\"${musl}/include\" \ + -D TCC_LIBGCC=\"libc.a\" \ + -D TCC_LIBTCC1=\"libtcc1.a\" \ + -D CONFIG_TCC_STATIC=1 \ + -D CONFIG_USE_LIBGCC=1 \ + -D TCC_VERSION=\"0.9.27\" \ + -D ONE_SOURCE=1 \ + -D TCC_MUSL=1 \ + -D CONFIG_TCC_PREDEFS=1 \ + -D CONFIG_TCC_SEMLOCK=0 \ + -B . \ + -B ${musl}/lib \ + tcc.c + # libtcc1.a + rm -f libtcc1.a + ./tcc-musl -c -D HAVE_CONFIG_H=1 lib/libtcc1.c + ./tcc-musl -c -D HAVE_CONFIG_H=1 lib/alloca.S + ./tcc-musl -ar cr libtcc1.a libtcc1.o alloca.o + + # Install + install -D tcc-musl $out/bin/tcc + install -Dm444 libtcc1.a $out/lib/libtcc1.a + ''; +in +{ + compiler = bash.runCommand "${pname}-${version}-compiler" { + inherit pname version meta; + passthru.tests.hello-world = result: + bash.runCommand "${pname}-simple-program-${version}" {} '' + cat <<EOF >> test.c + #include <stdio.h> + int main() { + printf("Hello World!\n"); + return 0; + } + EOF + ${result}/bin/tcc -v -static -B${musl}/lib -o test test.c + ./test + mkdir $out + ''; + passthru.tinycc-musl = tinycc-musl; + } "install -D ${tinycc-musl}/bin/tcc $out/bin/tcc"; + + libs = bash.runCommand "${pname}-${version}-libs" { + inherit pname version meta; + } '' + mkdir $out + cp -r ${musl}/* $out + chmod +w $out/lib/libtcc1.a + cp ${tinycc-musl}/lib/libtcc1.a $out/lib/libtcc1.a + ''; +} diff --git a/pkgs/os-specific/linux/minimal-bootstrap/tinycc/static-link.patch b/pkgs/os-specific/linux/minimal-bootstrap/tinycc/static-link.patch new file mode 100644 index 0000000000000..671a3b37f98dd --- /dev/null +++ b/pkgs/os-specific/linux/minimal-bootstrap/tinycc/static-link.patch @@ -0,0 +1,10 @@ +--- libtcc.c ++++ libtcc.c +@@ -793,6 +793,7 @@ LIBTCCAPI TCCState *tcc_new(void) + + s->gnu_ext = 1; + s->tcc_ext = 1; ++ s->static_link = 1; + s->nocommon = 1; + s->dollars_in_identifiers = 1; /*on by default like in gcc/clang*/ + s->cversion = 199901; /* default unless -std=c11 is supplied */ diff --git a/pkgs/os-specific/linux/minimal-bootstrap/xz/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/xz/default.nix index 92cb240c5f164..8dcccbacaca88 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/xz/default.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/xz/default.nix @@ -5,18 +5,19 @@ , bash , tinycc , gnumake +, gnused , gnugrep , gawk -, sed +, gnutar +, gzip }: let pname = "xz"; - # >=5.2 uses poll.h, unsupported by meslibc - version = "5.0.8"; + version = "5.4.3"; src = fetchurl { - url = "https://tukaani.org/xz/xz-${version}.tar.bz2"; - sha256 = "1nkb68dyrf16xwyqichcy1vhgbfg20dxz459rcsdx85h1gczk1i2"; + url = "https://tukaani.org/xz/xz-${version}.tar.gz"; + hash = "sha256-HDguC8Lk4K9YOYqQPdYv/35RAXHS3keh6+BtFSjpt+k="; }; in bash.runCommand "${pname}-${version}" { @@ -25,9 +26,11 @@ bash.runCommand "${pname}-${version}" { nativeBuildInputs = [ tinycc.compiler gnumake + gnused gnugrep gawk - sed + gnutar + gzip ]; passthru.tests.get-version = result: @@ -45,34 +48,23 @@ bash.runCommand "${pname}-${version}" { }; } '' # Unpack - unbz2 --file ${src} --output xz.tar - untar --file xz.tar - rm xz.tar + tar xzf ${src} cd xz-${version} # Configure - export CC="tcc -B ${tinycc.libs}/lib -include${./stubs.h}" - export CPP="tcc -E" - export LD=tcc + export CC="tcc -B ${tinycc.libs}/lib" export AR="tcc -ar" - export SED=sed - export ac_cv_prog_cc_c99= - export ac_cv_header_fcntl_h=yes - export ac_cv_header_limits_h=yes - export ac_cv_header_sys_time_h=yes - export ac_cv_func_utime=no + export LD=tcc bash ./configure \ --prefix=$out \ --build=${buildPlatform.config} \ --host=${hostPlatform.config} \ --disable-shared \ - --disable-nls \ - --disable-threads \ --disable-assembler # Build - make all + make -j $NIX_BUILD_CORES # Install - make install + make -j $NIX_BUILD_CORES install '' diff --git a/pkgs/os-specific/linux/minimal-bootstrap/xz/stubs.h b/pkgs/os-specific/linux/minimal-bootstrap/xz/stubs.h deleted file mode 100644 index cbf6f823299e1..0000000000000 --- a/pkgs/os-specific/linux/minimal-bootstrap/xz/stubs.h +++ /dev/null @@ -1,25 +0,0 @@ -#define sig_atomic_t int - -#define SSIZE_MAX LONG_MAX - -#define O_NOCTTY 0400 -#define O_NONBLOCK 04000 - -#define S_ISVTX 01000 -#define S_ISLNK(mode) (((mode) & S_IFMT) == S_IFLNK) - -int fchmod (int fd, int mode) -{ - return 0; -} - -int fchown (int fd, int owner, int group) -{ - return 0; -} - -#include <signal.h> -int sigfillset (sigset_t * set) -{ - return 0; -} diff --git a/pkgs/os-specific/linux/net-tools/default.nix b/pkgs/os-specific/linux/net-tools/default.nix index 9630b5c0c7a11..bedeaadc294ed 100644 --- a/pkgs/os-specific/linux/net-tools/default.nix +++ b/pkgs/os-specific/linux/net-tools/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.10"; src = fetchurl { - url = "mirror://gentoo/distfiles/${pname}-${version}.tar.xz"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.xz"; sha256 = "sha256-smJDWlJB6Jv6UcPKvVEzdTlS96e3uT8y4Iy52W9YDWk="; }; diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index ff37b362a8198..9d1f9c83ab791 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -27,12 +27,12 @@ rec { stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else latest; production = generic { - version = "535.104.05"; - sha256_64bit = "sha256-L51gnR2ncL7udXY2Y1xG5+2CU63oh7h8elSC4z/L7ck="; - sha256_aarch64 = "sha256-J4uEQQ5WK50rVTI2JysBBHLpmBEWQcQ0CihgEM6xuvk="; - openSha256 = "sha256-0ng4hyiUt0rHZkNveFTo+dSaqkMFO4UPXh85/js9Zbw="; - settingsSha256 = "sha256-pS9W5LMenX0Rrwmpg1cszmpAYPt0Mx+apVQmOmLWTog="; - persistencedSha256 = "sha256-uqT++w0gZRNbzyqbvP3GBqgb4g18r6VM3O8AMEfM7GU="; + version = "535.113.01"; + sha256_64bit = "sha256-KOME2N/oG39en2BAS/OMYvyjVXjZdSLjxwoOjyMWdIE="; + sha256_aarch64 = "sha256-mw/p5ELGTNcM4P94soJIGqpLMBJHSPf+z9qsGnISuCk="; + openSha256 = "sha256-SePRFb5S2T0pOmkSGflYfJkJBjG3Dx/Z0MjwnWccfcI="; + settingsSha256 = "sha256-hiX5Nc4JhiYYt0jaRgQzfnmlEQikQjuO0kHnqGdDa04="; + persistencedSha256 = "sha256-V5Wu8a7EhwZarGsflAhEQDE9s9PjuQ3JNMU1nWvNNsQ="; }; latest = selectHighestVersion production (generic { @@ -65,11 +65,11 @@ rec { # Vulkan developer beta driver # See here for more information: https://developer.nvidia.com/vulkan-driver vulkan_beta = generic rec { - version = "535.43.09"; + version = "535.43.10"; persistencedVersion = "535.98"; settingsVersion = "535.98"; - sha256_64bit = "sha256-7QDp+VDgxH7RGW40kbQp4F/luh0DCYb4BS0gU/6wn+c="; - openSha256 = "sha256-7MOwKQCTaOo1//8OlSaNdpKeDXejZvmKFFeqhFrhAk8="; + sha256_64bit = "sha256-J7lyBARBgJERS1tahJJ3Rm3+K2I1dJz7Keabfk52M1Q="; + openSha256 = "sha256-L9W0cvtTBweh6P0ikK+LzARnUUXWrPn33TLGzOqwTSU="; settingsSha256 = "sha256-jCRfeB1w6/dA27gaz6t5/Qo7On0zbAPIi74LYLel34s="; persistencedSha256 = "sha256-WviDU6B50YG8dO64CGvU3xK8WFUX8nvvVYm/fuGyroM="; url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitString "." version)}-linux"; @@ -109,7 +109,7 @@ rec { # source: https://gist.github.com/joanbm/2ec3c512a1ac21f5f5c6b3c1a4dbef35 (fetchpatch { url = "https://gist.github.com/joanbm/2ec3c512a1ac21f5f5c6b3c1a4dbef35/raw/615feaefed2de3a28bd12fe9783894b84a7c86e4/nvidia-470xx-fix-linux-6.6.patch"; - hash = "sha256-pOYlL5wYfeJsq9EX8zhn/CkNm4ZocNSns5N5pAuIuow="; + hash = "sha256-gdV+a+JFzQX8MzRz9eb4gVbnOfTWN+Ds9sOeyIBN5y0="; }) ]; }; diff --git a/pkgs/os-specific/linux/oxtools/default.nix b/pkgs/os-specific/linux/oxtools/default.nix index 02afb28e66e0a..c16e12ab5e142 100644 --- a/pkgs/os-specific/linux/oxtools/default.nix +++ b/pkgs/os-specific/linux/oxtools/default.nix @@ -2,19 +2,19 @@ , glibc, python3 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "0xtools"; - version = "1.1.3"; + version = "1.2.4"; src = fetchFromGitHub { owner = "tanelpoder"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-pe64st3yhVfZi8/sTEfH1cNjx7JpqxDmxMmodpXnqaU="; + repo = "0xtools"; + rev = "v${finalAttrs.version}"; + hash = "sha256-h0/HIbwb1CvFUh/NpozDUCjYGCH647lC7JhbpDCvaLk="; }; postPatch = '' - substituteInPlace lib/0xtools/proc.py \ + substituteInPlace lib/0xtools/psnproc.py \ --replace /usr/include/asm/unistd_64.h ${glibc.dev}/include/asm/unistd_64.h ''; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ astro ]; platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix index 1d27cf80e4dac..dcecfa4c13b85 100644 --- a/pkgs/os-specific/linux/pax-utils/default.nix +++ b/pkgs/os-specific/linux/pax-utils/default.nix @@ -1,6 +1,6 @@ { stdenv , lib -, fetchurl +, fetchgit , buildPackages , docbook_xml_dtd_44 , docbook_xsl @@ -18,9 +18,10 @@ stdenv.mkDerivation rec { pname = "pax-utils"; version = "1.3.7"; - src = fetchurl { - url = "mirror://gentoo/distfiles/${pname}-${version}.tar.xz"; - sha256 = "sha256-EINi0pZo0lz3sMrcY7FaTBz8DbxxrcFRszxf597Ok5o="; + src = fetchgit { + url = "https://anongit.gentoo.org/git/proj/pax-utils.git"; + rev = "v${version}"; + hash = "sha256-WyNng+UtfRz1+Eu4gwXLxUvBAg+m3mdrc8GdEPYRKVE="; }; strictDeps = true; diff --git a/pkgs/os-specific/linux/pipework/default.nix b/pkgs/os-specific/linux/pipework/default.nix index ea274377ced97..3591303a8d0c1 100644 --- a/pkgs/os-specific/linux/pipework/default.nix +++ b/pkgs/os-specific/linux/pipework/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation { homepage = "https://github.com/jpetazzo/pipework"; license = licenses.asl20; platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix b/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix index 3c19db4039174..6a429a77c57bf 100644 --- a/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix +++ b/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix @@ -1,5 +1,5 @@ { stdenvNoCC, lib, fetchFromGitHub, makeWrapper -, python3, binutils-unwrapped, findutils, kmod, pciutils, libraspberrypi +, python3, binutils-unwrapped, findutils, gawk, kmod, pciutils, libraspberrypi }: stdenvNoCC.mkDerivation rec { pname = "raspberrypi-eeprom"; @@ -40,6 +40,7 @@ stdenvNoCC.mkDerivation rec { --prefix PATH : "${lib.makeBinPath ([ binutils-unwrapped findutils + gawk kmod pciutils (placeholder "out") diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index 98ddb7bb57b81..e400e5eba7d7b 100644 --- a/pkgs/os-specific/linux/rdma-core/default.nix +++ b/pkgs/os-specific/linux/rdma-core/default.nix @@ -15,17 +15,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "rdma-core"; - version = "47.0"; + version = "48.0"; src = fetchFromGitHub { owner = "linux-rdma"; repo = "rdma-core"; rev = "v${finalAttrs.version}"; - hash = "sha256-R+qgHDu9GRwT5ic1DCDlYe1Xb4hqi8pgitKq9iBBQNQ="; + hash = "sha256-/ltuZ9OiwJJ6CuAd6hqJwo+wETOgZ4UcW50BrjudF+k="; }; strictDeps = true; + outputs = [ "out" "man" "dev" ]; + nativeBuildInputs = [ cmake docutils diff --git a/pkgs/os-specific/linux/rtl8821cu/default.nix b/pkgs/os-specific/linux/rtl8821cu/default.nix index d851863010710..806df9f6dd4d8 100644 --- a/pkgs/os-specific/linux/rtl8821cu/default.nix +++ b/pkgs/os-specific/linux/rtl8821cu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rtl8821cu"; - version = "${kernel.version}-unstable-2023-04-28"; + version = "${kernel.version}-unstable-2023-09-10"; src = fetchFromGitHub { owner = "morrownr"; repo = "8821cu-20210916"; - rev = "e49409f22ceea0d5b5ef431e6170580028b84c9d"; - hash = "sha256-mElZRr4RkRFiraBM8BxT8yesYgvDaj6xP+9T3P+0Ns4="; + rev = "f6d4598290c5e9c8e545130e8a31d130f6d135f4"; + hash = "sha256-jpMf8K9diJ3mbEkP9Cp+VwairK+pwiEGU/AtUIouCqM="; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index f0e2c281aa56d..746f9b17a6981 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -1,9 +1,9 @@ { lib, stdenv, fetchFromGitHub -, runtimeShell, nixosTests, fetchpatch +, runtimeShell, nixosTests , autoreconfHook, bison, flex , docbook_xml_dtd_45, docbook_xsl -, itstool , libxml2, libxslt -, libxcrypt +, itstool, libbsd, libxml2, libxslt +, libxcrypt, pkg-config , glibcCross ? null , pam ? null , withTcb ? lib.meta.availableOn stdenv.hostPlatform tcb, tcb @@ -17,13 +17,13 @@ in stdenv.mkDerivation rec { pname = "shadow"; - version = "4.13"; + version = "4.14.0"; src = fetchFromGitHub { owner = "shadow-maint"; repo = pname; rev = version; - sha256 = "sha256-L54DhdBYthfB9436t/XWXiqKhW7rfd0GLS7pYGB32rA="; + hash = "sha256-zopJevCv7ot8RLp/rSQGKO05eF4FjkLaOEMo9aq9Afo="; }; outputs = [ "out" "su" "dev" "man" ]; @@ -34,9 +34,10 @@ stdenv.mkDerivation rec { autoreconfHook bison flex docbook_xml_dtd_45 docbook_xsl itstool libxml2 libxslt + pkg-config ]; - buildInputs = [ libxcrypt ] + buildInputs = [ libbsd libxcrypt ] ++ lib.optional (pam != null && stdenv.isLinux) pam ++ lib.optional withTcb tcb; @@ -46,11 +47,6 @@ stdenv.mkDerivation rec { ./respect-xml-catalog-files-var.patch ./runtime-shell.patch ./fix-install-with-tcb.patch - # Fix HAVE_SHADOWGRP configure check - (fetchpatch { - url = "https://github.com/shadow-maint/shadow/commit/a281f241b592aec636d1b93a99e764499d68c7ef.patch"; - sha256 = "sha256-GJWg/8ggTnrbIgjI+HYa26DdVbjTHTk/IHhy7GU9G5w="; - }) ]; # The nix daemon often forbids even creating set[ug]id files. diff --git a/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch b/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch index a5cb7ba6bf783..104a9dad959a9 100644 --- a/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch +++ b/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch @@ -13,7 +13,7 @@ unit. (However, this ignores the fsck unit, so it's not perfect...) 1 file changed, 4 deletions(-) diff --git a/rules.d/99-systemd.rules.in b/rules.d/99-systemd.rules.in -index 3dbba1f850..40d367d1c8 100644 +index c0defc31de..8f80235731 100644 --- a/rules.d/99-systemd.rules.in +++ b/rules.d/99-systemd.rules.in @@ -20,10 +20,6 @@ SUBSYSTEM=="block", TAG+="systemd" diff --git a/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch b/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch index 138823ec68f5f..dda8524c498da 100644 --- a/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch +++ b/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch @@ -1,21 +1,23 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Eelco Dolstra <eelco.dolstra@logicblox.com> -Date: Fri, 12 Apr 2013 13:16:57 +0200 +From: Raito Bezarius <masterancpp@gmail.com> +Date: Mon, 19 Jun 2023 02:11:35 +0200 Subject: [PATCH] Don't try to unmount /nix or /nix/store They'll still be remounted read-only. https://github.com/NixOS/nixos/issues/126 + +Original-Author: Eelco Dolstra <eelco.dolstra@logicblox.com> --- src/shared/fstab-util.c | 2 ++ - src/shutdown/umount.c | 2 ++ - 2 files changed, 4 insertions(+) + src/shutdown/umount.c | 6 ++++-- + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c -index 164e71a150..68e0766594 100644 +index 4ffec25c75..b99031c54e 100644 --- a/src/shared/fstab-util.c +++ b/src/shared/fstab-util.c -@@ -41,6 +41,8 @@ bool fstab_is_extrinsic(const char *mount, const char *opts) { +@@ -43,6 +43,8 @@ bool fstab_is_extrinsic(const char *mount, const char *opts) { /* Don't bother with the OS data itself */ if (PATH_IN_SET(mount, "/", @@ -25,15 +27,19 @@ index 164e71a150..68e0766594 100644 "/etc")) return true; diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c -index 61bd9d2601..a6243da417 100644 +index 1586c2e214..fcae95f824 100644 --- a/src/shutdown/umount.c +++ b/src/shutdown/umount.c -@@ -531,6 +531,8 @@ static int delete_md(MountPoint *m) { - +@@ -170,8 +170,10 @@ int mount_points_list_get(const char *mountinfo, MountPoint **head) { static bool nonunmountable_path(const char *path) { - return path_equal(path, "/") + assert(path); + +- return PATH_IN_SET(path, "/", "/usr") || +- path_startswith(path, "/run/initramfs"); ++ return PATH_IN_SET(path, "/", "/usr") + || path_equal(path, "/nix") + || path_equal(path, "/nix/store") - #if ! HAVE_SPLIT_USR - || path_equal(path, "/usr") - #endif ++ || path_startswith(path, "/run/initramfs"); + } + + static void log_umount_blockers(const char *mnt) { diff --git a/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch b/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch index 08499a228344c..2d86d1e6957a1 100644 --- a/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch +++ b/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch @@ -10,10 +10,10 @@ container, so checking early whether it exists will fail. 1 file changed, 2 insertions(+) diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index 3dabe12672..e5aa4feb1e 100644 +index e170958fc5..898a674631 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -5638,6 +5638,7 @@ static int run(int argc, char *argv[]) { +@@ -5648,6 +5648,7 @@ static int run(int argc, char *argv[]) { goto finish; } } else { @@ -21,7 +21,7 @@ index 3dabe12672..e5aa4feb1e 100644 _cleanup_free_ char *p = NULL; if (arg_pivot_root_new) -@@ -5652,6 +5653,7 @@ static int run(int argc, char *argv[]) { +@@ -5662,6 +5663,7 @@ static int run(int argc, char *argv[]) { "Directory %s doesn't look like it has an OS tree (/usr/ directory is missing). Refusing.", arg_directory); goto finish; } diff --git a/pkgs/os-specific/linux/systemd/0004-Add-some-NixOS-specific-unit-directories.patch b/pkgs/os-specific/linux/systemd/0004-Add-some-NixOS-specific-unit-directories.patch index b4a0da30c8f61..c905a4d812af2 100644 --- a/pkgs/os-specific/linux/systemd/0004-Add-some-NixOS-specific-unit-directories.patch +++ b/pkgs/os-specific/linux/systemd/0004-Add-some-NixOS-specific-unit-directories.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Eelco Dolstra <eelco.dolstra@logicblox.com> -Date: Fri, 19 Dec 2014 14:46:17 +0100 +From: Raito Bezarius <masterancpp@gmail.com> +Date: Mon, 19 Jun 2023 02:13:42 +0200 Subject: [PATCH] Add some NixOS-specific unit directories Look in `/nix/var/nix/profiles/default/lib/systemd/{system,user}` for @@ -8,13 +8,15 @@ units provided by packages installed into the default profile via `nix-env -iA nixos.$package`. Also, remove /usr and /lib as these don't exist on NixOS. + +Original-Author: Eelco Dolstra <eelco.dolstra@logicblox.com> --- src/basic/path-lookup.c | 17 ++--------------- src/core/systemd.pc.in | 8 ++++---- 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/src/basic/path-lookup.c b/src/basic/path-lookup.c -index c99e9d8786..b9f85d1f8c 100644 +index 7d158a8295..f9bd62b631 100644 --- a/src/basic/path-lookup.c +++ b/src/basic/path-lookup.c @@ -92,11 +92,7 @@ int xdg_user_data_dir(char **ret, const char *suffix) { @@ -62,35 +64,37 @@ index c99e9d8786..b9f85d1f8c 100644 STRV_IFNOTNULL(generator_late)); break; -@@ -808,7 +799,6 @@ char **generator_binary_paths(LookupScope scope) { - case LOOKUP_SCOPE_SYSTEM: +@@ -808,7 +799,6 @@ char **generator_binary_paths(RuntimeScope scope) { + case RUNTIME_SCOPE_SYSTEM: add = strv_new("/run/systemd/system-generators", "/etc/systemd/system-generators", - "/usr/local/lib/systemd/system-generators", SYSTEM_GENERATOR_DIR); break; -@@ -816,7 +806,6 @@ char **generator_binary_paths(LookupScope scope) { - case LOOKUP_SCOPE_USER: +@@ -816,7 +806,6 @@ char **generator_binary_paths(RuntimeScope scope) { + case RUNTIME_SCOPE_USER: add = strv_new("/run/systemd/user-generators", "/etc/systemd/user-generators", - "/usr/local/lib/systemd/user-generators", USER_GENERATOR_DIR); break; -@@ -855,12 +844,10 @@ char **env_generator_binary_paths(bool is_system) { - if (is_system) +@@ -855,14 +844,12 @@ char **env_generator_binary_paths(RuntimeScope runtime_scope) { + case RUNTIME_SCOPE_SYSTEM: add = strv_new("/run/systemd/system-environment-generators", "/etc/systemd/system-environment-generators", - "/usr/local/lib/systemd/system-environment-generators", SYSTEM_ENV_GENERATOR_DIR); - else + break; + + case RUNTIME_SCOPE_USER: add = strv_new("/run/systemd/user-environment-generators", "/etc/systemd/user-environment-generators", - "/usr/local/lib/systemd/user-environment-generators", USER_ENV_GENERATOR_DIR); + break; - if (!add) diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in index 693433b34b..5932a21b5b 100644 --- a/src/core/systemd.pc.in diff --git a/pkgs/os-specific/linux/systemd/0005-Get-rid-of-a-useless-message-in-user-sessions.patch b/pkgs/os-specific/linux/systemd/0005-Get-rid-of-a-useless-message-in-user-sessions.patch index e9f73d7c7726b..0a80d5ac4e83e 100644 --- a/pkgs/os-specific/linux/systemd/0005-Get-rid-of-a-useless-message-in-user-sessions.patch +++ b/pkgs/os-specific/linux/systemd/0005-Get-rid-of-a-useless-message-in-user-sessions.patch @@ -13,10 +13,10 @@ in containers. 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/core/manager.c b/src/core/manager.c -index 4bc8a06bd2..342892490e 100644 +index 22ec6e79b1..771e8e7f16 100644 --- a/src/core/manager.c +++ b/src/core/manager.c -@@ -1486,7 +1486,8 @@ static unsigned manager_dispatch_stop_when_bound_queue(Manager *m) { +@@ -1559,7 +1559,8 @@ static unsigned manager_dispatch_stop_when_bound_queue(Manager *m) { if (!unit_is_bound_by_inactive(u, &culprit)) continue; diff --git a/pkgs/os-specific/linux/systemd/0006-hostnamed-localed-timedated-disable-methods-that-cha.patch b/pkgs/os-specific/linux/systemd/0006-hostnamed-localed-timedated-disable-methods-that-cha.patch index 2c4c3f6564e1b..abc6c24dbf511 100644 --- a/pkgs/os-specific/linux/systemd/0006-hostnamed-localed-timedated-disable-methods-that-cha.patch +++ b/pkgs/os-specific/linux/systemd/0006-hostnamed-localed-timedated-disable-methods-that-cha.patch @@ -11,10 +11,10 @@ Subject: [PATCH] hostnamed, localed, timedated: disable methods that change 3 files changed, 25 insertions(+) diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c -index 36ab0148b9..7d458d196d 100644 +index 9ef45f8e75..99b1ec2e36 100644 --- a/src/hostname/hostnamed.c +++ b/src/hostname/hostnamed.c -@@ -1028,6 +1028,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_ +@@ -1053,6 +1053,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_ if (r < 0) return r; @@ -24,7 +24,7 @@ index 36ab0148b9..7d458d196d 100644 name = empty_to_null(name); context_read_etc_hostname(c); -@@ -1091,6 +1094,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess +@@ -1116,6 +1119,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess if (r < 0) return r; @@ -35,10 +35,10 @@ index 36ab0148b9..7d458d196d 100644 context_read_machine_info(c); diff --git a/src/locale/localed.c b/src/locale/localed.c -index 841e5e3e91..a21e34430b 100644 +index f544a73580..ce00c262cc 100644 --- a/src/locale/localed.c +++ b/src/locale/localed.c -@@ -264,6 +264,9 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er +@@ -229,6 +229,9 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er use_localegen = locale_gen_check_available(); @@ -48,7 +48,7 @@ index 841e5e3e91..a21e34430b 100644 /* If single locale without variable name is provided, then we assume it is LANG=. */ if (strv_length(l) == 1 && !strchr(l[0], '=')) { if (!locale_is_valid(l[0])) -@@ -382,6 +385,9 @@ static int method_set_vc_keyboard(sd_bus_message *m, void *userdata, sd_bus_erro +@@ -347,6 +350,9 @@ static int method_set_vc_keyboard(sd_bus_message *m, void *userdata, sd_bus_erro if (r < 0) return bus_log_parse_error(r); @@ -57,8 +57,8 @@ index 841e5e3e91..a21e34430b 100644 + vc_context_empty_to_null(&in); - FOREACH_STRING(name, in.keymap ?: in.toggle, in.keymap ? in.toggle : NULL) { -@@ -607,6 +613,9 @@ static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_err + r = vc_context_verify_and_warn(&in, LOG_ERR, error); +@@ -465,6 +471,9 @@ static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_err if (r < 0) return bus_log_parse_error(r); @@ -67,9 +67,9 @@ index 841e5e3e91..a21e34430b 100644 + x11_context_empty_to_null(&in); - if (!x11_context_is_safe(&in)) + r = x11_context_verify_and_warn(&in, LOG_ERR, error); diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c -index ad483301ef..31ed86955b 100644 +index ad1d492d6b..331af34505 100644 --- a/src/timedate/timedated.c +++ b/src/timedate/timedated.c @@ -665,6 +665,10 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error * diff --git a/pkgs/os-specific/linux/systemd/0008-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch b/pkgs/os-specific/linux/systemd/0008-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch index 300906be04d97..3150d97be2e1a 100644 --- a/pkgs/os-specific/linux/systemd/0008-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch +++ b/pkgs/os-specific/linux/systemd/0008-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch @@ -35,10 +35,10 @@ index e486474c44..5f373d0723 100644 <literal>Etc/UTC</literal>. The resulting link should lead to the corresponding binary diff --git a/src/basic/time-util.c b/src/basic/time-util.c -index 0bea149324..4b16115d43 100644 +index 1db630003a..31744c3e68 100644 --- a/src/basic/time-util.c +++ b/src/basic/time-util.c -@@ -1283,7 +1283,7 @@ static int get_timezones_from_zone1970_tab(char ***ret) { +@@ -1350,7 +1350,7 @@ static int get_timezones_from_zone1970_tab(char ***ret) { assert(ret); @@ -47,16 +47,16 @@ index 0bea149324..4b16115d43 100644 if (!f) return -errno; -@@ -1322,7 +1322,7 @@ static int get_timezones_from_tzdata_zi(char ***ret) { - _cleanup_strv_free_ char **zones = NULL; - int r; +@@ -1391,7 +1391,7 @@ static int get_timezones_from_tzdata_zi(char ***ret) { + + assert(ret); - f = fopen("/usr/share/zoneinfo/tzdata.zi", "re"); + f = fopen("/etc/zoneinfo/tzdata.zi", "re"); if (!f) return -errno; -@@ -1434,7 +1434,7 @@ int verify_timezone(const char *name, int log_level) { +@@ -1503,7 +1503,7 @@ int verify_timezone(const char *name, int log_level) { if (p - name >= PATH_MAX) return -ENAMETOOLONG; @@ -65,7 +65,7 @@ index 0bea149324..4b16115d43 100644 fd = open(t, O_RDONLY|O_CLOEXEC); if (fd < 0) -@@ -1492,7 +1492,7 @@ int get_timezone(char **ret) { +@@ -1563,7 +1563,7 @@ int get_timezone(char **ret) { if (r < 0) return r; /* returns EINVAL if not a symlink */ @@ -75,23 +75,23 @@ index 0bea149324..4b16115d43 100644 return -EINVAL; diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c -index 9e79f84691..1a1c75718c 100644 +index 1956ab3b13..9ef356f8af 100644 --- a/src/firstboot/firstboot.c +++ b/src/firstboot/firstboot.c -@@ -512,7 +512,7 @@ static int process_timezone(void) { +@@ -630,7 +630,7 @@ static int process_timezone(int rfd) { if (isempty(arg_timezone)) return 0; - e = strjoina("../usr/share/zoneinfo/", arg_timezone); + e = strjoina("zoneinfo/", arg_timezone); - (void) mkdir_parents(etc_localtime, 0755); - r = symlink_atomic(e, etc_localtime); + r = symlinkat_atomic_full(e, pfd, f, /* make_relative= */ false); + if (r < 0) diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index e5aa4feb1e..a7a8fae860 100644 +index 898a674631..c41a416e04 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -1918,8 +1918,8 @@ int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t uid, gid +@@ -1924,8 +1924,8 @@ int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t uid, gid static const char *timezone_from_path(const char *path) { return PATH_STARTSWITH_SET( path, @@ -103,7 +103,7 @@ index e5aa4feb1e..a7a8fae860 100644 static bool etc_writable(void) { diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c -index 31ed86955b..8db8d8c288 100644 +index 331af34505..722c4b5b4f 100644 --- a/src/timedate/timedated.c +++ b/src/timedate/timedated.c @@ -282,7 +282,7 @@ static int context_read_data(Context *c) { diff --git a/pkgs/os-specific/linux/systemd/0009-localectl-use-etc-X11-xkb-for-list-x11.patch b/pkgs/os-specific/linux/systemd/0009-localectl-use-etc-X11-xkb-for-list-x11.patch index fac9916cf3b4d..c0f6afd7fc7ba 100644 --- a/pkgs/os-specific/linux/systemd/0009-localectl-use-etc-X11-xkb-for-list-x11.patch +++ b/pkgs/os-specific/linux/systemd/0009-localectl-use-etc-X11-xkb-for-list-x11.patch @@ -10,7 +10,7 @@ NixOS has an option to link the xkb data files to /etc/X11, but not to 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locale/localectl.c b/src/locale/localectl.c -index fb83881cc7..c47a33134a 100644 +index d8db9d9d22..4601bb5431 100644 --- a/src/locale/localectl.c +++ b/src/locale/localectl.c @@ -297,7 +297,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) { diff --git a/pkgs/os-specific/linux/systemd/0010-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch b/pkgs/os-specific/linux/systemd/0010-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch index eec57111b9132..b8f97308acfb7 100644 --- a/pkgs/os-specific/linux/systemd/0010-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch +++ b/pkgs/os-specific/linux/systemd/0010-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch @@ -8,10 +8,10 @@ Subject: [PATCH] build: don't create statedir and don't touch prefixdir 1 file changed, 3 deletions(-) diff --git a/meson.build b/meson.build -index b1f5477836..1a39484855 100644 +index 395eca1943..082cd748bb 100644 --- a/meson.build +++ b/meson.build -@@ -4278,9 +4278,6 @@ install_data('LICENSE.GPL2', +@@ -4707,9 +4707,6 @@ install_data('LICENSE.GPL2', install_subdir('LICENSES', install_dir : docdir) diff --git a/pkgs/os-specific/linux/systemd/0011-add-rootprefix-to-lookup-dir-paths.patch b/pkgs/os-specific/linux/systemd/0011-add-rootprefix-to-lookup-dir-paths.patch index 6e07928d5fbd8..fa201126ae277 100644 --- a/pkgs/os-specific/linux/systemd/0011-add-rootprefix-to-lookup-dir-paths.patch +++ b/pkgs/os-specific/linux/systemd/0011-add-rootprefix-to-lookup-dir-paths.patch @@ -12,10 +12,10 @@ files that I might have missed. 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/basic/constants.h b/src/basic/constants.h -index 5d68cc6332..33c06c1f65 100644 +index 3f96786da9..6e8fb40c08 100644 --- a/src/basic/constants.h +++ b/src/basic/constants.h -@@ -73,13 +73,15 @@ +@@ -74,13 +74,15 @@ "/run/" n "\0" \ "/usr/local/lib/" n "\0" \ "/usr/lib/" n "\0" \ diff --git a/pkgs/os-specific/linux/systemd/0012-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch b/pkgs/os-specific/linux/systemd/0012-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch index 9d0565a6e7672..fde1e2b276c51 100644 --- a/pkgs/os-specific/linux/systemd/0012-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch +++ b/pkgs/os-specific/linux/systemd/0012-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch @@ -10,10 +10,10 @@ This is needed for NixOS to use such scripts as systemd directory is immutable. 1 file changed, 1 insertion(+) diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c -index 5dee1b3a92..c08cf80548 100644 +index 8395bb429d..14fbc85bb4 100644 --- a/src/shutdown/shutdown.c +++ b/src/shutdown/shutdown.c -@@ -339,6 +339,7 @@ static void init_watchdog(void) { +@@ -334,6 +334,7 @@ static void init_watchdog(void) { int main(int argc, char *argv[]) { static const char* const dirs[] = { SYSTEM_SHUTDOWN_PATH, diff --git a/pkgs/os-specific/linux/systemd/0013-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch b/pkgs/os-specific/linux/systemd/0013-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch index 5fa3fb14f1ff9..d91150cfc4901 100644 --- a/pkgs/os-specific/linux/systemd/0013-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch +++ b/pkgs/os-specific/linux/systemd/0013-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch @@ -9,10 +9,10 @@ This is needed for NixOS to use such scripts as systemd directory is immutable. 1 file changed, 1 insertion(+) diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c -index 288fa4ae84..07deb19d7c 100644 +index de1f6c7ec1..d0cdebd80a 100644 --- a/src/sleep/sleep.c +++ b/src/sleep/sleep.c -@@ -186,6 +186,7 @@ static int execute( +@@ -224,6 +224,7 @@ static int execute( }; static const char* const dirs[] = { SYSTEM_SLEEP_PATH, diff --git a/pkgs/os-specific/linux/systemd/0014-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch b/pkgs/os-specific/linux/systemd/0014-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch index b3d1db340ef8c..13dec1070ffc0 100644 --- a/pkgs/os-specific/linux/systemd/0014-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch +++ b/pkgs/os-specific/linux/systemd/0014-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch @@ -10,10 +10,10 @@ systemd itself uses extensively. 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/basic/path-util.h b/src/basic/path-util.h -index 56f01f41d8..f9b8627388 100644 +index 97175bee11..3839704901 100644 --- a/src/basic/path-util.h +++ b/src/basic/path-util.h -@@ -24,11 +24,11 @@ +@@ -25,11 +25,11 @@ # define PATH_SBIN_BIN_NULSTR(x) PATH_NORMAL_SBIN_BIN_NULSTR(x) #endif diff --git a/pkgs/os-specific/linux/systemd/0016-inherit-systemd-environment-when-calling-generators.patch b/pkgs/os-specific/linux/systemd/0016-inherit-systemd-environment-when-calling-generators.patch index 0f67abe795c31..d6640c87454a8 100644 --- a/pkgs/os-specific/linux/systemd/0016-inherit-systemd-environment-when-calling-generators.patch +++ b/pkgs/os-specific/linux/systemd/0016-inherit-systemd-environment-when-calling-generators.patch @@ -16,10 +16,10 @@ executables that are being called from managers. 1 file changed, 8 insertions(+) diff --git a/src/core/manager.c b/src/core/manager.c -index 342892490e..1117251fe0 100644 +index 771e8e7f16..acf3ead8d7 100644 --- a/src/core/manager.c +++ b/src/core/manager.c -@@ -3771,9 +3771,17 @@ static int build_generator_environment(Manager *m, char ***ret) { +@@ -3899,9 +3899,17 @@ static int build_generator_environment(Manager *m, char ***ret) { * adjust generated units to that. Let's pass down some bits of information that are easy for us to * determine (but a bit harder for generator scripts to determine), as environment variables. */ @@ -35,5 +35,5 @@ index 342892490e..1117251fe0 100644 return -ENOMEM; +#endif - r = strv_env_assign(&nl, "SYSTEMD_SCOPE", MANAGER_IS_SYSTEM(m) ? "system" : "user"); + r = strv_env_assign(&nl, "SYSTEMD_SCOPE", runtime_scope_to_string(m->runtime_scope)); if (r < 0) diff --git a/pkgs/os-specific/linux/systemd/0017-core-don-t-taint-on-unmerged-usr.patch b/pkgs/os-specific/linux/systemd/0017-core-don-t-taint-on-unmerged-usr.patch index f509eb39ece53..73b237a29602b 100644 --- a/pkgs/os-specific/linux/systemd/0017-core-don-t-taint-on-unmerged-usr.patch +++ b/pkgs/os-specific/linux/systemd/0017-core-don-t-taint-on-unmerged-usr.patch @@ -17,10 +17,10 @@ See also: https://github.com/systemd/systemd/issues/24191 1 file changed, 4 deletions(-) diff --git a/src/core/manager.c b/src/core/manager.c -index 1117251fe0..bf5600a6cf 100644 +index acf3ead8d7..bdbab16829 100644 --- a/src/core/manager.c +++ b/src/core/manager.c -@@ -4617,10 +4617,6 @@ char* manager_taint_string(const Manager *m) { +@@ -4754,10 +4754,6 @@ char* manager_taint_string(const Manager *m) { if (m->taint_usr) stage[n++] = "split-usr"; diff --git a/pkgs/os-specific/linux/systemd/0018-tpm2_context_init-fix-driver-name-checking.patch b/pkgs/os-specific/linux/systemd/0018-tpm2_context_init-fix-driver-name-checking.patch index 8d6eab5ed847d..6de01a0ae8020 100644 --- a/pkgs/os-specific/linux/systemd/0018-tpm2_context_init-fix-driver-name-checking.patch +++ b/pkgs/os-specific/linux/systemd/0018-tpm2_context_init-fix-driver-name-checking.patch @@ -27,10 +27,10 @@ filename_is_valid with path_is_valid. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/tpm2-util.c b/src/shared/tpm2-util.c -index 4345b95106..424a334df1 100644 +index ae8a8bc073..c284b244f8 100644 --- a/src/shared/tpm2-util.c +++ b/src/shared/tpm2-util.c -@@ -176,7 +176,7 @@ int tpm2_context_new(const char *device, Tpm2Context **ret_context) { +@@ -582,7 +582,7 @@ int tpm2_context_new(const char *device, Tpm2Context **ret_context) { fn = strjoina("libtss2-tcti-", driver, ".so.0"); /* Better safe than sorry, let's refuse strings that cannot possibly be valid driver early, before going to disk. */ diff --git a/pkgs/os-specific/linux/systemd/0019-bootctl-also-print-efi-files-not-owned-by-systemd-in.patch b/pkgs/os-specific/linux/systemd/0019-bootctl-also-print-efi-files-not-owned-by-systemd-in.patch deleted file mode 100644 index 84fc6528b9847..0000000000000 --- a/pkgs/os-specific/linux/systemd/0019-bootctl-also-print-efi-files-not-owned-by-systemd-in.patch +++ /dev/null @@ -1,46 +0,0 @@ -From bc0f378a1149b59e88e9345e579d62fec7f50cdf Mon Sep 17 00:00:00 2001 -From: Arian van Putten <arian.vanputten@gmail.com> -Date: Wed, 31 May 2023 13:27:13 +0200 -Subject: [PATCH] bootctl: also print efi files not owned by systemd in status - -We should not skip over unknown entries in EFI/BOOT/ but -also print them out in status so people are aware that they are there. - -(cherry picked from commit a680d4fb87bad829989949e5ea4fc6db90453456) ---- - src/boot/bootctl-status.c | 11 +++++------ - 1 file changed, 5 insertions(+), 6 deletions(-) - -diff --git a/src/boot/bootctl-status.c b/src/boot/bootctl-status.c -index 2e2bf1f7e1..f1ac4a9c8a 100644 ---- a/src/boot/bootctl-status.c -+++ b/src/boot/bootctl-status.c -@@ -225,9 +225,8 @@ static int enumerate_binaries( - return log_error_errno(errno, "Failed to open file '%s' for reading: %m", filename); - - r = get_file_version(fd, &v); -- if (r == -ESRCH) /* Not the file we are looking for. */ -- continue; -- if (r < 0) -+ -+ if (r < 0 && r != -ESRCH) - return r; - - if (*previous) { /* Let's output the previous entry now, since now we know that there will be -@@ -242,10 +241,10 @@ static int enumerate_binaries( - /* Do not output this entry immediately, but store what should be printed in a state - * variable, because we only will know the tree glyph to print (branch or final edge) once we - * read one more entry */ -- if (r > 0) -- r = asprintf(previous, "/%s/%s (%s%s%s)", path, de->d_name, ansi_highlight(), v, ansi_normal()); -- else -+ if (r == -ESRCH) /* No systemd-owned file but still interesting to print */ - r = asprintf(previous, "/%s/%s", path, de->d_name); -+ else /* if (r >= 0) */ -+ r = asprintf(previous, "/%s/%s (%s%s%s)", path, de->d_name, ansi_highlight(), v, ansi_normal()); - if (r < 0) - return log_oom(); - --- -2.39.2 (Apple Git-143) - diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 338f0c7463c08..0d38016d9d739 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -55,7 +55,6 @@ , e2fsprogs , elfutils , linuxHeaders ? stdenv.cc.libc.linuxHeaders -, gnu-efi , iptables , withSelinux ? false , libselinux @@ -89,9 +88,11 @@ , withAnalyze ? true , withApparmor ? true , withAudit ? true +, withBootloader ? !stdenv.hostPlatform.isMusl # compiles systemd-boot, assumes EFI is available. , withCompression ? true # adds bzip2, lz4, xz and zstd , withCoredump ? true , withCryptsetup ? true +, withRepart ? true , withDocumentation ? true , withEfi ? stdenv.hostPlatform.isEfi , withFido2 ? true @@ -116,6 +117,7 @@ , withNss ? !stdenv.hostPlatform.isMusl , withOomd ? true , withPam ? true +, withPasswordQuality ? false , withPCRE2 ? true , withPolkit ? true , withPortabled ? !stdenv.hostPlatform.isMusl @@ -123,6 +125,7 @@ , withResolved ? true , withShellCompletions ? true , withSysusers ? false # conflicts with the NixOS user management +, withSysupdate ? true , withTimedated ? true , withTimesyncd ? true , withTpm2Tss ? true @@ -146,17 +149,21 @@ assert withCoredump -> withCompression; assert withHomed -> withCryptsetup; assert withHomed -> withPam; assert withUkify -> withEfi; +assert withRepart -> withCryptsetup; +assert withBootloader -> withEfi; +# passwdqc is not packaged in nixpkgs yet, if you want to fix this, please submit a PR. +assert !withPasswordQuality; let wantCurl = withRemote || withImportd; wantGcrypt = withResolved || withImportd; - version = "253.6"; + version = "254.3"; # Bump this variable on every (major) version change. See below (in the meson options list) for why. # command: # $ curl -s https://api.github.com/repos/systemd/systemd/releases/latest | \ # jq '.created_at|strptime("%Y-%m-%dT%H:%M:%SZ")|mktime' - releaseTimestamp = "1676488940"; + releaseTimestamp = "1690536449"; in stdenv.mkDerivation (finalAttrs: { inherit pname version; @@ -167,7 +174,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "systemd"; repo = "systemd-stable"; rev = "v${version}"; - hash = "sha256-LZs6QuBe23W643bTuz+MD2pzHiapsBJBHoFXi/QjzG4="; + hash = "sha256-ObnsAiKwhwEb4ti611eS/wGpg3Sss/pUy/gANPAbXbs="; }; # On major changes, or when otherwise required, you *must* reformat the patches, @@ -194,12 +201,11 @@ stdenv.mkDerivation (finalAttrs: { ./0016-inherit-systemd-environment-when-calling-generators.patch ./0017-core-don-t-taint-on-unmerged-usr.patch ./0018-tpm2_context_init-fix-driver-name-checking.patch - ./0019-bootctl-also-print-efi-files-not-owned-by-systemd-in.patch ] ++ lib.optional stdenv.hostPlatform.isMusl ( let oe-core = fetchzip { - url = "https://git.openembedded.org/openembedded-core/snapshot/openembedded-core-f34f6ab04b443608497b73668365819343d0c2fe.tar.gz"; - sha256 = "DFcLPvjQIxGEDADpP232ZRd7cOEKt6B48Ah29nIGTt4="; + url = "https://git.openembedded.org/openembedded-core/snapshot/openembedded-core-eb8a86fee9eeae787cc0a58ef2ed087fd48d93eb.tar.gz"; + sha256 = "tE2KpXLvOknIpEZFdOnNxvBmDvZrra3kvQp9tKxa51c="; }; musl-patches = oe-core + "/meta/recipes-core/systemd/systemd"; in @@ -207,7 +213,6 @@ stdenv.mkDerivation (finalAttrs: { (musl-patches + "/0001-Adjust-for-musl-headers.patch") (musl-patches + "/0005-pass-correct-parameters-to-getdents64.patch") (musl-patches + "/0006-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch") - (musl-patches + "/0007-Add-sys-stat.h-for-S_IFDIR.patch") (musl-patches + "/0009-missing_type.h-add-comparison_fn_t.patch") (musl-patches + "/0010-add-fallback-parse_printf_format-implementation.patch") (musl-patches + "/0011-src-basic-missing.h-check-for-missing-strndupa.patch") @@ -223,32 +228,21 @@ stdenv.mkDerivation (finalAttrs: { (musl-patches + "/0022-Handle-__cpu_mask-usage.patch") (musl-patches + "/0023-Handle-missing-gshadow.patch") (musl-patches + "/0024-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch") - (musl-patches + "/0026-src-boot-efi-efi-string.c-define-wchar_t-from-__WCHA.patch") + (musl-patches + "/0028-sd-event-Make-malloc_trim-conditional-on-glibc.patch") + (musl-patches + "/0029-shared-Do-not-use-malloc_info-on-musl.patch") ] ); postPatch = '' substituteInPlace src/basic/path-util.h --replace "@defaultPathNormal@" "${placeholder "out"}/bin/" - substituteInPlace src/boot/efi/meson.build \ - --replace \ - "run_command(cc.cmd_array(), '-print-prog-name=objcopy', check: true).stdout().strip()" \ - "'${stdenv.cc.bintools.targetPrefix}objcopy'" '' + lib.optionalString withLibBPF '' substituteInPlace meson.build \ --replace "find_program('clang'" "find_program('${stdenv.cc.targetPrefix}clang'" - # BPF does not work with stack protector - substituteInPlace src/core/bpf/meson.build \ - --replace "clang_flags = [" "clang_flags = [ '-fno-stack-protector'," '' + lib.optionalString withUkify '' substituteInPlace src/ukify/ukify.py \ --replace \ "'readelf'" \ "'${targetPackages.stdenv.cc.bintools.targetPrefix}readelf'" - # The objcopy dependency is removed in v254 - substituteInPlace src/ukify/ukify.py \ - --replace \ - "'objcopy'" \ - "'${targetPackages.stdenv.cc.bintools.targetPrefix}objcopy'" '' + ( let # The following patches references to dynamic libraries to ensure that @@ -325,6 +319,9 @@ stdenv.mkDerivation (finalAttrs: { # Support for PKCS#11 in systemd-cryptsetup, systemd-cryptenroll and systemd-homed { name = "libp11-kit.so.0"; pkg = opt (withHomed || withCryptsetup) p11-kit; } + + # Password quality support + { name = "libpasswdqc.so.1"; pkg = opt withPasswordQuality null; } ]; patchDlOpen = dl: @@ -395,7 +392,7 @@ stdenv.mkDerivation (finalAttrs: { docbook_xml_dtd_42 docbook_xml_dtd_45 bash - (buildPackages.python3Packages.python.withPackages (ps: with ps; [ lxml jinja2 ])) + (buildPackages.python3Packages.python.withPackages (ps: with ps; [ lxml jinja2 ] ++ lib.optional withEfi ps.pyelftools)) ] ++ lib.optionals withLibBPF [ bpftools @@ -422,7 +419,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals withCompression [ bzip2 lz4 xz zstd ] ++ lib.optional withCoredump elfutils ++ lib.optional withCryptsetup (lib.getDev cryptsetup.dev) - ++ lib.optional withEfi gnu-efi ++ lib.optional withKexectools kexec-tools ++ lib.optional withKmod kmod ++ lib.optional withLibidn2 libidn2 @@ -498,6 +494,8 @@ stdenv.mkDerivation (finalAttrs: { "-Dlibidn2=${lib.boolToString withLibidn2}" "-Dfirstboot=${lib.boolToString withFirstboot}" "-Dsysusers=${lib.boolToString withSysusers}" + "-Drepart=${lib.boolToString withRepart}" + "-Dsysupdate=${lib.boolToString withSysupdate}" "-Dquotacheck=false" "-Dldconfig=false" "-Dsmack=true" @@ -537,12 +535,9 @@ stdenv.mkDerivation (finalAttrs: { "-Dman=true" "-Defi=${lib.boolToString withEfi}" - "-Dgnu-efi=${lib.boolToString withEfi}" + "-Dbootloader=${lib.boolToString withBootloader}" "-Dukify=${lib.boolToString withUkify}" - ] ++ lib.optionals withEfi [ - "-Defi-libdir=${toString gnu-efi}/lib" - "-Defi-includedir=${toString gnu-efi}/include/efi" ] ++ lib.optionals (withShellCompletions == false) [ "-Dbashcompletiondir=no" "-Dzshcompletiondir=no" @@ -586,6 +581,7 @@ stdenv.mkDerivation (finalAttrs: { where = [ "man/systemd-analyze.xml" "man/systemd.service.xml" + "man/systemd-run.xml" "src/analyze/test-verify.c" "src/test/test-env-file.c" "src/test/test-fileio.c" @@ -595,7 +591,7 @@ stdenv.mkDerivation (finalAttrs: { { search = "/bin/cat"; replacement = "${coreutils}/bin/cat"; - where = [ "test/create-busybox-container" "test/test-execute/exec-noexecpaths-simple.service" "src/journal/cat.c" ]; + where = [ "test/test-execute/exec-noexecpaths-simple.service" "src/journal/cat.c" ]; } { search = "/usr/lib/systemd/systemd-fsck"; @@ -728,7 +724,7 @@ stdenv.mkDerivation (finalAttrs: { # https://github.com/NixOS/nixpkgs/issues/169693 # The hack is to move EFI file out of lib/ before doStrip # run and return it after doStrip run. - preFixup = lib.optionalString withEfi '' + preFixup = lib.optionalString withBootloader '' mv $out/lib/systemd/boot/efi $out/dont-strip-me ''; @@ -738,7 +734,7 @@ stdenv.mkDerivation (finalAttrs: { # This needs to be in LD_LIBRARY_PATH because rpath on a binary is not propagated to libraries using dlopen, in this case `libcryptsetup.so` wrapProgram $out/$f --prefix LD_LIBRARY_PATH : ${placeholder "out"}/lib/cryptsetup done - '' + lib.optionalString withEfi '' + '' + lib.optionalString withBootloader '' mv $out/dont-strip-me $out/lib/systemd/boot/efi '' + lib.optionalString withUkify '' # To cross compile a derivation that builds a UKI with ukify, we need to wrap diff --git a/pkgs/os-specific/linux/tailor-gui/default.nix b/pkgs/os-specific/linux/tailor-gui/default.nix new file mode 100644 index 0000000000000..86964ab4d36ab --- /dev/null +++ b/pkgs/os-specific/linux/tailor-gui/default.nix @@ -0,0 +1,60 @@ +{ stdenv +, lib +, rustPlatform +, cargo +, rustc +, pkg-config +, desktop-file-utils +, appstream-glib +, wrapGAppsHook4 +, meson +, ninja +, libadwaita +, gtk4 +, tuxedo-rs +}: +let + src = tuxedo-rs.src; + sourceRoot = "source/tailor_gui"; + pname = "tailor_gui"; + version = tuxedo-rs.version; +in +stdenv.mkDerivation { + + inherit src sourceRoot pname version; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src sourceRoot; + name = "${pname}-${version}"; + hash = "sha256-DUaSLv1V6skWXQ7aqD62uspq+I9KiWmjlwwxykVve5A="; + }; + + nativeBuildInputs = [ + rustPlatform.cargoSetupHook + pkg-config + desktop-file-utils + appstream-glib + wrapGAppsHook4 + ]; + + buildInputs = [ + cargo + rustc + meson + ninja + libadwaita + gtk4 + ]; + + meta = with lib; { + description = "Rust GUI for interacting with hardware from TUXEDO Computers"; + longDescription = '' + An alternative to the TUXEDO Control Center (https://www.tuxedocomputers.com/en/TUXEDO-Control-Center.tuxedo), + written in Rust. + ''; + homepage = "https://github.com/AaronErhardt/tuxedo-rs"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ mrcjkb ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/tuxedo-rs/default.nix b/pkgs/os-specific/linux/tuxedo-rs/default.nix new file mode 100644 index 0000000000000..c9fb057da68b6 --- /dev/null +++ b/pkgs/os-specific/linux/tuxedo-rs/default.nix @@ -0,0 +1,47 @@ +{ lib +, fetchFromGitHub +, rustPlatform +}: +let + + # NOTE: This src is shared with tailor-gui. + # When updating, the tailor-gui.cargoDeps hash needs to be updated. + src = fetchFromGitHub { + owner = "AaronErhardt"; + repo = "tuxedo-rs"; + rev = "a77a9f6c64e6dd1ede3511934392cbc16271ef6b"; + hash = "sha256-bk17vI1gLHayvCWfmZdCMqgmbJFOTDaaCaHcj9cLpMY="; + }; + +in +rustPlatform.buildRustPackage { + pname = "tuxedo-rs"; + version = "0.2.2"; + + inherit src; + + # Some of the tests are impure and rely on files in /etc/tailord + doCheck = false; + + cargoHash = "sha256-vuXqab9W8NSD5U9dk15xM4fM/vd/fGgGdsvReMncWHg="; + + postInstall = '' + install -Dm444 tailord/com.tux.Tailor.conf -t $out/share/dbus-1/system.d + ''; + + meta = with lib; { + description = "Rust utilities for interacting with hardware from TUXEDO Computers"; + longDescription = '' + An alternative to the TUXEDO Control Center daemon. + + Contains the following binaries: + - tailord: Daemon handling fan, keyboard and general HW support for Tuxedo laptops + - tailor: CLI + ''; + homepage = "https://github.com/AaronErhardt/tuxedo-rs"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ mrcjkb ]; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix index 07a9ceaa5173c..11b2ed28fb3f6 100644 --- a/pkgs/os-specific/linux/udisks/2-default.nix +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "udisks"; - version = "2.10.0"; + version = "2.10.1"; src = fetchFromGitHub { owner = "storaged-project"; repo = "udisks"; rev = "${pname}-${version}"; - sha256 = "sha256-M0L2MjVKv7VmtML/JZx0I8vNj+m6KDWGezvcwFqoTNI="; + sha256 = "sha256-L8jr1+SJWsCizkPXC8VKDy2eVa7/FpqdB8SkBYq6vwc="; }; outputs = [ "out" "man" "dev" ] ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) "devdoc"; diff --git a/pkgs/os-specific/linux/usbrelay/default.nix b/pkgs/os-specific/linux/usbrelay/default.nix index 385f4da1142db..670de2028c4fa 100644 --- a/pkgs/os-specific/linux/usbrelay/default.nix +++ b/pkgs/os-specific/linux/usbrelay/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchFromGitHub, hidapi, installShellFiles }: stdenv.mkDerivation (finalAttrs: { pname = "usbrelay"; - version = "1.2"; + version = "1.2.1"; src = fetchFromGitHub { owner = "darrylb123"; repo = "usbrelay"; rev = finalAttrs.version; - sha256 = "sha256-oJyHzbXOBKxLmPFZMS2jLF80frkiKjPJ89UwkenjIzs="; + sha256 = "sha256-9jEiMmBEpqY4+nKh3H8N/JrLohp/7oPK3rPmRjp2gvc="; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/xsensors/default.nix b/pkgs/os-specific/linux/xsensors/default.nix index 02ce560d8a94f..e3639fefffa4e 100644 --- a/pkgs/os-specific/linux/xsensors/default.nix +++ b/pkgs/os-specific/linux/xsensors/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { meta = with lib; { license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/os-specific/linux/zfs/stable.nix b/pkgs/os-specific/linux/zfs/stable.nix index 14cda12e6f323..1a77396300ebf 100644 --- a/pkgs/os-specific/linux/zfs/stable.nix +++ b/pkgs/os-specific/linux/zfs/stable.nix @@ -14,10 +14,13 @@ callPackage ./generic.nix args { # check the release notes for compatible kernels kernelCompatible = if stdenv'.isx86_64 || removeLinuxDRM - then kernel.kernelOlder "6.4" + then kernel.kernelOlder "6.6" else kernel.kernelOlder "6.2"; - latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_1; + latestCompatibleLinuxPackages = if stdenv'.isx86_64 || removeLinuxDRM + then linuxKernel.packages.linux_6_5 + else linuxKernel.packages.linux_6_1; extraPatches = [ + # applied in version 2.2.x (fetchpatch { name = "musl.patch"; url = "https://github.com/openzfs/zfs/commit/1f19826c9ac85835cbde61a7439d9d1fefe43a4a.patch"; @@ -26,7 +29,7 @@ callPackage ./generic.nix args { ]; # this package should point to the latest release. - version = "2.1.12"; + version = "2.1.13"; - sha256 = "eYUR5d4gpTrlFu6j1uL83DWL9uPGgAUDRdSEb73V5i4="; + sha256 = "tqUCn/Hf/eEmyWRQthWQdmTJK2sDspnHiiEfn9rz2Kc="; } diff --git a/pkgs/os-specific/windows/npiperelay/default.nix b/pkgs/os-specific/windows/npiperelay/default.nix index edc83a27e551d..d2347edcbaff6 100644 --- a/pkgs/os-specific/windows/npiperelay/default.nix +++ b/pkgs/os-specific/windows/npiperelay/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-cg4aZmpTysc8m1euxIO2XPv8OMnBk1DwhFcuIFHF/1o="; }; - vendorSha256 = null; + vendorHash = null; meta = { description = "Access Windows named pipes from WSL"; diff --git a/pkgs/servers/apache-airflow/python-package.nix b/pkgs/servers/apache-airflow/python-package.nix index 4631ae9ca4f2d..8ebb930188f9c 100644 --- a/pkgs/servers/apache-airflow/python-package.nix +++ b/pkgs/servers/apache-airflow/python-package.nix @@ -87,7 +87,7 @@ , enabledProviders ? [] }: let - version = "2.7.0"; + version = "2.7.1"; airflow-src = fetchFromGitHub rec { owner = "apache"; @@ -96,7 +96,7 @@ let # Download using the git protocol rather than using tarballs, because the # GitHub archive tarballs don't appear to include tests forceFetchGit = true; - hash = "sha256-zB4PWcPkm+lat4tNfVld051RHlC1dW2EbgyoxDao52o="; + hash = "sha256-TxlOdazdaEKt9U+t/zjRChUABLhVTqXvH8nUbYrRrQs="; }; # airflow bundles a web interface, which is built using webpack by an undocumented shell script in airflow's source tree. diff --git a/pkgs/servers/bazarr/default.nix b/pkgs/servers/bazarr/default.nix index 792d430a42ebd..5b7bea8034ea1 100644 --- a/pkgs/servers/bazarr/default.nix +++ b/pkgs/servers/bazarr/default.nix @@ -8,13 +8,13 @@ let in stdenv.mkDerivation rec { pname = "bazarr"; - version = "1.2.4"; + version = "1.3.0"; sourceRoot = "."; src = fetchurl { url = "https://github.com/morpheus65535/bazarr/releases/download/v${version}/bazarr.zip"; - sha256 = "sha256-TdBazeY/w9vSEbs/OgRtdoi/riAUai1zrmM/A8ecaWA="; + sha256 = "sha256-f9LKJZX+dZRUGq+g/PHvCzN8UpDiBpEVvqEO6CZPoAE="; }; nativeBuildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/servers/bloat/default.nix b/pkgs/servers/bloat/default.nix index 8db0a2ed962a9..5f1ba324472b1 100644 --- a/pkgs/servers/bloat/default.nix +++ b/pkgs/servers/bloat/default.nix @@ -6,12 +6,12 @@ buildGoModule { pname = "bloat"; - version = "unstable-2023-09-18"; + version = "unstable-2023-09-24"; src = fetchgit { url = "git://git.freesoftwareextremist.com/bloat"; - rev = "e50f12b6158ffae6b0b59f2902798ae86d263b5d"; - hash = "sha256-vejk2f/FC0gS8t16u37pVgp2qzaGRXfcEYzqyP+QbGY="; + rev = "8e3999fc3d9761f9ce71c35a7154a77c251caa66"; + hash = "sha256-+JHBTYZETAmxUxb2SBMIuZ5/StU7mHQceHbjDmta+Kw="; }; vendorHash = null; diff --git a/pkgs/servers/blockbook/default.nix b/pkgs/servers/blockbook/default.nix index 4d0c07b0bf1f1..147115b550ef1 100644 --- a/pkgs/servers/blockbook/default.nix +++ b/pkgs/servers/blockbook/default.nix @@ -24,10 +24,10 @@ buildGoModule rec { owner = "trezor"; repo = "blockbook"; rev = "v${version}"; - sha256 = "1jb195chy3kbspmv9vyg7llw6kgykkmvz3znd97mxf24f4q622jv"; + hash = "sha256-WwphMHFEuF5PavaPv+uc/k3DKT3P77Tr1WsOD1lJYck="; }; - vendorSha256 = "1w9c0qzah2f9rbjdxqajwrfkia25cwbn30gidviaid3b7ddpd7r8"; + vendorHash = "sha256-KJ92WztrtKjibvGBYRdnRag4XeZS4d7kyskJqD4GLPE="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 19012ea1e1f98..321e988af7f5e 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { "--with-lz4=${lz4.dev}" "--with-munge=${munge}" "--with-yaml=${libyaml.dev}" - "--with-ofed=${rdma-core}" + "--with-ofed=${lib.getDev rdma-core}" "--sysconfdir=/etc/slurm" "--with-pmix=${pmix}" "--with-bpf=${libbpf}" diff --git a/pkgs/servers/demoit/default.nix b/pkgs/servers/demoit/default.nix index e2dd5cc928be0..3a587230eef86 100644 --- a/pkgs/servers/demoit/default.nix +++ b/pkgs/servers/demoit/default.nix @@ -3,17 +3,19 @@ , fetchFromGitHub }: -buildGoModule { +buildGoModule rec { pname = "demoit"; - version = "unstable-2022-09-03"; + version = "1.0"; src = fetchFromGitHub { owner = "dgageot"; repo = "demoit"; - rev = "258780987922e46abde8e848247af0a9435e3099"; - sha256 = "sha256-yRfdnqk93GOTBa0zZrm4K3AkUqxGmlrwlKYcD6CtgRg="; + rev = "v${version}"; + hash = "sha256-3g0k2Oau0d9tXYDtxHpUKvAQ1FnGhjRP05YVTlmgLhM="; }; - vendorSha256 = null; + + vendorHash = null; + subPackages = [ "." ]; meta = with lib; { diff --git a/pkgs/servers/dendrite/default.nix b/pkgs/servers/dendrite/default.nix index a9e1b47eddbab..82ee6d59547a2 100644 --- a/pkgs/servers/dendrite/default.nix +++ b/pkgs/servers/dendrite/default.nix @@ -3,16 +3,16 @@ buildGoModule rec { pname = "matrix-dendrite"; - version = "0.13.2"; + version = "0.13.3"; src = fetchFromGitHub { owner = "matrix-org"; repo = "dendrite"; rev = "v${version}"; - hash = "sha256-I8k3E/7RXJFIaEX1Zw6oFDT6UkQvZBZuyTxUZZQYr+s="; + hash = "sha256-wM9ayB3L9pc3696Ze5hVZPKGwrB5fD+64Wf8DUIjf1k="; }; - vendorHash = "sha256-H2wtGjGTzqN8OXAI2ksCBgTJsmJYLQu5aFu9OP03/DA="; + vendorHash = "sha256-COljILLiAFoX8IShpAmLrxkw6yw7YQE4lpe8IR92j6g="; subPackages = [ # The server diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix index 8c340e444737d..c5e3a94455578 100644 --- a/pkgs/servers/dns/coredns/default.nix +++ b/pkgs/servers/dns/coredns/default.nix @@ -3,25 +3,52 @@ , buildGoModule , fetchFromGitHub , installShellFiles +, externalPlugins ? [] +, vendorHash ? "sha256-tp22jj6DNnYFQhtAFW2uLo10ty//dyNqIDH2egDgbOw=" }: -buildGoModule rec { +let + attrsToPlugins = attrs: + builtins.map ({name, repo, version}: "${name}:${repo}") attrs; + attrsToSources = attrs: + builtins.map ({name, repo, version}: "${repo}@${version}") attrs; +in buildGoModule rec { pname = "coredns"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "coredns"; repo = "coredns"; rev = "v${version}"; - sha256 = "sha256-Mn8hOsODTlnl6PJaevMcyIKkIx/1Lk2HGA7fSSizR20="; + sha256 = "sha256-XZoRN907PXNKV2iMn51H/lt8yPxhPupNfJ49Pymdm9Y="; }; - vendorHash = "sha256-9LFwrG6RxZaCLxrNabdnq++U5Aw+d2w90Zqt/wszNTY="; + inherit vendorHash; nativeBuildInputs = [ installShellFiles ]; outputs = [ "out" "man" ]; + # Override the go-modules fetcher derivation to fetch plugins + modBuildPhase = '' + for plugin in ${builtins.toString (attrsToPlugins externalPlugins)}; do echo $plugin >> plugin.cfg; done + for src in ${builtins.toString (attrsToSources externalPlugins)}; do go get $src; done + GOOS= GOARCH= go generate + go mod vendor + ''; + + modInstallPhase = '' + mv -t vendor go.mod go.sum plugin.cfg + cp -r --reflink=auto vendor "$out" + ''; + + preBuild = '' + chmod -R u+w vendor + mv -t . vendor/go.{mod,sum} vendor/plugin.cfg + + GOOS= GOARCH= go generate + ''; + postPatch = '' substituteInPlace test/file_cname_proxy_test.go \ --replace "TestZoneExternalCNAMELookupWithProxy" \ @@ -29,6 +56,11 @@ buildGoModule rec { substituteInPlace test/readme_test.go \ --replace "TestReadme" "SkipReadme" + + # this test fails if any external plugins were imported. + # it's a lint rather than a test of functionality, so it's safe to disable. + substituteInPlace test/presubmit_test.go \ + --replace "TestImportOrdering" "SkipImportOrdering" '' + lib.optionalString stdenv.isDarwin '' # loopback interface is lo0 on macos sed -E -i 's/\blo\b/lo0/' plugin/bind/setup_test.go diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index 7420aa339946c..aa995a9f4843e 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -29,6 +29,8 @@ stdenv.mkDerivation rec { buildInputs = [ libevent openssl ]; + enableParallelBuilding = true; + configureFlags = let edf = c: o: if c then ["--enable-${o}"] else ["--disable-${o}"]; in edf bind8Stats "bind8-stats" diff --git a/pkgs/servers/documize-community/default.nix b/pkgs/servers/documize-community/default.nix index a6631843ad5cb..572d9a8e2b901 100644 --- a/pkgs/servers/documize-community/default.nix +++ b/pkgs/servers/documize-community/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-Kv4BsFB08rkGRkePFIkjjuhK1TnLPS4m+PUlgKG5cTQ="; }; - vendorSha256 = null; + vendorHash = null; doCheck = false; diff --git a/pkgs/servers/domoticz/default.nix b/pkgs/servers/domoticz/default.nix index 869971d8fb89d..6e50b4754438d 100644 --- a/pkgs/servers/domoticz/default.nix +++ b/pkgs/servers/domoticz/default.nix @@ -51,7 +51,6 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DUSE_BUILTIN_MQTT=false" "-DUSE_BUILTIN_LUA=false" "-DUSE_BUILTIN_SQLITE=false" diff --git a/pkgs/servers/duckling-proxy/default.nix b/pkgs/servers/duckling-proxy/default.nix index 445e78234fbba..b314a6b59bd40 100644 --- a/pkgs/servers/duckling-proxy/default.nix +++ b/pkgs/servers/duckling-proxy/default.nix @@ -8,9 +8,10 @@ buildGoModule { owner = "LukeEmmet"; repo = "duckling-proxy"; rev = "e2bfd73a60d7afa43f13a9d420d514131fee8fd1"; - sha256 = "134hnfa4f5sb1z1j5684wmqzascsrlagx8z36i1470yggb00j4hr"; + hash = "sha256-GRIJwHrPg0NCNOOj/hTNmmn1ceUEmSLDD0sXR5SzkIw="; }; - vendorSha256 = "0wxk1a5gn9a7q2kgq11a783rl5cziipzhndgp71i365y3p1ssqyf"; + + vendorHash = "sha256-zmOtwx2+mBHDua9Z+G+MnxWaBzoqBPymwEcl+4oKs3M="; meta = with lib; { description = "Gemini proxy to access the Small Web"; diff --git a/pkgs/servers/etcd/3.3.nix b/pkgs/servers/etcd/3.3.nix deleted file mode 100644 index edea448ee84e1..0000000000000 --- a/pkgs/servers/etcd/3.3.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub, stdenv }: - -buildGoPackage rec { - pname = "etcd"; - version = "3.3.27"; - - goPackagePath = "github.com/coreos/etcd"; - - src = fetchFromGitHub { - owner = "etcd-io"; - repo = "etcd"; - rev = "v${version}"; - sha256 = "sha256-zO+gwzaTgeFHhlkY/3AvRTEA4Yltlp+NqdlDe4dLJYg="; - }; - - buildPhase = '' - cd go/src/${goPackagePath} - patchShebangs . - ./build - ./functional/build - ''; - - installPhase = '' - install -Dm755 bin/* bin/functional/cmd/* -t $out/bin - ''; - - meta = with lib; { - description = "Distributed reliable key-value store for the most critical data of a distributed system"; - license = licenses.asl20; - homepage = "https://etcd.io/"; - maintainers = with maintainers; [ offline ]; - broken = stdenv.isDarwin; # outdated golang.org/x/sys - knownVulnerabilities = [ "CVE-2023-32082" ]; - }; -} diff --git a/pkgs/servers/fastnetmon-advanced/default.nix b/pkgs/servers/fastnetmon-advanced/default.nix index e1422ed1379bd..76994cac91bbe 100644 --- a/pkgs/servers/fastnetmon-advanced/default.nix +++ b/pkgs/servers/fastnetmon-advanced/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fastnetmon-advanced"; - version = "2.0.342"; + version = "2.0.350"; src = fetchurl { url = "https://repo.fastnetmon.com/fastnetmon_ubuntu_jammy/pool/fastnetmon/f/fastnetmon/fastnetmon_${version}_amd64.deb"; - hash = "sha256-H4e7ftuL39xxDYs2zVhgVI8voDBR2TQLWlWSBg3At2s="; + hash = "sha256-rd0xdpENsdH8jOoUkQHW8/fXE4zEjQemFT4Q2tXjtT8="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/gobetween/default.nix b/pkgs/servers/gobetween/default.nix index 290d1db260874..db201e5ba48a9 100644 --- a/pkgs/servers/gobetween/default.nix +++ b/pkgs/servers/gobetween/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { make -e build${lib.optionalString enableStatic "-static"} ''; - vendorSha256 = null; #vendorSha256 = ""; + vendorHash = null; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/servers/gotify/default.nix b/pkgs/servers/gotify/default.nix index b940f35e6a577..57004b66b03a5 100644 --- a/pkgs/servers/gotify/default.nix +++ b/pkgs/servers/gotify/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "gotify-server"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "gotify"; repo = "server"; rev = "v${version}"; - hash = "sha256-fWcdnmpLZycg7hmPNnphGcuSMTI4bsq57XPoSyQSGDA="; + hash = "sha256-TZeQcrJCH9TW039r499fxY4xJ27nZm9GdrilsI33Iqc="; }; # With `allowGoReference = true;`, `buildGoModule` adds the `-trimpath` @@ -25,7 +25,7 @@ buildGoModule rec { # server[780]: stat /var/lib/private/ui/build/index.html: no such file or directory allowGoReference = true; - vendorHash = "sha256-im7Pauit0tWi0BcyKtxybOqsu7rrIHZwY5Olta3nJJI="; + vendorHash = "sha256-TR6YGNhSMQ/1kvX3p3QGlXovuoJdaRH0LOwIPZwQ/xY="; doCheck = false; diff --git a/pkgs/servers/gotosocial/default.nix b/pkgs/servers/gotosocial/default.nix index b75ef3cff13bf..f6c86c06312a3 100644 --- a/pkgs/servers/gotosocial/default.nix +++ b/pkgs/servers/gotosocial/default.nix @@ -9,11 +9,11 @@ let owner = "superseriousbusiness"; repo = "gotosocial"; - version = "0.11.0"; + version = "0.11.1"; web-assets = fetchurl { url = "https://github.com/${owner}/${repo}/releases/download/v${version}/${repo}_${version}_web-assets.tar.gz"; - hash = "sha256-NK5m+ERZQtl5Stq2+bWw0LS2SbmlhEJDZjTTxYciemE="; + hash = "sha256-xPdSwsXjyjodgEHlwl4X32Pb6TniwM9Q+u56xAoY7SQ="; }; in buildGoModule rec { @@ -23,7 +23,7 @@ buildGoModule rec { src = fetchFromGitHub { inherit owner repo; rev = "refs/tags/v${version}"; - hash = "sha256-qbq5pDvG2L1s6BG+sh7eagcFNH/DWyANMQaAl2WcQzE="; + hash = "sha256-qsgrHPQae1+LKF2y6e256ZfYR+a9ffe7oq1W3GJA1do="; }; vendorHash = null; diff --git a/pkgs/servers/hasura/cli.nix b/pkgs/servers/hasura/cli.nix index 48bcfe39eabd0..b8ec1a92fe306 100644 --- a/pkgs/servers/hasura/cli.nix +++ b/pkgs/servers/hasura/cli.nix @@ -9,7 +9,7 @@ buildGoModule rec { subPackages = [ "cmd/hasura" ]; - vendorSha256 = "0rjh4rs92jj56il3hg8msjz0w0iv25lydnh9v1kxmvdzy1x75b2b"; + vendorHash = "sha256-S6xyevC/7dpn2Ana5mkROwIOvtQVPThoNEVKkXQmUGY="; doCheck = false; diff --git a/pkgs/servers/hiraeth/default.nix b/pkgs/servers/hiraeth/default.nix index c7b3af8ceda8e..c31b8c4641529 100644 --- a/pkgs/servers/hiraeth/default.nix +++ b/pkgs/servers/hiraeth/default.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "hiraeth"; - version = "1.0.1"; + version = "1.1.1"; src = fetchFromGitHub { owner = "lukaswrz"; repo = "hiraeth"; rev = "v${version}"; - hash = "sha256-IjHQAJH6Kv65iDkVtJaVeAiMXCEyTTpUTTbW7I2Gxrc="; + hash = "sha256-GPDGwrYVy9utp5u4iyf0PqIAlI/izcwAsj4yFStYmTE="; }; - vendorHash = "sha256-tyFAd5S1RUn1AA5DbUGsAuvwtLgOgTE6LUzW3clQE9I="; + vendorHash = "sha256-bp9xDB7tplHEBR1Z+Ouks2ZwcktAhaZ/zSSPcu7LWr8="; meta = { description = "Share files with an expiration date"; diff --git a/pkgs/servers/hockeypuck/server.nix b/pkgs/servers/hockeypuck/server.nix index cf48fd5716c94..4a59ebe77463e 100644 --- a/pkgs/servers/hockeypuck/server.nix +++ b/pkgs/servers/hockeypuck/server.nix @@ -7,7 +7,7 @@ buildGoModule { inherit (sources) pname version src; modRoot = "src/hockeypuck/"; - vendorSha256 = null; + vendorHash = null; doCheck = false; # Uses networking for tests passthru.tests = nixosTests.hockeypuck; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 88678c2cc96e1..2082b96424634 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2023.9.2"; + version = "2023.10.0"; components = { "3_day_blinds" = ps: with ps; [ ]; @@ -79,7 +79,7 @@ pyserial pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "airtouch4" = ps: with ps; [ @@ -200,7 +200,7 @@ aqualogic ]; "aquostv" = ps: with ps; [ - ]; # missing inputs: sharp-aquos-rc + ]; # missing inputs: sharp_aquos_rc "aranet" = ps: with ps; [ aioesphomeapi aiohttp-cors @@ -224,7 +224,7 @@ pyserial pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "arcam_fmj" = ps: with ps; [ @@ -251,7 +251,7 @@ hassil home-assistant-intents mutagen - webrtcvad + webrtc-noise-gain ]; "asterisk_cdr" = ps: with ps; [ asterisk-mbox @@ -395,7 +395,7 @@ pyserial pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "blueprint" = ps: with ps; [ @@ -439,7 +439,7 @@ pyserial pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "bluetooth_le_tracker" = ps: with ps; [ @@ -464,7 +464,7 @@ pyserial pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "bluetooth_tracker" = ps: with ps; [ @@ -540,7 +540,7 @@ pyserial pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "bticino" = ps: with ps; [ @@ -581,7 +581,7 @@ pychromecast pyturbojpeg sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "cert_expiry" = ps: with ps; [ @@ -620,7 +620,7 @@ home-assistant-intents mutagen pyturbojpeg - webrtcvad + webrtc-noise-gain ]; "cloudflare" = ps: with ps; [ pycfdns @@ -754,7 +754,7 @@ scapy securetar sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "delijn" = ps: with ps; [ @@ -895,7 +895,7 @@ pyserial pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "dovado" = ps: with ps; [ @@ -956,6 +956,8 @@ "ecobee" = ps: with ps; [ python-ecobee-api ]; + "ecoforest" = ps: with ps; [ + ]; # missing inputs: pyecoforest "econet" = ps: with ps; [ pyeconet ]; @@ -1052,6 +1054,8 @@ "enigma2" = ps: with ps; [ openwebifpy ]; + "enmax" = ps: with ps; [ + ]; "enocean" = ps: with ps; [ enocean ]; @@ -1098,7 +1102,7 @@ pyserial pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; # missing inputs: python-eq3bt "escea" = ps: with ps; [ @@ -1126,7 +1130,7 @@ pyserial pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "etherscan" = ps: with ps; [ @@ -1157,7 +1161,7 @@ pyserial pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "event" = ps: with ps; [ @@ -1269,7 +1273,7 @@ pyserial pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "fleetgo" = ps: with ps; [ @@ -1410,9 +1414,9 @@ pyserial pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf - ]; # missing inputs: gardena_bluetooth + ]; # missing inputs: gardena-bluetooth "gaviota" = ps: with ps; [ ]; "gc100" = ps: with ps; [ @@ -1563,7 +1567,7 @@ pyserial pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "gpsd" = ps: with ps; [ @@ -1694,6 +1698,7 @@ psutil-home-assistant pyserial pyserial-asyncio + pyserial-asyncio-fast pyudev sqlalchemy universal-silabs-flasher @@ -1713,6 +1718,7 @@ psutil-home-assistant pyserial pyserial-asyncio + pyserial-asyncio-fast pyudev sqlalchemy universal-silabs-flasher @@ -1732,6 +1738,7 @@ psutil-home-assistant pyserial pyserial-asyncio + pyserial-asyncio-fast pyudev sqlalchemy universal-silabs-flasher @@ -1751,6 +1758,7 @@ psutil-home-assistant pyserial pyserial-asyncio + pyserial-asyncio-fast pyudev sqlalchemy universal-silabs-flasher @@ -1799,7 +1807,7 @@ python-otbr-api pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "homematic" = ps: with ps; [ @@ -1889,12 +1897,37 @@ pyserial pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "icloud" = ps: with ps; [ pyicloud ]; + "idasen_desk" = ps: with ps; [ + aioesphomeapi + aiohttp-cors + aioruuvigateway + aioshelly + async-interrupt + bleak + bleak-retry-connector + bluetooth-adapters + bluetooth-auto-recovery + bluetooth-data-tools + dbus-fast + esphome-dashboard-api + fnv-hash-fast + hassil + home-assistant-intents + ifaddr + mutagen + psutil-home-assistant + pyserial + pyudev + sqlalchemy + webrtc-noise-gain + zeroconf + ]; # missing inputs: idasen-ha "idteck_prox" = ps: with ps; [ ]; # missing inputs: rfk101py "ifttt" = ps: with ps; [ @@ -1958,7 +1991,7 @@ pyserial pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "input_boolean" = ps: with ps; [ @@ -2098,7 +2131,7 @@ pyserial pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "keyboard" = ps: with ps; [ @@ -2130,7 +2163,7 @@ pyserial pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "kira" = ps: with ps; [ @@ -2240,7 +2273,7 @@ pyserial pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "led_ble" = ps: with ps; [ @@ -2266,7 +2299,7 @@ pyserial pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "legrand" = ps: with ps; [ @@ -2372,7 +2405,7 @@ home-assistant-intents mutagen pyturbojpeg - webrtcvad + webrtc-noise-gain ]; # missing inputs: loqedAPI "lovelace" = ps: with ps; [ ]; @@ -2435,7 +2468,8 @@ mastodon-py ]; "matrix" = ps: with ps; [ - matrix-client + matrix-nio + pillow ]; "matter" = ps: with ps; [ aiohttp-cors @@ -2453,6 +2487,31 @@ "meater" = ps: with ps; [ meater-python ]; + "medcom_ble" = ps: with ps; [ + aioesphomeapi + aiohttp-cors + aioruuvigateway + aioshelly + async-interrupt + bleak + bleak-retry-connector + bluetooth-adapters + bluetooth-auto-recovery + bluetooth-data-tools + dbus-fast + esphome-dashboard-api + fnv-hash-fast + hassil + home-assistant-intents + ifaddr + mutagen + psutil-home-assistant + pyserial + pyudev + sqlalchemy + webrtc-noise-gain + zeroconf + ]; # missing inputs: medcom-ble "media_extractor" = ps: with ps; [ aiohttp-cors yt-dlp @@ -2493,7 +2552,7 @@ pyserial pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; # missing inputs: melnor-bluetooth "meraki" = ps: with ps; [ @@ -2548,8 +2607,6 @@ "min_max" = ps: with ps; [ ]; "minecraft_server" = ps: with ps; [ - aiodns - getmac mcstatus ]; "minio" = ps: with ps; [ @@ -2580,7 +2637,7 @@ pyserial pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "mobile_app" = ps: with ps; [ @@ -2595,7 +2652,7 @@ pynacl pyturbojpeg sqlalchemy - webrtcvad + webrtc-noise-gain ]; "mochad" = ps: with ps; [ ]; # missing inputs: pymochad @@ -2647,7 +2704,7 @@ pyserial pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "motion_blinds" = ps: with ps; [ @@ -2712,8 +2769,7 @@ sqlalchemy ]; "myq" = ps: with ps; [ - pymyq - ]; + ]; # missing inputs: python-myq "mysensors" = ps: with ps; [ aiohttp-cors janus @@ -2771,7 +2827,7 @@ pyatmo pyturbojpeg sqlalchemy - webrtcvad + webrtc-noise-gain ]; "netdata" = ps: with ps; [ netdata @@ -3014,7 +3070,7 @@ pyserial pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "oru" = ps: with ps; [ @@ -3037,6 +3093,7 @@ pyroute2 pyserial pyserial-asyncio + pyserial-asyncio-fast python-otbr-api pyudev sqlalchemy @@ -3068,7 +3125,7 @@ paho-mqtt pynacl pyturbojpeg - webrtcvad + webrtc-noise-gain ]; "p1_monitor" = ps: with ps; [ p1monitor @@ -3153,7 +3210,7 @@ mutagen pyplaato pyturbojpeg - webrtcvad + webrtc-noise-gain ]; "plant" = ps: with ps; [ fnv-hash-fast @@ -3184,6 +3241,31 @@ "powerwall" = ps: with ps; [ tesla-powerwall ]; + "private_ble_device" = ps: with ps; [ + aioesphomeapi + aiohttp-cors + aioruuvigateway + aioshelly + async-interrupt + bleak + bleak-retry-connector + bluetooth-adapters + bluetooth-auto-recovery + bluetooth-data-tools + dbus-fast + esphome-dashboard-api + fnv-hash-fast + hassil + home-assistant-intents + ifaddr + mutagen + psutil-home-assistant + pyserial + pyudev + sqlalchemy + webrtc-noise-gain + zeroconf + ]; "profiler" = ps: with ps; [ guppy3 objgraph @@ -3273,7 +3355,7 @@ pyudev qingping-ble sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "qld_bushfire" = ps: with ps; [ @@ -3308,7 +3390,7 @@ mutagen pyturbojpeg rachiopy - webrtcvad + webrtc-noise-gain ]; "radarr" = ps: with ps; [ aiopyarr @@ -3357,7 +3439,7 @@ pyudev rapt-ble sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "raspberry_pi" = ps: with ps; [ @@ -3481,7 +3563,6 @@ ]; "ruckus_unleashed" = ps: with ps; [ aioruckus - xmltodict ]; "russound_rio" = ps: with ps; [ ]; # missing inputs: russound-rio @@ -3525,7 +3606,7 @@ pyudev ruuvitag-ble sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "rympro" = ps: with ps; [ @@ -3546,7 +3627,7 @@ psutil-home-assistant pyturbojpeg sqlalchemy - webrtcvad + webrtc-noise-gain ]; "saj" = ps: with ps; [ pysaj @@ -3636,7 +3717,7 @@ pyudev sensirion-ble sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "sensor" = ps: with ps; [ @@ -3669,7 +3750,7 @@ pyudev sensorpro-ble sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "sensorpush" = ps: with ps; [ @@ -3695,7 +3776,7 @@ pyudev sensorpush-ble sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "sentry" = ps: with ps; [ @@ -3833,7 +3914,7 @@ pysmartapp pysmartthings pyturbojpeg - webrtcvad + webrtc-noise-gain ]; "smarttub" = ps: with ps; [ python-smarttub @@ -3880,7 +3961,7 @@ pysnooz pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; "solaredge" = ps: with ps; [ @@ -4071,9 +4152,11 @@ pyswitchbot pyudev sqlalchemy - webrtcvad + webrtc-noise-gain zeroconf ]; + "switchbot_cloud" = ps: with ps; [ + ]; # missing inputs: switchbot-api "switcher_kis" = ps: with ps; [ aioswitcher ]; @@ -4202,7 +4285,7 @@ pyudev sqlalchemy thermobeacon-ble - webrtcvad + webrtc-noise-gain zeroconf ]; "thermoplus" = ps: with ps; [ @@ -4230,7 +4313,7 @@ pyudev sqlalchemy thermopro-ble - webrtcvad + webrtc-noise-gain zeroconf ]; "thermoworks_smoke" = ps: with ps; [ @@ -4290,7 +4373,7 @@ pyudev sqlalchemy tilt-ble - webrtcvad + webrtc-noise-gain zeroconf ]; "time" = ps: with ps; [ @@ -4323,7 +4406,7 @@ mutagen pyturbojpeg toonapi - webrtcvad + webrtc-noise-gain ]; "torque" = ps: with ps; [ aiohttp-cors @@ -4410,6 +4493,10 @@ ttls ]; "twitch" = ps: with ps; [ + aiohttp-cors + fnv-hash-fast + psutil-home-assistant + sqlalchemy twitchapi ]; "twitter" = ps: with ps; [ @@ -4427,6 +4514,8 @@ "ukraine_alarm" = ps: with ps; [ uasiren ]; + "ultraloq" = ps: with ps; [ + ]; "unifi" = ps: with ps; [ aiounifi ]; @@ -4557,7 +4646,7 @@ hassil home-assistant-intents mutagen - webrtcvad + webrtc-noise-gain ]; # missing inputs: voip-utils "volkszaehler" = ps: with ps; [ volkszaehler @@ -4602,6 +4691,11 @@ ]; "weather" = ps: with ps; [ ]; + "weatherflow" = ps: with ps; [ + pyweatherflowudp + ]; + "weatherkit" = ps: with ps; [ + ]; # missing inputs: apple_weatherkit "webhook" = ps: with ps; [ aiohttp-cors ]; @@ -4636,8 +4730,14 @@ "withings" = ps: with ps; [ aiohttp-cors fnv-hash-fast + hass-nabucasa + hassil + home-assistant-intents + mutagen psutil-home-assistant + pyturbojpeg sqlalchemy + webrtc-noise-gain withings-api ]; "wiz" = ps: with ps; [ @@ -4710,7 +4810,7 @@ pyserial pyudev sqlalchemy - webrtcvad + webrtc-noise-gain xiaomi-ble zeroconf ]; @@ -4754,7 +4854,7 @@ pyserial pyudev sqlalchemy - webrtcvad + webrtc-noise-gain yalexs-ble zeroconf ]; @@ -4844,6 +4944,7 @@ psutil-home-assistant pyserial pyserial-asyncio + pyserial-asyncio-fast pyudev sqlalchemy universal-silabs-flasher @@ -4894,6 +4995,7 @@ "adguard" "advantage_air" "aemet" + "aftership" "agent_dvr" "air_quality" "airly" @@ -5071,6 +5173,7 @@ "filter" "fireservicerota" "firmata" + "fitbit" "fivem" "fjaraskupan" "flic" @@ -5168,6 +5271,7 @@ "humidifier" "hunterdouglas_powerview" "hvv_departures" + "hydrawise" "hyperion" "ialarm" "iaqualink" @@ -5252,10 +5356,12 @@ "mailgun" "manual" "manual_mqtt" + "matrix" "matter" "maxcube" "mazda" "meater" + "media_extractor" "media_player" "media_source" "melcloud" @@ -5292,7 +5398,6 @@ "mullvad" "mutesync" "my" - "myq" "mysensors" "mystrom" "mythicbeastsdns" @@ -5372,6 +5477,7 @@ "point" "poolsense" "powerwall" + "private_ble_device" "profiler" "prometheus" "prosegur" @@ -5603,10 +5709,12 @@ "wake_on_lan" "wake_word" "wallbox" + "waqi" "water_heater" "watttime" "waze_travel_time" "weather" + "weatherflow" "webhook" "webostv" "websocket_api" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index f6bb043f19844..eb5367cda93d1 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -134,16 +134,6 @@ let }; }); - plexapi = super.plexapi.overridePythonAttrs (oldAttrs: rec { - version = "4.13.2"; - src = fetchFromGitHub { - owner = "pkkid"; - repo = "python-plexapi"; - rev = "refs/tags/${version}"; - hash = "sha256-5YwINPgQ4efZBvu5McsLYicW/7keKSi011lthJUR9zw="; - }; - }); - # Pinned due to API changes in 0.1.0 poolsense = super.poolsense.overridePythonAttrs (oldAttrs: rec { version = "0.0.8"; @@ -282,16 +272,6 @@ let }; }); - zeroconf = super.zeroconf.overridePythonAttrs (oldAttrs: rec { - version = "0.98.0"; - src = fetchFromGitHub { - owner = "python-zeroconf"; - repo = "python-zeroconf"; - rev = "refs/tags/${version}"; - hash = "sha256-oajSXGQTsJsajRAnS/MkkbSyxTeVvdjvw1eiJaPzZMY="; - }; - }); - # internal python packages only consumed by home-assistant itself home-assistant-frontend = self.callPackage ./frontend.nix { }; home-assistant-intents = self.callPackage ./intents.nix { }; @@ -316,7 +296,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.9.2"; + hassVersion = "2023.10.0"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -332,7 +312,7 @@ in python.pkgs.buildPythonApplication rec { # Primary source is the pypi sdist, because it contains translations src = fetchPypi { inherit pname version; - hash = "sha256-pVW9NQYEf2pmGCp342lCzEiWfAyFCiWeRMVbhPd8wxQ="; + hash = "sha256-UmgIQJRQRDMzjUO9lJVpKsIvrFHBzoXc5Kig69ZHttU="; }; # Secondary source is git for tests @@ -340,7 +320,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-4sZBrGd5gz4W7c7Ok5Bj/47MaXAqAFC4qufcidbU5zA="; + hash = "sha256-M8TuH9oF4+6PuHDCHiGWxSnrQcOw/OsJVSfX/8XfyIM="; }; nativeBuildInputs = with python.pkgs; [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 118f179a9c532..39f41f6fca6b1 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20230911.0"; + version = "20231002.0"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-AcMZYjSbsBrfC0Oh5P+eruNILWdVmk46+p+8xLpqfuo="; + hash = "sha256-19HFMuR7INHM805HwWyWS2qWXPOYuFjnpf0UP93tObg="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/intents.nix b/pkgs/servers/home-assistant/intents.nix index 0d4caaea8b39d..5f815628a50fd 100644 --- a/pkgs/servers/home-assistant/intents.nix +++ b/pkgs/servers/home-assistant/intents.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "home-assistant-intents"; - version = "2023.8.2"; + version = "2023.10.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "home-assistant"; repo = "intents-package"; rev = "refs/tags/${version}"; - hash = "sha256-pNLH3GGfY8upKi7uYGZ466cIQkpdA16tR1tjwuiQ3JI="; + hash = "sha256-4zaMDYHrUape+s9Z1nfGpud74pbkAeKBpJtmIyLdCjk="; fetchSubmodules = true; }; diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index c87e590349370..2ede793de96f2 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2023.9.2"; + version = "2023.10.0"; format = "pyproject"; disabled = python.version != home-assistant.python.version; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-cKBf7S6ZvLlRp0L23mDu1CvG7d1d34LaIev60JPD0TE="; + hash = "sha256-/RVv2gfODAiG5mPteeHOleqkQwmamCfliCGrf1eSIr4="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index f2c9044678524..e4561cdcc3ed5 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -5,6 +5,7 @@ let # some components' tests have additional dependencies extraCheckInputs = with home-assistant.python.pkgs; { + airzone_cloud = [ aioairzone ]; alexa = [ av ]; bluetooth = [ pyswitchbot ]; bthome = [ xiaomi-ble ]; @@ -19,6 +20,7 @@ let homeassistant_sky_connect = [ bellows zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp zwave-js-server-python ]; homeassistant_yellow = [ bellows zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp ]; lovelace = [ pychromecast ]; + matrix = [ pydantic ]; mopeka = [ pyswitchbot ]; nest = [ av ]; onboarding = [ pymetno radios rpi-bad-power ]; diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index 4e35e0a76a1c2..279b1750b9e9f 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -1,5 +1,5 @@ { lib -, buildGoModule +, buildGo121Module , fetchFromGitHub , fetchNpmDeps , cacert @@ -14,22 +14,22 @@ , stdenv }: -buildGoModule rec { +buildGo121Module rec { pname = "evcc"; - version = "0.118.11"; + version = "0.120.3"; src = fetchFromGitHub { owner = "evcc-io"; repo = pname; rev = version; - hash = "sha256-gwFArZJX3DBUNaSpWD5n76VImWeDImR8b1s2czBrBaA="; + hash = "sha256-FYjDuGIsdGhPXOdYMQuoMp6L4MH70fpOymqw4+bu5hc="; }; - vendorHash = "sha256-0NTOit1nhX/zxQjHwU7ZOY1GsoIu959/KICCEWyfIQ4="; + vendorHash = "sha256-LNMNqlb/aj+ZHuwMvtK//oWyi34mm47ShAAD427szS4="; npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-/zpyU7x3cdmKrS7YiMe2BVJm0AC0P+yspiG9C3dMVAk="; + hash = "sha256-quznAvgAFJJnKabsFZxAu7yDkAuvujg6of6En8JaFs4="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/http/bozohttpd/default.nix b/pkgs/servers/http/bozohttpd/default.nix index 2087c2f591d68..5fd9f350b1176 100644 --- a/pkgs/servers/http/bozohttpd/default.nix +++ b/pkgs/servers/http/bozohttpd/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { # http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/www/bozohttpd/distinfo src = fetchurl { url = "http://www.eterna.com.au/${pname}/${pname}-${version}.tar.bz2"; - sha512 = "275b8fab3cf2e6c59721682cae952db95da5bd3b1f20680240c6cf1029463693f6feca047fbef5e3a3e7528b40b7b2e87b2a56fd800b612e679a16f24890e5b6"; + hash = "sha512-J1uPqzzy5sWXIWgsrpUtuV2lvTsfIGgCQMbPEClGNpP2/soEf77146PnUotAt7LoeypW/YALYS5nmhbySJDltg=="; }; buildInputs = [ openssl libxcrypt ] ++ optional (luaSupport) lua; diff --git a/pkgs/servers/http/cgiserver/default.nix b/pkgs/servers/http/cgiserver/default.nix index a9662a2916ebb..59092d51ad370 100644 --- a/pkgs/servers/http/cgiserver/default.nix +++ b/pkgs/servers/http/cgiserver/default.nix @@ -7,10 +7,10 @@ buildGoModule rec { src = fetchzip { url = "https://src.anomalous.eu/cgiserver/snapshot/cgiserver-${version}.tar.zst"; nativeBuildInputs = [ zstd ]; - sha256 = "14bp92sw0w6n5dzs4f7g4fcklh25nc9k0xjx4ia0gi7kn5jwx2mq"; + hash = "sha256-uIrOZbHzxAdUJF12MBOzRUA6mSPvOKJ/K9ZwwLVId5E="; }; - vendorSha256 = "00jslxzf6p8zs1wxdx3qdb919i80xv4w9ihljd40nnydasshqa4v"; + vendorHash = "sha256-mygMtVbNWwtIkxTGxMnuAMUU0mp49NZ50B9d436nWgI="; meta = with lib; { homepage = "https://src.anomalous.eu/cgiserver/about/"; diff --git a/pkgs/servers/http/dufs/default.nix b/pkgs/servers/http/dufs/default.nix index 77425c08b5bac..89058fd2171c5 100644 --- a/pkgs/servers/http/dufs/default.nix +++ b/pkgs/servers/http/dufs/default.nix @@ -1,6 +1,7 @@ { lib , rustPlatform , fetchFromGitHub +, installShellFiles , stdenv , darwin }: @@ -18,6 +19,8 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-HZiWmqIh21b12DP+hnx1pWBWgSa5j71kp6GCRKGMHv0="; + nativeBuildInputs = [ installShellFiles ]; + buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; @@ -30,6 +33,13 @@ rustPlatform.buildRustPackage rec { "--skip=validate_printed_urls" ]; + postInstall = '' + installShellCompletion --cmd dufs \ + --bash <($out/bin/dufs --completions bash) \ + --fish <($out/bin/dufs --completions fish) \ + --zsh <($out/bin/dufs --completions zsh) + ''; + meta = with lib; { description = "A file server that supports static serving, uploading, searching, accessing control, webdav"; homepage = "https://github.com/sigoden/dufs"; diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix index 0aa226e46658d..efcce583ce927 100644 --- a/pkgs/servers/http/jetty/default.nix +++ b/pkgs/servers/http/jetty/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "jetty"; - version = "11.0.15"; + version = "11.0.16"; src = fetchurl { url = "mirror://maven/org/eclipse/jetty/jetty-home/${version}/jetty-home-${version}.tar.gz"; - sha256 = "sha256-bDg3CYPAGryqRv/gcPdeZKucXx6YTkkNd0Cu1+zIjto="; + hash = "sha256-iL1s4o/1Hds0N/fzXgwOMriPtZNG7ei2t4frF1ImW+E="; }; dontBuild = true; diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 4981198779401..13c8bd7e7c75e 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -508,8 +508,8 @@ let self = { name = "njs"; src = fetchhg { url = "https://hg.nginx.org/njs"; - rev = "0.7.10"; - sha256 = "sha256-/yKzY+BUFxLk8bWo+mqKfRVRsC2moe+WvhaRYIGdr6Y="; + rev = "0.8.1"; + sha256 = "sha256-bFHrcA1ROMwYf+s0EWOXzkru6wvfRLvjvN8BV/r2tMc="; name = "nginx-njs"; }; diff --git a/pkgs/servers/http/router/default.nix b/pkgs/servers/http/router/default.nix index 31fc8332c96ea..b7b33c1d176c1 100644 --- a/pkgs/servers/http/router/default.nix +++ b/pkgs/servers/http/router/default.nix @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A configurable, high-performance routing runtime for Apollo Federation"; homepage = "https://www.apollographql.com/docs/router/"; - license = licenses.elastic; + license = licenses.elastic20; maintainers = [ maintainers.bbigras ]; }; } diff --git a/pkgs/servers/http/spawn-fcgi/default.nix b/pkgs/servers/http/spawn-fcgi/default.nix index 77272694a89d8..c57cc816524d8 100644 --- a/pkgs/servers/http/spawn-fcgi/default.nix +++ b/pkgs/servers/http/spawn-fcgi/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { homepage = "https://redmine.lighttpd.net/projects/spawn-fcgi"; description = "Provides an interface to external programs that support the FastCGI interface"; license = licenses.bsd3; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; platforms = with platforms; unix; }; } diff --git a/pkgs/servers/http/tomcat/tomcat-native.nix b/pkgs/servers/http/tomcat/tomcat-native.nix index cf912d87a1d63..5f9ea8a1665d5 100644 --- a/pkgs/servers/http/tomcat/tomcat-native.nix +++ b/pkgs/servers/http/tomcat/tomcat-native.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tomcat-native"; - version = "1.2.31"; + version = "2.0.5"; src = fetchurl { url = "mirror://apache/tomcat/tomcat-connectors/native/${version}/source/${pname}-${version}-src.tar.gz"; - sha512 = "2aaa93f0acf3eb780d39faeda3ece3cf053d3b6e2918462f7183070e8ab32232e035e9062f7c07ceb621006d727d3596d9b4b948f4432b4f625327b72fdb0e49"; + hash = "sha256-lY0fEhZRwQxhVW133J0NQfO1OYiiGVRC3krG9MuHg4g="; }; sourceRoot = "${pname}-${version}-src/native"; diff --git a/pkgs/servers/icingaweb2/ipl.nix b/pkgs/servers/icingaweb2/ipl.nix index ee0ebe120f7a1..b9623f47c91f4 100644 --- a/pkgs/servers/icingaweb2/ipl.nix +++ b/pkgs/servers/icingaweb2/ipl.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "icingaweb2-ipl"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "Icinga"; repo = "icinga-php-library"; rev = "v${version}"; - hash = "sha256-Fk886oIQz9sbrPCA6AWN1OMh9uFmQPCTFWcbAUWZyXs="; + hash = "sha256-U3SzjjYoalejPs5hqZP2QyvlKdgdpWk9o0DkFGtWC2w="; }; installPhase = '' diff --git a/pkgs/servers/invidious/versions.json b/pkgs/servers/invidious/versions.json index 61ee89b6e7421..61dc6fe3dd1fb 100644 --- a/pkgs/servers/invidious/versions.json +++ b/pkgs/servers/invidious/versions.json @@ -4,9 +4,9 @@ "sha256": "sha256-EU6T9yQCdOLx98Io8o01rEsgxDFF/Xoy42LgPopD2/A=" }, "invidious": { - "rev": "1377f2ce7d0a8fed716e8e285902bfbfef1a17e0", - "sha256": "sha256-ro5XneQqKGOfR7UZrowiht5V45s7EgkpbJiyBoLcnBo=", - "version": "unstable-2023-08-25" + "rev": "bb14f794969f62582917a39c2dd57bf92fa146a7", + "sha256": "sha256-UX66SBscxvjl0rUHmJko12HXo5+ckKvoOfNtCIVrjXY=", + "version": "unstable-2023-09-18" }, "lsquic": { "sha256": "sha256-hG8cUvhbCNeMOsKkaJlgGpzUrIx47E/WhmPIdI5F3qM=", diff --git a/pkgs/servers/irc/irccat/default.nix b/pkgs/servers/irc/irccat/default.nix index fdcb39af0b826..fb4b1c6c6bad6 100644 --- a/pkgs/servers/irc/irccat/default.nix +++ b/pkgs/servers/irc/irccat/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "irccloud"; repo = "irccat"; rev = "v${version}"; - sha256 = "sha256-fr5x1usviJPbc4t5SpIVgV9Q6071XG8eYtyeyraddts="; + hash = "sha256-fr5x1usviJPbc4t5SpIVgV9Q6071XG8eYtyeyraddts="; }; - vendorSha256 = "030hnkwh45yqppm96yy15j82skf7wmax5xkm7j5khr1l9lrz4591"; + vendorHash = "sha256-IRXyM000ZDiLPHX20lXlx00tkCzBe5PqvdgXAvm0EAw="; meta = with lib; { homepage = "https://github.com/irccloud/irccat"; diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 00014e4438ed4..439e816951014 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.21.798"; + version = "0.21.969"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha512-0GyfhVYs5YQXEYOxnCuOEhbwUAUYPvvXBIf4ylKkzZ7QKuiSYTDlPA+ArkaTQ4IRe7yesTsUMiSolWBOG8dtmw=="; + hash = "sha512-RpkXT2QD3O6DorDq4nD2od9QJJMRQm7ATuiNokl+IqxuVKLRmuiiOTPYVA7jWpdE/b44eOoVNqIJOmhCBMAllQ=="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; diff --git a/pkgs/servers/jackett/deps.nix b/pkgs/servers/jackett/deps.nix index bf38cb92d1102..e72b87ff4bac4 100644 --- a/pkgs/servers/jackett/deps.nix +++ b/pkgs/servers/jackett/deps.nix @@ -266,6 +266,8 @@ (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "4.5.0"; sha256 = "0srd5bva52n92i90wd88pzrqjsxnfgka3ilybwh7s6sf469y5s53"; }) (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "4.5.1"; sha256 = "0pya3ggs4pds6m8hgvjdljpacxwn3qx4bfq59nwi0qrs7zxihxhp"; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "6.0.0"; sha256 = "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai"; }) + (fetchNuGet { pname = "System.Text.Json"; version = "6.0.8"; sha256 = "0jhxpkx68fiih6p68s1bb0g45ab6qalkf1xl0g8bj4jdx7m5xhqi"; }) (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.0"; sha256 = "05mpkdc7aigwadlcc9q3ash88hygkyz5pmkj360jj6c6ffhm91s8"; }) diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix index 9ac59bf72cf71..9d846ba8a8df8 100644 --- a/pkgs/servers/jellyfin/default.nix +++ b/pkgs/servers/jellyfin/default.nix @@ -14,13 +14,13 @@ buildDotnetModule rec { pname = "jellyfin"; - version = "10.8.10"; # ensure that jellyfin-web has matching version + version = "10.8.11"; # ensure that jellyfin-web has matching version src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin"; rev = "v${version}"; - sha256 = "uX56TSyi0V0Rs6R3A8QHZrjTIHUZobLYIgG+nZDE3Hg="; + sha256 = "deJv2lWo0kXGixCBJzfdIBZcNjg45y2ITGQfWcM2smU="; }; patches = [ diff --git a/pkgs/servers/jellyfin/web.nix b/pkgs/servers/jellyfin/web.nix index f982cc5dd04c0..6f9d278091bb4 100644 --- a/pkgs/servers/jellyfin/web.nix +++ b/pkgs/servers/jellyfin/web.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "jellyfin-web"; - version = "10.8.10"; + version = "10.8.11"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-web"; rev = "v${version}"; - hash = "sha256-fJmGiHLwhgd3Ac7ggCbkMu6llob3qN87EpHpCO4K29I="; + hash = "sha256-Gl8eaC/AXBD956tAepwWVG3lSvL4rBCcgmkHeT/mrzM="; }; - npmDepsHash = "sha256-X8a/pmQGAhoGKhThJ86b50sf0nlsCXGgvLQaxRsmA5Q="; + npmDepsHash = "sha256-HoRteA6KFCFxDdwGtDKrvwWCMYNfYQWlit52RAN1eAU="; npmBuildScript = [ "build:production" ]; diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index 4fd7fe4a08c51..41b872fb4a773 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -18,11 +18,11 @@ let ''; in stdenv.mkDerivation rec { pname = "keycloak"; - version = "22.0.3"; + version = "22.0.4"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - hash = "sha256-QDa5YPPi7JR8fd3jni8fjkwWH/PF023avVBENEwnbVA="; + hash = "sha256-wl6kZmm6o9UspKdVHDqUvoDCRALp1ut7Sun/RDuEMLI="; }; nativeBuildInputs = [ makeWrapper jre ]; diff --git a/pkgs/servers/komga/default.nix b/pkgs/servers/komga/default.nix index 14e53cbd166ce..8ac3a70312407 100644 --- a/pkgs/servers/komga/default.nix +++ b/pkgs/servers/komga/default.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "komga"; - version = "1.3.1"; + version = "1.4.0"; src = fetchurl { url = "https://github.com/gotson/${pname}/releases/download/v${version}/${pname}-${version}.jar"; - sha256 = "sha256-R1weJRQ8DkBbUndGyO8wvFpsI+6OTZ59C8P6EzsMV+E="; + sha256 = "sha256-ahSM/Rr2R7e/Y80U7DmW2mTCYGvt34O4+QfzM8gXyoA="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index 407a319270f7e..698a82a6297f4 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "exim"; - version = "4.96"; + version = "4.96.1"; src = fetchurl { url = "https://ftp.exim.org/pub/exim/exim4/${pname}-${version}.tar.xz"; - hash = "sha256-KZpWknsus0d9qv08W9oCvGflxOWJinrq8nQIdSeM8aM="; + hash = "sha256-k6wHVcMX4f276ozLcKhoh2vfMUhpKJHHKtD+gWdnAz0="; }; enableParallelBuilding = true; diff --git a/pkgs/servers/mail/listmonk/stuffbin.nix b/pkgs/servers/mail/listmonk/stuffbin.nix index 442307fad65b3..2640ba8b85197 100644 --- a/pkgs/servers/mail/listmonk/stuffbin.nix +++ b/pkgs/servers/mail/listmonk/stuffbin.nix @@ -4,7 +4,7 @@ buildGoModule rec { pname = "stuffbin"; version = "1.1.0"; - vendorSha256 = null; + vendorHash = null; src = fetchFromGitHub { owner = "knadh"; diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 5955789d566f2..e9dea5282aa98 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -99,6 +99,11 @@ in stdenv.mkDerivation rec { --prefix PATH ":" ${lib.makeBinPath [ coreutils findutils gnugrep ]} wrapProgram $out/libexec/postfix/postfix-script \ --prefix PATH ":" ${lib.makeBinPath [ coreutils findutils gnugrep gawk gnused ]} + + # Avoid dev-only outputs from being retained in final closure. + # `makedefs.out` is a documenttation-only file. It should be safe + # to store invalid store paths there. + sed -e "s|$NIX_STORE/[a-z0-9]\{32\}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" -i $out/etc/postfix/makedefs.out ''; passthru = { diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix index 95b613f0b4784..8e9aee8ad9869 100644 --- a/pkgs/servers/mail/spamassassin/default.nix +++ b/pkgs/servers/mail/spamassassin/default.nix @@ -3,11 +3,16 @@ perlPackages.buildPerlPackage rec { pname = "SpamAssassin"; version = "4.0.0"; + rulesRev = "r1905950"; src = fetchurl { url = "mirror://apache/spamassassin/source/Mail-${pname}-${version}.tar.bz2"; hash = "sha256-5aoXBQowvHK6qGr9xgSMrepNHsLsxh14dxegWbgxnog="; }; + defaultRulesSrc = fetchurl { + url = "mirror://apache/spamassassin/source/Mail-${pname}-rules-${version}.${rulesRev}.tgz"; + hash = "sha256-rk/7uRfrx/76ckD8W7UVHdpmP45AWRYa18m0Lu0brG0="; + }; patches = [ ./satest-no-clean-path.patch @@ -53,6 +58,10 @@ perlPackages.buildPerlPackage rec { mkdir -p $out/share/spamassassin mv "rules/"* $out/share/spamassassin/ + tar -xzf ${defaultRulesSrc} -C $out/share/spamassassin/ + local moduleversion="$(${perlPackages.perl}/bin/perl -I lib -e 'use Mail::SpamAssassin; print $Mail::SpamAssassin::VERSION')" + sed -i -e "s/@@VERSION@@/$moduleversion/" $out/share/spamassassin/*.cf + for n in "$out/bin/"*; do # Skip if this isn't a perl script if ! head -n1 "$n" | grep -q bin/perl; then diff --git a/pkgs/servers/mail/spf-engine/default.nix b/pkgs/servers/mail/spf-engine/default.nix index c90522edf0412..326d42d5d78c3 100644 --- a/pkgs/servers/mail/spf-engine/default.nix +++ b/pkgs/servers/mail/spf-engine/default.nix @@ -1,15 +1,17 @@ -{ lib, buildPythonApplication, fetchurl, pyspf, dnspython, authres, pymilter }: +{ lib, buildPythonApplication, fetchurl, flit-core, pyspf, dnspython, authres, pymilter }: buildPythonApplication rec { pname = "spf-engine"; version = "3.0.4"; - format = "flit"; + format = "pyproject"; src = fetchurl { url = "https://launchpad.net/${pname}/${lib.versions.majorMinor version}/${version}/+download/${pname}-${version}.tar.gz"; sha256 = "sha256-Gcw7enNIb/TrZEYa0Z04ezHUmfMmc1J+aEH6FlXbhTo="; }; + nativeBuildInputs = [ flit-core ]; + propagatedBuildInputs = [ pyspf dnspython authres pymilter ]; pythonImportsCheck = [ diff --git a/pkgs/servers/mastodon/default.nix b/pkgs/servers/mastodon/default.nix index 1547485a03782..31a092359cfc1 100644 --- a/pkgs/servers/mastodon/default.nix +++ b/pkgs/servers/mastodon/default.nix @@ -1,28 +1,27 @@ -{ lib, stdenv, nodejs-slim, mkYarnPackage, fetchFromGitHub, bundlerEnv, nixosTests +{ lib, stdenv, nodejs-slim, bundlerEnv, nixosTests , yarn, callPackage, imagemagick, ffmpeg, file, ruby_3_0, writeShellScript , fetchYarnDeps, fixup_yarn_lock , brotli # Allow building a fork or custom version of Mastodon: , pname ? "mastodon" -, version ? import ./version.nix -, srcOverride ? null -, dependenciesDir ? ./. # Should contain gemset.nix, yarn.nix and package.json. +, version ? srcOverride.version + # src is a package +, srcOverride ? callPackage ./source.nix {} +, gemset ? ./. + "/gemset.nix" +, yarnHash ? srcOverride.yarnHash }: stdenv.mkDerivation rec { inherit pname version; - # Using overrideAttrs on src does not build the gems and modules with the overridden src. - # Putting the callPackage up in the arguments list also does not work. - src = if srcOverride != null then srcOverride else callPackage ./source.nix {}; + src = srcOverride; mastodonGems = bundlerEnv { name = "${pname}-gems-${version}"; - inherit version; + inherit version gemset; ruby = ruby_3_0; gemdir = src; - gemset = dependenciesDir + "/gemset.nix"; # This fix (copied from https://github.com/NixOS/nixpkgs/pull/76765) replaces the gem # symlinks with directories, resolving this error when running rake: # /nix/store/451rhxkggw53h7253izpbq55nrhs7iv0-mastodon-gems-3.0.1/lib/ruby/gems/2.6.0/gems/bundler-1.17.3/lib/bundler/settings.rb:6:in `<module:Bundler>': uninitialized constant Bundler::Settings (NameError) @@ -43,7 +42,7 @@ stdenv.mkDerivation rec { yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - sha256 = "sha256-e3rl/WuKXaUdeDEYvo1sSubuIwtBjkbguCYdAijwXOA="; + hash = yarnHash; }; nativeBuildInputs = [ fixup_yarn_lock nodejs-slim yarn mastodonGems mastodonGems.wrappedRuby brotli ]; diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix index c203852a76d1b..995b58476d783 100644 --- a/pkgs/servers/mastodon/source.nix +++ b/pkgs/servers/mastodon/source.nix @@ -1,12 +1,16 @@ # This file was generated by pkgs.mastodon.updateScript. -{ fetchFromGitHub, applyPatches }: let +{ fetchFromGitHub, applyPatches }: +let + version = "4.1.9"; +in +applyPatches { + inherit version; src = fetchFromGitHub { owner = "mastodon"; repo = "mastodon"; - rev = "v4.1.8"; - hash = "sha256-L4ikr270hXpTgh9DAyN9c5wzj/93urulcG9bTxwNOFw="; + rev = "${version}"; + hash = "sha256-xpE/mg2AeioW6NThUjLS+SBxGavG4w1xtp3BOMADfYo="; }; -in applyPatches { - inherit src; patches = []; + yarnHash = "sha256-e3rl/WuKXaUdeDEYvo1sSubuIwtBjkbguCYdAijwXOA="; } diff --git a/pkgs/servers/mastodon/update.sh b/pkgs/servers/mastodon/update.sh index babc062048510..6955f9e618050 100755 --- a/pkgs/servers/mastodon/update.sh +++ b/pkgs/servers/mastodon/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -i bash -p yarn2nix bundix coreutils diffutils nix-prefetch-github gnused jq +#! nix-shell -i bash -p bundix coreutils diffutils nix-prefetch-github gnused jq prefetch-yarn-deps set -e OWNER=mastodon @@ -56,7 +56,7 @@ if [[ -z "$REVISION" ]]; then VERSION="$(echo "$REVISION" | cut -c2-)" fi -rm -f gemset.nix version.nix source.nix +rm -f gemset.nix source.nix cd "$(dirname "${BASH_SOURCE[0]}")" || exit 1 WORK_DIR=$(mktemp -d) @@ -79,21 +79,22 @@ echo "Fetching source code $REVISION" JSON=$(nix-prefetch-github "$OWNER" "$REPO" --rev "$REVISION" 2> $WORK_DIR/nix-prefetch-git.out) HASH=$(echo "$JSON" | jq -r .hash) -echo "Creating version.nix" -echo "\"$VERSION\"" | sed 's/^"v/"/' > version.nix - cat > source.nix << EOF # This file was generated by pkgs.mastodon.updateScript. -{ fetchFromGitHub, applyPatches }: let +{ fetchFromGitHub, applyPatches }: +let + version = "$VERSION"; +in +applyPatches { + inherit version; src = fetchFromGitHub { owner = "$OWNER"; repo = "$REPO"; - rev = "$REVISION"; + rev = "\${version}"; hash = "$HASH"; }; -in applyPatches { - inherit src; patches = [$PATCHES]; + yarnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; } EOF SOURCE_DIR="$(nix-build --no-out-link -E '(import <nixpkgs> {}).callPackage ./source.nix {}')" @@ -101,3 +102,8 @@ SOURCE_DIR="$(nix-build --no-out-link -E '(import <nixpkgs> {}).callPackage ./so echo "Creating gemset.nix" bundix --lockfile="$SOURCE_DIR/Gemfile.lock" --gemfile="$SOURCE_DIR/Gemfile" echo "" >> gemset.nix # Create trailing newline to please EditorConfig checks + +echo "Creating yarn-hash.nix" +YARN_HASH="$(prefetch-yarn-deps "$SOURCE_DIR/yarn.lock")" +YARN_HASH="$(nix hash to-sri --type sha256 "$YARN_HASH")" +sed -i "s/sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=/$YARN_HASH/g" source.nix diff --git a/pkgs/servers/mastodon/version.nix b/pkgs/servers/mastodon/version.nix deleted file mode 100644 index a7c64b1833f5a..0000000000000 --- a/pkgs/servers/mastodon/version.nix +++ /dev/null @@ -1 +0,0 @@ -"4.1.8" diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 60da7eafa379f..45e9e89b3d653 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -16,20 +16,20 @@ let in python3.pkgs.buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.92.1"; + version = "1.93.0"; format = "pyproject"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-rCxoYtdvh+Gu0O2T3uu0k2FFFFc7m09LuKJvkSky3M4="; + hash = "sha256-fmY5xjpbFwzrX47ijPxOUTI0w9stYVPpSV+HRF4GdlA="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-yZeCENWdPv80Na1++/IQFOrhah/VHWwJDNV2dI/yTHg="; + hash = "sha256-9cCEfDV5X65JublgkUP6NVfMIObPawx+nXTmIG9lg5o="; }; postPatch = '' @@ -41,6 +41,10 @@ python3.pkgs.buildPythonApplication rec { # be extra defensive, but we don't want to deal with updating this sed -i 's/"poetry-core>=\([0-9.]*\),<=[0-9.]*"/"poetry-core>=\1"/' pyproject.toml sed -i 's/"setuptools_rust>=\([0-9.]*\),<=[0-9.]*"/"setuptools_rust>=\1"/' pyproject.toml + + # Don't force pillow to be 10.0.1 because we already have patched it, and + # we don't use the pillow wheels. + sed -i 's/Pillow = ".*"/Pillow = ">=5.4.0"/' pyproject.toml ''; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/package.json b/pkgs/servers/matrix-synapse/matrix-hookshot/package.json index 744f593caf13f..5f4e0c309f09f 100644 --- a/pkgs/servers/matrix-synapse/matrix-hookshot/package.json +++ b/pkgs/servers/matrix-synapse/matrix-hookshot/package.json @@ -1,6 +1,6 @@ { "name": "matrix-hookshot", - "version": "4.4.1", + "version": "4.5.1", "description": "A bridge between Matrix and multiple project management services, such as GitHub, GitLab and JIRA.", "main": "lib/app.js", "repository": "https://github.com/matrix-org/matrix-hookshot", @@ -57,7 +57,7 @@ "jira-client": "^8.0.0", "markdown-it": "^12.3.2", "matrix-appservice-bridge": "^9.0.1", - "matrix-bot-sdk": "npm:@vector-im/matrix-bot-sdk@^0.6.6-element.1", + "matrix-bot-sdk": "npm:@vector-im/matrix-bot-sdk@^0.6.7-element.1", "matrix-widget-api": "^1.0.0", "micromatch": "^4.0.4", "mime": "^3.0.0", @@ -65,11 +65,11 @@ "nyc": "^15.1.0", "p-queue": "^6.6.2", "prom-client": "^14.2.0", + "quickjs-emscripten": "^0.23.0", "reflect-metadata": "^0.1.13", "source-map-support": "^0.5.21", "string-argv": "^0.3.1", "tiny-typed-emitter": "^2.1.0", - "vm2": "^3.9.18", "winston": "^3.3.3", "xml2js": "^0.5.0", "yaml": "^2.2.2" @@ -92,13 +92,13 @@ "@types/node-emoji": "^1.8.1", "@types/uuid": "^8.3.3", "@types/xml2js": "^0.4.11", - "@typescript-eslint/eslint-plugin": "^5.59.1", - "@typescript-eslint/parser": "^5.59.1", + "@typescript-eslint/eslint-plugin": "^6.6.0", + "@typescript-eslint/parser": "^6.6.0", "@uiw/react-codemirror": "^4.12.3", "chai": "^4.3.4", - "eslint": "^8.39.0", + "eslint": "^8.49.0", "eslint-config-preact": "^1.3.0", - "eslint-plugin-mocha": "^9.0.0", + "eslint-plugin-mocha": "^10.1.0", "mini.css": "^3.0.1", "mocha": "^8.2.1", "preact": "^10.5.15", diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json b/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json index 503d692256d56..e27f39681c78e 100644 --- a/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json +++ b/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json @@ -1,6 +1,6 @@ { - "version": "4.4.1", - "srcHash": "sha256-pQSivF/90BvvqtBGTi8eSssPzJdkUNW9cXztG+V+Joo=", - "yarnHash": "1adcl20d5nis8w3amwkcxddybikn5whgx9ixv78lm9h2mc45y6jw", - "cargoHash": "sha256-c5hZroZ3A9dhviSuqVfNMSr5KL/FEXecuyMfZwMD9kc=" + "version": "4.5.1", + "srcHash": "sha256-uqLpwgVEfwcMTeGMDn3lDUD91GHPNyWHmCSPxuV/VC0=", + "yarnHash": "08dw9vbhlmqwj2nah6fv1b2sf15ibl5kg38ghkxkbccs4j7adans", + "cargoHash": "sha256-bIpsQni3kaoYCGLz01YdauYM8ybpx+BvVTiB6N72rIA=" } diff --git a/pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix b/pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix index 42d62539b6b31..92e111dbb6231 100644 --- a/pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix +++ b/pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix @@ -7,6 +7,7 @@ , pythonOlder , tqdm , twisted +, psycopg2 }: buildPythonPackage rec { @@ -37,6 +38,7 @@ buildPythonPackage rec { humanize tqdm twisted + psycopg2 ] # For the s3_media_upload script ++ matrix-synapse-unwrapped.propagatedBuildInputs; diff --git a/pkgs/servers/matrix-synapse/sliding-sync/default.nix b/pkgs/servers/matrix-synapse/sliding-sync/default.nix index d899c658ad362..bb8003e389273 100644 --- a/pkgs/servers/matrix-synapse/sliding-sync/default.nix +++ b/pkgs/servers/matrix-synapse/sliding-sync/default.nix @@ -31,7 +31,7 @@ buildGoModule rec { description = "A sliding sync implementation of MSC3575 for matrix"; homepage = "https://github.com/matrix-org/sliding-sync"; license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ emilylange ]; + maintainers = with maintainers; [ emilylange yayayayaka ]; mainProgram = "syncv3"; }; } diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index c12a0f9df73e2..942297b5cdcb0 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -8,33 +8,33 @@ buildGoModule rec { pname = "mattermost"; - version = "7.10.5"; + version = "8.1.2"; src = fetchFromGitHub { owner = "mattermost"; repo = "mattermost"; rev = "v${version}"; - hash = "sha256-7R2ivfF0wC4Y5NMcBhcmbwwULuaTUTP7hq1idwYsLYs="; - }; + hash = "sha256-hOt3xqrCs7akWyCv/6keiZN0ReF2adwiQNVibKFG3mk="; + } + "/server"; webapp = fetchurl { url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz"; - hash = "sha256-WTcQPXx9KYNDdA+cX46HWV2Cnq8ojUrsg0zn4IegR94="; + hash = "sha256-cIfUIGp51dyfmY3LnV+1F9CX+y5XyTCez6R8TLLz9fo="; }; - vendorHash = "sha256-7YxbBmkKeb20a3BNllB3RtvjAJLZzoC2OBK4l1Ud1bw="; + vendorHash = "sha256-3OZUWg4e2h7g15FXxiFKk2EXceHP4phBTpyy/uY2Ni4="; subPackages = [ "cmd/mattermost" ]; ldflags = [ "-s" "-w" - "-X github.com/mattermost/mattermost-server/v6/model.Version=${version}" - "-X github.com/mattermost/mattermost-server/v6/model.BuildNumber=${version}-nixpkgs" - "-X github.com/mattermost/mattermost-server/v6/model.BuildDate=1970-01-01" - "-X github.com/mattermost/mattermost-server/v6/model.BuildHash=v${version}" - "-X github.com/mattermost/mattermost-server/v6/model.BuildHashEnterprise=v${version}" - "-X github.com/mattermost/mattermost-server/v6/model.BuildEnterpriseReady=false" + "-X github.com/mattermost/mattermost/server/public/model.Version=${version}" + "-X github.com/mattermost/mattermost/server/public/model.BuildNumber=${version}-nixpkgs" + "-X github.com/mattermost/mattermost/server/public/model.BuildDate=1970-01-01" + "-X github.com/mattermost/mattermost/server/public/model.BuildHash=v${version}" + "-X github.com/mattermost/mattermost/server/public/model.BuildHashEnterprise=v${version}" + "-X github.com/mattermost/mattermost/server/public/model.BuildEnterpriseReady=false" ]; postInstall = '' diff --git a/pkgs/servers/mediamtx/default.nix b/pkgs/servers/mediamtx/default.nix index 850cf9e67c884..9e9e95d67f922 100644 --- a/pkgs/servers/mediamtx/default.nix +++ b/pkgs/servers/mediamtx/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "mediamtx"; - version = "1.0.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "bluenviron"; repo = pname; rev = "v${version}"; - hash = "sha256-SKNCQu5uRAxKpQbceha50K4ShV7mE0VI1PGFVAlWq4Q="; + hash = "sha256-VIXrptVF5kjjz9vHqqjAM5gYk2o/wkUvudXixCloPgE="; }; - vendorHash = "sha256-mPnAlFHCJKXOdmKP3Ff7cQJMStKtu4Sa7iYuot5/IKE="; + vendorHash = "sha256-bUZU9I2lqjMOupkCQKSfdrWsBYmAVrLEXod0l+J3p6g="; # Tests need docker doCheck = false; diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index 29ca27b165891..d25298b5677e4 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.46.7"; + version = "0.47.0"; src = fetchurl { url = "https://downloads.metabase.com/v${version}/metabase.jar"; - hash = "sha256-LGtjzODVkoOr8yGcE+fpgMzINQG3lBchTujTsZGgARU="; + hash = "sha256-m/A6RkFjlxGWvsMGWQBB6PVx8k4dWjRpU2Pw3qHrqAk="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/meteor/default.nix b/pkgs/servers/meteor/default.nix index 04f0ac3ac807c..868c420d49ae2 100644 --- a/pkgs/servers/meteor/default.nix +++ b/pkgs/servers/meteor/default.nix @@ -97,6 +97,6 @@ stdenv.mkDerivation { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; platforms = builtins.attrNames srcs; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 3c35cf164b995..b9505f15da4c6 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -15,16 +15,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2023-09-07T02-05-02Z"; + version = "2023-09-20T22-49-55Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-6Nps6h632OTXIuuiLSLt3kgBQfB5sBZ1O0bs6ltjtg8="; + sha256 = "sha256-JX+bxFAxTmOjpY6HAVVhdZftFx9HlniX+3zKY7Qui9w="; }; - vendorHash = "sha256-w4t60CE7QMqKK2eQpD+D6Uiy62ibyASXCm8aRMfntsQ="; + vendorHash = "sha256-fcaMYm7Tw5zqtHhPzmUS/5E7AYI8P2fuxT2sDQwNttc="; doCheck = false; diff --git a/pkgs/servers/misc/gobgpd/default.nix b/pkgs/servers/misc/gobgpd/default.nix index 67654226a715a..4a74b6e4a720f 100644 --- a/pkgs/servers/misc/gobgpd/default.nix +++ b/pkgs/servers/misc/gobgpd/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gobgpd"; - version = "3.18.0"; + version = "3.19.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "refs/tags/v${version}"; - hash = "sha256-OAePH8q8YQJGundd0VwtLEl3UkRyuZYAx5rcN4DNft4="; + hash = "sha256-zDLL+3k6/Jgq/pflpmjuLcfPzvDl0LQLQklW+kOvtQg="; }; - vendorHash = "sha256-Z7vYpDQIKc4elVBLiGtxF3D9pec4QNvWFLpux/29t1Y="; + vendorHash = "sha256-8qEGp95y8iBIJXCTh2Pa/JwiruZVVIjHLwaZqwFZMl8="; postConfigure = '' export CGO_ENABLED=0 diff --git a/pkgs/servers/mobilizon/common.nix b/pkgs/servers/mobilizon/common.nix index 35551a628c7f6..39f1fd85f55b6 100644 --- a/pkgs/servers/mobilizon/common.nix +++ b/pkgs/servers/mobilizon/common.nix @@ -19,6 +19,4 @@ }) ]; }; - - } diff --git a/pkgs/servers/mobilizon/default.nix b/pkgs/servers/mobilizon/default.nix index f35718c6d1b57..73ae391eadc23 100644 --- a/pkgs/servers/mobilizon/default.nix +++ b/pkgs/servers/mobilizon/default.nix @@ -1,14 +1,9 @@ { lib , callPackage , writeShellScriptBin -, writeText , beamPackages -, yarn2nix , mix2nix -, fetchFromGitLab , fetchFromGitHub -, fetchgit -, fetchurl , git , cmake , nixosTests @@ -16,7 +11,7 @@ }: let - inherit (beamPackages) mixRelease buildMix buildRebar3 fetchHex; + inherit (beamPackages) mixRelease buildMix; common = callPackage ./common.nix { }; in mixRelease rec { @@ -59,7 +54,7 @@ mixRelease rec { }); # The remainder are Git dependencies (and their deps) that are not supported by mix2nix currently. - web_push_encryption = buildMix rec { + web_push_encryption = buildMix { name = "web_push_encryption"; version = "0.3.1"; src = fetchFromGitHub { diff --git a/pkgs/servers/monitoring/alerta/default.nix b/pkgs/servers/monitoring/alerta/default.nix index d038039780a33..06383d436085f 100644 --- a/pkgs/servers/monitoring/alerta/default.nix +++ b/pkgs/servers/monitoring/alerta/default.nix @@ -30,6 +30,7 @@ python3.pkgs.buildPythonApplication rec { requests requests-hawk sentry-sdk + setuptools ]; # We can't run the tests from Nix, because they rely on the presence of a working MongoDB server diff --git a/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix b/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix index e4cdb6159685d..10bf273497dd9 100644 --- a/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix +++ b/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix @@ -4,7 +4,7 @@ }: buildGoModule rec { pname = "buildkite-agent-metrics"; - version = "5.7.0"; + version = "5.8.0"; outputs = [ "out" "lambda" ]; @@ -12,10 +12,10 @@ buildGoModule rec { owner = "buildkite"; repo = "buildkite-agent-metrics"; rev = "v${version}"; - hash = "sha256-+DK8OP/rOWIBw+5Fprd5gzFo1rJDkDt4G20iUVmrfLw="; + hash = "sha256-QPtjKjUGKlqgklZ0wUOJ1lXuXHhWVC83cEJ4QVtgdl4="; }; - vendorHash = "sha256-QfvHTJQEG5nvJy5ZZ9c66JYWMcR9Irow8OOyqDDjQN0="; + vendorHash = "sha256-KgTzaF8dFD4VwcuSqmOy2CSfLuA0rjFwtCqGNYHFFlc="; postInstall = '' mkdir -p $lambda/bin diff --git a/pkgs/servers/monitoring/do-agent/default.nix b/pkgs/servers/monitoring/do-agent/default.nix index d1009616a1f91..51502d9e1ba66 100644 --- a/pkgs/servers/monitoring/do-agent/default.nix +++ b/pkgs/servers/monitoring/do-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "do-agent"; - version = "3.16.6"; + version = "3.16.7"; src = fetchFromGitHub { owner = "digitalocean"; repo = "do-agent"; rev = version; - sha256 = "sha256-2KzgIv7DMEnzEJzC0fUrHQ1VIqClCgw55huqZFlctxk="; + sha256 = "sha256-m1OHCaSY13L+184ju6rzJ/SO0OCIlOtMNAvdkGTXTFw="; }; ldflags = [ diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix index 5d8ab393fb91d..cc2ccc3b01904 100644 --- a/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "grafana-agent"; - version = "0.36.1"; + version = "0.36.2"; src = fetchFromGitHub { owner = "grafana"; repo = "agent"; rev = "v${version}"; - hash = "sha256-94z4Veitj3SRZCtHCX+P4oVOj795OzpXn3dmhIP6HpQ="; + hash = "sha256-c8eay3lwAVqodw6MPU02tSQ+8D0+qywCI+U6bfJVk5A="; }; vendorHash = "sha256-kz/yogvKqUGP+TQjrzophA4qQ+Qf32cV/CuyNuM9fzM="; diff --git a/pkgs/servers/monitoring/grafana/update.sh b/pkgs/servers/monitoring/grafana/update.sh index 9a19485e37a4f..3fd4fd56be7c4 100755 --- a/pkgs/servers/monitoring/grafana/update.sh +++ b/pkgs/servers/monitoring/grafana/update.sh @@ -28,9 +28,10 @@ if [ ! "${oldVersion}" = "${targetVersion}" ]; then update-source-version grafana "${targetVersion#v}" oldStaticHash="$(nix-instantiate --eval -A grafana.srcStatic.outputHash | tr -d '"')" newStaticHash="$(nix-prefetch-url "https://dl.grafana.com/oss/release/grafana-${targetVersion#v}.linux-amd64.tar.gz")" + newStaticHash="$(nix hash to-sri --type sha256 $newStaticHash)" replaceHash "$oldStaticHash" "$newStaticHash" - goHash="$(nix-instantiate --eval -A grafana.vendorSha256 | tr -d '"')" - emptyHash="$(nix-instantiate --eval -A lib.fakeSha256 | tr -d '"')" + goHash="$(nix-instantiate --eval -A grafana.vendorHash | tr -d '"')" + emptyHash="$(nix-instantiate --eval -A lib.fakeHash | tr -d '"')" replaceHash "$goHash" "$emptyHash" replaceHash "$emptyHash" "$(extractVendorHash "$goHash")" nix-build -A grafana diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index be77ae102402a..708623bc9ffcb 100644 --- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "check_ssl_cert"; - version = "2.74.0"; + version = "2.75.0"; src = fetchFromGitHub { owner = "matteocorti"; repo = "check_ssl_cert"; rev = "refs/tags/v${version}"; - hash = "sha256-LOvJXF8J11uL70fPs2r48mGFkxqjIgMvtDn0Xrt5myE="; + hash = "sha256-Tz1ogwht6MCRUM4Knr7Ka0VNN2yUmh/lQrJNdPEUMiI="; }; nativeBuildInputs = [ @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/check_ssl_cert \ - --prefix PATH : "${lib.makeBinPath [ openssl file which curl bc coreutils bind nmap iproute2 netcat-gnu python3 ]}" + --prefix PATH : "${lib.makeBinPath ([ openssl file which curl bc coreutils bind nmap netcat-gnu python3 ] ++ lib.optional stdenv.isLinux iproute2) }" ''; meta = with lib; { diff --git a/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix b/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix index fd0234e7e163d..dd0ea4ec5ec4d 100644 --- a/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-dYkMCCAIlFDFOFUNJd4NvtAeJDTsHeJoH90b5pSGlQE="; }; - vendorSha256 = null; + vendorHash = null; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix index 3c34ca8b56fa9..8b842b7ce3dac 100644 --- a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0vb6vnd2j87iqxdl86j30dk65vrv4scprv200xb83203aprngqgh"; }; - vendorSha256 = null; + vendorHash = null; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index e5bb3678a1646..f96ab4584289b 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -31,10 +31,10 @@ }: let - version = "2.46.0"; + version = "2.47.0"; webUiStatic = fetchurl { url = "https://github.com/prometheus/prometheus/releases/download/v${version}/prometheus-web-ui-${version}.tar.gz"; - hash = "sha256-H6RRyemawt9NRLTVG0iH4vNFNiuvdPZz7u43Zop0vVI="; + hash = "sha256-MjnTFDHMLDML8crhtCfAv3aK67vwLEUVglIzXgc5mBU="; }; in buildGoModule rec { @@ -47,10 +47,10 @@ buildGoModule rec { owner = "prometheus"; repo = "prometheus"; rev = "v${version}"; - hash = "sha256-TB4N5aAfNw34HJ1HSt6rHTETTyAgpGA8B5VOFHisZFU="; + hash = "sha256-I0tl7DlZ1Yp5nHm3JK1hP+u+yLGBjwubfaTxUvXSDUE="; }; - vendorHash = "sha256-jeGtna7IeKAOiu4FFA2xRv+fwpzCpnqwI5nj641dlM4="; + vendorHash = "sha256-qFp+tMHhXmJGY9MSukVRjBVzaIBgfxB0BorWiuInMwk="; excludedPackages = [ "documentation/prometheus-mixin" ]; diff --git a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix index a171051223bc3..f6af24264fe97 100644 --- a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix @@ -7,11 +7,11 @@ buildGoModule rec { src = fetchFromGitHub { owner = "google"; repo = "dnsmasq_exporter"; - sha256 = "1i7imid981l0a9k8lqyr9igm3qkk92kid4xzadkwry4857k6mgpj"; rev = "v${version}"; + hash = "sha256-8r5q5imI+MxnU7+TFqdIc+JRX0zZY4pmUoAGlFqs8cQ="; }; - vendorSha256 = "1dqpa180pbdi2gcmp991d4cry560mx5rm5l9x065s9n9gnd38hvl"; + vendorHash = "sha256-dEM0mn3JJl0M6ImWmkuvwBSfGWkhpVvZE7GtC1BQF7c="; doCheck = false; diff --git a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix index 0a852b35ecb47..99d306f9710dc 100644 --- a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix @@ -8,12 +8,12 @@ buildGoModule rec { rev = "fd36539bd7db191b3734e17934b5f1e78e4e9829"; owner = "mxschmitt"; repo = "fritzbox_exporter"; - sha256 = "0w9gdcnfc61q6mzm95i7kphsf1rngn8rb6kz1b6knrh5d8w61p1n"; + hash = "sha256-NtxgOGoFZjvNCn+alZF9Ngen4Z0nllR/NTgY5ixrL3E="; }; - subPackages = [ "cmd/exporter" ]; + vendorHash = "sha256-VhQAEVxRJjIzFP67LUKhfGxdUbTQB7UCK8/JKwpoy0w="; - vendorSha256 = "0k6bd052pjfg5c1ba1yhni8msv3wl512vfzy2hrk49jibh8h052n"; + subPackages = [ "cmd/exporter" ]; passthru.tests = { inherit (nixosTests.prometheus-exporters) fritzbox; }; diff --git a/pkgs/servers/monitoring/prometheus/jitsi-exporter.nix b/pkgs/servers/monitoring/prometheus/jitsi-exporter.nix index 68e993089482e..5b90c26eed7ed 100644 --- a/pkgs/servers/monitoring/prometheus/jitsi-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/jitsi-exporter.nix @@ -10,7 +10,7 @@ buildGoModule rec { sha256 = "1cf46wp96d9dwlwlffcgbcr0v3xxxfdv6il0zqkm2i7cfsfw0skf"; }; - vendorSha256 = null; + vendorHash = null; passthru.tests = { inherit (nixosTests.prometheus-exporters) jitsi; }; diff --git a/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix b/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix index 035ee933086b8..7a72ab9cb9038 100644 --- a/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "junos-czerwonk-exporter"; - version = "0.10.1"; + version = "0.12.0"; src = fetchFromGitHub { owner = "czerwonk"; repo = "junos_exporter"; rev = version; - sha256 = "sha256-XYISwq6xcVKhXUK6j22pQ5eOfuKNH0uXOEK1MUzSq90="; + sha256 = "sha256-9Oh1GsqoIml/SKCmLHuJSnz0k2szEYkb6ArEsU5p198="; }; - vendorHash = "sha256-IV0FZb1rjOMLf+vkzz/ZxUBMFD8VRDS51Wdud/yz32E="; + vendorHash = "sha256-cQChRpjhL3plUk/J+8z2cg3u9IhMo6aTAbY8M/qlXSQ="; meta = with lib; { description = "Exporter for metrics from devices running JunOS"; diff --git a/pkgs/servers/monitoring/prometheus/mail-exporter.nix b/pkgs/servers/monitoring/prometheus/mail-exporter.nix index 2d995ba52932b..ae13becd0aede 100644 --- a/pkgs/servers/monitoring/prometheus/mail-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mail-exporter.nix @@ -8,10 +8,10 @@ buildGoModule { owner = "cherti"; repo = "mailexporter"; rev = "f5a552c736ac40ccdc0110d2e9a71619c1cd6862"; - sha256 = "0y7sg9qrd7q6g5gi65sjvw6byfmk2ph0a281wjc9cr4pd25xkciz"; + hash = "sha256-P7LZi2iXZJaY5AEJBeAVszq/DN9SFxNfeQaflnF6+ng="; }; - vendorSha256 = "1hwahk8v3qnmyn6bwk9l2zpr0k7p2w7zjzxmjwgjyx429g9rzqs0"; + vendorHash = "sha256-QOOf00uCdC8fl7V/+Q8X90yQ7xc0Tb6M9dXisdGEisM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix b/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix index 6f9e78799a03e..431b029db9f36 100644 --- a/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix @@ -7,11 +7,11 @@ buildGoModule rec { src = fetchFromGitHub { owner = "nshttpd"; repo = "mikrotik-exporter"; - sha256 = "1vqn1f159g0l76021gifbxpjf7zjhrj807qqqn51h5413lbi6r66"; rev = "4bfa7adfef500ff621a677adfab1f7010af920d1"; + hash = "sha256-xmQTFx2BFBiKxRgfgGSG8h8nb18uviCAORS8VIILFu8="; }; - vendorSha256 = "0b244z3hly5726vwkr7vhdzzm2fi38cv1qh7nvfp3vpsxnii04md"; + vendorHash = "sha256-rRIQo+367nHdtgfisBka0Yn6f4P75Mm3Ead4CscnRCw="; doCheck = false; diff --git a/pkgs/servers/monitoring/prometheus/openldap-exporter.nix b/pkgs/servers/monitoring/prometheus/openldap-exporter.nix index 5f5bd6503e011..3d574d1bb93f9 100644 --- a/pkgs/servers/monitoring/prometheus/openldap-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/openldap-exporter.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-1u+89odwV/lz34wtrK91lET2bOqkH6kRA7JCjzsmiEg="; }; - vendorSha256 = null; + vendorHash = null; ldflags = [ "-s" diff --git a/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix b/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix index 735fc8529984e..6b03f90e58fee 100644 --- a/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "kumina"; repo = "openvpn_exporter"; rev = "v${version}"; - sha256 = "14m4n5918zimdnyf0yg2948jb1hp1bdf27k07j07x3yrx357i05l"; + hash = "sha256-tIB4yujZj36APGAe4doKF4YlEUnieeC8bTV+FFKxpJI="; }; - vendorSha256 = "1jgw0nnibydhcd83kp6jqkf41mhwldp8wdhqk0yjw18v9m0p7g5s"; + vendorHash = "sha256-urxzQU0bBS49mBg2jm6jHNZA3MTS3DlQY7D5Fa0F/Mk="; meta = with lib; { inherit (src.meta) homepage; diff --git a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix index 52589af2da7e5..d1418a9a248a5 100644 --- a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "postgres_exporter"; - version = "0.13.2"; + version = "0.14.0"; src = fetchFromGitHub { owner = "prometheus-community"; repo = "postgres_exporter"; rev = "v${version}"; - sha256 = "sha256-K0B6EsRCWznYf4xS+9T4HafOSUPHCNsu2ZSIVXneGyk="; + sha256 = "sha256-Y66VxzKaadTNE/84aQxgTKsr/KpXwq2W/1BOvsvyNbM="; }; - vendorHash = "sha256-0MQS42/4iImtq3yBGVCe0BwV0HiJCo7LVEAbsKltE4g="; + vendorHash = "sha256-+ly4zZFCnrWycdi/RP8L0yG5/lsGzu4VwKDlea2prio="; ldflags = let diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix index b32c5a89c6f75..1b3818510076a 100644 --- a/pkgs/servers/monitoring/prometheus/pushgateway.nix +++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pushgateway"; - version = "1.6.0"; + version = "1.6.2"; src = fetchFromGitHub { owner = "prometheus"; repo = "pushgateway"; rev = "v${version}"; - sha256 = "sha256-sJ4TTyo+A3CEUcTJv3LlUU60pc/a/PgB0Mk6R5wpTgM="; + sha256 = "sha256-IwSzxpIBXIsOllAd0faP+uzpYZ8HcWJQBOgYZj9SZHM="; }; - vendorHash = "sha256-oDvFp7FYam/hsiEesfTuNgXciH4JAUKkMiECn4FPqmE="; + vendorHash = "sha256-xpbGavt0gzOVZMHVdPtZ+rRVbovJ4xaqaAmYVipLzSs="; ldflags = [ "-s" diff --git a/pkgs/servers/monitoring/prometheus/sabnzbd-exporter.nix b/pkgs/servers/monitoring/prometheus/sabnzbd-exporter.nix new file mode 100644 index 0000000000000..1412c4dff6c02 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/sabnzbd-exporter.nix @@ -0,0 +1,38 @@ +{ lib, fetchFromGitHub, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "sabnzbd_exporter"; + version = "0.1.70"; + + format = "other"; + + src = fetchFromGitHub { + owner = "msroest"; + repo = pname; + rev = version; + hash = "sha256-FkZAWIIlGX2VxRL3WS5J9lBgToQGbEQUqvf0xcdvynk="; + }; + + propagatedBuildInputs = with python3Packages; [ prometheus-client requests ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp sabnzbd_exporter.py $out/bin/ + + mkdir -p $out/share/${pname} + cp examples/* $out/share/${pname}/ + + runHook postInstall + ''; + + meta = with lib; { + description = "Prometheus exporter for sabnzbd"; + homepage = "https://github.com/msroest/sabnzbd_exporter"; + license = licenses.mit; + maintainers = with maintainers; [ fugi ]; + platforms = platforms.all; + mainProgram = "sabnzbd_exporter.py"; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/script-exporter.nix b/pkgs/servers/monitoring/prometheus/script-exporter.nix index d0806b6c5fa4e..5af5a5488d863 100644 --- a/pkgs/servers/monitoring/prometheus/script-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/script-exporter.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "adhocteam"; repo = pname; rev = "v${version}"; - sha256 = "t/xgRalcHxEcT1peU1ePJUItD02rQdfz1uWpXDBo6C0="; + hash = "sha256-t/xgRalcHxEcT1peU1ePJUItD02rQdfz1uWpXDBo6C0="; }; - vendorSha256 = "Hs1SNpC+t1OCcoF3FBgpVGkhR97ulq6zYhi8BQlgfVc="; + vendorHash = "sha256-Hs1SNpC+t1OCcoF3FBgpVGkhR97ulq6zYhi8BQlgfVc="; passthru.tests = { inherit (nixosTests.prometheus-exporters) script; }; diff --git a/pkgs/servers/monitoring/prometheus/systemd-exporter.nix b/pkgs/servers/monitoring/prometheus/systemd-exporter.nix index e0f93332547ee..767f6ebd61d55 100644 --- a/pkgs/servers/monitoring/prometheus/systemd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/systemd-exporter.nix @@ -7,17 +7,27 @@ buildGoModule rec { vendorHash = "sha256-XkwBhj2M1poirPkWzS71NbRTshc8dTKwaHoDfFxpykU="; src = fetchFromGitHub { - owner = "povilasv"; + owner = "prometheus-community"; repo = pname; rev = "v${version}"; sha256 = "sha256-q6rnD8JCtB1zTkUfZt6f2Uyo91uFi3HYI7WFlZdzpBM="; }; + ldflags = [ + "-s" + "-w" + "-X github.com/prometheus/common/version.Version=${version}" + "-X github.com/prometheus/common/version.Revision=unknown" + "-X github.com/prometheus/common/version.Branch=unknown" + "-X github.com/prometheus/common/version.BuildUser=nix@nixpkgs" + "-X github.com/prometheus/common/version.BuildDate=unknown" + ]; + passthru.tests = { inherit (nixosTests.prometheus-exporters) systemd; }; meta = with lib; { description = "Exporter for systemd unit metrics"; - homepage = "https://github.com/povilasv/systemd_exporter"; + homepage = "https://github.com/prometheus-community/systemd_exporter"; license = licenses.asl20; maintainers = with maintainers; [ chkno ]; }; diff --git a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix index a6fb147e758eb..aa86f06424096 100644 --- a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "jonnenauha"; repo = "prometheus_varnish_exporter"; rev = version; - sha256 = "15w2ijz621caink2imlp1666j0ih5pmlj62cbzggyb34ncl37ifn"; + hash = "sha256-1sUzKLNkLP/eX0wYSestMAJpjAmX1iimjYoFYb6Mgpc="; }; - vendorSha256 = "00i9znb1pk5jpmyhxfg9zbw935fk3c1r0qrgf868xlcf9p8x2rrz"; + vendorHash = "sha256-P2fR0U2O0Y4Mci9jkAMb05WR+PrpuQ59vbLMG5b9KQI="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix index 14920ea035fff..d810633c17f36 100644 --- a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix @@ -13,6 +13,11 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-NsxGpjuZPpz4gCJRp5IOcfRFh8DTud47nV2bE0/kc2Q="; + postPatch = '' + # drop hardcoded linker names, fixing static build + rm .cargo/config.toml + ''; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; passthru.tests = { inherit (nixosTests.prometheus-exporters) wireguard; }; diff --git a/pkgs/servers/monitoring/unpoller/default.nix b/pkgs/servers/monitoring/unpoller/default.nix index e471666e588ba..e3105e4b24fd3 100644 --- a/pkgs/servers/monitoring/unpoller/default.nix +++ b/pkgs/servers/monitoring/unpoller/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "unpoller"; - version = "2.8.3"; + version = "2.9.2"; src = fetchFromGitHub { owner = "unpoller"; repo = "unpoller"; rev = "v${version}"; - hash = "sha256-ONr8xwvCXLnAlJKbgt/O+lCEKbV2SJXW/1oJPYRtQ3s="; + hash = "sha256-8O5lu0AGLMrWtAd+Unv97CPhxSuhB/wiJXPZnoBjy2A="; }; vendorHash = "sha256-eLHtSEINxrqjlPyJZJwfSGA0gVaxcIolhWnqJxLXkew="; diff --git a/pkgs/servers/monitoring/uptime-kuma/default.nix b/pkgs/servers/monitoring/uptime-kuma/default.nix index 42b39e50eab5d..2bebed16c7368 100644 --- a/pkgs/servers/monitoring/uptime-kuma/default.nix +++ b/pkgs/servers/monitoring/uptime-kuma/default.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "uptime-kuma"; - version = "1.23.0"; + version = "1.23.2"; src = fetchFromGitHub { owner = "louislam"; repo = "uptime-kuma"; rev = version; - hash = "sha256-868hyugz/YJaCs4dJJ4OKHi5jx/e4ScjMBxGaNGUhe0="; + hash = "sha256-AJAnWMJDIPbZyVcz6lGMSIq/EuwL2xgj9+4jySNzUb8="; }; - npmDepsHash = "sha256-vULtoWNqvT4RW1Q1l0+9p65cZ0TZEUnhCw0/bANsjOo="; + npmDepsHash = "sha256-ABVCpJH0cS8zPNdPLlNVgAKYd1zSinS3rLJHj4hiMEY="; patches = [ # Fixes the permissions of the database being not set correctly diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index 7a659cbb7c7ce..d6d7adfb395a5 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -1,18 +1,18 @@ generic: { v60 = generic { - version = "6.0.14"; - sha256 = "sha256-YxrVl12OBxkB/cEvlGR+mV7bTBe6nRi71wLCtZPCzlg="; + version = "6.0.21"; + sha256 = "sha256-hdKPI5UEQvF/URH2eLWW32az3LMEse3UXIELOsfvwzk="; vendorHash = null; }; v50 = generic { - version = "5.0.33"; - sha256 = "sha256-VimTMcnYaFXeBW3zkDRGMxmtOFgPBU2ANKXLjgtr0GE="; - vendorHash = "sha256-RG6tSQk3dGaoTG/LHsZkayYCHbguSNOOuAFCmpSwElQ="; + version = "5.0.37"; + sha256 = "sha256-+C5fI+eMJKsynVnVJIYj27x1iFQwaG9Fnho0BXgENQI="; + vendorHash = "sha256-oSZBzIUL1yHXk7PnkSAlhI0i89aGMFrFHmbMN9rDAJ0="; }; v40 = generic { - version = "4.0.44"; - sha256 = "sha256-qB3hSHnPffenBC6gv/QQXJuVpj4/oN4/jt/O6QmiX+c="; + version = "4.0.48"; + sha256 = "sha256-WK8Zzkd/s9M7N5Qr2kejtp/f/n1wb5zRSfh0RiI2K+Q="; }; } diff --git a/pkgs/servers/moonraker/default.nix b/pkgs/servers/moonraker/default.nix index ed2e988d8a665..8d33402d7d347 100644 --- a/pkgs/servers/moonraker/default.nix +++ b/pkgs/servers/moonraker/default.nix @@ -1,23 +1,26 @@ -{ lib, stdenvNoCC, fetchFromGitHub, python3, makeWrapper, unstableGitUpdater, nixosTests }: +{ lib, stdenvNoCC, fetchFromGitHub, python3, makeWrapper, unstableGitUpdater, nixosTests, useGpiod ? false }: let - pythonEnv = python3.withPackages (packages: with packages; [ - tornado - pyserial-asyncio - pillow - lmdb - streaming-form-data - distro - inotify-simple - libnacl - paho-mqtt - pycurl - zeroconf - preprocess-cancellation - jinja2 - dbus-next - apprise - ]); + pythonEnv = python3.withPackages (packages: + with packages; [ + tornado + pyserial-asyncio + pillow + lmdb + streaming-form-data + distro + inotify-simple + libnacl + paho-mqtt + pycurl + zeroconf + preprocess-cancellation + jinja2 + dbus-next + apprise + ] + ++ (lib.optionals useGpiod [ libgpiod ]) + ); in stdenvNoCC.mkDerivation rec { pname = "moonraker"; version = "unstable-2023-08-03"; diff --git a/pkgs/servers/mx-puppet-discord/default.nix b/pkgs/servers/mx-puppet-discord/default.nix index be32bda993542..b0ccb03a8f9cb 100644 --- a/pkgs/servers/mx-puppet-discord/default.nix +++ b/pkgs/servers/mx-puppet-discord/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitLab, pkgs, lib, nodejs_14, pkg-config +{ stdenv, fetchFromGitLab, pkgs, lib, nodejs_18, pkg-config , libjpeg, pixman, cairo, pango, which, postgresql }: let - nodejs = nodejs_14; + nodejs = nodejs_18; version = "0.1.1"; diff --git a/pkgs/servers/nats-server/default.nix b/pkgs/servers/nats-server/default.nix index b715f4e60877b..93555097954f5 100644 --- a/pkgs/servers/nats-server/default.nix +++ b/pkgs/servers/nats-server/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nats-server"; - version = "2.9.22"; + version = "2.10.1"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - hash = "sha256-ednQfVG1/A8zliJ6oHXvfjIP7EtAiwdVaUSNUdKwn+g="; + hash = "sha256-gc1CGMlH5rSbq5Fr4MzMFP5FiS8nxip5JrIZsGQ/ad0="; }; - vendorHash = "sha256-B5za9EcnAytmt0p6oyvXjfeRamsslh+O7n2xMHooLSk="; + vendorHash = "sha256-ZyqIMR9rhgJXHaLFXBj3wdXGuKt0ricwti9uN62QjCE="; doCheck = false; diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 5c0ead3ea5fae..ec45f7565667f 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -60,20 +60,20 @@ in { ''; nextcloud25 = generic { - version = "25.0.11"; - hash = "sha256-UkOCknG6t9uN8ry3dGZ0y7DS3KlQu7mS5K6UO+N+rtE="; + version = "25.0.12"; + hash = "sha256-UgMYQkEdh7hjL47EEq14y0K9VIi+LT77/OSmhRykTYw="; packages = nextcloud25Packages; }; nextcloud26 = generic { - version = "26.0.6"; - hash = "sha256-LKyP2S0kgjDc0Ea7u0RGmyIPWLAQ5j+V2APZhXVer2Y="; + version = "26.0.7"; + hash = "sha256-vtJEqLlNE7YWqSdAUhZwwdZ9Q8SAR3I/sTGAv/bUjpI="; packages = nextcloud26Packages; }; nextcloud27 = generic { - version = "27.1.0"; - hash = "sha256-wxZwWeacUXt64H87sLgyQz0yRnWFkIH+lT6kG8ffEkI="; + version = "27.1.1"; + hash = "sha256-OpFQBWaHRnVnb6O1v64lh6g5zeQd+sUxgEOxYsExH6s="; packages = nextcloud27Packages; }; diff --git a/pkgs/servers/nextcloud/packages/25.json b/pkgs/servers/nextcloud/packages/25.json index 952fb6d8db832..9838732d8ad49 100644 --- a/pkgs/servers/nextcloud/packages/25.json +++ b/pkgs/servers/nextcloud/packages/25.json @@ -10,9 +10,9 @@ ] }, "calendar": { - "sha256": "0liws0xkndrx5qd06hn3n5jg7yl02w38j0nj37wyrv4qjk9w6n7v", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.4.4/calendar-v4.4.4.tar.gz", - "version": "4.4.4", + "sha256": "14jf0vrjkscz6j2xsf2xn18v3vwqkd8qi47iyyz2wlzdgi25zl6v", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.5.1/calendar-v4.5.1.tar.gz", + "version": "4.5.1", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -20,9 +20,9 @@ ] }, "contacts": { - "sha256": "0f9k3glw6kfj4ms9bxw5zcv0ygfg0jdhdn9cdzq8a3d8i07v0vb8", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.3.2/contacts-v5.3.2.tar.gz", - "version": "5.3.2", + "sha256": "1pz2px5amk3byn4pq86cyyjv4hrqhsjz61xfm7cl7z8qfckqfhi2", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.4.2/contacts-v5.4.2.tar.gz", + "version": "5.4.2", "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.", "homepage": "https://github.com/nextcloud/contacts#readme", "licenses": [ @@ -40,9 +40,9 @@ ] }, "deck": { - "sha256": "1rsfyl6p6myy36mv4x9ci3g53k4ndbwqmss4pfk3sh1y6vik8hcn", - "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.8.5/deck-v1.8.5.tar.gz", - "version": "1.8.5", + "sha256": "01bpcq96y1yp4cmkssjcpqamk3wsg99jbsyhich2kjj9a33d0a5v", + "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.8.6/deck-v1.8.6.tar.gz", + "version": "1.8.6", "description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in Markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your Markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized", "homepage": "https://github.com/nextcloud/deck", "licenses": [ @@ -80,9 +80,9 @@ ] }, "groupfolders": { - "sha256": "1yfhy14cfz16ax5i8d6zhl4m161qzy98xzm36y1656rh96i2ksbx", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v13.1.5/groupfolders-v13.1.5.tar.gz", - "version": "13.1.5", + "sha256": "0mkw8w3miq14ky3c04d3pli1n1jcrsf47005pv8ny170zyhai943", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v13.1.6/groupfolders-v13.1.6.tar.gz", + "version": "13.1.6", "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ @@ -113,15 +113,15 @@ "sha256": "1i05dbdhbsg6pmzs7w9dh0wmfd4irv4d44v1gwsfmr00w4mwn9v1", "url": "https://github.com/nextcloud-releases/mail/releases/download/v2.2.7/mail-v2.2.7.tar.gz", "version": "2.2.7", - "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n### Rating: 🟢\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", + "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ "agpl" ] }, "maps": { - "sha256": "12dg1bklv2jhmj5dnz4ram6zvgf8kipfz77g1lcn77fyhzqw6y1z", - "url": "https://github.com/nextcloud/maps/releases/download/v1.1.0/maps-1.1.0.tar.gz", + "sha256": "0517kakkk7lr7ays6rrnl276709kcm5yvkp8g6cwjnfih7pmnkn9", + "url": "https://github.com/nextcloud/maps/releases/download/v1.1.0-2a-nightly/maps-1.1.0-2a-nightly.tar.gz", "version": "1.1.0", "description": "**The whole world fits inside your cloud!**\n\n- **🗺 Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! 🎨\n- **⭐ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **🧭 Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **🖼 Photos on the map:** No more boring slideshows, just show directly where you were!\n- **🙋 Contacts on the map:** See where your friends live and plan your next visit.\n- **📱 Devices:** Lost your phone? Check the map!\n- **〰 Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.", "homepage": "https://github.com/nextcloud/maps", @@ -130,9 +130,9 @@ ] }, "memories": { - "sha256": "0v72hfn57zrvbfgd970qkm7c4lkm436k32vhxz4d1hkg83wjqsrl", - "url": "https://github.com/pulsejet/memories/releases/download/v5.2.1/memories.tar.gz", - "version": "5.2.1", + "sha256": "1w17cy5ciybq2yf42rmiim77mkfdrjg49l2l3b2v2dxpfv36is1s", + "url": "https://github.com/pulsejet/memories/releases/download/v5.4.1/memories.tar.gz", + "version": "5.4.1", "description": "# Memories: Photo Management for Nextcloud\n\nMemories is a *batteries-included* photo management solution for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects, powered by [recognize](https://github.com/nextcloud/recognize) and [facerecognition](https://github.com/matiasdelellis/facerecognition).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Work from any device, of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates and other metadata on photos quickly and in bulk.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **📹 Video Transcoding**: Transcode videos and use HLS for maximal performance.\n- **🗺️ Map**: View your photos on a map, tagged with accurate reverse geocoding.\n- **📦 Migration**: Migrate easily from Nextcloud Photos and Google Takeout.\n- **⚡️ Performance**: Do all this very fast.\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store (try a demo [here](https://demo.memories.gallery/apps/memories/)).\n1. Perform the recommended [configuration steps](https://memories.gallery/config/).\n1. Run `php occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos.", "homepage": "https://memories.gallery", "licenses": [ @@ -180,9 +180,9 @@ ] }, "polls": { - "sha256": "0w41zxbf8kqnr5hwlf6z5bymwz1d0vbgg5ippc72a8rwma7hlyay", - "url": "https://github.com/nextcloud/polls/releases/download/v5.2.0/polls.tar.gz", - "version": "5.2.0", + "sha256": "1v5zb164f60qskfiv02l9x2v0d4rayacg5qivd70dawmyqnz4vmd", + "url": "https://github.com/nextcloud/polls/releases/download/v5.3.2/polls.tar.gz", + "version": "5.3.2", "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).", "homepage": "https://github.com/nextcloud/polls", "licenses": [ @@ -220,9 +220,9 @@ ] }, "spreed": { - "sha256": "0az92qmc24n91zh2vq4qs99zppph6bchknv5akw6c7iqpg8d12gk", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v15.0.7/spreed-v15.0.7.tar.gz", - "version": "15.0.7", + "sha256": "0n6dbvfmasyrrpzqp5i5k6bcp6ipwawkvn7hl557nhy2d60k0ffs", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v15.0.8/spreed-v15.0.8.tar.gz", + "version": "15.0.8", "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat integration!** Nextcloud Talk comes with a simple text chat. Allowing you to share files from your Nextcloud and mentioning other participants.\n* 👥 **Private, group, public and password protected calls!** Just invite somebody, a whole group or send a public link to invite to a call.\n* 💻 **Screen sharing!** Share your screen with participants of your call. You just need to use Firefox version 66 (or newer), latest Edge or Chrome 72 (or newer, also possible using Chrome 49 with this [Chrome extension](https://chrome.google.com/webstore/detail/screensharing-for-nextclo/kepnpjhambipllfmgmbapncekcmabkol)).\n* 🚀 **Integration with other Nextcloud apps** like Files, Contacts and Deck. More to come.\n\nAnd in the works for the [coming versions](https://github.com/nextcloud/spreed/milestones/):\n* ✋ [Federated calls](https://github.com/nextcloud/spreed/issues/21), to call people on other Nextclouds", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ diff --git a/pkgs/servers/nextcloud/packages/26.json b/pkgs/servers/nextcloud/packages/26.json index 557b6ec045f9c..dbdd35e814fca 100644 --- a/pkgs/servers/nextcloud/packages/26.json +++ b/pkgs/servers/nextcloud/packages/26.json @@ -1,8 +1,8 @@ { "bookmarks": { - "sha256": "16j10gj5nghgji36jhng60291wl4h9c3vndjx9j8jij9qn6hz23f", - "url": "https://github.com/nextcloud/bookmarks/releases/download/v13.1.0/bookmarks-13.1.0.tar.gz", - "version": "13.1.0", + "sha256": "14dkyqm04d4ix114jbcgbx10zvkv4qlx4n56chpqz0w1y7x8idpd", + "url": "https://github.com/nextcloud/bookmarks/releases/download/v13.1.1/bookmarks-13.1.1.tar.gz", + "version": "13.1.1", "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- 🔍 Full-text search\n- 📲 Synchronize with all your browsers and devices\n- 👪 Share bookmarks with other users and publicly\n- ☠ Find broken links\n- ⚛ Generate RSS feeds of your collections\n- 📔 Read archived versions of your links in case they are depublished\n- 💬 Create new bookmarks directly from within Nextcloud Talk\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0", "homepage": "https://github.com/nextcloud/bookmarks", "licenses": [ @@ -10,9 +10,9 @@ ] }, "calendar": { - "sha256": "0liws0xkndrx5qd06hn3n5jg7yl02w38j0nj37wyrv4qjk9w6n7v", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.4.4/calendar-v4.4.4.tar.gz", - "version": "4.4.4", + "sha256": "14jf0vrjkscz6j2xsf2xn18v3vwqkd8qi47iyyz2wlzdgi25zl6v", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.5.1/calendar-v4.5.1.tar.gz", + "version": "4.5.1", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -20,9 +20,9 @@ ] }, "contacts": { - "sha256": "0f9k3glw6kfj4ms9bxw5zcv0ygfg0jdhdn9cdzq8a3d8i07v0vb8", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.3.2/contacts-v5.3.2.tar.gz", - "version": "5.3.2", + "sha256": "1pz2px5amk3byn4pq86cyyjv4hrqhsjz61xfm7cl7z8qfckqfhi2", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.4.2/contacts-v5.4.2.tar.gz", + "version": "5.4.2", "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.", "homepage": "https://github.com/nextcloud/contacts#readme", "licenses": [ @@ -40,9 +40,9 @@ ] }, "deck": { - "sha256": "0lgm6d99r2qpsx3ymnjy5i7h8c0yif9fgn2nhq49jz51x09pc7kd", - "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.9.2/deck-v1.9.2.tar.gz", - "version": "1.9.2", + "sha256": "0j228lbf0zrm2sq45f9abgkln1qzgrkw8ac5r6fhyi0qfxcpmm0m", + "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.9.3/deck-v1.9.3.tar.gz", + "version": "1.9.3", "description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in Markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your Markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized", "homepage": "https://github.com/nextcloud/deck", "licenses": [ @@ -80,9 +80,9 @@ ] }, "groupfolders": { - "sha256": "00w3ri03d8kwnzzjgfbx8c5882gnw666nyxpjp4nq5rmr05m14s1", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v14.0.4/groupfolders-v14.0.4.tar.gz", - "version": "14.0.4", + "sha256": "03zljgzhyvvc7jfabphxvkgp8rhbypz17zmlvmr46cwh1djnx5m9", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v14.0.5/groupfolders-v14.0.5.tar.gz", + "version": "14.0.5", "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ @@ -110,19 +110,19 @@ ] }, "mail": { - "sha256": "044adgcsix1lkisk6lr6y1z7hiqb0p3sipwn16xilxy1cdnxwf5h", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.2.6/mail-v3.2.6.tar.gz", - "version": "3.2.6", - "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n### Rating: 🟢\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", + "sha256": "1n5z683ws6206vcy0qza342ihwv4wl5kvr1nscji84hvl18ccdfr", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.4.0/mail-v3.4.0.tar.gz", + "version": "3.4.0", + "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ "agpl" ] }, "maps": { - "sha256": "12dg1bklv2jhmj5dnz4ram6zvgf8kipfz77g1lcn77fyhzqw6y1z", - "url": "https://github.com/nextcloud/maps/releases/download/v1.1.0/maps-1.1.0.tar.gz", - "version": "1.1.0", + "sha256": "1rcmqnm5364h5gaq1yy6b6d7k17napgn0yc9ymrnn75bps9s71v9", + "url": "https://github.com/nextcloud/maps/releases/download/v1.1.1/maps-1.1.1.tar.gz", + "version": "1.1.1", "description": "**The whole world fits inside your cloud!**\n\n- **🗺 Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! 🎨\n- **⭐ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **🧭 Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **🖼 Photos on the map:** No more boring slideshows, just show directly where you were!\n- **🙋 Contacts on the map:** See where your friends live and plan your next visit.\n- **📱 Devices:** Lost your phone? Check the map!\n- **〰 Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.", "homepage": "https://github.com/nextcloud/maps", "licenses": [ @@ -130,9 +130,9 @@ ] }, "memories": { - "sha256": "0v72hfn57zrvbfgd970qkm7c4lkm436k32vhxz4d1hkg83wjqsrl", - "url": "https://github.com/pulsejet/memories/releases/download/v5.2.1/memories.tar.gz", - "version": "5.2.1", + "sha256": "1w17cy5ciybq2yf42rmiim77mkfdrjg49l2l3b2v2dxpfv36is1s", + "url": "https://github.com/pulsejet/memories/releases/download/v5.4.1/memories.tar.gz", + "version": "5.4.1", "description": "# Memories: Photo Management for Nextcloud\n\nMemories is a *batteries-included* photo management solution for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects, powered by [recognize](https://github.com/nextcloud/recognize) and [facerecognition](https://github.com/matiasdelellis/facerecognition).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Work from any device, of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates and other metadata on photos quickly and in bulk.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **📹 Video Transcoding**: Transcode videos and use HLS for maximal performance.\n- **🗺️ Map**: View your photos on a map, tagged with accurate reverse geocoding.\n- **📦 Migration**: Migrate easily from Nextcloud Photos and Google Takeout.\n- **⚡️ Performance**: Do all this very fast.\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store (try a demo [here](https://demo.memories.gallery/apps/memories/)).\n1. Perform the recommended [configuration steps](https://memories.gallery/config/).\n1. Run `php occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos.", "homepage": "https://memories.gallery", "licenses": [ @@ -180,9 +180,9 @@ ] }, "polls": { - "sha256": "0w41zxbf8kqnr5hwlf6z5bymwz1d0vbgg5ippc72a8rwma7hlyay", - "url": "https://github.com/nextcloud/polls/releases/download/v5.2.0/polls.tar.gz", - "version": "5.2.0", + "sha256": "1v5zb164f60qskfiv02l9x2v0d4rayacg5qivd70dawmyqnz4vmd", + "url": "https://github.com/nextcloud/polls/releases/download/v5.3.2/polls.tar.gz", + "version": "5.3.2", "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).", "homepage": "https://github.com/nextcloud/polls", "licenses": [ @@ -220,9 +220,9 @@ ] }, "spreed": { - "sha256": "09jkq0fiw5h60qvjhld0nrralf2yrdcnpr9q4chw5hq0q710526n", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v16.0.5/spreed-v16.0.5.tar.gz", - "version": "16.0.5", + "sha256": "1fnlilb9l4vfqdkyk0f3djzdkv0pw3yy30f7psfj6hh6y82pvfky", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v16.0.6/spreed-v16.0.6.tar.gz", + "version": "16.0.6", "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat integration!** Nextcloud Talk comes with a simple text chat. Allowing you to share files from your Nextcloud and mentioning other participants.\n* 👥 **Private, group, public and password protected calls!** Just invite somebody, a whole group or send a public link to invite to a call.\n* 💻 **Screen sharing!** Share your screen with participants of your call. You just need to use Firefox version 66 (or newer), latest Edge or Chrome 72 (or newer, also possible using Chrome 49 with this [Chrome extension](https://chrome.google.com/webstore/detail/screensharing-for-nextclo/kepnpjhambipllfmgmbapncekcmabkol)).\n* 🚀 **Integration with other Nextcloud apps** like Files, Contacts and Deck. More to come.\n\nAnd in the works for the [coming versions](https://github.com/nextcloud/spreed/milestones/):\n* ✋ [Federated calls](https://github.com/nextcloud/spreed/issues/21), to call people on other Nextclouds", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ diff --git a/pkgs/servers/nextcloud/packages/27.json b/pkgs/servers/nextcloud/packages/27.json index 850b46bf8379b..a8bb03bc6962d 100644 --- a/pkgs/servers/nextcloud/packages/27.json +++ b/pkgs/servers/nextcloud/packages/27.json @@ -1,8 +1,8 @@ { "bookmarks": { - "sha256": "16j10gj5nghgji36jhng60291wl4h9c3vndjx9j8jij9qn6hz23f", - "url": "https://github.com/nextcloud/bookmarks/releases/download/v13.1.0/bookmarks-13.1.0.tar.gz", - "version": "13.1.0", + "sha256": "14dkyqm04d4ix114jbcgbx10zvkv4qlx4n56chpqz0w1y7x8idpd", + "url": "https://github.com/nextcloud/bookmarks/releases/download/v13.1.1/bookmarks-13.1.1.tar.gz", + "version": "13.1.1", "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- 🔍 Full-text search\n- 📲 Synchronize with all your browsers and devices\n- 👪 Share bookmarks with other users and publicly\n- ☠ Find broken links\n- ⚛ Generate RSS feeds of your collections\n- 📔 Read archived versions of your links in case they are depublished\n- 💬 Create new bookmarks directly from within Nextcloud Talk\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0", "homepage": "https://github.com/nextcloud/bookmarks", "licenses": [ @@ -10,9 +10,9 @@ ] }, "calendar": { - "sha256": "0liws0xkndrx5qd06hn3n5jg7yl02w38j0nj37wyrv4qjk9w6n7v", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.4.4/calendar-v4.4.4.tar.gz", - "version": "4.4.4", + "sha256": "14jf0vrjkscz6j2xsf2xn18v3vwqkd8qi47iyyz2wlzdgi25zl6v", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.5.1/calendar-v4.5.1.tar.gz", + "version": "4.5.1", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -20,9 +20,9 @@ ] }, "contacts": { - "sha256": "0f9k3glw6kfj4ms9bxw5zcv0ygfg0jdhdn9cdzq8a3d8i07v0vb8", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.3.2/contacts-v5.3.2.tar.gz", - "version": "5.3.2", + "sha256": "1pz2px5amk3byn4pq86cyyjv4hrqhsjz61xfm7cl7z8qfckqfhi2", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.4.2/contacts-v5.4.2.tar.gz", + "version": "5.4.2", "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.", "homepage": "https://github.com/nextcloud/contacts#readme", "licenses": [ @@ -40,9 +40,9 @@ ] }, "deck": { - "sha256": "1vj58yfwgnsjs0khlyazfp1rx2sppkhv5c9w9hw3gjsxvg6ayxph", - "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.10.0/deck-v1.10.0.tar.gz", - "version": "1.10.0", + "sha256": "060im5zlj7w6x9d5jpxsziqc8ym6fk573dynvdz231jx360s52g6", + "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.11.0/deck-v1.11.0.tar.gz", + "version": "1.11.0", "description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in Markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your Markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized", "homepage": "https://github.com/nextcloud/deck", "licenses": [ @@ -80,9 +80,9 @@ ] }, "groupfolders": { - "sha256": "1ghq09ym82i6w4w11zarx5m64axa3m1abwyzmmhz9zv1rlz5xjm4", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v15.0.2/groupfolders-v15.0.2.tar.gz", - "version": "15.0.2", + "sha256": "17wqhnbbmgw5ywi39ygf6m1hys7fvr5nhbjzqna6a0bjfr9g19d7", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v15.3.1/groupfolders-v15.3.1.tar.gz", + "version": "15.3.1", "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ @@ -110,19 +110,19 @@ ] }, "mail": { - "sha256": "044adgcsix1lkisk6lr6y1z7hiqb0p3sipwn16xilxy1cdnxwf5h", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.2.6/mail-v3.2.6.tar.gz", - "version": "3.2.6", - "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n### Rating: 🟢\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", + "sha256": "1n5z683ws6206vcy0qza342ihwv4wl5kvr1nscji84hvl18ccdfr", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.4.0/mail-v3.4.0.tar.gz", + "version": "3.4.0", + "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ "agpl" ] }, "maps": { - "sha256": "12dg1bklv2jhmj5dnz4ram6zvgf8kipfz77g1lcn77fyhzqw6y1z", - "url": "https://github.com/nextcloud/maps/releases/download/v1.1.0/maps-1.1.0.tar.gz", - "version": "1.1.0", + "sha256": "1rcmqnm5364h5gaq1yy6b6d7k17napgn0yc9ymrnn75bps9s71v9", + "url": "https://github.com/nextcloud/maps/releases/download/v1.1.1/maps-1.1.1.tar.gz", + "version": "1.1.1", "description": "**The whole world fits inside your cloud!**\n\n- **🗺 Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! 🎨\n- **⭐ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **🧭 Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **🖼 Photos on the map:** No more boring slideshows, just show directly where you were!\n- **🙋 Contacts on the map:** See where your friends live and plan your next visit.\n- **📱 Devices:** Lost your phone? Check the map!\n- **〰 Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.", "homepage": "https://github.com/nextcloud/maps", "licenses": [ @@ -130,9 +130,9 @@ ] }, "memories": { - "sha256": "0v72hfn57zrvbfgd970qkm7c4lkm436k32vhxz4d1hkg83wjqsrl", - "url": "https://github.com/pulsejet/memories/releases/download/v5.2.1/memories.tar.gz", - "version": "5.2.1", + "sha256": "1w17cy5ciybq2yf42rmiim77mkfdrjg49l2l3b2v2dxpfv36is1s", + "url": "https://github.com/pulsejet/memories/releases/download/v5.4.1/memories.tar.gz", + "version": "5.4.1", "description": "# Memories: Photo Management for Nextcloud\n\nMemories is a *batteries-included* photo management solution for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects, powered by [recognize](https://github.com/nextcloud/recognize) and [facerecognition](https://github.com/matiasdelellis/facerecognition).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Work from any device, of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates and other metadata on photos quickly and in bulk.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **📹 Video Transcoding**: Transcode videos and use HLS for maximal performance.\n- **🗺️ Map**: View your photos on a map, tagged with accurate reverse geocoding.\n- **📦 Migration**: Migrate easily from Nextcloud Photos and Google Takeout.\n- **⚡️ Performance**: Do all this very fast.\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store (try a demo [here](https://demo.memories.gallery/apps/memories/)).\n1. Perform the recommended [configuration steps](https://memories.gallery/config/).\n1. Run `php occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos.", "homepage": "https://memories.gallery", "licenses": [ @@ -180,9 +180,9 @@ ] }, "polls": { - "sha256": "0w41zxbf8kqnr5hwlf6z5bymwz1d0vbgg5ippc72a8rwma7hlyay", - "url": "https://github.com/nextcloud/polls/releases/download/v5.2.0/polls.tar.gz", - "version": "5.2.0", + "sha256": "1v5zb164f60qskfiv02l9x2v0d4rayacg5qivd70dawmyqnz4vmd", + "url": "https://github.com/nextcloud/polls/releases/download/v5.3.2/polls.tar.gz", + "version": "5.3.2", "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).", "homepage": "https://github.com/nextcloud/polls", "licenses": [ @@ -220,9 +220,9 @@ ] }, "spreed": { - "sha256": "02npdw77xbpmxr8nff4wpiz08155zcxbkd3awhzhl6gq00pigwrw", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v17.0.3/spreed-v17.0.3.tar.gz", - "version": "17.0.3", + "sha256": "07q6kxbvrg652px8a4wi1msxm2z7r7z7s8v4nnccvdcscv90d99d", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v17.1.1/spreed-v17.1.1.tar.gz", + "version": "17.1.1", "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat integration!** Nextcloud Talk comes with a simple text chat. Allowing you to share files from your Nextcloud and mentioning other participants.\n* 👥 **Private, group, public and password protected calls!** Just invite somebody, a whole group or send a public link to invite to a call.\n* 💻 **Screen sharing!** Share your screen with participants of your call. You just need to use Firefox version 66 (or newer), latest Edge or Chrome 72 (or newer, also possible using Chrome 49 with this [Chrome extension](https://chrome.google.com/webstore/detail/screensharing-for-nextclo/kepnpjhambipllfmgmbapncekcmabkol)).\n* 🚀 **Integration with other Nextcloud apps** like Files, Contacts and Deck. More to come.\n\nAnd in the works for the [coming versions](https://github.com/nextcloud/spreed/milestones/):\n* ✋ [Federated calls](https://github.com/nextcloud/spreed/issues/21), to call people on other Nextclouds", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ diff --git a/pkgs/servers/nitter/default.nix b/pkgs/servers/nitter/default.nix index 013a66ef3d3f4..07fc8b50e6ac3 100644 --- a/pkgs/servers/nitter/default.nix +++ b/pkgs/servers/nitter/default.nix @@ -11,6 +11,7 @@ , karax , markdown , nimcrypto +, openssl , packedjson , redis , redpool @@ -46,6 +47,7 @@ buildNimPackage rec { karax markdown nimcrypto + openssl packedjson redis redpool diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index 74d832803b1df..36c978e364fea 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -62,10 +62,11 @@ gcc10Stdenv.mkDerivation rec { patchShebangs utils ''; + cmakeBuildType = "RelWithDebInfo"; + cmakeFlags = [ "-DUSE_MAINTAINER_MODE=OFF" "-DUSE_GOOGLE_TESTS=OFF" - "-DCMAKE_BUILD_TYPE=RelWithDebInfo" # avoid reading /proc/cpuinfo for feature detection "-DTARGET_ARCHITECTURE=${targetArch}" diff --git a/pkgs/servers/nosql/ferretdb/default.nix b/pkgs/servers/nosql/ferretdb/default.nix index 237ddfee40886..0fba93fb5b56e 100644 --- a/pkgs/servers/nosql/ferretdb/default.nix +++ b/pkgs/servers/nosql/ferretdb/default.nix @@ -5,13 +5,13 @@ buildGo121Module rec { pname = "ferretdb"; - version = "1.10.1"; + version = "1.11.0"; src = fetchFromGitHub { owner = "FerretDB"; repo = "FerretDB"; rev = "v${version}"; - hash = "sha256-Pw3rusnFYlVPL55dj7VM8kGxE2c+72jgEXCoS4+hufY="; + hash = "sha256-jasAfbE3CRlBJeyMnqKJBbmA+W/QnytGIUdyXR55EaU="; }; postPatch = '' @@ -19,7 +19,7 @@ buildGo121Module rec { echo nixpkgs > build/version/package.txt ''; - vendorHash = "sha256-1hkJMkMgDrjOgKgGX96hv5PALqx0KyjUZXXiIvUh5VA="; + vendorHash = "sha256-5TjKGGEX66qNr2/25zRd7UESi03g7FI1AfEsW2mBcDE="; CGO_ENABLED = 0; diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix index ff82755d8cd79..5be49f18891f9 100644 --- a/pkgs/servers/nosql/mongodb/mongodb.nix +++ b/pkgs/servers/nosql/mongodb/mongodb.nix @@ -190,7 +190,7 @@ in stdenv.mkDerivation rec { homepage = "http://www.mongodb.org"; inherit license; - maintainers = with maintainers; [ bluescreen303 offline cstrahan ]; + maintainers = with maintainers; [ bluescreen303 offline ]; platforms = subtractLists systems.doubles.i686 systems.doubles.unix; broken = (versionOlder version "6.0" && stdenv.system == "aarch64-darwin"); }; diff --git a/pkgs/servers/nosql/questdb/default.nix b/pkgs/servers/nosql/questdb/default.nix index 5d91e6dc32459..f2bbf4b9a2501 100644 --- a/pkgs/servers/nosql/questdb/default.nix +++ b/pkgs/servers/nosql/questdb/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "questdb"; - version = "7.3.1"; + version = "7.3.2"; src = fetchurl { url = "https://github.com/questdb/questdb/releases/download/${finalAttrs.version}/questdb-${finalAttrs.version}-no-jre-bin.tar.gz"; - hash = "sha256-bnnuIoARr7awwdxDo9NDKy1HEJVl24YTqYhBpmc8n/o="; + hash = "sha256-JiMY4TICsf7OQPXYCOqlQ+av0InR10EptXHm/QXEpGI="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 201e87aab2eb5..25d8896945045 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, lua, jemalloc, pkg-config, nixosTests +{ lib, stdenv, fetchurl, lua, jemalloc, pkg-config, nixosTests , tcl, which, ps, getconf , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd # dependency ordering is broken at the moment when building with openssl @@ -10,12 +10,12 @@ , useSystemJemalloc ? true }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "redis"; version = "7.2.1"; src = fetchurl { - url = "https://download.redis.io/releases/${pname}-${version}.tar.gz"; + url = "https://download.redis.io/releases/redis-${finalAttrs.version}.tar.gz"; hash = "sha256-XHbZkKGxxflJvNHu2Q0Mik9wNpvb3LQCiMVh3fiJZ6Q="; }; @@ -84,8 +84,8 @@ stdenv.mkDerivation rec { description = "An open source, advanced key-value store"; license = licenses.bsd3; platforms = platforms.all; - changelog = "https://github.com/redis/redis/raw/${version}/00-RELEASENOTES"; + changelog = "https://github.com/redis/redis/raw/${finalAttrs.version}/00-RELEASENOTES"; maintainers = with maintainers; [ berdario globin marsam ]; mainProgram = "redis-cli"; }; -} +}) diff --git a/pkgs/servers/nsq/default.nix b/pkgs/servers/nsq/default.nix index dd948b8b1c482..870664854172d 100644 --- a/pkgs/servers/nsq/default.nix +++ b/pkgs/servers/nsq/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "nsqio"; repo = "nsq"; rev = "v${version}"; - sha256 = "0ajqjwfn06zsmz21z9mkl4cblarypaf20228pqcd1293zl6y3ry8"; + hash = "sha256-yOfhDf0jidAYvkgIIJy6Piu6GKGzph/Er/obYB2XWCo="; }; - vendorSha256 = "11sx96zshaciqrm8rqmhz1sf6nd4lczqwiha031xyyifvmpp2hsa"; + vendorHash = "sha256-SkNxb90uet/DAApGjj+jpFnjdPiw4oxqxpEpqL9JXYc="; excludedPackages = [ "bench" ]; diff --git a/pkgs/servers/oauth2-proxy/default.nix b/pkgs/servers/oauth2-proxy/default.nix index cea8a0e7ce8b4..b9e457006c6cd 100644 --- a/pkgs/servers/oauth2-proxy/default.nix +++ b/pkgs/servers/oauth2-proxy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "oauth2-proxy"; - version = "7.4.0"; + version = "7.5.1"; src = fetchFromGitHub { repo = pname; owner = "oauth2-proxy"; - sha256 = "sha256-/PoMi09j9ADDnaB7E/zU1AFiYpO+ZScFszN1E9OM0TM="; + sha256 = "sha256-zIw30pFf/IxruG3MYwrrLhANBPemLsYdYnPRO+EWNs0="; rev = "v${version}"; }; - vendorHash = "sha256-2WUd2RxeOal0lpp/TuGSyfP1ppvG/Vd3bgsSsNO8ejo="; + vendorHash = "sha256-Z2yPfUkDb07db8T3/1v9onnNloaKEN5tdrMDNIy7QHo="; # Taken from https://github.com/oauth2-proxy/oauth2-proxy/blob/master/Makefile ldflags = [ "-X main.VERSION=${version}" ]; diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 2f11a9a4e0caa..6ef9287004fdf 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.32.6.7468-07e0d4a7e"; + version = "1.32.6.7557-1cf77d501"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "01sdhm307zsnsj893qch9h2yc07y7yijz5j0y4p223v29picr3h6"; + sha256 = "0ym2s425084l5lzpw9j1aqw2nc6f4l5vzizvpj1gicf4yp2dyk91"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "066hfidm25830xljj3ygq6vr142v2n4z3w94wnxfhxv2mx5fxall"; + sha256 = "1jqgglyzlfzq5saa21338vn2v3x25vl24x1w17j5wq30ca7nmzdr"; }; outputs = [ "out" "basedb" ]; diff --git a/pkgs/servers/polaris/default.nix b/pkgs/servers/polaris/default.nix index 647b278e39be7..fc3141d464473 100644 --- a/pkgs/servers/polaris/default.nix +++ b/pkgs/servers/polaris/default.nix @@ -5,6 +5,7 @@ , nix-update-script , polaris-web , darwin +, nixosTests }: rustPlatform.buildRustPackage rec { @@ -58,6 +59,7 @@ rustPlatform.buildRustPackage rec { __darwinAllowLocalNetworking = true; + passthru.tests = nixosTests.polaris; passthru.updateScript = nix-update-script { attrPath = pname; }; diff --git a/pkgs/servers/polaris/web.nix b/pkgs/servers/polaris/web.nix index d0c310c2ad86a..19d35103281db 100644 --- a/pkgs/servers/polaris/web.nix +++ b/pkgs/servers/polaris/web.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "polaris-web"; - version = "67"; + version = "68"; src = fetchFromGitHub { owner = "agersant"; repo = "polaris-web"; rev = "build-${version}"; - hash = "sha256-mhrgHNbqxLhhLWP4eu1A3ytrx9Q3X0EESL2LuTfgsBE="; + hash = "sha256-YvVNTqv/DQzRyMuDgDdtCyoQbt4EqVztGa0NO92pO/Q="; }; - npmDepsHash = "sha256-lScXbxkJiRq5LLFkoz5oZsmKz8I/t1rZJVonfct9r+0="; + npmDepsHash = "sha256-c11CWJB76gX+Bxmqac3VxWjJxQVzYCaaf+pmQQpnOds="; env.CYPRESS_INSTALL_BINARY = "0"; diff --git a/pkgs/servers/portunus/default.nix b/pkgs/servers/portunus/default.nix index a59df99c8d183..b2cd17f016d25 100644 --- a/pkgs/servers/portunus/default.nix +++ b/pkgs/servers/portunus/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-+sq5Wja0tVkPZ0Z++K2A6my9LfLJ4twxtoEAS6LHqzE="; }; - vendorSha256 = null; + vendorHash = null; postInstall = '' mv $out/bin/{,portunus-}orchestrator diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 0c15e21f5a369..fe701f7b819d0 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -179,6 +179,9 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ lovek323 ]; platforms = lib.platforms.unix; + # https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/issues/1089 + badPlatforms = [ lib.systems.inspect.platformPatterns.isStatic ]; + longDescription = '' PulseAudio is a sound server for POSIX and Win32 systems. A sound server is basically a proxy for your sound applications. diff --git a/pkgs/servers/readarr/default.nix b/pkgs/servers/readarr/default.nix index 609d0cacddf28..74dc9acfc9825 100644 --- a/pkgs/servers/readarr/default.nix +++ b/pkgs/servers/readarr/default.nix @@ -8,13 +8,13 @@ let x86_64-darwin = "x64"; }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-0q+MHdNRzq7gmv5jiArU1q+1UBWNZx0JRgiIy2pnIAc="; - arm64-linux_hash = "sha256-NtbzzbWfEE1thyGOuJhTYXPxhTpw9lqXcvvlfmvCMqM="; - x64-osx_hash = "sha256-oz2Sbvr8fky0mpBUXRKYki3UL0ewA/a2hEtPISBV8Ko="; + x64-linux_hash = "sha256-H48WjqRAG7I+IPhCANuJ137IwCXkTa5vrfh5Wm4tOyE="; + arm64-linux_hash = "sha256-lBclZfdYuI/ICgEpnekxNdMB6lvsJfK6Wzf/mMmtafU="; + x64-osx_hash = "sha256-1UUK0xU0WdLMjkbIEWVqpwa74tir9CkTSq63uqq9ygY="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "readarr"; - version = "0.3.3.2171"; + version = "0.3.6.2232"; src = fetchurl { url = "https://github.com/Readarr/Readarr/releases/download/v${version}/Readarr.develop.${version}.${os}-core-${arch}.tar.gz"; diff --git a/pkgs/servers/routinator/default.nix b/pkgs/servers/routinator/default.nix index a56a5e491a039..3ab45831389b6 100644 --- a/pkgs/servers/routinator/default.nix +++ b/pkgs/servers/routinator/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "routinator"; - version = "0.12.2"; + version = "0.13.0"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = pname; rev = "v${version}"; - hash = "sha256-fblUr2gtlGMRAFbpWYDafskLmIls56e9b2GFD7ASZHM="; + hash = "sha256-gInJS7JpvEbmOuZecB4xjff2d7TnjcVV+8mPOmy5Oyo="; }; - cargoHash = "sha256-pvb/tZW4jqNSLgp+Ktakd3J1KVfCRtPgE0bgNst6ImQ="; + cargoHash = "sha256-c5SQysjO821pfGhnyB4aGOZuwrHaN502PfkA1gBPtY4="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix index 67b55dd23f06d..07c2ebe13b49b 100644 --- a/pkgs/servers/sabnzbd/default.nix +++ b/pkgs/servers/sabnzbd/default.nix @@ -47,14 +47,14 @@ let ]); path = lib.makeBinPath [ coreutils par2cmdline unrar unzip p7zip util-linux ]; in stdenv.mkDerivation rec { - version = "4.0.3"; + version = "4.1.0"; pname = "sabnzbd"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-6d/UGFuySgKvpqhGjzl007GS9yMgfgI3YwTxkxsCzew="; + sha256 = "sha256-FN2BKvO9ToTvGdYqgv0wMSPgshMrVybDs9wsBo8MkII="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/scaphandre/default.nix b/pkgs/servers/scaphandre/default.nix index 04a3c7fee1695..21b72c031be2c 100644 --- a/pkgs/servers/scaphandre/default.nix +++ b/pkgs/servers/scaphandre/default.nix @@ -1,10 +1,8 @@ -{ stdenv -, lib +{ lib , rustPlatform , fetchFromGitHub , pkg-config , openssl -, powercap , nix-update-script , runCommand , dieHook @@ -66,7 +64,7 @@ rustPlatform.buildRustPackage rec { description = "Electrical power consumption metrology agent"; homepage = "https://github.com/hubblo-org/scaphandre"; license = licenses.asl20; - platforms = with platforms; [ "x86_64-linux"]; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ gaelreyrol ]; }; } diff --git a/pkgs/servers/search/elasticsearch/7.x.nix b/pkgs/servers/search/elasticsearch/7.x.nix index 6eea9d751d517..9efa621e5b4bb 100644 --- a/pkgs/servers/search/elasticsearch/7.x.nix +++ b/pkgs/servers/search/elasticsearch/7.x.nix @@ -16,12 +16,12 @@ let info = splitString "-" stdenv.hostPlatform.system; arch = elemAt info 0; plat = elemAt info 1; - shas = + hashes = { - x86_64-linux = "7a2013e43c7fc39e86a31a733cc74c587ef2bba0c013f95ce874f98b488a4f8f0e6fb254a1eedd5c0b0e210aed9a0195f7358fa9653c890e234413ff93190807"; - x86_64-darwin = "e6f49e7c0f59e260b3e3d43e57375c9352976c4f51118005e3a9127f41b59f95e51ea158cd318e99410e6d98464ea1f84432c905d12a84b8f68b2ce35905f944"; - aarch64-linux = "f2790f49b79c381246bbf87431919452af93aa4fd8aa6bc9c1f9031e7ed5d9c649f5bab867c28a7d1602e2285d3f4a5f78f809ac05744b02ad67d68610bb677d"; - aarch64-darwin = "75b66b60650bb82dc517f4a594fa40816d3becb92bf3b349f3e8324cc6b297c8bcacebc08e7661891fd4ede03a099fea56c1509291804dd03345717c36564172"; + x86_64-linux = "sha512-eiAT5Dx/w56GoxpzPMdMWH7yu6DAE/lc6HT5i0iKT48Ob7JUoe7dXAsOIQrtmgGV9zWPqWU8iQ4jRBP/kxkIBw=="; + x86_64-darwin = "sha512-5vSefA9Z4mCz49Q+Vzdck1KXbE9REYAF46kSf0G1n5XlHqFYzTGOmUEObZhGTqH4RDLJBdEqhLj2iyzjWQX5RA=="; + aarch64-linux = "sha512-8nkPSbecOBJGu/h0MZGUUq+Tqk/YqmvJwfkDHn7V2cZJ9bq4Z8KKfRYC4ihdP0pfePgJrAV0SwKtZ9aGELtnfQ=="; + aarch64-darwin = "sha512-dbZrYGULuC3FF/SllPpAgW077Lkr87NJ8+gyTMayl8i8rOvAjnZhiR/U7eA6CZ/qVsFQkpGATdAzRXF8NlZBcg=="; }; in stdenv.mkDerivation rec { @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch/${pname}-${version}-${plat}-${arch}.tar.gz"; - sha512 = shas.${stdenv.hostPlatform.system} or (throw "Unknown architecture"); + hash = hashes.${stdenv.hostPlatform.system} or (throw "Unknown architecture"); }; patches = [ ./es-home-6.x.patch ]; @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { binaryBytecode binaryNativeCode ]; - license = licenses.elastic; + license = licenses.elastic20; platforms = platforms.unix; maintainers = with maintainers; [ apeschar basvandijk ]; }; diff --git a/pkgs/servers/search/opensearch/default.nix b/pkgs/servers/search/opensearch/default.nix index d32d77f0ae49d..35fdeed8ce289 100644 --- a/pkgs/servers/search/opensearch/default.nix +++ b/pkgs/servers/search/opensearch/default.nix @@ -11,11 +11,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "opensearch"; - version = "2.9.0"; + version = "2.10.0"; src = fetchurl { url = "https://artifacts.opensearch.org/releases/bundle/opensearch/${finalAttrs.version}/opensearch-${finalAttrs.version}-linux-x64.tar.gz"; - hash = "sha256-A9YjwtmacQDC8PrdyP/ai6J+roqmP/bz99rSM3votow="; + hash = "sha256-oJLxdXHn+fEp2ATWdyFRbfM/QebAWiT7cogxIwLrgfs="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/search/quickwit/Cargo.lock b/pkgs/servers/search/quickwit/Cargo.lock index f62ec3b25ab3d..c83170fe2c777 100644 --- a/pkgs/servers/search/quickwit/Cargo.lock +++ b/pkgs/servers/search/quickwit/Cargo.lock @@ -10,9 +10,9 @@ checksum = "8b5ace29ee3216de37c0546865ad08edef58b0f9e76838ed8959a84a990e58c5" [[package]] name = "addr2line" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" dependencies = [ "gimli", ] @@ -35,9 +35,9 @@ dependencies = [ [[package]] name = "aes" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433cfd6710c9986c576a25ca913c39d66a6474107b406f34f91d4a8923395241" +checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" dependencies = [ "cfg-if", "cipher", @@ -50,7 +50,7 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "getrandom 0.2.9", + "getrandom 0.2.10", "once_cell", "version_check", ] @@ -62,15 +62,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" dependencies = [ "cfg-if", + "getrandom 0.2.10", "once_cell", "version_check", ] [[package]] name = "aho-corasick" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" dependencies = [ "memchr", ] @@ -82,6 +83,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" [[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[package]] name = "android-tzdata" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -112,15 +119,6 @@ dependencies = [ ] [[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] name = "ansitok" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -146,15 +144,15 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" +checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" [[package]] name = "anstyle-parse" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" dependencies = [ "utf8parse", ] @@ -180,9 +178,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" [[package]] name = "anymap" @@ -204,9 +202,9 @@ checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" [[package]] name = "arrayvec" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "ascii-canvas" @@ -240,9 +238,9 @@ dependencies = [ [[package]] name = "async-channel" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", "event-listener", @@ -293,41 +291,30 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.26", ] [[package]] name = "async-trait" -version = "0.1.68" +version = "0.1.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +checksum = "a564d521dd56509c4c47480d00b80ee55f7e385ae48db5744c67ad50c92d2ebf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.26", ] [[package]] name = "atoi" -version = "1.0.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7c57d12312ff59c811c0643f4d80830505833c9ffaebd193d819392b265be8e" +checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" dependencies = [ "num-traits", ] [[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi 0.3.9", -] - -[[package]] name = "autocfg" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -351,12 +338,12 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes", - "fastrand", + "fastrand 1.9.0", "hex", "http", "hyper", "ring", - "time 0.3.21", + "time 0.3.23", "tokio", "tower", "tracing", @@ -371,7 +358,7 @@ checksum = "1fcdb2f7acbc076ff5ad05e7864bdb191ca70a6fd07668dc3a1a8bcd051de5ae" dependencies = [ "aws-smithy-async", "aws-smithy-types", - "fastrand", + "fastrand 1.9.0", "tokio", "tracing", "zeroize", @@ -412,9 +399,9 @@ dependencies = [ [[package]] name = "aws-sdk-kinesis" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda5450344773e1c2a5e5ff42d3364a38f4a7303c202c4d81da56887cf08d485" +checksum = "ca88060b315da80279486d079a2c5c27891fc60a7e770526e50ad5d98551f650" dependencies = [ "aws-credential-types", "aws-endpoint", @@ -437,9 +424,9 @@ dependencies = [ [[package]] name = "aws-sdk-s3" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37c77060408d653d3efa6ea7b66c1389bc35a0342352984c8bf8bcb814a8fc27" +checksum = "fba197193cbb4bcb6aad8d99796b2291f36fa89562ded5d4501363055b0de89f" dependencies = [ "aws-credential-types", "aws-endpoint", @@ -551,7 +538,7 @@ dependencies = [ "percent-encoding", "regex", "sha2", - "time 0.3.21", + "time 0.3.23", "tracing", ] @@ -600,7 +587,7 @@ dependencies = [ "aws-smithy-protocol-test", "aws-smithy-types", "bytes", - "fastrand", + "fastrand 1.9.0", "http", "http-body", "hyper", @@ -709,7 +696,7 @@ dependencies = [ "itoa", "num-integer", "ryu", - "time 0.3.21", + "time 0.3.23", ] [[package]] @@ -739,13 +726,13 @@ dependencies = [ [[package]] name = "axum" -version = "0.6.18" +version = "0.6.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8175979259124331c1d7bf6586ee7e0da434155e4b2d48ec2c8386281d8df39" +checksum = "a6a1de45611fdb535bfde7b7de4fd54f4fd2b17b1737c0a59b69bf9b92074b8c" dependencies = [ "async-trait", "axum-core", - "bitflags", + "bitflags 1.3.2", "bytes", "futures-util", "http", @@ -784,75 +771,70 @@ dependencies = [ [[package]] name = "azure_core" -version = "0.5.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6424becb946de1b1eff7bf5fbc86fabf7457637c88b63dd967b219a712c322c" +checksum = "86b0f0eea648347e40f5f7f7e6bfea4553bcefad0fbf52044ea339e5ce3aba61" dependencies = [ "async-trait", - "base64 0.13.1", + "base64 0.21.2", "bytes", "dyn-clone", "futures", - "getrandom 0.2.9", + "getrandom 0.2.10", "http-types", "log", "paste", "pin-project", + "quick-xml", "rand 0.8.5", "reqwest", "rustc_version", "serde", - "serde-xml-rs", "serde_json", - "time 0.3.21", + "time 0.3.23", "url", "uuid", ] [[package]] name = "azure_storage" -version = "0.6.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d0de4ed66067ca1afa0a07d787a6fe001288a162409b8308c45909044552ca" +checksum = "32d9cfa13ed9acb51cd663e04f343bd550a92b455add96c90de387a9a6bc4dbc" dependencies = [ "RustyXML", "async-trait", "azure_core", - "base64 0.13.1", "bytes", "futures", "hmac", "log", "once_cell", "serde", - "serde-xml-rs", "serde_derive", "serde_json", "sha2", - "time 0.3.21", + "time 0.3.23", "url", "uuid", ] [[package]] name = "azure_storage_blobs" -version = "0.6.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a69ea7177f0b3c64196766fcd442ac9664658a194070d082ae8876406800040b" +checksum = "57cb0fe58af32a3fb49e560613cb1e4937f9f13161a2c1caf1bba0224435f2af" dependencies = [ "RustyXML", "azure_core", "azure_storage", - "base64 0.13.1", "bytes", "futures", "log", - "md5", "serde", - "serde-xml-rs", "serde_derive", "serde_json", - "time 0.3.21", + "time 0.3.23", "url", "uuid", ] @@ -864,7 +846,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" dependencies = [ "futures-core", - "getrandom 0.2.9", + "getrandom 0.2.10", "instant", "pin-project-lite", "rand 0.8.5", @@ -873,15 +855,15 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.67" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" dependencies = [ "addr2line", "cc", "cfg-if", "libc", - "miniz_oxide 0.6.2", + "miniz_oxide", "object", "rustc-demangle", ] @@ -915,6 +897,21 @@ dependencies = [ ] [[package]] +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + +[[package]] name = "bit-set" version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -936,6 +933,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] +name = "bitflags" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +dependencies = [ + "serde", +] + +[[package]] name = "bitpacking" version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1089,6 +1095,27 @@ dependencies = [ ] [[package]] +name = "bzip2" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" +dependencies = [ + "bzip2-sys", + "libc", +] + +[[package]] +name = "bzip2-sys" +version = "0.1.11+1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + +[[package]] name = "cast" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1151,7 +1178,7 @@ dependencies = [ "anyhow", "async-trait", "bytes", - "itertools", + "itertools 0.10.5", "rand 0.8.5", "serde", "tokio", @@ -1177,9 +1204,9 @@ dependencies = [ [[package]] name = "chrono-tz" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9cc2b23599e6d7479755f3594285efb3f74a1bdca7a7374948bc831e23a552" +checksum = "f1369bc6b9e9a7dfdae2055f6ec151fe9c554a9d23d357c0237cee2e25eaabb7" dependencies = [ "chrono", "chrono-tz-build", @@ -1188,9 +1215,9 @@ dependencies = [ [[package]] name = "chrono-tz-build" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9998fb9f7e9b2111641485bf8beb32f92945f97f92a3d061f744cfef335f751" +checksum = "e2f5ebdc942f57ed96d560a6d1a459bae5851102a25d5bf89dc04ae453e31ecf" dependencies = [ "parse-zoneinfo", "phf", @@ -1249,39 +1276,23 @@ dependencies = [ [[package]] name = "clap" -version = "2.34.0" +version = "4.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "ansi_term", - "atty", - "bitflags", - "strsim 0.8.0", - "textwrap", - "unicode-width", - "vec_map", -] - -[[package]] -name = "clap" -version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93aae7a4192245f70fe75dd9157fc7b4a5bf53e88d30bd4396f7d8f9284d5acc" +checksum = "8f644d0dac522c8b05ddc39aaaccc5b136d5dc4ff216610c5641e3be5becf56c" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.3.0" +version = "4.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f423e341edefb78c9caba2d9c7f7687d0e72e89df3ce3394554754393ac3990" +checksum = "af410122b9778e024f9e0fb35682cc09cc3f85cad5e8d3ba8f47a9702df6e73d" dependencies = [ "anstream", "anstyle", - "bitflags", "clap_lex", - "strsim 0.10.0", + "strsim", ] [[package]] @@ -1323,13 +1334,13 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "colored" -version = "2.0.0" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd" +checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6" dependencies = [ - "atty", + "is-terminal", "lazy_static", - "winapi 0.3.9", + "windows-sys 0.48.0", ] [[package]] @@ -1377,9 +1388,9 @@ dependencies = [ [[package]] name = "console-subscriber" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57ab2224a0311582eb03adba4caaf18644f7b1f10a760803a803b9b605187fc7" +checksum = "d4cf42660ac07fcebed809cfe561dd8730bcd35b075215e6479c516bcd0d11cb" dependencies = [ "console-api", "crossbeam-channel", @@ -1400,6 +1411,18 @@ dependencies = [ ] [[package]] +name = "const-oid" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "795bc6e66a8e340f075fcf6227e417a2dc976b92b91f3cdc778bb858778b6747" + +[[package]] +name = "constant_time_eq" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" + +[[package]] name = "convert_case" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1423,9 +1446,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.7" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" dependencies = [ "libc", ] @@ -1472,11 +1495,11 @@ dependencies = [ "anes", "cast", "ciborium", - "clap 4.3.0", + "clap", "criterion-plot", "futures", "is-terminal", - "itertools", + "itertools 0.10.5", "num-traits", "once_cell", "oorandom", @@ -1498,14 +1521,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" dependencies = [ "cast", - "itertools", + "itertools 0.10.5", ] [[package]] name = "cron" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76219e9243e100d5a37676005f08379297f8addfebc247613299600625c734d" +checksum = "1ff76b51e4c068c52bfd2866e1567bee7c567ae8f24ada09fd4307019e25eab7" dependencies = [ "chrono", "nom", @@ -1535,9 +1558,9 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.14" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", "cfg-if", @@ -1558,9 +1581,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if", ] @@ -1603,16 +1626,6 @@ dependencies = [ ] [[package]] -name = "ctor" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[package]] name = "ctr" version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1633,12 +1646,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.1" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0558d22a7b463ed0241e993f76f09f30b126687447751a8638587b864e4b3944" +checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" dependencies = [ - "darling_core 0.20.1", - "darling_macro 0.20.1", + "darling_core 0.20.3", + "darling_macro 0.20.3", ] [[package]] @@ -1651,22 +1664,22 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim 0.10.0", + "strsim", "syn 1.0.109", ] [[package]] name = "darling_core" -version = "0.20.1" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab8bfa2e259f8ee1ce5e97824a3c55ec4404a0d772ca7fa96bf19f0752a046eb" +checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "strsim 0.10.0", - "syn 2.0.18", + "strsim", + "syn 2.0.26", ] [[package]] @@ -1682,26 +1695,26 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.1" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a" +checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ - "darling_core 0.20.1", + "darling_core 0.20.3", "quote", - "syn 2.0.18", + "syn 2.0.26", ] [[package]] name = "dashmap" -version = "5.4.0" +version = "5.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc" +checksum = "6943ae99c34386c84a470c499d3414f66502a41340aa895406e0d2e4a207b91d" dependencies = [ "cfg-if", - "hashbrown 0.12.3", + "hashbrown 0.14.0", "lock_api", "once_cell", - "parking_lot_core 0.9.7", + "parking_lot_core", ] [[package]] @@ -1742,6 +1755,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f578e8e2c440e7297e008bb5486a3a8a194775224bbc23729b0dbdfaeebf162e" [[package]] +name = "der" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c7ed52955ce76b1554f509074bb357d3fb8ac9b51288a65a3fd480d1dfba946" +dependencies = [ + "const-oid", + "pem-rfc7468", + "zeroize", +] + +[[package]] name = "derivative" version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1796,20 +1820,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", + "const-oid", "crypto-common", "subtle", ] [[package]] -name = "dirs" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" -dependencies = [ - "dirs-sys", -] - -[[package]] name = "dirs-next" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1820,17 +1836,6 @@ dependencies = [ ] [[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi 0.3.9", -] - -[[package]] name = "dirs-sys-next" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1897,21 +1902,24 @@ dependencies = [ [[package]] name = "dyn-clone" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30" +checksum = "304e6508efa593091e97a9abbc10f90aa7ca635b6d2784feff3c89d41dd12272" [[package]] name = "either" version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +dependencies = [ + "serde", +] [[package]] name = "elasticsearch-dsl" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68ab1335c08fb99784b100ed23db38416b5fb52f5a178966d3b972b969e183e1" +checksum = "2e0289994b78ad51661d9195cd2fb071ebdc68f3b03de0e0e7420ede8fb320dc" dependencies = [ "chrono", "num-traits", @@ -1935,15 +1943,88 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] +name = "encoding" +version = "0.2.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec" +dependencies = [ + "encoding-index-japanese", + "encoding-index-korean", + "encoding-index-simpchinese", + "encoding-index-singlebyte", + "encoding-index-tradchinese", +] + +[[package]] +name = "encoding-index-japanese" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding-index-korean" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding-index-simpchinese" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding-index-singlebyte" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding-index-tradchinese" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding_index_tests" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" + +[[package]] name = "encoding_rs" -version = "0.8.29" +version = "0.8.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a74ea89a0a1b98f6332de42c95baff457ada66d1cb4030f9ff151b2041a1c746" +checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" dependencies = [ "cfg-if", ] [[package]] +name = "encoding_rs_io" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cc3c5651fb62ab8aa3103998dade57efdd028544bd300516baa31840c252a83" +dependencies = [ + "encoding_rs", +] + +[[package]] name = "enum-iterator" version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1960,27 +2041,33 @@ checksum = "eecf8589574ce9b895052fa12d69af7a233f99e6107f5cb8dd1044f2a17bfdcb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.26", ] [[package]] name = "env_logger" -version = "0.9.3" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" dependencies = [ - "atty", "humantime", + "is-terminal", "log", "regex", "termcolor", ] [[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] name = "erased-serde" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f2b0c2380453a92ea8b6c8e5f64ecaafccddde8ceab55ff7a8ac1029f894569" +checksum = "da96524cc884f6558f1769b6c46686af2fe8e8b4cd253bd5a3cdba8181b8e070" dependencies = [ "serde", ] @@ -2007,6 +2094,17 @@ dependencies = [ ] [[package]] +name = "etcetera" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" +dependencies = [ + "cfg-if", + "home", + "windows-sys 0.48.0", +] + +[[package]] name = "event-listener" version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2051,6 +2149,24 @@ dependencies = [ ] [[package]] +name = "fastrand" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" + +[[package]] +name = "filetime" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.2.16", + "windows-sys 0.48.0", +] + +[[package]] name = "fixedbitset" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2063,7 +2179,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" dependencies = [ "crc32fast", - "miniz_oxide 0.7.1", + "miniz_oxide", ] [[package]] @@ -2111,9 +2227,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ "percent-encoding", ] @@ -2126,11 +2242,11 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "fs4" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7672706608ecb74ab2e055c68327ffc25ae4cac1e12349204fd5fb0f3487cce2" +checksum = "2eeb4ed9e12f43b7fa0baae3f9cdda28352770132ef2e09a23760c29cae8bd47" dependencies = [ - "rustix 0.37.19", + "rustix 0.38.4", "windows-sys 0.48.0", ] @@ -2184,13 +2300,13 @@ dependencies = [ [[package]] name = "futures-intrusive" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a604f7a68fbf8103337523b1fadc8ade7361ee3f112f7c680ad179651616aed5" +checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" dependencies = [ "futures-core", "lock_api", - "parking_lot 0.11.2", + "parking_lot", ] [[package]] @@ -2205,7 +2321,7 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ - "fastrand", + "fastrand 1.9.0", "futures-core", "futures-io", "memchr", @@ -2222,7 +2338,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.26", ] [[package]] @@ -2263,9 +2379,9 @@ dependencies = [ [[package]] name = "generator" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3e123d9ae7c02966b4d892e550bdc32164f05853cd40ab570650ad600596a8a" +checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" dependencies = [ "cc", "libc", @@ -2297,9 +2413,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "js-sys", @@ -2309,17 +2425,6 @@ dependencies = [ ] [[package]] -name = "ghost" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e77ac7b51b8e6313251737fcef4b1c01a2ea102bde68415b62c0ee9268fec357" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.18", -] - -[[package]] name = "gimli" version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2333,9 +2438,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "h2" -version = "0.3.19" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" +checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" dependencies = [ "bytes", "fnv", @@ -2343,7 +2448,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.3", "slab", "tokio", "tokio-util", @@ -2375,12 +2480,22 @@ dependencies = [ ] [[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +dependencies = [ + "ahash 0.8.3", + "allocator-api2", +] + +[[package]] name = "hashlink" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0761a1b9491c4f2e3d66aa0f62d0fba0af9a0e2852e4d48ea506632a4b56e6aa" +checksum = "312f66718a2d7789ffef4f4b7b213138ed9f1eb3aa1d0d82fc99f88fb3ffd26f" dependencies = [ - "hashbrown 0.13.2", + "hashbrown 0.14.0", ] [[package]] @@ -2403,7 +2518,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" dependencies = [ "base64 0.13.1", - "bitflags", + "bitflags 1.3.2", "bytes", "headers-core", "http", @@ -2423,15 +2538,6 @@ dependencies = [ [[package]] name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "heck" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" @@ -2441,18 +2547,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "hex" @@ -2583,9 +2680,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.26" +version = "0.14.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" dependencies = [ "bytes", "futures-channel", @@ -2622,17 +2719,18 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7" +checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" dependencies = [ + "futures-util", "http", "hyper", "log", - "rustls 0.21.1", + "rustls 0.21.5", "rustls-native-certs", "tokio", - "tokio-rustls 0.24.0", + "tokio-rustls 0.24.1", ] [[package]] @@ -2649,9 +2747,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.56" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -2678,9 +2776,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -2698,10 +2796,21 @@ dependencies = [ ] [[package]] +name = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown 0.14.0", + "serde", +] + +[[package]] name = "indicatif" -version = "0.17.4" +version = "0.17.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db45317f37ef454e6519b6c3ed7d377e5f23346f0823f86e65ca36912d1d0ef8" +checksum = "8ff8cc23a7393a397ed1d7f56e6365cba772aba9f9912ab968b03043c395d057" dependencies = [ "console", "instant", @@ -2712,9 +2821,9 @@ dependencies = [ [[package]] name = "indoc" -version = "2.0.1" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f2cb48b81b1dc9f39676bf99f5499babfec7cd8fe14307f7b3d747208fb5690" +checksum = "2c785eefb63ebd0e33416dfcb8d6da0bf27ce752843a45632a67bf10d4d4b5c4" [[package]] name = "infer" @@ -2752,12 +2861,9 @@ checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02" [[package]] name = "inventory" -version = "0.3.6" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0539b5de9241582ce6bd6b0ba7399313560151e58c9aaf8b74b711b1bdce644" -dependencies = [ - "ghost", -] +checksum = "25b1d6b4b9fb75fc419bdef998b689df5080a32931cb3395b86202046b56a9ea" [[package]] name = "io-lifetimes" @@ -2765,35 +2871,34 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.1", + "hermit-abi", "libc", "windows-sys 0.48.0", ] [[package]] name = "ipnet" -version = "2.7.2" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" +checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" [[package]] name = "ipnetwork" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f84f1612606f3753f205a4e9a2efd6fe5b4c573a6269b2cc6c3003d44a0d127" +checksum = "bf466541e9d546596ee94f9f69590f89473455f88372423e0008fc1a7daf100e" dependencies = [ "serde", ] [[package]] name = "is-terminal" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", - "rustix 0.37.19", + "hermit-abi", + "rustix 0.38.4", "windows-sys 0.48.0", ] @@ -2807,10 +2912,19 @@ dependencies = [ ] [[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + +[[package]] name = "itoa" -version = "1.0.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jobserver" @@ -2823,9 +2937,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.63" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] @@ -2865,7 +2979,7 @@ dependencies = [ "diff", "ena", "is-terminal", - "itertools", + "itertools 0.10.5", "lalrpop-util", "petgraph", "regex", @@ -2887,6 +3001,9 @@ name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +dependencies = [ + "spin 0.5.2", +] [[package]] name = "levenshtein_automata" @@ -2907,6 +3024,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" [[package]] +name = "libsqlite3-sys" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" +dependencies = [ + "cc", + "pkg-config", + "vcpkg", +] + +[[package]] name = "libz-sys" version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2919,6 +3047,233 @@ dependencies = [ ] [[package]] +name = "lindera-cc-cedict" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69c983c7c5068266e882449172a9583b04745045180d5118a52ea0e69743476b" +dependencies = [ + "bincode", + "byteorder", + "encoding", + "lindera-cc-cedict-builder", + "lindera-core", + "lindera-decompress", + "once_cell", + "zip", +] + +[[package]] +name = "lindera-cc-cedict-builder" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d2e8f2ca97ddf952fe340642511b9c14b373cb2eef711d526bb8ef2ca0969b8" +dependencies = [ + "anyhow", + "bincode", + "byteorder", + "csv", + "encoding", + "env_logger", + "glob", + "lindera-compress", + "lindera-core", + "lindera-decompress", + "log", + "yada", +] + +[[package]] +name = "lindera-compress" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f72b460559bcbe8a9cee85ea4a5056133ed3abf373031191589236e656d65b59" +dependencies = [ + "anyhow", + "flate2", + "lindera-decompress", +] + +[[package]] +name = "lindera-core" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f586eb8a9393c32d5525e0e9336a3727bd1329674740097126f3b0bff8a1a1ea" +dependencies = [ + "anyhow", + "bincode", + "byteorder", + "encoding_rs", + "log", + "once_cell", + "serde", + "thiserror", + "yada", +] + +[[package]] +name = "lindera-decompress" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fb1facd8da698072fcc7338bd757730db53d59f313f44dd583fa03681dcc0e1" +dependencies = [ + "anyhow", + "flate2", + "serde", +] + +[[package]] +name = "lindera-dictionary" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec7be7410b1da7017a8948986b87af67082f605e9a716f0989790d795d677f0c" +dependencies = [ + "anyhow", + "bincode", + "byteorder", + "lindera-cc-cedict", + "lindera-cc-cedict-builder", + "lindera-core", + "lindera-ipadic", + "lindera-ipadic-builder", + "lindera-ipadic-neologd-builder", + "lindera-ko-dic", + "lindera-ko-dic-builder", + "lindera-unidic-builder", + "serde", +] + +[[package]] +name = "lindera-ipadic" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3db2c39d5b69cb7b69df6edb44863d38991e0eb0037d38396604c1e65106a5db" +dependencies = [ + "bincode", + "byteorder", + "encoding", + "flate2", + "lindera-core", + "lindera-decompress", + "lindera-ipadic-builder", + "once_cell", + "tar", +] + +[[package]] +name = "lindera-ipadic-builder" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "705d07f8a45d04fd95149f7ad41a26d1f9e56c9c00402be6f9dd05e3d88b99c6" +dependencies = [ + "anyhow", + "bincode", + "byteorder", + "csv", + "encoding_rs", + "encoding_rs_io", + "env_logger", + "glob", + "lindera-compress", + "lindera-core", + "lindera-decompress", + "log", + "serde", + "yada", +] + +[[package]] +name = "lindera-ipadic-neologd-builder" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "633a93983ba13fba42328311a501091bd4a7aff0c94ae9eaa9d4733dd2b0468a" +dependencies = [ + "anyhow", + "bincode", + "byteorder", + "csv", + "encoding_rs", + "encoding_rs_io", + "env_logger", + "glob", + "lindera-core", + "lindera-decompress", + "log", + "serde", + "yada", +] + +[[package]] +name = "lindera-ko-dic" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a428e0d316b6c86f51bd919479692bc41ad840dba266ebc044663970f431ea18" +dependencies = [ + "bincode", + "byteorder", + "encoding", + "flate2", + "lindera-core", + "lindera-decompress", + "lindera-ko-dic-builder", + "once_cell", + "tar", +] + +[[package]] +name = "lindera-ko-dic-builder" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a5288704c6b8a069c0a1705c38758e836497698b50453373ab3d56c6f9a7ef8" +dependencies = [ + "anyhow", + "bincode", + "byteorder", + "csv", + "encoding", + "env_logger", + "glob", + "lindera-compress", + "lindera-core", + "lindera-decompress", + "log", + "yada", +] + +[[package]] +name = "lindera-tokenizer" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "106ba439b2e87529d9bbedbb88d69f635baba1195c26502b308f55a85885fc81" +dependencies = [ + "bincode", + "byteorder", + "lindera-core", + "lindera-dictionary", + "once_cell", + "serde", + "serde_json", +] + +[[package]] +name = "lindera-unidic-builder" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b698227fdaeac32289173ab389b990d4eb00a40cbc9912020f69a0c491dabf55" +dependencies = [ + "anyhow", + "bincode", + "byteorder", + "csv", + "encoding", + "env_logger", + "glob", + "lindera-core", + "lindera-decompress", + "log", + "yada", +] + +[[package]] name = "linked-hash-map" version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2932,15 +3287,15 @@ checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" [[package]] name = "linux-raw-sys" -version = "0.3.8" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ "autocfg", "scopeguard", @@ -2948,9 +3303,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.18" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de" +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" [[package]] name = "loom" @@ -2968,14 +3323,23 @@ dependencies = [ [[package]] name = "lru" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03f1160296536f10c833a82dca22267d5486734230d47bf00bf435885814ba1e" +checksum = "718e8fae447df0c7e1ba7f5189829e63fd536945c8988d61444c19039f16b670" dependencies = [ "hashbrown 0.13.2", ] [[package]] +name = "lru" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eedb2bdbad7e0634f83989bf596f497b070130daaa398ab22d84c39e266deec5" +dependencies = [ + "hashbrown 0.14.0", +] + +[[package]] name = "lz4" version = "1.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3070,9 +3434,9 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] @@ -3101,15 +3465,6 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" -dependencies = [ - "adler", -] - -[[package]] -name = "miniz_oxide" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" @@ -3139,7 +3494,7 @@ dependencies = [ "fragile", "lazy_static", "mockall_derive", - "predicates", + "predicates 2.1.5", "predicates-tree", ] @@ -3207,7 +3562,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" dependencies = [ - "getrandom 0.2.9", + "getrandom 0.2.10", ] [[package]] @@ -3261,15 +3616,6 @@ dependencies = [ ] [[package]] -name = "nom8" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8" -dependencies = [ - "memchr", -] - -[[package]] name = "normalize-line-endings" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3297,6 +3643,23 @@ dependencies = [ ] [[package]] +name = "num-bigint-dig" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" +dependencies = [ + "byteorder", + "lazy_static", + "libm", + "num-integer", + "num-iter", + "num-traits", + "rand 0.8.5", + "smallvec", + "zeroize", +] + +[[package]] name = "num-integer" version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3307,6 +3670,17 @@ dependencies = [ ] [[package]] +name = "num-iter" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] name = "num-traits" version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3322,7 +3696,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.1", + "hermit-abi", "libc", ] @@ -3364,13 +3738,13 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "oauth2" -version = "4.4.0" +version = "4.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50df55a3cc0374df91ef8da8741542d9e0b9e6581481ed1cffe84f64d2f5fc3d" +checksum = "09a6e2a2b13a56ebeabba9142f911745be6456163fd6c3d361274ebcd891a80c" dependencies = [ "base64 0.13.1", "chrono", - "getrandom 0.2.9", + "getrandom 0.2.10", "http", "rand 0.8.5", "reqwest", @@ -3384,9 +3758,9 @@ dependencies = [ [[package]] name = "object" -version = "0.30.4" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385" +checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" dependencies = [ "memchr", ] @@ -3430,7 +3804,7 @@ dependencies = [ "base64 0.13.1", "chrono", "http", - "itertools", + "itertools 0.10.5", "log", "num-bigint", "oauth2", @@ -3454,7 +3828,7 @@ version = "0.10.55" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "foreign-types", "libc", @@ -3471,7 +3845,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.26", ] [[package]] @@ -3578,7 +3952,7 @@ dependencies = [ "fnv", "futures-channel", "futures-util", - "indexmap", + "indexmap 1.9.3", "once_cell", "pin-project-lite", "thiserror", @@ -3652,20 +4026,11 @@ version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a56f651b4dd45ae3ac3d260ced32eaf0620cddaae5f26c69b554a9016594726" dependencies = [ - "heck 0.4.1", + "heck", "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.18", -] - -[[package]] -name = "output_vt100" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66" -dependencies = [ - "winapi 0.3.9", + "syn 2.0.26", ] [[package]] @@ -3709,66 +4074,52 @@ checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" [[package]] name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] - -[[package]] -name = "parking_lot" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.7", + "parking_lot_core", ] [[package]] name = "parking_lot_core" -version = "0.8.6" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ "cfg-if", - "instant", "libc", - "redox_syscall 0.2.16", + "redox_syscall 0.3.5", "smallvec", - "winapi 0.3.9", + "windows-targets 0.48.1", ] [[package]] -name = "parking_lot_core" -version = "0.9.7" +name = "parse-zoneinfo" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +checksum = "c705f256449c60da65e11ff6626e0c16a0a0b96aaa348de61376b249bc340f41" dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "windows-sys 0.45.0", + "regex", ] [[package]] -name = "parse-zoneinfo" -version = "0.3.0" +name = "password-hash" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c705f256449c60da65e11ff6626e0c16a0a0b96aaa348de61376b249bc340f41" +checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" dependencies = [ - "regex", + "base64ct", + "rand_core 0.6.4", + "subtle", ] [[package]] name = "paste" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "path" @@ -3782,6 +4133,18 @@ dependencies = [ ] [[package]] +name = "pbkdf2" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" +dependencies = [ + "digest", + "hmac", + "password-hash", + "sha2", +] + +[[package]] name = "pem" version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3791,10 +4154,19 @@ dependencies = [ ] [[package]] +name = "pem-rfc7468" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" +dependencies = [ + "base64ct", +] + +[[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "petgraph" @@ -3803,35 +4175,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" dependencies = [ "fixedbitset", - "indexmap", + "indexmap 1.9.3", ] [[package]] name = "phf" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ - "phf_shared 0.11.1", + "phf_shared 0.11.2", ] [[package]] name = "phf_codegen" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56ac890c5e3ca598bbdeaa99964edb5b0258a583a9eb6ef4e89fc85d9224770" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" dependencies = [ "phf_generator", - "phf_shared 0.11.1", + "phf_shared 0.11.2", ] [[package]] name = "phf_generator" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" dependencies = [ - "phf_shared 0.11.1", + "phf_shared 0.11.2", "rand 0.8.5", ] @@ -3846,38 +4218,38 @@ dependencies = [ [[package]] name = "phf_shared" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ "siphasher", ] [[package]] name = "pin-project" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" +checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" +checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.26", ] [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" [[package]] name = "pin-utils" @@ -3886,6 +4258,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] +name = "pkcs1" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" +dependencies = [ + "der", + "pkcs8", + "spki", +] + +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "spki", +] + +[[package]] name = "pkg-config" version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3893,9 +4286,9 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "plotters" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b639e642295546c50fcd545198c9d64ee2a38620a628724a3b266d5fbf97" +checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" dependencies = [ "num-traits", "plotters-backend", @@ -3906,24 +4299,24 @@ dependencies = [ [[package]] name = "plotters-backend" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142" +checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" [[package]] name = "plotters-svg" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a81d2759aae1dae668f783c308bc5c8ebd191ff4184aaa1b37f65a6ae5a56f" +checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" dependencies = [ "plotters-backend", ] [[package]] name = "pnet" -version = "0.31.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0caaf5b11fd907ff15cf14a4477bfabca4b37ab9e447a4f8dead969a59cdafad" +checksum = "cd959a8268165518e2bf5546ba84c7b3222744435616381df3c456fe8d983576" dependencies = [ "ipnetwork", "pnet_base", @@ -3935,18 +4328,18 @@ dependencies = [ [[package]] name = "pnet_base" -version = "0.31.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d3a993d49e5fd5d4d854d6999d4addca1f72d86c65adf224a36757161c02b6" +checksum = "872e46346144ebf35219ccaa64b1dffacd9c6f188cd7d012bd6977a2a838f42e" dependencies = [ "no-std-net", ] [[package]] name = "pnet_datalink" -version = "0.31.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e466faf03a98ad27f6e15cd27a2b7cc89e73e640a43527742977bc503c37f8aa" +checksum = "c302da22118d2793c312a35fb3da6846cb0fab6c3ad53fd67e37809b06cdafce" dependencies = [ "ipnetwork", "libc", @@ -3957,9 +4350,9 @@ dependencies = [ [[package]] name = "pnet_macros" -version = "0.31.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48dd52a5211fac27e7acb14cfc9f30ae16ae0e956b7b779c8214c74559cef4c3" +checksum = "2a780e80005c2e463ec25a6e9f928630049a10b43945fea83207207d4a7606f4" dependencies = [ "proc-macro2", "quote", @@ -3969,18 +4362,18 @@ dependencies = [ [[package]] name = "pnet_macros_support" -version = "0.31.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89de095dc7739349559913aed1ef6a11e73ceade4897dadc77c5e09de6740750" +checksum = "e6d932134f32efd7834eb8b16d42418dac87086347d1bc7d142370ef078582bc" dependencies = [ "pnet_base", ] [[package]] name = "pnet_packet" -version = "0.31.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc3b5111e697c39c8b9795b9fdccbc301ab696699e88b9ea5a4e4628978f495f" +checksum = "8bde678bbd85cb1c2d99dc9fc596e57f03aa725f84f3168b0eaf33eeccb41706" dependencies = [ "glob", "pnet_base", @@ -3990,9 +4383,9 @@ dependencies = [ [[package]] name = "pnet_sys" -version = "0.31.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "328e231f0add6d247d82421bf3790b4b33b39c8930637f428eef24c4c6a90805" +checksum = "faf7a58b2803d818a374be9278a1fe8f88fce14b936afbe225000cfcd9c73f16" dependencies = [ "libc", "winapi 0.3.9", @@ -4000,9 +4393,9 @@ dependencies = [ [[package]] name = "pnet_transport" -version = "0.31.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff597185e6f1f5671b3122e4dba892a1c73e17c17e723d7669bd9299cbe7f124" +checksum = "813d1c0e4defbe7ee22f6fe1755f122b77bfb5abe77145b1b5baaf463cab9249" dependencies = [ "libc", "pnet_base", @@ -4012,9 +4405,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.3.3" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "767eb9f07d4a5ebcb39bbf2d452058a93c011373abf6832e24194a1c3f004794" +checksum = "edc55135a600d700580e406b4de0d59cb9ad25e344a3a091a97ded2622ec4ec6" [[package]] name = "postcard" @@ -4046,7 +4439,22 @@ checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" dependencies = [ "difflib", "float-cmp", - "itertools", + "itertools 0.10.5", + "normalize-line-endings", + "predicates-core", + "regex", +] + +[[package]] +name = "predicates" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09963355b9f467184c04017ced4a2ba2d75cbcb4e7462690d388233253d4b1a9" +dependencies = [ + "anstyle", + "difflib", + "float-cmp", + "itertools 0.10.5", "normalize-line-endings", "predicates-core", "regex", @@ -4070,13 +4478,11 @@ dependencies = [ [[package]] name = "pretty_assertions" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755" +checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" dependencies = [ - "ctor", "diff", - "output_vt100", "yansi", ] @@ -4092,12 +4498,12 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.6" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b69d39aab54d069e7f2fe8cb970493e7834601ca2d8c65fd7bbd183578080d1" +checksum = "92139198957b410250d43fad93e630d956499a625c527eda65175c8680f83387" dependencies = [ "proc-macro2", - "syn 2.0.18", + "syn 2.0.26", ] [[package]] @@ -4116,7 +4522,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit 0.19.10", + "toml_edit", ] [[package]] @@ -4145,9 +4551,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.59" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] @@ -4158,11 +4564,11 @@ version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1de8dacb0873f77e6aefc6d71e044761fcc68060290f5b1089fcdf84626bb69" dependencies = [ - "bitflags", + "bitflags 1.3.2", "byteorder", "hex", "lazy_static", - "rustix 0.36.14", + "rustix 0.36.15", ] [[package]] @@ -4176,7 +4582,7 @@ dependencies = [ "lazy_static", "libc", "memchr", - "parking_lot 0.12.1", + "parking_lot", "procfs", "protobuf", "thiserror", @@ -4189,7 +4595,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e35c06b98bf36aba164cc17cb25f7e232f5c4aeea73baa14b8a9f0d92dbfa65" dependencies = [ "bit-set", - "bitflags", + "bitflags 1.3.2", "byteorder", "lazy_static", "num-traits", @@ -4219,8 +4625,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" dependencies = [ "bytes", - "heck 0.4.1", - "itertools", + "heck", + "itertools 0.10.5", "lazy_static", "log", "multimap", @@ -4241,7 +4647,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" dependencies = [ "anyhow", - "itertools", + "itertools 0.10.5", "proc-macro2", "quote", "syn 1.0.109", @@ -4327,8 +4733,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] +name = "quick-xml" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81b9228215d82c7b61490fec1de287136b5de6f5700f6e58ea9ad61a7964ca51" +dependencies = [ + "memchr", + "serde", +] + +[[package]] name = "quickwit-actors" -version = "0.6.2" +version = "0.6.3" dependencies = [ "anyhow", "async-trait", @@ -4337,7 +4753,6 @@ dependencies = [ "futures", "once_cell", "quickwit-common", - "quickwit-proto", "rand 0.8.5", "serde", "serde_json", @@ -4349,7 +4764,7 @@ dependencies = [ [[package]] name = "quickwit-aws" -version = "0.6.2" +version = "0.6.3" dependencies = [ "anyhow", "async-trait", @@ -4361,7 +4776,7 @@ dependencies = [ "aws-types", "futures", "hyper", - "hyper-rustls 0.24.0", + "hyper-rustls 0.24.1", "once_cell", "quickwit-actors", "rand 0.8.5", @@ -4373,28 +4788,27 @@ dependencies = [ [[package]] name = "quickwit-cli" -version = "0.6.2" +version = "0.6.3" dependencies = [ "anyhow", "async-trait", - "atty", "byte-unit", "bytes", "chitchat", - "clap 4.3.0", + "clap", "colored", "console-subscriber", "dialoguer", "futures", "humantime", "indicatif", - "itertools", + "itertools 0.11.0", "once_cell", "openssl-probe", "opentelemetry", "opentelemetry-jaeger", "opentelemetry-otlp", - "predicates", + "predicates 3.0.3", "quickwit-actors", "quickwit-cluster", "quickwit-common", @@ -4419,10 +4833,10 @@ dependencies = [ "thousands", "tikv-jemalloc-ctl", "tikv-jemallocator", - "time 0.3.21", + "time 0.3.23", "tokio", "tokio-util", - "toml 0.6.0", + "toml 0.7.6", "tonic 0.9.2", "tracing", "tracing-opentelemetry", @@ -4431,13 +4845,13 @@ dependencies = [ [[package]] name = "quickwit-cluster" -version = "0.6.2" +version = "0.6.3" dependencies = [ "anyhow", "async-trait", "chitchat", "futures", - "itertools", + "itertools 0.11.0", "quickwit-common", "quickwit-config", "quickwit-proto", @@ -4446,7 +4860,7 @@ dependencies = [ "serde_json", "tempfile", "thiserror", - "time 0.3.21", + "time 0.3.23", "tokio", "tokio-stream", "tonic 0.9.2", @@ -4457,26 +4871,27 @@ dependencies = [ [[package]] name = "quickwit-codegen" -version = "0.6.2" +version = "0.6.3" dependencies = [ "anyhow", - "heck 0.4.1", - "prettyplease 0.2.6", + "heck", + "prettyplease 0.2.10", "proc-macro2", "prost", "prost-build", "quote", "serde", - "syn 2.0.18", + "syn 2.0.26", "tonic-build", ] [[package]] name = "quickwit-codegen-example" -version = "0.6.2" +version = "0.6.3" dependencies = [ "async-trait", "dyn-clone", + "futures", "http", "hyper", "mockall", @@ -4495,7 +4910,7 @@ dependencies = [ [[package]] name = "quickwit-common" -version = "0.6.2" +version = "0.6.3" dependencies = [ "anyhow", "async-speed-limit", @@ -4508,7 +4923,7 @@ dependencies = [ "hostname", "http", "hyper", - "itertools", + "itertools 0.11.0", "num_cpus", "once_cell", "pin-project", @@ -4532,7 +4947,7 @@ dependencies = [ [[package]] name = "quickwit-config" -version = "0.6.2" +version = "0.6.3" dependencies = [ "anyhow", "byte-unit", @@ -4541,7 +4956,7 @@ dependencies = [ "cron", "enum-iterator", "humantime", - "itertools", + "itertools 0.11.0", "json_comments", "new_string_template", "once_cell", @@ -4550,10 +4965,10 @@ dependencies = [ "regex", "serde", "serde_json", - "serde_with 2.3.3", - "serde_yaml 0.9.21", + "serde_with 3.1.0", + "serde_yaml 0.9.24", "tokio", - "toml 0.6.0", + "toml 0.7.6", "tracing", "utoipa", "vrl", @@ -4562,15 +4977,16 @@ dependencies = [ [[package]] name = "quickwit-control-plane" -version = "0.6.2" +version = "0.6.3" dependencies = [ "anyhow", "async-trait", "chitchat", "dyn-clone", + "futures", "http", "hyper", - "itertools", + "itertools 0.11.0", "mockall", "proptest", "prost", @@ -4579,7 +4995,6 @@ dependencies = [ "quickwit-codegen", "quickwit-common", "quickwit-config", - "quickwit-grpc-clients", "quickwit-indexing", "quickwit-metastore", "quickwit-proto", @@ -4588,7 +5003,7 @@ dependencies = [ "serde", "serde_json", "thiserror", - "time 0.3.21", + "time 0.3.23", "tokio", "tokio-stream", "tonic 0.9.2", @@ -4599,7 +5014,7 @@ dependencies = [ [[package]] name = "quickwit-core" -version = "0.6.2" +version = "0.6.3" dependencies = [ "anyhow", "async-trait", @@ -4619,7 +5034,7 @@ dependencies = [ "rand 0.8.5", "serde", "serde_json", - "serde_yaml 0.9.21", + "serde_yaml 0.9.24", "tantivy", "tempfile", "thiserror", @@ -4631,20 +5046,20 @@ dependencies = [ [[package]] name = "quickwit-datetime" -version = "0.6.2" +version = "0.6.3" dependencies = [ - "itertools", + "itertools 0.11.0", "ouroboros", "serde", "serde_json", "tantivy", - "time 0.3.21", + "time 0.3.23", "time-fmt", ] [[package]] name = "quickwit-directories" -version = "0.6.2" +version = "0.6.3" dependencies = [ "anyhow", "async-trait", @@ -4658,14 +5073,14 @@ dependencies = [ "tantivy", "tempfile", "thiserror", - "time 0.3.21", + "time 0.3.23", "tokio", "tracing", ] [[package]] name = "quickwit-doc-mapper" -version = "0.6.2" +version = "0.6.3" dependencies = [ "anyhow", "base64 0.21.2", @@ -4673,8 +5088,8 @@ dependencies = [ "dyn-clone", "fnv", "hex", - "indexmap", - "itertools", + "indexmap 2.0.0", + "itertools 0.11.0", "matches", "mockall", "nom", @@ -4686,38 +5101,19 @@ dependencies = [ "regex", "serde", "serde_json", - "serde_yaml 0.9.21", + "serde_yaml 0.9.24", "siphasher", "tantivy", "thiserror", - "time 0.3.21", + "time 0.3.23", "tracing", "typetag", "utoipa", ] [[package]] -name = "quickwit-grpc-clients" -version = "0.6.2" -dependencies = [ - "anyhow", - "async-trait", - "futures", - "itertools", - "quickwit-cluster", - "quickwit-common", - "quickwit-config", - "quickwit-proto", - "tokio", - "tokio-stream", - "tonic 0.9.2", - "tower", - "tracing", -] - -[[package]] name = "quickwit-indexing" -version = "0.6.2" +version = "0.6.3" dependencies = [ "anyhow", "arc-swap", @@ -4734,7 +5130,7 @@ dependencies = [ "flume", "fnv", "futures", - "itertools", + "itertools 0.11.0", "libz-sys", "mockall", "once_cell", @@ -4749,7 +5145,6 @@ dependencies = [ "quickwit-config", "quickwit-directories", "quickwit-doc-mapper", - "quickwit-grpc-clients", "quickwit-ingest", "quickwit-metastore", "quickwit-proto", @@ -4763,7 +5158,7 @@ dependencies = [ "tantivy", "tempfile", "thiserror", - "time 0.3.21", + "time 0.3.23", "tokio", "tokio-stream", "tracing", @@ -4775,7 +5170,7 @@ dependencies = [ [[package]] name = "quickwit-ingest" -version = "0.6.2" +version = "0.6.3" dependencies = [ "anyhow", "async-trait", @@ -4790,6 +5185,7 @@ dependencies = [ "mrecordlog", "once_cell", "prost", + "prost-build", "quickwit-actors", "quickwit-codegen", "quickwit-common", @@ -4811,14 +5207,14 @@ dependencies = [ [[package]] name = "quickwit-integration-tests" -version = "0.6.2" +version = "0.6.3" dependencies = [ "anyhow", "bytes", "chitchat", "futures-util", "hyper", - "itertools", + "itertools 0.11.0", "quickwit-actors", "quickwit-cluster", "quickwit-common", @@ -4843,12 +5239,12 @@ dependencies = [ [[package]] name = "quickwit-jaeger" -version = "0.6.2" +version = "0.6.3" dependencies = [ "anyhow", "async-trait", "base64 0.21.2", - "itertools", + "itertools 0.11.0", "once_cell", "prost", "prost-types", @@ -4856,7 +5252,6 @@ dependencies = [ "quickwit-cluster", "quickwit-common", "quickwit-config", - "quickwit-grpc-clients", "quickwit-indexing", "quickwit-ingest", "quickwit-metastore", @@ -4869,7 +5264,7 @@ dependencies = [ "serde_json", "tantivy", "tempfile", - "time 0.3.21", + "time 0.3.23", "tokio", "tokio-stream", "tonic 0.9.2", @@ -4878,13 +5273,13 @@ dependencies = [ [[package]] name = "quickwit-janitor" -version = "0.6.2" +version = "0.6.3" dependencies = [ "anyhow", "async-trait", "chrono", "futures", - "itertools", + "itertools 0.11.0", "mockall", "once_cell", "quickwit-actors", @@ -4893,7 +5288,6 @@ dependencies = [ "quickwit-config", "quickwit-directories", "quickwit-doc-mapper", - "quickwit-grpc-clients", "quickwit-indexing", "quickwit-metastore", "quickwit-proto", @@ -4905,7 +5299,7 @@ dependencies = [ "tantivy", "tempfile", "thiserror", - "time 0.3.21", + "time 0.3.23", "tokio", "tokio-stream", "tracing", @@ -4915,7 +5309,7 @@ dependencies = [ [[package]] name = "quickwit-macros" -version = "0.6.2" +version = "0.6.3" dependencies = [ "proc-macro2", "quickwit-macros-impl", @@ -4923,17 +5317,17 @@ dependencies = [ [[package]] name = "quickwit-macros-impl" -version = "0.6.2" +version = "0.6.3" dependencies = [ - "heck 0.4.1", + "heck", "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.26", ] [[package]] name = "quickwit-metastore" -version = "0.6.2" +version = "0.6.3" dependencies = [ "anyhow", "async-trait", @@ -4941,7 +5335,7 @@ dependencies = [ "dotenv", "futures", "http", - "itertools", + "itertools 0.11.0", "md5", "mockall", "once_cell", @@ -4949,16 +5343,17 @@ dependencies = [ "quickwit-config", "quickwit-doc-mapper", "quickwit-proto", + "quickwit-query", "quickwit-storage", "rand 0.8.5", "regex", "serde", "serde_json", - "serde_with 2.3.3", + "serde_with 3.1.0", "sqlx", "tempfile", "thiserror", - "time 0.3.21", + "time 0.3.23", "tokio", "tokio-stream", "tower", @@ -4969,21 +5364,8 @@ dependencies = [ ] [[package]] -name = "quickwit-metastore-utils" -version = "0.1.0" -dependencies = [ - "anyhow", - "async-trait", - "quickwit-proto", - "serde", - "serde_json", - "structopt", - "tokio", -] - -[[package]] name = "quickwit-opentelemetry" -version = "0.6.2" +version = "0.6.3" dependencies = [ "anyhow", "async-trait", @@ -5006,19 +5388,29 @@ dependencies = [ [[package]] name = "quickwit-proto" -version = "0.6.2" +version = "0.6.3" dependencies = [ "anyhow", + "async-trait", + "dyn-clone", "glob", + "http", + "hyper", + "mockall", "opentelemetry", "prost", "prost-build", "prost-types", - "quickwit-query", + "quickwit-actors", + "quickwit-codegen", + "quickwit-common", "serde", "serde_json", + "thiserror", + "tokio", "tonic 0.9.2", "tonic-build", + "tower", "tracing", "tracing-opentelemetry", "ulid", @@ -5027,25 +5419,31 @@ dependencies = [ [[package]] name = "quickwit-query" -version = "0.6.2" +version = "0.6.3" dependencies = [ "anyhow", "base64 0.21.2", + "criterion", "hex", + "lindera-core", + "lindera-dictionary", + "lindera-tokenizer", "once_cell", "proptest", "quickwit-datetime", "serde", "serde_json", - "serde_with 2.3.3", + "serde_with 3.1.0", "tantivy", "thiserror", - "time 0.3.21", + "time 0.3.23", + "tracing", + "whichlang", ] [[package]] name = "quickwit-rest-client" -version = "0.6.2" +version = "0.6.3" dependencies = [ "anyhow", "bytes", @@ -5069,7 +5467,7 @@ dependencies = [ [[package]] name = "quickwit-search" -version = "0.6.2" +version = "0.6.3" dependencies = [ "anyhow", "assert-json-diff 2.0.2", @@ -5080,8 +5478,8 @@ dependencies = [ "futures", "http", "hyper", - "itertools", - "lru", + "itertools 0.11.0", + "lru 0.11.0", "mockall", "once_cell", "opentelemetry", @@ -5093,7 +5491,6 @@ dependencies = [ "quickwit-config", "quickwit-directories", "quickwit-doc-mapper", - "quickwit-grpc-clients", "quickwit-indexing", "quickwit-metastore", "quickwit-opentelemetry", @@ -5103,7 +5500,7 @@ dependencies = [ "rayon", "serde", "serde_json", - "serde_with 2.3.3", + "serde_with 3.1.0", "tantivy", "tempfile", "thiserror", @@ -5118,7 +5515,7 @@ dependencies = [ [[package]] name = "quickwit-serve" -version = "0.6.2" +version = "0.6.3" dependencies = [ "anyhow", "assert-json-diff 2.0.2", @@ -5131,7 +5528,7 @@ dependencies = [ "futures-util", "http-serde", "hyper", - "itertools", + "itertools 0.11.0", "mime_guess", "mockall", "num_cpus", @@ -5145,7 +5542,6 @@ dependencies = [ "quickwit-core", "quickwit-directories", "quickwit-doc-mapper", - "quickwit-grpc-clients", "quickwit-indexing", "quickwit-ingest", "quickwit-jaeger", @@ -5162,12 +5558,12 @@ dependencies = [ "rust-embed", "serde", "serde_json", - "serde_qs 0.10.1", - "serde_with 2.3.3", + "serde_qs 0.12.0", + "serde_with 3.1.0", "tempfile", "termcolor", "thiserror", - "time 0.3.21", + "time 0.3.23", "tokio", "tokio-stream", "tower", @@ -5180,7 +5576,7 @@ dependencies = [ [[package]] name = "quickwit-storage" -version = "0.6.2" +version = "0.6.3" dependencies = [ "anyhow", "async-trait", @@ -5198,7 +5594,7 @@ dependencies = [ "fnv", "futures", "hyper", - "lru", + "lru 0.11.0", "md5", "mockall", "once_cell", @@ -5222,7 +5618,7 @@ dependencies = [ [[package]] name = "quickwit-telemetry" -version = "0.6.2" +version = "0.6.3" dependencies = [ "async-trait", "encoding_rs", @@ -5240,9 +5636,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.28" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +checksum = "5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0" dependencies = [ "proc-macro2", ] @@ -5318,7 +5714,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.9", + "getrandom 0.2.10", ] [[package]] @@ -5373,9 +5769,9 @@ dependencies = [ [[package]] name = "rdkafka" -version = "0.32.2" +version = "0.33.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8733bc5dc0b192d1a4b28073f9bff1326ad9e4fecd4d9b025d6fc358d1c3e79" +checksum = "da18026aad1c24033da3da726200de7e911e75c2e2cc2f77ffb9b4502720faae" dependencies = [ "futures-channel", "futures-util", @@ -5411,7 +5807,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -5420,7 +5816,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -5429,7 +5825,7 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.9", + "getrandom 0.2.10", "redox_syscall 0.2.16", "thiserror", ] @@ -5442,8 +5838,8 @@ checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.1", - "regex-syntax 0.7.3", + "regex-automata 0.3.3", + "regex-syntax 0.7.4", ] [[package]] @@ -5457,13 +5853,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9aaecc05d5c4b5f7da074b9a0d1a0867e71fd36e7fc0482d8bcfe8e8fc56290" +checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.3", + "regex-syntax 0.7.4", ] [[package]] @@ -5474,9 +5870,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab07dc67230e4a4718e70fd5c20055a4334b121f1f9db8fe63ef39ce9b8c846" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "rend" @@ -5502,7 +5898,7 @@ dependencies = [ "http", "http-body", "hyper", - "hyper-rustls 0.24.0", + "hyper-rustls 0.24.1", "ipnet", "js-sys", "log", @@ -5510,13 +5906,13 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.1", + "rustls 0.21.5", "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", "tokio", - "tokio-rustls 0.24.0", + "tokio-rustls 0.24.1", "tokio-util", "tower-service", "url", @@ -5524,7 +5920,7 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots", + "webpki-roots 0.22.6", "winreg", ] @@ -5596,6 +5992,28 @@ dependencies = [ ] [[package]] +name = "rsa" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ab43bb47d23c1a631b4b680199a45255dce26fa9ab2fa902581f624ff13e6a8" +dependencies = [ + "byteorder", + "const-oid", + "digest", + "num-bigint-dig", + "num-integer", + "num-iter", + "num-traits", + "pkcs1", + "pkcs8", + "rand_core 0.6.4", + "signature", + "spki", + "subtle", + "zeroize", +] + +[[package]] name = "rust-embed" version = "6.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5615,7 +6033,7 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.18", + "syn 2.0.26", "walkdir", ] @@ -5641,11 +6059,11 @@ dependencies = [ [[package]] name = "rust_decimal" -version = "1.29.1" +version = "1.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26bd36b60561ee1fb5ec2817f198b6fd09fa571c897a5e86d1487cfc2b096dfc" +checksum = "d0446843641c69436765a35a5a77088e28c2e6a12da93e84aa3ab1cd4aa5a042" dependencies = [ - "arrayvec 0.7.2", + "arrayvec 0.7.4", "borsh", "bytecheck", "byteorder", @@ -5680,11 +6098,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.14" +version = "0.36.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14e4d67015953998ad0eb82887a0eb0129e18a7e2f3b7b0f6c422fddcd503d62" +checksum = "c37f1bd5ef1b5422177b7646cba67430579cfe2ace80f284fee876bca52ad941" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", "io-lifetimes", "libc", @@ -5694,15 +6112,14 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.19" +version = "0.38.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" +checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" dependencies = [ - "bitflags", + "bitflags 2.3.3", "errno", - "io-lifetimes", "libc", - "linux-raw-sys 0.3.8", + "linux-raw-sys 0.4.3", "windows-sys 0.48.0", ] @@ -5720,9 +6137,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.1" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c911ba11bc8433e811ce56fde130ccf32f5127cab0e0194e9c68c5a5b671791e" +checksum = "79ea77c539259495ce8ca47f53e66ae0330a8819f67e23ac96ca02f50e7b7d36" dependencies = [ "log", "ring", @@ -5732,9 +6149,9 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ "openssl-probe", "rustls-pemfile", @@ -5744,18 +6161,18 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" +checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ "base64 0.21.2", ] [[package]] name = "rustls-webpki" -version = "0.100.1" +version = "0.101.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" +checksum = "15f36a6828982f422756984e47912a7a51dcbc2a197aa791158f8ca61cd8204e" dependencies = [ "ring", "untrusted", @@ -5763,9 +6180,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "rusty-fork" @@ -5781,9 +6198,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "same-file" @@ -5808,11 +6225,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "windows-sys 0.42.0", + "windows-sys 0.48.0", ] [[package]] @@ -5823,9 +6240,9 @@ checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sct" @@ -5849,7 +6266,7 @@ version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -5868,15 +6285,15 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" [[package]] name = "serde" -version = "1.0.163" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" +checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" dependencies = [ "serde_derive", ] @@ -5892,33 +6309,21 @@ dependencies = [ ] [[package]] -name = "serde-xml-rs" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb3aa78ecda1ebc9ec9847d5d3aba7d618823446a049ba2491940506da6e2782" -dependencies = [ - "log", - "serde", - "thiserror", - "xml-rs", -] - -[[package]] name = "serde_derive" -version = "1.0.163" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" +checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.26", ] [[package]] name = "serde_json" -version = "1.0.96" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" dependencies = [ "itoa", "ryu", @@ -5927,10 +6332,11 @@ dependencies = [ [[package]] name = "serde_path_to_error" -version = "0.1.11" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7f05c1d5476066defcdfacce1f52fc3cae3af1d3089727100c02ae92e5abbe0" +checksum = "4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335" dependencies = [ + "itoa", "serde", ] @@ -5956,9 +6362,9 @@ dependencies = [ [[package]] name = "serde_qs" -version = "0.10.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cac3f1e2ca2fe333923a1ae72caca910b98ed0630bb35ef6f8c8517d6e81afa" +checksum = "0431a35568651e363364210c91983c1da5eb29404d9f0928b67d4ebcfa7d330c" dependencies = [ "futures", "percent-encoding", @@ -5970,9 +6376,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d" +checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" dependencies = [ "serde", ] @@ -6001,18 +6407,18 @@ dependencies = [ [[package]] name = "serde_with" -version = "2.3.3" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" +checksum = "21e47d95bc83ed33b2ecf84f4187ad1ab9685d18ff28db000c99deac8ce180e3" dependencies = [ - "base64 0.13.1", + "base64 0.21.2", "chrono", "hex", - "indexmap", + "indexmap 1.9.3", "serde", "serde_json", - "serde_with_macros 2.3.3", - "time 0.3.21", + "serde_with_macros 3.1.0", + "time 0.3.23", ] [[package]] @@ -6029,14 +6435,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "2.3.3" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" +checksum = "ea3cee93715c2e266b9338b7544da68a9f24e227722ba482bd1c024367c77c65" dependencies = [ - "darling 0.20.1", + "darling 0.20.3", "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.26", ] [[package]] @@ -6045,7 +6451,7 @@ version = "0.8.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" dependencies = [ - "indexmap", + "indexmap 1.9.3", "ryu", "serde", "yaml-rust", @@ -6053,11 +6459,11 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.21" +version = "0.9.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9d684e3ec7de3bf5466b32bd75303ac16f0736426e5a4e0d6e489559ce1249c" +checksum = "bd5f51e3fdb5b9cdd1577e1cb7a733474191b1aca6a72c2e50913241632c1180" dependencies = [ - "indexmap", + "indexmap 2.0.0", "itoa", "ryu", "serde", @@ -6088,9 +6494,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" dependencies = [ "cfg-if", "cpufeatures", @@ -6142,6 +6548,16 @@ dependencies = [ ] [[package]] +name = "signature" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" +dependencies = [ + "digest", + "rand_core 0.6.4", +] + +[[package]] name = "simdutf8" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6173,15 +6589,15 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "snafu" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0656e7e3ffb70f6c39b3c2a86332bb74aa3c679da781642590f3c1118c5045" +checksum = "e4de37ad025c587a29e8f3f5605c00f70b98715ef90b9061a815b9e59e9042d6" dependencies = [ "doc-comment", "snafu-derive", @@ -6189,11 +6605,11 @@ dependencies = [ [[package]] name = "snafu-derive" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "475b3bbe5245c26f2d8a6f62d67c1f30eb9fffeccee721c45d162c3ebbdf81b2" +checksum = "990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf" dependencies = [ - "heck 0.4.1", + "heck", "proc-macro2", "quote", "syn 1.0.109", @@ -6231,108 +6647,226 @@ dependencies = [ ] [[package]] +name = "spki" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" +dependencies = [ + "base64ct", + "der", +] + +[[package]] name = "sqlformat" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c12bc9199d1db8234678b7051747c07f517cdcf019262d1847b94ec8b1aee3e" dependencies = [ - "itertools", + "itertools 0.10.5", "nom", "unicode_categories", ] [[package]] name = "sqlx" -version = "0.6.3" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8de3b03a925878ed54a954f621e64bf55a3c1bd29652d0d1a17830405350188" +checksum = "8e58421b6bc416714d5115a2ca953718f6c621a51b68e4f4922aea5a4391a721" dependencies = [ "sqlx-core", "sqlx-macros", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", ] [[package]] name = "sqlx-core" -version = "0.6.3" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa8241483a83a3f33aa5fff7e7d9def398ff9990b2752b6c6112b83c6d246029" +checksum = "dd4cef4251aabbae751a3710927945901ee1d97ee96d757f6880ebb9a79bfd53" dependencies = [ - "ahash 0.7.6", + "ahash 0.8.3", "atoi", - "base64 0.13.1", - "bitflags", "byteorder", "bytes", "crc", "crossbeam-queue", - "dirs", "dotenvy", "either", "event-listener", "futures-channel", "futures-core", "futures-intrusive", + "futures-io", "futures-util", "hashlink", "hex", - "hkdf", - "hmac", - "indexmap", - "itoa", - "libc", + "indexmap 2.0.0", "log", - "md-5", "memchr", "once_cell", "paste", "percent-encoding", - "rand 0.8.5", - "rustls 0.20.8", + "rustls 0.21.5", "rustls-pemfile", "serde", "serde_json", - "sha1", "sha2", "smallvec", "sqlformat", - "sqlx-rt", - "stringprep", "thiserror", - "time 0.3.21", + "time 0.3.23", + "tokio", "tokio-stream", + "tracing", "url", - "webpki-roots", - "whoami", + "webpki-roots 0.24.0", ] [[package]] name = "sqlx-macros" -version = "0.6.3" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9966e64ae989e7e575b19d7265cb79d7fc3cbbdf179835cb0d716f294c2049c9" +checksum = "208e3165167afd7f3881b16c1ef3f2af69fa75980897aac8874a0696516d12c2" +dependencies = [ + "proc-macro2", + "quote", + "sqlx-core", + "sqlx-macros-core", + "syn 1.0.109", +] + +[[package]] +name = "sqlx-macros-core" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a4a8336d278c62231d87f24e8a7a74898156e34c1c18942857be2acb29c7dfc" dependencies = [ "dotenvy", "either", - "heck 0.4.1", + "heck", + "hex", "once_cell", "proc-macro2", "quote", + "serde", + "serde_json", "sha2", "sqlx-core", - "sqlx-rt", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", "syn 1.0.109", + "tempfile", + "tokio", "url", ] [[package]] -name = "sqlx-rt" -version = "0.6.3" +name = "sqlx-mysql" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "804d3f245f894e61b1e6263c84b23ca675d96753b5abfd5cc8597d86806e8024" +checksum = "8ca69bf415b93b60b80dc8fda3cb4ef52b2336614d8da2de5456cc942a110482" dependencies = [ + "atoi", + "base64 0.21.2", + "bitflags 2.3.3", + "byteorder", + "bytes", + "crc", + "digest", + "dotenvy", + "either", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "generic-array", + "hex", + "hkdf", + "hmac", + "itoa", + "log", + "md-5", + "memchr", "once_cell", - "tokio", - "tokio-rustls 0.23.4", + "percent-encoding", + "rand 0.8.5", + "rsa", + "serde", + "sha1", + "sha2", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "time 0.3.23", + "tracing", + "whoami", +] + +[[package]] +name = "sqlx-postgres" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0db2df1b8731c3651e204629dd55e52adbae0462fa1bdcbed56a2302c18181e" +dependencies = [ + "atoi", + "base64 0.21.2", + "bitflags 2.3.3", + "byteorder", + "crc", + "dotenvy", + "etcetera", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "hex", + "hkdf", + "hmac", + "home", + "itoa", + "log", + "md-5", + "memchr", + "once_cell", + "rand 0.8.5", + "serde", + "serde_json", + "sha1", + "sha2", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "time 0.3.23", + "tracing", + "whoami", +] + +[[package]] +name = "sqlx-sqlite" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4c21bf34c7cae5b283efb3ac1bcc7670df7561124dc2f8bdc0b59be40f79a2" +dependencies = [ + "atoi", + "flume", + "futures-channel", + "futures-core", + "futures-executor", + "futures-intrusive", + "futures-util", + "libsqlite3-sys", + "log", + "percent-encoding", + "serde", + "sqlx-core", + "time 0.3.23", + "tracing", + "url", ] [[package]] @@ -6355,16 +6889,16 @@ checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" dependencies = [ "new_debug_unreachable", "once_cell", - "parking_lot 0.12.1", + "parking_lot", "phf_shared 0.10.0", "precomputed-hash", ] [[package]] name = "stringprep" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ee348cb74b87454fff4b551cbf727025810a004f88aeacae7f85b87f4e9a1c1" +checksum = "db3737bde7edce97102e0e2b15365bf7a20bfdb5f60f4f9e8d7004258a51a8da" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -6381,41 +6915,11 @@ dependencies = [ [[package]] name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] -name = "strsim" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] -name = "structopt" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" -dependencies = [ - "clap 2.34.0", - "lazy_static", - "structopt-derive", -] - -[[package]] -name = "structopt-derive" -version = "0.4.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" -dependencies = [ - "heck 0.3.3", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] name = "subtle" version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6434,9 +6938,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.18" +version = "2.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" +checksum = "45c3457aacde3c65315de5031ec191ce46604304d2446e803d71ade03308d970" dependencies = [ "proc-macro2", "quote", @@ -6477,7 +6981,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9ee618502f497abf593e1c5c9577f34775b111480009ffccd7ad70d23fcaba8" dependencies = [ - "heck 0.4.1", + "heck", "proc-macro-error", "proc-macro2", "quote", @@ -6503,10 +7007,10 @@ dependencies = [ "fs4", "futures-util", "htmlescape", - "itertools", + "itertools 0.10.5", "levenshtein_automata", "log", - "lru", + "lru 0.10.1", "lz4_flex", "measure_time", "memmap2", @@ -6532,7 +7036,7 @@ dependencies = [ "tantivy-tokenizer-api", "tempfile", "thiserror", - "time 0.3.21", + "time 0.3.23", "uuid", "winapi 0.3.9", "zstd 0.12.3+zstd.1.5.2", @@ -6553,7 +7057,7 @@ source = "git+https://github.com/quickwit-oss/tantivy/?rev=3c30066#3c300666ad448 dependencies = [ "fastdivide", "fnv", - "itertools", + "itertools 0.10.5", "serde", "tantivy-bitpacker", "tantivy-common", @@ -6570,7 +7074,7 @@ dependencies = [ "byteorder", "ownedbytes", "serde", - "time 0.3.21", + "time 0.3.23", ] [[package]] @@ -6628,16 +7132,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] +name = "tar" +version = "0.4.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec96d2ffad078296368d46ff1cb309be1c23c513b4ab0e22a45de0185275ac96" +dependencies = [ + "filetime", + "libc", + "xattr", +] + +[[package]] name = "tempfile" -version = "3.6.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998" dependencies = [ - "autocfg", "cfg-if", - "fastrand", + "fastrand 2.0.0", "redox_syscall 0.3.5", - "rustix 0.37.19", + "rustix 0.38.4", "windows-sys 0.48.0", ] @@ -6668,32 +7182,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.26", ] [[package]] @@ -6778,9 +7283,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.21" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc" +checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446" dependencies = [ "itoa", "libc", @@ -6803,14 +7308,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78bfd61bca99323ce96911bd2c443259115460615e44f1d449cee8cb3831a1dd" dependencies = [ "thiserror", - "time 0.3.21", + "time 0.3.23", ] [[package]] name = "time-macros" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" +checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4" dependencies = [ "time-core", ] @@ -6851,9 +7356,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.29.0" +version = "1.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374442f06ee49c3a28a8fc9f01a2596fed7559c6b99b31279c3261778e77d84f" +checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" dependencies = [ "autocfg", "backtrace", @@ -6861,7 +7366,7 @@ dependencies = [ "libc", "mio", "num_cpus", - "parking_lot 0.12.1", + "parking_lot", "pin-project-lite", "signal-hook-registry", "socket2", @@ -6888,7 +7393,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.26", ] [[package]] @@ -6914,11 +7419,11 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0d409377ff5b1e3ca6437aa86c1eb7d40c134bfec254e44c830defa92669db5" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.1", + "rustls 0.21.5", "tokio", ] @@ -6975,52 +7480,35 @@ dependencies = [ [[package]] name = "toml" -version = "0.6.0" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb9d890e4dc9298b70f740f615f2e05b9db37dce531f6b24fb77ac993f9f217" +checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" dependencies = [ "serde", "serde_spanned", - "toml_datetime 0.5.1", - "toml_edit 0.18.1", + "toml_datetime", + "toml_edit", ] [[package]] name = "toml_datetime" -version = "0.5.1" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" dependencies = [ "serde", ] [[package]] -name = "toml_datetime" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f" - -[[package]] name = "toml_edit" -version = "0.18.1" +version = "0.19.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c59d8dd7d0dcbc6428bf7aa2f0e823e26e43b3c9aca15bbc9475d23e5fa12b" +checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" dependencies = [ - "indexmap", - "nom8", + "indexmap 2.0.0", "serde", "serde_spanned", - "toml_datetime 0.5.1", -] - -[[package]] -name = "toml_edit" -version = "0.19.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739" -dependencies = [ - "indexmap", - "toml_datetime 0.6.2", + "toml_datetime", "winnow", ] @@ -7106,7 +7594,7 @@ checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" dependencies = [ "futures-core", "futures-util", - "indexmap", + "indexmap 1.9.3", "pin-project", "pin-project-lite", "rand 0.8.5", @@ -7120,12 +7608,12 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d1d42a9b3f3ec46ba828e8d376aec14592ea199f70a06a548587ecd1c4ab658" +checksum = "a8bd22a874a2d0b70452d5597b12c537331d49060824a95f49f108994f94aa4c" dependencies = [ "async-compression", - "bitflags", + "bitflags 2.3.3", "bytes", "futures-core", "futures-util", @@ -7166,13 +7654,13 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.24" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.26", ] [[package]] @@ -7233,7 +7721,7 @@ dependencies = [ "sharded-slab", "smallvec", "thread_local", - "time 0.3.21", + "time 0.3.23", "tracing", "tracing-core", "tracing-log", @@ -7272,9 +7760,9 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "typetag" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6898cc6f6a32698cc3e14d5632a14d2b23ed9f7b11e6b8e05ce685990acc22" +checksum = "7a66aafcfb982bf1f9a28755ac6bcbdcd4631ff516cb038fa61299201ebb4364" dependencies = [ "erased-serde", "inventory", @@ -7285,13 +7773,13 @@ dependencies = [ [[package]] name = "typetag-impl" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c3e1c30cedd24fc597f7d37a721efdbdc2b1acae012c1ef1218f4c7c2c0f3e7" +checksum = "d836cd032f71d90cbaa3c1f85ce84266af23659766d8c0b1c4c6524a0fb4c36f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.26", ] [[package]] @@ -7341,9 +7829,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unicode-normalization" @@ -7380,9 +7868,9 @@ checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" [[package]] name = "unsafe-libyaml" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1865806a559042e51ab5414598446a5871b561d21b6764f2eabb0dd481d880a6" +checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa" [[package]] name = "untrusted" @@ -7392,9 +7880,9 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "url" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" dependencies = [ "form_urlencoded", "idna", @@ -7444,11 +7932,11 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "utoipa" -version = "3.3.0" +version = "3.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68ae74ef183fae36d650f063ae7bde1cacbe1cd7e72b617cbe1e985551878b98" +checksum = "8c624186f22e625eb8faa777cb33d34cd595aa16d1742aa1d8b6cf35d3e4dda9" dependencies = [ - "indexmap", + "indexmap 2.0.0", "serde", "serde_json", "utoipa-gen", @@ -7456,23 +7944,23 @@ dependencies = [ [[package]] name = "utoipa-gen" -version = "3.3.0" +version = "3.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ea8ac818da7e746a63285594cce8a96f5e00ee31994e655bd827569cb8b137b" +checksum = "b9ce5f21ca77e010f5283fa791c6ab892c68b3668a1bdc6b7ac6cf978f5d5b30" dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.26", ] [[package]] name = "uuid" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d023da39d1fde5a8a3fe1f3e01ca9632ada0a63e9797de55a879d6e2236277be" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" dependencies = [ - "getrandom 0.2.9", + "getrandom 0.2.10", "rand 0.8.5", "serde", ] @@ -7507,12 +7995,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - -[[package]] name = "version_check" version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7538,7 +8020,7 @@ dependencies = [ "chrono", "chrono-tz", "dyn-clone", - "getrandom 0.2.9", + "getrandom 0.2.10", "indoc", "lalrpop-util", "ordered-float 3.7.0", @@ -7618,7 +8100,7 @@ dependencies = [ "hex", "hmac", "hostname", - "indexmap", + "indexmap 1.9.3", "indoc", "md-5", "nom", @@ -7707,11 +8189,10 @@ dependencies = [ [[package]] name = "want" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" dependencies = [ - "log", "try-lock", ] @@ -7766,9 +8247,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -7776,24 +8257,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.26", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.36" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d1985d03709c53167ce907ff394f5316aa22cb4e12761295c5dc57dacb6297e" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" dependencies = [ "cfg-if", "js-sys", @@ -7803,9 +8284,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -7813,22 +8294,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.26", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "wasm-streams" @@ -7845,9 +8326,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.63" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" dependencies = [ "js-sys", "wasm-bindgen", @@ -7873,6 +8354,15 @@ dependencies = [ ] [[package]] +name = "webpki-roots" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888" +dependencies = [ + "rustls-webpki", +] + +[[package]] name = "which" version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7884,14 +8374,15 @@ dependencies = [ ] [[package]] +name = "whichlang" +version = "0.1.0" +source = "git+https://github.com/quickwit-oss/whichlang?rev=fe406416#fe406416cbad9849f790a274d25b2a53caccd2fa" + +[[package]] name = "whoami" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c70234412ca409cc04e864e89523cb0fc37f5e1344ebed5a3ebf4192b6b9f68" -dependencies = [ - "wasm-bindgen", - "web-sys", -] +checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50" [[package]] name = "winapi" @@ -7942,22 +8433,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets 0.48.0", -] - -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", + "windows-targets 0.48.1", ] [[package]] @@ -7975,7 +8451,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.0", + "windows-targets 0.48.1", ] [[package]] @@ -7995,9 +8471,9 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.48.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" dependencies = [ "windows_aarch64_gnullvm 0.48.0", "windows_aarch64_msvc 0.48.0", @@ -8094,9 +8570,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "winnow" -version = "0.4.6" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699" +checksum = "81fac9742fd1ad1bd9643b991319f72dd031016d44b77039a26977eb667141e7" dependencies = [ "memchr", ] @@ -8112,9 +8588,9 @@ dependencies = [ [[package]] name = "wiremock" -version = "0.5.18" +version = "0.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd7b0b5b253ebc0240d6aac6dd671c495c467420577bf634d3064ae7e6fa2b4c" +checksum = "c6f71803d3a1c80377a06221e0530be02035d5b3e854af56c6ece7ac20ac441d" dependencies = [ "assert-json-diff 2.0.2", "async-trait", @@ -8152,10 +8628,13 @@ dependencies = [ ] [[package]] -name = "xml-rs" -version = "0.8.14" +name = "xattr" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52839dc911083a8ef63efa4d039d1f58b5e409f923e44c80828f206f66e5541c" +checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" +dependencies = [ + "libc", +] [[package]] name = "xmlparser" @@ -8164,6 +8643,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d25c75bf9ea12c4040a97f829154768bbbce366287e2dc044af160cd79a13fd" [[package]] +name = "yada" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6d12cb7a57bbf2ab670ed9545bae3648048547f9039279a89ce000208e585c1" + +[[package]] name = "yaml-rust" version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8185,6 +8670,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" [[package]] +name = "zip" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +dependencies = [ + "aes", + "byteorder", + "bzip2", + "constant_time_eq", + "crc32fast", + "crossbeam-utils", + "flate2", + "hmac", + "pbkdf2", + "sha1", + "time 0.3.23", + "zstd 0.11.2+zstd.1.5.2", +] + +[[package]] name = "zstd" version = "0.11.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/pkgs/servers/search/quickwit/default.nix b/pkgs/servers/search/quickwit/default.nix index e3eaf86c16e50..9fdcbef3e7129 100644 --- a/pkgs/servers/search/quickwit/default.nix +++ b/pkgs/servers/search/quickwit/default.nix @@ -9,7 +9,7 @@ let pname = "quickwit"; - version = "0.6.2"; + version = "0.6.4"; in rustPlatform.buildRustPackage rec { inherit pname version; @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage rec { owner = "quickwit-oss"; repo = pname; rev = "v${version}"; - hash = "sha256-ClCKBUdFl5AhDmJdCfdOM6jzQpwducyDuqzypdqM6Zg="; + hash = "sha256-stlm3oDMQVoMza3s4JApynXbzhrarfXw3uAxGMZQJqs="; }; postPatch = '' substituteInPlace ./quickwit-ingest/build.rs \ --replace '&[]' '&["."]' - substituteInPlace ./quickwit-control-plane/build.rs \ - --replace '&[]' '&["."]' substituteInPlace ./quickwit-codegen/example/build.rs \ --replace '&[]' '&["."]' + substituteInPlace ./quickwit-proto/build.rs \ + --replace '&[]' '&["."]' ''; sourceRoot = "${src.name}/quickwit"; @@ -42,6 +42,7 @@ rustPlatform.buildRustPackage rec { "path-0.1.0" = "sha256-f+Iix+YuKy45zoQXH7ctzANaL96s7HNUBOhcM1ZV0Ko="; "pulsar-5.0.2" = "sha256-j7wpsAro6x4fk3pvSL4fxLkddJFq8duZ7jDj0Edf3YQ="; "sasl2-sys-0.1.20+2.1.28" = "sha256-u4BsfmTDFxuY3i1amLCsr7MDv356YPThMHclura0Sxs="; + "whichlang-0.1.0" = "sha256-7AvLGjtWHjG0TnZdg9p5D+O0H19uo2sqPxJMn6mOU0k="; }; }; @@ -71,6 +72,7 @@ rustPlatform.buildRustPackage rec { "--skip=actors::indexer::tests::test_indexer_partitioning" "--skip=actors::indexing_pipeline::tests::test_merge_pipeline_does_not_stop_on_indexing_pipeline_failure" "--skip=actors::indexer::tests::test_indexer_triggers_commit_on_target_num_docs" + "--skip=actors::packager::tests::test_packager_simple" # fail on darwin for some reason "--skip=io::tests::test_controlled_writer_limited_async" "--skip=io::tests::test_controlled_writer_limited_sync" diff --git a/pkgs/servers/search/typesense/sources.json b/pkgs/servers/search/typesense/sources.json index 0ecf202f670ee..bd7a422a2f0b4 100644 --- a/pkgs/servers/search/typesense/sources.json +++ b/pkgs/servers/search/typesense/sources.json @@ -1,17 +1,17 @@ { - "version": "0.25.0", + "version": "0.25.1", "platforms": { "aarch64-linux": { "arch": "linux-arm64", - "hash": "sha256-R1ayDJah8EMZVVw5fQpHNXMUMwtOJWEPtx4qz5KbniM=" + "hash": "sha256-u5gkAcSw0AG0+NK3/1O90leOyM8I03/EXxFAXoFSqt4=" }, "x86_64-linux": { "arch": "linux-amd64", - "hash": "sha256-/EDDYaGP43LuOq90Vx8z/fmp4ougyuiTP1L5DmQPZ0Q=" + "hash": "sha256-XebMzmTkLn+kKa0gAnoSMPmPxbxysfPnes4RQ3hqShc=" }, "x86_64-darwin": { "arch": "darwin-amd64", - "hash": "sha256-M2yUAto7KlNY8zswSXqVwH120QV8OrGljobbZkjUSoQ=" + "hash": "sha256-zz8GObtjDgMWx4HDcwugMWeS/n40/1jPwN/8rXIb5+8=" } } } diff --git a/pkgs/servers/skydns/default.nix b/pkgs/servers/skydns/default.nix index be9e815b9ec46..2ae2efbbb7596 100644 --- a/pkgs/servers/skydns/default.nix +++ b/pkgs/servers/skydns/default.nix @@ -29,6 +29,6 @@ buildGoModule rec { description = "A distributed service for announcement and discovery of services"; homepage = "https://github.com/skynetservices/skydns"; license = lib.licenses.mit; - maintainers = with maintainers; [ aaronjheng ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/servers/snac2/default.nix b/pkgs/servers/snac2/default.nix index 82ff542c92287..b13b6c2b9fcfa 100644 --- a/pkgs/servers/snac2/default.nix +++ b/pkgs/servers/snac2/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "snac2"; - version = "2.35"; + version = "2.41"; src = fetchFromGitea { domain = "codeberg.org"; owner = "grunfink"; repo = pname; rev = version; - hash = "sha256-V9Q9rjinFDFCi2snQ27R0Y9KFrYD/HLElnT8KV/3bP4="; + hash = "sha256-WVbGORth3paDo1eK/J7MPUstVQifcU7ksVEb87vknN0="; }; buildInputs = [ curl openssl ]; diff --git a/pkgs/servers/sozu/default.nix b/pkgs/servers/sozu/default.nix index 13031f72aa9dc..beb544de0bae7 100644 --- a/pkgs/servers/sozu/default.nix +++ b/pkgs/servers/sozu/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "sozu"; - version = "0.15.4"; + version = "0.15.5"; src = fetchFromGitHub { owner = "sozu-proxy"; repo = pname; rev = version; - hash = "sha256-kyD4MXk6MajAJb0k7jDquPFodq7NLPsaZbGHcZMojC4="; + hash = "sha256-EKp+BR1x98BFDl4d6cCwBlldF6NT66SfrchNvyasI0s="; }; - cargoHash = "sha256-qfuTkf31b5rHdYbTraFDw1FtZ0jGdQaM2V3idVHk/u4="; + cargoHash = "sha256-8uiMQPXhZyk3YteTQfxzFIt9xlJzvogUy+WqsHBzmhk="; nativeBuildInputs = [ protobuf ]; diff --git a/pkgs/servers/spicedb/zed.nix b/pkgs/servers/spicedb/zed.nix index 96b1afec99359..cc3853624706a 100644 --- a/pkgs/servers/spicedb/zed.nix +++ b/pkgs/servers/spicedb/zed.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "zed"; - version = "0.12.1"; + version = "0.14.0"; src = fetchFromGitHub { owner = "authzed"; repo = "zed"; rev = "v${version}"; - hash = "sha256-3aG47DeYVwDj0tX26oOWVE8yq8sVtxA4uw+LOIjKNuI="; + hash = "sha256-+u8qrF/P8a19Bc085upT65xVPGIVR3My/k/enhdUJmQ="; }; - vendorHash = "sha256-kUMCbRIhSb5Bqo1P9J08xVUJmUdxaq5iU34sR+nuol4="; + vendorHash = "sha256-f0UNUOi0WXm06dko+7O00C0dla/JlfGlXaZ00TMX0WU="; meta = with lib; { description = "Command line for managing SpiceDB"; diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index f910f1651d2f2..e2ddc06729b54 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "1.14.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "dolthub"; repo = "dolt"; rev = "v${version}"; - sha256 = "sha256-dLIT0EPtz1a1v48axT1xRcgKGJwXFjNnzu5eUzF4QXw="; + sha256 = "sha256-+pUlnL8Ie/+of/kEv7d3gqF3d0HaYjWgZf0ycNQcaC0="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" ]; - vendorHash = "sha256-s9ACHwgdElFqmgnryVsKfVFqoy153prtyJx03qNI/KU="; + vendorHash = "sha256-e90yn7vZo15BrP91PrFGMogNNy3VAP8rew4cjVa6puM="; proxyVendor = true; doCheck = false; diff --git a/pkgs/servers/sql/mysql/8.0.x.nix b/pkgs/servers/sql/mysql/8.0.x.nix index 43086a891d796..4eec452d0f11a 100644 --- a/pkgs/servers/sql/mysql/8.0.x.nix +++ b/pkgs/servers/sql/mysql/8.0.x.nix @@ -1,15 +1,14 @@ { lib, stdenv, fetchurl, bison, cmake, pkg-config , boost, icu, libedit, libevent, lz4, ncurses, openssl, protobuf, re2, readline, zlib, zstd, libfido2 -, numactl, perl, cctools, CoreServices, developer_cmds, libtirpc, rpcsvc-proto, curl, DarwinTools, nixosTests +, numactl, cctools, CoreServices, developer_cmds, libtirpc, rpcsvc-proto, curl, DarwinTools, nixosTests }: -let -self = stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mysql"; version = "8.0.34"; src = fetchurl { - url = "https://dev.mysql.com/get/Downloads/MySQL-${self.mysqlVersion}/${pname}-${version}.tar.gz"; + url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor finalAttrs.version}/mysql-${finalAttrs.version}.tar.gz"; hash = "sha256-5l0Do8QmGLX7+ZBCrtMyCUAumyeqYsfIdD/9R4jY2x0="; }; @@ -63,10 +62,10 @@ self = stdenv.mkDerivation rec { ''; passthru = { - client = self; - connector-c = self; - server = self; - mysqlVersion = "8.0"; + client = finalAttrs.finalPackage; + connector-c = finalAttrs.finalPackage; + server = finalAttrs.finalPackage; + mysqlVersion = lib.versions.majorMinor finalAttrs.version; tests = nixosTests.mysql.mysql80; }; @@ -77,4 +76,4 @@ self = stdenv.mkDerivation rec { maintainers = with maintainers; [ orivej ]; platforms = platforms.unix; }; -}; in self +}) diff --git a/pkgs/servers/sql/mysql/jdbc/default.nix b/pkgs/servers/sql/mysql/jdbc/default.nix index e1082480efb69..69a7893ed7c2b 100644 --- a/pkgs/servers/sql/mysql/jdbc/default.nix +++ b/pkgs/servers/sql/mysql/jdbc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mysql-connector-java"; - version = "8.0.33"; + version = "8.1.0"; src = fetchurl { url = "https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-j-${version}.zip"; - sha256 = "sha256-k3jft7sM2xrc88mdhltxtm+SZcRAn6B4EvglMyJyX4Y="; + sha256 = "sha256-xFYvNbb5cj6xrMHAnTzGLC8v5fxqRcmZhf4haK3wtUk="; }; installPhase = '' @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "MySQL Connector/J"; - homepage = "https://dev.mysql.com/doc/connector-j/8.0/en/"; + homepage = "https://dev.mysql.com/doc/connector-j/8.1/en/"; maintainers = with maintainers; [ ]; platforms = platforms.unix; license = licenses.gpl2; diff --git a/pkgs/servers/sql/pgbouncer/default.nix b/pkgs/servers/sql/pgbouncer/default.nix index 7a528ba3c6d5c..b0f2bcb61626a 100644 --- a/pkgs/servers/sql/pgbouncer/default.nix +++ b/pkgs/servers/sql/pgbouncer/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pgbouncer"; - version = "1.20.0"; + version = "1.20.1"; src = fetchurl { url = "https://www.pgbouncer.org/downloads/files/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-5w1afLi3Hdfbq/01cdcaS2uZ8uhdjXGvHnNPbYZjXw4="; + hash = "sha256-JJks9VfXNCbXBIaY3/x7AZ5jZNTYdXriz14kcShqIIg="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/sql/postgresql/ext/age.nix b/pkgs/servers/sql/postgresql/ext/age.nix index 5e88b2fdebca5..c0de0c30d5a7b 100644 --- a/pkgs/servers/sql/postgresql/ext/age.nix +++ b/pkgs/servers/sql/postgresql/ext/age.nix @@ -1,14 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, bison, flex, postgresql }: +{ lib, stdenv, bison, fetchFromGitHub, flex, perl, postgresql }: +let + hashes = { + "15" = "sha256-1vmwoflbU3++PFDcsLt9gyLkuzMRGNCD7vWl7/6Q+SE="; + "14" = "sha256-w93Q499sZRk4q85A9yqKQjGUd9Pl8UL8K1D3W7mHRTU="; + "13" = "sha256-Sot7FR0oW7kWA680pNCMCmlflu4RfJTSWZn9mrXrpzw="; + "12" = "sha256-XezcXoHHLCD1/2OHmKhxome2pdjOsYAfZlpvOoU3aS4="; + "11" = "sha256-ZkNAIMO69BxF3knQ+jcUBVuDgcoZXZccF5O+acpZ81M="; + }; +in stdenv.mkDerivation rec { pname = "age"; - version = "1.1.0-rc0"; + version = "1.4.0-rc0"; src = fetchFromGitHub { owner = "apache"; repo = "age"; - rev = "v${version}"; - sha256 = "sha256-7qQGiiFkGbS/j7ouP2Joj5EGT+ferIgYYMoTe9jmTqQ="; + rev = "PG${lib.versions.major postgresql.version}/v${builtins.replaceStrings ["."] ["_"] version}"; + hash = hashes.${lib.versions.major postgresql.version} or (throw "Source for Age is not available for ${postgresql.version}"); }; buildInputs = [ postgresql ]; @@ -16,6 +25,7 @@ stdenv.mkDerivation rec { makeFlags = [ "BISON=${bison}/bin/bison" "FLEX=${flex}/bin/flex" + "PERL=${perl}/bin/perl" ]; installPhase = '' @@ -54,11 +64,10 @@ stdenv.mkDerivation rec { }; meta = with lib; { - # Only supports PostgreSQL 11 https://github.com/apache/age/issues/225 - broken = versions.major postgresql.version != "11"; + broken = !builtins.elem (versions.major postgresql.version) (builtins.attrNames hashes); description = "A graph database extension for PostgreSQL"; homepage = "https://age.apache.org/"; - changelog = "https://github.com/apache/age/raw/v${version}/RELEASE"; + changelog = "https://github.com/apache/age/raw/v${src.rev}/RELEASE"; maintainers = with maintainers; [ ]; platforms = postgresql.meta.platforms; license = licenses.asl20; diff --git a/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix b/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix index 25d27fcdfcbe8..f710c5c3d3817 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix @@ -1,24 +1,55 @@ { lib, stdenv, fetchFromGitHub, postgresql }: -stdenv.mkDerivation rec { +let + source = { + "16" = { + version = "1.6.0"; + hash = "sha256-lg7N0QblluTgtNo1tGZjirNJSyQXtcAEs9Jqd3zx0Sg="; + }; + "15" = { + version = "1.5.1"; + hash = "sha256-o8Hepf/Mc1ClRTLZ6PBdqU4jSdlz+ijVgl2vJKmIc6M="; + }; + "14" = { + version = "1.4.2"; + hash = "sha256-nGyKcNY57RdQdZKSaBPk2/YbT0Annz1ZevH0lKswdhA="; + }; + "13" = { + version = "1.3.9"; + hash = "sha256-KGcHDwk8CgNHPZARfLBfS8r7TRCP9LPjT+m4fNSnnW0="; + }; + "12" = { + version = "1.3.9"; + hash = "sha256-64/dlm6e4flCxMQ8efsxfKSlja+Tko0zsghTgLatN+Y="; + }; + "11" = { + version = "1.3.9"; + hash = "sha256-8t/HhB/2Kjx4xMItmmKv3g9gba5VCBHdplYtYD/3UhA="; + }; + }.${lib.versions.major postgresql.version} or (throw "Source for pg_hint_plan is not available for ${postgresql.version}"); +in +stdenv.mkDerivation { pname = "pg_hint_plan"; - version = "14-1.4.0"; + inherit (source) version; src = fetchFromGitHub { owner = "ossc-db"; - repo = pname; - rev = "REL${builtins.replaceStrings ["-" "."] ["_" "_"] version}"; - sha256 = "sha256-2hYDn/69264x2lMRVIp/I5chjocL6UqIw5ry1qdRcDM="; + repo = "pg_hint_plan"; + rev = "REL${lib.versions.major postgresql.version}_${builtins.replaceStrings ["."] ["_"] source.version}"; + inherit (source) hash; }; + postPatch = lib.optionalString (lib.versionOlder postgresql.version "14") '' + # https://github.com/ossc-db/pg_hint_plan/commit/e9e564ad59b8bd4a03e0f13b95b5122712e573e6 + substituteInPlace Makefile --replace "LDFLAGS+=-Wl,--build-id" "" + ''; + buildInputs = [ postgresql ]; installPhase = '' - mkdir -p $out/{lib,share/postgresql/extension} - - cp *.so $out/lib - cp *.sql $out/share/postgresql/extension - cp *.control $out/share/postgresql/extension + install -D -t $out/lib pg_hint_plan.so + install -D -t $out/share/postgresql/extension *.sql + install -D -t $out/share/postgresql/extension *.control ''; meta = with lib; { @@ -27,6 +58,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ _1000101 ]; platforms = postgresql.meta.platforms; license = licenses.bsd3; - broken = versionOlder postgresql.version "14"; }; } diff --git a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix index 83e4560692672..abbb1ac4d3e16 100644 --- a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix +++ b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "plpgsql_check"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = "v${version}"; - hash = "sha256-6S1YG/4KGlgtTBrxh3p6eMd/aCovK/QME4f2z0YTUxc="; + hash = "sha256-4J4uKcQ/jRKKgrpUUed9MXDmOJaYKYDzznt1DItr6T0="; }; buildInputs = [ postgresql ]; diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index a7c136ba691fa..863e22f18b500 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -1,19 +1,8 @@ { lib, stdenv, fetchFromGitHub, cmake, postgresql, openssl, libkrb5, enableUnfree ? true }: -# # To enable on NixOS: -# config.services.postgresql = let -# # The postgresql pkgs has to be taken from the -# # postgresql package used, so the extensions -# # are built for the correct postgresql version. -# postgresqlPackages = config.services.postgresql.package.pkgs; -# in { -# extraPlugins = with postgresqlPackages; [ timescaledb ]; -# settings.shared_preload_libraries = "timescaledb"; -# } - stdenv.mkDerivation rec { pname = "timescaledb${lib.optionalString (!enableUnfree) "-apache"}"; - version = "2.11.2"; + version = "2.12.0"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql openssl libkrb5 ]; @@ -22,7 +11,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = version; - sha256 = "sha256-c2fztGtl2cLThT0JhHCM0UaYkiWTp5T6TUZ3Au7CG7c="; + sha256 = "sha256-e4Sq5VzX5YPiFzG4T8OcCqzgxaWsyVeB21GAKl0aPDk="; }; cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" "-DTAP_CHECKS=OFF" ] diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index f42e5e7ccfc29..abdeb97319aff 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildGoModule, fetchFromGitHub, makeWrapper, iptables, iproute2, procps, shadow, getent }: let - version = "1.48.2"; + version = "1.50.1"; in buildGoModule { pname = "tailscale"; @@ -11,9 +11,9 @@ buildGoModule { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-5Usi7W4y6JniyxBIfQid1XjDIZRS5oIw+KUMMiFRBwk="; + hash = "sha256-YosV9zyWbZ18xeiKJ6/4ZzSSfcoACWadZQsqGBD/hZ4="; }; - vendorHash = "sha256-Fr4VZcKrXnT1PZuEG110KBefjcZzRsQRBSvByELKAy4="; + vendorHash = "sha256-aVtlDzC+sbEWlUAzPkAryA/+dqSzoAFc02xikh6yhf8="; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; diff --git a/pkgs/servers/tarantool/default.nix b/pkgs/servers/tarantool/default.nix index bdb36a7f10ad1..80b2e96d2d6d6 100644 --- a/pkgs/servers/tarantool/default.nix +++ b/pkgs/servers/tarantool/default.nix @@ -38,8 +38,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + cmakeBuildType = "RelWithDebInfo"; + cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=RelWithDebInfo" "-DENABLE_DIST=ON" "-DTARANTOOL_VERSION=${version}.builtByNix" # expects the commit hash as well ]; diff --git a/pkgs/servers/tracing/honeycomb/honeyvent/default.nix b/pkgs/servers/tracing/honeycomb/honeyvent/default.nix index e1009c35a8823..e950980f0375a 100644 --- a/pkgs/servers/tracing/honeycomb/honeyvent/default.nix +++ b/pkgs/servers/tracing/honeycomb/honeyvent/default.nix @@ -3,7 +3,7 @@ import ./versions.nix ({version, sha256}: buildGoModule { pname = "honeyvent"; inherit version; - vendorSha256 = null; + vendorHash = null; src = fetchFromGitHub { owner = "honeycombio"; diff --git a/pkgs/servers/tracing/tempo/default.nix b/pkgs/servers/tracing/tempo/default.nix index b4788d2dcf4b4..8681e704130e8 100644 --- a/pkgs/servers/tracing/tempo/default.nix +++ b/pkgs/servers/tracing/tempo/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "tempo"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "grafana"; repo = "tempo"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-FeQTg0EuAwpSMf+rPLFNegXEXfVa6dqR2xjl4MfZnYg="; + hash = "sha256-23wjD8HTSEGonIMAWCoKORMLIISASxlN4FeY+Bmt/+I="; }; vendorHash = null; diff --git a/pkgs/servers/trickster/trickster.nix b/pkgs/servers/trickster/trickster.nix index a798e0ceff0d8..db8d6942a61fb 100644 --- a/pkgs/servers/trickster/trickster.nix +++ b/pkgs/servers/trickster/trickster.nix @@ -15,7 +15,7 @@ buildGoModule rec { sha256 = "sha256-BRD8IF3s9RaDorVtXRvbKLVVVXWiEQTQyKBR9jFo1eM="; }; - vendorSha256 = null; + vendorHash = null; subPackages = [ "cmd/trickster" ]; diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index b403404747b11..e705d8bc394c3 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -66,7 +66,8 @@ in rec { }; unifi7 = generic { - version = "7.4.156"; - sha256 = "sha256-UJjzSC2qKi2ABwH5p0s/5fXfB3NVfYBb3wBfE/8NlK4="; + version = "7.5.176"; + suffix = "-1136930355"; + sha256 = "sha256-prsFq09zYrB74p/MGKjwvZftw78k9wbIva5xFdk+Ztw="; }; } diff --git a/pkgs/servers/web-apps/bookstack/default.nix b/pkgs/servers/web-apps/bookstack/default.nix index d85bdf4ab7e17..dcd95cdea07bc 100644 --- a/pkgs/servers/web-apps/bookstack/default.nix +++ b/pkgs/servers/web-apps/bookstack/default.nix @@ -16,13 +16,13 @@ let in package.override rec { pname = "bookstack"; - version = "23.08.2"; + version = "23.08.3"; src = fetchFromGitHub { owner = "bookstackapp"; repo = pname; rev = "v${version}"; - sha256 = "0qg4isivyxinbccac4gga1ym43wh80qhs0308l5hk8dc3zvi7d5q"; + sha256 = "sha256-EJozYktTnruJTwnDZZ8LHp/DI/ZjwWScRTJewXJuC4k="; }; meta = with lib; { diff --git a/pkgs/servers/web-apps/discourse/assets_esbuild_from_path.patch b/pkgs/servers/web-apps/discourse/assets_esbuild_from_path.patch new file mode 100644 index 0000000000000..fd40d27ca8b5a --- /dev/null +++ b/pkgs/servers/web-apps/discourse/assets_esbuild_from_path.patch @@ -0,0 +1,13 @@ +diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb +index 3fee4259af9..53cc3107f46 100644 +--- a/lib/discourse_js_processor.rb ++++ b/lib/discourse_js_processor.rb +@@ -111,8 +111,6 @@ class DiscourseJsProcessor + + def self.generate_js_processor + Discourse::Utils.execute_command( +- "yarn", +- "--silent", + "esbuild", + "--log-level=warning", + "--bundle", diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index 58eabadfb6e2c..893404a6084f3 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -13,6 +13,7 @@ , gzip , gnutar , git +, esbuild , cacert , util-linux , gawk @@ -46,13 +47,13 @@ }@args: let - version = "3.1.0"; + version = "3.2.0.beta1"; src = fetchFromGitHub { owner = "discourse"; repo = "discourse"; rev = "v${version}"; - sha256 = "sha256-Iv7VSnK8nZDpmIwIRPedSWlftABKuMOQ4MXDGpjuWrY="; + sha256 = "sha256-HVjt5rsLSuyOaQxkbiTrsYsSXj3oSWjke98QVp+tEqk="; }; ruby = ruby_3_2; @@ -65,6 +66,7 @@ let gnutar git brotli + esbuild # Misc required system utils which @@ -202,7 +204,7 @@ let yarnOfflineCache = fetchYarnDeps { yarnLock = src + "/app/assets/javascripts/yarn.lock"; - sha256 = "0sclrv3303dgg3r08dwhd1yvi3pvlnvnikn300vjsh6c71fnzhnj"; + sha256 = "070h66zp8kmsigbrkh5d3jzbzvllzhbx0fa2yzx5lbpgnjhih3p2"; }; nativeBuildInputs = runtimeDeps ++ [ @@ -215,6 +217,7 @@ let nodejs_18 jq moreutils + esbuild ]; outputs = [ "out" "javascripts" ]; @@ -238,6 +241,12 @@ let # hasn't been `patchShebangs`-ed yet. So instead we just use # `patch-package` from `nativeBuildInputs`. ./asserts_patch-package_from_path.patch + + # `lib/discourse_js_processor.rb` + # tries to call `../node_modules/.bin/esbuild`, which + # hasn't been `patchShebangs`-ed yet. So instead we just use + # `esbuild` from `nativeBuildInputs`. + ./assets_esbuild_from_path.patch ]; # We have to set up an environment that is close enough to @@ -351,6 +360,12 @@ let # Make sure the notification email setting applies ./notification_email.patch + + # `lib/discourse_js_processor.rb` + # tries to call `../node_modules/.bin/esbuild`, which + # hasn't been `patchShebangs`-ed yet. So instead we just use + # `esbuild` from `nativeBuildInputs`. + ./assets_esbuild_from_path.patch ]; postPatch = '' diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix index 68cd69dcc3a6e..b25bd428f69b3 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-assign"; - rev = "0cbf10b8055370445bd36536e51986bf48bdc57e"; - sha256 = "sha256-7rJ2zQo1nCHwtVuLJUmdj66Ky2bi4Cpo+22H3DbO1uo="; + rev = "e9c7cb5c3f90109bc47223b0aa4054d681e9cc04"; + sha256 = "sha256-w1h1dCSyOml+AT7lPKENYfawm6BU2De5CyBHrDnDcrM="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-docs"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix index 266c43e4f8e28..eacdc099f123f 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-bbcode-color"; - rev = "35aab2e9b92f8b01633d374ea999e7fd59d020d7"; - sha256 = "sha256-DHckx921EeQysm1UPloCrt43BJetTnZKnTbJGk15NMs="; + rev = "79ed22b3a3352adbd20f7e2222b9dbdb9fbaf7fe"; + sha256 = "sha256-AHgny9BW/ssmv0U2lwzVWgYKPsvWHD6kgU3mBMFX4Aw="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-bbcode-color"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock index 183ead8d51d44..586a58d3d6265 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock @@ -22,4 +22,4 @@ DEPENDENCIES rrule (= 0.4.4) BUNDLED WITH - 2.4.13 + 2.4.17 diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix index 7a6bd7f692707..9fc5779fc74c3 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-calendar"; - rev = "afc2ee684de41601d6cecc46713d139760f176a6"; - sha256 = "sha256-rTQWO+E/Jg4zjZDYDvBrDQsox5q4dHkdQjwnJxgv3dI="; + rev = "4d4fe40d09f7232b1348e1ff910b37b2cec0835d"; + sha256 = "sha256-w1sqE3KxwrE8SWqZUtPVhjITOPFXwlj4iPyPZeSfvtI="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-calendar"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix index 499d2e6447bd1..9f4cb186dd666 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-chat-integration"; - rev = "70fea6b66b68868aa4c00b45a169436deaa142a8"; - sha256 = "sha256-K9MmP1F0B6Na2dTqgnsjMbTQFkF+nNKkI8aF3zPAodc="; + rev = "4f9ccb58cae8600dcb6db84f38f235283911e6e8"; + sha256 = "sha256-Em9aAwAfUoqsOHLrqNhxUQXsO4Owydf9nhCHbBaqqpg="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-chat-integration"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix index 39320637ddcdc..881fade4ea956 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-data-explorer"; - rev = "e4f8d3924a18b303c2bb7da9472cf0c060060e4e"; - sha256 = "sha256-K+GPszO3je6NmnhIRSqSEhylUK5oEByaS0bLfAGjvB4="; + rev = "06193f27ef15828479eea61ae4a80bf59806a535"; + sha256 = "sha256-afjqgi2gzRpbZt5K9yXPy4BJ5qRv7A4ZkXHX85+Cv7s="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-data-explorer"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix index 3dcd2b86a9692..4f458cd4ce63a 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-docs"; - rev = "a4b203274b88c5277d0b5b936de0bc0e0016726c"; - sha256 = "sha256-R+VP/gsb2Oa6lPVMhRoGZzOBx5C7kRSxqwYpWE10GHw="; + rev = "89c7274b1a730edefd1b56c13b8c04305d4ef331"; + sha256 = "sha256-j3zrGmoAvbSHFnbiUfetyfiQJebrtW3Iw5GvsRRq1kk="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-docs"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock index 3640cbc601dad..f12130e240664 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock @@ -3,7 +3,9 @@ GEM specs: addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) - faraday (2.7.10) + base64 (0.1.1) + faraday (2.7.11) + base64 faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) faraday-net_http (3.0.2) @@ -24,4 +26,4 @@ DEPENDENCIES sawyer (= 0.9.2) BUNDLED WITH - 2.4.13 + 2.4.17 diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix index 50a59136ecf50..f5967cde115a1 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-github"; - rev = "8aa068d56ef010cecaabd50657e7753f4bbecc1f"; - sha256 = "sha256-WzljuGvv6pki3ROkvhXZWQaq5D9JkCbWjdlkdRI8lHE="; + rev = "21fa5c97ca23b4c39aef5ab9c4f8ebb22f19a19b"; + sha256 = "sha256-0Teu6nMJWAT9TCjZ0RWZKtfsUKAS1cga5DvALIvrUyY="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-github"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix index 87599999d894f..7410f0ca0d209 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix @@ -10,16 +10,26 @@ }; version = "2.8.5"; }; + base64 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cydk9p2cv25qysm0sn2pb97fcpz1isa7n3c8xm1gd99li8x6x8c"; + type = "gem"; + }; + version = "0.1.1"; + }; faraday = { - dependencies = ["faraday-net_http" "ruby2_keywords"]; + dependencies = ["base64" "faraday-net_http" "ruby2_keywords"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "187clqhp9mv5mnqmjlfdp57svhsg1bggz84ak8v333j9skrnrgh9"; + sha256 = "0vn7jwss2v6jhnxvjsiwbs3irjwhbx9zxn4l6fhd4rkcfyxzdnw5"; type = "gem"; }; - version = "2.7.10"; + version = "2.7.11"; }; faraday-net_http = { groups = ["default"]; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix index 3a07b4bfd3424..da8ff6f32f4a9 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-math"; - rev = "529ad1fe6da924da378a60bec48c35657bb01a68"; - sha256 = "sha256-zhtAy0tTVMzQfPilTwfyyzxgCJD4xazOITBuliFR5Gg="; + rev = "66d522cd8e4cf98547f083c4decdc64c688767de"; + sha256 = "sha256-Zil6LWl6ACyP/ZkxNli1u9/3dlHFRETtmIov1BmQ3u4="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-math"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix index a467f4d17b399..5f64d52e55b2a 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-openid-connect"; - rev = "b1df541ad29f6f6098a1008b83393b2d400986ed"; - sha256 = "sha256-afRd/9M0nQGkS14Q8BJhcJwMCkOku3Fr0uHxcRl44vQ="; + rev = "322bf50700840b327d9a52091fedbacc0bb1edfe"; + sha256 = "sha256-8WMhlKHYVm2wHbkP7b8dhOosvwDNjHqTrEziQT1Bu/4="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-openid-connect"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile.lock index 88a3a3c8d6548..29f66df12c80d 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile.lock @@ -13,4 +13,4 @@ DEPENDENCIES webrick (= 1.7.0) BUNDLED WITH - 2.4.13 + 2.4.17 diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix index 95bf4c5a679a3..7ce27877cd96f 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix @@ -6,8 +6,8 @@ src = fetchFromGitHub { owner = "discourse"; repo = "discourse-prometheus"; - rev = "8a7a46a80cc65aa0839bc5e3c3b6f8ef6544089f"; - sha256 = "sha256-TL+pbP26LvRMKdy8CAuBEK+LZfAs8HfggMeUDaBu9hc="; + rev = "305610c90079556cdfa2aa09b567a6ca10d11de5"; + sha256 = "sha256-dz+/2pbbhs8sxYMxe/wAjvdxoU4ihjN95A4ngP0KzQg="; }; patches = [ diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-reactions/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-reactions/default.nix index 36e4ac19c4bd6..f91ad047201b0 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-reactions/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-reactions/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-reactions"; - rev = "643f807a3a2195f08211064301f0350d9f51604f"; - sha256 = "sha256-4FdiYUNysSuOJ664G3YvlUHx/J7MLUS3kVBdXT47oEw="; + rev = "f04f077e9f0392ca2373ca001044069d650ae6e5"; + sha256 = "sha256-HuFXgfd5HO7qfVlf1RHxenlNL10YRF5OYya4Yt6eS14="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-reactions"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix index 32709666189e3..b091884bb5116 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-saved-searches"; - rev = "7c9bdcd68951e7cef16cafe3c4bfb583bb994d2a"; - sha256 = "sha256-6RIN12ACDCeRcxmsC3FgeIPdvovI4arn7w/Dqil1yCI="; + rev = "1b90d26cc35bd049d0ab7ea3922f7db6ac7ec017"; + sha256 = "sha256-d+zbm8UAZ/ow8o1Y5mWAyjg5JCvQ761jcGcO72tHEIs="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-saved-searches"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix index ed47f9e15e924..26939adc4ec7d 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-solved"; - rev = "b5d487d6a5bfe2571d936eec5911d02a5f3fcc32"; - sha256 = "sha256-Tt7B9PcsV8E7B+m8GnJw+MBz9rGYtojKt6NjBFMQvOM="; + rev = "3b9ecc69c6a25b7671c42842b8a6f3872873f537"; + sha256 = "sha256-gtG+v25jJ0DiYlU2vatreGj13yrb5WWRTvxlcDdAibw="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-solved"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix index 23ce34dcd694e..a8a0f7975654f 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-spoiler-alert"; - rev = "65989714af08eda44196cca3a0afe85c9e9443f9"; - sha256 = "sha256-R/vqNEDst50+Y7anckIvhy4viBOqBemIZMh4sPt7kRM="; + rev = "b57e79343acc15cb2c0a032a2deb29ad4b9d53cc"; + sha256 = "sha256-Ypt6PYCZzArCv9KkCtw5rfT6++dDoUx5q9m/eMvP0Sc="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-spoiler-alert"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix index a311dbcfbfcf9..5922bcca2cbb4 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-voting"; - rev = "6449fc15658d972e20086a3f1fae3dbac9cd9eeb"; - sha256 = "sha256-f04LpVeodCVEB/t5Ic2dketp542Nrc0rZWbQ6hrC22g="; + rev = "83ab47f3186694039c6850ac3e230443e05d37c5"; + sha256 = "sha256-2sSBLSSPddxXqvEukDn8tzLVOOWoPBA+C8N5jVccCjA="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-voting"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix index 979398f7394b7..c3ad1c7ef5488 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-yearly-review"; - rev = "3246c6b378f9e69e664c575efc63c2ad83bcac2f"; - sha256 = "sha256-usHHyfYP4YAQ94f7gvNSH7VBRRkdZMmsSi9QQM8tPfY="; + rev = "47014a8ecb96da8d45d0fe141a069010161b3087"; + sha256 = "sha256-9OIgxRdQoYH19vb7GcTt8MxVM5N4JPzmMIsg7FQOjJs="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-yearly-review"; diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile index 647aefea8adac..649c1df5815ac 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile +++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile @@ -18,7 +18,7 @@ else # this allows us to include the bits of rails we use without pieces we do not. # # To issue a rails update bump the version number here - rails_version = "7.0.5.1" + rails_version = "7.0.7" gem "actionmailer", rails_version gem "actionpack", rails_version gem "actionview", rails_version @@ -141,10 +141,10 @@ group :test do gem "fakeweb", require: false gem "minitest", require: false gem "simplecov", require: false - gem "selenium-webdriver", require: false + gem "selenium-webdriver", "~> 4.11", require: false gem "test-prof" - gem "webdrivers", require: false gem "rails-dom-testing", require: false + gem "minio_runner", require: false end group :test, :development do @@ -259,6 +259,11 @@ if ENV["IMPORT"] == "1" gem "parallel", require: false end +if ENV["GENERIC_IMPORT"] == "1" + gem "sqlite3" + gem "redcarpet" +end + gem "web-push" gem "colored2", require: false gem "maxminddb" diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock index 0b93bf23d097b..685bdbd8a5e23 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock @@ -9,7 +9,7 @@ GIT GIT remote: https://github.com/thoughtbot/shoulda-matchers.git - revision: 783a90554053002017510285bc736099b2749c22 + revision: 68f76ce13e9892339f90c4928339dfd769cfa613 specs: shoulda-matchers (5.3.0) activesupport (>= 5.2.0) @@ -17,47 +17,47 @@ GIT GEM remote: https://rubygems.org/ specs: - actionmailer (7.0.5.1) - actionpack (= 7.0.5.1) - actionview (= 7.0.5.1) - activejob (= 7.0.5.1) - activesupport (= 7.0.5.1) + actionmailer (7.0.7) + actionpack (= 7.0.7) + actionview (= 7.0.7) + activejob (= 7.0.7) + activesupport (= 7.0.7) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.0) - actionpack (7.0.5.1) - actionview (= 7.0.5.1) - activesupport (= 7.0.5.1) + actionpack (7.0.7) + actionview (= 7.0.7) + activesupport (= 7.0.7) rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (7.0.5.1) - activesupport (= 7.0.5.1) + actionview (7.0.7) + activesupport (= 7.0.7) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - actionview_precompiler (0.2.3) + actionview_precompiler (0.3.0) actionview (>= 6.0.a) active_model_serializers (0.8.4) activemodel (>= 3.0) - activejob (7.0.5.1) - activesupport (= 7.0.5.1) + activejob (7.0.7) + activesupport (= 7.0.7) globalid (>= 0.3.6) - activemodel (7.0.5.1) - activesupport (= 7.0.5.1) - activerecord (7.0.5.1) - activemodel (= 7.0.5.1) - activesupport (= 7.0.5.1) - activesupport (7.0.5.1) + activemodel (7.0.7) + activesupport (= 7.0.7) + activerecord (7.0.7) + activemodel (= 7.0.7) + activesupport (= 7.0.7) + activesupport (7.0.7) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - addressable (2.8.4) + addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) annotate (3.2.0) activerecord (>= 3.2, < 8.0) @@ -82,6 +82,7 @@ GEM aws-sigv4 (~> 1.1) aws-sigv4 (1.5.0) aws-eventstream (~> 1, >= 1.0.2) + base64 (0.1.1) better_errors (2.10.1) erubi (>= 1.0.0) rack (>= 0.9.0) @@ -109,7 +110,7 @@ GEM cgi (0.3.6) chunky_png (1.4.0) coderay (1.1.3) - colored2 (3.1.2) + colored2 (4.0.0) concurrent-ruby (1.2.2) connection_pool (2.4.1) cose (1.3.0) @@ -119,7 +120,7 @@ GEM crack (0.4.5) rexml crass (1.0.6) - css_parser (1.14.0) + css_parser (1.16.0) addressable dartsass-ruby (3.0.1) sass-embedded (~> 1.54) @@ -144,8 +145,8 @@ GEM docile (1.4.0) email_reply_trimmer (0.1.13) erubi (1.12.0) - excon (0.100.0) - execjs (2.8.1) + excon (0.102.0) + execjs (2.9.0) exifr (1.4.0) fabrication (2.30.0) faker (2.23.0) @@ -163,9 +164,9 @@ GEM ffi (1.15.5) fspath (3.1.2) gc_tracer (1.5.1) - globalid (1.1.0) - activesupport (>= 5.0) - google-protobuf (3.23.4) + globalid (1.2.1) + activesupport (>= 6.1) + google-protobuf (3.24.3) guess_html_encoding (0.0.11) hana (1.3.7) hashdiff (1.0.1) @@ -188,7 +189,7 @@ GEM json (2.6.3) json-schema (3.0.0) addressable (>= 2.8) - json_schemer (1.0.3) + json_schemer (2.0.0) hana (~> 1.3) regexp_parser (~> 2.0) simpleidn (~> 0.2) @@ -222,19 +223,20 @@ GEM matrix (0.4.2) maxminddb (0.1.22) memory_profiler (1.0.1) - message_bus (4.3.7) + message_bus (4.3.8) rack (>= 1.1.3) method_source (1.0.0) - mini_mime (1.1.2) + mini_mime (1.1.5) mini_portile2 (2.8.4) mini_racer (0.8.0) libv8-node (~> 18.16.0.0) mini_scheduler (0.16.0) sidekiq (>= 4.2.3, < 7.0) - mini_sql (1.4.0) + mini_sql (1.5.0) mini_suffix (0.3.3) ffi (~> 1.9) - minitest (5.19.0) + minio_runner (0.1.1) + minitest (5.20.0) mocha (2.1.0) ruby2_keywords (>= 0.0.5) msgpack (1.7.2) @@ -253,7 +255,7 @@ GEM net-smtp (0.3.3) net-protocol nio4r (2.5.9) - nokogiri (1.15.3) + nokogiri (1.15.4) mini_portile2 (~> 2.8.2) racc (~> 1.4) oauth (1.1.0) @@ -268,7 +270,7 @@ GEM multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 4) - oj (3.15.1) + oj (3.16.1) omniauth (1.9.2) hashie (>= 3.4.6) rack (>= 1.6.2, < 3) @@ -296,7 +298,7 @@ GEM openssl (> 2.0) optimist (3.1.0) parallel (1.23.0) - parallel_tests (4.2.1) + parallel_tests (4.2.2) parallel parser (3.2.2.3) ast (~> 2.4.1) @@ -313,17 +315,17 @@ GEM pry-rails (0.3.9) pry (>= 0.10.4) public_suffix (5.0.3) - puma (6.3.0) + puma (6.3.1) nio4r (~> 2.0) racc (1.7.1) rack (2.2.8) - rack-mini-profiler (3.1.0) + rack-mini-profiler (3.1.1) rack (>= 1.2.0) - rack-protection (3.0.6) - rack + rack-protection (3.1.0) + rack (~> 2.2, >= 2.2.4) rack-test (2.1.0) rack (>= 1.3) - rails-dom-testing (2.1.1) + rails-dom-testing (2.2.0) activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) @@ -337,9 +339,9 @@ GEM rails_multisite (5.0.0) activerecord (>= 6.0) railties (>= 6.0) - railties (7.0.5.1) - actionpack (= 7.0.5.1) - activesupport (= 7.0.5.1) + railties (7.0.7) + actionpack (= 7.0.7) + activesupport (= 7.0.7) method_source rake (>= 12.2) thor (~> 1.0) @@ -363,7 +365,7 @@ GEM rack (>= 1.4) rexml (3.2.6) rinku (2.0.6) - rotp (6.2.2) + rotp (6.3.0) rouge (4.1.3) rqrcode (2.2.0) chunky_png (~> 1.0) @@ -393,7 +395,7 @@ GEM rspec-mocks (~> 3.12) rspec-support (~> 3.12) rspec-support (3.12.1) - rss (0.2.9) + rss (0.3.0) rexml rswag-specs (2.10.1) activesupport (>= 3.1, < 7.1) @@ -402,7 +404,8 @@ GEM rspec-core (>= 2.14) rtlcss (0.2.1) mini_racer (>= 0.6.3) - rubocop (1.55.1) + rubocop (1.56.3) + base64 (~> 0.1.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -422,7 +425,7 @@ GEM rubocop-rspec (>= 2.0.0) rubocop-factory_bot (2.23.1) rubocop (~> 1.33) - rubocop-rspec (2.23.0) + rubocop-rspec (2.23.2) rubocop (~> 1.33) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) @@ -436,10 +439,10 @@ GEM sanitize (6.0.2) crass (~> 1.0.2) nokogiri (>= 1.12.0) - sass-embedded (1.64.1) + sass-embedded (1.66.1) google-protobuf (~> 3.23) rake (>= 13.0.0) - selenium-webdriver (4.10.0) + selenium-webdriver (4.12.0) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) @@ -462,7 +465,7 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - sshkey (2.0.0) + sshkey (3.0.0) stackprof (0.2.25) syntax_tree (6.1.1) prettier_print (>= 1.2.0) @@ -491,11 +494,7 @@ GEM hkdf (~> 1.0) jwt (~> 2.0) openssl (~> 3.0) - webdrivers (5.3.1) - nokogiri (~> 1.6) - rubyzip (>= 1.3.0) - selenium-webdriver (~> 4.0, < 4.11) - webmock (3.18.1) + webmock (3.19.1) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) @@ -504,20 +503,20 @@ GEM nokogiri (~> 1.8) yaml-lint (0.1.2) yard (0.9.34) - zeitwerk (2.6.10) + zeitwerk (2.6.11) PLATFORMS ruby DEPENDENCIES - actionmailer (= 7.0.5.1) - actionpack (= 7.0.5.1) - actionview (= 7.0.5.1) + actionmailer (= 7.0.7) + actionpack (= 7.0.7) + actionview (= 7.0.7) actionview_precompiler active_model_serializers (~> 0.8.3) - activemodel (= 7.0.5.1) - activerecord (= 7.0.5.1) - activesupport (= 7.0.5.1) + activemodel (= 7.0.7) + activerecord (= 7.0.7) + activesupport (= 7.0.7) addressable annotate aws-sdk-s3 @@ -577,6 +576,7 @@ DEPENDENCIES mini_scheduler mini_sql mini_suffix + minio_runner minitest mocha multi_json @@ -604,7 +604,7 @@ DEPENDENCIES rails-dom-testing rails_failover rails_multisite - railties (= 7.0.5.1) + railties (= 7.0.7) rake rb-fsevent rbtrace @@ -625,7 +625,7 @@ DEPENDENCIES ruby-readability rubyzip sanitize - selenium-webdriver + selenium-webdriver (~> 4.11) shoulda-matchers! sidekiq simplecov @@ -642,10 +642,9 @@ DEPENDENCIES unf unicorn web-push - webdrivers webmock yaml-lint yard BUNDLED WITH - 2.4.13 + 2.4.17 diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix index fc7b71f0c0306..350bf7abba202 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix +++ b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pz26qpdx1xncpy5h8k4afw0npnh6wn580yvwv2cf857zrzvr1pm"; + sha256 = "15ni57icsw1ilz5srlasff4h31h2ckgmxbdd8jnbniscvz4x2sd0"; type = "gem"; }; - version = "7.0.5.1"; + version = "7.0.7"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "003y7cdxwzdqx8hgw02kf1b5mp8qr8syx07f35sk3ghhqxp39ksy"; + sha256 = "150sjsk12vzj9aswjy3cz124l8n8sn52bhd0wwly73rwc1a750sg"; type = "gem"; }; - version = "7.0.5.1"; + version = "7.0.7"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11ihpqcvz3f38ka85zdjkdcvgdbcan81dbr0y9bi784jn1v5ggwa"; + sha256 = "1nn21k5psxdv2fkwxs679lr0b8n1nzli2ks343cx4azn6snp8b8a"; type = "gem"; }; - version = "7.0.5.1"; + version = "7.0.7"; }; actionview_precompiler = { dependencies = ["actionview"]; @@ -38,10 +38,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07dx8vkwig8han4zccs0chahcf9ibd4abzx9n56qah8zak5cyrhd"; + sha256 = "07jyr2h87ha6k2y965rs4ywq142ddkfkhbmp0r44xg4wnffr8jbl"; type = "gem"; }; - version = "0.2.3"; + version = "0.3.0"; }; active_model_serializers = { dependencies = ["activemodel"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11wkxf16zdb9gsnc94x4hyj89wjks06gnk4fbl7gp5vkbl744n83"; + sha256 = "0s5r5z9jm57jjabh8w2823rpjd1agn8z2rlqgyyn4s9pbbhgalzy"; type = "gem"; }; - version = "7.0.5.1"; + version = "7.0.7"; }; activemodel = { dependencies = ["activesupport"]; @@ -71,10 +71,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12f89hxs4s26ggsg4bnz9qxlcsclcgx9gdsl8dni5jc0gk47h14y"; + sha256 = "1rspbw4yxx9fh2wyl2wvgwadwapfyx7j9zlirpd4pmk31wkhl4hf"; type = "gem"; }; - version = "7.0.5.1"; + version = "7.0.7"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -82,10 +82,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sfdq2slmsc0ygncl36dq1lmjww1y3b42izrnn62cyisiag28796"; + sha256 = "1ygg145wxlgm12b1x5r0rsk2aa6i2wjz7bgb21j8vmyqyfl272cy"; type = "gem"; }; - version = "7.0.5.1"; + version = "7.0.7"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; @@ -93,10 +93,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m1sa6djlm9cz6mz3lcbqqahvm6qj75dmq3phpn2ysyxnlz2hr0c"; + sha256 = "1wzbnv3hns0yiwbgh1m3q5j0d7b0k52nlpwirhxyv3l0ycmljfr9"; type = "gem"; }; - version = "7.0.5.1"; + version = "7.0.7"; }; addressable = { dependencies = ["public_suffix"]; @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15s8van7r2ad3dq6i03l3z4hqnvxcq75a3h72kxvf9an53sqma20"; + sha256 = "05r1fwy487klqkya7vzia8hnklcxy4vr92m9dmni3prfwk6zpw33"; type = "gem"; }; - version = "2.8.4"; + version = "2.8.5"; }; annotate = { dependencies = ["activerecord" "rake"]; @@ -205,6 +205,16 @@ }; version = "1.5.0"; }; + base64 = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cydk9p2cv25qysm0sn2pb97fcpz1isa7n3c8xm1gd99li8x6x8c"; + type = "gem"; + }; + version = "0.1.1"; + }; better_errors = { dependencies = ["erubi" "rack" "rouge"]; groups = ["development"]; @@ -351,10 +361,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jlbqa9q4mvrm73aw9mxh23ygzbjiqwisl32d8szfb5fxvbjng5i"; + sha256 = "1zj06gjqwykgzxmbkp2hmg3wv5kv8zz5d77acxipzcgicdjgvfan"; type = "gem"; }; - version = "3.1.2"; + version = "4.0.0"; }; concurrent-ruby = { groups = ["default" "development" "test"]; @@ -424,10 +434,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04q1vin8slr3k8mp76qz0wqgap6f9kdsbryvgfq9fljhrm463kpj"; + sha256 = "18mii41bbl106rn940ah8v3xclj4yrxxa0bwlwp546244n9b83zp"; type = "gem"; }; - version = "1.14.0"; + version = "1.16.0"; }; dartsass-ruby = { dependencies = ["sass-embedded"]; @@ -572,20 +582,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08r6qgbpkxxsihjmlspk3l1sr69q5hx35p1l4wp7rmkbzys89867"; + sha256 = "0mbkyyadz9vw7mzixi9dks6i6iw033yn2hzwfvnfdvgqq6ywqs4g"; type = "gem"; }; - version = "0.100.0"; + version = "0.102.0"; }; execjs = { groups = ["assets" "default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "121h6af4i6wr3wxvv84y53jcyw2sk71j5wsncm6wq6yqrwcrk4vd"; + sha256 = "1a4dhqclx0n4dc5riiff1nkwfinaf5an1dxjywmlwa9wm57r9q9p"; type = "gem"; }; - version = "2.8.1"; + version = "2.9.0"; }; exifr = { groups = ["default"]; @@ -746,20 +756,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kqm5ndzaybpnpxqiqkc41k4ksyxl41ln8qqr6kb130cdxsf2dxk"; + sha256 = "1sbw6b66r7cwdx3jhs46s4lr991969hvigkjpbdl7y3i31qpdgvh"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.1"; }; google-protobuf = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dq5lgkxhagqr8zjrwr10zi8rldbg2vhis2m5q86v5q9415ylfgj"; + sha256 = "0pcl4x4cw3snl5xzs99lm82m9xkfs8vm1a8dfrc34pwb77mwrwv3"; type = "gem"; }; - version = "3.23.4"; + version = "3.24.3"; }; guess_html_encoding = { groups = ["default"]; @@ -920,10 +930,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mbf7v8bzmxyk413y16drnww68bgyzknlqmaqvj785iakja7in7x"; + sha256 = "0spgxaxvsl3qvyj9qb95gd5hvy2pnp98hbgp8nfw6s69yyw0xmgj"; type = "gem"; }; - version = "1.0.3"; + version = "2.0.0"; }; jwt = { groups = ["default"]; @@ -1122,10 +1132,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ppqgch8xxccpmccdx37lb00112ayqjb80zz5m3w3298vdzb1kn4"; + sha256 = "15xqp7pnicjh2868fsc6fmxw8cw32bpiaqpc5bz8cwdib09ns3qk"; type = "gem"; }; - version = "4.3.7"; + version = "4.3.8"; }; method_source = { groups = ["default" "development" "test"]; @@ -1138,14 +1148,14 @@ version = "1.0.0"; }; mini_mime = { - groups = ["default"]; + groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5"; + sha256 = "1vycif7pjzkr29mfk4dlqv3disc5dn0va04lkwajlpr1wkibg0c6"; type = "gem"; }; - version = "1.1.2"; + version = "1.1.5"; }; mini_portile2 = { groups = ["default" "development" "test"]; @@ -1184,10 +1194,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dgwyyya821sfj4f92sljsxmmnak2yrzsbckvy82001zgq1n3b41"; + sha256 = "0yrxjmwhfnvcwbj9vscyq0z67sq09zl8qhmzgakq2ywy4yvcpwgg"; type = "gem"; }; - version = "1.4.0"; + version = "1.5.0"; }; mini_suffix = { dependencies = ["ffi"]; @@ -1200,15 +1210,25 @@ }; version = "0.3.3"; }; + minio_runner = { + groups = ["test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11rwvbqichq5jipgbr5x6s609485ga7vxc32r3h9vx342gs6nrzy"; + type = "gem"; + }; + version = "0.1.1"; + }; minitest = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jnpsbb2dbcs95p4is4431l2pw1l5pn7dfg3vkgb4ga464j0c5l6"; + sha256 = "0bkmfi9mb49m0fkdhl2g38i3xxa02d411gg0m8x0gvbwfmmg5ym3"; type = "gem"; }; - version = "5.19.0"; + version = "5.20.0"; }; mocha = { dependencies = ["ruby2_keywords"]; @@ -1336,10 +1356,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jw8a20a9k05fpz3q24im19b97idss3179z76yn5scc5b8lk2rl7"; + sha256 = "0k9w2z0953mnjrsji74cshqqp08q7m1r6zhadw1w0g34xzjh3a74"; type = "gem"; }; - version = "1.15.3"; + version = "1.15.4"; }; oauth = { dependencies = ["oauth-tty" "snaky_hash" "version_gem"]; @@ -1379,10 +1399,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vzcrsv6w5k90l75gy83dlfkv2z9pvnr82mz1nhnijmcg3rgqaz8"; + sha256 = "0m4vsd6i093kmyz9gckvzpnws997laldaiaf86hg5lza1ir82x7n"; type = "gem"; }; - version = "3.15.1"; + version = "3.16.1"; }; omniauth = { dependencies = ["hashie" "rack"]; @@ -1512,10 +1532,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04y02j0kyhfww41dnnjawn2gpp24smq0x21dvaa5z6pnq0fvmahv"; + sha256 = "1pa50my9sgh4wh9jah1qxjd33wsp1ahv29vj2q1biz434p67vh5p"; type = "gem"; }; - version = "4.2.1"; + version = "4.2.2"; }; parser = { dependencies = ["ast" "racc"]; @@ -1607,10 +1627,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v7fmv0n4bhdcwh60dgza44iqai5pg34f5pzm4vh4i5fwx7mpqxh"; + sha256 = "1x4dwx2shx0p7lsms97r85r7ji7zv57bjy3i1kmcpxc8bxvrr67c"; type = "gem"; }; - version = "6.3.0"; + version = "6.3.1"; }; racc = { groups = ["default" "development" "test"]; @@ -1642,10 +1662,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13dhpp1iljhqp9c8akmp6gjhx47qf83w12ns4bif26ldkignpam1"; + sha256 = "18vj7q740f7ffj677i258abryj97w0a6g3d5859y0lgypm5big1v"; type = "gem"; }; - version = "3.1.0"; + version = "3.1.1"; }; rack-protection = { dependencies = ["rack"]; @@ -1653,10 +1673,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kpm67az1wxlg76h620in2r7agfyhv177ps268j5ggsanzddzih8"; + sha256 = "0xsz78hccgza144n37bfisdkzpr2c8m0xl6rnlzgxdbsm1zrkg7r"; type = "gem"; }; - version = "3.0.6"; + version = "3.1.0"; }; rack-test = { dependencies = ["rack"]; @@ -1675,10 +1695,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17g05y7q7934z0ib4aph8h71c2qwjmlakkm7nb2ab45q0aqkfgjd"; + sha256 = "0fx9dx1ag0s1lr6lfr34lbx5i1bvn3bhyf3w3mx6h7yz90p725g5"; type = "gem"; }; - version = "2.1.1"; + version = "2.2.0"; }; rails-html-sanitizer = { dependencies = ["loofah" "nokogiri"]; @@ -1719,10 +1739,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1z4lqqbd4i5izsg97mx5yf3gj7y5d07wgvad0jzjghjg12pf142i"; + sha256 = "0in2b84qqmfnigx0li9bgi6l4knmgbj3a29fzm1zzb5jnv4r1gbr"; type = "gem"; }; - version = "7.0.5.1"; + version = "7.0.7"; }; rainbow = { groups = ["default" "development" "test"]; @@ -1873,10 +1893,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10mmzc85y7andsich586ndykw678qn1ns2wpjxrg0sc0gr4w3pig"; + sha256 = "0m48hv6wpmmm6cjr6q92q78h1i610riml19k5h1dil2yws3h1m3m"; type = "gem"; }; - version = "6.2.2"; + version = "6.3.0"; }; rouge = { groups = ["default" "development"]; @@ -1995,10 +2015,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b1zx07kr64kkpm4lssd4r1a1qyr829ppmfl85i4adcvx9mqfid0"; + sha256 = "1wv27axi39hhr0nmaffdl5bdjqiafcvp9xhfgnsgfczsblja50sn"; type = "gem"; }; - version = "0.2.9"; + version = "0.3.0"; }; rswag-specs = { dependencies = ["activesupport" "json-schema" "railties" "rspec-core"]; @@ -2023,15 +2043,15 @@ version = "0.2.1"; }; rubocop = { - dependencies = ["json" "language_server-protocol" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; + dependencies = ["base64" "json" "language_server-protocol" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s9p5qaqq68h5s3ys8xlk9swccma7arjif1w58987n6gicrsprrm"; + sha256 = "1i3571gchdj3c28znr5kisj0fkppy57208g9j1kv23rhk3p5q5p2"; type = "gem"; }; - version = "1.55.1"; + version = "1.56.3"; }; rubocop-ast = { dependencies = ["parser"]; @@ -2083,10 +2103,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l364y00bw1zcs3grdxcxpn48vfrjds2khsiaxjqq3r9grvbprfy"; + sha256 = "0ylwy4afnxhbrvlaf8an9nrizj78axnzggiyfcp8v531cv8six5f"; type = "gem"; }; - version = "2.23.0"; + version = "2.23.2"; }; ruby-prof = { groups = ["development"]; @@ -2160,10 +2180,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15k44qn8vk8ap8khkmpsiw40pywm9pkx4a5yhm8vfi2rgqci9k90"; + sha256 = "038fzkbq5sw9lf947akhpsvdm14q6jfzl2yn87s8958h42sn0xjy"; type = "gem"; }; - version = "1.64.1"; + version = "1.66.1"; }; selenium-webdriver = { dependencies = ["rexml" "rubyzip" "websocket"]; @@ -2171,10 +2191,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hwxxvx6j95ln82pjmrgyzg6qmf511dkcp5q79n6m5m8z4way8m3"; + sha256 = "0jwll13m7bqph4lgl75m7vwd175k657znwa7qn9qkf5dcxdjkcjs"; type = "gem"; }; - version = "4.10.0"; + version = "4.12.0"; }; shoulda-matchers = { dependencies = ["activesupport"]; @@ -2182,8 +2202,8 @@ platforms = []; source = { fetchSubmodules = false; - rev = "783a90554053002017510285bc736099b2749c22"; - sha256 = "10rw7ksi462fxamap6kimdy7hpdgx8477r6zs1kgrbakx24dm3wx"; + rev = "68f76ce13e9892339f90c4928339dfd769cfa613"; + sha256 = "08kbcdfplmbdhgq0x6lk2lpwrlgijrfq6vhl5hkmxg9v9gpgbbrj"; type = "git"; url = "https://github.com/thoughtbot/shoulda-matchers.git"; }; @@ -2282,10 +2302,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03bkn55qsng484iqwz2lmm6rkimj01vsvhwk661s3lnmpkl65lbp"; + sha256 = "1k8i5pzjhcnyf0bhcyn5iixpfp4pz0556rcxwpglh6p0sr8s6nv5"; type = "gem"; }; - version = "2.0.0"; + version = "3.0.0"; }; stackprof = { groups = ["default"]; @@ -2484,27 +2504,16 @@ }; version = "3.0.0"; }; - webdrivers = { - dependencies = ["nokogiri" "rubyzip" "selenium-webdriver"]; - groups = ["test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "19aaxhawzv7315rh285gd1fg6m6wbrn3w3kilyibci1wphgm7mfp"; - type = "gem"; - }; - version = "5.3.1"; - }; webmock = { dependencies = ["addressable" "crack" "hashdiff"]; groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1myj44wvbbqvv18ragv3ihl0h61acgnfwrnj3lccdgp49bgmbjal"; + sha256 = "0vfispr7wd2p1fs9ckn1qnby1yyp4i1dl7qz8n482iw977iyxrza"; type = "gem"; }; - version = "3.18.1"; + version = "3.19.1"; }; websocket = { groups = ["default" "test"]; @@ -2552,9 +2561,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06vf6y5ai20ry3b1h9cl7vsdj6i5valq172zdxpnfhj5zvlp104j"; + sha256 = "1mwdd445w63khz13hpv17m2br5xngyjl3jdj08xizjbm78i2zrxd"; type = "gem"; }; - version = "2.6.10"; + version = "2.6.11"; }; } diff --git a/pkgs/servers/web-apps/engelsystem/default.nix b/pkgs/servers/web-apps/engelsystem/default.nix index 815718bc0c595..ee92f58a2121b 100644 --- a/pkgs/servers/web-apps/engelsystem/default.nix +++ b/pkgs/servers/web-apps/engelsystem/default.nix @@ -6,11 +6,11 @@ let in stdenv.mkDerivation rec { pname = "engelsystem"; - version = "3.3.0"; + version = "3.4.0"; src = fetchzip { url = "https://github.com/engelsystem/engelsystem/releases/download/v${version}/engelsystem-v${version}.zip"; - hash = "sha256-DS0klm26udXsiiFToeOJooA1WUR8gk0qf/UJL8E77ps="; + hash = "sha256-Z0p+6QlMrj5OtiwFKBfWxkkd/kbL2dxDSKvljcTXWo0="; }; buildInputs = [ phpExt ]; diff --git a/pkgs/servers/web-apps/galene/default.nix b/pkgs/servers/web-apps/galene/default.nix index 5e402bde05dce..1cf78fa2d76e6 100644 --- a/pkgs/servers/web-apps/galene/default.nix +++ b/pkgs/servers/web-apps/galene/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "galene"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "jech"; repo = "galene"; rev = "galene-${version}"; - hash = "sha256-dqve8ZQgJZYVyB43Dk2y966sn3zC2xtD2/jMFtcUj24="; + hash = "sha256-9jFloYrAQXmhmRoJxGp1UUxzFEkzB32iohStbb39suU="; }; vendorHash = "sha256-+itNqxEy0S2g5UGpUIthJE2ILQzToISref/8F4zTmYg="; diff --git a/pkgs/servers/web-apps/lemmy/ui.nix b/pkgs/servers/web-apps/lemmy/ui.nix index d578fde8e56b1..4f219ae21abaf 100644 --- a/pkgs/servers/web-apps/lemmy/ui.nix +++ b/pkgs/servers/web-apps/lemmy/ui.nix @@ -24,7 +24,7 @@ let ''; }; sharp = { - nativeBuildInputs = [ pkg-config nodePackages.semver ]; + nativeBuildInputs = [ pkg-config nodePackages.node-gyp nodePackages.semver ]; buildInputs = [ vips ]; postInstall = '' yarn --offline run install diff --git a/pkgs/servers/web-apps/netbox/default.nix b/pkgs/servers/web-apps/netbox/default.nix index 433b974eb411a..ab648d7daa7b4 100644 --- a/pkgs/servers/web-apps/netbox/default.nix +++ b/pkgs/servers/web-apps/netbox/default.nix @@ -1,41 +1,38 @@ -{ lib, nixosTests, callPackage, fetchpatch }: +{ lib, nixosTests, callPackage, }: let generic = import ./generic.nix; in -{ - netbox_3_3 = callPackage generic { - version = "3.3.10"; - hash = "sha256-MeOfTU5IxNDoUh7FyvwAQNRC/CE0R6p40WnlF+3RuxA="; +lib.fix (self: { + netbox = self.netbox_3_6; + + netbox_3_5 = callPackage generic { + version = "3.5.9"; + hash = "sha256-CJbcuCyTuihDXrObSGyJi2XF+zgWAwcJzjxtkX8pmKs="; extraPatches = [ # Allow setting the STATIC_ROOT from within the configuration and setting a custom redis URL - ./config_3_3.patch - ./graphql-3_2_0.patch - # fix compatibility ith django 4.1 - (fetchpatch { - url = "https://github.com/netbox-community/netbox/pull/10341/commits/ce6bf9e5c1bc08edc80f6ea1e55cf1318ae6e14b.patch"; - sha256 = "sha256-aCPQp6k7Zwga29euASAd+f13hIcZnIUu3RPAzNPqgxc="; - }) + ./config.patch ]; - tests = { - netbox = nixosTests.netbox_3_3; + netbox = nixosTests.netbox_3_5; inherit (nixosTests) netbox-upgrade; }; - maintainers = with lib.maintainers; [ n0emis raitobezarius ]; + + maintainers = with lib.maintainers; [ minijackson n0emis raitobezarius ]; eol = true; }; - netbox = callPackage generic { - version = "3.5.9"; - hash = "sha256-CJbcuCyTuihDXrObSGyJi2XF+zgWAwcJzjxtkX8pmKs="; + netbox_3_6 = callPackage generic { + version = "3.6.3"; + hash = "sha256-8Xir2Gvwh2cllHu5qVAzumuH0lknMMtjd8BuFuuf9A0="; extraPatches = [ # Allow setting the STATIC_ROOT from within the configuration and setting a custom redis URL ./config.patch ]; tests = { - inherit (nixosTests) netbox netbox-upgrade; + netbox = nixosTests.netbox_3_6; + inherit (nixosTests) netbox-upgrade; }; maintainers = with lib.maintainers; [ minijackson n0emis raitobezarius ]; }; -} +}) diff --git a/pkgs/servers/web-apps/netbox/generic.nix b/pkgs/servers/web-apps/netbox/generic.nix index 179ef71b702d7..afd02d7985351 100644 --- a/pkgs/servers/web-apps/netbox/generic.nix +++ b/pkgs/servers/web-apps/netbox/generic.nix @@ -11,32 +11,9 @@ , eol ? false }: let - py = python3 // { - pkgs = python3.pkgs.overrideScope (self: super: { - django = super.django_4; - drf-nested-routers = super.drf-nested-routers.overridePythonAttrs (_oldAttrs: { - patches = [ - # all for django 4 compat - (fetchpatch { - url = "https://github.com/alanjds/drf-nested-routers/commit/59764cc356f7f593422b26845a9dfac0ad196120.diff"; - hash = "sha256-mq3vLHzQlGl2EReJ5mVVQMMcYgGIVt/T+qi1STtQ0aI="; - }) - (fetchpatch { - url = "https://github.com/alanjds/drf-nested-routers/commit/723a5729dd2ffcb66fe315f229789ca454986fa4.diff"; - hash = "sha256-UCbBjwlidqsJ9vEEWlGzfqqMOr0xuB2TAaUxHsLzFfU="; - }) - (fetchpatch { - url = "https://github.com/alanjds/drf-nested-routers/commit/38e49eb73759bc7dcaaa9166169590f5315e1278.diff"; - hash = "sha256-IW4BLhHHhXDUZqHaXg46qWoQ89pMXv0ZxKjOCTnDcI0="; - }) - ]; - }); - }); - }; - - extraBuildInputs = plugins py.pkgs; + extraBuildInputs = plugins python3.pkgs; in - py.pkgs.buildPythonApplication rec { + python3.pkgs.buildPythonApplication rec { pname = "netbox"; inherit version; @@ -51,7 +28,7 @@ patches = extraPatches; - propagatedBuildInputs = with py.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ bleach boto3 django_4 @@ -90,7 +67,7 @@ jsonschema ] ++ extraBuildInputs; - buildInputs = with py.pkgs; [ + buildInputs = with python3.pkgs; [ mkdocs-material mkdocs-material-extensions mkdocstrings @@ -98,7 +75,7 @@ ]; nativeBuildInputs = [ - py.pkgs.mkdocs + python3.pkgs.mkdocs ]; postBuild = '' diff --git a/pkgs/servers/web-apps/peering-manager/default.nix b/pkgs/servers/web-apps/peering-manager/default.nix index a16683572fa27..3f18b700d66ca 100644 --- a/pkgs/servers/web-apps/peering-manager/default.nix +++ b/pkgs/servers/web-apps/peering-manager/default.nix @@ -7,47 +7,32 @@ , plugins ? ps: [] }: -let - py = python3.override { - packageOverrides = final: prev: { - django = final.django_4; - drf-nested-routers = prev.drf-nested-routers.overridePythonAttrs (oldAttrs: { - patches = [ - # all for django 4 compat - (fetchpatch { - url = "https://github.com/alanjds/drf-nested-routers/commit/59764cc356f7f593422b26845a9dfac0ad196120.diff"; - hash = "sha256-mq3vLHzQlGl2EReJ5mVVQMMcYgGIVt/T+qi1STtQ0aI="; - }) - (fetchpatch { - url = "https://github.com/alanjds/drf-nested-routers/commit/723a5729dd2ffcb66fe315f229789ca454986fa4.diff"; - hash = "sha256-UCbBjwlidqsJ9vEEWlGzfqqMOr0xuB2TAaUxHsLzFfU="; - }) - (fetchpatch { - url = "https://github.com/alanjds/drf-nested-routers/commit/38e49eb73759bc7dcaaa9166169590f5315e1278.diff"; - hash = "sha256-IW4BLhHHhXDUZqHaXg46qWoQ89pMXv0ZxKjOCTnDcI0="; - }) - ]; - }); - }; - }; - -in py.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "peering-manager"; - version = "1.7.4"; + version = "1.8.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-mXva4c5Rtjq/jFJl3yGGlVrggzGJ3awN0+xoDnDWBSA="; + sha256 = "sha256-N34piaSP+QKZzjT42nAR47DTtqGtZ/GMeTeTyRQw3/4="; }; + patches = [ + # restore support unix sockets for redis connections + # https://github.com/peering-manager/peering-manager/pull/773 + (fetchpatch { + url = "https://github.com/peering-manager/peering-manager/commit/ff66823c04d8c545a46dcec91d61eda7c21f99aa.patch"; + hash = "sha256-x5E0LFhGrc5LPY4pwAMNUtigltLGqqbRCe1PIm0yLA8="; + }) + ]; + format = "other"; - propagatedBuildInputs = with py.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ django djangorestframework - django-cacheops + django-redis django-debug-toolbar django-filter django-postgresql-netfields @@ -56,16 +41,18 @@ in py.pkgs.buildPythonApplication rec { django-tables2 django-taggit drf-spectacular + drf-spectacular-sidecar jinja2 markdown napalm packaging psycopg2 + pyixapi pynetbox pyyaml requests tzdata - ] ++ plugins py.pkgs; + ] ++ plugins python3.pkgs; buildPhase = '' runHook preBuild @@ -87,8 +74,8 @@ in py.pkgs.buildPythonApplication rec { passthru = { # PYTHONPATH of all dependencies used by the package - python = py; - pythonPath = py.pkgs.makePythonPath propagatedBuildInputs; + python = python3; + pythonPath = python3.pkgs.makePythonPath propagatedBuildInputs; tests = { inherit (nixosTests) peering-manager; diff --git a/pkgs/servers/web-apps/pict-rs/default.nix b/pkgs/servers/web-apps/pict-rs/default.nix index 37c344931e4fa..d99c00b2f3db0 100644 --- a/pkgs/servers/web-apps/pict-rs/default.nix +++ b/pkgs/servers/web-apps/pict-rs/default.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "pict-rs"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitea { domain = "git.asonix.dog"; owner = "asonix"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3iY16ld2yKf5PffaS1FUwhWD657OAdY4eWHe5f3fIuQ="; + sha256 = "sha256-gUBSPkfIjvIU94tdasaoSl8zKPdfZ2PuT7sD8zU+iCI="; }; - cargoHash = "sha256-uRDRBe3rxkTSmO/uWSLQ6JI/t0KFta2kkf2ZihVYw0A="; + cargoHash = "sha256-ENFFhZ+OUcQPmQoYj5xFmUBJpofe8ovQgcEepujwcFA="; # needed for internal protobuf c wrapper library PROTOC = "${protobuf}/bin/protoc"; diff --git a/pkgs/servers/web-apps/snipe-it/default.nix b/pkgs/servers/web-apps/snipe-it/default.nix index c2ff95f93da05..7d511db2654d4 100644 --- a/pkgs/servers/web-apps/snipe-it/default.nix +++ b/pkgs/servers/web-apps/snipe-it/default.nix @@ -36,13 +36,13 @@ let in package.override rec { pname = "snipe-it"; - version = "6.1.1"; + version = "6.2.1"; src = fetchFromGitHub { owner = "snipe"; repo = pname; rev = "v${version}"; - sha256 = "0kqrq0blamqbfh8dxfyvn2m4q7yphamh4yvpfs7iyb3lb7z7a75i"; + sha256 = "0kx5j9a2fbj9zy0i9r01z3lsbqlf488kn5b42fjs47nfzk1yznvx"; }; passthru.tests = nixosTests.snipe-it; diff --git a/pkgs/servers/web-apps/snipe-it/php-packages.nix b/pkgs/servers/web-apps/snipe-it/php-packages.nix index 5475e5a952101..465310daf90cb 100644 --- a/pkgs/servers/web-apps/snipe-it/php-packages.nix +++ b/pkgs/servers/web-apps/snipe-it/php-packages.nix @@ -15,10 +15,10 @@ let "arietimmerman/laravel-scim-server" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "arietimmerman-laravel-scim-server-9e8dd2d3958d3c3c05d0a99fe6475361ad9e9419"; + name = "arietimmerman-laravel-scim-server-dda6dfb60d70fb6cca4b8d4ce1c5f4c19deaab2d"; src = fetchurl { - url = "https://api.github.com/repos/grokability/laravel-scim-server/zipball/9e8dd2d3958d3c3c05d0a99fe6475361ad9e9419"; - sha256 = "02if4yvnqagpwgrq8b0371nva24lsk0h3h06q51vjxyqjhqvc2nr"; + url = "https://api.github.com/repos/grokability/laravel-scim-server/zipball/dda6dfb60d70fb6cca4b8d4ce1c5f4c19deaab2d"; + sha256 = "0b08j7xfrbvp6ckv413sfpqq8v4qk59y9wcwch5kc19fb8y3dgiq"; }; }; }; @@ -415,10 +415,10 @@ let "guzzlehttp/psr7" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "guzzlehttp-psr7-13388f00956b1503577598873fffb5ae994b5737"; + name = "guzzlehttp-psr7-0454e12ef0cd597ccd2adb036f7bda4e7fface66"; src = fetchurl { - url = "https://api.github.com/repos/guzzle/psr7/zipball/13388f00956b1503577598873fffb5ae994b5737"; - sha256 = "05vc1q903nxfg11y9mcnlg253lm5d81jjg6wv76hjiwx8m47lbac"; + url = "https://api.github.com/repos/guzzle/psr7/zipball/0454e12ef0cd597ccd2adb036f7bda4e7fface66"; + sha256 = "1vlrryjzwjigf2q1nichnrxl43r75cw3yjf17d3dy7ixhvlpnlv6"; }; }; }; @@ -845,10 +845,10 @@ let "nyholm/psr7" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "nyholm-psr7-f734364e38a876a23be4d906a2a089e1315be18a"; + name = "nyholm-psr7-e874c8c4286a1e010fb4f385f3a55ac56a05cc93"; src = fetchurl { - url = "https://api.github.com/repos/Nyholm/psr7/zipball/f734364e38a876a23be4d906a2a089e1315be18a"; - sha256 = "0w8i5l1qg8dkc1zsyz1gpwn2awgkhlm295l1b8smmzabqdc65dcx"; + url = "https://api.github.com/repos/Nyholm/psr7/zipball/e874c8c4286a1e010fb4f385f3a55ac56a05cc93"; + sha256 = "0abjvcrg19km5p6bcjfmfhrravsb60hap71zzznpwmf83bq16l8r"; }; }; }; @@ -1582,6 +1582,16 @@ let }; }; }; + "tecnickcom/tcpdf" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "tecnickcom-tcpdf-e3cffc9bcbc76e89e167e9eb0bbda0cab7518459"; + src = fetchurl { + url = "https://api.github.com/repos/tecnickcom/TCPDF/zipball/e3cffc9bcbc76e89e167e9eb0bbda0cab7518459"; + sha256 = "17769rpyfq6z8lw5bj7icvkz7003d6kbj1hiji5cixrkahvc57fy"; + }; + }; + }; "tijsverkoyen/css-to-inline-styles" = { targetDir = ""; src = composerEnv.buildZipPackage { diff --git a/pkgs/servers/web-apps/snipe-it/update.sh b/pkgs/servers/web-apps/snipe-it/update.sh index 3e5f70f1a5879..226c71af3e345 100755 --- a/pkgs/servers/web-apps/snipe-it/update.sh +++ b/pkgs/servers/web-apps/snipe-it/update.sh @@ -1,5 +1,43 @@ #!/usr/bin/env nix-shell #! nix-shell -I nixpkgs=../../../.. -i bash -p nix curl jq nix-update +# shellcheck shell=bash +cd "$(dirname "$0")" + +usage () { + cat <<EOF +# Snipe-IT Updater + +A small script to update Snipe-IT to the latest release + +Usage: $(basename "$0") [options] + + -h, --help Display this message and quit + -c, --commit Create a commit after updating + -n, --no-build Just update, don't build the package + +This script needs composer2nix in your PATH. +https://github.com/svanderburg/composer2nix +EOF +} + +# Parse command line arguments +while [ $# -ge 1 ]; do + case "$1" in + -h|--help) + usage + exit 0 + ;; + -c|--commit) + COMMIT_CHANGES=true + ;; + -d|--dont-build) + DONT_BUILD=true + ;; + *) + ;; + esac + shift +done # check if composer2nix is installed if ! command -v composer2nix &> /dev/null; then @@ -44,7 +82,18 @@ sed -e '7s/stdenv writeTextFile/stdenv lib writeTextFile/' \ echo "" >> composition.nix echo "" >> php-packages.nix -cd ../../../.. -nix-build -A snipe-it +if [ -z ${DONT_BUILD+x} ]; then + ( + cd ../../../.. + nix-build -A snipe-it + ) +fi + +if [ -n "$COMMIT_CHANGES" ]; then + git add . + git commit -m "snipe-it: $CURRENT_VERSION -> $TARGET_VERSION + +https://github.com/snipe/snipe-it/releases/tag/v$TARGET_VERSION" +fi exit $? diff --git a/pkgs/servers/web-apps/wordpress/packages/languages.json b/pkgs/servers/web-apps/wordpress/packages/languages.json index d48681583b5e3..dea632e5420c6 100644 --- a/pkgs/servers/web-apps/wordpress/packages/languages.json +++ b/pkgs/servers/web-apps/wordpress/packages/languages.json @@ -1,20 +1,20 @@ { "de_DE": { "path": "de_DE", - "rev": "1125866", - "sha256": "1igf7zlws3l1vw8pvmdfzpqaarc4yjdcgz2qkzi14wnf3sna66p9", - "version": "6.2" + "rev": "1208447", + "sha256": "1xavixayja6b2mxjp478yxkiimykmg50r23bl011nmkvir7sgm9f", + "version": "6.3" }, "fr_FR": { "path": "fr_FR", - "rev": "1124123", - "sha256": "1830p1fyjij31ilvdaqyjvbgjkaavkqq18ckmmg7mswl6ij9zigs", - "version": "6.2" + "rev": "1227211", + "sha256": "1fgzjbzwd3h1i92ylxjmyagswgd2lg1bimnz00zckqk3z1jl2693", + "version": "6.3" }, "ro_RO": { "path": "ro_RO", - "rev": "1124117", - "sha256": "0cgpwm8wrmj68b2q3g4nq5dnvmx4g7qh11nq0yq5hgnlwrb8dx5g", - "version": "6.2" + "rev": "1219994", + "sha256": "0xjdv91pqpvzqajcaazcqvb79842llzl27lp2cqr4r8p2kivg94d", + "version": "6.3" } } diff --git a/pkgs/servers/web-apps/wordpress/packages/plugins.json b/pkgs/servers/web-apps/wordpress/packages/plugins.json index 7105e80dba490..16e1a8528e792 100644 --- a/pkgs/servers/web-apps/wordpress/packages/plugins.json +++ b/pkgs/servers/web-apps/wordpress/packages/plugins.json @@ -6,34 +6,34 @@ "version": "2.4.5" }, "akismet": { - "path": "akismet/tags/5.1", - "rev": "2894240", - "sha256": "032b3hhdqyjj4y4z246wlhyjj74qw0c60kndc7nv79l7h3i1q10f", - "version": "5.1" + "path": "akismet/tags/5.3", + "rev": "2966753", + "sha256": "17ayrjbwc6ij7qqaph3jjn94i27nmhr6hki5gjl4dzrz8142zrwn", + "version": "5.3" }, "antispam-bee": { - "path": "antispam-bee/tags/2.11.3", - "rev": "2898402", - "sha256": "0rh5r7qdhq9y7dily2b7h24dn5r0qr10gqw9qvvnz4lsqq3mpw2q", - "version": "2.11.3" + "path": "antispam-bee/tags/2.11.5", + "rev": "2969611", + "sha256": "1pbigfchwkz9zks3vf1xd83d0aj4n1fmlimn8dpa5pw96687nc9d", + "version": "2.11.5" }, "async-javascript": { "path": "async-javascript/tags/2.21.08.31", - "rev": "2760769", - "sha256": "1yf3pj0nn4gyl0a2wfvznpwb7y0glxg19rgny3bh38k4pj9mli49", + "rev": "2929532", + "sha256": "0v9lrbxcgk6diz927q36nx45nbl6hm8bdig9lc0gj42i183y3g61", "version": "2.21.08.31" }, "breeze": { - "path": "breeze/tags/2.0.22", - "rev": "2913544", - "sha256": "09x5ii2255cj78hamvbkzxfgj917pn7agpl7v8lgpkf0y113lvqi", - "version": "2.0.22" + "path": "breeze/tags/2.0.29", + "rev": "2959271", + "sha256": "0ggyy9l33czv72vp1y4n03ky2nr2ysllkz5phfy9axhhv5a01ip0", + "version": "2.0.29" }, "co-authors-plus": { - "path": "co-authors-plus/tags/3.5.10", - "rev": "2853502", - "sha256": "1nlw3bkvz05fl1d4fyh3b9n27hchs90w9c30hikhpj2vxfkpc4zh", - "version": "3.5.10" + "path": "co-authors-plus/tags/3.5.15", + "rev": "2959167", + "sha256": "1n01sk2vgiym25wvxi4igpx773ph59y5f5lvwaasilamdpw0lzh4", + "version": "3.5.15" }, "code-syntax-block": { "path": "code-syntax-block/tags/3.1.1", @@ -42,22 +42,22 @@ "version": "3.1.1" }, "cookie-notice": { - "path": "cookie-notice/tags/2.4.8", - "rev": "2888335", - "sha256": "0gya4qi0hxhvry9a6r3lmby242lf7yqam96vdhyav080s7fr4m8b", - "version": "2.4.8" + "path": "cookie-notice/tags/2.4.10", + "rev": "2956191", + "sha256": "1mi4ml1s92ljd85f1fiig1p1yi962db07m4kjw7vl3b7l3j4qdq5", + "version": "2.4.10" }, "disable-xml-rpc": { "path": "disable-xml-rpc/tags/1.0.1", - "rev": "2561901", - "sha256": "04x5dj79bx5avx8db991nlhrpd3qv3maniqmzwnyd8ab2zblzx83", + "rev": "2954460", + "sha256": "03vay6j7ac44pg55hlm02lglm3ggmjxdq95dhh0cmavbiafimhqq", "version": "1.0.1" }, "gutenberg": { - "path": "gutenberg/tags/15.7.1", - "rev": "2910291", - "sha256": "0g8fp819hhnlva603cd2sqa0g4v5h0nszx73765yiijks1xy7vbk", - "version": "15.7.1" + "path": "gutenberg/tags/16.7.0", + "rev": "2972264", + "sha256": "0mpbpp0c8dmpv3591i92xhjr44dnhbpgx4vln0q4cjdq5c6638r8", + "version": "16.7.0" }, "hello-dolly": { "path": "hello-dolly/tags/1.7.2", @@ -66,16 +66,16 @@ "version": "1.7.2" }, "hkdev-maintenance-mode": { - "path": "hkdev-maintenance-mode/trunk", - "rev": "2858025", - "sha256": "1p844pjyiz2ydv0imwa13dfbp8150rlghla454dflk3rcdmxzj1n", - "version": "2.3.2" + "path": "hkdev-maintenance-mode/tags/2.4.5", + "rev": "2971903", + "sha256": "1nq3f0qv8zkws490h86m57972wp7vcngr62x90m8bcq4v6r110wd", + "version": "2.4.5" }, "jetpack": { - "path": "jetpack/tags/12.1", - "rev": "2907118", - "sha256": "0z6qzxfqcsx6ywzvak24l64aig33g344x84zy4n9a3h6ymz4rcrb", - "version": "12.1" + "path": "jetpack/tags/12.6.2", + "rev": "2972327", + "sha256": "1659k1418rcmxc51pfwlbbfcq3fskr1n04vlzgx5wi7a3bgjv47n", + "version": "12.6.2" }, "jetpack-lite": { "path": "jetpack-lite/tags/3.0.3", @@ -84,39 +84,39 @@ "version": "3.0.3" }, "lightbox-photoswipe": { - "path": "lightbox-photoswipe/tags/5.0.35", - "rev": "2907179", - "sha256": "1imzrav4a9848imkhvldm9x4cnw57vi5agllqw614j36kkxk1fpg", - "version": "5.0.35" + "path": "lightbox-photoswipe/tags/5.0.44", + "rev": "2968868", + "sha256": "0nbs05lxdf85ig373l3k558ncw0li1zrqnajq5mw9vkw15mxgy90", + "version": "5.0.44" }, "login-lockdown": { "path": "login-lockdown/tags/2.06", - "rev": "2911341", - "sha256": "1xg2q76m96vyfk4sc9fqi0x7b2ddb3jbv0hm0iawxckv9baxh2gl", + "rev": "2951219", + "sha256": "0sl1pydylz1xpp3404nv2rdw8y2ccjvwglncj8flhjmgiwkjf47x", "version": "2.06" }, "mailpoet": { - "path": "mailpoet/tags/4.16.0", - "rev": "2912930", - "sha256": "0ij8g9bnni0ki4ks5sdq83pd8nqqfj3yf6by1v44splq2a5ix81g", - "version": "4.16.0" + "path": "mailpoet/tags/4.29.0", + "rev": "2972087", + "sha256": "0n0aq8p4265zskq5vblpn551v45870vrmnjzbyvppnyagydfc1q8", + "version": "4.29.0" }, "merge-minify-refresh": { "path": "merge-minify-refresh/trunk", - "rev": "2887489", - "sha256": "11z5d2f5kylszfl47ifxzb9ayyhr3haxds5hvm5dknphczkmjg4j", - "version": "1.14.2" + "rev": "2967306", + "sha256": "038sfnyr0ab8hzk5ybs0vnpiklhp1649dszbmlxilb5lm8rphbgq", + "version": "1.14.4" }, "opengraph": { "path": "opengraph/tags/1.11.1", - "rev": "2892781", - "sha256": "0z0vxvmd2brgh32hjfns0hssi93k7rw4rnsf8jx9gff3q6xxhlkc", + "rev": "2950019", + "sha256": "0vfxv2d3z572m99nlxzla0l5s1lp14a6inb3x1plr779zn0rlg5c", "version": "1.11.1" }, "simple-login-captcha": { "path": "simple-login-captcha/tags/1.3.5", - "rev": "2887191", - "sha256": "0jwm4snrw6lwkq48258n0aca8rn16mlgr5n9ngj6b38i2nj5i7i3", + "rev": "2947230", + "sha256": "054f51gybpy71iwdjnxf89v8x8dlvg4k4ggd2psvjjf16ai258dw", "version": "1.3.5" }, "static-mail-sender-configurator": { @@ -126,10 +126,10 @@ "version": "0.9.3" }, "webp-converter-for-media": { - "path": "webp-converter-for-media/tags/5.8.6", - "rev": "2906166", - "sha256": "0i30yshs94rdlj1wpfkkp2n4b4w98mq806cmkk2696ak9ddi5gdh", - "version": "5.8.6" + "path": "webp-converter-for-media/tags/5.11.0", + "rev": "2972415", + "sha256": "1ppa3npnvzn3a50hflpfzxgp3c79gn7zxvxiga9qhamhqpvnk48d", + "version": "5.11.0" }, "webp-express": { "path": "webp-express/tags/0.25.6", @@ -156,10 +156,10 @@ "version": "1.0" }, "wp-fastest-cache": { - "path": "wp-fastest-cache/tags/1.1.5", - "rev": "2905667", - "sha256": "1vpw526zw9yin1ppkcf98027yxwdzk5q7xvhbgar74jchq91zzfc", - "version": "1.1.5" + "path": "wp-fastest-cache/tags/1.1.9", + "rev": "2962251", + "sha256": "0dwd8csv3ixixiajgihxx1xhwq9vy3idlhw4ya2xsyk38gisfa4z", + "version": "1.1.9" }, "wp-gdpr-compliance": { "path": "wp-gdpr-compliance/tags/2.0.22", @@ -168,22 +168,22 @@ "version": "2.0.22" }, "wp-mail-smtp": { - "path": "wp-mail-smtp/tags/3.8.0", - "rev": "2904482", - "sha256": "0wd2x1kkh499gaq7p33sjvbbhrmgfi6vlalv2lsmlnh9nbgdf6cn", - "version": "3.8.0" + "path": "wp-mail-smtp/tags/3.9.0", + "rev": "2960628", + "sha256": "1zxpbm92v2hmqipr9jy5awv3wmp7zik85hk9sb7i4ccvds8i90yw", + "version": "3.9.0" }, "wp-statistics": { - "path": "wp-statistics/tags/14.1", - "rev": "2907012", - "sha256": "0pb5988x1aqpdkr5ar32zl004c48c6040bvjdws6f3z6vi6i475x", - "version": "14.1" + "path": "wp-statistics/tags/14.1.6.2", + "rev": "2968479", + "sha256": "1sx8zki5ip2s3lkjdllsyybmsisy7dqzgnpgwj0ksk2gr4aksz1y", + "version": "14.1.6.2" }, "wp-swiper": { "path": "wp-swiper/trunk", - "rev": "2905097", - "sha256": "0g8m6rar78pwshyk124ww04gy18bz85z8xv0ir8b7lxx8l8rpmvd", - "version": "1.0.32" + "rev": "2945958", + "sha256": "0s8rp2h43sslb5c2h3d9h72qcwd7krn8hggh412l5r2j87cn4qwf", + "version": "1.0.33" }, "wp-user-avatars": { "path": "wp-user-avatars/trunk", @@ -192,9 +192,9 @@ "version": "1.4.1" }, "wpforms-lite": { - "path": "wpforms-lite/tags/1.8.1.2", - "rev": "2897758", - "sha256": "07wdk0139l9fwg7yc9qh2g0a8c5c37788si6xaf8gcvqj7fd9c2z", - "version": "1.8.1.2" + "path": "wpforms-lite/tags/1.8.4", + "rev": "2972627", + "sha256": "17gydpbhfk4j4r2scs3nn938xynxgqx3c5jdn4avxh4s4ms649al", + "version": "1.8.4" } } diff --git a/pkgs/servers/web-apps/wordpress/packages/themes.json b/pkgs/servers/web-apps/wordpress/packages/themes.json index 9daa98351d37a..8cd103dbc2b39 100644 --- a/pkgs/servers/web-apps/wordpress/packages/themes.json +++ b/pkgs/servers/web-apps/wordpress/packages/themes.json @@ -18,10 +18,10 @@ "version": "1.8" }, "twentytwentythree": { - "path": "twentytwentythree/1.1", - "rev": "188105", - "sha256": "1k2249zv5c6n58m875jc6n83ri6fy229l5v8wm757bhb9nqljdpk", - "version": "1.1" + "path": "twentytwentythree/1.2", + "rev": "198780", + "sha256": "1qybkprcjv89qrzkbv8lrhir6ns1wx3kzdimjnjhx70ggkbygh5y", + "version": "1.2" }, "twentytwentytwo": { "path": "twentytwentytwo/1.4", diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 8ce28251d4fc7..bd499329e29f6 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2671,11 +2671,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videosiliconmotion = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { pname = "xf86-video-siliconmotion"; - version = "1.7.9"; + version = "1.7.10"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.9.tar.bz2"; - sha256 = "1g2r6gxqrmjdff95d42msxdw6vmkg2zn5sqv0rxd420iwy8wdwyh"; + url = "mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.10.tar.xz"; + sha256 = "1h4g2mqxshaxii416ldw0aqy6cxnsbnzayfin51xm2526dw9q18n"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 2c168a659a89b..1a8c59deebff1 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -1,5 +1,4 @@ -{ abiCompat ? null, - callPackage, +{ callPackage, lib, stdenv, makeWrapper, fetchurl, fetchpatch, fetchFromGitLab, buildPackages, automake, autoconf, libiconv, libtool, intltool, gettext, python3, perl, freetype, tradcpp, fontconfig, meson, ninja, ed, fontforge, @@ -135,7 +134,15 @@ self: super: }; }); - libxcvt = addMainProgram super.libxcvt { mainProgram = "cvt"; }; + libxcvt = super.libxcvt.overrideAttrs ({ meta ? {}, ... }: { + meta = meta // { + homepage = "https://gitlab.freedesktop.org/xorg/lib/libxcvt"; + mainProgram = "cvt"; + badPlatforms = meta.badPlatforms or [] ++ [ + lib.systems.inspect.platformPatterns.isStatic + ]; + }; + }); libX11 = super.libX11.overrideAttrs (attrs: { outputs = [ "out" "dev" "man" ]; @@ -738,24 +745,18 @@ self: super: }); xorgserver = with xorg; super.xorgserver.overrideAttrs (attrs_passed: - # exchange attrs if abiCompat is set let - version = lib.getVersion attrs_passed; - attrs = - if (abiCompat == null || lib.hasPrefix abiCompat version) then - attrs_passed // { - buildInputs = attrs_passed.buildInputs ++ - lib.optional (libdrm != null) libdrm.dev; - postPatch = '' - for i in dri3/*.c - do - sed -i -e "s|#include <drm_fourcc.h>|#include <libdrm/drm_fourcc.h>|" $i - done - ''; - meta = attrs_passed.meta // { mainProgram = "X"; }; - } - else throw "unsupported xorg abiCompat ${abiCompat} for ${attrs_passed.name}"; - + attrs = attrs_passed // { + buildInputs = attrs_passed.buildInputs ++ + lib.optional (libdrm != null) libdrm.dev; + postPatch = '' + for i in dri3/*.c + do + sed -i -e "s|#include <drm_fourcc.h>|#include <libdrm/drm_fourcc.h>|" $i + done + ''; + meta = attrs_passed.meta // { mainProgram = "X"; }; + }; in attrs // (let version = lib.getVersion attrs; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 45ce4833a13b2..75b71a62565b1 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -112,7 +112,7 @@ mirror://xorg/individual/driver/xf86-video-r128-6.12.1.tar.xz mirror://xorg/individual/driver/xf86-video-rendition-4.2.7.tar.bz2 mirror://xorg/individual/driver/xf86-video-s3virge-1.11.1.tar.xz mirror://xorg/individual/driver/xf86-video-savage-2.4.0.tar.xz -mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.9.tar.bz2 +mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.10.tar.xz mirror://xorg/individual/driver/xf86-video-sis-0.12.0.tar.gz mirror://xorg/individual/driver/xf86-video-sisusb-0.9.7.tar.bz2 mirror://xorg/individual/driver/xf86-video-suncg6-1.1.3.tar.xz diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index 28ebf020e1cdb..7ad83147fa165 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -19,7 +19,7 @@ , libXt , libdrm , libtirpc -, libunwind +, withLibunwind ? true, libunwind , libxcb , libxkbfile , libxshmfence @@ -39,15 +39,17 @@ , xorgproto , xtrans , zlib -, defaultFontPath ? "" }: +, defaultFontPath ? "" +, gitUpdater +}: stdenv.mkDerivation rec { pname = "xwayland"; - version = "23.2.0"; + version = "23.2.1"; src = fetchurl { url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz"; - sha256 = "sha256-fzPsKjTebmauG35Ehyw6IUYZKHLHGbms8ZKBTtur1MU="; + sha256 = "sha256-7rwmksOqgGF9eEKLxux7kbJUqYIU0qcOmXCYUDzW75A="; }; depsBuildBuild = [ @@ -79,7 +81,6 @@ stdenv.mkDerivation rec { libXt libdrm libtirpc - libunwind libxcb libxkbfile libxshmfence @@ -93,6 +94,8 @@ stdenv.mkDerivation rec { xorgproto xtrans zlib + ] ++ lib.optionals withLibunwind [ + libunwind ]; mesonFlags = [ (lib.mesonBool "xwayland_eglstream" true) @@ -101,9 +104,15 @@ stdenv.mkDerivation rec { (lib.mesonOption "xkb_bin_dir" "${xkbcomp}/bin") (lib.mesonOption "xkb_dir" "${xkeyboard_config}/etc/X11/xkb") (lib.mesonOption "xkb_output_dir" "${placeholder "out"}/share/X11/xkb/compiled") - (lib.mesonBool "libunwind" (libunwind != null)) + (lib.mesonBool "libunwind" withLibunwind) ]; + passthru.updateScript = gitUpdater { + # No nicer place to find latest release. + url = "https://gitlab.freedesktop.org/xorg/xserver.git"; + rev-prefix = "xwayland-"; + }; + meta = with lib; { description = "An X server for interfacing X11 apps with the Wayland protocol"; homepage = "https://wayland.freedesktop.org/xserver.html"; diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/servers/x11/xquartz/default.nix index cdb2122a612d2..93b2869f8d2bb 100644 --- a/pkgs/servers/x11/xquartz/default.nix +++ b/pkgs/servers/x11/xquartz/default.nix @@ -177,7 +177,7 @@ in stdenv.mkDerivation { meta = with lib; { platforms = platforms.darwin; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; license = licenses.mit; }; } diff --git a/pkgs/servers/xmpp/prosody-filer/default.nix b/pkgs/servers/xmpp/prosody-filer/default.nix index a6de3a1047406..7665a7f7450d8 100644 --- a/pkgs/servers/xmpp/prosody-filer/default.nix +++ b/pkgs/servers/xmpp/prosody-filer/default.nix @@ -1,18 +1,18 @@ -{ stdenv, lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "prosody-filer"; version = "unstable-2021-05-24"; - vendorSha256 = "05spkks77x88kc31c1zdg1cbf9ijymjs7qzmhg4c6lql5p2h5fbd"; - src = fetchFromGitHub { owner = "ThomasLeister"; repo = "prosody-filer"; rev = "c65edd199b47dc505366c85b3702230fda797cd6"; - sha256 = "0h6vp5flgy4wwmzhs6pf6qkk2j4ah8w919dwhfsq4wdpqs78kc0y"; + hash = "sha256-HrCJjsa3cYK1g7ylkDiCikgxJzbuGg1/5Zz4R12520A="; }; + vendorHash = "sha256-bbkCxS0UU8PIg/Xjo2X1Mia3WHjtBxYGmwj1c/ScVxc="; + doCheck = false; meta = with lib; { @@ -21,5 +21,5 @@ buildGoModule rec { license = licenses.mit; platforms = platforms.linux; description = "A simple file server for handling XMPP http_upload requests"; - }; + }; } diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix index 64ac2e8699ad1..bb8b68c17ddf7 100644 --- a/pkgs/servers/xmpp/prosody/default.nix +++ b/pkgs/servers/xmpp/prosody/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lib, libidn, openssl, makeWrapper, fetchhg +{ stdenv, fetchurl, lib, libidn, openssl, makeWrapper, fetchhg, buildPackages , icu , lua , nixosTests @@ -54,9 +54,13 @@ stdenv.mkDerivation rec { configureFlags = [ "--ostype=linux" + "--with-lua-bin=${lib.getBin buildPackages.lua}/bin" "--with-lua-include=${luaEnv}/include" "--with-lua=${luaEnv}" + "--c-compiler=${stdenv.cc.targetPrefix}cc" + "--linker=${stdenv.cc.targetPrefix}cc" ]; + configurePlatforms = []; postBuild = '' make -C tools/migration diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/servers/zigbee2mqtt/default.nix index 5e310cda8c95f..a93163b560c10 100644 --- a/pkgs/servers/zigbee2mqtt/default.nix +++ b/pkgs/servers/zigbee2mqtt/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "zigbee2mqtt"; - version = "1.33.0"; + version = "1.33.1"; src = fetchFromGitHub { owner = "Koenkk"; repo = "zigbee2mqtt"; rev = version; - hash = "sha256-DdRcDSvgFf+NSDpWT4MnAOLNJ5sfqvJqKBhfPwTHd/g="; + hash = "sha256-Rd8PJWKPUriVf3BmHFvhmb+SQskVeqOFdJB8Gsopgnw="; }; - npmDepsHash = "sha256-ov1ftDqJtxLCu3xgtGcg+Q2OMkOsHrwk1SNNfdlUieY="; + npmDepsHash = "sha256-rEqbwdeIQg6YS7uLeoP2uMbJWsnovIHBVp9CPlTc2NY="; nativeBuildInputs = [ python3 diff --git a/pkgs/servers/zookeeper/default.nix b/pkgs/servers/zookeeper/default.nix index c8ef0cb68d412..1df644b9fbe7f 100644 --- a/pkgs/servers/zookeeper/default.nix +++ b/pkgs/servers/zookeeper/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://apache/zookeeper/${pname}-${version}/apache-${pname}-${version}-bin.tar.gz"; - sha512 = "sha512-kQNiilB0X6GiibymZv2kqcCOwXxVzxPmaIfnunbpPbrmCh8f/WwQeYvjoWBpNE7LwAzrspvwPZzXCWzNCY7QEQ=="; + hash = "sha512-kQNiilB0X6GiibymZv2kqcCOwXxVzxPmaIfnunbpPbrmCh8f/WwQeYvjoWBpNE7LwAzrspvwPZzXCWzNCY7QEQ=="; }; nativeBuildInputs = [ makeWrapper ]; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { homepage = "https://zookeeper.apache.org"; description = "Apache Zookeeper"; license = licenses.asl20; - maintainers = with maintainers; [ nathan-gs cstrahan pradeepchhetri ztzg ]; + maintainers = with maintainers; [ nathan-gs pradeepchhetri ztzg ]; platforms = platforms.unix; }; } diff --git a/pkgs/shells/bash/5.nix b/pkgs/shells/bash/5.nix index 6b126390c9f6e..3c4fb83e3e4e5 100644 --- a/pkgs/shells/bash/5.nix +++ b/pkgs/shells/bash/5.nix @@ -2,7 +2,6 @@ , stdenv , buildPackages , fetchurl -, binutils , bison , util-linux @@ -68,6 +67,12 @@ stdenv.mkDerivation rec { ]; configureFlags = [ + # At least on Linux bash memory allocator has pathological performance + # in scenarios involving use of larger memory: + # https://lists.gnu.org/archive/html/bug-bash/2023-08/msg00052.html + # Various distributions default to system allocator. Let's nixpkgs + # do the same. + "--without-bash-malloc" (if interactive then "--with-installed-readline" else "--disable-readline") ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "bash_cv_job_control_missing=nomissing" @@ -81,7 +86,6 @@ stdenv.mkDerivation rec { "bash_cv_dev_fd=standard" "bash_cv_termcap_lib=libncurses" ] ++ lib.optionals (stdenv.hostPlatform.libc == "musl") [ - "--without-bash-malloc" "--disable-nls" ]; @@ -90,7 +94,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ bison ] ++ lib.optional withDocs texinfo - ++ lib.optional stdenv.hostPlatform.isDarwin binutils; + ++ lib.optional stdenv.hostPlatform.isDarwin stdenv.cc.bintools; buildInputs = lib.optional interactive readline; diff --git a/pkgs/shells/fish/plugins/done.nix b/pkgs/shells/fish/plugins/done.nix index ffbd8dfdaa032..ad16e257bf627 100644 --- a/pkgs/shells/fish/plugins/done.nix +++ b/pkgs/shells/fish/plugins/done.nix @@ -2,13 +2,13 @@ buildFishPlugin rec { pname = "done"; - version = "1.16.5"; + version = "1.17.1"; src = fetchFromGitHub { owner = "franciscolourenco"; repo = "done"; rev = version; - sha256 = "E0wveeDw1VzEH2kzn63q9hy1xkccfxQHBV2gVpu2IdQ="; + hash = "sha256-aYKTkx5v7tB6k/UBcS0NOgA6SiRrjzn1lUTH/Xp5DFM="; }; checkPlugins = [ fishtape ]; diff --git a/pkgs/shells/hishtory/default.nix b/pkgs/shells/hishtory/default.nix index 818dd4b11281d..1d5256e401ac0 100644 --- a/pkgs/shells/hishtory/default.nix +++ b/pkgs/shells/hishtory/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "hishtory"; - version = "0.208"; + version = "0.215"; src = fetchFromGitHub { owner = "ddworken"; repo = pname; rev = "v${version}"; - hash = "sha256-TEto5lLH5nwqJ9PaYKrYCNW4/zrIICANQlGmqwDbOm4="; + hash = "sha256-XDxAzMQjtCfufWnEO5NXP8Zv823a85qYhkZcEZKxIXs="; }; - vendorHash = "sha256-FodgIELV5JbqP3h/mIDDYARZcols9ZEtVREW1853EOI="; + vendorHash = "sha256-aXHqPk8iBMbe0NlsY3ZR7iozBGCAKlOOQ23FAD/5hL8="; ldflags = [ "-X github.com/ddworken/hishtory/client/lib.Version=${version}" ]; diff --git a/pkgs/shells/nushell/plugins/formats.nix b/pkgs/shells/nushell/plugins/formats.nix index 8c511782e3de0..5f75951b8c955 100644 --- a/pkgs/shells/nushell/plugins/formats.nix +++ b/pkgs/shells/nushell/plugins/formats.nix @@ -5,25 +5,32 @@ , pkg-config , IOKit , Foundation +, nix-update-script }: -let +rustPlatform.buildRustPackage rec { pname = "nushell_plugin_formats"; -in -rustPlatform.buildRustPackage { - inherit pname; - version = "0.85.0"; - src = nushell.src; - cargoHash = "sha256-OKtktjBOujvljAX260TbC2sQWZOiGgU+sXsbYRhGPRM="; + inherit (nushell) version src; + cargoHash = "sha256-WS8VRpJnn/VWS7GUkGowFf51ifUx0SbEZzcoTfx2dp0="; + nativeBuildInputs = [ pkg-config ]; - buildInputs = [ IOKit Foundation ]; + buildInputs = lib.optionals stdenv.isDarwin [ IOKit Foundation ]; cargoBuildFlags = [ "--package nu_plugin_formats" ]; - doCheck = false; + + checkPhase = '' + cargo test --manifest-path crates/nu_plugin_formats/Cargo.toml + ''; + + passthru.updateScript = nix-update-script { + # Skip the version check and only check the hash because we inherit version from nushell. + extraArgs = [ "--version=skip" ]; + }; + meta = with lib; { description = "A formats plugin for Nushell"; - homepage = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_formats"; + homepage = "https://github.com/nushell/nushell/tree/${version}/crates/nu_plugin_formats"; license = licenses.mpl20; - maintainers = with maintainers; [ viraptor ]; + maintainers = with maintainers; [ viraptor aidalgol ]; platforms = with platforms; all; }; } diff --git a/pkgs/shells/nushell/plugins/gstat.nix b/pkgs/shells/nushell/plugins/gstat.nix index f7e912a6fdc67..bf788098a5eb9 100644 --- a/pkgs/shells/nushell/plugins/gstat.nix +++ b/pkgs/shells/nushell/plugins/gstat.nix @@ -5,25 +5,32 @@ , nushell , pkg-config , Security +, nix-update-script }: -let +rustPlatform.buildRustPackage rec { pname = "nushell_plugin_gstat"; -in -rustPlatform.buildRustPackage { - inherit pname; - version = "0.85.0"; - src = nushell.src; - cargoHash = "sha256-Fj70uKYzEKxeZeNrqlwM7ZFJ+K1tz10RqLndrdY40CE="; + inherit (nushell) version src; + cargoHash = "sha256-6luY3SIRRd9vaY9KIJcj8Q974FW0LtAvRjVpdpzkdLo="; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; cargoBuildFlags = [ "--package nu_plugin_gstat" ]; - doCheck = false; # some tests fail + + checkPhase = '' + cargo test --manifest-path crates/nu_plugin_gstat/Cargo.toml + ''; + + passthru.updateScript = nix-update-script { + # Skip the version check and only check the hash because we inherit version from nushell. + extraArgs = [ "--version=skip" ]; + }; + meta = with lib; { description = "A git status plugin for Nushell"; - homepage = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_gstat"; + homepage = "https://github.com/nushell/nushell/tree/${version}/crates/nu_plugin_gstat"; license = licenses.mpl20; - maintainers = with maintainers; [ mrkkrp ]; + maintainers = with maintainers; [ mrkkrp aidalgol ]; platforms = with platforms; all; }; } diff --git a/pkgs/shells/nushell/plugins/query.nix b/pkgs/shells/nushell/plugins/query.nix index 51db91bec2665..25097a5d6297b 100644 --- a/pkgs/shells/nushell/plugins/query.nix +++ b/pkgs/shells/nushell/plugins/query.nix @@ -9,28 +9,26 @@ rustPlatform.buildRustPackage { pname = "nushell_plugin_query"; - version = "0.85.0"; - - src = nushell.src; - - cargoHash = "sha256-8iUqOdGWm2kDW72ptlCBIqqe4zjckN09MOQD77kCf5Y="; + inherit (nushell) version src; + cargoHash = "sha256-xyty3GfI+zNkuHs7LYHBctqXUHZ4/MNNcnnfYvI18do="; buildInputs = lib.optionals stdenv.isDarwin [ IOKit CoreFoundation ]; - cargoBuildFlags = [ "--package nu_plugin_query" ]; - # compilation fails with a missing symbol - doCheck = false; + checkPhase = '' + cargo test --manifest-path crates/nu_plugin_query/Cargo.toml + ''; - passthru = { - updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { + # Skip the version check and only check the hash because we inherit version from nushell. + extraArgs = [ "--version=skip" ]; }; meta = with lib; { description = "A Nushell plugin to query JSON, XML, and various web data"; - homepage = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_query"; + homepage = "https://github.com/nushell/nushell/tree/${version}/crates/nu_plugin_query"; license = licenses.mpl20; - maintainers = with maintainers; [ happysalada ]; + maintainers = with maintainers; [ happysalada aidalgol ]; platforms = with platforms; all; }; } diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index 2f7bc15c1b3c0..0366dac5b944f 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -1,89 +1,139 @@ -{ stdenv, lib, autoPatchelfHook, fetchurl, libunwind, libuuid, icu, curl -, darwin, makeWrapper, less, openssl, pam, lttng-ust }: - -let archString = if stdenv.isAarch64 then "arm64" - else if stdenv.isx86_64 then "x64" - else throw "unsupported platform"; - platformString = if stdenv.isDarwin then "osx" - else if stdenv.isLinux then "linux" - else throw "unsupported platform"; - platformHash = { - x86_64-darwin = "sha256-FX3OyVzwU+Ms2tgjpZ4dPdjeJx2H5541dQZAjhI3n1U="; - aarch64-darwin = "sha256-Dg7FRF5inRnzP6tjDhIgHTJ1J2EQXnegqimZPK574WQ="; - x86_64-linux = "sha256-6F1VROE6kk+LLEpdwtQ6vkbkZjP4no0TjTnAqurLmXY="; - aarch64-linux = "sha256-NO4E2TOUIYyUFJmi3zKJzOyP0/rTPTZgJZcebVNkSfk="; - }.${stdenv.hostPlatform.system} or (throw "unsupported platform"); - platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" - else if stdenv.isLinux then "LD_LIBRARY_PATH" - else throw "unsupported platform"; - libraries = [ libunwind libuuid icu curl openssl ] ++ - (if stdenv.isLinux then [ pam lttng-ust ] else [ darwin.Libsystem ]); +{ lib +, stdenv +, fetchurl +, less +, makeWrapper +, autoPatchelfHook +, curl +, icu +, libuuid +, libunwind +, openssl +, darwin +, lttng-ust +, pam +, testers +, powershell +, writeShellScript +, common-updater-scripts +, gnused +, jq +}: + +let + ext = stdenv.hostPlatform.extensions.sharedLibrary; + platformLdLibraryPath = { + darwin = "DYLD_FALLBACK_LIBRARY_PATH"; + linux = "LD_LIBRARY_PATH"; + }.${stdenv.hostPlatform.parsed.kernel.name} or (throw "unsupported platform"); in stdenv.mkDerivation rec { pname = "powershell"; - version = "7.3.4"; + version = "7.3.7"; - src = fetchurl { - url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-${platformString}-${archString}.tar.gz"; - hash = platformHash; - }; + src = passthru.sources.${stdenv.hostPlatform.system} + or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); sourceRoot = "."; strictDeps = true; - buildInputs = [ less ] ++ libraries; - nativeBuildInputs = [ makeWrapper ] - ++ lib.optional stdenv.isLinux autoPatchelfHook; - installPhase = - let - ext = stdenv.hostPlatform.extensions.sharedLibrary; - in '' - pslibs=$out/share/powershell - mkdir -p $pslibs + nativeBuildInputs = [ + less + makeWrapper + ] ++ lib.optionals stdenv.isLinux [ + autoPatchelfHook + ]; + + buildInputs = [ + curl + icu + libuuid + libunwind + openssl + ] ++ lib.optionals stdenv.isDarwin [ + darwin.Libsystem + ] ++ lib.optionals stdenv.isLinux [ + lttng-ust + pam + ]; - cp -r * $pslibs + installPhase = '' + runHook preInstall - # At least the 7.1.4-osx package does not have the executable bit set. - chmod a+x $pslibs/pwsh + mkdir -p $out/{bin,share/powershell} + cp -R * $out/share/powershell + chmod +x $out/share/powershell/pwsh + makeWrapper $out/share/powershell/pwsh $out/bin/pwsh \ + --prefix ${platformLdLibraryPath} : "${lib.makeLibraryPath buildInputs}" \ + --set TERM xterm \ + --set POWERSHELL_TELEMETRY_OPTOUT 1 \ + --set DOTNET_CLI_TELEMETRY_OPTOUT 1 '' + lib.optionalString (stdenv.isLinux && stdenv.isx86_64) '' - patchelf --replace-needed libcrypto${ext}.1.0.0 libcrypto${ext} $pslibs/libmi.so - patchelf --replace-needed libssl${ext}.1.0.0 libssl${ext} $pslibs/libmi.so - '' + lib.optionalString stdenv.isLinux '' - patchelf --replace-needed liblttng-ust${ext}.0 liblttng-ust${ext}.1 $pslibs/libcoreclrtraceptprovider.so - '' + '' + patchelf --replace-needed libcrypto${ext}.1.0.0 libcrypto${ext} $out/share/powershell/libmi.so + patchelf --replace-needed libssl${ext}.1.0.0 libssl${ext} $out/share/powershell/libmi.so - mkdir -p $out/bin + '' + lib.optionalString stdenv.isLinux '' + patchelf --replace-needed liblttng-ust${ext}.0 liblttng-ust${ext}.1 $out/share/powershell/libcoreclrtraceptprovider.so - makeWrapper $pslibs/pwsh $out/bin/pwsh \ - --prefix ${platformLdLibraryPath} : "${lib.makeLibraryPath libraries}" \ - --set TERM xterm --set POWERSHELL_TELEMETRY_OPTOUT 1 --set DOTNET_CLI_TELEMETRY_OPTOUT 1 + '' + '' + runHook postInstall ''; dontStrip = true; - doInstallCheck = true; - installCheckPhase = '' - # May need a writable home, seen on Darwin. - HOME=$TMP $out/bin/pwsh --help > /dev/null - ''; + passthru = { + shellPath = "/bin/pwsh"; + sources = { + aarch64-darwin = fetchurl { + url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-osx-arm64.tar.gz"; + hash = "sha256-KSBsYw369fURSmoD/YyZm9CLEIbhDR12mRp1xLCJ4Wc="; + }; + aarch64-linux = fetchurl { + url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-linux-arm64.tar.gz"; + hash = "sha256-GaAu3nD0xRqqE0Lm7Z5Da6YUQGiCFc5xHuJYDLKySGc="; + }; + x86_64-darwin = fetchurl { + url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-osx-x64.tar.gz"; + hash = "sha256-+6cy4PLpt3ZR7ui3H9rAg3C39kVryPtqE5HKzMpBa24="; + }; + x86_64-linux = fetchurl { + url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-linux-x64.tar.gz"; + hash = "sha256-GKsAH+A89/M1fxvw4C4yb7+ITcfD6Y4Oicb1K8AswwI="; + }; + }; + tests.version = testers.testVersion { + package = powershell; + command = "HOME=$(mktemp -d) pwsh --version"; + }; + updateScript = writeShellScript "update-powershell" '' + set -o errexit + export PATH="${lib.makeBinPath [ common-updater-scripts curl gnused jq ]}" + NEW_VERSION=$(curl -s https://api.github.com/repos/PowerShell/PowerShell/releases/latest | jq .tag_name --raw-output | sed -e 's/v//') + + if [[ "${version}" = "$NEW_VERSION" ]]; then + echo "The new version same as the old version." + exit 0 + fi + + for platform in ${lib.escapeShellArgs meta.platforms}; do + update-source-version "powershell" "0" "${lib.fakeHash}" --source-key="sources.$platform" + update-source-version "powershell" "$NEW_VERSION" --source-key="sources.$platform" + done + ''; + }; meta = with lib; { description = "Powerful cross-platform (Windows, Linux, and macOS) shell and scripting language based on .NET"; - homepage = "https://github.com/PowerShell/PowerShell"; + homepage = "https://microsoft.com/PowerShell"; + license = licenses.mit; + mainProgram = "pwsh"; + maintainers = with maintainers; [ wegank ]; + platforms = builtins.attrNames passthru.sources; sourceProvenance = with sourceTypes; [ binaryBytecode binaryNativeCode ]; - maintainers = with maintainers; [ yrashk srgom p3psi ]; - mainProgram = "pwsh"; - platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-linux" "aarch64-darwin" ]; - license = with licenses; [ mit ]; }; - - passthru = { - shellPath = "/bin/pwsh"; - }; - } diff --git a/pkgs/shells/powershell/getHashes.sh b/pkgs/shells/powershell/getHashes.sh deleted file mode 100755 index 785ab264ebccc..0000000000000 --- a/pkgs/shells/powershell/getHashes.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p bash wget coreutils nix -version=$1 - -if [[ -z $version ]] -then - echo "Pass the version to get hashes for as an argument" - exit 1 -fi - -allOutput="" - -dlDest=$(mktemp) - -trap 'rm $dlDest' EXIT - -for plat in osx linux; do - for arch in x64 arm64; do - - URL="https://github.com/PowerShell/PowerShell/releases/download/v$version/powershell-$version-$plat-$arch.tar.gz" - wget $URL -O $dlDest >&2 - - hash=$(nix hash file $dlDest) - - allOutput+=" -variant: $plat $arch -hash: $hash -" - - done -done - -echo "$allOutput" diff --git a/pkgs/shells/zsh/antibody/default.nix b/pkgs/shells/zsh/antibody/default.nix index 0ecbb9bfdb6f4..8df75ac15b959 100644 --- a/pkgs/shells/zsh/antibody/default.nix +++ b/pkgs/shells/zsh/antibody/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "getantibody"; repo = "antibody"; rev = "v${version}"; - sha256 = "0icag53svzdm7yvzp855fp0f7q0g0jkfmjaa1sj6mmb01c1xgzi1"; + hash = "sha256-If7XAwtg1WqkDkrJ6qYED+DjwHWloPu3P7X9rUd5ikU="; }; - vendorSha256 = "0z8fma3v2dph8nv3q4lmv43s6p5sc338xb7kcmnpwcc0iw7b4vyj"; + vendorHash = "sha256-0m+yDo+AMX5tZfOsjsZgulyjB9mVEjy2RfA2sYeqDn0="; doCheck = false; diff --git a/pkgs/shells/zsh/zimfw/default.nix b/pkgs/shells/zsh/zimfw/default.nix index 5f58d3d5e9f9f..af452968fa637 100644 --- a/pkgs/shells/zsh/zimfw/default.nix +++ b/pkgs/shells/zsh/zimfw/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "zimfw"; - version = "1.12.0"; + version = "1.12.1"; src = fetchFromGitHub { owner = "zimfw"; repo = "zimfw"; rev = "v${version}"; ## zim only needs this one file to be installed. sparseCheckout = [ "zimfw.zsh" ]; - sha256 = "sha256-PwfPiga4KcOrkkObIu3RCUmO2ExoDQkbQx7S+Yncy6k="; + sha256 = "sha256-BoUNUdhRUWNi2ttxgWJxbjHw64K9k0rNjRi2L4V+gLk="; }; strictDeps = true; dontConfigure = true; diff --git a/pkgs/stdenv/linux/bootstrap-files/aarch64.nix b/pkgs/stdenv/linux/bootstrap-files/aarch64-unknown-linux-gnu.nix index 6719e7ca30722..6719e7ca30722 100644 --- a/pkgs/stdenv/linux/bootstrap-files/aarch64.nix +++ b/pkgs/stdenv/linux/bootstrap-files/aarch64-unknown-linux-gnu.nix diff --git a/pkgs/stdenv/linux/bootstrap-files/aarch64-musl.nix b/pkgs/stdenv/linux/bootstrap-files/aarch64-unknown-linux-musl.nix index 252783cce47cb..252783cce47cb 100644 --- a/pkgs/stdenv/linux/bootstrap-files/aarch64-musl.nix +++ b/pkgs/stdenv/linux/bootstrap-files/aarch64-unknown-linux-musl.nix diff --git a/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix b/pkgs/stdenv/linux/bootstrap-files/armv5tel-unknown-linux-gnueabi.nix index 0ac818b9f2233..0ac818b9f2233 100644 --- a/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix +++ b/pkgs/stdenv/linux/bootstrap-files/armv5tel-unknown-linux-gnueabi.nix diff --git a/pkgs/stdenv/linux/bootstrap-files/armv6l.nix b/pkgs/stdenv/linux/bootstrap-files/armv6l-unknown-linux-gnueabihf.nix index 8bc99c64c6813..8bc99c64c6813 100644 --- a/pkgs/stdenv/linux/bootstrap-files/armv6l.nix +++ b/pkgs/stdenv/linux/bootstrap-files/armv6l-unknown-linux-gnueabihf.nix diff --git a/pkgs/stdenv/linux/bootstrap-files/armv6l-musl.nix b/pkgs/stdenv/linux/bootstrap-files/armv6l-unknown-linux-musleabihf.nix index e445a7bba4d8f..e445a7bba4d8f 100644 --- a/pkgs/stdenv/linux/bootstrap-files/armv6l-musl.nix +++ b/pkgs/stdenv/linux/bootstrap-files/armv6l-unknown-linux-musleabihf.nix diff --git a/pkgs/stdenv/linux/bootstrap-files/armv7l.nix b/pkgs/stdenv/linux/bootstrap-files/armv7l-unknown-linux-gnueabihf.nix index 74d158452231f..74d158452231f 100644 --- a/pkgs/stdenv/linux/bootstrap-files/armv7l.nix +++ b/pkgs/stdenv/linux/bootstrap-files/armv7l-unknown-linux-gnueabihf.nix diff --git a/pkgs/stdenv/linux/bootstrap-files/i686.nix b/pkgs/stdenv/linux/bootstrap-files/i686-unknown-linux-gnu.nix index 112d37670c8cd..112d37670c8cd 100644 --- a/pkgs/stdenv/linux/bootstrap-files/i686.nix +++ b/pkgs/stdenv/linux/bootstrap-files/i686-unknown-linux-gnu.nix diff --git a/pkgs/stdenv/linux/bootstrap-files/loongson2f.nix b/pkgs/stdenv/linux/bootstrap-files/loongson2f.nix deleted file mode 100644 index 8e22a274974a1..0000000000000 --- a/pkgs/stdenv/linux/bootstrap-files/loongson2f.nix +++ /dev/null @@ -1,44 +0,0 @@ -let - - fetch = { file, sha256 }: import <nix/fetchurl.nix> { - url = "http://tarballs.nixos.org/stdenv-linux/loongson2f/r22849/${file}"; - inherit sha256; - executable = true; - }; - -in { - sh = fetch { - file = "sh"; - sha256 = "02jjl49wdq85pgh61aqf78yaknn9mi3rcspbpk7hs9c4mida2rhf"; - }; - - bzip2 = fetch { - file = "bzip2"; - sha256 = "1qn27y3amj9c6mnjk2kyb59y0d2w4yv16z9apaxx91hyq19gf29z"; - }; - - mkdir = fetch { - file = "mkdir"; - sha256 = "1vbp2bv9hkyb2fwl8hjrffpywn1wrl1kc4yrwi2lirawlnc6kymh"; - }; - - cpio = fetch { - file = "cpio"; - sha256 = "0mqxwdx0sl7skxx6049mk35l7d0fnibqsv174284kdp4p7iixwa0"; - }; - - ln = fetch { - file = "ln"; - sha256 = "05lwx8qvga3yv8xhs8bjgsfygsfrcxsfck0lxw6gsdckx25fgi7s"; - }; - - curl = fetch { - file = "curl.bz2"; - sha256 = "0iblnz4my54gryac04i64fn3ksi9g3dx96yjq93fj39z6kx6151c"; - }; - - bootstrapTools = { - url = "http://tarballs.nixos.org/stdenv-linux/loongson2f/r22849/cross-bootstrap-tools.cpio.bz2"; - sha256 = "00aavbk76qjj2gdlmpaaj66r8nzl4d7pyl8cv1gigyzgpbr5vv3j"; - }; -} diff --git a/pkgs/stdenv/linux/bootstrap-files/mips64el.nix b/pkgs/stdenv/linux/bootstrap-files/mips64el-unknown-linux-gnuabi64.nix index 452a247fb0b9c..452a247fb0b9c 100644 --- a/pkgs/stdenv/linux/bootstrap-files/mips64el.nix +++ b/pkgs/stdenv/linux/bootstrap-files/mips64el-unknown-linux-gnuabi64.nix diff --git a/pkgs/stdenv/linux/bootstrap-files/mips64el-n32.nix b/pkgs/stdenv/linux/bootstrap-files/mips64el-unknown-linux-gnuabin32.nix index cf26c2113ec8d..cf26c2113ec8d 100644 --- a/pkgs/stdenv/linux/bootstrap-files/mips64el-n32.nix +++ b/pkgs/stdenv/linux/bootstrap-files/mips64el-unknown-linux-gnuabin32.nix diff --git a/pkgs/stdenv/linux/bootstrap-files/mipsel.nix b/pkgs/stdenv/linux/bootstrap-files/mipsel-unknown-linux-gnu.nix index 42f2e871d92e5..42f2e871d92e5 100644 --- a/pkgs/stdenv/linux/bootstrap-files/mipsel.nix +++ b/pkgs/stdenv/linux/bootstrap-files/mipsel-unknown-linux-gnu.nix diff --git a/pkgs/stdenv/linux/bootstrap-files/powerpc64le.nix b/pkgs/stdenv/linux/bootstrap-files/powerpc64le-unknown-linux-gnu.nix index c35cb9b102c07..c35cb9b102c07 100644 --- a/pkgs/stdenv/linux/bootstrap-files/powerpc64le.nix +++ b/pkgs/stdenv/linux/bootstrap-files/powerpc64le-unknown-linux-gnu.nix diff --git a/pkgs/stdenv/linux/bootstrap-files/riscv64.nix b/pkgs/stdenv/linux/bootstrap-files/riscv64-unknown-linux-gnu.nix index aaf1f153c7876..aaf1f153c7876 100644 --- a/pkgs/stdenv/linux/bootstrap-files/riscv64.nix +++ b/pkgs/stdenv/linux/bootstrap-files/riscv64-unknown-linux-gnu.nix diff --git a/pkgs/stdenv/linux/bootstrap-files/x86_64.nix b/pkgs/stdenv/linux/bootstrap-files/x86_64-unknown-linux-gnu.nix index bdfa98c89cbc7..1eefa4f3d6d4f 100644 --- a/pkgs/stdenv/linux/bootstrap-files/x86_64.nix +++ b/pkgs/stdenv/linux/bootstrap-files/x86_64-unknown-linux-gnu.nix @@ -1,5 +1,5 @@ # Use busybox for i686-linux since it works on x86_64-linux as well. -(import ./i686.nix) // +(import ./i686-unknown-linux-gnu.nix) // { bootstrapTools = import <nix/fetchurl.nix> { diff --git a/pkgs/stdenv/linux/bootstrap-files/x86_64-musl.nix b/pkgs/stdenv/linux/bootstrap-files/x86_64-unknown-linux-musl.nix index 98a65bd776453..98a65bd776453 100644 --- a/pkgs/stdenv/linux/bootstrap-files/x86_64-musl.nix +++ b/pkgs/stdenv/linux/bootstrap-files/x86_64-unknown-linux-musl.nix diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 34fffd36aa6ab..5c03312cc75f0 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -59,24 +59,24 @@ , bootstrapFiles ? let table = { glibc = { - i686-linux = import ./bootstrap-files/i686.nix; - x86_64-linux = import ./bootstrap-files/x86_64.nix; - armv5tel-linux = import ./bootstrap-files/armv5tel.nix; - armv6l-linux = import ./bootstrap-files/armv6l.nix; - armv7l-linux = import ./bootstrap-files/armv7l.nix; - aarch64-linux = import ./bootstrap-files/aarch64.nix; - mipsel-linux = import ./bootstrap-files/mipsel.nix; + i686-linux = import ./bootstrap-files/i686-unknown-linux-gnu.nix; + x86_64-linux = import ./bootstrap-files/x86_64-unknown-linux-gnu.nix; + armv5tel-linux = import ./bootstrap-files/armv5tel-unknown-linux-gnueabi.nix; + armv6l-linux = import ./bootstrap-files/armv6l-unknown-linux-gnueabihf.nix; + armv7l-linux = import ./bootstrap-files/armv7l-unknown-linux-gnueabihf.nix; + aarch64-linux = import ./bootstrap-files/aarch64-unknown-linux-gnu.nix; + mipsel-linux = import ./bootstrap-files/mipsel-unknown-linux-gnu.nix; mips64el-linux = import (if localSystem.isMips64n32 - then ./bootstrap-files/mips64el-n32.nix - else ./bootstrap-files/mips64el.nix); - powerpc64le-linux = import ./bootstrap-files/powerpc64le.nix; - riscv64-linux = import ./bootstrap-files/riscv64.nix; + then ./bootstrap-files/mips64el-unknown-linux-gnuabin32.nix.nix + else ./bootstrap-files/mips64el-unknown-linux-gnuabi64.nix); + powerpc64le-linux = import ./bootstrap-files/powerpc64le-unknown-linux-gnu.nix; + riscv64-linux = import ./bootstrap-files/riscv64-unknown-linux-gnu.nix; }; musl = { - aarch64-linux = import ./bootstrap-files/aarch64-musl.nix; - armv6l-linux = import ./bootstrap-files/armv6l-musl.nix; - x86_64-linux = import ./bootstrap-files/x86_64-musl.nix; + aarch64-linux = import ./bootstrap-files/aarch64-unknown-linux-musl.nix; + armv6l-linux = import ./bootstrap-files/armv6l-unknown-linux-musleabihf.nix; + x86_64-linux = import ./bootstrap-files/x86_64-unknown-linux-musl.nix; }; }; diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index e67b5aef95c56..124575af68881 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -12,21 +12,21 @@ let pkgs = releaseLib.pkgsForCross crossSystem system; }; in lib.mapAttrs (n: make) (with lib.systems.examples; { - armv5tel = sheevaplug; - pogoplug4 = pogoplug4; - armv6l = raspberryPi; - armv7l = armv7l-hf-multiplatform; - aarch64 = aarch64-multiplatform; - x86_64-musl = musl64; - armv6l-musl = muslpi; - aarch64-musl = aarch64-multiplatform-musl; - riscv64 = riscv64; - loongarch64-linux = loongarch64-linux; - mips64el-linux-gnuabin32 = mips64el-linux-gnuabin32; - mips64el-linux-gnuabi64 = mips64el-linux-gnuabi64; - mipsel-linux-gnu = mipsel-linux-gnu; - powerpc64 = ppc64; - powerpc64-musl = ppc64-musl; - powerpc64le = powernv; - powerpc64le-musl = musl-power; + # NOTE: Only add platforms for which there are files in `./bootstrap-files`. + # Sort following the sorting in `./default.nix` `bootstrapFiles` argument. + + armv5tel-unknown-linux-gnueabi = sheevaplug; + armv6l-unknown-linux-gnueabihf = raspberryPi; + armv7l-unknown-linux-gnueabihf = armv7l-hf-multiplatform; + aarch64-unknown-linux-gnu = aarch64-multiplatform; + mipsel-unknown-linux-gnu = mipsel-linux-gnu; + mips64el-unknown-linux-gnuabin32 = mips64el-linux-gnuabin32; + mips64el-unknown-linux-gnuabi64 = mips64el-linux-gnuabi64; + powerpc64le-unknown-linux-gnu = powernv; + riscv64-unknown-linux-gnu = riscv64; + + # musl + aarch64-unknown-linux-musl = aarch64-multiplatform-musl; + armv6l-unknown-linux-musleabihf = muslpi; + x86_64-unknown-linux-musl = musl64; }) diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index d6c4da0ab2bee..1334c13ad1703 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -78,7 +78,8 @@ in with pkgs; rec { cp -d ${libc.out}/lib/libutil*.so* $out/lib cp -d ${libc.out}/lib/libnss*.so* $out/lib cp -d ${libc.out}/lib/libresolv*.so* $out/lib - cp -d ${libc.out}/lib/crt?.o $out/lib + # Copy all runtime files to enable non-PIE, PIE, static PIE and profile-generated builds + cp -d ${libc.out}/lib/*.o $out/lib # Hacky compat with our current unpack-bootstrap-tools.sh ln -s librt.so "$out"/lib/librt-dummy.so diff --git a/pkgs/test/nixpkgs-check-by-name/Cargo.lock b/pkgs/test/nixpkgs-check-by-name/Cargo.lock index 3859d2b6e97cd..aa4459c7cff8b 100644 --- a/pkgs/test/nixpkgs-check-by-name/Cargo.lock +++ b/pkgs/test/nixpkgs-check-by-name/Cargo.lock @@ -243,6 +243,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" [[package]] +name = "lock_api" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] name = "memchr" version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -267,9 +277,9 @@ dependencies = [ "lazy_static", "regex", "rnix", - "rowan", "serde", "serde_json", + "temp-env", "tempfile", ] @@ -280,6 +290,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets", +] + +[[package]] name = "proc-macro2" version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -383,6 +416,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] name = "serde" version = "1.0.186" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -414,6 +453,12 @@ dependencies = [ ] [[package]] +name = "smallvec" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" + +[[package]] name = "strsim" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -431,6 +476,15 @@ dependencies = [ ] [[package]] +name = "temp-env" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e010429b1f3ea1311190c658c7570100f03c1dab05c16cfab774181c648d656a" +dependencies = [ + "parking_lot", +] + +[[package]] name = "tempfile" version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/pkgs/test/nixpkgs-check-by-name/Cargo.toml b/pkgs/test/nixpkgs-check-by-name/Cargo.toml index 003aab6d5842d..70b44d0482005 100644 --- a/pkgs/test/nixpkgs-check-by-name/Cargo.toml +++ b/pkgs/test/nixpkgs-check-by-name/Cargo.toml @@ -5,7 +5,6 @@ edition = "2021" [dependencies] rnix = "0.11.0" -rowan = "0.15.0" regex = "1.9.3" clap = { version = "4.3.23", features = ["derive"] } serde_json = "1.0.105" @@ -14,3 +13,6 @@ serde = { version = "1.0.185", features = ["derive"] } anyhow = "1.0" lazy_static = "1.4.0" colored = "2.0.4" + +[dev-dependencies] +temp-env = "0.3.5" diff --git a/pkgs/test/nixpkgs-check-by-name/default.nix b/pkgs/test/nixpkgs-check-by-name/default.nix index cb8a672bc990c..0d4e2fcc48a78 100644 --- a/pkgs/test/nixpkgs-check-by-name/default.nix +++ b/pkgs/test/nixpkgs-check-by-name/default.nix @@ -26,8 +26,8 @@ let export NIX_STATE_DIR=$TEST_ROOT/var/nix export NIX_STORE_DIR=$TEST_ROOT/store - # cargo tests run in parallel by default, which would then run into - # https://github.com/NixOS/nix/issues/2706 unless the store is initialised first + # Ensure that even if tests run in parallel, we don't get an error + # We'd run into https://github.com/NixOS/nix/issues/2706 unless the store is initialised first nix-store --init ''; postCheck = '' diff --git a/pkgs/test/nixpkgs-check-by-name/src/main.rs b/pkgs/test/nixpkgs-check-by-name/src/main.rs index 751b5dbd02408..8c663061bb097 100644 --- a/pkgs/test/nixpkgs-check-by-name/src/main.rs +++ b/pkgs/test/nixpkgs-check-by-name/src/main.rs @@ -87,10 +87,9 @@ mod tests { use crate::check_nixpkgs; use crate::structure; use anyhow::Context; - use std::env; use std::fs; use std::path::Path; - use tempfile::{tempdir, tempdir_in}; + use tempfile::{tempdir_in, TempDir}; #[test] fn tests_dir() -> anyhow::Result<()> { @@ -111,6 +110,13 @@ mod tests { Ok(()) } + // tempfile::tempdir needs to be wrapped in temp_env lock + // because it accesses TMPDIR environment variable. + fn tempdir() -> anyhow::Result<TempDir> { + let empty_list: [(&str, Option<&str>); 0] = []; + Ok(temp_env::with_vars(empty_list, tempfile::tempdir)?) + } + // We cannot check case-conflicting files into Nixpkgs (the channel would fail to // build), so we generate the case-conflicting file instead. #[test] @@ -157,34 +163,21 @@ mod tests { std::os::unix::fs::symlink("actual", temp_root.path().join("symlinked"))?; let tmpdir = temp_root.path().join("symlinked"); - // Then set TMPDIR to the symlinked directory - // Make sure to persist the old value so we can undo this later - let old_tmpdir = env::var("TMPDIR").ok(); - env::set_var("TMPDIR", &tmpdir); - - // Then run a simple test with this symlinked temporary directory - // This should be successful - test_nixpkgs("symlinked_tmpdir", Path::new("tests/success"), "")?; - - // Undo the env variable change - if let Some(old) = old_tmpdir { - env::set_var("TMPDIR", old); - } else { - env::remove_var("TMPDIR"); - } - - Ok(()) + temp_env::with_var("TMPDIR", Some(&tmpdir), || { + test_nixpkgs("symlinked_tmpdir", Path::new("tests/success"), "") + }) } fn test_nixpkgs(name: &str, path: &Path, expected_errors: &str) -> anyhow::Result<()> { let extra_nix_path = Path::new("tests/mock-nixpkgs.nix"); // We don't want coloring to mess up the tests - env::set_var("NO_COLOR", "1"); - - let mut writer = vec![]; - check_nixpkgs(&path, vec![&extra_nix_path], &mut writer) - .context(format!("Failed test case {name}"))?; + let writer = temp_env::with_var("NO_COLOR", Some("1"), || -> anyhow::Result<_> { + let mut writer = vec![]; + check_nixpkgs(&path, vec![&extra_nix_path], &mut writer) + .context(format!("Failed test case {name}"))?; + Ok(writer) + })?; let actual_errors = String::from_utf8_lossy(&writer); diff --git a/pkgs/test/vim/default.nix b/pkgs/test/vim/default.nix index 4d8e59a306a80..33e1e551d4f92 100644 --- a/pkgs/test/vim/default.nix +++ b/pkgs/test/vim/default.nix @@ -3,7 +3,7 @@ , pkgs }: let - inherit (vimUtils) buildVimPluginFrom2Nix; + inherit (vimUtils) buildVimPlugin; packages.myVimPackage.start = with vimPlugins; [ vim-nix ]; diff --git a/pkgs/tools/X11/go-sct/default.nix b/pkgs/tools/X11/go-sct/default.nix index d52cd046da9f7..585e28971b491 100644 --- a/pkgs/tools/X11/go-sct/default.nix +++ b/pkgs/tools/X11/go-sct/default.nix @@ -26,7 +26,7 @@ buildGoModule rec { description = "Color temperature setting library and CLI that operates in a similar way to f.lux and Redshift"; homepage = "https://github.com/d4l3k/go-sct"; license = licenses.mit; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; mainProgram = "sct"; }; } diff --git a/pkgs/tools/X11/inputplug/default.nix b/pkgs/tools/X11/inputplug/default.nix index 031b73994b62d..e6bf334cf4c0a 100644 --- a/pkgs/tools/X11/inputplug/default.nix +++ b/pkgs/tools/X11/inputplug/default.nix @@ -4,6 +4,7 @@ , libbsd , pkg-config , rustPlatform +, stdenv }: rustPlatform.buildRustPackage rec { @@ -29,6 +30,9 @@ rustPlatform.buildRustPackage rec { description = "Monitor XInput events and run arbitrary scripts on hierarchy change events"; homepage = "https://github.com/andrewshadura/inputplug"; license = licenses.mit; + platforms = platforms.unix; + # `daemon(3)` is deprecated on macOS and `pidfile-rs` needs updating + broken = stdenv.isDarwin; maintainers = with maintainers; [ jecaro ]; }; } diff --git a/pkgs/tools/X11/ncview/default.nix b/pkgs/tools/X11/ncview/default.nix index 2b2aac5f66b07..fcfb6661f3101 100644 --- a/pkgs/tools/X11/ncview/default.nix +++ b/pkgs/tools/X11/ncview/default.nix @@ -8,18 +8,21 @@ , xorg }: -let +stdenv.mkDerivation (finalAttrs: { pname = "ncview"; - version = "2.1.8"; - -in stdenv.mkDerivation { - name = "${pname}-${version}"; + version = "2.1.9"; src = fetchurl { - url = "ftp://cirrus.ucsd.edu/pub/ncview/ncview-2.1.8.tar.gz"; - sha256 = "1gliziyxil2fcz85hj6z0jq33avrxdcjs74d500lhxwvgd8drfp8"; + url = "https://cirrus.ucsd.edu/~pierce/ncview/ncview-${finalAttrs.version}.tar.gz"; + hash = "sha256-4jF6wJSvYvCtz2hCHXBlgglDaq40RkCVnsiXWmRYka8="; }; + strictDeps = true; + + nativeBuildInputs = [ + netcdf + ]; + buildInputs = [ expat libpng @@ -34,8 +37,10 @@ in stdenv.mkDerivation { meta = with lib; { description = "Visual browser for netCDF format files"; - homepage = "http://meteora.ucsd.edu/~pierce/ncview_home_page.html"; - license = licenses.gpl3; + homepage = "http://meteora.ucsd.edu/~pierce/ncview_home_page.html"; + license = licenses.gpl3Plus; + mainProgram = "ncview"; maintainers = with maintainers; [ jmettes ]; + platforms = platforms.all; }; -} +}) diff --git a/pkgs/tools/X11/wpgtk/default.nix b/pkgs/tools/X11/wpgtk/default.nix index 1bfdd674aa00c..f5489aa8b82f6 100644 --- a/pkgs/tools/X11/wpgtk/default.nix +++ b/pkgs/tools/X11/wpgtk/default.nix @@ -3,13 +3,13 @@ python3Packages.buildPythonApplication rec { pname = "wpgtk"; - version = "6.5.7"; + version = "6.5.9"; src = fetchFromGitHub { owner = "deviantfero"; repo = "wpgtk"; rev = version; - sha256 = "sha256-rHNni0nDghc5kI1sWHAb5ODr4buBz65eUEB1qWpbTTs="; + sha256 = "sha256-NlJG9d078TW1jcnVrpBORIIwDUGIAGWZoDbXp9/qRr4="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index 35557ce447f18..ed8b1363d5f8c 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -2,6 +2,7 @@ , file, libxslt, docbook_xml_dtd_412, docbook_xsl, xmlto , w3m, gnugrep, gnused, coreutils, xset, perlPackages , mimiSupport ? false, gawk +, bash , glib , withXdgOpenUsePortalPatch ? true }: @@ -48,6 +49,9 @@ stdenv.mkDerivation rec { # just needed when built from git nativeBuildInputs = [ libxslt docbook_xml_dtd_412 docbook_xsl xmlto w3m ]; + # explicitly provide a runtime shell so patchShebangs is consistent across build platforms + buildInputs = [ bash ]; + postInstall = lib.optionalString mimiSupport '' cp ${mimisrc}/xdg-open $out/bin/xdg-open '' + '' @@ -83,6 +87,5 @@ stdenv.mkDerivation rec { license = if mimiSupport then licenses.gpl2 else licenses.free; maintainers = [ maintainers.eelco ]; platforms = platforms.all; - broken = !(stdenv.buildPlatform.canExecute stdenv.hostPlatform); }; } diff --git a/pkgs/tools/X11/xzoom/default.nix b/pkgs/tools/X11/xzoom/default.nix index 979e2725098d1..7ba6bbee223d7 100644 --- a/pkgs/tools/X11/xzoom/default.nix +++ b/pkgs/tools/X11/xzoom/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, fetchurl, libX11, libXext, libXt, imake, gccmakedep}: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "xzoom"; version = "0.3"; patch = "24"; diff --git a/pkgs/tools/admin/ansible/lint.nix b/pkgs/tools/admin/ansible/lint.nix index 617c600c55ce5..bbdde0e60f720 100644 --- a/pkgs/tools/admin/ansible/lint.nix +++ b/pkgs/tools/admin/ansible/lint.nix @@ -6,12 +6,12 @@ python3.pkgs.buildPythonApplication rec { pname = "ansible-lint"; - version = "6.19.0"; + version = "6.20.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-JsOqEkljatkIRJ7yBL4KBDpa8R6jvUWUnI5KaA8hfn4="; + hash = "sha256-7BO/LrZUd/Rkq468YiNVKr/mjLP2WD3JEdhGAP0ZGts="; }; postPatch = '' diff --git a/pkgs/tools/admin/aws-encryption-sdk-cli/default.nix b/pkgs/tools/admin/aws-encryption-sdk-cli/default.nix new file mode 100644 index 0000000000000..526730e72228e --- /dev/null +++ b/pkgs/tools/admin/aws-encryption-sdk-cli/default.nix @@ -0,0 +1,53 @@ +{ lib +, python3Packages +, fetchPypi +, nix-update-script +, testers +, aws-encryption-sdk-cli +}: + +python3Packages.buildPythonApplication rec { + pname = "aws-encryption-sdk-cli"; + version = "4.1.0"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-OCbt0OkDVfpzUIogbsKzaPAle2L6l6N3cmZoS2hEaSM="; + }; + + propagatedBuildInputs = with python3Packages; [ + attrs + aws-encryption-sdk + base64io + ]; + + doCheck = true; + + nativeCheckInputs = with python3Packages; [ + mock + pytest-mock + pytestCheckHook + ]; + + disabledTestPaths = [ + # requires networking + "test/integration" + ]; + + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + package = aws-encryption-sdk-cli; + command = "aws-encryption-cli --version"; + }; + }; + + meta = with lib; { + homepage = "https://aws-encryption-sdk-cli.readthedocs.io/"; + changelog = "https://github.com/aws/aws-encryption-sdk-cli/blob/v${version}/CHANGELOG.rst"; + description = "CLI wrapper around aws-encryption-sdk-python"; + license = licenses.asl20; + mainProgram = "aws-encryption-cli"; + maintainers = with maintainers; [ anthonyroussel ]; + }; +} diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index f47f418476d52..6aedcc169a39c 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -23,14 +23,14 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.13.18"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.13.23"; # N.B: if you change this, check if overrides are still up-to-date format = "pyproject"; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = "refs/tags/${version}"; - hash = "sha256-0YCJZgu8GZgHBzlfGmOo+qF/ux99N1SQ0HDpN14z+CA="; + hash = "sha256-KFj+Z4Di14umlgzSg7Ip4jg7I6jP5fHTGG7c6+kXbRo="; }; postPatch = '' diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index 93c7c5fb07555..b74a59e47ee11 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "exoscale-cli"; - version = "1.72.2"; + version = "1.73.0"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-EUHjkhorfqRPStwThO5rdBVtl+NltEv18Bno4zu+5Us="; + sha256 = "sha256-46NRA+5SOJ451jF0KlTWu4STiTmRD1BjL3iQcGjdu2c="; }; vendorHash = null; diff --git a/pkgs/tools/admin/granted/default.nix b/pkgs/tools/admin/granted/default.nix index df888cebcff45..7fa7a3b748809 100644 --- a/pkgs/tools/admin/granted/default.nix +++ b/pkgs/tools/admin/granted/default.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "granted"; - version = "0.16.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = "common-fate"; repo = pname; rev = "v${version}"; - sha256 = "sha256-s9HnZ+yZ/dPIn8d2510k+lpsq5KHvtNsULTxtWVlGAk="; + sha256 = "sha256-+XdbHCa7XtngX1v/uH0p7EbQVcZY+vT2ox9saDOKYE0="; }; - vendorHash = "sha256-8wPQjxmY3EW0Y8BfNjZW1NNz4L9Rwzsvap0BF+7AtDc="; + vendorHash = "sha256-vHOGnflLC85hrONPPAAuuaPxNkv3t5T616nAnDEZbAY="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/admin/hop-cli/default.nix b/pkgs/tools/admin/hop-cli/default.nix index 794b5be90ef49..4d9734874e2c9 100644 --- a/pkgs/tools/admin/hop-cli/default.nix +++ b/pkgs/tools/admin/hop-cli/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "hop-cli"; - version = "0.2.53"; + version = "0.2.54"; src = fetchFromGitHub { owner = "hopinc"; repo = "cli"; rev = "v${version}"; - hash = "sha256-DyM8OEgO2OtD/PD/I6Ys2Yg0gQMB21OnjFdDkWKw+Io="; + hash = "sha256-0BIPN4+XYZgUdxygpKpWZq6VkWWNCFD8v5egXOYfC64="; }; - cargoHash = "sha256-R6Dbje6OEndJxyWJ8cR/QcfdIBw88Vfbve+EYGozWNc="; + cargoHash = "sha256-KE7AAyArRang/EZrpgv+vlNZaAP/Y2pCltiPMgZ5vFA="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/admin/infra/default.nix b/pkgs/tools/admin/infra/default.nix index f5189203943ba..bfb44acc6ed5b 100644 --- a/pkgs/tools/admin/infra/default.nix +++ b/pkgs/tools/admin/infra/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { description = "Infra manages access to infrastructure such as Kubernetes"; homepage = "https://github.com/infrahq/infra"; changelog = "https://github.com/infrahq/infra/raw/v${version}/CHANGELOG.md"; - license = licenses.elastic; + license = licenses.elastic20; maintainers = with maintainers; [ peterromfeldhk ]; }; } diff --git a/pkgs/tools/admin/kics/default.nix b/pkgs/tools/admin/kics/default.nix index 64f8ec24251e8..205a8f42b997c 100644 --- a/pkgs/tools/admin/kics/default.nix +++ b/pkgs/tools/admin/kics/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "kics"; - version = "1.7.7"; + version = "1.7.8"; src = fetchFromGitHub { owner = "Checkmarx"; repo = "kics"; rev = "v${version}"; - hash = "sha256-qK1lq7jrej4HdM+BUDDPujhbhqEhKcli3CTAmadO5Mg="; + hash = "sha256-T4b4PO4NcpsosiyRa/78WJ4yYvc1Ez7t7KIbZzSlQAo="; }; vendorHash = "sha256-gJu3B30IPp8A/xgtE5fzThQAtnFbbzr8ZwucAsObBxs="; diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix index 6fa7b3a8a257d..8d3954c31deeb 100644 --- a/pkgs/tools/admin/lego/default.nix +++ b/pkgs/tools/admin/lego/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lego"; - version = "4.14.0"; + version = "4.14.2"; src = fetchFromGitHub { owner = "go-acme"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dIHyorypyaKIv0Jo+iAK25j7NabgmPtNC6eJVwCl0LQ="; + sha256 = "sha256-o0opYPJk8QURDSPuxEoITyhu3PNvuvcT9ZsnWPJmoAY="; }; - vendorHash = "sha256-nAEPkikm98xbGQJzsB6YNXgpZVgR4AK/uCPwiQ25OYU="; + vendorHash = "sha256-RW2ybMX55bds3uo90dGzBJPsmv9iIqllt5Ap2WF8PnQ="; doCheck = false; diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 5e123ff6685bd..cc5550395febe 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -18,11 +18,11 @@ buildGoModule rec { pname = "lxd-unwrapped"; - version = "5.17"; + version = "5.18"; src = fetchurl { url = "https://github.com/canonical/lxd/releases/download/lxd-${version}/lxd-${version}.tar.gz"; - hash = "sha256-21pw8Q8UYjuxdaKzNXoTanxxyTNRXXbuerIZPIQK4yg="; + hash = "sha256-4F4q+jnypE4I2/5D65UT3NRpdJertSRni8JvHkpTFVI="; }; vendorHash = null; diff --git a/pkgs/tools/admin/manta/default.nix b/pkgs/tools/admin/manta/default.nix index 53b1e5ebd1991..f768305d20a1d 100644 --- a/pkgs/tools/admin/manta/default.nix +++ b/pkgs/tools/admin/manta/default.nix @@ -1,41 +1,34 @@ { lib , buildNpmPackage -, fetchurl -, nodejs +, fetchFromGitHub , installShellFiles , testers , node-manta }: -let - source = lib.importJSON ./source.json; -in buildNpmPackage rec { pname = "manta"; - inherit (source) version; + version = "5.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/${pname}/-/${source.filename}"; - hash = source.integrity; + src = fetchFromGitHub { + owner = "TritonDataCenter"; + repo = "node-manta"; + rev = "v${version}"; + hash = "sha256-C6O5yTCBABMsz2scot8v3IwPbdYvJyZbcPOLfeDXCoo="; }; - npmDepsHash = source.deps; + npmDepsHash = "sha256-4Zz9sSUXE2dXdkIka2z5bQ2pNmCXXCBS2Sr0JHQOBQw="; dontBuild = true; - nativeBuildInputs = [ nodejs installShellFiles ]; - - postPatch = '' - # Use generated package-lock.json as upstream does not provide one - ln -s ${./package-lock.json} package-lock.json - ''; + nativeBuildInputs = [ installShellFiles ]; postInstall = '' ln -s ./lib/node_modules/manta/bin $out/bin ''; postFixup = '' - # create completions, following upstream procedure https://github.com/joyent/node-manta/blob/v5.3.2/Makefile#L85-L91 + # create completions, following upstream procedure https://github.com/joyent/node-manta/blob/v5.4.1/Makefile#L85-L91 cmds=$(find ./bin/ -type f -printf "%f\n") node $out/lib/node_modules/manta/lib/create_client.js @@ -52,7 +45,6 @@ buildNpmPackage rec { tests.version = testers.testVersion { package = node-manta; }; - updateScript = ./update.sh; }; meta = with lib; { diff --git a/pkgs/tools/admin/manta/package-lock.json b/pkgs/tools/admin/manta/package-lock.json deleted file mode 100644 index 69665b044695e..0000000000000 --- a/pkgs/tools/admin/manta/package-lock.json +++ /dev/null @@ -1,3477 +0,0 @@ -{ - "name": "manta", - "version": "5.3.2", - "lockfileVersion": 3, - "requires": true, - "packages": { - "": { - "name": "manta", - "version": "5.3.2", - "license": "MIT", - "dependencies": { - "assert-plus": "^1.0.0", - "backoff": "~2.3.0", - "bunyan": "^1.8.1", - "clone": "~0.1.11", - "cmdln": "4.1.2", - "dashdash": "1.14.1", - "extsprintf": "^1.3.0", - "hogan.js": "~2.0.0", - "jsprim": "^1.3.0", - "lomstream": "^1.1.0", - "lstream": "~0.0.4", - "mime": "~2.4.4", - "moment": "^2.22.2", - "once": "~1.4.0", - "path-platform": "~0.0.1", - "progbar": "^1.2.1", - "readable-stream": "~1.1.9", - "restify-clients": "~1.6.0", - "showdown": "~1.9.1", - "smartdc-auth": "^2.4.1", - "strsplit": "1.0.0", - "tar": "~2.2.1", - "uuid": "~2.0.2", - "vasync": "^1.6.4", - "verror": "^1.6.1", - "watershed": "^0.3.1" - }, - "bin": { - "mchattr": "bin/mchattr", - "mchmod": "bin/mchmod", - "mfind": "bin/mfind", - "mget": "bin/mget", - "minfo": "bin/minfo", - "mjob": "bin/mjob", - "mln": "bin/mln", - "mlogin": "bin/mlogin", - "mls": "bin/mls", - "mmd5": "bin/mmd5", - "mmkdir": "bin/mmkdir", - "mmpu": "bin/mmpu", - "mput": "bin/mput", - "mrm": "bin/mrm", - "mrmdir": "bin/mrmdir", - "msign": "bin/msign", - "muntar": "bin/muntar" - }, - "devDependencies": { - "forkexec": "^1.0.0", - "semver": "^6.3.0", - "tap": "^12.7.0" - }, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/@babel/code-frame": { - "version": "7.21.4", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.21.4.tgz", - "integrity": "sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==", - "dev": true, - "dependencies": { - "@babel/highlight": "^7.18.6" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/generator": { - "version": "7.21.5", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.5.tgz", - "integrity": "sha512-SrKK/sRv8GesIW1bDagf9cCG38IOMYZusoe1dfg0D8aiUe3Amvoj1QtjTPAWcfrZFvIwlleLb0gxzQidL9w14w==", - "dev": true, - "dependencies": { - "@babel/types": "^7.21.5", - "@jridgewell/gen-mapping": "^0.3.2", - "@jridgewell/trace-mapping": "^0.3.17", - "jsesc": "^2.5.1" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-environment-visitor": { - "version": "7.21.5", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.21.5.tgz", - "integrity": "sha512-IYl4gZ3ETsWocUWgsFZLM5i1BYx9SoemminVEXadgLBa9TdeorzgLKm8wWLA6J1N/kT3Kch8XIk1laNzYoHKvQ==", - "dev": true, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-function-name": { - "version": "7.21.0", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz", - "integrity": "sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==", - "dev": true, - "dependencies": { - "@babel/template": "^7.20.7", - "@babel/types": "^7.21.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-hoist-variables": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz", - "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==", - "dev": true, - "dependencies": { - "@babel/types": "^7.18.6" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-split-export-declaration": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz", - "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==", - "dev": true, - "dependencies": { - "@babel/types": "^7.18.6" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-string-parser": { - "version": "7.21.5", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.21.5.tgz", - "integrity": "sha512-5pTUx3hAJaZIdW99sJ6ZUUgWq/Y+Hja7TowEnLNMm1VivRgZQL3vpBY3qUACVsvw+yQU6+YgfBVmcbLaZtrA1w==", - "dev": true, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-validator-identifier": { - "version": "7.19.1", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz", - "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==", - "dev": true, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/highlight": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz", - "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==", - "dev": true, - "dependencies": { - "@babel/helper-validator-identifier": "^7.18.6", - "chalk": "^2.0.0", - "js-tokens": "^4.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/parser": { - "version": "7.21.8", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.8.tgz", - "integrity": "sha512-6zavDGdzG3gUqAdWvlLFfk+36RilI+Pwyuuh7HItyeScCWP3k6i8vKclAQ0bM/0y/Kz/xiwvxhMv9MgTJP5gmA==", - "dev": true, - "bin": { - "parser": "bin/babel-parser.js" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@babel/template": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz", - "integrity": "sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.18.6", - "@babel/parser": "^7.20.7", - "@babel/types": "^7.20.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/traverse": { - "version": "7.21.5", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.5.tgz", - "integrity": "sha512-AhQoI3YjWi6u/y/ntv7k48mcrCXmus0t79J9qPNlk/lAsFlCiJ047RmbfMOawySTHtywXhbXgpx/8nXMYd+oFw==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.21.4", - "@babel/generator": "^7.21.5", - "@babel/helper-environment-visitor": "^7.21.5", - "@babel/helper-function-name": "^7.21.0", - "@babel/helper-hoist-variables": "^7.18.6", - "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/parser": "^7.21.5", - "@babel/types": "^7.21.5", - "debug": "^4.1.0", - "globals": "^11.1.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/types": { - "version": "7.21.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.5.tgz", - "integrity": "sha512-m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q==", - "dev": true, - "dependencies": { - "@babel/helper-string-parser": "^7.21.5", - "@babel/helper-validator-identifier": "^7.19.1", - "to-fast-properties": "^2.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@jridgewell/gen-mapping": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", - "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==", - "dev": true, - "dependencies": { - "@jridgewell/set-array": "^1.0.1", - "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.9" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/resolve-uri": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", - "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==", - "dev": true, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/set-array": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", - "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", - "dev": true, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.4.15", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", - "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==", - "dev": true - }, - "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.18", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz", - "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==", - "dev": true, - "dependencies": { - "@jridgewell/resolve-uri": "3.1.0", - "@jridgewell/sourcemap-codec": "1.4.14" - } - }, - "node_modules/@jridgewell/trace-mapping/node_modules/@jridgewell/sourcemap-codec": { - "version": "1.4.14", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", - "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==", - "dev": true - }, - "node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dependencies": { - "color-convert": "^1.9.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/append-transform": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-1.0.0.tgz", - "integrity": "sha512-P009oYkeHyU742iSZJzZZywj4QRJdnTWffaKuJQLablCZ1uz6/cW4yaRgcDaoQ+uwOxxnt0gRUcwfsNP2ri0gw==", - "dev": true, - "dependencies": { - "default-require-extensions": "^2.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/archy": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", - "integrity": "sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==", - "dev": true - }, - "node_modules/arg": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", - "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", - "dev": true - }, - "node_modules/argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, - "dependencies": { - "sprintf-js": "~1.0.2" - } - }, - "node_modules/asn1": { - "version": "0.2.6", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz", - "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==", - "dependencies": { - "safer-buffer": "~2.1.0" - } - }, - "node_modules/assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==", - "engines": { - "node": ">=0.8" - } - }, - "node_modules/asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", - "dev": true - }, - "node_modules/aws-sign2": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", - "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/aws4": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz", - "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==", - "dev": true - }, - "node_modules/backoff": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/backoff/-/backoff-2.3.0.tgz", - "integrity": "sha512-ljr33cUQ/vyXE/60QuRO+WKGW4PzQ5OTWNXPWQwOTx5gh43q0pZocaVyXoU2gvFtasMIdIohdm9s01qoT6IJBQ==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" - }, - "node_modules/bcrypt-pbkdf": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", - "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==", - "dependencies": { - "tweetnacl": "^0.14.3" - } - }, - "node_modules/bind-obj-methods": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/bind-obj-methods/-/bind-obj-methods-2.0.2.tgz", - "integrity": "sha512-bUkRdEOppT1Xg/jG0+bp0JSjUD9U0r7skxb/42WeBUjfBpW6COQTIgQmKX5J2Z3aMXcORKgN2N+d7IQwTK3pag==", - "dev": true - }, - "node_modules/block-stream": { - "version": "0.0.9", - "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", - "integrity": "sha512-OorbnJVPII4DuUKbjARAe8u8EfqOmkEEaSFIyoQ7OjTHn6kafxWl0wLgoZ2rXaYd7MyLcDaU4TmhfxtwgcccMQ==", - "dependencies": { - "inherits": "~2.0.0" - }, - "engines": { - "node": "0.4 || >=0.5.8" - } - }, - "node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/browser-process-hrtime": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz", - "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==", - "dev": true - }, - "node_modules/buffer-from": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", - "dev": true - }, - "node_modules/bunyan": { - "version": "1.8.15", - "resolved": "https://registry.npmjs.org/bunyan/-/bunyan-1.8.15.tgz", - "integrity": "sha512-0tECWShh6wUysgucJcBAoYegf3JJoZWibxdqhTm7OHPeT42qdjkZ29QCMcKwbgU1kiH+auSIasNRXMLWXafXig==", - "engines": [ - "node >=0.10.0" - ], - "bin": { - "bunyan": "bin/bunyan" - }, - "optionalDependencies": { - "dtrace-provider": "~0.8", - "moment": "^2.19.3", - "mv": "~2", - "safe-json-stringify": "~1" - } - }, - "node_modules/caching-transform": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-3.0.2.tgz", - "integrity": "sha512-Mtgcv3lh3U0zRii/6qVgQODdPA4G3zhG+jtbCWj39RXuUFTMzH0vcdMtaJS1jPowd+It2Pqr6y3NJMQqOqCE2w==", - "dev": true, - "dependencies": { - "hasha": "^3.0.0", - "make-dir": "^2.0.0", - "package-hash": "^3.0.0", - "write-file-atomic": "^2.4.2" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "engines": { - "node": ">=6" - } - }, - "node_modules/capture-stack-trace": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.2.tgz", - "integrity": "sha512-X/WM2UQs6VMHUtjUDnZTRI+i1crWteJySFzr9UpGoQa4WQffXVTTXuekjl7TjZRlcF2XfjgITT0HxZ9RnxeT0w==", - "dev": true, - "engines": { - "node": ">=0.10.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/caseless": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==", - "dev": true - }, - "node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/clean-yaml-object": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/clean-yaml-object/-/clean-yaml-object-0.1.0.tgz", - "integrity": "sha512-3yONmlN9CSAkzNwnRCiJQ7Q2xK5mWuEfL3PuTZcAUzhObbXsfsnMptJzXwz93nc5zn9V9TwCVMmV7w4xsm43dw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/cliui": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", - "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", - "dependencies": { - "string-width": "^3.1.0", - "strip-ansi": "^5.2.0", - "wrap-ansi": "^5.1.0" - } - }, - "node_modules/cliui/node_modules/ansi-regex": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", - "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==", - "engines": { - "node": ">=6" - } - }, - "node_modules/cliui/node_modules/strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dependencies": { - "ansi-regex": "^4.1.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/clone": { - "version": "0.1.19", - "resolved": "https://registry.npmjs.org/clone/-/clone-0.1.19.tgz", - "integrity": "sha512-IO78I0y6JcSpEPHzK4obKdsL7E7oLdRVDVOLwr2Hkbjsb+Eoz0dxW6tef0WizoKu0gLC4oZSZuEF4U2K6w1WQw==", - "engines": { - "node": "*" - } - }, - "node_modules/cmdln": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/cmdln/-/cmdln-4.1.2.tgz", - "integrity": "sha512-pOVvOB8UoEwVY1by82y9RL2756NZbqd7qxmhP7PqOLFnA9HsoS+MxoaOKg39d/42/VVY5r+9BP4asl3+VBDVMw==", - "engines": [ - "node >=0.8.0" - ], - "dependencies": { - "assert-plus": "^1.0.0", - "dashdash": "^1.14.1", - "extsprintf": "^1.2.0", - "fuzzyset.js": "^0.0.1", - "verror": "^1.6.0" - } - }, - "node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==" - }, - "node_modules/color-support": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", - "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", - "dev": true, - "bin": { - "color-support": "bin.js" - } - }, - "node_modules/combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dev": true, - "dependencies": { - "delayed-stream": "~1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/commondir": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", - "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==", - "dev": true - }, - "node_modules/concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" - }, - "node_modules/convert-source-map": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", - "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", - "dev": true - }, - "node_modules/core-util-is": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", - "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==" - }, - "node_modules/coveralls": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/coveralls/-/coveralls-3.1.1.tgz", - "integrity": "sha512-+dxnG2NHncSD1NrqbSM3dn/lE57O6Qf/koe9+I7c+wzkqRmEvcp0kgJdxKInzYzkICKkFMZsX3Vct3++tsF9ww==", - "dev": true, - "dependencies": { - "js-yaml": "^3.13.1", - "lcov-parse": "^1.0.0", - "log-driver": "^1.2.7", - "minimist": "^1.2.5", - "request": "^2.88.2" - }, - "bin": { - "coveralls": "bin/coveralls.js" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/cp-file": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/cp-file/-/cp-file-6.2.0.tgz", - "integrity": "sha512-fmvV4caBnofhPe8kOcitBwSn2f39QLjnAnGq3gO9dfd75mUytzKNZB1hde6QHunW2Rt+OwuBOMc3i1tNElbszA==", - "dev": true, - "dependencies": { - "graceful-fs": "^4.1.2", - "make-dir": "^2.0.0", - "nested-error-stacks": "^2.0.0", - "pify": "^4.0.1", - "safe-buffer": "^5.0.1" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/cross-spawn": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz", - "integrity": "sha512-yAXz/pA1tD8Gtg2S98Ekf/sewp3Lcp3YoFKJ4Hkp5h5yLWnKVTDU0kwjKJ8NDCYcfTLfyGkzTikst+jWypT1iA==", - "dev": true, - "dependencies": { - "lru-cache": "^4.0.1", - "which": "^1.2.9" - } - }, - "node_modules/dashdash": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", - "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==", - "dependencies": { - "assert-plus": "^1.0.0" - }, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/default-require-extensions": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-2.0.0.tgz", - "integrity": "sha512-B0n2zDIXpzLzKeoEozorDSa1cHc1t0NjmxP0zuAxbizNU2MBqYJJKYXrrFdKuQliojXynrxgd7l4ahfg/+aA5g==", - "dev": true, - "dependencies": { - "strip-bom": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", - "dev": true, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/diff": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz", - "integrity": "sha512-VzVc42hMZbYU9Sx/ltb7KYuQ6pqAw+cbFWVy4XKdkuEL2CFaRLGEnISPs7YdzaUGpi+CpIqvRmu7hPQ4T7EQ5w==", - "dev": true, - "engines": { - "node": ">=0.3.1" - } - }, - "node_modules/domain-browser": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz", - "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==", - "dev": true, - "engines": { - "node": ">=0.4", - "npm": ">=1.2" - } - }, - "node_modules/dtrace-provider": { - "version": "0.8.8", - "resolved": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.8.tgz", - "integrity": "sha512-b7Z7cNtHPhH9EJhNNbbeqTcXB8LGFFZhq1PGgEvpeHlzd36bhbdTWoE/Ba/YguqpBSlAPKnARWhVlhunCMwfxg==", - "hasInstallScript": true, - "dependencies": { - "nan": "^2.14.0" - }, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/ecc-jsbn": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", - "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==", - "dependencies": { - "jsbn": "~0.1.0", - "safer-buffer": "^2.1.0" - } - }, - "node_modules/emoji-regex": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==" - }, - "node_modules/error-ex": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", - "dev": true, - "dependencies": { - "is-arrayish": "^0.2.1" - } - }, - "node_modules/es6-error": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", - "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==", - "dev": true - }, - "node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "dev": true, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/esm": { - "version": "3.2.25", - "resolved": "https://registry.npmjs.org/esm/-/esm-3.2.25.tgz", - "integrity": "sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true, - "bin": { - "esparse": "bin/esparse.js", - "esvalidate": "bin/esvalidate.js" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/events-to-array": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/events-to-array/-/events-to-array-1.1.2.tgz", - "integrity": "sha512-inRWzRY7nG+aXZxBzEqYKB3HPgwflZRopAjDCHv0whhRx+MTUr1ei0ICZUypdyE0HRm4L2d5VEcIqLD6yl+BFA==", - "dev": true - }, - "node_modules/extend": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", - "dev": true - }, - "node_modules/extsprintf": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.1.tgz", - "integrity": "sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==", - "engines": [ - "node >=0.6.0" - ] - }, - "node_modules/fast-deep-equal": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true - }, - "node_modules/fast-json-stable-stringify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true - }, - "node_modules/fast-safe-stringify": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-1.2.3.tgz", - "integrity": "sha512-QJYT/i0QYoiZBQ71ivxdyTqkwKkQ0oxACXHYxH2zYHJEgzi2LsbjgvtzTbLi1SZcF190Db2YP7I7eTsU2egOlw==" - }, - "node_modules/find-cache-dir": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz", - "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==", - "dev": true, - "dependencies": { - "commondir": "^1.0.1", - "make-dir": "^2.0.0", - "pkg-dir": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "dependencies": { - "locate-path": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/foreground-child": { - "version": "1.5.6", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-1.5.6.tgz", - "integrity": "sha512-3TOY+4TKV0Ml83PXJQY+JFQaHNV38lzQDIzzXYg1kWdBLenGgoZhAs0CKgzI31vi2pWEpQMq/Yi4bpKwCPkw7g==", - "dev": true, - "dependencies": { - "cross-spawn": "^4", - "signal-exit": "^3.0.0" - } - }, - "node_modules/forever-agent": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", - "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/forkexec": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/forkexec/-/forkexec-1.1.1.tgz", - "integrity": "sha512-HB4TyHa5EXf73bfCM4E71SZKtckL5L9OsltwXBjJvyK2+cM7CSyIOlWIBrYkHacjpeNvWsMntRAgbKLti4/qcA==", - "dev": true, - "dependencies": { - "assert-plus": "^1.0.0", - "verror": "^1.6.0" - } - }, - "node_modules/form-data": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", - "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", - "dev": true, - "dependencies": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.6", - "mime-types": "^2.1.12" - }, - "engines": { - "node": ">= 0.12" - } - }, - "node_modules/fs-exists-cached": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs-exists-cached/-/fs-exists-cached-1.0.0.tgz", - "integrity": "sha512-kSxoARUDn4F2RPXX48UXnaFKwVU7Ivd/6qpzZL29MCDmr9sTvybv4gFCp+qaI4fM9m0z9fgz/yJvi56GAz+BZg==", - "dev": true - }, - "node_modules/fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "dev": true - }, - "node_modules/fstream": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz", - "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==", - "dependencies": { - "graceful-fs": "^4.1.2", - "inherits": "~2.0.0", - "mkdirp": ">=0.5 0", - "rimraf": "2" - }, - "engines": { - "node": ">=0.6" - } - }, - "node_modules/function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true - }, - "node_modules/function-loop": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/function-loop/-/function-loop-1.0.2.tgz", - "integrity": "sha512-Iw4MzMfS3udk/rqxTiDDCllhGwlOrsr50zViTOO/W6lS/9y6B1J0BD2VZzrnWUYBJsl3aeqjgR5v7bWWhZSYbA==", - "dev": true - }, - "node_modules/fuzzyset.js": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/fuzzyset.js/-/fuzzyset.js-0.0.1.tgz", - "integrity": "sha512-/FAzX0w4Zd4PaVMM06wSJfDfdkYmIqZs4c6iCUc2icEL8nz6VJqyqlCy6InPZInjf6HadfhkFxYd2a0RDZ3Htg==", - "engines": { - "node": ">= 0.4.0" - } - }, - "node_modules/get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "engines": { - "node": "6.* || 8.* || >= 10.*" - } - }, - "node_modules/getpass": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", - "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==", - "dependencies": { - "assert-plus": "^1.0.0" - } - }, - "node_modules/glob": { - "version": "6.0.4", - "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", - "integrity": "sha512-MKZeRNyYZAVVVG1oZeLaWie1uweH40m9AZwIwxyPbTSX4hHrVYSzLg0Ro5Z5R7XKkIX+Cc6oD1rqeDJnwsB8/A==", - "dependencies": { - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "2 || 3", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - } - }, - "node_modules/globals": { - "version": "11.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", - "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/graceful-fs": { - "version": "4.2.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", - "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==" - }, - "node_modules/har-schema": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", - "integrity": "sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/har-validator": { - "version": "5.1.5", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", - "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", - "deprecated": "this library is no longer supported", - "dev": true, - "dependencies": { - "ajv": "^6.12.3", - "har-schema": "^2.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, - "dependencies": { - "function-bind": "^1.1.1" - }, - "engines": { - "node": ">= 0.4.0" - } - }, - "node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/hasha": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/hasha/-/hasha-3.0.0.tgz", - "integrity": "sha512-w0Kz8lJFBoyaurBiNrIvxPqr/gJ6fOfSkpAPOepN3oECqGJag37xPbOv57izi/KP8auHgNYxn5fXtAb+1LsJ6w==", - "dev": true, - "dependencies": { - "is-stream": "^1.0.1" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/hogan.js": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/hogan.js/-/hogan.js-2.0.0.tgz", - "integrity": "sha512-urTqVvefaiu6ZqpIVQklkbu6tuqUQSv0pfgnG02ibeAC4ZFG0Rj2uDjH45eUcIEyLFjPsh1mxgeqd9BYldWrgg==", - "bin": { - "hulk": "bin/hulk" - }, - "engines": { - "node": "*" - } - }, - "node_modules/hosted-git-info": { - "version": "2.8.9", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", - "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", - "dev": true - }, - "node_modules/html-escaper": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", - "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", - "dev": true - }, - "node_modules/http-signature": { - "version": "1.3.6", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.3.6.tgz", - "integrity": "sha512-3adrsD6zqo4GsTqtO7FyrejHNv+NgiIfAfv68+jVlFmSr9OGy7zrxONceFRLKvnnZA5jbxQBX1u9PpB6Wi32Gw==", - "dependencies": { - "assert-plus": "^1.0.0", - "jsprim": "^2.0.2", - "sshpk": "^1.14.1" - }, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/http-signature/node_modules/core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==" - }, - "node_modules/http-signature/node_modules/extsprintf": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", - "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==", - "engines": [ - "node >=0.6.0" - ] - }, - "node_modules/http-signature/node_modules/jsprim": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-2.0.2.tgz", - "integrity": "sha512-gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ==", - "engines": [ - "node >=0.6.0" - ], - "dependencies": { - "assert-plus": "1.0.0", - "extsprintf": "1.3.0", - "json-schema": "0.4.0", - "verror": "1.10.0" - } - }, - "node_modules/http-signature/node_modules/verror": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", - "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==", - "engines": [ - "node >=0.6.0" - ], - "dependencies": { - "assert-plus": "^1.0.0", - "core-util-is": "1.0.2", - "extsprintf": "^1.2.0" - } - }, - "node_modules/imurmurhash": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", - "dev": true, - "engines": { - "node": ">=0.8.19" - } - }, - "node_modules/inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "dependencies": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "node_modules/inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" - }, - "node_modules/is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", - "dev": true - }, - "node_modules/is-core-module": { - "version": "2.12.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.0.tgz", - "integrity": "sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ==", - "dev": true, - "dependencies": { - "has": "^1.0.3" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==", - "engines": { - "node": ">=4" - } - }, - "node_modules/is-stream": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", - "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-typedarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==", - "dev": true - }, - "node_modules/isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==" - }, - "node_modules/isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", - "dev": true - }, - "node_modules/isstream": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==", - "dev": true - }, - "node_modules/istanbul-lib-coverage": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz", - "integrity": "sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/istanbul-lib-hook": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-2.0.7.tgz", - "integrity": "sha512-vrRztU9VRRFDyC+aklfLoeXyNdTfga2EI3udDGn4cZ6fpSXpHLV9X6CHvfoMCPtggg8zvDDmC4b9xfu0z6/llA==", - "dev": true, - "dependencies": { - "append-transform": "^1.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/istanbul-lib-instrument": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz", - "integrity": "sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA==", - "dev": true, - "dependencies": { - "@babel/generator": "^7.4.0", - "@babel/parser": "^7.4.3", - "@babel/template": "^7.4.0", - "@babel/traverse": "^7.4.3", - "@babel/types": "^7.4.0", - "istanbul-lib-coverage": "^2.0.5", - "semver": "^6.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/istanbul-lib-report": { - "version": "2.0.8", - "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz", - "integrity": "sha512-fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ==", - "dev": true, - "dependencies": { - "istanbul-lib-coverage": "^2.0.5", - "make-dir": "^2.1.0", - "supports-color": "^6.1.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/istanbul-lib-report/node_modules/supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "dev": true, - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/istanbul-lib-source-maps": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz", - "integrity": "sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==", - "dev": true, - "dependencies": { - "debug": "^4.1.1", - "istanbul-lib-coverage": "^2.0.5", - "make-dir": "^2.1.0", - "rimraf": "^2.6.3", - "source-map": "^0.6.1" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/istanbul-lib-source-maps/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/istanbul-lib-source-maps/node_modules/rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "dev": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - } - }, - "node_modules/istanbul-reports": { - "version": "2.2.7", - "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.2.7.tgz", - "integrity": "sha512-uu1F/L1o5Y6LzPVSVZXNOoD/KXpJue9aeLRd0sM9uMXfZvzomB0WxVamWb5ue8kA2vVWEmW7EG+A5n3f1kqHKg==", - "dev": true, - "dependencies": { - "html-escaper": "^2.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true - }, - "node_modules/js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", - "dev": true, - "dependencies": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/jsbn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==" - }, - "node_modules/jsesc": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", - "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", - "dev": true, - "bin": { - "jsesc": "bin/jsesc" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/json-parse-better-errors": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", - "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", - "dev": true - }, - "node_modules/json-schema": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz", - "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==" - }, - "node_modules/json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - }, - "node_modules/json-stringify-safe": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==", - "dev": true - }, - "node_modules/jsprim": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz", - "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==", - "dependencies": { - "assert-plus": "1.0.0", - "extsprintf": "1.3.0", - "json-schema": "0.4.0", - "verror": "1.10.0" - }, - "engines": { - "node": ">=0.6.0" - } - }, - "node_modules/jsprim/node_modules/core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==" - }, - "node_modules/jsprim/node_modules/extsprintf": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", - "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==", - "engines": [ - "node >=0.6.0" - ] - }, - "node_modules/jsprim/node_modules/verror": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", - "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==", - "engines": [ - "node >=0.6.0" - ], - "dependencies": { - "assert-plus": "^1.0.0", - "core-util-is": "1.0.2", - "extsprintf": "^1.2.0" - } - }, - "node_modules/keep-alive-agent": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/keep-alive-agent/-/keep-alive-agent-0.0.1.tgz", - "integrity": "sha512-fF6aj9/XFwJiE/4zihw/ZdXg+KeyU4nFvmutF+PkAVadSGqP298+Zm6IzWFzgeDBgvLk3o8boBxNtd1g5Kdjfg==" - }, - "node_modules/lcov-parse": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/lcov-parse/-/lcov-parse-1.0.0.tgz", - "integrity": "sha512-aprLII/vPzuQvYZnDRU78Fns9I2Ag3gi4Ipga/hxnVMCZC8DnR2nI7XBqrPoywGfxqIx/DgarGvDJZAD3YBTgQ==", - "dev": true, - "bin": { - "lcov-parse": "bin/cli.js" - } - }, - "node_modules/load-json-file": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz", - "integrity": "sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==", - "dev": true, - "dependencies": { - "graceful-fs": "^4.1.2", - "parse-json": "^4.0.0", - "pify": "^3.0.0", - "strip-bom": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/load-json-file/node_modules/pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "dependencies": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" - }, - "node_modules/lodash.flattendeep": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz", - "integrity": "sha512-uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ==", - "dev": true - }, - "node_modules/log-driver": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.7.tgz", - "integrity": "sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg==", - "dev": true, - "engines": { - "node": ">=0.8.6" - } - }, - "node_modules/lomstream": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/lomstream/-/lomstream-1.1.1.tgz", - "integrity": "sha512-G2UKFT23/uueUnpUWYwB+uOlqcLvF6r1vNsMgTR6roJPpvpFQkgG75bkpAy/XYvaLpGs8XSgS24CUKC92Ap+jg==", - "dependencies": { - "assert-plus": "0.1.5", - "extsprintf": "1.3.0", - "vstream": "0.1.0" - } - }, - "node_modules/lomstream/node_modules/assert-plus": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz", - "integrity": "sha512-brU24g7ryhRwGCI2y+1dGQmQXiZF7TtIj583S96y0jjdajIe6wn8BuXyELYhvD22dtIxDQVFk04YTJwwdwOYJw==", - "engines": { - "node": ">=0.8" - } - }, - "node_modules/lomstream/node_modules/extsprintf": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", - "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==", - "engines": [ - "node >=0.6.0" - ] - }, - "node_modules/lru-cache": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", - "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", - "dependencies": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" - } - }, - "node_modules/lstream": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/lstream/-/lstream-0.0.4.tgz", - "integrity": "sha512-usI61rjXiD5YoITGpWxUGe/AjYEwpKlQISNDgQ3D3DrWDcdX4A5Pu1xrmh7E1r65I/snMj9tpqRJgJRktOb00Q==", - "dependencies": { - "readable-stream": ">= 1.0.2" - }, - "engines": { - "node": ">= 0.10.0" - } - }, - "node_modules/make-dir": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", - "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", - "dev": true, - "dependencies": { - "pify": "^4.0.1", - "semver": "^5.6.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/make-dir/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true, - "bin": { - "semver": "bin/semver" - } - }, - "node_modules/make-error": { - "version": "1.3.6", - "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", - "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", - "dev": true - }, - "node_modules/merge-source-map": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz", - "integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==", - "dev": true, - "dependencies": { - "source-map": "^0.6.1" - } - }, - "node_modules/mime": { - "version": "2.4.7", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.7.tgz", - "integrity": "sha512-dhNd1uA2u397uQk3Nv5LM4lm93WYDUXFn3Fu291FJerns4jyTudqhIWe4W04YLy7Uk1tm1Ore04NpjRvQp/NPA==", - "bin": { - "mime": "cli.js" - }, - "engines": { - "node": ">=4.0.0" - } - }, - "node_modules/mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "dev": true, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "dev": true, - "dependencies": { - "mime-db": "1.52.0" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/minimist": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", - "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/minipass": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz", - "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==", - "dev": true, - "dependencies": { - "safe-buffer": "^5.1.2", - "yallist": "^3.0.0" - } - }, - "node_modules/minipass/node_modules/yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", - "dev": true - }, - "node_modules/mkdirp": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", - "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", - "dependencies": { - "minimist": "^1.2.6" - }, - "bin": { - "mkdirp": "bin/cmd.js" - } - }, - "node_modules/moment": { - "version": "2.29.4", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz", - "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==", - "engines": { - "node": "*" - } - }, - "node_modules/mooremachine": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/mooremachine/-/mooremachine-2.3.0.tgz", - "integrity": "sha512-IrhznRheWtDcT/TEL3cqaT4UJOqc5G3K8TnGq29PRXZil+sWGPkcM6SHVUZVirTKFKceuCadfyDMjmRoXCN21A==", - "dependencies": { - "assert-plus": ">=0.2.0 <0.3.0" - }, - "engines": { - "node": ">=0.8.0" - }, - "optionalDependencies": { - "dtrace-provider": "~0.8" - } - }, - "node_modules/mooremachine/node_modules/assert-plus": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz", - "integrity": "sha512-u1L0ZLywRziOVjUhRxI0Qg9G+4RnFB9H/Rq40YWn0dieDgO7vAYeJz6jKAO6t/aruzlDFLAPkQTT87e+f8Imaw==", - "engines": { - "node": ">=0.8" - } - }, - "node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, - "node_modules/mv": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz", - "integrity": "sha512-at/ZndSy3xEGJ8i0ygALh8ru9qy7gWW1cmkaqBN29JmMlIvM//MEO9y1sk/avxuwnPcfhkejkLsuPxH81BrkSg==", - "optional": true, - "dependencies": { - "mkdirp": "~0.5.1", - "ncp": "~2.0.0", - "rimraf": "~2.4.0" - }, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/nan": { - "version": "2.17.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz", - "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==" - }, - "node_modules/ncp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz", - "integrity": "sha512-zIdGUrPRFTUELUvr3Gmc7KZ2Sw/h1PiVM0Af/oHB6zgnV1ikqSfRk+TOufi79aHYCW3NiOXmr1BP5nWbzojLaA==", - "optional": true, - "bin": { - "ncp": "bin/ncp" - } - }, - "node_modules/nested-error-stacks": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-2.1.1.tgz", - "integrity": "sha512-9iN1ka/9zmX1ZvLV9ewJYEk9h7RyRRtqdK0woXcqohu8EWIerfPUjYJPg0ULy0UqP7cslmdGc8xKDJcojlKiaw==", - "dev": true - }, - "node_modules/normalize-package-data": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", - "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", - "dev": true, - "dependencies": { - "hosted-git-info": "^2.1.4", - "resolve": "^1.10.0", - "semver": "2 || 3 || 4 || 5", - "validate-npm-package-license": "^3.0.1" - } - }, - "node_modules/normalize-package-data/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true, - "bin": { - "semver": "bin/semver" - } - }, - "node_modules/nyc": { - "version": "14.1.1", - "resolved": "https://registry.npmjs.org/nyc/-/nyc-14.1.1.tgz", - "integrity": "sha512-OI0vm6ZGUnoGZv/tLdZ2esSVzDwUC88SNs+6JoSOMVxA+gKMB8Tk7jBwgemLx4O40lhhvZCVw1C+OYLOBOPXWw==", - "dev": true, - "dependencies": { - "archy": "^1.0.0", - "caching-transform": "^3.0.2", - "convert-source-map": "^1.6.0", - "cp-file": "^6.2.0", - "find-cache-dir": "^2.1.0", - "find-up": "^3.0.0", - "foreground-child": "^1.5.6", - "glob": "^7.1.3", - "istanbul-lib-coverage": "^2.0.5", - "istanbul-lib-hook": "^2.0.7", - "istanbul-lib-instrument": "^3.3.0", - "istanbul-lib-report": "^2.0.8", - "istanbul-lib-source-maps": "^3.0.6", - "istanbul-reports": "^2.2.4", - "js-yaml": "^3.13.1", - "make-dir": "^2.1.0", - "merge-source-map": "^1.1.0", - "resolve-from": "^4.0.0", - "rimraf": "^2.6.3", - "signal-exit": "^3.0.2", - "spawn-wrap": "^1.4.2", - "test-exclude": "^5.2.3", - "uuid": "^3.3.2", - "yargs": "^13.2.2", - "yargs-parser": "^13.0.0" - }, - "bin": { - "nyc": "bin/nyc.js" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/nyc/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/nyc/node_modules/rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "dev": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - } - }, - "node_modules/nyc/node_modules/uuid": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", - "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.", - "dev": true, - "bin": { - "uuid": "bin/uuid" - } - }, - "node_modules/nyc/node_modules/yargs": { - "version": "13.3.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", - "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", - "dev": true, - "dependencies": { - "cliui": "^5.0.0", - "find-up": "^3.0.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^3.0.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^13.1.2" - } - }, - "node_modules/oauth-sign": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", - "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "dependencies": { - "wrappy": "1" - } - }, - "node_modules/opener": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz", - "integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==", - "dev": true, - "bin": { - "opener": "bin/opener-bin.js" - } - }, - "node_modules/os-homedir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", - "integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/own-or": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/own-or/-/own-or-1.0.0.tgz", - "integrity": "sha512-NfZr5+Tdf6MB8UI9GLvKRs4cXY8/yB0w3xtt84xFdWy8hkGjn+JFc60VhzS/hFRfbyxFcGYMTjnF4Me+RbbqrA==", - "dev": true - }, - "node_modules/own-or-env": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/own-or-env/-/own-or-env-1.0.2.tgz", - "integrity": "sha512-NQ7v0fliWtK7Lkb+WdFqe6ky9XAzYmlkXthQrBbzlYbmFKoAYbDDcwmOm6q8kOuwSRXW8bdL5ORksploUJmWgw==", - "dev": true, - "dependencies": { - "own-or": "^1.0.0" - } - }, - "node_modules/p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dependencies": { - "p-try": "^2.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", - "dependencies": { - "p-limit": "^2.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "engines": { - "node": ">=6" - } - }, - "node_modules/package-hash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/package-hash/-/package-hash-3.0.0.tgz", - "integrity": "sha512-lOtmukMDVvtkL84rJHI7dpTYq+0rli8N2wlnqUcBuDWCfVhRUfOmnR9SsoHFMLpACvEV60dX7rd0rFaYDZI+FA==", - "dev": true, - "dependencies": { - "graceful-fs": "^4.1.15", - "hasha": "^3.0.0", - "lodash.flattendeep": "^4.4.0", - "release-zalgo": "^1.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==", - "dev": true, - "dependencies": { - "error-ex": "^1.3.1", - "json-parse-better-errors": "^1.0.1" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==", - "engines": { - "node": ">=4" - } - }, - "node_modules/path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/path-parse": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", - "dev": true - }, - "node_modules/path-platform": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/path-platform/-/path-platform-0.0.1.tgz", - "integrity": "sha512-ydK1VKZFYwy0mT2JvimJfxt5z6Z6sjBbLfsFMoJczbwZ/ul0AjgpXLHinUzclf4/XYC8mtsWGuFERZ95Rnm8wA==", - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/path-type": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", - "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", - "dev": true, - "dependencies": { - "pify": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/path-type/node_modules/pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/performance-now": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", - "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==", - "dev": true - }, - "node_modules/pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/pkg-dir": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz", - "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==", - "dev": true, - "dependencies": { - "find-up": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/precond": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/precond/-/precond-0.2.3.tgz", - "integrity": "sha512-QCYG84SgGyGzqJ/vlMsxeXd/pgL/I94ixdNFyh1PusWmTCyVfPJjZ1K1jvHtsbfnXQs2TSkEP2fR7QiMZAnKFQ==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/process-nextick-args": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" - }, - "node_modules/progbar": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/progbar/-/progbar-1.2.1.tgz", - "integrity": "sha512-iEb0ZXmdQ24Pphdwa8+LbH75hMpuCMlPnsFUa3zHzDQj4kq4q72VGuD2pe3nwauKjxKgq3U0M9tCoLes6ISltw==", - "dependencies": { - "assert-plus": "^1.0.0", - "extsprintf": "^1.4.0", - "readable-stream": "~1.0.27-1" - } - }, - "node_modules/progbar/node_modules/readable-stream": { - "version": "1.0.34", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", - "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==", - "dependencies": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "0.0.1", - "string_decoder": "~0.10.x" - } - }, - "node_modules/pseudomap": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", - "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==" - }, - "node_modules/psl": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz", - "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==", - "dev": true - }, - "node_modules/punycode": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", - "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/qs": { - "version": "6.5.3", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz", - "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==", - "dev": true, - "engines": { - "node": ">=0.6" - } - }, - "node_modules/read-pkg": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz", - "integrity": "sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA==", - "dev": true, - "dependencies": { - "load-json-file": "^4.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/read-pkg-up": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-4.0.0.tgz", - "integrity": "sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==", - "dev": true, - "dependencies": { - "find-up": "^3.0.0", - "read-pkg": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/readable-stream": { - "version": "1.1.14", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", - "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==", - "dependencies": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "0.0.1", - "string_decoder": "~0.10.x" - } - }, - "node_modules/release-zalgo": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/release-zalgo/-/release-zalgo-1.0.0.tgz", - "integrity": "sha512-gUAyHVHPPC5wdqX/LG4LWtRYtgjxyX78oanFNTMMyFEfOqdC54s3eE82imuWKbOeqYht2CrNf64Qb8vgmmtZGA==", - "dev": true, - "dependencies": { - "es6-error": "^4.0.1" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/request": { - "version": "2.88.2", - "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", - "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", - "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142", - "dev": true, - "dependencies": { - "aws-sign2": "~0.7.0", - "aws4": "^1.8.0", - "caseless": "~0.12.0", - "combined-stream": "~1.0.6", - "extend": "~3.0.2", - "forever-agent": "~0.6.1", - "form-data": "~2.3.2", - "har-validator": "~5.1.3", - "http-signature": "~1.2.0", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.19", - "oauth-sign": "~0.9.0", - "performance-now": "^2.1.0", - "qs": "~6.5.2", - "safe-buffer": "^5.1.2", - "tough-cookie": "~2.5.0", - "tunnel-agent": "^0.6.0", - "uuid": "^3.3.2" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/request/node_modules/http-signature": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", - "integrity": "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==", - "dev": true, - "dependencies": { - "assert-plus": "^1.0.0", - "jsprim": "^1.2.2", - "sshpk": "^1.7.0" - }, - "engines": { - "node": ">=0.8", - "npm": ">=1.3.7" - } - }, - "node_modules/request/node_modules/uuid": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", - "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.", - "dev": true, - "bin": { - "uuid": "bin/uuid" - } - }, - "node_modules/require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/require-main-filename": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", - "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==" - }, - "node_modules/resolve": { - "version": "1.22.2", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz", - "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==", - "dev": true, - "dependencies": { - "is-core-module": "^2.11.0", - "path-parse": "^1.0.7", - "supports-preserve-symlinks-flag": "^1.0.0" - }, - "bin": { - "resolve": "bin/resolve" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/restify-clients": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/restify-clients/-/restify-clients-1.6.0.tgz", - "integrity": "sha512-q5kF/KHkwC10PhEjZkgQnWCIVCq5rlKF+fbqjl51e28ArkztJNI5czFzwCd/4Qz3HRrfwidk1XcAKLxY75dT6w==", - "dependencies": { - "assert-plus": "^1.0.0", - "backoff": "^2.4.1", - "bunyan": "^1.8.3", - "fast-safe-stringify": "^1.1.3", - "keep-alive-agent": "0.0.1", - "lodash": "^4.7.0", - "lru-cache": "^4.0.1", - "mime": "^1.3.4", - "once": "^1.3.2", - "restify-errors": "^3.1.0", - "semver": "^5.0.1", - "tunnel-agent": "^0.6.0", - "uuid": "^3.0.1" - }, - "optionalDependencies": { - "dtrace-provider": "^0.8.3" - } - }, - "node_modules/restify-clients/node_modules/backoff": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/backoff/-/backoff-2.5.0.tgz", - "integrity": "sha512-wC5ihrnUXmR2douXmXLCe5O3zg3GKIyvRi/hi58a/XyRxVI+3/yM0PYueQOZXPXQ9pxBislYkw+sF9b7C/RuMA==", - "dependencies": { - "precond": "0.2" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/restify-clients/node_modules/mime": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", - "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", - "bin": { - "mime": "cli.js" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/restify-clients/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "bin": { - "semver": "bin/semver" - } - }, - "node_modules/restify-clients/node_modules/uuid": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", - "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.", - "bin": { - "uuid": "bin/uuid" - } - }, - "node_modules/restify-errors": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/restify-errors/-/restify-errors-3.1.0.tgz", - "integrity": "sha512-4RDQs4zirMPXH03y5LKIFoAs+LvO9HTd5Ig4KfD5h4yRtTC5aWK/F2L1g9O2CSjTsgNIc+d0ib0f1rSob3FjNg==", - "dependencies": { - "assert-plus": "^0.2.0", - "lodash": "^3.10.1", - "verror": "^1.6.0" - } - }, - "node_modules/restify-errors/node_modules/assert-plus": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz", - "integrity": "sha512-u1L0ZLywRziOVjUhRxI0Qg9G+4RnFB9H/Rq40YWn0dieDgO7vAYeJz6jKAO6t/aruzlDFLAPkQTT87e+f8Imaw==", - "engines": { - "node": ">=0.8" - } - }, - "node_modules/restify-errors/node_modules/lodash": { - "version": "3.10.1", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", - "integrity": "sha512-9mDDwqVIma6OZX79ZlDACZl8sBm0TEnkf99zV3iMA4GzkIT/9hiqP5mY0HoT1iNLCrKc/R1HByV+yJfRWVJryQ==" - }, - "node_modules/rimraf": { - "version": "2.4.5", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz", - "integrity": "sha512-J5xnxTyqaiw06JjMftq7L9ouA448dw/E7dKghkP9WpKNuwmARNNg+Gk8/u5ryb9N/Yo2+z3MCwuqFK/+qPOPfQ==", - "dependencies": { - "glob": "^6.0.1" - }, - "bin": { - "rimraf": "bin.js" - } - }, - "node_modules/safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] - }, - "node_modules/safe-json-stringify": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz", - "integrity": "sha512-gH8eh2nZudPQO6TytOvbxnuhYBOvDBBLW52tz5q6X58lJcd/tkmqFR+5Z9adS8aJtURSXWThWy/xJtJwixErvg==", - "optional": true - }, - "node_modules/safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" - }, - "node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - } - }, - "node_modules/set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==" - }, - "node_modules/showdown": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/showdown/-/showdown-1.9.1.tgz", - "integrity": "sha512-9cGuS382HcvExtf5AHk7Cb4pAeQQ+h0eTr33V1mu+crYWV4KvWAw6el92bDrqGEk5d46Ai/fhbEUwqJ/mTCNEA==", - "dependencies": { - "yargs": "^14.2" - }, - "bin": { - "showdown": "bin/showdown.js" - } - }, - "node_modules/signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true - }, - "node_modules/smartdc-auth": { - "version": "2.5.9", - "resolved": "https://registry.npmjs.org/smartdc-auth/-/smartdc-auth-2.5.9.tgz", - "integrity": "sha512-tSVRtJPzbFY4Ak8n4bb9nkjyGsFz+db+X+KJUDhojgZkzPXEVaPBgKsnXdrvRyBiOR6geZtqi1LKMRJ8ku8d1g==", - "dependencies": { - "assert-plus": "^1.0.0", - "bunyan": "1.8.12", - "clone": "0.1.5", - "dashdash": "1.10.1", - "http-signature": "^1.0.2", - "once": "1.3.0", - "sshpk": "^1.13.2", - "sshpk-agent": "^1.3.0", - "vasync": "^2.2.1" - }, - "bin": { - "sdc-curl": "bin/sdc-curl" - }, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/smartdc-auth/node_modules/bunyan": { - "version": "1.8.12", - "resolved": "https://registry.npmjs.org/bunyan/-/bunyan-1.8.12.tgz", - "integrity": "sha512-dmDUbGHeGcvCDLRFOscZkwx1ZO/aFz3bJOCi5nCgzdhFGPxwK+y5AcDBnqagNGlJZ7lje/l6JUEz9mQcutttdg==", - "engines": [ - "node >=0.10.0" - ], - "bin": { - "bunyan": "bin/bunyan" - }, - "optionalDependencies": { - "dtrace-provider": "~0.8", - "moment": "^2.10.6", - "mv": "~2", - "safe-json-stringify": "~1" - } - }, - "node_modules/smartdc-auth/node_modules/clone": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/clone/-/clone-0.1.5.tgz", - "integrity": "sha512-icqCXhZwHg0fpiRngRxgxhehGAnrnaIM5whGwpjyajCqx5bqonZW1SsRRWutDV/LXDMqbgEx6EC07vQG24pVbQ==", - "engines": { - "node": "*" - } - }, - "node_modules/smartdc-auth/node_modules/core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==" - }, - "node_modules/smartdc-auth/node_modules/dashdash": { - "version": "1.10.1", - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.10.1.tgz", - "integrity": "sha512-hu/OyjwJnarCHKBL1eM4ZaRn00dwRwfSOR316vE5IO7PO4iM+xMx6xOY2g76yRwq+OHBrmb5oh74tVr27piJTQ==", - "dependencies": { - "assert-plus": "0.1.x" - }, - "engines": { - "node": ">=0.8" - } - }, - "node_modules/smartdc-auth/node_modules/dashdash/node_modules/assert-plus": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz", - "integrity": "sha512-brU24g7ryhRwGCI2y+1dGQmQXiZF7TtIj583S96y0jjdajIe6wn8BuXyELYhvD22dtIxDQVFk04YTJwwdwOYJw==", - "engines": { - "node": ">=0.8" - } - }, - "node_modules/smartdc-auth/node_modules/once": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.3.0.tgz", - "integrity": "sha512-A31oqbdEQnnhkjIXJ6QKcgO9eN8Xe+dVAQqlFLAmri0Y5s11pUadCihT2popU2WLd5CbbnD2ZVkbEJsR/8JHvA==" - }, - "node_modules/smartdc-auth/node_modules/vasync": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/vasync/-/vasync-2.2.1.tgz", - "integrity": "sha512-Hq72JaTpcTFdWiNA4Y22Amej2GH3BFmBaKPPlDZ4/oC8HNn2ISHLkFrJU4Ds8R3jcUi7oo5Y9jcMHKjES+N9wQ==", - "engines": [ - "node >=0.6.0" - ], - "dependencies": { - "verror": "1.10.0" - } - }, - "node_modules/smartdc-auth/node_modules/verror": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", - "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==", - "engines": [ - "node >=0.6.0" - ], - "dependencies": { - "assert-plus": "^1.0.0", - "core-util-is": "1.0.2", - "extsprintf": "^1.2.0" - } - }, - "node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/source-map-support": { - "version": "0.5.21", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", - "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", - "dev": true, - "dependencies": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, - "node_modules/spawn-wrap": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/spawn-wrap/-/spawn-wrap-1.4.3.tgz", - "integrity": "sha512-IgB8md0QW/+tWqcavuFgKYR/qIRvJkRLPJDFaoXtLLUaVcCDK0+HeFTkmQHj3eprcYhc+gOl0aEA1w7qZlYezw==", - "dev": true, - "dependencies": { - "foreground-child": "^1.5.6", - "mkdirp": "^0.5.0", - "os-homedir": "^1.0.1", - "rimraf": "^2.6.2", - "signal-exit": "^3.0.2", - "which": "^1.3.0" - } - }, - "node_modules/spawn-wrap/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/spawn-wrap/node_modules/rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "dev": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - } - }, - "node_modules/spdx-correct": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz", - "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==", - "dev": true, - "dependencies": { - "spdx-expression-parse": "^3.0.0", - "spdx-license-ids": "^3.0.0" - } - }, - "node_modules/spdx-exceptions": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz", - "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==", - "dev": true - }, - "node_modules/spdx-expression-parse": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", - "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", - "dev": true, - "dependencies": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" - } - }, - "node_modules/spdx-license-ids": { - "version": "3.0.13", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz", - "integrity": "sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w==", - "dev": true - }, - "node_modules/sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", - "dev": true - }, - "node_modules/sshpk": { - "version": "1.17.0", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz", - "integrity": "sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==", - "dependencies": { - "asn1": "~0.2.3", - "assert-plus": "^1.0.0", - "bcrypt-pbkdf": "^1.0.0", - "dashdash": "^1.12.0", - "ecc-jsbn": "~0.1.1", - "getpass": "^0.1.1", - "jsbn": "~0.1.0", - "safer-buffer": "^2.0.2", - "tweetnacl": "~0.14.0" - }, - "bin": { - "sshpk-conv": "bin/sshpk-conv", - "sshpk-sign": "bin/sshpk-sign", - "sshpk-verify": "bin/sshpk-verify" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/sshpk-agent": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/sshpk-agent/-/sshpk-agent-1.8.1.tgz", - "integrity": "sha512-YzAzemVrXEf1OeZUpveXLeYUT5VVw/I5gxLeyzq1aMS3pRvFvCeaGliNFjKR3VKtGXRqF9WamqKwYadIG6vStQ==", - "dependencies": { - "assert-plus": "^1.0.0", - "dashdash": "^1.14.1", - "getpass": "^0.1.7", - "mooremachine": "^2.0.1", - "readable-stream": "^2.1.4", - "sshpk": ">=1.14.1 < 1.17.0", - "verror": "^1.10.0" - }, - "bin": { - "sshpk-agent": "bin/sshpk-agent" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/sshpk-agent/node_modules/isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==" - }, - "node_modules/sshpk-agent/node_modules/readable-stream": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", - "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", - "dependencies": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "node_modules/sshpk-agent/node_modules/safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - }, - "node_modules/sshpk-agent/node_modules/sshpk": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", - "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", - "dependencies": { - "asn1": "~0.2.3", - "assert-plus": "^1.0.0", - "bcrypt-pbkdf": "^1.0.0", - "dashdash": "^1.12.0", - "ecc-jsbn": "~0.1.1", - "getpass": "^0.1.1", - "jsbn": "~0.1.0", - "safer-buffer": "^2.0.2", - "tweetnacl": "~0.14.0" - }, - "bin": { - "sshpk-conv": "bin/sshpk-conv", - "sshpk-sign": "bin/sshpk-sign", - "sshpk-verify": "bin/sshpk-verify" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/sshpk-agent/node_modules/string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dependencies": { - "safe-buffer": "~5.1.0" - } - }, - "node_modules/stack-utils": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.5.tgz", - "integrity": "sha512-KZiTzuV3CnSnSvgMRrARVCj+Ht7rMbauGDK0LdVFRGyenwdylpajAp4Q0i6SX8rEmbTpMMf6ryq2gb8pPq2WgQ==", - "dev": true, - "dependencies": { - "escape-string-regexp": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/stack-utils/node_modules/escape-string-regexp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", - "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==" - }, - "node_modules/string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dependencies": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/string-width/node_modules/ansi-regex": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", - "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==", - "engines": { - "node": ">=6" - } - }, - "node_modules/string-width/node_modules/strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dependencies": { - "ansi-regex": "^4.1.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==", - "dev": true, - "dependencies": { - "ansi-regex": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/strsplit": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/strsplit/-/strsplit-1.0.0.tgz", - "integrity": "sha512-efXqQImOEC0nyQqFzPUqa7NvF4B0ZPW2YM5nS+uXTB76sQt002brfZWQo/NSkAt771RTvv/brVQqtxJL7UBHMw==" - }, - "node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/supports-preserve-symlinks-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", - "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", - "dev": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/tap": { - "version": "12.7.0", - "resolved": "https://registry.npmjs.org/tap/-/tap-12.7.0.tgz", - "integrity": "sha512-SjglJmRv0pqrQQ7d5ZBEY8ZOqv3nYDBXEX51oyycOH7piuhn82JKT/yDNewwmOsodTD/RZL9MccA96EjDgK+Eg==", - "dev": true, - "dependencies": { - "bind-obj-methods": "^2.0.0", - "browser-process-hrtime": "^1.0.0", - "capture-stack-trace": "^1.0.0", - "clean-yaml-object": "^0.1.0", - "color-support": "^1.1.0", - "coveralls": "^3.0.2", - "domain-browser": "^1.2.0", - "esm": "^3.2.5", - "foreground-child": "^1.3.3", - "fs-exists-cached": "^1.0.0", - "function-loop": "^1.0.1", - "glob": "^7.1.3", - "isexe": "^2.0.0", - "js-yaml": "^3.13.1", - "minipass": "^2.3.5", - "mkdirp": "^0.5.1", - "nyc": "^14.0.0", - "opener": "^1.5.1", - "os-homedir": "^1.0.2", - "own-or": "^1.0.0", - "own-or-env": "^1.0.1", - "rimraf": "^2.6.3", - "signal-exit": "^3.0.0", - "source-map-support": "^0.5.10", - "stack-utils": "^1.0.2", - "tap-mocha-reporter": "^3.0.9", - "tap-parser": "^7.0.0", - "tmatch": "^4.0.0", - "trivial-deferred": "^1.0.1", - "ts-node": "^8.0.2", - "tsame": "^2.0.1", - "typescript": "^3.3.3", - "write-file-atomic": "^2.4.2", - "yapool": "^1.0.0" - }, - "bin": { - "tap": "bin/run.js" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/tap-mocha-reporter": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/tap-mocha-reporter/-/tap-mocha-reporter-3.0.9.tgz", - "integrity": "sha512-VO07vhC9EG27EZdOe7bWBj1ldbK+DL9TnRadOgdQmiQOVZjFpUEQuuqO7+rNSO2kfmkq5hWeluYXDWNG/ytXTQ==", - "dev": true, - "dependencies": { - "color-support": "^1.1.0", - "debug": "^2.1.3", - "diff": "^1.3.2", - "escape-string-regexp": "^1.0.3", - "glob": "^7.0.5", - "js-yaml": "^3.3.1", - "tap-parser": "^5.1.0", - "unicode-length": "^1.0.0" - }, - "bin": { - "tap-mocha-reporter": "index.js" - }, - "optionalDependencies": { - "readable-stream": "^2.1.5" - } - }, - "node_modules/tap-mocha-reporter/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/tap-mocha-reporter/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/tap-mocha-reporter/node_modules/isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", - "dev": true, - "optional": true - }, - "node_modules/tap-mocha-reporter/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true - }, - "node_modules/tap-mocha-reporter/node_modules/readable-stream": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", - "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", - "dev": true, - "optional": true, - "dependencies": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "node_modules/tap-mocha-reporter/node_modules/safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true, - "optional": true - }, - "node_modules/tap-mocha-reporter/node_modules/string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "optional": true, - "dependencies": { - "safe-buffer": "~5.1.0" - } - }, - "node_modules/tap-mocha-reporter/node_modules/tap-parser": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/tap-parser/-/tap-parser-5.4.0.tgz", - "integrity": "sha512-BIsIaGqv7uTQgTW1KLTMNPSEQf4zDDPgYOBRdgOfuB+JFOLRBfEu6cLa/KvMvmqggu1FKXDfitjLwsq4827RvA==", - "dev": true, - "dependencies": { - "events-to-array": "^1.0.1", - "js-yaml": "^3.2.7" - }, - "bin": { - "tap-parser": "bin/cmd.js" - }, - "optionalDependencies": { - "readable-stream": "^2" - } - }, - "node_modules/tap-parser": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/tap-parser/-/tap-parser-7.0.0.tgz", - "integrity": "sha512-05G8/LrzqOOFvZhhAk32wsGiPZ1lfUrl+iV7+OkKgfofZxiceZWMHkKmow71YsyVQ8IvGBP2EjcIjE5gL4l5lA==", - "dev": true, - "dependencies": { - "events-to-array": "^1.0.1", - "js-yaml": "^3.2.7", - "minipass": "^2.2.0" - }, - "bin": { - "tap-parser": "bin/cmd.js" - } - }, - "node_modules/tap/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/tap/node_modules/rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "dev": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - } - }, - "node_modules/tar": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz", - "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==", - "deprecated": "This version of tar is no longer supported, and will not receive security updates. Please upgrade asap.", - "dependencies": { - "block-stream": "*", - "fstream": "^1.0.12", - "inherits": "2" - } - }, - "node_modules/test-exclude": { - "version": "5.2.3", - "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-5.2.3.tgz", - "integrity": "sha512-M+oxtseCFO3EDtAaGH7iiej3CBkzXqFMbzqYAACdzKui4eZA+pq3tZEwChvOdNfa7xxy8BfbmgJSIr43cC/+2g==", - "dev": true, - "dependencies": { - "glob": "^7.1.3", - "minimatch": "^3.0.4", - "read-pkg-up": "^4.0.0", - "require-main-filename": "^2.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/test-exclude/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/tmatch": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/tmatch/-/tmatch-4.0.0.tgz", - "integrity": "sha512-Ynn2Gsp+oCvYScQXeV+cCs7citRDilq0qDXA6tuvFwDgiYyyaq7D5vKUlAPezzZR5NDobc/QMeN6e5guOYmvxg==", - "dev": true - }, - "node_modules/to-fast-properties": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/tough-cookie": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", - "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", - "dev": true, - "dependencies": { - "psl": "^1.1.28", - "punycode": "^2.1.1" - }, - "engines": { - "node": ">=0.8" - } - }, - "node_modules/trivial-deferred": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/trivial-deferred/-/trivial-deferred-1.1.2.tgz", - "integrity": "sha512-vDPiDBC3hyP6O4JrJYMImW3nl3c03Tsj9fEXc7Qc/XKa1O7gf5ZtFfIR/E0dun9SnDHdwjna1Z2rSzYgqpxh/g==", - "dev": true, - "engines": { - "node": ">= 8" - } - }, - "node_modules/ts-node": { - "version": "8.10.2", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.10.2.tgz", - "integrity": "sha512-ISJJGgkIpDdBhWVu3jufsWpK3Rzo7bdiIXJjQc0ynKxVOVcg2oIrf2H2cejminGrptVc6q6/uynAHNCuWGbpVA==", - "dev": true, - "dependencies": { - "arg": "^4.1.0", - "diff": "^4.0.1", - "make-error": "^1.1.1", - "source-map-support": "^0.5.17", - "yn": "3.1.1" - }, - "bin": { - "ts-node": "dist/bin.js", - "ts-node-script": "dist/bin-script.js", - "ts-node-transpile-only": "dist/bin-transpile.js", - "ts-script": "dist/bin-script-deprecated.js" - }, - "engines": { - "node": ">=6.0.0" - }, - "peerDependencies": { - "typescript": ">=2.7" - } - }, - "node_modules/ts-node/node_modules/diff": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", - "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", - "dev": true, - "engines": { - "node": ">=0.3.1" - } - }, - "node_modules/tsame": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/tsame/-/tsame-2.0.1.tgz", - "integrity": "sha512-jxyxgKVKa4Bh5dPcO42TJL22lIvfd9LOVJwdovKOnJa4TLLrHxquK+DlGm4rkGmrcur+GRx+x4oW00O2pY/fFw==", - "dev": true - }, - "node_modules/tunnel-agent": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==", - "dependencies": { - "safe-buffer": "^5.0.1" - }, - "engines": { - "node": "*" - } - }, - "node_modules/tweetnacl": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==" - }, - "node_modules/typescript": { - "version": "3.9.10", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz", - "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==", - "dev": true, - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=4.2.0" - } - }, - "node_modules/unicode-length": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/unicode-length/-/unicode-length-1.0.3.tgz", - "integrity": "sha512-rZKNhIqioUp7H49afr26tivLDCvUSqOXwmwEEnsCwnPX67S1CYbOL45Y5IP3K/XHN73/lg21HlrB8SNlYXKQTg==", - "dev": true, - "dependencies": { - "punycode": "^1.3.2", - "strip-ansi": "^3.0.1" - } - }, - "node_modules/unicode-length/node_modules/punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==", - "dev": true - }, - "node_modules/uri-js": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", - "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "dev": true, - "dependencies": { - "punycode": "^2.1.0" - } - }, - "node_modules/util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" - }, - "node_modules/uuid": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz", - "integrity": "sha512-FULf7fayPdpASncVy4DLh3xydlXEJJpvIELjYjNeQWYUZ9pclcpvCZSr2gkmN2FrrGcI7G/cJsIEwk5/8vfXpg==", - "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details." - }, - "node_modules/validate-npm-package-license": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", - "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", - "dev": true, - "dependencies": { - "spdx-correct": "^3.0.0", - "spdx-expression-parse": "^3.0.0" - } - }, - "node_modules/vasync": { - "version": "1.6.4", - "resolved": "https://registry.npmjs.org/vasync/-/vasync-1.6.4.tgz", - "integrity": "sha512-3oQMomVgQgHzNe5iKuT8PGOhMCQcg1wfh00Nh/Kl39ERdTlw/uNS7kbrhEraDMDKWHdDdc0iBFahPEd/Ft2b+A==", - "engines": [ - "node >=0.6.0" - ], - "dependencies": { - "verror": "1.6.0" - } - }, - "node_modules/vasync/node_modules/extsprintf": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.2.0.tgz", - "integrity": "sha512-T3PYC6HucmF4OfunfZb5d1nRvTSvWYhsr/Og33HANcCuCtGPUtWVyt/tTs8SU9sR0SGh5Z/xQCuX/D72ph2H+A==", - "engines": [ - "node >=0.6.0" - ] - }, - "node_modules/vasync/node_modules/verror": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.6.0.tgz", - "integrity": "sha512-bIOaZx4+Bf6a7sIORfmYnyKLDLk/lhVym6rjYlq+vkitYKnhFmUpmPpDTCltWFrUTlGKs6sCeoDWfMA0oOOneA==", - "engines": [ - "node >=0.6.0" - ], - "dependencies": { - "extsprintf": "1.2.0" - } - }, - "node_modules/verror": { - "version": "1.10.1", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.1.tgz", - "integrity": "sha512-veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg==", - "dependencies": { - "assert-plus": "^1.0.0", - "core-util-is": "1.0.2", - "extsprintf": "^1.2.0" - }, - "engines": { - "node": ">=0.6.0" - } - }, - "node_modules/verror/node_modules/core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==" - }, - "node_modules/vstream": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/vstream/-/vstream-0.1.0.tgz", - "integrity": "sha512-WHV31NZp7EP0JHFPWzhuHuo4+MaHcrTyZZucsCW+wFuF3OQ3mJsOBSfJTqkG53ZN1jdjkfxitbOFLy8pNyKyDA==", - "dependencies": { - "assert-plus": "0.1.5", - "extsprintf": "1.2.0" - } - }, - "node_modules/vstream/node_modules/assert-plus": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz", - "integrity": "sha512-brU24g7ryhRwGCI2y+1dGQmQXiZF7TtIj583S96y0jjdajIe6wn8BuXyELYhvD22dtIxDQVFk04YTJwwdwOYJw==", - "engines": { - "node": ">=0.8" - } - }, - "node_modules/vstream/node_modules/extsprintf": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.2.0.tgz", - "integrity": "sha512-T3PYC6HucmF4OfunfZb5d1nRvTSvWYhsr/Og33HANcCuCtGPUtWVyt/tTs8SU9sR0SGh5Z/xQCuX/D72ph2H+A==", - "engines": [ - "node >=0.6.0" - ] - }, - "node_modules/watershed": { - "version": "0.3.4", - "resolved": "https://registry.npmjs.org/watershed/-/watershed-0.3.4.tgz", - "integrity": "sha512-/lRBpLn2TvEwrIW5i35ZCpb+SIq4VWq4c1yxN311we+E4eXRW7EB5nybrv4fJEuBmgqyqVkT2gtQ6Zqu+u66mA==", - "engines": [ - "node >=0.8.0" - ], - "dependencies": { - "dtrace-provider": "~0.8", - "readable-stream": "1.0.2" - } - }, - "node_modules/watershed/node_modules/readable-stream": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.2.tgz", - "integrity": "sha512-El0AJ9aGxDbvoPzWx9rlD84bzmrhdoxytBbN4R4+fb9Wjx2UHdY9ghDTQPIFYw/eL7KwaKgyrTv2iH6IvCk3Ig==" - }, - "node_modules/which": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", - "dev": true, - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "which": "bin/which" - } - }, - "node_modules/which-module": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz", - "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==" - }, - "node_modules/wrap-ansi": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", - "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", - "dependencies": { - "ansi-styles": "^3.2.0", - "string-width": "^3.0.0", - "strip-ansi": "^5.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/wrap-ansi/node_modules/ansi-regex": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", - "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==", - "engines": { - "node": ">=6" - } - }, - "node_modules/wrap-ansi/node_modules/strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dependencies": { - "ansi-regex": "^4.1.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" - }, - "node_modules/write-file-atomic": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz", - "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==", - "dev": true, - "dependencies": { - "graceful-fs": "^4.1.11", - "imurmurhash": "^0.1.4", - "signal-exit": "^3.0.2" - } - }, - "node_modules/y18n": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", - "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==" - }, - "node_modules/yallist": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==" - }, - "node_modules/yapool": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/yapool/-/yapool-1.0.0.tgz", - "integrity": "sha512-RONBZndo8Lo8pKPfORRxr2DIk2NZKIml654o4kaIu7RXVxQCKsAN6AqrcoZsI3h+2H5YO2mD/04Wy4LbAgd+Pg==", - "dev": true - }, - "node_modules/yargs": { - "version": "14.2.3", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-14.2.3.tgz", - "integrity": "sha512-ZbotRWhF+lkjijC/VhmOT9wSgyBQ7+zr13+YLkhfsSiTriYsMzkTUFP18pFhWwBeMa5gUc1MzbhrO6/VB7c9Xg==", - "dependencies": { - "cliui": "^5.0.0", - "decamelize": "^1.2.0", - "find-up": "^3.0.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^3.0.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^15.0.1" - } - }, - "node_modules/yargs-parser": { - "version": "13.1.2", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", - "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", - "dev": true, - "dependencies": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } - }, - "node_modules/yargs/node_modules/yargs-parser": { - "version": "15.0.3", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-15.0.3.tgz", - "integrity": "sha512-/MVEVjTXy/cGAjdtQf8dW3V9b97bPN7rNn8ETj6BmAQL7ibC7O1Q9SPJbGjgh3SlwoBNXMzj/ZGIj8mBgl12YA==", - "dependencies": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } - }, - "node_modules/yn": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", - "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", - "dev": true, - "engines": { - "node": ">=6" - } - } - } -} diff --git a/pkgs/tools/admin/manta/source.json b/pkgs/tools/admin/manta/source.json deleted file mode 100644 index d58f96bb9e15b..0000000000000 --- a/pkgs/tools/admin/manta/source.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "version": "5.3.2", - "integrity": "sha512-Vsgmc7hZbra1oicuHH9e5UNkcVyRJiH+Y4uvpTW3OQ60NhUAbv3V+re3ZtyN51MH3QJ9WNgkMAfR8dZ3Sv5gCw==", - "filename": "manta-5.3.2.tgz", - "deps": "sha256-npoCp4PSgv1gK6PziQZINkHUfqxTu8sBbYR/HRu98KA=" -} diff --git a/pkgs/tools/admin/manta/update.sh b/pkgs/tools/admin/manta/update.sh deleted file mode 100755 index 6aa03bb3553a2..0000000000000 --- a/pkgs/tools/admin/manta/update.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -i bash -p nodejs libarchive prefetch-npm-deps moreutils -# shellcheck shell=bash - -set -exuo pipefail - -cd -- "$(dirname -- "${BASH_SOURCE[0]}")" - -TMPDIR="$(mktemp -d)" -trap 'rm -r -- "$TMPDIR"' EXIT - -pushd -- "$TMPDIR" -npm pack manta --json | jq '.[0] | { version, integrity, filename }' > source.json -bsdtar -x -f "$(jq -r .filename source.json)" - -pushd package -npm install --package-lock-only -popd - -DEPS="$(prefetch-npm-deps package/package-lock.json)" -jq ".deps = \"$DEPS\"" source.json | sponge source.json - -popd - -cp -t . -- "$TMPDIR/source.json" "$TMPDIR/package/package-lock.json" diff --git a/pkgs/tools/admin/pebble/default.nix b/pkgs/tools/admin/pebble/default.nix index a3c8d20b107f4..76e2e281f68ee 100644 --- a/pkgs/tools/admin/pebble/default.nix +++ b/pkgs/tools/admin/pebble/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { sha256 = "0sh67bzq3hlagk73w2kp45viq15g2rcxm760jk9fqshamq784m6m"; }; - vendorSha256 = null; + vendorHash = null; passthru.tests = { smoke-test = nixosTests.acme; diff --git a/pkgs/tools/admin/pulumi-packages/base.nix b/pkgs/tools/admin/pulumi-packages/base.nix index 001a247379bc3..8327e41dcd5f2 100644 --- a/pkgs/tools/admin/pulumi-packages/base.nix +++ b/pkgs/tools/admin/pulumi-packages/base.nix @@ -33,10 +33,10 @@ let , version , ... }: python3Packages.callPackage - ({ buildPythonPackage, pythonOlder, parver, pulumi, semver }: + ({ buildPythonPackage, pythonOlder, parver, pip, pulumi, semver, setuptools }: buildPythonPackage rec { inherit pname meta src version; - format = "setuptools"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -46,13 +46,20 @@ let parver pulumi semver + setuptools ]; postPatch = '' - sed -i \ - -e 's/^VERSION = .*/VERSION = "${version}"/g' \ - -e 's/^PLUGIN_VERSION = .*/PLUGIN_VERSION = "${version}"/g' \ - setup.py + if [[ -e "pyproject.toml" ]]; then + sed -i \ + -e 's/^ version = .*/ version = "${version}"/g' \ + pyproject.toml + else + sed -i \ + -e 's/^VERSION = .*/VERSION = "${version}"/g' \ + -e 's/^PLUGIN_VERSION = .*/PLUGIN_VERSION = "${version}"/g' \ + setup.py + fi ''; # Auto-generated; upstream does not have any tests. @@ -60,7 +67,7 @@ let checkPhase = '' runHook preCheck - pip show "${pname}" | grep "Version: ${version}" > /dev/null \ + ${pip}/bin/pip show "${pname}" | grep "Version: ${version}" > /dev/null \ || (echo "ERROR: Version substitution seems to be broken"; exit 1) runHook postCheck diff --git a/pkgs/tools/admin/pulumi-packages/pulumi-command.nix b/pkgs/tools/admin/pulumi-packages/pulumi-command.nix index 3b181ceb05b0d..d53e9593feecd 100644 --- a/pkgs/tools/admin/pulumi-packages/pulumi-command.nix +++ b/pkgs/tools/admin/pulumi-packages/pulumi-command.nix @@ -4,14 +4,14 @@ mkPulumiPackage rec { owner = "pulumi"; repo = "pulumi-command"; - version = "0.7.1"; + version = "0.9.0"; rev = "v${version}"; - hash = "sha256-QrKtnpJGWoc5WwV6bnERrN3iBJpyoFKFwlqBtNNK7F8="; - vendorHash = "sha256-HyzWPRYfjdjGGBByCc8N91qWhX2QBJoQMpudHWrkmFM="; + hash = "sha256-VnbtPhMyTZ4Oy+whOK6Itr2vqUagwZUODONL13fjMaU="; + vendorHash = "sha256-MBWDEVA29uzHD3B/iPe68ntGjMM1SCTDq/TL+NgMc6c="; cmdGen = "pulumi-gen-command"; cmdRes = "pulumi-resource-command"; extraLdflags = [ - "-X github.com/pulumi/${repo}/provider/v4/pkg/version.Version=v${version}" + "-X github.com/pulumi/${repo}/provider/pkg/version.Version=v${version}" ]; postConfigure = '' diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/tools/admin/qovery-cli/default.nix index 4b846b595333c..75c0e81b4953a 100644 --- a/pkgs/tools/admin/qovery-cli/default.nix +++ b/pkgs/tools/admin/qovery-cli/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.70.1"; + version = "0.72.0"; src = fetchFromGitHub { owner = "Qovery"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-g1X0DUbCwL9XTDeYsYNfXABNnyJqnB+E6nq7NynoMYk="; + hash = "sha256-mb1GLhrU+/g0zX2CNkwlJKuLAVDxLWuU9EoYyxXQEWA="; }; vendorHash = "sha256-OexoLqlPBr1JSL63lP172YaGJ0GLlxxsJYdXIGhNqjs="; diff --git a/pkgs/tools/admin/rset/default.nix b/pkgs/tools/admin/rset/default.nix index f7c00fffb1ccd..e164e133f9851 100644 --- a/pkgs/tools/admin/rset/default.nix +++ b/pkgs/tools/admin/rset/default.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/eradman/rset/raw/${version}/NEWS"; license = licenses.isc; platforms = platforms.unix; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/admin/syft/default.nix b/pkgs/tools/admin/syft/default.nix index 845b7c7077362..3f6567b09f0c8 100644 --- a/pkgs/tools/admin/syft/default.nix +++ b/pkgs/tools/admin/syft/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "syft"; - version = "0.90.0"; + version = "0.92.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - hash = "sha256-W1BLwoqo7sDRZ1LjAbfuuZpoJCWfAK8ekIFwfItkH4A="; + hash = "sha256-YmzizpcAfE4+Rfq5ydQnDQBo4R+pAyudfi+fqD9EZP0="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -22,7 +22,7 @@ buildGoModule rec { }; # hash mismatch with darwin proxyVendor = true; - vendorHash = "sha256-TG292RncaL/4kfuM02huEaIAsuUj7vrTre2aFnjqx3Y="; + vendorHash = "sha256-siOZWhHqNokkYAPwuXQCs4T1yBiEWUTJzhfbH/Z2uBk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix index 74f1bcfe9b8b1..53b4a4bfa96ea 100644 --- a/pkgs/tools/archivers/unrar/default.nix +++ b/pkgs/tools/archivers/unrar/default.nix @@ -1,45 +1,51 @@ -{lib, stdenv, fetchurl}: +{ lib +, stdenv +, fetchzip +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "unrar"; - version = "6.2.5"; + version = "6.2.11"; - src = fetchurl { - url = "https://www.rarlab.com/rar/unrarsrc-${version}.tar.gz"; - hash = "sha256-mjl0QQ0dNA45mN0qb5j6776DjK1VYmbnFK37Doz5N3w="; + src = fetchzip { + url = "https://www.rarlab.com/rar/unrarsrc-${finalAttrs.version}.tar.gz"; + stripRoot = false; + hash = "sha256-HFglLjn4UE8dalp2ZIFlqqaE9FahahFrDNsPrKUIQPI="; }; + sourceRoot = finalAttrs.src.name; + postPatch = '' - substituteInPlace makefile \ + substituteInPlace unrar/makefile \ --replace "CXX=" "#CXX=" \ --replace "STRIP=" "#STRIP=" \ --replace "AR=" "#AR=" ''; + outputs = [ "out" "dev" ]; + + # `make {unrar,lib}` call `make clean` implicitly + # separate build into different dirs to avoid deleting them buildPhase = '' - # `make {unrar,lib}` call `make clean` implicitly - # move build results to another dir to avoid deleting them - mkdir -p bin + runHook preBuild - make unrar - mv unrar bin + cp -a unrar libunrar + make -C libunrar lib + make -C unrar -j1 - make lib - mv libunrar.so bin + runHook postBuild ''; - outputs = [ "out" "dev" ]; - installPhase = '' - install -Dt "$out/bin" bin/unrar + runHook preInstall - mkdir -p $out/share/doc/unrar - cp acknow.txt license.txt \ - $out/share/doc/unrar + install -Dm755 unrar/unrar -t $out/bin/ + install -Dm644 unrar/{acknow.txt,license.txt} -t $out/share/doc/unrar/ - install -Dm755 bin/libunrar.so $out/lib/libunrar.so + install -Dm755 libunrar/libunrar.so -t $out/lib/ + install -Dm644 libunrar/dll.hpp -t $dev/include/unrar/ - install -Dt $dev/include/unrar/ *.hpp + runHook postInstall ''; setupHook = ./setup-hook.sh; @@ -48,7 +54,7 @@ stdenv.mkDerivation rec { description = "Utility for RAR archives"; homepage = "https://www.rarlab.com/"; license = licenses.unfreeRedistributable; - maintainers = [ maintainers.ehmry ]; + maintainers = with maintainers; [ ehmry wegank ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/tools/audio/dsp/default.nix b/pkgs/tools/audio/dsp/default.nix index 57990199dfa86..e17e211d34026 100644 --- a/pkgs/tools/audio/dsp/default.nix +++ b/pkgs/tools/audio/dsp/default.nix @@ -15,14 +15,14 @@ , libpulseaudio }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dsp"; version = "1.9"; src = fetchFromGitHub { owner = "bmc0"; repo = "dsp"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-S1pzVQ/ceNsx0vGmzdDWw2TjPVLiRgzR4edFblWsekY="; }; @@ -47,6 +47,6 @@ stdenv.mkDerivation rec { description = "An audio processing program with an interactive mode"; license = licenses.isc; maintainers = with maintainers; [ aaronjheng ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.linux; }; -} +}) diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix index 81157c13782e8..5e196a5b557bc 100644 --- a/pkgs/tools/audio/liquidsoap/full.nix +++ b/pkgs/tools/audio/liquidsoap/full.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { ocamlPackages.mm ocamlPackages.ocaml_pcre ocamlPackages.menhir ocamlPackages.menhirLib - ocamlPackages.camomile + (ocamlPackages.camomile.override { version = "1.0.2"; }) ocamlPackages.ocurl ocamlPackages.uri ocamlPackages.sedlex diff --git a/pkgs/tools/audio/spotdl/default.nix b/pkgs/tools/audio/spotdl/default.nix index 53fdbd677f755..6b7a75bfb61e4 100644 --- a/pkgs/tools/audio/spotdl/default.nix +++ b/pkgs/tools/audio/spotdl/default.nix @@ -6,18 +6,7 @@ }: let - python = python3.override { - packageOverrides = self: super: { - ytmusicapi = super.ytmusicapi.overridePythonAttrs (old: rec { - version = "0.25.1"; - src = fetchPypi { - inherit (old) pname; - inherit version; - hash = "sha256-uc/fgDetSYaCRzff0SzfbRhs3TaKrfE2h6roWkkj8yQ="; - }; - }); - }; - }; + python = python3; in python.pkgs.buildPythonApplication rec { pname = "spotdl"; version = "4.2.1"; diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix index 8609095823543..bdd0f58235e5a 100644 --- a/pkgs/tools/audio/tts/default.nix +++ b/pkgs/tools/audio/tts/default.nix @@ -10,19 +10,20 @@ let packageOverrides = self: super: { torch = super.torch-bin; torchvision = super.torchvision-bin; + tensorflow = super.tensorflow-bin; }; }; in python.pkgs.buildPythonApplication rec { pname = "tts"; - version = "0.16.0"; + version = "0.17.4"; format = "pyproject"; src = fetchFromGitHub { owner = "coqui-ai"; repo = "TTS"; rev = "refs/tags/v${version}"; - hash = "sha256-2JZyINyzy4X1DTp4ZsMLY/rCsH4JdQ8bF/3hoqtvNTU="; + hash = "sha256-yZHdPqvYmlq/ZKeinez4MmO9+jCIl9JAD0t/tc/Uz8c="; }; postPatch = let diff --git a/pkgs/tools/audio/wyoming/openwakeword.nix b/pkgs/tools/audio/wyoming/openwakeword.nix new file mode 100644 index 0000000000000..d8450dac69830 --- /dev/null +++ b/pkgs/tools/audio/wyoming/openwakeword.nix @@ -0,0 +1,63 @@ +{ lib +, python3 +, python3Packages +, fetchFromGitHub +, fetchpatch +}: + +python3.pkgs.buildPythonApplication { + pname = "wyoming-openwakeword"; + version = "1.5.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "rhasspy"; + repo = "rhasspy3"; + rev = "e16d7d374a64f671db48142c7b635b327660ebcf"; + hash = "sha256-SbWsRmR1hfuU3yJbuu+r7M43ugHeNwLgu5S8MqkbCQA="; + }; + + patches = [ + (fetchpatch { + # import tflite entrypoint from tensorflow + url = "https://github.com/rhasspy/rhasspy3/commit/23b1bc9cf1e9aa78453feb11e27d5dafe26de068.patch"; + hash = "sha256-fjLJ+VI4c8ABBWx1IjZ6nS8MGqdry4rgcThKiaAvz+Q="; + }) + (fetchpatch { + # add commandline entrypoint + url = "https://github.com/rhasspy/rhasspy3/commit/7662b82cd85e16817a3c6f4153e855bf57436ac3.patch"; + hash = "sha256-41CLkVDSAJJpZ5irwIf/Z4wHoCuKDrqFBAjKCx7ta50="; + }) + ]; + + postPatch = '' + cd programs/wake/openwakeword-lite/server + ''; + + nativeBuildInputs = with python3Packages; [ + setuptools + wheel + ]; + + propagatedBuildInputs = with python3Packages; [ + tensorflow-bin + webrtc-noise-gain + wyoming + ]; + + passthru.optional-dependencies.webrtc = with python3Packages; [ + webrtc-noise-gain + ]; + + pythonImportsCheck = [ + "wyoming_openwakeword" + ]; + + meta = with lib; { + description = "An open source voice assistant toolkit for many human languages"; + homepage = "https://github.com/rhasspy/rhasspy3/commit/fe44635132079db74d0c76c6b3553b842aa1e318"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + mainProgram = "wyoming-openwakeword"; + }; +} diff --git a/pkgs/tools/audio/wyoming/piper.nix b/pkgs/tools/audio/wyoming/piper.nix index c5ce6f99005b5..fbc52a88aa20c 100644 --- a/pkgs/tools/audio/wyoming/piper.nix +++ b/pkgs/tools/audio/wyoming/piper.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "wyoming-piper"; - version = "1.2.0"; + version = "1.3.2"; format = "setuptools"; src = fetchPypi { pname = "wyoming_piper"; inherit version; - hash = "sha256-cdCWpejHNCjyYtIxGms9yaEerRmFnGllUN7+3uQy4mQ="; + hash = "sha256-WyoHwIF3xC5nOa7iQ8/esfdwahbU6YJzK5G2Vi3mV4M="; }; patches = [ diff --git a/pkgs/tools/backup/awsbck/default.nix b/pkgs/tools/backup/awsbck/default.nix index f0ef8367e0ee5..d8d54dad392d4 100644 --- a/pkgs/tools/backup/awsbck/default.nix +++ b/pkgs/tools/backup/awsbck/default.nix @@ -8,21 +8,21 @@ rustPlatform.buildRustPackage rec { pname = "awsbck"; - version = "0.3.4"; + version = "0.3.5"; src = fetchFromGitHub { owner = "beeb"; repo = "awsbck"; rev = "v${version}"; - hash = "sha256-MDlFCbBAvGovhCO5uxXRQhIN4Fw9wav0afIBNzz3Mow="; + hash = "sha256-BitR4f1VzYs5L7hT5OCbBbe4JvPIOPDQ9byKEkfBDBY="; }; + cargoHash = "sha256-J5BI6Gv20iAe2XCt1riLATCnlOg+pcj7q2Gzo2ZN0ms="; + nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "sha256-p7t/QtihdP6dyJ7tKpNkqcyYJvFJG8+fPqSGH7DNAtg="; - doCheck = false; meta = with lib; { diff --git a/pkgs/tools/backup/bdsync/default.nix b/pkgs/tools/backup/bdsync/default.nix index 0112ad4c9a193..bf3afacb94961 100644 --- a/pkgs/tools/backup/bdsync/default.nix +++ b/pkgs/tools/backup/bdsync/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "bdsync"; - version = "0.11.2"; + version = "0.11.3"; src = fetchFromGitHub { owner = "rolffokkens"; repo = pname; rev = "v${version}"; - sha256 = "0kx422cp1bxr62i1mi7dzrpwmys1kdp865rcymdp4knb5rr5864k"; + sha256 = "sha256-58yoF6s0WjH+1mTY7X5OX53YgcnDmGxoCR8Kvl6lP+A="; }; nativeBuildInputs = [ pandoc which ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fast block device synchronizing tool"; - homepage = "https://github.com/TargetHolding/bdsync"; + homepage = "https://github.com/rolffokkens/bdsync"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ jluttine ]; diff --git a/pkgs/tools/backup/conserve/Cargo.lock b/pkgs/tools/backup/conserve/Cargo.lock deleted file mode 100644 index b7d5a288a055c..0000000000000 --- a/pkgs/tools/backup/conserve/Cargo.lock +++ /dev/null @@ -1,2023 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "ahash" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" -dependencies = [ - "cfg-if", - "once_cell", - "version_check", -] - -[[package]] -name = "aho-corasick" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" -dependencies = [ - "memchr", -] - -[[package]] -name = "aho-corasick" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" -dependencies = [ - "memchr", -] - -[[package]] -name = "anstream" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "is-terminal", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" - -[[package]] -name = "anstyle-parse" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" -dependencies = [ - "windows-sys 0.48.0", -] - -[[package]] -name = "anstyle-wincon" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" -dependencies = [ - "anstyle", - "windows-sys 0.48.0", -] - -[[package]] -name = "arrayvec" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9" -dependencies = [ - "nodrop", -] - -[[package]] -name = "assert_cmd" -version = "2.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d6b683edf8d1119fe420a94f8a7e389239666aa72e65495d91c00462510151" -dependencies = [ - "anstyle", - "bstr", - "doc-comment", - "predicates", - "predicates-core", - "predicates-tree", - "wait-timeout", -] - -[[package]] -name = "assert_fs" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f070617a68e5c2ed5d06ee8dd620ee18fb72b99f6c094bed34cf8ab07c875b48" -dependencies = [ - "anstyle", - "doc-comment", - "globwalk", - "predicates", - "predicates-core", - "predicates-tree", - "tempfile", -] - -[[package]] -name = "assert_matches" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "bit-set" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" -dependencies = [ - "bit-vec", -] - -[[package]] -name = "bit-vec" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "blake2-rfc" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400" -dependencies = [ - "arrayvec", - "constant_time_eq", -] - -[[package]] -name = "bstr" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5" -dependencies = [ - "memchr", - "once_cell", - "regex-automata", - "serde", -] - -[[package]] -name = "bumpalo" -version = "3.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "bytes" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" - -[[package]] -name = "cachedir" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e236bf5873ea57ec2877445297f4da008916bfae51567131acfc54a073d694f3" -dependencies = [ - "tempfile", -] - -[[package]] -name = "cc" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "clap" -version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93aae7a4192245f70fe75dd9157fc7b4a5bf53e88d30bd4396f7d8f9284d5acc" -dependencies = [ - "clap_builder", - "clap_derive", - "once_cell", -] - -[[package]] -name = "clap_builder" -version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f423e341edefb78c9caba2d9c7f7687d0e72e89df3ce3394554754393ac3990" -dependencies = [ - "anstream", - "anstyle", - "bitflags", - "clap_lex", - "strsim", - "terminal_size", -] - -[[package]] -name = "clap_derive" -version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "191d9573962933b4027f932c600cd252ce27a8ad5979418fe78e43c07996f27b" -dependencies = [ - "heck", - "proc-macro2 1.0.58", - "quote 1.0.27", - "syn 2.0.16", -] - -[[package]] -name = "clap_lex" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" - -[[package]] -name = "clicolors-control" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90082ee5dcdd64dc4e9e0d37fbf3ee325419e39c0092191e0393df65518f741e" -dependencies = [ - "atty", - "lazy_static", - "libc", - "winapi", -] - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "conserve" -version = "23.5.0" -dependencies = [ - "assert_cmd", - "assert_fs", - "assert_matches", - "blake2-rfc", - "bytes", - "cachedir", - "clap", - "clicolors-control", - "cp_r", - "derive_more", - "dir-assert", - "filetime", - "globset", - "hex", - "indoc", - "itertools", - "lazy_static", - "metrics", - "metrics-util", - "mutants", - "nix", - "nutmeg", - "predicates", - "pretty_assertions", - "proptest", - "proptest-derive", - "rayon", - "readahead-iterator", - "regex", - "rstest", - "semver", - "serde", - "serde_json", - "snap", - "tempfile", - "thiserror", - "thousands", - "time", - "tracing", - "tracing-appender", - "tracing-subscriber", - "tracing-test", - "unix_mode", - "url", - "users", -] - -[[package]] -name = "constant_time_eq" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" - -[[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - -[[package]] -name = "cp_r" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f21d305efe161d2d3179950f5746837215197e774bf7424c12eafc191b63e88a" -dependencies = [ - "filetime", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" -dependencies = [ - "cfg-if", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" -dependencies = [ - "autocfg", - "cfg-if", - "crossbeam-utils", - "memoffset 0.8.0", - "scopeguard", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "ctor" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" -dependencies = [ - "quote 1.0.27", - "syn 1.0.109", -] - -[[package]] -name = "derive_more" -version = "0.99.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" -dependencies = [ - "convert_case", - "proc-macro2 1.0.58", - "quote 1.0.27", - "rustc_version", - "syn 1.0.109", -] - -[[package]] -name = "diff" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" - -[[package]] -name = "difflib" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" - -[[package]] -name = "dir-assert" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52079f51e329f84f2895c4752455296d9a2dab76d7af51fc7b026f05889b1899" - -[[package]] -name = "doc-comment" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" - -[[package]] -name = "either" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" - -[[package]] -name = "endian-type" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" - -[[package]] -name = "errno" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "filetime" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.2.16", - "windows-sys 0.48.0", -] - -[[package]] -name = "float-cmp" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" -dependencies = [ - "num-traits", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "form_urlencoded" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "getrandom" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "globset" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" -dependencies = [ - "aho-corasick 0.7.20", - "bstr", - "fnv", - "log", - "regex", -] - -[[package]] -name = "globwalk" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93e3af942408868f6934a7b85134a3230832b9977cf66125df2f9edcfce4ddcc" -dependencies = [ - "bitflags", - "ignore", - "walkdir", -] - -[[package]] -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", -] - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "idna" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "ignore" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" -dependencies = [ - "globset", - "lazy_static", - "log", - "memchr", - "regex", - "same-file", - "thread_local", - "walkdir", - "winapi-util", -] - -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - -[[package]] -name = "indoc" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f2cb48b81b1dc9f39676bf99f5499babfec7cd8fe14307f7b3d747208fb5690" - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" -dependencies = [ - "hermit-abi 0.3.1", - "libc", - "windows-sys 0.48.0", -] - -[[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.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" - -[[package]] -name = "js-sys" -version = "0.3.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libc" -version = "0.2.144" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" - -[[package]] -name = "libm" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" - -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "lock_api" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "mach2" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d0d1830bcd151a6fc4aea1369af235b36c1528fe976b8ff678683c9995eade8" -dependencies = [ - "libc", -] - -[[package]] -name = "matchers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" -dependencies = [ - "regex-automata", -] - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" -dependencies = [ - "autocfg", -] - -[[package]] -name = "metrics" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa8ebbd1a9e57bbab77b9facae7f5136aea44c356943bf9a198f647da64285d6" -dependencies = [ - "ahash", - "metrics-macros", - "portable-atomic", -] - -[[package]] -name = "metrics-macros" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddece26afd34c31585c74a4db0630c376df271c285d682d1e55012197830b6df" -dependencies = [ - "proc-macro2 1.0.58", - "quote 1.0.27", - "syn 2.0.16", -] - -[[package]] -name = "metrics-util" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "111cb375987443c3de8d503580b536f77dc8416d32db62d9456db5d93bd7ac47" -dependencies = [ - "aho-corasick 0.7.20", - "crossbeam-epoch", - "crossbeam-utils", - "hashbrown 0.13.2", - "indexmap", - "metrics", - "num_cpus", - "ordered-float", - "quanta", - "radix_trie", - "sketches-ddsketch", -] - -[[package]] -name = "mutants" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc0287524726960e07b119cebd01678f852f147742ae0d925e6a520dca956126" - -[[package]] -name = "nibble_vec" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43" -dependencies = [ - "smallvec", -] - -[[package]] -name = "nix" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" -dependencies = [ - "bitflags", - "cfg-if", - "libc", - "memoffset 0.7.1", - "pin-utils", - "static_assertions", -] - -[[package]] -name = "nodrop" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" - -[[package]] -name = "normalize-line-endings" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" - -[[package]] -name = "nu-ansi-term" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" -dependencies = [ - "overload", - "winapi", -] - -[[package]] -name = "num-traits" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -dependencies = [ - "autocfg", - "libm", -] - -[[package]] -name = "num_cpus" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" -dependencies = [ - "hermit-abi 0.2.6", - "libc", -] - -[[package]] -name = "num_threads" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" -dependencies = [ - "libc", -] - -[[package]] -name = "nutmeg" -version = "0.1.3-pre" -source = "git+https://github.com/sourcefrog/nutmeg#2d10f07580e038040f9ea72b0cc9cc65b3316104" -dependencies = [ - "atty", - "parking_lot", - "terminal_size", - "yansi", -] - -[[package]] -name = "once_cell" -version = "1.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" - -[[package]] -name = "ordered-float" -version = "3.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fc2dbde8f8a79f2102cc474ceb0ad68e3b80b85289ea62389b60e66777e4213" -dependencies = [ - "num-traits", -] - -[[package]] -name = "output_vt100" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66" -dependencies = [ - "winapi", -] - -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "windows-sys 0.45.0", -] - -[[package]] -name = "percent-encoding" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" - -[[package]] -name = "pin-project-lite" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "portable-atomic" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc59d1bcc64fc5d021d67521f818db868368028108d37f0e98d74e33f68297b5" - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "predicates" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09963355b9f467184c04017ced4a2ba2d75cbcb4e7462690d388233253d4b1a9" -dependencies = [ - "anstyle", - "difflib", - "float-cmp", - "itertools", - "normalize-line-endings", - "predicates-core", - "regex", -] - -[[package]] -name = "predicates-core" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" - -[[package]] -name = "predicates-tree" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" -dependencies = [ - "predicates-core", - "termtree", -] - -[[package]] -name = "pretty_assertions" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755" -dependencies = [ - "ctor", - "diff", - "output_vt100", - "yansi", -] - -[[package]] -name = "proc-macro2" -version = "0.4.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" -dependencies = [ - "unicode-xid", -] - -[[package]] -name = "proc-macro2" -version = "1.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa1fb82fc0c281dd9671101b66b771ebbe1eaf967b96ac8740dcba4b70005ca8" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "proptest" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e35c06b98bf36aba164cc17cb25f7e232f5c4aeea73baa14b8a9f0d92dbfa65" -dependencies = [ - "bit-set", - "bitflags", - "byteorder", - "lazy_static", - "num-traits", - "rand", - "rand_chacha", - "rand_xorshift", - "regex-syntax 0.6.29", - "rusty-fork", - "tempfile", - "unarray", -] - -[[package]] -name = "proptest-derive" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90b46295382dc76166cb7cf2bb4a97952464e4b7ed5a43e6cd34e1fec3349ddc" -dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "syn 0.15.44", -] - -[[package]] -name = "quanta" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cc73c42f9314c4bdce450c77e6f09ecbddefbeddb1b5979ded332a3913ded33" -dependencies = [ - "crossbeam-utils", - "libc", - "mach2", - "once_cell", - "raw-cpuid", - "wasi", - "web-sys", - "winapi", -] - -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - -[[package]] -name = "quote" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" -dependencies = [ - "proc-macro2 0.4.30", -] - -[[package]] -name = "quote" -version = "1.0.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" -dependencies = [ - "proc-macro2 1.0.58", -] - -[[package]] -name = "radix_trie" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd" -dependencies = [ - "endian-type", - "nibble_vec", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rand_xorshift" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" -dependencies = [ - "rand_core", -] - -[[package]] -name = "raw-cpuid" -version = "10.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332" -dependencies = [ - "bitflags", -] - -[[package]] -name = "rayon" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", - "num_cpus", -] - -[[package]] -name = "readahead-iterator" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73ea134c32fe12df286020949d57d052a90c4001f2dbec4c1c074f39bcb7fc8c" - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags", -] - -[[package]] -name = "regex" -version = "1.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1a59b5d8e97dee33696bf13c5ba8ab85341c002922fba050069326b9c498974" -dependencies = [ - "aho-corasick 1.0.1", - "memchr", - "regex-syntax 0.7.2", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", -] - -[[package]] -name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - -[[package]] -name = "regex-syntax" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" - -[[package]] -name = "rstest" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de1bb486a691878cd320c2f0d319ba91eeaa2e894066d8b5f8f117c000e9d962" -dependencies = [ - "rstest_macros", - "rustc_version", -] - -[[package]] -name = "rstest_macros" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290ca1a1c8ca7edb7c3283bd44dc35dd54fdec6253a3912e201ba1072018fca8" -dependencies = [ - "cfg-if", - "proc-macro2 1.0.58", - "quote 1.0.27", - "rustc_version", - "syn 1.0.109", - "unicode-ident", -] - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - -[[package]] -name = "rustix" -version = "0.37.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" -dependencies = [ - "bitflags", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "windows-sys 0.48.0", -] - -[[package]] -name = "rusty-fork" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f" -dependencies = [ - "fnv", - "quick-error", - "tempfile", - "wait-timeout", -] - -[[package]] -name = "ryu" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "semver" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" - -[[package]] -name = "serde" -version = "1.0.163" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.163" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" -dependencies = [ - "proc-macro2 1.0.58", - "quote 1.0.27", - "syn 2.0.16", -] - -[[package]] -name = "serde_json" -version = "1.0.96" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "sharded-slab" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "sketches-ddsketch" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a406c1882ed7f29cd5e248c9848a80e7cb6ae0fea82346d2746f2f941c07e1" - -[[package]] -name = "smallvec" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" - -[[package]] -name = "snap" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831" - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "syn" -version = "0.15.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" -dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "unicode-xid", -] - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2 1.0.58", - "quote 1.0.27", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01" -dependencies = [ - "proc-macro2 1.0.58", - "quote 1.0.27", - "unicode-ident", -] - -[[package]] -name = "tempfile" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" -dependencies = [ - "cfg-if", - "fastrand", - "redox_syscall 0.3.5", - "rustix", - "windows-sys 0.45.0", -] - -[[package]] -name = "terminal_size" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" -dependencies = [ - "rustix", - "windows-sys 0.48.0", -] - -[[package]] -name = "termtree" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" - -[[package]] -name = "thiserror" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" -dependencies = [ - "proc-macro2 1.0.58", - "quote 1.0.27", - "syn 2.0.16", -] - -[[package]] -name = "thousands" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bf63baf9f5039dadc247375c29eb13706706cfde997d0330d05aa63a77d8820" - -[[package]] -name = "thread_local" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "time" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc" -dependencies = [ - "itoa", - "libc", - "num_threads", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" - -[[package]] -name = "time-macros" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" -dependencies = [ - "time-core", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "tracing" -version = "0.1.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" -dependencies = [ - "cfg-if", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-appender" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e" -dependencies = [ - "crossbeam-channel", - "time", - "tracing-subscriber", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" -dependencies = [ - "proc-macro2 1.0.58", - "quote 1.0.27", - "syn 2.0.16", -] - -[[package]] -name = "tracing-core" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" -dependencies = [ - "once_cell", - "valuable", -] - -[[package]] -name = "tracing-log" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" -dependencies = [ - "lazy_static", - "log", - "tracing-core", -] - -[[package]] -name = "tracing-serde" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" -dependencies = [ - "serde", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" -dependencies = [ - "matchers", - "nu-ansi-term", - "once_cell", - "regex", - "serde", - "serde_json", - "sharded-slab", - "smallvec", - "thread_local", - "time", - "tracing", - "tracing-core", - "tracing-log", - "tracing-serde", -] - -[[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 1.0.27", - "syn 1.0.109", -] - -[[package]] -name = "unarray" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" - -[[package]] -name = "unicode-bidi" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" - -[[package]] -name = "unicode-ident" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-xid" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" - -[[package]] -name = "unix_mode" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35abed4630bb800f02451a7428205d1f37b8e125001471bfab259beee6a587ed" - -[[package]] -name = "url" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[package]] -name = "users" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24cc0f6d6f267b73e5a2cadf007ba8f9bc39c6a6f9666f8cf25ea809a153b032" -dependencies = [ - "libc", - "log", -] - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "wait-timeout" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" -dependencies = [ - "libc", -] - -[[package]] -name = "walkdir" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" -dependencies = [ - "same-file", - "winapi-util", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2 1.0.58", - "quote 1.0.27", - "syn 2.0.16", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" -dependencies = [ - "quote 1.0.27", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" -dependencies = [ - "proc-macro2 1.0.58", - "quote 1.0.27", - "syn 2.0.16", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" - -[[package]] -name = "web-sys" -version = "0.3.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.0", -] - -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-targets" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" -dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" - -[[package]] -name = "yansi" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" diff --git a/pkgs/tools/backup/conserve/default.nix b/pkgs/tools/backup/conserve/default.nix index 093ad0c8aba66..345bd06e23c05 100644 --- a/pkgs/tools/backup/conserve/default.nix +++ b/pkgs/tools/backup/conserve/default.nix @@ -5,21 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "conserve"; - version = "23.5.0"; + version = "23.9.0"; src = fetchFromGitHub { owner = "sourcefrog"; repo = "conserve"; rev = "v${version}"; - hash = "sha256-OzSTueaw2kWc2e45zckXS2O4bfykREOcz8/PpUIK09w="; + hash = "sha256-QBGuLSW4Uek1ag+QwXvoI8IEDM3j1MAOpScb9tIWrfA="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "nutmeg-0.1.3-pre" = "sha256-WcbQf8DZ9ryY+TWcVObdHj005GvfeMG+wesr6FiCUCE="; - }; - }; + cargoHash = "sha256-fKEktRDydmLJdU2KMDn4T637ogdbvT3OwWCzyIVaymc="; meta = with lib; { description = "Robust portable backup tool in Rust"; diff --git a/pkgs/tools/backup/discordchatexporter-cli/default.nix b/pkgs/tools/backup/discordchatexporter-cli/default.nix index 0216ab6bff367..aca75eab7c4ea 100644 --- a/pkgs/tools/backup/discordchatexporter-cli/default.nix +++ b/pkgs/tools/backup/discordchatexporter-cli/default.nix @@ -8,13 +8,13 @@ buildDotnetModule rec { pname = "discordchatexporter-cli"; - version = "2.40.4"; + version = "2.41.1"; src = fetchFromGitHub { owner = "tyrrrz"; repo = "discordchatexporter"; rev = version; - hash = "sha256-XmUTGVOU67fSX0mZg2f5j8pb6ID7amzJpD4F7u6f3GM="; + hash = "sha256-69Q08KSV77rOHLryG3T4R7bqrl5ypQS0i8sbsP//OUw="; }; projectFile = "DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj"; diff --git a/pkgs/tools/backup/discordchatexporter-cli/deps.nix b/pkgs/tools/backup/discordchatexporter-cli/deps.nix index de52148198c5d..36fe796380439 100644 --- a/pkgs/tools/backup/discordchatexporter-cli/deps.nix +++ b/pkgs/tools/backup/discordchatexporter-cli/deps.nix @@ -6,16 +6,18 @@ (fetchNuGet { pname = "AngleSharp"; version = "1.0.4"; sha256 = "1b4qd0z27fdkgy5l8fqcbpzwm29gmmjm2h0mqb9ac94rv6ynq510"; }) (fetchNuGet { pname = "AsyncKeyedLock"; version = "6.2.1"; sha256 = "0281mj9ppz6q454li6xyllb1hdfkl59bh3psbj4z6l9xjbhnjhz0"; }) (fetchNuGet { pname = "CliFx"; version = "2.3.4"; sha256 = "14nj8w3j0hbsr5cghj39jx2sh5cg3wsvl517dk8whva5kgy3q1mf"; }) + (fetchNuGet { pname = "CSharpier.MsBuild"; version = "0.25.0"; sha256 = "0xpdb2mss9zhdpks9ajm2h611khhw69xjwxv1k6qf7qrbkb0rgr3"; }) (fetchNuGet { pname = "Deorcify"; version = "1.0.2"; sha256 = "0nwxyrl4rd5x621i2hs5fl3w7fxpm13lkdssxr9fd5042px2gqbm"; }) (fetchNuGet { pname = "DotnetRuntimeBootstrapper"; version = "2.5.1"; sha256 = "192795akjmdxvp8p52g256rg0nzriipfsr8j808h69j6himhp4d7"; }) (fetchNuGet { pname = "Gress"; version = "2.1.1"; sha256 = "1svz1flhyl26h3xjch0acjjinympgf6bhj5vpb188njfih3ip4ck"; }) (fetchNuGet { pname = "JsonExtensions"; version = "1.2.0"; sha256 = "0g54hibabbqqfhxjlnxwv1rxagpali5agvnpymp2w3dk8h6q66xy"; }) - (fetchNuGet { pname = "Polly"; version = "7.2.4"; sha256 = "0lvhi2a18p6ay780lbw18656297s9i45cvpp4dr9k5lhg7fwl2y1"; }) - (fetchNuGet { pname = "RazorBlade"; version = "0.4.3"; sha256 = "1wnp7dd1ir9w1ipp424h4f3z832b6i1dx1cljyf1ry9lrb3i91is"; }) + (fetchNuGet { pname = "Polly"; version = "8.0.0"; sha256 = "08wzmkz9qjz61sczmipm8m5j4bg8dg4mbjgspagx4hh28q8mvagn"; }) + (fetchNuGet { pname = "Polly.Core"; version = "8.0.0"; sha256 = "10w6z81kidkdhbwkhyas9kc1zmvz0r3mzcsii01wpydw27v0rzxp"; }) + (fetchNuGet { pname = "RazorBlade"; version = "0.4.4"; sha256 = "1dkyyn58gcrl1sh6mv3g7zqapqg8lb5nzn10aj3vh4l51wpl0l5r"; }) (fetchNuGet { pname = "Spectre.Console"; version = "0.47.0"; sha256 = "0gc9ana660an7d76w9qd8l62lv66dc69vr5lslr896b1313ywakp"; }) (fetchNuGet { pname = "Superpower"; version = "3.0.0"; sha256 = "0p6riay4732j1fahc081dzgs9q4z3n2fpxrin4zfpj6q2226dhz4"; }) (fetchNuGet { pname = "System.Memory"; version = "4.5.5"; sha256 = "08jsfwimcarfzrhlyvjjid61j02irx6xsklf32rv57x2aaikvx0h"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "7.0.0"; sha256 = "0sn6hxdjm7bw3xgsmg041ccchsa4sp02aa27cislw3x61dbr68kq"; }) (fetchNuGet { pname = "WebMarkupMin.Core"; version = "2.14.0"; sha256 = "0c41zw1bwz6ybxagq5vr26cx7najd17rrdbqjpn8mabynq380ayr"; }) - (fetchNuGet { pname = "YoutubeExplode"; version = "6.3.1"; sha256 = "1rkj7rjm8vl4lygfqbil5cgj271wvnhcdpcybb74m6mlf7w7dg1q"; }) + (fetchNuGet { pname = "YoutubeExplode"; version = "6.3.4"; sha256 = "0zlfga8aigxxqa96jmqsp95h5plvxxlgymsrbcl5z1ds9ga0ldkd"; }) ] diff --git a/pkgs/tools/backup/kopia/default.nix b/pkgs/tools/backup/kopia/default.nix index ffdfd8acb6c6e..020902c1a0c60 100644 --- a/pkgs/tools/backup/kopia/default.nix +++ b/pkgs/tools/backup/kopia/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kopia"; - version = "0.13.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-wQZzFrrxLzJ16TOrhxBlUuz+eCdqW/PmHUTuJP1Wy9Y="; + hash = "sha256-ELnop8/f7/4E5FnWwGrPJt3n9YhSG1jei1tAt3zr1KI="; }; - vendorHash = "sha256-OeDgaO125y8eCQlm9Lv5RZlb1fNLTCplEQbpJ2KMVms="; + vendorHash = "sha256-8NTAnkIJkFKyjQL7KBoCqtSBog9Hz1vPBo81u8YcA1A="; doCheck = false; diff --git a/pkgs/tools/backup/mtx/default.nix b/pkgs/tools/backup/mtx/default.nix index b8476954949e5..683bee11067da 100644 --- a/pkgs/tools/backup/mtx/default.nix +++ b/pkgs/tools/backup/mtx/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.3.12"; src = fetchurl { - url = "mirror://gentoo/distfiles/mtx-${version}.tar.gz"; + url = "mirror://sourceforge/${pname}/${pname}-stable/${version}/${pname}-${version}.tar.gz"; sha256 = "0261c5e90b98b6138cd23dadecbc7bc6e2830235145ed2740290e1f35672d843"; }; diff --git a/pkgs/tools/backup/percona-xtrabackup/8_0.nix b/pkgs/tools/backup/percona-xtrabackup/8_0.nix index d5e1389d618e9..5bdfd864daca7 100644 --- a/pkgs/tools/backup/percona-xtrabackup/8_0.nix +++ b/pkgs/tools/backup/percona-xtrabackup/8_0.nix @@ -1,8 +1,8 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "8.0.29-22"; - sha256 = "sha256-dGpfU+IesAyr2s1AEjfYggOEkMGQ9JdEesu5PtJHNXA="; + version = "8.0.34-29"; + hash = "sha256-dO5ciIIAnKj2t+fYhrtnY7MvBThoA+SymBzN8H07giM="; # includes https://github.com/Percona-Lab/libkmip.git fetchSubmodules = true; diff --git a/pkgs/tools/backup/percona-xtrabackup/generic.nix b/pkgs/tools/backup/percona-xtrabackup/generic.nix index 3bcf09ca43f92..112a3f556204a 100644 --- a/pkgs/tools/backup/percona-xtrabackup/generic.nix +++ b/pkgs/tools/backup/percona-xtrabackup/generic.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, bison, boost, cmake, makeWrapper, pkg-config , curl, cyrus_sasl, libaio, libedit, libev, libevent, libgcrypt, libgpg-error, lz4 -, ncurses, numactl, openssl, protobuf, valgrind, xxd, zlib +, ncurses, numactl, openssl, procps, protobuf, valgrind, xxd, zlib , perlPackages -, version, sha256, fetchSubmodules ? false, extraPatches ? [], extraPostInstall ? "", ... +, version, hash, fetchSubmodules ? false, extraPatches ? [], extraPostInstall ? "", ... }: stdenv.mkDerivation rec { @@ -13,14 +13,14 @@ stdenv.mkDerivation rec { owner = "percona"; repo = "percona-xtrabackup"; rev = "${pname}-${version}"; - inherit sha256 fetchSubmodules; + inherit hash fetchSubmodules; }; nativeBuildInputs = [ bison boost cmake makeWrapper pkg-config ]; buildInputs = [ (curl.override { inherit openssl; }) cyrus_sasl libaio libedit libevent libev libgcrypt libgpg-error lz4 - ncurses numactl openssl protobuf valgrind xxd zlib + ncurses numactl openssl procps protobuf valgrind xxd zlib ] ++ (with perlPackages; [ perl DBI DBDmysql ]); patches = extraPatches; @@ -52,6 +52,6 @@ stdenv.mkDerivation rec { homepage = "http://www.percona.com/software/percona-xtrabackup"; license = licenses.lgpl2; platforms = platforms.linux; - maintainers = with maintainers; [ izorkin ]; + maintainers = teams.flyingcircus.members ++ [ maintainers.izorkin ]; }; } diff --git a/pkgs/tools/bluetooth/bluewalker/default.nix b/pkgs/tools/bluetooth/bluewalker/default.nix index ed2a5796444e2..6cc25523d74c6 100644 --- a/pkgs/tools/bluetooth/bluewalker/default.nix +++ b/pkgs/tools/bluetooth/bluewalker/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "jtaimisto"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wAzBlCczsLfHboGYIsyN7dGwz52CMw+L3XQ0njfLVR0="; + hash = "sha256-wAzBlCczsLfHboGYIsyN7dGwz52CMw+L3XQ0njfLVR0="; }; - vendorSha256 = "189qs6vmx63vwsjmc4qgf1y8xjsi7x6l1f5c3kd8j8jnagl26z4h"; + vendorHash = "sha256-kHwj6FNWIonaHKy4QE0/UcuOfHAPE1al5nuYXrfROKE="; ldflags = [ "-w" diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix index 3d15cbd395c40..263478e4ba3cd 100644 --- a/pkgs/tools/compression/brotli/default.nix +++ b/pkgs/tools/compression/brotli/default.nix @@ -1,8 +1,8 @@ { lib , stdenv , fetchFromGitHub -, cmake , fetchpatch +, cmake , staticOnly ? stdenv.hostPlatform.isStatic , testers }: @@ -11,23 +11,27 @@ stdenv.mkDerivation (finalAttrs: { pname = "brotli"; - version = "1.0.9"; + version = "1.1.0"; src = fetchFromGitHub { owner = "google"; repo = "brotli"; rev = "v${finalAttrs.version}"; - sha256 = "z6Dhrabav1MDQ4rAcXaDv0aN+qOoh9cvoXZqEWBB13c="; + hash = "sha256-MvceRcle2dSkkucC2PlsCizsIf8iv95d8Xjqew266wc="; }; - nativeBuildInputs = [ cmake ]; + patches = [ + # revert runpath change, breaks curl on darwin: + # https://github.com/NixOS/nixpkgs/pull/254532#issuecomment-1722337476 + (fetchpatch { + name = "revert-runpath.patch"; + url = "https://github.com/google/brotli/commit/f842c1bcf9264431cd3b15429a72b7dafbe80509.patch"; + hash = "sha256-W3LY3EjoHP74YsKOOcYQrzo+f0HbooOvEbnOibtN6TM="; + revert = true; + }) + ]; - patches = lib.optional staticOnly (fetchpatch { - # context from https://github.com/google/brotli/pull/655 - # updated patch from https://github.com/google/brotli/pull/655 - url = "https://github.com/google/brotli/commit/47a554804ceabb899ae924aaee54df806053d0d1.patch"; - sha256 = "sOeXNVsCaBSD9i82GRUDrkyreGeQ7qaJWjjy/uLL0/0="; - }); + nativeBuildInputs = [ cmake ]; cmakeFlags = lib.optional staticOnly "-DBUILD_SHARED_LIBS=OFF"; @@ -37,17 +41,6 @@ stdenv.mkDerivation (finalAttrs: { checkTarget = "test"; - # This breaks on Darwin because our cmake hook tries to make a build folder - # and the wonderful bazel BUILD file is already there (yay case-insensitivity?) - prePatch = '' - rm BUILD - - # Upstream fixed this reference to runtime-path after the release - # and with this references g++ complains about invalid option -R - sed -i 's/ -R''${libdir}//' scripts/libbrotli*.pc.in - cat scripts/libbrotli*.pc.in - ''; - # Don't bother with "man" output for now, # it currently only makes the manpages hard to use. postInstall = '' diff --git a/pkgs/tools/compression/mozlz4a/default.nix b/pkgs/tools/compression/mozlz4a/default.nix index 2116fa45c3ef5..834b7698cf85f 100644 --- a/pkgs/tools/compression/mozlz4a/default.nix +++ b/pkgs/tools/compression/mozlz4a/default.nix @@ -1,16 +1,23 @@ -{ lib, stdenv, fetchurl, python3, runtimeShell }: +{ lib +, stdenv +, fetchurl +, python3 +, runtimeShell +}: stdenv.mkDerivation rec { pname = "mozlz4a"; - version = "2018-08-23"; - # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) + version = "2022-03-19"; + src = fetchurl { - url = "https://gist.githubusercontent.com/kaefer3000/73febe1eec898cd50ce4de1af79a332a/raw/a266410033455d6b4af515d7a9d34f5afd35beec/mozlz4a.py"; - sha256 = "1d1ai062kdms34bya9dlykkx011rj8d8nh5l7d76xj8k9kv4ssq6"; + url = "https://gist.githubusercontent.com/Tblue/62ff47bef7f894e92ed5/raw/c12fce199a97ecb214eb913cc5d762eac2e92c57/mozlz4a.py"; + hash = "sha256-Igj9u6TmV+nIuSg8gI8zD4hTb/Iiog/3aB3DDk0Lqkg="; }; dontUnpack = true; + buildInputs = [ python3 python3.pkgs.lz4 ]; + installPhase = '' mkdir -p "$out/bin" "$out/${python3.sitePackages}/" cp "${src}" "$out/${python3.sitePackages}/mozlz4a.py" @@ -21,13 +28,11 @@ stdenv.mkDerivation rec { chmod a+x "$out/bin/mozlz4a" ''; - buildInputs = [ python3 python3.pkgs.lz4 ]; - - meta = { - description = "A script to handle Mozilla's mozlz4 files"; - license = lib.licenses.bsd2; - maintainers = [lib.maintainers.raskin lib.maintainers.pshirshov lib.maintainers.kira-bruneau]; - platforms = lib.platforms.unix; - homepage = "https://gist.githubusercontent.com/Tblue/62ff47bef7f894e92ed5"; + meta = with lib; { + description = "MozLz4a compression/decompression utility"; + license = licenses.bsd2; + maintainers = with maintainers; [ kira-bruneau pshirshov raskin ]; + platforms = python3.meta.platforms; + homepage = "https://gist.github.com/Tblue/62ff47bef7f894e92ed5"; }; } diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 50a42f777bf41..879075101b2c2 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "sha256-2suygTboJYavgCIFJjpCjD0ZQXeLw/3JsbOG6hLrkE4="; + sha256 = "sha256-xViy3dQ/V0ei9ctirtPlxQmXA4hkhaSAMQ/tRpjTYQw="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/filesystems/curlftpfs/default.nix b/pkgs/tools/filesystems/curlftpfs/default.nix index f1e08f0362d25..1263ccb8565ef 100644 --- a/pkgs/tools/filesystems/curlftpfs/default.nix +++ b/pkgs/tools/filesystems/curlftpfs/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { # it is known to cause problems. Search online for "rpl_malloc" and # "rpl_realloc" to find out more. ./fix-rpl_malloc.patch + ./suse-bug-580609.patch + ./suse-bug-955687.patch ]; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/tools/filesystems/curlftpfs/suse-bug-580609.patch b/pkgs/tools/filesystems/curlftpfs/suse-bug-580609.patch new file mode 100644 index 0000000000000..068fb129a4b1b --- /dev/null +++ b/pkgs/tools/filesystems/curlftpfs/suse-bug-580609.patch @@ -0,0 +1,10 @@ +--- a/ftpfs.c 2008-04-30 01:05:47.000000000 +0200 ++++ b/ftpfs.c 2010-05-21 13:01:42.569006163 +0200 +@@ -503,7 +503,6 @@ static void *ftpfs_write_thread(void *da + + curl_easy_setopt_or_die(fh->write_conn, CURLOPT_URL, fh->full_path); + curl_easy_setopt_or_die(fh->write_conn, CURLOPT_UPLOAD, 1); +- curl_easy_setopt_or_die(fh->write_conn, CURLOPT_INFILESIZE, -1); + curl_easy_setopt_or_die(fh->write_conn, CURLOPT_READFUNCTION, write_data_bg); + curl_easy_setopt_or_die(fh->write_conn, CURLOPT_READDATA, fh); + curl_easy_setopt_or_die(fh->write_conn, CURLOPT_LOW_SPEED_LIMIT, 1); diff --git a/pkgs/tools/filesystems/curlftpfs/suse-bug-955687.patch b/pkgs/tools/filesystems/curlftpfs/suse-bug-955687.patch new file mode 100644 index 0000000000000..b198c586e0cb1 --- /dev/null +++ b/pkgs/tools/filesystems/curlftpfs/suse-bug-955687.patch @@ -0,0 +1,11 @@ +--- a/ftpfs.c ++++ b/ftpfs.c +@@ -614,6 +614,8 @@ static void free_ftpfs_file(struct ftpfs + sem_destroy(&fh->data_need); + sem_destroy(&fh->data_written); + sem_destroy(&fh->ready); ++ if (fh->buf.size) { buf_free(&fh->buf); } ++ if (fh->stream_buf.size) { buf_free(&fh->stream_buf); } + free(fh); + } + diff --git a/pkgs/tools/filesystems/duperemove/default.nix b/pkgs/tools/filesystems/duperemove/default.nix index 0bf0f77880fe0..e44e961e3aeb6 100644 --- a/pkgs/tools/filesystems/duperemove/default.nix +++ b/pkgs/tools/filesystems/duperemove/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "duperemove"; - version = "0.12"; + version = "0.13"; src = fetchFromGitHub { owner = "markfasheh"; repo = "duperemove"; rev = "v${version}"; - hash = "sha256-VPwcWAENCRnU51F78FhMPjQZaCTewQRUdeFwK1blJbs="; + hash = "sha256-D3+p8XgokKIHEwZnvOkn7cionVH1gsypcURF+PBpugY="; }; postPatch = '' diff --git a/pkgs/tools/filesystems/erofs-utils/default.nix b/pkgs/tools/filesystems/erofs-utils/default.nix index a10addbfa51ef..163439c903edb 100644 --- a/pkgs/tools/filesystems/erofs-utils/default.nix +++ b/pkgs/tools/filesystems/erofs-utils/default.nix @@ -1,20 +1,20 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, fuse, util-linux, lz4 +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, fuse, util-linux, lz4, zlib , fuseSupport ? stdenv.isLinux }: stdenv.mkDerivation rec { pname = "erofs-utils"; - version = "1.6"; + version = "1.7"; outputs = [ "out" "man" ]; src = fetchurl { url = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot/erofs-utils-${version}.tar.gz"; - sha256 = "sha256-2/Gtrv8buFMrKacsip4ZGTjJOJlGdw3HY9PFnm8yBXE="; + hash = "sha256-tutSm7Qj6y3XecnanCYyhVSItLkeI1U6Mc4j8Rycziw="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ util-linux lz4 ] + buildInputs = [ util-linux lz4 zlib ] ++ lib.optionals fuseSupport [ fuse ]; configureFlags = lib.optionals fuseSupport [ "--enable-fuse" ]; diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix index e9cb2d8912b17..0af1a965fc4e6 100644 --- a/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/pkgs/tools/filesystems/gcsfuse/default.nix @@ -42,6 +42,6 @@ buildGoModule rec { homepage = "https://cloud.google.com/storage/docs/gcs-fuse"; changelog = "https://github.com/GoogleCloudPlatform/gcsfuse/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ aaronjheng ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/filesystems/go-mtpfs/default.nix b/pkgs/tools/filesystems/go-mtpfs/default.nix index 115928e4979ca..f82e5b7c362a7 100644 --- a/pkgs/tools/filesystems/go-mtpfs/default.nix +++ b/pkgs/tools/filesystems/go-mtpfs/default.nix @@ -28,7 +28,7 @@ buildGoModule rec { description = "A simple FUSE filesystem for mounting Android devices as a MTP device"; homepage = "https://github.com/hanwen/go-mtpfs"; license = licenses.bsd3; - maintainers = with maintainers; [ aaronjheng ]; + maintainers = with maintainers; [ ]; broken = stdenv.isDarwin; }; } diff --git a/pkgs/tools/filesystems/juicefs/default.nix b/pkgs/tools/filesystems/juicefs/default.nix index 62565385558e2..5df6986380b78 100644 --- a/pkgs/tools/filesystems/juicefs/default.nix +++ b/pkgs/tools/filesystems/juicefs/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "juicefs"; - version = "1.0.4"; + version = "1.1.0"; src = fetchFromGitHub { owner = "juicedata"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Bez9wwAPDyYYECDwW9CB/ACTGUJl6PW3YiipIGY0Zbo="; + sha256 = "sha256-UtERYOjAKOTK+A1qPdD1PajOkf/t5vqWRBvEuxkZmdg="; }; - vendorHash = "sha256-dsKNFIXcSeYUyh1TO1h1Ze3jS97pdhn2eU9hHjTARCo="; + vendorHash = "sha256-BpqxCCuWyUgzPyh7sq3/HyQ29qm/PWD7mQFh1nkkAkA="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/tools/filesystems/littlefs-fuse/default.nix b/pkgs/tools/filesystems/littlefs-fuse/default.nix index daec12b50411c..637e24483d8ec 100644 --- a/pkgs/tools/filesystems/littlefs-fuse/default.nix +++ b/pkgs/tools/filesystems/littlefs-fuse/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "littlefs-fuse"; - version = "2.4.1"; + version = "2.7.2"; src = fetchFromGitHub { owner = "littlefs-project"; repo = pname; rev = "v${version}"; - hash = "sha256-+EUZluBtgZiziTEIfXIhkRIBu/Pe78qmL18TQHkfHO4="; + hash = "sha256-ybaZbAomrIaEdYfQtbZirkozRarEUxjsf6hgTMu5uIY="; }; buildInputs = [ fuse ]; installPhase = '' diff --git a/pkgs/tools/filesystems/mergerfs/default.nix b/pkgs/tools/filesystems/mergerfs/default.nix index b48db16b8fdf0..e2e6e28e3b621 100644 --- a/pkgs/tools/filesystems/mergerfs/default.nix +++ b/pkgs/tools/filesystems/mergerfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mergerfs"; - version = "2.37.0"; + version = "2.37.1"; src = fetchFromGitHub { owner = "trapexit"; repo = pname; rev = version; - sha256 = "sha256-IJcTzEKFMSAryG44Rpwgl0toxFxNyyJyaVC8MO1Dv7M="; + sha256 = "sha256-4WowGrmFDDpmZlAVH73oiKBdgQeqEkbwZCaDSd1rAEc="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/filesystems/rar2fs/default.nix b/pkgs/tools/filesystems/rar2fs/default.nix index 2c987ccef0c3b..3b42a7890fbdf 100644 --- a/pkgs/tools/filesystems/rar2fs/default.nix +++ b/pkgs/tools/filesystems/rar2fs/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , autoreconfHook , fuse @@ -25,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ fuse unrar ]; configureFlags = [ - "--with-unrar=${unrar.dev}/include/unrar" + "--with-unrar=${unrar.src}/unrar" "--disable-static-unrar" ]; @@ -33,7 +34,7 @@ stdenv.mkDerivation rec { description = "FUSE file system for reading RAR archives"; homepage = "https://hasse69.github.io/rar2fs/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ kraem ]; + maintainers = with maintainers; [ kraem wegank ]; platforms = with platforms; linux ++ freebsd; }; } diff --git a/pkgs/tools/filesystems/stuffbin/default.nix b/pkgs/tools/filesystems/stuffbin/default.nix index 442307fad65b3..2640ba8b85197 100644 --- a/pkgs/tools/filesystems/stuffbin/default.nix +++ b/pkgs/tools/filesystems/stuffbin/default.nix @@ -4,7 +4,7 @@ buildGoModule rec { pname = "stuffbin"; version = "1.1.0"; - vendorSha256 = null; + vendorHash = null; src = fetchFromGitHub { owner = "knadh"; diff --git a/pkgs/tools/filesystems/zkfuse/default.nix b/pkgs/tools/filesystems/zkfuse/default.nix index c58dbff9ac733..320ccde4cc539 100644 --- a/pkgs/tools/filesystems/zkfuse/default.nix +++ b/pkgs/tools/filesystems/zkfuse/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan ztzg ]; + maintainers = with maintainers; [ ztzg ]; license = licenses.asl20; }; } diff --git a/pkgs/tools/games/minecraft/minecraft-server-hibernation/default.nix b/pkgs/tools/games/minecraft/minecraft-server-hibernation/default.nix index 4e39edd83efa8..ff0e7873827b9 100644 --- a/pkgs/tools/games/minecraft/minecraft-server-hibernation/default.nix +++ b/pkgs/tools/games/minecraft/minecraft-server-hibernation/default.nix @@ -2,24 +2,35 @@ buildGoModule rec { pname = "minecraft-server-hibernation"; - version = "2.4.10"; + version = "2.5.0"; src = fetchFromGitHub { owner = "gekware"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hflPVO+gqHr0jDrhWzd7t/E6WsswiMKMHCkTUK4E05k="; + hash = "sha256-b6LeqjIraIasHBpaVgy8esl4NV8rdBrfO7ewgeIocS8="; }; - vendorHash = "sha256-W6P7wz1FGL6Os1zmmqWJ7/sO8zizfnwg+TMiFWGHIOM="; + vendorHash = null; ldflags = [ "-s" "-w" ]; + checkFlags = + let + skippedTests = [ + # Disable tests requiring network access + "Test_getPing" + "Test_getReqType" + "Test_QueryBasic" + "Test_QueryFull" + ]; + in + [ "-skip" "${builtins.concatStringsSep "|" skippedTests}" ]; + meta = with lib; { description = "Autostart and stop minecraft-server when players join/leave"; homepage = "https://github.com/gekware/minecraft-server-hibernation"; license = licenses.gpl3Only; - platforms = platforms.linux; maintainers = with maintainers; [ squarepear ]; }; } diff --git a/pkgs/tools/graphics/astc-encoder/default.nix b/pkgs/tools/graphics/astc-encoder/default.nix index 5e63038e67dbe..4403ab255dd38 100644 --- a/pkgs/tools/graphics/astc-encoder/default.nix +++ b/pkgs/tools/graphics/astc-encoder/default.nix @@ -40,8 +40,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + cmakeBuildType = "RelWithDebInfo"; + cmakeFlags = isaFlags ++ [ - "-DCMAKE_BUILD_TYPE=RelWithDebInfo" "-DASTCENC_UNIVERSAL_BUILD=OFF" ]; diff --git a/pkgs/tools/graphics/gifski/Cargo.lock b/pkgs/tools/graphics/gifski/Cargo.lock index 6209f6b193b10..bc5b95bc75aad 100644 --- a/pkgs/tools/graphics/gifski/Cargo.lock +++ b/pkgs/tools/graphics/gifski/Cargo.lock @@ -20,31 +20,39 @@ dependencies = [ ] [[package]] +name = "aho-corasick" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" +dependencies = [ + "memchr", +] + +[[package]] name = "anstream" -version = "0.3.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6342bd4f5a1205d7f41e94a41a901f5647c938cdfa96036338e8533c9d6c2450" +checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", - "is-terminal", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" +checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46" [[package]] name = "anstyle-parse" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" dependencies = [ "utf8parse", ] @@ -60,9 +68,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "1.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" dependencies = [ "anstyle", "windows-sys", @@ -70,9 +78,9 @@ dependencies = [ [[package]] name = "arrayvec" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "autocfg" @@ -108,15 +116,18 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bytemuck" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] [[package]] name = "cexpr" @@ -146,38 +157,30 @@ dependencies = [ [[package]] name = "clap" -version = "4.2.5" +version = "4.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a1f23fa97e1d1641371b51f35535cb26959b8e27ab50d167a8b996b5bada819" +checksum = "b1d7b8d5ec32af0fadc644bf1fd509a688c2103b185644bb1e29d164e0703136" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.2.5" +version = "4.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fdc5d93c358224b4d6867ef1356d740de2303e9892edc06c5340daeccd96bab" +checksum = "5179bb514e4d7c2051749d8fcefa2ed6d06a9f4e6d69faf3805f5d80b8cf8d56" dependencies = [ "anstream", "anstyle", - "bitflags", "clap_lex", - "once_cell", "strsim", ] [[package]] name = "clap_lex" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" - -[[package]] -name = "color_quant" -version = "1.1.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" +checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" [[package]] name = "colorchoice" @@ -217,9 +220,9 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.14" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", "cfg-if", @@ -230,9 +233,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if", ] @@ -245,36 +248,15 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "either" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" - -[[package]] -name = "errno" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "fallible_collections" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9acf77205554f3cfeca94a4b910e159ad9824e8c2d164de02b3f12495cc1074d" +checksum = "a88c69768c0a15262df21899142bc6df9b9b823546d4b4b9a7bc2d6c448ec6fd" dependencies = [ "hashbrown", ] @@ -305,9 +287,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", "miniz_oxide", @@ -319,15 +301,14 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" dependencies = [ - "color_quant", "weezl", ] [[package]] name = "gif-dispose" -version = "4.0.0" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a40dfdf5be59e0cbbf77cb7c6a91a18ee6d398b70fc54ad900e2bcba1860cb50" +checksum = "347afae04a03ca25a3a76d130abb63e7e6e7367b895470fdc3d996aec916c3d7" dependencies = [ "gif", "imgref", @@ -346,7 +327,7 @@ dependencies = [ [[package]] name = "gifski" -version = "1.11.0" +version = "1.12.2" dependencies = [ "clap", "crossbeam-channel", @@ -387,24 +368,15 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "imagequant" -version = "4.2.0" +version = "4.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc3c62f251799ae51bbd7a94fc00a83fcb796d8dd14876280e3063e8341138dc" +checksum = "9427afad20d287aad11e5981db8beb68d0a20e2e4cbd8280e05f95e05b31668a" dependencies = [ "arrayvec", "num_cpus", @@ -421,29 +393,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2cf49df1085dcfb171460e4592597b84abe50d900fb83efb6e41b20fefd6c2c" [[package]] -name = "io-lifetimes" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" -dependencies = [ - "hermit-abi 0.3.1", - "libc", - "windows-sys", -] - -[[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", -] - -[[package]] name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -457,9 +406,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.142" +version = "0.2.148" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317" +checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" [[package]] name = "libloading" @@ -472,16 +421,10 @@ dependencies = [ ] [[package]] -name = "linux-raw-sys" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b64f40e5e03e0d54f03845c8197d0291253cdbedfb1cb46b13c2c117554a9f4c" - -[[package]] name = "lodepng" -version = "3.7.2" +version = "3.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0ad39f75bbaa4b10bb6f2316543632a8046a5bcf9c785488d79720b21f044f8" +checksum = "73c81862c9e16a943631de5160969379758f13fb3c788110db4ab49430b4feab" dependencies = [ "crc32fast", "fallible_collections", @@ -492,24 +435,24 @@ dependencies = [ [[package]] name = "loop9" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a703804431e5927454bcaf2b2a162595e95db931130c2728c18d050090f69940" +checksum = "81a837f917de41d61ab531ba255d1913208d02325cab0d6a66a706e0dbaa699d" dependencies = [ "imgref", ] [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" [[package]] name = "memoffset" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] @@ -547,28 +490,28 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", ] [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi", "libc", ] [[package]] name = "once_cell" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "pbr" @@ -589,15 +532,15 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "pkg-config" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "proc-macro2" -version = "1.0.56" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" dependencies = [ "unicode-ident", ] @@ -610,18 +553,18 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" [[package]] name = "quote" -version = "1.0.26" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] [[package]] name = "rayon" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -629,38 +572,50 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] name = "regex" -version = "1.8.1" +version = "1.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" +checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" dependencies = [ + "aho-corasick", + "memchr", "regex-syntax", ] [[package]] name = "regex-syntax" -version = "0.7.1" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "resize" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87e7bdfff05e26408cf8f82fe896ce3d7624f0c0b06c84b2f1009c50452ead41" +checksum = "8ce43c0220eff4793a20c120ff89ee01499ba3c882957021dcdc12f5e4ca97c8" dependencies = [ - "fallible_collections", + "rayon", "rgb", ] @@ -680,30 +635,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] -name = "rustix" -version = "0.37.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bbfc1d1c7c40c01715f47d71444744a81669ca84e8b63e25a55e169b1f86433" -dependencies = [ - "bitflags", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "windows-sys", -] - -[[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "shlex" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" +checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" [[package]] name = "strsim" @@ -734,9 +675,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "utf8parse" @@ -764,9 +705,9 @@ checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" [[package]] name = "wild" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b116685a6be0c52f5a103334cbff26db643826c7b3735fc0a3ba9871310a74" +checksum = "10d01931a94d5a115a53f95292f51d316856b68a035618eb831bbba593a30b67" dependencies = [ "glob", ] @@ -804,9 +745,9 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -819,42 +760,42 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" diff --git a/pkgs/tools/graphics/gifski/default.nix b/pkgs/tools/graphics/gifski/default.nix index 437bb414ef3d2..ed3c332cc452b 100644 --- a/pkgs/tools/graphics/gifski/default.nix +++ b/pkgs/tools/graphics/gifski/default.nix @@ -1,20 +1,19 @@ { lib , rustPlatform , fetchFromGitHub -, stdenv , pkg-config , ffmpeg }: rustPlatform.buildRustPackage rec { pname = "gifski"; - version = "1.11.0"; + version = "1.12.2"; src = fetchFromGitHub { owner = "ImageOptim"; repo = "gifski"; rev = version; - hash = "sha256-sPsq/hntNqOdPJcoob1jrDUrLLiBEnfRoDANyFUjOuM="; + hash = "sha256-KiedPhlPcFkTiZZfOBlTKqtzU2ND1HXdsfhq+F1MtdU="; }; cargoLock = { @@ -45,11 +44,6 @@ rustPlatform.buildRustPackage rec { # checkType = "debug"; - # error: linker `/usr/bin/x86_64-linux-gnu-gcc` not found - postPatch = '' - rm .cargo/config.toml; - ''; - meta = with lib; { description = "GIF encoder based on libimagequant (pngquant)"; homepage = "https://gif.ski/"; diff --git a/pkgs/tools/graphics/gmic-qt/default.nix b/pkgs/tools/graphics/gmic-qt/default.nix index 535a7cdd74f15..cbaecdf0b8a4c 100644 --- a/pkgs/tools/graphics/gmic-qt/default.nix +++ b/pkgs/tools/graphics/gmic-qt/default.nix @@ -95,9 +95,9 @@ stdenv.mkDerivation (finalAttrs: { ''; cmakeFlags = [ - "-DGMIC_QT_HOST=${if variant == "standalone" then "none" else variant}" - "-DENABLE_SYSTEM_GMIC=ON" - "-DENABLE_DYNAMIC_LINKING=ON" + (lib.cmakeFeature "GMIC_QT_HOST" (if variant == "standalone" then "none" else variant)) + (lib.cmakeBool "ENABLE_SYSTEM_GMIC" true) + (lib.cmakeBool "ENABLE_DYNAMIC_LINKING" true) ]; postFixup = lib.optionalString (variant == "gimp") '' @@ -135,8 +135,11 @@ stdenv.mkDerivation (finalAttrs: { homepage = "http://gmic.eu/"; inherit (variants.${variant}) description; license = lib.licenses.gpl3Plus; - maintainers = [ lib.maintainers.lilyinstarlight ]; - platforms = lib.platforms.unix; mainProgram = "gmic_qt"; + maintainers = [ + lib.maintainers.AndersonTorres + lib.maintainers.lilyinstarlight + ]; + platforms = lib.platforms.unix; }; }) diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index a5d3b53b5ec11..59022bcca5057 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -64,10 +64,10 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DBUILD_LIB_STATIC=OFF" - "-DENABLE_CURL=OFF" - "-DENABLE_DYNAMIC_LINKING=ON" - "-DUSE_SYSTEM_CIMG=ON" + (lib.cmakeBool "BUILD_LIB_STATIC" false) + (lib.cmakeBool "ENABLE_CURL" false) + (lib.cmakeBool "ENABLE_DYNAMIC_LINKING" true) + (lib.cmakeBool "USE_SYSTEM_CIMG" true) ]; postPatch = '' @@ -115,7 +115,10 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gmic.eu/"; description = "Open and full-featured framework for image processing"; license = lib.licenses.cecill21; - maintainers = [ lib.maintainers.lilyinstarlight ]; + maintainers = [ + lib.maintainers.AndersonTorres + lib.maintainers.lilyinstarlight + ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index ec5dde5d4c882..f76919b0bc550 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -21,11 +21,11 @@ let in (if withQt then mkDerivation else stdenv.mkDerivation) rec { pname = "gnuplot"; - version = "5.4.8"; + version = "5.4.9"; src = fetchurl { url = "mirror://sourceforge/gnuplot/${pname}-${version}.tar.gz"; - sha256 = "sha256-kxJ5x8qtGv99RstHZvH/QcJtm+na8Lzwx53u7j2R9c8="; + sha256 = "sha256-oyigIfU9wFRZvmBmAg6acejqtiVdM4HiJpYSDUZcapc="; }; nativeBuildInputs = [ makeWrapper pkg-config texinfo ] ++ lib.optional withQt qttools; diff --git a/pkgs/tools/graphics/mangohud/default.nix b/pkgs/tools/graphics/mangohud/default.nix index e64d2b457ba97..e42ca26cfb08b 100644 --- a/pkgs/tools/graphics/mangohud/default.nix +++ b/pkgs/tools/graphics/mangohud/default.nix @@ -3,7 +3,6 @@ , fetchFromGitLab , fetchFromGitHub , fetchurl -, fetchpatch , substituteAll , coreutils , curl @@ -16,6 +15,7 @@ , mangohud32 , addOpenGLRunpath , appstream +, git , glslang , mako , meson @@ -31,13 +31,13 @@ , glfw , xorg , gamescopeSupport ? true # build mangoapp and mangohudctl -, lowerBitnessSupport ? stdenv.hostPlatform.is64bit # Support 32 bit on 64bit +, lowerBitnessSupport ? stdenv.hostPlatform.isx86_64 # Support 32 bit on 64bit , nix-update-script }: let # Derived from subprojects/cmocka.wrap - cmocka = rec { + cmocka = { version = "1.81"; src = fetchFromGitLab { owner = "cmocka"; @@ -79,14 +79,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "mangohud"; - version = "0.6.9-1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "flightlessmango"; repo = "MangoHud"; rev = "refs/tags/v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-AX4m1XZ+yXp74E3slFGyI3CGu2eYU+eXNN2EY+ivdfk="; + hash = "sha256-KkMN7A3AcS/v+b9GCs0pI6MBBk3WwOMciaoiBzL5xOQ="; }; outputs = [ "out" "doc" "man" ]; @@ -124,13 +124,6 @@ stdenv.mkDerivation (finalAttrs: { libdbus = dbus.lib; inherit hwdata; }) - - # Pull gcc-13 build fix for nissing <cstdint> - (fetchpatch { - name = "gcc-13.patch"; - url = "https://github.com/flightlessmango/MangoHud/commit/3f8f036ee8773ae1af23dd0848b6ab487b5ac7de.patch"; - hash = "sha256-qbNywAXAStGiVZ1LA5qZyNp4n28iNUuE4N69zXv2gmM="; - }) ]; postPatch = '' @@ -140,6 +133,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals lowerBitnessSupport [ mangohud32 ])} \ + --subst-var-by version "${finalAttrs.version}" \ --subst-var-by dataDir ${placeholder "out"}/share ( @@ -161,6 +155,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ addOpenGLRunpath + git glslang mako meson diff --git a/pkgs/tools/graphics/mangohud/preload-nix-workaround.patch b/pkgs/tools/graphics/mangohud/preload-nix-workaround.patch index e360d8c1876ad..f38e1703973d5 100644 --- a/pkgs/tools/graphics/mangohud/preload-nix-workaround.patch +++ b/pkgs/tools/graphics/mangohud/preload-nix-workaround.patch @@ -1,24 +1,24 @@ diff --git a/bin/mangohud.in b/bin/mangohud.in -index f975224..24936eb 100755 +index 6c3c6e8..8847cdc 100755 --- a/bin/mangohud.in +++ b/bin/mangohud.in -@@ -8,16 +8,18 @@ if [ "$#" -eq 0 ]; then +@@ -8,10 +8,10 @@ if [ "$#" -eq 0 ]; then exit 1 fi --MANGOHUD_LIB_NAME="@ld_libdir_mangohud@libMangoHud.so" -+MANGOHUD_LIB_NAME="libMangoHud.so" +-MANGOHUD_LIB_NAME="@ld_libdir_mangohud@libMangoHud_opengl.so" ++MANGOHUD_LIB_NAME="libMangoHud_opengl.so" if [ "$1" = "--dlsym" ]; then - MANGOHUD_DLSYM=1 - MANGOHUD_LIB_NAME="@ld_libdir_mangohud@libMangoHud_dlsym.so:${MANGOHUD_LIB_NAME}" + MANGOHUD_LIB_NAME="libMangoHud_dlsym.so:${MANGOHUD_LIB_NAME}" shift fi - # Preload using the plain filenames of the libs, the dynamic linker will - # figure out whether the 32 or 64 bit version should be used - LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}${MANGOHUD_LIB_NAME}" +@@ -31,5 +31,7 @@ case ":${LD_PRELOAD-}:" in + LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}${MANGOHUD_LIB_NAME}" + esac + +LD_LIBRARY_PATH="@libraryPath@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" +XDG_DATA_DIRS="@dataDir@${XDG_DATA_DIRS:+:$XDG_DATA_DIRS}" diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index 973aa41d5ca2c..f4fc086d86a6c 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation { # Determine version and revision from: # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced pname = "netpbm"; - version = "11.3.4"; + version = "11.3.5"; outputs = [ "bin" "out" "dev" ]; src = fetchsvn { url = "https://svn.code.sf.net/p/netpbm/code/advanced"; - rev = "4606"; - sha256 = "raWpqPlORgL5vBkmHbvj7UCrGjpPLulWjeTuaPnuB98="; + rev = "4636"; + sha256 = "x9q7xhBhpWJfS3fbSEZE7ctnv+gL8U2IMy3GLiTEqag="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/graphics/plotutils/c++17-register-usage-fix.patch b/pkgs/tools/graphics/plotutils/c++17-register-usage-fix.patch new file mode 100644 index 0000000000000..c83409221ac2e --- /dev/null +++ b/pkgs/tools/graphics/plotutils/c++17-register-usage-fix.patch @@ -0,0 +1,44 @@ +diff -ur a/pic2plot/gram.cc b/pic2plot/gram.cc +--- a/pic2plot/gram.cc 2000-06-28 00:23:21.000000000 -0400 ++++ b/pic2plot/gram.cc 2023-09-07 22:59:47.004460065 -0400 +@@ -1229,9 +1229,9 @@ + char *from; + unsigned int count; + { +- register char *f = from; +- register char *t = to; +- register int i = count; ++ char *f = from; ++ char *t = to; ++ int i = count; + + while (i-- > 0) + *t++ = *f++; +@@ -1244,9 +1244,9 @@ + static void + __yy_memcpy (char *to, char *from, unsigned int count) + { +- register char *t = to; +- register char *f = from; +- register int i = count; ++ char *t = to; ++ char *f = from; ++ int i = count; + + while (i-- > 0) + *t++ = *f++; +@@ -1289,10 +1289,10 @@ + yyparse(YYPARSE_PARAM_ARG) + YYPARSE_PARAM_DECL + { +- register int yystate; +- register int yyn; +- register short *yyssp; +- register YYSTYPE *yyvsp; ++ int yystate; ++ int yyn; ++ short *yyssp; ++ YYSTYPE *yyvsp; + int yyerrstatus; /* number of tokens to shift before error messages enabled */ + int yychar1 = 0; /* lookahead token as an internal (translated) token number */ + diff --git a/pkgs/tools/graphics/plotutils/default.nix b/pkgs/tools/graphics/plotutils/default.nix index 57cfe988b0b7f..29b4c4b35fe90 100644 --- a/pkgs/tools/graphics/plotutils/default.nix +++ b/pkgs/tools/graphics/plotutils/default.nix @@ -16,7 +16,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ libpng ]; - patches = map fetchurl (import ./debian-patches.nix); + patches = map fetchurl (import ./debian-patches.nix) + # `pic2plot/gram.cc` uses the register storage class specifier, which is not supported in C++17. + # This prevents clang 16 from building plotutils because it defaults to C++17. + ++ [ ./c++17-register-usage-fix.patch ]; preBuild = '' # Fix parallel building. diff --git a/pkgs/tools/graphics/pngquant/default.nix b/pkgs/tools/graphics/pngquant/default.nix index 908ad26fa6a66..9a33e4282b2fb 100644 --- a/pkgs/tools/graphics/pngquant/default.nix +++ b/pkgs/tools/graphics/pngquant/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/kornelski/pngquant/raw/${version}/CHANGELOG"; platforms = platforms.unix; license = with licenses; [ gpl3Plus hpnd bsd2 ]; + mainProgram = "pngquant"; maintainers = [ maintainers.srapenne ]; }; } diff --git a/pkgs/tools/graphics/resvg/default.nix b/pkgs/tools/graphics/resvg/default.nix index af86e9d46ba73..539e3faebfdc8 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.35.0"; + version = "0.36.0"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - hash = "sha256-iZY0t8GssM4doPnPiI+FdAdjmfXDxSUT7K9YUHBs8rQ="; + hash = "sha256-KxEeC9E1XG5ascIWzSAoNXtdJyPiEsXcQGebmhs/qkE="; }; - cargoHash = "sha256-F7XeBto+vqfhucG7fygRkQWTQe7iwUuVyPTzdyXI7Lc="; + cargoHash = "sha256-iiPtf1xEBB80Cs31uUEbxG9YgKItdZCNGS6TTgrj4uM="; cargoBuildFlags = [ "--package=resvg" @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "An SVG rendering library"; homepage = "https://github.com/RazrFalcon/resvg"; - changelog = "https://github.com/RazrFalcon/resvg/raw/v${version}/CHANGELOG.md"; + changelog = "https://github.com/RazrFalcon/resvg/blob/v${version}/CHANGELOG.md"; license = licenses.mpl20; maintainers = [ maintainers.marsam ]; }; diff --git a/pkgs/tools/graphics/svg2pdf/default.nix b/pkgs/tools/graphics/svg2pdf/default.nix index 764ab301ed65a..5952bb615ec63 100644 --- a/pkgs/tools/graphics/svg2pdf/default.nix +++ b/pkgs/tools/graphics/svg2pdf/default.nix @@ -5,15 +5,15 @@ rustPlatform.buildRustPackage rec { pname = "svg2pdf"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "typst"; repo = "svg2pdf"; rev = "v${version}"; - hash = "sha256-XTOGxuytbkaq4ZV6rXKJF9A/KSX6naYQ3kdICDQU4JA="; + hash = "sha256-iN6/VO6EMP9wMoTn4t0y1Oq9XP9Q3UcRNCWsMzI4Fn8="; }; - cargoHash = "sha256-CQPkVJ3quQlnIS05tAj+i7kGk2l0RvGM/FRNvgQ0mHM="; + cargoHash = "sha256-Xxb8DeTAmw0Pq4mrLVcpEuzq7/SX+AlUSWoA2dcVQJA="; buildFeatures = [ "cli" ]; meta = with lib; { diff --git a/pkgs/tools/graphics/unpaper/default.nix b/pkgs/tools/graphics/unpaper/default.nix index b7fe0f6955ca6..b4f298fadce2e 100644 --- a/pkgs/tools/graphics/unpaper/default.nix +++ b/pkgs/tools/graphics/unpaper/default.nix @@ -53,6 +53,7 @@ stdenv.mkDerivation rec { description = "Post-processing tool for scanned sheets of paper"; license = licenses.gpl2; platforms = platforms.all; + mainProgram = "unpaper"; maintainers = [ maintainers.rycee ]; }; } diff --git a/pkgs/tools/inputmethods/fcitx5/default.nix b/pkgs/tools/inputmethods/fcitx5/default.nix index 9ce0eda43cce2..136550548e645 100644 --- a/pkgs/tools/inputmethods/fcitx5/default.nix +++ b/pkgs/tools/inputmethods/fcitx5/default.nix @@ -43,13 +43,13 @@ let in stdenv.mkDerivation rec { pname = "fcitx5"; - version = "5.1.0"; + version = "5.1.1"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-tnYyHhldPmMZcygpcOcbaYFQbRQjPr/FlvyYfRylTmQ="; + hash = "sha256-R8stzpfQttBZFFSu8ikUz/2eL+b98/X672uVFsha9H0="; }; prePatch = '' diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix index 1fca5fdc77f96..0e1a5fa9598b0 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fcitx5-anthy"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { url = "https://download.fcitx-im.org/fcitx5/fcitx5-anthy/${pname}-${version}.tar.xz"; - sha256 = "sha256-tyWxNhCreJaAc+IUH85iayo8OALcY0ytFc7Aa8Ye80M="; + sha256 = "sha256-kUelkzVr1zOC4bbNP2EFPnhtygkJnKCFdlHeSkBGLGw="; }; nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ]; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix index 8077a48dcfd81..bcb1a6ac50944 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix @@ -31,13 +31,13 @@ in mkDerivation rec { pname = "fcitx5-chinese-addons"; - version = "5.1.0"; + version = "5.1.1"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-Z5X/yKxj8jX/einrebkP6rSCSrKvaQ7vOlbmT1IKXfY="; + sha256 = "sha256-XC8NQYVvGhh6GFrKtJi9GeBHxWrtw9DJzeeDvKAQEdk="; }; cmakeFlags = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix index b2b6716a3b66c..264587f3e7bc4 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix @@ -21,13 +21,13 @@ mkDerivation rec { pname = "fcitx5-configtool"; - version = "5.1.0"; + version = "5.1.1"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-kjoAcoqLJ8XHMI6NUr5DZfltWfX3GPco3VGseze6qbw="; + sha256 = "sha256-5f75UTGCWsuMdZKhssSpUiVaRR05YY0bumVUNq2wJtY="; }; cmakeFlags = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix index 7da946b0518c7..788023bf0b063 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix @@ -9,13 +9,13 @@ }: stdenv.mkDerivation rec { pname = "fcitx5-lua"; - version = "5.0.10"; + version = "5.0.11"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-0ESgQv8kyc+zv/tDZtBZ+QhFFswD80ApwswFlJs8tOU="; + sha256 = "sha256-FgRETT4YLA/B/5mBAJxyF2WI8TM0J51vdlJeoiJST1M="; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix index 7d627772d9705..e922bc533c2ca 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "fcitx5-qt"; - version = "5.1.0"; + version = "5.1.1"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-LWOELt1uo5TtM85ppxt6MK7fvUuocHkWXYjUE1yyOV4="; + sha256 = "sha256-IkaaLFMyPVaL5taRN4e+QxMEsNhhXlA1fWBn/6PeGnI="; }; preConfigure = '' diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix index 665c76561454c..0e62a1ae366f9 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "fcitx5-rime"; - version = "5.1.1"; + version = "5.1.2"; src = fetchurl { url = "https://download.fcitx-im.org/fcitx5/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-qo0m/asTranm70PHPLwWCn/jX+FWNEGRKBRNNW+B28A="; + hash = "sha256-0WcBM6kOKATuh6I8yEzl+HkK5/k4Ku6brZ+s1ncKlpw="; }; cmakeFlags = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix index 61f12faf5e642..141bd185afc32 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-unikey"; - version = "5.1.0"; + version = "5.1.1"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5-unikey"; rev = version; - sha256 = "sha256-X00/jGtbApWtS9+S6lTXJ0+BK7SUsLA1sKxq0vW1VNE="; + sha256 = "sha256-9t8YYYGTiY+HteoRI1m833ITcbYb/KpHczyUd8lllc8="; }; nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ]; diff --git a/pkgs/tools/inputmethods/fusuma/Gemfile b/pkgs/tools/inputmethods/fusuma/Gemfile index 9aa2c3ac71a89..deeb923579641 100644 --- a/pkgs/tools/inputmethods/fusuma/Gemfile +++ b/pkgs/tools/inputmethods/fusuma/Gemfile @@ -1,2 +1,17 @@ source 'https://rubygems.org' gem "fusuma" +gem "fusuma-plugin-appmatcher" +gem "fusuma-plugin-keypress" +gem "fusuma-plugin-sendkey" +gem "fusuma-plugin-tap" +gem "fusuma-plugin-wmctrl" + +# I've not activated the following plugins for the reasons given below. + +# touchscreen needs specific h/w support I don't have access to, so I can't confirm +# if it's problem free. A quick check didn't reveal any problems. +#gem "fusuma-plugin-touchscreen" + +# thumbsense pulls in remap, and at best remap requires further configuration to allow the use access to event devices. +#gem "fusuma-plugin-thumbsense" +#gem "fusuma-plugin-remap" diff --git a/pkgs/tools/inputmethods/fusuma/Gemfile.lock b/pkgs/tools/inputmethods/fusuma/Gemfile.lock index 86cbfcfc5d88a..e6055e890d474 100644 --- a/pkgs/tools/inputmethods/fusuma/Gemfile.lock +++ b/pkgs/tools/inputmethods/fusuma/Gemfile.lock @@ -2,12 +2,34 @@ GEM remote: https://rubygems.org/ specs: fusuma (3.1.0) + fusuma-plugin-appmatcher (0.6.0) + fusuma (~> 3.0) + rexml + ruby-dbus + fusuma-plugin-keypress (0.8.0) + fusuma (~> 2.0) + fusuma-plugin-sendkey (0.10.1) + fusuma (~> 3.1) + revdev + fusuma-plugin-tap (0.4.2) + fusuma (~> 2.0) + fusuma-plugin-wmctrl (1.3.1) + fusuma (~> 3.1) + revdev (0.2.1) + rexml (3.2.5) + ruby-dbus (0.19.0) + rexml PLATFORMS ruby DEPENDENCIES fusuma + fusuma-plugin-appmatcher + fusuma-plugin-keypress + fusuma-plugin-sendkey + fusuma-plugin-tap + fusuma-plugin-wmctrl BUNDLED WITH - 2.1.4 + 2.4.6 diff --git a/pkgs/tools/inputmethods/fusuma/gemset.nix b/pkgs/tools/inputmethods/fusuma/gemset.nix index bcb624aa5841e..a118e56687d4f 100644 --- a/pkgs/tools/inputmethods/fusuma/gemset.nix +++ b/pkgs/tools/inputmethods/fusuma/gemset.nix @@ -9,4 +9,90 @@ }; version = "3.1.0"; }; + fusuma-plugin-appmatcher = { + dependencies = ["fusuma" "rexml" "ruby-dbus"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "28e8c59d5984a5723510f19868c37c363bec93e51f6cb7a573170cf7f5b9189f"; + type = "gem"; + }; + version = "0.6.0"; + }; + fusuma-plugin-keypress = { + dependencies = ["fusuma"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "045c1820d909307abb1d232c0cf26bbd88eafa0453004124c07b15fff5d680de"; + type = "gem"; + }; + version = "0.8.0"; + }; + fusuma-plugin-sendkey = { + dependencies = ["fusuma" "revdev"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "f792fec194b611d5d79b93b6694876292c43bee55635d9422f885b6509eeb765"; + type = "gem"; + }; + version = "0.10.1"; + }; + fusuma-plugin-tap = { + dependencies = ["fusuma"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jlw08iw20fpykjglzj4c2fy3z13zsnmi63zbfpn0gmvs05869ys"; + type = "gem"; + }; + version = "0.4.2"; + }; + fusuma-plugin-wmctrl = { + dependencies = ["fusuma"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "067939b2d8b99cf8fce43be40341cda3de3371596a8a4fb24eb13ca84c0bffe5"; + type = "gem"; + }; + version = "1.3.1"; + }; + revdev = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1b6zg6vqlaik13fqxxcxhd4qnkfgdjnl4wy3a1q67281bl0qpsz9"; + type = "gem"; + }; + version = "0.2.1"; + }; + rexml = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + type = "gem"; + }; + version = "3.2.5"; + }; + ruby-dbus = { + dependencies = ["rexml"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18zbsr03drpx7mknm927i2kz5b49s0lwmrbmsdknfa674z0xy6sm"; + type = "gem"; + }; + version = "0.19.0"; + }; } diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix index 620ea55e2e556..8e072ffeb3b46 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "ibus-table"; - version = "1.17.0"; + version = "1.17.3"; src = fetchFromGitHub { owner = "kaio"; repo = "ibus-table"; rev = version; - sha256 = "sha256-6zuSb/oNUAozzUmrIdSR6FH8xXds07MTpRVU4A19chc="; + sha256 = "sha256-rolnpjJojtL+0tUbZIQgL1IIkv+d3MoMWoedfEMpr8A="; }; postPatch = '' diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix index 0ce6215b4964e..30dcfb864ca49 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix @@ -13,13 +13,13 @@ in stdenv.mkDerivation rec { pname = "ibus-typing-booster"; - version = "2.24.0"; + version = "2.24.1"; src = fetchFromGitHub { owner = "mike-fabian"; repo = "ibus-typing-booster"; rev = version; - hash = "sha256-C9RUkA/gb3jhRGfYXX6rzCnYenSkAVdNvR1+O0u9Av8="; + hash = "sha256-gG2wuoJoEOsnvcPJkravpsJ746/0r9wAEo2Vft3bEoo="; }; nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook gobject-introspection ]; diff --git a/pkgs/tools/llm/heygpt/default.nix b/pkgs/tools/llm/heygpt/default.nix new file mode 100644 index 0000000000000..053f5b90e8b38 --- /dev/null +++ b/pkgs/tools/llm/heygpt/default.nix @@ -0,0 +1,34 @@ +{ + fetchFromGitHub, + lib, + openssl, + rustPlatform, +}: +rustPlatform.buildRustPackage rec { + pname = "heygpt"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "fuyufjh"; + repo = pname; + rev = "v${version}"; + hash = "sha256-Gtbb0G7tV+cjbq/74dnZKIwWZgNfSJl0My6F4OmAdhU="; + }; + + cargoSha256 = "sha256-ON6+gU+KsI2QFQjwxPRcbMClaAGrjVJ33mVuf0jSro8="; + + nativeBuildInputs = [openssl]; + + # Needed to get openssl-sys to use pkg-config. + OPENSSL_NO_VENDOR = 1; + OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib"; + OPENSSL_DIR = "${lib.getDev openssl}"; + + meta = with lib; { + description = "A simple command-line interface for ChatGPT API."; + homepage = "https://github.com/fuyufjh/heygpt"; + license = licenses.mit; + mainProgram = pname; + maintainers = with maintainers; [aldoborrero]; + }; +} diff --git a/pkgs/tools/llm/open-interpreter/default.nix b/pkgs/tools/llm/open-interpreter/default.nix index 281f77bf2a500..f5353c6506841 100644 --- a/pkgs/tools/llm/open-interpreter/default.nix +++ b/pkgs/tools/llm/open-interpreter/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub }: let - version = "0.1.3"; + version = "0.1.4"; in python3.pkgs.buildPythonApplication { pname = "open-interpreter"; @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication { owner = "KillianLucas"; repo = "open-interpreter"; rev = "v${version}"; - hash = "sha256-xmmyDIshEYql41k/7gF+ay7s3mI+iGCjr5gDfLkqLU0="; + hash = "sha256-3a4pRV8o+NBZGgOuXng97KjRVU8xVqBp+B9sXsCqHtk="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/asciinema-agg/Cargo.lock b/pkgs/tools/misc/asciinema-agg/Cargo.lock index f23b7500cc109..a1feb20f9a47b 100644 --- a/pkgs/tools/misc/asciinema-agg/Cargo.lock +++ b/pkgs/tools/misc/asciinema-agg/Cargo.lock @@ -10,7 +10,7 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "agg" -version = "1.4.2" +version = "1.4.3" dependencies = [ "anyhow", "avt", @@ -152,8 +152,8 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "avt" -version = "0.6.0" -source = "git+https://github.com/asciinema/avt.git?tag=v0.6.0#168627cf65999720a6fce122e3419da0147d9296" +version = "0.8.0" +source = "git+https://github.com/asciinema/avt.git?tag=v0.8.0#aaec6a11896551296d2f49078f432756e8a0529d" dependencies = [ "rgb", "serde", diff --git a/pkgs/tools/misc/asciinema-agg/default.nix b/pkgs/tools/misc/asciinema-agg/default.nix index 923768504c755..516051e11920d 100644 --- a/pkgs/tools/misc/asciinema-agg/default.nix +++ b/pkgs/tools/misc/asciinema-agg/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "agg"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "asciinema"; repo = "agg"; rev = "v${version}"; - sha256 = "sha256-pyXGWSL2HnRfcLo1V/pFKNI08B51ZvmJsYhl893CUl0="; + sha256 = "sha256-WCUYnveTWWQOzhIViMkSnyQ6vgLs5HDLWa/xvfZMh3A="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "avt-0.6.0" = "sha256-JA1Ln90Pew6m5YOZp8weOC9JdKJqjFG0PDPNL2kDWUc="; + "avt-0.8.0" = "sha256-5IN8P/2UWJ2EmkbbTSGWECTqiD8TeOd8LgwLZ+W2z90="; }; }; diff --git a/pkgs/tools/misc/asdf-vm/default.nix b/pkgs/tools/misc/asdf-vm/default.nix index 092607f8cbe59..1247039e8c64e 100644 --- a/pkgs/tools/misc/asdf-vm/default.nix +++ b/pkgs/tools/misc/asdf-vm/default.nix @@ -37,13 +37,13 @@ ${asdfReshimFile} ''; in stdenv.mkDerivation rec { pname = "asdf-vm"; - version = "0.12.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "asdf-vm"; repo = "asdf"; rev = "v${version}"; - sha256 = "sha256-9U8B6KRn27RrMqWXAUTTy+hrOgMv5Ii4YGsOZeX5Bl0="; + sha256 = "sha256-9Levs1Wr7Lohhvpy+1Xq3AYyf7+VsBalvAAA7qq6heI="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/aspcud/default.nix b/pkgs/tools/misc/aspcud/default.nix index e3f75693803c3..cd290d5e085e5 100644 --- a/pkgs/tools/misc/aspcud/default.nix +++ b/pkgs/tools/misc/aspcud/default.nix @@ -27,7 +27,6 @@ stdenv.mkDerivation rec { buildInputs = [ boost clingo re2c ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DASPCUD_GRINGO_PATH=${clingo}/bin/gringo" "-DASPCUD_CLASP_PATH=${clingo}/bin/clasp" ]; diff --git a/pkgs/tools/misc/bepasty/default.nix b/pkgs/tools/misc/bepasty/default.nix index dc4b25b5475bc..9bf8c8e3ae16f 100644 --- a/pkgs/tools/misc/bepasty/default.nix +++ b/pkgs/tools/misc/bepasty/default.nix @@ -2,15 +2,33 @@ , python3 , fetchPypi }: +let + # bepasty 1.2 needs xstatic-font-awesome < 5, see + # https://github.com/bepasty/bepasty-server/issues/305 + bepastyPython = python3.override { + self = bepastyPython; + packageOverrides = self: super: { + xstatic-font-awesome = super.xstatic-font-awesome.overridePythonAttrs(oldAttrs: rec { + version = "4.7.0.0"; + src = oldAttrs.src.override { + inherit version; + sha256 = "sha256-4B+0gMqqfHlj3LMyikcA5jG+9gcNsOi2hYFtIg5oX2w="; + }; + }); + }; + }; + #We need to use buildPythonPackage here to get the PYTHONPATH build correctly. #This is needed for services.bepasty #https://github.com/NixOS/nixpkgs/pull/38300 -with python3.pkgs; buildPythonPackage rec { +in with bepastyPython.pkgs; buildPythonPackage rec { pname = "bepasty"; - version = "1.1.0"; + version = "1.2.0"; + format = "pyproject"; propagatedBuildInputs = [ flask + markupsafe pygments setuptools xstatic @@ -28,16 +46,29 @@ with python3.pkgs; buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-f5tRq48tCqjzOGq7Z2T2U1zwQN121N9ap+xPxHWZyvU="; + sha256 = "sha256-R3bvrl/tOP0S9m6X+MwYK6fMQ51cI6W5AoxyYZ8aZ/w="; }; nativeCheckInputs = [ - pytest + build + codecov + flake8 + pytestCheckHook + pytest-cov selenium + tox + twine ]; - # No tests in sdist - doCheck = false; + disabledTestPaths = [ + # Can be enabled when werkzeug is updated to >2.2, see #245145 + # and https://github.com/bepasty/bepasty-server/pull/303 + "src/bepasty/tests/test_rest_server.py" + + # These require a web browser + "src/bepasty/tests/screenshots.py" + "src/bepasty/tests/test_website.py" + ]; meta = { homepage = "https://github.com/bepasty/bepasty-server"; diff --git a/pkgs/tools/misc/bkt/default.nix b/pkgs/tools/misc/bkt/default.nix index e359ab2fd3328..61926352ce334 100644 --- a/pkgs/tools/misc/bkt/default.nix +++ b/pkgs/tools/misc/bkt/default.nix @@ -4,16 +4,16 @@ }: rustPlatform.buildRustPackage rec { pname = "bkt"; - version = "0.6.1"; + version = "0.7.1"; src = fetchFromGitHub { owner = "dimo414"; repo = pname; rev = version; - sha256 = "sha256-NgNXuTpI1EzgmxKRsqzxTOlQi75BHCcbjFnouhnfDDM="; + sha256 = "sha256-CMCO1afTWhXlWpy9D7txqI1FHxGDgdVdkKtyei6oFJU="; }; - cargoSha256 = "sha256-PvcKviyXtiHQCHgJLGR2Mr+mPpTd06eKWQ5h6eGdl40="; + cargoHash = "sha256-T4JT8GzKqsQQfe3zfst6gNEvdY7zs2h2H3s6slaRhYY="; meta = { description = "A subprocess caching utility"; diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 16222050f30af..39790d653813f 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.25.1"; + version = "1.26.1"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - hash = "sha256-CgWng5b0w6LGt2m9bx3IVMxOXwqYjgsIddTQdBnN/IY="; + hash = "sha256-IqDcE6P4DSH/A4TKzPoLZsO00t0zGPCutM0yVI41nrM="; }; - cargoHash = "sha256-xcUDg2vfGq4nmdbN6kFfWwbwaH/WqdLpIO0qrvQ7/t4="; + cargoHash = "sha256-Lo/O/q2kGioWxkRJ/c9jWAHSm2Y839RsK4NM4qP576c="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/misc/calamares-nixos-extensions/default.nix b/pkgs/tools/misc/calamares-nixos-extensions/default.nix index 455d1b223a7ca..885ce09575aa5 100644 --- a/pkgs/tools/misc/calamares-nixos-extensions/default.nix +++ b/pkgs/tools/misc/calamares-nixos-extensions/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "calamares-nixos-extensions"; - version = "0.3.12"; + version = "0.3.13"; src = fetchFromGitHub { owner = "NixOS"; repo = "calamares-nixos-extensions"; rev = version; - sha256 = "qNRlUz4+xxNNzyswKHOjbkaLx0qi8fiAly94fMOlryE="; + sha256 = "YCtm7OzPdhtV7/fQijJfZvZyX7oEk92F34CK2lnRHnI="; }; installPhase = '' diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index 00a06b857b0de..a82d62aed0df7 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -51,7 +51,6 @@ mkDerivation rec { "-DPYTHON_LIBRARY=${python}/lib/lib${python.libPrefix}.so" "-DPYTHON_INCLUDE_DIR=${python}/include/${python.libPrefix}" "-DCMAKE_VERBOSE_MAKEFILE=True" - "-DCMAKE_BUILD_TYPE=Release" "-DWITH_PYTHONQT:BOOL=ON" ]; diff --git a/pkgs/tools/misc/cf-terraforming/default.nix b/pkgs/tools/misc/cf-terraforming/default.nix index 05f8586a1455f..70e6aa04e6f46 100644 --- a/pkgs/tools/misc/cf-terraforming/default.nix +++ b/pkgs/tools/misc/cf-terraforming/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cf-terraforming"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cf-terraforming"; rev = "v${version}"; - sha256 = "sha256-s2xsFJ+8ivkdG2F52iRdTbJDEw8ALmFDR7Ct6d84p+s="; + sha256 = "sha256-9aGN3TP4bMz4V0MRrNFxMm16k9RfvU5iDVwe+Ws4Ask="; }; - vendorHash = "sha256-pe5ieCstUe3ZHlJs83lzwNS2qAIhIGJG9E5P4Ri3E/s="; + vendorHash = "sha256-fswT6t2LP6gRmCHrSHVJGdNc6gic3rMSrE+STe5oiyQ="; ldflags = [ "-X github.com/cloudflare/cf-terraforming/internal/app/cf-terraforming/cmd.versionString=${version}" ]; # The test suite insists on downloading a binary release of Terraform from diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index f700f0477333e..9f75753e89889 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.38.0"; + version = "2.40.0"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - hash = "sha256-s8E+Nva/lsZ/jPzDuGRN0P8JOeJPUK6Xj6bHqiozwNA="; + hash = "sha256-0FzhIsCsOVoQpxpxl83Ei8v8ANbanltLi5nvOt0kWsA="; }; - vendorHash = "sha256-UFEpP5I++8+F8OTMqm5G6/2Kn31Q2U3+8g0deeLMWDc="; + vendorHash = "sha256-941uw/7NoVnW3Ul5bAJLyvQ+RrNoiUVJHpKlfkiGT8c="; doCheck = false; diff --git a/pkgs/tools/misc/claws/default.nix b/pkgs/tools/misc/claws/default.nix index 9d360e40c2a8f..5690ec74d0a25 100644 --- a/pkgs/tools/misc/claws/default.nix +++ b/pkgs/tools/misc/claws/default.nix @@ -19,6 +19,6 @@ buildGoModule rec { homepage = "https://github.com/thehowl/claws"; description = "Interactive command line client for testing websocket servers"; license = licenses.mit; - maintainers = with maintainers; [ aaronjheng ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/misc/clipboard-jh/default.nix b/pkgs/tools/misc/clipboard-jh/default.nix index 9cebe31dd7b88..fe4f18eea8d22 100644 --- a/pkgs/tools/misc/clipboard-jh/default.nix +++ b/pkgs/tools/misc/clipboard-jh/default.nix @@ -42,8 +42,9 @@ stdenv.mkDerivation rec { darwin.apple_sdk.frameworks.AppKit ]; + cmakeBuildType = "MinSizeRel"; + cmakeFlags = [ - "-DCMAKE_BUILD_TYPE='MinSizeRel'" "-Wno-dev" "-DINSTALL_PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/tools/misc/cloud-sql-proxy/default.nix b/pkgs/tools/misc/cloud-sql-proxy/default.nix index 6ee0ca8a8702f..48783fddd6545 100644 --- a/pkgs/tools/misc/cloud-sql-proxy/default.nix +++ b/pkgs/tools/misc/cloud-sql-proxy/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "cloud-sql-proxy"; - version = "2.6.1"; + version = "2.7.0"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "cloud-sql-proxy"; rev = "v${version}"; - hash = "sha256-YbfN9ZdcxP78/dNaONBhb1UqcZYJcet+lHuKmvXk9MI="; + hash = "sha256-4PB9Eaqb8teF+gmiHD2VAIFnxqiK2Nb0u+xSNAM8iMs="; }; subPackages = [ "." ]; - vendorHash = "sha256-2Cu9o26R9y2EBUB9kLf98n2AKFOE7NE1NrcMD+8pvRY="; + vendorHash = "sha256-LaI7IdSyB7ETTjqIcIPDf3noEbvwlN3+KqrkSm8B6m8="; preCheck = '' buildFlagsArray+="-short" diff --git a/pkgs/tools/misc/cod/default.nix b/pkgs/tools/misc/cod/default.nix index e80abc03a794f..c681930032fcb 100644 --- a/pkgs/tools/misc/cod/default.nix +++ b/pkgs/tools/misc/cod/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "dim-an"; repo = pname; rev = "v${version}"; - sha256 = "0wi680sxpv0kp1ggy21qp4c4ms79hw4z9w9kvp278p8z3y8wwglr"; + hash = "sha256-mT7OkR8fXXTE3TPx9AmH6ehKGLk4CP9euBPs2zVAJnI="; }; - vendorSha256 = "0ann1fbh8rqys3rwbz5h9mfnvkpqiw5rgkd4c30y99706h2dzv4i"; + vendorHash = "sha256-kezfBDTgpOTBYKTNlwuP+M5tXU2w/MXz0B5nBJcL1io="; ldflags = [ "-s" "-w" "-X main.GitSha=${src.rev}" ]; diff --git a/pkgs/tools/misc/crudini/default.nix b/pkgs/tools/misc/crudini/default.nix index 1e25413b151f4..fa4e7cc34a484 100644 --- a/pkgs/tools/misc/crudini/default.nix +++ b/pkgs/tools/misc/crudini/default.nix @@ -8,24 +8,16 @@ python3Packages.buildPythonApplication rec { pname = "crudini"; - version = "0.9.4"; + version = "0.9.5"; format = "pyproject"; src = fetchFromGitHub { owner = "pixelb"; repo = "crudini"; rev = version; - hash = "sha256-jbTOaCF/ZqRpM0scDBBAcV5bSYg/QhBPbM9R5cONZ2o="; + hash = "sha256-BU4u7uBsNyDOwWUjOIlBWcf1AeUXXZ+johAe+bjws1U="; }; - patches = [ - (fetchpatch { - name = "add-missing-install-file.patch"; - url = "https://github.com/pixelb/crudini/commit/d433e4d9c4106ae26985e3f4b2efa593bdd5c274.patch"; - hash = "sha256-aDGzoG4i2tvYeL8m1WoqwNFNHe4xR1dGk+XDt3f3i5E="; - }) - ]; - postPatch = '' patchShebangs crudini.py crudini-help tests/test.sh ''; diff --git a/pkgs/tools/misc/dashing/default.nix b/pkgs/tools/misc/dashing/default.nix index 4b960c3fa54ad..7a1541b7e9403 100644 --- a/pkgs/tools/misc/dashing/default.nix +++ b/pkgs/tools/misc/dashing/default.nix @@ -23,6 +23,6 @@ buildGoModule rec { description = "A Dash Generator Script for Any HTML"; homepage = "https://github.com/technosophos/dashing"; license = licenses.mit; - maintainers = with maintainers; [ aaronjheng ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/misc/dbus-map/default.nix b/pkgs/tools/misc/dbus-map/default.nix index 5960ba5c5731e..56f89b2f05311 100644 --- a/pkgs/tools/misc/dbus-map/default.nix +++ b/pkgs/tools/misc/dbus-map/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation { homepage = "https://github.com/taviso/dbusmap"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 7daff3641a041..2b966474346d9 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -245,8 +245,13 @@ python3.pkgs.buildPythonApplication rec { "test_symlink_root" ]; + disabledTestPaths = [ + # fails due to https://github.com/NixOS/nixpkgs/issues/256896 + # should be removed once that issue is resolved in coreboot or diffoscope + "tests/comparators/test_cbfs.py" + ] # Flaky tests on Darwin - disabledTestPaths = lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.isDarwin [ "tests/comparators/test_git.py" "tests/comparators/test_java.py" "tests/comparators/test_uimage.py" diff --git a/pkgs/tools/misc/docui/default.nix b/pkgs/tools/misc/docui/default.nix index dd4dd26efa254..122bc20279ba1 100644 --- a/pkgs/tools/misc/docui/default.nix +++ b/pkgs/tools/misc/docui/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "skanehira"; repo = "docui"; rev = version; - sha256 = "0jya0wdp8scjmsr44krdbbb8q4gplf44gsng1nyn12a6ldqzayxl"; + hash = "sha256-tHv1caNGiWC9Dc/qR4ij9xGM1lotT0KyrpJpdBsHyks="; }; - vendorSha256 = "1ggdczvv03lj0g6cq26vrk1rba6pk0805n85w9hkbjx9c4r3j577"; + vendorHash = "sha256-5xQ5MmGpyzVh4gXZAhCY16iVw8zbCMzMA5IOsPdn7b0="; meta = with lib; { description = "TUI Client for Docker"; diff --git a/pkgs/tools/misc/domine/default.nix b/pkgs/tools/misc/domine/default.nix new file mode 100644 index 0000000000000..cd62b9bd1a744 --- /dev/null +++ b/pkgs/tools/misc/domine/default.nix @@ -0,0 +1,17 @@ +{ buildDartApplication, fetchFromGitHub, lib }: + +buildDartApplication rec { + pname = "domine"; + version = "nightly-2023-08-10"; + + src = fetchFromGitHub { + owner = "breitburg"; + repo = pname; + rev = "d99d02b014d009b0201380a21ddaa57696dc77af"; + sha256 = "038yfa22q7lzz85czmny3c1lkv8mjv4pq62cbmh054fqvgf3k3s4"; + }; + + pubspecLockFile = ./pubspec.lock; + + vendorHash = "16z3paq1nxlnzs20qlljnwa2ff6xfhdqzcq8d8izkl7w1j4hyxgn"; +} diff --git a/pkgs/tools/misc/domine/pubspec.lock b/pkgs/tools/misc/domine/pubspec.lock new file mode 100644 index 0000000000000..56a35ef145484 --- /dev/null +++ b/pkgs/tools/misc/domine/pubspec.lock @@ -0,0 +1,157 @@ +# Generated by pub +# See https://dart.dev/tools/pub/glossary#lockfile +packages: + args: + dependency: "direct main" + description: + name: args + sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596 + url: "https://pub.dev" + source: hosted + version: "2.4.2" + async: + dependency: transitive + description: + name: async + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + url: "https://pub.dev" + source: hosted + version: "2.11.0" + collection: + dependency: transitive + description: + name: collection + sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + url: "https://pub.dev" + source: hosted + version: "1.17.2" + dart_openai: + dependency: "direct main" + description: + name: dart_openai + sha256: "707f6975454513f4a6197125b5a0fbe92ab7cbe4b8ea9111e529a09d7a3ce0c3" + url: "https://pub.dev" + source: hosted + version: "4.0.0" + dio: + dependency: "direct main" + description: + name: dio + sha256: ce75a1b40947fea0a0e16ce73337122a86762e38b982e1ccb909daa3b9bc4197 + url: "https://pub.dev" + source: hosted + version: "5.3.2" + dio_smart_retry: + dependency: "direct main" + description: + name: dio_smart_retry + sha256: "1a2d0cf73ab56bf5998b375cda2d51f45c77268e712e4073f232cdc7753a94b2" + url: "https://pub.dev" + source: hosted + version: "5.0.0" + fetch_api: + dependency: transitive + description: + name: fetch_api + sha256: "7896632eda5af40c4459d673ad601df21d4c3ae6a45997e300a92ca63ec9fe4c" + url: "https://pub.dev" + source: hosted + version: "1.0.1" + fetch_client: + dependency: transitive + description: + name: fetch_client + sha256: "83c07b07a63526a43630572c72715707ca113a8aa3459efbc7b2d366b79402af" + url: "https://pub.dev" + source: hosted + version: "1.0.2" + http: + dependency: transitive + description: + name: http + sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525" + url: "https://pub.dev" + source: hosted + version: "1.1.0" + http_parser: + dependency: transitive + description: + name: http_parser + sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" + url: "https://pub.dev" + source: hosted + version: "4.0.2" + js: + dependency: transitive + description: + name: js + sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 + url: "https://pub.dev" + source: hosted + version: "0.6.7" + lints: + dependency: "direct dev" + description: + name: lints + sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452" + url: "https://pub.dev" + source: hosted + version: "2.1.1" + meta: + dependency: transitive + description: + name: meta + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + url: "https://pub.dev" + source: hosted + version: "1.9.1" + path: + dependency: transitive + description: + name: path + sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + url: "https://pub.dev" + source: hosted + version: "1.8.3" + source_span: + dependency: transitive + description: + name: source_span + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + url: "https://pub.dev" + source: hosted + version: "1.10.0" + string_scanner: + dependency: transitive + description: + name: string_scanner + sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + url: "https://pub.dev" + source: hosted + version: "1.2.0" + term_glyph: + dependency: transitive + description: + name: term_glyph + sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + url: "https://pub.dev" + source: hosted + version: "1.2.1" + tint: + dependency: "direct main" + description: + name: tint + sha256: "9652d9a589f4536d5e392cf790263d120474f15da3cf1bee7f1fdb31b4de5f46" + url: "https://pub.dev" + source: hosted + version: "2.0.1" + typed_data: + dependency: transitive + description: + name: typed_data + sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c + url: "https://pub.dev" + source: hosted + version: "1.3.2" +sdks: + dart: ">=3.0.6 <4.0.0" diff --git a/pkgs/tools/misc/edir/default.nix b/pkgs/tools/misc/edir/default.nix index 6252710fb7356..f6934bae49956 100644 --- a/pkgs/tools/misc/edir/default.nix +++ b/pkgs/tools/misc/edir/default.nix @@ -2,13 +2,22 @@ python3Packages.buildPythonApplication rec { pname = "edir"; - version = "2.16"; + version = "2.22"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "ro1GZkJ6xDZcMRaWTAW/a2qhFbZAxsduvGO3C4sOI+A="; + sha256 = "sha256-Z4p16v0J7mgl1Av8tdUZ6vSILgbOpLHs3rWx2P7AH+E="; }; + nativeBuildInputs = with python3Packages; [ + setuptools-scm + ]; + + propagatedBuildInputs = with python3Packages; [ + platformdirs + ]; + meta = with lib; { description = "Program to rename and remove files and directories using your editor"; homepage = "https://github.com/bulletmark/edir"; diff --git a/pkgs/tools/misc/esphome/dashboard.nix b/pkgs/tools/misc/esphome/dashboard.nix index 7d4fd4cb71ef2..ceb416c652905 100644 --- a/pkgs/tools/misc/esphome/dashboard.nix +++ b/pkgs/tools/misc/esphome/dashboard.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "esphome-dashboard"; - version = "20230711.0"; + version = "20230904.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-00JenOcGttrDDvIIK/iERboiRr7dsg2ibbNAmB4LItU="; + hash = "sha256-b+NlWekNXbGvhLQlQqFtSSsO99J+ldS6NddlK3lykeA="; }; # no tests diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 3fdc11c3a4f23..b791cac21bd48 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -16,14 +16,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2023.8.3"; + version = "2023.9.3"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-qiB3VZzqQeimkLTlTNK2/UFt+YJw9sglfF/ogMl239o="; + hash = "sha256-SyXEiGh1/s9EJ0UPYC8R04JUYkCPhCtNUcGvVCycKGM="; }; postPatch = '' diff --git a/pkgs/tools/misc/etcher/default.nix b/pkgs/tools/misc/etcher/default.nix index 24d0c5c43dfd0..af9d5d6470d27 100644 --- a/pkgs/tools/misc/etcher/default.nix +++ b/pkgs/tools/misc/etcher/default.nix @@ -1,58 +1,48 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl -, gcc-unwrapped -, dpkg -, util-linux , bash +, util-linux +, autoPatchelfHook +, dpkg , makeWrapper +, udev , electron }: -let - inherit (stdenv.hostPlatform) system; - - throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; - - sha256 = { - "x86_64-linux" = "1rcidar97nnpjb163x9snnnhw1z1ld4asgbd5dxpzdh8hikh66ll"; - "i686-linux" = "1jll4i0j9kh78kl10s596xxs60gy7cnlafgpk89861yihj0i73a5"; - }."${system}" or throwSystem; - - arch = { - "x86_64-linux" = "amd64"; - "i686-linux" = "i386"; - }."${system}" or throwSystem; - -in - stdenv.mkDerivation rec { pname = "etcher"; - version = "1.7.9"; + version = "1.18.12"; src = fetchurl { - url = "https://github.com/balena-io/etcher/releases/download/v${version}/balena-etcher-electron_${version}_${arch}.deb"; - inherit sha256; + url = "https://github.com/balena-io/etcher/releases/download/v${version}/balena-etcher_${version}_amd64.deb"; + hash = "sha256-Ucs187xTpbRJ7P32hCl8cHPxO3HCs44ZneAas043FXk="; }; - nativeBuildInputs = [ makeWrapper ]; - - dontConfigure = true; - dontBuild = true; - - unpackPhase = '' - ${dpkg}/bin/dpkg-deb -x $src . - ''; - # sudo-prompt has hardcoded binary paths on Linux and we patch them here # along with some other paths postPatch = '' - # use Nix(OS) paths substituteInPlace opt/balenaEtcher/resources/app/generated/gui.js \ --replace '/usr/bin/pkexec' '/usr/bin/pkexec", "/run/wrappers/bin/pkexec' \ --replace '/bin/bash' '${bash}/bin/bash' \ --replace '"lsblk"' '"${util-linux}/bin/lsblk"' ''; + nativeBuildInputs = [ + autoPatchelfHook + dpkg + makeWrapper + ]; + + buildInputs = [ + stdenv.cc.cc.lib + udev + ]; + + dontConfigure = true; + + dontBuild = true; + installPhase = '' runHook preInstall @@ -61,24 +51,22 @@ stdenv.mkDerivation rec { cp -a usr/share/* $out/share cp -a opt/balenaEtcher/{locales,resources} $out/share/${pname} - substituteInPlace $out/share/applications/balena-etcher-electron.desktop \ - --replace /opt/balenaEtcher/balena-etcher-electron ${pname} + makeWrapper ${electron}/bin/electron $out/bin/${pname} \ + --add-flags $out/share/${pname}/resources/app - runHook postInstall - ''; + substituteInPlace $out/share/applications/balena-etcher.desktop \ + --replace /opt/balenaEtcher/balena-etcher ${pname} - postFixup = '' - makeWrapper ${electron}/bin/electron $out/bin/${pname} \ - --add-flags $out/share/${pname}/resources/app \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gcc-unwrapped.lib ]}" + runHook postInstall ''; meta = with lib; { description = "Flash OS images to SD cards and USB drives, safely and easily"; homepage = "https://etcher.io/"; license = licenses.asl20; - maintainers = [ maintainers.shou ]; - platforms = [ "i686-linux" "x86_64-linux" ]; + mainProgram = pname; + maintainers = with maintainers; [ wegank ]; + platforms = [ "x86_64-linux" ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; } diff --git a/pkgs/tools/misc/fastfetch/default.nix b/pkgs/tools/misc/fastfetch/default.nix index 2a222f155662a..da47c960ea3f9 100644 --- a/pkgs/tools/misc/fastfetch/default.nix +++ b/pkgs/tools/misc/fastfetch/default.nix @@ -42,13 +42,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.0.5"; + version = "2.1.0"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; rev = finalAttrs.version; - hash = "sha256-KYicfYpJiO7ZfQ2vlGDKuiNprIwXnxz6Razf3GrjRq8="; + hash = "sha256-4FkBq7UxwZ2YuC4t/siC3CXqyP3Lff4jW3xheAQ9M6o="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/frei/default.nix b/pkgs/tools/misc/frei/default.nix index 22e6276464322..6e8a2181abb17 100644 --- a/pkgs/tools/misc/frei/default.nix +++ b/pkgs/tools/misc/frei/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-9CV6B7fRHXl73uI2JRv3RiaFczLHHBOd7/8UoCAwK6w="; }; - vendorSha256 = null; + vendorHash = null; meta = with lib; { description = "Modern replacement for free"; diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index 9aad1529d162f..0116ee41104e1 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -101,5 +101,6 @@ buildGoModule rec { maintainers = with maintainers; [ Br1ght0ne ma27 zowoq ]; platforms = platforms.unix; changelog = "https://github.com/junegunn/fzf/blob/${version}/CHANGELOG.md"; + mainProgram = "fzf"; }; } diff --git a/pkgs/tools/misc/geekbench/5.nix b/pkgs/tools/misc/geekbench/5.nix index 1fe03e76d5182..7784b3632a730 100644 --- a/pkgs/tools/misc/geekbench/5.nix +++ b/pkgs/tools/misc/geekbench/5.nix @@ -8,14 +8,25 @@ , vulkan-loader }: -stdenv.mkDerivation rec { - pname = "geekbench"; +let + inherit (stdenv.hostPlatform.uname) processor; version = "5.5.1"; - - src = fetchurl { - url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz"; - sha256 = "sha256-MgN+VcPcjzYP4Wt/uxiNMTh+p1mA5I2M8CgzDjI5xAQ="; + sources = { + "x86_64-linux" = { + url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz"; + hash = "sha256-MgN+VcPcjzYP4Wt/uxiNMTh+p1mA5I2M8CgzDjI5xAQ="; + }; + "aarch64-linux" = { + url = "https://cdn.geekbench.com/Geekbench-${version}-LinuxARMPreview.tar.gz"; + hash = "sha256-nrPKnsMqvw6+HGQAKxkQi/6lPEEca1VrDCaJUUuMvW8="; + }; }; +in +stdenv.mkDerivation { + inherit version; + pname = "geekbench"; + + src = fetchurl (sources.${stdenv.system}); dontConfigure = true; dontBuild = true; @@ -28,9 +39,9 @@ stdenv.mkDerivation rec { runHook preInstall mkdir -p $out/bin - cp -r geekbench.plar geekbench5 geekbench_x86_64 $out/bin + cp -r geekbench.plar geekbench5 geekbench_${processor} $out/bin - for f in geekbench5 geekbench_x86_64 ; do + for f in geekbench5 geekbench_${processor} ; do wrapProgram $out/bin/$f \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ addOpenGLRunpath.driverLink @@ -48,7 +59,7 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = [ maintainers.michalrus ]; - platforms = [ "x86_64-linux" ]; + platforms = builtins.attrNames sources; mainProgram = "geekbench5"; }; } diff --git a/pkgs/tools/misc/geekbench/6.nix b/pkgs/tools/misc/geekbench/6.nix index 4c72ecf057a8c..4ac5f1d0e49a3 100644 --- a/pkgs/tools/misc/geekbench/6.nix +++ b/pkgs/tools/misc/geekbench/6.nix @@ -8,14 +8,26 @@ , vulkan-loader }: -stdenv.mkDerivation rec { +let + inherit (stdenv.hostPlatform.uname) processor; + version = "6.2.0"; + sources = { + "x86_64-linux" = { + url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz"; + hash = "sha256-QoxSw825qqx1vzhzW9TZg03BPNvgOCokBWARGUhjCGY="; + }; + "aarch64-linux" = { + url = "https://cdn.geekbench.com/Geekbench-${version}-LinuxARMPreview.tar.gz"; + hash = "sha256-m2uz5Rk34rm9Bx3j5FjFigOIKaj2c4I+uXKzU4cK4D4="; + }; + }; + geekbench_avx2 = lib.optionalString stdenv.isx86_64 "geekbench_avx2"; +in +stdenv.mkDerivation { + inherit version; pname = "geekbench"; - version = "6.1.0"; - src = fetchurl { - url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz"; - hash = "sha256-GBJHnT6tfLdZuaawwhEvqOFYcmM42DZxRxm7cJNi0aA="; - }; + src = fetchurl (sources.${stdenv.system}); dontConfigure = true; dontBuild = true; @@ -28,9 +40,9 @@ stdenv.mkDerivation rec { runHook preInstall mkdir -p $out/bin - cp -r geekbench.plar geekbench-workload.plar geekbench6 geekbench_x86_64 geekbench_avx2 $out/bin + cp -r geekbench.plar geekbench-workload.plar geekbench6 geekbench_${processor} ${geekbench_avx2} $out/bin - for f in geekbench6 geekbench_x86_64 geekbench_avx2 ; do + for f in geekbench6 geekbench_${processor} ${geekbench_avx2} ; do wrapProgram $out/bin/$f \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ addOpenGLRunpath.driverLink @@ -48,7 +60,7 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = [ maintainers.michalrus ]; - platforms = [ "x86_64-linux" ]; + platforms = builtins.attrNames sources; mainProgram = "geekbench6"; }; } diff --git a/pkgs/tools/misc/ghostie/default.nix b/pkgs/tools/misc/ghostie/default.nix index 9f4ef4baff42f..2bda5af2af306 100644 --- a/pkgs/tools/misc/ghostie/default.nix +++ b/pkgs/tools/misc/ghostie/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "ghostie"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "attriaayush"; repo = "ghostie"; rev = "v${version}"; - sha256 = "sha256-kdDdKI4nJqomA2h370JT180qQ+EkcLaF4NAG+PjydGE="; + sha256 = "sha256-lEjJLmBA3dlIVxc8E+UvR7u154QGeCfEbxdgUxAS3Cw="; }; cargoLock = { diff --git a/pkgs/tools/misc/glasgow/default.nix b/pkgs/tools/misc/glasgow/default.nix index a2c8019e190d4..470f4016e5dd4 100644 --- a/pkgs/tools/misc/glasgow/default.nix +++ b/pkgs/tools/misc/glasgow/default.nix @@ -9,17 +9,15 @@ python3.pkgs.buildPythonApplication rec { pname = "glasgow"; - version = "unstable-2023-04-15"; + version = "unstable-2023-09-20"; # python -m setuptools_scm - realVersion = "0.1.dev2+g${lib.substring 0 7 src.rev}"; - - patches = [ ./0001-Relax-Amaranth-git-dependency.patch ]; + realVersion = "0.1.dev1798+g${lib.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "GlasgowEmbedded"; repo = "glasgow"; - rev = "406e06fae5c85f6f773c9839747513874bc3ec77"; - sha256 = "sha256-s4fWpKJj6n2+CIAsD2bjr5K8RhJz1H1sFnjiartNGf0="; + rev = "e9a9801d5be3dcba0ee188dd8a6e9115e337795d"; + sha256 = "sha256-ztB3I/jrDSm1gKB1e5igivUVloq+YYhkshDlWg75NMA="; }; nativeBuildInputs = [ @@ -30,10 +28,12 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ aiohttp amaranth + appdirs bitarray crc fx2 libusb1 + packaging pyvcd setuptools ]; @@ -52,7 +52,17 @@ python3.pkgs.buildPythonApplication rec { # installCheck tries to build_ext again doInstallCheck = false; + postInstall = '' + mkdir -p $out/etc/udev/rules.d + cp $src/config/99-glasgow.rules $out/etc/udev/rules.d + ''; + checkPhase = '' + # tests attempt to cache bitstreams + # for linux: + export XDG_CACHE_HOME=$TMPDIR + # for darwin: + export HOME=$TMPDIR ${python3.interpreter} -W ignore::DeprecationWarning test.py ''; diff --git a/pkgs/tools/misc/go-ios/default.nix b/pkgs/tools/misc/go-ios/default.nix index 0c926cb289a61..cca8c44d60ac7 100644 --- a/pkgs/tools/misc/go-ios/default.nix +++ b/pkgs/tools/misc/go-ios/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "go-ios"; - version = "1.0.115"; + version = "1.0.117"; src = fetchFromGitHub { owner = "danielpaulus"; repo = "go-ios"; rev = "v${version}"; - sha256 = "sha256-pvgdGBLgRHvnGdAyA4Rrexkh5oRzVT7AYgKfLNfSf7M="; + sha256 = "sha256-grkuUDhMusI8S2LhQ8m2z1CoX1Di0/CJK3RZR63N+LU="; }; vendorHash = "sha256-lLpvpT0QVVyy12HmtOQxagT0JNwRO7CcfkGhCpouH8w="; diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix index 78b595fbd1923..b147935c4483f 100644 --- a/pkgs/tools/misc/goaccess/default.nix +++ b/pkgs/tools/misc/goaccess/default.nix @@ -10,14 +10,14 @@ }: stdenv.mkDerivation rec { - version = "1.7.2"; + version = "1.8"; pname = "goaccess"; src = fetchFromGitHub { owner = "allinurl"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LYvdxVlGL4dVfhYkeR+TmYSvey0ArJrkC37t5BIIJfE="; + sha256 = "sha256-nZqjC6PEpD/md+mWRhuro2hAxVAGiUhETfZMVHlfP5o="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index 714876c0cc685..58056f2f77a3f 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -7,16 +7,16 @@ }: buildGoModule rec { pname = "goreleaser"; - version = "1.20.0"; + version = "1.21.2"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "iZqX/03+0koxLTbeUOxpQoEita6S/eszB8kMe/NtDcc="; + hash = "sha256-dH5Fh3F+UJRS/zZkxhZ7TzLWo0ncUNKbLZdjbnBPloE="; }; - vendorHash = "sha256-YYFCoLwgx8OBfI4VcWO6AUqNZU2JdgGAJm26koJAzWA="; + vendorHash = "sha256-Ua1Eey0trzha1WyPtwZYvfzOSywb7ThfWcI/VlMgD88="; ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.builtBy=nixpkgs" ]; diff --git a/pkgs/tools/misc/gosu/default.nix b/pkgs/tools/misc/gosu/default.nix index df42c6ea94955..6f08e027d8f8c 100644 --- a/pkgs/tools/misc/gosu/default.nix +++ b/pkgs/tools/misc/gosu/default.nix @@ -23,7 +23,7 @@ buildGoModule rec { description = "Tool that avoids TTY and signal-forwarding behavior of sudo and su"; homepage = "https://github.com/tianon/gosu"; license = licenses.asl20; - maintainers = with maintainers; [ aaronjheng ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/hakuneko/default.nix b/pkgs/tools/misc/hakuneko/default.nix index 128cddd8c6829..bb7bf24cb659d 100644 --- a/pkgs/tools/misc/hakuneko/default.nix +++ b/pkgs/tools/misc/hakuneko/default.nix @@ -1,5 +1,4 @@ -{ atomEnv -, autoPatchelfHook +{ autoPatchelfHook , dpkg , fetchurl , makeDesktopItem @@ -8,6 +7,11 @@ , stdenv , lib , wrapGAppsHook +, alsa-lib +, nss +, nspr +, systemd +, xorg }: let desktopItem = makeDesktopItem { @@ -39,6 +43,7 @@ stdenv.mkDerivation rec { dontPatchELF = true; dontWrapGApps = true; + # TODO: migrate off autoPatchelfHook and use nixpkgs' electron nativeBuildInputs = [ autoPatchelfHook dpkg @@ -46,7 +51,14 @@ stdenv.mkDerivation rec { wrapGAppsHook ]; - buildInputs = atomEnv.packages; + buildInputs = [ + alsa-lib + nss + nspr + xorg.libXScrnSaver + xorg.libXtst + systemd + ]; unpackPhase = '' # The deb file contains a setuid binary, so 'dpkg -x' doesn't work here diff --git a/pkgs/tools/misc/ical2orgpy/default.nix b/pkgs/tools/misc/ical2orgpy/default.nix index e5515c3d01492..e9397e14430f7 100644 --- a/pkgs/tools/misc/ical2orgpy/default.nix +++ b/pkgs/tools/misc/ical2orgpy/default.nix @@ -1,17 +1,22 @@ -{ lib, python3Packages, fetchPypi, ... }: +{ lib +, python3 +, fetchFromGitHub +}: -python3Packages.buildPythonPackage rec { +python3.pkgs.buildPythonApplication rec { pname = "ical2orgpy"; - version = "0.4.0"; + version = "0.5"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-7/kWW1oTSJXPJtN02uIDrFdNJ9ExKRUa3tUNA0oJSoc="; - }; + format = "setuptools"; - disabled = python3Packages.pythonOlder "3.9"; + src = fetchFromGitHub { + owner = "ical2org-py"; + repo = "ical2org.py"; + rev = version; + hash = "sha256-vBi1WYXMuDFS/PnwFQ/fqN5+gIvtylXidfZklyd6LcI="; + }; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with python3.pkgs; [ click future icalendar @@ -19,13 +24,18 @@ python3Packages.buildPythonPackage rec { tzlocal recurring-ical-events ]; - checkInputs = with python3Packages; [ freezegun pytest pyyaml ]; - nativeBuildInputs = [ python3Packages.pbr ]; + + nativeCheckInputs = with python3.pkgs; [ + freezegun + pytestCheckHook + pyyaml + ]; meta = with lib; { - description = "Converting ICAL file into org-mode format."; + changelog = "https://github.com/ical2org-py/ical2org.py/blob/${src.rev}/CHANGELOG.rst"; + description = "Converting ICAL file into org-mode format"; homepage = "https://github.com/ical2org-py/ical2org.py"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ StillerHarpo ]; }; diff --git a/pkgs/tools/misc/interactsh/default.nix b/pkgs/tools/misc/interactsh/default.nix index 7621333b3f1a8..cbf023d79099e 100644 --- a/pkgs/tools/misc/interactsh/default.nix +++ b/pkgs/tools/misc/interactsh/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "interactsh"; - version = "1.1.6"; + version = "1.1.7"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-cSqDiJEJdtHwL/xumZPOp1JHg7SUZ/47nKFv4bWBo5U="; + hash = "sha256-9mUyVFm/UZw0bQkI3JumFoyzYBz7X6m1YLdpEsypb7s="; }; - vendorHash = "sha256-xtV+QLheWU6RJSjmoOunrsOfUhNCDWJORQDBAmJd2Io="; + vendorHash = "sha256-C4tlyvKQ2sG6uqbO06eT9E72JCPc44PhFAcek+O8sN4="; modRoot = "."; subPackages = [ diff --git a/pkgs/tools/misc/jfrog-cli/default.nix b/pkgs/tools/misc/jfrog-cli/default.nix index d9d4d193f7c0c..4deaa1736ba04 100644 --- a/pkgs/tools/misc/jfrog-cli/default.nix +++ b/pkgs/tools/misc/jfrog-cli/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "jfrog-cli"; - version = "2.46.2"; + version = "2.48.0"; src = fetchFromGitHub { owner = "jfrog"; repo = "jfrog-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-NPRxBcXnY1l30RrFTgR+vqvRLdH564Daw/OIqRUhTss="; + hash = "sha256-OrJUnvDCJPQcz3doY8bn8O1jA6boNs+7ReN8/0OF6vU="; }; - vendorHash = "sha256-dMVXpqIDL6fQc9KYN4Co6vBCrpxocnwA3EkgMEme3aI="; + vendorHash = "sha256-uwfiRLsT0o2gDozHrMq6iY9tg1sYK721lLv3UtBCe78="; postInstall = '' # Name the output the same way as the original build script does diff --git a/pkgs/tools/misc/lnch/default.nix b/pkgs/tools/misc/lnch/default.nix index 211df2186f784..70d52d2ea8bd5 100644 --- a/pkgs/tools/misc/lnch/default.nix +++ b/pkgs/tools/misc/lnch/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-Iro/FjPFMqulcK90MbludnOXkMEHW0QSCoQRL01/LDE"; }; - vendorSha256 = null; + vendorHash = null; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/tools/misc/logstash/7.x.nix b/pkgs/tools/misc/logstash/7.x.nix index 7bbc5bd6a0dfa..f7c096249b0f8 100644 --- a/pkgs/tools/misc/logstash/7.x.nix +++ b/pkgs/tools/misc/logstash/7.x.nix @@ -13,17 +13,17 @@ let info = lib.splitString "-" stdenv.hostPlatform.system; arch = lib.elemAt info 0; plat = lib.elemAt info 1; - shas = + hashes = if enableUnfree then { - x86_64-linux = "5391bfef09c403a365518a3a8e8f075bb7974b137095b3c7fd2a0173cfa6dbd4a7451170a3657afef3e6a468e90a38d6e7a5b669799878f9389fa44ff8fee026"; - x86_64-darwin = "8e3516b82329a47505358fb7eab486ca39423adc44a1f061c35f6ba225ac2f37330f2afc3e37eb652b6536e5ca35d77ac2485dec743fa8d99dd4fcc60bddbc21"; - aarch64-linux = "06f91a5aabff0f86a4150de6c1fd02fb6d0a44b04ac660597cb4c8356cf1d22552aaa77899db42a49a5e35b3cad73be5d7bad8cacfb4b17e622949329cdf791a"; + x86_64-linux = "sha512-U5G/7wnEA6NlUYo6jo8HW7eXSxNwlbPH/SoBc8+m29SnRRFwo2V6/vPmpGjpCjjW56W2aXmYePk4n6RP+P7gJg=="; + x86_64-darwin = "sha512-jjUWuCMppHUFNY+36rSGyjlCOtxEofBhw19roiWsLzczDyr8PjfrZStlNuXKNdd6wkhd7HQ/qNmd1PzGC928IQ=="; + aarch64-linux = "sha512-BvkaWqv/D4akFQ3mwf0C+20KRLBKxmBZfLTINWzx0iVSqqd4mdtCpJpeNbPK1zvl17rYys+0sX5iKUkynN95Gg=="; } else { - x86_64-linux = "ba22c4c414f47515387bb28cc47612bea58aff97c407f2571863e83174a2bef273627f65dd531ed833e40668c79144a501d49c3ec691c1b1c4d8fb0cb124b052"; - x86_64-darwin = "81a97ca06c086fac33f32e90124f649d5ddce09d649021020f434b75b5bff63065f9dc8aa267b72cedd581089bc24db12122f705ef8b69acf8f59f11771cbf77"; - aarch64-linux = "64adb41a7a1b14b21d463b333f3f4470a4db9140e288d379bf79510c83091d5ca27e997961d757cee2329b85d16da6da8a1038a00aeabb1e74ab8f95b841ad0a"; + x86_64-linux = "sha512-uiLExBT0dRU4e7KMxHYSvqWK/5fEB/JXGGPoMXSivvJzYn9l3VMe2DPkBmjHkUSlAdScPsaRwbHE2PsMsSSwUg=="; + x86_64-darwin = "sha512-gal8oGwIb6wz8y6QEk9knV3c4J1kkCECD0NLdbW/9jBl+dyKome3LO3VgQibwk2xISL3Be+Laaz49Z8Rdxy/dw=="; + aarch64-linux = "sha512-ZK20GnobFLIdRjszPz9EcKTbkUDiiNN5v3lRDIMJHVyifpl5YddXzuIym4XRbabaihA4oArqux50q4+VuEGtCg=="; }; this = stdenv.mkDerivation rec { version = elk7Version; @@ -32,7 +32,7 @@ let src = fetchurl { url = "https://artifacts.elastic.co/downloads/logstash/${pname}-${version}-${plat}-${arch}.tar.gz"; - sha512 = shas.${stdenv.hostPlatform.system} or (throw "Unknown architecture"); + hash = hashes.${stdenv.hostPlatform.system} or (throw "Unknown architecture"); }; dontBuild = true; @@ -72,7 +72,7 @@ let binaryBytecode # source bundles dependencies as jars binaryNativeCode # bundled jruby includes native code ]; - license = if enableUnfree then licenses.elastic else licenses.asl20; + license = if enableUnfree then licenses.elastic20 else licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ wjlroe offline basvandijk ]; }; diff --git a/pkgs/tools/misc/logstash/contrib.nix b/pkgs/tools/misc/logstash/contrib.nix index d4c88dc32ed48..2d2f6272fddfa 100644 --- a/pkgs/tools/misc/logstash/contrib.nix +++ b/pkgs/tools/misc/logstash/contrib.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elasticsearch/logstash-contrib"; license = lib.licenses.asl20; platforms = lib.platforms.unix; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/misc/mapcidr/default.nix b/pkgs/tools/misc/mapcidr/default.nix index a3a9166185155..cbaf2ee51b4ce 100644 --- a/pkgs/tools/misc/mapcidr/default.nix +++ b/pkgs/tools/misc/mapcidr/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "mapcidr"; - version = "1.1.2"; + version = "1.1.10"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-LnEoe9H3KbR2DfHKjDnhzBB8NCoU2wG9+7n7qBktYls="; + hash = "sha256-4VBIcdlK3tHUNQT8FRJuzlUcgM17SSFWYi4zys7zgZU="; }; - vendorHash = "sha256-hbV93MhlXhF4j5MS5agNrG8JcdoHMBKIVn9aUusvBpo="; + vendorHash = "sha256-HBX8Npd4jy5YXx70GV8h3woM6ArcgMWqu8dybj/wdRU="; modRoot = "."; subPackages = [ diff --git a/pkgs/tools/misc/mloader/default.nix b/pkgs/tools/misc/mloader/default.nix index 8100119b3e620..9021724f8e0a0 100644 --- a/pkgs/tools/misc/mloader/default.nix +++ b/pkgs/tools/misc/mloader/default.nix @@ -2,12 +2,12 @@ python3Packages.buildPythonApplication rec { pname = "mloader"; - version = "1.1.9"; + version = "1.1.11"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "81e4dc7117999d502e3345f8e32df8b16cca226b8b508976dde2de81a4cc2b19"; + sha256 = "sha256-SFFjv4RWh1JZtxkDmaun35gKi5xty1ifIItwaz3lot4="; }; postPatch = '' diff --git a/pkgs/tools/misc/mlocate/default.nix b/pkgs/tools/misc/mlocate/default.nix index 12d9f5622cc4a..c9253be930afe 100644 --- a/pkgs/tools/misc/mlocate/default.nix +++ b/pkgs/tools/misc/mlocate/default.nix @@ -1,18 +1,17 @@ -{ lib, stdenv, fetchurl, config }: +{ lib, stdenv, fetchurl }: -let - dbfile = lib.attrByPath [ "locate" "dbfile" ] "/var/cache/locatedb" config; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "mlocate"; version = "0.26"; src = fetchurl { - url = "https://releases.pagure.org/mlocate/${pname}-${version}.tar.xz"; + url = "https://releases.pagure.org/mlocate/mlocate-${version}.tar.xz"; sha256 = "0gi6y52gkakhhlnzy0p6izc36nqhyfx5830qirhvk3qrzrwxyqrh"; }; - buildInputs = [ ]; - makeFlags = [ "dbfile=${dbfile}" ]; + makeFlags = [ + "dbfile=/var/cache/locatedb" + ]; meta = with lib; { description = "Merging locate is an utility to index and quickly search for files"; diff --git a/pkgs/tools/misc/moar/default.nix b/pkgs/tools/misc/moar/default.nix index 01a283b096809..ec441ec0264fd 100644 --- a/pkgs/tools/misc/moar/default.nix +++ b/pkgs/tools/misc/moar/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "moar"; - version = "1.16.2"; + version = "1.17.0"; src = fetchFromGitHub { owner = "walles"; repo = pname; rev = "v${version}"; - hash = "sha256-PknHG0ODrR5YbaZgWdwt/PtNf+q1uyK5KYlrntYZT64="; + hash = "sha256-nLXHAIR+4w6fDR69fSANBqlD0ZTc7emNIv5QTp+pdYo="; }; vendorHash = "sha256-aFCv6VxHD1bOLhCHXhy4ubik8Z9uvU6AeqcMqIZI2Oo="; diff --git a/pkgs/tools/misc/moon-phases/default.nix b/pkgs/tools/misc/moon-phases/default.nix new file mode 100644 index 0000000000000..c1b58c7cce1ae --- /dev/null +++ b/pkgs/tools/misc/moon-phases/default.nix @@ -0,0 +1,20 @@ +{ lib, fetchCrate, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "moon-phases"; + version = "0.3.3"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-8ZdtM246aqc49Q3ygMGk51LIzRA8RIdlaistbKUj3yY="; + }; + + cargoSha256 = "sha256-5JKM+GnigkpuX4qeGQAjDz/X48ZxXtCfYVwGco13YRM="; + + meta = with lib; { + description = "Command-line/WM bar tool to display the moon phase at a certain date"; + homepage = "https://github.com/mirrorwitch/moon-phases"; + license = licenses.acsl14; + maintainers = with maintainers; [ mirrorwitch ]; + }; +} diff --git a/pkgs/tools/misc/opentelemetry-collector/default.nix b/pkgs/tools/misc/opentelemetry-collector/default.nix index 2d4b244b86376..d91c0cb665af5 100644 --- a/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "opentelemetry-collector"; - version = "0.83.0"; + version = "0.86.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector"; rev = "v${version}"; - hash = "sha256-e2wcRawTEyK/NwSwd2WUgOnQnAj8Z7DQrrx32ksfHeU="; + hash = "sha256-Ucp00OjyPtHA6so/NOzTLtPSuhXwz6A2708w2WIZb/E="; }; # there is a nested go.mod sourceRoot = "${src.name}/cmd/otelcorecol"; - vendorHash = "sha256-HZ7aKLVjDMdMuq8IQ/6EgqCXWeYHmrJtf1fJyrLbPuU="; + vendorHash = "sha256-DfbG2qrhwVMXYjg2yJ6XlhrL27oPplvWIoP3C/JBKuA="; # upstream strongly recommends disabling CGO # additionally dependencies have had issues when GCO was enabled that weren't caught upstream diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/tools/misc/osm2pgsql/default.nix index 5f4ff20e5d9bb..2cc2ba926ef57 100644 --- a/pkgs/tools/misc/osm2pgsql/default.nix +++ b/pkgs/tools/misc/osm2pgsql/default.nix @@ -9,6 +9,7 @@ , boost , cimg , postgresql +, python3 , withLuaJIT ? false , lua , luajit @@ -21,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "osm2pgsql"; - version = "1.9.0"; + version = "1.9.2"; src = fetchFromGitHub { - owner = "openstreetmap"; + owner = "osm2pgsql-dev"; repo = "osm2pgsql"; rev = finalAttrs.version; - hash = "sha256-ZIjT4uKJas5RgxcMSoR8hWCM9pdu3hSzWwfIn1ZvU8Y="; + hash = "sha256-RzJpaOEpgKm2IN6CK2Z67CUG0WU2ELvCpGhdQehjGKU="; }; postPatch = '' @@ -49,6 +50,7 @@ stdenv.mkDerivation (finalAttrs: { potrace proj protozero + (python3.withPackages (p: with p; [ psycopg2 pyosmium ])) zlib ] ++ lib.optional withLuaJIT luajit ++ lib.optional (!withLuaJIT) lua; diff --git a/pkgs/tools/misc/ovh-ttyrec/default.nix b/pkgs/tools/misc/ovh-ttyrec/default.nix index 98d9ef201007c..550df6531ced7 100644 --- a/pkgs/tools/misc/ovh-ttyrec/default.nix +++ b/pkgs/tools/misc/ovh-ttyrec/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ovh-ttyrec"; - version = "1.1.6.7"; + version = "1.1.7.1"; src = fetchFromGitHub { owner = "ovh"; repo = "ovh-ttyrec"; rev = "v${version}"; - sha256 = "sha256-OkSs0Cu79u53+fN57px48f6kJKuOJLjGUar+lLTdUJU="; + sha256 = "sha256-VTF9WLwAIWWn+W0sLQaoFBFro+pSXKwcTO6q6MW6JD8="; }; nativeBuildInputs = [ zstd ]; diff --git a/pkgs/tools/misc/page/default.nix b/pkgs/tools/misc/page/default.nix index 1468b350f5f80..b1da229f1e865 100644 --- a/pkgs/tools/misc/page/default.nix +++ b/pkgs/tools/misc/page/default.nix @@ -1,26 +1,35 @@ -{ lib, rustPlatform, fetchFromGitHub, installShellFiles }: +{ lib, rustPlatform, fetchFromGitHub, fetchpatch, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "page"; - version = "4.6.0"; + version = "4.6.3"; src = fetchFromGitHub { owner = "I60R"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iK8XRPT/0PG3szIRkHvUIdgJC1XsuBbDKk25RvwSViQ="; + hash = "sha256-uNdtgx9/9+KOfQvHiKNrT8NFWtR2tfJuI2bMwywBC/4="; }; + cargoHash = "sha256-ctYQMBAdSUfEek2vcCa3gnI9N6ZG9b+VvtAzT20jlXY="; + + cargoPatches = [ + # Cargo.lock is outdated. + # https://github.com/I60R/page/pull/45. + (fetchpatch { + url = "https://github.com/I60R/page/commit/83f936b64620ba74043c1db31207b4366c0f7e3d.patch"; + hash = "sha256-qA5oP4K/6eG0A+syVNb1izl+bnYll5V6sWM3LVFTb4o="; + }) + ]; + nativeBuildInputs = [ installShellFiles ]; postInstall = '' - completions_dir=$(find "target" -name "shell_completions" -type d -printf "%T+\t%p\n" | sort | awk 'NR==1{print $2}') + completions_dir=$(find "target" -name "assets" -type d -printf "%T+\t%p\n" | sort | awk 'NR==1{print $2}') installShellCompletion --bash $completions_dir/page.bash installShellCompletion --fish $completions_dir/page.fish installShellCompletion --zsh $completions_dir/_page ''; - cargoSha256 = "sha256-OZvsZijrIeVxqf58P16Woanf0JsJIENX72n28wMtq14="; - meta = with lib; { description = "Use neovim as pager"; homepage = "https://github.com/I60R/page"; diff --git a/pkgs/tools/misc/paperlike-go/default.nix b/pkgs/tools/misc/paperlike-go/default.nix index 0278fb1f791da..63390f427d403 100644 --- a/pkgs/tools/misc/paperlike-go/default.nix +++ b/pkgs/tools/misc/paperlike-go/default.nix @@ -11,12 +11,12 @@ buildGoModule { owner = "leoluk"; repo = "paperlike-go"; rev = "bd658d88ea9a3b21e1b301b96253abab7cf56d79"; - sha256 = "1h0n2n5w5pn3r08qf6hbmiib5m71br27y66ki9ajnaa890377qaj"; + hash = "sha256-UuFzBkhIKStVitMYf0Re4dSyYqwLGocRyMPewosVFsA="; }; - subPackages = [ "cmd/paperlike-cli" ]; + vendorHash = "sha256-OfTeJd3VS/WoUpyPY7XfQZWLrvS+vqPPgeL2Hd0HtgI="; - vendorSha256 = "00mn0zfivxp2h77s7gmyyjp8p5a1vysn73wwaalgajymvljxxx1r"; + subPackages = [ "cmd/paperlike-cli" ]; meta = { description = "paperlike-go is a Linux Go library and CLI utility to control a Dasung Paperlike display via I2C DDC."; diff --git a/pkgs/tools/misc/perccli/default.nix b/pkgs/tools/misc/perccli/default.nix index aca382d504621..eacc0c26de331 100644 --- a/pkgs/tools/misc/perccli/default.nix +++ b/pkgs/tools/misc/perccli/default.nix @@ -6,16 +6,18 @@ stdenvNoCC.mkDerivation rec { pname = "perccli"; - version = "7.2110.00"; + + # On a new release, update version, URL, hash, and meta.homepage + version = "7.2313.00"; src = fetchzip { # On pkg update: manually adjust the version in the URL because of the different format. - url = "https://dl.dell.com/FOLDER09074160M/1/PERCCLI_7.211.0_Linux.tar.gz"; - sha256 = "sha256-8gk+0CrgeisfN2hNpaO1oFey57y7KuNy2i6PWTikDls="; + url = "https://dl.dell.com/FOLDER09770976M/1/PERCCLI_7.2313.0_A14_Linux.tar.gz"; + hash = "sha256-IhclHVkdihRx5CzyO2dlOEhCon+0/HB3Fkue7MWsWnw="; # Dell seems to block "uncommon" user-agents, such as Nixpkgs's custom one. - # Sending no user-agent at all seems to be fine though. - curlOptsList = [ "--user-agent" "" ]; + # 403 otherwise + curlOptsList = [ "--user-agent" "Mozilla/5.0" ]; }; nativeBuildInputs = [ rpmextract ]; @@ -43,6 +45,10 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { description = "Perccli Support for PERC RAID controllers"; + + # Must be updated with every release + homepage = "https://www.dell.com/support/home/en-us/drivers/driversdetails?driverid=tdghn"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ panicgh ]; diff --git a/pkgs/tools/misc/pg_flame/default.nix b/pkgs/tools/misc/pg_flame/default.nix index ca58e2a65700a..f35706bfc674d 100644 --- a/pkgs/tools/misc/pg_flame/default.nix +++ b/pkgs/tools/misc/pg_flame/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "mgartner"; repo = pname; rev = "v${version}"; - sha256 = "1a03vxqnga83mhjp7pkl0klhkyfaby7ncbwm45xbl8c7s6zwhnw2"; + hash = "sha256-glvIv9GHIbp6IZUvZo9fyvkJ6QR03nMlrAOpZ3HfA6g="; }; - vendorSha256 = "1rkx20winh66y2m7i7q13jpr83044i2d1pfd5p5l5kkpsix5mra5"; + vendorHash = "sha256-ReVaetR3zkLLLc3d0EQkBAyUrxwBn3iq8MZAGzkQfeY="; meta = with lib; { description = "Flamegraph generator for Postgres EXPLAIN ANALYZE output"; diff --git a/pkgs/tools/misc/pgmetrics/default.nix b/pkgs/tools/misc/pgmetrics/default.nix index 1b6312db12df2..7a24a87ca767c 100644 --- a/pkgs/tools/misc/pgmetrics/default.nix +++ b/pkgs/tools/misc/pgmetrics/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pgmetrics"; - version = "1.15.2"; + version = "1.16.0"; src = fetchFromGitHub { owner = "rapidloop"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WzyTLOJo/wTZA9glxO0ovcaADlHV+AKLChWSLJ+uvaQ="; + sha256 = "sha256-8pF3E0Zh/SsH6+5iXt1KFwud2ijoisYfcu+QHRM9x9s="; }; vendorHash = "sha256-KIMnvGMIipuIFPTSeERtCfvlPuvHvEHdjBJ1TbT2d1s="; diff --git a/pkgs/tools/misc/phrase-cli/default.nix b/pkgs/tools/misc/phrase-cli/default.nix index 3de9148c98ab5..51daa59b19ef3 100644 --- a/pkgs/tools/misc/phrase-cli/default.nix +++ b/pkgs/tools/misc/phrase-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "phrase-cli"; - version = "2.11.0"; + version = "2.12.0"; src = fetchFromGitHub { owner = "phrase"; repo = "phrase-cli"; rev = version; - sha256 = "sha256-8LhXsrO0sXMu7cXNoLafwNgCO99zGcQBYcCmqJfM2KY="; + sha256 = "sha256-VGuVDlIn0SnE3ZHcYbfQ0lWESf0tEyb6CTk8G8jnRlg="; }; - vendorHash = "sha256-lbJetTERQKnDKmM1VqRWU0OjZPm+bfeQ9ZThs/TzxIU="; + vendorHash = "sha256-YzOPt02zbgT0wglWGEkUiDJhSNQnzazPs5nnNFDI0+g="; ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ]; @@ -22,6 +22,7 @@ buildGoModule rec { meta = with lib; { homepage = "http://docs.phraseapp.com"; description = "PhraseApp API v2 Command Line Client"; + changelog = "https://github.com/phrase/phrase-cli/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ juboba ]; }; diff --git a/pkgs/tools/misc/plocate/default.nix b/pkgs/tools/misc/plocate/default.nix index 356d58ccbc35c..2a55841d7e538 100644 --- a/pkgs/tools/misc/plocate/default.nix +++ b/pkgs/tools/misc/plocate/default.nix @@ -1,5 +1,4 @@ -{ config -, stdenv +{ stdenv , lib , fetchgit , pkg-config @@ -9,9 +8,6 @@ , liburing , zstd }: -let - dbfile = lib.attrByPath [ "locate" "dbfile" ] "/var/cache/locatedb" config; -in stdenv.mkDerivation rec { pname = "plocate"; version = "1.1.19"; @@ -33,8 +29,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dsystemunitdir=${placeholder "out"}/etc/systemd/system" - "-Dsharedstatedir=${builtins.dirOf dbfile}" - "-Ddbpath=${builtins.baseNameOf dbfile}" + "-Dsharedstatedir=/var/cache" + "-Ddbpath=locatedb" ]; meta = with lib; { diff --git a/pkgs/tools/misc/pouf/default.nix b/pkgs/tools/misc/pouf/default.nix index 6b4f812bf3b27..9206e16463edf 100644 --- a/pkgs/tools/misc/pouf/default.nix +++ b/pkgs/tools/misc/pouf/default.nix @@ -5,16 +5,21 @@ rustPlatform.buildRustPackage rec { pname = "pouf"; - version = "0.5.1"; + version = "0.6.3"; src = fetchFromGitHub { owner = "mothsart"; repo = pname; rev = version; - sha256 = "1zz91r37d6nqvdy29syq853krqdkigiqihwz7ww9kvagfvzvdh13"; + hash = "sha256-tW86b9a7u1jyfmHjwjs+5DaUujRZH+VhGQsj0CBj0yk="; }; - cargoSha256 = "1ikm9fqi37jznln2xsyzfm625lv8kwjzanpm3wglx2s1k1jkmcy9"; + cargoHash = "sha256-rVJAaeg27SdM8cTx12rKLIGEYtXUhLHXUYpT78oVNlo="; + + # Cargo.lock is outdated. + preConfigure = '' + cargo update --offline + ''; postInstall = "make PREFIX=$out copy-data"; diff --git a/pkgs/tools/misc/shelldap/default.nix b/pkgs/tools/misc/shelldap/default.nix index c782b12920088..b383c9692a9ca 100644 --- a/pkgs/tools/misc/shelldap/default.nix +++ b/pkgs/tools/misc/shelldap/default.nix @@ -1,26 +1,52 @@ -{ lib, fetchurl, perlPackages }: +{ lib +, fetchFromGitHub +, perlPackages +}: + perlPackages.buildPerlPackage rec { pname = "shelldap"; - version = "1.4.0"; - src = fetchurl { - url = "https://bitbucket.org/mahlon/shelldap/downloads/shelldap-${version}.tar.gz"; - sha256 = "07gkvvxcgw3pgkfy8p9mmidakciaq1rsq5zhmdqd8zcwgqkrr24i"; + version = "1.5.1"; + + src = fetchFromGitHub { + owner = "mahlonsmith"; + repo = "shelldap"; + rev = "refs/tags/v${version}"; + hash = "sha256-67ttAXzu9pfeqjfhMfLMb9vWCXTrE+iUDCbamqswaLg="; }; - buildInputs = with perlPackages; [ perl YAMLSyck perlldap AlgorithmDiff IOSocketSSL AuthenSASL TermReadLineGnu TermShell ]; + + buildInputs = with perlPackages; [ + AlgorithmDiff + AuthenSASL + IOSocketSSL + perl + perlldap + TermReadLineGnu + TermShell + TieIxHash + YAMLSyck + ]; + prePatch = '' touch Makefile.PL ''; + installPhase = '' runHook preInstall install -Dm555 -t $out/bin shelldap runHook preInstall ''; + + # no make target 'test', not tests provided by source + doCheck = false; + outputs = [ "out" ]; + meta = with lib; { - homepage = "https://bitbucket.org/mahlon/shelldap/"; + homepage = "https://github.com/mahlonsmith/shelldap/"; description = "A handy shell-like interface for browsing LDAP servers and editing their content"; + changelog = "https://github.com/mahlonsmith/shelldap/blob/v${version}/CHANGELOG"; license = with licenses; [ bsd3 ]; - maintainers = with maintainers; [ tobiasBora ]; - platforms = platforms.linux; + maintainers = with maintainers; [ clerie tobiasBora ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/shim/default.nix b/pkgs/tools/misc/shim/default.nix index ea13cc1bd66f3..1615a6d8c794a 100644 --- a/pkgs/tools/misc/shim/default.nix +++ b/pkgs/tools/misc/shim/default.nix @@ -36,6 +36,13 @@ in stdenv.mkDerivation rec { install -m 644 ${target} $out/share/shim/ ''; + passthru = { + # Expose the target file name so that consumers + # (e.g. infrastructure for signing this shim) don't need to + # duplicate the logic from here + inherit target; + }; + meta = with lib; { description = "UEFI shim loader"; homepage = "https://github.com/rhboot/shim"; diff --git a/pkgs/tools/misc/star-history/default.nix b/pkgs/tools/misc/star-history/default.nix index a983834aa6890..caa584a020645 100644 --- a/pkgs/tools/misc/star-history/default.nix +++ b/pkgs/tools/misc/star-history/default.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage rec { pname = "star-history"; - version = "1.0.14"; + version = "1.0.15"; src = fetchCrate { inherit pname version; - sha256 = "sha256-bdu0LLH6f5rLwzNw1wz0J9zEspYmAOlJYCWOdamWjyw="; + sha256 = "sha256-9/r01j/47rbgmXQy9qVOeY1E3LDMe9A/1SOB2l9zpJU="; }; - cargoSha256 = "sha256-Z7zq93Orx7Mb2b9oZxAIPn6qObzYPGOx4N86naUvqtg="; + cargoSha256 = "sha256-kUpGBtgircX8/fACed4WO7rHTCah+3BFuQQV/A5pivg="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/misc/starry/default.nix b/pkgs/tools/misc/starry/default.nix index b2ffe3175bfbc..a59fb3127f17b 100644 --- a/pkgs/tools/misc/starry/default.nix +++ b/pkgs/tools/misc/starry/default.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage rec { pname = "starry"; - version = "2.0.1"; + version = "2.0.2"; src = fetchCrate { inherit pname version; - hash = "sha256-CPEMjg70MXlV+ruYnEHpTmqlc27NMTUKTR4/fpQmYcI="; + hash = "sha256-/ZUmMLEqlpqu+Ja/3XjFJf+OFZJCz7rp5MrQBEjwsXs="; }; - cargoHash = "sha256-d6icXOgju4qEV2+J+G09/xeQMIX3/4XUFmuWfD/Cqhc="; + cargoHash = "sha256-L6s1LkWnjht2VLwq1GOFiIosnZjFN9tDSLpPtokmj9o="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index b8f7e8cdbf361..523532904e356 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -33,6 +33,10 @@ rustPlatform.buildRustPackage rec { --bash <($out/bin/starship completions bash) \ --fish <($out/bin/starship completions fish) \ --zsh <($out/bin/starship completions zsh) + + presetdir=$out/share/starship/presets/ + mkdir -p $presetdir + cp docs/.vuepress/public/presets/toml/*.toml $presetdir ''; cargoHash = "sha256-ZHHrpepKZnSGufyEAjNDozaIKAt2GFRt+hU2ej7LceA="; diff --git a/pkgs/tools/misc/tailspin/default.nix b/pkgs/tools/misc/tailspin/default.nix index c197c76eece7f..06678de835892 100644 --- a/pkgs/tools/misc/tailspin/default.nix +++ b/pkgs/tools/misc/tailspin/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "tailspin"; - version = "1.4.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "bensadeh"; repo = "tailspin"; rev = "refs/tags/${version}"; - hash = "sha256-mtMUHiuGuzLEJk4S+AnpyYGPn0naIP45R9itzXLhG8g="; + hash = "sha256-Uqo47g0AXyRNFb1RmVVJzdFI2g1Oakx85Sg+zIN5B2A="; }; - cargoHash = "sha256-M+TUdKtR8/vpkyJiO17LBPDgXq207pC2cUKE7krarfY="; + cargoHash = "sha256-0ROLrdS3oBZuh+nXW9mTS2Jn/D+iLAUaYqhKvmKAPTo="; meta = with lib; { description = "A log file highlighter"; diff --git a/pkgs/tools/misc/tcat/default.nix b/pkgs/tools/misc/tcat/default.nix index 3556eb232c1ed..1f6c45f32dc1c 100644 --- a/pkgs/tools/misc/tcat/default.nix +++ b/pkgs/tools/misc/tcat/default.nix @@ -9,7 +9,7 @@ buildGoModule rec { rev = "v${version}"; sha256 = "1szzfz5xsx9l8gjikfncgp86hydzpvsi0y5zvikd621xkp7g7l21"; }; - vendorSha256 = null; + vendorHash = null; subPackages = "."; meta = with lib; { diff --git a/pkgs/tools/misc/tgpt/default.nix b/pkgs/tools/misc/tgpt/default.nix index 325ed8dc01faf..d0f0a8cdf91d5 100644 --- a/pkgs/tools/misc/tgpt/default.nix +++ b/pkgs/tools/misc/tgpt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "tgpt"; - version = "1.8.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "aandrew-me"; repo = "tgpt"; rev = "refs/tags/v${version}"; - hash = "sha256-fVDwKNj4XHMWP30f4ASKQ3m5stlQJ/6zOCwVhUfP39c="; + hash = "sha256-AnGll0BjvR7xUWGn25M4nz4PIJAscl6Sh0pTn1102h8="; }; vendorHash = "sha256-2I5JJWxM6aZx0eZu7taUTL11Y/5HIrXYC5aezrTbbsM="; diff --git a/pkgs/tools/misc/time/default.nix b/pkgs/tools/misc/time/default.nix index 8707309937bea..1df89b323838f 100644 --- a/pkgs/tools/misc/time/default.nix +++ b/pkgs/tools/misc/time/default.nix @@ -1,17 +1,16 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "time"; version = "1.9"; src = fetchurl { - url = "mirror://gnu/time/${pname}-${version}.tar.gz"; - sha256 = "07jj7cz6lc13iqrpgn81ivqh8rkm73p4rnivwgrrshk23v4g1b7v"; + url = "mirror://gnu/time/time-${finalAttrs.version}.tar.gz"; + hash = "sha256-+6zwyB5iQp3z4zvaTO44dWYE8Y4B2XczjiMwaj47Uh4="; }; meta = { description = "Tool that runs programs and summarizes the system resources they use"; - longDescription = '' The `time' command runs another program, then displays information about the resources used by that program, collected @@ -25,9 +24,9 @@ stdenv.mkDerivation rec { do not provide much information about program resource use; `time' reports unavailable information as zero values. ''; - license = lib.licenses.gpl3Plus; homepage = "https://www.gnu.org/software/time/"; platforms = lib.platforms.unix; + mainProgram = "time"; }; -} +}) diff --git a/pkgs/tools/misc/tio/default.nix b/pkgs/tools/misc/tio/default.nix index cd03e4f52f539..c179614cfae50 100644 --- a/pkgs/tools/misc/tio/default.nix +++ b/pkgs/tools/misc/tio/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tio"; - version = "2.6"; + version = "2.7"; src = fetchFromGitHub { owner = "tio"; repo = "tio"; rev = "v${version}"; - hash = "sha256-cYCkf9seaWcjrW0aDz+5FexfnTtiO3KQ1aX4OgG62Ug="; + hash = "sha256-SGOxy0gyR2RQn5sj28RPhDNmESd7LhNj9nlOoCZSEJs="; }; strictDeps = true; diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix index 023028879245e..51f10640ccbb7 100644 --- a/pkgs/tools/misc/tlp/default.nix +++ b/pkgs/tools/misc/tlp/default.nix @@ -24,13 +24,13 @@ , networkmanager }: stdenv.mkDerivation rec { pname = "tlp"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "linrunner"; repo = "TLP"; rev = version; - hash = "sha256-XAyko2MxFyo5RyioaexhoFAR3E+I3t/8vD2K3WYNmsI="; + hash = "sha256-CxO1KU7F6sT5D8vjKOmntjDxcieoRSHTvuSqXfplcHk="; }; # XXX: See patch files for relevant explanations. diff --git a/pkgs/tools/misc/topicctl/default.nix b/pkgs/tools/misc/topicctl/default.nix index 2b0903bff2e21..23ab910924158 100644 --- a/pkgs/tools/misc/topicctl/default.nix +++ b/pkgs/tools/misc/topicctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "topicctl"; - version = "1.10.1"; + version = "1.10.2"; src = fetchFromGitHub { owner = "segmentio"; repo = "topicctl"; rev = "v${version}"; - sha256 = "sha256-Ag8ZQT6ugLMDTZwY6A69B+WDpLWMtBBtpg8m1a09N4I="; + sha256 = "sha256-VyzWaoGOGDtB4fe0Wa6ldeOSEN+Ihu8xapiHcHJos0w="; }; vendorHash = "sha256-UJ7U9CfQHKgK7wfb8zqLZ7na4OBBZBYiGayII3RTaiQ="; diff --git a/pkgs/tools/misc/twm/default.nix b/pkgs/tools/misc/twm/default.nix index 5ad3deea19541..68a58d04602dc 100644 --- a/pkgs/tools/misc/twm/default.nix +++ b/pkgs/tools/misc/twm/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "twm"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "vinnymeller"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OUaT/JMh4JgFbzIYlU34EN7gxEydNKBXSLJfYKOeck4="; + sha256 = "sha256-Q8WdNmO5uSm4PvitBXQ7YEkjJhlCz4qfJO/F6+XckXY="; }; - cargoHash = "sha256-VGbY3QRkO4znEGs2daUhpDeNntONwvGeUg1ryFyWmjE="; + cargoHash = "sha256-fxDUUfC7mBgVHN+M6pb5leRp28wzO69ZdStdYmQFxQE="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/tools/misc/twspace-crawler/default.nix b/pkgs/tools/misc/twspace-crawler/default.nix index 23e6092c7f537..df1ef6e6e2c24 100644 --- a/pkgs/tools/misc/twspace-crawler/default.nix +++ b/pkgs/tools/misc/twspace-crawler/default.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "twspace-crawler"; - version = "1.12.8"; + version = "1.12.9"; src = fetchFromGitHub { owner = "HitomaruKonpaku"; repo = "twspace-crawler"; - rev = "3909facc10fe0308d425b609675919e1b9d1b06e"; # version not tagged - hash = "sha256-qAkrNWy7ofT2klgxU4lbZNfiPvF9gLpgkhaTW1xMcAc="; + rev = "7875e534b257d4ba5a0cf8179a4772c87005fee6"; # version not tagged + hash = "sha256-pA31ak0Rwy4Rc1fVz+4QV1lcTYGUmPOd61FtLQGN1ek="; }; - npmDepsHash = "sha256-m0xszerBSx6Ovs/S55lT4CqPRls7aSw4bjONV7BZ8xE="; + npmDepsHash = "sha256-2fsYeSZYzadLmikUJbuHE4XMAp38jTZvtRo9xgaZVzg="; meta = with lib; { description = "Script to monitor & download Twitter Spaces 24/7"; diff --git a/pkgs/tools/misc/upterm/default.nix b/pkgs/tools/misc/upterm/default.nix index f1a28f1af4074..76c39f665a15c 100644 --- a/pkgs/tools/misc/upterm/default.nix +++ b/pkgs/tools/misc/upterm/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { hash = "sha256-wjbptcGy3wOZPm/11El7Xqz6NrR8G19V9zfU5pKFGuk="; }; - vendorSha256 = null; + vendorHash = null; subPackages = [ "cmd/upterm" "cmd/uptermd" ]; diff --git a/pkgs/tools/misc/vector/Cargo.lock b/pkgs/tools/misc/vector/Cargo.lock index b4643639d00ee..e74b6b2c2107c 100644 --- a/pkgs/tools/misc/vector/Cargo.lock +++ b/pkgs/tools/misc/vector/Cargo.lock @@ -40,6 +40,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" [[package]] +name = "aead" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" +dependencies = [ + "crypto-common", + "generic-array", +] + +[[package]] name = "aes" version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -75,15 +85,6 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" -dependencies = [ - "memchr", -] - -[[package]] -name = "aho-corasick" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" @@ -170,6 +171,20 @@ dependencies = [ ] [[package]] +name = "anstream" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" +dependencies = [ + "anstyle 1.0.0", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] name = "anstyle" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -182,10 +197,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" [[package]] +name = "anstyle-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "anstyle-wincon" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" +dependencies = [ + "anstyle 1.0.0", + "windows-sys 0.48.0", +] + +[[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "anymap" @@ -195,12 +238,12 @@ checksum = "8f1f8f5a6f3d50d89e3797d7593a50f96bb2aaa20ca0cc7be1fb673232c91d72" [[package]] name = "apache-avro" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cf4144857f9e4d7dd6cc4ba4c78efd2a46bad682b029bd0d91e76a021af1b2a" +checksum = "9c0fdddc3fdac97394ffcc5c89c634faa9c1c166ced54189af34e407c97b6ee7" dependencies = [ "byteorder", - "digest 0.10.7", + "digest", "lazy_static", "libflate", "log", @@ -213,7 +256,7 @@ dependencies = [ "strum", "strum_macros", "thiserror", - "typed-builder", + "typed-builder 0.14.0", "uuid", "zerocopy", ] @@ -260,18 +303,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c6368f9ae5c6ec403ca910327ae0c9437b0a85255b6950c90d497e6177f6e5e" dependencies = [ "proc-macro-hack", - "quote 1.0.29", + "quote 1.0.33", "syn 1.0.109", ] [[package]] name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - -[[package]] -name = "arrayvec" version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" @@ -314,12 +351,12 @@ dependencies = [ [[package]] name = "assert_cmd" -version = "2.0.11" +version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d6b683edf8d1119fe420a94f8a7e389239666aa72e65495d91c00462510151" +checksum = "88903cb14723e4d4003335bb7f8a14f27691649105346a0f0957466c096adfe6" dependencies = [ "anstyle 1.0.0", - "bstr 1.5.0", + "bstr 1.6.2", "doc-comment", "predicates", "predicates-core", @@ -353,29 +390,16 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a" -dependencies = [ - "flate2", - "futures-core", - "memchr", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "async-compression" -version = "0.4.0" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0122885821398cc923ece939e24d1056a2384ee719432397fa9db87230ff11" +checksum = "bb42b2197bf15ccb092b62c74515dbd8b86d0effd934795f6687c93b6e679a2c" dependencies = [ "flate2", "futures-core", "memchr", "pin-project-lite", "tokio", - "zstd 0.12.3+zstd.1.5.2", + "zstd 0.12.4", "zstd-safe 6.0.3+zstd.1.5.2", ] @@ -437,14 +461,13 @@ version = "5.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b35ef8f9be23ee30fe1eb1cf175c689bc33517c6c6d0fd0669dade611e5ced7f" dependencies = [ - "async-graphql-derive", - "async-graphql-parser", - "async-graphql-value", + "async-graphql-derive 5.0.10", + "async-graphql-parser 5.0.10", + "async-graphql-value 5.0.10", "async-stream", "async-trait", "base64 0.13.1", - "bytes 1.4.0", - "chrono", + "bytes 1.5.0", "fnv", "futures-util", "http", @@ -463,28 +486,88 @@ dependencies = [ ] [[package]] +name = "async-graphql" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d1f56ef571e325930c41685502269651505160ae0d7e0d7413dd84afe86432c" +dependencies = [ + "async-graphql-derive 6.0.0", + "async-graphql-parser 6.0.0", + "async-graphql-value 6.0.0", + "async-stream", + "async-trait", + "base64 0.13.1", + "bytes 1.5.0", + "chrono", + "fnv", + "futures-util", + "http", + "indexmap 2.0.0", + "mime", + "multer", + "num-traits", + "once_cell", + "pin-project-lite", + "regex", + "serde", + "serde_json", + "serde_urlencoded", + "static_assertions", + "thiserror", +] + +[[package]] name = "async-graphql-derive" version = "5.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a0f6ceed3640b4825424da70a5107e79d48d9b2bc6318dfc666b2fc4777f8c4" dependencies = [ "Inflector", - "async-graphql-parser", + "async-graphql-parser 5.0.10", "darling 0.14.2", "proc-macro-crate 1.2.1", - "proc-macro2 1.0.63", - "quote 1.0.29", + "proc-macro2 1.0.67", + "quote 1.0.33", "syn 1.0.109", "thiserror", ] [[package]] +name = "async-graphql-derive" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a3a4c50aafce65a48d1aba749aaa946173a52d274abb5b9f76360a966ce17c6" +dependencies = [ + "Inflector", + "async-graphql-parser 6.0.0", + "darling 0.20.3", + "proc-macro-crate 1.2.1", + "proc-macro2 1.0.67", + "quote 1.0.33", + "strum", + "syn 2.0.37", + "thiserror", +] + +[[package]] name = "async-graphql-parser" version = "5.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ecc308cd3bc611ee86c9cf19182d2b5ee583da40761970e41207f088be3db18f" dependencies = [ - "async-graphql-value", + "async-graphql-value 5.0.10", + "pest", + "serde", + "serde_json", +] + +[[package]] +name = "async-graphql-parser" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a64488a0f0afd284f829977437a2e49e9f62cb72ea5fbd96aec19f87351576df" +dependencies = [ + "async-graphql-value 6.0.0", "pest", "serde", "serde_json", @@ -496,19 +579,31 @@ version = "5.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d461325bfb04058070712296601dfe5e5bd6cdff84780a0a8c569ffb15c87eb3" dependencies = [ - "bytes 1.4.0", + "bytes 1.5.0", "indexmap 1.9.3", "serde", "serde_json", ] [[package]] +name = "async-graphql-value" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86046bbced96c0fab3ff5d2b3c769c0c55b0b3a7d67f9e2f2044f349f2e7d501" +dependencies = [ + "bytes 1.5.0", + "indexmap 2.0.0", + "serde", + "serde_json", +] + +[[package]] name = "async-graphql-warp" -version = "5.0.10" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce971f92675defe1adf14f9e70b8798d797db9f454463b611a552bffd5532188" +checksum = "4de785650dd90a223b5f5968c5345215160a36d196c9295c6c9a316cb29cba04" dependencies = [ - "async-graphql", + "async-graphql 6.0.0", "futures-util", "serde_json", "warp", @@ -545,6 +640,40 @@ dependencies = [ ] [[package]] +name = "async-nats" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df2ea11ebe42f65b91c125042bdf8cfb0cccbd344c75e64b98fa3177040e0de9" +dependencies = [ + "base64 0.21.4", + "bytes 1.5.0", + "futures 0.3.28", + "http", + "memchr", + "nkeys", + "nuid", + "once_cell", + "rand 0.8.5", + "regex", + "ring", + "rustls 0.21.7", + "rustls-native-certs", + "rustls-pemfile", + "rustls-webpki", + "serde", + "serde_json", + "serde_nanos", + "serde_repr", + "thiserror", + "time", + "tokio", + "tokio-retry", + "tokio-rustls 0.24.1", + "tracing 0.1.37", + "url", +] + +[[package]] name = "async-net" version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -588,13 +717,13 @@ dependencies = [ [[package]] name = "async-recursion" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" +checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", - "syn 2.0.10", + "proc-macro2 1.0.67", + "quote 1.0.33", + "syn 2.0.37", ] [[package]] @@ -614,9 +743,9 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", - "syn 2.0.10", + "proc-macro2 1.0.67", + "quote 1.0.33", + "syn 2.0.37", ] [[package]] @@ -627,13 +756,13 @@ checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" [[package]] name = "async-trait" -version = "0.1.68" +version = "0.1.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", - "syn 2.0.10", + "proc-macro2 1.0.67", + "quote 1.0.33", + "syn 2.0.37", ] [[package]] @@ -675,7 +804,7 @@ dependencies = [ "aws-smithy-json", "aws-smithy-types", "aws-types", - "bytes 1.4.0", + "bytes 1.5.0", "hex", "http", "hyper", @@ -721,7 +850,7 @@ dependencies = [ "aws-smithy-http", "aws-smithy-types", "aws-types", - "bytes 1.4.0", + "bytes 1.5.0", "http", "http-body", "lazy_static", @@ -748,7 +877,7 @@ dependencies = [ "aws-smithy-types", "aws-smithy-xml", "aws-types", - "bytes 1.4.0", + "bytes 1.5.0", "http", "regex", "tokio-stream", @@ -771,7 +900,7 @@ dependencies = [ "aws-smithy-json", "aws-smithy-types", "aws-types", - "bytes 1.4.0", + "bytes 1.5.0", "http", "regex", "tokio-stream", @@ -794,7 +923,7 @@ dependencies = [ "aws-smithy-json", "aws-smithy-types", "aws-types", - "bytes 1.4.0", + "bytes 1.5.0", "http", "regex", "tokio-stream", @@ -817,7 +946,7 @@ dependencies = [ "aws-smithy-json", "aws-smithy-types", "aws-types", - "bytes 1.4.0", + "bytes 1.5.0", "http", "regex", "tower", @@ -839,7 +968,7 @@ dependencies = [ "aws-smithy-json", "aws-smithy-types", "aws-types", - "bytes 1.4.0", + "bytes 1.5.0", "http", "regex", "tokio-stream", @@ -866,7 +995,7 @@ dependencies = [ "aws-smithy-types", "aws-smithy-xml", "aws-types", - "bytes 1.4.0", + "bytes 1.5.0", "bytes-utils", "fastrand", "http", @@ -881,6 +1010,31 @@ dependencies = [ ] [[package]] +name = "aws-sdk-sns" +version = "0.24.0" +source = "git+https://github.com/vectordotdev/aws-sdk-rust?rev=3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670#3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670" +dependencies = [ + "aws-credential-types", + "aws-endpoint", + "aws-http", + "aws-sig-auth", + "aws-smithy-async", + "aws-smithy-client", + "aws-smithy-http", + "aws-smithy-http-tower", + "aws-smithy-json", + "aws-smithy-query", + "aws-smithy-types", + "aws-smithy-xml", + "aws-types", + "bytes 1.5.0", + "http", + "regex", + "tokio-stream", + "tower", +] + +[[package]] name = "aws-sdk-sqs" version = "0.24.0" source = "git+https://github.com/vectordotdev/aws-sdk-rust?rev=3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670#3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670" @@ -898,7 +1052,7 @@ dependencies = [ "aws-smithy-types", "aws-smithy-xml", "aws-types", - "bytes 1.4.0", + "bytes 1.5.0", "http", "regex", "tokio-stream", @@ -921,7 +1075,7 @@ dependencies = [ "aws-smithy-json", "aws-smithy-types", "aws-types", - "bytes 1.4.0", + "bytes 1.5.0", "http", "regex", "tokio-stream", @@ -946,7 +1100,7 @@ dependencies = [ "aws-smithy-types", "aws-smithy-xml", "aws-types", - "bytes 1.4.0", + "bytes 1.5.0", "http", "regex", "tower", @@ -974,7 +1128,7 @@ source = "git+https://github.com/vectordotdev/aws-sdk-rust?rev=3d6aefb7fcfced5fc dependencies = [ "aws-smithy-eventstream", "aws-smithy-http", - "bytes 1.4.0", + "bytes 1.5.0", "form_urlencoded", "hex", "hmac", @@ -982,7 +1136,7 @@ dependencies = [ "once_cell", "percent-encoding", "regex", - "sha2 0.10.7", + "sha2", "time", "tracing 0.1.37", ] @@ -1005,7 +1159,7 @@ source = "git+https://github.com/vectordotdev/aws-sdk-rust?rev=3d6aefb7fcfced5fc dependencies = [ "aws-smithy-http", "aws-smithy-types", - "bytes 1.4.0", + "bytes 1.5.0", "crc32c", "crc32fast", "hex", @@ -1014,7 +1168,7 @@ dependencies = [ "md-5", "pin-project-lite", "sha1", - "sha2 0.10.7", + "sha2", "tracing 0.1.37", ] @@ -1028,7 +1182,7 @@ dependencies = [ "aws-smithy-http-tower", "aws-smithy-protocol-test", "aws-smithy-types", - "bytes 1.4.0", + "bytes 1.5.0", "fastrand", "http", "http-body", @@ -1049,7 +1203,7 @@ version = "0.54.1" source = "git+https://github.com/vectordotdev/aws-sdk-rust?rev=3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670#3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670" dependencies = [ "aws-smithy-types", - "bytes 1.4.0", + "bytes 1.5.0", "crc32fast", ] @@ -1060,7 +1214,7 @@ source = "git+https://github.com/vectordotdev/aws-sdk-rust?rev=3d6aefb7fcfced5fc dependencies = [ "aws-smithy-eventstream", "aws-smithy-types", - "bytes 1.4.0", + "bytes 1.5.0", "bytes-utils", "futures-core", "http", @@ -1080,7 +1234,7 @@ source = "git+https://github.com/vectordotdev/aws-sdk-rust?rev=3d6aefb7fcfced5fc dependencies = [ "aws-smithy-http", "aws-smithy-types", - "bytes 1.4.0", + "bytes 1.5.0", "http", "http-body", "pin-project-lite", @@ -1156,14 +1310,14 @@ dependencies = [ [[package]] name = "axum" -version = "0.6.18" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8175979259124331c1d7bf6586ee7e0da434155e4b2d48ec2c8386281d8df39" +checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" dependencies = [ "async-trait", "axum-core", "bitflags 1.3.2", - "bytes 1.4.0", + "bytes 1.5.0", "futures-util", "http", "http-body", @@ -1190,7 +1344,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" dependencies = [ "async-trait", - "bytes 1.4.0", + "bytes 1.5.0", "futures-util", "http", "http-body", @@ -1202,12 +1356,13 @@ dependencies = [ [[package]] name = "azure_core" -version = "0.5.0" -source = "git+https://github.com/Azure/azure-sdk-for-rust.git?rev=b4544d4920fa3064eb921340054cd9cc130b7664#b4544d4920fa3064eb921340054cd9cc130b7664" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f20eb684aea745292c540173304383c9cba9697d1c31d307620a57d6f878fa9" dependencies = [ "async-trait", - "base64 0.13.1", - "bytes 1.4.0", + "base64 0.21.4", + "bytes 1.5.0", "dyn-clone", "futures 0.3.28", "getrandom 0.2.10", @@ -1215,11 +1370,11 @@ dependencies = [ "log", "paste", "pin-project", + "quick-xml 0.30.0", "rand 0.8.5", "reqwest", "rustc_version 0.4.0", "serde", - "serde-xml-rs", "serde_json", "time", "url", @@ -1228,17 +1383,18 @@ dependencies = [ [[package]] name = "azure_identity" -version = "0.6.0" -source = "git+https://github.com/Azure/azure-sdk-for-rust.git?rev=b4544d4920fa3064eb921340054cd9cc130b7664#b4544d4920fa3064eb921340054cd9cc130b7664" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e15ab021e72fa7196fa8406951f7e85a3476e4968568b2ce3866d2ceed831655" dependencies = [ "async-lock", "async-trait", "azure_core", - "base64 0.13.1", "fix-hidden-lifetime-bug", "futures 0.3.28", "log", "oauth2", + "pin-project", "serde", "serde_json", "time", @@ -1248,23 +1404,22 @@ dependencies = [ [[package]] name = "azure_storage" -version = "0.6.0" -source = "git+https://github.com/Azure/azure-sdk-for-rust.git?rev=b4544d4920fa3064eb921340054cd9cc130b7664#b4544d4920fa3064eb921340054cd9cc130b7664" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf64f9d78e573f64e189fa7188c4e6a0f605e27740105a8d32038b3ba8c913be" dependencies = [ "RustyXML", "async-trait", "azure_core", - "base64 0.13.1", - "bytes 1.4.0", + "bytes 1.5.0", "futures 0.3.28", "hmac", "log", "once_cell", "serde", - "serde-xml-rs", "serde_derive", "serde_json", - "sha2 0.10.7", + "sha2", "time", "url", "uuid", @@ -1272,19 +1427,17 @@ dependencies = [ [[package]] name = "azure_storage_blobs" -version = "0.6.0" -source = "git+https://github.com/Azure/azure-sdk-for-rust.git?rev=b4544d4920fa3064eb921340054cd9cc130b7664#b4544d4920fa3064eb921340054cd9cc130b7664" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a61299a8b65b88acba1a079a0b5e8a39970a12cb53e35ada2641687edb022d5a" dependencies = [ "RustyXML", "azure_core", "azure_storage", - "base64 0.13.1", - "bytes 1.4.0", + "bytes 1.5.0", "futures 0.3.28", "log", - "md5", "serde", - "serde-xml-rs", "serde_derive", "serde_json", "time", @@ -1350,9 +1503,9 @@ checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5" [[package]] name = "base64" -version = "0.21.2" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" [[package]] name = "base64-simd" @@ -1364,15 +1517,6 @@ dependencies = [ ] [[package]] -name = "base64-url" -version = "1.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67a99c239d0c7e77c85dddfa9cebce48704b3c49550fcd3b84dd637e4484899f" -dependencies = [ - "base64 0.13.1", -] - -[[package]] name = "base64ct" version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1384,17 +1528,11 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" dependencies = [ - "bit-vec 0.6.3", + "bit-vec", ] [[package]] name = "bit-vec" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b4ff8b16e6076c3e14220b39fbc1fabb6737522281a388998046859400895f" - -[[package]] -name = "bit-vec" version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" @@ -1407,18 +1545,18 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.2" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dbe3c979c178231552ecba20214a8272df4e09f232a87aef4320cf06539aded" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" [[package]] name = "bitmask-enum" -version = "2.1.0" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd9e32d7420c85055e8107e5b2463c4eeefeaac18b52359fe9f9c08a18f342b2" +checksum = "49fb8528abca6895a5ada33d62aedd538a5c33e77068256483b44a3230270163" dependencies = [ - "quote 1.0.29", - "syn 1.0.109", + "quote 1.0.33", + "syn 2.0.37", ] [[package]] @@ -1435,15 +1573,6 @@ dependencies = [ [[package]] name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "generic-array", -] - -[[package]] -name = "block-buffer" version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" @@ -1475,37 +1604,38 @@ dependencies = [ ] [[package]] -name = "bloom" -version = "0.3.2" +name = "bloomy" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d00ac8e5056d6d65376a3c1aa5c7c34850d6949ace17f0266953a254eb3d6fe8" +checksum = "489d2af57852b78a86478273ac6a1ef912061b6af3a439694c49f309f6ea3bdd" dependencies = [ - "bit-vec 0.4.4", + "siphasher", ] [[package]] name = "bollard" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af254ed2da4936ef73309e9597180558821cb16ae9bba4cb24ce6b612d8d80ed" +checksum = "f03db470b3c0213c47e978da93200259a1eb4dae2e5512cba9955e2b540a6fc6" dependencies = [ - "base64 0.21.2", + "base64 0.21.4", "bollard-stubs", - "bytes 1.4.0", + "bytes 1.5.0", "chrono", - "dirs-next", "futures-core", "futures-util", "hex", + "home", "http", "hyper", - "hyper-rustls 0.23.1", + "hyper-rustls 0.24.0", "hyperlocal", "log", "pin-project-lite", - "rustls 0.20.7", - "rustls-native-certs 0.6.2", - "rustls-pemfile 1.0.1", + "rustls 0.21.7", + "rustls-native-certs", + "rustls-pemfile", + "rustls-webpki", "serde", "serde_derive", "serde_json", @@ -1515,20 +1645,20 @@ dependencies = [ "tokio", "tokio-util", "url", - "webpki 0.22.0", - "webpki-roots", + "webpki-roots 0.25.2", "winapi", ] [[package]] name = "bollard-stubs" -version = "1.42.0-rc.7" +version = "1.43.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "602bda35f33aeb571cef387dcd4042c643a8bf689d8aaac2cc47ea24cb7bc7e0" +checksum = "b58071e8fd9ec1e930efd28e3a90c1251015872a2ce49f81f36421b86466932e" dependencies = [ "chrono", "serde", - "serde_with 2.3.2", + "serde_repr", + "serde_with 3.3.0", ] [[package]] @@ -1538,7 +1668,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "822462c1e7b17b31961798a6874b36daea6818e99e0cb7d3b7b0fa3c477751c3" dependencies = [ "borsh-derive", - "hashbrown 0.13.2", + "hashbrown 0.13.1", ] [[package]] @@ -1550,7 +1680,7 @@ dependencies = [ "borsh-derive-internal", "borsh-schema-derive-internal", "proc-macro-crate 0.1.5", - "proc-macro2 1.0.63", + "proc-macro2 1.0.67", "syn 1.0.109", ] @@ -1560,8 +1690,8 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61820b4c5693eafb998b1e67485423c923db4a75f72585c247bdee32bad81e7b" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", + "proc-macro2 1.0.67", + "quote 1.0.33", "syn 1.0.109", ] @@ -1571,8 +1701,8 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c76cdbfa13def20d1f8af3ae7b3c6771f06352a74221d8851262ac384c122b8e" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", + "proc-macro2 1.0.67", + "quote 1.0.33", "syn 1.0.109", ] @@ -1605,18 +1735,17 @@ checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" dependencies = [ "lazy_static", "memchr", - "regex-automata", + "regex-automata 0.1.10", ] [[package]] name = "bstr" -version = "1.5.0" +version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5" +checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" dependencies = [ "memchr", - "once_cell", - "regex-automata", + "regex-automata 0.3.8", "serde", ] @@ -1642,8 +1771,8 @@ version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13e576ebe98e605500b3c8041bb888e966653577172df6dd97398714eb30b9bf" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", + "proc-macro2 1.0.67", + "quote 1.0.33", "syn 1.0.109", ] @@ -1671,9 +1800,9 @@ dependencies = [ [[package]] name = "bytes" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" dependencies = [ "serde", ] @@ -1684,15 +1813,15 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e47d3a8076e283f3acd27400535992edb3ba4b5bb72f8891ad8fbe7932a7d4b9" dependencies = [ - "bytes 1.4.0", + "bytes 1.5.0", "either", ] [[package]] name = "bytesize" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38fcc2979eff34a4b84e1cf9a1e3da42a7d44b3b690a40cdcb23e3d556cfb2e5" +checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" [[package]] name = "cache-padded" @@ -1702,31 +1831,27 @@ checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" [[package]] name = "cached" -version = "0.44.0" +version = "0.45.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b195e4fbc4b6862bbd065b991a34750399c119797efff72492f28a5864de8700" +checksum = "90eb5776f28a149524d1d8623035760b4454ec881e8cf3838fa8d7e1b11254b3" dependencies = [ - "async-trait", "cached_proc_macro", "cached_proc_macro_types", - "futures 0.3.28", - "hashbrown 0.13.2", + "hashbrown 0.13.1", "instant", "once_cell", "thiserror", - "tokio", ] [[package]] name = "cached_proc_macro" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b48814962d2fd604c50d2b9433c2a41a0ab567779ee2c02f7fba6eca1221f082" +checksum = "7da8245dd5f576a41c3b76247b54c15b0e43139ceeb4f732033e15be7c005176" dependencies = [ - "cached_proc_macro_types", "darling 0.14.2", - "proc-macro2 1.0.63", - "quote 1.0.29", + "proc-macro2 1.0.67", + "quote 1.0.33", "syn 1.0.109", ] @@ -1737,6 +1862,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a4f925191b4367301851c6d99b09890311d74b0d43f274c0b34c86d308a3663" [[package]] +name = "cargo_toml" +version = "0.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3f9629bc6c4388ea699781dc988c2b99766d7679b151c81990b4fa1208fafd3" +dependencies = [ + "serde", + "toml 0.8.0", +] + +[[package]] name = "cassowary" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1759,11 +1894,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.77" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4" +checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01" dependencies = [ "jobserver", + "libc", ] [[package]] @@ -1788,6 +1924,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] +name = "chacha20" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7fc89c7c5b9e7a02dfe45cd2367bae382f9ed31c61ca8debe5f827c420a2f08" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + +[[package]] +name = "chacha20poly1305" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35" +dependencies = [ + "aead", + "chacha20", + "cipher", + "poly1305", + "zeroize", +] + +[[package]] name = "charset" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1799,8 +1959,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.26" -source = "git+https://github.com/vectordotdev/chrono.git?tag=v0.4.26-no-default-time-1#d44a3b100183d68f8a3e3cb431fcc4a47152a0a3" +version = "0.4.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "defd4e7873dbddba6c7c91e199c7fcb946abc4a6a4ac3195400bcfb01b5de877" dependencies = [ "android-tzdata", "iana-time-zone", @@ -1808,7 +1969,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "winapi", + "windows-targets 0.48.0", ] [[package]] @@ -1863,9 +2024,9 @@ dependencies = [ [[package]] name = "cidr-utils" -version = "0.5.10" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdfa36f04861d39453affe1cf084ce2d6554021a84eb6f31ebdeafb6fb92a01c" +checksum = "2315f7119b7146d6a883de6acd63ddf96071b5f79d9d98d2adaa84d749f6abf1" dependencies = [ "debug-helper", "num-bigint", @@ -1882,6 +2043,7 @@ checksum = "d1873270f8f7942c191139cb8a40fd228da6c3fd2fc376d7e92d47aa14aeb59e" dependencies = [ "crypto-common", "inout", + "zeroize", ] [[package]] @@ -1901,13 +2063,12 @@ dependencies = [ [[package]] name = "clap" -version = "4.1.14" +version = "4.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "906f7fe1da4185b7a282b2bc90172a496f9def1aca4545fe7526810741591e14" +checksum = "824956d0dca8334758a5b7f7e50518d66ea319330cbceedcf76905c2f6ab30e3" dependencies = [ "clap_builder", "clap_derive", - "once_cell", ] [[package]] @@ -1916,50 +2077,49 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1eef05769009513df2eb1c3b4613e7fad873a14c600ff025b08f250f59fee7de" dependencies = [ - "clap 4.1.14", + "clap 4.4.5", "log", ] [[package]] name = "clap_builder" -version = "4.1.14" +version = "4.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "351f9ad9688141ed83dfd8f5fb998a06225ef444b48ff4dc43de6d409b7fd10b" +checksum = "122ec64120a49b4563ccaedcbea7818d069ed8e9aa6d829b82d8a4128936b2ab" dependencies = [ - "bitflags 1.3.2", + "anstream", + "anstyle 1.0.0", "clap_lex", - "is-terminal", "strsim 0.10.0", - "termcolor", - "terminal_size 0.2.2", + "terminal_size 0.3.0", ] [[package]] name = "clap_complete" -version = "4.3.1" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6b5c519bab3ea61843a7923d074b04245624bb84a64a8c150f5deb014e388b" +checksum = "8baeccdb91cd69189985f87f3c7e453a3a451ab5746cf3be6acc92120bd16d24" dependencies = [ - "clap 4.1.14", + "clap 4.4.5", ] [[package]] name = "clap_derive" -version = "4.1.14" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81d7dc0031c3a59a04fc2ba395c8e2dd463cba1859275f065d225f6122221b45" +checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" dependencies = [ - "heck 0.4.0", - "proc-macro2 1.0.63", - "quote 1.0.29", - "syn 2.0.10", + "heck 0.4.1", + "proc-macro2 1.0.67", + "quote 1.0.33", + "syn 2.0.37", ] [[package]] name = "clap_lex" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" +checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" [[package]] name = "clipboard-win" @@ -1986,17 +2146,18 @@ name = "codecs" version = "0.1.0" dependencies = [ "apache-avro", - "bytes 1.4.0", + "bytes 1.5.0", "chrono", - "csv", + "csv-core", "derivative", "dyn-clone", "futures 0.3.28", "indoc", "memchr", "once_cell", - "ordered-float 3.7.0", - "prost", + "ordered-float 4.1.0", + "prost 0.12.1", + "prost-reflect", "regex", "serde", "serde_json", @@ -2027,14 +2188,20 @@ dependencies = [ ] [[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] name = "colored" -version = "2.0.0" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd" +checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6" dependencies = [ - "atty", + "is-terminal", "lazy_static", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -2056,7 +2223,7 @@ version = "4.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" dependencies = [ - "bytes 1.4.0", + "bytes 1.5.0", "futures-core", "memchr", "pin-project-lite", @@ -2065,6 +2232,20 @@ dependencies = [ ] [[package]] +name = "community-id" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a97e158411823bf87634e2e47552f712e51fa4119cdb2255da799e7cb5c90a9" +dependencies = [ + "anyhow", + "base64 0.21.4", + "hex", + "lazy_static", + "num_enum 0.6.1", + "sha1", +] + +[[package]] name = "concurrent-queue" version = "1.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2114,17 +2295,17 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2895653b4d9f1538a83970077cb01dfc77a4810524e51a110944688e916b18e" dependencies = [ - "prost", - "prost-types", - "tonic", + "prost 0.11.9", + "prost-types 0.11.9", + "tonic 0.9.2", "tracing-core 0.1.30", ] [[package]] name = "console-subscriber" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57ab2224a0311582eb03adba4caaf18644f7b1f10a760803a803b9b605187fc7" +checksum = "d4cf42660ac07fcebed809cfe561dd8730bcd35b075215e6479c516bcd0d11cb" dependencies = [ "console-api", "crossbeam-channel", @@ -2132,13 +2313,13 @@ dependencies = [ "futures 0.3.28", "hdrhistogram", "humantime", - "prost-types", + "prost-types 0.11.9", "serde", "serde_json", "thread_local", "tokio", "tokio-stream", - "tonic", + "tonic 0.9.2", "tracing 0.1.37", "tracing-core 0.1.30", "tracing-subscriber", @@ -2146,9 +2327,9 @@ dependencies = [ [[package]] name = "const-oid" -version = "0.6.2" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6f2aa4d0537bcc1c74df8755072bd31c1ef1a3a1b85a68e8404a8c353b7b8b" +checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" [[package]] name = "convert_case" @@ -2189,9 +2370,9 @@ checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" [[package]] name = "cpufeatures" -version = "0.2.5" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" dependencies = [ "libc", ] @@ -2238,7 +2419,7 @@ dependencies = [ "anes", "cast", "ciborium", - "clap 4.1.14", + "clap 4.4.5", "criterion-plot", "futures 0.3.28", "is-terminal", @@ -2322,27 +2503,11 @@ dependencies = [ [[package]] name = "crossterm" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67" -dependencies = [ - "bitflags 1.3.2", - "crossterm_winapi", - "libc", - "mio", - "parking_lot", - "signal-hook", - "signal-hook-mio", - "winapi", -] - -[[package]] -name = "crossterm" -version = "0.26.1" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a84cda67535339806297f1b331d6dd6320470d2a0fe65381e79ee9e156dd3d13" +checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "crossterm_winapi", "futures-core", "libc", @@ -2355,9 +2520,9 @@ dependencies = [ [[package]] name = "crossterm_winapi" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ae1b35a484aa10e07fe0638d02301c5ad24de82d310ccbd2f3693da5f09bf1c" +checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" dependencies = [ "winapi", ] @@ -2375,10 +2540,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", + "rand_core 0.6.4", "typenum", ] [[package]] +name = "crypto_secretbox" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9d6cf87adf719ddf43a805e92c6870a531aedda35ff640442cbaf8674e141e1" +dependencies = [ + "aead", + "cipher", + "generic-array", + "poly1305", + "salsa20", + "subtle", + "zeroize", +] + +[[package]] name = "csv" version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2405,7 +2586,7 @@ version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" dependencies = [ - "quote 1.0.29", + "quote 1.0.33", "syn 1.0.109", ] @@ -2426,15 +2607,29 @@ checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" [[package]] name = "curve25519-dalek" -version = "3.2.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" +checksum = "f711ade317dd348950a9910f81c5947e3d8907ebd2b83f76203ff1807e6a2bc2" dependencies = [ - "byteorder", - "digest 0.9.0", - "rand_core 0.5.1", + "cfg-if", + "cpufeatures", + "curve25519-dalek-derive", + "digest", + "fiat-crypto", + "platforms 3.0.2", + "rustc_version 0.4.0", "subtle", - "zeroize", +] + +[[package]] +name = "curve25519-dalek-derive" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" +dependencies = [ + "proc-macro2 1.0.67", + "quote 1.0.33", + "syn 2.0.37", ] [[package]] @@ -2458,8 +2653,8 @@ dependencies = [ "cc", "codespan-reporting", "once_cell", - "proc-macro2 1.0.63", - "quote 1.0.29", + "proc-macro2 1.0.67", + "quote 1.0.33", "scratch", "syn 1.0.109", ] @@ -2476,8 +2671,8 @@ version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a08a6e2fcc370a089ad3b4aaf54db3b1b4cee38ddabce5896b33eb693275f470" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", + "proc-macro2 1.0.67", + "quote 1.0.33", "syn 1.0.109", ] @@ -2502,6 +2697,16 @@ dependencies = [ ] [[package]] +name = "darling" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +dependencies = [ + "darling_core 0.20.3", + "darling_macro 0.20.3", +] + +[[package]] name = "darling_core" version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2509,8 +2714,8 @@ checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.63", - "quote 1.0.29", + "proc-macro2 1.0.67", + "quote 1.0.33", "strsim 0.10.0", "syn 1.0.109", ] @@ -2523,20 +2728,34 @@ checksum = "a784d2ccaf7c98501746bf0be29b2022ba41fd62a2e622af997a03e9f972859f" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.63", - "quote 1.0.29", + "proc-macro2 1.0.67", + "quote 1.0.33", "strsim 0.10.0", "syn 1.0.109", ] [[package]] +name = "darling_core" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2 1.0.67", + "quote 1.0.33", + "strsim 0.10.0", + "syn 2.0.37", +] + +[[package]] name = "darling_macro" version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" dependencies = [ "darling_core 0.13.4", - "quote 1.0.29", + "quote 1.0.33", "syn 1.0.109", ] @@ -2547,18 +2766,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7618812407e9402654622dd402b0a89dff9ba93badd6540781526117b92aab7e" dependencies = [ "darling_core 0.14.2", - "quote 1.0.29", + "quote 1.0.33", "syn 1.0.109", ] [[package]] +name = "darling_macro" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +dependencies = [ + "darling_core 0.20.3", + "quote 1.0.33", + "syn 2.0.37", +] + +[[package]] name = "dashmap" -version = "5.4.0" +version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.12.3", + "hashbrown 0.14.0", "lock_api", "once_cell", "parking_lot_core", @@ -2609,11 +2839,22 @@ checksum = "f578e8e2c440e7297e008bb5486a3a8a194775224bbc23729b0dbdfaeebf162e" [[package]] name = "der" -version = "0.4.5" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79b71cca7d95d7681a4b3b9cdf63c8dbc3730d0584c2c74e31416d64a90493f4" +checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" dependencies = [ "const-oid", + "pem-rfc7468", + "zeroize", +] + +[[package]] +name = "deranged" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +dependencies = [ + "serde", ] [[package]] @@ -2622,8 +2863,8 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", + "proc-macro2 1.0.67", + "quote 1.0.33", "syn 1.0.109", ] @@ -2633,9 +2874,9 @@ version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53e0efad4403bfc52dc201159c4b842a246a14b98c64b55dfd0f2d89729dfeb8" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", - "syn 2.0.10", + "proc-macro2 1.0.67", + "quote 1.0.33", + "syn 2.0.37", ] [[package]] @@ -2645,8 +2886,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "convert_case 0.4.0", - "proc-macro2 1.0.63", - "quote 1.0.29", + "proc-macro2 1.0.67", + "quote 1.0.33", "rustc_version 0.4.0", "syn 1.0.109", ] @@ -2665,20 +2906,11 @@ checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" [[package]] name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array", -] - -[[package]] -name = "digest" version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "block-buffer 0.10.3", + "block-buffer", "crypto-common", "subtle", ] @@ -2756,13 +2988,13 @@ dependencies = [ [[package]] name = "dns-lookup" -version = "2.0.2" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f332aa79f9e9de741ac013237294ef42ce2e9c6394dc7d766725812f1238812" +checksum = "8d0fa3cd8dc96ada974e126a940d37d4079bbbe6a24aca15b1113c2f362441c5" dependencies = [ "cfg-if", "libc", - "socket2 0.5.3", + "socket2 0.5.4", "windows-sys 0.48.0", ] @@ -2773,7 +3005,7 @@ dependencies = [ "criterion", "data-encoding", "thiserror", - "trust-dns-proto 0.22.0", + "trust-dns-proto 0.23.0", ] [[package]] @@ -2816,29 +3048,29 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "dyn-clone" -version = "1.0.11" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30" +checksum = "23d2f3407d9a573d666de4b5bdf10569d73ca9478087346697dcbae6244bfbcd" [[package]] name = "ed25519" -version = "1.5.3" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" +checksum = "60f6d271ca33075c88028be6f04d502853d63a5ece419d269c15315d4fc1cf1d" dependencies = [ "signature", ] [[package]] name = "ed25519-dalek" -version = "1.0.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" +checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980" dependencies = [ "curve25519-dalek", "ed25519", - "sha2 0.9.9", - "zeroize", + "sha2", + "signature", ] [[package]] @@ -2870,9 +3102,9 @@ checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" [[package]] name = "encoding_rs" -version = "0.8.32" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" dependencies = [ "cfg-if", "serde", @@ -2900,54 +3132,54 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73" dependencies = [ - "heck 0.4.0", - "proc-macro2 1.0.63", - "quote 1.0.29", + "heck 0.4.1", + "proc-macro2 1.0.67", + "quote 1.0.33", "syn 1.0.109", ] [[package]] name = "enum-as-inner" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" +checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" dependencies = [ - "heck 0.4.0", - "proc-macro2 1.0.63", - "quote 1.0.29", - "syn 1.0.109", + "heck 0.4.1", + "proc-macro2 1.0.67", + "quote 1.0.33", + "syn 2.0.37", ] [[package]] name = "enum_dispatch" -version = "0.3.11" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11f36e95862220b211a6e2aa5eca09b4fa391b13cd52ceb8035a24bf65a79de2" +checksum = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e" dependencies = [ "once_cell", - "proc-macro2 1.0.63", - "quote 1.0.29", - "syn 1.0.109", + "proc-macro2 1.0.67", + "quote 1.0.33", + "syn 2.0.37", ] [[package]] name = "enumflags2" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c041f5090df68b32bcd905365fd51769c8b9d553fe87fde0b683534f10c01bd2" +checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" dependencies = [ "enumflags2_derive", ] [[package]] name = "enumflags2_derive" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" +checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", - "syn 2.0.10", + "proc-macro2 1.0.67", + "quote 1.0.33", + "syn 2.0.37", ] [[package]] @@ -2987,26 +3219,15 @@ checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1" [[package]] name = "erased-serde" -version = "0.3.23" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54558e0ba96fbe24280072642eceb9d7d442e32c7ec0ea9e7ecd7b4ea2cf4e11" +checksum = "f94c0e13118e7d7533271f754a168ae8400e6a1cc043f2bfd53cc7290f1a1de3" dependencies = [ "serde", ] [[package]] name = "errno" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" -dependencies = [ - "errno-dragonfly", - "libc", - "winapi", -] - -[[package]] -name = "errno" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" @@ -3073,8 +3294,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f47da3a72ec598d9c8937a7ebca8962a5c7a1f28444e38c2b33c771ba3f55f05" dependencies = [ "proc-macro-error", - "proc-macro2 1.0.63", - "quote 1.0.29", + "proc-macro2 1.0.67", + "quote 1.0.33", "syn 1.0.109", ] @@ -3114,11 +3335,17 @@ dependencies = [ ] [[package]] +name = "fiat-crypto" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" + +[[package]] name = "file-source" version = "0.1.0" dependencies = [ - "bstr 1.5.0", - "bytes 1.4.0", + "bstr 1.6.2", + "bytes 1.5.0", "chrono", "crc", "criterion", @@ -3144,14 +3371,14 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.18" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b9663d381d07ae25dc88dbdf27df458faa83a9b25336bcac83d5e452b5fc9d3" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.2.16", - "windows-sys 0.42.0", + "redox_syscall 0.3.5", + "windows-sys 0.48.0", ] [[package]] @@ -3169,8 +3396,8 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4c81935e123ab0741c4c4f0d9b8377e5fb21d3de7e062fa4b1263b1fbcba1ea" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", + "proc-macro2 1.0.67", + "quote 1.0.33", "syn 1.0.109", ] @@ -3188,9 +3415,9 @@ checksum = "cda653ca797810c02f7ca4b804b40b8b95ae046eb989d356bce17919a8c25499" [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", "miniz_oxide 0.7.1", @@ -3350,9 +3577,9 @@ version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", - "syn 2.0.10", + "proc-macro2 1.0.67", + "quote 1.0.33", + "syn 2.0.37", ] [[package]] @@ -3395,12 +3622,13 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.6" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", + "zeroize", ] [[package]] @@ -3428,17 +3656,6 @@ dependencies = [ ] [[package]] -name = "ghost" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb19fe8de3ea0920d282f7b77dd4227aea6b8b999b42cdf0ca41b2472b14443a" -dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", - "syn 1.0.109", -] - -[[package]] name = "gimli" version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3452,9 +3669,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "gloo-utils" -version = "0.1.7" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "037fcb07216cb3a30f7292bd0176b050b7b9a052ba830ef7d5d65f6dc64ba58e" +checksum = "0b5555354113b18c547c1d3a98fbf7fb32a9ff4f6fa112ce823a21641a0ba3aa" dependencies = [ "js-sys", "serde", @@ -3484,9 +3701,9 @@ dependencies = [ [[package]] name = "governor" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c390a940a5d157878dd057c78680a33ce3415bcd05b4799509ea44210914b4d5" +checksum = "821239e5672ff23e2a7060901fa622950bbd80b649cdaadd78d1c1767ed14eb4" dependencies = [ "cfg-if", "dashmap", @@ -3537,10 +3754,10 @@ checksum = "a40f793251171991c4eb75bd84bc640afa8b68ff6907bc89d3b712a22f700506" dependencies = [ "graphql-introspection-query", "graphql-parser", - "heck 0.4.0", + "heck 0.4.1", "lazy_static", - "proc-macro2 1.0.63", - "quote 1.0.29", + "proc-macro2 1.0.67", + "quote 1.0.33", "serde", "serde_json", "syn 1.0.109", @@ -3553,11 +3770,44 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00bda454f3d313f909298f626115092d348bc231025699f557b27e248475f48c" dependencies = [ "graphql_client_codegen", - "proc-macro2 1.0.63", + "proc-macro2 1.0.67", "syn 1.0.109", ] [[package]] +name = "greptime-proto" +version = "0.1.0" +source = "git+https://github.com/GreptimeTeam/greptime-proto.git?tag=0.2.1#4398d20c56d5f7939cc2960789cb1fa7dd18e6fe" +dependencies = [ + "prost 0.11.9", + "serde", + "serde_json", + "tonic 0.9.2", + "tonic-build 0.9.2", +] + +[[package]] +name = "greptimedb-client" +version = "0.1.0" +source = "git+https://github.com/GreptimeTeam/greptimedb-client-rust.git?rev=bc32362adf0df17a41a95bae4221d6d8f1775656#bc32362adf0df17a41a95bae4221d6d8f1775656" +dependencies = [ + "dashmap", + "enum_dispatch", + "futures 0.3.28", + "futures-util", + "greptime-proto", + "parking_lot", + "prost 0.11.9", + "rand 0.8.5", + "snafu", + "tokio", + "tokio-stream", + "tonic 0.9.2", + "tonic-build 0.9.2", + "tower", +] + +[[package]] name = "grok" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3569,11 +3819,11 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.20" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" dependencies = [ - "bytes 1.4.0", + "bytes 1.5.0", "fnv", "futures-core", "futures-sink", @@ -3609,9 +3859,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.13.2" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +checksum = "33ff8ae62cd3a9102e5637afc8452c55acf3844001bd5374e0b0bd7b6616c038" dependencies = [ "ahash 0.8.2", ] @@ -3641,13 +3891,12 @@ dependencies = [ [[package]] name = "headers" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" +checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" dependencies = [ - "base64 0.13.1", - "bitflags 1.3.2", - "bytes 1.4.0", + "base64 0.21.4", + "bytes 1.5.0", "headers-core", "http", "httpdate", @@ -3675,9 +3924,9 @@ dependencies = [ [[package]] name = "heck" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "heim" @@ -3758,7 +4007,7 @@ dependencies = [ "log", "mach", "ntapi", - "platforms", + "platforms 1.1.0", "winapi", ] @@ -3830,7 +4079,16 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.7", + "digest", +] + +[[package]] +name = "home" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +dependencies = [ + "windows-sys 0.48.0", ] [[package]] @@ -3850,7 +4108,7 @@ version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ - "bytes 1.4.0", + "bytes 1.5.0", "fnv", "itoa", ] @@ -3861,7 +4119,7 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ - "bytes 1.4.0", + "bytes 1.5.0", "http", "pin-project-lite", ] @@ -3873,6 +4131,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" [[package]] +name = "http-serde" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f560b665ad9f1572cfcaf034f7fb84338a7ce945216d64a90fd81f046a3caee" +dependencies = [ + "http", + "serde", +] + +[[package]] name = "http-types" version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3917,7 +4185,7 @@ version = "0.14.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" dependencies = [ - "bytes 1.4.0", + "bytes 1.5.0", "futures-channel", "futures-core", "futures-util", @@ -3959,7 +4227,7 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca815a891b24fdfb243fa3239c86154392b0953ee584aa1a2a1f66d20cbe75cc" dependencies = [ - "bytes 1.4.0", + "bytes 1.5.0", "futures 0.3.28", "headers", "http", @@ -3980,7 +4248,7 @@ dependencies = [ "hyper", "log", "rustls 0.20.7", - "rustls-native-certs 0.6.2", + "rustls-native-certs", "tokio", "tokio-rustls 0.23.4", ] @@ -3993,9 +4261,11 @@ checksum = "0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7" dependencies = [ "http", "hyper", - "rustls 0.21.0", + "log", + "rustls 0.21.7", + "rustls-native-certs", "tokio", - "tokio-rustls 0.24.0", + "tokio-rustls 0.24.1", ] [[package]] @@ -4016,7 +4286,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ - "bytes 1.4.0", + "bytes 1.5.0", "hyper", "native-tls", "tokio", @@ -4111,9 +4381,9 @@ dependencies = [ [[package]] name = "indicatif" -version = "0.17.5" +version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ff8cc23a7393a397ed1d7f56e6365cba772aba9f9912ab968b03043c395d057" +checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25" dependencies = [ "console", "instant", @@ -4125,9 +4395,9 @@ dependencies = [ [[package]] name = "indoc" -version = "2.0.1" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f2cb48b81b1dc9f39676bf99f5499babfec7cd8fe14307f7b3d747208fb5690" +checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" [[package]] name = "infer" @@ -4137,9 +4407,9 @@ checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac" [[package]] name = "infer" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb78f4c4a058ef30a9ff77322e758f7e60f871274b602d7fdc1b0956b0cb88e" +checksum = "cb33622da908807a06f9513c19b3c1ad50fab3e4137d82a78107d502075aa199" [[package]] name = "inotify" @@ -4182,18 +4452,9 @@ dependencies = [ [[package]] name = "inventory" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0539b5de9241582ce6bd6b0ba7399313560151e58c9aaf8b74b711b1bdce644" -dependencies = [ - "ghost", -] - -[[package]] -name = "io-lifetimes" -version = "0.7.5" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074" +checksum = "e1be380c410bf0595e94992a648ea89db4dd3f3354ba54af206fd2a68cf5ac8e" [[package]] name = "io-lifetimes" @@ -4224,7 +4485,7 @@ dependencies = [ "socket2 0.4.9", "widestring 0.5.1", "winapi", - "winreg", + "winreg 0.10.1", ] [[package]] @@ -4249,7 +4510,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" dependencies = [ "hermit-abi 0.3.1", - "io-lifetimes 1.0.11", + "io-lifetimes", "rustix 0.37.19", "windows-sys 0.48.0", ] @@ -4325,12 +4586,6 @@ dependencies = [ ] [[package]] -name = "json" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "078e285eafdfb6c4b434e0d31e8cfcb5115b651496faca5749b88fafd4f23bfd" - -[[package]] name = "json-patch" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4377,7 +4632,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d9455388f4977de4d0934efa9f7d36296295537d774574113a20f6082de03da" dependencies = [ "base64 0.13.1", - "bytes 1.4.0", + "bytes 1.5.0", "chrono", "serde", "serde-value", @@ -4390,8 +4645,8 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd990069640f9db34b3b0f7a1afc62a05ffaa3be9b66aa3c313f58346df7f788" dependencies = [ - "base64 0.21.2", - "bytes 1.4.0", + "base64 0.21.4", + "bytes 1.5.0", "chrono", "http", "percent-encoding", @@ -4469,7 +4724,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90b1d8deb705ef2463b2ce142b0ff98c815f8f0ac393d13c8f4c2b26491daf66" dependencies = [ "base64 0.20.0", - "bytes 1.4.0", + "bytes 1.5.0", "chrono", "dirs-next", "either", @@ -4488,7 +4743,7 @@ dependencies = [ "secrecy", "serde", "serde_json", - "serde_yaml 0.9.22", + "serde_yaml 0.9.25", "thiserror", "tokio", "tokio-util", @@ -4554,7 +4809,7 @@ dependencies = [ "lalrpop-util", "petgraph", "regex", - "regex-syntax 0.7.2", + "regex-syntax 0.7.5", "string_cache", "term", "tiny-keccak", @@ -4569,9 +4824,9 @@ checksum = "3f35c735096c0293d313e8f2a641627472b83d01b937177fe76e5e2708d31e0d" [[package]] name = "lapin" -version = "2.2.1" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acc13beaa09eed710f406201f46b961345b4d061dd90ec3d3ccc70721e70342a" +checksum = "5f3067a1fcfbc3fc46455809c023e69b8f6602463201010f4ae5a3b572adb9dc" dependencies = [ "amq-protocol", "async-global-executor-trait", @@ -4597,9 +4852,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.147" +version = "0.2.148" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" [[package]] name = "libflate" @@ -4665,15 +4920,15 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.0.46" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.3.8" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" [[package]] name = "listenfd" @@ -4688,9 +4943,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ "autocfg", "scopeguard", @@ -4704,9 +4959,9 @@ checksum = "8166fbddef141acbea89cf3425ed97d4c22d14a68161977fc01c301175a4fb89" [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "logfmt" @@ -4718,19 +4973,19 @@ checksum = "879777f0cc6f3646a044de60e4ab98c75617e3f9580f7a2032e6ad7ea0cd3054" name = "loki-logproto" version = "0.1.0" dependencies = [ - "bytes 1.4.0", + "bytes 1.5.0", "chrono", - "prost", - "prost-build", - "prost-types", + "prost 0.12.1", + "prost-build 0.12.1", + "prost-types 0.12.1", "snap", ] [[package]] name = "lru" -version = "0.10.1" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718e8fae447df0c7e1ba7f5189829e63fd536945c8988d61444c19039f16b670" +checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21" [[package]] name = "lru-cache" @@ -4752,11 +5007,12 @@ dependencies = [ [[package]] name = "luajit-src" -version = "210.4.3+resty8384278" +version = "210.4.8+resty107baaf" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ee5d5afddf1ec76ffa55ca7c3001f2f8a703834beba53c56a38ea6641cef44" +checksum = "e05167e8b2a2185758d83ed23541e5bd8bce37072e4204e0ef2c9b322bc87c4e" dependencies = [ "cc", + "which", ] [[package]] @@ -4824,7 +5080,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" dependencies = [ - "regex-automata", + "regex-automata 0.1.10", ] [[package]] @@ -4862,24 +5118,19 @@ dependencies = [ [[package]] name = "md-5" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" dependencies = [ - "digest 0.10.7", + "cfg-if", + "digest", ] [[package]] -name = "md5" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" - -[[package]] name = "memchr" -version = "2.5.0" +version = "2.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" [[package]] name = "memmap2" @@ -4910,9 +5161,9 @@ dependencies = [ [[package]] name = "metrics" -version = "0.21.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa8ebbd1a9e57bbab77b9facae7f5136aea44c356943bf9a198f647da64285d6" +checksum = "fde3af1a009ed76a778cb84fdef9e7dbbdf5775ae3e4cc1f434a6a307f6f76c5" dependencies = [ "ahash 0.8.2", "metrics-macros", @@ -4925,9 +5176,9 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ddece26afd34c31585c74a4db0630c376df271c285d682d1e55012197830b6df" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", - "syn 2.0.10", + "proc-macro2 1.0.67", + "quote 1.0.33", + "syn 2.0.37", ] [[package]] @@ -4948,18 +5199,18 @@ dependencies = [ [[package]] name = "metrics-util" -version = "0.15.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "111cb375987443c3de8d503580b536f77dc8416d32db62d9456db5d93bd7ac47" +checksum = "4de2ed6e491ed114b40b732e4d1659a9d53992ebd87490c44a6ffe23739d973e" dependencies = [ - "aho-corasick 0.7.20", + "aho-corasick", "crossbeam-epoch", "crossbeam-utils", - "hashbrown 0.13.2", + "hashbrown 0.13.1", "indexmap 1.9.3", "metrics", "num_cpus", - "ordered-float 3.7.0", + "ordered-float 3.9.1", "quanta", "radix_trie", "sketches-ddsketch", @@ -5019,18 +5270,44 @@ dependencies = [ [[package]] name = "mlua" -version = "0.8.9" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07366ed2cd22a3b000aed076e2b68896fb46f06f1f5786c5962da73c0af01577" +checksum = "6c3a7a7ff4481ec91b951a733390211a8ace1caba57266ccb5f4d4966704e560" +dependencies = [ + "bstr 1.6.2", + "mlua-sys", + "mlua_derive", + "num-traits", + "once_cell", + "rustc-hash", +] + +[[package]] +name = "mlua-sys" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ec8b54eddb76093069cce9eeffb4c7b3a1a0fe66962d7bd44c4867928149ca3" dependencies = [ - "bstr 0.2.17", "cc", + "cfg-if", "lua-src", "luajit-src", - "num-traits", - "once_cell", "pkg-config", - "rustc-hash", +] + +[[package]] +name = "mlua_derive" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f359220f24e6452dd82a3f50d7242d4aab822b5594798048e953d7a9e0314c6" +dependencies = [ + "itertools 0.11.0", + "once_cell", + "proc-macro-error", + "proc-macro2 1.0.67", + "quote 1.0.33", + "regex", + "syn 2.0.37", ] [[package]] @@ -5041,9 +5318,9 @@ checksum = "6c1a54de846c4006b88b1516731cc1f6026eb5dc4bcb186aa071ef66d40524ec" [[package]] name = "mongodb" -version = "2.6.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebcd85ec209a5b84fd9f54b9e381f6fa17462bc74160d018fc94fd8b9f61faa8" +checksum = "16928502631c0db72214720aa479c722397fe5aed6bf1c740a3830b3fe4bfcfe" dependencies = [ "async-trait", "base64 0.13.1", @@ -5065,12 +5342,12 @@ dependencies = [ "rand 0.8.5", "rustc_version_runtime", "rustls 0.20.7", - "rustls-pemfile 1.0.1", + "rustls-pemfile", "serde", "serde_bytes", "serde_with 1.14.0", "sha-1", - "sha2 0.10.7", + "sha2", "socket2 0.4.9", "stringprep", "strsim 0.10.0", @@ -5081,9 +5358,9 @@ dependencies = [ "tokio-util", "trust-dns-proto 0.21.2", "trust-dns-resolver", - "typed-builder", + "typed-builder 0.10.0", "uuid", - "webpki-roots", + "webpki-roots 0.22.5", ] [[package]] @@ -5092,7 +5369,7 @@ version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ed4198ce7a4cbd2a57af78d28c6fbb57d81ac5f1d6ad79ac6c5587419cbdf22" dependencies = [ - "bytes 1.4.0", + "bytes 1.5.0", "encoding_rs", "futures-util", "http", @@ -5129,42 +5406,6 @@ dependencies = [ ] [[package]] -name = "nats" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eebb39ba0555bcf232817d42ed3346499f14f6f8d4de1c0ca4517bda99c1a7b" -dependencies = [ - "base64 0.13.1", - "base64-url", - "blocking", - "crossbeam-channel", - "fastrand", - "itoa", - "json", - "lazy_static", - "libc", - "log", - "memchr", - "nkeys 0.2.0", - "nuid", - "once_cell", - "parking_lot", - "regex", - "ring", - "rustls 0.19.1", - "rustls-native-certs 0.5.0", - "rustls-pemfile 0.2.1", - "serde", - "serde_json", - "serde_nanos", - "serde_repr", - "time", - "url", - "webpki 0.21.4", - "winapi", -] - -[[package]] name = "ndarray" version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5240,27 +5481,13 @@ dependencies = [ [[package]] name = "nkeys" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e66a7cd1358277b2a6f77078e70aea7315ff2f20db969cc61153103ec162594" -dependencies = [ - "byteorder", - "data-encoding", - "ed25519-dalek", - "getrandom 0.2.10", - "log", - "rand 0.8.5", - "signatory", -] - -[[package]] -name = "nkeys" -version = "0.3.0" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2d151f6ece2f3d1077f6c779268de2516653d8344ddde65addd785cce764fe5" +checksum = "aad178aad32087b19042ee36dfd450b73f5f934fbfb058b59b198684dfec4c47" dependencies = [ "byteorder", "data-encoding", + "ed25519", "ed25519-dalek", "getrandom 0.2.10", "log", @@ -5270,9 +5497,9 @@ dependencies = [ [[package]] name = "no-proxy" -version = "0.3.2" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b24b826bdb92c7a2c6f22ed4cf649001bd237f936587ee0b76cd9dea86003d01" +checksum = "1b41e7479dc3678ea792431e04bafd62a31879035f4a5fa707602df062f58c77" dependencies = [ "cidr-utils", "serde", @@ -5311,19 +5538,20 @@ checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21" [[package]] name = "notify" -version = "6.0.1" +version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5738a2795d57ea20abec2d6d76c6081186709c0024187cd5977265eda6598b51" +checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "filetime", "fsevent-sys", "inotify", "kqueue", "libc", + "log", "mio", "walkdir", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -5346,11 +5574,10 @@ dependencies = [ [[package]] name = "nuid" -version = "0.3.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20c1bb65186718d348306bf1afdeb20d9ab45b2ab80fb793c0fdcf59ffbb4f38" +checksum = "fc895af95856f929163a0aa20c26a78d26bfdc839f51b9d5aa7a5b79e52b7e83" dependencies = [ - "lazy_static", "rand 0.8.5", ] @@ -5380,7 +5607,7 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3" dependencies = [ - "arrayvec 0.7.2", + "arrayvec", "itoa", "num-bigint", ] @@ -5408,9 +5635,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", "libm", @@ -5445,14 +5672,23 @@ dependencies = [ ] [[package]] +name = "num_enum" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70bf6736f74634d299d00086f02986875b3c2d924781a6a2cb6c201e73da0ceb" +dependencies = [ + "num_enum_derive 0.7.0", +] + +[[package]] name = "num_enum_derive" version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ "proc-macro-crate 1.2.1", - "proc-macro2 1.0.63", - "quote 1.0.29", + "proc-macro2 1.0.67", + "quote 1.0.33", "syn 1.0.109", ] @@ -5463,9 +5699,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" dependencies = [ "proc-macro-crate 1.2.1", - "proc-macro2 1.0.63", - "quote 1.0.29", - "syn 2.0.10", + "proc-macro2 1.0.67", + "quote 1.0.33", + "syn 2.0.37", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56ea360eafe1022f7cc56cd7b869ed57330fb2453d0c7831d99b74c65d2f5597" +dependencies = [ + "proc-macro-crate 1.2.1", + "proc-macro2 1.0.67", + "quote 1.0.33", + "syn 2.0.37", ] [[package]] @@ -5498,7 +5746,7 @@ dependencies = [ "serde", "serde_json", "serde_path_to_error", - "sha2 0.10.7", + "sha2", "thiserror", "url", ] @@ -5572,16 +5820,16 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "opendal" -version = "0.38.0" +version = "0.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "717f47be1760a6a651f81eeba8239444a077d0d229409a016298d2b2483c408c" +checksum = "4df645b6012162c04c8949e9b96ae2ef002e79189cfb154e507e51ac5be76a09" dependencies = [ "anyhow", "async-compat", "async-trait", "backon", - "base64 0.21.2", - "bytes 1.4.0", + "base64 0.21.4", + "bytes 1.5.0", "chrono", "flagset", "futures 0.3.28", @@ -5593,7 +5841,7 @@ dependencies = [ "parking_lot", "percent-encoding", "pin-project", - "quick-xml", + "quick-xml 0.27.1", "reqwest", "serde", "serde_json", @@ -5627,11 +5875,11 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.55" +version = "0.10.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" +checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "cfg-if", "foreign-types", "libc", @@ -5646,8 +5894,8 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", + "proc-macro2 1.0.67", + "quote 1.0.33", "syn 1.0.109", ] @@ -5659,18 +5907,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "111.25.0+1.1.1t" +version = "300.1.5+3.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3173cd3626c43e3854b1b727422a276e568d9ec5fe8cec197822cf52cfb743d6" +checksum = "559068e4c12950d7dcaa1857a61725c0d38d4fc03ff8e070ab31a75d6e316491" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.90" +version = "0.9.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" +checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" dependencies = [ "cc", "libc", @@ -5683,14 +5931,14 @@ dependencies = [ name = "opentelemetry-proto" version = "0.1.0" dependencies = [ - "bytes 1.4.0", + "bytes 1.5.0", "chrono", "hex", - "ordered-float 3.7.0", - "prost", - "prost-build", - "tonic", - "tonic-build", + "ordered-float 4.1.0", + "prost 0.12.1", + "prost-build 0.12.1", + "tonic 0.10.1", + "tonic-build 0.10.1", "vector-core", "vector-lookup", "vrl", @@ -5713,9 +5961,18 @@ dependencies = [ [[package]] name = "ordered-float" -version = "3.7.0" +version = "3.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a54938017eacd63036332b4ae5c8a49fc8c0c1d6d629893057e4f13609edd06" +dependencies = [ + "num-traits", +] + +[[package]] +name = "ordered-float" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fc2dbde8f8a79f2102cc474ceb0ad68e3b80b85289ea62389b60e66777e4213" +checksum = "e3a540f3e3b3d7929c884e46d093d344e4e5bdeed54d08bf007df50c93cc85d5" dependencies = [ "num-traits", ] @@ -5797,15 +6054,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.4" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.2.16", + "redox_syscall 0.3.5", "smallvec", - "windows-sys 0.42.0", + "windows-targets 0.48.0", ] [[package]] @@ -5819,9 +6076,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "pbkdf2" @@ -5829,7 +6086,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" dependencies = [ - "digest 0.10.7", + "digest", ] [[package]] @@ -5849,9 +6106,9 @@ dependencies = [ [[package]] name = "pem-rfc7468" -version = "0.2.3" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f22eb0e3c593294a99e9ff4b24cf6b752d43f193aa4415fe5077c159996d497" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" dependencies = [ "base64ct", ] @@ -5864,19 +6121,20 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pest" -version = "2.5.6" +version = "2.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cbd939b234e95d72bc393d51788aec68aeeb5d51e748ca08ff3aad58cb722f7" +checksum = "d7a4d085fd991ac8d5b05a147b437791b4260b76326baf0fc60cf7c9c27ecd33" dependencies = [ + "memchr", "thiserror", "ucd-trie", ] [[package]] name = "pest_derive" -version = "2.5.6" +version = "2.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a81186863f3d0a27340815be8f2078dd8050b14cd71913db9fbda795e5f707d7" +checksum = "a2bee7be22ce7918f641a33f08e3f43388c7656772244e2bbb2477f44cc9021a" dependencies = [ "pest", "pest_generator", @@ -5884,26 +6142,26 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.5.6" +version = "2.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75a1ef20bf3193c15ac345acb32e26b3dc3223aff4d77ae4fc5359567683796b" +checksum = "d1511785c5e98d79a05e8a6bc34b4ac2168a0e3e92161862030ad84daa223141" dependencies = [ "pest", "pest_meta", - "proc-macro2 1.0.63", - "quote 1.0.29", - "syn 1.0.109", + "proc-macro2 1.0.67", + "quote 1.0.33", + "syn 2.0.37", ] [[package]] name = "pest_meta" -version = "2.5.6" +version = "2.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e3b284b1f13a20dc5ebc90aff59a51b8d7137c221131b52a7260c08cbc1cc80" +checksum = "b42f0394d3123e33353ca5e1e89092e533d2cc490389f2bd6131c43c634ebc5f" dependencies = [ "once_cell", "pest", - "sha2 0.10.7", + "sha2", ] [[package]] @@ -5965,29 +6223,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.1" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e138fdd8263907a2b0e1b4e80b7e58c721126479b6e6eedfb1b402acea7b9bd" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.1" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1fef411b303e3e12d534fb6e7852de82da56edd937d895125821fb7c09436c7" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", - "syn 2.0.10", + "proc-macro2 1.0.67", + "quote 1.0.33", + "syn 2.0.37", ] [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" [[package]] name = "pin-utils" @@ -6009,14 +6267,12 @@ dependencies = [ [[package]] name = "pkcs8" -version = "0.7.6" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee3ef9b64d26bad0536099c816c6734379e45bbd5f14798def6809e5cc350447" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" dependencies = [ "der", - "pem-rfc7468", "spki", - "zeroize", ] [[package]] @@ -6032,6 +6288,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "989d43012e2ca1c4a02507c67282691a0a3207f9dc67cec596b43fe925b3d325" [[package]] +name = "platforms" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630" + +[[package]] name = "plotters" version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6074,6 +6336,17 @@ dependencies = [ ] [[package]] +name = "poly1305" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" +dependencies = [ + "cpufeatures", + "opaque-debug", + "universal-hash", +] + +[[package]] name = "portable-atomic" version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6101,29 +6374,29 @@ dependencies = [ [[package]] name = "postgres-protocol" -version = "0.6.4" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "878c6cbf956e03af9aa8204b407b9cbf47c072164800aa918c516cd4b056c50c" +checksum = "49b6c5ef183cd3ab4ba005f1ca64c21e8bd97ce4699cfea9e8d9a2c4958ca520" dependencies = [ - "base64 0.13.1", + "base64 0.21.4", "byteorder", - "bytes 1.4.0", + "bytes 1.5.0", "fallible-iterator", "hmac", "md-5", "memchr", "rand 0.8.5", - "sha2 0.10.7", + "sha2", "stringprep", ] [[package]] name = "postgres-types" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73d946ec7d256b04dfadc4e6a3292324e6f417124750fc5c0950f981b703a0f1" +checksum = "8d2234cdee9408b523530a9b6d2d6b373d1db34f6a8e51dc03ded1828d7fb67c" dependencies = [ - "bytes 1.4.0", + "bytes 1.5.0", "chrono", "fallible-iterator", "postgres-protocol", @@ -6199,11 +6472,21 @@ version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c142c0e46b57171fe0c528bee8c5b7569e80f0c17e377cd0e30ea57dbc11bb51" dependencies = [ - "proc-macro2 1.0.63", + "proc-macro2 1.0.67", "syn 1.0.109", ] [[package]] +name = "prettyplease" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c64d9ba0963cdcea2e1b2230fbae2bab30eb25a174be395c41e764bfb65dd62" +dependencies = [ + "proc-macro2 1.0.67", + "syn 2.0.37", +] + +[[package]] name = "prettytable-rs" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6244,8 +6527,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.63", - "quote 1.0.29", + "proc-macro2 1.0.67", + "quote 1.0.33", "syn 1.0.109", "version_check", ] @@ -6256,8 +6539,8 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", + "proc-macro2 1.0.67", + "quote 1.0.33", "version_check", ] @@ -6284,9 +6567,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.63" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" +checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" dependencies = [ "unicode-ident", ] @@ -6297,10 +6580,10 @@ version = "0.1.0" dependencies = [ "indexmap 2.0.0", "nom", - "num_enum 0.6.1", - "prost", - "prost-build", - "prost-types", + "num_enum 0.7.0", + "prost 0.12.1", + "prost-build 0.12.1", + "prost-types 0.12.1", "snafu", "vector-common", ] @@ -6331,8 +6614,18 @@ version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" dependencies = [ - "bytes 1.4.0", - "prost-derive", + "bytes 1.5.0", + "prost-derive 0.11.9", +] + +[[package]] +name = "prost" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4fdd22f3b9c31b53c060df4a0613a1c7f062d4115a2b984dd15b1858f7e340d" +dependencies = [ + "bytes 1.5.0", + "prost-derive 0.12.1", ] [[package]] @@ -6341,16 +6634,16 @@ version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" dependencies = [ - "bytes 1.4.0", - "heck 0.4.0", + "bytes 1.5.0", + "heck 0.4.1", "itertools 0.10.5", "lazy_static", "log", "multimap", "petgraph", - "prettyplease", - "prost", - "prost-types", + "prettyplease 0.1.21", + "prost 0.11.9", + "prost-types 0.11.9", "regex", "syn 1.0.109", "tempfile", @@ -6358,6 +6651,28 @@ dependencies = [ ] [[package]] +name = "prost-build" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bdf592881d821b83d471f8af290226c8d51402259e9bb5be7f9f8bdebbb11ac" +dependencies = [ + "bytes 1.5.0", + "heck 0.4.1", + "itertools 0.11.0", + "log", + "multimap", + "once_cell", + "petgraph", + "prettyplease 0.2.12", + "prost 0.12.1", + "prost-types 0.12.1", + "regex", + "syn 2.0.37", + "tempfile", + "which", +] + +[[package]] name = "prost-derive" version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6365,20 +6680,36 @@ checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" dependencies = [ "anyhow", "itertools 0.10.5", - "proc-macro2 1.0.63", - "quote 1.0.29", + "proc-macro2 1.0.67", + "quote 1.0.33", "syn 1.0.109", ] [[package]] +name = "prost-derive" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "265baba7fabd416cf5078179f7d2cbeca4ce7a9041111900675ea7c4cb8a4c32" +dependencies = [ + "anyhow", + "itertools 0.11.0", + "proc-macro2 1.0.67", + "quote 1.0.33", + "syn 2.0.37", +] + +[[package]] name = "prost-reflect" -version = "0.11.4" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "000e1e05ebf7b26e1eba298e66fe4eee6eb19c567d0ffb35e0dd34231cdac4c8" +checksum = "057237efdb71cf4b3f9396302a3d6599a92fa94063ba537b66130980ea9909f3" dependencies = [ + "base64 0.21.4", "once_cell", - "prost", - "prost-types", + "prost 0.12.1", + "prost-types 0.12.1", + "serde", + "serde-value", ] [[package]] @@ -6387,7 +6718,16 @@ version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" dependencies = [ - "prost", + "prost 0.11.9", +] + +[[package]] +name = "prost-types" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e081b29f63d83a4bc75cfc9f3fe424f9156cf92d8a4f0c9407cce9a1b67327cf" +dependencies = [ + "prost 0.12.1", ] [[package]] @@ -6405,8 +6745,8 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", + "proc-macro2 1.0.67", + "quote 1.0.33", "syn 1.0.109", ] @@ -6417,8 +6757,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6eb95b2e36b92d3e0536be87eaf7accb17db39f5a44452759b43f1328e82dc9" dependencies = [ "async-trait", - "bit-vec 0.6.3", - "bytes 1.4.0", + "bit-vec", + "bytes 1.5.0", "chrono", "crc", "data-url", @@ -6433,9 +6773,9 @@ dependencies = [ "oauth2", "openidconnect", "pem", - "prost", - "prost-build", - "prost-derive", + "prost 0.11.9", + "prost-build 0.11.9", + "prost-derive 0.11.9", "rand 0.8.5", "regex", "serde", @@ -6488,6 +6828,16 @@ dependencies = [ ] [[package]] +name = "quick-xml" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" +dependencies = [ + "memchr", + "serde", +] + +[[package]] name = "quickcheck" version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6504,8 +6854,8 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b22a693222d716a9587786f37ac3f6b4faedb5b80c23914e7303ff5a1d8016e9" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", + "proc-macro2 1.0.67", + "quote 1.0.33", "syn 1.0.109", ] @@ -6520,11 +6870,11 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.29" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ - "proc-macro2 1.0.63", + "proc-macro2 1.0.67", ] [[package]] @@ -6640,6 +6990,23 @@ dependencies = [ ] [[package]] +name = "ratatui" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e2e4cd95294a85c3b4446e63ef054eea43e0205b1fd60120c16b74ff7ff96ad" +dependencies = [ + "bitflags 2.4.0", + "cassowary", + "crossterm", + "indoc", + "itertools 0.11.0", + "paste", + "strum", + "unicode-segmentation", + "unicode-width", +] + +[[package]] name = "raw-cpuid" version = "10.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6688,9 +7055,9 @@ dependencies = [ [[package]] name = "rdkafka" -version = "0.32.2" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8733bc5dc0b192d1a4b28073f9bff1326ad9e4fecd4d9b025d6fc358d1c3e79" +checksum = "053adfa02fab06e86c01d586cc68aa47ee0ff4489a59469081dc12cbcde578bf" dependencies = [ "futures-channel", "futures-util", @@ -6706,9 +7073,9 @@ dependencies = [ [[package]] name = "rdkafka-sys" -version = "4.5.0+1.9.2" +version = "4.6.0+2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bb0676c2112342ac7165decdedbc4e7086c0af384479ccce534546b10687a5d" +checksum = "ad63c279fca41a27c231c450a2d2ad18288032e9cbb159ad16c9d96eba35aaaf" dependencies = [ "cmake", "libc", @@ -6733,13 +7100,13 @@ dependencies = [ [[package]] name = "redis" -version = "0.23.0" +version = "0.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ea8c51b5dc1d8e5fd3350ec8167f464ec0995e79f2e90a075b63371500d557f" +checksum = "4f49cdc0bb3f412bf8e7d1bd90fe1d9eb10bc5c399ba90973c14662a27b3f8ba" dependencies = [ "arc-swap", "async-trait", - "bytes 1.4.0", + "bytes 1.5.0", "combine 4.6.6", "futures 0.3.28", "futures-util", @@ -6750,6 +7117,7 @@ dependencies = [ "ryu", "tokio", "tokio-native-tls", + "tokio-retry", "tokio-util", "url", ] @@ -6785,13 +7153,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.8.4" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" +checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" dependencies = [ - "aho-corasick 1.0.1", + "aho-corasick", "memchr", - "regex-syntax 0.7.2", + "regex-automata 0.3.8", + "regex-syntax 0.7.5", ] [[package]] @@ -6804,6 +7173,17 @@ dependencies = [ ] [[package]] +name = "regex-automata" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.7.5", +] + +[[package]] name = "regex-syntax" version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6811,9 +7191,15 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.2" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" + +[[package]] +name = "relative-path" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" +checksum = "c707298afce11da2efef2f600116fa93ffa7a032b5d7b628aa17711ec81383ca" [[package]] name = "rend" @@ -6826,12 +7212,12 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.18" +version = "0.11.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" +checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" dependencies = [ - "base64 0.21.2", - "bytes 1.4.0", + "base64 0.21.4", + "bytes 1.5.0", "encoding_rs", "futures-core", "futures-util", @@ -6849,14 +7235,14 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.0", - "rustls-pemfile 1.0.1", + "rustls 0.21.7", + "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", "tokio", "tokio-native-tls", - "tokio-rustls 0.24.0", + "tokio-rustls 0.24.1", "tokio-util", "tower-service", "url", @@ -6864,8 +7250,8 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots", - "winreg", + "webpki-roots 0.25.2", + "winreg 0.50.0", ] [[package]] @@ -6919,8 +7305,8 @@ version = "0.7.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff26ed6c7c4dfc2aa9480b86a60e3c7233543a270a680e10758a507c5a4ce476" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", + "proc-macro2 1.0.67", + "quote 1.0.33", "syn 1.0.109", ] @@ -6943,9 +7329,9 @@ dependencies = [ [[package]] name = "rmp-serde" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5b13be192e0220b8afb7222aa5813cb62cc269ebb5cac346ca6487681d2913e" +checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a" dependencies = [ "byteorder", "rmp", @@ -6954,9 +7340,9 @@ dependencies = [ [[package]] name = "rmpv" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de8813b3a2f95c5138fe5925bfb8784175d88d6bff059ba8ce090aa891319754" +checksum = "2e0e0214a4a2b444ecce41a4025792fc31f77c7bb89c46d253953ea8c65701ec" dependencies = [ "num-traits", "rmp", @@ -6966,9 +7352,9 @@ dependencies = [ [[package]] name = "roaring" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef0fb5e826a8bde011ecae6a8539dd333884335c57ff0f003fbe27c25bbe8f71" +checksum = "6106b5cf8587f5834158895e9715a3c6c9716c8aefab57f1f7680917191c7873" dependencies = [ "bytemuck", "byteorder", @@ -6994,16 +7380,45 @@ dependencies = [ ] [[package]] +name = "rstest" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97eeab2f3c0a199bc4be135c36c924b6590b88c377d416494288c14f2db30199" +dependencies = [ + "futures 0.3.28", + "futures-timer", + "rstest_macros", + "rustc_version 0.4.0", +] + +[[package]] +name = "rstest_macros" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d428f8247852f894ee1be110b375111b586d4fa431f6c46e64ba5a0dcccbe605" +dependencies = [ + "cfg-if", + "glob", + "proc-macro2 1.0.67", + "quote 1.0.33", + "regex", + "relative-path", + "rustc_version 0.4.0", + "syn 2.0.37", + "unicode-ident", +] + +[[package]] name = "rust_decimal" version = "1.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26bd36b60561ee1fb5ec2817f198b6fd09fa571c897a5e86d1487cfc2b096dfc" dependencies = [ - "arrayvec 0.7.2", + "arrayvec", "borsh", "bytecheck", "byteorder", - "bytes 1.4.0", + "bytes 1.5.0", "num-traits", "rand 0.8.5", "rkyv", @@ -7038,7 +7453,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.17", + "semver 1.0.18", ] [[package]] @@ -7053,43 +7468,29 @@ dependencies = [ [[package]] name = "rustix" -version = "0.35.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9" -dependencies = [ - "bitflags 1.3.2", - "errno 0.2.8", - "io-lifetimes 0.7.5", - "libc", - "linux-raw-sys 0.0.46", - "windows-sys 0.42.0", -] - -[[package]] -name = "rustix" version = "0.37.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" dependencies = [ "bitflags 1.3.2", - "errno 0.3.1", - "io-lifetimes 1.0.11", + "errno", + "io-lifetimes", "libc", "linux-raw-sys 0.3.8", "windows-sys 0.48.0", ] [[package]] -name = "rustls" -version = "0.19.1" +name = "rustix" +version = "0.38.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" +checksum = "747c788e9ce8e92b12cd485c49ddf90723550b654b32508f979b71a7b1ecda4f" dependencies = [ - "base64 0.13.1", - "log", - "ring", - "sct 0.6.1", - "webpki 0.21.4", + "bitflags 2.4.0", + "errno", + "libc", + "linux-raw-sys 0.4.7", + "windows-sys 0.48.0", ] [[package]] @@ -7100,69 +7501,48 @@ checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c" dependencies = [ "log", "ring", - "sct 0.7.0", - "webpki 0.22.0", + "sct", + "webpki", ] [[package]] name = "rustls" -version = "0.21.0" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07180898a28ed6a7f7ba2311594308f595e3dd2e3c3812fa0a80a47b45f17e5d" +checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", "ring", "rustls-webpki", - "sct 0.7.0", -] - -[[package]] -name = "rustls-native-certs" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092" -dependencies = [ - "openssl-probe", - "rustls 0.19.1", - "schannel", - "security-framework", + "sct", ] [[package]] name = "rustls-native-certs" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ "openssl-probe", - "rustls-pemfile 1.0.1", + "rustls-pemfile", "schannel", "security-framework", ] [[package]] name = "rustls-pemfile" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9" -dependencies = [ - "base64 0.13.1", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.1" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55" +checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64 0.13.1", + "base64 0.21.4", ] [[package]] name = "rustls-webpki" -version = "0.100.1" +version = "0.101.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" +checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" dependencies = [ "ring", "untrusted", @@ -7192,7 +7572,7 @@ version = "12.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "994eca4bca05c87e86e15d90fc7a91d1be64b4482b38cb2d27474568fe7c9db9" dependencies = [ - "bitflags 2.3.2", + "bitflags 2.4.0", "cfg-if", "clipboard-win", "libc", @@ -7208,9 +7588,18 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" + +[[package]] +name = "salsa20" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213" +dependencies = [ + "cipher", +] [[package]] name = "same-file" @@ -7245,11 +7634,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "windows-sys 0.42.0", + "windows-sys 0.48.0", ] [[package]] @@ -7272,16 +7661,6 @@ checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" [[package]] name = "sct" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "sct" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" @@ -7308,9 +7687,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.1" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -7340,9 +7719,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" dependencies = [ "serde", ] @@ -7355,20 +7734,20 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.164" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] [[package]] name = "serde-toml-merge" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a78072b550e5c20bc4a9d1384be28809cbdb7b25b2b4707ddc6d908b7e6de3bf" +checksum = "250c08954c1c279a877fd44909e7c50d366082d301d23821353f8b9327baf648" dependencies = [ - "toml 0.7.5", + "toml 0.8.0", ] [[package]] @@ -7383,9 +7762,9 @@ dependencies = [ [[package]] name = "serde-wasm-bindgen" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3b143e2833c57ab9ad3ea280d21fd34e285a42837aeb0ee301f4f41890fa00e" +checksum = "30c9933e5689bd420dc6c87b7a1835701810cbc10cd86a26e4da45b73e6b1d78" dependencies = [ "js-sys", "serde", @@ -7393,53 +7772,41 @@ dependencies = [ ] [[package]] -name = "serde-xml-rs" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb3aa78ecda1ebc9ec9847d5d3aba7d618823446a049ba2491940506da6e2782" -dependencies = [ - "log", - "serde", - "thiserror", - "xml-rs", -] - -[[package]] name = "serde_bytes" -version = "0.11.9" +version = "0.11.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "416bda436f9aab92e02c8e10d49a15ddd339cea90b6e340fe51ed97abb548294" +checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.164" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", - "syn 2.0.10", + "proc-macro2 1.0.67", + "quote 1.0.33", + "syn 2.0.37", ] [[package]] name = "serde_derive_internals" -version = "0.26.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" +checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", - "syn 1.0.109", + "proc-macro2 1.0.67", + "quote 1.0.33", + "syn 2.0.37", ] [[package]] name = "serde_json" -version = "1.0.99" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46266871c240a00b8f503b877622fe33430b3c7d963bdc0f2adc511e54a1eae3" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ "indexmap 2.0.0", "itoa", @@ -7449,9 +7816,9 @@ dependencies = [ [[package]] name = "serde_nanos" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e44969a61f5d316be20a42ff97816efb3b407a924d06824c3d8a49fa8450de0e" +checksum = "8ae801b7733ca8d6a2b580debe99f67f36826a0f5b8a36055dc6bc40f8d6bc71" dependencies = [ "serde", ] @@ -7478,13 +7845,13 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.9" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fe39d9fbb0ebf5eb2c7cb7e2a47e4f462fad1379f1166b8ae49ad9eae89a7ca" +checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", - "syn 1.0.109", + "proc-macro2 1.0.67", + "quote 1.0.33", + "syn 2.0.37", ] [[package]] @@ -7520,17 +7887,18 @@ dependencies = [ [[package]] name = "serde_with" -version = "2.3.2" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "331bb8c3bf9b92457ab7abecf07078c13f7d270ba490103e84e8b014490cd0b0" +checksum = "1ca3b16a3d82c4088f343b7480a93550b3eabe1a358569c2dfe38bbcead07237" dependencies = [ - "base64 0.13.1", + "base64 0.21.4", "chrono", "hex", "indexmap 1.9.3", + "indexmap 2.0.0", "serde", "serde_json", - "serde_with_macros 2.3.2", + "serde_with_macros 3.3.0", "time", ] @@ -7541,21 +7909,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" dependencies = [ "darling 0.13.4", - "proc-macro2 1.0.63", - "quote 1.0.29", + "proc-macro2 1.0.67", + "quote 1.0.33", "syn 1.0.109", ] [[package]] name = "serde_with_macros" -version = "2.3.2" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859011bddcc11f289f07f467cc1fe01c7a941daa4d8f6c40d4d1c92eb6d9319c" +checksum = "2e6be15c453eb305019bfa438b1593c731f36a289a7853f7707ee29e870b3b3c" dependencies = [ - "darling 0.14.2", - "proc-macro2 1.0.63", - "quote 1.0.29", - "syn 1.0.109", + "darling 0.20.3", + "proc-macro2 1.0.67", + "quote 1.0.33", + "syn 2.0.37", ] [[package]] @@ -7572,9 +7940,9 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.22" +version = "0.9.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "452e67b9c20c37fa79df53201dc03839651086ed9bbe92b3ca585ca9fdaa7d85" +checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" dependencies = [ "indexmap 2.0.0", "itoa", @@ -7591,7 +7959,7 @@ checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.7", + "digest", ] [[package]] @@ -7602,20 +7970,7 @@ checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.7", -] - -[[package]] -name = "sha2" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if", - "cpufeatures", - "digest 0.9.0", - "opaque-debug", + "digest", ] [[package]] @@ -7626,7 +7981,7 @@ checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.7", + "digest", ] [[package]] @@ -7635,7 +7990,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bdf0c33fae925bdc080598b84bc15c55e7b9a4a43b3c704da051f977469691c9" dependencies = [ - "digest 0.10.7", + "digest", "keccak", ] @@ -7660,9 +8015,9 @@ dependencies = [ [[package]] name = "signal-hook" -version = "0.3.14" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" dependencies = [ "libc", "signal-hook-registry", @@ -7690,9 +8045,9 @@ dependencies = [ [[package]] name = "signatory" -version = "0.23.2" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfecc059e81632eef1dd9b79e22fc28b8fe69b30d3357512a77a0ad8ee3c782" +checksum = "c1e303f8205714074f6068773f0e29527e0453937fe837c9717d066635b65f31" dependencies = [ "pkcs8", "rand_core 0.6.4", @@ -7702,9 +8057,12 @@ dependencies = [ [[package]] name = "signature" -version = "1.6.4" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" +checksum = "8fe458c98333f9c8152221191a77e2a44e8325d0193484af2e9421a53019e57d" +dependencies = [ + "digest", +] [[package]] name = "simd-abstraction" @@ -7727,9 +8085,9 @@ dependencies = [ [[package]] name = "similar-asserts" -version = "1.4.2" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbf644ad016b75129f01a34a355dcb8d66a5bc803e417c7a77cc5d5ee9fa0f18" +checksum = "e041bb827d1bfca18f213411d51b665309f1afb37a04a5d1464530e13779fc0f" dependencies = [ "console", "similar", @@ -7764,9 +8122,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" dependencies = [ "serde", ] @@ -7807,9 +8165,9 @@ dependencies = [ [[package]] name = "snafu" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0656e7e3ffb70f6c39b3c2a86332bb74aa3c679da781642590f3c1118c5045" +checksum = "e4de37ad025c587a29e8f3f5605c00f70b98715ef90b9061a815b9e59e9042d6" dependencies = [ "doc-comment", "futures-core", @@ -7819,13 +8177,13 @@ dependencies = [ [[package]] name = "snafu-derive" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "475b3bbe5245c26f2d8a6f62d67c1f30eb9fffeccee721c45d162c3ebbdf81b2" +checksum = "990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf" dependencies = [ - "heck 0.4.0", - "proc-macro2 1.0.63", - "quote 1.0.29", + "heck 0.4.1", + "proc-macro2 1.0.67", + "quote 1.0.33", "syn 1.0.109", ] @@ -7847,9 +8205,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" dependencies = [ "libc", "windows-sys 0.48.0", @@ -7872,10 +8230,11 @@ dependencies = [ [[package]] name = "spki" -version = "0.4.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c01a0c15da1b0b0e1494112e7af814a678fec9bd157881b49beac661e9b6f32" +checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" dependencies = [ + "base64ct", "der", ] @@ -7927,9 +8286,9 @@ dependencies = [ [[package]] name = "strip-ansi-escapes" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "011cbb39cf7c1f62871aea3cc46e5817b0937b49e9447370c93cacbe93a766d8" +checksum = "55ff8ef943b384c414f54aefa961dd2bd853add74ec75e7ac74cf91dba62bcfa" dependencies = [ "vte", ] @@ -7965,28 +8324,31 @@ checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" dependencies = [ "heck 0.3.3", "proc-macro-error", - "proc-macro2 1.0.63", - "quote 1.0.29", + "proc-macro2 1.0.67", + "quote 1.0.33", "syn 1.0.109", ] [[package]] name = "strum" -version = "0.24.1" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" +checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +dependencies = [ + "strum_macros", +] [[package]] name = "strum_macros" -version = "0.24.3" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" +checksum = "6069ca09d878a33f883cc06aaa9718ede171841d3832450354410b718b097232" dependencies = [ - "heck 0.4.0", - "proc-macro2 1.0.63", - "quote 1.0.29", + "heck 0.4.1", + "proc-macro2 1.0.67", + "quote 1.0.33", "rustversion", - "syn 1.0.109", + "syn 2.0.37", ] [[package]] @@ -8022,19 +8384,19 @@ version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", + "proc-macro2 1.0.67", + "quote 1.0.33", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.10" +version = "2.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aad1363ed6d37b84299588d62d3a7d95b5a5c2d9aad5c85609fda12afaa1f40" +checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", + "proc-macro2 1.0.67", + "quote 1.0.33", "unicode-ident", ] @@ -8045,18 +8407,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20518fe4a4c9acf048008599e464deb21beeae3d3578418951a189c235a7a9a8" [[package]] -name = "synstructure" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" -dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", - "syn 1.0.109", - "unicode-xid 0.2.4", -] - -[[package]] name = "syslog" version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8071,9 +8421,9 @@ dependencies = [ [[package]] name = "syslog_loose" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fb75f176928530867b2a659e470f9c9ff71904695bab6556f7ad30f9039efd" +checksum = "acf5252d1adec0a489a0225f867c1a7fd445e41674530a396d0629cff0c4b211" dependencies = [ "chrono", "nom", @@ -8099,7 +8449,7 @@ checksum = "09a4b0a70bac0a58ca6a7659d1328e34ee462339c70b0fa49f72bad1f278910a" dependencies = [ "cfg-if", "native-tls", - "rustls-pemfile 1.0.1", + "rustls-pemfile", ] [[package]] @@ -8154,12 +8504,12 @@ dependencies = [ [[package]] name = "terminal_size" -version = "0.2.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ca90c434fd12083d1a6bdcbe9f92a14f96c8a1ba600ba451734ac334521f7a" +checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" dependencies = [ - "rustix 0.35.13", - "windows-sys 0.42.0", + "rustix 0.38.14", + "windows-sys 0.48.0", ] [[package]] @@ -8191,22 +8541,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", - "syn 2.0.10", + "proc-macro2 1.0.67", + "quote 1.0.33", + "syn 2.0.37", ] [[package]] @@ -8231,9 +8581,9 @@ dependencies = [ [[package]] name = "tikv-jemallocator" -version = "0.5.0" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20612db8a13a6c06d57ec83953694185a367e16945f66565e8028d2c0bd76979" +checksum = "965fe0c26be5c56c94e38ba547249074803efd52adfb66de62107d95aab3eaca" dependencies = [ "libc", "tikv-jemalloc-sys", @@ -8241,10 +8591,11 @@ dependencies = [ [[package]] name = "time" -version = "0.3.17" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" +checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" dependencies = [ + "deranged", "itoa", "libc", "num_threads", @@ -8255,15 +8606,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.6" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" +checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" dependencies = [ "time-core", ] @@ -8304,20 +8655,19 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.29.0" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374442f06ee49c3a28a8fc9f01a2596fed7559c6b99b31279c3261778e77d84f" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ - "autocfg", "backtrace", - "bytes 1.4.0", + "bytes 1.5.0", "libc", "mio", "num_cpus", "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.4.9", + "socket2 0.5.4", "tokio-macros", "tracing 0.1.37", "windows-sys 0.48.0", @@ -8350,9 +8700,9 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", - "syn 2.0.10", + "proc-macro2 1.0.67", + "quote 1.0.33", + "syn 2.0.37", ] [[package]] @@ -8379,13 +8729,13 @@ dependencies = [ [[package]] name = "tokio-postgres" -version = "0.7.7" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29a12c1b3e0704ae7dfc25562629798b29c72e6b1d0a681b6f29ab4ae5e7f7bf" +checksum = "d340244b32d920260ae7448cb72b6e238bddc3d4f7603394e7dd46ed8e48f5b8" dependencies = [ "async-trait", "byteorder", - "bytes 1.4.0", + "bytes 1.5.0", "fallible-iterator", "futures-channel", "futures-util", @@ -8396,9 +8746,22 @@ dependencies = [ "pin-project-lite", "postgres-protocol", "postgres-types", - "socket2 0.4.9", + "rand 0.8.5", + "socket2 0.5.4", "tokio", "tokio-util", + "whoami", +] + +[[package]] +name = "tokio-retry" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f" +dependencies = [ + "pin-project", + "rand 0.8.5", + "tokio", ] [[package]] @@ -8409,16 +8772,16 @@ checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ "rustls 0.20.7", "tokio", - "webpki 0.22.0", + "webpki", ] [[package]] name = "tokio-rustls" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0d409377ff5b1e3ca6437aa86c1eb7d40c134bfec254e44c830defa92669db5" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.0", + "rustls 0.21.7", "tokio", ] @@ -8436,12 +8799,12 @@ dependencies = [ [[package]] name = "tokio-test" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53474327ae5e166530d17f2d956afcb4f8a004de581b3cae10f12006bc8163e3" +checksum = "e89b3cbabd3ae862100094ae433e1def582cf86451b4e9bf83aa7ac1d8a7d719" dependencies = [ "async-stream", - "bytes 1.4.0", + "bytes 1.5.0", "futures-core", "tokio", "tokio-stream", @@ -8461,23 +8824,23 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec509ac96e9a0c43427c74f003127d953a265737636129424288d27cb5c4b12c" +checksum = "2b2dbec703c26b00d74844519606ef15d09a7d6857860f84ad223dec002ddea2" dependencies = [ "futures-util", "log", - "rustls 0.21.0", + "rustls 0.21.7", "tokio", - "tungstenite 0.19.0", + "tungstenite 0.20.0", ] [[package]] name = "tokio-util" -version = "0.7.4" -source = "git+https://github.com/vectordotdev/tokio?branch=tokio-util-0.7.4-framed-read-continue-on-error#53a17f257b599a9d18bd75249de98d0b6fc28cfa" +version = "0.7.8" +source = "git+https://github.com/vectordotdev/tokio?branch=tokio-util-0.7.8-framed-read-continue-on-error#3747655f8f0443e13fe20da3f613ea65c23347c2" dependencies = [ - "bytes 1.4.0", + "bytes 1.5.0", "futures-core", "futures-io", "futures-sink", @@ -8498,9 +8861,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.5" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ebafdf5ad1220cb59e7d17cf4d2c72015297b75b19a10472f99b89225089240" +checksum = "c226a7bba6d859b63c92c4b4fe69c5b6b72d0cb897dbc8e6012298e6154cb56e" dependencies = [ "serde", "serde_spanned", @@ -8519,9 +8882,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.11" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266f016b7f039eec8a1a80dfe6156b633d208b9fccca5e4db1d6775b0c4e34a7" +checksum = "8ff63e60a958cefbb518ae1fd6566af80d9d4be430a33f3723dfc47d1d411d95" dependencies = [ "indexmap 2.0.0", "serde", @@ -8539,9 +8902,8 @@ dependencies = [ "async-stream", "async-trait", "axum", - "base64 0.21.2", - "bytes 1.4.0", - "flate2", + "base64 0.21.4", + "bytes 1.5.0", "futures-core", "futures-util", "h2", @@ -8551,11 +8913,42 @@ dependencies = [ "hyper-timeout", "percent-encoding", "pin-project", - "prost", - "rustls-native-certs 0.6.2", - "rustls-pemfile 1.0.1", + "prost 0.11.9", + "rustls-pemfile", "tokio", - "tokio-rustls 0.24.0", + "tokio-rustls 0.24.1", + "tokio-stream", + "tower", + "tower-layer", + "tower-service", + "tracing 0.1.37", +] + +[[package]] +name = "tonic" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c00bc15e49625f3d2f20b17082601e5e17cf27ead69e805174026c194b6664" +dependencies = [ + "async-stream", + "async-trait", + "axum", + "base64 0.21.4", + "bytes 1.5.0", + "flate2", + "h2", + "http", + "http-body", + "hyper", + "hyper-timeout", + "percent-encoding", + "pin-project", + "prost 0.12.1", + "rustls 0.21.7", + "rustls-native-certs", + "rustls-pemfile", + "tokio", + "tokio-rustls 0.24.1", "tokio-stream", "tower", "tower-layer", @@ -8569,14 +8962,27 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6fdaae4c2c638bb70fe42803a26fbd6fc6ac8c72f5c59f67ecc2a2dcabf4b07" dependencies = [ - "prettyplease", - "proc-macro2 1.0.63", - "prost-build", - "quote 1.0.29", + "prettyplease 0.1.21", + "proc-macro2 1.0.67", + "prost-build 0.11.9", + "quote 1.0.33", "syn 1.0.109", ] [[package]] +name = "tonic-build" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9d37bb15da06ae9bb945963066baca6561b505af93a52e949a85d28558459a2" +dependencies = [ + "prettyplease 0.2.12", + "proc-macro2 1.0.67", + "prost-build 0.12.1", + "quote 1.0.33", + "syn 2.0.37", +] + +[[package]] name = "tower" version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8598,14 +9004,14 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.4.1" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8bd22a874a2d0b70452d5597b12c537331d49060824a95f49f108994f94aa4c" +checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" dependencies = [ - "async-compression 0.3.15", - "base64 0.20.0", - "bitflags 2.3.2", - "bytes 1.4.0", + "async-compression", + "base64 0.21.4", + "bitflags 2.4.0", + "bytes 1.5.0", "futures-core", "futures-util", "http", @@ -8675,8 +9081,8 @@ version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", + "proc-macro2 1.0.67", + "quote 1.0.33", "syn 1.0.109", ] @@ -8830,20 +9236,20 @@ dependencies = [ [[package]] name = "trust-dns-proto" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26" +checksum = "0dc775440033cb114085f6f2437682b194fa7546466024b1037e82a48a052a69" dependencies = [ "async-trait", "cfg-if", "data-encoding", - "enum-as-inner 0.5.1", + "enum-as-inner 0.6.0", "futures-channel", "futures-io", "futures-util", - "idna 0.2.3", + "idna 0.4.0", "ipnet", - "lazy_static", + "once_cell", "rand 0.8.5", "smallvec", "thiserror", @@ -8880,19 +9286,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] -name = "tui" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccdd26cbd674007e649a272da4475fb666d3aa0ad0531da7136db6fab0e5bad1" -dependencies = [ - "bitflags 1.3.2", - "cassowary", - "crossterm 0.25.0", - "unicode-segmentation", - "unicode-width", -] - -[[package]] name = "tungstenite" version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8900,7 +9293,7 @@ checksum = "30ee6ab729cd4cf0fd55218530c4522ed30b7b6081752839b68fcec8d0960788" dependencies = [ "base64 0.13.1", "byteorder", - "bytes 1.4.0", + "bytes 1.5.0", "http", "httparse", "log", @@ -8913,12 +9306,12 @@ dependencies = [ [[package]] name = "tungstenite" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15fba1a6d6bb030745759a9a2a588bfe8490fc8b4751a277db3a0be1c9ebbf67" +checksum = "e862a1c4128df0112ab625f55cd5c934bcb4312ba80b39ae4b4835a3fd58e649" dependencies = [ "byteorder", - "bytes 1.4.0", + "bytes 1.5.0", "data-encoding", "http", "httparse", @@ -8946,8 +9339,19 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89851716b67b937e393b3daa8423e67ddfc4bbbf1654bcf05488e95e0828db0c" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", + "proc-macro2 1.0.67", + "quote 1.0.33", + "syn 1.0.109", +] + +[[package]] +name = "typed-builder" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64cba322cb9b7bc6ca048de49e83918223f35e7a86311267013afff257004870" +dependencies = [ + "proc-macro2 1.0.67", + "quote 1.0.33", "syn 1.0.109", ] @@ -8959,9 +9363,9 @@ checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" [[package]] name = "typetag" -version = "0.2.8" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6898cc6f6a32698cc3e14d5632a14d2b23ed9f7b11e6b8e05ce685990acc22" +checksum = "80960fd143d4c96275c0e60b08f14b81fbb468e79bc0ef8fbda69fb0afafae43" dependencies = [ "erased-serde", "inventory", @@ -8972,20 +9376,20 @@ dependencies = [ [[package]] name = "typetag-impl" -version = "0.2.8" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c3e1c30cedd24fc597f7d37a721efdbdc2b1acae012c1ef1218f4c7c2c0f3e7" +checksum = "bfc13d450dc4a695200da3074dacf43d449b968baee95e341920e47f61a3b40f" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", - "syn 2.0.10", + "proc-macro2 1.0.67", + "quote 1.0.33", + "syn 2.0.37", ] [[package]] name = "uaparser" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d705ae455d32248d299de9af5316a79ce9dc502c0b533aaeaf5f1c2fc02cc5" +checksum = "cf694e7b0434d4fad6c879e984e8fdc3a62f5533c3d421762244f9e9d03f6927" dependencies = [ "derive_more", "lazy_static", @@ -9062,6 +9466,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] +name = "universal-hash" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" +dependencies = [ + "crypto-common", + "subtle", +] + +[[package]] name = "unreachable" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -9095,9 +9509,9 @@ dependencies = [ [[package]] name = "url" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", "idna 0.4.0", @@ -9125,15 +9539,15 @@ checksum = "5190c9442dcdaf0ddd50f37420417d219ae5261bbf5db120d0f9bab996c9cba1" [[package]] name = "utf8parse" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d023da39d1fde5a8a3fe1f3e01ca9632ada0a63e9797de55a879d6e2236277be" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" dependencies = [ "getrandom 0.2.10", "rand 0.8.5", @@ -9161,7 +9575,7 @@ dependencies = [ "atty", "cached", "chrono", - "clap 4.1.14", + "clap 4.4.5", "clap-verbosity-flag", "clap_complete", "confy", @@ -9181,10 +9595,10 @@ dependencies = [ "reqwest", "serde", "serde_json", - "serde_yaml 0.9.22", - "sha2 0.10.7", + "serde_yaml 0.9.25", + "sha2", "tempfile", - "toml 0.7.5", + "toml 0.8.0", ] [[package]] @@ -9195,16 +9609,17 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] name = "vector" -version = "0.31.0" +version = "0.33.0" dependencies = [ "apache-avro", "approx", "arc-swap", "arr_macro", "assert_cmd", - "async-compression 0.4.0", - "async-graphql", + "async-compression", + "async-graphql 6.0.0", "async-graphql-warp", + "async-nats", "async-stream", "async-trait", "atty", @@ -9216,6 +9631,7 @@ dependencies = [ "aws-sdk-firehose", "aws-sdk-kinesis", "aws-sdk-s3", + "aws-sdk-sns", "aws-sdk-sqs", "aws-sigv4", "aws-smithy-async", @@ -9229,19 +9645,19 @@ dependencies = [ "azure_identity", "azure_storage", "azure_storage_blobs", - "base64 0.21.2", - "bloom", + "base64 0.21.4", + "bloomy", "bollard", - "bytes 1.4.0", + "bytes 1.5.0", "bytesize", "chrono", "cidr-utils", - "clap 4.1.14", + "clap 4.4.5", "codecs", "colored", "console-subscriber", "criterion", - "crossterm 0.26.1", + "crossterm", "csv", "derivative", "dirs-next", @@ -9259,6 +9675,7 @@ dependencies = [ "glob", "goauth", "governor", + "greptimedb-client", "grok", "h2", "hash_hasher", @@ -9269,12 +9686,13 @@ dependencies = [ "hostname", "http", "http-body", + "http-serde", "hyper", "hyper-openssl", "hyper-proxy", "indexmap 2.0.0", "indoc", - "infer 0.14.0", + "infer 0.15.0", "inventory", "itertools 0.11.0", "k8s-openapi 0.18.0", @@ -9291,9 +9709,8 @@ dependencies = [ "metrics-tracing-context", "mlua", "mongodb", - "nats", "nix 0.26.2", - "nkeys 0.3.0", + "nkeys", "nom", "notify", "num-format", @@ -9304,7 +9721,7 @@ dependencies = [ "openssl-probe", "openssl-src", "opentelemetry-proto", - "ordered-float 3.7.0", + "ordered-float 4.1.0", "paste", "percent-encoding", "pin-project", @@ -9312,14 +9729,15 @@ dependencies = [ "postgres-openssl", "prometheus-parser", "proptest", - "prost", - "prost-build", + "prost 0.12.1", + "prost-build 0.12.1", "prost-reflect", - "prost-types", + "prost-types 0.12.1", "pulsar", "quickcheck", "rand 0.8.5", "rand_distr", + "ratatui", "rdkafka", "redis", "regex", @@ -9327,21 +9745,22 @@ dependencies = [ "rmp-serde", "rmpv", "roaring", + "rstest", "seahash", - "semver 1.0.17", + "semver 1.0.18", "serde", "serde-toml-merge", "serde_bytes", "serde_json", - "serde_with 2.3.2", - "serde_yaml 0.9.22", - "sha2 0.10.7", + "serde_with 3.3.0", + "serde_yaml 0.9.25", + "sha2", "similar-asserts", "smallvec", "smpl_jwt", "snafu", "snap", - "socket2 0.5.3", + "socket2 0.5.4", "stream-cancel", "strip-ansi-escapes", "syslog", @@ -9353,11 +9772,11 @@ dependencies = [ "tokio-postgres", "tokio-stream", "tokio-test", - "tokio-tungstenite 0.19.0", + "tokio-tungstenite 0.20.0", "tokio-util", - "toml 0.7.5", - "tonic", - "tonic-build", + "toml 0.8.0", + "tonic 0.10.1", + "tonic-build 0.10.1", "tower", "tower-http", "tower-test", @@ -9367,8 +9786,7 @@ dependencies = [ "tracing-limit", "tracing-subscriber", "tracing-tower", - "trust-dns-proto 0.22.0", - "tui", + "trust-dns-proto 0.23.0", "typetag", "url", "uuid", @@ -9385,7 +9803,7 @@ dependencies = [ "warp", "windows-service", "wiremock", - "zstd 0.12.3+zstd.1.5.2", + "zstd 0.12.4", ] [[package]] @@ -9395,7 +9813,7 @@ dependencies = [ "anyhow", "async-trait", "chrono", - "clap 4.1.14", + "clap 4.4.5", "futures 0.3.28", "graphql_client", "indoc", @@ -9404,7 +9822,7 @@ dependencies = [ "serde_json", "tokio", "tokio-stream", - "tokio-tungstenite 0.19.0", + "tokio-tungstenite 0.20.0", "url", "uuid", ] @@ -9417,8 +9835,8 @@ dependencies = [ "async-stream", "async-trait", "bytecheck", - "bytes 1.4.0", - "clap 4.1.14", + "bytes 1.5.0", + "clap 4.4.5", "crc32fast", "criterion", "crossbeam-queue", @@ -9438,7 +9856,7 @@ dependencies = [ "rand 0.8.5", "rkyv", "serde", - "serde_yaml 0.9.22", + "serde_yaml 0.9.25", "snafu", "temp-dir", "tokio", @@ -9458,7 +9876,7 @@ name = "vector-common" version = "0.1.0" dependencies = [ "async-stream", - "bytes 1.4.0", + "bytes 1.5.0", "chrono", "chrono-tz", "crossbeam-utils", @@ -9467,7 +9885,7 @@ dependencies = [ "indexmap 2.0.0", "metrics", "nom", - "ordered-float 3.7.0", + "ordered-float 4.1.0", "paste", "pin-project", "quickcheck", @@ -9494,20 +9912,21 @@ dependencies = [ "chrono", "chrono-tz", "encoding_rs", + "http", "indexmap 2.0.0", "inventory", "no-proxy", "num-traits", - "once_cell", "serde", "serde_json", - "serde_with 2.3.2", + "serde_with 3.3.0", "snafu", - "toml 0.7.5", + "toml 0.8.0", "tracing 0.1.37", "url", "vector-config-common", "vector-config-macros", + "vector-core", "vrl", ] @@ -9516,13 +9935,13 @@ name = "vector-config-common" version = "0.1.0" dependencies = [ "convert_case 0.6.0", - "darling 0.13.4", + "darling 0.20.3", "once_cell", - "proc-macro2 1.0.63", - "quote 1.0.29", + "proc-macro2 1.0.67", + "quote 1.0.33", "serde", "serde_json", - "syn 1.0.109", + "syn 2.0.37", "tracing 0.1.37", ] @@ -9530,12 +9949,12 @@ dependencies = [ name = "vector-config-macros" version = "0.1.0" dependencies = [ - "darling 0.13.4", - "proc-macro2 1.0.63", - "quote 1.0.29", + "darling 0.20.3", + "proc-macro2 1.0.67", + "quote 1.0.33", "serde", "serde_derive_internals", - "syn 1.0.109", + "syn 2.0.37", "vector-config", "vector-config-common", ] @@ -9544,11 +9963,12 @@ dependencies = [ name = "vector-core" version = "0.1.0" dependencies = [ - "async-graphql", + "async-graphql 5.0.10", + "async-stream", "async-trait", - "base64 0.21.2", + "base64 0.21.4", "bitmask-enum", - "bytes 1.4.0", + "bytes 1.5.0", "chrono", "chrono-tz", "criterion", @@ -9575,13 +9995,13 @@ dependencies = [ "noisy_float", "once_cell", "openssl", - "ordered-float 3.7.0", + "ordered-float 4.1.0", "parking_lot", "pin-project", "proptest", - "prost", - "prost-build", - "prost-types", + "prost 0.12.1", + "prost-build 0.12.1", + "prost-types 0.12.1", "quanta", "quickcheck", "quickcheck_macros", @@ -9593,18 +10013,18 @@ dependencies = [ "security-framework", "serde", "serde_json", - "serde_with 2.3.2", + "serde_with 3.3.0", "similar-asserts", "smallvec", "snafu", - "socket2 0.5.3", + "socket2 0.5.4", "tokio", "tokio-openssl", "tokio-stream", "tokio-test", "tokio-util", - "toml 0.7.5", - "tonic", + "toml 0.8.0", + "tonic 0.10.1", "tower", "tracing 0.1.37", "tracing-core 0.1.30", @@ -9636,7 +10056,7 @@ dependencies = [ name = "vector-vrl-cli" version = "0.1.0" dependencies = [ - "clap 4.1.14", + "clap 4.4.5", "vector-vrl-functions", "vrl", ] @@ -9655,7 +10075,7 @@ dependencies = [ "ansi_term", "chrono", "chrono-tz", - "clap 4.1.14", + "clap 4.4.5", "enrichment", "glob", "prettydiff", @@ -9672,6 +10092,7 @@ dependencies = [ name = "vector-vrl-web-playground" version = "0.1.0" dependencies = [ + "cargo_toml", "enrichment", "getrandom 0.2.10", "gloo-utils", @@ -9696,26 +10117,29 @@ checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" [[package]] name = "vrl" -version = "0.5.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee149a42aa313d18cf7a7e6b54e06df03b4a0e6e5dd42a2b8b6d5eeb98d582c1" +checksum = "10d3c3ffe5322a8a7f63cf422aebb5000774e4152955fca1cd024c262893db5d" dependencies = [ "aes", "ansi_term", "anymap", "arbitrary", "base16", - "base64 0.21.2", - "bytes 1.4.0", + "base64 0.21.4", + "bytes 1.5.0", "cbc", "cfb-mode", "cfg-if", + "chacha20poly1305", "charset", "chrono", "chrono-tz", "cidr-utils", - "clap 4.1.14", + "clap 4.4.5", "codespan-reporting", + "community-id", + "crypto_secretbox", "csv", "ctr", "data-encoding", @@ -9738,7 +10162,7 @@ dependencies = [ "ofb", "once_cell", "onig", - "ordered-float 3.7.0", + "ordered-float 4.1.0", "paste", "peeking_take_while", "percent-encoding", @@ -9757,7 +10181,7 @@ dependencies = [ "serde", "serde_json", "sha-1", - "sha2 0.10.7", + "sha2", "sha3", "snafu", "strip-ansi-escapes", @@ -9771,16 +10195,15 @@ dependencies = [ "uuid", "webbrowser", "woothee", - "zstd 0.12.3+zstd.1.5.2", + "zstd 0.12.4", ] [[package]] name = "vte" -version = "0.10.1" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cbce692ab4ca2f1f3047fcf732430249c0e971bfdd2b234cf2c47ad93af5983" +checksum = "f5022b5fbf9407086c180e9557be968742d839e68346af7792b8592489732197" dependencies = [ - "arrayvec 0.5.2", "utf8parse", "vte_generate_state_changes", ] @@ -9791,8 +10214,8 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", + "proc-macro2 1.0.67", + "quote 1.0.33", ] [[package]] @@ -9837,7 +10260,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba431ef570df1287f7f8b07e376491ad54f84d26ac473489427231e1718e1f69" dependencies = [ - "bytes 1.4.0", + "bytes 1.5.0", "futures-channel", "futures-util", "headers", @@ -9848,7 +10271,7 @@ dependencies = [ "mime_guess", "percent-encoding", "pin-project", - "rustls-pemfile 1.0.1", + "rustls-pemfile", "scoped-tls", "serde", "serde_json", @@ -9892,9 +10315,9 @@ dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.63", - "quote 1.0.29", - "syn 2.0.10", + "proc-macro2 1.0.67", + "quote 1.0.33", + "syn 2.0.37", "wasm-bindgen-shared", ] @@ -9916,7 +10339,7 @@ version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ - "quote 1.0.29", + "quote 1.0.33", "wasm-bindgen-macro-support", ] @@ -9926,9 +10349,9 @@ version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", - "syn 2.0.10", + "proc-macro2 1.0.67", + "quote 1.0.33", + "syn 2.0.37", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -9941,9 +10364,9 @@ checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "wasm-streams" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bbae3363c08332cadccd13b67db371814cd214c2524020932f0804b8cf7c078" +checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" dependencies = [ "futures-util", "js-sys", @@ -9981,32 +10404,28 @@ dependencies = [ [[package]] name = "webpki" -version = "0.21.4" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" +checksum = "f0e74f82d49d545ad128049b7e88f6576df2da6b02e9ce565c6f533be576957e" dependencies = [ "ring", "untrusted", ] [[package]] -name = "webpki" -version = "0.22.0" +name = "webpki-roots" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +checksum = "368bfe657969fb01238bb756d351dcade285e0f6fcbd36dcb23359a5169975be" dependencies = [ - "ring", - "untrusted", + "webpki", ] [[package]] name = "webpki-roots" -version = "0.22.5" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368bfe657969fb01238bb756d351dcade285e0f6fcbd36dcb23359a5169975be" -dependencies = [ - "webpki 0.22.0", -] +checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" [[package]] name = "wepoll-ffi" @@ -10019,13 +10438,24 @@ dependencies = [ [[package]] name = "which" -version = "4.3.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" dependencies = [ "either", - "libc", + "home", "once_cell", + "rustix 0.38.14", +] + +[[package]] +name = "whoami" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50" +dependencies = [ + "wasm-bindgen", + "web-sys", ] [[package]] @@ -10237,9 +10667,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "winnow" -version = "0.4.6" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699" +checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" dependencies = [ "memchr", ] @@ -10254,6 +10684,16 @@ dependencies = [ ] [[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] name = "wiremock" version = "0.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -10261,7 +10701,7 @@ checksum = "c6f71803d3a1c80377a06221e0530be02035d5b3e854af56c6ece7ac20ac441d" dependencies = [ "assert-json-diff 2.0.2", "async-trait", - "base64 0.21.2", + "base64 0.21.4", "deadpool", "futures 0.3.28", "futures-timer", @@ -10295,12 +10735,6 @@ dependencies = [ ] [[package]] -name = "xml-rs" -version = "0.8.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52839dc911083a8ef63efa4d039d1f58b5e409f923e44c80828f206f66e5541c" - -[[package]] name = "xmlparser" version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -10337,8 +10771,8 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6505e6815af7de1746a08f69c69606bb45695a17149517680f3b2149713b19a3" dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", + "proc-macro2 1.0.67", + "quote 1.0.33", "syn 1.0.109", ] @@ -10347,21 +10781,6 @@ name = "zeroize" version = "1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f" -dependencies = [ - "zeroize_derive", -] - -[[package]] -name = "zeroize_derive" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17" -dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.29", - "syn 1.0.109", - "synstructure", -] [[package]] name = "zstd" @@ -10374,9 +10793,9 @@ dependencies = [ [[package]] name = "zstd" -version = "0.12.3+zstd.1.5.2" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76eea132fb024e0e13fd9c2f5d5d595d8a967aa72382ac2f9d39fcc95afd0806" +checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c" dependencies = [ "zstd-safe 6.0.3+zstd.1.5.2", ] diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index fd3a94298c62e..b1fd29e746734 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -33,7 +33,7 @@ let pname = "vector"; - version = "0.31.0"; + version = "0.33.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -42,23 +42,19 @@ rustPlatform.buildRustPackage { owner = "vectordotdev"; repo = pname; rev = "v${version}"; - hash = "sha256-+ATOHx+LQLQV4nMdj1FRRvDTqGCTbX9kl290AbY9Vw0="; + hash = "sha256-ZhRvQQ0MxEd0Ry6sfEWUzYpEN80GhBOzpbEG5ZhCA2E="; }; - patches = [ - ./rust-1.71-unnecessary-mut.diff - ]; - cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "aws-config-0.54.1" = "sha256-AVumLhybVbMnEah9/JqiQOQ4R0e2OsbB8WAJ422R6uk="; - "azure_core-0.5.0" = "sha256-fojO7dhntpymMjV58TtYb7N4UN6rOp30D54x09RDXfQ="; - "chrono-0.4.26" = "sha256-4aDDfLK9H0tEyKlZVMIIU4NjvF70spVYFrfM3/05e0k="; + "greptime-proto-0.1.0" = "sha256-kSOy/0s8ZJ1RfqOb469oaVlreABtHxesNaMzFH6H+aE="; + "greptimedb-client-0.1.0" = "sha256-mGgbxp/h55snowS2BV+QRwrhnE5vywfRF9Gc+8MoAdY="; "heim-0.1.0-rc.1" = "sha256-ODKEQ1udt7FlxI5fvoFMG7C2zmM45eeEYDUEaLTsdYo="; "nix-0.26.2" = "sha256-uquYvRT56lhupkrESpxwKEimRFhmYvri10n3dj0f2yg="; "ntapi-0.3.7" = "sha256-G6ZCsa3GWiI/FeGKiK9TWkmTxen7nwpXvm5FtjNtjWU="; - "tokio-util-0.7.4" = "sha256-rAzj44O+GOZhG+o6FVN5qCcG/NWxW8fUpScm+xsRjIs="; + "tokio-util-0.7.8" = "sha256-HCvtfohOoa1ZjD4s7QLDbIV4fe/MVBKtgM1QQX7gGKQ="; "tracing-0.2.0" = "sha256-YAxeEofFA43PX2hafh3RY+C81a2v6n1fGzYz2FycC3M="; }; }; diff --git a/pkgs/tools/misc/vector/rust-1.71-unnecessary-mut.diff b/pkgs/tools/misc/vector/rust-1.71-unnecessary-mut.diff deleted file mode 100644 index 2507117279ba9..0000000000000 --- a/pkgs/tools/misc/vector/rust-1.71-unnecessary-mut.diff +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/lib/vector-core/src/tls/incoming.rs b/lib/vector-core/src/tls/incoming.rs -index 5d2fd1cdb..7992f2c2b 100644 ---- a/lib/vector-core/src/tls/incoming.rs -+++ b/lib/vector-core/src/tls/incoming.rs -@@ -263,7 +263,7 @@ impl MaybeTlsIncomingStream<TcpStream> { - where - F: FnOnce(Pin<&mut MaybeTlsStream<TcpStream>>, &mut Context) -> Poll<io::Result<T>>, - { -- let mut this = self.get_mut(); -+ let this = self.get_mut(); - loop { - return match &mut this.state { - StreamState::Accepted(stream) => poll_fn(Pin::new(stream), cx), -@@ -307,7 +307,7 @@ impl AsyncWrite for MaybeTlsIncomingStream<TcpStream> { - } - - fn poll_shutdown(self: Pin<&mut Self>, cx: &mut Context) -> Poll<io::Result<()>> { -- let mut this = self.get_mut(); -+ let this = self.get_mut(); - match &mut this.state { - StreamState::Accepted(stream) => match Pin::new(stream).poll_shutdown(cx) { - Poll::Ready(Ok(())) => { diff --git a/pkgs/tools/misc/vsh/default.nix b/pkgs/tools/misc/vsh/default.nix index c7f65527e0819..cfe014d3f9aa5 100644 --- a/pkgs/tools/misc/vsh/default.nix +++ b/pkgs/tools/misc/vsh/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { }; # vendor directory is part of repository - vendorSha256 = null; + vendorHash = null; # make sure version gets set at compile time ldflags = [ "-s" "-w" "-X main.vshVersion=v${version}" ]; diff --git a/pkgs/tools/misc/wakapi/default.nix b/pkgs/tools/misc/wakapi/default.nix index 95ffa8e8e4b1e..5a68dd7a79554 100644 --- a/pkgs/tools/misc/wakapi/default.nix +++ b/pkgs/tools/misc/wakapi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "wakapi"; - version = "2.8.1"; + version = "2.8.2"; src = fetchFromGitHub { owner = "muety"; repo = pname; rev = version; - sha256 = "sha256-5EUXhKv4cLDaHr6Q2mel3YbVPAYRJd1JtHyWn7kQy8Y="; + sha256 = "sha256-r6CTWBsaaYzQE9pe3rj/BQudloKGlkf310r39Y0kYuM="; }; - vendorHash = "sha256-rwQeIHJAtnRm5nPQCvgoBabVeyLZyrY3yglCW9+NGwM="; + vendorHash = "sha256-uVdjMgQ1zWFKNwTKIHd7O47oekE9tLBh8LgFgI1SATM="; # Not a go module required by the project, contains development utilities excludedPackages = [ "scripts" ]; diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix index bf0e9657296bb..2ce8df19867e9 100644 --- a/pkgs/tools/misc/wakatime/default.nix +++ b/pkgs/tools/misc/wakatime/default.nix @@ -47,7 +47,7 @@ buildGoModule rec { homepage = "https://wakatime.com/"; description = "WakaTime command line interface"; license = licenses.bsd3; - maintainers = with maintainers; [ aaronjheng ]; + maintainers = with maintainers; [ ]; mainProgram = "wakatime-cli"; }; } diff --git a/pkgs/tools/misc/wasm-tools/default.nix b/pkgs/tools/misc/wasm-tools/default.nix index 057413c54ce97..3a878ba87f3c9 100644 --- a/pkgs/tools/misc/wasm-tools/default.nix +++ b/pkgs/tools/misc/wasm-tools/default.nix @@ -5,17 +5,17 @@ rustPlatform.buildRustPackage rec { pname = "wasm-tools"; - version = "1.0.40"; + version = "1.0.45"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "${pname}-${version}"; - hash = "sha256-ZDQPIEDroi+YgEtQ9IsVvFSErfeyDf4KFuybEbGu91E="; + hash = "sha256-8iIYExnWK9W9gVTV66ygY2gu3N1pwylUeOf6LOz51qA="; fetchSubmodules = true; }; - cargoHash = "sha256-Nynn7pxQyqfMAMGmp3eZFg7y5nj7UPyK6FLbVbN07AA="; + cargoHash = "sha256-KwtlgBcijeYRQ5Yfrqd6GirHkbZqAVd2/yP6aJT3pWM="; cargoBuildFlags = [ "--package" "wasm-tools" ]; cargoTestFlags = [ "--all" ]; diff --git a/pkgs/tools/misc/websocat/default.nix b/pkgs/tools/misc/websocat/default.nix index e2024f623ba92..cfc225ea75f84 100644 --- a/pkgs/tools/misc/websocat/default.nix +++ b/pkgs/tools/misc/websocat/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "websocat"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "vi"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FomP5ykHc5oAA7zF7r+PXHf30KaTmYTmVm6Mwf/tPdQ="; + sha256 = "sha256-wyVys+1g2klgwFHlKHI0ztd2qSlWyNXJoFvFCd1PGjo="; }; - cargoSha256 = "sha256-YVI1+WsDMoznRTjnzwlPTdJMRPsQFYtzssoU0sQwQfA="; + cargoHash = "sha256-fakXOPQOEaKEt+AeOYlhumULJyjRHHXFKz4o9AD7WE0="; nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ openssl ] diff --git a/pkgs/tools/misc/xsel/default.nix b/pkgs/tools/misc/xsel/default.nix index 69061eb15b8ba..e886ff331a2a3 100644 --- a/pkgs/tools/misc/xsel/default.nix +++ b/pkgs/tools/misc/xsel/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { description = "Command-line program for getting and setting the contents of the X selection"; homepage = "http://www.kfish.org/software/xsel"; license = licenses.mit; - maintainers = [ maintainers.cstrahan ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/yt-dlp/default.nix b/pkgs/tools/misc/yt-dlp/default.nix index e274222b27b78..ccb30b13af6fb 100644 --- a/pkgs/tools/misc/yt-dlp/default.nix +++ b/pkgs/tools/misc/yt-dlp/default.nix @@ -22,11 +22,11 @@ buildPythonPackage rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2023.7.6"; + version = "2023.9.24"; src = fetchPypi { inherit pname version; - sha256 = "sha256-y1g3OGnIzLUDR0b5HPzNbSXqaXCQ39b5PpA01R60rtI="; + sha256 = "sha256-z8+1/8EgE7auS4x6KDp+RimI8bSSg94pHei/vgU7gHM="; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/misc/ytcast/default.nix b/pkgs/tools/misc/ytcast/default.nix index a918f56fbedc1..163329a60da17 100644 --- a/pkgs/tools/misc/ytcast/default.nix +++ b/pkgs/tools/misc/ytcast/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0f45ai1s4njhcvbv088yn10i3vdvlm6wlfi0ijq5gak1dg02klma"; }; - vendorSha256 = null; + vendorHash = null; ldflags = [ "-X main.progVersion=${version}" ]; meta = with lib; { diff --git a/pkgs/tools/misc/zf/default.nix b/pkgs/tools/misc/zf/default.nix index 041f2a3989ccb..1b441687d3166 100644 --- a/pkgs/tools/misc/zf/default.nix +++ b/pkgs/tools/misc/zf/default.nix @@ -3,27 +3,29 @@ , fetchFromGitHub , installShellFiles , testers -, zig_0_10 +, zig_0_11 +, callPackage }: stdenv.mkDerivation (finalAttrs: { pname = "zf"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "natecraddock"; repo = "zf"; rev = "refs/tags/${finalAttrs.version}"; - fetchSubmodules = true; - hash = "sha256-MzlSU5x2lb6PJZ/iNAi2aebfuClBprlfHMIG/4OPmuc="; + hash = "sha256-qzGr72EnWlGZgd7/r+8Iv+1i/Q9qvWpf/cgkr+TrgkE="; }; nativeBuildInputs = [ installShellFiles - zig_0_10.hook + zig_0_11.hook ]; - doCheck = false; # it's failing somehow + postPatch = '' + ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p + ''; postInstall = '' installManPage doc/zf.1 @@ -33,13 +35,14 @@ stdenv.mkDerivation (finalAttrs: { --zsh complete/_zf ''; - passthru.tests.version = testers.testVersion { package = finalAttrs.zf; }; + passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; meta = { homepage = "https://github.com/natecraddock/zf"; description = "A commandline fuzzy finder that prioritizes matches on filenames"; + changelog = "https://github.com/natecraddock/zf/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ dit7ya mmlb ]; + maintainers = with lib.maintainers; [ dit7ya figsoda mmlb ]; }; }) diff --git a/pkgs/tools/misc/zf/deps.nix b/pkgs/tools/misc/zf/deps.nix new file mode 100644 index 0000000000000..226dd9eaeb6a0 --- /dev/null +++ b/pkgs/tools/misc/zf/deps.nix @@ -0,0 +1,13 @@ +# generated by zon2nix (https://github.com/nix-community/zon2nix) + +{ linkFarm, fetchzip }: + +linkFarm "zig-packages" [ + { + name = "1220dee955839b7f267c1bb21e0ee60888c08f408c30f0722b243cabcc8cce8b7508"; + path = fetchzip { + url = "https://codeberg.org/dude_the_builder/ziglyph/archive/v0.11.1.tar.gz"; + hash = "sha256-tpl4RyCcukKWZehlZf6t2n41gYFDyL27t7+bzcxHP7g="; + }; + } +] diff --git a/pkgs/tools/networking/biosdevname/default.nix b/pkgs/tools/networking/biosdevname/default.nix index f44574fb03647..0f7702acdcc88 100644 --- a/pkgs/tools/networking/biosdevname/default.nix +++ b/pkgs/tools/networking/biosdevname/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { description = "Udev helper for naming devices per BIOS names"; license = licenses.gpl2; platforms = ["x86_64-linux" "i686-linux"]; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/networking/bitmask-vpn/default.nix b/pkgs/tools/networking/bitmask-vpn/default.nix index c3e8538acb8dc..60988da176a26 100644 --- a/pkgs/tools/networking/bitmask-vpn/default.nix +++ b/pkgs/tools/networking/bitmask-vpn/default.nix @@ -68,7 +68,7 @@ in buildGoModule rec { inherit src version; pname = "${provider}-vpn"; - vendorSha256 = null; + vendorHash = null; postPatch = '' substituteInPlace pkg/pickle/helpers.go \ diff --git a/pkgs/tools/networking/changetower/default.nix b/pkgs/tools/networking/changetower/default.nix index 62a277dd0cfd5..f5d63bb4336a2 100644 --- a/pkgs/tools/networking/changetower/default.nix +++ b/pkgs/tools/networking/changetower/default.nix @@ -11,10 +11,10 @@ buildGoModule rec { owner = "Dc4ts"; repo = "ChangeTower"; rev = "v${version}"; - sha256 = "058ccn6d5f7w268hfqh85bz1xj6ysgfrmyj0b4asjiskq7728v9z"; + hash = "sha256-P20kzsFTR6kVWUD6mt3T3sge/ioIYgeREfy40oxlDBU="; }; - vendorSha256 = "0hagskhwrdsl6s6hn27jriysbxhaz0pqq1h43j7v0ggnwd2s03bq"; + vendorHash = "sha256-eA2gReP2PbCPHAQGjC/4CvalfczyCAuNNlS3zOHUT0E="; meta = with lib; { description = "Tools to watch for webppage changes"; diff --git a/pkgs/tools/networking/clash-meta/default.nix b/pkgs/tools/networking/clash-meta/default.nix index 5c3f4c976b415..2ec32960d7fa5 100644 --- a/pkgs/tools/networking/clash-meta/default.nix +++ b/pkgs/tools/networking/clash-meta/default.nix @@ -4,16 +4,16 @@ }: buildGoModule rec { pname = "clash-meta"; - version = "1.15.1"; + version = "1.16.0"; src = fetchFromGitHub { owner = "MetaCubeX"; repo = "Clash.Meta"; rev = "v${version}"; - hash = "sha256-gOUG+XtLfkgnbTj1yUun50pevOh+aPXfIlof5/U2ud8="; + hash = "sha256-ORyjCYf2OPrSt/juiBk0Gf2Az4XoZipKBWWFXf8nIqE="; }; - vendorHash = "sha256-My/fwa8BgaJcSGKcyyzUExVE0M2fk7rMZtOBW7V5edQ="; + vendorHash = "sha256-ySCmHLuMTCxBcAYo7YD8zOpUAa90PQmeLLt+uOn40Pk="; # Do not build testing suit excludedPackages = [ "./test" ]; diff --git a/pkgs/tools/networking/containerlab/default.nix b/pkgs/tools/networking/containerlab/default.nix index ca9b54c5135a9..fe59d72397bbd 100644 --- a/pkgs/tools/networking/containerlab/default.nix +++ b/pkgs/tools/networking/containerlab/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "containerlab"; - version = "0.44.3"; + version = "0.45.1"; src = fetchFromGitHub { owner = "srl-labs"; repo = "containerlab"; rev = "v${version}"; - hash = "sha256-USQULAT1T40eyQHpU3YIdwl2PDG1IHm9ferXKsNVyLg="; + hash = "sha256-SjB00hTbY28EsLHAnq5PwtHD9Y2cYTNqu/nSF6smQfE="; }; nativeBuildInputs = [ installShellFiles ]; - vendorHash = "sha256-yzxhK7Gpgcdh+j8EJvHIduZgsF1rK652QWvswFkgO7s="; + vendorHash = "sha256-Tkm0BUn1KEFp1EyZu44dueSQlKIbUUrxGK7iT+aTmaQ="; ldflags = [ "-s" diff --git a/pkgs/tools/networking/curl/7.79.1-darwin-no-systemconfiguration.patch b/pkgs/tools/networking/curl/7.79.1-darwin-no-systemconfiguration.patch index 2c732621d9251..2d97338a1fe9c 100644 --- a/pkgs/tools/networking/curl/7.79.1-darwin-no-systemconfiguration.patch +++ b/pkgs/tools/networking/curl/7.79.1-darwin-no-systemconfiguration.patch @@ -27,13 +27,13 @@ autoconf in the bootstrap loop just to regenerate a patched configure.ac. curl_includes_winsock2="\ diff --git a/lib/curl_setup.h b/lib/curl_setup.h -index 727d123e5..f78d8be4a 100644 +index b43714da7..7674778b7 100644 --- a/lib/curl_setup.h +++ b/lib/curl_setup.h -@@ -250,19 +250,6 @@ - +@@ -250,20 +250,6 @@ + #include <curl/system.h> - + -/* - * Use getaddrinfo to resolve the IPv4 address literal. If the current network - * interface doesn't support IPv4, but supports IPv6, NAT64, and DNS64, @@ -42,8 +42,9 @@ index 727d123e5..f78d8be4a 100644 -#if defined(__APPLE__) && !defined(USE_ARES) -#include <TargetConditionals.h> -#define USE_RESOLVE_ON_IPS 1 --# if !defined(TARGET_OS_OSX) || TARGET_OS_OSX --# define CURL_OSX_CALL_COPYPROXIES 1 +-# if TARGET_OS_MAC && !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) && \ +- defined(ENABLE_IPV6) +-# define CURL_MACOS_CALL_COPYPROXIES 1 -# endif -#endif - diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index c15325a49e4de..aced6d6653a94 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -47,14 +47,14 @@ assert !((lib.count (x: x) [ gnutlsSupport opensslSupport wolfsslSupport rustlsS stdenv.mkDerivation (finalAttrs: { pname = "curl"; - version = "8.2.1"; + version = "8.3.0"; src = fetchurl { urls = [ "https://curl.haxx.se/download/curl-${finalAttrs.version}.tar.xz" - "https://github.com/curl/curl/releases/download/curl-${finalAttrs.version}/curl-${finalAttrs.version}.tar.xz" + "https://github.com/curl/curl/releases/download/curl-${builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version}/curl-${finalAttrs.version}.tar.xz" ]; - hash = "sha256-3TIva9CiDmzr39OI9p6Yw9GDvteSz0cTyKfvSYy6SJQ="; + hash = "sha256-N21id2fWxPBRBattSXsNmrpxEXcN2dmVIlR4IJw36mM="; }; patches = [ diff --git a/pkgs/tools/networking/dnscrypt-proxy/default.nix b/pkgs/tools/networking/dnscrypt-proxy/default.nix index 5227a28c1bdde..319e8d9f822ae 100644 --- a/pkgs/tools/networking/dnscrypt-proxy/default.nix +++ b/pkgs/tools/networking/dnscrypt-proxy/default.nix @@ -4,7 +4,7 @@ buildGoModule rec { pname = "dnscrypt-proxy"; version = "2.1.5"; - vendorSha256 = null; + vendorHash = null; doCheck = false; diff --git a/pkgs/tools/networking/ebpf-verifier/default.nix b/pkgs/tools/networking/ebpf-verifier/default.nix index 972c72c4e57ff..8605db55bba82 100644 --- a/pkgs/tools/networking/ebpf-verifier/default.nix +++ b/pkgs/tools/networking/ebpf-verifier/default.nix @@ -39,8 +39,6 @@ stdenv.mkDerivation { yaml-cpp ]; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; - installPhase = '' runHook preInstall diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/tools/networking/findomain/default.nix index 5347f443bd77a..230cc646afec6 100644 --- a/pkgs/tools/networking/findomain/default.nix +++ b/pkgs/tools/networking/findomain/default.nix @@ -5,7 +5,7 @@ , pkg-config , openssl , stdenv -, Security +, darwin }: rustPlatform.buildRustPackage rec { @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ - Security + darwin.apple_sdk.frameworks.SystemConfiguration ]; env = { diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix index c0e1cf8962551..0d7b5be4b5a2e 100644 --- a/pkgs/tools/networking/flannel/default.nix +++ b/pkgs/tools/networking/flannel/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flannel"; - version = "0.22.2"; + version = "0.22.3"; rev = "v${version}"; - vendorHash = "sha256-sObAXI9U5U1JXWNzaBNNGfklnfh/G3aUye/MINWwU4s="; + vendorHash = "sha256-2P9gEbItK7rCtveXIZkFMcvppjK4GLzTSoLrkMPeCig="; src = fetchFromGitHub { inherit rev; owner = "flannel-io"; repo = "flannel"; - sha256 = "sha256-ZQyBPsYIOQq6oonn661sIBpccV9uxoXlieOhbIIv5AE="; + sha256 = "sha256-sO3iFs6pAmnqpc9+hxx2WZQWOP37/4XS1m5U4nerVLI="; }; ldflags = [ "-X github.com/flannel-io/flannel/pkg/version.Version=${rev}" ]; diff --git a/pkgs/tools/networking/ghostunnel/default.nix b/pkgs/tools/networking/ghostunnel/default.nix index 3ca9ec74c2672..88afb472b77be 100644 --- a/pkgs/tools/networking/ghostunnel/default.nix +++ b/pkgs/tools/networking/ghostunnel/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { hash = "sha256-yG9PfpYqW95X7EfbAhKEDmqBue7SjFULXUO73V4s3t4="; }; - vendorSha256 = null; + vendorHash = null; deleteVendor = true; diff --git a/pkgs/tools/networking/gobgp/default.nix b/pkgs/tools/networking/gobgp/default.nix index 63f6c672d3cd4..8675e3e695988 100644 --- a/pkgs/tools/networking/gobgp/default.nix +++ b/pkgs/tools/networking/gobgp/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gobgp"; - version = "3.18.0"; + version = "3.19.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${version}"; - sha256 = "sha256-OAePH8q8YQJGundd0VwtLEl3UkRyuZYAx5rcN4DNft4="; + sha256 = "sha256-zDLL+3k6/Jgq/pflpmjuLcfPzvDl0LQLQklW+kOvtQg="; }; - vendorHash = "sha256-Z7vYpDQIKc4elVBLiGtxF3D9pec4QNvWFLpux/29t1Y="; + vendorHash = "sha256-8qEGp95y8iBIJXCTh2Pa/JwiruZVVIjHLwaZqwFZMl8="; postConfigure = '' export CGO_ENABLED=0 diff --git a/pkgs/tools/networking/godns/default.nix b/pkgs/tools/networking/godns/default.nix index edbeaa64cfa39..a75fae9f724c8 100644 --- a/pkgs/tools/networking/godns/default.nix +++ b/pkgs/tools/networking/godns/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "godns"; - version = "2.9.9"; + version = "3.0.1"; src = fetchFromGitHub { owner = "TimothyYe"; repo = "godns"; rev = "refs/tags/v${version}"; - hash = "sha256-R5f2h8bodP/9MP5gqGWBEbC/rLPEV4gEDoc5sMgmoLs="; + hash = "sha256-MmjPcJxz8wAgBwPg8UaYVniypDeY05yDxehkTL8zjro="; }; vendorHash = "sha256-iAU62/0MjzxwuMvIobhIZEqDJUpRqwEabnazH7jBRTE="; diff --git a/pkgs/tools/networking/gof5/default.nix b/pkgs/tools/networking/gof5/default.nix index 9b437ee49ee6d..4c9ab25cc7881 100644 --- a/pkgs/tools/networking/gof5/default.nix +++ b/pkgs/tools/networking/gof5/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "10qh7rj8s540ghjdvymly53vny3n0qd0z0ixy24n026jjhgjvnpl"; }; - vendorSha256 = null; + vendorHash = null; # The tests are broken and apparently you need to uncomment some lines in the # code in order for it to work. diff --git a/pkgs/tools/networking/gp-saml-gui/default.nix b/pkgs/tools/networking/gp-saml-gui/default.nix index 3e343b3715d32..8a7ad11a2fe79 100644 --- a/pkgs/tools/networking/gp-saml-gui/default.nix +++ b/pkgs/tools/networking/gp-saml-gui/default.nix @@ -12,13 +12,13 @@ }: buildPythonPackage rec { pname = "gp-saml-gui"; - version = "0.1"; + version = "0.1+20230507-${lib.strings.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "dlenski"; repo = "gp-saml-gui"; - rev = "085d3276e17e1094e22e5d49545e273147598eb4"; - sha256 = "sha256-5vIfgDaHE3T+euLliEyXe+Xikf5VyW3b9C2GapWx278="; + rev = "258f47cdc4a8ed57a1eef16667f6cad0d1cb49b1"; + sha256 = "sha256-g10S8C32mnOymCmGNdM8gmGpYn5/ObMJK3g6amKtQmI="; }; buildInputs = lib.optional stdenv.isLinux glib-networking; diff --git a/pkgs/tools/networking/grpc_cli/default.nix b/pkgs/tools/networking/grpc_cli/default.nix index b2b84ea53e663..f8803e3f7999e 100644 --- a/pkgs/tools/networking/grpc_cli/default.nix +++ b/pkgs/tools/networking/grpc_cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "grpc_cli"; - version = "1.58.0"; + version = "1.59.0"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - hash = "sha256-JxkQZSmI3FSAoSd45uciCpsTeGuAvRhG/BGyC4NKOjo="; + hash = "sha256-++8QWJJuwGUcm6pKxik6+jqzvXbMx8LHSV5CSgJ8IVo="; fetchSubmodules = true; }; nativeBuildInputs = [ automake cmake autoconf ]; diff --git a/pkgs/tools/networking/hey/default.nix b/pkgs/tools/networking/hey/default.nix index d59e58981e776..fc086eeeafff9 100644 --- a/pkgs/tools/networking/hey/default.nix +++ b/pkgs/tools/networking/hey/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0gsdksrzlwpba14a43ayyy41l1hxpw4ayjpvqyd4ycakddlkvgzb"; }; - vendorSha256 = null; + vendorHash = null; meta = with lib; { description = "HTTP load generator, ApacheBench (ab) replacement"; diff --git a/pkgs/tools/networking/hysteria/default.nix b/pkgs/tools/networking/hysteria/default.nix index cbcd00dc0ba2d..9885066397b6c 100644 --- a/pkgs/tools/networking/hysteria/default.nix +++ b/pkgs/tools/networking/hysteria/default.nix @@ -1,19 +1,19 @@ { lib , fetchFromGitHub -, buildGoModule +, buildGo121Module }: -buildGoModule rec { +buildGo121Module rec { pname = "hysteria"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "apernet"; repo = pname; rev = "app/v${version}"; - hash = "sha256-MMBDBWeOm0yiKNGe/Ywriv8oR0YoM3Or5uGGuePOV3U="; + hash = "sha256-0ekw92T9yWrKu5MxSssOCXlUFubiVLoH6ZLEMDFkcis="; }; - vendorHash = "sha256-zsPqqk8nKhtF2RXfF2yRhienzLMLPAcHQgnEX8gcl3s="; + vendorHash = "sha256-Hf+Jx/z+hJ6jqWLJHGK7umNgNzNKYgQtCdAosdrqvPg="; proxyVendor = true; ldflags = [ diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix index 0f31ef01cf226..e4eb2eeaac41f 100644 --- a/pkgs/tools/networking/inetutils/default.nix +++ b/pkgs/tools/networking/inetutils/default.nix @@ -1,4 +1,10 @@ -{ stdenv, lib, fetchurl, ncurses, perl, help2man +{ stdenv +, lib +, fetchurl +, fetchpatch +, ncurses +, perl +, help2man , apparmorRulesFromClosure , libxcrypt }: @@ -17,6 +23,11 @@ stdenv.mkDerivation rec { patches = [ # https://git.congatec.com/yocto/meta-openembedded/commit/3402bfac6b595c622e4590a8ff5eaaa854e2a2a3 ./inetutils-1_9-PATH_PROCNET_DEV.patch + (fetchpatch { + name = "CVE-2023-40303.patch"; + url = "https://git.savannah.gnu.org/cgit/inetutils.git/patch/?id=e4e65c03f4c11292a3e40ef72ca3f194c8bffdd6"; + hash = "sha256-I5skN537owfpFpAZr4vDKPHuERI6+oq5/hFW2RQeUxI="; + }) ]; strictDeps = true; @@ -40,9 +51,7 @@ stdenv.mkDerivation rec { "--disable-rexec" ] ++ lib.optional stdenv.isDarwin "--disable-servers"; - # Test fails with "UNIX socket name too long", probably because our - # $TMPDIR is too long. - doCheck = false; + doCheck = true; installFlags = [ "SUIDMODE=" ]; diff --git a/pkgs/tools/networking/iouyap/default.nix b/pkgs/tools/networking/iouyap/default.nix deleted file mode 100644 index d2754469fadec..0000000000000 --- a/pkgs/tools/networking/iouyap/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, bison, flex }: - -stdenv.mkDerivation rec { - pname = "iouyap"; - version = "0.97"; - - src = fetchFromGitHub { - owner = "GNS3"; - repo = pname; - rev = "v${version}"; - sha256 = "028s9kx67b9x7gwzg0fhc6546diw4n0x4kk1xhl3v7hbsz3wdh6s"; - }; - - buildInputs = [ bison flex ]; - - # Workaround build failure on -fno-common toolchains like upstream - # gcc-10. Otherwise build fails as: - # ld: netmap.o:(.bss+0x20): multiple definition of `sizecheck'; iouyap.o:(.bss+0x20): first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - installPhase = '' - install -D -m555 iouyap $out/bin/iouyap; - ''; - - meta = with lib; { - description = "Bridge IOU to UDP, TAP and Ethernet"; - inherit (src.meta) homepage; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ primeos ]; - }; -} diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix index 2c5b064a165f2..7c3cab0fe5a77 100644 --- a/pkgs/tools/networking/kea/default.nix +++ b/pkgs/tools/networking/kea/default.nix @@ -51,6 +51,10 @@ stdenv.mkDerivation rec { "--with-mysql=${lib.getDev libmysqlclient}/bin/mysql_config" "--with-pgsql=${postgresql}/bin/pg_config" ]; + postConfigure = '' + # Mangle embedded paths to dev-only inputs. + sed -e "s|$NIX_STORE/[a-z0-9]\{32\}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" -i config.report + ''; nativeBuildInputs = [ autoreconfHook diff --git a/pkgs/tools/networking/mailctl/default.nix b/pkgs/tools/networking/mailctl/default.nix index 873d6f370939e..2e62332692807 100644 --- a/pkgs/tools/networking/mailctl/default.nix +++ b/pkgs/tools/networking/mailctl/default.nix @@ -1,7 +1,8 @@ { mkDerivation -, fetchFromSourcehut +, fetchFromGitHub , aeson , base +, base64 , bytestring , containers , directory @@ -12,23 +13,26 @@ , optparse-applicative , pretty-simple , process +, random +, strings , template-haskell , text , time , twain +, unix , utf8-string , warp , yaml }: mkDerivation rec { pname = "mailctl"; - version = "0.8.8"; + version = "0.9.2"; - src = fetchFromSourcehut { - owner = "~petrus"; + src = fetchFromGitHub { + owner = "pdobsan"; repo = "mailctl"; rev = version; - hash = "sha256-aFt6y2DzreROLcOLU8ynnSSVQW840T5wFqSRdSODQX4="; + hash = "sha256-frT+fRJpixSvpb2+C34Z47zbMqvmDHdESItXb9YVbfU="; }; isLibrary = true; @@ -37,6 +41,7 @@ mkDerivation rec { libraryHaskellDepends = [ aeson base + base64 bytestring containers directory @@ -46,10 +51,13 @@ mkDerivation rec { optparse-applicative pretty-simple process + random + strings template-haskell text time twain + unix utf8-string warp yaml @@ -58,6 +66,7 @@ mkDerivation rec { executableHaskellDepends = [ aeson base + base64 bytestring containers directory @@ -67,18 +76,21 @@ mkDerivation rec { optparse-applicative pretty-simple process + random + strings template-haskell text time twain + unix utf8-string warp yaml ]; description = "OAuth2 tool for mail clients"; - homepage = "https://sr.ht/~petrus/mailctl/"; - changelog = "https://git.sr.ht/~petrus/mailctl/refs/${version}"; + homepage = "https://github.com/pdobsan/mailctl"; + changelog = "https://github.com/pdobsan/mailctl/releases/tag/${version}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ aidalgol ]; mainProgram = "mailctl"; diff --git a/pkgs/tools/networking/mole/default.nix b/pkgs/tools/networking/mole/default.nix index 53bf7b3ada7bd..39d109118d95a 100644 --- a/pkgs/tools/networking/mole/default.nix +++ b/pkgs/tools/networking/mole/default.nix @@ -12,10 +12,10 @@ buildGoModule rec { owner = "davrodpin"; repo = pname; rev = "v${version}"; - sha256 = "11q48wfsr35xf2gmvh4biq4hlpba3fh6lrm3p9wni0rl1nxy40i7"; + hash = "sha256-JwLiuw00g2h5uqNmaqAbal0KCY6LwF2fcL2MrB1HBIc="; }; - vendorSha256 = "1qm328ldkaifj1vsrz025vsa2wqzii9rky00b6wh8jf31f4ljbzv"; + vendorHash = "sha256-+y9JiQvDSQS5WQD4mVOMH3Oh9C4C/Kx3kC6q2SgSo+I="; ldflags = [ "-s" diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index 6e90bd64a4332..3b080725e957c 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -30,13 +30,13 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.23.1"; + version = "0.23.6"; src = fetchFromGitHub { owner = "netbirdio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YCCkVNFRFoHkBGZ67VHOrw/hxMrwi3lkdbHwMCLE6Hg="; + sha256 = "sha256-foyHV3+8fh7q3jCQqHAznlVLmBTwIiLyxVJraoJ5+P4="; }; vendorHash = "sha256-CwozOBAPFSsa1XzDOHBgmFSwGiNekWT8t7KGR2KOOX4="; diff --git a/pkgs/tools/networking/networkmanager/openvpn/default.nix b/pkgs/tools/networking/networkmanager/openvpn/default.nix index e988fc13528ad..aeaf57a137a3f 100644 --- a/pkgs/tools/networking/networkmanager/openvpn/default.nix +++ b/pkgs/tools/networking/networkmanager/openvpn/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "NetworkManager-openvpn"; - version = "1.10.0"; + version = "1.10.2"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager-openvpn/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "V0XUEH8zmKl6+7k/aSObUQyeRet/ti1g2e0Kcpf00QE="; + sha256 = "YvDyqHgiIbkj8hKsKo67wQAu/WqQ7pRdrUrftW0HbSE="; }; patches = [ diff --git a/pkgs/tools/networking/nexttrace/default.nix b/pkgs/tools/networking/nexttrace/default.nix index e7d53706e25cb..b7991ac2c39f0 100644 --- a/pkgs/tools/networking/nexttrace/default.nix +++ b/pkgs/tools/networking/nexttrace/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "nexttrace"; - version = "1.1.7-1"; + version = "1.2.1.1"; src = fetchFromGitHub { owner = "sjlleo"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZMbX37gi9aGamDtoTdfUMiCPieP4DhjBSE5CIJLK6Z0="; + sha256 = "sha256-B3NHY4wYCa3lR3XPqhjcrgf9iA4Bz/8bKrwxdNSa1Bk="; }; - vendorHash = "sha256-u5EIzYWr81tmMmImoRH0wT7aD3/0tx+W3CXeymWVACM="; + vendorHash = "sha256-8etZelvdUmHNWC0FnSX9oO3reuhB7xIzd/KxPTt6Szc="; doCheck = false; # Tests require a network connection. diff --git a/pkgs/tools/networking/nqptp/default.nix b/pkgs/tools/networking/nqptp/default.nix index e46f34e3aeee0..5261a6afb58f0 100644 --- a/pkgs/tools/networking/nqptp/default.nix +++ b/pkgs/tools/networking/nqptp/default.nix @@ -6,14 +6,14 @@ }: stdenv.mkDerivation rec { - version = "1.2.1"; + version = "1.2.3"; pname = "nqptp"; src = fetchFromGitHub { owner = "mikebrady"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-JfgJXyUCUUrydHHUHSLvtJ6KfFS8eKVEzCW5AdzakI0="; + hash = "sha256-Ppsz3hDG6sEf6LJ2WdbTdJ8Gi53f0YmvaUU8TOfVMz4="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/tools/networking/nss-mdns/default.nix b/pkgs/tools/networking/nss-mdns/default.nix index 9c1bb43a67327..f0c47fe945e19 100644 --- a/pkgs/tools/networking/nss-mdns/default.nix +++ b/pkgs/tools/networking/nss-mdns/default.nix @@ -2,27 +2,27 @@ stdenv.mkDerivation rec { pname = "nss-mdns"; - version = "v0.15.1"; + version = "0.15.1"; src = fetchFromGitHub { owner = "lathiat"; - repo = pname; - rev = version; + repo = "nss-mdns"; + rev = "v${version}"; hash = "sha256-iRaf9/gu9VkGi1VbGpxvC5q+0M8ivezCz/oAKEg5V1M="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; + # Note: Although `nss-mdns' works by talking to `avahi-daemon', it # doesn't depend on the Avahi libraries. Instead, it contains # hand-written D-Bus code to talk to the Avahi daemon. - configureFlags = - [ # Try to use the Avahi daemon before resolving on our own. - "--enable-avahi" - - # Connect to the daemon at `/var/run/avahi-daemon/socket'. - "--localstatedir=/var" - ]; + configureFlags = [ + # Try to use the Avahi daemon before resolving on our own. + "--enable-avahi" + # Connect to the daemon at `/var/run/avahi-daemon/socket'. + "--localstatedir=/var" + ]; meta = { description = "The mDNS Name Service Switch (NSS) plug-in"; @@ -33,13 +33,10 @@ stdenv.mkDerivation rec { resolution by common Unix/Linux programs in the ad-hoc mDNS domain `.local'. ''; - homepage = "http://0pointer.de/lennart/projects/nss-mdns/"; license = lib.licenses.lgpl2Plus; - # Supports both the GNU and FreeBSD NSS. platforms = lib.platforms.gnu ++ lib.platforms.linux ++ lib.platforms.freebsd; - maintainers = [ ]; }; } diff --git a/pkgs/tools/networking/oha/default.nix b/pkgs/tools/networking/oha/default.nix index 24e70cb073d13..327161c8a9731 100644 --- a/pkgs/tools/networking/oha/default.nix +++ b/pkgs/tools/networking/oha/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "oha"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "hatoo"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-vna0wmdcugrYLubnjSgBBeDW6ZHH3VToIJG0z8sB/ss="; + sha256 = "sha256-zupenhIxw93EifV1JRcM9ryGli+wqo88JH+8JciOn8E="; }; - cargoSha256 = "sha256-d6gK/+dsJYb/9HSOHOsly3b35dh0FZ+aNnDVVzcXiV0="; + cargoSha256 = "sha256-g0YJu34LmqqKCSVqS6LaO71iCJ26QKvbMpR6+sMLTr4="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config diff --git a/pkgs/tools/networking/openapi-generator-cli/default.nix b/pkgs/tools/networking/openapi-generator-cli/default.nix index 868bd65be9c14..3d6e49f43840e 100644 --- a/pkgs/tools/networking/openapi-generator-cli/default.nix +++ b/pkgs/tools/networking/openapi-generator-cli/default.nix @@ -1,7 +1,7 @@ { callPackage, lib, stdenv, fetchurl, jre, makeWrapper }: let this = stdenv.mkDerivation rec { - version = "6.6.0"; + version = "7.0.0"; pname = "openapi-generator-cli"; jarfilename = "${pname}-${version}.jar"; @@ -12,7 +12,7 @@ let this = stdenv.mkDerivation rec { src = fetchurl { url = "mirror://maven/org/openapitools/${pname}/${version}/${jarfilename}"; - sha256 = "sha256-lxj/eETolGLHXc2bIKNRNvbbJXv+G4dNseMALpneRgk="; + sha256 = "sha256-gOjp1xvb31E7jGXPfT/C/j2IqutOOaLG4ggx8AAyx3U="; }; dontUnpack = true; diff --git a/pkgs/tools/networking/pgrok/add_version_to_package.json.patch b/pkgs/tools/networking/pgrok/add_version_to_package.json.patch deleted file mode 100644 index 2b39131c9e3b7..0000000000000 --- a/pkgs/tools/networking/pgrok/add_version_to_package.json.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/package.json b/package.json -index 35d34c5..82eda74 100644 ---- a/package.json -+++ b/package.json -@@ -1,5 +1,6 @@ - { - "name": "pgrokd", -+ "version": "0.0.0", - "scripts": { - "dev": "vite", - "build": "tsc && vite build --outDir=../cli/dist --emptyOutDir", diff --git a/pkgs/tools/networking/pgrok/build-deps/package.json b/pkgs/tools/networking/pgrok/build-deps/package.json new file mode 100644 index 0000000000000..3ace3f15e44c3 --- /dev/null +++ b/pkgs/tools/networking/pgrok/build-deps/package.json @@ -0,0 +1,38 @@ +{ + "name": "pgrokd", + "scripts": { + "dev": "vite", + "build": "tsc && vite build --outDir=dist --emptyOutDir", + "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0" + }, + "version": "1.4.0", + "dependencies": { + "axios": "~1.4.0", + "react": "~18.2.0", + "react-dom": "~18.2.0", + "react-router-dom": "~6.15.0", + "@headlessui/react": "~1.7.17", + "@heroicons/react": "~2.0.18", + "@tailwindcss/forms": "~0.5.4", + "@trivago/prettier-plugin-sort-imports": "~4.2.0", + "@types/node": "~20.5.1", + "@types/react": "~18.2.15", + "@types/react-dom": "~18.2.7", + "@typescript-eslint/eslint-plugin": "~6.0.0", + "@typescript-eslint/parser": "~6.0.0", + "@vitejs/plugin-react": "~4.0.3", + "autoprefixer": "~10.4.15", + "code-inspector-plugin": "v0.1.9", + "eslint": "~8.45.0", + "eslint-plugin-import": "~2.28.0", + "eslint-plugin-react": "~7.33.2", + "eslint-plugin-react-hooks": "~4.6.0", + "eslint-plugin-react-refresh": "~0.4.3", + "eslint-plugin-unicorn": "~48.0.1", + "postcss": "~8.4.28", + "prettier": "~3.0.2", + "tailwindcss": "~3.3.3", + "typescript": "~5.0.2", + "vite": "~4.4.5" + } +} diff --git a/pkgs/tools/networking/pgrok/default.nix b/pkgs/tools/networking/pgrok/default.nix index dae4634e825a0..21a62ba8ccd6f 100644 --- a/pkgs/tools/networking/pgrok/default.nix +++ b/pkgs/tools/networking/pgrok/default.nix @@ -3,23 +3,22 @@ , callPackage , fetchFromGitHub }: -let +buildGoModule rec { + pname = "pgrok"; version = "1.4.0"; + src = fetchFromGitHub { owner = "pgrok"; repo = "pgrok"; rev = "v${version}"; hash = "sha256-2k3XLXmf1Xnx4HvS7sD/aq+78Z4I7uY4djV958n5TX4="; }; - web = callPackage ./web.nix { inherit src version; }; -in -buildGoModule { - pname = "pgrok"; - inherit version src; vendorHash = "sha256-M0xVHRh9NKPxmUEmx1dDQUZc8aXcdAfHisQAnt72RdY="; - outputs = [ "out" "server" "web" ]; + outputs = [ "out" "server" ]; + + web = callPackage ./web.nix { inherit src version; }; ldflags = [ "-s" @@ -43,7 +42,6 @@ buildGoModule { postInstall = '' moveToOutput bin/pgrokd $server - cp -r ${web} $web ''; passthru.updateScript = ./update.sh; diff --git a/pkgs/tools/networking/pgrok/package-lock.json b/pkgs/tools/networking/pgrok/package-lock.json deleted file mode 100644 index b0af56695d0b1..0000000000000 --- a/pkgs/tools/networking/pgrok/package-lock.json +++ /dev/null @@ -1,5977 +0,0 @@ -{ - "name": "pgrokd", - "lockfileVersion": 3, - "requires": true, - "packages": { - "": { - "name": "pgrokd", - "dependencies": { - "axios": "^1.4.0", - "react": "^18.2.0", - "react-dom": "^18.2.0", - "react-router-dom": "^6.15.0" - }, - "devDependencies": { - "@headlessui/react": "^1.7.17", - "@heroicons/react": "^2.0.18", - "@tailwindcss/forms": "^0.5.4", - "@trivago/prettier-plugin-sort-imports": "^4.2.0", - "@types/node": "^20.5.1", - "@types/react": "^18.2.15", - "@types/react-dom": "^18.2.7", - "@typescript-eslint/eslint-plugin": "^6.0.0", - "@typescript-eslint/parser": "^6.0.0", - "@vitejs/plugin-react": "^4.0.3", - "autoprefixer": "^10.4.15", - "code-inspector-plugin": "v0.1.9", - "eslint": "^8.45.0", - "eslint-plugin-import": "^2.28.0", - "eslint-plugin-react": "^7.33.2", - "eslint-plugin-react-hooks": "^4.6.0", - "eslint-plugin-react-refresh": "^0.4.3", - "eslint-plugin-unicorn": "^48.0.1", - "postcss": "^8.4.28", - "prettier": "^3.0.2", - "tailwindcss": "^3.3.3", - "typescript": "^5.0.2", - "vite": "^4.4.5" - } - }, - "node_modules/@aashutoshrathi/word-wrap": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", - "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/@alloc/quick-lru": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/@alloc/quick-lru/-/quick-lru-5.2.0.tgz", - "integrity": "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@ampproject/remapping": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz", - "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==", - "dev": true, - "dependencies": { - "@jridgewell/gen-mapping": "^0.3.0", - "@jridgewell/trace-mapping": "^0.3.9" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@babel/code-frame": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.10.tgz", - "integrity": "sha512-/KKIMG4UEL35WmI9OlvMhurwtytjvXoFcGNrOvyG9zIzA8YmPjVtIZUf7b05+TPO7G7/GEmLHDaoCgACHl9hhA==", - "dev": true, - "dependencies": { - "@babel/highlight": "^7.22.10", - "chalk": "^2.4.2" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/compat-data": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.9.tgz", - "integrity": "sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==", - "dev": true, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/core": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.10.tgz", - "integrity": "sha512-fTmqbbUBAwCcre6zPzNngvsI0aNrPZe77AeqvDxWM9Nm+04RrJ3CAmGHA9f7lJQY6ZMhRztNemy4uslDxTX4Qw==", - "dev": true, - "dependencies": { - "@ampproject/remapping": "^2.2.0", - "@babel/code-frame": "^7.22.10", - "@babel/generator": "^7.22.10", - "@babel/helper-compilation-targets": "^7.22.10", - "@babel/helper-module-transforms": "^7.22.9", - "@babel/helpers": "^7.22.10", - "@babel/parser": "^7.22.10", - "@babel/template": "^7.22.5", - "@babel/traverse": "^7.22.10", - "@babel/types": "^7.22.10", - "convert-source-map": "^1.7.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.2", - "json5": "^2.2.2", - "semver": "^6.3.1" - }, - "engines": { - "node": ">=6.9.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/babel" - } - }, - "node_modules/@babel/core/node_modules/@babel/generator": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.10.tgz", - "integrity": "sha512-79KIf7YiWjjdZ81JnLujDRApWtl7BxTqWD88+FFdQEIOG8LJ0etDOM7CXuIgGJa55sGOwZVwuEsaLEm0PJ5/+A==", - "dev": true, - "dependencies": { - "@babel/types": "^7.22.10", - "@jridgewell/gen-mapping": "^0.3.2", - "@jridgewell/trace-mapping": "^0.3.17", - "jsesc": "^2.5.1" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/core/node_modules/@babel/traverse": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz", - "integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.22.10", - "@babel/generator": "^7.22.10", - "@babel/helper-environment-visitor": "^7.22.5", - "@babel/helper-function-name": "^7.22.5", - "@babel/helper-hoist-variables": "^7.22.5", - "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/parser": "^7.22.10", - "@babel/types": "^7.22.10", - "debug": "^4.1.0", - "globals": "^11.1.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/core/node_modules/@babel/types": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.10.tgz", - "integrity": "sha512-obaoigiLrlDZ7TUQln/8m4mSqIW2QFeOrCQc9r+xsaHGNoplVNYlRVpsfE8Vj35GEm2ZH4ZhrNYogs/3fj85kg==", - "dev": true, - "dependencies": { - "@babel/helper-string-parser": "^7.22.5", - "@babel/helper-validator-identifier": "^7.22.5", - "to-fast-properties": "^2.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/core/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - } - }, - "node_modules/@babel/generator": { - "version": "7.17.7", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.7.tgz", - "integrity": "sha512-oLcVCTeIFadUoArDTwpluncplrYBmTCCZZgXCbgNGvOBBiSDDK3eWO4b/+eOTli5tKv1lg+a5/NAXg+nTcei1w==", - "dev": true, - "dependencies": { - "@babel/types": "^7.17.0", - "jsesc": "^2.5.1", - "source-map": "^0.5.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-compilation-targets": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.10.tgz", - "integrity": "sha512-JMSwHD4J7SLod0idLq5PKgI+6g/hLD/iuWBq08ZX49xE14VpVEojJ5rHWptpirV2j020MvypRLAXAO50igCJ5Q==", - "dev": true, - "dependencies": { - "@babel/compat-data": "^7.22.9", - "@babel/helper-validator-option": "^7.22.5", - "browserslist": "^4.21.9", - "lru-cache": "^5.1.1", - "semver": "^6.3.1" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-compilation-targets/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - } - }, - "node_modules/@babel/helper-environment-visitor": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz", - "integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==", - "dev": true, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-function-name": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz", - "integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==", - "dev": true, - "dependencies": { - "@babel/template": "^7.22.5", - "@babel/types": "^7.22.5" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-function-name/node_modules/@babel/types": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.10.tgz", - "integrity": "sha512-obaoigiLrlDZ7TUQln/8m4mSqIW2QFeOrCQc9r+xsaHGNoplVNYlRVpsfE8Vj35GEm2ZH4ZhrNYogs/3fj85kg==", - "dev": true, - "dependencies": { - "@babel/helper-string-parser": "^7.22.5", - "@babel/helper-validator-identifier": "^7.22.5", - "to-fast-properties": "^2.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-hoist-variables": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz", - "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==", - "dev": true, - "dependencies": { - "@babel/types": "^7.22.5" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-hoist-variables/node_modules/@babel/types": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.10.tgz", - "integrity": "sha512-obaoigiLrlDZ7TUQln/8m4mSqIW2QFeOrCQc9r+xsaHGNoplVNYlRVpsfE8Vj35GEm2ZH4ZhrNYogs/3fj85kg==", - "dev": true, - "dependencies": { - "@babel/helper-string-parser": "^7.22.5", - "@babel/helper-validator-identifier": "^7.22.5", - "to-fast-properties": "^2.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-module-imports": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz", - "integrity": "sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==", - "dev": true, - "dependencies": { - "@babel/types": "^7.22.5" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-module-imports/node_modules/@babel/types": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.10.tgz", - "integrity": "sha512-obaoigiLrlDZ7TUQln/8m4mSqIW2QFeOrCQc9r+xsaHGNoplVNYlRVpsfE8Vj35GEm2ZH4ZhrNYogs/3fj85kg==", - "dev": true, - "dependencies": { - "@babel/helper-string-parser": "^7.22.5", - "@babel/helper-validator-identifier": "^7.22.5", - "to-fast-properties": "^2.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-module-transforms": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz", - "integrity": "sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==", - "dev": true, - "dependencies": { - "@babel/helper-environment-visitor": "^7.22.5", - "@babel/helper-module-imports": "^7.22.5", - "@babel/helper-simple-access": "^7.22.5", - "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/helper-validator-identifier": "^7.22.5" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0" - } - }, - "node_modules/@babel/helper-plugin-utils": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz", - "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==", - "dev": true, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-simple-access": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz", - "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==", - "dev": true, - "dependencies": { - "@babel/types": "^7.22.5" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-simple-access/node_modules/@babel/types": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.10.tgz", - "integrity": "sha512-obaoigiLrlDZ7TUQln/8m4mSqIW2QFeOrCQc9r+xsaHGNoplVNYlRVpsfE8Vj35GEm2ZH4ZhrNYogs/3fj85kg==", - "dev": true, - "dependencies": { - "@babel/helper-string-parser": "^7.22.5", - "@babel/helper-validator-identifier": "^7.22.5", - "to-fast-properties": "^2.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-split-export-declaration": { - "version": "7.22.6", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz", - "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==", - "dev": true, - "dependencies": { - "@babel/types": "^7.22.5" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-split-export-declaration/node_modules/@babel/types": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.10.tgz", - "integrity": "sha512-obaoigiLrlDZ7TUQln/8m4mSqIW2QFeOrCQc9r+xsaHGNoplVNYlRVpsfE8Vj35GEm2ZH4ZhrNYogs/3fj85kg==", - "dev": true, - "dependencies": { - "@babel/helper-string-parser": "^7.22.5", - "@babel/helper-validator-identifier": "^7.22.5", - "to-fast-properties": "^2.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-string-parser": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz", - "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==", - "dev": true, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-validator-identifier": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz", - "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==", - "dev": true, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-validator-option": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz", - "integrity": "sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==", - "dev": true, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helpers": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.10.tgz", - "integrity": "sha512-a41J4NW8HyZa1I1vAndrraTlPZ/eZoga2ZgS7fEr0tZJGVU4xqdE80CEm0CcNjha5EZ8fTBYLKHF0kqDUuAwQw==", - "dev": true, - "dependencies": { - "@babel/template": "^7.22.5", - "@babel/traverse": "^7.22.10", - "@babel/types": "^7.22.10" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helpers/node_modules/@babel/generator": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.10.tgz", - "integrity": "sha512-79KIf7YiWjjdZ81JnLujDRApWtl7BxTqWD88+FFdQEIOG8LJ0etDOM7CXuIgGJa55sGOwZVwuEsaLEm0PJ5/+A==", - "dev": true, - "dependencies": { - "@babel/types": "^7.22.10", - "@jridgewell/gen-mapping": "^0.3.2", - "@jridgewell/trace-mapping": "^0.3.17", - "jsesc": "^2.5.1" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helpers/node_modules/@babel/traverse": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz", - "integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.22.10", - "@babel/generator": "^7.22.10", - "@babel/helper-environment-visitor": "^7.22.5", - "@babel/helper-function-name": "^7.22.5", - "@babel/helper-hoist-variables": "^7.22.5", - "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/parser": "^7.22.10", - "@babel/types": "^7.22.10", - "debug": "^4.1.0", - "globals": "^11.1.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helpers/node_modules/@babel/types": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.10.tgz", - "integrity": "sha512-obaoigiLrlDZ7TUQln/8m4mSqIW2QFeOrCQc9r+xsaHGNoplVNYlRVpsfE8Vj35GEm2ZH4ZhrNYogs/3fj85kg==", - "dev": true, - "dependencies": { - "@babel/helper-string-parser": "^7.22.5", - "@babel/helper-validator-identifier": "^7.22.5", - "to-fast-properties": "^2.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/highlight": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.10.tgz", - "integrity": "sha512-78aUtVcT7MUscr0K5mIEnkwxPE0MaxkR5RxRwuHaQ+JuU5AmTPhY+do2mdzVTnIJJpyBglql2pehuBIWHug+WQ==", - "dev": true, - "dependencies": { - "@babel/helper-validator-identifier": "^7.22.5", - "chalk": "^2.4.2", - "js-tokens": "^4.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/parser": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.10.tgz", - "integrity": "sha512-lNbdGsQb9ekfsnjFGhEiF4hfFqGgfOP3H3d27re3n+CGhNuTSUEQdfWk556sTLNTloczcdM5TYF2LhzmDQKyvQ==", - "dev": true, - "bin": { - "parser": "bin/babel-parser.js" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@babel/plugin-transform-react-jsx-self": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.22.5.tgz", - "integrity": "sha512-nTh2ogNUtxbiSbxaT4Ds6aXnXEipHweN9YRgOX/oNXdf0cCrGn/+2LozFa3lnPV5D90MkjhgckCPBrsoSc1a7g==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-react-jsx-source": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.22.5.tgz", - "integrity": "sha512-yIiRO6yobeEIaI0RTbIr8iAK9FcBHLtZq0S89ZPjDLQXBA4xvghaKqI0etp/tF3htTM0sazJKKLz9oEiGRtu7w==", - "dev": true, - "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/template": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz", - "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.22.5", - "@babel/parser": "^7.22.5", - "@babel/types": "^7.22.5" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/template/node_modules/@babel/types": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.10.tgz", - "integrity": "sha512-obaoigiLrlDZ7TUQln/8m4mSqIW2QFeOrCQc9r+xsaHGNoplVNYlRVpsfE8Vj35GEm2ZH4ZhrNYogs/3fj85kg==", - "dev": true, - "dependencies": { - "@babel/helper-string-parser": "^7.22.5", - "@babel/helper-validator-identifier": "^7.22.5", - "to-fast-properties": "^2.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/traverse": { - "version": "7.17.3", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.3.tgz", - "integrity": "sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.16.7", - "@babel/generator": "^7.17.3", - "@babel/helper-environment-visitor": "^7.16.7", - "@babel/helper-function-name": "^7.16.7", - "@babel/helper-hoist-variables": "^7.16.7", - "@babel/helper-split-export-declaration": "^7.16.7", - "@babel/parser": "^7.17.3", - "@babel/types": "^7.17.0", - "debug": "^4.1.0", - "globals": "^11.1.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/types": { - "version": "7.17.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.0.tgz", - "integrity": "sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==", - "dev": true, - "dependencies": { - "@babel/helper-validator-identifier": "^7.16.7", - "to-fast-properties": "^2.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@esbuild/android-arm": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz", - "integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==", - "cpu": [ - "arm" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/android-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz", - "integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/android-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz", - "integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/darwin-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz", - "integrity": "sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/darwin-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz", - "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/freebsd-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz", - "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/freebsd-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz", - "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-arm": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz", - "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==", - "cpu": [ - "arm" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz", - "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-ia32": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz", - "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==", - "cpu": [ - "ia32" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-loong64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz", - "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==", - "cpu": [ - "loong64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-mips64el": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz", - "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==", - "cpu": [ - "mips64el" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-ppc64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz", - "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==", - "cpu": [ - "ppc64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-riscv64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz", - "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==", - "cpu": [ - "riscv64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-s390x": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz", - "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==", - "cpu": [ - "s390x" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz", - "integrity": "sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/netbsd-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz", - "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "netbsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/openbsd-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz", - "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "openbsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/sunos-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz", - "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "sunos" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/win32-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz", - "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/win32-ia32": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz", - "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==", - "cpu": [ - "ia32" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/win32-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz", - "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@eslint-community/eslint-utils": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", - "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", - "dev": true, - "dependencies": { - "eslint-visitor-keys": "^3.3.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" - } - }, - "node_modules/@eslint-community/regexpp": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.7.0.tgz", - "integrity": "sha512-+HencqxU7CFJnQb7IKtuNBqS6Yx3Tz4kOL8BJXo+JyeiBm5MEX6pO8onXDkjrkCRlfYXS1Axro15ZjVFe9YgsA==", - "dev": true, - "engines": { - "node": "^12.0.0 || ^14.0.0 || >=16.0.0" - } - }, - "node_modules/@eslint/eslintrc": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz", - "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==", - "dev": true, - "dependencies": { - "ajv": "^6.12.4", - "debug": "^4.3.2", - "espree": "^9.6.0", - "globals": "^13.19.0", - "ignore": "^5.2.0", - "import-fresh": "^3.2.1", - "js-yaml": "^4.1.0", - "minimatch": "^3.1.2", - "strip-json-comments": "^3.1.1" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/@eslint/eslintrc/node_modules/globals": { - "version": "13.21.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.21.0.tgz", - "integrity": "sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==", - "dev": true, - "dependencies": { - "type-fest": "^0.20.2" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@eslint/eslintrc/node_modules/type-fest": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@eslint/js": { - "version": "8.47.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.47.0.tgz", - "integrity": "sha512-P6omY1zv5MItm93kLM8s2vr1HICJH8v0dvddDhysbIuZ+vcjOHg5Zbkf1mTkcmi2JA9oBG2anOkRnW8WJTS8Og==", - "dev": true, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - } - }, - "node_modules/@headlessui/react": { - "version": "1.7.17", - "resolved": "https://registry.npmjs.org/@headlessui/react/-/react-1.7.17.tgz", - "integrity": "sha512-4am+tzvkqDSSgiwrsEpGWqgGo9dz8qU5M3znCkC4PgkpY4HcCZzEDEvozltGGGHIKl9jbXbZPSH5TWn4sWJdow==", - "dev": true, - "dependencies": { - "client-only": "^0.0.1" - }, - "engines": { - "node": ">=10" - }, - "peerDependencies": { - "react": "^16 || ^17 || ^18", - "react-dom": "^16 || ^17 || ^18" - } - }, - "node_modules/@heroicons/react": { - "version": "2.0.18", - "resolved": "https://registry.npmjs.org/@heroicons/react/-/react-2.0.18.tgz", - "integrity": "sha512-7TyMjRrZZMBPa+/5Y8lN0iyvUU/01PeMGX2+RE7cQWpEUIcb4QotzUObFkJDejj/HUH4qjP/eQ0gzzKs2f+6Yw==", - "dev": true, - "peerDependencies": { - "react": ">= 16" - } - }, - "node_modules/@humanwhocodes/config-array": { - "version": "0.11.10", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz", - "integrity": "sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==", - "dev": true, - "dependencies": { - "@humanwhocodes/object-schema": "^1.2.1", - "debug": "^4.1.1", - "minimatch": "^3.0.5" - }, - "engines": { - "node": ">=10.10.0" - } - }, - "node_modules/@humanwhocodes/module-importer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", - "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", - "dev": true, - "engines": { - "node": ">=12.22" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/nzakas" - } - }, - "node_modules/@humanwhocodes/object-schema": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", - "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", - "dev": true - }, - "node_modules/@jridgewell/gen-mapping": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", - "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==", - "dev": true, - "dependencies": { - "@jridgewell/set-array": "^1.0.1", - "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.9" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/resolve-uri": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz", - "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==", - "dev": true, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/set-array": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", - "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", - "dev": true, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.4.15", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", - "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==", - "dev": true - }, - "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.19", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz", - "integrity": "sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==", - "dev": true, - "dependencies": { - "@jridgewell/resolve-uri": "^3.1.0", - "@jridgewell/sourcemap-codec": "^1.4.14" - } - }, - "node_modules/@nodelib/fs.scandir": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", - "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", - "dev": true, - "dependencies": { - "@nodelib/fs.stat": "2.0.5", - "run-parallel": "^1.1.9" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@nodelib/fs.stat": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", - "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", - "dev": true, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@nodelib/fs.walk": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", - "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", - "dev": true, - "dependencies": { - "@nodelib/fs.scandir": "2.1.5", - "fastq": "^1.6.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@remix-run/router": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.8.0.tgz", - "integrity": "sha512-mrfKqIHnSZRyIzBcanNJmVQELTnX+qagEDlcKO90RgRBVOZGSGvZKeDihTRfWcqoDn5N/NkUcwWTccnpN18Tfg==", - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@tailwindcss/forms": { - "version": "0.5.4", - "resolved": "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.5.4.tgz", - "integrity": "sha512-YAm12D3R7/9Mh4jFbYSMnsd6jG++8KxogWgqs7hbdo/86aWjjlIEvL7+QYdVELmAI0InXTpZqFIg5e7aDVWI2Q==", - "dev": true, - "dependencies": { - "mini-svg-data-uri": "^1.2.3" - }, - "peerDependencies": { - "tailwindcss": ">=3.0.0 || >= 3.0.0-alpha.1" - } - }, - "node_modules/@trivago/prettier-plugin-sort-imports": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@trivago/prettier-plugin-sort-imports/-/prettier-plugin-sort-imports-4.2.0.tgz", - "integrity": "sha512-YBepjbt+ZNBVmN3ev1amQH3lWCmHyt5qTbLCp/syXJRu/Kw2koXh44qayB1gMRxcL/gV8egmjN5xWSrYyfUtyw==", - "dev": true, - "dependencies": { - "@babel/generator": "7.17.7", - "@babel/parser": "^7.20.5", - "@babel/traverse": "7.17.3", - "@babel/types": "7.17.0", - "javascript-natural-sort": "0.7.1", - "lodash": "^4.17.21" - }, - "peerDependencies": { - "@vue/compiler-sfc": "3.x", - "prettier": "2.x - 3.x" - }, - "peerDependenciesMeta": { - "@vue/compiler-sfc": { - "optional": true - } - } - }, - "node_modules/@types/json-schema": { - "version": "7.0.12", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz", - "integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==", - "dev": true - }, - "node_modules/@types/json5": { - "version": "0.0.29", - "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", - "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==", - "dev": true - }, - "node_modules/@types/node": { - "version": "20.5.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.5.2.tgz", - "integrity": "sha512-5j/lXt7unfPOUlrKC34HIaedONleyLtwkKggiD/0uuMfT8gg2EOpg0dz4lCD15Ga7muC+1WzJZAjIB9simWd6Q==", - "dev": true - }, - "node_modules/@types/normalize-package-data": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz", - "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==", - "dev": true - }, - "node_modules/@types/prop-types": { - "version": "15.7.5", - "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz", - "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==", - "dev": true - }, - "node_modules/@types/react": { - "version": "18.2.20", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.20.tgz", - "integrity": "sha512-WKNtmsLWJM/3D5mG4U84cysVY31ivmyw85dE84fOCk5Hx78wezB/XEjVPWl2JTZ5FkEeaTJf+VgUAUn3PE7Isw==", - "dev": true, - "dependencies": { - "@types/prop-types": "*", - "@types/scheduler": "*", - "csstype": "^3.0.2" - } - }, - "node_modules/@types/react-dom": { - "version": "18.2.7", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.7.tgz", - "integrity": "sha512-GRaAEriuT4zp9N4p1i8BDBYmEyfo+xQ3yHjJU4eiK5NDa1RmUZG+unZABUTK4/Ox/M+GaHwb6Ow8rUITrtjszA==", - "dev": true, - "dependencies": { - "@types/react": "*" - } - }, - "node_modules/@types/scheduler": { - "version": "0.16.3", - "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.3.tgz", - "integrity": "sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ==", - "dev": true - }, - "node_modules/@types/semver": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.0.tgz", - "integrity": "sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==", - "dev": true - }, - "node_modules/@typescript-eslint/eslint-plugin": { - "version": "6.4.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.4.1.tgz", - "integrity": "sha512-3F5PtBzUW0dYlq77Lcqo13fv+58KDwUib3BddilE8ajPJT+faGgxmI9Sw+I8ZS22BYwoir9ZhNXcLi+S+I2bkw==", - "dev": true, - "dependencies": { - "@eslint-community/regexpp": "^4.5.1", - "@typescript-eslint/scope-manager": "6.4.1", - "@typescript-eslint/type-utils": "6.4.1", - "@typescript-eslint/utils": "6.4.1", - "@typescript-eslint/visitor-keys": "6.4.1", - "debug": "^4.3.4", - "graphemer": "^1.4.0", - "ignore": "^5.2.4", - "natural-compare": "^1.4.0", - "semver": "^7.5.4", - "ts-api-utils": "^1.0.1" - }, - "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "@typescript-eslint/parser": "^6.0.0 || ^6.0.0-alpha", - "eslint": "^7.0.0 || ^8.0.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/parser": { - "version": "6.4.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.4.1.tgz", - "integrity": "sha512-610G6KHymg9V7EqOaNBMtD1GgpAmGROsmfHJPXNLCU9bfIuLrkdOygltK784F6Crboyd5tBFayPB7Sf0McrQwg==", - "dev": true, - "dependencies": { - "@typescript-eslint/scope-manager": "6.4.1", - "@typescript-eslint/types": "6.4.1", - "@typescript-eslint/typescript-estree": "6.4.1", - "@typescript-eslint/visitor-keys": "6.4.1", - "debug": "^4.3.4" - }, - "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^7.0.0 || ^8.0.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/scope-manager": { - "version": "6.4.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.4.1.tgz", - "integrity": "sha512-p/OavqOQfm4/Hdrr7kvacOSFjwQ2rrDVJRPxt/o0TOWdFnjJptnjnZ+sYDR7fi4OimvIuKp+2LCkc+rt9fIW+A==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "6.4.1", - "@typescript-eslint/visitor-keys": "6.4.1" - }, - "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/type-utils": { - "version": "6.4.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.4.1.tgz", - "integrity": "sha512-7ON8M8NXh73SGZ5XvIqWHjgX2f+vvaOarNliGhjrJnv1vdjG0LVIz+ToYfPirOoBi56jxAKLfsLm40+RvxVVXA==", - "dev": true, - "dependencies": { - "@typescript-eslint/typescript-estree": "6.4.1", - "@typescript-eslint/utils": "6.4.1", - "debug": "^4.3.4", - "ts-api-utils": "^1.0.1" - }, - "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^7.0.0 || ^8.0.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/types": { - "version": "6.4.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.4.1.tgz", - "integrity": "sha512-zAAopbNuYu++ijY1GV2ylCsQsi3B8QvfPHVqhGdDcbx/NK5lkqMnCGU53amAjccSpk+LfeONxwzUhDzArSfZJg==", - "dev": true, - "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/typescript-estree": { - "version": "6.4.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.4.1.tgz", - "integrity": "sha512-xF6Y7SatVE/OyV93h1xGgfOkHr2iXuo8ip0gbfzaKeGGuKiAnzS+HtVhSPx8Www243bwlW8IF7X0/B62SzFftg==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "6.4.1", - "@typescript-eslint/visitor-keys": "6.4.1", - "debug": "^4.3.4", - "globby": "^11.1.0", - "is-glob": "^4.0.3", - "semver": "^7.5.4", - "ts-api-utils": "^1.0.1" - }, - "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/utils": { - "version": "6.4.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.4.1.tgz", - "integrity": "sha512-F/6r2RieNeorU0zhqZNv89s9bDZSovv3bZQpUNOmmQK1L80/cV4KEu95YUJWi75u5PhboFoKUJBnZ4FQcoqhDw==", - "dev": true, - "dependencies": { - "@eslint-community/eslint-utils": "^4.4.0", - "@types/json-schema": "^7.0.12", - "@types/semver": "^7.5.0", - "@typescript-eslint/scope-manager": "6.4.1", - "@typescript-eslint/types": "6.4.1", - "@typescript-eslint/typescript-estree": "6.4.1", - "semver": "^7.5.4" - }, - "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^7.0.0 || ^8.0.0" - } - }, - "node_modules/@typescript-eslint/visitor-keys": { - "version": "6.4.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.4.1.tgz", - "integrity": "sha512-y/TyRJsbZPkJIZQXrHfdnxVnxyKegnpEvnRGNam7s3TRR2ykGefEWOhaef00/UUN3IZxizS7BTO3svd3lCOJRQ==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "6.4.1", - "eslint-visitor-keys": "^3.4.1" - }, - "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@vitejs/plugin-react": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.0.4.tgz", - "integrity": "sha512-7wU921ABnNYkETiMaZy7XqpueMnpu5VxvVps13MjmCo+utBdD79sZzrApHawHtVX66cCJQQTXFcjH0y9dSUK8g==", - "dev": true, - "dependencies": { - "@babel/core": "^7.22.9", - "@babel/plugin-transform-react-jsx-self": "^7.22.5", - "@babel/plugin-transform-react-jsx-source": "^7.22.5", - "react-refresh": "^0.14.0" - }, - "engines": { - "node": "^14.18.0 || >=16.0.0" - }, - "peerDependencies": { - "vite": "^4.2.0" - } - }, - "node_modules/@vue/compiler-core": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.3.4.tgz", - "integrity": "sha512-cquyDNvZ6jTbf/+x+AgM2Arrp6G4Dzbb0R64jiG804HRMfRiFXWI6kqUVqZ6ZR0bQhIoQjB4+2bhNtVwndW15g==", - "dev": true, - "dependencies": { - "@babel/parser": "^7.21.3", - "@vue/shared": "3.3.4", - "estree-walker": "^2.0.2", - "source-map-js": "^1.0.2" - } - }, - "node_modules/@vue/compiler-dom": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.3.4.tgz", - "integrity": "sha512-wyM+OjOVpuUukIq6p5+nwHYtj9cFroz9cwkfmP9O1nzH68BenTTv0u7/ndggT8cIQlnBeOo6sUT/gvHcIkLA5w==", - "dev": true, - "dependencies": { - "@vue/compiler-core": "3.3.4", - "@vue/shared": "3.3.4" - } - }, - "node_modules/@vue/shared": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.4.tgz", - "integrity": "sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==", - "dev": true - }, - "node_modules/acorn": { - "version": "8.10.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz", - "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==", - "dev": true, - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/acorn-jsx": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", - "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "dev": true, - "peerDependencies": { - "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" - } - }, - "node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "dependencies": { - "color-convert": "^1.9.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/any-promise": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", - "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==", - "dev": true - }, - "node_modules/anymatch": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", - "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", - "dev": true, - "dependencies": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/arg": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz", - "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==", - "dev": true - }, - "node_modules/argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true - }, - "node_modules/array-buffer-byte-length": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz", - "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "is-array-buffer": "^3.0.1" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/array-includes": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz", - "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", - "get-intrinsic": "^1.1.3", - "is-string": "^1.0.7" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/array-union": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", - "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/array.prototype.findlastindex": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.2.tgz", - "integrity": "sha512-tb5thFFlUcp7NdNF6/MpDk/1r/4awWG1FIz3YqDf+/zJSTezBb+/5WViH41obXULHVpDzoiCLpJ/ZO9YbJMsdw==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", - "es-shim-unscopables": "^1.0.0", - "get-intrinsic": "^1.1.3" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/array.prototype.flat": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz", - "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", - "es-shim-unscopables": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/array.prototype.flatmap": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz", - "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", - "es-shim-unscopables": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/array.prototype.tosorted": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz", - "integrity": "sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", - "es-shim-unscopables": "^1.0.0", - "get-intrinsic": "^1.1.3" - } - }, - "node_modules/arraybuffer.prototype.slice": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz", - "integrity": "sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==", - "dev": true, - "dependencies": { - "array-buffer-byte-length": "^1.0.0", - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "get-intrinsic": "^1.2.1", - "is-array-buffer": "^3.0.2", - "is-shared-array-buffer": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/async": { - "version": "2.6.4", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz", - "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==", - "dev": true, - "dependencies": { - "lodash": "^4.17.14" - } - }, - "node_modules/asynciterator.prototype": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/asynciterator.prototype/-/asynciterator.prototype-1.0.0.tgz", - "integrity": "sha512-wwHYEIS0Q80f5mosx3L/dfG5t5rjEa9Ft51GTaNt862EnpyGHpgz2RkZvLPp1oF5TnAiTohkEKVEu8pQPJI7Vg==", - "dev": true, - "dependencies": { - "has-symbols": "^1.0.3" - } - }, - "node_modules/asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" - }, - "node_modules/autoprefixer": { - "version": "10.4.15", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.15.tgz", - "integrity": "sha512-KCuPB8ZCIqFdA4HwKXsvz7j6gvSDNhDP7WnUjBleRkKjPdvCmHFuQ77ocavI8FT6NdvlBnE2UFr2H4Mycn8Vew==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/autoprefixer" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "dependencies": { - "browserslist": "^4.21.10", - "caniuse-lite": "^1.0.30001520", - "fraction.js": "^4.2.0", - "normalize-range": "^0.1.2", - "picocolors": "^1.0.0", - "postcss-value-parser": "^4.2.0" - }, - "bin": { - "autoprefixer": "bin/autoprefixer" - }, - "engines": { - "node": "^10 || ^12 || >=14" - }, - "peerDependencies": { - "postcss": "^8.1.0" - } - }, - "node_modules/available-typed-arrays": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", - "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==", - "dev": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/axios": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.4.0.tgz", - "integrity": "sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==", - "dependencies": { - "follow-redirects": "^1.15.0", - "form-data": "^4.0.0", - "proxy-from-env": "^1.1.0" - } - }, - "node_modules/balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true - }, - "node_modules/binary-extensions": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", - "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "dev": true, - "dependencies": { - "fill-range": "^7.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/browserslist": { - "version": "4.21.10", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz", - "integrity": "sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/browserslist" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "dependencies": { - "caniuse-lite": "^1.0.30001517", - "electron-to-chromium": "^1.4.477", - "node-releases": "^2.0.13", - "update-browserslist-db": "^1.0.11" - }, - "bin": { - "browserslist": "cli.js" - }, - "engines": { - "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" - } - }, - "node_modules/builtin-modules": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz", - "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==", - "dev": true, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", - "dev": true, - "dependencies": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/camelcase-css": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz", - "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==", - "dev": true, - "engines": { - "node": ">= 6" - } - }, - "node_modules/caniuse-lite": { - "version": "1.0.30001522", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001522.tgz", - "integrity": "sha512-TKiyTVZxJGhsTszLuzb+6vUZSjVOAhClszBr2Ta2k9IwtNBT/4dzmL6aywt0HCgEZlmwJzXJd8yNiob6HgwTRg==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/caniuse-lite" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ] - }, - "node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/chokidar": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", - "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://paulmillr.com/funding/" - } - ], - "dependencies": { - "anymatch": "~3.1.2", - "braces": "~3.0.2", - "glob-parent": "~5.1.2", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.6.0" - }, - "engines": { - "node": ">= 8.10.0" - }, - "optionalDependencies": { - "fsevents": "~2.3.2" - } - }, - "node_modules/chokidar/node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "dependencies": { - "is-glob": "^4.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/ci-info": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz", - "integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/sibiraj-s" - } - ], - "engines": { - "node": ">=8" - } - }, - "node_modules/clean-regexp": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/clean-regexp/-/clean-regexp-1.0.0.tgz", - "integrity": "sha512-GfisEZEJvzKrmGWkvfhgzcz/BllN1USeqD2V6tg14OAOgaCD2Z/PUEuxnAZ/nPvmaHRG7a8y77p1T/IRQ4D1Hw==", - "dev": true, - "dependencies": { - "escape-string-regexp": "^1.0.5" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/client-only": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/client-only/-/client-only-0.0.1.tgz", - "integrity": "sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==", - "dev": true - }, - "node_modules/code-inspector-core": { - "version": "0.1.9", - "resolved": "https://registry.npmjs.org/code-inspector-core/-/code-inspector-core-0.1.9.tgz", - "integrity": "sha512-A00SydCM8zgPWfoM140hbcOjTFzciuGKYMsd7sl1evy+M+ZH2/k6n90vGHHTCdOfVmlaaHcXU+aaPnsADb17Aw==", - "dev": true, - "dependencies": { - "@vue/compiler-dom": "^3.2.47", - "chalk": "^4.1.1", - "portfinder": "^1.0.28" - } - }, - "node_modules/code-inspector-core/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/code-inspector-core/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/code-inspector-core/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/code-inspector-core/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/code-inspector-core/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/code-inspector-core/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/code-inspector-plugin": { - "version": "0.1.9", - "resolved": "https://registry.npmjs.org/code-inspector-plugin/-/code-inspector-plugin-0.1.9.tgz", - "integrity": "sha512-/OyEt9e+DmxuyHI3dMzkOgcbFT6CIi8PgwK7QIlIQKMU/P9QvDehHUKpZU1Yjd/AAymcni7RikRVQNGU3+kwtg==", - "dev": true, - "dependencies": { - "chalk": "4.1.1", - "code-inspector-core": "0.1.9", - "vite-code-inspector-plugin": "0.1.9", - "webpack-code-inspector-plugin": "0.1.9" - } - }, - "node_modules/code-inspector-plugin/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/code-inspector-plugin/node_modules/chalk": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz", - "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/code-inspector-plugin/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/code-inspector-plugin/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/code-inspector-plugin/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/code-inspector-plugin/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true - }, - "node_modules/combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dependencies": { - "delayed-stream": "~1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/commander": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz", - "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==", - "dev": true, - "engines": { - "node": ">= 6" - } - }, - "node_modules/concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true - }, - "node_modules/convert-source-map": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", - "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", - "dev": true - }, - "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "dev": true, - "dependencies": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/cssesc": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", - "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", - "dev": true, - "bin": { - "cssesc": "bin/cssesc" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/csstype": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz", - "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==", - "dev": true - }, - "node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/deep-is": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", - "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", - "dev": true - }, - "node_modules/define-properties": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz", - "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==", - "dev": true, - "dependencies": { - "has-property-descriptors": "^1.0.0", - "object-keys": "^1.1.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/didyoumean": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz", - "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==", - "dev": true - }, - "node_modules/dir-glob": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", - "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", - "dev": true, - "dependencies": { - "path-type": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/dlv": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz", - "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==", - "dev": true - }, - "node_modules/doctrine": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", - "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", - "dev": true, - "dependencies": { - "esutils": "^2.0.2" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/electron-to-chromium": { - "version": "1.4.498", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.498.tgz", - "integrity": "sha512-4LODxAzKGVy7CJyhhN5mebwe7U2L29P+0G+HUriHnabm0d7LSff8Yn7t+Wq+2/9ze2Fu1dhX7mww090xfv7qXQ==", - "dev": true - }, - "node_modules/error-ex": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", - "dev": true, - "dependencies": { - "is-arrayish": "^0.2.1" - } - }, - "node_modules/es-abstract": { - "version": "1.22.1", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.1.tgz", - "integrity": "sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==", - "dev": true, - "dependencies": { - "array-buffer-byte-length": "^1.0.0", - "arraybuffer.prototype.slice": "^1.0.1", - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", - "es-set-tostringtag": "^2.0.1", - "es-to-primitive": "^1.2.1", - "function.prototype.name": "^1.1.5", - "get-intrinsic": "^1.2.1", - "get-symbol-description": "^1.0.0", - "globalthis": "^1.0.3", - "gopd": "^1.0.1", - "has": "^1.0.3", - "has-property-descriptors": "^1.0.0", - "has-proto": "^1.0.1", - "has-symbols": "^1.0.3", - "internal-slot": "^1.0.5", - "is-array-buffer": "^3.0.2", - "is-callable": "^1.2.7", - "is-negative-zero": "^2.0.2", - "is-regex": "^1.1.4", - "is-shared-array-buffer": "^1.0.2", - "is-string": "^1.0.7", - "is-typed-array": "^1.1.10", - "is-weakref": "^1.0.2", - "object-inspect": "^1.12.3", - "object-keys": "^1.1.1", - "object.assign": "^4.1.4", - "regexp.prototype.flags": "^1.5.0", - "safe-array-concat": "^1.0.0", - "safe-regex-test": "^1.0.0", - "string.prototype.trim": "^1.2.7", - "string.prototype.trimend": "^1.0.6", - "string.prototype.trimstart": "^1.0.6", - "typed-array-buffer": "^1.0.0", - "typed-array-byte-length": "^1.0.0", - "typed-array-byte-offset": "^1.0.0", - "typed-array-length": "^1.0.4", - "unbox-primitive": "^1.0.2", - "which-typed-array": "^1.1.10" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/es-iterator-helpers": { - "version": "1.0.13", - "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.13.tgz", - "integrity": "sha512-LK3VGwzvaPWobO8xzXXGRUOGw8Dcjyfk62CsY/wfHN75CwsJPbuypOYJxK6g5RyEL8YDjIWcl6jgd8foO6mmrA==", - "dev": true, - "dependencies": { - "asynciterator.prototype": "^1.0.0", - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.21.3", - "es-set-tostringtag": "^2.0.1", - "function-bind": "^1.1.1", - "get-intrinsic": "^1.2.1", - "globalthis": "^1.0.3", - "has-property-descriptors": "^1.0.0", - "has-proto": "^1.0.1", - "has-symbols": "^1.0.3", - "internal-slot": "^1.0.5", - "iterator.prototype": "^1.1.0", - "safe-array-concat": "^1.0.0" - } - }, - "node_modules/es-set-tostringtag": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz", - "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==", - "dev": true, - "dependencies": { - "get-intrinsic": "^1.1.3", - "has": "^1.0.3", - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/es-shim-unscopables": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz", - "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==", - "dev": true, - "dependencies": { - "has": "^1.0.3" - } - }, - "node_modules/es-to-primitive": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", - "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", - "dev": true, - "dependencies": { - "is-callable": "^1.1.4", - "is-date-object": "^1.0.1", - "is-symbol": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/esbuild": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz", - "integrity": "sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==", - "dev": true, - "hasInstallScript": true, - "bin": { - "esbuild": "bin/esbuild" - }, - "engines": { - "node": ">=12" - }, - "optionalDependencies": { - "@esbuild/android-arm": "0.18.20", - "@esbuild/android-arm64": "0.18.20", - "@esbuild/android-x64": "0.18.20", - "@esbuild/darwin-arm64": "0.18.20", - "@esbuild/darwin-x64": "0.18.20", - "@esbuild/freebsd-arm64": "0.18.20", - "@esbuild/freebsd-x64": "0.18.20", - "@esbuild/linux-arm": "0.18.20", - "@esbuild/linux-arm64": "0.18.20", - "@esbuild/linux-ia32": "0.18.20", - "@esbuild/linux-loong64": "0.18.20", - "@esbuild/linux-mips64el": "0.18.20", - "@esbuild/linux-ppc64": "0.18.20", - "@esbuild/linux-riscv64": "0.18.20", - "@esbuild/linux-s390x": "0.18.20", - "@esbuild/linux-x64": "0.18.20", - "@esbuild/netbsd-x64": "0.18.20", - "@esbuild/openbsd-x64": "0.18.20", - "@esbuild/sunos-x64": "0.18.20", - "@esbuild/win32-arm64": "0.18.20", - "@esbuild/win32-ia32": "0.18.20", - "@esbuild/win32-x64": "0.18.20" - } - }, - "node_modules/escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "dev": true, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/eslint": { - "version": "8.47.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.47.0.tgz", - "integrity": "sha512-spUQWrdPt+pRVP1TTJLmfRNJJHHZryFmptzcafwSvHsceV81djHOdnEeDmkdotZyLNjDhrOasNK8nikkoG1O8Q==", - "dev": true, - "dependencies": { - "@eslint-community/eslint-utils": "^4.2.0", - "@eslint-community/regexpp": "^4.6.1", - "@eslint/eslintrc": "^2.1.2", - "@eslint/js": "^8.47.0", - "@humanwhocodes/config-array": "^0.11.10", - "@humanwhocodes/module-importer": "^1.0.1", - "@nodelib/fs.walk": "^1.2.8", - "ajv": "^6.12.4", - "chalk": "^4.0.0", - "cross-spawn": "^7.0.2", - "debug": "^4.3.2", - "doctrine": "^3.0.0", - "escape-string-regexp": "^4.0.0", - "eslint-scope": "^7.2.2", - "eslint-visitor-keys": "^3.4.3", - "espree": "^9.6.1", - "esquery": "^1.4.2", - "esutils": "^2.0.2", - "fast-deep-equal": "^3.1.3", - "file-entry-cache": "^6.0.1", - "find-up": "^5.0.0", - "glob-parent": "^6.0.2", - "globals": "^13.19.0", - "graphemer": "^1.4.0", - "ignore": "^5.2.0", - "imurmurhash": "^0.1.4", - "is-glob": "^4.0.0", - "is-path-inside": "^3.0.3", - "js-yaml": "^4.1.0", - "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.4.1", - "lodash.merge": "^4.6.2", - "minimatch": "^3.1.2", - "natural-compare": "^1.4.0", - "optionator": "^0.9.3", - "strip-ansi": "^6.0.1", - "text-table": "^0.2.0" - }, - "bin": { - "eslint": "bin/eslint.js" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/eslint-import-resolver-node": { - "version": "0.3.9", - "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz", - "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==", - "dev": true, - "dependencies": { - "debug": "^3.2.7", - "is-core-module": "^2.13.0", - "resolve": "^1.22.4" - } - }, - "node_modules/eslint-import-resolver-node/node_modules/debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "dependencies": { - "ms": "^2.1.1" - } - }, - "node_modules/eslint-module-utils": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz", - "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==", - "dev": true, - "dependencies": { - "debug": "^3.2.7" - }, - "engines": { - "node": ">=4" - }, - "peerDependenciesMeta": { - "eslint": { - "optional": true - } - } - }, - "node_modules/eslint-module-utils/node_modules/debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "dependencies": { - "ms": "^2.1.1" - } - }, - "node_modules/eslint-plugin-import": { - "version": "2.28.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.28.1.tgz", - "integrity": "sha512-9I9hFlITvOV55alzoKBI+K9q74kv0iKMeY6av5+umsNwayt59fz692daGyjR+oStBQgx6nwR9rXldDev3Clw+A==", - "dev": true, - "dependencies": { - "array-includes": "^3.1.6", - "array.prototype.findlastindex": "^1.2.2", - "array.prototype.flat": "^1.3.1", - "array.prototype.flatmap": "^1.3.1", - "debug": "^3.2.7", - "doctrine": "^2.1.0", - "eslint-import-resolver-node": "^0.3.7", - "eslint-module-utils": "^2.8.0", - "has": "^1.0.3", - "is-core-module": "^2.13.0", - "is-glob": "^4.0.3", - "minimatch": "^3.1.2", - "object.fromentries": "^2.0.6", - "object.groupby": "^1.0.0", - "object.values": "^1.1.6", - "semver": "^6.3.1", - "tsconfig-paths": "^3.14.2" - }, - "engines": { - "node": ">=4" - }, - "peerDependencies": { - "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8" - } - }, - "node_modules/eslint-plugin-import/node_modules/debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "dependencies": { - "ms": "^2.1.1" - } - }, - "node_modules/eslint-plugin-import/node_modules/doctrine": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", - "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", - "dev": true, - "dependencies": { - "esutils": "^2.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/eslint-plugin-import/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - } - }, - "node_modules/eslint-plugin-react": { - "version": "7.33.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.33.2.tgz", - "integrity": "sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw==", - "dev": true, - "dependencies": { - "array-includes": "^3.1.6", - "array.prototype.flatmap": "^1.3.1", - "array.prototype.tosorted": "^1.1.1", - "doctrine": "^2.1.0", - "es-iterator-helpers": "^1.0.12", - "estraverse": "^5.3.0", - "jsx-ast-utils": "^2.4.1 || ^3.0.0", - "minimatch": "^3.1.2", - "object.entries": "^1.1.6", - "object.fromentries": "^2.0.6", - "object.hasown": "^1.1.2", - "object.values": "^1.1.6", - "prop-types": "^15.8.1", - "resolve": "^2.0.0-next.4", - "semver": "^6.3.1", - "string.prototype.matchall": "^4.0.8" - }, - "engines": { - "node": ">=4" - }, - "peerDependencies": { - "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8" - } - }, - "node_modules/eslint-plugin-react-hooks": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz", - "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==", - "dev": true, - "engines": { - "node": ">=10" - }, - "peerDependencies": { - "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0" - } - }, - "node_modules/eslint-plugin-react-refresh": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.3.tgz", - "integrity": "sha512-Hh0wv8bUNY877+sI0BlCUlsS0TYYQqvzEwJsJJPM2WF4RnTStSnSR3zdJYa2nPOJgg3UghXi54lVyMSmpCalzA==", - "dev": true, - "peerDependencies": { - "eslint": ">=7" - } - }, - "node_modules/eslint-plugin-react/node_modules/doctrine": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", - "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", - "dev": true, - "dependencies": { - "esutils": "^2.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/eslint-plugin-react/node_modules/resolve": { - "version": "2.0.0-next.4", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.4.tgz", - "integrity": "sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==", - "dev": true, - "dependencies": { - "is-core-module": "^2.9.0", - "path-parse": "^1.0.7", - "supports-preserve-symlinks-flag": "^1.0.0" - }, - "bin": { - "resolve": "bin/resolve" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/eslint-plugin-react/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - } - }, - "node_modules/eslint-plugin-unicorn": { - "version": "48.0.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-48.0.1.tgz", - "integrity": "sha512-FW+4r20myG/DqFcCSzoumaddKBicIPeFnTrifon2mWIzlfyvzwyqZjqVP7m4Cqr/ZYisS2aiLghkUWaPg6vtCw==", - "dev": true, - "dependencies": { - "@babel/helper-validator-identifier": "^7.22.5", - "@eslint-community/eslint-utils": "^4.4.0", - "ci-info": "^3.8.0", - "clean-regexp": "^1.0.0", - "esquery": "^1.5.0", - "indent-string": "^4.0.0", - "is-builtin-module": "^3.2.1", - "jsesc": "^3.0.2", - "lodash": "^4.17.21", - "pluralize": "^8.0.0", - "read-pkg-up": "^7.0.1", - "regexp-tree": "^0.1.27", - "regjsparser": "^0.10.0", - "semver": "^7.5.4", - "strip-indent": "^3.0.0" - }, - "engines": { - "node": ">=16" - }, - "funding": { - "url": "https://github.com/sindresorhus/eslint-plugin-unicorn?sponsor=1" - }, - "peerDependencies": { - "eslint": ">=8.44.0" - } - }, - "node_modules/eslint-plugin-unicorn/node_modules/jsesc": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz", - "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==", - "dev": true, - "bin": { - "jsesc": "bin/jsesc" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/eslint-scope": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", - "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", - "dev": true, - "dependencies": { - "esrecurse": "^4.3.0", - "estraverse": "^5.2.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/eslint-visitor-keys": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", - "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", - "dev": true, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/eslint/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/eslint/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/eslint/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/eslint/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/eslint/node_modules/escape-string-regexp": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/eslint/node_modules/globals": { - "version": "13.21.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.21.0.tgz", - "integrity": "sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==", - "dev": true, - "dependencies": { - "type-fest": "^0.20.2" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/eslint/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/eslint/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/eslint/node_modules/type-fest": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/espree": { - "version": "9.6.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", - "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", - "dev": true, - "dependencies": { - "acorn": "^8.9.0", - "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^3.4.1" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/esquery": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", - "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==", - "dev": true, - "dependencies": { - "estraverse": "^5.1.0" - }, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/esrecurse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", - "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", - "dev": true, - "dependencies": { - "estraverse": "^5.2.0" - }, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/estree-walker": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz", - "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==", - "dev": true - }, - "node_modules/esutils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/fast-deep-equal": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true - }, - "node_modules/fast-glob": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz", - "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==", - "dev": true, - "dependencies": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.4" - }, - "engines": { - "node": ">=8.6.0" - } - }, - "node_modules/fast-glob/node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "dependencies": { - "is-glob": "^4.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/fast-json-stable-stringify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true - }, - "node_modules/fast-levenshtein": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", - "dev": true - }, - "node_modules/fastq": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz", - "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==", - "dev": true, - "dependencies": { - "reusify": "^1.0.4" - } - }, - "node_modules/file-entry-cache": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", - "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", - "dev": true, - "dependencies": { - "flat-cache": "^3.0.4" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - } - }, - "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "dev": true, - "dependencies": { - "to-regex-range": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/find-up": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", - "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", - "dev": true, - "dependencies": { - "locate-path": "^6.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/flat-cache": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", - "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==", - "dev": true, - "dependencies": { - "flatted": "^3.1.0", - "rimraf": "^3.0.2" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - } - }, - "node_modules/flatted": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz", - "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==", - "dev": true - }, - "node_modules/follow-redirects": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", - "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", - "funding": [ - { - "type": "individual", - "url": "https://github.com/sponsors/RubenVerborgh" - } - ], - "engines": { - "node": ">=4.0" - }, - "peerDependenciesMeta": { - "debug": { - "optional": true - } - } - }, - "node_modules/for-each": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", - "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", - "dev": true, - "dependencies": { - "is-callable": "^1.1.3" - } - }, - "node_modules/form-data": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", - "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", - "dependencies": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "mime-types": "^2.1.12" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/fraction.js": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.1.tgz", - "integrity": "sha512-/KxoyCnPM0GwYI4NN0Iag38Tqt+od3/mLuguepLgCAKPn0ZhC544nssAW0tG2/00zXEYl9W+7hwAIpLHo6Oc7Q==", - "dev": true, - "engines": { - "node": "*" - }, - "funding": { - "type": "patreon", - "url": "https://www.patreon.com/infusion" - } - }, - "node_modules/fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "dev": true - }, - "node_modules/fsevents": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", - "dev": true, - "hasInstallScript": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, - "node_modules/function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true - }, - "node_modules/function.prototype.name": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz", - "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "es-abstract": "^1.19.0", - "functions-have-names": "^1.2.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/functions-have-names": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", - "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", - "dev": true, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/gensync": { - "version": "1.0.0-beta.2", - "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", - "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", - "dev": true, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/get-intrinsic": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz", - "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==", - "dev": true, - "dependencies": { - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-proto": "^1.0.1", - "has-symbols": "^1.0.3" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/get-symbol-description": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz", - "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/glob-parent": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", - "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", - "dev": true, - "dependencies": { - "is-glob": "^4.0.3" - }, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/globals": { - "version": "11.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", - "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/globalthis": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz", - "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==", - "dev": true, - "dependencies": { - "define-properties": "^1.1.3" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/globby": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", - "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", - "dev": true, - "dependencies": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.9", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/gopd": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", - "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", - "dev": true, - "dependencies": { - "get-intrinsic": "^1.1.3" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/graphemer": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", - "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", - "dev": true - }, - "node_modules/has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, - "dependencies": { - "function-bind": "^1.1.1" - }, - "engines": { - "node": ">= 0.4.0" - } - }, - "node_modules/has-bigints": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", - "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==", - "dev": true, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/has-property-descriptors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", - "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", - "dev": true, - "dependencies": { - "get-intrinsic": "^1.1.1" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", - "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", - "dev": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-symbols": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", - "dev": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-tostringtag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", - "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", - "dev": true, - "dependencies": { - "has-symbols": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/hosted-git-info": { - "version": "2.8.9", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", - "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", - "dev": true - }, - "node_modules/ignore": { - "version": "5.2.4", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", - "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==", - "dev": true, - "engines": { - "node": ">= 4" - } - }, - "node_modules/import-fresh": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", - "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", - "dev": true, - "dependencies": { - "parent-module": "^1.0.0", - "resolve-from": "^4.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/imurmurhash": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", - "dev": true, - "engines": { - "node": ">=0.8.19" - } - }, - "node_modules/indent-string": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", - "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "dev": true, - "dependencies": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "node_modules/inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true - }, - "node_modules/internal-slot": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz", - "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==", - "dev": true, - "dependencies": { - "get-intrinsic": "^1.2.0", - "has": "^1.0.3", - "side-channel": "^1.0.4" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/is-array-buffer": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz", - "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.2.0", - "is-typed-array": "^1.1.10" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", - "dev": true - }, - "node_modules/is-async-function": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.0.0.tgz", - "integrity": "sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==", - "dev": true, - "dependencies": { - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-bigint": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", - "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", - "dev": true, - "dependencies": { - "has-bigints": "^1.0.1" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-binary-path": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "dev": true, - "dependencies": { - "binary-extensions": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/is-boolean-object": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", - "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-builtin-module": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz", - "integrity": "sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==", - "dev": true, - "dependencies": { - "builtin-modules": "^3.3.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/is-callable": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", - "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", - "dev": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-core-module": { - "version": "2.13.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz", - "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==", - "dev": true, - "dependencies": { - "has": "^1.0.3" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-date-object": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", - "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", - "dev": true, - "dependencies": { - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-finalizationregistry": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz", - "integrity": "sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-generator-function": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz", - "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==", - "dev": true, - "dependencies": { - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-glob": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "dev": true, - "dependencies": { - "is-extglob": "^2.1.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-map": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz", - "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==", - "dev": true, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-negative-zero": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", - "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==", - "dev": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true, - "engines": { - "node": ">=0.12.0" - } - }, - "node_modules/is-number-object": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz", - "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==", - "dev": true, - "dependencies": { - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-path-inside": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", - "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/is-regex": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", - "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-set": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz", - "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==", - "dev": true, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-shared-array-buffer": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz", - "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-string": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", - "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", - "dev": true, - "dependencies": { - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-symbol": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", - "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", - "dev": true, - "dependencies": { - "has-symbols": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-typed-array": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz", - "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==", - "dev": true, - "dependencies": { - "which-typed-array": "^1.1.11" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-weakmap": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz", - "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==", - "dev": true, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-weakref": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", - "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-weakset": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz", - "integrity": "sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.1" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/isarray": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", - "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", - "dev": true - }, - "node_modules/isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", - "dev": true - }, - "node_modules/iterator.prototype": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.0.tgz", - "integrity": "sha512-rjuhAk1AJ1fssphHD0IFV6TWL40CwRZ53FrztKx43yk2v6rguBYsY4Bj1VU4HmoMmKwZUlx7mfnhDf9cOp4YTw==", - "dev": true, - "dependencies": { - "define-properties": "^1.1.4", - "get-intrinsic": "^1.1.3", - "has-symbols": "^1.0.3", - "has-tostringtag": "^1.0.0", - "reflect.getprototypeof": "^1.0.3" - } - }, - "node_modules/javascript-natural-sort": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz", - "integrity": "sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw==", - "dev": true - }, - "node_modules/jiti": { - "version": "1.19.3", - "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.19.3.tgz", - "integrity": "sha512-5eEbBDQT/jF1xg6l36P+mWGGoH9Spuy0PCdSr2dtWRDGC6ph/w9ZCL4lmESW8f8F7MwT3XKescfP0wnZWAKL9w==", - "dev": true, - "bin": { - "jiti": "bin/jiti.js" - } - }, - "node_modules/js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" - }, - "node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dev": true, - "dependencies": { - "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/jsesc": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", - "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", - "dev": true, - "bin": { - "jsesc": "bin/jsesc" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/json-parse-even-better-errors": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", - "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", - "dev": true - }, - "node_modules/json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - }, - "node_modules/json-stable-stringify-without-jsonify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", - "dev": true - }, - "node_modules/json5": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", - "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", - "dev": true, - "bin": { - "json5": "lib/cli.js" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/jsx-ast-utils": { - "version": "3.3.5", - "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz", - "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==", - "dev": true, - "dependencies": { - "array-includes": "^3.1.6", - "array.prototype.flat": "^1.3.1", - "object.assign": "^4.1.4", - "object.values": "^1.1.6" - }, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/levn": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", - "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", - "dev": true, - "dependencies": { - "prelude-ls": "^1.2.1", - "type-check": "~0.4.0" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/lilconfig": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz", - "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==", - "dev": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/lines-and-columns": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", - "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", - "dev": true - }, - "node_modules/locate-path": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", - "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", - "dev": true, - "dependencies": { - "p-locate": "^5.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true - }, - "node_modules/lodash.merge": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", - "dev": true - }, - "node_modules/loose-envify": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", - "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", - "dependencies": { - "js-tokens": "^3.0.0 || ^4.0.0" - }, - "bin": { - "loose-envify": "cli.js" - } - }, - "node_modules/lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", - "dev": true, - "dependencies": { - "yallist": "^3.0.2" - } - }, - "node_modules/merge2": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", - "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", - "dev": true, - "engines": { - "node": ">= 8" - } - }, - "node_modules/micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", - "dev": true, - "dependencies": { - "braces": "^3.0.2", - "picomatch": "^2.3.1" - }, - "engines": { - "node": ">=8.6" - } - }, - "node_modules/mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "dependencies": { - "mime-db": "1.52.0" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/min-indent": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz", - "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/mini-svg-data-uri": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/mini-svg-data-uri/-/mini-svg-data-uri-1.4.4.tgz", - "integrity": "sha512-r9deDe9p5FJUPZAk3A59wGH7Ii9YrjjWw0jmw/liSbHl2CHiyXj6FcDXDu2K3TjVAXqiJdaw3xxwlZZr9E6nHg==", - "dev": true, - "bin": { - "mini-svg-data-uri": "cli.js" - } - }, - "node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/minimist": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", - "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", - "dev": true, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/mkdirp": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", - "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", - "dev": true, - "dependencies": { - "minimist": "^1.2.6" - }, - "bin": { - "mkdirp": "bin/cmd.js" - } - }, - "node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, - "node_modules/mz": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz", - "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==", - "dev": true, - "dependencies": { - "any-promise": "^1.0.0", - "object-assign": "^4.0.1", - "thenify-all": "^1.0.0" - } - }, - "node_modules/nanoid": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz", - "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "bin": { - "nanoid": "bin/nanoid.cjs" - }, - "engines": { - "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" - } - }, - "node_modules/natural-compare": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", - "dev": true - }, - "node_modules/node-releases": { - "version": "2.0.13", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz", - "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==", - "dev": true - }, - "node_modules/normalize-package-data": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", - "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", - "dev": true, - "dependencies": { - "hosted-git-info": "^2.1.4", - "resolve": "^1.10.0", - "semver": "2 || 3 || 4 || 5", - "validate-npm-package-license": "^3.0.1" - } - }, - "node_modules/normalize-package-data/node_modules/semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", - "dev": true, - "bin": { - "semver": "bin/semver" - } - }, - "node_modules/normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/normalize-range": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz", - "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/object-hash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz", - "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==", - "dev": true, - "engines": { - "node": ">= 6" - } - }, - "node_modules/object-inspect": { - "version": "1.12.3", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", - "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", - "dev": true, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/object-keys": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", - "dev": true, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/object.assign": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz", - "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "has-symbols": "^1.0.3", - "object-keys": "^1.1.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/object.entries": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz", - "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/object.fromentries": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz", - "integrity": "sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/object.groupby": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.0.tgz", - "integrity": "sha512-70MWG6NfRH9GnbZOikuhPPYzpUpof9iW2J9E4dW7FXTqPNb6rllE6u39SKwwiNh8lCwX3DDb5OgcKGiEBrTTyw==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.21.2", - "get-intrinsic": "^1.2.1" - } - }, - "node_modules/object.hasown": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.2.tgz", - "integrity": "sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw==", - "dev": true, - "dependencies": { - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/object.values": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz", - "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "dev": true, - "dependencies": { - "wrappy": "1" - } - }, - "node_modules/optionator": { - "version": "0.9.3", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", - "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==", - "dev": true, - "dependencies": { - "@aashutoshrathi/word-wrap": "^1.2.3", - "deep-is": "^0.1.3", - "fast-levenshtein": "^2.0.6", - "levn": "^0.4.1", - "prelude-ls": "^1.2.1", - "type-check": "^0.4.0" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, - "dependencies": { - "yocto-queue": "^0.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/p-locate": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", - "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", - "dev": true, - "dependencies": { - "p-limit": "^3.0.2" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/parent-module": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", - "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", - "dev": true, - "dependencies": { - "callsites": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/parse-json": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", - "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.0.0", - "error-ex": "^1.3.1", - "json-parse-even-better-errors": "^2.3.0", - "lines-and-columns": "^1.1.6" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/path-parse": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", - "dev": true - }, - "node_modules/path-type": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/picocolors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", - "dev": true - }, - "node_modules/picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "dev": true, - "engines": { - "node": ">=8.6" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" - } - }, - "node_modules/pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/pirates": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz", - "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==", - "dev": true, - "engines": { - "node": ">= 6" - } - }, - "node_modules/pluralize": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-8.0.0.tgz", - "integrity": "sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/portfinder": { - "version": "1.0.32", - "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.32.tgz", - "integrity": "sha512-on2ZJVVDXRADWE6jnQaX0ioEylzgBpQk8r55NE4wjXW1ZxO+BgDlY6DXwj20i0V8eB4SenDQ00WEaxfiIQPcxg==", - "dev": true, - "dependencies": { - "async": "^2.6.4", - "debug": "^3.2.7", - "mkdirp": "^0.5.6" - }, - "engines": { - "node": ">= 0.12.0" - } - }, - "node_modules/portfinder/node_modules/debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "dependencies": { - "ms": "^2.1.1" - } - }, - "node_modules/postcss": { - "version": "8.4.28", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.28.tgz", - "integrity": "sha512-Z7V5j0cq8oEKyejIKfpD8b4eBy9cwW2JWPk0+fB1HOAMsfHbnAXLLS+PfVWlzMSLQaWttKDt607I0XHmpE67Vw==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/postcss" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "dependencies": { - "nanoid": "^3.3.6", - "picocolors": "^1.0.0", - "source-map-js": "^1.0.2" - }, - "engines": { - "node": "^10 || ^12 || >=14" - } - }, - "node_modules/postcss-import": { - "version": "15.1.0", - "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-15.1.0.tgz", - "integrity": "sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==", - "dev": true, - "dependencies": { - "postcss-value-parser": "^4.0.0", - "read-cache": "^1.0.0", - "resolve": "^1.1.7" - }, - "engines": { - "node": ">=14.0.0" - }, - "peerDependencies": { - "postcss": "^8.0.0" - } - }, - "node_modules/postcss-js": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.1.tgz", - "integrity": "sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==", - "dev": true, - "dependencies": { - "camelcase-css": "^2.0.1" - }, - "engines": { - "node": "^12 || ^14 || >= 16" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - }, - "peerDependencies": { - "postcss": "^8.4.21" - } - }, - "node_modules/postcss-load-config": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-4.0.1.tgz", - "integrity": "sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA==", - "dev": true, - "dependencies": { - "lilconfig": "^2.0.5", - "yaml": "^2.1.1" - }, - "engines": { - "node": ">= 14" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - }, - "peerDependencies": { - "postcss": ">=8.0.9", - "ts-node": ">=9.0.0" - }, - "peerDependenciesMeta": { - "postcss": { - "optional": true - }, - "ts-node": { - "optional": true - } - } - }, - "node_modules/postcss-nested": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.0.1.tgz", - "integrity": "sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ==", - "dev": true, - "dependencies": { - "postcss-selector-parser": "^6.0.11" - }, - "engines": { - "node": ">=12.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - }, - "peerDependencies": { - "postcss": "^8.2.14" - } - }, - "node_modules/postcss-selector-parser": { - "version": "6.0.13", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz", - "integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==", - "dev": true, - "dependencies": { - "cssesc": "^3.0.0", - "util-deprecate": "^1.0.2" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/postcss-value-parser": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", - "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==", - "dev": true - }, - "node_modules/prelude-ls": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", - "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", - "dev": true, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/prettier": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.2.tgz", - "integrity": "sha512-o2YR9qtniXvwEZlOKbveKfDQVyqxbEIWn48Z8m3ZJjBjcCmUy3xZGIv+7AkaeuaTr6yPXJjwv07ZWlsWbEy1rQ==", - "dev": true, - "bin": { - "prettier": "bin/prettier.cjs" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/prettier/prettier?sponsor=1" - } - }, - "node_modules/prop-types": { - "version": "15.8.1", - "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", - "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", - "dev": true, - "dependencies": { - "loose-envify": "^1.4.0", - "object-assign": "^4.1.1", - "react-is": "^16.13.1" - } - }, - "node_modules/proxy-from-env": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", - "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" - }, - "node_modules/punycode": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", - "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/queue-microtask": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", - "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] - }, - "node_modules/react": { - "version": "18.2.0", - "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz", - "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==", - "dependencies": { - "loose-envify": "^1.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/react-dom": { - "version": "18.2.0", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz", - "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==", - "dependencies": { - "loose-envify": "^1.1.0", - "scheduler": "^0.23.0" - }, - "peerDependencies": { - "react": "^18.2.0" - } - }, - "node_modules/react-is": { - "version": "16.13.1", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", - "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", - "dev": true - }, - "node_modules/react-refresh": { - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.0.tgz", - "integrity": "sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/react-router": { - "version": "6.15.0", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.15.0.tgz", - "integrity": "sha512-NIytlzvzLwJkCQj2HLefmeakxxWHWAP+02EGqWEZy+DgfHHKQMUoBBjUQLOtFInBMhWtb3hiUy6MfFgwLjXhqg==", - "dependencies": { - "@remix-run/router": "1.8.0" - }, - "engines": { - "node": ">=14.0.0" - }, - "peerDependencies": { - "react": ">=16.8" - } - }, - "node_modules/react-router-dom": { - "version": "6.15.0", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.15.0.tgz", - "integrity": "sha512-aR42t0fs7brintwBGAv2+mGlCtgtFQeOzK0BM1/OiqEzRejOZtpMZepvgkscpMUnKb8YO84G7s3LsHnnDNonbQ==", - "dependencies": { - "@remix-run/router": "1.8.0", - "react-router": "6.15.0" - }, - "engines": { - "node": ">=14.0.0" - }, - "peerDependencies": { - "react": ">=16.8", - "react-dom": ">=16.8" - } - }, - "node_modules/read-cache": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz", - "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==", - "dev": true, - "dependencies": { - "pify": "^2.3.0" - } - }, - "node_modules/read-pkg": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", - "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", - "dev": true, - "dependencies": { - "@types/normalize-package-data": "^2.4.0", - "normalize-package-data": "^2.5.0", - "parse-json": "^5.0.0", - "type-fest": "^0.6.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/read-pkg-up": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz", - "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==", - "dev": true, - "dependencies": { - "find-up": "^4.1.0", - "read-pkg": "^5.2.0", - "type-fest": "^0.8.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/read-pkg-up/node_modules/find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "dependencies": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/read-pkg-up/node_modules/locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "dependencies": { - "p-locate": "^4.1.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/read-pkg-up/node_modules/p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "dependencies": { - "p-try": "^2.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/read-pkg-up/node_modules/p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "dependencies": { - "p-limit": "^2.2.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/read-pkg/node_modules/type-fest": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", - "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/readdirp": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", - "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", - "dev": true, - "dependencies": { - "picomatch": "^2.2.1" - }, - "engines": { - "node": ">=8.10.0" - } - }, - "node_modules/reflect.getprototypeof": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.3.tgz", - "integrity": "sha512-TTAOZpkJ2YLxl7mVHWrNo3iDMEkYlva/kgFcXndqMgbo/AZUmmavEkdXV+hXtE4P8xdyEKRzalaFqZVuwIk/Nw==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", - "get-intrinsic": "^1.1.1", - "globalthis": "^1.0.3", - "which-builtin-type": "^1.1.3" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/regexp-tree": { - "version": "0.1.27", - "resolved": "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.27.tgz", - "integrity": "sha512-iETxpjK6YoRWJG5o6hXLwvjYAoW+FEZn9os0PD/b6AP6xQwsa/Y7lCVgIixBbUPMfhu+i2LtdeAqVTgGlQarfA==", - "dev": true, - "bin": { - "regexp-tree": "bin/regexp-tree" - } - }, - "node_modules/regexp.prototype.flags": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz", - "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "functions-have-names": "^1.2.3" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/regjsparser": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.10.0.tgz", - "integrity": "sha512-qx+xQGZVsy55CH0a1hiVwHmqjLryfh7wQyF5HO07XJ9f7dQMY/gPQHhlyDkIzJKC+x2fUCpCcUODUUUFrm7SHA==", - "dev": true, - "dependencies": { - "jsesc": "~0.5.0" - }, - "bin": { - "regjsparser": "bin/parser" - } - }, - "node_modules/regjsparser/node_modules/jsesc": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", - "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==", - "dev": true, - "bin": { - "jsesc": "bin/jsesc" - } - }, - "node_modules/resolve": { - "version": "1.22.4", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz", - "integrity": "sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==", - "dev": true, - "dependencies": { - "is-core-module": "^2.13.0", - "path-parse": "^1.0.7", - "supports-preserve-symlinks-flag": "^1.0.0" - }, - "bin": { - "resolve": "bin/resolve" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/reusify": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", - "dev": true, - "engines": { - "iojs": ">=1.0.0", - "node": ">=0.10.0" - } - }, - "node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/rollup": { - "version": "3.28.1", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.28.1.tgz", - "integrity": "sha512-R9OMQmIHJm9znrU3m3cpE8uhN0fGdXiawME7aZIpQqvpS/85+Vt1Hq1/yVIcYfOmaQiHjvXkQAoJukvLpau6Yw==", - "dev": true, - "bin": { - "rollup": "dist/bin/rollup" - }, - "engines": { - "node": ">=14.18.0", - "npm": ">=8.0.0" - }, - "optionalDependencies": { - "fsevents": "~2.3.2" - } - }, - "node_modules/run-parallel": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", - "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "dependencies": { - "queue-microtask": "^1.2.2" - } - }, - "node_modules/safe-array-concat": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz", - "integrity": "sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.2.0", - "has-symbols": "^1.0.3", - "isarray": "^2.0.5" - }, - "engines": { - "node": ">=0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/safe-regex-test": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz", - "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.3", - "is-regex": "^1.1.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/scheduler": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz", - "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==", - "dependencies": { - "loose-envify": "^1.1.0" - } - }, - "node_modules/semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", - "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/semver/node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/semver/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - }, - "node_modules/shebang-command": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, - "dependencies": { - "shebang-regex": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/shebang-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/side-channel": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", - "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.0", - "get-intrinsic": "^1.0.2", - "object-inspect": "^1.9.0" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/source-map-js": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", - "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/spdx-correct": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz", - "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==", - "dev": true, - "dependencies": { - "spdx-expression-parse": "^3.0.0", - "spdx-license-ids": "^3.0.0" - } - }, - "node_modules/spdx-exceptions": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz", - "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==", - "dev": true - }, - "node_modules/spdx-expression-parse": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", - "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", - "dev": true, - "dependencies": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" - } - }, - "node_modules/spdx-license-ids": { - "version": "3.0.13", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz", - "integrity": "sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w==", - "dev": true - }, - "node_modules/string.prototype.matchall": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz", - "integrity": "sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", - "get-intrinsic": "^1.1.3", - "has-symbols": "^1.0.3", - "internal-slot": "^1.0.3", - "regexp.prototype.flags": "^1.4.3", - "side-channel": "^1.0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/string.prototype.trim": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz", - "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/string.prototype.trimend": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz", - "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/string.prototype.trimstart": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz", - "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/strip-indent": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz", - "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==", - "dev": true, - "dependencies": { - "min-indent": "^1.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/strip-json-comments": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", - "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", - "dev": true, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/sucrase": { - "version": "3.34.0", - "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.34.0.tgz", - "integrity": "sha512-70/LQEZ07TEcxiU2dz51FKaE6hCTWC6vr7FOk3Gr0U60C3shtAN+H+BFr9XlYe5xqf3RA8nrc+VIwzCfnxuXJw==", - "dev": true, - "dependencies": { - "@jridgewell/gen-mapping": "^0.3.2", - "commander": "^4.0.0", - "glob": "7.1.6", - "lines-and-columns": "^1.1.6", - "mz": "^2.7.0", - "pirates": "^4.0.1", - "ts-interface-checker": "^0.1.9" - }, - "bin": { - "sucrase": "bin/sucrase", - "sucrase-node": "bin/sucrase-node" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/sucrase/node_modules/glob": { - "version": "7.1.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", - "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/supports-preserve-symlinks-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", - "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", - "dev": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/tailwindcss": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.3.tgz", - "integrity": "sha512-A0KgSkef7eE4Mf+nKJ83i75TMyq8HqY3qmFIJSWy8bNt0v1lG7jUcpGpoTFxAwYcWOphcTBLPPJg+bDfhDf52w==", - "dev": true, - "dependencies": { - "@alloc/quick-lru": "^5.2.0", - "arg": "^5.0.2", - "chokidar": "^3.5.3", - "didyoumean": "^1.2.2", - "dlv": "^1.1.3", - "fast-glob": "^3.2.12", - "glob-parent": "^6.0.2", - "is-glob": "^4.0.3", - "jiti": "^1.18.2", - "lilconfig": "^2.1.0", - "micromatch": "^4.0.5", - "normalize-path": "^3.0.0", - "object-hash": "^3.0.0", - "picocolors": "^1.0.0", - "postcss": "^8.4.23", - "postcss-import": "^15.1.0", - "postcss-js": "^4.0.1", - "postcss-load-config": "^4.0.1", - "postcss-nested": "^6.0.1", - "postcss-selector-parser": "^6.0.11", - "resolve": "^1.22.2", - "sucrase": "^3.32.0" - }, - "bin": { - "tailwind": "lib/cli.js", - "tailwindcss": "lib/cli.js" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/text-table": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", - "dev": true - }, - "node_modules/thenify": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz", - "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==", - "dev": true, - "dependencies": { - "any-promise": "^1.0.0" - } - }, - "node_modules/thenify-all": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz", - "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==", - "dev": true, - "dependencies": { - "thenify": ">= 3.1.0 < 4" - }, - "engines": { - "node": ">=0.8" - } - }, - "node_modules/to-fast-properties": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, - "dependencies": { - "is-number": "^7.0.0" - }, - "engines": { - "node": ">=8.0" - } - }, - "node_modules/ts-api-utils": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.2.tgz", - "integrity": "sha512-Cbu4nIqnEdd+THNEsBdkolnOXhg0I8XteoHaEKgvsxpsbWda4IsUut2c187HxywQCvveojow0Dgw/amxtSKVkQ==", - "dev": true, - "engines": { - "node": ">=16.13.0" - }, - "peerDependencies": { - "typescript": ">=4.2.0" - } - }, - "node_modules/ts-interface-checker": { - "version": "0.1.13", - "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz", - "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==", - "dev": true - }, - "node_modules/tsconfig-paths": { - "version": "3.14.2", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz", - "integrity": "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==", - "dev": true, - "dependencies": { - "@types/json5": "^0.0.29", - "json5": "^1.0.2", - "minimist": "^1.2.6", - "strip-bom": "^3.0.0" - } - }, - "node_modules/tsconfig-paths/node_modules/json5": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", - "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", - "dev": true, - "dependencies": { - "minimist": "^1.2.0" - }, - "bin": { - "json5": "lib/cli.js" - } - }, - "node_modules/type-check": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", - "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", - "dev": true, - "dependencies": { - "prelude-ls": "^1.2.1" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/type-fest": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", - "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/typed-array-buffer": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz", - "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.2.1", - "is-typed-array": "^1.1.10" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/typed-array-byte-length": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz", - "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "for-each": "^0.3.3", - "has-proto": "^1.0.1", - "is-typed-array": "^1.1.10" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/typed-array-byte-offset": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz", - "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==", - "dev": true, - "dependencies": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", - "for-each": "^0.3.3", - "has-proto": "^1.0.1", - "is-typed-array": "^1.1.10" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/typed-array-length": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz", - "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "for-each": "^0.3.3", - "is-typed-array": "^1.1.9" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/typescript": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz", - "integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==", - "dev": true, - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=14.17" - } - }, - "node_modules/unbox-primitive": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", - "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "has-bigints": "^1.0.2", - "has-symbols": "^1.0.3", - "which-boxed-primitive": "^1.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/update-browserslist-db": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz", - "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/browserslist" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "dependencies": { - "escalade": "^3.1.1", - "picocolors": "^1.0.0" - }, - "bin": { - "update-browserslist-db": "cli.js" - }, - "peerDependencies": { - "browserslist": ">= 4.21.0" - } - }, - "node_modules/uri-js": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", - "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "dev": true, - "dependencies": { - "punycode": "^2.1.0" - } - }, - "node_modules/util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", - "dev": true - }, - "node_modules/validate-npm-package-license": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", - "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", - "dev": true, - "dependencies": { - "spdx-correct": "^3.0.0", - "spdx-expression-parse": "^3.0.0" - } - }, - "node_modules/vite": { - "version": "4.4.9", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.4.9.tgz", - "integrity": "sha512-2mbUn2LlUmNASWwSCNSJ/EG2HuSRTnVNaydp6vMCm5VIqJsjMfbIWtbH2kDuwUVW5mMUKKZvGPX/rqeqVvv1XA==", - "dev": true, - "dependencies": { - "esbuild": "^0.18.10", - "postcss": "^8.4.27", - "rollup": "^3.27.1" - }, - "bin": { - "vite": "bin/vite.js" - }, - "engines": { - "node": "^14.18.0 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/vitejs/vite?sponsor=1" - }, - "optionalDependencies": { - "fsevents": "~2.3.2" - }, - "peerDependencies": { - "@types/node": ">= 14", - "less": "*", - "lightningcss": "^1.21.0", - "sass": "*", - "stylus": "*", - "sugarss": "*", - "terser": "^5.4.0" - }, - "peerDependenciesMeta": { - "@types/node": { - "optional": true - }, - "less": { - "optional": true - }, - "lightningcss": { - "optional": true - }, - "sass": { - "optional": true - }, - "stylus": { - "optional": true - }, - "sugarss": { - "optional": true - }, - "terser": { - "optional": true - } - } - }, - "node_modules/vite-code-inspector-plugin": { - "version": "0.1.9", - "resolved": "https://registry.npmjs.org/vite-code-inspector-plugin/-/vite-code-inspector-plugin-0.1.9.tgz", - "integrity": "sha512-49ZLkFS2ajDCZ0eXTKK0BG4G2yLMtXHjQUZ5ebx889sZm0O3qJzjhtzTITjOi37xjYFASWuIptqL98qEgYXhoA==", - "dev": true, - "dependencies": { - "code-inspector-core": "0.1.9" - } - }, - "node_modules/webpack-code-inspector-plugin": { - "version": "0.1.9", - "resolved": "https://registry.npmjs.org/webpack-code-inspector-plugin/-/webpack-code-inspector-plugin-0.1.9.tgz", - "integrity": "sha512-w4/dvbCVeuhmmY2TnnHSjo7SWXfYicNdjdGU7CixZy8rxyXBSMCdlArSFgxJ/DWctLMWJ5whxIcMNm7twIPi6A==", - "dev": true, - "dependencies": { - "code-inspector-core": "0.1.9" - } - }, - "node_modules/which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/node-which" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/which-boxed-primitive": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", - "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", - "dev": true, - "dependencies": { - "is-bigint": "^1.0.1", - "is-boolean-object": "^1.1.0", - "is-number-object": "^1.0.4", - "is-string": "^1.0.5", - "is-symbol": "^1.0.3" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/which-builtin-type": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.1.3.tgz", - "integrity": "sha512-YmjsSMDBYsM1CaFiayOVT06+KJeXf0o5M/CAd4o1lTadFAtacTUM49zoYxr/oroopFDfhvN6iEcBxUyc3gvKmw==", - "dev": true, - "dependencies": { - "function.prototype.name": "^1.1.5", - "has-tostringtag": "^1.0.0", - "is-async-function": "^2.0.0", - "is-date-object": "^1.0.5", - "is-finalizationregistry": "^1.0.2", - "is-generator-function": "^1.0.10", - "is-regex": "^1.1.4", - "is-weakref": "^1.0.2", - "isarray": "^2.0.5", - "which-boxed-primitive": "^1.0.2", - "which-collection": "^1.0.1", - "which-typed-array": "^1.1.9" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/which-collection": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz", - "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==", - "dev": true, - "dependencies": { - "is-map": "^2.0.1", - "is-set": "^2.0.1", - "is-weakmap": "^2.0.1", - "is-weakset": "^2.0.1" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/which-typed-array": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz", - "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==", - "dev": true, - "dependencies": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", - "for-each": "^0.3.3", - "gopd": "^1.0.1", - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "dev": true - }, - "node_modules/yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", - "dev": true - }, - "node_modules/yaml": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.1.tgz", - "integrity": "sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==", - "dev": true, - "engines": { - "node": ">= 14" - } - }, - "node_modules/yocto-queue": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - } - } -} diff --git a/pkgs/tools/networking/pgrok/update.sh b/pkgs/tools/networking/pgrok/update.sh index 65b9f8481eb9b..5e2e082fd6a09 100755 --- a/pkgs/tools/networking/pgrok/update.sh +++ b/pkgs/tools/networking/pgrok/update.sh @@ -1,58 +1,40 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p nix wget nix-prefetch-github moreutils jq prefetch-npm-deps nodejs - -# adapted from https://github.com/NixOS/nixpkgs/blob/f4ffbe5ecb8039816f2dae60526e0a47f65a2b4e/pkgs/servers/memos/update.sh +#!nix-shell -i bash -p nix curl nix-update jq set -euo pipefail +nix-update + +cd "$(dirname "$0")" + +nixpkgs=../../../.. +node_packages="$nixpkgs/pkgs/development/node-packages" +pgrok="$nixpkgs/pkgs/tools/networking/pgrok" + TARGET_VERSION_REMOTE=$(curl -s https://api.github.com/repos/pgrok/pgrok/releases/latest | jq -r ".tag_name") TARGET_VERSION=${TARGET_VERSION_REMOTE#v} -if [[ "$UPDATE_NIX_OLD_VERSION" == "$TARGET_VERSION" ]]; then - echo "pgrok is up-to-date: ${UPDATE_NIX_OLD_VERSION}" - exit 0 -fi - -extractVendorHash() { - original="${1?original hash missing}" - result="$(nix-build -A pgrok.goModules 2>&1 | tail -n3 | grep 'got:' | cut -d: -f2- | xargs echo || true)" - [ -z "$result" ] && { echo "$original"; } || { echo "$result"; } -} - -replaceHash() { - old="${1?old hash missing}" - new="${2?new hash missing}" - awk -v OLD="$old" -v NEW="$new" '{ - if (i=index($0, OLD)) { - $0 = substr($0, 1, i-1) NEW substr($0, i+length(OLD)); - } - print $0; - }' ./pkgs/tools/networking/pgrok/default.nix | sponge ./pkgs/tools/networking/pgrok/default.nix -} - -# change version number -sed -e "s/version =.*;/version = \"$TARGET_VERSION\";/g" \ - -i ./pkgs/tools/networking/pgrok/default.nix - -# update hash -SRC_HASH="$(nix-instantiate --eval -A pgrok.src.outputHash | tr -d '"')" -NEW_HASH="$(nix-prefetch-github pgrok pgrok --rev v$TARGET_VERSION | jq -r .hash)" - -replaceHash "$SRC_HASH" "$NEW_HASH" - -GO_HASH="$(nix-instantiate --eval -A pgrok.vendorHash | tr -d '"')" -EMPTY_HASH="$(nix-instantiate --eval -A lib.fakeHash | tr -d '"')" -replaceHash "$GO_HASH" "$EMPTY_HASH" -replaceHash "$EMPTY_HASH" "$(extractVendorHash "$GO_HASH")" - -# update src yarn lock SRC_FILE_BASE="https://raw.githubusercontent.com/pgrok/pgrok/v$TARGET_VERSION" -pushd ./pkgs/tools/networking/pgrok -wget -q "$SRC_FILE_BASE/pgrokd/web/package.json" -npm install --package-lock-only -rm package.json* -NPM_HASH=$(prefetch-npm-deps ./package-lock.json) -popd +# replace ^ versions with ~, replace outdir to dist +curl https://raw.githubusercontent.com/pgrok/pgrok/main/pgrokd/web/package.json \ + | jq "{name,scripts,version: \"${TARGET_VERSION}\",dependencies: (.dependencies + .devDependencies) }" \ + | sed -e 's/"\^/"~/g' -e 's/\.\.\/cli\/dist/dist/g' \ + > "$pgrok/build-deps/package.json.new" + +old_deps="$(jq '.dependencies' "$pgrok/build-deps/package.json")" +new_deps="$(jq '.dependencies' "$pgrok/build-deps/package.json.new")" + +if [[ "$old_deps" == "$new_deps" ]]; then + echo "package.json dependencies not changed, do simple version change" + + sed -e '/^ "pgrok-build-deps/,+3 s/version = ".*"/version = "'"$TARGET_VERSION"'"/' \ + --in-place "$node_packages"/node-packages.nix + mv build-deps/package.json{.new,} +else + echo "package.json dependencies changed, updating nodePackages" + mv build-deps/package.json{.new,} + + ./"$node_packages"/generate.sh +fi -sed -i -E -e "s#npmDepsHash = \".*\"#npmDepsHash = \"$NPM_HASH\"#" ./pkgs/tools/networking/pgrok/web.nix diff --git a/pkgs/tools/networking/pgrok/web.nix b/pkgs/tools/networking/pgrok/web.nix index f9b1485c20ae8..0cbe45e0e3966 100644 --- a/pkgs/tools/networking/pgrok/web.nix +++ b/pkgs/tools/networking/pgrok/web.nix @@ -1,29 +1,30 @@ -{ buildNpmPackage -, src +{ src , version +, nodejs +, nodePackages +, stdenvNoCC }: -buildNpmPackage { - name = "pgrok-web"; - inherit src version; - sourceRoot = "${src.name}/pgrokd/web"; +let + build-deps = nodePackages."pgrok-build-deps-../../tools/networking/pgrok/build-deps"; +in +stdenvNoCC.mkDerivation { + pname = "pgrok-web"; + inherit version; + src = "${src}/pgrokd/web"; - npmDepsHash = "sha256-f4pDBoG6sTJE3aUknqUvHHpBR9KWo/B4YMrWHkGbvA8="; + nativeBuildInputs = [ nodejs ]; - # Upstream doesn't have a lockfile - postPatch = '' - cp ${./package-lock.json} ./package-lock.json - substituteInPlace ./package.json \ - --replace "../cli/dist" "$out" - ''; + buildPhase = '' + runHook preBuild + cp ${./build-deps/package.json} package.json + ln -s ${build-deps}/lib/node_modules/pgrokd/node_modules node_modules + npm run build + runHook postBuild + ''; - patches = [ - ./add_version_to_package.json.patch - ]; - - dontInstall = true; - dontFixup = true; - - NODE_OPTIONS = "--openssl-legacy-provider"; - - npmPackFlags = [ "--ignore-scripts" ]; - } + installPhase = '' + runHook preInstall + cp -r dist $out + runHook postInstall + ''; +} diff --git a/pkgs/tools/networking/pixiecore/default.nix b/pkgs/tools/networking/pixiecore/default.nix index 371d39193f36b..f1249cfb8286f 100644 --- a/pkgs/tools/networking/pixiecore/default.nix +++ b/pkgs/tools/networking/pixiecore/default.nix @@ -9,10 +9,10 @@ buildGoModule rec { owner = "danderson"; repo = "netboot"; inherit rev; - sha256 = "14dslmx3gk08h9gqfjw5y27x7d2c6r8ir7mjd7l9ybysagpzr02a"; + hash = "sha256-SoD871PaL5/oabKeHFE2TLTTj/CFS4dfggjMN3qlupE="; }; - vendorSha256 = "08n3m6fkwh8jmmzky3ygij4gxlcqidqk5ywi8ki8bkyzzs2lqaw7"; + vendorHash = "sha256-hytMhf7fz4XiRJH7MnGLmNH+iIzPDz9/rRJBPp2pwyI="; doCheck = false; diff --git a/pkgs/tools/networking/q/default.nix b/pkgs/tools/networking/q/default.nix index a217c9fb6b6ac..bbcaf765d0fd7 100644 --- a/pkgs/tools/networking/q/default.nix +++ b/pkgs/tools/networking/q/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "q"; - version = "0.11.4"; + version = "0.12.0"; src = fetchFromGitHub { owner = "natesales"; repo = "q"; rev = "v${version}"; - sha256 = "sha256-zoIHpj1i0X5SCVhcT3bl5xxsDcvD2trEVhlIC5YnIZo="; + sha256 = "sha256-Z62xxmbzouuP0ol0sJxlh3bQr/sysFSqo7Y5b26IJ1g="; }; - vendorHash = "sha256-cZRaf5Ks6Y4PzeVN0Lf1TxXzrifb7uQzsMbZf6JbLK4="; + vendorHash = "sha256-uWPvUz8H9e/deZ3JmpRBNEG6UXAQa1068fZwQoeiKkc="; doCheck = false; # tries to resolve DNS diff --git a/pkgs/tools/networking/restish/default.nix b/pkgs/tools/networking/restish/default.nix index c13c5708b52b1..303d88b235f2b 100644 --- a/pkgs/tools/networking/restish/default.nix +++ b/pkgs/tools/networking/restish/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "restish"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "danielgtaylor"; repo = "restish"; rev = "refs/tags/v${version}"; - hash = "sha256-DvI1pe4ONuIhSecJOhv6GKRzOYHo+jePqT8oYVvcKnM="; + hash = "sha256-zAWlbfZywL8jepgmXBM5lacRv1N/+dBd+9vIavWAyNs="; }; vendorHash = "sha256-sUBqeLhpWUu1NfAmFQCKFHm8DQaB8LYRrFexvuF8vC8="; diff --git a/pkgs/tools/networking/s5cmd/default.nix b/pkgs/tools/networking/s5cmd/default.nix index cdfa2cee60336..8d3b97c0d3168 100644 --- a/pkgs/tools/networking/s5cmd/default.nix +++ b/pkgs/tools/networking/s5cmd/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "s5cmd"; - version = "2.2.0"; + version = "2.2.2"; src = fetchFromGitHub { owner = "peak"; repo = "s5cmd"; rev = "v${version}"; - hash = "sha256-4Jx9hgjj+rthiyB7eKXNcbBv9oJWfwHanPO7bZ4J/K0="; + hash = "sha256-5BIyG6P2pfADSPWtz3KouGPVMpQRiY2X4wtotTCX4lo="; }; vendorHash = null; diff --git a/pkgs/tools/networking/shadowsocks-rust/default.nix b/pkgs/tools/networking/shadowsocks-rust/default.nix index 55fc6289fe09c..4dcd1ee250e40 100644 --- a/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "shadowsocks-rust"; - version = "1.16.1"; + version = "1.16.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "shadowsocks"; repo = pname; - hash = "sha256-h/2zHxgp8sXcUOpmtneoAX0hNt19pObfyGW3wIzQNxc="; + hash = "sha256-TE1pGLS77WpaT0J0rUllihmHY5nOHzxd1LMsNjptXrg="; }; - cargoHash = "sha256-MZGd1SyTSZ6y9W9h+M3Y5cwX6hLCFiuPZb307PRtvQk="; + cargoHash = "sha256-Fq/EMA7PHL/1eWNwT0naRtfkIU0Hia5yzFWmsyugOFc="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; diff --git a/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix b/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix index 24aaebe9d02c6..12117252abf68 100644 --- a/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix +++ b/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix @@ -12,10 +12,10 @@ buildGoModule rec { owner = "shadowsocks"; repo = "v2ray-plugin"; rev = "v${version}"; - sha256 = "0aq445gnqk9dxs1hkw7rvk86wg0iyiy0h740lvyh6d9zsqhf61wb"; + hash = "sha256-iwfjINY/NQP9poAcCHz0ETxu0Nz58AmD7i1NbF8hBCs="; }; - vendorSha256 = "0vzd9v33p4a32f5ic9ir4g5ckis06wpdf07a649h9qalimxnvzfz"; + vendorHash = "sha256-3/1te41U4QQTMeoA1y43QMfJyiM5JhaLE0ORO8ZO7W8="; meta = with lib; { description = "Yet another SIP003 plugin for shadowsocks, based on v2ray"; diff --git a/pkgs/tools/networking/sing-box/default.nix b/pkgs/tools/networking/sing-box/default.nix index abc5be83d0ef3..8aa2896be1d77 100644 --- a/pkgs/tools/networking/sing-box/default.nix +++ b/pkgs/tools/networking/sing-box/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "sing-box"; - version = "1.4.3"; + version = "1.5.1"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-ptnppqh7f6Cn5pMrqtqM39zFh2nEpOSrZtTxhSzFXS0="; + hash = "sha256-Vc7TLkADOlMs4nMRCI2DAd4h40eYhcOP/EzM7uWqZ+A="; }; - vendorHash = "sha256-XHZoXnQJMfnaPbHHoC1toxqjq/jifAI2UqZ4cc6y034="; + vendorHash = "sha256-bcjhBAW4/NLQ/l7gmD9169DCYJwDH1j0vtEShJqKRiw="; tags = [ "with_quic" diff --git a/pkgs/tools/networking/slirp4netns/default.nix b/pkgs/tools/networking/slirp4netns/default.nix index 828e3e1ad0c50..6deae44051668 100644 --- a/pkgs/tools/networking/slirp4netns/default.nix +++ b/pkgs/tools/networking/slirp4netns/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "slirp4netns"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "rootless-containers"; repo = "slirp4netns"; rev = "v${version}"; - sha256 = "sha256-Lq3MMIPPEo1yJZ/xE3m9Y/V+cJl17IRkTBVjnr/avHw="; + sha256 = "sha256-TQi2Ok58VbKl3iaMygBL16NZukvVkSSmyVpGT2A1IJQ="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/tools/networking/ssh-key-confirmer/default.nix b/pkgs/tools/networking/ssh-key-confirmer/default.nix index c7a90aee52360..ed8b9cac734bd 100644 --- a/pkgs/tools/networking/ssh-key-confirmer/default.nix +++ b/pkgs/tools/networking/ssh-key-confirmer/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "benjojo"; repo = "ssh-key-confirmer"; rev = "v${version}"; - sha256 = "18whj9ds3rpjj5b71lbadi37ps99v13nnmkn3vq28x6cqfdy6w09"; + hash = "sha256-CXDjm8PMdCTwHnZWa0fYKel7Rmxq0XBWkfLmoVuSkKM="; }; - vendorSha256 = "0v9yw6v8fj6dqgbkks4pnmvxx9b7jqdy7bn7ywddk396sbsxjiqa"; + vendorHash = "sha256-CkfZ9dImjdka98eu4xuWZ6Xed7WX6DnXw81Ih7bhPm0="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/tools/networking/ubridge/default.nix b/pkgs/tools/networking/ubridge/default.nix index ac475e6e8a538..085ee4f76d0a9 100644 --- a/pkgs/tools/networking/ubridge/default.nix +++ b/pkgs/tools/networking/ubridge/default.nix @@ -1,5 +1,9 @@ -{ lib, stdenv, fetchFromGitHub +{ lib +, stdenv +, fetchFromGitHub , libpcap +, testers +, ubridge }: stdenv.mkDerivation rec { @@ -21,10 +25,22 @@ stdenv.mkDerivation rec { buildInputs = [ libpcap ]; - preInstall = '' + installPhase = '' + runHook preInstall + mkdir -p $out/bin + install -Dm755 ubridge $out/bin/ubridge + + runHook postInstall ''; + passthru = { + tests.version = testers.testVersion { + package = ubridge; + command = "ubridge -v"; + }; + }; + meta = with lib; { description = "Bridge for UDP tunnels, Ethernet, TAP, and VMnet interfaces"; longDescription = '' @@ -35,7 +51,8 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; changelog = "https://github.com/GNS3/ubridge/releases/tag/v${version}"; license = licenses.gpl3Plus; - platforms = platforms.linux; + mainProgram = "ubridge"; maintainers = with maintainers; [ primeos ]; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/tools/networking/vegeta/default.nix b/pkgs/tools/networking/vegeta/default.nix index 17efa4336bf53..caa420cbfa7a9 100644 --- a/pkgs/tools/networking/vegeta/default.nix +++ b/pkgs/tools/networking/vegeta/default.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "vegeta"; - version = "12.11.0"; - rev = "e04d9c0df8177e8633bff4afe7b39c2f3a9e7dea"; + version = "12.11.1"; + rev = "6fbe391628eeeae1adf39522a55078797e6e7f2e"; src = fetchFromGitHub { owner = "tsenart"; repo = "vegeta"; rev = "v${version}"; - sha256 = "sha256-dqVwz4nc+QDD5M2ajLtnoEnvaka/n6KxqCvRH63Za4g="; + sha256 = "sha256-09DowdlbCsBQsAuAqC2QyUYvZHz7QmttO8Q6KHQCqLo="; }; - vendorHash = "sha256-Pq8MRfwYhgk5YWEmBisBrV2F7Ztn18MdpRFZ9r/1y7A="; + vendorHash = "sha256-5MvcZLg+NDDsqlpVV2FhTiEhXUJHq7eaP7Pba3iIipo="; subPackages = [ "." ]; diff --git a/pkgs/tools/networking/veilid/Cargo.lock b/pkgs/tools/networking/veilid/Cargo.lock index 2585bef885c7a..d210e639c8808 100644 --- a/pkgs/tools/networking/veilid/Cargo.lock +++ b/pkgs/tools/networking/veilid/Cargo.lock @@ -45,7 +45,7 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "getrandom 0.2.10", + "getrandom", "once_cell", "version_check 0.9.4", ] @@ -57,7 +57,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" dependencies = [ "cfg-if 1.0.0", - "getrandom 0.2.10", + "getrandom", "once_cell", "version_check 0.9.4", ] @@ -73,9 +73,9 @@ dependencies = [ [[package]] name = "allo-isolate" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71441b1911974f09ca413fc93fb2e3bfc60f4a284fdc7fd51e5a81b6afc61727" +checksum = "c258c1a017ecaccfb34c8fa46ecbb2f5402584e31082c12b5caf0be82ac5ac44" dependencies = [ "atomic", ] @@ -172,9 +172,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" +checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46" [[package]] name = "anstyle-parse" @@ -231,9 +231,9 @@ dependencies = [ [[package]] name = "argon2" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2e554a8638bdc1e4eae9984845306cc95f8a9208ba8d49c3859fd958b46774d" +checksum = "17ba4cac0a46bc1d2912652a751c47f2a9f3a7fe89bcae2275d418f5270402f9" dependencies = [ "base64ct", "blake2", @@ -301,7 +301,7 @@ dependencies = [ "async-lock", "async-task", "concurrent-queue", - "fastrand 1.9.0", + "fastrand", "futures-lite", "slab", ] @@ -398,42 +398,20 @@ dependencies = [ [[package]] name = "async-std-resolver" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba50e24d9ee0a8950d3d03fc6d0dd10aa14b5de3b101949b4e160f7fee7c723" +checksum = "0354a68a52265a3bde76005ddd2726624ef8624614f7f58871301de205a58a59" dependencies = [ "async-std", "async-trait", "futures-io", "futures-util", "pin-utils", - "socket2 0.4.9", + "socket2 0.5.4", "trust-dns-resolver", ] [[package]] -name = "async-stream" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" -dependencies = [ - "async-stream-impl", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-stream-impl" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.31", -] - -[[package]] name = "async-task" version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -461,20 +439,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", -] - -[[package]] -name = "async-tungstenite" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5c45a0dd44b7e6533ac4e7acc38ead1a3b39885f5bbb738140d30ea528abc7c" -dependencies = [ - "futures-io", - "futures-util", - "log", - "pin-project 0.4.30", - "tungstenite 0.11.1", + "syn 2.0.36", ] [[package]] @@ -488,7 +453,7 @@ dependencies = [ "futures-util", "log", "pin-project-lite", - "tungstenite 0.20.0", + "tungstenite", ] [[package]] @@ -503,7 +468,7 @@ dependencies = [ "futures-task", "futures-timer", "futures-util", - "pin-project 1.1.3", + "pin-project", "rustc_version", "tokio", "wasm-bindgen-futures", @@ -570,7 +535,7 @@ dependencies = [ "async-trait", "axum-core", "bitflags 1.3.2", - "bytes 1.4.0", + "bytes", "futures-util", "http", "http-body", @@ -596,7 +561,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" dependencies = [ "async-trait", - "bytes 1.4.0", + "bytes", "futures-util", "http", "http-body", @@ -623,21 +588,15 @@ dependencies = [ [[package]] name = "base64" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" - -[[package]] -name = "base64" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.3" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" [[package]] name = "base64ct" @@ -647,31 +606,12 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "bindgen" -version = "0.57.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd4865004a46a0aafb2a0a5eb19d3c9fc46ee5f063a6cfc605c69ac9ecf5263d" -dependencies = [ - "bitflags 1.3.2", - "cexpr 0.4.0", - "clang-sys", - "lazy_static", - "lazycell", - "peeking_take_while", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex 0.1.1", -] - -[[package]] -name = "bindgen" version = "0.59.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" dependencies = [ "bitflags 1.3.2", - "cexpr 0.6.0", + "cexpr", "clang-sys", "clap 2.34.0", "env_logger 0.9.3", @@ -683,7 +623,7 @@ dependencies = [ "quote", "regex", "rustc-hash", - "shlex 1.1.0", + "shlex", "which", ] @@ -730,7 +670,7 @@ checksum = "e0b121a9fe0df916e362fb3271088d071159cdf11db0e4182d02152850756eff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.36", ] [[package]] @@ -783,31 +723,31 @@ dependencies = [ "async-lock", "async-task", "atomic-waker", - "fastrand 1.9.0", + "fastrand", "futures-lite", "log", ] [[package]] name = "boringssl-src" -version = "0.3.0+688fc5c" +version = "0.5.2+6195bf8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f901accdf830d2ea2f4e27f923a5e1125cd8b1a39ab578b9db1a42d578a6922b" +checksum = "7ab565ccc5e276ea82a2013dd08bf2c999866b06daf1d4f30fee419c4aaec6d5" dependencies = [ "cmake", ] [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "bytemuck" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" [[package]] name = "byteorder" @@ -817,27 +757,24 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "0.5.6" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" - -[[package]] -name = "bytes" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "capnp" -version = "0.17.2" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95e65021d89250bbfe7c2791789ced2c4bdc21b0e8bb59c64f3fd6145a5fd678" +checksum = "9eddbd729bd9742aa22d29e871a42ffea7f216a4ddbfdaf09ea88150ef2e7f76" +dependencies = [ + "embedded-io", +] [[package]] name = "capnpc" -version = "0.17.2" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbbc3763fb3e6635188e9cc51ee11a26f8777c553ca377430818dbebaaf6042b" +checksum = "5067f3c8ee94d993d03150153e9a57a6ff330127b1c1ad76475051e1cef79c2d" dependencies = [ "capnp", ] @@ -859,15 +796,6 @@ checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" [[package]] name = "cexpr" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27" -dependencies = [ - "nom 5.1.3", -] - -[[package]] -name = "cexpr" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" @@ -913,15 +841,14 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.28" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ed24df0632f708f5f6d8082675bef2596f7084dee3dd55f632290bf35bfe0f" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", - "time 0.1.45", "wasm-bindgen", "windows-targets 0.48.5", ] @@ -974,9 +901,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.2" +version = "4.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a13b88d2c62ff462f88e4a121f17a82c1af05693a2f192b5c38d14de73c19f6" +checksum = "84ed82781cea27b43c9b106a979fe450a13a31aab0500595fb3fc06616de08e6" dependencies = [ "clap_builder", "clap_derive", @@ -1004,7 +931,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.36", ] [[package]] @@ -1064,7 +991,7 @@ version = "4.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" dependencies = [ - "bytes 1.4.0", + "bytes", "memchr", ] @@ -1104,7 +1031,7 @@ checksum = "c2895653b4d9f1538a83970077cb01dfc77a4810524e51a110944688e916b18e" dependencies = [ "prost", "prost-types", - "tonic 0.9.2", + "tonic", "tracing-core", ] @@ -1126,7 +1053,7 @@ dependencies = [ "thread_local", "tokio", "tokio-stream", - "tonic 0.9.2", + "tonic", "tracing", "tracing-core", "tracing-subscriber", @@ -1263,7 +1190,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array 0.14.7", - "rand_core 0.6.4", + "rand_core", "typenum", ] @@ -1317,7 +1244,7 @@ dependencies = [ "flexi_logger", "lazy_static", "log", - "time 0.3.28", + "time", "unicode-width", ] @@ -1362,9 +1289,9 @@ dependencies = [ "owning_ref", "serde_json", "serde_yaml", - "time 0.3.28", + "time", "tokio", - "toml 0.7.6", + "toml 0.7.8", "unicode-segmentation", "unicode-width", "xi-unicode", @@ -1381,9 +1308,9 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.0.0" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f711ade317dd348950a9910f81c5947e3d8907ebd2b83f76203ff1807e6a2bc2" +checksum = "622178105f911d937a42cdb140730ba4a3ed2becd8ae6ce39c7d28b5d75d4588" dependencies = [ "cfg-if 1.0.0", "cpufeatures", @@ -1404,7 +1331,7 @@ checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.36", ] [[package]] @@ -1460,7 +1387,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.36", ] [[package]] @@ -1482,7 +1409,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core 0.20.3", "quote", - "syn 2.0.31", + "syn 2.0.36", ] [[package]] @@ -1553,31 +1480,11 @@ dependencies = [ [[package]] name = "directories" -version = "4.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210" -dependencies = [ - "dirs-sys 0.3.7", -] - -[[package]] -name = "directories" version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" dependencies = [ - "dirs-sys 0.4.1", -] - -[[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi", + "dirs-sys", ] [[package]] @@ -1622,7 +1529,7 @@ checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980" dependencies = [ "curve25519-dalek", "ed25519", - "rand_core 0.6.4", + "rand_core", "serde", "sha2 0.10.7", "signature", @@ -1636,35 +1543,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] +name = "embedded-io" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "658bbadc628dc286b9ae02f0cb0f5411c056eb7487b72f0083203f115de94060" + +[[package]] name = "enum-as-inner" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" +checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" dependencies = [ "heck", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.36", ] [[package]] name = "enum-map" -version = "2.6.1" +version = "2.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9705d8de4776df900a4a0b2384f8b0ab42f775e93b083b42f8ce71bdc32a47e3" +checksum = "c188012f8542dee7b3996e44dd89461d64aa471b0a7c71a1ae2f595d259e96e5" dependencies = [ "enum-map-derive", ] [[package]] name = "enum-map-derive" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccb14d927583dd5c2eac0f2cf264fc4762aefe1ae14c47a8a20fc1939d3a5fc0" +checksum = "04d0b288e3bb1d861c4403c1774a6f7a798781dfc519b3647df2a3dd4ae95f25" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.36", ] [[package]] @@ -1707,7 +1620,7 @@ dependencies = [ "darling 0.20.3", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.36", ] [[package]] @@ -1808,12 +1721,6 @@ dependencies = [ ] [[package]] -name = "fastrand" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" - -[[package]] name = "fdeflate" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1834,15 +1741,9 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" - -[[package]] -name = "fixedbitset" -version = "0.4.2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" +checksum = "d0870c84016d4b481be5c9f323c24f65e31e901ae618f0e80f4308fb00de1d2d" [[package]] name = "flate2" @@ -1869,7 +1770,7 @@ dependencies = [ "regex", "rustversion", "thiserror", - "time 0.3.28", + "time", ] [[package]] @@ -1926,7 +1827,7 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2eeb4ed9e12f43b7fa0baae3f9cdda28352770132ef2e09a23760c29cae8bd47" dependencies = [ - "rustix 0.38.11", + "rustix 0.38.13", "windows-sys 0.48.0", ] @@ -1984,7 +1885,7 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ - "fastrand 1.9.0", + "fastrand", "futures-core", "futures-io", "memchr", @@ -2001,7 +1902,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.36", ] [[package]] @@ -2090,17 +1991,6 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "getrandom" version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" @@ -2108,7 +1998,7 @@ dependencies = [ "cfg-if 1.0.0", "js-sys", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "wasm-bindgen", ] @@ -2138,6 +2028,19 @@ dependencies = [ [[package]] name = "gloo-utils" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "037fcb07216cb3a30f7292bd0176b050b7b9a052ba830ef7d5d65f6dc64ba58e" +dependencies = [ + "js-sys", + "serde", + "serde_json", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-utils" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b5555354113b18c547c1d3a98fbf7fb32a9ff4f6fa112ce823a21641a0ba3aa" @@ -2151,25 +2054,26 @@ dependencies = [ [[package]] name = "grpcio" -version = "0.9.1" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d99e00eed7e0a04ee2705112e7cfdbe1a3cc771147f22f016a8cd2d002187b" +checksum = "609832ca501baeb662dc81932fda9ed83f5d058f4b899a807ba222ce696f430a" dependencies = [ - "futures", + "futures-executor", + "futures-util", "grpcio-sys", "libc", "log", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "protobuf", ] [[package]] name = "grpcio-sys" -version = "0.9.1+1.38.0" +version = "0.12.1+1.46.5-patched" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9447d1a926beeef466606cc45717f80897998b548e7dc622873d453e1ecb4be4" +checksum = "cf625d1803b6f44203f0428ddace847fb4994def5c803fc8a7a2f18fb3daec62" dependencies = [ - "bindgen 0.57.0", + "bindgen", "boringssl-src", "cc", "cmake", @@ -2185,7 +2089,7 @@ version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" dependencies = [ - "bytes 1.4.0", + "bytes", "fnv", "futures-core", "futures-sink", @@ -2314,6 +2218,15 @@ dependencies = [ ] [[package]] +name = "home" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] name = "hostname" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2330,7 +2243,7 @@ version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ - "bytes 1.4.0", + "bytes", "fnv", "itoa", ] @@ -2341,7 +2254,7 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ - "bytes 1.4.0", + "bytes", "http", "pin-project-lite", ] @@ -2370,7 +2283,7 @@ version = "0.14.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" dependencies = [ - "bytes 1.4.0", + "bytes", "futures-channel", "futures-core", "futures-util", @@ -2431,17 +2344,6 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "idna" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" @@ -2517,15 +2419,6 @@ dependencies = [ ] [[package]] -name = "input_buffer" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19a8a95243d5a0398cae618ec29477c6e3cb631152be5c19481f80bc71559754" -dependencies = [ - "bytes 0.5.6", -] - -[[package]] name = "instant" version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2551,7 +2444,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2 0.5.3", + "socket2 0.5.4", "widestring", "windows-sys 0.48.0", "winreg", @@ -2642,7 +2535,7 @@ dependencies = [ "cfg-if 1.0.0", "core-foundation", "core-foundation-sys", - "directories 5.0.1", + "directories", "fs4", "jni", "lazy_static", @@ -2732,9 +2625,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.147" +version = "0.2.148" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" [[package]] name = "libloading" @@ -2783,9 +2676,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.5" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" +checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" [[package]] name = "lock_api" @@ -2846,12 +2739,6 @@ dependencies = [ ] [[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - -[[package]] name = "matchit" version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2873,15 +2760,6 @@ dependencies = [ ] [[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - -[[package]] name = "memory_units" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2917,23 +2795,17 @@ checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", "log", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "windows-sys 0.48.0", ] [[package]] -name = "multimap" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" - -[[package]] name = "nanorand" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" dependencies = [ - "getrandom 0.2.10", + "getrandom", ] [[package]] @@ -3027,9 +2899,9 @@ dependencies = [ [[package]] name = "netlink-packet-route" -version = "0.17.0" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6de2fe935f44cbdfcab77dce2150d68eda75be715cd42d4d6f52b0bd4dcc5b1" +checksum = "053998cea5a306971f88580d0829e90f270f940befd7cf928da179d4187a5a66" dependencies = [ "anyhow", "bitflags 1.3.2", @@ -3057,7 +2929,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "842c6770fc4bb33dd902f41829c61ef872b8e38de1405aa0b938b27b8fba12c3" dependencies = [ - "bytes 1.4.0", + "bytes", "futures", "log", "netlink-packet-core", @@ -3073,7 +2945,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6471bf08e7ac0135876a9581bf3217ef0333c191c128d34878079f42ee150411" dependencies = [ "async-io", - "bytes 1.4.0", + "bytes", "futures", "libc", "log", @@ -3090,7 +2962,7 @@ dependencies = [ "cc", "cfg-if 1.0.0", "libc", - "memoffset 0.6.5", + "memoffset", ] [[package]] @@ -3102,7 +2974,7 @@ dependencies = [ "bitflags 1.3.2", "cfg-if 1.0.0", "libc", - "memoffset 0.6.5", + "memoffset", ] [[package]] @@ -3114,8 +2986,6 @@ dependencies = [ "bitflags 1.3.2", "cfg-if 1.0.0", "libc", - "memoffset 0.7.1", - "pin-utils", ] [[package]] @@ -3141,16 +3011,6 @@ dependencies = [ [[package]] name = "nom" -version = "5.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08959a387a676302eebf4ddbcbc611da04285579f76f88ee0506c63b1a61dd4b" -dependencies = [ - "memchr", - "version_check 0.9.4", -] - -[[package]] -name = "nom" version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" @@ -3346,9 +3206,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "opentelemetry" -version = "0.18.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69d6c3d7288a106c0a363e4b0e8d308058d56902adefb16f4936f417ffef086e" +checksum = "9591d937bc0e6d2feb6f71a559540ab300ea49955229c347a517a28d27784c54" dependencies = [ "opentelemetry_api", "opentelemetry_sdk", @@ -3356,56 +3216,55 @@ dependencies = [ [[package]] name = "opentelemetry-otlp" -version = "0.11.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1c928609d087790fc936a1067bdc310ae702bdf3b090c3f281b713622c8bbde" +checksum = "7e5e5a5c4135864099f3faafbe939eb4d7f9b80ebf68a8448da961b32a7c1275" dependencies = [ "async-trait", - "futures", - "futures-util", + "futures-core", "grpcio", "http", - "opentelemetry", "opentelemetry-proto", + "opentelemetry-semantic-conventions", + "opentelemetry_api", + "opentelemetry_sdk", "prost", "protobuf", "thiserror", "tokio", - "tonic 0.8.3", + "tonic", ] [[package]] name = "opentelemetry-proto" -version = "0.1.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61a2f56df5574508dd86aaca016c917489e589ece4141df1b5e349af8d66c28" +checksum = "b1e3f814aa9f8c905d0ee4bde026afd3b2577a97c10e1699912e3e44f0c4cbeb" dependencies = [ "futures", - "futures-util", "grpcio", - "opentelemetry", + "opentelemetry_api", + "opentelemetry_sdk", "prost", "protobuf", - "tonic 0.8.3", - "tonic-build", + "tonic", ] [[package]] name = "opentelemetry-semantic-conventions" -version = "0.10.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b02e0230abb0ab6636d18e2ba8fa02903ea63772281340ccac18e0af3ec9eeb" +checksum = "73c9f9340ad135068800e7f1b24e9e09ed9e7143f5bf8518ded3d3ec69789269" dependencies = [ "opentelemetry", ] [[package]] name = "opentelemetry_api" -version = "0.18.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c24f96e21e7acc813c7a8394ee94978929db2bcc46cf6b5014fc612bf7760c22" +checksum = "8a81f725323db1b1206ca3da8bb19874bbd3f57c3bcd59471bfb04525b265b9b" dependencies = [ - "fnv", "futures-channel", "futures-util", "indexmap 1.9.3", @@ -3413,26 +3272,28 @@ dependencies = [ "once_cell", "pin-project-lite", "thiserror", + "urlencoding", ] [[package]] name = "opentelemetry_sdk" -version = "0.18.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca41c4933371b61c2a2f214bf16931499af4ec90543604ec828f7a625c09113" +checksum = "fa8e705a0612d48139799fcbaba0d4a90f06277153e43dd2bdc16c6f0edd8026" dependencies = [ "async-std", "async-trait", "crossbeam-channel", - "dashmap", - "fnv", "futures-channel", "futures-executor", "futures-util", "once_cell", "opentelemetry_api", + "ordered-float", "percent-encoding", - "rand 0.8.5", + "rand", + "regex", + "serde_json", "thiserror", "tokio", "tokio-stream", @@ -3445,6 +3306,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] +name = "ordered-float" +version = "3.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a54938017eacd63036332b4ae5c8a49fc8c0c1d6d629893057e4f13609edd06" +dependencies = [ + "num-traits", +] + +[[package]] name = "ordered-multimap" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3561,7 +3431,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" dependencies = [ "base64ct", - "rand_core 0.6.4", + "rand_core", "subtle", ] @@ -3620,7 +3490,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.36", ] [[package]] @@ -3635,16 +3505,6 @@ dependencies = [ ] [[package]] -name = "petgraph" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" -dependencies = [ - "fixedbitset", - "indexmap 2.0.0", -] - -[[package]] name = "pharos" version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3656,31 +3516,11 @@ dependencies = [ [[package]] name = "pin-project" -version = "0.4.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ef0f924a5ee7ea9cbcea77529dba45f8a9ba9f622419fe3386ca581a3ae9d5a" -dependencies = [ - "pin-project-internal 0.4.30", -] - -[[package]] -name = "pin-project" version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" dependencies = [ - "pin-project-internal 1.1.3", -] - -[[package]] -name = "pin-project-internal" -version = "0.4.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "851c8d0ce9bebe43790dedfc86614c23494ac9f423dd618d3a61fc693eafe61e" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", + "pin-project-internal", ] [[package]] @@ -3691,7 +3531,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.36", ] [[package]] @@ -3775,16 +3615,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] -name = "prettyplease" -version = "0.1.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" -dependencies = [ - "proc-macro2", - "syn 1.0.109", -] - -[[package]] name = "proc-macro-crate" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3805,9 +3635,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" dependencies = [ "unicode-ident", ] @@ -3818,33 +3648,11 @@ version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" dependencies = [ - "bytes 1.4.0", + "bytes", "prost-derive", ] [[package]] -name = "prost-build" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" -dependencies = [ - "bytes 1.4.0", - "heck", - "itertools", - "lazy_static", - "log", - "multimap", - "petgraph", - "prettyplease", - "prost", - "prost-types", - "regex", - "syn 1.0.109", - "tempfile", - "which", -] - -[[package]] name = "prost-derive" version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3889,36 +3697,13 @@ dependencies = [ [[package]] name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - -[[package]] -name = "rand" version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", + "rand_chacha", + "rand_core", ] [[package]] @@ -3928,16 +3713,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", + "rand_core", ] [[package]] @@ -3946,16 +3722,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.10", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", + "getrandom", ] [[package]] @@ -4000,7 +3767,7 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.10", + "getrandom", "redox_syscall 0.2.16", "thiserror", ] @@ -4087,21 +3854,20 @@ dependencies = [ [[package]] name = "rpassword" -version = "6.0.1" +version = "7.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bf099a1888612545b683d2661a1940089f6c2e5a8e38979b2159da876bfd956" +checksum = "6678cf63ab3491898c0d021b493c94c9b221d91295294a2a5746eacbe5928322" dependencies = [ "libc", - "serde", - "serde_json", + "rtoolbox", "winapi", ] [[package]] name = "rtnetlink" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6333af2adba73478936174a0ef3edf05fbfa058539c21d567344a53bb6d75cfd" +checksum = "7a552eb82d19f38c3beed3f786bd23aa434ceb9ac43ab44419ca6d67a7e186c0" dependencies = [ "async-global-executor", "futures", @@ -4117,6 +3883,16 @@ dependencies = [ ] [[package]] +name = "rtoolbox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "034e22c514f5c0cb8a10ff341b9b048b5ceb21591f31c8f44c43b960f9b3524a" +dependencies = [ + "libc", + "winapi", +] + +[[package]] name = "rusqlite" version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4177,14 +3953,14 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.11" +version = "0.38.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0c3dde1fc030af041adc40e79c0e7fbcf431dd24870053d187d7c66e4b87453" +checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662" dependencies = [ "bitflags 2.4.0", "errno", "libc", - "linux-raw-sys 0.4.5", + "linux-raw-sys 0.4.7", "windows-sys 0.48.0", ] @@ -4206,7 +3982,7 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64 0.21.3", + "base64 0.21.4", ] [[package]] @@ -4250,7 +4026,7 @@ checksum = "ec0f696e21e10fa546b7ffb1c9672c6de8fbc7a81acf59524386d8639bf12737" dependencies = [ "proc-macro2", "quote", - "serde_derive_internals", + "serde_derive_internals 0.26.0", "syn 1.0.109", ] @@ -4287,7 +4063,7 @@ dependencies = [ "hkdf", "lazy_static", "num", - "rand 0.8.5", + "rand", "serde", "sha2 0.9.9", "zbus", @@ -4359,6 +4135,28 @@ dependencies = [ ] [[package]] +name = "serde-wasm-bindgen" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3b143e2833c57ab9ad3ea280d21fd34e285a42837aeb0ee301f4f41890fa00e" +dependencies = [ + "js-sys", + "serde", + "wasm-bindgen", +] + +[[package]] +name = "serde-wasm-bindgen" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30c9933e5689bd420dc6c87b7a1835701810cbc10cd86a26e4da45b73e6b1d78" +dependencies = [ + "js-sys", + "serde", + "wasm-bindgen", +] + +[[package]] name = "serde_cbor" version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4376,7 +4174,7 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.36", ] [[package]] @@ -4391,10 +4189,21 @@ dependencies = [ ] [[package]] +name = "serde_derive_internals" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e578a843d40b4189a4d66bba51d7684f57da5bd7c304c64e14bd63efbef49509" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.36", +] + +[[package]] name = "serde_json" -version = "1.0.105" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ "itoa", "ryu", @@ -4409,7 +4218,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.36", ] [[package]] @@ -4436,20 +4245,6 @@ dependencies = [ [[package]] name = "serial_test" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c789ec87f4687d022a2405cf46e0cd6284889f1839de292cadeb6c6019506f2" -dependencies = [ - "dashmap", - "futures", - "lazy_static", - "log", - "parking_lot 0.12.1", - "serial_test_derive 0.10.0", -] - -[[package]] -name = "serial_test" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e56dd856803e253c8f298af3f4d7eb0ae5e23a737252cd90bb4f3b435033b2d" @@ -4459,18 +4254,7 @@ dependencies = [ "lazy_static", "log", "parking_lot 0.12.1", - "serial_test_derive 2.0.0", -] - -[[package]] -name = "serial_test_derive" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b64f9e531ce97c88b4778aad0ceee079216071cffec6ac9b904277f8f92e7fe3" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", + "serial_test_derive", ] [[package]] @@ -4481,20 +4265,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", -] - -[[package]] -name = "sha-1" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if 1.0.0", - "cpufeatures", - "digest 0.9.0", - "opaque-debug", + "syn 2.0.36", ] [[package]] @@ -4549,15 +4320,9 @@ checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" [[package]] name = "shlex" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" - -[[package]] -name = "shlex" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" +checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" [[package]] name = "signal-hook" @@ -4624,7 +4389,7 @@ checksum = "acee08041c5de3d5048c8b3f6f13fafb3026b24ba43c6a695a0c76179b844369" dependencies = [ "log", "termcolor", - "time 0.3.28", + "time", ] [[package]] @@ -4664,9 +4429,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" dependencies = [ "libc", "windows-sys 0.48.0", @@ -4758,9 +4523,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.31" +version = "2.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718fa2415bcb8d8bd775917a1bf12a7931b6dfa890753378538118181e0cb398" +checksum = "91e02e55d62894af2a08aca894c6577281f76769ba47c94d5756bec8ac6e7373" dependencies = [ "proc-macro2", "quote", @@ -4775,9 +4540,9 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] name = "sysinfo" -version = "0.28.4" +version = "0.29.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4c2f3ca6693feb29a89724516f016488e9aafc7f37264f898593ee4b942f31b" +checksum = "0a18d114d420ada3a891e6bc8e96a2023402203296a47cdd65083377dad18ba5" dependencies = [ "cfg-if 1.0.0", "core-foundation-sys", @@ -4788,19 +4553,6 @@ dependencies = [ ] [[package]] -name = "tempfile" -version = "3.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" -dependencies = [ - "cfg-if 1.0.0", - "fastrand 2.0.0", - "redox_syscall 0.3.5", - "rustix 0.38.11", - "windows-sys 0.48.0", -] - -[[package]] name = "termcolor" version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4845,7 +4597,7 @@ checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.36", ] [[package]] @@ -4871,17 +4623,6 @@ dependencies = [ [[package]] name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - -[[package]] -name = "time" version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" @@ -4932,14 +4673,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ "backtrace", - "bytes 1.4.0", + "bytes", "libc", "mio", "num_cpus", "parking_lot 0.12.1", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.3", + "socket2 0.5.4", "tokio-macros", "tracing", "windows-sys 0.48.0", @@ -4963,7 +4704,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.36", ] [[package]] @@ -4983,7 +4724,7 @@ version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" dependencies = [ - "bytes 1.4.0", + "bytes", "futures-core", "futures-io", "futures-sink", @@ -5003,9 +4744,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.6" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" dependencies = [ "serde", "serde_spanned", @@ -5024,9 +4765,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.14" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ "indexmap 2.0.0", "serde", @@ -5037,46 +4778,14 @@ dependencies = [ [[package]] name = "tonic" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f219fad3b929bef19b1f86fbc0358d35daed8f2cac972037ac0dc10bbb8d5fb" -dependencies = [ - "async-stream", - "async-trait", - "axum", - "base64 0.13.1", - "bytes 1.4.0", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-timeout", - "percent-encoding", - "pin-project 1.1.3", - "prost", - "prost-derive", - "tokio", - "tokio-stream", - "tokio-util", - "tower", - "tower-layer", - "tower-service", - "tracing", - "tracing-futures", -] - -[[package]] -name = "tonic" version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" dependencies = [ "async-trait", "axum", - "base64 0.21.3", - "bytes 1.4.0", + "base64 0.21.4", + "bytes", "futures-core", "futures-util", "h2", @@ -5085,7 +4794,7 @@ dependencies = [ "hyper", "hyper-timeout", "percent-encoding", - "pin-project 1.1.3", + "pin-project", "prost", "tokio", "tokio-stream", @@ -5096,19 +4805,6 @@ dependencies = [ ] [[package]] -name = "tonic-build" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf5e9b9c0f7e0a7c027dcfaba7b2c60816c7049171f679d99ee2ff65d0de8c4" -dependencies = [ - "prettyplease", - "proc-macro2", - "prost-build", - "quote", - "syn 1.0.109", -] - -[[package]] name = "tower" version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5117,9 +4813,9 @@ dependencies = [ "futures-core", "futures-util", "indexmap 1.9.3", - "pin-project 1.1.3", + "pin-project", "pin-project-lite", - "rand 0.8.5", + "rand", "slab", "tokio", "tokio-util", @@ -5160,7 +4856,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e" dependencies = [ "crossbeam-channel", - "time 0.3.28", + "time", "tracing-subscriber", ] @@ -5172,7 +4868,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.36", ] [[package]] @@ -5196,16 +4892,6 @@ dependencies = [ ] [[package]] -name = "tracing-futures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -dependencies = [ - "pin-project 1.1.3", - "tracing", -] - -[[package]] name = "tracing-journald" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5229,12 +4915,14 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.18.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21ebb87a95ea13271332df069020513ab70bdb5637ca42d6e492dc3bbbad48de" +checksum = "75327c6b667828ddc28f5e3f169036cb793c3f588d83bf0f262a7f062ffed3c8" dependencies = [ "once_cell", "opentelemetry", + "opentelemetry_sdk", + "smallvec", "tracing", "tracing-core", "tracing-log", @@ -5247,7 +4935,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9bc58223383423483e4bc056c7e7b3f77bdee924a9d33834112c69ead06dc847" dependencies = [ - "bindgen 0.59.2", + "bindgen", "cc", "cfg-if 1.0.0", "fnv", @@ -5298,9 +4986,9 @@ dependencies = [ [[package]] name = "trust-dns-proto" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26" +checksum = "0dc775440033cb114085f6f2437682b194fa7546466024b1037e82a48a052a69" dependencies = [ "async-trait", "cfg-if 1.0.0", @@ -5309,10 +4997,10 @@ dependencies = [ "futures-channel", "futures-io", "futures-util", - "idna 0.2.3", + "idna", "ipnet", - "lazy_static", - "rand 0.8.5", + "once_cell", + "rand", "smallvec", "thiserror", "tinyvec", @@ -5323,16 +5011,17 @@ dependencies = [ [[package]] name = "trust-dns-resolver" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aff21aa4dcefb0a1afbfac26deb0adc93888c7d295fb63ab273ef276ba2b7cfe" +checksum = "2dff7aed33ef3e8bf2c9966fccdfed93f93d46f432282ea875cd66faabc6ef2f" dependencies = [ "cfg-if 1.0.0", "futures-util", "ipconfig", - "lazy_static", "lru-cache", + "once_cell", "parking_lot 0.12.1", + "rand", "resolv-conf", "smallvec", "thiserror", @@ -5348,22 +5037,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] -name = "tungstenite" -version = "0.11.1" +name = "tsify" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0308d80d86700c5878b9ef6321f020f29b1bb9d5ff3cab25e75e23f3a492a23" +checksum = "d6b26cf145f2f3b9ff84e182c448eaf05468e247f148cf3d2a7d67d78ff023a0" dependencies = [ - "base64 0.12.3", - "byteorder", - "bytes 0.5.6", - "http", - "httparse", - "input_buffer", - "log", - "rand 0.7.3", - "sha-1", - "url", - "utf-8", + "gloo-utils 0.1.7", + "serde", + "serde-wasm-bindgen 0.5.0", + "serde_json", + "tsify-macros", + "wasm-bindgen", +] + +[[package]] +name = "tsify-macros" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a94b0f0954b3e59bfc2c246b4c8574390d94a4ad4ad246aaf2fb07d7dfd3b47" +dependencies = [ + "proc-macro2", + "quote", + "serde_derive_internals 0.28.0", + "syn 2.0.36", ] [[package]] @@ -5373,12 +5069,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e862a1c4128df0112ab625f55cd5c934bcb4312ba80b39ae4b4835a3fd58e649" dependencies = [ "byteorder", - "bytes 1.4.0", + "bytes", "data-encoding", "http", "httparse", "log", - "rand 0.8.5", + "rand", "sha1", "thiserror", "url", @@ -5387,9 +5083,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "ucd-trie" @@ -5405,9 +5101,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" @@ -5465,11 +5161,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", - "idna 0.4.0", + "idna", "percent-encoding", ] [[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + +[[package]] name = "utf-8" version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5513,13 +5215,13 @@ checksum = "a9ee584edf237fac328b891dd06c21e7914a1db3762907edc366a13803451fe3" [[package]] name = "veilid-cli" -version = "0.2.1" +version = "0.2.3" dependencies = [ "arboard", "async-std", - "async-tungstenite 0.8.0", + "async-tungstenite", "cfg-if 1.0.0", - "clap 4.4.2", + "clap 4.4.3", "config", "crossbeam-channel", "cursive", @@ -5527,7 +5229,7 @@ dependencies = [ "cursive_buffered_backend", "cursive_table_view", "data-encoding", - "directories 4.0.1", + "directories", "flexi_logger", "flume", "futures", @@ -5538,7 +5240,7 @@ dependencies = [ "parking_lot 0.12.1", "serde", "serde_derive", - "serial_test 0.10.0", + "serial_test", "stop-token", "thiserror", "tokio", @@ -5549,7 +5251,7 @@ dependencies = [ [[package]] name = "veilid-core" -version = "0.2.1" +version = "0.2.3" dependencies = [ "argon2", "async-io", @@ -5557,7 +5259,7 @@ dependencies = [ "async-std", "async-std-resolver", "async-tls", - "async-tungstenite 0.23.0", + "async-tungstenite", "async_executors", "backtrace", "blake3", @@ -5571,15 +5273,14 @@ dependencies = [ "console_error_panic_hook", "curve25519-dalek", "data-encoding", - "directories 5.0.1", + "directories", "ed25519-dalek", "enum-as-inner", "enumset", "eyre", "flume", "futures-util", - "generic-array 0.14.7", - "getrandom 0.2.10", + "getrandom", "hex", "ifstructs", "jni", @@ -5598,7 +5299,7 @@ dependencies = [ "ndk-glue", "netlink-packet-route", "netlink-sys", - "nix 0.26.4", + "nix 0.27.1", "num-traits", "once_cell", "owning_ref", @@ -5614,11 +5315,12 @@ dependencies = [ "send_wrapper 0.6.0", "serde", "serde-big-array", + "serde-wasm-bindgen 0.6.0", "serde_json", - "serial_test 2.0.0", + "serial_test", "shell-words", "simplelog", - "socket2 0.5.3", + "socket2 0.5.4", "static_assertions", "stop-token", "thiserror", @@ -5631,6 +5333,7 @@ dependencies = [ "tracing-subscriber", "tracing-wasm", "trust-dns-resolver", + "tsify", "veilid-bugsalot", "veilid-hashlink", "veilid-igd", @@ -5653,7 +5356,7 @@ dependencies = [ [[package]] name = "veilid-flutter" -version = "0.2.1" +version = "0.2.3" dependencies = [ "allo-isolate", "async-std", @@ -5698,27 +5401,27 @@ checksum = "28428a3f826ed334f995522e554d7c8c1a5a0e0a0248fc795a31022ddf436c9d" dependencies = [ "attohttpc", "log", - "rand 0.8.5", + "rand", "url", "xmltree", ] [[package]] name = "veilid-server" -version = "0.2.1" +version = "0.2.3" dependencies = [ "ansi_term", "async-std", - "async-tungstenite 0.23.0", + "async-tungstenite", "backtrace", "cfg-if 1.0.0", - "clap 4.4.2", + "clap 4.4.3", "color-eyre", "config", "console-subscriber", "ctrlc", "daemonize", - "directories 4.0.1", + "directories", "flume", "futures-util", "hostname", @@ -5733,7 +5436,7 @@ dependencies = [ "serde", "serde_derive", "serde_yaml", - "serial_test 0.10.0", + "serial_test", "signal-hook", "signal-hook-async-std", "stop-token", @@ -5755,7 +5458,7 @@ dependencies = [ [[package]] name = "veilid-tools" -version = "0.2.1" +version = "0.2.3" dependencies = [ "android_logger 0.13.3", "async-lock", @@ -5769,7 +5472,7 @@ dependencies = [ "flume", "fn_name", "futures-util", - "getrandom 0.2.10", + "getrandom", "jni", "jni-sys", "js-sys", @@ -5778,16 +5481,16 @@ dependencies = [ "log", "ndk", "ndk-glue", - "nix 0.26.4", + "nix 0.27.1", "once_cell", "oslog", "paranoid-android", "parking_lot 0.12.1", - "rand 0.8.5", - "rand_core 0.6.4", + "rand", + "rand_core", "range-set-blaze", "send_wrapper 0.6.0", - "serial_test 2.0.0", + "serial_test", "simplelog", "static_assertions", "stop-token", @@ -5807,21 +5510,24 @@ dependencies = [ [[package]] name = "veilid-wasm" -version = "0.2.1" +version = "0.2.3" dependencies = [ "cfg-if 1.0.0", "console_error_panic_hook", "data-encoding", "futures-util", - "gloo-utils", + "gloo-utils 0.2.0", "js-sys", "lazy_static", + "parking_lot 0.12.1", "send_wrapper 0.6.0", "serde", + "serde-wasm-bindgen 0.6.0", "serde_json", "tracing", "tracing-subscriber", "tracing-wasm", + "tsify", "veilid-core", "wasm-bindgen", "wasm-bindgen-futures", @@ -5849,9 +5555,9 @@ checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" [[package]] name = "walkdir" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", "winapi-util", @@ -5868,18 +5574,6 @@ dependencies = [ [[package]] name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - -[[package]] -name = "wasi" version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" @@ -5907,7 +5601,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.36", "wasm-bindgen-shared", ] @@ -5941,7 +5635,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.36", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -6059,13 +5753,14 @@ dependencies = [ [[package]] name = "which" -version = "4.4.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" dependencies = [ "either", - "libc", + "home", "once_cell", + "rustix 0.38.13", ] [[package]] @@ -6368,7 +6063,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96" dependencies = [ "curve25519-dalek", - "rand_core 0.6.4", + "rand_core", "serde", "zeroize", ] @@ -6381,9 +6076,9 @@ checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a" [[package]] name = "xml-rs" -version = "0.8.16" +version = "0.8.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47430998a7b5d499ccee752b41567bc3afc57e1327dc855b1a2aa44ce29b5fa1" +checksum = "bab77e97b50aee93da431f2cee7cd0f43b4d1da3c408042f2d7d164187774f0a" [[package]] name = "xmltree" @@ -6413,7 +6108,7 @@ dependencies = [ "byteorder", "derivative", "enumflags2", - "fastrand 1.9.0", + "fastrand", "futures", "nb-connect", "nix 0.22.3", @@ -6455,7 +6150,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.36", ] [[package]] diff --git a/pkgs/tools/networking/veilid/default.nix b/pkgs/tools/networking/veilid/default.nix index 7a859c7283f4a..66237d4ca789b 100644 --- a/pkgs/tools/networking/veilid/default.nix +++ b/pkgs/tools/networking/veilid/default.nix @@ -10,23 +10,23 @@ rustPlatform.buildRustPackage rec { pname = "veilid"; - version = "0.2.1"; + version = "0.2.3"; src = fetchFromGitLab { owner = "veilid"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ebWY/1LTLwi1YFHliPDracdF0WLfY047jUtQ/1w9Rjw="; + sha256 = "sha256-fpA0JsBp2mlyDWlwE6xgyX5KNI2FSypO6m1J9BI+Kjs="; }; cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "cursive-0.20.0" = "sha256-jETyRRnzt7OMkTo4LRfeRr37oPJpn9R2soxkH7tzGy8="; - "cursive-flexi-logger-view-0.5.0" = "sha256-zFpfVFNZNNdNMdpJbaT4O2pMYccGEAGnvYzpRziMwfQ="; - "cursive_buffered_backend-0.6.1" = "sha256-+sTJnp570HupwaJxV2x+oKyLwNmqQ4HqOH2P1s9Hhw8="; - }; - }; + lockFile = ./Cargo.lock; + outputHashes = { + "cursive-0.20.0" = "sha256-jETyRRnzt7OMkTo4LRfeRr37oPJpn9R2soxkH7tzGy8="; + "cursive-flexi-logger-view-0.5.0" = "sha256-zFpfVFNZNNdNMdpJbaT4O2pMYccGEAGnvYzpRziMwfQ="; + "cursive_buffered_backend-0.6.1" = "sha256-+sTJnp570HupwaJxV2x+oKyLwNmqQ4HqOH2P1s9Hhw8="; + }; + }; nativeBuildInputs = [ capnproto @@ -51,6 +51,6 @@ rustPlatform.buildRustPackage rec { description = "An open-source, peer-to-peer, mobile-first, networked application framework"; homepage = "https://veilid.com"; license = licenses.mpl20; - maintainers = with maintainers; [ bbigras ]; + maintainers = with maintainers; [ bbigras qbit ]; }; } diff --git a/pkgs/tools/networking/vlan/default.nix b/pkgs/tools/networking/vlan/default.nix index 8ddbb83463477..aff4ebd09f370 100644 --- a/pkgs/tools/networking/vlan/default.nix +++ b/pkgs/tools/networking/vlan/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.9"; src = fetchurl { - url = "mirror://gentoo/distfiles/vlan.${version}.tar.gz"; + url = "https://www.candelatech.com/~greear/${pname}/${pname}.${version}.tar.gz"; sha256 = "1jjc5f26hj7bk8nkjxsa8znfxcf8pgry2ipnwmj2fr6ky0dhm3rv"; }; diff --git a/pkgs/tools/networking/waitron/default.nix b/pkgs/tools/networking/waitron/default.nix index c316e98317e75..7ad9ed77a7d57 100644 --- a/pkgs/tools/networking/waitron/default.nix +++ b/pkgs/tools/networking/waitron/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { sha256 = "sha256-ZkGhEOckIOYGb6Yjr4I4e9cjAHDfksRwHW+zgOMZ/FE="; }; - vendorSha256 = null; #vendorSha256 = ""; + vendorHash = null; subPackages = [ "." ]; diff --git a/pkgs/tools/networking/xdp-tools/default.nix b/pkgs/tools/networking/xdp-tools/default.nix index b14dd819e434a..d3eb90f258ba1 100644 --- a/pkgs/tools/networking/xdp-tools/default.nix +++ b/pkgs/tools/networking/xdp-tools/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , libbpf , elfutils , zlib @@ -16,23 +15,15 @@ }: stdenv.mkDerivation rec { pname = "xdp-tools"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "xdp-project"; repo = "xdp-tools"; rev = "v${version}"; - sha256 = "ctggXzc3qA+m2/nJ9lmR/pERj0YyPko3MTttm8e85cU="; + hash = "sha256-XZGbfXQM3catiDavzi2vY5s+EMVgGHq/ju32lBIgg8E="; }; - patches = [ - # Fix function detection for btf__type_cnt() - (fetchpatch { - url = "https://github.com/xdp-project/xdp-tools/commit/a7df567634af77381832a2212c5f5099b07734f3.patch"; - sha256 = "n6qG/bojSGUowrAaJWxecYpWdv9OceHkoaGlhbl81hA="; - }) - ]; - outputs = [ "out" "lib" ]; buildInputs = [ diff --git a/pkgs/tools/networking/zrok/default.nix b/pkgs/tools/networking/zrok/default.nix index fa59d9f7ddf29..49a495493d88a 100644 --- a/pkgs/tools/networking/zrok/default.nix +++ b/pkgs/tools/networking/zrok/default.nix @@ -11,14 +11,14 @@ let }.${system} or throwSystem; sha256 = { - x86_64-linux = "sha256-lI9FmAvUTzfukxyhjbB4mULURSQNhLcLbZ0NzIDem0g="; - aarch64-linux = "sha256-A77yPDC3MVDhc4Le+1XmHl/HRc0keYDfnS3kM1hQYL4="; - armv7l-linux = "sha256-khl0g8IDHtB53Sg4IdRzQs7A+FmUZyT/1dpKVTGnMs8="; + x86_64-linux = "sha256-w3BF5Zu68e7X6vfkJhUTS6wkg7LSFZunx9dnBA2Ao5c="; + aarch64-linux = "sha256-hJiXDydUF750mTsFIXH6X8AjzjaG2Iaa+TzsCCCVAvs="; + armv7l-linux = "sha256-lEPo6Y+cqlG2QflwJdG/MNqFLMPdwQLI0+TC/VVlGV4="; }.${system} or throwSystem; in stdenv.mkDerivation rec { pname = "zrok"; - version = "0.4.5"; + version = "0.4.6"; src = fetchzip { url = "https://github.com/openziti/zrok/releases/download/v${version}/zrok_${version}_${plat}.tar.gz"; diff --git a/pkgs/tools/nix/nix-output-monitor/generated-package.nix b/pkgs/tools/nix/nix-output-monitor/generated-package.nix index 8d9ae67ff9c4f..7d993282601ba 100644 --- a/pkgs/tools/nix/nix-output-monitor/generated-package.nix +++ b/pkgs/tools/nix/nix-output-monitor/generated-package.nix @@ -38,10 +38,10 @@ }: mkDerivation { pname = "nix-output-monitor"; - version = "2.0.0.6"; + version = "2.0.0.7"; src = fetchzip { - url = "https://github.com/maralorn/nix-output-monitor/archive/refs/tags/v2.0.0.6.tar.gz"; - sha256 = "1adxg2bws7fqbmzfna5hr28fh8j10gvf57j6b0xbkhh4hgj4h9xd"; + url = "https://github.com/maralorn/nix-output-monitor/archive/refs/tags/v2.0.0.7.tar.gz"; + sha256 = "1b2c9kfz80rv2r1s7h6iikyq3bn32h1fv2yq65wkhg3in7qg49jp"; }; isLibrary = true; isExecutable = true; diff --git a/pkgs/tools/nix/nixos-generators/default.nix b/pkgs/tools/nix/nixos-generators/default.nix index bf3a387c439fb..b4d3581a0ebc0 100644 --- a/pkgs/tools/nix/nixos-generators/default.nix +++ b/pkgs/tools/nix/nixos-generators/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "nixos-generators"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixos-generators"; rev = version; - sha256 = "sha256-WecDwDY/hEcDQYzFnccCNa+5Umht0lfjx/d1qGDy/rQ="; + sha256 = "sha256-wHmtB5H8AJTUaeGHw+0hsQ6nU4VyvVrP2P4NeCocRzY="; }; strictDeps = true; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/package-management/apt/default.nix b/pkgs/tools/package-management/apt/default.nix index 74676827fb954..60bd420f1548e 100644 --- a/pkgs/tools/package-management/apt/default.nix +++ b/pkgs/tools/package-management/apt/default.nix @@ -82,6 +82,6 @@ stdenv.mkDerivation rec { changelog = "https://salsa.debian.org/apt-team/apt/-/raw/${version}/debian/changelog"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/package-management/apx/default.nix b/pkgs/tools/package-management/apx/default.nix index e1f134a2f5f9a..9c58e5e085048 100644 --- a/pkgs/tools/package-management/apx/default.nix +++ b/pkgs/tools/package-management/apx/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { hash = "sha256-nBhSl4r7LlgCA5/HCLpOleihE5n/JCJgf43KdCklQbg="; }; - vendorSha256 = null; + vendorHash = null; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index 05a9e45c95622..15e5f3e0e9478 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "disnixos"; - version = "0.9.3"; + version = "0.9.4"; src = fetchurl { url = "https://github.com/svanderburg/disnixos/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "0nm7g184xh6xzjz4a40a7kgfnpmq043x6v0cynpffa6wd9jv89s9"; + sha256 = "0adv6dm6hszjhzkfkw48pmi37zj32plcibk80r6bm907mm7n50lj"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index f07aade89ca15..48d1b79651121 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -40,10 +40,10 @@ assert enableXinetdService -> xinetd != null; stdenv.mkDerivation rec { pname = "dysnomia"; - version = "0.10.1"; + version = "0.10.2"; src = fetchurl { url = "https://github.com/svanderburg/dysnomia/releases/download/dysnomia-${version}/dysnomia-${version}.tar.gz"; - sha256 = "0w9601g8zpaxrmynx6mh8zz85ldpb8psp7cc6ls8v3srjpj1l5n3"; + sha256 = "08ijqbijs2h584dvsb3z858ha385fqd5jfxc51lks9lxxv0sfkr4"; }; configureFlags = [ diff --git a/pkgs/tools/package-management/dnf5/default.nix b/pkgs/tools/package-management/dnf5/default.nix index 1234ddd76d300..3d6119f51ccab 100644 --- a/pkgs/tools/package-management/dnf5/default.nix +++ b/pkgs/tools/package-management/dnf5/default.nix @@ -8,10 +8,8 @@ , pkg-config , cppunit , fmt -, glib , json_c , libmodulemd -, libpeas , librepo , libsmartcols , libsolv @@ -26,23 +24,21 @@ stdenv.mkDerivation (finalAttrs: { pname = "dnf5"; - version = "5.1.3"; + version = "5.1.4"; src = fetchFromGitHub { owner = "rpm-software-management"; repo = "dnf5"; rev = finalAttrs.version; - hash = "sha256-Z1Pbi3dGqAQeVaagpOUsjYsT46DAlcFHsDhQzyeCCfY="; + hash = "sha256-zQK7RRn2C/6Avu5oPqSW7KVv6JT3s2hrcgBRkP6055U="; }; nativeBuildInputs = [ cmake createrepo_c gettext help2man pkg-config ]; buildInputs = [ cppunit fmt - glib json_c libmodulemd - libpeas librepo libsmartcols libsolv diff --git a/pkgs/tools/package-management/holo-build/default.nix b/pkgs/tools/package-management/holo-build/default.nix index 6fa3887b9e2db..fca55807f516c 100644 --- a/pkgs/tools/package-management/holo-build/default.nix +++ b/pkgs/tools/package-management/holo-build/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { --replace '/usr/lib/holo/holo-build' '${placeholder "out"}/lib/holo/holo-build' ''; - vendorSha256 = null; + vendorHash = null; nativeBuildInputs = [ installShellFiles perl ]; diff --git a/pkgs/tools/package-management/morph/default.nix b/pkgs/tools/package-management/morph/default.nix index ec2e63fe39729..dfb41df33708f 100644 --- a/pkgs/tools/package-management/morph/default.nix +++ b/pkgs/tools/package-management/morph/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "dbcdk"; repo = "morph"; rev = "v${version}"; - sha256 = "sha256-0CHmjqPxBgALGZYjfJFLoLBnoI0U7oZ8WyCtu1bkzZg="; + hash = "sha256-0CHmjqPxBgALGZYjfJFLoLBnoI0U7oZ8WyCtu1bkzZg="; }; - vendorSha256 = "08zzp0h4c4i5hk4whz06a3da7qjms6lr36596vxz0d8q0n7rspr9"; + vendorHash = "sha256-KV+djwUYNfD7NqmYkanRVeKj2lAGfMjJhCUSRiC4/yM="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index f1bad0bf7f4e0..2f775a35627b6 100644 --- a/pkgs/tools/package-management/nfpm/default.nix +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "nfpm"; - version = "2.32.0"; + version = "2.33.1"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - hash = "sha256-qxxa7V96cJJLu9Ki2NL5UreRyiR9sPhIVA9cllF4y70="; + hash = "sha256-5CNN0aKy9FnoqRwhbNVTUs04q+hkzoAWlDuDKMeT+1s="; }; - vendorHash = "sha256-lVejUufXI5Ihv7hU1N8/MHrwUgIfaHmcj1MR0RTsKVU="; + vendorHash = "sha256-P96qMc9KHDMreuPI3xY/yI/+8qp/znQM/O2B6t6iFug="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/pkgs/tools/package-management/nix-update/default.nix b/pkgs/tools/package-management/nix-update/default.nix index c0030fcf8a605..755286ec87054 100644 --- a/pkgs/tools/package-management/nix-update/default.nix +++ b/pkgs/tools/package-management/nix-update/default.nix @@ -9,14 +9,14 @@ python3.pkgs.buildPythonApplication rec { pname = "nix-update"; - version = "0.19.3"; + version = "1.0.0"; pyproject = true; src = fetchFromGitHub { owner = "Mic92"; repo = pname; rev = version; - hash = "sha256-+WD+SV/L3TvksWBIg6jk+T0dUTNdp4VKONzdzVT+pac="; + hash = "sha256-C7ke51QlBcTR98ovQi5NcxToEPP6s9gqnxWO1eBw/sI="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index a6f0ac7be39ef..6a2b2948ff957 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -191,6 +191,11 @@ in lib.makeExtensible (self: ({ hash = "sha256-QMYAkdtU+g9HlZKtoJ+AI6TbWzzovKGnPZJHfZdclc8="; }; + nix_2_18 = common { + version = "2.18.1"; + hash = "sha256-WNmifcTsN9aG1ONkv+l2BC4sHZZxtNKy0keqBHXXQ7w="; + }; + # The minimum Nix version supported by Nixpkgs # Note that some functionality *might* have been backported into this Nix version, # making this package an inaccurate representation of what features are available diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/tools/package-management/pdm/default.nix index 15489ce50a99b..bc6c2be1060d0 100644 --- a/pkgs/tools/package-management/pdm/default.nix +++ b/pkgs/tools/package-management/pdm/default.nix @@ -31,13 +31,13 @@ in with python.pkgs; buildPythonApplication rec { pname = "pdm"; - version = "2.9.1"; + version = "2.9.3"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-/IAU3S/7cnF5qOwCQ8+sntOp3EU0i+HX+X0fKQrWD8s="; + hash = "sha256-CxGVtR6WMLWgsGPyffywEgy26ihPGkzZdaOibwhW0lM="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/package-management/pkg/default.nix b/pkgs/tools/package-management/pkg/default.nix index 800400ba93c4f..07d42879c8968 100644 --- a/pkgs/tools/package-management/pkg/default.nix +++ b/pkgs/tools/package-management/pkg/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pkg"; - version = "1.20.5"; + version = "1.20.7"; src = fetchFromGitHub { owner = "freebsd"; repo = "pkg"; rev = finalAttrs.version; - sha256 = "sha256-svAxEBRnqwWhmu3aRfeGeEjXfADbb1zWPj+REK9fsDM="; + sha256 = "sha256-k7QDdHwxM1RYoZy37rzhJunk3RQXVC3rkdoXUVL00wQ="; }; setOutputFlags = false; diff --git a/pkgs/tools/package-management/repro-get/default.nix b/pkgs/tools/package-management/repro-get/default.nix index b17e345a1a2b2..bb619874d7b0f 100644 --- a/pkgs/tools/package-management/repro-get/default.nix +++ b/pkgs/tools/package-management/repro-get/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "repro-get"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "reproducible-containers"; repo = "repro-get"; rev = "v${version}"; - sha256 = "sha256-Ij74EQz5NreOhjz6XPAriYUb5iNT4E+w5vO5uzjzFR4="; + sha256 = "sha256-qLu9SZuHCkKAOhzrBPEEev1iD5mcIBvrbXspHtifsq4="; }; - vendorHash = "sha256-Tev6MaquEup5EN7aeIA1wzc08kqLtvLuUz7U8o7CW04="; + vendorHash = "sha256-clpQLRozXFeUGrItL2pfNft2hUNyuyeCP9oMQxagAWs="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/package-management/zkg/default.nix b/pkgs/tools/package-management/zkg/default.nix index 8abd58f7da4f4..9d6700469722c 100644 --- a/pkgs/tools/package-management/zkg/default.nix +++ b/pkgs/tools/package-management/zkg/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "zkg"; - version = "2.13.0"; + version = "2.14.0"; format = "setuptools"; src = fetchFromGitHub { owner = "zeek"; repo = "package-manager"; rev = "refs/tags/v${version}"; - hash = "sha256-kQFm8VlbvJ791Ll8b0iu6xqaxhYTf41jTmvGxLgIzuE="; + hash = "sha256-HdOzxSU3XWz1ZH96woDWrHzKbpJW3/IKkpc2tGfyi9o="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/security/agebox/default.nix b/pkgs/tools/security/agebox/default.nix index 9e0c7c48e5921..ea50c8779b3da 100644 --- a/pkgs/tools/security/agebox/default.nix +++ b/pkgs/tools/security/agebox/default.nix @@ -8,12 +8,14 @@ buildGoModule rec { owner = "slok"; repo = pname; rev = "v${version}"; - sha256 = "1gi6lj3dpckhsx6hdpdnr8rclqgfkbdmkzx966nlxyi52bjfzbsv"; + hash = "sha256-W6/v5BIl+k6tMan/Wdua7mHKMsq23QZN13Cy24akJr4="; }; - vendorSha256 = "1jwzx6hp04y8hfpwfvf9zmhqjj3ghvr3gmgnllpcff1lai78vdrw"; + + vendorHash = "sha256-PLeNTlQ0OMcupfbVN/KGb0iJYf3Jbcevg8gTcKHpn8s="; ldflags = [ - "-s" "-w" + "-s" + "-w" "-X main.Version=${version}" ]; diff --git a/pkgs/tools/security/arti/default.nix b/pkgs/tools/security/arti/default.nix index 6ba0e0a0f57b9..0ed6ca8a25d8a 100644 --- a/pkgs/tools/security/arti/default.nix +++ b/pkgs/tools/security/arti/default.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { pname = "arti"; - version = "1.1.8"; + version = "1.1.9"; src = fetchFromGitLab { domain = "gitlab.torproject.org"; @@ -18,10 +18,10 @@ rustPlatform.buildRustPackage rec { owner = "core"; repo = "arti"; rev = "arti-v${version}"; - sha256 = "sha256-+Y41jhMEzcNyA9U0zsvVyR9f1dEV94hFNR8SxiJ6hCk="; + sha256 = "sha256-nce+WpT9uloO9Ce/h1ziPWJhYMcL4yZvYO1EP8AEfxI="; }; - cargoHash = "sha256-MF2WPUs0MvhN3MSmey7ziPPwZz8zkn2D3G2WDgXn+hs="; + cargoHash = "sha256-Qqm39QK+/rCmad3dJLVPGd7ZKP8ldtFI+NnxC6iQUBA="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; diff --git a/pkgs/tools/security/asnmap/default.nix b/pkgs/tools/security/asnmap/default.nix index 2295d183ea84e..b2c58136d9a81 100644 --- a/pkgs/tools/security/asnmap/default.nix +++ b/pkgs/tools/security/asnmap/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "asnmap"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-J5Dn5eDzwj+ApwQ3ibTsMbwCobRAb1Cli+hbf74I9VQ="; + hash = "sha256-JdbKFc374U/MjRiLUbVOqb7qeFYpvMevUdis7GDZz3Y="; }; - vendorHash = "sha256-0vU7YWZKiqi3WsjSTNvtUiskIczADgfRRC7rwCx8ho4="; + vendorHash = "sha256-3/R8dhaJnoAsJgD4pqZ7etTXDFZnhW9sbUrnGp4md5o="; # Tests require network access doCheck = false; diff --git a/pkgs/tools/security/b3sum/default.nix b/pkgs/tools/security/b3sum/default.nix index c7634b790ef6c..858226fb569bd 100644 --- a/pkgs/tools/security/b3sum/default.nix +++ b/pkgs/tools/security/b3sum/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "b3sum"; - version = "1.4.1"; + version = "1.5.0"; src = fetchCrate { inherit version pname; - sha256 = "sha256-cVl0thk+ENZEhTRvFvtAnHIWM8LzKDKEVSVyI22fh2I="; + sha256 = "sha256-yjMuXL0eW+6mm26LgIjD22WyTjb+KMjKRI68mpGGAZA="; }; - cargoHash = "sha256-v175TKlCZ9Vdd1L2IHv2YX406ZkxRXJmZFKBIMab2gg="; + cargoHash = "sha256-Ka+5RKRSVQYoLFXE1bEc6fGFQcbrFTVgi6yAoGIDdUI="; meta = { description = "BLAKE3 cryptographic hash function"; diff --git a/pkgs/tools/security/beyond-identity/default.nix b/pkgs/tools/security/beyond-identity/default.nix index 46ed84078c2d9..31b3439f0e876 100644 --- a/pkgs/tools/security/beyond-identity/default.nix +++ b/pkgs/tools/security/beyond-identity/default.nix @@ -22,7 +22,7 @@ let src = fetchurl { url = "https://packages.beyondidentity.com/public/linux-authenticator/deb/ubuntu/pool/focal/main/b/be/${pname}_${version}/${pname}_${version}_amd64.deb"; - sha512 = "sha512-JrHLf7KkJVbJLxx54OTvOSaIzY3+hjX+bpkeBHKX23YriCJssUUvEP6vlbI4r6gjMMFMhW92k0iikAgD1Tr4ug=="; + hash = "sha512-JrHLf7KkJVbJLxx54OTvOSaIzY3+hjX+bpkeBHKX23YriCJssUUvEP6vlbI4r6gjMMFMhW92k0iikAgD1Tr4ug=="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/biscuit-cli/default.nix b/pkgs/tools/security/biscuit-cli/default.nix index d7150ff353fa8..74dac8b565860 100644 --- a/pkgs/tools/security/biscuit-cli/default.nix +++ b/pkgs/tools/security/biscuit-cli/default.nix @@ -8,20 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "biscuit-cli"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "biscuit-auth"; repo = "biscuit-cli"; rev = version; - sha256 = "sha256-Fd5wBvQe7S/UZ42FMlU+f9qTwcLIMnQrCWVRoHxOx64="; + sha256 = "sha256-Mvrv3BU0Pw85fs8IbjMKSQLIhtU6SKoLC0cuGdhfAYs="; }; - cargoHash = "sha256-SHRqdKRAHkWK/pEVFYo3d+r761K4j9BkTg2angQOubk="; - - # Version option does not report the correct version - # https://github.com/biscuit-auth/biscuit-cli/issues/44 - patches = [ ./version-0.4.0.patch ]; + cargoHash = "sha256-tgmM0rswIFrpFyupaASTXYvIyhVu0fXJJN+hg0p+vrQ="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/tools/security/biscuit-cli/version-0.4.0.patch b/pkgs/tools/security/biscuit-cli/version-0.4.0.patch deleted file mode 100644 index d2ed06f211ca5..0000000000000 --- a/pkgs/tools/security/biscuit-cli/version-0.4.0.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/cli.rs b/src/cli.rs -index f40cfc7..d587eeb 100644 ---- a/src/cli.rs -+++ b/src/cli.rs -@@ -89,7 +89,7 @@ fn parse_param(kv: &str) -> Result<Param, std::io::Error> { - - /// biscuit creation and inspection CLI. Run `biscuit --help` to see what's available. - #[derive(Parser)] --#[clap(version = "0.2.0", author = "Clément D. <clement@delafargue.name>")] -+#[clap(version = "0.4.0", author = "Clément D. <clement@delafargue.name>")] - pub struct Opts { - #[clap(subcommand)] - pub subcmd: SubCommand, diff --git a/pkgs/tools/security/bitwarden/cli.nix b/pkgs/tools/security/bitwarden/cli.nix index 22cfca2497184..6e4ebb9d0987b 100644 --- a/pkgs/tools/security/bitwarden/cli.nix +++ b/pkgs/tools/security/bitwarden/cli.nix @@ -12,16 +12,16 @@ let buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_18; }; in buildNpmPackage' rec { pname = "bitwarden-cli"; - version = "2023.8.2"; + version = "2023.9.0"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "cli-v${version}"; - hash = "sha256-v9ql01dwWf9kBxw75n9svQousrnbUi8NY1wkJx06teg="; + hash = "sha256-s9jj1qmh4aCvtVY85U4AU7pcc8ABu9essFYqwf64dns="; }; - npmDepsHash = "sha256-RvkauNvt6MZxWMssEtaCjXP1z/3NsReywUgCefV/jjM="; + npmDepsHash = "sha256-0q3XoC87kfC2PYMsNse4DV8M8OXjckiLTdN3LK06lZY="; nativeBuildInputs = [ python3 diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index fae9848f482fc..41ce0d7e5e892 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -1,6 +1,7 @@ { lib , applyPatches , buildNpmPackage +, cargo , dbus , electron_24 , fetchFromGitHub @@ -12,11 +13,12 @@ , makeDesktopItem , makeWrapper , moreutils +, napi-rs-cli , nodejs_18 , pkg-config , python3 +, rustc , rustPlatform -, wrapGAppsHook }: let @@ -26,56 +28,6 @@ let buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_18; }; electron = electron_24; - version = "2023.8.3"; - src = applyPatches { - src = fetchFromGitHub { - owner = "bitwarden"; - repo = "clients"; - rev = "desktop-v${version}"; - hash = "sha256-ZsAc9tC087Em/VzgaVm5fU+JnI4gIsSAphxicdJWztU="; - }; - - patches = [ ]; - }; - - desktop-native = rustPlatform.buildRustPackage { - pname = "bitwarden-desktop-native"; - inherit src version; - sourceRoot = "${src.name}/apps/desktop/desktop_native"; - cargoHash = "sha256-iBZvdBfuZtcoSgyU4B58ARIBplqUuT5bRev9qnk9LpE="; - - nativeBuildInputs = [ - pkg-config - wrapGAppsHook - ]; - - buildInputs = [ - glib - gtk3 - libsecret - ]; - - nativeCheckInputs = [ - dbus - (gnome.gnome-keyring.override { useWrappedDaemon = false; }) - ]; - - checkFlags = [ - "--skip=password::password::tests::test" - ]; - - checkPhase = '' - runHook preCheck - - export HOME=$(mktemp -d) - export -f cargoCheckHook runHook _eval _callImplicitHook - dbus-run-session \ - --config-file=${dbus}/share/dbus-1/session.conf \ - -- bash -e -c cargoCheckHook - runHook postCheck - ''; - }; - desktopItem = makeDesktopItem { name = "bitwarden"; exec = "bitwarden %U"; @@ -84,26 +36,48 @@ let desktopName = "Bitwarden"; categories = [ "Utility" ]; }; - -in - -buildNpmPackage' { +in buildNpmPackage' rec { pname = "bitwarden"; - inherit src version; + version = "2023.9.0"; + + src = fetchFromGitHub { + owner = "bitwarden"; + repo = "clients"; + rev = "desktop-v${version}"; + hash = "sha256-8rNJmDpKLzTre5c2wktle7tthp1owZK5WAQP80/2R0g="; + }; makeCacheWritable = true; - npmBuildFlags = [ - "--workspace apps/desktop" - ]; - npmDepsHash = "sha256-ARq6iYOkL9CMyAX37g8+Wf+UQsH7hU1jCq/52I1qS9A="; + npmWorkspace = "apps/desktop"; + npmDepsHash = "sha256-0q3XoC87kfC2PYMsNse4DV8M8OXjckiLTdN3LK06lZY="; + + cargoDeps = rustPlatform.fetchCargoTarball { + name = "${pname}-${version}"; + inherit src; + sourceRoot = "${src.name}/${cargoRoot}"; + hash = "sha256-YF3UHQWCSuWAg2frE8bo1XrLn44P6+1A7YUh4RZxwo0="; + }; + cargoRoot = "apps/desktop/desktop_native"; - ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; nativeBuildInputs = [ + cargo jq makeWrapper moreutils + napi-rs-cli + pkg-config python3 + rustc + rustPlatform.cargoCheckHook + rustPlatform.cargoSetupHook + ]; + + buildInputs = [ + glib + gtk3 + libsecret ]; preBuild = '' @@ -111,15 +85,14 @@ buildNpmPackage' { echo 'ERROR: electron version mismatch' exit 1 fi - - jq 'del(.scripts.postinstall)' apps/desktop/package.json | sponge apps/desktop/package.json - jq '.scripts.build = ""' apps/desktop/desktop_native/package.json | sponge apps/desktop/desktop_native/package.json - cp ${desktop-native}/lib/libdesktop_native.so apps/desktop/desktop_native/desktop_native.linux-x64-musl.node ''; postBuild = '' pushd apps/desktop + # desktop_native/index.js loads a file of that name regarldess of the libc being used + mv desktop_native/desktop_native.* desktop_native/desktop_native.linux-x64-musl.node + npm exec electron-builder -- \ --dir \ -c.electronDist=${electron}/libexec/electron \ @@ -128,6 +101,32 @@ buildNpmPackage' { popd ''; + doCheck = true; + + nativeCheckInputs = [ + dbus + (gnome.gnome-keyring.override { useWrappedDaemon = false; }) + ]; + + checkFlags = [ + "--skip=password::password::tests::test" + ]; + + checkPhase = '' + runHook preCheck + + pushd ${cargoRoot} + export HOME=$(mktemp -d) + export -f cargoCheckHook runHook _eval _callImplicitHook + export cargoCheckType=release + dbus-run-session \ + --config-file=${dbus}/share/dbus-1/session.conf \ + -- bash -e -c cargoCheckHook + popd + + runHook postCheck + ''; + installPhase = '' mkdir $out @@ -154,11 +153,12 @@ buildNpmPackage' { popd ''; - meta = with lib; { + meta = { + changelog = "https://github.com/bitwarden/clients/releases/tag/${src.rev}"; inherit description; homepage = "https://bitwarden.com"; license = lib.licenses.gpl3; - maintainers = with maintainers; [ amarshall kiwi ]; + maintainers = with lib.maintainers; [ amarshall kiwi ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/tools/security/cloudbrute/default.nix b/pkgs/tools/security/cloudbrute/default.nix index 84a59ec495f2e..677c14021509f 100644 --- a/pkgs/tools/security/cloudbrute/default.nix +++ b/pkgs/tools/security/cloudbrute/default.nix @@ -11,10 +11,10 @@ buildGoModule rec { owner = "0xsha"; repo = "CloudBrute"; rev = "v${version}"; - sha256 = "05b9klddk8wvi78j47jyg9pix6qpxyr01l1m7k1j7598siazfv9g"; + hash = "sha256-L233VdQolSPDPDXQALLvF5seb3peHiLRiZuj2RqdaRU="; }; - vendorSha256 = "0f3n0wrmg9d2qyn8hlnhf9lsfqd9443myzr04p48v68m8n83j6a9"; + vendorHash = "sha256-SRk5kEUVmY3IJSB/XwchqWGnaXLQUoisx6KlVzMHdjg="; meta = with lib; { description = "Cloud enumeration tool"; diff --git a/pkgs/tools/security/cloudlist/default.nix b/pkgs/tools/security/cloudlist/default.nix index d9f97553b0f64..b3e13d1691e85 100644 --- a/pkgs/tools/security/cloudlist/default.nix +++ b/pkgs/tools/security/cloudlist/default.nix @@ -5,20 +5,21 @@ buildGoModule rec { pname = "cloudlist"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-PWOC+Y+tCr5LqWJpSVoIeOquO2vMb06KW25pBEER3Ys="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-m0b7gtbI9i1tD8HduEAF+Mo2UpI4gqldEO8q4u+Wo3E="; }; - vendorHash = "sha256-FesvXH29thy6B9VXZnuvllJ+9VQR4i6q1JzrULaU82s="; + vendorHash = "sha256-GHQnI4T6y/p+BlQyrNJmIaSek0sC1J3UwcuvDQH5gCI="; meta = with lib; { description = "Tool for listing assets from multiple cloud providers"; homepage = "https://github.com/projectdiscovery/cloudlist"; + changelog = "https://github.com/projectdiscovery/cloudlist/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/tools/security/crowdsec/default.nix b/pkgs/tools/security/crowdsec/default.nix index 10a8291a54d4e..9c3dceda96f6c 100644 --- a/pkgs/tools/security/crowdsec/default.nix +++ b/pkgs/tools/security/crowdsec/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "crowdsec"; - version = "1.5.2"; + version = "1.5.4"; src = fetchFromGitHub { owner = "crowdsecurity"; repo = pname; rev = "v${version}"; - hash = "sha256-260+XsRn3Mm/zCSvfEcBQ6j715KV4t1Z0CvXdriDzCs="; + hash = "sha256-5VwsuPNoAhCvhKUJDUkXnEVLMqHx2M1Nz11VoBASoxU="; }; - vendorHash = "sha256-Mto0X/LMwWU10cmC2bjzX4lzp9t+nEgsWRP3JGkl++A="; + vendorHash = "sha256-6ODcb7UQPgM5n5RPN4AdkrY3+vlu+GXlUfrlTePywyY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/security/deepsea/default.nix b/pkgs/tools/security/deepsea/default.nix index 0befd62e2212a..2f0a9f175f395 100644 --- a/pkgs/tools/security/deepsea/default.nix +++ b/pkgs/tools/security/deepsea/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "02s03sha8vwp7dsaw3z446pskhb6wmy0hyj0mhpbx58sf147rkig"; }; - vendorSha256 = null; #vendorSha256 = ""; + vendorHash = null; meta = with lib; { description = "Phishing tool for red teams and pentesters"; diff --git a/pkgs/tools/security/der-ascii/default.nix b/pkgs/tools/security/der-ascii/default.nix index 2bfcc9c370955..5fc3b179b3ad1 100644 --- a/pkgs/tools/security/der-ascii/default.nix +++ b/pkgs/tools/security/der-ascii/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { rev = "v${version}"; sha256 = "1my93m1rx08kn2yms6k8w43byr8k61r1nra4b082j8b393wwxkqc"; }; - vendorSha256 = null; + vendorHash = null; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/tools/security/dnsx/default.nix b/pkgs/tools/security/dnsx/default.nix index bdc84d802bf74..e3ff230c1e617 100644 --- a/pkgs/tools/security/dnsx/default.nix +++ b/pkgs/tools/security/dnsx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dnsx"; - version = "1.1.4"; + version = "1.1.5"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "dnsx"; rev = "refs/tags/v${version}"; - hash = "sha256-FNPAsslKmsLrUtiw+GlXLppsEk/VB02jkZLmrB8zZOI="; + hash = "sha256-hO6m4WsoK50tLBr7I9ui7HE3rxKpOES8IOugi04yeQo="; }; - vendorHash = "sha256-QXmy+Ph0lKguAoIWfc41z7XH7jXGc601DD6v292Hzj0="; + vendorHash = "sha256-c3HHfcWppAUfKjePsB+/CvxJWjp5zV6TJvsm3yKH4cw="; # Tests require network access doCheck = false; diff --git a/pkgs/tools/security/doas/default.nix b/pkgs/tools/security/doas/default.nix index ad08cd8056bed..03268bc98479c 100644 --- a/pkgs/tools/security/doas/default.nix +++ b/pkgs/tools/security/doas/default.nix @@ -53,6 +53,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Duncaen/OpenDoas"; license = licenses.isc; platforms = platforms.linux; - maintainers = with maintainers; [ cole-h cstrahan ]; + maintainers = with maintainers; [ cole-h ]; }; } diff --git a/pkgs/tools/security/doppler/default.nix b/pkgs/tools/security/doppler/default.nix index 28956edeaa371..ceafa9fdb2577 100644 --- a/pkgs/tools/security/doppler/default.nix +++ b/pkgs/tools/security/doppler/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "doppler"; - version = "3.65.2"; + version = "3.66.0"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - sha256 = "sha256-rs+V19YaBvo5U9AAUks/nWl8TYveH8t+/rcQqjtG1gE="; + sha256 = "sha256-Iw+Rr4VAdZ+DjN3mfXkVHYlnnVOnRkof+O1EoluYjeM="; }; vendorHash = "sha256-FOmaK6S61fkzybpDx6qfi6m4e2IaqBpavaFhEgIvmqw="; diff --git a/pkgs/tools/security/dorkscout/default.nix b/pkgs/tools/security/dorkscout/default.nix index 27cc5a0d4e1b8..e5b5057c6089c 100644 --- a/pkgs/tools/security/dorkscout/default.nix +++ b/pkgs/tools/security/dorkscout/default.nix @@ -11,10 +11,10 @@ buildGoModule rec { owner = "R4yGM"; repo = pname; rev = version; - sha256 = "0h2m458jxdm3xg0h2vb8yq1jc28jqwinv1pdqypdsbvsz48s0hxz"; + hash = "sha256-v0OgEfl6L92ux+2GbSPHEgkmA/ZobQHB66O2LlEhVUA="; }; - vendorSha256 = "05vn9hd5r8cy45b3ixjch17v38p08k8di8gclq0i9rkz9bvy1nph"; + vendorHash = "sha256-8Nrg90p/5hQBpuyh2NBE4KKxT4BM9jhWIZ6hXBpMdhc="; meta = with lib; { description = "Tool to automate the work with Google dorks"; diff --git a/pkgs/tools/security/duo-unix/default.nix b/pkgs/tools/security/duo-unix/default.nix index c80c92ffbf4ed..f0ddb1c0c2aae 100644 --- a/pkgs/tools/security/duo-unix/default.nix +++ b/pkgs/tools/security/duo-unix/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "duo-unix"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { url = "https://dl.duosecurity.com/duo_unix-${version}.tar.gz"; - sha256 = "sha256-Oi8SPfPaGS3ITgRONt60PLy3B9QICeDDyIsP+iBpQmk="; + sha256 = "sha256-7huWd71SdnTe1ef8OoHgQKjYQKVpE8k/oNT7bA+OJR0="; }; buildInputs = [ pam openssl zlib ]; diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index c9f34760f4db9..8e6a300089a5b 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2023-09-13"; + version = "2023-10-03"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Dv7LcKzZi5uvEiYmFk/lrOd1l1VknCvjz7cV3K2UfeM="; + hash = "sha256-lK8Yj7YcnWX2PVIM8RkfGGvWutwT1333TYO1qrJKToc="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/ggshield/default.nix b/pkgs/tools/security/ggshield/default.nix index 3f275875ed482..f2cf2e9050d83 100644 --- a/pkgs/tools/security/ggshield/default.nix +++ b/pkgs/tools/security/ggshield/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ggshield"; - version = "1.18.0"; + version = "1.19.1"; format = "pyproject"; src = fetchFromGitHub { owner = "GitGuardian"; repo = "ggshield"; rev = "refs/tags/v${version}"; - hash = "sha256-CWWgt2Ec8ChhH+nL6DkGqI3GsR52HforUYaaxSpKgCs="; + hash = "sha256-yAH1MWviOfo5m7esvnm6KlcQeS62aIqgFD4hzBMbHVU="; }; pythonRelaxDeps = true; diff --git a/pkgs/tools/security/gitjacker/default.nix b/pkgs/tools/security/gitjacker/default.nix index 05bdb2b17339c..c233032d9359d 100644 --- a/pkgs/tools/security/gitjacker/default.nix +++ b/pkgs/tools/security/gitjacker/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { sha256 = "sha256-rEn9FpcRfEt2yGepIPEAO9m8JeVb+nMhYMBWhC/barc="; }; - vendorSha256 = null; + vendorHash = null; propagatedBuildInputs = [ git ]; diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 93b4ff4119b36..92c0992c86e6f 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { pname = "gopass"; - version = "1.15.7"; + version = "1.15.8"; nativeBuildInputs = [ installShellFiles makeWrapper ]; @@ -21,10 +21,10 @@ buildGoModule rec { owner = "gopasspw"; repo = "gopass"; rev = "v${version}"; - hash = "sha256-Q3EX5giteIsH5+fXb7n2qpd9kBjaZZ/A5VuCljc72C8="; + hash = "sha256-l8Ce0ioMnSlet+PMrQCMvyH3IvmQaE1MQSJR9myyLB8="; }; - vendorHash = "sha256-crnr5qXlYrhNT3nLlA7U13CaYAmAqcV+MBs/hee9ixU="; + vendorHash = "sha256-xyQTlbTPAC2iG8XQ4oEHBXjfXauwuBhaTbsew23nlVw="; subPackages = [ "." ]; @@ -62,7 +62,7 @@ buildGoModule rec { homepage = "https://www.gopass.pw/"; license = licenses.mit; maintainers = with maintainers; [ rvolosatovs sikmir ]; - changelog = "https://github.com/gopasspw/gopass/raw/v${version}/CHANGELOG.md"; + changelog = "https://github.com/gopasspw/gopass/blob/v${version}/CHANGELOG.md"; longDescription = '' gopass is a rewrite of the pass password manager in Go with the aim of @@ -73,5 +73,6 @@ buildGoModule rec { users. We go by the UNIX philosophy and try to do one thing and do it well, providing a stellar user experience and a sane, simple interface. ''; + mainProgram = "gopass"; }; } diff --git a/pkgs/tools/security/gopass/git-credential.nix b/pkgs/tools/security/gopass/git-credential.nix index 87c1367022f8e..aac7deb19d5fd 100644 --- a/pkgs/tools/security/gopass/git-credential.nix +++ b/pkgs/tools/security/gopass/git-credential.nix @@ -37,5 +37,6 @@ buildGoModule rec { changelog = "https://github.com/gopasspw/git-credential-gopass/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ benneti ]; + mainProgram = "git-credential-gopass"; }; } diff --git a/pkgs/tools/security/gopass/hibp.nix b/pkgs/tools/security/gopass/hibp.nix index 1486f8476f2b9..590b183194eb4 100644 --- a/pkgs/tools/security/gopass/hibp.nix +++ b/pkgs/tools/security/gopass/hibp.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gopass-hibp"; - version = "1.15.7"; + version = "1.15.8"; src = fetchFromGitHub { owner = "gopasspw"; repo = "gopass-hibp"; rev = "v${version}"; - hash = "sha256-525e2LXQ/Ldrqhxqndwpdo2HeS4xRkbPzfwvWeiEayE="; + hash = "sha256-dNzvC+ubkZPHx40bVwFT2R7TMrPdeD5oJz0lAd0vtw0="; }; - vendorHash = "sha256-jfqxl21euOtOvt+RltVlSjca2o8VuLtWHgpnW4ve5JM="; + vendorHash = "sha256-zaB8xrzqk3moR/ScXdHtqIgA9lZqWFzLWi4NAqbs0XU="; subPackages = [ "." ]; @@ -37,5 +37,6 @@ buildGoModule rec { changelog = "https://github.com/gopasspw/gopass-hibp/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ sikmir ]; + mainProgram = "gopass-hibp"; }; } diff --git a/pkgs/tools/security/gopass/jsonapi.nix b/pkgs/tools/security/gopass/jsonapi.nix index f7c0cd0ebdf93..b00b4bf014799 100644 --- a/pkgs/tools/security/gopass/jsonapi.nix +++ b/pkgs/tools/security/gopass/jsonapi.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "gopass-jsonapi"; - version = "1.15.7"; + version = "1.15.8"; src = fetchFromGitHub { owner = "gopasspw"; repo = "gopass-jsonapi"; rev = "v${version}"; - hash = "sha256-lwY5uc6eKqXO8FbvzlrpQY0y5AEcV0RQFvvnE+At6z0="; + hash = "sha256-CL9PcztiFCCy1T7w0v2SzLmwkA6z8aPUx65ye5AJDr4="; }; - vendorHash = "sha256-BKwgP22l4t4jaAHHh+ZD/2nroCtAp/A6DqHt+9HZzKw="; + vendorHash = "sha256-Czlp3MyxRGcIV5uFZzF8t0JrucLzPzxyCUCtjICjPM0="; subPackages = [ "." ]; @@ -38,5 +38,6 @@ buildGoModule rec { changelog = "https://github.com/gopasspw/gopass-jsonapi/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ maxhbr ]; + mainProgram = "gopass-jsonapi"; }; } diff --git a/pkgs/tools/security/gopass/summon.nix b/pkgs/tools/security/gopass/summon.nix index eb264b752d085..848cff91a65db 100644 --- a/pkgs/tools/security/gopass/summon.nix +++ b/pkgs/tools/security/gopass/summon.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gopass-summon-provider"; - version = "1.15.7"; + version = "1.15.8"; src = fetchFromGitHub { owner = "gopasspw"; repo = "gopass-summon-provider"; rev = "v${version}"; - hash = "sha256-JoSNWgwTnFQbnrwGIk6L5SwQeNg0RfLMULceqFF/XnA="; + hash = "sha256-7Oj/1h1468zz6r3+Cv5IaIFbkrs0dPteY0SRsOZ8UXI="; }; - vendorHash = "sha256-gb9AZBh5oUAiuCXbsvkmYxcHRNd9KLYq35nMd4iabKw="; + vendorHash = "sha256-IXY8w5TLXA3SIT2Jyjqt+pPtZ35zQnG0wY08OB1spDw="; subPackages = [ "." ]; @@ -37,5 +37,6 @@ buildGoModule rec { changelog = "https://github.com/gopasspw/gopass-summon-provider/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ sikmir ]; + mainProgram = "gopass-summon-provider"; }; } diff --git a/pkgs/tools/security/gotrue/supabase.nix b/pkgs/tools/security/gotrue/supabase.nix index 3ee604a90b9bb..325dbb029aa15 100644 --- a/pkgs/tools/security/gotrue/supabase.nix +++ b/pkgs/tools/security/gotrue/supabase.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gotrue"; - version = "2.92.0"; + version = "2.96.0"; src = fetchFromGitHub { owner = "supabase"; repo = pname; rev = "v${version}"; - hash = "sha256-acOTuvs9AFDGdmj4dwTAabhO31MAJgYOVZghlPQiXT4="; + hash = "sha256-1k8HCix49kuTVEsCeSDcPC2gPpnx7wzro3q53scW568="; }; vendorHash = "sha256-r1xJka1ISahaHJOkFwjn/Nrf2EU0iGVosz8PZnH31TE="; diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/tools/security/grype/default.nix index dbb8fcdd4ba12..ff996562572b3 100644 --- a/pkgs/tools/security/grype/default.nix +++ b/pkgs/tools/security/grype/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "grype"; - version = "0.68.1"; + version = "0.69.1"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ASjnExBnOdeEWc94ShM+RUmp1YK499M/5CN6WQjCXMo="; + hash = "sha256-AXw2mtN4FC6EKWN8dObrU04+WSHDWLY19FSWqQlkq/Q="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -28,7 +28,7 @@ buildGoModule rec { proxyVendor = true; - vendorHash = "sha256-nLZAbniX1FT1PE32cmYzqZar1e2ZiLBpnYuZg1BcKMo="; + vendorHash = "sha256-iitWThvWVfeJMLcJLgmFnVguFVF4DejObZPZ3qB5cY0="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/security/hologram/default.nix b/pkgs/tools/security/hologram/default.nix index 1a7e45c8024d2..86bc4293747c7 100644 --- a/pkgs/tools/security/hologram/default.nix +++ b/pkgs/tools/security/hologram/default.nix @@ -24,7 +24,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/AdRoll/hologram/"; description = "Easy, painless AWS credentials on developer laptops"; - maintainers = with maintainers; [ aaronjheng ]; + maintainers = with maintainers; [ ]; license = licenses.asl20; }; } diff --git a/pkgs/tools/security/jwx/default.nix b/pkgs/tools/security/jwx/default.nix index 2ccf3d7bfd472..01ca4c302f9ba 100644 --- a/pkgs/tools/security/jwx/default.nix +++ b/pkgs/tools/security/jwx/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "jwx"; - version = "2.0.12"; + version = "2.0.13"; src = fetchFromGitHub { owner = "lestrrat-go"; repo = pname; rev = "v${version}"; - hash = "sha256-2Lx9pu5KQut9eXIQYDjFW/pMDzR0eSKMFtSGOPQAkN4="; + hash = "sha256-jtNG/d70Q67IKKEfRBewl40cxH6wYj3CPfx+S/vuQnQ="; }; vendorHash = "sha256-o3EHPIXGLz/io0d8jhl9cxzctP3CeOjEDMQl1SY9lXg="; diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index ce82a720f2d02..28665e618d04d 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -5,7 +5,7 @@ buildGoModule rec { pname = "keybase"; - version = "6.0.2"; + version = "6.2.2"; modRoot = "go"; subPackages = [ "kbnm" "keybase" ]; @@ -16,9 +16,9 @@ buildGoModule rec { owner = "keybase"; repo = "client"; rev = "v${version}"; - sha256 = "sha256-JiYufEsoj/98An2qKdm/Uu4YHJr6ttc/VHn4kMgkuwI="; + hash = "sha256-1vJCuAkJmehFcVYLwp3UIlQiGji7mHVczCBtXq9Fl68="; }; - vendorHash = "sha256-D8b/pvmBGCnaRuf92FYgRcSSbN59Yu0CHKxAybdYjS4="; + vendorHash = "sha256-tXEEVEfjoKub2A4m7F3hDc5ABJ+R+axwX1+1j7e3BAM="; patches = [ (substituteAll { diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index 6b218de45dc2d..15bc22a7f1bb0 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -4,16 +4,16 @@ , runtimeShell, gsettings-desktop-schemas }: let - versionSuffix = "20220610191041.a459abf326"; + versionSuffix = "20230726175256.4464bfb32d"; in stdenv.mkDerivation rec { pname = "keybase-gui"; - version = "6.0.2"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages + version = "6.2.2"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages src = fetchurl { url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version + "-" + versionSuffix}_amd64.deb"; - hash = "sha256-FMhbMSuJHq5d5E0dTVAk02y85UXmhtKZYk4qcbnhRxI="; + hash = "sha256-X3BJksdddTdxeUqVjzcq3cDRGRqmaYE7Z+eXtHoqbkg="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/kiterunner/default.nix b/pkgs/tools/security/kiterunner/default.nix index a455c17d717cb..5f73ba055902c 100644 --- a/pkgs/tools/security/kiterunner/default.nix +++ b/pkgs/tools/security/kiterunner/default.nix @@ -11,10 +11,10 @@ buildGoModule rec { owner = "assetnote"; repo = pname; rev = "v${version}"; - sha256 = "084jywgqjj2hpaprdcb9a7i8hihphnfil0sx3wrlvjpa8sk0z1mw"; + hash = "sha256-vIYPpkbqyk0zH10DGp2FF0aI4lFpsZavulBIiR/3kiA="; }; - vendorSha256 = "1nczzzsnh38qi949ki5268y39ggkwncanc1pv7727qpwllzl62vy"; + vendorHash = "sha256-fgtDP6X84iPO2Tcwq5jl8700PDKixJlIihgNaPX/n9k="; ldflags = [ "-s" "-w" "-X github.com/assetnote/kiterunner/cmd/kiterunner/cmd.Version=${version}" diff --git a/pkgs/tools/security/kubeclarity/default.nix b/pkgs/tools/security/kubeclarity/default.nix index 709a4c52bccc5..2f026b62f6e96 100644 --- a/pkgs/tools/security/kubeclarity/default.nix +++ b/pkgs/tools/security/kubeclarity/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "kubeclarity"; - version = "2.19.0"; + version = "2.21.0"; src = fetchFromGitHub { owner = "openclarity"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ua9BmQh5NacxmcgiwnaJ8avjuR6ZrG3ilx11dF+tDWs="; + hash = "sha256-aTbad1w/8ywBbZKA0PIbY18K1fUikXZ8VLFKsX7JI6g="; }; - vendorHash = "sha256-XXjKkq5bFf8iFhBLJ3xYHuNWctP3Qo5Gqo/gfZQF/n8="; + vendorHash = "sha256-rpP+3x/+e5PxyRL+IR2k3OEOSkm5341oScqRm+EdFUI="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/security/lastpass-cli/default.nix b/pkgs/tools/security/lastpass-cli/default.nix index 45333391de043..c20157cb41949 100644 --- a/pkgs/tools/security/lastpass-cli/default.nix +++ b/pkgs/tools/security/lastpass-cli/default.nix @@ -57,6 +57,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/lastpass/lastpass-cli"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/security/ldeep/default.nix b/pkgs/tools/security/ldeep/default.nix index 008ff90ee60a9..e82dd9381a3c1 100644 --- a/pkgs/tools/security/ldeep/default.nix +++ b/pkgs/tools/security/ldeep/default.nix @@ -5,16 +5,20 @@ python3.pkgs.buildPythonApplication rec { pname = "ldeep"; - version = "1.0.34"; + version = "1.0.38"; format = "setuptools"; src = fetchFromGitHub { owner = "franc-pentest"; repo = "ldeep"; rev = "refs/tags/${version}"; - hash = "sha256-Gskbxfqp2HqI6rCEiuT0lgHQtD0rZjtLgH3idEkfmjc="; + hash = "sha256-QoisQL7K4Xg4k7IGymvsMjNfTkjHtkVJpygHtX8lUqs="; }; + nativeBuildInputs = with python3.pkgs; [ + cython + ]; + propagatedBuildInputs = with python3.pkgs; [ commandparse cryptography diff --git a/pkgs/tools/security/log4j-sniffer/default.nix b/pkgs/tools/security/log4j-sniffer/default.nix index 72cf2fb851b3c..dec7ce35866a4 100644 --- a/pkgs/tools/security/log4j-sniffer/default.nix +++ b/pkgs/tools/security/log4j-sniffer/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { sha256 = "sha256-pO6difzNvQvKQtRLyksXmExtQHlnnwyF3iNEmSBgUmU="; }; - vendorSha256 = null; + vendorHash = null; nativeCheckInputs = [ git diff --git a/pkgs/tools/security/log4j-vuln-scanner/default.nix b/pkgs/tools/security/log4j-vuln-scanner/default.nix index a33848b5d4871..57e884d37fef6 100644 --- a/pkgs/tools/security/log4j-vuln-scanner/default.nix +++ b/pkgs/tools/security/log4j-vuln-scanner/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-YMD2233EdrrF1SLjwiRcNr53b7Rf5Tu8CZC43QhSY7c="; }; - vendorSha256 = null; + vendorHash = null; postInstall = '' mv $out/bin/scanner $out/bin/$pname diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 4aba63848b52d..dee609d5a179d 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.34" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.36" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index c8405ee07c609..a81bb3cc7583c 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 1396546689a7d63bf8ab3a831647784843b5065f - ref: refs/tags/6.3.34 + revision: 787e303296c1ac456e76b5980a975993c1e24742 + ref: refs/tags/6.3.36 specs: - metasploit-framework (6.3.34) + metasploit-framework (6.3.36) actionpack (~> 7.0) activerecord (~> 7.0) activesupport (~> 7.0) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index b4d90b84e73c6..d033b2fe0cd7f 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.3.34"; + version = "6.3.36"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-DXG9OFY0KzH2MhI3lF/0vaFcvqugazpybFpxDehIyYg="; + sha256 = "sha256-oHnVIdVeQsPTAQAMInWRKYYiYT7yHG7CZReoTZzH03s="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 314836e93c628..a2c028f713123 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -654,12 +654,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "1396546689a7d63bf8ab3a831647784843b5065f"; - sha256 = "126993l0swasdir3lsx0mfz5r8dxyigr8dqj6bv32arlaqwbsw8d"; + rev = "787e303296c1ac456e76b5980a975993c1e24742"; + sha256 = "0yykqyf4va0pcp16w77j7rhj51i9j5sj4300079w6hjyslhxayd0"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.3.34"; + version = "6.3.36"; }; metasploit-model = { groups = ["default"]; diff --git a/pkgs/tools/security/minica/default.nix b/pkgs/tools/security/minica/default.nix index 902961e049f7f..6dd6d1fd5ce03 100644 --- a/pkgs/tools/security/minica/default.nix +++ b/pkgs/tools/security/minica/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-3p6rUFFiWXhX9BBbxqWxRoyRceexvNnqcFCyNi5HoaA="; }; - vendorSha256 = null; + vendorHash = null; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/tools/security/minio-certgen/default.nix b/pkgs/tools/security/minio-certgen/default.nix index ddcd55ef3ff40..fed6bdca2c546 100644 --- a/pkgs/tools/security/minio-certgen/default.nix +++ b/pkgs/tools/security/minio-certgen/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-qi+SeNLW/jE2dGar4Lf16TKRT3ZTmWB/j8EsnoyrdxI="; }; - vendorSha256 = null; + vendorHash = null; meta = with lib; { description = "A simple Minio tool to generate self-signed certificates, and provides SAN certificates with DNS and IP entries"; diff --git a/pkgs/tools/security/mkpasswd/default.nix b/pkgs/tools/security/mkpasswd/default.nix index 439fd1543cf82..38c26a93b4e39 100644 --- a/pkgs/tools/security/mkpasswd/default.nix +++ b/pkgs/tools/security/mkpasswd/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { homepage = "https://packages.qa.debian.org/w/whois.html"; description = "Overfeatured front-end to crypt, from the Debian whois package"; license = licenses.gpl2; - maintainers = with maintainers; [ cstrahan fpletz ]; + maintainers = with maintainers; [ fpletz ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/security/naabu/default.nix b/pkgs/tools/security/naabu/default.nix index 9ff500a7fb925..8ed883b8e1b3f 100644 --- a/pkgs/tools/security/naabu/default.nix +++ b/pkgs/tools/security/naabu/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "naabu"; - version = "2.1.7"; + version = "2.1.8"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "naabu"; rev = "refs/tags/v${version}"; - hash = "sha256-x6TmV8c5p9Uuc9uJG3+FNNpdmzdzgQpsyO29dly7PuU="; + hash = "sha256-/EVlg0NhWJRowHttwYq+i/3BhO5o8w74kRLWIjSI6AQ="; }; - vendorHash = "sha256-9LIPRiLKszfz9Gj26G03TPHOqCXi1s3CYiaadInlD84="; + vendorHash = "sha256-LoYArDsCJCDSI02nFSUVemYNeF+q5xAjV2QyWjMOXIY="; buildInputs = [ libpcap diff --git a/pkgs/tools/security/nmap-formatter/default.nix b/pkgs/tools/security/nmap-formatter/default.nix index a81037da44e41..38e9b3aeedd2b 100644 --- a/pkgs/tools/security/nmap-formatter/default.nix +++ b/pkgs/tools/security/nmap-formatter/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nmap-formatter"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "vdjagilev"; repo = pname; rev = "v${version}"; - hash = "sha256-i2g+l5XJkBjXMbJwpSirEKCDxO2Ric4CwF3jzue/4+o="; + hash = "sha256-Y7BAMJlcu5j8css2F75Bgq90nUGGo/H/kNc5aVwFJew="; }; - vendorHash = "sha256-YAsWXbIyeC4uhzRFXX/bZs3cOvEa3k4/ZCoDisUN1Yw="; + vendorHash = "sha256-c2n8GlaD6q21gWUqr31UOioZRxO0s0tSpVRKl/YHXZU="; meta = with lib; { description = "Tool that allows you to convert nmap output"; diff --git a/pkgs/tools/security/osv-scanner/default.nix b/pkgs/tools/security/osv-scanner/default.nix index e40d9c4cdab41..1397405dd8ff6 100644 --- a/pkgs/tools/security/osv-scanner/default.nix +++ b/pkgs/tools/security/osv-scanner/default.nix @@ -6,16 +6,16 @@ }: buildGoModule rec { pname = "osv-scanner"; - version = "1.3.6"; + version = "1.4.0"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - hash = "sha256-mvR4LqUPtmLBH9RSfVge4anwun1wHJMCuGyHGQvA56s="; + hash = "sha256-UJrqSzJ024IiQwuPOoxNGgTNNfhb00KjtIHQb5qpDPQ="; }; - vendorHash = "sha256-oxAvpiNrdst7Y8EbSTrTEebX6+G/8K5UFwdKG+wiDQE="; + vendorHash = "sha256-oT4pjsEfjlPZyVo7Ic0rpTEK/sSUz1ShWk7fOJq+EQ8="; subPackages = [ "cmd/osv-scanner" diff --git a/pkgs/tools/security/ots/default.nix b/pkgs/tools/security/ots/default.nix index 47d53e741cc2b..bba9e8e6fb89d 100644 --- a/pkgs/tools/security/ots/default.nix +++ b/pkgs/tools/security/ots/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "sniptt-official"; repo = pname; rev = "v${version}"; - sha256 = "Oxs2ytf0rY9QYzVaLUkqyX15oWjas3ukSkq9D1TYbDE="; + hash = "sha256-Oxs2ytf0rY9QYzVaLUkqyX15oWjas3ukSkq9D1TYbDE="; }; - vendorSha256 = "qYk8T0sYIO0wJ0R0j+0VetCy11w8usIRRdBm/Z6grJE="; + vendorHash = "sha256-qYk8T0sYIO0wJ0R0j+0VetCy11w8usIRRdBm/Z6grJE="; ldflags = [ "-X main.version=${version}" "-X main.buildSource=nix" ]; diff --git a/pkgs/tools/security/pynitrokey/default.nix b/pkgs/tools/security/pynitrokey/default.nix index b9847171616f6..9c36ceb3c841e 100644 --- a/pkgs/tools/security/pynitrokey/default.nix +++ b/pkgs/tools/security/pynitrokey/default.nix @@ -11,7 +11,7 @@ with python3Packages; buildPythonApplication rec { pname = "pynitrokey"; version = "0.4.39"; - format = "flit"; + format = "pyproject"; src = fetchPypi { inherit pname version; @@ -43,9 +43,13 @@ buildPythonApplication rec { ]; nativeBuildInputs = [ + flit-core pythonRelaxDepsHook ]; + # FIXME: does pythonRelaxDepsHook not work for pypaBuildHook + flit-core? + pypaBuildFlags = [ "--skip-dependency-check" ]; + pythonRelaxDeps = [ "click" "cryptography" diff --git a/pkgs/tools/security/quark-engine/default.nix b/pkgs/tools/security/quark-engine/default.nix index c855fdde93336..e67dd3f8b944f 100644 --- a/pkgs/tools/security/quark-engine/default.nix +++ b/pkgs/tools/security/quark-engine/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "quark-engine"; - version = "23.8.1"; + version = "23.9.1"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-sdhTrRh6xkkIDZDGE22hSr5dD179VWdMVs6L1cJ9yiw="; + sha256 = "sha256-E9efhgMGN9lvMlFeZqo6xco75TtQsXULOzKX00pjqMM="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/security/rblake2sum/default.nix b/pkgs/tools/security/rblake2sum/default.nix new file mode 100644 index 0000000000000..a5a4a1bce76c3 --- /dev/null +++ b/pkgs/tools/security/rblake2sum/default.nix @@ -0,0 +1,28 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, Security +}: +rustPlatform.buildRustPackage { + pname = "rblake2sum"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "crev-dev"; + repo = "rblake2sum"; + rev = "cdbaba9f198bd28bfad2fbc17011ce5c8c7ad957"; + hash = "sha256-bzOjJ+/M0YWY4/r8cNARPVqbuLBeTllqFyVXhJz6ZMI="; + }; + + cargoHash = "sha256-egwL3z7uB4AcRwPT0uPrenyh4FSxhbZKMdkPhRztMbs="; + + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + + meta = with lib; { + description = "A recursive blake2 digest (hash) of a file-system path"; + homepage = "https://github.com/crev-dev/rblake2sum"; + license = [ licenses.mit ]; + maintainers = with maintainers; [ dpc ]; + }; +} diff --git a/pkgs/tools/security/rucredstash/default.nix b/pkgs/tools/security/rucredstash/default.nix index 53e367431be3a..3a6fcfbf53257 100644 --- a/pkgs/tools/security/rucredstash/default.nix +++ b/pkgs/tools/security/rucredstash/default.nix @@ -1,35 +1,26 @@ -{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, stdenv, Security }: +{ lib, rustPlatform, fetchFromGitHub, stdenv, Security }: rustPlatform.buildRustPackage rec { pname = "rucredstash"; - version = "0.9.0"; + version = "0.9.2"; src = fetchFromGitHub { owner = "psibi"; repo = "rucredstash"; rev = "v${version}"; - sha256 = "1jwsj2y890nxpgmlfbr9hms2raspp5h89ykzsh014mf7lb3yxzwg"; + hash = "sha256-trupBiinULzD8TAy3eh1MYXhQilO08xu2a4yN7wwhwk="; }; - cargoLock = { - lockFile = ./Cargo.lock; - }; + cargoHash = "sha256-TYobVjjzrK3gprZcYyY98EvdASkq4urB+WiLlbJbwmk="; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] - ++ lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.isDarwin Security; # Disable tests since it requires network access and relies on the # presence of certain AWS infrastructure doCheck = false; - # update Cargo.lock to work with openssl 3 - postPatch = '' - ln -sf ${./Cargo.lock} Cargo.lock - ''; - meta = with lib; { - description = "Rust port for credstash. Manages credentials securely in AWS cloud"; + description = "Utility for managing credentials securely in AWS cloud"; homepage = "https://github.com/psibi/rucredstash"; license = licenses.mit; maintainers = with maintainers; [ psibi ]; diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index 1ae0ac170d969..4fa1609629939 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "saml2aws"; - version = "2.36.10"; + version = "2.36.11"; src = fetchFromGitHub { owner = "Versent"; repo = "saml2aws"; rev = "v${version}"; - sha256 = "sha256-YoQ22AJOpNW7WVy9lCb/KzZ7/CkOMHSsgzh0gAfnqP0="; + sha256 = "sha256-Sx/MAgjPcUzg4sX0O3CobAXCZQi2msZu6dKZ9q7/K+k="; }; - vendorHash = "sha256-hbsURcFOLYP//1UXmxWfnNEb6PqJDqwAjJc5Au5+BOQ="; + vendorHash = "sha256-T5x8C1cKyJaHVJbf2xNabD3XXwde2lOOCa8GHjdFlh0="; buildInputs = lib.optionals stdenv.isDarwin [ AppKit ]; diff --git a/pkgs/tools/security/secretscanner/default.nix b/pkgs/tools/security/secretscanner/default.nix index cff77db6b849e..7945977079943 100644 --- a/pkgs/tools/security/secretscanner/default.nix +++ b/pkgs/tools/security/secretscanner/default.nix @@ -50,6 +50,7 @@ buildGoModule rec { description = "Tool to find secrets and passwords in container images and file systems"; homepage = "https://github.com/deepfence/SecretScanner"; changelog = "https://github.com/deepfence/SecretScanner/releases/tag/v${version}"; + platforms = [ "x86_64-linux" ]; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/tools/security/shellz/default.nix b/pkgs/tools/security/shellz/default.nix index b34986b2f7fb6..f1b226c32137c 100644 --- a/pkgs/tools/security/shellz/default.nix +++ b/pkgs/tools/security/shellz/default.nix @@ -11,10 +11,10 @@ buildGoModule rec { owner = "evilsocket"; repo = pname; rev = "v${version}"; - sha256 = "1mhl1y0jkycyl1hgwxavxkm1f6kdx1sz3bvpmkr46sdijji06imi"; + hash = "sha256-sUYDopSxaUPyrHev8XXobRoX6uxbdf5goJ75KYEPFNY="; }; - vendorSha256 = "14rd9xd7s5sfmxgv5p9ka8x12xcimv5hrq7hzy0d1c3ddf50rr7n"; + vendorHash = "sha256-9uQMimttsNCA//DgDMuukXUROlIz3bJfr04XfVpPLZM="; ldflags = [ "-s" diff --git a/pkgs/tools/security/sirikali/default.nix b/pkgs/tools/security/sirikali/default.nix index a3e67a2b76a5e..6ae689d95fd4c 100644 --- a/pkgs/tools/security/sirikali/default.nix +++ b/pkgs/tools/security/sirikali/default.nix @@ -71,7 +71,6 @@ stdenv.mkDerivation rec { doCheck = true; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=RELEASE" "-DINTERNAL_LXQT_WALLET=false" "-DNOKDESUPPORT=${if withKWallet then "false" else "true"}" "-DNOSECRETSUPPORT=${if withLibsecret then "false" else "true"}" diff --git a/pkgs/tools/security/ssb/default.nix b/pkgs/tools/security/ssb/default.nix index aed2dd79aeb34..725f72e6c7cf8 100644 --- a/pkgs/tools/security/ssb/default.nix +++ b/pkgs/tools/security/ssb/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "0dkd02l30461cwn5hsssnjyb9s8ww179wll3l7z5hy1hv3x6h9g1"; }; - vendorSha256 = null; #vendorSha256 = ""; + vendorHash = null; meta = with lib; { description = "Tool to bruteforce SSH server"; diff --git a/pkgs/tools/security/ssh-to-age/default.nix b/pkgs/tools/security/ssh-to-age/default.nix index 52997fc242590..90ea4c9b7eb58 100644 --- a/pkgs/tools/security/ssh-to-age/default.nix +++ b/pkgs/tools/security/ssh-to-age/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ssh-to-age"; - version = "1.1.5"; + version = "1.1.6"; src = fetchFromGitHub { owner = "Mic92"; repo = "ssh-to-age"; rev = version; - sha256 = "sha256-vER4PG2LFi/NM9TmCffqsF3aR4ZycwWVeKls2fNupo0="; + sha256 = "sha256-cYSrosDFdueEJPQdDYCMObMPwQTvuXUBHXPO0rhehxk="; }; - vendorHash = "sha256-g8qVV2cd7nxBN/BGNz28gJbtNkCUDJDdSdupXxhFw9Q="; + vendorHash = "sha256-dmxFkoz/2qyUv2/I8bLFTYAfUcYdHjVYQgmg8xleIxA="; checkPhase = '' runHook preCheck diff --git a/pkgs/tools/security/steamguard-cli/default.nix b/pkgs/tools/security/steamguard-cli/default.nix index 08ed47b165e0b..643a5ad07ef96 100644 --- a/pkgs/tools/security/steamguard-cli/default.nix +++ b/pkgs/tools/security/steamguard-cli/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "steamguard-cli"; - version = "0.12.1"; + version = "0.12.2"; src = fetchFromGitHub { owner = "dyc3"; repo = pname; rev = "v${version}"; - hash = "sha256-i+q8hiElLuA1oHRLASiO/icEmhd1VqvV/zKGV0CSXms="; + hash = "sha256-p3v7XiOXWH6F1oIiARr0K3sYOXCcNS97+THIG7k72wk="; }; - cargoHash = "sha256-1K482GygV9SLpbpwF1iI3pwL0gcNo0eM2goKTgscK64="; + cargoHash = "sha256-qQA7UdtFqGPyCRHdV+FfbQFiPaOeW4rT4dYC3BeHDw0="; meta = with lib; { changelog = "https://github.com/dyc3/steamguard-cli/releases/tag/v${version}"; diff --git a/pkgs/tools/security/step-ca/default.nix b/pkgs/tools/security/step-ca/default.nix index 008a87841a133..7e149ad143bfe 100644 --- a/pkgs/tools/security/step-ca/default.nix +++ b/pkgs/tools/security/step-ca/default.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "step-ca"; - version = "0.24.2"; + version = "0.25.0"; src = fetchFromGitHub { owner = "smallstep"; repo = "certificates"; rev = "refs/tags/v${version}"; - hash = "sha256-499gPucDfABpajrPPLLyPLwFSlPsY+m4hUvaur39+ug="; + hash = "sha256-CO9Qjx4D6qNGjOdva88KRCJOQq85r5U5nwmXC1G94dY="; }; - vendorHash = "sha256-aqDjL0bPRmEGmYU0XERvfxhk2IKWhs/GDCvh/PecIBw="; + vendorHash = "sha256-Weq8sS+8gsfdoVSBDm8E2DCrngfNsolqQR2/yd9etPo="; ldflags = [ "-buildid=" ]; diff --git a/pkgs/tools/security/step-cli/default.nix b/pkgs/tools/security/step-cli/default.nix index f637039c0025d..040c25b65c3f1 100644 --- a/pkgs/tools/security/step-cli/default.nix +++ b/pkgs/tools/security/step-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "step-cli"; - version = "0.24.4"; + version = "0.25.0"; src = fetchFromGitHub { owner = "smallstep"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-QSV1+EKaz0anV+Kj5sUEJgVEZkSi4cQG5GiWsgGKN/I="; + hash = "sha256-8sMF7KSrHyApdXZ3Oy4KogEqd6R8KlQVkqIcvYQBPJY="; }; ldflags = [ @@ -25,7 +25,7 @@ buildGoModule rec { rm command/certificate/remote_test.go ''; - vendorHash = "sha256-R2lnbHTIfgKdgeZ21JLKlVuPIwvNmjXSlzb8bwrva2U="; + vendorHash = "sha256-c+2mOAMdGcqeL7zAURso3XVcnb93HNS/i6c63kiIHKU="; meta = with lib; { description = "A zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc"; diff --git a/pkgs/tools/security/sudo-rs/default.nix b/pkgs/tools/security/sudo-rs/default.nix index 3cda1cde8322c..0be60c5025b7f 100644 --- a/pkgs/tools/security/sudo-rs/default.nix +++ b/pkgs/tools/security/sudo-rs/default.nix @@ -1,7 +1,6 @@ { lib , bash , fetchFromGitHub -, fetchpatch , installShellFiles , nix-update-script , nixosTests @@ -12,29 +11,20 @@ rustPlatform.buildRustPackage rec { pname = "sudo-rs"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "memorysafety"; repo = "sudo-rs"; rev = "v${version}"; - hash = "sha256-Kk5D3387hdl6eGWTSV003r+XajuDh6YgHuqYlj9NnaQ="; + hash = "sha256-EQEdNDUXEMMiFZKuu9LR9ywjvKWyM5bWcRHHUB9+gp4="; }; - cargoHash = "sha256-yeMK37tOgJcs9pW3IclpR5WMXx0gMDJ2wcmInxJYbQ8="; + cargoHash = "sha256-Zs9/A7u4yMLKY4cAUCnsqRHgkxI8R3w1JwkAd2lw0eo="; nativeBuildInputs = [ installShellFiles pandoc ]; buildInputs = [ pam ]; - patches = [ - (fetchpatch { - # @R-VdP's patch to work with NixOS' suid wrappers - name = "Skip self_check when executed as root.patch"; - url = "https://github.com/R-VdP/sudo-rs/commit/a44541dcb36b94f938daaed66b3ff06cfc1c2b40.patch"; - hash = "sha256-PdmOqp/NDjFy8ve4jEOi58e0N9xUnaVKioQwdC5Jf1U="; - }) - ]; - # Don't attempt to generate the docs in a (pan)Docker container postPatch = '' substituteInPlace util/generate-docs.sh \ diff --git a/pkgs/tools/security/super/0001-Remove-references-to-dropped-sys_nerr-sys_errlist-fo.patch b/pkgs/tools/security/super/0001-Remove-references-to-dropped-sys_nerr-sys_errlist-fo.patch deleted file mode 100644 index 048486caafd78..0000000000000 --- a/pkgs/tools/security/super/0001-Remove-references-to-dropped-sys_nerr-sys_errlist-fo.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 86e37c1c09c23924c4e055a3d4b8c79f19cd0599 Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch <maximilian@mbosch.me> -Date: Mon, 10 Aug 2020 21:33:39 +0200 -Subject: [PATCH] Remove references to dropped `sys_nerr` & `sys_errlist` for - `glibc-2.32` compat - -According to the release-notes[1], `strerror(3)` should be used. This is -already the case, however the source tries to be backwards-compatible by -supporting `sys_nerr` & `sys_errlist` which breaks compilation -unfortunately. - -Simply using `strerror` fixes the problems. - -[1] https://sourceware.org/pipermail/libc-announce/2020/000029.html ---- - utils.c | 12 +----------- - 1 file changed, 1 insertion(+), 11 deletions(-) - -diff --git a/utils.c b/utils.c -index 3ec70b6..430f027 100644 ---- a/utils.c -+++ b/utils.c -@@ -2003,7 +2003,6 @@ int n; - - #ifdef HAVE_SYS_ERRLIST - extern char *sys_errlist[]; -- extern int sys_nerr; - #endif - - /* -@@ -2019,16 +2018,7 @@ int errnum; - sprintf(buf, "Error %d", errnum); - return buf; - #else -- if (errnum < 0 || errnum > sys_nerr) { -- sprintf(buf, "Error %d (!)", errnum); -- return buf; -- } else { --#ifdef HAVE_STRERROR -- return strerror(errnum); --#else -- return sys_errlist[errnum]; --#endif -- } -+ return strerror(errnum); - #endif - } - --- -2.25.4 - diff --git a/pkgs/tools/security/super/default.nix b/pkgs/tools/security/super/default.nix deleted file mode 100644 index 8000ae9afc8c2..0000000000000 --- a/pkgs/tools/security/super/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, libxcrypt }: - -stdenv.mkDerivation rec { - pname = "super"; - version = "3.30.0"; - - src = fetchurl { - name = "super-${version}.tar.gz"; - url = "https://www.ucolick.org/~will/RUE/super/super-${version}-tar.gz"; - sha256 = "0k476f83w7f45y9jpyxwr00ikv1vhjiq0c26fgjch9hnv18icvwy"; - }; - - prePatch = '' - # do not set sticky bit in nix store - substituteInPlace Makefile.in \ - --replace "-o root" "" \ - --replace 04755 755 - ''; - - patches = [ - ./0001-Remove-references-to-dropped-sys_nerr-sys_errlist-fo.patch - (fetchpatch { - name = "CVE-2014-0470.patch"; - url = "https://salsa.debian.org/debian/super/raw/debian/3.30.0-7/debian/patches/14-Fix-unchecked-setuid-call.patch"; - sha256 = "08m9hw4kyfjv0kqns1cqha4v5hkgp4s4z0q1rgif1fnk14xh7wqh"; - }) - ]; - - # -fcommon: workaround build failure on -fno-common toolchains like upstream - # gcc-10. Otherwise build fails as: - # ld: pam.o:/build/super-3.30.0/super.h:293: multiple definition of - # `Method'; super.o:/build/super-3.30.0/super.h:293: first defined here - env.NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE -fcommon"; - - configureFlags = [ - "--sysconfdir=/etc" - "--localstatedir=/var" - ]; - - buildInputs = [ libxcrypt ]; - - installFlags = [ "sysconfdir=$(out)/etc" "localstatedir=$(TMPDIR)" ]; - - meta = { - homepage = "https://www.ucolick.org/~will/#super"; - description = "Allows users to execute scripts as if they were root"; - longDescription = - '' - This package provides two commands: 1) “super”, which allows - users to execute commands under a different uid/gid (specified - in /etc/super.tab); and 2) “setuid”, which allows root to - execute a command under a different uid. - ''; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/tools/security/theharvester/default.nix b/pkgs/tools/security/theharvester/default.nix index 5326c6fc5b932..5280036646973 100644 --- a/pkgs/tools/security/theharvester/default.nix +++ b/pkgs/tools/security/theharvester/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "theharvester"; - version = "4.4.3"; + version = "4.4.4"; format = "setuptools"; src = fetchFromGitHub { owner = "laramies"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-hAR5z1NwBmcmWRAg2F4QVicxKfzgTOOptlwKdx+G0+o="; + hash = "sha256-L0WbPZE2alregOvWc+0nuMvsD17ayCw3JtahGhf4B1o="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/security/tlsx/default.nix b/pkgs/tools/security/tlsx/default.nix index 91f21c99710b8..10915cad9ecd3 100644 --- a/pkgs/tools/security/tlsx/default.nix +++ b/pkgs/tools/security/tlsx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "tlsx"; - version = "1.1.4"; + version = "1.1.5"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - hash = "sha256-EMTNd5NOvaFbVxv31j3pBU//mWQQpThswCT8bMNx5Qw="; + hash = "sha256-lS/D3p8Q6Zu3/XxwkC77fPS9cXVrUTkDPGd46Y+krbo="; }; - vendorHash = "sha256-5fS10G1YxtyhMZcpaqYy9P6eX/xQABYVZj1HX6WxQxo="; + vendorHash = "sha256-aEsq9LwU/ZWvuZGGzZ4NEvMWFk1m/Sr9LOXiCA/X388="; # Tests require network access doCheck = false; diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 71b22a9706cf2..a4c0fc51b6442 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -30,11 +30,11 @@ let in stdenv.mkDerivation rec { pname = "tor"; - version = "0.4.8.5"; + version = "0.4.8.7"; src = fetchurl { url = "https://dist.torproject.org/${pname}-${version}.tar.gz"; - sha256 = "sha256-aVfP0Uop7udVXFL4OHpG8s4vX+fa35NUfxvHSxZX4Rk="; + sha256 = "sha256-sg0rnHTbKKAMB/CQ7lsCQbK2hPOv3szMa4AIkxxVdJE="; }; outputs = [ "out" "geoip" ]; diff --git a/pkgs/tools/security/traitor/default.nix b/pkgs/tools/security/traitor/default.nix index bbe9553819fb0..26efa6d68a70b 100644 --- a/pkgs/tools/security/traitor/default.nix +++ b/pkgs/tools/security/traitor/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-LQfKdjZaTm5z8DUt6He/RJHbOUCUwP3CV3Fyt5rJIfU="; }; - vendorSha256 = null; + vendorHash = null; meta = with lib; { description = "Automatic Linux privilege escalation"; diff --git a/pkgs/tools/security/trueseeing/default.nix b/pkgs/tools/security/trueseeing/default.nix index 607a179845262..a9c4f300141fa 100644 --- a/pkgs/tools/security/trueseeing/default.nix +++ b/pkgs/tools/security/trueseeing/default.nix @@ -6,7 +6,7 @@ python3.pkgs.buildPythonApplication rec { pname = "trueseeing"; version = "2.1.7"; - format = "flit"; + format = "pyproject"; src = fetchFromGitHub { owner = "alterakey"; diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index f40c6d86bf373..86346b62010bb 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.56.1"; + version = "3.59.0"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-4FN3FAs6Sc2LLcqaKsSxJS9VVNwp/Zit9gZT+qDXRik="; + hash = "sha256-J+hmWEBjTFb7mE9uj0g4uq+VZjKS/3sIOtJyNweYkRw="; }; - vendorHash = "sha256-NBwPyA+NuW9RA/dXj+FpTa6RU0WOZRrey7gosDOatG8="; + vendorHash = "sha256-xsdtqRU3Exeo/EHkA8xars9+FUnrVZRdET0PGtv4ikI="; ldflags = [ "-s" diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 792cd4771866b..fb9ce6fd6d5a6 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "vault"; - version = "1.14.3"; + version = "1.14.4"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "sha256-J8ZHK9zOZIo61xund4VQ46LD609B9zWgCZcD1StEu/Y="; + sha256 = "sha256-E7lEKsbl2L6KhLgAZbemCaTIjbsvl3wg3oCURn/Judc="; }; vendorHash = "sha256-8ytAT7qVXAIfoeMyTBMJ6DiWn74sRM1WrrOYaKTlKMo="; diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index e876aba235314..f9d1dd74e1265 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "vault-bin"; - version = "1.14.3"; + version = "1.15.0"; src = let @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { aarch64-darwin = "darwin_arm64"; }; sha256 = selectSystem { - x86_64-linux = "sha256-zgRX4RfyZMHuE/yYFGLfbEi2SJ1DIxp5UShOvIYZmG8="; - aarch64-linux = "sha256-ZGLzZylXnkS/0BuUz/PSGHDXRZoVqSA/+hREDp9tmsE="; - i686-linux = "sha256-qG2dpE/snBL7eVTrtX1ZP9gtCIyhPqebUo3T515uHBU="; - x86_64-darwin = "sha256-21OH98/vlUtnb3s4wA3iDV4b5jVnN2BFJ3AWMonHpPw="; - aarch64-darwin = "sha256-Usbwmqyo/RKUeGXCBPul14cccjawt1Des/hsr8mKA/Q="; + x86_64-linux = "sha256-TLpH6s9odZFh9LFnLiZjpcx0+W+6XrdDhja/xcixx7s="; + aarch64-linux = "sha256-QQejEfJrCB+68SXhQm7Ub763ZL72Cy+HB1be+4p4XrM="; + i686-linux = "sha256-1dFPAIBNyDQheIdszmoiHU6AmLZ1TtbT+If7n8ZQQAY="; + x86_64-darwin = "sha256-51A12pOMaJGYacgiIIW3sqUytApDXrSWBkNl7fWqFgk="; + aarch64-darwin = "sha256-PacsdP9n7mdK/wKJW63Ajbt5G+PFPwa+XB4OEz3YUno="; }; in fetchzip { diff --git a/pkgs/tools/security/volatility3/default.nix b/pkgs/tools/security/volatility3/default.nix index 747d9c8737b5f..221ed6ae639db 100644 --- a/pkgs/tools/security/volatility3/default.nix +++ b/pkgs/tools/security/volatility3/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "volatility3"; - version = "2.4.1"; + version = "2.5.0"; src = fetchFromGitHub { owner = "volatilityfoundation"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Oi9uy1zNRnKJc+31+IjMiza72EUopiM75sP+Mjjw+aE="; + hash = "sha256-yutQbrWmJGDsTccQcR+HtC8JvgmsXfCxbxxcMLDx5vk="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/system/amtterm/default.nix b/pkgs/tools/system/amtterm/default.nix index 4ceb1aea72b3a..eb6ec1765f685 100644 --- a/pkgs/tools/system/amtterm/default.nix +++ b/pkgs/tools/system/amtterm/default.nix @@ -1,16 +1,16 @@ { fetchurl, lib, stdenv, makeWrapper, perl, perlPackages }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "amtterm"; - version = "1.6-1"; + version = "1.7-1"; buildInputs = with perlPackages; [ perl SOAPLite ]; nativeBuildInputs = [ makeWrapper ]; src = fetchurl { - url = "https://www.kraxel.org/cgit/amtterm/snapshot/${pname}-${version}.tar.gz"; - sha256 = "1jxcsqkag2bxmrnr4m6g88sln1j2d9liqlna57fj8kkc85316vlc"; + url = "https://www.kraxel.org/cgit/amtterm/snapshot/amtterm-${finalAttrs.version}.tar.gz"; + sha256 = "sha256-WrYWAXLW74hb/DfSiPyiFIGAUfDQFdNEPx+XevZYcyk="; }; makeFlags = [ "prefix=$(out)" "STRIP=" ]; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.ehmry ]; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/tools/system/automatic-timezoned/default.nix b/pkgs/tools/system/automatic-timezoned/default.nix index 9e936c2dfc7a5..38906d2428ea6 100644 --- a/pkgs/tools/system/automatic-timezoned/default.nix +++ b/pkgs/tools/system/automatic-timezoned/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "1.0.125"; + version = "1.0.128"; src = fetchFromGitHub { owner = "maxbrunet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gXuAgiz4pqc1UXTqU47G8Dve+RdCM/61jIROzy6bzII="; + sha256 = "sha256-h9Iej7vxMYyWSbDrW2nNTxXvY53dr9MidhLiSGahuNw="; }; - cargoHash = "sha256-8zW5CHgAZHMcIIhtyjf4WA/lB+eUWiH/Nu4vkwrAx3Q="; + cargoHash = "sha256-Toy8xYI9qbqc6C1lehl/Om/xBk2wn0S3mJyU8ZZjE7c="; meta = with lib; { description = "Automatically update system timezone based on location"; diff --git a/pkgs/tools/system/fakeroot/default.nix b/pkgs/tools/system/fakeroot/default.nix index 4ca22cb238590..dd6ab9868aa85 100644 --- a/pkgs/tools/system/fakeroot/default.nix +++ b/pkgs/tools/system/fakeroot/default.nix @@ -1,4 +1,5 @@ { lib +, coreutils , stdenv , fetchurl , fetchpatch @@ -6,14 +7,15 @@ , libcap , gnused , nixosTests +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.29"; pname = "fakeroot"; src = fetchurl { - url = "http://http.debian.net/debian/pool/main/f/fakeroot/fakeroot_${version}.orig.tar.gz"; + url = "http://http.debian.net/debian/pool/main/f/fakeroot/fakeroot_${finalAttrs.version}.orig.tar.gz"; sha256 = "sha256-j7uvt4DJFz46zkoEr7wdkA8zfzIWiDk59cfbNDG+fCA="; }; @@ -39,16 +41,23 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ getopt gnused ] - ++ lib.optional (!stdenv.isDarwin) libcap - ; + buildInputs = lib.optional (!stdenv.isDarwin) libcap; postUnpack = '' - sed -i -e "s@getopt@$(type -p getopt)@g" -e "s@sed@$(type -p sed)@g" ${pname}-${version}/scripts/fakeroot.in + sed -i \ + -e 's@getopt@${getopt}/bin/getopt@g' \ + -e 's@sed@${gnused}/bin/sed@g' \ + -e 's@kill@${coreutils}/bin/kill@g' \ + -e 's@/bin/ls@${coreutils}/bin/ls@g' \ + -e 's@cut@${coreutils}/bin/cut@g' \ + fakeroot-${finalAttrs.version}/scripts/fakeroot.in ''; passthru = { tests = { + version = testers.testVersion { + package = finalAttrs; + }; # A lightweight *unit* test that exercises fakeroot and fakechroot together: nixos-etc = nixosTests.etc.test-etc-fakeroot; }; @@ -61,4 +70,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [viric]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/tools/system/gptman/default.nix b/pkgs/tools/system/gptman/default.nix index 8c4d650105351..e8fc661dd72dc 100644 --- a/pkgs/tools/system/gptman/default.nix +++ b/pkgs/tools/system/gptman/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "gptman"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "rust-disk-partition-management"; repo = pname; rev = "v${version}"; - hash = "sha256-sDRnvF/XPXgWIIIrOmnEuktP8XvZxPahF2n4h8RCX+o="; + hash = "sha256-Qi2nrvF566AK+JsP7V9tVQXwAU63TNpfTFZLuM/h1Ps="; }; - cargoHash = "sha256-voslPSh7n31cGTKaayKXomgiXWVTutuc4FxfnZUDejc="; + cargoHash = "sha256-YMlwlSq14S37SqewglvxZYUL67fT66hh22t0N8h+2vk="; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/pkgs/tools/system/journalwatch/default.nix b/pkgs/tools/system/journalwatch/default.nix index 01324b65f6bb1..3eea1a3796564 100644 --- a/pkgs/tools/system/journalwatch/default.nix +++ b/pkgs/tools/system/journalwatch/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { owner = "The-Compiler"; repo = pname; rev = "v${version}"; - sha512 = "11g2f1w9lfqw6zxxyg7qrqpb914s6w71j0gnpw7qr7cak2l5jlf2l39dlg30y55rw7jgmf0yg77wwzd0c430mq1n6q1v8w86g1rwkzb"; + hash = "sha512-60+ewzOIox2wsQFXMAgD7XN+zvPA1ScPz6V4MB5taVDhqCxUTMVOxodf+4AMhxtNQloXZ3ye7/0bjh1NPDjxQg=="; }; # can be removed post 1.1.0 diff --git a/pkgs/tools/system/jump/default.nix b/pkgs/tools/system/jump/default.nix index c1e625e14c158..3ff64996d0137 100644 --- a/pkgs/tools/system/jump/default.nix +++ b/pkgs/tools/system/jump/default.nix @@ -30,6 +30,6 @@ buildGoModule rec { ''; homepage = "https://github.com/gsamokovarov/jump"; license = licenses.mit; - maintainers = with maintainers; [ aaronjheng ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index e3dbabe1f52e3..f380bf4fd6f6f 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, makeWrapper +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, makeWrapper , CoreFoundation, IOKit, libossp_uuid , nixosTests , netdata-go-plugins @@ -9,6 +9,7 @@ , withIpmi ? (!stdenv.isDarwin), freeipmi , withNetfilter ? (!stdenv.isDarwin), libmnl, libnetfilter_acct , withCloud ? (!stdenv.isDarwin), json_c +, withCloudUi ? false , withConnPubSub ? false, google-cloud-cpp, grpc , withConnPrometheus ? false, snappy , withSsl ? true, openssl @@ -24,8 +25,17 @@ stdenv.mkDerivation rec { owner = "netdata"; repo = "netdata"; rev = "v${version}"; - hash = "sha256-8L8PhPgNIHvw+Dcx2D6OE8fp2+GEYOc9wEIoPJSqXME="; + hash = if withCloudUi + then "sha256-8L8PhPgNIHvw+Dcx2D6OE8fp2+GEYOc9wEIoPJSqXME=" + else "sha256-J/pKKxTNoSwvsyVaRsnazQQqu2C8zx1QEAkB+gkR5lU="; fetchSubmodules = true; + + # Remove v2 dashboard distributed under NCUL1. Make sure an empty + # Makefile.am exists, as autoreconf will get confused otherwise. + postFetch = lib.optionalString (!withCloudUi) '' + rm -rf $out/web/gui/v2/* + touch $out/web/gui/v2/Makefile.am + ''; }; strictDeps = true; @@ -53,6 +63,12 @@ stdenv.mkDerivation rec { # Avoid build-only inputs in closure leaked by configure command: # https://github.com/NixOS/nixpkgs/issues/175693#issuecomment-1143344162 ./skip-CONFIGURE_COMMAND.patch + + # Allow building without non-free v2 dashboard. + (fetchpatch { + url = "https://github.com/peat-psuwit/netdata/commit/6ccbdd1500db2b205923968688d5f1777430a326.patch"; + hash = "sha256-jAyk5HlxdjFn5IP6jOKP8/SXOraMQSA6r1krThe+s7g="; + }) ]; # Guard against unused buld-time development inputs in closure. Without @@ -98,6 +114,8 @@ stdenv.mkDerivation rec { "--disable-dbengine" ] ++ lib.optionals (!withCloud) [ "--disable-cloud" + ] ++ lib.optionals (!withCloudUi) [ + "--disable-cloud-ui" ]; postFixup = '' @@ -118,7 +136,8 @@ stdenv.mkDerivation rec { description = "Real-time performance monitoring tool"; homepage = "https://www.netdata.cloud/"; changelog = "https://github.com/netdata/netdata/releases/tag/v${version}"; - license = licenses.gpl3Plus; + license = [ licenses.gpl3Plus ] + ++ lib.optionals (withCloudUi) [ licenses.ncul1 ]; platforms = platforms.unix; maintainers = with maintainers; [ raitobezarius ]; }; diff --git a/pkgs/tools/system/nkeys/default.nix b/pkgs/tools/system/nkeys/default.nix index 22a22157f06e4..9914e6f142430 100644 --- a/pkgs/tools/system/nkeys/default.nix +++ b/pkgs/tools/system/nkeys/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "nkeys"; - version = "0.4.4"; + version = "0.4.5"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ePpFzwjFKcm/xgt9TBl1CVnJYxO389rV9uLONeUeX0c="; + hash = "sha256-txPd4Q/ApaNutt2Ik5E2478tHAQmpTJQKYnHA9niz3E="; }; vendorHash = "sha256-ozK0vimYs7wGplw1QhSu+q8R+YsIYHU4m08a7K6i78I="; diff --git a/pkgs/tools/system/nq/default.nix b/pkgs/tools/system/nq/default.nix index 133ce941faa5c..46db1c612ff39 100644 --- a/pkgs/tools/system/nq/default.nix +++ b/pkgs/tools/system/nq/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/chneukirchen/nq"; license = licenses.publicDomain; platforms = platforms.all; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/system/nsc/default.nix b/pkgs/tools/system/nsc/default.nix index ef5fd5b3b7c6f..d69791553d504 100644 --- a/pkgs/tools/system/nsc/default.nix +++ b/pkgs/tools/system/nsc/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "nsc"; - version = "2.8.0"; + version = "2.8.1"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - hash = "sha256-8TBg5ByR4d/AvJOiADW068W40wN7ggRT8LbZFfHeqz4="; + hash = "sha256-kNfA/MQuXauQPWQhUspreqo4oOKb+qBqh9NdmQM1Q+A="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule rec { "-X main.builtBy=nixpkgs" ]; - vendorHash = "sha256-Yywurr+RM96qJGH/WvuLDtf6bLzw9C5hG2d0ID9w1pQ="; + vendorHash = "sha256-8cTegiNVtGSZdf9O+KVoOgnjjMIv8w7YBSkFhk7gHfk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/system/nvitop/default.nix b/pkgs/tools/system/nvitop/default.nix index 21fa53dc7034d..9cfe26de37326 100644 --- a/pkgs/tools/system/nvitop/default.nix +++ b/pkgs/tools/system/nvitop/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "nvitop"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "XuehaiPan"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-nHJ2m5Q0IWl0nx13iGBkHsHj2YdPS+33kLUBsjbpyuM="; + hash = "sha256-DPdKdIqFUozTt5Go3+c7oSv9tZSio486QeSlSfIrBZ4="; }; pythonRelaxDeps = [ "nvidia-ml-py" ]; diff --git a/pkgs/tools/system/nvtop/default.nix b/pkgs/tools/system/nvtop/default.nix index 1ab520cefac45..e47291207f081 100644 --- a/pkgs/tools/system/nvtop/default.nix +++ b/pkgs/tools/system/nvtop/default.nix @@ -38,7 +38,6 @@ stdenv.mkDerivation rec { }; cmakeFlags = with lib; [ - "-DCMAKE_BUILD_TYPE=Release" "-DBUILD_TESTING=ON" "-DUSE_LIBUDEV_OVER_LIBSYSTEMD=ON" ] ++ optional nvidia "-DNVML_INCLUDE_DIRS=${cudatoolkit}/include" diff --git a/pkgs/tools/system/openipmi/default.nix b/pkgs/tools/system/openipmi/default.nix index cc5a544aa02d9..189452c65d63d 100644 --- a/pkgs/tools/system/openipmi/default.nix +++ b/pkgs/tools/system/openipmi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "OpenIPMI"; - version = "2.0.33"; + version = "2.0.34"; src = fetchurl { url = "mirror://sourceforge/openipmi/OpenIPMI-${version}.tar.gz"; - sha256 = "sha256-+1Pp6l4mgc+K982gJLGgBExnX4QRbKJ66WFsi3rZW0k="; + sha256 = "sha256-kyJ+Q8crXDvVlJMj4GaapVJ9GpcUc6OjZa8D+4KEqV8="; }; buildInputs = [ ncurses popt python3 readline ]; diff --git a/pkgs/tools/system/psensor/default.nix b/pkgs/tools/system/psensor/default.nix index 6e3ccc45a034c..33749f30be0cb 100644 --- a/pkgs/tools/system/psensor/default.nix +++ b/pkgs/tools/system/psensor/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { homepage = "https://wpitchoune.net/psensor/"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/system/runitor/default.nix b/pkgs/tools/system/runitor/default.nix index 651f766cefbba..d724d4c437002 100644 --- a/pkgs/tools/system/runitor/default.nix +++ b/pkgs/tools/system/runitor/default.nix @@ -3,7 +3,7 @@ buildGoModule rec { pname = "runitor"; version = "1.2.0"; - vendorSha256 = null; + vendorHash = null; src = fetchFromGitHub { owner = "bdd"; diff --git a/pkgs/tools/system/skeema/default.nix b/pkgs/tools/system/skeema/default.nix index 9918128ee74ee..86798155047c6 100644 --- a/pkgs/tools/system/skeema/default.nix +++ b/pkgs/tools/system/skeema/default.nix @@ -1,14 +1,14 @@ -{ lib, buildGoModule, fetchFromGitHub, coreutils, runtimeShell, testers, skeema }: +{ lib, buildGoModule, fetchFromGitHub, coreutils, testers, skeema }: buildGoModule rec { pname = "skeema"; - version = "1.10.1"; + version = "1.11.0"; src = fetchFromGitHub { owner = "skeema"; repo = "skeema"; rev = "v${version}"; - hash = "sha256-t0UACavJaDorAgxm2gA6FEsMfQ8UQEY/CZbFIFHwfIQ="; + hash = "sha256-BXjcn9oakTvaWPYIsAsjYRwQ1aKhZ4PAV2AkxSVOF/I="; }; vendorHash = null; @@ -25,6 +25,7 @@ buildGoModule rec { "TestParseDirSymlinks" # Flaky tests + "TestCommandTimeout" "TestShellOutTimeout" ]; in @@ -41,13 +42,6 @@ buildGoModule rec { substituteInPlace internal/applier/ddlstatement_test.go \ --replace /bin/echo "${coreutils}/bin/echo" - - substituteInPlace internal/util/shellout_unix_test.go \ - --replace /bin/echo "${coreutils}/bin/echo" \ - --replace /usr/bin/printf "${coreutils}/bin/printf" - - substituteInPlace internal/util/shellout_unix.go \ - --replace /bin/sh "${runtimeShell}" ''; passthru.tests.version = testers.testVersion { diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index a54c85bdaf922..02c4340aded2e 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -23,11 +23,11 @@ let in stdenv.mkDerivation rec { pname = "smartmontools"; - version = "7.3"; + version = "7.4"; src = fetchurl { url = "mirror://sourceforge/smartmontools/${pname}-${version}.tar.gz"; - sha256 = "sha256-pUT4gI0MWM+w50JMoYQcuFipdJIrA11QXU5MJIvjois="; + hash = "sha256-6aYfZB/5bKlTGe37F5SM0pfQzTNCc2ssScmdRxb7mT0="; }; patches = [ diff --git a/pkgs/tools/system/uroboros/default.nix b/pkgs/tools/system/uroboros/default.nix index 7f25c70c29795..f7d5ec0ac133d 100644 --- a/pkgs/tools/system/uroboros/default.nix +++ b/pkgs/tools/system/uroboros/default.nix @@ -12,10 +12,10 @@ buildGoModule rec { owner = "evilsocket"; repo = pname; inherit rev; - sha256 = "1a1bc2za2ppb7j7ibhykgxwivwmx7yq0593255jd55gl60r0l7i4"; + hash = "sha256-JB4KMjD0ldJkKWKkArA/vfIdeX/TwxWPPOteob5gK6g="; }; - vendorSha256 = "1ml3x00zzkwj1f76a4wk2y8z4bxjhadf2p1li96qjpnc8fgfd50l"; + vendorHash = "sha256-FJTmnkPMXolNijRc4ZqCsi/ykReTE2WOC5LP/wHog9Y="; meta = with lib; { description = "Tool for monitoring and profiling single processes"; diff --git a/pkgs/tools/system/which/default.nix b/pkgs/tools/system/which/default.nix index aecf68e8c7fa1..82316541f4c73 100644 --- a/pkgs/tools/system/which/default.nix +++ b/pkgs/tools/system/which/default.nix @@ -12,6 +12,13 @@ stdenv.mkDerivation rec { strictDeps = true; enableParallelBuilding = true; + env.NIX_CFLAGS_COMPILE = toString ( + # Enable 64-bit file API. Otherwise `which` fails to find tools + # on filesystems with 64-bit inodes (like `btrfs`) when running + # binaries from 32-bit systems (like `i686-linux`). + lib.optional stdenv.hostPlatform.is32bit "-D_FILE_OFFSET_BITS=64" + ); + meta = with lib; { homepage = "https://www.gnu.org/software/which/"; description = "Shows the full path of (shell) commands"; diff --git a/pkgs/tools/system/xe/default.nix b/pkgs/tools/system/xe/default.nix index f31cdaab4c5a1..133c7d8736194 100644 --- a/pkgs/tools/system/xe/default.nix +++ b/pkgs/tools/system/xe/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/chneukirchen/xe"; license = licenses.publicDomain; platforms = platforms.all; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/text/align/default.nix b/pkgs/tools/text/align/default.nix index 4f67d747da4c1..e3287b762e344 100644 --- a/pkgs/tools/text/align/default.nix +++ b/pkgs/tools/text/align/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "17gs3417633z71kc6l5zqg4b3rjhpn2v8qs8rnfrk4nbwzz4nrq3"; }; - vendorSha256 = null; + vendorHash = null; meta = with lib; { homepage = "https://github.com/Guitarbum722/align"; diff --git a/pkgs/tools/text/autocorrect/Cargo.lock b/pkgs/tools/text/autocorrect/Cargo.lock index 1cba3b30eae2f..82fb056857c2a 100644 --- a/pkgs/tools/text/autocorrect/Cargo.lock +++ b/pkgs/tools/text/autocorrect/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "1.0.2" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" dependencies = [ "memchr", ] @@ -34,24 +34,23 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstream" -version = "0.3.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", - "is-terminal", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.1" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" +checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46" [[package]] name = "anstyle-parse" @@ -73,9 +72,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "1.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" dependencies = [ "anstyle", "windows-sys 0.48.0", @@ -89,7 +88,7 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "autocorrect" -version = "2.8.4" +version = "2.8.5" dependencies = [ "autocorrect-derive 0.3.0", "criterion", @@ -110,9 +109,9 @@ dependencies = [ [[package]] name = "autocorrect" -version = "2.8.4" +version = "2.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7747f9e20a908aa4ef73f8333d4892c197a8cce1648bd0f3c7a83ec6559f6cde" +checksum = "f2aa23c243abf88a533e514d8e5455e668daa3a8ca93061d8eb7f22014d7ad1a" dependencies = [ "autocorrect-derive 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "diff", @@ -130,9 +129,9 @@ dependencies = [ [[package]] name = "autocorrect-cli" -version = "2.8.4" +version = "2.8.5" dependencies = [ - "autocorrect 2.8.4", + "autocorrect 2.8.5", "clap", "ignore", "lazy_static", @@ -167,17 +166,17 @@ dependencies = [ [[package]] name = "autocorrect-java" -version = "2.8.4" +version = "2.8.5" dependencies = [ - "autocorrect 2.8.4", + "autocorrect 2.8.5", "jni", ] [[package]] name = "autocorrect-node" -version = "2.8.4" +version = "2.8.5" dependencies = [ - "autocorrect 2.8.4", + "autocorrect 2.8.5", "autocorrect-cli", "napi", "napi-build", @@ -186,25 +185,25 @@ dependencies = [ [[package]] name = "autocorrect-py" -version = "2.8.4" +version = "2.8.5" dependencies = [ - "autocorrect 2.8.4", + "autocorrect 2.8.5", "pyo3", ] [[package]] name = "autocorrect-rb" -version = "2.8.4" +version = "2.8.5" dependencies = [ - "autocorrect 2.8.4 (registry+https://github.com/rust-lang/crates.io-index)", + "autocorrect 2.8.5 (registry+https://github.com/rust-lang/crates.io-index)", "magnus", ] [[package]] name = "autocorrect-wasm" -version = "2.8.4" +version = "2.8.5" dependencies = [ - "autocorrect 2.8.4", + "autocorrect 2.8.5", "serde", "serde_json", "wasm-bindgen", @@ -212,9 +211,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", @@ -227,9 +226,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.21.2" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" [[package]] name = "bindgen" @@ -237,7 +236,7 @@ version = "0.66.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.0", "cexpr", "clang-sys", "lazy_static", @@ -248,7 +247,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.28", + "syn 2.0.33", ] [[package]] @@ -259,9 +258,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" [[package]] name = "block-buffer" @@ -274,9 +273,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.6.0" +version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" +checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" dependencies = [ "memchr", "serde", @@ -284,15 +283,15 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "bytes" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "cast" @@ -302,9 +301,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.81" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c6b2562119bf28c3439f7f02db99faf0aa1a8cdfe5772a2ee155d32227239f0" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "libc", ] @@ -370,20 +369,19 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.19" +version = "4.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d" +checksum = "84ed82781cea27b43c9b106a979fe450a13a31aab0500595fb3fc06616de08e6" dependencies = [ "clap_builder", "clap_derive", - "once_cell", ] [[package]] name = "clap_builder" -version = "4.3.19" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1" +checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08" dependencies = [ "anstream", "anstyle", @@ -393,21 +391,21 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.3.12" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" +checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.33", ] [[package]] name = "clap_lex" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" +checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" [[package]] name = "colorchoice" @@ -560,7 +558,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f34ba9a9bcb8645379e9de8cb3ecfcf4d1c85ba66d90deb3259206fa5aa193b" dependencies = [ "quote", - "syn 2.0.28", + "syn 2.0.33", ] [[package]] @@ -593,9 +591,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "encoding_rs" -version = "0.8.32" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" dependencies = [ "cfg-if", ] @@ -608,9 +606,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" +checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" dependencies = [ "errno-dragonfly", "libc", @@ -647,9 +645,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", "miniz_oxide", @@ -699,7 +697,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.33", ] [[package]] @@ -742,9 +740,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.3" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "glob" @@ -767,9 +765,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.20" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" dependencies = [ "bytes", "fnv", @@ -844,9 +842,9 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" @@ -865,7 +863,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2", + "socket2 0.4.9", "tokio", "tower-service", "tracing", @@ -1026,9 +1024,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.147" +version = "0.2.148" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" [[package]] name = "libloading" @@ -1042,9 +1040,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.5" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" +checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" [[package]] name = "lock_api" @@ -1058,9 +1056,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "magnus" @@ -1086,9 +1084,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" [[package]] name = "memoffset" @@ -1142,11 +1140,11 @@ dependencies = [ [[package]] name = "napi" -version = "2.13.2" +version = "2.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ede2d12cd6fce44da537a4be1f5510c73be2506c2e32dfaaafd1f36968f3a0e" +checksum = "fd063c93b900149304e3ba96ce5bf210cd4f81ef5eb80ded0d100df3e85a3ac0" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.0", "ctor", "napi-derive", "napi-sys", @@ -1235,9 +1233,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "object" -version = "0.31.1" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "memchr", ] @@ -1280,7 +1278,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -1297,19 +1295,20 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pest" -version = "2.7.2" +version = "2.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1acb4a4365a13f749a93f1a094a7805e5cfa0955373a9de860d962eaa3a5fe5a" +checksum = "d7a4d085fd991ac8d5b05a147b437791b4260b76326baf0fc60cf7c9c27ecd33" dependencies = [ + "memchr", "thiserror", "ucd-trie", ] [[package]] name = "pest_derive" -version = "2.7.2" +version = "2.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "666d00490d4ac815001da55838c500eafb0320019bbaa44444137c48b443a853" +checksum = "a2bee7be22ce7918f641a33f08e3f43388c7656772244e2bbb2477f44cc9021a" dependencies = [ "pest", "pest_generator", @@ -1317,22 +1316,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.2" +version = "2.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68ca01446f50dbda87c1786af8770d535423fa8a53aec03b8f4e3d7eb10e0929" +checksum = "d1511785c5e98d79a05e8a6bc34b4ac2168a0e3e92161862030ad84daa223141" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.33", ] [[package]] name = "pest_meta" -version = "2.7.2" +version = "2.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56af0a30af74d0445c0bf6d9d051c979b516a1a5af790d251daee76005420a48" +checksum = "b42f0394d3123e33353ca5e1e89092e533d2cc490389f2bd6131c43c634ebc5f" dependencies = [ "once_cell", "pest", @@ -1341,9 +1340,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.10" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -1391,9 +1390,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" dependencies = [ "unicode-ident", ] @@ -1469,9 +1468,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -1519,7 +1518,7 @@ dependencies = [ "quote", "regex", "shell-words", - "syn 2.0.28", + "syn 2.0.33", ] [[package]] @@ -1539,9 +1538,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.2" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bc4f4d719ae1d92dc7e5ef3865f93af6e28c7af68ebd7a68a367932b88c1e2c" +checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" dependencies = [ "aho-corasick", "memchr", @@ -1551,9 +1550,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26bb2039bb570943fc65037c16640a64fba171d3760138656fdfe62b3bd24239" +checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" dependencies = [ "aho-corasick", "memchr", @@ -1562,15 +1561,15 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "reqwest" -version = "0.11.18" +version = "0.11.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" +checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" dependencies = [ "base64", "bytes", @@ -1634,11 +1633,11 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.38.7" +version = "0.38.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "172891ebdceb05aa0005f533a6cbfca599ddd7d966f6f5d4d9b2e70478e70399" +checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.0", "errno", "libc", "linux-raw-sys", @@ -1647,9 +1646,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.6" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb" +checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", "ring", @@ -1668,9 +1667,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.101.2" +version = "0.101.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "513722fd73ad80a71f72b61009ea1b584bcfa1483ca93949c8f290298837fa59" +checksum = "45a27e3b59326c16e23d30aeb7a36a24cc0d29e71d68ff611cdfb4a01d013bed" dependencies = [ "ring", "untrusted", @@ -1735,29 +1734,29 @@ checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" [[package]] name = "serde" -version = "1.0.181" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d3e73c93c3240c0bda063c239298e633114c69a888c3e37ca8bb33f343e9890" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.181" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be02f6cb0cd3a5ec20bbcfbcbd749f57daddb1a0882dc2e46a6c236c90b977ed" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.33", ] [[package]] name = "serde_json" -version = "1.0.104" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ "itoa", "ryu", @@ -1772,7 +1771,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.33", ] [[package]] @@ -1819,15 +1818,15 @@ checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" [[package]] name = "shlex" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" +checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" [[package]] name = "slab" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] @@ -1849,6 +1848,16 @@ dependencies = [ ] [[package]] +name = "socket2" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] name = "spin" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1883,9 +1892,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.28" +version = "2.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" +checksum = "9caece70c63bfba29ec2fed841a09851b14a235c60010fa4de58089b6c025668" dependencies = [ "proc-macro2", "quote", @@ -1894,9 +1903,9 @@ dependencies = [ [[package]] name = "tar" -version = "0.4.39" +version = "0.4.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec96d2ffad078296368d46ff1cb309be1c23c513b4ab0e22a45de0185275ac96" +checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" dependencies = [ "filetime", "libc", @@ -1911,9 +1920,9 @@ checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" [[package]] name = "tempfile" -version = "3.7.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if", "fastrand", @@ -1924,22 +1933,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.44" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" +checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.44" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" +checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.33", ] [[package]] @@ -1988,18 +1997,17 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.29.1" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ - "autocfg", "backtrace", "bytes", "libc", "mio", "num_cpus", "pin-project-lite", - "socket2", + "socket2 0.5.4", "tokio-macros", "windows-sys 0.48.0", ] @@ -2012,7 +2020,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.33", ] [[package]] @@ -2091,9 +2099,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" @@ -2130,9 +2138,9 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "url" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", "idna", @@ -2153,9 +2161,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "walkdir" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", "winapi-util", @@ -2199,7 +2207,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.33", "wasm-bindgen-shared", ] @@ -2233,7 +2241,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.33", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2255,23 +2263,10 @@ dependencies = [ ] [[package]] -name = "webpki" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] name = "webpki-roots" -version = "0.22.6" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" -dependencies = [ - "webpki", -] +checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" [[package]] name = "winapi" @@ -2319,7 +2314,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -2339,17 +2334,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", ] [[package]] @@ -2360,9 +2355,9 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" @@ -2372,9 +2367,9 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" @@ -2384,9 +2379,9 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" @@ -2396,9 +2391,9 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" @@ -2408,9 +2403,9 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" @@ -2420,9 +2415,9 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" @@ -2432,24 +2427,25 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winreg" -version = "0.10.1" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ - "winapi", + "cfg-if", + "windows-sys 0.48.0", ] [[package]] name = "xattr" -version = "0.2.3" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" +checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" dependencies = [ "libc", ] diff --git a/pkgs/tools/text/autocorrect/default.nix b/pkgs/tools/text/autocorrect/default.nix index e8b413248e357..fa1214762b296 100644 --- a/pkgs/tools/text/autocorrect/default.nix +++ b/pkgs/tools/text/autocorrect/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "autocorrect"; - version = "2.8.4"; + version = "2.8.5"; src = fetchFromGitHub { owner = "huacnlee"; repo = pname; rev = "v${version}"; - sha256 = "sha256-njgngDowyRfOY9+BnBSNWow5GkdGhRu2YPXkA6n23qE="; + sha256 = "sha256-j59yCGGV6yiT6o+VKM1FPh87T4QG0qAeKgcKIAqpx+8="; }; cargoLock = { diff --git a/pkgs/tools/text/chroma/default.nix b/pkgs/tools/text/chroma/default.nix index 6ef96b287b4d0..af5241de7a05a 100644 --- a/pkgs/tools/text/chroma/default.nix +++ b/pkgs/tools/text/chroma/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { inherit (srcInfo) sha256; }; - vendorSha256 = "1qawayihklidfzln3jr899wh4zp9w7yq3i18klaylqndrg47k286"; + vendorHash = "sha256-Bol5yMvNYuoVnSjEgf3h6X4CeUooy2Hpdy3SCaNXXOE="; modRoot = "./cmd/chroma"; diff --git a/pkgs/tools/text/cidrgrep/default.nix b/pkgs/tools/text/cidrgrep/default.nix index 2feadbabfd773..0117374dadefa 100644 --- a/pkgs/tools/text/cidrgrep/default.nix +++ b/pkgs/tools/text/cidrgrep/default.nix @@ -11,7 +11,7 @@ buildGoModule { hash = "sha256-Bp1cST6/8ppvpgNxjUpwL498C9vTJmoWOKLJgmWqfEs="; }; - vendorSha256 = null; + vendorHash = null; postInstall = '' mv $out/bin/cmd $out/bin/cidrgrep diff --git a/pkgs/tools/text/codesearch/default.nix b/pkgs/tools/text/codesearch/default.nix index f0a23d8d30206..7a948388e09ca 100644 --- a/pkgs/tools/text/codesearch/default.nix +++ b/pkgs/tools/text/codesearch/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-i03w8PZ31j5EutUZaamZsHz+z4qgX4prePbj5DLA78s="; }; - vendorSha256 = null; + vendorHash = null; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/tools/text/comrak/default.nix b/pkgs/tools/text/comrak/default.nix index 5e52b0c39861d..2254bb7e2c273 100644 --- a/pkgs/tools/text/comrak/default.nix +++ b/pkgs/tools/text/comrak/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "comrak"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "kivikakk"; repo = pname; rev = version; - sha256 = "sha256-igJphBA49878xuSlAxbI3l6252aTkXaN7XbxVaSBVOw="; + sha256 = "sha256-eyLgAVo4U0a1JByJsoWOnKGhDcaOhul145KeOOkmHq8="; }; - cargoSha256 = "sha256-ucXb0SU7dpjeLzDN2OTxji3Mh+7bw+npSNsQjbOeY+s="; + cargoSha256 = "sha256-Q9VmiC07UxstwRPertTteeHX34zTo58a2wPkQtSwUPU="; meta = with lib; { description = "A CommonMark-compatible GitHub Flavored Markdown parser and formatter"; diff --git a/pkgs/tools/text/d2/default.nix b/pkgs/tools/text/d2/default.nix index db3cb81dc41d8..bca032d6ddf96 100644 --- a/pkgs/tools/text/d2/default.nix +++ b/pkgs/tools/text/d2/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "d2"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "terrastruct"; repo = pname; rev = "v${version}"; - hash = "sha256-MF8RqwoMc48JYgNUJTQKHlGl59xyHOALnFL2BWQAl24="; + hash = "sha256-bp45tkV7f6rGDAmhle/e3cHIqa7nPakANvk4QxetLts="; }; - vendorHash = "sha256-SocBC/1LrdSQNfcNVa9nnPaq/UvLVIghHlUSJB7ImBk="; + vendorHash = "sha256-QMptNFCoJouI555WkA+4TJhaEzQgJJmca3jVpM3neeI="; excludedPackages = [ "./e2etests" ]; @@ -50,6 +50,6 @@ buildGoModule rec { description = "A modern diagram scripting language that turns text to diagrams"; homepage = "https://d2lang.com"; license = licenses.mpl20; - maintainers = with maintainers; [ dit7ya ]; + maintainers = with maintainers; [ dit7ya kashw2 ]; }; } diff --git a/pkgs/tools/text/dcs/default.nix b/pkgs/tools/text/dcs/default.nix index 5edc7896afac0..0f438e4ff571b 100644 --- a/pkgs/tools/text/dcs/default.nix +++ b/pkgs/tools/text/dcs/default.nix @@ -13,10 +13,10 @@ buildGoModule { owner = "Debian"; repo = "dcs"; rev = "da46accc4d55e9bfde1a6852ac5a9e730fcbbb2c"; - sha256 = "N+6BXlKn1YTlh0ZdPNWa0nuJNcQtlUIc9TocM8cbzQk="; + hash = "sha256-N+6BXlKn1YTlh0ZdPNWa0nuJNcQtlUIc9TocM8cbzQk="; }; - vendorSha256 = "l2mziuisx0HzuP88rS5M+Wha6lu8P036wJYZlmzjWfs="; + vendorHash = "sha256-l2mziuisx0HzuP88rS5M+Wha6lu8P036wJYZlmzjWfs="; # Depends on dcs binaries doCheck = false; diff --git a/pkgs/tools/text/gtree/default.nix b/pkgs/tools/text/gtree/default.nix index 91a21ea6794c6..951bbf4258cc5 100644 --- a/pkgs/tools/text/gtree/default.nix +++ b/pkgs/tools/text/gtree/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gtree"; - version = "1.9.9"; + version = "1.9.11"; src = fetchFromGitHub { owner = "ddddddO"; repo = "gtree"; rev = "v${version}"; - hash = "sha256-CBD01MIKrd/KSQvJg9xyS7V/ed/nfQ2CQe8C3Z9+lwM="; + hash = "sha256-mB/Wftq6YB1aZFJaulNfSXEPYjiznA5rc9hsoCehc5A="; }; - vendorHash = "sha256-QxcDa499XV43p8fstENOtfe3iZ176R5/Ub5iovXlYIM="; + vendorHash = "sha256-Td2DOMXA/E2ynsAKv+CLuS53pI9Bd4GkWcWBMqHrQ5o="; subPackages = [ "cmd/gtree" diff --git a/pkgs/tools/text/hcledit/default.nix b/pkgs/tools/text/hcledit/default.nix index 1c846cb6e0f0b..d5b2fb0cc0a2a 100644 --- a/pkgs/tools/text/hcledit/default.nix +++ b/pkgs/tools/text/hcledit/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "hcledit"; - version = "0.2.9"; + version = "0.2.10"; src = fetchFromGitHub { owner = "minamijoyo"; repo = pname; rev = "v${version}"; - hash = "sha256-9FxQ/Y2vMyc4gLbKjhts36wtBIt90gkQZ9LQ3FO/Jig="; + hash = "sha256-rXmbRbM6U1JtV3t8C0LlLAdYpxd4UjxrbrPVHdqiCJ8="; }; - vendorHash = "sha256-HWwZd5AUo1cysT4WYylQ2+JPBBr/qYNVC4JcJyUiBag="; + vendorHash = "sha256-9ND/vDPDn3rn213Jn1UPMmYAkMI86gYx9QLcV/oFGh4="; meta = with lib; { description = "A command line editor for HCL"; diff --git a/pkgs/tools/text/mdbook-admonish/default.nix b/pkgs/tools/text/mdbook-admonish/default.nix index 5ba3fe700a74e..074d7cc1fe66f 100644 --- a/pkgs/tools/text/mdbook-admonish/default.nix +++ b/pkgs/tools/text/mdbook-admonish/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-admonish"; - version = "1.10.2"; + version = "1.12.1"; src = fetchFromGitHub { owner = "tommilligan"; repo = pname; rev = "v${version}"; - hash = "sha256-2c1wSij2MDRdrqxN+cmnFO0z6mH/fgeg9E3cm+8ssww="; + hash = "sha256-U9boL+Ki4szDwhdPBvXA5iXYjL9LEMVyez8DX35i5gI="; }; - cargoHash = "sha256-UXH0SstMVprgezyr3I/6rv2uCMdDUUSIsQ3MJ49tdoI="; + cargoHash = "sha256-cqzY6z4e3ZAVG5HOxkTKYEcAxXu4OsUjpP6SD/LIX74="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/tools/text/mdbook-emojicodes/default.nix b/pkgs/tools/text/mdbook-emojicodes/default.nix index 63bf0dc6daf1c..0bbcffd28fe2f 100644 --- a/pkgs/tools/text/mdbook-emojicodes/default.nix +++ b/pkgs/tools/text/mdbook-emojicodes/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-emojicodes"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "blyxyas"; repo = "mdbook-emojicodes"; rev = "${version}"; - hash = "sha256-wj3WVDDJmRh1g4E1iqxqmu6QNNVi9pOqZDnnDX3AnFo="; + hash = "sha256-dlvfY2AMBvTl0j9YaT+u4CeWQGGihFD8AZaAK4/hUWU="; }; - cargoHash = "sha256-Ia7GdMadx1Jb1BB040eRmyIpK98CsN3yjruUxUNh3co="; + cargoHash = "sha256-SkvAtV613+ARk79dB2zRKoLjPgdzoEKQa3JrRw9qBkA="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation diff --git a/pkgs/tools/text/mecab/base.nix b/pkgs/tools/text/mecab/base.nix index 181eb405cbd71..d52d4e907730e 100644 --- a/pkgs/tools/text/mecab/base.nix +++ b/pkgs/tools/text/mecab/base.nix @@ -1,16 +1,17 @@ { fetchurl }: -{ - version = "0.996"; +finalAttrs: { + version = "0.996"; - src = fetchurl { - url = "https://drive.google.com/uc?export=download&id=0B4y35FiV1wh7cENtOXlicTFaRUE"; - name = "mecab-0.996.tar.gz"; - sha256 = "0ncwlqxl1hdn1x4v4kr2sn1sbbcgnhdphp0lcvk74nqkhdbk4wz0"; - }; + src = fetchurl { + url = "https://drive.google.com/uc?export=download&id=0B4y35FiV1wh7cENtOXlicTFaRUE"; + name = "mecab-${finalAttrs.version}.tar.gz"; + hash = "sha256-4HMyV4MTW3LmZhRceBu0j62lg9UiT7JJD7bBQDumnFk="; + }; - buildPhase = '' - make - make check - ''; + configureFlags = [ + "--with-charset=utf8" + ]; + + doCheck = true; } diff --git a/pkgs/tools/text/mecab/default.nix b/pkgs/tools/text/mecab/default.nix index 04293d29efb27..58396d2aa4621 100644 --- a/pkgs/tools/text/mecab/default.nix +++ b/pkgs/tools/text/mecab/default.nix @@ -3,19 +3,19 @@ let mecab-base = import ./base.nix { inherit fetchurl; }; in -stdenv.mkDerivation (mecab-base // { - pname = "mecab"; - version = mecab-base.version; +stdenv.mkDerivation (finalAttrs: ((mecab-base finalAttrs) // { + pname = "mecab"; - postInstall = '' - sed -i 's|^dicdir = .*$|dicdir = ${mecab-ipadic}|' "$out/etc/mecabrc" - ''; + postInstall = '' + sed -i 's|^dicdir = .*$|dicdir = ${mecab-ipadic}|' "$out/etc/mecabrc" + ''; - meta = with lib; { - description = "Japanese morphological analysis system"; - homepage = "http://taku910.github.io/mecab/"; - license = licenses.bsd3; - platforms = platforms.unix; - maintainers = with maintainers; [ auntie ]; - }; -}) + meta = with lib; { + description = "Japanese morphological analysis system"; + homepage = "http://taku910.github.io/mecab"; + license = licenses.bsd3; + platforms = platforms.unix; + mainProgram = "mecab"; + maintainers = with maintainers; [ auntie paveloom ]; + }; +})) diff --git a/pkgs/tools/text/mecab/ipadic.nix b/pkgs/tools/text/mecab/ipadic.nix index 026e385e7c2bd..61d23f87a8cec 100644 --- a/pkgs/tools/text/mecab/ipadic.nix +++ b/pkgs/tools/text/mecab/ipadic.nix @@ -1,18 +1,19 @@ { stdenv, fetchurl, mecab-nodic }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "mecab-ipadic"; version = "2.7.0-20070801"; src = fetchurl { url = "https://drive.google.com/uc?export=download&id=0B4y35FiV1wh7MWVlSDBCSXZMTXM"; - name = "mecab-ipadic-2.7.0-20070801.tar.gz"; - sha256 = "08rmkvj0f0x6jq0axrjw2y5nam0mavv6x77dp9v4al0wi1ym4bxn"; + name = "mecab-ipadic-${finalAttrs.version}.tar.gz"; + hash = "sha256-ti9SfYgcUEV2uu2cbvZWFVRlixdc5q4AlqYDB+SeNSM="; }; buildInputs = [ mecab-nodic ]; - configurePhase = '' - ./configure --with-dicdir="$out" - ''; -} + configureFlags = [ + "--with-charset=utf8" + "--with-dicdir=${placeholder "out"}" + ]; +}) diff --git a/pkgs/tools/text/mecab/nodic.nix b/pkgs/tools/text/mecab/nodic.nix index be9003623e05e..5e33b09db1453 100644 --- a/pkgs/tools/text/mecab/nodic.nix +++ b/pkgs/tools/text/mecab/nodic.nix @@ -3,7 +3,6 @@ let mecab-base = import ./base.nix { inherit fetchurl; }; in -stdenv.mkDerivation (mecab-base // { - pname = "mecab-nodic"; - version = mecab-base.version; -}) +stdenv.mkDerivation (finalAttrs: ((mecab-base finalAttrs) // { + pname = "mecab-nodic"; +})) diff --git a/pkgs/tools/text/mmdoc/default.nix b/pkgs/tools/text/mmdoc/default.nix index 312a4f94b22f9..50b7f6dcb9dff 100644 --- a/pkgs/tools/text/mmdoc/default.nix +++ b/pkgs/tools/text/mmdoc/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "mmdoc"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "ryantm"; repo = "mmdoc"; rev = version; - hash = "sha256-W48ndjWrdJphvGDDUtcLZLBzsTfeLCi3k6UrHVroBcA="; + hash = "sha256-NS8i5xvCwq0pSdfxnaxnpuwmDAkfH6Tkc4N2F6aGvWY="; }; nativeBuildInputs = [ ninja meson pkg-config xxd ]; diff --git a/pkgs/tools/text/ov/default.nix b/pkgs/tools/text/ov/default.nix index ac07611063aa0..e988f1c2f204d 100644 --- a/pkgs/tools/text/ov/default.nix +++ b/pkgs/tools/text/ov/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "ov"; - version = "0.31.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "noborus"; repo = "ov"; rev = "refs/tags/v${version}"; - hash = "sha256-UtYFr5eFdEU/oZqwy84W/GQiFrMPWRIomqgJY3P52Ws="; + hash = "sha256-mQ1KwElD8RizOT2trHWo4T1QiZ974xwhQCCa5snpnZM="; }; - vendorHash = "sha256-0Gs/GFlAl+ttprAVq9NxRLYzP/U2PD4IrY+drSIWJ/c="; + vendorHash = "sha256-XACdtJdACMKQ5gSJcjGAPNGPFL1Tbt6QOovl15mvFGI="; ldflags = [ "-s" diff --git a/pkgs/tools/text/papeer/default.nix b/pkgs/tools/text/papeer/default.nix index 9bca2da6ffce2..4084d49373fd9 100644 --- a/pkgs/tools/text/papeer/default.nix +++ b/pkgs/tools/text/papeer/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "papeer"; - version = "0.7.2"; + version = "0.8.1"; src = fetchFromGitHub { owner = "lapwat"; repo = pname; rev = "v${version}"; - hash = "sha256-Kdy660FuPjXYF/uqndljmIvA6r+lo3D86W9pK6KqXl0="; + hash = "sha256-nEt2rxI9slrEkbpMpXQM6+jO0QWQsuLdOswXPCSozJs="; }; vendorHash = "sha256-3QRSdkx9p0H+zPB//bpWCBKKjKjrx0lHMk5lFm+U7pA="; diff --git a/pkgs/tools/text/platinum-searcher/default.nix b/pkgs/tools/text/platinum-searcher/default.nix index ca89b7dc2d8ab..cbca59bdc6e58 100644 --- a/pkgs/tools/text/platinum-searcher/default.nix +++ b/pkgs/tools/text/platinum-searcher/default.nix @@ -1,20 +1,27 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: -buildGoPackage rec { +buildGoModule rec { pname = "the_platinum_searcher"; version = "2.1.5"; - rev = "v${version}"; - - goPackagePath = "github.com/monochromegane/the_platinum_searcher"; src = fetchFromGitHub { - inherit rev; owner = "monochromegane"; repo = "the_platinum_searcher"; - sha256 = "1y7kl3954dimx9hp2bf1vjg1h52hj1v6cm4f5nhrqzwrawp0b6q0"; + rev = "v${version}"; + hash = "sha256-AJsFLleZf5yhLY5UZnaQUBQYntzBLXFh6jU2UtKg8/g="; }; - goDeps = ./deps.nix; + vendorHash = "sha256-GIjPgu0e+duN5MeWcRaF5xUFCkqe2aZJCwGbLUMko08="; + + patches = [ + # Add Go Modules support. See https://github.com/monochromegane/the_platinum_searcher/pull/217. + (fetchpatch { + url = "https://github.com/monochromegane/the_platinum_searcher/pull/217/commits/69064d11c57d5fd5f66ddd95f0e789786183d3c6.patch"; + hash = "sha256-qQ7kZYb2MWSUV6T1frIPT9nMfb20SI7lbG8YhqyQEi8="; + }) + ]; + + ldflags = [ "-s" "-w" ]; meta = with lib; { homepage = "https://github.com/monochromegane/the_platinum_searcher"; diff --git a/pkgs/tools/text/platinum-searcher/deps.nix b/pkgs/tools/text/platinum-searcher/deps.nix deleted file mode 100644 index 04fb9bd4be345..0000000000000 --- a/pkgs/tools/text/platinum-searcher/deps.nix +++ /dev/null @@ -1,83 +0,0 @@ -[ - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "a5b47d31c556af34a302ce5d659e6fea44d90de0"; - sha256 = "0v6l48fshdjrqzyq1kwn22gy7vy434xdr1i0lm3prsf6jbln9fam"; - }; - } - { - goPackagePath = "github.com/jessevdk/go-flags"; - fetch = { - type = "git"; - url = "https://github.com/jessevdk/go-flags"; - rev = "4e64e4a4e2552194cf594243e23aa9baf3b4297e"; - sha256 = "02x7f1wm8119s27h4dc3a4aw6shydnpnnkvzwg5xm0snn5kb4zxm"; - }; - } - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "99064174e013895bbd9b025c31100bd1d9b590ca"; - sha256 = "058qrar8rvw3wb0ci1mf1axnqq2729cvv9zmdr4ms2nn9s97yiz9"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "a49bea13b776691cb1b49873e5d8df96ec74831a"; - sha256 = "1pcmgf88wml6ca8v63nh3nxsfvpzjv3c4qj2w2wkizbil826g7as"; - }; - } - { - goPackagePath = "github.com/monochromegane/conflag"; - fetch = { - type = "git"; - url = "https://github.com/monochromegane/conflag"; - rev = "6d68c9aa4183844ddc1655481798fe4d90d483e9"; - sha256 = "0csfr5c8d3kbna9sqhzfp2z06wq6mc6ijja1zj2i82kzsq8534wa"; - }; - } - { - goPackagePath = "github.com/monochromegane/go-home"; - fetch = { - type = "git"; - url = "https://github.com/monochromegane/go-home"; - rev = "25d9dda593924a11ea52e4ffbc8abdb0dbe96401"; - sha256 = "172chakrj22xfm0bcda4qj5zqf7lwr53pzwc3xj6wz8vd2bcxkww"; - }; - } - { - goPackagePath = "github.com/monochromegane/terminal"; - fetch = { - type = "git"; - url = "https://github.com/monochromegane/terminal"; - rev = "2da212063ce19aed90ee5bbb00ad1ad7393d7f48"; - sha256 = "1rddaq9pk5q57ildms35iihghqk505gb349pb0f6k3svchay38nh"; - }; - } - { - goPackagePath = "github.com/monochromegane/go-gitignore"; - fetch = { - type = "git"; - url = "https://github.com/monochromegane/go-gitignore"; - rev = "38717d0a108ca0e5af632cd6845ca77d45b50729"; - sha256 = "0r1inabpgg6sn6i47b02hcmd2p4dc1ab1mcy20mn1b2k3mpdj4b7"; - }; - } - { - goPackagePath = "github.com/shiena/ansicolor"; - fetch = { - type = "git"; - url = "https://github.com/shiena/ansicolor"; - rev = "a422bbe96644373c5753384a59d678f7d261ff10"; - sha256 = "1dcn8a9z6a5dxa2m3fkppnajcls8lanbl38qggkf646yi5qsk1hc"; - }; - } -] diff --git a/pkgs/tools/text/riffdiff/default.nix b/pkgs/tools/text/riffdiff/default.nix index c26966a158170..cd5e2caa8f0da 100644 --- a/pkgs/tools/text/riffdiff/default.nix +++ b/pkgs/tools/text/riffdiff/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "riffdiff"; - version = "2.25.2"; + version = "2.27.0"; src = fetchFromGitHub { owner = "walles"; repo = "riff"; rev = version; - hash = "sha256-JZWgI4yAsk+jtTyS3QZBxdAOPYmUxb7pn1SbcUeCh6Y="; + hash = "sha256-yrIZsCxoFV9LFh96asYxpAYv1KvrLq+RlqL8gZXaeak="; }; - cargoHash = "sha256-Z33CGF02rPf24LaYh+wEmmGgPPw+oxMNCgMzCrUEKqk="; + cargoHash = "sha256-tO49qAEW15q76hLcHOtniwLqGy29MZ/dabyZHYAsiME="; meta = with lib; { description = "A diff filter highlighting which line parts have changed"; diff --git a/pkgs/tools/text/txr/default.nix b/pkgs/tools/text/txr/default.nix index dceedbdc51019..1b7062d9ddcc2 100644 --- a/pkgs/tools/text/txr/default.nix +++ b/pkgs/tools/text/txr/default.nix @@ -69,6 +69,5 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ AndersonTorres dtzWill ]; platforms = lib.platforms.all; - broken = stdenv.isDarwin && stdenv.isx86_64; # ofborg fails while testing }; }) diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix index edfc8cce6d08c..878f342101ca0 100644 --- a/pkgs/tools/text/ugrep/default.nix +++ b/pkgs/tools/text/ugrep/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ugrep"; - version = "4.1.0"; + version = "4.2.0"; src = fetchFromGitHub { owner = "Genivia"; repo = "ugrep"; rev = "v${finalAttrs.version}"; - hash = "sha256-FZGZ60+SGCFOfdUOlUXMZee4Il0UmT8zRmsAVX6bGYY="; + hash = "sha256-wK952anodjsYvJQhM3V6SXZnt1+jbRTfgN+GfuuhPr8="; }; buildInputs = [ diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index 9509d9b79083f..7ac57de731a5d 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "2.28.3"; + version = "2.29.1"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - hash = "sha256-uRQGTVEueIe7tk0jd25V2MIBBxbWmXLYDu2lCofq/uY="; + hash = "sha256-bvj0K7d23E5QKree+PLfA9AgKFqL6YDtlmh/nEtrPbE="; }; vendorHash = "sha256-YUazrbTeioRV+L6Ku+oJRJzp16WCLPzlAH6F25TT6Dg="; diff --git a/pkgs/tools/text/vgrep/default.nix b/pkgs/tools/text/vgrep/default.nix index e9fbaf81c2aa9..f6a14e6024b5d 100644 --- a/pkgs/tools/text/vgrep/default.nix +++ b/pkgs/tools/text/vgrep/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-8xLyk1iid3xDCAuZwz1oXsEyboLaxvzm1BEyA2snQt4="; }; - vendorSha256 = null; + vendorHash = null; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/pkgs/tools/text/xml/basex/default.nix b/pkgs/tools/text/xml/basex/default.nix index a99f414884465..5e9df9f513b6c 100644 --- a/pkgs/tools/text/xml/basex/default.nix +++ b/pkgs/tools/text/xml/basex/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "basex"; - version = "10.6"; + version = "10.7"; src = fetchurl { url = "http://files.basex.org/releases/${version}/BaseX${builtins.replaceStrings ["."] [""] version}.zip"; - hash = "sha256-8C1fsoXcihMA+JXQ+aQTIi08+hZEk1cRZKg2vRB/j0k="; + hash = "sha256-Jr73UoyJfhtXLnYgOPh+jqKc3XZs+WMwJaO5nuD+Vmw="; }; nativeBuildInputs = [ unzip copyDesktopItems ]; diff --git a/pkgs/tools/typesetting/htmldoc/default.nix b/pkgs/tools/typesetting/htmldoc/default.nix index 911d3eba87e9b..02a1a97010c59 100644 --- a/pkgs/tools/typesetting/htmldoc/default.nix +++ b/pkgs/tools/typesetting/htmldoc/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, testers, fetchFromGitHub, zlib, libpng, libjpeg, SystemConfiguration, Foundation, pkg-config, htmldoc }: +{ lib, stdenv, testers, fetchFromGitHub, zlib, cups, libpng, libjpeg, SystemConfiguration, Foundation, pkg-config, htmldoc }: stdenv.mkDerivation rec { pname = "htmldoc"; - version = "1.9.16"; + version = "1.9.17"; src = fetchFromGitHub { owner = "michaelrsweet"; repo = "htmldoc"; rev = "v${version}"; - sha256 = "117cj5sfzl18gan53ld8lxb0wycizcp9jcakcs3nsvnss99rw3a6"; + sha256 = "1qq45l1vxxa970cm0wjvgj0w88hd4vsisa85pf5i54yvfzf11sqw"; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ zlib libpng libjpeg ] + buildInputs = [ zlib cups libpng libjpeg ] ++ lib.optionals stdenv.isDarwin [ Foundation SystemConfiguration ]; # do not generate universal binary on Darwin diff --git a/pkgs/tools/typesetting/lowdown/default.nix b/pkgs/tools/typesetting/lowdown/default.nix index 3a108d7c8ed02..ba510fe256b78 100644 --- a/pkgs/tools/typesetting/lowdown/default.nix +++ b/pkgs/tools/typesetting/lowdown/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"; - sha512 = "1cizrzmldi7lrgdkpn4b6skp1b5hz2jskkbcbv9k6lmz08clm02gyifh7fgd8j2rklqsim34n5ifyg83xhsjzd57xqjys1ccjdn3a5m"; + hash = "sha512-tahhm2QsaC9xP6V9qWEf6HkXiyWjRo3pzEKi9tyBLvonQKUMgV+pmWkvtubUUnxYVrhTm0Xsne1lemKj9ecfWQ=="; }; nativeBuildInputs = [ which dieHook ] diff --git a/pkgs/tools/typesetting/pdf2djvu/default.nix b/pkgs/tools/typesetting/pdf2djvu/default.nix index 6921c64d85fa5..9cbf61304b9a9 100644 --- a/pkgs/tools/typesetting/pdf2djvu/default.nix +++ b/pkgs/tools/typesetting/pdf2djvu/default.nix @@ -16,40 +16,16 @@ }: stdenv.mkDerivation rec { - version = "0.9.18.2"; + version = "0.9.19"; pname = "pdf2djvu"; src = fetchFromGitHub { owner = "jwilk"; repo = "pdf2djvu"; rev = version; - sha256 = "s6n7nDO15DZSJ1EOPoNvjdFv/QtOoGiUa2b/k3kzWe8="; + sha256 = "sha256-j4mYdmLZ56qTA1KbWBjBvyTyLaeuIITKYsALRIO7lj0="; }; - patches = [ - # Fix build with Poppler 22.03. - (fetchpatch { - url = "https://github.com/jwilk/pdf2djvu/commit/e170ad557d5f13daeeac047dfaa79347bbe5062f.patch"; - sha256 = "OPK2UWVs+E2uOEaxPtLWmVL28yCxaeJKscY9ziAbS7E="; - }) - (fetchpatch { - url = "https://github.com/jwilk/pdf2djvu/commit/956fedc7e0831126b9006efedad5519c14201c52.patch"; - sha256 = "JF1xvvL2WyMu6GjdrPLlRC6eC6vGLbVurQcNy3AOOXA="; - }) - (fetchpatch { - url = "https://github.com/jwilk/pdf2djvu/commit/dca43e8182174bc04e107eaefcafcfdfdf9bcd61.patch"; - sha256 = "0JcfDaVZpuv6VfUJ2HuxRqgntZ/t8AzU0RG/E83BWGY="; - }) - (fetchpatch { - url = "https://github.com/jwilk/pdf2djvu/commit/81b635e014ebd0240a8719cc39b6a1b759cc6a98.patch"; - sha256 = "LBmT4eflLd23X7gg7IbqGe3PfTGldEGFLEKImV4nbB0="; - postFetch = '' - # The file was renamed after the release. - sed -i "s/main.cc/pdf2djvu.cc/g" "$out" - ''; - }) - ]; - nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ @@ -77,7 +53,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # Required by Poppler + # Required by Poppler on darwin # https://github.com/jwilk/pdf2djvu/commit/373e065faf2f0d868a3700788d20a96e9528bb12 CXXFLAGS = "-std=c++17"; diff --git a/pkgs/tools/typesetting/soupault/default.nix b/pkgs/tools/typesetting/soupault/default.nix index f3fa8b67ba7c2..da3b2b509b1ec 100644 --- a/pkgs/tools/typesetting/soupault/default.nix +++ b/pkgs/tools/typesetting/soupault/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitea -, fetchpatch , ocamlPackages , soupault , testers @@ -9,35 +8,26 @@ let pname = "soupault"; - version = "4.6.0"; + version = "4.7.0"; in ocamlPackages.buildDunePackage { inherit pname version; minimalOCamlVersion = "4.13"; - duneVersion = "3"; - src = fetchFromGitea { domain = "codeberg.org"; owner = "PataphysicalSociety"; repo = pname; rev = version; - sha256 = "MblwVacfK9CfoO0TEND+bqdi7iQayBOJKKOhzE7oiVk="; + sha256 = "nwXyOwDUbkMnyHPrvCvmToyONdbg5kJm2mt5rWrB6HA="; }; - patches = lib.lists.optional - (lib.strings.versionAtLeast "2.0.0" ocamlPackages.camomile.version) - (fetchpatch { - name = "camomile-1_x"; - url = "https://files.baturin.org/software/soupault/soupault-4.6.0-camomile-1.x.patch"; - sha256 = "J5RGyLDDVRzf6MLLI+73lqClxoovcPD2ZFawk+f6cE4="; - }); - buildInputs = with ocamlPackages; [ base64 camomile containers + csv digestif ezjsonm fileutils @@ -66,5 +56,6 @@ ocamlPackages.buildDunePackage { changelog = "https://codeberg.org/PataphysicalSociety/soupault/src/branch/main/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ toastal ]; + mainProgram = "soupault"; }; } diff --git a/pkgs/tools/typesetting/typstfmt/Cargo.lock b/pkgs/tools/typesetting/typstfmt/Cargo.lock index 82a5be7508383..f5abd5a1e9ea6 100644 --- a/pkgs/tools/typesetting/typstfmt/Cargo.lock +++ b/pkgs/tools/typesetting/typstfmt/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "aho-corasick" -version = "1.0.5" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" +checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" dependencies = [ "memchr", ] @@ -146,9 +146,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.31.0" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0770b0a3d4c70567f0d58331f3088b0e4c4f56c9b8d764efe654b4a5d46de3a" +checksum = "a3e02c584f4595792d09509a94cdb92a3cef7592b1eb2d9877ee6f527062d0ea" dependencies = [ "console", "lazy_static", @@ -180,9 +180,9 @@ checksum = "baff4b617f7df3d896f97fe922b64817f6cd9a756bb81d40f8883f2f66dcb401" [[package]] name = "libc" -version = "0.2.147" +version = "0.2.148" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" [[package]] name = "linked-hash-map" @@ -232,9 +232,9 @@ checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" dependencies = [ "unicode-ident", ] @@ -309,7 +309,7 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.37", ] [[package]] @@ -358,9 +358,9 @@ checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] name = "smallvec" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" [[package]] name = "syn" @@ -375,9 +375,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.32" +version = "2.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" +checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" dependencies = [ "proc-macro2", "quote", @@ -448,7 +448,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.37", ] [[package]] @@ -504,7 +504,7 @@ dependencies = [ [[package]] name = "typstfmt" -version = "0.2.4" +version = "0.2.5" dependencies = [ "lexopt", "typstfmt_lib", @@ -512,7 +512,7 @@ dependencies = [ [[package]] name = "typstfmt_lib" -version = "0.2.4" +version = "0.2.5" dependencies = [ "globmatch", "insta", @@ -585,9 +585,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ "winapi", ] diff --git a/pkgs/tools/typesetting/typstfmt/default.nix b/pkgs/tools/typesetting/typstfmt/default.nix index 880cbdcac34b5..7f84fc1cc5e7b 100644 --- a/pkgs/tools/typesetting/typstfmt/default.nix +++ b/pkgs/tools/typesetting/typstfmt/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "typstfmt"; - version = "0.2.4"; + version = "0.2.5"; src = fetchFromGitHub { owner = "astrale-sharp"; repo = "typstfmt"; rev = version; - hash = "sha256-d0vlZqg0RcRvZM7xYdMLX2/UeolUbqZ9H4drJRRKBmc="; + hash = "sha256-+iQOS+WPCWevUFurLfuC5mhuRdJ/1ZsekFoFDzZviag="; }; cargoLock = { diff --git a/pkgs/tools/video/go2rtc/default.nix b/pkgs/tools/video/go2rtc/default.nix index 9a9da5c49f32f..d3e572fae5135 100644 --- a/pkgs/tools/video/go2rtc/default.nix +++ b/pkgs/tools/video/go2rtc/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "go2rtc"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "AlexxIT"; repo = "go2rtc"; rev = "refs/tags/v${version}"; - hash = "sha256-o4sxVvDQfJELlA1addsvojkosGMx+/5jrGqPfeYtPUs="; + hash = "sha256-w3yn8Xn09VdbSAnOey9YFW4qf6+h1xmdgYfIcf6Q1lY="; }; - vendorHash = "sha256-Nv89Fo88bzLrG7PbaGEBM52N81WmGoCiogZNB/FsrcA="; + vendorHash = "sha256-VI6OODJLKrCvehM4W96Qh3PvZoIM2GlE5cgyvSaCv+8="; buildFlagArrays = [ "-trimpath" diff --git a/pkgs/tools/video/svt-av1/default.nix b/pkgs/tools/video/svt-av1/default.nix index 062f21bb4d201..40869c0f8f4e4 100644 --- a/pkgs/tools/video/svt-av1/default.nix +++ b/pkgs/tools/video/svt-av1/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "svt-av1"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitLab { owner = "AOMediaCodec"; repo = "SVT-AV1"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-rGe4h3d2Ql8tB/5vKFJGPkhmjMHnqgMUpnGzeh+PasA="; + sha256 = "sha256-WKc0DNwpA9smMS3e/GDkk77FUkohwaPMgcXgji14CIw="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/virtualization/google-guest-agent/default.nix b/pkgs/tools/virtualization/google-guest-agent/default.nix index bf53f43a5731b..423f43a02de03 100644 --- a/pkgs/tools/virtualization/google-guest-agent/default.nix +++ b/pkgs/tools/virtualization/google-guest-agent/default.nix @@ -1,19 +1,26 @@ -{ buildGoModule, fetchFromGitHub, lib, coreutils, makeWrapper -, google-guest-configs, google-guest-oslogin, iproute2, procps +{ lib +, buildGoModule +, fetchFromGitHub +, coreutils +, makeWrapper +, google-guest-configs +, google-guest-oslogin +, iproute2 +, procps }: buildGoModule rec { pname = "guest-agent"; - version = "20230726.00"; + version = "20230821.00"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = pname; - rev = version; - sha256 = "sha256-p+gjiaUaBBGhCVkbXrubfV/xZWvanC8ktlfIfjyUQSA="; + rev = "refs/tags/${version}"; + hash = "sha256-DP15KDnD09edBxOQDwP0cjVIFxjMzE1hu1Sbu6Faj9Y="; }; - vendorHash = "sha256-Xw/5yHW9DRtZFC6cECLI0RncgzSGB5/Y0yjW7hz247s="; + vendorHash = "sha256-PGvyDjhLwIKhR6NmwzbzjfkBK+FqsziAdsybQmCbtCc="; patches = [ ./disable-etc-mutation.patch ]; @@ -27,7 +34,12 @@ buildGoModule rec { ''; # We don't add `shadow` here; it's added to PATH if `mutableUsers` is enabled. - binPath = lib.makeBinPath [ google-guest-configs google-guest-oslogin iproute2 procps ]; + binPath = lib.makeBinPath [ + google-guest-configs + google-guest-oslogin + iproute2 + procps + ]; # Skip tests which require networking. preCheck = '' @@ -44,10 +56,11 @@ buildGoModule rec { ''; meta = with lib; { - homepage = "https://github.com/GoogleCloudPlatform/guest-agent"; description = "Guest Agent for Google Compute Engine"; + homepage = "https://github.com/GoogleCloudPlatform/guest-agent"; + changelog = "https://github.com/GoogleCloudPlatform/guest-agent/releases/tag/${version}"; license = licenses.asl20; - platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/virtualization/govc/default.nix b/pkgs/tools/virtualization/govc/default.nix index 20bb8a66089f9..43f8cfd2143c6 100644 --- a/pkgs/tools/virtualization/govc/default.nix +++ b/pkgs/tools/virtualization/govc/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "govc"; - version = "0.30.7"; + version = "0.32.0"; subPackages = [ "govc" ]; @@ -10,10 +10,10 @@ buildGoModule rec { rev = "v${version}"; owner = "vmware"; repo = "govmomi"; - sha256 = "sha256-8cBS92O5AEeXQyLwOTAWbjvj1oPJiHLBooRgl5pt0Mk="; + sha256 = "sha256-GnMWgN6ZxxGU/tRAPIk2cvpsBiut97iPcU9920wepxM="; }; - vendorHash = "sha256-iLmQdjN0EXJuwC3NT5FKdHhJ4KvNAvnsBGAO9bypdqg="; + vendorHash = "sha256-mf9ZYZEmqB/47JLHn8N3VDr57SXbFLubXnwfXj682FA="; ldflags = [ "-s" diff --git a/pkgs/tools/virtualization/jumppad/default.nix b/pkgs/tools/virtualization/jumppad/default.nix index 45a3e30603f64..a993fe9484d26 100644 --- a/pkgs/tools/virtualization/jumppad/default.nix +++ b/pkgs/tools/virtualization/jumppad/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "jumppad"; - version = "0.5.38"; + version = "0.5.51"; src = fetchFromGitHub { owner = "jumppad-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-s779QQ1fzVKFIMoj7X3MLLo1Z3NBSGPoKoDi3xM0fr8="; + hash = "sha256-Az/rNkGwwrYZfay+KjINjIT2PNsoGDNCwZnXZTeKqM4="; }; - vendorHash = "sha256-37j7taSmWhs9NQbv41aljR07HCTRrLd3ddiktV/XKBs="; + vendorHash = "sha256-onUs7ZbnzJGbs+Q+1jvqUp9y9ecOxhtcdx/fkxZntmc="; ldflags = [ "-s" "-w" "-X main.version=${version}" diff --git a/pkgs/tools/virtualization/mkosi/default.nix b/pkgs/tools/virtualization/mkosi/default.nix index 8fc5376e4c2cb..1c99d63741a79 100644 --- a/pkgs/tools/virtualization/mkosi/default.nix +++ b/pkgs/tools/virtualization/mkosi/default.nix @@ -1,44 +1,76 @@ { lib , fetchFromGitHub +, fetchpatch +, stdenv +, python3 +, bubblewrap +, systemd + + # Python packages , setuptools , setuptools-scm , wheel , buildPythonApplication , pytestCheckHook -, bubblewrap -, systemd -, stdenv +, pefile + + # Optional dependencies +, withQemu ? false +, qemu +, OVMF }: let # For systemd features used by mkosi, see # https://github.com/systemd/mkosi/blob/19bb5e274d9a9c23891905c4bcbb8f68955a701d/action.yaml#L64-L72 - systemdForMkosi = systemd.override { - # Will be added in #243242 - # withRepart = true; - # withBootloader = true; + systemdForMkosi = (systemd.overrideAttrs (oldAttrs: { + patches = oldAttrs.patches ++ [ + # Enable setting a deterministic verity seed for systemd-repart. Remove when upgrading to systemd 255. + (fetchpatch { + url = "https://github.com/systemd/systemd/commit/81e04781106e3db24e9cf63c1d5fdd8215dc3f42.patch"; + hash = "sha256-KO3poIsvdeepPmXWQXNaJJCPpmBb4sVmO+ur4om9f5k="; + }) + # Propagate SOURCE_DATE_EPOCH to mcopy. Remove when upgrading to systemd 255. + (fetchpatch { + url = "https://github.com/systemd/systemd/commit/4947de275a5553399854cc748f4f13e4ae2ba069.patch"; + hash = "sha256-YIZZyc3f8pQO9fMAxiNhDdV8TtL4pXoh+hwHBzRWtfo="; + }) + ]; + })).override { + withRepart = true; + withBootloader = true; + withSysusers = true; + withFirstboot = true; withEfi = true; withUkify = true; }; + + python3pefile = python3.withPackages (ps: with ps; [ + pefile + ]); in buildPythonApplication rec { pname = "mkosi"; - version = "15.2-pre"; # 15.1 is the latest release, but we require a newer commit + version = "18"; format = "pyproject"; src = fetchFromGitHub { owner = "systemd"; repo = "mkosi"; - # Fix from the commit is needed to run on NixOS, - # see https://github.com/systemd/mkosi/issues/1792 - rev = "ca9673cbcbd9f293e5566cec4a1ba14bbcd075b8"; - hash = "sha256-y5gG/g33HBpH1pTXfjHae25bc5p/BvlCm9QxOIYtcA8="; + rev = "v${version}"; + hash = "sha256-bnd2P6lq1XqKed3m4hDYrR9IcdrPaJxNBL2Z6jCruV4="; }; # Fix ctypes finding library # https://github.com/NixOS/nixpkgs/issues/7307 - patchPhase = lib.optionalString stdenv.isLinux '' - substituteInPlace mkosi/run.py --replace \ - 'ctypes.util.find_library("c")' "'${stdenv.cc.libc}/lib/libc.so.6'" + postPatch = lib.optionalString stdenv.isLinux '' + substituteInPlace mkosi/run.py \ + --replace 'ctypes.util.find_library("c")' "'${stdenv.cc.libc}/lib/libc.so.6'" + substituteInPlace mkosi/__init__.py \ + --replace '/usr/lib/systemd/ukify' "${systemdForMkosi}/lib/systemd/ukify" + '' + lib.optionalString withQemu '' + substituteInPlace mkosi/qemu.py \ + --replace '/usr/share/ovmf/x64/OVMF_VARS.fd' "${OVMF.variables}" \ + --replace '/usr/share/ovmf/x64/OVMF_CODE.fd' "${OVMF.firmware}" ''; nativeBuildInputs = [ @@ -47,9 +79,15 @@ buildPythonApplication rec { wheel ]; + makeWrapperArgs = [ + "--set MKOSI_INTERPRETER ${python3pefile}/bin/python3" + ]; + propagatedBuildInputs = [ systemdForMkosi bubblewrap + ] ++ lib.optional withQemu [ + qemu ]; postInstall = '' @@ -64,6 +102,7 @@ buildPythonApplication rec { meta = with lib; { description = "Build legacy-free OS images"; homepage = "https://github.com/systemd/mkosi"; + changelog = "https://github.com/systemd/mkosi/releases/tag/v${version}"; license = licenses.lgpl21Only; mainProgram = "mkosi"; maintainers = with maintainers; [ malt3 katexochen ]; diff --git a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix index 74e6c5359ed4b..25123ec9b2443 100644 --- a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix +++ b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix @@ -42,6 +42,7 @@ ocamlPackages.buildDunePackage rec { homepage = "https://github.com/talex5/wayland-virtwl-proxy"; description = "Proxy Wayland connections across a VM boundary"; license = licenses.asl20; + mainProgram = "wayland-proxy-virtwl"; maintainers = [ maintainers.qyliss maintainers.sternenseemann ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/wayland/wl-screenrec/default.nix b/pkgs/tools/wayland/wl-screenrec/default.nix index c7f42cba64300..c96a5834fa259 100644 --- a/pkgs/tools/wayland/wl-screenrec/default.nix +++ b/pkgs/tools/wayland/wl-screenrec/default.nix @@ -2,22 +2,23 @@ , rustPlatform , fetchFromGitHub , pkg-config -, wayland +, libdrm , ffmpeg +, wayland }: rustPlatform.buildRustPackage rec { pname = "wl-screenrec"; - version = "unstable-2023-05-31"; + version = "unstable-2023-09-17"; src = fetchFromGitHub { owner = "russelltg"; repo = pname; - rev = "fc918f7898900c1882c6f64c96ed2de8cb9a6300"; - hash = "sha256-P/JELiw0qGcwLFgNPccN/uetNy8CNCJdlCLhgq0h4sc="; + rev = "a36c5923009b44f2131196d8a3a234948f8e0102"; + hash = "sha256-V29eB9vozVKIBq8dO7zgA4nirsh1eDBjJN+rwVkeDLE="; }; - cargoHash = "sha256-r9zmAiLiAntHcb5W/WKmKbVP9c9+15ElIWtHkks0wig="; + cargoHash = "sha256-uUfEweLWn/NdqgY8O7Ld+YnGPKQV1tpJi/Gd4MZB4xI="; nativeBuildInputs = [ pkg-config @@ -26,9 +27,12 @@ rustPlatform.buildRustPackage rec { buildInputs = [ wayland + libdrm ffmpeg ]; + doCheck = false; # tests use host compositor, etc + meta = with lib; { description = "High performance wlroots screen recording, featuring hardware encoding"; homepage = "https://github.com/russelltg/wl-screenrec"; diff --git a/pkgs/tools/wayland/wlopm/default.nix b/pkgs/tools/wayland/wlopm/default.nix index 5e08e5b53a836..aa0b9ae4bcfc1 100644 --- a/pkgs/tools/wayland/wlopm/default.nix +++ b/pkgs/tools/wayland/wlopm/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Simple client implementing zwlr-output-power-management-v1"; homepage = "https://git.sr.ht/~leon_plickat/wlopm"; + mainProgram = "wlopm"; license = licenses.gpl3Only; maintainers = with maintainers; [ arjan-s ]; platforms = platforms.linux; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 85c66e4bbbbf5..5ea4c7d943858 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -53,115 +53,41 @@ mapAliases ({ forceSystem = system: _: (import self.path { localSystem = { inherit system; }; }); - _0x0 = throw "0x0 upstream is abandoned and no longer exists: https://gitlab.com/somasis/scripts/"; - ### A ### - accounts-qt = throw "'accounts-qt' has been renamed to/replaced by 'libsForQt5.accounts-qt'"; # Converted to throw 2022-02-22 - acoustidFingerprinter = throw "acoustidFingerprinter has been removed from nixpkgs, as it was unmaintained"; # Added 2022-05-09 - adobeReader = throw "'adobeReader' has been renamed to/replaced by 'adobe-reader'"; # Converted to throw 2022-02-22 - adobe_flex_sdk = throw "'adobe_flex_sdk' has been renamed to/replaced by 'apache-flex-sdk'"; # Converted to throw 2022-02-22 - adoptopenjdk-hotspot-bin-17 = throw "AdoptOpenJDK is now Temurin. Use temurin-bin-17"; # added 2022-07-02 - adoptopenjdk-jre-hotspot-bin-17 = throw "AdoptOpenJDK is now Temurin and JRE is no longer provided. Use temurin-bin-17"; # added 2022-07-02 - aesop = throw "aesop has been removed from nixpkgs, as it was unmaintained"; # Added 2021-08-05 - ag = throw "'ag' has been renamed to/replaced by 'silver-searcher'"; # Converted to throw 2022-02-22 - aircrackng = throw "'aircrackng' has been renamed to/replaced by 'aircrack-ng'"; # Converted to throw 2022-02-22 airfield = throw "airfield has been removed due to being unmaintained"; # Added 2023-05-19 - airtame = throw "airtame has been removed due to being unmaintained"; # Added 2022-01-19 alertmanager-bot = throw "alertmanager-bot is broken and has been archived by upstream" ; # Added 2023-07-28 - aleth = throw "aleth (previously packaged as cpp_ethereum) has been removed; abandoned upstream"; # Added 2020-11-30 - aliza = throw "aliza has been removed, because it depended on qt4 and was unmaintained in nixpkgs"; # Added 2022-05-12 alsaLib = alsa-lib; # Added 2021-06-09 alsaOss = alsa-oss; # Added 2021-06-10 alsaPluginWrapper = alsa-plugins-wrapper; # Added 2021-06-10 alsaPlugins = alsa-plugins; # Added 2021-06-10 alsaTools = alsa-tools; # Added 2021-06-10 alsaUtils = alsa-utils; # Added 2021-06-10 - amazon-glacier-cmd-interface = throw "amazon-glacier-cmd-interface has been removed due to it being unmaintained"; # Added 2020-10-30 - aminal = throw "aminal was renamed to darktile"; # Added 2021-09-28 - ammonite-repl = throw "'ammonite-repl' has been renamed to/replaced by 'ammonite'"; # Converted to throw 2022-02-22 - amuleDaemon = throw "amuleDaemon was renamed to amule-daemon"; # Added 2022-02-11 - amsn = throw "amsn has been removed due to being unmaintained"; # Added 2020-12-09 - amuleGui = throw "amuleGui was renamed to amule-gui"; # Added 2022-02-11 angelfish = libsForQt5.kdeGear.angelfish; # Added 2021-10-06 - ansible_2_10 = throw "Ansible 2.10 went end of life in 2022/05 and has subsequently been dropped"; # Added 2022-03-30 - ansible_2_11 = throw "Ansible 2.11 goes end of life in 2022/11 and can't be supported throughout the 22.05 release cycle"; # Added 2022-03-30 ansible_2_12 = throw "Ansible 2.12 goes end of life in 2023/05 and can't be supported throughout the 23.05 release cycle"; # Added 2023-05-16 - ansible_2_9 = throw "Ansible 2.9 went end of life in 2022/05 and has subsequently been dropped"; # Added 2022-03-30 - animbar = throw "animbar has been removed, because it was unmaintained"; # Added 2022-05-26 - antimicro = throw "antimicro has been removed as it was broken, see antimicrox instead"; # Added 2020-08-06 antimicroX = antimicrox; # Added 2021-10-31 - apple-music-electron = throw "'apple-music-electron' is end of life and has been removed, you can use 'cider' instead"; # Added 2022-10-02 - appleseed = throw "appleseed has been removed, because it was unmaintained"; # Added 2022-05-26 - arangodb_3_3 = throw "arangodb_3_3 went end of life and has been removed"; # Added 2022-10-08 - arangodb_3_4 = throw "arangodb_3_4 went end of life and has been removed"; # Added 2022-10-08 - arangodb_3_5 = throw "arangodb_3_5 went end of life and has been removed"; # Added 2022-10-08 - ardour_5 = throw "ardour_5 has been removed. see https://github.com/NixOS/nixpkgs/issues/139549"; # Added 2021-09-28 - arduino_core = throw "'arduino_core' has been renamed to/replaced by 'arduino-core'"; # Converted to throw 2022-02-22 - arora = throw "arora has been removed"; # Added 2020-09-09 - asciidocFull = throw "'asciidocFull' has been renamed to/replaced by 'asciidoc-full'"; # Converted to throw 2022-02-22 aseprite-unfree = aseprite; # Added 2023-08-26 asls = throw "asls has been removed: abandoned by upstream"; # Added 2023-03-16 - asterisk_13 = throw "asterisk_13: Asterisk 13 is end of life and has been removed"; # Added 2022-04-06 - asterisk_15 = throw "asterisk_15: Asterisk 15 is end of life and has been removed"; # Added 2020-10-07 asterisk_16 = throw "asterisk_16: Asterisk 16 is end of life and has been removed"; # Added 2023-04-19 - asterisk_17 = throw "asterisk_17: Asterisk 17 is end of life and has been removed"; # Added 2022-04-06 asterisk_19 = throw "asterisk_19: Asterisk 19 is end of life and has been removed"; # Added 2023-04-19 - at_spi2_atk = throw "'at_spi2_atk' has been renamed to/replaced by 'at-spi2-atk'"; # Converted to throw 2022-02-22 - at_spi2_core = throw "'at_spi2_core' has been renamed to/replaced by 'at-spi2-core'"; # Converted to throw 2022-02-22 - aucdtect = throw "aucdtect: Upstream no longer provides download urls"; # Added 2020-12-26 - audacity-gtk2 = throw "'audacity-gtk2' has been removed to/replaced by 'audacity'"; # Added 2022-10-09 - audacity-gtk3 = throw "'audacity-gtk3' has been removed to/replaced by 'audacity'"; # Added 2022-10-09 - automoc4 = throw "automoc4 has been removed from nixpkgs"; # Added 2022-05-30 + atom = throw "'atom' has been removed because discontinued and deprecated. Consider using 'pulsar', a maintained fork"; # Added 2023-10-01 + atom-beta = throw "'atom-beta' has been removed because discontinued and deprecated. Consider using 'pulsar', a maintained fork"; # Added 2023-10-01 + atomEnv = throw "'atomEnv' has been removed because 'atom' is discontinued and deprecated. Consider using 'pulsar', a maintained fork"; # Added 2023-10-01 + atomPackages = throw "'atomPackages' has been removed because 'atom' is discontinued and deprecated. Consider using 'pulsar', a maintained fork"; # Added 2023-10-01 avldrums-lv2 = x42-avldrums; # Added 2020-03-29 - avogadro = throw "avogadro has been removed, because it depended on qt4"; # Added 2022-06-12 - avxsynth = throw "avxsynth was removed because it was broken"; # Added 2021-05-18 awesome-4-0 = awesome; # Added 2022-05-05 - aws = throw "aws has been removed: abandoned by upstream. For the AWS CLI maintained by Amazon, see 'awscli' or 'awscli2'"; # Added 2022-09-21 - awless = throw "awless has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-05-30 - aws-okta = throw "aws-okta is on indefinite hiatus. See https://github.com/segmentio/aws-okta/issues/278"; # Added 2022-04-05; - axoloti = throw "axoloti has been removed: abandoned by upstream"; # Added 2022-05-13 - azure-vhd-utils = throw "azure-vhd-utils has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-03 - azureus = throw "azureus is now known as vuze and the version in nixpkgs was really outdated"; # Added 2021-08-02 ### B ### badtouch = authoscope; # Project was renamed, added 20210626 baget = throw "'baget' has been removed due to being unmaintained"; - bar-xft = throw "'bar-xft' has been renamed to/replaced by 'lemonbar-xft'"; # Converted to throw 2022-02-22 - bashCompletion = throw "'bashCompletion' has been renamed to/replaced by 'bash-completion'"; # Converted to throw 2022-02-22 bashInteractive_5 = bashInteractive; # Added 2021-08-20 bash_5 = bash; # Added 2021-08-20 - bashburn = throw "bashburn has been removed: deleted by upstream"; # Added 2022-01-07 - bazaar = throw "bazaar has been deprecated by breezy"; # Added 2020-04-19 - bazaarTools = throw "bazaar has been deprecated by breezy"; # Added 2020-04-19 - bazel_0 = throw "bazel 0 is past end of life as it is not an lts version"; # Added 2022-05-09 - bazel_0_27 = throw "bazel 0.27 is past end of life as it is not an lts version"; # Added 2022-05-09 - bazel_0_29 = throw "bazel 0.29 is past end of life as it is not an lts version"; # Added 2022-05-09 - bazel_1 = throw "bazel 1 is past end of life as it is not an lts version"; # Added 2022-05-09 bazel_3 = throw "bazel 3 is past end of life as it is not an lts version"; # Added 2023-02-02 - bcat = throw "bcat has been removed because upstream is dead"; # Added 2021-08-22 bedup = throw "bedup was removed because it was broken and abandoned upstream"; # added 2023-02-04 - beetsExternalPlugins = throw "beetsExternalPlugins has been deprecated, use beetsPackages.$pluginname"; # Added 2022-05-07 - beret = throw "beret has been removed"; # Added 2021-11-16 - bin_replace_string = throw "bin_replace_string has been removed: deleted by upstream"; # Added 2022-01-07 bird2 = bird; # Added 2022-02-21 - bird6 = throw "bird6 was dropped. Use bird instead, which has support for both ipv4/ipv6"; # Added 2022-02-21 - bitbucket-cli = throw "bitbucket-cli has been removed: abandoned by upstream"; # Added 2022-03-21 - bitcoin-classic = throw "bitcoin-classic has been removed: the Bitcoin Classic project has closed down, https://bitcoinclassic.com/news/closing.html"; # Added 2022-11-24 - bitcoind-classic = throw "bitcoind-classic has been removed: the Bitcoin Classic project has closed down, https://bitcoinclassic.com/news/closing.html"; # Added 2022-11-24 - bitcoin-gold = throw "bitcoin-gold has been removed since it's unnmaintained and will stop building with Qt > 5.14"; # Added 2022-11-24 - bitcoind-gold = throw "bitcoin-gold has been removed since it's unnmaintained: https://github.com/BTCGPU/BTCGPU/graphs/code-frequency"; # Added 2022-11-24 ddclient = throw "ddclient has been removed on the request of the upstream maintainer because it is unmaintained and has bugs. Please switch to a different software like `inadyn` or `knsupdate`."; # Added 2023-07-04 - digibyte = throw "digibyte has been removed since it's unnmaintained and will stop building with Qt > 5.14"; # Added 2022-11-24 - digibyted = throw "digibyted has been removed since it's unnmaintained: https://github.com/digibyte/digibyte/graphs/code-frequency"; # Added 2022-11-24 - bitsnbots = throw "bitsnbots has been removed because it was broken and upstream missing"; # Added 2021-08-22 - blastem = throw "blastem has been removed from nixpkgs as it would still require python2"; # Added 2022-01-01 bluezFull = throw "'bluezFull' has been renamed to/replaced by 'bluez'"; # Converted to throw 2023-09-10 - bomi = throw "bomi has been removed from nixpkgs since it was broken and abandoned upstream"; # Added 2020-12-10 - boost159 = throw "boost159 has been deprecated in favor of the latest version"; # Added 2023-01-01 - boost15x = throw "boost15x has been deprecated in favor of the latest version"; # Added 2023-01-01 - boost160 = throw "boost160 has been deprecated in favor of the latest version"; # Added 2023-01-01 boost168 = throw "boost168 has been deprecated in favor of the latest version"; # Added 2023-06-08 boost169 = throw "boost169 has been deprecated in favor of the latest version"; # Added 2023-06-08 boost16x = throw "boost16x has been deprecated in favor of the latest version"; # Added 2023-06-08 @@ -171,18 +97,11 @@ mapAliases ({ boost174 = throw "boost174 has been deprecated in favor of the latest version"; # Added 2023-06-08 boost17x = throw "boost17x has been deprecated in favor of the latest version"; # Added 2023-07-13 boost18x = throw "boost18x has been deprecated in favor of the latest version"; # Added 2023-07-13 - botan = throw "botan has been removed because it did not support a supported openssl version"; # added 2021-12-15 bpftool = bpftools; # Added 2021-05-03 bpytop = throw "bpytop has been deprecated by btop"; # Added 2023-02-16 - brackets = throw "brackets has been removed, it was unmaintained and had open vulnerabilities"; # Added 2021-01-24 - bridge_utils = throw "'bridge_utils' has been renamed to/replaced by 'bridge-utils'"; # Converted to throw 2022-02-22 bro = throw "'bro' has been renamed to/replaced by 'zeek'"; # Converted to throw 2023-09-10 - btops = throw "btops has been dropped due to the lack of maintenance from upstream since 2017"; # Added 2022-06-02 - btrfsProgs = throw "'btrfsProgs' has been renamed to/replaced by 'btrfs-progs'"; # Converted to throw 2022-02-22 - bud = throw "bud has been removed: abandoned by upstream"; # Added 2022-03-14 inherit (libsForQt5.mauiPackages) buho; # added 2022-05-17 bukut = throw "bukut has been removed since it has been archived by upstream"; # Added 2023-05-24 - buttersink = throw "buttersink has been removed: abandoned by upstream"; # Added 2022-04-05 # Shorter names; keep the longer name for back-compat. Added 2023-04-11 buildFHSUserEnv = buildFHSEnv; buildFHSUserEnvChroot = buildFHSEnvChroot; @@ -196,54 +115,22 @@ mapAliases ({ bitwarden_rs-vault = vaultwarden-vault; - bs1770gain = throw "bs1770gain has been removed from nixpkgs, as it had no maintainer or reverse dependencies"; # Added 2021-01-02 - bsod = throw "bsod has been removed: deleted by upstream"; # Added 2022-01-07 - btc1 = throw "btc1 has been removed, it was abandoned by upstream"; # Added 2020-11-03 - buildPerlPackage = throw "'buildPerlPackage' has been renamed to/replaced by 'perlPackages.buildPerlPackage'"; # Converted to throw 2022-02-22 - buildkite-agent3 = throw "'buildkite-agent3' has been renamed to/replaced by 'buildkite-agent'"; # Converted to throw 2022-02-22 - bundler_HEAD = throw "'bundler_HEAD' has been renamed to/replaced by 'bundler'"; # Converted to throw 2022-02-22 - bunny = throw "bunny has been removed: deleted by upstream"; # Added 2022-01-07 - bypass403 = throw "bypass403 has been removed: deleted by upstream"; # Added 2022-01-07 ### C ### - c14 = throw "c14 is deprecated and archived by upstream"; # Added 2022-04-10 - caddy1 = throw "caddy 1.x has been removed from nixpkgs, as it's unmaintained: https://github.com/caddyserver/caddy/blob/master/.github/SECURITY.md#supported-versions"; # Added 2020-10-02 - caffe2 = throw "caffe2 has been removed: subsumed under the PyTorch project"; # Added 2022-04-25 - calibre-py2 = throw "calibre-py2 has been removed from nixpkgs, as calibre has upgraded to python 3. Please use calibre as replacement"; # Added 2021-01-13 - calibre-py3 = throw "calibre-py3 has been removed from nixpkgs, as calibre's default python version is now 3. Please use calibre as replacement"; # Added 2021-01-13 callPackage_i686 = pkgsi686Linux.callPackage; - cantarell_fonts = throw "'cantarell_fonts' has been renamed to/replaced by 'cantarell-fonts'"; # Converted to throw 2022-02-22 cask = emacs.pkgs.cask; # Added 2022-11-12 - cargo-download = throw "cargo-download has been removed from nixpkgs as it is unmaintained, use cargo-clone instead"; # Added 2022-10-11 cargo-embed = throw "cargo-embed is now part of the probe-rs package"; # Added 2023-07-03 cargo-flash = throw "cargo-flash is now part of the probe-rs package"; # Added 2023-07-03 - cargo-tree = throw "cargo-tree has been removed, use the builtin `cargo tree` command instead"; # Added 2020-08-20 - carnix = throw "carnix has been removed, use alternatives such as naersk and crate2nix instead"; # Added 2022-11-22 - casperjs = throw "casperjs has been removed, it was abandoned by upstream and broken"; - cassandra_2_1 = throw "cassandra_2_1 has been removed, please use cassandra_3_11 instead"; # Added 2022-10-29 - cassandra_2_2 = throw "cassandra_2_2 has been removed, please use cassandra_3_11 instead"; # Added 2022-10-29 catfish = throw "'catfish' has been renamed to/replaced by 'xfce.catfish'"; # Converted to throw 2023-09-10 cawbird = throw "cawbird has been abandoned upstream and is broken anyways due to Twitter closing its API"; ccloud-cli = throw "ccloud-cli has been removed, please use confluent-cli instead"; # Added 2023-06-09 - ccnet = throw "ccnet has been removed because seafile does not depend on it anymore"; # Added 2021-03-25 - cde-gtk-theme = throw "cde-gtk-theme has been removed from nixpkgs as it shipped with python2 scripts that didn't work anymore"; # Added 2022-01-12 - cgmanager = throw "cgmanager was deprecated by lxc and therefore removed from nixpkgs"; # Added 2020-06-05 - checkbashism = throw "'checkbashism' has been renamed to/replaced by 'checkbashisms'"; # Converted to throw 2022-02-22 chefdk = throw "chefdk has been removed due to being deprecated upstream by Chef Workstation"; # Added 2023-03-22 chocolateDoom = chocolate-doom; # Added 2023-05-01 chrome-gnome-shell = gnome-browser-connector; # Added 2022-07-27 - chronos = throw "chronos has been removed from nixpkgs, as it was unmaintained"; # Added 2020-08-15 - chunkwm = throw "chunkwm has been removed: abandoned by upstream"; # Added 2022-01-07 - cifs_utils = throw "'cifs_utils' has been renamed to/replaced by 'cifs-utils'"; # Converted to throw 2022-02-22 - cipherscan = throw "cipherscan was removed from nixpkgs, as it was unmaintained"; # added 2021-12-11 citra = citra-nightly; # added 2022-05-17 - ckb = throw "'ckb' has been renamed to/replaced by 'ckb-next'"; # Converted to throw 2022-02-22 - clickshare-csc1 = throw "'clickshare-csc1' has been removed as it requires qt4 which is being removed"; # Added 2022-06-16 inherit (libsForQt5.mauiPackages) clip; # added 2022-05-17 cpp-ipfs-api = cpp-ipfs-http-client; # Project has been renamed. Added 2022-05-15 - cratesIO = throw "cratesIO has been removed, use alternatives such as naersk and crate2nix instead"; # Added 2022-11-22 - creddump = throw "creddump has been removed from nixpkgs as the upstream has abandoned the project"; # Added 2022-01-01 crispyDoom = crispy-doom; # Added 2023-05-01 # these are for convenience, not for backward compat and shouldn't expire @@ -260,208 +147,51 @@ mapAliases ({ clang15Stdenv = lowPrio llvmPackages_15.stdenv; clang16Stdenv = lowPrio llvmPackages_16.stdenv; - clangAnalyzer = throw "'clangAnalyzer' has been renamed to/replaced by 'clang-analyzer'"; # Converted to throw 2022-02-22 clasp = clingo; # added 2022-12-22 - claws-mail-gtk2 = throw "claws-mail-gtk2 was removed to get rid of Python 2, please use claws-mail"; # Added 2021-12-05 claws-mail-gtk3 = claws-mail; # Added 2021-07-10 - clawsMail = throw "'clawsMail' has been renamed to/replaced by 'claws-mail'"; # Converted to throw 2022-02-22 - cldr-emoji-annotation = throw "'cldr-emoji-annotation' has been removed, as it was unmaintained; use 'cldr-annotations' instead"; # Added 2022-04-03 - clearsilver = throw "clearsilver has been removed: abandoned by upstream"; # Added 2022-03-15 - clementineUnfree = throw "clementineUnfree has been removed because Spotify stopped supporting libspotify"; # added 2022-05-29 - clutter_gtk = throw "'clutter_gtk' has been renamed to/replaced by 'clutter-gtk'"; # Converted to throw 2022-02-22 - cmakeWithQt4Gui = throw "cmakeWithQt4Gui has been removed in favor of cmakeWithGui (Qt 5)"; # Added 2021-05 codimd = hedgedoc; # Added 2020-11-29 inherit (libsForQt5.mauiPackages) communicator; # added 2022-05-17 compton = throw "'compton' has been renamed to/replaced by 'picom'"; # Converted to throw 2023-09-10 - compton-git = throw "'compton-git' has been renamed to/replaced by 'compton'"; # Converted to throw 2022-02-22 concurrencykit = libck; # Added 2021-03 - conntrack_tools = throw "'conntrack_tools' has been renamed to/replaced by 'conntrack-tools'"; # Converted to throw 2022-02-22 - container-linux-config-transpiler = throw "container-linux-config-transpiler is deprecated and archived by upstream"; # Added 2022-04-05 - cool-old-term = throw "'cool-old-term' has been renamed to/replaced by 'cool-retro-term'"; # Converted to throw 2022-02-22 - corsmisc = throw "corsmisc has been removed (upstream is gone)"; # Added 2022-01-24 - couchdb = throw "couchdb was removed from nixpkgs, use couchdb3 instead"; # Added 2021-03-03 - couchdb2 = throw "couchdb2 was removed from nixpkgs, use couchdb3 instead"; # Added 2021-03-03 - coreclr = throw "coreclr has been removed from nixpkgs, use dotnet-sdk instead"; # added 2022-06-12 - corgi = throw "corgi has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-02 - cpp-gsl = throw "'cpp-gsl' has been renamed to/replaced by 'microsoft-gsl'"; # Converted to throw 2022-02-22 - cpp_ethereum = throw "cpp_ethereum has been removed; abandoned upstream"; # Added 2020-11-30 - cpuminer-multi = throw "cpuminer-multi has been removed: deleted by upstream"; # Added 2022-01-07 - crafty = throw "crafty has been removed: deleted by upstream"; # Added 2022-01-07 - cryptol = throw "cryptol was removed due to prolonged broken build"; # Added 2020-08-21 - cryptpad = throw "cryptpad has been removed, because it was unmaintained in nixpkgs"; # Added 2022-07-04 - ctl = throw "ctl has been removed: abandoned by upstream"; # Added 2022-05-13 - - # CUDA Toolkit - cudatoolkit_6 = throw "cudatoolkit_6 has been removed in favor of newer versions"; # Added 2021-02-14 - cudatoolkit_65 = throw "cudatoolkit_65 has been removed in favor of newer versions"; # Added 2021-02-14 - cudatoolkit_7 = throw "cudatoolkit_7 has been removed in favor of newer versions"; # Added 2021-02-14 - cudatoolkit_7_5 = throw "cudatoolkit_7_5 has been removed in favor of newer versions"; # Added 2021-02-14 - cudatoolkit_8 = throw "cudatoolkit_8 has been removed in favor of newer versions"; # Added 2021-02-14 - cudatoolkit_9 = throw "cudatoolkit_9 has been removed in favor of newer versions"; # Added 2021-04-18 - cudatoolkit_9_0 = throw "cudatoolkit_9_0 has been removed in favor of newer versions"; # Added 2021-04-18 - cudatoolkit_9_1 = throw "cudatoolkit_9_1 has been removed in favor of newer versions"; # Added 2021-04-18 - cudatoolkit_9_2 = throw "cudatoolkit_9_2 has been removed in favor of newer versions"; # Added 2021-04-18 - cudatoolkit_10 = throw "cudatoolkit_10 has been renamed to cudaPackages_10.cudatoolkit"; # Added 2022-04-04 - cudatoolkit_10_0 = throw "cudatoolkit_10_0 has been renamed to cudaPackages_10_0.cudatoolkit"; # Added 2022-04-04 - cudatoolkit_10_1 = throw "cudatoolkit_10_1 has been renamed to cudaPackages_10_1.cudatoolkit"; # Added 2022-04-04 - cudatoolkit_10_2 = throw "cudatoolkit_10_2 has been renamed to cudaPackages_10_2.cudatoolkit"; # Added 2022-04-04 - cudatoolkit_11_0 = throw "cudatoolkit_11_0 has been renamed to cudaPackages_11_0.cudatoolkit"; # Added 2022-04-04 - cudatoolkit_11_1 = throw "cudatoolkit_11_1 has been renamed to cudaPackages_11_1.cudatoolkit"; # Added 2022-04-04 - cudatoolkit_11_2 = throw "cudatoolkit_11_2 has been renamed to cudaPackages_11_2.cudatoolkit"; # Added 2022-04-04 - cudatoolkit_11_3 = throw "cudatoolkit_11_3 has been renamed to cudaPackages_11_3.cudatoolkit"; # Added 2022-04-04 - cudatoolkit_11_4 = throw "cudatoolkit_11_4 has been renamed to cudaPackages_11_4.cudatoolkit"; # Added 2022-04-04 - cudatoolkit_11_5 = throw "cudatoolkit_11_5 has been renamed to cudaPackages_11_5.cudatoolkit"; # Added 2022-04-04 - cudatoolkit_11_6 = throw "cudatoolkit_11_6 has been renamed to cudaPackages_11_6.cudatoolkit"; # Added 2022-04-04 - - cudnn = throw "cudnn is now part of cudaPackages*"; # Added 2022-04-04 - cudnn6_cudatoolkit_8 = throw "cudnn6_cudatoolkit_8 has been removed in favor of newer versions"; # Added 2021-02-14 - cudnn_cudatoolkit_7 = throw "cudnn_cudatoolkit_7 has been removed in favor of newer versions"; # Added 2021-02-14 - cudnn_7_4_cudatoolkit_10_0 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04 - cudnn_cudatoolkit_7_5 = throw "cudnn_cudatoolkit_7_5 has been removed in favor of newer versions"; # Added 2021-02-14 - cudnn_7_6_cudatoolkit_10_0 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04 - cudnn_7_6_cudatoolkit_10_1 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04 - cudnn_cudatoolkit_8 = throw "cudnn_cudatoolkit_8 has been removed in favor of newer versions"; # Added 2021-02-14 - cudnn_8_1_cudatoolkit_10_2 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04 - cudnn_8_1_cudatoolkit_11_0 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04 - cudnn_8_1_cudatoolkit_11_1 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04 - cudnn_8_1_cudatoolkit_11_2 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04 - cudnn_8_1_cudatoolkit_10 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04 - cudnn_8_3_cudatoolkit_10_2 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04 - cudnn_8_3_cudatoolkit_11_0 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04 - cudnn_8_3_cudatoolkit_11_1 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04 - cudnn_8_3_cudatoolkit_11_2 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04 - cudnn_8_3_cudatoolkit_11_3 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04 - cudnn_8_3_cudatoolkit_11_4 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04 - cudnn_8_3_cudatoolkit_11_5 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04 - cudnn_8_3_cudatoolkit_10 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04 - cudnn_8_3_cudatoolkit_11 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04 - cudnn_cudatoolkit_9 = throw "cudnn_cudatoolkit_9 has been removed in favor of newer versions"; # Added 2021-04-18 - cudnn_cudatoolkit_9_0 = throw "cudnn_cudatoolkit_9_0 has been removed in favor of newer versions"; # Added 2021-04-18 - cudnn_cudatoolkit_9_1 = throw "cudnn_cudatoolkit_9_1 has been removed in favor of newer versions"; # Added 2021-04-18 - cudnn_cudatoolkit_9_2 = throw "cudnn_cudatoolkit_9_2 has been removed in favor of newer versions"; # Added 2021-04-18 - cura_stable = throw "cura_stable was removed because it was broken and used Python 2"; # added 2022-06-05 - curl_unix_socket = throw "curl_unix_socket has been dropped due to the lack of maintenance from upstream since 2015"; # Added 2022-06-02 - cutensor = throw "cutensor is now part of cudaPackages*"; # Added 2022-04-04 - cutensor_cudatoolkit_10 = throw "cutensor* is now part of cudaPackages*"; # Added 2022-04-04 - cutensor_cudatoolkit_10_1 = throw "cutensor* is now part of cudaPackages*"; # Added 2022-04-04 - cutensor_cudatoolkit_10_2 = throw "cutensor* is now part of cudaPackages*"; # Added 2022-04-04 - cutensor_cudatoolkit_11 = throw "cutensor* is now part of cudaPackages*"; # Added 2022-04-04 - cutensor_cudatoolkit_11_0 = throw "cutensor* is now part of cudaPackages*"; # Added 2022-04-04 - cutensor_cudatoolkit_11_1 = throw "cutensor* is now part of cudaPackages*"; # Added 2022-04-04 - cutensor_cudatoolkit_11_2 = throw "cutensor* is now part of cudaPackages*"; # Added 2022-04-04 - cutensor_cudatoolkit_11_3 = throw "cutensor* is now part of cudaPackages*"; # Added 2022-04-04 - cutensor_cudatoolkit_11_4 = throw "cutensor* is now part of cudaPackages*"; # Added 2022-04-04 - - cloud-print-connector = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006"; - cquery = throw "cquery has been removed because it is abandoned by upstream. Consider switching to clangd or ccls instead"; # Added 2020-06-15 - cups-googlecloudprint = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006"; + cups-kyodialog3 = cups-kyodialog; # Added 2022-11-12 - cupsBjnp = throw "'cupsBjnp' has been renamed to/replaced by 'cups-bjnp'"; # Converted to throw 2022-02-22 - cups_filters = throw "'cups_filters' has been renamed to/replaced by 'cups-filters'"; # Converted to throw 2022-02-22 - curl-impersonate-bin = throw "'curl-impersonate-bin' has been replaced by 'curl-impersonate'"; # Added 2022-10-08 - curlcpp = throw "curlcpp has been removed, no active maintainers and no usage within nixpkgs"; # Added 2022-05-10 - curaByDagoma = throw "curaByDagoma has been removed from nixpkgs, because it was unmaintained and dependent on python2 packages"; # Added 2022-01-12 - curaLulzbot = throw "curaLulzbot has been removed due to insufficient upstream support for a modern dependency chain"; # Added 2021-10-23 - cv = throw "'cv' has been renamed to/replaced by 'progress'"; # Converted to throw 2022-02-22 cvs_fast_export = cvs-fast-export; # Added 2021-06-10 ### D ### oroborus = throw "oroborus was removed, because it was abandoned years ago."; #Added 2023-09-10 - d1x_rebirth = throw "'d1x_rebirth' has been renamed to/replaced by 'dxx-rebirth'"; # Converted to throw 2022-02-22 - d2x_rebirth = throw "'d2x_rebirth' has been renamed to/replaced by 'dxx-rebirth'"; # Converted to throw 2022-02-22 - dart_dev = throw "Non-stable versions of Dart have been removed"; # Added 2020-01-15 - dart_old = throw "Non-stable versions of Dart have been removed"; # Added 2020-01-15 dart_stable = dart; # Added 2020-01-15 dat = nodePackages.dat; - dashpay = throw "'dashpay' has been removed because it was unmaintained"; # Added 2022-05-12 - dbus_daemon = throw "'dbus_daemon' has been renamed to/replaced by 'dbus.daemon'"; # Converted to throw 2022-02-22 - dbus_glib = throw "'dbus_glib' has been renamed to/replaced by 'dbus-glib'"; # Converted to throw 2022-02-22 - dbus_libs = throw "'dbus_libs' has been renamed to/replaced by 'dbus'"; # Converted to throw 2022-02-22 - dbus_tools = throw "'dbus_tools' has been renamed to/replaced by 'dbus.out'"; # Converted to throw 2022-02-22 - dbvisualizer = throw "dbvisualizer has been removed from nixpkgs, as it's unmaintained"; # Added 2020-09-20 - dd-agent = throw "dd-agent has been removed in favor of the newer datadog-agent"; # Added 2022-04-26 - ddar = throw "ddar has been removed: abandoned by upstream"; # Added 2022-03-18 - deadbeef-mpris2-plugin = throw "'deadbeef-mpris2-plugin' has been renamed to/replaced by 'deadbeefPlugins.mpris2'"; # Converted to throw 2022-02-22 deadpixi-sam = deadpixi-sam-unstable; - debian_devscripts = throw "'debian_devscripts' has been renamed to/replaced by 'debian-devscripts'"; # Converted to throw 2022-02-22 debugedit-unstable = debugedit; # Added 2021-11-22 - deepspeech = throw "deepspeech was removed in favor of stt. https://github.com/NixOS/nixpkgs/issues/119496"; # added 2021-05-05 - deisctl = throw "deisctl was removed ; the service does not exist anymore"; # added 2022-02-06 - deis = throw "deis was removed ; the service does not exist anymore"; # added 2022-02-06 deltachat-electron = deltachat-desktop; # added 2021-07-18 - deluge-1_x = throw '' - Deluge 1.x (deluge-1_x) is no longer supported. - Please use Deluge 2.x (deluge-2_x) instead, for example: - - services.deluge.package = pkgs.deluge-2_x; - - Note that it is NOT possible to switch back to Deluge 1.x after this change. - ''; # Added 2021-08-18 - demjson = with python3Packages; toPythonApplication demjson; # Added 2022-01-18 - desktop_file_utils = throw "'desktop_file_utils' has been renamed to/replaced by 'desktop-file-utils'"; # Converted to throw 2022-02-22 - devicemapper = throw "'devicemapper' has been renamed to/replaced by 'lvm2'"; # Converted to throw 2022-02-22 devserver = throw "'devserver' has been removed in favor of 'miniserve' or other alternatives"; # Added 2023-01-13 - dfu-util-axoloti = throw "dfu-util-axoloti has been removed: abandoned by upstream"; # Added 2022-05-13 - dhall-text = throw "'dhall-text' has been deprecated in favor of the 'dhall text' command from 'dhall'"; # Added 2022-03-26 dhcp = throw "dhcp (ISC DHCP) has been removed from nixpkgs, because it reached its end of life"; # Added 2023-04-04 - digikam5 = throw "'digikam5' has been renamed to/replaced by 'digikam'"; # Converted to throw 2022-02-22 - dirmngr = throw "dirmngr has been removed: merged into gnupg"; # Added 2022-05-13 - disper = throw "disper has been removed: abandoned by upstream"; # Added 2022-03-18 - dmtx = throw "'dmtx' has been renamed to/replaced by 'dmtx-utils'"; # Converted to throw 2022-02-22 dnnl = oneDNN; # Added 2020-04-22 - docbook5_xsl = throw "'docbook5_xsl' has been renamed to/replaced by 'docbook_xsl_ns'"; # Converted to throw 2022-02-22 - docbookrx = throw "docbookrx has been removed since it was unmaintained"; # Added 2021-01-12 - docbook_xml_xslt = throw "'docbook_xml_xslt' has been renamed to/replaced by 'docbook_xsl'"; # Converted to throw 2022-02-22 - doh-proxy = throw "doh-proxy has been removed because upstream abandoned it and its dependencies where removed."; # Added 2022-03-30 - docker_compose = throw "'docker_compose' has been renamed to/replaced by 'docker-compose'"; # Converted to throw 2022-02-22 - docker-compose_2 = throw "'docker-compose_2' has been renamed to 'docker-compose'"; # Added 2022-06-05 - docker-edge = throw "'docker-edge' has been removed, it was an alias for 'docker'"; # Added 2022-06-05 dolphin-emu-beta = dolphin-emu; # Added 2023-02-11 dolphinEmu = dolphin-emu; # Added 2021-11-10 dolphinEmuMaster = dolphin-emu-beta; # Added 2021-11-10 dot-http = throw "'dot-http' has been removed: abandoned by upstream. Use hurl instead."; # Added 2023-01-16 dotty = scala_3; # Added 2023-08-20 dotnet-netcore = dotnet-runtime; # Added 2021-10-07 - double_conversion = throw "'double_conversion' has been renamed to/replaced by 'double-conversion'"; # Converted to throw 2022-02-22 - draftsight = throw "draftsight has been removed, no longer available as freeware"; # Added 2020-08-14 - dragon-drop = throw "'dragon-drop' has been removed in favor of 'xdragon'"; # Added 2022-04-10; dtv-scan-tables_linuxtv = dtv-scan-tables; # Added 2023-03-03 dtv-scan-tables_tvheadend = dtv-scan-tables; # Added 2023-03-03 - dust = throw "dust has been removed: abandoned by upstream"; # Added 2022-04-21 - dvb_apps = throw "dvb_apps has been removed"; # Added 2020-11-03 - dwarf_fortress = throw "'dwarf_fortress' has been renamed to/replaced by 'dwarf-fortress'"; # Converted to throw 2022-02-22 - dwm-git = throw "dwm-git has been removed from nixpkgs, as it had no updates for 2 years not serving it's purpose"; # Added 2021-02-07 dylibbundler = macdylibbundler; # Added 2021-04-24 ### E ### - eagle7 = throw "eagle7 has been removed because it did not support a supported openssl version"; # added 2021-12-15 ec2_ami_tools = ec2-ami-tools; # Added 2021-10-08 ec2_api_tools = ec2-api-tools; # Added 2021-10-08 ec2-utils = amazon-ec2-utils; # Added 2022-02-01 - elasticmq = throw "elasticmq has been removed in favour of elasticmq-server-bin"; # Added 2021-01-17 - elasticsearch7-oss = throw "elasticsearch7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # Added 2021-06-09 - elasticsearch-oss = throw "elasticsearch-oss has been removed because there is no oss version of elasticsearch anymore. Use opensearch instead."; # Added 2022-10-04 - elasticsearch6 = throw "elasticsearch6 has been removed because it reached end of life"; # Added 2022-10-04 - elasticsearch6-oss = throw "elasticsearch6-oss has been removed because it reached end of life"; # Added 2022-10-04 - elasticsearch6Plugins = throw "elasticsearch6Plugins has been removed because it reached end of life"; # Added 2022-10-04 elasticsearch7Plugins = elasticsearchPlugins; # Electron - electron_3 = throw "electron_3 has been removed in favor of newer versions"; # added 2022-01-06 - electron_4 = throw "electron_4 has been removed in favor of newer versions"; # added 2022-01-06 - electron_5 = throw "electron_5 has been removed in favor of newer versions"; # added 2022-01-06 - electron_6 = throw "electron_6 has been removed in favor of newer versions"; # added 2022-01-06 - electron_7 = throw "electron_7 has been removed in favor of newer versions"; # added 2022-02-08 - electron_8 = throw "electron_8 has been removed in favor of newer versions"; # added 2022-02-08 electron_9 = throw "electron_9 has been removed in favor of newer versions"; # added 2023-09-11 - electrum-dash = throw "electrum-dash has been removed from nixpkgs as the project is abandoned"; # Added 2022-01-01 elementary-planner = throw "elementary-planner has been renamed to planify"; # Added 2023-06-24 elixir_ls = elixir-ls; # Added 2023-03-20 @@ -472,22 +202,14 @@ mapAliases ({ emacs28WithPackages = emacs28.pkgs.withPackages; # Added 2021-10-04 emacsMacport = emacs-macport; # Added 2023-08-10 emacsNativeComp = emacs28NativeComp; # Added 2022-06-08 - emacsPackagesGen = throw "'emacsPackagesGen' has been renamed to/replaced by 'emacsPackagesFor'"; # Converted to throw 2022-02-22 emacsPackagesNg = throw "'emacsPackagesNg' has been renamed to/replaced by 'emacs.pkgs'"; # Converted to throw 2023-09-10 emacsPackagesNgFor = throw "'emacsPackagesNgFor' has been renamed to/replaced by 'emacsPackagesFor'"; # Converted to throw 2023-09-10 - emacsPackagesNgGen = throw "'emacsPackagesNgGen' has been renamed to/replaced by 'emacsPackagesFor'"; # Converted to throw 2022-02-22 emacsWithPackages = emacs.pkgs.withPackages; # Added 2020-12-18 empathy = throw "empathy was removed as it is unmaintained and no longer launches due to libsoup3 migration"; # Added 2023-01-20 - enblendenfuse = throw "'enblendenfuse' has been renamed to/replaced by 'enblend-enfuse'"; # Converted to throw 2022-02-22 enchant1 = throw "enchant1 has been removed from nixpkgs, as it was unmaintained"; # Added 2023-01-18 - encryptr = throw "encryptr was removed because it reached end of life"; # Added 2022-02-06 - envdir = throw "envdir has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-03 - envelope = throw "envelope has been removed from nixpkgs, as it was unmaintained"; # Added 2021-08-05 enyo-doom = enyo-launcher; # Added 2022-09-09 epoxy = libepoxy; # Added 2021-11-11 - epsxe = throw "epsxe has been removed from nixpkgs, as it was unmaintained."; # added 2021-12-15 - eql = throw "eql has been removed from nixpkgs, because it depended on qt4. eql5 exists, but is not currently pacakged in nixpkgs."; # added 2022-05-09 inherit (beam.interpreters) erlangR26 erlangR25 erlangR24; # added 2023-03-21 erlang_21 = throw "erlangR21 has been removed in favor of newer versions."; # added 2023-03-21 erlangR21 = erlang_21; @@ -495,88 +217,36 @@ mapAliases ({ erlangR22 = erlang_22; erlang_23 = throw "erlangR23 has been removed in favor of newer versions."; # added 2023-09-11 erlangR23 = erlang_23; - esniper = throw "esniper has been removed because upstream no longer maintains it (and it no longer works)"; # Added 2021-04-12 - etcdctl = throw "'etcdctl' has been renamed to/replaced by 'etcd'"; # Converted to throw 2022-02-22 + etcd_3_3 = throw "etcd_3_3 has been removed because upstream no longer maintains it"; # Added 2023-09-29 eterm = throw "eterm was removed because it is still insecure: https://github.com/mej/Eterm/issues/7"; # Added 2023-09-10 - eteroj.lv2 = throw "'eteroj.lv2' has been renamed to/replaced by 'open-music-kontrollers.eteroj'"; # Added 2022-03-09 - euca2tools = throw "euca2ools has been removed because it is unmaintained upstream and still uses python2"; # Added 2022-01-01 - evilvte = throw "evilvte has been removed from nixpkgs for being unmaintained with security issues and dependant on an old version of vte which was removed"; # Added 2022-01-14 - evolution_data_server = throw "'evolution_data_server' has been renamed to/replaced by 'evolution-data-server'"; # Converted to throw 2022-02-22 exa = throw "'exa' has been removed because it is unmaintained upstream. Consider using 'eza', a maintained fork"; # Added 2023-09-07 exhibitor = throw "'exhibitor' has been removed because it is unmaintained upstream"; # Added 2023-06-20 - exfat-utils = throw "'exfat-utils' has been renamed to/replaced by 'exfat'"; # Converted to throw 2022-02-22 ### F ### - facette = throw "facette has been removed"; # Added 2020-01-06 faustStk = faustPhysicalModeling; # Added 2023-05-16 - faust1 = throw "faust1 has been removed, use faust2 instead"; # Added 2022-12-03 - fast-neural-doodle = throw "fast-neural-doodle has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 fastnlo = fastnlo_toolkit; # Added 2021-04-24 - fbreader = throw "fbreader has been removed, as the upstream project has been archived"; # Added 2022-05-26 - fedora-coreos-config-transpiler = throw "fedora-coreos-config-transpiler has been renamed to 'butane'"; # Added 2021-04-13 - feedreader = throw "feedreader is no longer activily maintained since 2019. The developer is working on a spiritual successor called NewsFlash."; # Added 2022-05-03 inherit (luaPackages) fennel; # Added 2022-09-24 fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H"; # preserve - ffadoFull = throw "'ffadoFull' has been renamed to/replaced by 'ffado'"; # Converted to throw 2022-02-22 - ffmpeg-sixel = throw "ffmpeg-sixel has been removed, because it was an outdated/unmaintained fork of ffmpeg"; # Added 2022-03-23"; - ffmpeg_3 = throw "ffmpeg_3 was removed from nixpkgs, because it was an outdated and insecure release"; # added 2022-01-17 - filebeat6 = throw "filebeat6 has been removed because it reached end of life"; # Added 2022-10-04 findimagedupes = throw "findimagedupes has been removed because the perl bindings are no longer compatible"; # Added 2023-07-10 finger_bsd = bsd-finger; fingerd_bsd = bsd-fingerd; - firefox-esr-68 = throw "Firefox 68 ESR was removed because it reached end of life with its final release 68.12esr on 2020-08-25"; - firefox-esr-wayland = firefox-esr; # Added 2022-11-15 - firefox-esr-wrapper = throw "'firefox-esr-wrapper' has been renamed to/replaced by 'firefox-esr'"; # Converted to throw 2022-02-22 firefox-wayland = firefox; # Added 2022-11-15 - firefoxWrapper = throw "'firefoxWrapper' has been renamed to/replaced by 'firefox'"; # Converted to throw 2022-02-22 - firefox-wrapper = throw "'firefox-wrapper' has been renamed to/replaced by 'firefox'"; # Converted to throw 2022-02-22 firmwareLinuxNonfree = linux-firmware; # Added 2022-01-09 - fish-foreign-env = throw "fish-foreign-env has been replaced with fishPlugins.foreign-env"; # Added 2020-12-29, modified 2021-01-10 fishfight = jumpy; # Added 2022-08-03 fitnesstrax = throw "fitnesstrax was removed from nixpkgs because it disappeared upstream and no longer compiles"; # added 2023-07-04 - flameGraph = throw "'flameGraph' has been renamed to/replaced by 'flamegraph'"; # Converted to throw 2022-02-22 - flashplayer-standalone-debugger = throw "flashplayer-standalone-debugger has been removed as Adobe Flash Player is now deprecated"; # Added 2021-02-07 - flashplayer-standalone = throw "flashplayer-standalone has been removed as Adobe Flash Player is now deprecated"; # Added 2021-02-07 - flashplayer = throw "flashplayer has been removed as Adobe Flash Player is now deprecated"; # Added 2021-02-07 - flashtool = throw "flashtool was removed from nixpkgs, because the download is down for copyright reasons and the site looks very fishy"; # Added 2021-06-31 - flatbuffers_1_12 = throw "FlatBuffers version 1.12 has been removed, because upstream no longer maintains it"; # Added 2022-05-12 flatbuffers_2_0 = flatbuffers; # Added 2022-05-12 - flink_1_5 = throw "flink_1_5 was removed, use flink instead"; # Added 2021-01-25 - flutter-beta = throw "Non-stable versions of Flutter have been removed. You can use flutterPackages.mkFlutter to generate a package for other Flutter versions"; # Added 2020-01-15 - flutter-dev = throw "Non-stable versions of Flutter have been removed. You can use flutterPackages.mkFlutter to generate a package for other Flutter versions"; # Added 2020-01-15 flutter2 = throw "flutter2 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2023-07-03 flutter37 = throw "flutter37 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2023-07-03 - flvtool2 = throw "flvtool2 has been removed"; # Added 2020-11-03 - fmbt = throw "fmbt was removed, because it depended on qt4 and python2 and was unmaintained upstream"; # Added 2022-06-13 - fme = throw "fme was removed, because it is old and uses Glade, a discontinued library"; # Added 2022-01-26 foldingathome = fahclient; # Added 2020-09-03 - font-awesome-ttf = throw "'font-awesome-ttf' has been renamed to/replaced by 'font-awesome'"; # Converted to throw 2022-02-22 - - fontconfig-penultimate = throw '' - fontconfig-penultimate has been removed. - It was a fork of the abandoned fontconfig-ultimate. - ''; # Added 2020-07-21 - fontconfig_210 = throw '' - fontconfig 2.10.x hasn't had a release in years, is vulnerable to CVE-2016-5384 - and has only been used for old fontconfig caches. - ''; - - foomatic_filters = throw "'foomatic_filters' has been renamed to/replaced by 'foomatic-filters'"; # Converted to throw 2022-02-22 foundationdb51 = throw "foundationdb51 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06 foundationdb52 = throw "foundationdb52 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06 foundationdb60 = throw "foundationdb60 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06 foundationdb61 = throw "foundationdb61 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06 foxitreader = throw "foxitreader has been removed because it had vulnerabilities and was unmaintained"; # added 2023-02-20 - fscryptctl-experimental = throw "The package fscryptctl-experimental has been removed. Please switch to fscryptctl"; # Added 2021-11-07 - fsharp41 = throw "fsharp41 has been removed, please use dotnet-sdk_5 or later"; - fslint = throw "fslint has been removed: end of life. Upstream recommends using czkawka (https://qarmin.github.io/czkawka/) instead"; # Added 2022-01-15 - fuse_exfat = throw "'fuse_exfat' has been renamed to/replaced by 'exfat'"; # Converted to throw 2022-02-22 - fuseki = throw "'fuseki' has been renamed to/replaced by 'apache-jena-fuseki'"; # Converted to throw 2022-02-22 fuse2fs = if stdenv.isLinux then e2fsprogs.fuse2fs else null; # Added 2022-03-27 preserve, reason: convenience, arch has a package named fuse2fs too. fx_cast_bridge = fx-cast-bridge; # added 2023-07-26 - fwupdate = throw "fwupdate was merged into fwupd"; # Added 2020-05-19 fcitx = throw "fcitx is deprecated, please use fcitx5 instead."; # Added 2023-03-13 fcitx-engines = throw "fcitx-engines is deprecated, please use fcitx5 instead."; # Added 2023-03-13 @@ -585,24 +255,10 @@ mapAliases ({ ### G ### g4py = python3Packages.geant4; # Added 2020-06-06 - gaia = throw "gaia has been removed because it seems abandoned upstream and uses no longer supported dependencies"; # Added 2020-06-06 - gambatte = throw "gambatte has been removed, because the project has been taken private"; # Added 2022-05-26 - gammy = throw "'gammy' is deprecated upstream and has been replaced by 'gummy'"; # Added 2022-09-03 garmindev = throw "'garmindev' has been removed as the dependent software 'qlandkartegt' has been removed"; # Added 2023-04-17 - gawp = throw "gawp has been dropped due to the lack of maintenance from upstream since 2017"; # Added 2022-06-02 - gdal_1_11 = throw "gdal_1_11 was removed. Use gdal instead"; # Added 2021-04-03 - gdb-multitarget = throw "'gdb-multitarget' has been renamed to/replaced by 'gdb'"; # Converted to throw 2022-02-22 - gdk_pixbuf = throw "'gdk_pixbuf' has been renamed to/replaced by 'gdk-pixbuf'"; # Converted to throw 2022-02-22 geekbench4 = throw "'geekbench4' has been renamed to 'geekbench_4'"; # Added 2023-03-10 geekbench5 = throw "'geekbench5' has been renamed to 'geekbench_5'"; # Added 2023-03-10 - getmail = throw "getmail has been removed from nixpkgs, migrate to getmail6"; # Added 2022-01-12 - gettextWithExpat = throw "'gettextWithExpat' has been renamed to/replaced by 'gettext'"; # Converted to throw 2022-02-22 - gfm = throw "gfm has been removed"; # Added 2021-01-15 ghostwriter = libsForQt5.kdeGear.ghostwriter; # Added 2023-03-18 - giblib = throw " giblib has been removed from nixpkgs because upstream is gone"; # Added 2022-01-23 - giflib_4_1 = throw "giflib_4_1 has been removed; use giflib instead"; # Added 2020-02-12 - git-annex-remote-b2 = throw "git-annex-remote-b2 has been dropped due to the lack of maintenance from upstream since 2016"; # Added 2022-06-02 - git-bz = throw "giz-bz has been removed from nixpkgs as it is stuck on python2"; # Added 2022-01-01 git-subset = throw "'git-subset' has been removed in favor of 'git-filter-repo'"; # Added 2023-01-13 gitAndTools = self // { @@ -615,28 +271,16 @@ mapAliases ({ topGit = top-git; }; # Added 2021-01-14 - gitin = throw "gitin has been remove because it was unmaintained and depended on an insecure version of libgit2"; # Added 2021-12-07 - gitinspector = throw "gitinspector has been removed because it doesn't work with python3"; # Added 2022-01-12 gitter = throw "gitter has been removed since the client has been abandoned by upstream with the backend migration to Matrix"; # Added 2023-09-18 - gksu = throw "gksu has been removed"; # Added 2022-01-16 - glib_networking = throw "'glib_networking' has been renamed to/replaced by 'glib-networking'"; # Converted to throw 2022-02-22 - glimpse = throw "glimpse was removed, as the project was discontinued. You can use gimp instead."; # Added 2022-07-11 gmailieer = lieer; # Added 2020-04-19 gmic-qt-krita = throw "gmic-qt-krita was removed as it's no longer supported upstream."; # Converted to throw 2023-02-02 - gmvault = throw "gmvault has been removed because it is unmaintained, mostly broken, and insecure"; # Added 2021-03-08 - gnash = throw "gnash has been removed; broken and abandoned upstream"; # added 2022-02-06 gnatboot11 = gnat-bootstrap11; gnatboot12 = gnat-bootstrap12; gnatboot = gnat-bootstrap; - gnome-breeze = throw "gnome-breeze has been removed, use libsForQt5.breeze-gtk instead"; # Added 2022-04-22 gnome-firmware-updater = gnome-firmware; # added 2022-04-14 gnome-passwordsafe = gnome-secrets; # added 2022-01-30 gnome-mpv = throw "'gnome-mpv' has been renamed to/replaced by 'celluloid'"; # Converted to throw 2023-09-10 - gnome-sharp = throw "gnome-sharp has been removed from nixpkgs"; # Added 2022-01-15 - gnome-themes-standard = throw "'gnome-themes-standard' has been renamed to/replaced by 'gnome-themes-extra'"; # Converted to throw 2022-02-22 gnome_user_docs = throw "'gnome_user_docs' has been renamed to/replaced by 'gnome-user-docs'"; # Converted to throw 2023-09-10 - gnome_doc_utils = throw "'gnome_doc_utils' has been renamed to/replaced by 'gnome-doc-utils'"; # Converted to throw 2022-02-22 - gnome_themes_standard = throw "'gnome_themes_standard' has been renamed to/replaced by 'gnome-themes-standard'"; # Converted to throw 2022-02-22 gnuradio-with-packages = gnuradio3_7.override { extraPackages = lib.attrVals [ @@ -647,7 +291,6 @@ mapAliases ({ gmock = gtest; # moved from top-level 2021-03-14 gnome3 = gnome; # Added 2021-05-07 - gnupg20 = throw "gnupg20 has been removed from nixpkgs as upstream dropped support on 2017-12-31";# Added 2020-07-12 gnuradio3_7 = throw "gnuradio3_7 has been removed because it required Python 2"; # Added 2022-01-16 gnuradio-ais = throw "'gnuradio-ais' has been renamed to/replaced by 'gnuradio3_7.pkgs.ais'"; # Converted to throw 2023-09-10 gnuradio-gsm = throw "'gnuradio-gsm' has been renamed to/replaced by 'gnuradio3_7.pkgs.gsm'"; # Converted to throw 2023-09-10 @@ -655,10 +298,7 @@ mapAliases ({ gnuradio-nacl = throw "'gnuradio-nacl' has been renamed to/replaced by 'gnuradio3_7.pkgs.nacl'"; # Converted to throw 2023-09-10 gnuradio-osmosdr = throw "'gnuradio-osmosdr' has been renamed to/replaced by 'gnuradio3_7.pkgs.osmosdr'"; # Converted to throw 2023-09-10 gnuradio-rds = throw "'gnuradio-rds' has been renamed to/replaced by 'gnuradio3_7.pkgs.rds'"; # Converted to throw 2023-09-10 - gnustep-make = throw "'gnustep-make' has been renamed to/replaced by 'gnustep.make'"; # Converted to throw 2022-02-22 - gnuvd = throw "gnuvd was removed because the backend service is missing"; # Added 2020-01-14 gobby5 = gobby; # Added 2021-02-01 - gobjectIntrospection = throw "'gobjectIntrospection' has been renamed to/replaced by 'gobject-introspection'"; # Converted to throw 2022-02-22 #godot godot = throw "godot has been renamed to godot3 to distinguish from version 4"; # Added 2023-07-16 @@ -666,40 +306,18 @@ mapAliases ({ godot-headless = throw "godot-headless has been renamed to godot3-headless to distinguish from version 4"; # Added 2023-07-16 godot-server = throw "godot-server has been renamed to godot3-server to distinguish from version 4"; # Added 2023-07-16 - gogoclient = throw "gogoclient has been removed, because it was unmaintained"; # Added 2021-12-15 - goklp = throw "goklp has been dropped due to the lack of maintenance from upstream since 2017"; # Added 2022-06-02 - golly-beta = throw "golly-beta has been removed: use golly instead"; # Added 2022-03-21 - goimports = throw "'goimports' has been renamed to/replaced by 'gotools'"; # Converted to throw 2022-02-22 - gometalinter = throw "gometalinter was abandoned by upstream. Consider switching to golangci-lint instead"; # Added 2020-04-23 - googleAuthenticator = throw "'googleAuthenticator' has been renamed to/replaced by 'google-authenticator'"; # Converted to throw 2022-02-22 - googleearth = throw "the non-pro version of Google Earth was removed because it was discontinued and downloading it isn't possible anymore"; # Added 2022-01-22 google-gflags = throw "'google-gflags' has been renamed to/replaced by 'gflags'"; # Converted to throw 2023-09-10 - google-musicmanager = throw "google-musicmanager has been removed because Google Play Music was discontinued"; # Added 2021-03-07 - google-music-scripts = throw "google-music-scripts has been removed because Google Play Music was discontinued"; # Added 2021-03-07 - gosca = throw "gosca has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-30 - google-play-music-desktop-player = throw "GPMDP shows a black screen, upstream homepage is dead, use 'ytmdesktop' instead"; # Added 2022-06-16 - go-langserver = throw "go-langserver has been replaced by gopls"; # Added 2022-06-30 - go-mk = throw "go-mk has been dropped due to the lack of maintenance from upstream since 2015"; # Added 2022-06-02 - go-pup = throw "'go-pup' has been renamed to/replaced by 'pup'"; # Converted to throw 2022-02-22 - go-repo-root = throw "go-repo-root has been dropped due to the lack of maintenance from upstream since 2014"; # Added 2022-06-02 + go-thumbnailer = thud; # Added 2023-09-21 gometer = throw "gometer has been removed from nixpkgs because goLance stopped offering Linux support"; # Added 2023-02-10 - gpgstats = throw "gpgstats has been removed: upstream is gone"; # Added 2022-02-06 - gpshell = throw "gpshell has been removed, because it was unmaintained in nixpkgs"; # added 2021-12-17 - - graalvm11 = graalvm11-ce; - graalvm8-ce = throw "graalvm8-ce has been removed by upstream"; # Added 2021-10-19 - graalvm8 = throw "graalvm8-ce has been removed by upstream"; # Added 2021-10-19 - graalvm8-ee = throw "graalvm8-ee has been removed because it is unmaintained"; # Added 2022-04-15 - graalvm11-ee = throw "graalvm11-ee has been removed because it is unmaintained"; # Added 2022-04-15 - gradio = throw "gradio has been removed because it is unmaintained, use shortwave instead"; # Added 2022-06-03 + + graalvm11-ce = throw "graalvm11-ce has been removed because upstream dropped support to different JDK versions for each GraalVM release. Please use graalvm-ce instead"; # Added 2023-09-26 + graalvm17-ce = throw "graalvm17-ce has been removed because upstream dropped support to different JDK versions for each GraalVM release. Please use graalvm-ce instead"; # Added 2023-09-26 + graalvm19-ce = throw "graalvm19-ce has been removed because upstream dropped support to different JDK versions for each GraalVM release. Please use graalvm-ce instead"; # Added 2023-09-26 gradle_4 = throw "gradle_4 has been removed because it's no longer being updated"; # Added 2023-01-17 gradle_5 = throw "gradle_5 has been removed because it's no longer being updated"; # Added 2023-01-17 - grafana-mimir = throw "'grafana-mimir' has been renamed to/replaced by 'mimir'"; # Added 2022-06-07 gr-ais = throw "'gr-ais' has been renamed to/replaced by 'gnuradio3_7.pkgs.ais'"; # Converted to throw 2023-09-10 - grantlee5 = throw "'grantlee5' has been renamed to/replaced by 'libsForQt5.grantlee'"; # Converted to throw 2022-02-22 graylog = throw "graylog is now available in versions 3.3 up to 5.0. Please mind the upgrade path and choose the appropriate version. Direct upgrading from 3.3 to 4.3 or above is not supported"; # Added 2023-04-24 gr-gsm = throw "'gr-gsm' has been renamed to/replaced by 'gnuradio3_7.pkgs.gsm'"; # Converted to throw 2023-09-10 - grib-api = throw "grib-api has been replaced by ecCodes => https://confluence.ecmwf.int/display/ECC/GRIB-API+migration"; # Added 2022-01-05 gringo = clingo; # added 2022-11-27 gr-limesdr = throw "'gr-limesdr' has been renamed to/replaced by 'gnuradio3_7.pkgs.limesdr'"; # Converted to throw 2023-09-10 gr-nacl = throw "'gr-nacl' has been renamed to/replaced by 'gnuradio3_7.pkgs.nacl'"; # Converted to throw 2023-09-10 @@ -707,273 +325,116 @@ mapAliases ({ gr-rds = throw "'gr-rds' has been renamed to/replaced by 'gnuradio3_7.pkgs.rds'"; # Converted to throw 2023-09-10 grub2_full = grub2; # Added 2022-11-18 grub = throw "grub1 was removed after not being maintained upstream for a decade. Please switch to another bootloader"; # Added 2023-04-11 - grv = throw "grv has been dropped due to the lack of maintenance from upstream since 2019"; # Added 2022-06-01 - gsettings_desktop_schemas = throw "'gsettings_desktop_schemas' has been renamed to/replaced by 'gsettings-desktop-schemas'"; # Converted to throw 2022-02-22 - gsl_1 = throw "'gsl_1' has been renamed to/replaced by 'gsl'"; # Added 2022-11-19 - gtk_doc = throw "'gtk_doc' has been renamed to/replaced by 'gtk-doc'"; # Converted to throw 2022-02-22 - gtklick = throw "gtklick has been removed from nixpkgs as the project is stuck on python2"; # Added 2022-01-01 - gtmess = throw "gtmess has been removed, because it was a MSN client."; # add 2021-12-15 - guile-gnome = throw "guile-gnome has been removed"; # Added 2022-01-16 - guileCairo = throw "'guileCairo' has been renamed to/replaced by 'guile-cairo'"; # Converted to throw 2022-02-22 - guileGnome = throw "guile-gnome has been removed"; # Added 2022-01-16 - guileLint = throw "'guileLint' has been renamed to/replaced by 'guile-lint'"; # Converted to throw 2022-02-22 - guile_lib = throw "'guile_lib' has been renamed to/replaced by 'guile-lib'"; # Converted to throw 2022-02-22 - guile_ncurses = throw "'guile_ncurses' has been renamed to/replaced by 'guile-ncurses'"; # Converted to throw 2022-02-22 - gupnp_av = throw "'gupnp_av' has been renamed to/replaced by 'gupnp-av'"; # Converted to throw 2022-02-22 - gupnp_dlna = throw "'gupnp_dlna' has been renamed to/replaced by 'gupnp-dlna'"; # Converted to throw 2022-02-22 - gupnp_igd = throw "'gupnp_igd' has been renamed to/replaced by 'gupnp-igd'"; # Converted to throw 2022-02-22 - gupnptools = throw "'gupnptools' has been renamed to/replaced by 'gupnp-tools'"; # Converted to throw 2022-02-22 - gutenberg = throw "'gutenberg' has been renamed to/replaced by 'zola'"; # Converted to throw 2022-02-22 - gwtdragdrop = throw "gwtdragdrop was removed: abandoned by upstream"; # Added 2022-02-06 - gwtwidgets = throw "gwtwidgets was removed: unmaintained"; # Added 2022-02-06 ### H ### - hal-flash = throw "hal-flash has been removed as Adobe Flash Player is now deprecated"; # Added 2021-02-07 - hardlink = throw "hardlink was merged into util-linux since 2019-06-14."; # Added 2022-08-12 inherit (harePackages) hare harec; # Added 2022-08-10 - hawkthorne = throw "hawkthorne has been removed because it depended on a broken version of love"; # Added 2022-01-15 haxe_3_2 = throw "'haxe_3_2' has been removed because it is old and no longer used by any packages in nixpkgs"; # Added 2023-03-15 haxe_3_4 = throw "'haxe_3_4' has been removed because it is old and no longer used by any packages in nixpkgs"; # Added 2023-03-15 - hdr-plus = throw "hdr-plus has been removed because it is unmaintained, often breaks and no longer consumed as a dependency"; # Added 2022-11-08 - heapster = throw "Heapster is now retired. See https://github.com/kubernetes-retired/heapster/blob/master/docs/deprecation.md"; # Added 2022-04-05 - heartbeat6 = throw "heartbeat6 has been removed because it reached end of life"; # Added 2022-10-04 - heimdalFull = throw "'heimdalFull' has been renamed to/replaced by 'heimdal'"; # Converted to throw 2022-02-22 - heme = throw "heme has been removed: upstream is gone"; # added 2022-02-06 hepmc = throw "'hepmc' has been renamed to/replaced by 'hepmc2'"; # Converted to throw 2023-09-10 - hicolor_icon_theme = throw "'hicolor_icon_theme' has been renamed to/replaced by 'hicolor-icon-theme'"; # Converted to throw 2022-02-22 - holdingnuts = throw "holdingnuts was removed from nixpkgs, as the project is no longer developed"; # Added 2022-05-10 - holochain-go = throw "holochain-go was abandoned by upstream"; # Added 2022-01-01 - htmlTidy = throw "'htmlTidy' has been renamed to/replaced by 'html-tidy'"; # Converted to throw 2022-02-22 ht-rust = xh; # Added 2021-02-13 - hydra-flakes = throw "hydra-flakes: Flakes support has been merged into Hydra's master. Please use `hydra_unstable` now"; # Added 2020-04-06 hydra-unstable = hydra_unstable; # added 2022-05-10 - hydrogen_0 = throw "hydrogen_0 has been removed, because it depended on qt4"; # Added 2022-06-13 - hyperspace-cli = throw "hyperspace-cli is out of date, and has been deprecated upstream in favour of using the individual repos instead"; # Added 2022-08-29 ### I ### i3-gaps = i3; # Added 2023-01-03 - i3cat = throw "i3cat has been dropped due to the lack of maintenance from upstream since 2016"; # Added 2022-06-02 - iana_etc = throw "'iana_etc' has been renamed to/replaced by 'iana-etc'"; # Converted to throw 2022-02-22 - iasl = throw "iasl has been removed, use acpica-tools instead"; # Added 2021-08-08 - ibus-qt = throw "ibus-qt has been removed, because it depended on qt4"; # Added 2022-06-09 - ical2org = throw "ical2org has been dropped due to the lack of maintanence from upstream since 2018"; # Added 2022-06-02 - icecat-bin = throw "icecat-bin has been removed, the binary builds are not maintained upstream"; # Added 2022-02-15 icedtea8_web = throw "'icedtea8_web' has been renamed to/replaced by 'adoptopenjdk-icedtea-web'"; # Converted to throw 2023-09-10 icedtea_web = throw "'icedtea_web' has been renamed to/replaced by 'adoptopenjdk-icedtea-web'"; # Converted to throw 2023-09-10 - icu59 = throw "icu59 has been removed, use a more recent version instead"; # Added 2022-05-14 - icu65 = throw "icu65 has been removed, use a more recent version instead"; # Added 2022-05-14 - idea = throw "'idea' has been renamed to/replaced by 'jetbrains'"; # Converted to throw 2022-02-22 - ike = throw "ike has been removed, because it was unmaintained"; # Added 2022-05-26 - imapproxy = throw "imapproxy has been removed because it did not support a supported openssl version"; # added 2021-12-15 imag = throw "'imag' has been removed, upstream gone"; # Added 2023-01-13 imagemagick7Big = imagemagickBig; # Added 2021-02-22 imagemagick7 = imagemagick; # Added 2021-02-22 imagemagick7_light = imagemagick_light; # Added 2021-02-22 imlib = throw "imlib has been dropped due to the lack of maintenance from upstream since 2004"; # Added 2023-01-04 - impressive = throw "impressive has been removed due to lack of released python 2 support and maintainership in nixpkgs"; # Added 2022-01-27 instead-launcher = throw "instead-launcher has been removed, because it depended on qt4"; # Added 2023-07-26 insync-v3 = throw "insync-v3 has been merged into the insync package; use insync instead"; #Added 2023-05-13 - i-score = throw "i-score has been removed: abandoned upstream"; # Added 2020-11-21 - inboxer = throw "inboxer has been removed as it is no longer maintained and no longer works as Google shut down the inbox service this package wrapped"; index-fm = libsForQt5.mauiPackages.index; # added 2022-05-17 infiniband-diags = throw "'infiniband-diags' has been renamed to/replaced by 'rdma-core'"; # Converted to throw 2023-09-10 - ino = throw "ino has been removed from nixpkgs, the project is stuck on python2 and upstream has archived the project"; # Added 2022-01-12 inotifyTools = inotify-tools; - intecture-agent = throw "intecture-agent has been removed, because it was no longer maintained upstream"; # added 2021-12-15 - intecture-auth = throw "intecture-auth has been removed, because it was no longer maintained upstream"; # added 2021-12-15 - intecture-cli = throw "intecture-cli has been removed, because it was no longer maintained upstream"; # added 2021-12-15 - interfacer = throw "interfacer is deprecated and archived by upstream"; # Added 2022-04-05 inter-ui = inter; # Added 2021-03-27 - iops = throw "iops was removed: upstream is gone"; # Added 2022-02-06 + iouyap = throw "'iouyap' is deprecated and archived by upstream, use 'ubridge' instead"; # Added 2023-09-21 ipfs = kubo; # Added 2022-09-27 ipfs-migrator-all-fs-repo-migrations = kubo-migrator-all-fs-repo-migrations; # Added 2022-09-27 ipfs-migrator-unwrapped = kubo-migrator-unwrapped; # Added 2022-09-27 ipfs-migrator = kubo-migrator; # Added 2022-09-27 iproute = iproute2; # moved from top-level 2021-03-14 - iproute_mptcp = throw "'iproute_mptcp' has been moved to https://github.com/teto/mptcp-flake"; # Converted to throw 2022-10-04 - ipsecTools = throw "ipsecTools has benn removed, because it was no longer maintained upstream"; # Added 2021-12-15 - itch-setup = throw "itch-setup has benn removed, use itch instead"; # Added 2022-06-02 ### J ### jack2Full = jack2; # moved from top-level 2021-03-14 - jami-client-gnome = throw "jami-client-gnome has been removed: abandoned upstream"; # Added 2022-05-15 jami-client-qt = jami-client; # Added 2022-11-06 jami-client = jami; # Added 2023-02-10 jami-daemon = jami.daemon; # Added 2023-02-10 - jami-libclient = throw "jami-libclient has been removed: moved into jami-qt"; # Added 2022-07-29 - jamomacore = throw "jamomacore has been removed: abandoned upstream"; # Added 2020-11-21 - jbidwatcher = throw "jbidwatcher was discontinued in march 2021"; # Added 2021-03-15 - jbuilder = throw "'jbuilder' has been renamed to/replaced by 'dune_1'"; # Converted to throw 2022-02-22 - jd = throw "jd has been dropped due to the lack of maintenance from upstream since 2016"; # Added 2022-06-03 - jellyfin_10_5 = throw "Jellyfin 10.5 is no longer supported and contains a security vulnerability. Please upgrade to a newer version"; # Added 2021-04-26 jfbpdf = throw "'jfbpdf' has been removed, because it depends on an outdated and insecure version of mupdf"; # Added 2023-06-27 jfbview = throw "'jfbview' has been removed, because it depends on an outdated and insecure version of mupdf"; # Added 2023-06-27 jira-cli = throw "jira-cli was removed because it is no longer maintained"; # Added 2023-02-28 - joseki = throw "'joseki' has been renamed to/replaced by 'apache-jena-fuseki'"; # Converted to throw 2022-02-22 - journalbeat = throw "journalbeat7 has been removed upstream. Use filebeat with the journald input instead"; # Added 2022-10-04 - journalbeat6 = throw "journalbeat6 has been removed because it reached end of life"; # Added 2022-10-04 - journalbeat7 = throw "journalbeat7 has been removed upstream. Use filebeat with the journald input instead"; # Added 2022-10-04 # Julia - julia_07 = throw "julia_07 has been deprecated in favor of the latest LTS version"; # Added 2020-09-15 - julia_1 = throw "julia_1 has been deprecated in favor of julia_10 as it was ambiguous"; # Added 2021-03-13 - julia_10 = throw "julia_10 has been deprecated in favor of the latest stable version"; # Added 2022-11-15 - julia_11 = throw "julia_11 has been deprecated in favor of the latest stable version"; # Added 2020-09-15 - julia_13 = throw "julia_13 has been deprecated in favor of the latest stable version"; # Added 2021-03-13 - julia_15 = throw "julia_15 has been deprecated in favor of the latest stable version"; # Added 2022-11-15 - julia_10-bin = throw "julia_10-bin has been deprecated in favor of the latest LTS version"; # Added 2021-12-02 - julia_17-bin = throw "julia_17-bin has been deprecated in favor of the latest stable version"; # Added 2022-09-04 - - json_glib = throw "'json_glib' has been renamed to/replaced by 'json-glib'"; # Converted to throw 2022-02-22 - jvmci8 = throw "graalvm8 and its tools were deprecated in favor of graalvm8-ce"; # Added 2021-10-15 + ### K ### # k3d was a 3d editing software k-3d - "k3d has been removed because it was broken and has seen no release since 2016" Added 2022-01-04 # now kube3d/k3d will take it's place kube3d = k3d; # Added 2022-0705 - k9copy = throw "k9copy has been removed from nixpkgs, as there is no upstream activity"; # Added 2020-11-06 kafkacat = kcat; # Added 2021-10-07 - kbdKeymaps = throw "kbdKeymaps is not needed anymore since dvp and neo are now part of kbd"; # Added 2021-04-11 kdeconnect = plasma5Packages.kdeconnect-kde; # Added 2020-10-28 - kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # Added 2020-06-16 - kdiff3-qt5 = throw "'kdiff3-qt5' has been renamed to/replaced by 'kdiff3'"; # Converted to throw 2022-02-22 - keepass-keefox = throw "'keepass-keefox' has been renamed to/replaced by 'keepass-keepassrpc'"; # Converted to throw 2022-02-22 keepassx = throw "KeePassX is no longer actively developed. Please consider KeePassXC as a maintained alternative."; # Added 2023-02-17 - keepassx-community = throw "'keepassx-community' has been renamed to/replaced by 'keepassxc'"; # Converted to throw 2022-02-22 - keepassx-reboot = throw "'keepassx-reboot' has been renamed to/replaced by 'keepassx-community'"; # Converted to throw 2022-02-22 keepassx2 = throw "KeePassX is no longer actively developed. Please consider KeePassXC as a maintained alternative."; # Added 2023-02-17 - keepassx2-http = throw "'keepassx2-http' has been renamed to/replaced by 'keepassx-reboot'"; # Converted to throw 2022-02-22 - keepnote = throw "keepnote has been removed from nixpkgs, as it is stuck on python2"; # Added 2022-01-01 kerberos = libkrb5; # moved from top-level 2021-03-14 kexectools = kexec-tools; # Added 2021-09-03 - kexpand = throw "kexpand awless has been dropped due to the lack of maintenance from upstream since 2017"; # Added 2022-06-01 - keybase-go = throw "'keybase-go' has been renamed to/replaced by 'keybase'"; # Converted to throw 2022-02-22 keysmith = libsForQt5.kdeGear.keysmith; # Added 2021-07-14 kfctl = throw "kfctl is broken and has been archived by upstream" ; # Added 2023-08-21 kgx = gnome-console; # Added 2022-02-19 - kibana7-oss = throw "kibana7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # Added 2021-06-09 kicad-with-packages3d = throw "'kicad-with-packages3d' has been renamed to/replaced by 'kicad'"; # Converted to throw 2023-09-10 - kindlegen = throw "kindlegen has been removed from nixpkgs, as it's abandoned and no longer available for download"; # Added 2021-03-09 - kinetic-cpp-client = throw "kinetic-cpp-client has been removed from nixpkgs, as it's abandoned"; # Added 2020-04-28 - kino = throw "kino has been removed because it was broken and abandoned"; # Added 2021-04-25 kio-admin = libsForQt5.kdeGear.kio-admin; # Added 2023-03-18 - knockknock = throw "knockknock has been removed from nixpkgs because the upstream project is abandoned"; # Added 2022-01-01 - kodestudio = throw "kodestudio has been removed from nixpkgs, as the nix package has been long unmaintained and out of date."; # Added 2022-06-07 kodiGBM = kodi-gbm; kodiPlain = kodi; kodiPlainWayland = kodi-wayland; kodiPlugins = kodiPackages; # Added 2021-03-09; kramdown-rfc2629 = rubyPackages.kramdown-rfc2629; # Added 2021-03-23 krb5Full = krb5; - krename-qt5 = throw "'krename-qt5' has been renamed to/replaced by 'krename'"; # Converted to throw 2022-02-22 krita-beta = krita; # moved from top-level 2021-12-23 - kube-aws = throw "kube-aws is deprecated and archived by upstream"; # Added 2022-04-05 kubei = kubeclarity; # Added 2023-05-20 - kubeless = throw "kubeless is deprecated and archived by upstream"; # Added 2022-04-05 - kubicorn = throw "kubicorn has been dropped due to the lack of maintenance from upstream since 2019"; # Added 2022-05-30 kuma-prometheus-sd = throw "kuma-prometheus-sd has been deprecated upstream"; # Added 2023-07-02 - kvm = throw "'kvm' has been renamed to/replaced by 'qemu_kvm'"; # Converted to throw 2022-02-22 ### L ### larynx = piper-tts; # Added 2023-05-09 - lastfmsubmitd = throw "lastfmsubmitd was removed from nixpkgs as the project is abandoned"; # Added 2022-01-01 latinmodern-math = lmmath; ldgallery = throw "'ldgallery' has been removed from nixpkgs. Use the Flake provided by ldgallery instead"; # Added 2023-07-26 - letsencrypt = throw "'letsencrypt' has been renamed to/replaced by 'certbot'"; # Converted to throw 2022-02-22 lfs = dysk; # Added 2023-07-03 - libGL_driver = throw "'libGL_driver' has been renamed to/replaced by 'mesa.drivers'"; # Converted to throw 2022-02-22 - libaudit = throw "'libaudit' has been renamed to/replaced by 'audit'"; # Converted to throw 2022-02-22 - libayatana-indicator-gtk2 = throw "'libayatana-indicator-gtk2' has been removed from nixpkgs, as gtk2 is deprecated"; # Added 2022-10-18 libayatana-indicator-gtk3 = libayatana-indicator; # Added 2022-10-18 - libayatana-appindicator-gtk2 = throw "'libayatana-appindicator-gtk2' has been removed from nixpkgs, as gtk2 is deprecated"; # Added 2022-10-18 libayatana-appindicator-gtk3 = libayatana-appindicator; # Added 2022-10-18 libbencodetools = bencodetools; # Added 2022-07-30 - libbluedevil = throw "'libbluedevil' (Qt4) is unmaintained and unused since 'kde4.bluedevil's removal in 2017"; # Added 2022-06-14 libbpf_1 = libbpf; # Added 2022-12-06 - libcanberra_gtk2 = throw "'libcanberra_gtk2' has been renamed to/replaced by 'libcanberra-gtk2'"; # Converted to throw 2022-02-22 - libcanberra_gtk3 = throw "'libcanberra_gtk3' has been renamed to/replaced by 'libcanberra-gtk3'"; # Converted to throw 2022-02-22 - libcap_manpages = throw "'libcap_manpages' has been renamed to/replaced by 'libcap.doc'"; # Converted to throw 2022-02-22 libcap_pam = throw "'libcap_pam' has been replaced with 'libcap'"; # Converted to throw 2023-09-10 - libcap_progs = throw "'libcap_progs' has been renamed to/replaced by 'libcap.out'"; # Converted to throw 2022-02-22 - libco-canonical = throw "libco-canonical: Canonical deleted the repo, libco-canonical is not used anymore"; # Added 2021-05-16 - libcroco = throw "libcroco has been removed as it's no longer used in any derivations"; # Added 2020-03-04 - libdbusmenu-glib = throw "'libdbusmenu-glib' has been renamed to/replaced by 'libdbusmenu'"; # Converted to throw 2022-02-22 - libdbusmenu_qt = throw "'libdbusmenu_qt' (Qt4) is deprecated and unused, use 'libsForQt5.libdbusmenu'"; # Added 2022-06-14 - libdbusmenu_qt5 = throw "'libdbusmenu_qt5' has been renamed to/replaced by 'libsForQt5.libdbusmenu'"; # Converted to throw 2022-02-22 - libdigidoc = throw "'libdigidoc' is unused in nixpkgs, deprecated and archived by upstream, use 'libdigidocpp' instead"; # Added 2022-06-03 - liberation_ttf_v1_from_source = throw "'liberation_ttf_v1_from_source' has been renamed to/replaced by 'liberation_ttf_v1'"; # Converted to throw 2022-02-22 - liberation_ttf_v2_from_source = throw "'liberation_ttf_v2_from_source' has been renamed to/replaced by 'liberation_ttf_v2'"; # Converted to throw 2022-02-22 - liberationsansnarrow = throw "'liberationsansnarrow' has been renamed to/replaced by 'liberation-sans-narrow'"; # Converted to throw 2022-02-22 - libgksu = throw "libgksu has been removed"; # Added 2022-01-16 libgme = game-music-emu; # Added 2022-07-20 - libgnome_keyring = throw "'libgnome_keyring' has been renamed to/replaced by 'libgnome-keyring'"; # Converted to throw 2022-02-22 - libgnome_keyring3 = throw "'libgnome_keyring3' has been renamed to/replaced by 'libgnome-keyring3'"; # Converted to throw 2022-02-22 libgpgerror = libgpg-error; # Added 2021-09-04 - libgroove = throw "libgroove has been removed, because it depends on an outdated and insecure version of ffmpeg"; # Added 2022-01-21 - libgumbo = throw "'libgumbo' has been renamed to/replaced by 'gumbo'"; # Converted to throw 2022-02-22 libheimdal = heimdal; # Added 2022-11-18 libintlOrEmpty = throw "'libintlOrEmpty' has been replaced by gettext"; # Converted to throw 2023-09-10 libixp_hg = libixp; libjpeg_drop = libjpeg_original; # Added 2020-06-05 - libjreen = throw "libjreen has been removed, because it did not support a recent version of qt5"; # Added 2022-06-12 - libjson_rpc_cpp = throw "'libjson_rpc_cpp' has been renamed to/replaced by 'libjson-rpc-cpp'"; # Converted to throw 2022-02-22 - libkml = throw "libkml has been removed from nixpkgs, as it's abandoned and no package needed it"; # Added 2021-11-09 - liblapackWithoutAtlas = throw "'liblapackWithoutAtlas' has been renamed to/replaced by 'lapack-reference'"; # Converted to throw 2022-02-22 liblastfm = libsForQt5.liblastfm; # Added 2020-06-14 - liblrdf = throw "'liblrdf' has been renamed to/replaced by 'lrdf'"; # Converted to throw 2022-02-22 - libmicrohttpd_0_9_70 = throw "'libmicrohttpd_0_9_70' has been removed because it is insecure, and has been replaced by 'libmicrohttpd_0_9_69' and 'libmicrohttpd_0_9_71'"; # Added 2022-10-10 libmongo-client = throw "'libmongo-client' has been removed, upstream gone"; # Added 2023-06-22 - libmsgpack = throw "'libmsgpack' has been renamed to/replaced by 'msgpack'"; # Converted to throw 2022-02-22 - libnih = throw "'libnih' has been removed"; # Converted to throw 2022-05-17 - libosmpbf = throw "libosmpbf was removed because it is no longer required by osrm-backend"; - libpng_apng = throw "libpng_apng has been removed, because it is equivalent to libpng"; # Added 2021-03-21 libpulseaudio-vanilla = libpulseaudio; # Added 2022-04-20 - libqmatrixclient = throw "libqmatrixclient was renamed to libquotient"; # Added 2020-04-09 - libqrencode = throw "'libqrencode' has been renamed to/replaced by 'qrencode'"; # Converted to throw 2022-02-22 libraw_unstable = throw "'libraw_unstable' has been removed, please use libraw"; # Added 2023-01-30 librdf = lrdf; # Added 2020-03-22 - librecad2 = throw "'librecad2' has been renamed to/replaced by 'librecad'"; # Converted to throw 2022-02-22 - libressl_3_2 = throw "'libressl_3_2' has reached end-of-life "; # Added 2022-03-19 libressl_3_5 = throw "'libressl_3_5' has reached end-of-life "; # Added 2023-05-07 - librevisa = throw "librevisa has been removed because its website and source have disappeared upstream"; # Added 2022-09-23 - librsync_0_9 = throw "librsync_0_9 has been removed"; # Added 2021-07-24 librtlsdr = rtl-sdr; # Added 2023-02-18 librewolf-wayland = librewolf; # Added 2022-11-15 libseat = seatd; # Added 2021-06-24 - libsForQt512 = throw "Qt 5 versions prior to 5.15 are no longer supported upstream and have been removed"; # Added 2022-11-24 - libsForQt514 = throw "Qt 5 versions prior to 5.15 are no longer supported upstream and have been removed"; # Added 2022-11-24 libsForQt515 = libsForQt5; # Added 2022-11-24 - libspotify = throw "libspotify has been removed because Spotify stopped supporting it"; # added 2022-05-29 - libstdcxxHook = throw "libstdcxx hook has been removed because cc-wrapper is now directly aware of the c++ standard library intended to be used"; # Added 2020-06-22 - libsysfs = throw "'libsysfs' has been renamed to/replaced by 'sysfsutils'"; # Converted to throw 2022-02-22 libtensorflow-bin = libtensorflow; # Added 2022-09-25 - libtidy = throw "'libtidy' has been renamed to/replaced by 'html-tidy'"; # Converted to throw 2022-02-22 libtorrentRasterbar = libtorrent-rasterbar; # Added 2020-12-20 libtorrentRasterbar-1_2_x = libtorrent-rasterbar-1_2_x; # Added 2020-12-20 libtorrentRasterbar-2_0_x = libtorrent-rasterbar-2_0_x; # Added 2020-12-20 - libtxc_dxtn = throw "libtxc_dxtn was removed 2020-03-16, now integrated in Mesa"; - libtxc_dxtn_s2tc = throw "libtxc_dxtn_s2tc was removed 2020-03-16, now integrated in Mesa"; - libudev = throw "'libudev' has been renamed to/replaced by 'udev'"; # Converted to throw 2022-02-22 libungif = giflib; # Added 2020-02-12 libusb = libusb1; # Added 2020-04-28 - libusb1-axoloti = throw "libusb1-axoloti has been removed: axoloti has been removed"; # Added 2022-05-13 - libva-full = throw "'libva-full' has been renamed to/replaced by 'libva'"; # Converted to throw 2022-02-22 - libva1-full = throw "'libva1-full' has been renamed to/replaced by 'libva1'"; # Converted to throw 2022-02-22 libwnck3 = libwnck; libyamlcpp = yaml-cpp; # Added 2023-01-29 libyamlcpp_0_3 = yaml-cpp_0_3; # Added 2023-01-29 lightdm_gtk_greeter = lightdm-gtk-greeter; # Added 2022-08-01 - lighttable = throw "'lighttable' crashes (SIGSEGV) on startup, has not been updated in years and depends on deprecated GTK2"; # Added 2022-06-15 - lilyterm = throw "lilyterm has been removed from nixpkgs, because it was relying on a vte version that depended on python2"; # Added 2022-01-14 - lilyterm-git = throw "lilyterm-git has been removed from nixpkgs, because it was relying on a vte version that depended on python2"; # Added 2022-01-14 - links = throw "'links' has been renamed to/replaced by 'links2'"; # Converted to throw 2022-02-22 - linuxband = throw "linuxband has been removed from nixpkgs, as it's abandoned upstream"; # Added 2021-12-09 llama = walk; # Added 2023-01-23 # Linux kernels @@ -1020,21 +481,12 @@ mapAliases ({ linux_6_3 = linuxKernel.kernels.linux_6_3; linux_6_4 = linuxKernel.kernels.linux_6_4; linux_6_5 = linuxKernel.kernels.linux_6_5; - linuxPackages_mptcp = throw "'linuxPackages_mptcp' has been moved to https://github.com/teto/mptcp-flake"; # Converted to throw 2022-10-04 - linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake"; # Converted to throw 2022-10-04 - linux_mptcp_95 = throw "'linux_mptcp_95' has been moved to https://github.com/teto/mptcp-flake"; # Converted to throw 2022-10-04 linux_rpi0 = linuxKernel.kernels.linux_rpi1; linux_rpi02w = linuxKernel.kernels.linux_rpi3; linux_rpi1 = linuxKernel.kernels.linux_rpi1; linux_rpi2 = linuxKernel.kernels.linux_rpi2; linux_rpi3 = linuxKernel.kernels.linux_rpi3; linux_rpi4 = linuxKernel.kernels.linux_rpi4; - linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option"; # Added 2022-11-01 - linuxPackages_xanmod_tt = throw "linuxPackages_xanmod_tt was removed because upstream no longer offers this option"; # Added 2022-11-01 - - # Added 2020-04-04 - linuxPackages_testing_hardened = throw "linuxPackages_testing_hardened has been removed, please use linuxPackages_latest_hardened"; - linux_testing_hardened = throw "linux_testing_hardened has been removed, please use linux_latest_hardened"; # Added 2021-04-04 linuxPackages_xen_dom0 = linuxPackages; @@ -1056,149 +508,54 @@ mapAliases ({ ''; linux_latest_hardened = linuxPackages_latest_hardened; - linux-steam-integration = throw "linux-steam-integration has been removed, as the upstream project has been abandoned"; # Added 2020-05-22 - loadcaffe = throw "loadcaffe has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 lobster-two = google-fonts; # Added 2021-07-22 - logstash6 = throw "logstash6 has been removed because it reached end of life"; # Added 2022-10-04 - logstash6-oss = throw "logstash6 has been removed because it reached end of life"; # Added 2022-10-04 - love_0_7 = throw "love_0_7 was removed because it is a very old version and no longer used by any package in nixpkgs"; # Added 2022-01-15 - love_0_8 = throw "love_0_8 was removed because it is a very old version and no longer used by any package in nixpkgs"; # Added 2022-01-15 - love_0_9 = throw "love_0_9 was removed because was broken for a long time and no longer used by any package in nixpkgs"; # Added 2022-01-15 - lprof = throw "lprof has been removed as it's unmaintained upstream and broken in nixpkgs since a while ago"; # Added 2021-02-15 - lttngTools = throw "'lttngTools' has been renamed to/replaced by 'lttng-tools'"; # Converted to throw 2022-02-22 - lttngUst = throw "'lttngUst' has been renamed to/replaced by 'lttng-ust'"; # Converted to throw 2022-02-22 - lua5_1_sockets = throw "'lua5_1_sockets' has been renamed to/replaced by 'lua51Packages.luasocket'"; # Converted to throw 2022-02-22 - lua5_expat = throw "'lua5_expat' has been renamed to/replaced by 'luaPackages.luaexpat'"; # Converted to throw 2022-02-22 - lua5_sec = throw "'lua5_sec' has been renamed to/replaced by 'luaPackages.luasec'"; # Converted to throw 2022-02-22 - lumo = throw "lumo has been removed: abandoned by upstream"; # Added 2022-04-25 - lumpy = throw "lumpy has been removed from nixpkgs, as it is stuck on python2"; # Added 2022-01-12 luxcorerender = throw "'luxcorerender' has been removed as it's unmaintained and broken in nixpkgs since a while ago"; # Added 2023-06-07 - lxappearance-gtk3 = throw "lxappearance-gtk3 has been removed. Use lxappearance instead, which now defaults to Gtk3"; # Added 2020-06-03 lzma = xz; # moved from top-level 2021-03-14 ### M ### - m3d-linux = throw "'m3d-linux' has been renamed to/replaced by 'm33-linux'"; # Converted to throw 2022-02-22 MACS2 = macs2; # Added 2023-06-12 - mail-notification = throw "mail-notification has been removed from nixpkgs, as it's unmaintained and has dependencies on old gnome libraries we want to remove"; # Added 2021-08-21 - mailpile = throw "mailpile was removed from nixpkgs, as it is stuck on python2"; # Added 2022-01-12 - man_db = throw "'man_db' has been renamed to/replaced by 'man-db'"; # Converted to throw 2022-02-22 - manul = throw "manul has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-01 - manpages = throw "'manpages' has been renamed to/replaced by 'man-pages'"; # Converted to throw 2022-02-22 - marathon = throw "marathon has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15 mariadb_104 = throw "mariadb_104 has been removed from nixpkgs, please switch to another version like mariadb_106"; # Added 2023-09-11 - mariadb_108 = throw "mariadb_108 has been removed from nixpkgs, please switch to another version like mariadb_1010"; # Added 2022-05-10 - mariadb_109 = throw "mariadb_109 has been removed from nixpkgs, please switch to another version like mariadb_1010"; # Added 2022-05-10 mariadb-client = hiPrio mariadb.client; #added 2019.07.28 markdown-pp = throw "markdown-pp was removed from nixpkgs, because the upstream archived it on 2021-09-02"; # Added 2023-07-22 markmind = throw "markmind has been removed from nixpkgs, because it depended on an old version of electron"; # Added 2023-09-12 - marp = throw "marp has been removed from nixpkgs, as it's unmaintained and has security issues"; # Added 2022-06-04 - matcha = throw "matcha was renamed to matcha-gtk-theme"; # added 2020-05-09 - mathics = throw "mathics has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15 matrique = spectral; # Added 2020-01-27 matrix-recorder = throw "matrix-recorder has been removed due to being unmaintained"; # Added 2023-05-21 maui-nota = libsForQt5.mauiPackages.nota; # added 2022-05-17 - mcgrid = throw "mcgrid has been removed from nixpkgs, as it's not compatible with rivet 3"; # Added 2020-05-23 mcomix3 = mcomix; # Added 2022-06-05 - mediatomb = throw "mediatomb is no longer maintained upstream, use gerbera instead"; # added 2022-01-04 meme = meme-image-generator; # Added 2021-04-21 - memtest86 = throw "'memtest86' has been renamed to/replaced by 'memtest86plus'"; # Converted to throw 2022-02-22 - mercurial_4 = throw "mercurial_4 has been removed as it's unmaintained"; # Added 2021-10-18 - mesos = throw "mesos has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15 mess = throw "'mess' has been renamed to/replaced by 'mame'"; # Converted to throw 2023-09-10 - metal = throw "metal has been removed due to lack of maintainers"; - metricbeat6 = throw "metricbeat6 has been removed because it reached end of life"; # Added 2022-10-04 microsoft_gsl = microsoft-gsl; # Added 2023-05-26 - mididings = throw "mididings has been removed from nixpkgs as it doesn't support recent python3 versions and its upstream stopped maintaining it"; # Added 2022-01-12 - midoriWrapper = throw "'midoriWrapper' has been renamed to/replaced by 'midori'"; # Converted to throw 2022-02-22 mime-types = mailcap; # Added 2022-01-21 - mimms = throw "mimms has been removed from nixpkgs as the upstream project is stuck on python2"; # Added 2022-01-01 - minergate-cli = throw "minergatecli has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # Added 2021-08-13 - minergate = throw "minergate has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # Added 2021-08-13 - minetestclient_4 = throw "minetestclient_4 has been removed from Nixpkgs; current version is available at minetest or minetestclient"; # added 2022-02-01 - minetestserver_4 = throw "minetestserver_4 has been removed from Nixpkgs; current version is available at minetestserver"; # added 2022-02-01 - minetime = throw "minetime has been removed from nixpkgs, because it was discontinued 2021-06-22"; # Added 2021-10-14 - miniupnpc_1 = throw "miniupnpc_1 has been removed; current version is available at miniupnpc"; # Added 2022-10-30 minizip2 = pkgs.minizip-ng; # Added 2022-12-28 - mist = throw "mist has been removed as the upstream project has been abandoned, see https://github.com/ethereum/mist#mist-browser-deprecated"; # Added 2020-08-15 - mlt-qt5 = throw "'mlt-qt5' has been renamed to/replaced by 'libsForQt5.mlt'"; # Converted to throw 2022-02-22 - mobile_broadband_provider_info = throw "'mobile_broadband_provider_info' has been renamed to/replaced by 'mobile-broadband-provider-info'"; # Converted to throw 2022-02-22 - moby = throw "moby has been removed, merged into linuxkit in 2018. Use linuxkit instead"; - module_init_tools = throw "'module_init_tools' has been renamed to/replaced by 'kmod'"; # Converted to throw 2022-02-22 monero = monero-cli; # Added 2021-11-28 - moku = throw "moku: Unusable since 2.6.2, not maintained upstream anymore"; # Added 2022-02-26 - mongodb-3_4 = throw "mongodb-3_4 has been removed, it's end of life since January 2020"; # Added 2022-11-30 - mongodb-3_6 = throw "mongodb-3_6 has been removed, it's end of life since April 2021"; # Added 2022-11-30 mongodb-4_0 = throw "mongodb-4_0 has been removed, it's end of life since April 2022"; # Added 2023-01-05 mongodb-4_2 = throw "mongodb-4_2 has been removed, it's end of life since April 2023"; # Added 2023-06-06 - monodevelop = throw "monodevelop has been removed from nixpkgs"; # Added 2022-01-15 - mopidy-gmusic = throw "mopidy-gmusic has been removed because Google Play Music was discontinued"; # Added 2021-03-07 - mopidy-local-images = throw "mopidy-local-images has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension"; # Added 2020-10-18 - mopidy-local-sqlite = throw "mopidy-local-sqlite has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension"; # Added 2020-10-18 - mopidy-spotify-tunigo = throw "mopidy-spotify-tunigo has been removed because Spotify stopped supporting libspotify"; # added 2022-05-29 - morituri = throw "'morituri' has been renamed to/replaced by 'whipper'"; # Converted to throw 2022-02-22 moz-phab = mozphab; # Added 2022-08-09 mozart-binary = throw "'mozart-binary' has been renamed to/replaced by 'mozart2-binary'"; # Converted to throw 2023-09-10 mozart = throw "'mozart' has been renamed to/replaced by 'mozart2-binary'"; # Converted to throw 2023-09-10 mpc_cli = mpc-cli; # moved from top-level 2022-01-24 mpd_clientlib = libmpdclient; # Added 2021-02-11 - mpich2 = throw "'mpich2' has been renamed to/replaced by 'mpich'"; # Converted to throw 2022-02-22 - mps-youtube = throw "'mps-youtube' has been removed as it's unmaintained and stopped working. Use 'yewtube', a maintained fork"; # Added 2022-12-29 - mqtt-bench = throw "mqtt-bench has been dropped due to the lack of maintenance from upstream since 2017"; # Added 2022-06-02 - msf = throw "'msf' has been renamed to/replaced by 'metasploit'"; # Converted to throw 2022-02-22 - multimc = throw "multimc was removed from nixpkgs; use prismlauncher instead (see https://github.com/NixOS/nixpkgs/pull/154051 for more information)"; # Added 2022-01-08 mumble_git = throw "'mumble_git' has been renamed to/replaced by 'pkgs.mumble'"; # Converted to throw 2023-09-10 murmur_git = throw "'murmur_git' has been renamed to/replaced by 'pkgs.murmur'"; # Converted to throw 2023-09-10 mutt-with-sidebar = mutt; # Added 2022-09-17 mysql-client = hiPrio mariadb.client; mysql = mariadb; # moved from top-level 2021-03-14 - mysql57 = throw "'mysql57' has been removed. Please use 'mysql80' or 'mariadb'"; # floating point textures patents are expired, # so package reduced to alias mesa_drivers = mesa.drivers; - mesa_noglu = throw "'mesa_noglu' has been renamed to/replaced by 'mesa'"; # Converted to throw 2022-02-22 - - mpv-with-scripts = throw "'mpv-with-scripts' has been renamed to/replaced by 'mpv' or with 'mpv.override { scripts = [ mpvScripts.plugin-name ]; }' if you where using plugins."; # Converted to throw 2022-09-24 - mssys = throw "'mssys' has been renamed to/replaced by 'ms-sys'"; # Converted to throw 2022-02-22 - multipath_tools = throw "'multipath_tools' has been renamed to/replaced by 'multipath-tools'"; # Converted to throw 2022-02-22 - mumsi = throw "mumsi has been removed from nixpkgs, as it's unmaintained and does not build anymore"; # Added 2021-11-18 - mupen64plus1_5 = throw "'mupen64plus1_5' has been renamed to/replaced by 'mupen64plus'"; # Converted to throw 2022-02-22 - mx = throw "graalvm8 and its tools were deprecated in favor of graalvm8-ce"; # Added 2021-10-15 - mxisd = throw "mxisd has been removed from nixpkgs as it has reached end of life, see https://github.com/kamax-matrix/mxisd/blob/535e0a5b96ab63cb0ddef90f6f42c5866407df95/EOL.md#end-of-life-notice . ma1sd may be a suitable alternative"; # Added 2021-04-15 - mysqlWorkbench = throw "'mysqlWorkbench' has been renamed to/replaced by 'mysql-workbench'"; # Converted to throw 2022-02-22 - myxer = throw "Myxer has been removed from nixpkgs, as it has been unmaintained since Jul 31, 2021"; # Added 2022-06-08 ### N ### - namecoin = throw "namecoin GUI has been removed, because it depended on qt4"; # Added 2022-05-26 - navipowm = throw "navipowm has been removed, because it was unmaintained upstream"; # Added 2022-05-26 ncdu_2 = ncdu; # Added 2022-07-22 - nccl = throw "nccl has been renamed to cudaPackages.nccl"; # Added 2022-04-04 - nccl_cudatoolkit_10 = throw "nccl_cudatoolkit_10 has been renamed to cudaPackages_10.nccl"; # Added 2022-04-04 - nccl_cudatoolkit_11 = throw "nccl_cudatoolkit_11 has been renamed to cudaPackages_11.nccl"; # Added 2022-04-04 net_snmp = throw "'net_snmp' has been renamed to/replaced by 'net-snmp'"; # Converted to throw 2023-09-10 + netbox_3_3 = throw "netbox 3.3 series has been removed as it was EOL"; # Added 2023-09-02 nagiosPluginsOfficial = monitoring-plugins; - navit = throw "navit has been removed from nixpkgs, due to being unmaintained"; # Added 2021-06-07 - ncat = throw "'ncat' has been renamed to/replaced by 'nmap'"; # Converted to throw 2022-02-22 - neap = throw "neap was removed from nixpkgs, as it relies on python2"; # Added 2022-01-12 neochat = libsForQt5.kdeGear.neochat; # added 2022-05-10 - netease-cloud-music = throw "netease-cloud-music has been removed together with deepin"; # Added 2020-08-31 - nettools_mptcp = throw "'nettools_mptcp' has been moved to https://github.com/teto/mptcp-flake"; # Converted to throw 2022-10-04 - networkmanager_fortisslvpn = throw "'networkmanager_fortisslvpn' has been renamed to/replaced by 'networkmanager-fortisslvpn'"; # Converted to throw 2022-02-22 - networkmanager_iodine = throw "'networkmanager_iodine' has been renamed to/replaced by 'networkmanager-iodine'"; # Converted to throw 2022-02-22 - networkmanager_l2tp = throw "'networkmanager_l2tp' has been renamed to/replaced by 'networkmanager-l2tp'"; # Converted to throw 2022-02-22 - networkmanager_openconnect = throw "'networkmanager_openconnect' has been renamed to/replaced by 'networkmanager-openconnect'"; # Converted to throw 2022-02-22 - networkmanager_openvpn = throw "'networkmanager_openvpn' has been renamed to/replaced by 'networkmanager-openvpn'"; # Converted to throw 2022-02-22 - networkmanager_vpnc = throw "'networkmanager_vpnc' has been renamed to/replaced by 'networkmanager-vpnc'"; # Converted to throw 2022-02-22 - neutral-style = throw "neural-style has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 - neuron-notes = throw "'neuron-notes' has been decontinued, migrate to 'emanote' instead."; # Added 2022-12-18 - nfsUtils = throw "'nfsUtils' has been renamed to/replaced by 'nfs-utils'"; # Converted to throw 2022-02-22 - nginxUnstable = throw "'nginxUnstable' has been renamed to/replaced by 'nginxMainline'"; # Converted to throw 2022-02-22 - nilfs_utils = throw "'nilfs_utils' has been renamed to/replaced by 'nilfs-utils'"; # Converted to throw 2022-02-22 nitrokey-udev-rules = libnitrokey; # Added 2023-03-25 nix-direnv-flakes = nix-direnv; nix-review = throw "'nix-review' has been renamed to/replaced by 'nixpkgs-review'"; # Converted to throw 2023-09-10 @@ -1211,14 +568,7 @@ mapAliases ({ nix_2_6 = nixVersions.nix_2_6; nixopsUnstable = nixops_unstable; # Added 2022-03-03 nixosTest = testers.nixosTest; # Added 2022-05-05 - nixui = throw "nixui has been removed from nixpkgs, due to the project being unmaintained"; # Added 2022-05-23 nmap-unfree = nmap; # Added 2021-04-06 - nmap-graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Added 2022-04-26 - nmap_graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Modified 2022-04-26 - nodejs_10 = throw "nodejs-10_x has been removed. Use a newer version instead."; # Added 2022-05-31 - nodejs-10_x = nodejs_10; # Added 2022-11-06 - nodejs_12 = throw "nodejs-12_x has been removed. Use a newer version instead."; # Added 2022-07-04 - nodejs-12_x = nodejs_12; # Added 2022-11-06 nodejs-14_x = nodejs_14; # Added 2022-11-06 nodejs-slim-14_x = nodejs-slim_14; # Added 2022-11-06 nodejs-16_x = nodejs_16; # Added 2022-11-06 @@ -1226,207 +576,71 @@ mapAliases ({ nodejs-slim-16_x = nodejs-slim_16; # Added 2022-11-06 nodejs-18_x = nodejs_18; # Added 2022-11-06 nodejs-slim-18_x = nodejs-slim_18; # Added 2022-11-06 - nologin = throw "'nologin' has been renamed to/replaced by 'shadow'"; # Converted to throw 2022-02-22 - nomad_1_1 = throw "nomad_1_1 has been removed because it's outdated. Use a a newer version instead"; # Added 2022-05-22 nomad_1_2 = throw "nomad_1_2 has been removed because it's outdated. Use a a newer version instead"; # Added 2023-09-02 nomad_1_3 = throw "nomad_1_3 has been removed because it's outdated. Use a a newer version instead"; # Added 2023-09-02 - nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # Added 2021-05-27 noto-fonts-cjk = noto-fonts-cjk-sans; # Added 2021-12-16 noto-fonts-emoji = noto-fonts-color-emoji; # Added 2023-09-09 noto-fonts-extra = noto-fonts; # Added 2023-04-08 - nottetris2 = throw "nottetris2 was removed because it is unmaintained by upstream and broken"; # Added 2022-01-15 - now-cli = throw "now-cli has been replaced with nodePackages.vercel"; # Added 2021-08-05 - ntrack = throw "ntrack has been removed, because it depended on qt4"; # Added 2022-05-12 - ntdb = throw "ntdb has been removed: abandoned by upstream"; # Added 2022-04-21 - nxproxy = throw "'nxproxy' has been renamed to/replaced by 'nx-libs'"; # Converted to throw 2022-02-22 ### O ### o = orbiton; # Added 2023-04-09 oathToolkit = oath-toolkit; # Added 2022-04-04 - oci-image-tool = throw "oci-image-tool is no longer actively maintained, and has had major deficiencies for several years."; # Added 2022-05-14; - oracleXE = throw "oracleXE has been removed, as it's heavily outdated and unmaintained"; # Added 2020-10-09 - OVMF-CSM = throw "OVMF-CSM has been removed in favor of OVMFFull"; # Added 2021-10-16 - OVMF-secureBoot = throw "OVMF-secureBoot has been removed in favor of OVMFFull"; # Added 2021-10-16 oauth2_proxy = oauth2-proxy; # Added 2021-04-18 - ocropus = throw "ocropus has been removed: abandoned by upstream"; # Added 2022-04-24 - octoprint-plugins = throw "octoprint-plugins are now part of the octoprint.python.pkgs package set"; # Added 2021-01-24 - ocz-ssd-guru = throw "ocz-ssd-guru has been removed due to there being no source available"; # Added 2021-07-12 - odpdown = throw "odpdown has been removed because it lacks python3 support"; # Added 2022-04-25 - ofp = throw "ofp is not compatible with odp-dpdk"; + octant = throw "octant has been dropped due to being archived and vulnerable"; # Added 2023-09-29 + octant-desktop = throw "octant-desktop has been dropped due to being archived and vulnerable"; # Added 2023-09-29 ogre1_9 = throw "ogre1_9 has been removed, use ogre instead"; # Added 2023-03-22 ogre1_10 = throw "ogre1_10 has been removed, use ogre instead"; # Added 2023-07-20 - olifant = throw "olifant has been removed from nixpkgs, as it was unmaintained"; # Added 2021-08-05 - omapd = throw "omapd has been removed from nixpkgs, as it was unmaintained"; # Added 2022-05-09 opa = throw "opa has been removed from nixpkgs as upstream has abandoned the project"; # Added 2023-03-21 opam_1_2 = throw "'opam_1_2' has been renamed to/replaced by 'opam'"; # Added 2023-03-08 openafs_1_8 = openafs; # Added 2022-08-22 - openbazaar = throw "openbazzar has been removed from nixpkgs as upstream has abandoned the project"; # Added 2022-01-06 - openbazaar-client = throw "openbazzar-client has been removed from nixpkgs as upstream has abandoned the project"; # Added 2022-01-06 - opencascade_oce = throw "'opencascade_oce' has been renamed to/replaced by 'opencascade'"; # Converted to throw 2022-02-22 - opencl-icd = throw "'opencl-icd' has been renamed to/replaced by 'ocl-icd'"; # Converted to throw 2022-02-22 + opencascade = throw "'opencascade' has been removed as it is unmaintained; consider opencascade-occt instead'"; # Added 2023-09-18 openconnect_head = openconnect_unstable; # Added 2022-03-29 openconnect_gnutls = openconnect; # Added 2022-03-29 - openconnect_pa = throw "openconnect_pa fork has been discontinued, support for GlobalProtect is now available in openconnect"; # Added 2021-05-21 openconnect_unstable = throw "openconnect_unstable was removed from nixpkgs as it was not being updated"; # Added 2023-06-01 openelec-dvb-firmware = libreelec-dvb-firmware; # Added 2021-05-10 - openexr_ctl = throw "'openexr_ctl' has been renamed to/replaced by 'ctl'"; # Converted to throw 2022-02-22 openimagedenoise_1_2_x = throw "'openimagedenoise_1_2_x' has been renamed to/replaced by 'openimagedenoise'"; # Added 2023-06-07 openimageio2 = openimageio; # Added 2023-01-05 openimageio_1 = throw "'openimageio_1' has been removed, please update to 'openimageio' 2"; # Added 2023-06-14 openisns = open-isns; # Added 2020-01-28 - openjpeg_1 = throw "openjpeg_1 has been removed, use openjpeg_2 instead"; # Added 2021-01-24 openjpeg_2 = openjpeg; # Added 2021-01-25 openmpt123 = libopenmpt; # Added 2021-09-05 - opensans-ttf = throw "'opensans-ttf' has been renamed to/replaced by 'open-sans'"; # Converted to throw 2022-02-22 - openssh_with_kerberos = throw "'openssh_with_kerberos' has been renamed to/replaced by 'openssh'"; # Converted to throw 2022-02-22 openssl_3_0 = openssl_3; # Added 2022-06-27 openvpn_24 = throw "openvpn_24 has been removed, because it went EOL. 2.5.x or newer is still available"; # Added 2023-01-23 orchis = orchis-theme; # Added 2021-06-09 osxfuse = macfuse-stubs; # Added 2021-03-20 - otter-browser = throw "otter-browser has been removed from nixpkgs, as it was unmaintained"; # Added 2020-02-02 - owncloudclient = throw "'owncloudclient' has been renamed to/replaced by 'owncloud-client'"; # Converted to throw 2022-02-22 ### P ### - PPSSPP = throw "'PPSSPP' has been renamed to/replaced by 'ppsspp'"; # Converted to throw 2022-02-22 - p11_kit = throw "'p11_kit' has been renamed to/replaced by 'p11-kit'"; # Converted to throw 2022-02-22 packet-cli = metal-cli; # Added 2021-10-25 palemoon = throw "palemoon has been dropped due to python2 being EOL and marked insecure. Use 'palemoon-bin' instead"; # Added 2023-05-18 paperless = paperless-ngx; # Added 2021-06-06 paperless-ng = paperless-ngx; # Added 2022-04-11 paper-note = throw "paper-note has been removed: abandoned by upstream"; # Added 2023-05-03 parity = openethereum; # Added 2020-08-01 - parity-ui = throw "parity-ui was removed because it was broken and unmaintained by upstream"; # Added 2022-01-10 - parquet-cpp = throw "'parquet-cpp' has been renamed to/replaced by 'arrow-cpp'"; # Converted to throw 2022-02-22 - patchmatrix = throw "'patchmatrix' has been renamed to/replaced by 'open-music-kontrollers.patchmatrix'"; # Added 2022-03-09 pash = throw "'pash' has been removed: abandoned by upstream. Use 'powershell' instead"; # Added 2023-09-16 - pass-otp = throw "'pass-otp' has been renamed to/replaced by 'pass.withExtensions'"; # Converted to throw 2022-02-22 - pbis-open = throw "pbis-open has been removed, because it is no longer maintained upstream"; # added 2021-12-15 - pdf-redact-tools = throw "pdf-redact-tools has been removed from nixpkgs because the upstream has abandoned the project"; # Added 2022-01-01 - pdf2htmlEx = throw "pdf2htmlEx has been removed from nixpkgs, as it was unmaintained"; # Added 2020-11-03 - pdfmod = throw "pdfmod has been removed"; # Added 2022-01-15 - pdfread = throw "pdfread has been remove because it is unmaintained for years and the sources are no longer available"; # Added 2021-07-22 - pdfstudio = throw "'pdfstudio' has been replaced with 'pdfstudio<year>', where '<year>' is the year from the PDF Studio version number, because each license is specific to a given year"; # Added 2022-09-04 peach = asouldocs; # Added 2022-08-28 pentablet-driver = xp-pen-g430-driver; # Added 2022-06-23 - percona-server = percona-server56; # Added 2022-11-01 - percona-server56 = throw "'percona-server56' has been dropped due to lack of maintenance, no upstream support and security issues"; # Added 2022-11-01 - percona-xtrabackup_2_4 = throw "'percona-xtrabackup_2_4' has been renamed to/replaced by 'percona-xtrabackup'"; # Added 2022-12-23 perldevel = throw "'perldevel' has been dropped due to lack of updates in nixpkgs and lack of consistent support for devel versions by 'perl-cross' releases, use 'perl' instead"; perldevelPackages = perldevel; - perlXMLParser = throw "'perlXMLParser' has been renamed to/replaced by 'perlPackages.XMLParser'"; # Converted to throw 2022-02-22 - perlArchiveCpio = throw "'perlArchiveCpio' has been renamed to/replaced by 'perlPackages.ArchiveCpio'"; # Converted to throw 2022-02-22 pgadmin = pgadmin4; - pgadmin3 = throw "pgadmin3 was removed for being unmaintained, use pgadmin4 instead."; # Added 2022-03-30 - pgp-tools = throw "'pgp-tools' has been renamed to/replaced by 'signing-party'"; # Converted to throw 2022-02-22 - pg_tmp = throw "'pg_tmp' has been renamed to/replaced by 'ephemeralpg'"; # Converted to throw 2022-02-22 - phantomjs = throw "phantomjs 1.9.8 has been dropped due to lack of maintenance and security issues"; # Added 2022-02-20 - phantomjs2 = throw "phantomjs2 has been dropped due to lack of maintenance"; # Added 2022-04-22 pharo-spur64 = pharo; # Added 2022-08-03 - pharo-spur32 = throw "pharo on 32bits is currently not supported due to lack of maintenance"; # Added 2022-08-03 - pharo-cog32 = throw "the cog32 VM has been outdated for about a decade now, time to move on"; # Added 2022-08-03 - pharo-launcher = throw "pharo launcher has been dropped due to lack of maintenance"; # Added 2022-08-03 - philter = throw "philter has been removed: abandoned by upstream"; # Added 2022-04-26 phodav_2_0 = throw "'phodav_2_0' has been renamed to/replaced by 'phodav'"; # Added 2023-02-21 photoflow = throw "photoflow was removed because it was broken and unmaintained by upstream"; # Added 2023-03-10 - phraseapp-client = throw "phraseapp-client is archived by upstream. Use phrase-cli instead"; # Added 2022-05-15 - phwmon = throw "phwmon has been removed: abandoned by upstream"; # Added 2022-04-24 # Obsolete PHP version aliases php80 = throw "php80 has been dropped due to the lack of maintenance from upstream for future releases"; # Added 2023-06-21 php80Packages = php80; # Added 2023-06-21 php80Extensions = php80; # Added 2023-06-21 - php74 = throw "php74 has been dropped due to the lack of maintenance from upstream for future releases"; # Added 2022-05-24 - php74Packages = php74; # Added 2022-05-24 - php74Extensions = php74; # Added 2022-05-24 - - php73 = throw "php73 has been dropped due to the lack of maintenance from upstream for future releases"; # Added 2021-06-03 - php73Packages = php73; # Added 2021-06-03 - php73Extensions = php73; # Added 2021-06-03 - - php-embed = throw '' - php*-embed has been dropped, you can build something similar - with the following snippet: - php74.override { embedSupport = true; apxs2Support = false; } - ''; # Added 2020-04-01 - php73-embed = php-embed; # Added 2020-04-01 - php74-embed = php-embed; # Added 2020-04-01 - - phpPackages-embed = throw '' - php*Packages-embed has been dropped, you can build something - similar with the following snippet: - (php74.override { embedSupport = true; apxs2Support = false; }).packages - ''; # Added 2020-04-01 - php73Packages-embed = phpPackages-embed; - php74Packages-embed = phpPackages-embed; - - php-unit = throw '' - php*-unit has been dropped, you can build something similar with - the following snippet: - php74.override { - embedSupport = true; - apxs2Support = false; - systemdSupport = false; - phpdbgSupport = false; - cgiSupport = false; - fpmSupport = false; - } - ''; # Added 2020-04-01 - php73-unit = php-unit; # Added 2020-04-01 - php74-unit = php-unit; # Added 2020-04-01 - - phpPackages-unit = throw '' - php*Packages-unit has been dropped, you can build something - similar with this following snippet: - (php74.override { - embedSupport = true; - apxs2Support = false; - systemdSupport = false; - phpdbgSupport = false; - cgiSupport = false; - fpmSupport = false; - }).packages - ''; # Added 2020-04-01 - php73Packages-unit = phpPackages-unit; - php74Packages-unit = phpPackages-unit; - - pidgin-with-plugins = throw "'pidgin-with-plugins' has been renamed to/replaced by 'pidgin'"; # Converted to throw 2022-02-22 - pidginlatex = throw "'pidginlatex' has been renamed to/replaced by 'pidgin-latex'"; # Converted to throw 2022-02-22 - pidginlatexSF = throw "'pidginlatexSF' has been renamed to/replaced by 'pidgin-latex'"; # Converted to throw 2022-02-22 - pidginmsnpecan = throw "'pidginmsnpecan' has been renamed to/replaced by 'pidgin-msn-pecan'"; # Converted to throw 2022-02-22 - pidginosd = throw "'pidginosd' has been renamed to/replaced by 'pidgin-osd'"; # Converted to throw 2022-02-22 - pidginotr = throw "'pidginotr' has been renamed to/replaced by 'pidgin-otr'"; # Converted to throw 2022-02-22 - pidginsipe = throw "'pidginsipe' has been renamed to/replaced by 'pidgin-sipe'"; # Converted to throw 2022-02-22 - pidginwindowmerge = throw "'pidginwindowmerge' has been renamed to/replaced by 'pidgin-window-merge'"; # Converted to throw 2022-02-22 - pifi = throw "pifi has been removed from nixpkgs, as it is no longer developed"; # Added 2022-01-19 - ping = throw "'ping' does not build with recent valac and has been removed. If you are just looking for the 'ping' command use either 'iputils' or 'inetutils'"; # Added 2022-04-18 pipewire-media-session = throw "pipewire-media-session is no longer maintained and has been removed. Please use Wireplumber instead."; - piwik = throw "'piwik' has been renamed to/replaced by 'matomo'"; # Converted to throw 2022-02-22 - pixie = throw "pixie has been removed: abandoned by upstream"; # Added 2022-04-21 pkgconfig = throw "'pkgconfig' has been renamed to/replaced by 'pkg-config'"; # Converted to throw 2023-09-10 - pkgconfigUpstream = throw "'pkgconfigUpstream' has been renamed to/replaced by 'pkg-configUpstream'"; # Converted to throw 2022-02-22 pleroma-otp = pleroma; # Added 2021-07-10 - plexpy = throw "'plexpy' has been renamed to/replaced by 'tautulli'"; # Converted to throw 2022-02-22 pltScheme = racket; # just to be sure pmdk = throw "'pmdk' is discontinued, no further support or maintenance is planned by upstream"; # Added 2023-02-06 - pmtools = throw "'pmtools' has been renamed to/replaced by 'acpica-tools'"; # Converted to throw 2022-02-22 - pocketsphinx = throw "pocketsphinx has been removed: unmaintained"; # Added 2022-04-24 - polarssl = throw "'polarssl' has been renamed to/replaced by 'mbedtls'"; # Converted to throw 2022-02-22 - polymc = throw "PolyMC has been removed from nixpkgs due to a hostile takeover by a rogue maintainer. The rest of the maintainers have made a fork which is packaged as 'prismlauncher'"; # Added 2022-10-18 - polysh = throw "polysh has been removed from nixpkgs as the upstream has abandoned the project"; # Added 2022-01-01 pomotroid = throw "pomotroid has been removed from nixpkgs, because it depended on an insecure version of electron"; # Added 2023-09-12 - pond = throw "pond has been dropped due to the lack of maintenance from upstream since 2016"; # Added 2022-06-02 - poppler_qt5 = throw "'poppler_qt5' has been renamed to/replaced by 'libsForQt5.poppler'"; # Converted to throw 2022-02-22 powerdns = pdns; # Added 2022-03-28 - portaudio2014 = throw "'portaudio2014' has been removed"; # Added 2022-05-10 - - # postgresql - postgresql96 = postgresql_9_6; - postgresql_9_6 = throw "postgresql_9_6 has been removed from nixpkgs, as this version is no longer supported by upstream"; # Added 2021-12-03 - postgresql_10 = throw "postgresql_10 has been removed from nixpkgs, as this version went EOL on 2022-11-10"; # Added 2022-08-01 # postgresql plugins cstore_fdw = postgresqlPackages.cstore_fdw; @@ -1440,10 +654,7 @@ mapAliases ({ pgtap = postgresqlPackages.pgtap; plv8 = postgresqlPackages.plv8; postgis = postgresqlPackages.postgis; - tilp2 = throw "tilp2 has been removed"; # Added 2022-01-15 - timekeeper = throw "timekeeper has been removed"; # Added 2022-01-16 timescaledb = postgresqlPackages.timescaledb; - tlauncher = throw "tlauncher has been removed because there questionable practices and legality concerns"; tsearch_extras = postgresqlPackages.tsearch_extras; pinentry_curses = throw "'pinentry_curses' has been renamed to/replaced by 'pinentry-curses'"; # Converted to throw 2023-09-10 @@ -1452,142 +663,58 @@ mapAliases ({ pinentry_gtk2 = throw "'pinentry_gtk2' has been renamed to/replaced by 'pinentry-gtk2'"; # Converted to throw 2023-09-10 pinentry_qt = throw "'pinentry_qt' has been renamed to/replaced by 'pinentry-qt'"; # Converted to throw 2023-09-10 pinentry_qt5 = pinentry-qt; # Added 2020-02-11 - prboom = throw "prboom was removed because it was abandoned by upstream, use prboom-plus instead"; # Added 2022-04-24 - privateer = throw "privateer was removed because it was broken"; # Added 2021-05-18 probe-rs-cli = throw "probe-rs-cli is now part of the probe-rs package"; # Added 2023-07-03 processing3 = throw "'processing3' has been renamed to/replaced by 'processing'"; # Converted to throw 2023-09-10 - procps-ng = throw "'procps-ng' has been renamed to/replaced by 'procps'"; # Converted to throw 2022-02-22 - proglodyte-wasm = throw "proglodyte-wasm has been removed from nixpkgs, because it is unmaintained since 5 years with zero github stars"; # Added 2021-06-30 - proj_5 = throw "Proj-5 has been removed from nixpkgs, use proj instead"; # Added 2021-04-12 - prometheus-cups-exporter = throw "outdated and broken by design; removed by developer"; # Added 2021-03-16 prometheus-dmarc-exporter = dmarc-metrics-exporter; # added 2022-05-31 - prometheus-mesos-exporter = throw "prometheus-mesos-exporter is deprecated and archived by upstream"; # Added 2022-04-05 - prometheus-unifi-exporter = throw "prometheus-unifi-exporter is deprecated and archived by upstream, use unifi-poller instead"; # Added 2022-06-03 prometheus-speedtest-exporter = throw "prometheus-speedtest-exporter was removed as unmaintained"; # Added 2023-07-31 - protobuf3_7 = throw "protobuf3_7 does not receive updates anymore and has been removed"; # Added 2022-10-03 - protobuf3_11 = throw "protobuf3_11 does not receive updates anymore and has been removed"; # Added 2022-09-28 protobuf3_17 = throw "protobuf3_17 does not receive updates anymore and has been removed"; # Added 2023-05-21 + protobuf3_19 = throw "protobuf3_19 does not receive updates anymore and has been removed"; # Added 2023-10-01 protonup = protonup-ng; # Added 2022-11-06 proxmark3-rrg = proxmark3; # Added 2023-07-25 proxmark3-unstable = throw "removed in favor of rfidresearchgroup fork"; # Added 2023-07-25 - proxytunnel = throw "proxytunnel has been removed from nixpkgs, because it has not been update upstream since it was added to nixpkgs in 2008 and has therefore bitrotted."; # added 2021-12-15 - pulseaudio-hsphfpd = throw "pulseaudio-hsphfpd upstream has been abandoned"; # Added 2022-03-23 - pulseaudio-modules-bt = throw "pulseaudio-modules-bt has been abandoned, and is superseded by pulseaudio's native bt functionality"; # Added 2022-04-01 - pulseaudioLight = throw "'pulseaudioLight' has been renamed to/replaced by 'pulseaudio'"; # Converted to throw 2022-02-22 - pulseeffects = throw "Use pulseeffects-legacy if you use PulseAudio and easyeffects if you use PipeWire"; # Added 2021-02-13 - pulseeffects-pw = easyeffects; # Added 2021-07-07 pyls-black = throw "pyls-black has been removed from nixpkgs. Use python-lsp-black instead."; # Added 2023-01-09 pyls-mypy = throw "pyls-mypy has been removed from nixpkgs. Use pylsp-mypy instead."; # Added 2023-01-09 - py-wmi-client = throw "py-wmi-client has been removed: abandoned by upstream"; # Added 2022-04-26 - pydb = throw "pydb has been removed: abandoned by upstream"; # Added 2022-04-22 - pyIRCt = throw "pyIRCt has been removed from nixpkgs as it is unmaintained and python2-only"; - pyMAILt = throw "pyMAILt has been removed from nixpkgs as it is unmaintained and python2-only"; - pybind11 = throw "pybind11 was removed because pythonPackages.pybind11 for the appropriate version of Python should be used"; # Added 2021-05-14 - pybitmessage = throw "pybitmessage was removed from nixpkgs as it is stuck on python2"; # Added 2022-01-01 - pyext = throw "pyext was removed because it does not support python 3.11, is upstream unmaintained and was unused"; # Added 2022-11-21 pygmentex = throw "'pygmentex' has been renamed to/replaced by 'texlive.bin.pygmentex'"; # Converted to throw 2023-09-10 - pyload = throw "pyload has been removed from nixpkgs. Use pyload-ng instead."; # Added 2021-03-21 - pynagsystemd = throw "pynagsystemd was removed as it was unmaintained and incompatible with recent systemd versions. Instead use its fork check_systemd"; # Added 2020-10-24 pyo3-pack = maturin; pypi2nix = throw "pypi2nix has been removed due to being unmaintained"; pypolicyd-spf = spf-engine; # Added 2022-10-09 - pyrex = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2"; # Added 2022-01-12 - pyrex095 = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2"; # Added 2022-01-12 - pyrex096 = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2"; # Added 2022-01-12 - pyrit = throw "pyrit has been removed from nixpkgs as the project is still stuck on python2"; # Added 2022-01-01 python = python2; # Added 2022-01-11 python-language-server = throw "python-language-server has been removed as it is no longer maintained. Use e.g. python-lsp-server instead"; # Added 2023-01-07 python-swiftclient = swiftclient; # Added 2021-09-09 - python2nix = throw "python2nix has been removed as it is outdated. Use e.g. nixpkgs-pytools instead"; # Added 2021-03-08 pythonFull = python2Full; # Added 2022-01-11 pythonPackages = python.pkgs; # Added 2022-01-11 ### Q ### - QmidiNet = throw "'QmidiNet' has been renamed to/replaced by 'qmidinet'"; # Converted to throw 2022-02-22 - qca-qt5 = throw "'qca-qt5' has been renamed to/replaced by 'libsForQt5.qca-qt5'"; # Converted to throw 2022-02-22 - qca2 = throw "qca2 has been removed, because it depended on qt4"; # Added 2022-05-26 qcsxcad = libsForQt5.qcsxcad; # Added 2020-11-05 qtcreator-qt6 = throw "'qtcreator-qt6' has been renamed to/replaced by 'qtcreator', since qt5 version has been removed"; # Added 2023-07-25 qflipper = qFlipper; # Added 2022-02-11 - qfsm = throw "qfsm has been removed, because it depended on qt4"; # Added 2022-06-12 - qimageblitz = throw "qimageblitz has been removed from nixpkgs, because it depended on qt4 and was last updated upstream in 2007"; # Added 2022-06-12 - qmetro = throw "qmetro has been removed, because it does not support qt5 (well)"; # Added 2022-05-26 - qmidiroute = throw "qmidiroute has been removed, because it was unmaintained upstream"; # Added 2022-05-26 - qmk_firmware = throw "qmk_firmware has been removed because it was broken"; # Added 2021-04-02 qlandkartegt = throw "'qlandkartegt' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-04-17 - qr-filetransfer = throw ''"qr-filetransfer" has been renamed to "qrcp"''; # Added 2020-12-02 - qshowdiff = throw "'qshowdiff' (Qt4) is unmaintained and not been updated since its addition in 2010"; # Added 2022-06-14 - qtscrobbler = throw "qtscrobbler has been removed, because it was unmaintained"; # Added 2022-05-26 - qt-3 = throw "qt-3 has been removed from nixpkgs, as it's unmaintained and insecure"; # Added 2021-02-15 - qt512 = throw "Qt 5 versions prior to 5.15 are no longer supported upstream and have been removed"; # Added 2022-11-24 - qt514 = throw "Qt 5 versions prior to 5.15 are no longer supported upstream and have been removed"; # Added 2022-11-24 + qscintilla = libsForQt5.qscintilla; # Added 2023-09-20 + qscintilla-qt6 = qt6Packages.qscintilla; # Added 2023-09-20 qt515 = qt5; # Added 2022-11-24 - qt4 = throw "qt4 has been removed from nixpkgs, because it's been EOL since the end of 2015"; # Added 2022-05-09 qt5ct = libsForQt5.qt5ct; # Added 2021-12-27 qt6ct = qt6Packages.qt6ct; # Added 2023-03-07 qtcurve = libsForQt5.qtcurve; # Added 2020-11-07 qtile-unwrapped = python3.pkgs.qtile; # Added 2023-05-12 - qtkeychain = throw "the qtkeychain attribute (qt4 version) has been removes, use the qt5 version: libsForQt5.qtkeychain"; # Added 2021-08-04 - qt-mobility = throw "qt-mobility has been removed, because it depended on qt4"; # Added 2022-06-13 - qtscriptgenerator = throw "'qtscriptgenerator' (Qt4) is unmaintained upstream and not used in nixpkgs"; # Added 2022-06-14 - qtstyleplugin-kvantum-qt4 = throw "qtstyleplugin-kvantum-qt4 has been removed, because it depended on qt4"; # Added 2022-05-26 - quagga = throw "quagga is no longer maintained upstream"; # Added 2021-04-22 - quake3game = throw "'quake3game' has been renamed to/replaced by 'ioquake3'"; # Converted to throw 2022-02-22 - quaternion-git = throw "quaternion-git has been removed in favor of the stable version 'quaternion'"; # Added 2020-04-09 - qucs = throw "qucs has been removed, because it depended on qt4. try using qucs-s"; # Added 2022-05-12 - quilter = throw "quilter has been removed from nixpkgs, as it was unmaintained"; # Added 2021-08-03 qutebrowser-qt6 = throw "'qutebrowser-qt6' has been replaced by 'qutebrowser', since the the qt5 version has been removed"; # Added 2023-08-19 - qvim = throw "qvim has been removed"; # Added 2020-08-31 - qweechat = throw "qweechat has been removed because it was broken"; # Added 2021-03-08 - qwt6 = throw "'qwt6' has been renamed to/replaced by 'libsForQt5.qwt'"; # Converted to throw 2022-02-22 ### R ### radare2-cutter = cutter; # Added 2021-03-30 - railcar = throw "'railcar' has been removed, as the upstream project has been abandoned"; # Added 2022-06-27 rambox-pro = rambox; # Added 2022-12-12 rarian = throw "rarian has been removed as unused"; # Added 2023-07-05 - raspberrypi-tools = throw "raspberrypi-tools has been removed in favor of identical 'libraspberrypi'"; # Added 2020-12-24 - rawdog = throw "rawdog has been removed from nixpkgs as it still requires python2"; # Added 2022-01-01 - rdiff_backup = throw "'rdiff_backup' has been renamed to/replaced by 'rdiff-backup'"; # Converted to throw 2022-02-22 - rdmd = throw "'rdmd' has been renamed to/replaced by 'dtools'"; # Converted to throw 2022-02-22 - readline5 = throw "readline-5 is no longer supported in nixpkgs, please use 'readline' for main supported version"; # Added 2022-02-20 - readline62 = throw "readline-6.2 is no longer supported in nixpkgs, please use 'readline' for main supported version"; # Added 2022-02-20 - readline80 = throw "readline-8.0 is no longer supported in nixpkgs, please use 'readline' for main supported version"; # Added 2021-04-22 - redkite = throw "redkite was archived by upstream"; # Added 2021-04-12 - redis-desktop-manager = throw "'redis-desktop-manager' has been renamed to/replaced by 'resp-app'"; # Added 2022-11-10 - redshift-wlr = throw "redshift-wlr has been replaced by gammastep"; # Added 2021-12-25 - resim = throw "resim has been removed, because it depended on qt4"; # Added 2022-05-26 - reicast = throw "reicast has been removed from nixpkgs as it is unmaintained, please use flycast instead"; # Added 2022-03-07 - residualvm = throw "residualvm was merged to scummvm code in 2018-06-15; consider using scummvm"; # Added 2021-11-27 - retroArchCores = throw "retroArchCores has been removed. Please use overrides instead, e.g.: `retroarch.override { cores = with libretro; [ ... ]; }`"; # Added 2021-11-19 retroshare06 = retroshare; - rfkill = throw "rfkill has been removed, as it's included in util-linux"; # Added 2020-08-23 - riak = throw "riak has been removed due to lack of maintainer to update the package"; # Added 2022-06-22 - riak-cs = throw "riak-cs is not maintained anymore"; # Added 2020-10-14 rigsofrods = rigsofrods-bin; # Added 2023-03-22 - rimshot = throw "rimshot has been removed, because it is broken and no longer maintained upstream"; # Added 2022-01-15 ring-daemon = jami-daemon; # Added 2021-10-26 - rkt = throw "rkt was archived by upstream"; # Added 2020-05-16 - rls = throw "rls was discontinued upstream, use rust-analyzer instead"; # Added 2022-09-06 - rng_tools = throw "'rng_tools' has been renamed to/replaced by 'rng-tools'"; # Converted to throw 2022-02-22 - robomongo = throw "'robomongo' has been renamed to/replaced by 'robo3t'"; # Converted to throw 2022-02-22 rockbox_utility = rockbox-utility; # Added 2022-03-17 - rocm-runtime-ext = throw "rocm-runtime-ext has been removed, since its functionality was added to rocm-runtime"; #added 2020-08-21 + rome = throw "rome is no longer maintained, consider using biome instead"; # Added 2023-09-12 rpiboot-unstable = rpiboot; # Added 2021-07-30 rr-unstable = rr; # Added 2022-09-17 - rssglx = throw "'rssglx' has been renamed to/replaced by 'rss-glx'"; # Converted to throw 2022-02-22 - rssh = throw "rssh has been removed from nixpkgs: no upstream releases since 2012, several known CVEs"; # Added 2020-08-25 rtl8723bs-firmware = throw "rtl8723bs-firmware was added in mainline kernel version 4.12"; # Added 2023-07-03 - rtv = throw "rtv was archived by upstream. Consider using tuir, an actively maintained fork"; # Added 2021-08-08 rtsp-simple-server = throw "rtsp-simple-server is rebranded as mediamtx, including default config path update"; # Added 2023-04-11 - rubyMinimal = throw "rubyMinimal was removed due to being unused"; runCommandNoCC = runCommand; runCommandNoCCLocal = runCommandLocal; - runwayml = throw "runwayml is now a webapp"; # Added 2021-04-17 - rustracerd = throw "rustracerd has been removed because it is broken and unmaintained"; # Added 2021-10-19 - rustracer = throw "rustracer has been removed as it has been deprecated"; # Added 2022-11-28 rxvt_unicode = rxvt-unicode-unwrapped; # Added 2020-02-02 rxvt_unicode-with-plugins = rxvt-unicode; # Added 2020-02-02 @@ -1599,59 +726,21 @@ mapAliases ({ ### S ### s2n = s2n-tls; # Added 2021-03-03 - s3gof3r = throw "s3gof3r has been dropped due to the lack of maintenance from upstream since 2017"; # Added 2022-06-04 - s6Dns = throw "'s6Dns' has been renamed to/replaced by 's6-dns'"; # Converted to throw 2022-02-22 - s6LinuxUtils = throw "'s6LinuxUtils' has been renamed to/replaced by 's6-linux-utils'"; # Converted to throw 2022-02-22 - s6Networking = throw "'s6Networking' has been renamed to/replaced by 's6-networking'"; # Converted to throw 2022-02-22 - s6PortableUtils = throw "'s6PortableUtils' has been renamed to/replaced by 's6-portable-utils'"; # Converted to throw 2022-02-22 - sagemath = throw "'sagemath' has been renamed to/replaced by 'sage'"; # Converted to throw 2022-02-22 - salut_a_toi = throw "salut_a_toi was removed because it was broken and used Python 2"; # added 2022-06-05 - sam = throw "'sam' has been renamed to/replaced by 'deadpixi-sam'"; # Converted to throw 2022-02-22 - samsungUnifiedLinuxDriver = throw "'samsungUnifiedLinuxDriver' has been renamed to/replaced by 'samsung-unified-linux-driver'"; # Converted to throw 2022-02-22 sane-backends-git = sane-backends; # Added 2021-02-19 - saneBackends = throw "'saneBackends' has been renamed to/replaced by 'sane-backends'"; # Converted to throw 2022-02-22 - saneBackendsGit = throw "'saneBackendsGit' has been renamed to/replaced by 'sane-backends'"; # Converted to throw 2022-02-22 - saneFrontends = throw "'saneFrontends' has been renamed to/replaced by 'sane-frontends'"; # Converted to throw 2022-02-22 - scaff = throw "scaff is deprecated - replaced by https://gitlab.com/jD91mZM2/inc (not in nixpkgs yet)"; # Added 2020-03-01 - scallion = throw "scallion has been removed, because it is currently unmaintained upstream"; # added 2021-12-15 scantailor = scantailor-advanced; # Added 2022-05-26 - scim = throw "'scim' has been renamed to/replaced by 'sc-im'"; # Converted to throw 2022-02-22 - scollector = throw "'scollector' has been renamed to/replaced by 'bosun'"; # Converted to throw 2022-02-22 - screencloud = throw "screencloud has been removed, because it was unmaintained in nixpkgs"; # Added 2022-05-26 - scribus_1_4 = throw "scribus has been removed, because it is based on EOL technologies, e.g. qt4 and python2"; # Added 2022-05-29 - scribusUnstable = throw "'scribusUnstable' has been renamed to 'scribus'"; # Added 2022-05-13 - scrollkeeper = throw "'scrollkeeper' has been removed due to deprecated LibXML2 headers"; # Added 2022-11-08 - scyther = throw "scyther has been removed since it currently only supports Python 2, see https://github.com/cascremers/scyther/issues/20"; # Added 2021-10-07 sdlmame = throw "'sdlmame' has been renamed to/replaced by 'mame'"; # Converted to throw 2023-09-10 - seeks = throw "seeks has been removed from nixpkgs, as it was unmaintained"; # Added 2020-06-21 - sepolgen = throw "sepolgen was merged into selinux-python"; # Added 2021-11-11 session-desktop-appimage = session-desktop; sequoia = sequoia-sq; # Added 2023-06-26 sexp = sexpp; # Added 2023-07-03 sget = throw "sget has been removed from nixpkgs, as it is not supported upstream anymore see https://github.com/sigstore/sget/issues/145"; # Added 2023-05-26 - shared_mime_info = throw "'shared_mime_info' has been renamed to/replaced by 'shared-mime-info'"; # Converted to throw 2022-02-22 inherit (libsForQt5.mauiPackages) shelf; # added 2022-05-17 - shellinabox = throw "shellinabox has been removed from nixpkgs, as it was unmaintained upstream"; # Added 2021-12-15 shhgit = throw "shhgit is broken and is no longer maintained. See https://github.com/eth0izzle/shhgit#-shhgit-is-no-longer-maintained-" ; # Added 2023-08-08 shipyard = jumppad; # Added 2023-06-06 - sickbeard = throw "sickbeard has been removed from nixpkgs, as it was unmaintained"; # Added 2022-01-01 - sickrage = throw "sickbeard has been removed from nixpkgs, as it was unmaintained"; # Added 2022-01-01 signumone-ks = throw "signumone-ks has been removed from nixpkgs because the developers stopped offering the binaries"; # Added 2023-08-17 - sigurlx = throw "sigurlx has been removed (upstream is gone)"; # Added 2022-01-24 - skrooge2 = throw "'skrooge2' has been renamed to/replaced by 'skrooge'"; # Converted to throw 2022-02-22 - skype = throw "'skype' has been renamed to/replaced by 'skypeforlinux'"; # Converted to throw 2022-02-22 - skype4pidgin = throw "skype4pidgin has been remove from nixpkgs, because it stopped working when classic Skype was retired"; # Added 2021-07-14 - skype_call_recorder = throw "skype_call_recorder has been removed from nixpkgs, because it stopped working when classic Skype was retired"; # Added 2020-10-31 slack-dark = slack; # Added 2020-03-27 - sleepyhead = throw "'sleepyhead' has been renamed to/replaced by 'OSCAR'"; # Added 2022-11-20 - slic3r-prusa3d = throw "'slic3r-prusa3d' has been renamed to/replaced by 'prusa-slicer'"; # Converted to throw 2022-02-22 slmenu = throw "slmenu has been removed (upstream is gone)"; # Added 2023-04-06 - slurm-full = throw "'slurm-full' has been renamed to/replaced by 'slurm'"; # Converted to throw 2022-02-22 slurm-llnl = slurm; # renamed July 2017 - slurm-llnl-full = slurm-full; # renamed July 2017 - smbclient = throw "'smbclient' has been renamed to/replaced by 'samba'"; # Converted to throw 2022-02-22 - smugline = throw "smugline has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries"; # Added 2020-11-04 - snack = throw "snack has been removed: broken for 5+ years"; # Added 2022-04-21 + smesh = throw "'smesh' has been removed as it's unmaintained and depends on opencascade-oce, which is also unmaintained"; # Added 2023-09-18 soldat-unstable = opensoldat; # Added 2022-07-02 solr_8 = throw "'solr' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-03-16 solr = throw "'solr' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-03-16 @@ -1682,136 +771,43 @@ mapAliases ({ source-han-serif-simplified-chinese = source-han-serif; source-han-serif-traditional-chinese = source-han-serif; - sourcetrail = throw "sourcetrail has been removed: abandoned by upstream"; # Added 2022-08-14 spacegun = throw "'spacegun' has been removed as unmaintained"; # Added 2023-05-20 - spaceOrbit = throw "'spaceOrbit' has been renamed to/replaced by 'space-orbit'"; # Converted to throw 2022-02-22 spectral = neochat; # Added 2020-12-27 - speech_tools = throw "'speech_tools' has been renamed to/replaced by 'speech-tools'"; # Converted to throw 2022-02-22 - speedometer = throw "speedometer has been removed: abandoned by upstream"; # Added 2022-04-24 - speedtest_cli = throw "'speedtest_cli' has been renamed to/replaced by 'speedtest-cli'"; # Converted to throw 2022-02-22 speedtest-exporter = throw "'speedtest-exporter' has been removed as unmaintained"; # Added 2023-07-31 - sphinxbase = throw "sphinxbase has been removed: unmaintained"; # Added 2022-04-24 spice-gtk_libsoup2 = throw "'spice-gtk_libsoup2' has been renamed to/replaced by 'spice-gtk'"; # Added 2023-02-21 - spice_gtk = throw "'spice_gtk' has been renamed to/replaced by 'spice-gtk'"; # Converted to throw 2022-02-22 - spice_protocol = throw "'spice_protocol' has been renamed to/replaced by 'spice-protocol'"; # Converted to throw 2022-02-22 - spidermonkey_1_8_5 = throw "spidermonkey_1_8_5 has been removed, because it is based on Firefox 4.0 from 2011"; # added 2021-05-03 - spidermonkey_38 = throw "spidermonkey_38 has been removed. Please use spidermonkey_78 instead"; # Added 2021-03-21 - spidermonkey_60 = throw "spidermonkey_60 has been removed. Please use spidermonkey_78 instead"; # Added 2021-03-21 - spidermonkey_68 = throw "spidermonkey_68 has been removed. Please use spidermonkey_91 instead"; # added 2022-01-04 # spidermonkey is not ABI upwards-compatible, so only allow this for nix-shell spidermonkey = spidermonkey_78; # Added 2020-10-09 - split2flac = throw "split2flac has been removed. Consider using the shnsplit command from shntool package or help packaging unflac."; # added 2022-01-13 spotify-unwrapped = spotify; # added 2022-11-06 spring-boot = spring-boot-cli; # added 2020-04-24 - sqlite3_analyzer = throw "'sqlite3_analyzer' has been renamed to/replaced by 'sqlite-analyzer'"; # Converted to throw 2022-02-22 - sqlite-replication = throw "'sqlite-replication' has been removed since it is no longer required by lxd and is not maintained."; # throw 2022-12-26 - sqliteInteractive = throw "'sqliteInteractive' has been renamed to/replaced by 'sqlite-interactive'"; # Converted to throw 2022-02-22 - sqliteman = throw "sqliteman has been removed, because it was unmaintained"; # Added 2022-05-26 squid4 = throw "'squid4' has been renamed to/replaced by 'squid'"; # Converted to throw 2023-09-10 - srcml = throw "'srcml' has been removed: abandoned by upstream"; # Added 2022-07-21 - sshfsFuse = throw "'sshfsFuse' has been renamed to/replaced by 'sshfs-fuse'"; # Converted to throw 2022-02-22 - ssmtp = throw "'ssmtp' has been removed due to the software being unmaintained. 'msmtp' can be used as a replacement"; # Added 2022-04-17 - ssr = throw "ssr has been removed, because it was unmaintained in nixpkgs and depended on qt4"; # Added 2022-05-26 - stanchion = throw "Stanchion was part of riak-cs which is not maintained anymore"; # added 2020-10-14 + starboard-octant-plugin = throw "starboard-octant-plugin has been dropped due to needing octant which is archived"; # Added 2023-09-29 steam-run-native = steam-run; # added 2022-02-21 - stride = throw "'stride' aka. Atlassian Stride is dead since 2019 (bought by Slack)"; # added 2022-06-15 - structure-synth = throw "structure-synth has been removed, because it was unmaintained"; # Added 2022-05-09 - stumpwm-git = throw "stumpwm-git has been broken for a long time and lispPackages.stumpwm follows Quicklisp that is close to git version"; # Added 2021-05-09 - subversion_1_10 = throw "subversion_1_10 has been removed as it has reached its end of life"; # Added 2022-04-26 - subversion19 = throw "subversion19 has been removed as it has reached its end of life"; # Added 2021-03-31 - sudolikeaboss = throw "sudolikeaboss is no longer maintained by upstream"; # Added 2022-04-16 sumneko-lua-language-server = lua-language-server; # Added 2023-02-07 - sundials_3 = throw "sundials_3 was removed in 2020-02. outdated and no longer needed"; - surf-webkit2 = throw "'surf-webkit2' has been renamed to/replaced by 'surf'"; # Converted to throw 2022-02-22 - swec = throw "swec has been removed; broken and abandoned upstream"; # Added 2021-10-14 - sweep-visualizer = throw "'sweep-visualizer' is abondoned upstream and depends on deprecated GNOME2/GTK2"; # Added 2022-06-15 swift-im = throw "swift-im has been removed as it is unmaintained and depends on deprecated Python 2 / Qt WebKit"; # Added 2023-01-06 - swfdec = throw "swfdec has been removed as broken and unmaintained"; # Added 2020-08-23 swtpm-tpm2 = swtpm; # Added 2021-02-26 syncthing-cli = syncthing; # Added 2021-04-06 - synology-drive = throw "synology-drive has been superseded by synology-drive-client"; # Added 2021-11-26 - system_config_printer = throw "'system_config_printer' has been renamed to/replaced by 'system-config-printer'"; # Converted to throw 2022-02-22 - systemd-cryptsetup-generator = throw "systemd-cryptsetup-generator is now included in the systemd package"; # Added 2020-07-12 - systemd_with_lvm2 = throw "systemd_with_lvm2 is obsolete, enabled by default via the lvm module"; # Added 2020-07-12 - systool = throw "'systool' has been renamed to/replaced by 'sysfsutils'"; # Converted to throw 2022-02-22 ### T ### - tahoelafs = throw "'tahoelafs' has been renamed to/replaced by 'tahoe-lafs'"; # Converted to throw 2022-02-22 tangogps = foxtrotgps; # Added 2020-01-26 taplo-cli = taplo; # Added 2022-07-30 taplo-lsp = taplo; # Added 2022-07-30 taro = taproot-assets; # Added 2023-07-04 tdesktop = telegram-desktop; # Added 2023-04-07 - tdm = throw "tdm has been removed because nobody can figure out how to fix OpenAL integration. Use precompiled binary and `steam-run` instead"; - teleconsole = throw "teleconsole is archived by upstream"; # Added 2022-04-05 telegram-cli = throw "telegram-cli was removed because it was broken and abandoned upstream"; # Added 2023-07-28 - telepathy-qt = throw "telepathy-qt no longer supports Qt 4. Please use libsForQt5.telepathy instead"; # Added 2020-07-02 - telepathy_farstream = throw "'telepathy_farstream' has been renamed to/replaced by 'telepathy-farstream'"; # Converted to throw 2022-02-22 - telepathy_gabble = throw "'telepathy_gabble' has been renamed to/replaced by 'telepathy-gabble'"; # Converted to throw 2022-02-22 - telepathy_glib = throw "'telepathy_glib' has been renamed to/replaced by 'telepathy-glib'"; # Converted to throw 2022-02-22 - telepathy_haze = throw "'telepathy_haze' has been renamed to/replaced by 'telepathy-haze'"; # Converted to throw 2022-02-22 - telepathy_idle = throw "'telepathy_idle' has been renamed to/replaced by 'telepathy-idle'"; # Converted to throw 2022-02-22 - telepathy_logger = throw "'telepathy_logger' has been renamed to/replaced by 'telepathy-logger'"; # Converted to throw 2022-02-22 - telepathy_mission_control = throw "'telepathy_mission_control' has been renamed to/replaced by 'telepathy-mission-control'"; # Converted to throw 2022-02-22 - telepathy_qt = throw "'telepathy_qt' has been renamed to/replaced by 'telepathy-qt'"; # Converted to throw 2022-02-22 - telepathy_qt5 = throw "'telepathy_qt5' has been renamed to/replaced by 'libsForQt5.telepathy'"; # Converted to throw 2022-02-22 - telnet = throw "'telnet' has been renamed to/replaced by 'inetutils'"; # Converted to throw 2022-02-22 - terminus = throw "terminus has been removed, it was unmaintained in nixpkgs"; # Added 2021-08-21 - termonad-with-packages = throw "termonad-with-packages has been renamed to just 'termonad'"; # Added 2022-10-15 - terraform-full = throw "terraform-full has been removed, it was an alias for 'terraform.full'"; # Added 2022-08-02 - terraform_0_13 = throw "terraform_0_13 has been removed from nixpkgs"; # Added 2022-06-26 - terraform_0_14 = throw "terraform_0_14 has been removed from nixpkgs"; # Added 2022-06-26 - terraform_0_15 = throw "terraform_0_15 has been removed from nixpkgs"; # Added 2022-06-26 - tesseract_4 = throw "'tesseract_4' has been renamed to/replaced by 'tesseract4'"; # Converted to throw 2022-02-22 testVersion = testers.testVersion; # Added 2022-04-20 invalidateFetcherByDrvHash = testers.invalidateFetcherByDrvHash; # Added 2022-05-05 - tex-gyre-bonum-math = throw "'tex-gyre-bonum-math' has been renamed to/replaced by 'tex-gyre-math.bonum'"; # Converted to throw 2022-02-22 - tex-gyre-pagella-math = throw "'tex-gyre-pagella-math' has been renamed to/replaced by 'tex-gyre-math.pagella'"; # Converted to throw 2022-02-22 - tex-gyre-schola-math = throw "'tex-gyre-schola-math' has been renamed to/replaced by 'tex-gyre-math.schola'"; # Converted to throw 2022-02-22 - tex-gyre-termes-math = throw "'tex-gyre-termes-math' has been renamed to/replaced by 'tex-gyre-math.termes'"; # Converted to throw 2022-02-22 - textadept11 = throw "textadept11 has been removed. Please use textadept instead"; # Added 2022-12-23 TODO: UPDATE THE DATE - tftp_hpa = throw "'tftp_hpa' has been renamed to/replaced by 'tftp-hpa'"; # Converted to throw 2022-02-22 - thunderbird-68 = throw "Thunderbird 68 reached end of life with its final release 68.12.0 on 2020-08-25"; - thunderbird-bin-68 = thunderbird-68; - thunderbird-wayland = thunderbird; # Added 2022-11-15 timescale-prometheus = promscale; # Added 2020-09-29 - timedoctor = throw "'timedoctor' has been removed from nixpkgs"; # Added 2022-10-09 - timetable = throw "timetable has been removed, as the upstream project has been abandoned"; # Added 2021-09-05 tinygltf = throw "TinyglTF has been embedded in draco due to lack of other users and compatibility breaks."; # Added 2023-06-25 tixati = throw "'tixati' has been removed from nixpkgs as it is unfree and unmaintained"; # Added 2023-03-17 tkcvs = tkrev; # Added 2022-03-07 - togglesg-download = throw "togglesg-download was removed 2021-04-30 as it's unmaintained"; # Added 2021-04-30 tokodon = plasma5Packages.tokodon; - tomboy = throw "tomboy is not actively developed anymore and was removed"; # Added 2022-01-27 - tomcat7 = throw "tomcat7 has been removed from nixpkgs as it has reached end of life"; # Added 2021-06-16 - tomcat8 = throw "tomcat8 has been removed from nixpkgs as it has reached end of life"; # Added 2021-06-16 - tomcat85 = throw "tomcat85 has been removed from nixpkgs as it has reached end of life"; # Added 2020-03-11 - tor-arm = throw "tor-arm has been removed from nixpkgs as the upstream project has been abandoned"; # Added 2022-01-01 - torbrowser = throw "'torbrowser' has been renamed to/replaced by 'tor-browser-bundle-bin'"; # Converted to throw 2022-02-22 - torch = throw "torch has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 - torch-hdf5 = throw "torch-hdf5 has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 - torch-repl = throw "torch-repl has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 - torchPackages = throw "torchPackages has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 - trang = throw "'trang' has been renamed to/replaced by 'jing-trang'"; # Converted to throw 2022-02-22 + tor-browser-bundle-bin = tor-browser; # Added 2023-09-23 transfig = fig2dev; # Added 2022-02-15 - transmission-remote-cli = throw "transmission-remote-cli has been removed, as the upstream project has been abandoned. Please use tremc instead"; # Added 2020-10-14 - transmission_gtk = throw "'transmission_gtk' has been renamed to/replaced by 'transmission-gtk'"; # Converted to throw 2022-02-22 - transmission_remote_gtk = throw "'transmission_remote_gtk' has been renamed to/replaced by 'transmission-remote-gtk'"; # Converted to throw 2022-02-22 - transporter = throw "transporter has been removed. It was archived upstream, so it's considered abandoned"; - trebleshot = throw "trebleshot has been removed. It was archived upstream, so it's considered abandoned"; - trilium = throw "trilium has been removed. Please use trilium-desktop instead"; # Added 2020-04-29 - truecrypt = throw "'truecrypt' has been renamed to/replaced by 'veracrypt'"; # Converted to throw 2022-02-22 trustedGrub = throw "trustedGrub has been removed, because it is not maintained upstream anymore"; # Added 2023-05-10 trustedGrub-for-HP = throw "trustedGrub-for-HP has been removed, because it is not maintained upstream anymore"; # Added 2023-05-10 - tuijam = throw "tuijam has been removed because Google Play Music was discontinued"; # Added 2021-03-07 - turbo-geth = throw "turbo-geth has been renamed to erigon"; # Added 2021-08-08 tvbrowser-bin = tvbrowser; # Added 2023-03-02 - twister = throw "twister has been removed: abandoned by upstream and python2-only"; # Added 2022-04-26 - tworld2 = throw "tworld2 has been removed, as it was unmaintained"; # Added 2022-05-09 - tychus = throw "tychus has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-03 - typora = throw "Newer versions of typora use anti-user encryption and refuse to start. As such it has been removed"; # Added 2021-09-11 typst-fmt = typstfmt; # Added 2023-07-15 ### U ### @@ -1819,16 +815,11 @@ mapAliases ({ uade123 = uade; # Added 2022-07-30 uberwriter = apostrophe; # Added 2020-04-23 ubootBeagleboneBlack = ubootAmx335xEVM; # Added 2020-01-21 - uchiwa = throw "uchiwa is deprecated and archived by upstream"; # Added 2022-05-02 - ucsFonts = throw "'ucsFonts' has been renamed to/replaced by 'ucs-fonts'"; # Converted to throw 2022-02-22 - ufraw = throw "ufraw is unmaintained and has been removed from nixpkgs. Its successor, nufraw, doesn't seem to be stable enough. Consider using Darktable for now"; # Added 2020-01-11 uhhyou.lv2 = throw "'uhhyou.lv2' has been removed, upstream gone"; # Added 2023-06-21 - ultrastardx-beta = throw "'ultrastardx-beta' has been renamed to/replaced by 'ultrastardx'"; # Converted to throw 2022-02-22 unicorn-emu = unicorn; # Added 2020-10-29 uniffi-bindgen = throw "uniffi-bindgen has been removed since upstream no longer provides a standalone package for the CLI"; unifi-poller = unpoller; # Added 2022-11-24 unifiStable = unifi6; # Added 2020-12-28 - unity3d = throw "'unity3d' is unmaintained, has seen no updates in years and depends on deprecated GTK2"; # Added 2022-06-16 untrunc = untrunc-anthwlock; # Added 2021-02-01 urxvt_autocomplete_all_the_things = rxvt-unicode-plugins.autocomplete-all-the-things; # Added 2020-02-02 urxvt_bidi = rxvt-unicode-plugins.bidi; # Added 2020-02-02 @@ -1838,50 +829,32 @@ mapAliases ({ urxvt_tabbedex = rxvt-unicode-plugins.tabbedex; # Added 2020-02-02 urxvt_theme_switch = rxvt-unicode-plugins.theme-switch; # Added 2020-02-02 urxvt_vtwheel = rxvt-unicode-plugins.vtwheel; # Added 2020-02-02 - usb_modeswitch = throw "'usb_modeswitch' has been renamed to/replaced by 'usb-modeswitch'"; # Converted to throw 2022-02-22 usbguard-nox = throw "'usbguard-nox' has been renamed to/replaced by 'usbguard'"; # Converted to throw 2023-09-10 + utahfs = throw "utahfs has been removed, as it is broken and lack of maintenance from upstream"; # Added 2023-09-29 util-linuxCurses = util-linux; # Added 2022-04-12 utillinux = util-linux; # Added 2020-11-24 ### V ### v4l_utils = throw "'v4l_utils' has been renamed to/replaced by 'v4l-utils'"; # Converted to throw 2023-09-10 - valkyrie = throw "valkyrie was removed from nixpkgs, because it is unmaintained upstream"; # Added 2022-05-10 vamp = { vampSDK = vamp-plugin-sdk; }; # Added 2020-03-26 vaapiIntel = intel-vaapi-driver; # Added 2023-05-31 - vapor = throw "vapor was removed because it was unmaintained and upstream service no longer exists"; - varnish62 = throw "varnish62 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release"; # Added 2021-07-26 - varnish63 = throw "varnish63 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release"; # Added 2021-07-26 - varnish65 = throw "varnish65 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release"; # Added 2021-09-15 - varnish70 = throw "varnish70 was removed from nixpkgs, because it was superseded upstream. Please switch to a different release"; # Added 2022-03-17 vaultwarden-vault = vaultwarden.webvault; # Added 2022-12-13 - varnish71 = throw "varnish71 was removed from nixpkgs, because it was superseded upstream. Please switch to a different release"; # Added 2022-11-08 vdirsyncerStable = vdirsyncer; # Added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168 ventoy-bin = ventoy; # Added 2023-04-12 ventoy-bin-full = ventoy-full; # Added 2023-04-12 - venus = throw "venus has been removed from nixpkgs, as it's unmaintained"; # Added 2021-02-05 - vgo2nix = throw "vgo2nix has been removed, because it was deprecated. Consider using gomod2nix instead"; # added 2022-08-24 ViennaRNA = viennarna; # Added 2023-08-23 vimHugeX = vim-full; # Added 2022-12-04 vim_configurable = vim-full; # Added 2022-12-04 - vimbWrapper = throw "'vimbWrapper' has been renamed to/replaced by 'vimb'"; # Converted to throw 2022-02-22 - virtinst = throw "virtinst has been removed, as it's included in virt-manager"; # Added 2021-07-21 - virtuoso = throw "virtuoso has been removed, because it was unmaintained in nixpkgs"; # added 2021-12-15 virtmanager = throw "'virtmanager' has been renamed to/replaced by 'virt-manager'"; # Converted to throw 2023-09-10 virtmanager-qt = throw "'virtmanager-qt' has been renamed to/replaced by 'virt-manager-qt'"; # Converted to throw 2023-09-10 - virtviewer = throw "'virtviewer' has been renamed to/replaced by 'virt-viewer'"; # Converted to throw 2022-02-22 vivaldi-widevine = throw "'vivaldi-widevine' has been renamed to/replaced by 'widevine-cdm'"; # Added 2023-02-25 vkBasalt = vkbasalt; # Added 2022-11-22 - vnc2flv = throw "vnc2flv has been removed: abandoned by upstream"; # Added 2022-03-21 - vorbisTools = throw "'vorbisTools' has been renamed to/replaced by 'vorbis-tools'"; # Converted to throw 2022-02-22 vte_290 = throw "'vte_290' has been renamed to/replaced by 'vte'"; # Added 2023-01-05 - vtun = throw "vtune has been removed as it's unmaintained upstream"; # Added 2021-10-29 inherit (libsForQt5.mauiPackages) vvave; # added 2022-05-17 ### W ### - wavesurfer = throw "wavesurfer has been removed: depended on snack which has been removed"; # Added 2022-04-21 waybar-hyprland = throw "waybar-hyprland has been removed: hyprland support is now built into waybar by default."; # Added 2023-08-21 - way-cooler = throw "way-cooler is abandoned by its author: https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"; # Added 2020-01-13 wayfireApplications-unwrapped = throw '' 'wayfireApplications-unwrapped.wayfire' has been renamed to/replaced by 'wayfire' 'wayfireApplications-unwrapped.wayfirePlugins' has been renamed to/replaced by 'wayfirePlugins' @@ -1889,75 +862,26 @@ mapAliases ({ 'wayfireApplications-unwrapped.wlroots' has been removed ''; # Add 2023-07-29 wcm = throw "'wcm' has been renamed to/replaced by 'wayfirePlugins.wcm'"; # Add 2023-07-29 - webbrowser = throw "webbrowser was removed because it's unmaintained upstream and was marked as broken in nixpkgs for over a year"; # Added 2022-03-21 - webkit = throw "'webkit' has been renamed to/replaced by 'webkitgtk'"; # Converted to throw 2022-02-22 webkitgtk_5_0 = throw "'webkitgtk_5_0' has been superseded by 'webkitgtk_6_0'"; # Added 2023-02-25 - weechat-matrix-bridge = throw "'weechat-matrix-bridge' has been renamed to/replaced by 'weechatScripts.weechat-matrix-bridge'"; # Converted to throw 2022-02-22 - weighttp = throw "weighttp has been removed: abandoned by upstream"; # Added 2022-04-20 - whirlpool-gui = throw "whirlpool-gui has been removed as it depended on an insecure version of Electron"; # added 2022-02-08 wio = throw "wio has been removed from nixpkgs, it was unmaintained and required wlroots_0_14 at the time of removal"; # Added 2023-04-28 - wicd = throw "wicd has been removed as it is abandoned"; # Added 2021-09-11 - wineFull = throw "'wineFull' has been renamed to/replaced by 'winePackages.full'"; # Converted to throw 2022-02-22 - wineMinimal = throw "'wineMinimal' has been renamed to/replaced by 'winePackages.minimal'"; # Converted to throw 2022-02-22 - wineStable = throw "'wineStable' has been renamed to/replaced by 'winePackages.stable'"; # Converted to throw 2022-02-22 - wineStaging = throw "'wineStaging' has been renamed to/replaced by 'wine-staging'"; # Converted to throw 2022-02-22 - wineUnstable = throw "'wineUnstable' has been renamed to/replaced by 'winePackages.unstable'"; # Converted to throw 2022-02-22 wineWayland = wine-wayland; win-qemu = throw "'win-qemu' has been replaced by 'win-virtio'"; # Added 2023-08-16 win-signed-gplpv-drivers = throw "win-signed-gplpv-drivers has been removed from nixpkgs, as it's unmaintained: https://help.univention.com/t/installing-signed-gplpv-drivers/21828"; # Added 2023-08-17 - winpdb = throw "winpdb has been removed: abandoned by upstream"; # Added 2022-04-22 - winusb = throw "'winusb' has been renamed to/replaced by 'woeusb'"; # Converted to throw 2022-02-22 - wireguard = throw "'wireguard' has been renamed to/replaced by 'wireguard-tools'"; # Converted to throw 2022-02-22 wlroots_0_14 = throw "'wlroots_0_14' has been removed in favor of newer versions"; # Added 2023-07-29 wormhole-rs = magic-wormhole-rs; # Added 2022-05-30. preserve, reason: Arch package name, main binary name wmii_hg = wmii; - wmc-mpris = throw "wmc-mpris has been abandoned by upstream due to its redundancy"; # Added 2022-11-13 - ws = throw "ws has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-03 - wxGTK = throw "wxGTK28 has been removed from nixpkgs as it has reached end of life"; # Added 2022-11-04 - wxGTK28 = throw "wxGTK28 has been removed from nixpkgs as it has reached end of life"; # Added 2022-11-04 - wxGTK29 = throw "wxGTK29 has been removed from nixpkgs as it has reached end of life"; # Added 2022-11-04 wxGTK30 = throw "wxGTK30 has been removed from nixpkgs as it has reached end of life"; # Added 2023-03-22 wxGTK30-gtk2 = wxGTK30; # Added 2022-12-03 wxGTK30-gtk3 = wxGTK30; # Added 2022-12-03 - wxGTK31-gtk2 = throw "'wxGTK31-gtk2' has been removed from nixpkgs as it depends on deprecated GTK2"; # Added 2022-10-27 - wxGTK31-gtk3 = throw "'wxGTK31-gtk3' has been renamed to/replaced by 'wxGTK31'"; # Added 2022-10-27 wxmac = wxGTK30; # Added 2023-03-22 - wxmupen64plus = throw "wxmupen64plus was removed because the upstream disappeared"; # Added 2022-01-31 - wxcam = throw "'wxcam' has seen no updates in ten years, crashes (SIGABRT) on startup and depends on deprecated wxGTK28/GNOME2/GTK2, use 'gnome.cheese'"; # Added 2022-06-15 ### X ### - x11 = throw "'x11' has been renamed to/replaced by its constituents"; # Converted to throw 2022-02-22 - xara = throw "xara has been removed from nixpkgs. Unmaintained since 2006"; # Added 2020-06-24 - xbmc = throw "'xbmc' has been renamed to/replaced by 'kodi'"; # Converted to throw 2022-02-22 xbmc-retroarch-advanced-launchers = kodi-retroarch-advanced-launchers; # Added 2021-11-19 - xbmcPlain = throw "'xbmcPlain' has been renamed to/replaced by 'kodiPlain'"; # Converted to throw 2022-02-22 - xbmcPlugins = throw "'xbmcPlugins' has been renamed to/replaced by 'kodiPackages'"; # Converted to throw 2022-02-22 xdg_utils = xdg-utils; # Added 2021-02-01 - xfce4-14 = throw "xfce4-14 has been removed, use xfce instead"; # added 2022-12-25 - xfceUnstable = throw "xfceUnstable has been removed, use xfce instead"; # added 2022-12-25 xineLib = xine-lib; # Added 2021-04-27 xineUI = xine-ui; # Added 2021-04-27 - xlibsWrapper = throw "'xlibsWrapper' has been replaced by its constituents"; # Converted to throw 2022-12-27 - xmonad_log_applet_gnome3 = throw "'xmonad_log_applet_gnome3' has been renamed to/replaced by 'xmonad_log_applet'"; # Converted to throw 2022-02-22 - xmpp-client = throw "xmpp-client has been dropped due to the lack of maintenance from upstream since 2017"; # Added 2022-06-02 - xmpppy = throw "xmpppy has been removed from nixpkgs as it is unmaintained and python2-only"; - xp-pen-g430 = throw "xp-pen-g430 has been renamed to xp-pen-g430-driver"; # Converted to throw 2022-06-23 - xpf = throw "xpf has been removed: abandoned by upstream"; # Added 2022-04-26 - xf86_video_nouveau = throw "'xf86_video_nouveau' has been renamed to/replaced by 'xorg.xf86videonouveau'"; # Converted to throw 2022-02-22 - xf86_input_mtrack = throw '' - xf86_input_mtrack has been removed from nixpkgs as it is broken and - unmaintained. Working alternatives are libinput and synaptics. - ''; - xf86_input_multitouch = throw "xf86_input_multitouch has been removed from nixpkgs"; # Added 2020-01-20 - xlibs = throw "'xlibs' has been renamed to/replaced by 'xorg'"; # Converted to throw 2022-02-22 - xow = throw ( - "Upstream has ended support for 'xow' and the package has been removed" + - "from nixpkgs. Users are urged to switch to 'xone'." - ); # Added 2022-08-02 - xpraGtk3 = throw "'xpraGtk3' has been renamed to/replaced by 'xpra'"; # Converted to throw 2022-02-22 xtrt = throw "xtrt has been removed due to being abandoned"; # Added 2023-05-25 - xvidcap = throw "'xvidcap' has been removed because of a broken dependency"; # Added 2022-11-08 xvfb_run = xvfb-run; # Added 2021-05-07 ### Y ### @@ -1965,90 +889,23 @@ mapAliases ({ yacc = bison; # moved from top-level 2021-03-14 yafaray-core = libyafaray; # Added 2022-09-23 yarn2nix-moretea-openssl_1_1 = throw "'yarn2nix-moretea-openssl_1_1' has been removed."; # Added 2023-02-04 - yarssr = throw "yarssr has been removed as part of the python2 deprecation"; # Added 2022-01-15 - youtubeDL = throw "'youtubeDL' has been renamed to/replaced by 'youtube-dl'"; # Converted to throw 2022-02-22 - ytop = throw "ytop has been abandoned by upstream. Consider switching to bottom instead"; - yubikey-neo-manager = throw "yubikey-neo-manager has been removed because it was broken. Use yubikey-manager-qt instead"; # Added 2021-03-08 - yubioath-desktop = throw "yubioath-desktop has been deprecated by upstream in favor of yubioath-flutter"; # Added 2022-11-22 yuzu-ea = yuzu-early-access; # Added 2022-08-18 yuzu = yuzu-mainline; # Added 2021-01-25 ### Z ### - zabbix30 = throw "Zabbix 3.0.x is end of life, see https://www.zabbix.com/documentation/5.0/manual/installation/upgrade/sources for a direct upgrade path to 5.0.x"; # Added 2021-04-07 - zdfmediathk = throw "'zdfmediathk' has been renamed to/replaced by 'mediathekview'"; # Converted to throw 2022-02-22 - zimreader = throw "zimreader has been removed from nixpkgs as it has been replaced by kiwix-serve and stopped working with modern zimlib versions"; # Added 2021-03-28 - zimwriterfs = throw "zimwriterfs is now part of zim-tools"; # Added 2022-06-10. zinc = zincsearch; # Added 2023-05-28 zq = zed.overrideAttrs (old: { meta = old.meta // { mainProgram = "zq"; }; }); # Added 2023-02-06 ### UNSORTED ### - ocamlPackages_latest = throw "'ocamlPackages_latest' has been renamed to/replaced by 'ocaml-ng.ocamlPackages_latest'"; # Converted to throw 2022-02-22 - - ocamlformat_0_11_0 = throw "ocamlformat_0_11_0 has been removed in favor of newer versions"; # Added 2022-06-01 - ocamlformat_0_12 = throw "ocamlformat_0_12 has been removed in favor of newer versions"; # Added 2022-06-01 - ocamlformat_0_13_0 = throw "ocamlformat_0_13_0 has been removed in favor of newer versions"; # Added 2022-06-01 - ocamlformat_0_14_0 = throw "ocamlformat_0_14_0 has been removed in favor of newer versions"; # Added 2022-06-01 - ocamlformat_0_14_1 = throw "ocamlformat_0_14_1 has been removed in favor of newer versions"; # Added 2022-06-01 - ocamlformat_0_14_2 = throw "ocamlformat_0_14_2 has been removed in favor of newer versions"; # Added 2022-06-01 - ocamlformat_0_14_3 = throw "ocamlformat_0_14_3 has been removed in favor of newer versions"; # Added 2022-06-01 - ocamlformat_0_15_0 = throw "ocamlformat_0_15_0 has been removed in favor of newer versions"; # Added 2022-06-01 - ocamlformat_0_15_1 = throw "ocamlformat_0_15_1 has been removed in favor of newer versions"; # Added 2022-06-01 - ocamlformat_0_16_0 = throw "ocamlformat_0_16_0 has been removed in favor of newer versions"; # Added 2022-06-01 - ocamlformat_0_17_0 = throw "ocamlformat_0_17_0 has been removed in favor of newer versions"; # Added 2022-06-01 - ocamlformat_0_18_0 = throw "ocamlformat_0_18_0 has been removed in favor of newer versions"; # Added 2022-06-01 - - zabbix44 = throw '' - Zabbix 4.4 is end of life. For details on upgrading to Zabbix 5.0 look at - https://www.zabbix.com/documentation/current/manual/installation/upgrade_notes_500 - ''; # Added 2020-08-17 - zeroc_ice = throw "'zeroc_ice' has been renamed to/replaced by 'zeroc-ice'"; # Converted to throw 2023-09-10 - # Added 2020-06-22 - zeromq3 = throw "zeromq3 has been deprecated by zeromq4"; - jzmq = throw "jzmq has been removed from nixpkgs, as it was unmaintained"; - - ant-dracula-theme = throw "ant-dracula-theme is now dracula-theme, and theme name is Dracula instead of Ant-Dracula"; dina-font-pcf = dina-font; # Added 2020-02-09 dnscrypt-proxy2 = dnscrypt-proxy; # Added 2023-02-02 - gcc-snapshot = throw "gcc-snapshot: Marked as broken for >2 years, additionally this 'snapshot' pointed to a fairly old one from gcc7"; gnatsd = throw "'gnatsd' has been renamed to/replaced by 'nats-server'"; # Converted to throw 2023-09-10 - obs-gstreamer = throw '' - obs-gstreamer has been converted into a plugin for use with wrapOBS. - Its new location is obs-studio-plugins.obs-gstreamer. - ''; # Added 2021-06-01 - - obs-move-transition = throw '' - obs-move-transition has been converted into a plugin for use with wrapOBS. - Its new location is obs-studio-plugins.obs-move-transition. - ''; # Added 2021-06-01 - - obs-multi-rtmp = throw '' - obs-multi-rtmp has been converted into a plugin for use with wrapOBS. - Its new location is obs-studio-plugins.obs-multi-rtmp. - ''; # Added 2021-06-01 - - obs-ndi = throw '' - obs-ndi has been converted into a plugin for use with wrapOBS. - Its new location is obs-studio-plugins.obs-ndi. - ''; # Added 2021-06-01 - - obs-v4l2sink = throw "obs-v4l2sink is integrated into upstream OBS since version 26.1"; # Added 2021-06-01 - - obs-wlrobs = throw '' - wlrobs has been converted into a plugin for use with wrapOBS. - Its new location is obs-studio-plugins.wlrobs. - ''; # Added 2021-06-01 - posix_man_pages = man-pages-posix; # Added 2021-04-15 - sqldeveloper_18 = throw "sqldeveloper_18 is not maintained anymore!"; # Added 2020-02-04 - todolist = throw "todolist is now ultralist"; # Added 2020-12-27 - tor-browser-bundle = throw "tor-browser-bundle was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead"; # Added 2020-01-10 - tor-browser-unwrapped = throw "tor-browser-unwrapped was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead"; # Added 2020-01-10 - torchat = throw "torchat was removed because it was broken and requires Python 2"; # added 2022-06-05 ttyrec = ovh-ttyrec; # Added 2021-01-02 zplugin = zinit; # Added 2021-01-30 zyn-fusion = zynaddsubfx; # Added 2022-08-05 @@ -2065,9 +922,6 @@ mapAliases ({ targetLlvm = targetPackages.llvmPackages_git.llvm or llvmPackages_git.llvm; }); - # Added 2022-01-28 - zeroc-ice-36 = throw "Unmaintained, doesn't build w/glibc-2.34"; - /* If these are in the scope of all-packages.nix, they cause collisions between mixed versions of qt. See: https://github.com/NixOS/nixpkgs/pull/101369 */ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 66e04b69fb523..c04f16cfb5dee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -126,6 +126,13 @@ with pkgs; common-updater-scripts = callPackage ../common-updater/scripts.nix { }; + # vimPluginsUpdater = callPackage ../applications/editors/vim/plugins/updater.nix { + # inherit (writers) writePython3Bin; + # }; + vimPluginsUpdater = callPackage ../applications/editors/vim/plugins/updater.nix { + inherit (python3Packages) buildPythonApplication ; + }; + genericUpdater = callPackage ../common-updater/generic-updater.nix { }; _experimental-update-script-combinators = callPackage ../common-updater/combinators.nix { }; @@ -274,8 +281,6 @@ with pkgs; asnmap = callPackage ../tools/security/asnmap { }; - ast-grep = callPackage ../development/tools/misc/ast-grep { }; - astrolog = callPackage ../applications/science/astronomy/astrolog { }; astronomer = callPackage ../tools/misc/astronomer { }; @@ -586,8 +591,8 @@ with pkgs; dinghy = with python3Packages; toPythonApplication dinghy; djgpp = djgpp_i586; - djgpp_i586 = callPackage ../development/compilers/djgpp { targetArchitecture = "i586"; }; - djgpp_i686 = lowPrio (callPackage ../development/compilers/djgpp { targetArchitecture = "i686"; }); + djgpp_i586 = callPackage ../development/compilers/djgpp { targetArchitecture = "i586"; stdenv = gccStdenv; }; + djgpp_i686 = lowPrio (callPackage ../development/compilers/djgpp { targetArchitecture = "i686"; stdenv = gccStdenv; }); djhtml = python3Packages.callPackage ../development/tools/djhtml { }; @@ -603,6 +608,8 @@ with pkgs; documenso = callPackage ../applications/office/documenso { }; + domine = callPackage ../tools/misc/domine { }; + dsq = callPackage ../tools/misc/dsq { }; dt = callPackage ../tools/text/dt { }; @@ -725,6 +732,11 @@ with pkgs; inherit (darwin) DarwinTools; }; + rtthost = callPackage ../development/tools/rust/rtthost { + inherit (darwin.apple_sdk.frameworks) AppKit; + inherit (darwin) DarwinTools; + }; + mix2nix = callPackage ../development/tools/mix2nix { }; n98-magerun = callPackage ../development/tools/misc/n98-magerun { }; @@ -1078,6 +1090,7 @@ with pkgs; antlr = antlr4_10; boost = boost177; # Configure checks for specific version. icu = icu69; + protobuf = protobuf3_21; }; broadlink-cli = callPackage ../tools/misc/broadlink-cli { }; @@ -1301,10 +1314,6 @@ with pkgs; ociTools = callPackage ../build-support/oci-tools { }; - octant = callPackage ../applications/networking/cluster/octant { }; - octant-desktop = callPackage ../applications/networking/cluster/octant/desktop.nix { }; - starboard-octant-plugin = callPackage ../applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix { }; - inherit ( callPackages ../build-support/setup-hooks/patch-rc-path-hooks { } ) patchRcPathBash patchRcPathCsh patchRcPathFish patchRcPathPosix; @@ -1913,6 +1922,8 @@ with pkgs; mkosi = python3Packages.callPackage ../tools/virtualization/mkosi { inherit systemd; }; + mkosi-full = mkosi.override { withQemu = true; }; + monica = callPackage ../servers/web-apps/monica { }; mpremote = python3Packages.callPackage ../tools/misc/mpremote { }; @@ -2981,8 +2992,6 @@ with pkgs; cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { }; - ctx = callPackage ../applications/terminal-emulators/ctx { }; - darklua = callPackage ../development/tools/darklua { }; darktile = callPackage ../applications/terminal-emulators/darktile { }; @@ -3331,6 +3340,8 @@ with pkgs; aliyun-cli = callPackage ../tools/admin/aliyun-cli { }; + aws-encryption-sdk-cli = callPackage ../tools/admin/aws-encryption-sdk-cli { }; + aws-iam-authenticator = callPackage ../tools/security/aws-iam-authenticator { }; awscli = callPackage ../tools/admin/awscli { }; @@ -3580,6 +3591,8 @@ with pkgs; callaudiod = callPackage ../applications/audio/callaudiod { }; + castopod = callPackage ../applications/audio/castopod { }; + calls = callPackage ../applications/networking/calls { }; castnow = callPackage ../tools/networking/castnow { }; @@ -4406,8 +4419,6 @@ with pkgs; bmon = callPackage ../tools/misc/bmon { }; - bmake = callPackage ../development/tools/build-managers/bmake { }; - boca = callPackage ../development/libraries/boca { }; bubblewrap = callPackage ../tools/admin/bubblewrap { }; @@ -5203,8 +5214,6 @@ with pkgs; ekam = callPackage ../development/tools/build-managers/ekam { }; - eksctl = callPackage ../tools/admin/eksctl { }; - electronplayer = callPackage ../applications/video/electronplayer/electronplayer.nix { }; electron-mail = callPackage ../applications/networking/mailreaders/electron-mail { }; @@ -5501,8 +5510,6 @@ with pkgs; go-neb = callPackage ../applications/networking/instant-messengers/go-neb { }; - go-thumbnailer = callPackage ../applications/misc/go-thumbnailer { }; - google-cursor = callPackage ../data/icons/google-cursor { }; geckodriver = callPackage ../development/tools/geckodriver { @@ -5680,6 +5687,7 @@ with pkgs; hyprdim = callPackage ../applications/misc/hyprdim { }; hyprland = callPackage ../applications/window-managers/hyprwm/hyprland { + stdenv = gcc13Stdenv; wlroots = callPackage ../applications/window-managers/hyprwm/hyprland/wlroots.nix { }; udis86 = callPackage ../applications/window-managers/hyprwm/hyprland/udis86.nix { }; }; @@ -5812,6 +5820,8 @@ with pkgs; komorebi = callPackage ../applications/graphics/komorebi { }; + konsave = callPackage ../applications/misc/konsave { }; + krapslog = callPackage ../tools/misc/krapslog { }; krelay = callPackage ../applications/networking/cluster/krelay { }; @@ -6029,6 +6039,8 @@ with pkgs; moodle-dl = callPackage ../tools/networking/moodle-dl { }; + moon-phases = callPackage ../tools/misc/moon-phases { }; + moonraker = callPackage ../servers/moonraker { }; morsel = callPackage ../tools/text/morsel { }; @@ -6298,6 +6310,10 @@ with pkgs; rare = python3Packages.callPackage ../games/rare { }; + rblake2sum = callPackage ../tools/security/rblake2sum { + inherit (darwin.apple_sdk.frameworks) Security; + }; + reg = callPackage ../tools/virtualization/reg { }; retool = callPackage ../applications/misc/retool { }; @@ -7804,6 +7820,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + uutils-coreutils-noprefix = uutils-coreutils.override { prefix = null; }; + volctl = callPackage ../tools/audio/volctl { }; volk = if (stdenv.isDarwin && stdenv.isAarch64) then @@ -7818,8 +7836,6 @@ with pkgs; vt-cli = callPackage ../tools/security/vt-cli { }; - utahfs = callPackage ../applications/networking/utahfs { }; - wakeonlan = callPackage ../tools/networking/wakeonlan { }; wallutils = callPackage ../tools/graphics/wallutils { }; @@ -7976,7 +7992,7 @@ with pkgs; esshader = callPackage ../tools/graphics/esshader { }; etcher = callPackage ../tools/misc/etcher { - electron = electron_12; + electron = electron_19; }; ethercalc = callPackage ../servers/web-apps/ethercalc { }; @@ -7987,7 +8003,9 @@ with pkgs; ettercap = callPackage ../applications/networking/sniffers/ettercap { }; - evcc = callPackage ../servers/home-automation/evcc { }; + evcc = callPackage ../servers/home-automation/evcc { + go = go_1_21; + }; eventstat = callPackage ../os-specific/linux/eventstat { }; @@ -8027,10 +8045,6 @@ with pkgs; expliot = callPackage ../tools/security/expliot { }; - eza = callPackage ../tools/misc/eza { - inherit (darwin.apple_sdk.frameworks) Security; - }; - f2fs-tools = callPackage ../tools/filesystems/f2fs-tools { }; Fabric = with python3Packages; toPythonApplication fabric; @@ -8160,9 +8174,7 @@ with pkgs; findex = callPackage ../applications/misc/findex { }; - findomain = callPackage ../tools/networking/findomain { - inherit (darwin.apple_sdk.frameworks) Security; - }; + findomain = callPackage ../tools/networking/findomain { }; findutils = callPackage ../tools/misc/findutils { }; @@ -8550,9 +8562,7 @@ with pkgs; gitleaks = callPackage ../tools/security/gitleaks { }; - gitaly = callPackage ../applications/version-management/gitlab/gitaly { - libgit2 = libgit2_1_5; - }; + gitaly = callPackage ../applications/version-management/gitlab/gitaly { }; gitqlient = libsForQt5.callPackage ../applications/version-management/gitqlient { }; @@ -8626,7 +8636,7 @@ with pkgs; }; dapl-native = callPackage ../development/interpreters/dzaima-apl { buildNativeImage = true; - jdk = graalvm11-ce; + jdk = graalvm-ce; }; gnucap = callPackage ../applications/science/electronics/gnucap { }; @@ -9095,9 +9105,7 @@ with pkgs; hardinfo = callPackage ../tools/system/hardinfo { }; - harmonia = callPackage ../tools/package-management/harmonia { - nix = nixVersions.unstable; - }; + harmonia = callPackage ../tools/package-management/harmonia { }; hayagriva = callPackage ../tools/typesetting/hayagriva { }; @@ -9169,6 +9177,8 @@ with pkgs; hey = callPackage ../tools/networking/hey { }; + heygpt = callPackage ../tools/llm/heygpt { }; + hhpc = callPackage ../tools/misc/hhpc { }; hiera-eyaml = callPackage ../tools/system/hiera-eyaml { }; @@ -9366,6 +9376,8 @@ with pkgs; incron = callPackage ../tools/system/incron { }; + indexed-bzip2 = with python3Packages; toPythonApplication indexed-bzip2; + industrializer = callPackage ../applications/audio/industrializer { }; inetutils = callPackage ../tools/networking/inetutils { }; @@ -9421,8 +9433,6 @@ with pkgs; ior = callPackage ../tools/system/ior { }; - iouyap = callPackage ../tools/networking/iouyap { }; - ioztat = callPackage ../tools/filesystems/ioztat { }; ip2location = callPackage ../tools/networking/ip2location { }; @@ -9872,9 +9882,13 @@ with pkgs; ldc = callPackage ../development/compilers/ldc { }; - ligo = callPackage ../development/compilers/ligo { - coq = coq_8_14; - ocamlPackages = ocaml-ng.ocamlPackages_4_14_janeStreet_0_15; + ligo = + let ocaml_p = ocaml-ng.ocamlPackages_4_14_janeStreet_0_15; in + callPackage ../development/compilers/ligo { + coq = coq_8_13.override { + customOCamlPackages = ocaml_p; + }; + ocamlPackages = ocaml_p; }; lego = callPackage ../tools/admin/lego { }; @@ -10479,7 +10493,7 @@ with pkgs; libmbim = callPackage ../development/libraries/libmbim { }; - libmongocrypt = callPackage ../development/libraries/libmongocrypt { }; + libmongocrypt = darwin.apple_sdk_11_0.callPackage ../development/libraries/libmongocrypt { }; libmesode = callPackage ../development/libraries/libmesode { }; @@ -11073,7 +11087,7 @@ with pkgs; netbootxyz-efi = callPackage ../tools/misc/netbootxyz-efi { }; inherit (callPackage ../servers/web-apps/netbox { }) - netbox_3_3 netbox; + netbox netbox_3_5 netbox_3_6; netbox2netshot = callPackage ../tools/admin/netbox2netshot { }; @@ -11097,8 +11111,6 @@ with pkgs; netpbm = callPackage ../tools/graphics/netpbm { }; - netproc = callPackage ../tools/networking/netproc { }; - netrw = callPackage ../tools/networking/netrw { }; netselect = callPackage ../tools/networking/netselect { }; @@ -11624,6 +11636,8 @@ with pkgs; opensp = callPackage ../tools/text/sgml/opensp { }; + opentofu = callPackage ../applications/networking/cluster/opentofu { }; + opentrack = libsForQt5.callPackage ../applications/misc/opentrack { }; opentracker = callPackage ../applications/networking/p2p/opentracker { }; @@ -11858,7 +11872,6 @@ with pkgs; percona-xtrabackup = percona-xtrabackup_8_0; percona-xtrabackup_8_0 = callPackage ../tools/backup/percona-xtrabackup/8_0.nix { boost = boost177; - openssl = openssl_1_1; }; pick = callPackage ../tools/misc/pick { }; @@ -11993,7 +12006,7 @@ with pkgs; pfstools = libsForQt5.callPackage ../tools/graphics/pfstools { }; phoc = callPackage ../applications/misc/phoc { - wlroots = wlroots_0_15; + wlroots = wlroots_0_16; }; phockup = callPackage ../applications/misc/phockup { }; @@ -12209,6 +12222,8 @@ with pkgs; ppl = callPackage ../development/libraries/ppl { }; + pplite = callPackage ../development/libraries/pplite { }; + ppp = callPackage ../tools/networking/ppp { }; pptp = callPackage ../tools/networking/pptp { }; @@ -12482,12 +12497,6 @@ with pkgs; qprint = callPackage ../tools/text/qprint { }; - qscintilla = libsForQt5.callPackage ../development/libraries/qscintilla { - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; - }; - - qscintilla-qt6 = qt6Packages.callPackage ../development/libraries/qscintilla { }; - qrcp = callPackage ../tools/networking/qrcp { }; qrscan = callPackage ../tools/misc/qrscan { }; @@ -12548,6 +12557,8 @@ with pkgs; ramfetch = callPackage ../tools/misc/ramfetch { }; + rapidgzip = with python3Packages; toPythonApplication rapidgzip; + rar = callPackage ../tools/archivers/rar { }; rarcrack = callPackage ../tools/security/rarcrack { }; @@ -12556,6 +12567,8 @@ with pkgs; ratman = callPackage ../tools/networking/ratman { }; + ratarmount = with python3Packages; toPythonApplication ratarmount; + ratools = callPackage ../tools/networking/ratools { }; ratt = callPackage ../applications/misc/ratt { }; @@ -13136,8 +13149,6 @@ with pkgs; shrikhand = callPackage ../data/fonts/shrikhand { }; - shopware-cli = callPackage ../tools/misc/shopware-cli { }; - shunit2 = callPackage ../tools/misc/shunit2 { }; sic = callPackage ../applications/networking/irc/sic { }; @@ -13268,10 +13279,6 @@ with pkgs; smenu = callPackage ../tools/misc/smenu { }; - smesh = callPackage ../development/libraries/smesh { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; - boost-sml = callPackage ../development/libraries/boost-ext/boost-sml { }; smu = callPackage ../tools/text/smu { }; @@ -13413,8 +13420,6 @@ with pkgs; sunwait = callPackage ../applications/misc/sunwait { }; - sunpaper = callPackage ../tools/X11/sunpaper { }; - surface-control = callPackage ../applications/misc/surface-control { }; syntex = callPackage ../tools/graphics/syntex { }; @@ -13505,8 +13510,6 @@ with pkgs; sumorobot-manager = python3Packages.callPackage ../applications/science/robotics/sumorobot-manager { }; - super = callPackage ../tools/security/super { }; - supertag = callPackage ../tools/filesystems/supertag { }; supertux-editor = callPackage ../applications/editors/supertux-editor { }; @@ -13963,7 +13966,7 @@ with pkgs; tor = callPackage ../tools/security/tor { }; - tor-browser-bundle-bin = callPackage ../applications/networking/browsers/tor-browser-bundle-bin { }; + tor-browser = callPackage ../applications/networking/browsers/tor-browser { }; touchegg = callPackage ../tools/inputmethods/touchegg { }; @@ -15031,8 +15034,6 @@ with pkgs; xml2 = callPackage ../tools/text/xml/xml2 { }; - xmldiff = python3Packages.callPackage ../tools/text/xml/xmldiff { }; - xmlformat = callPackage ../tools/text/xml/xmlformat { }; xmlroff = callPackage ../tools/typesetting/xmlroff { }; @@ -15335,17 +15336,13 @@ with pkgs; nix-your-shell = callPackage ../shells/nix-your-shell { }; - bash = lowPrio (callPackage ../shells/bash/5.nix { - binutils = stdenv.cc.bintools; - }); + bash = lowPrio (callPackage ../shells/bash/5.nix { }); # WARNING: this attribute is used by nix-shell so it shouldn't be removed/renamed bashInteractive = callPackage ../shells/bash/5.nix { - binutils = stdenv.cc.bintools; interactive = true; withDocs = true; }; bashInteractiveFHS = callPackage ../shells/bash/5.nix { - binutils = stdenv.cc.bintools; interactive = true; withDocs = true; forFHSEnv = true; @@ -16479,10 +16476,7 @@ with pkgs; graalvmCEPackages = recurseIntoAttrs (callPackage ../development/compilers/graalvm/community-edition { }); - graalvm-ce = graalvm11-ce; - graalvm11-ce = graalvmCEPackages.graalvm11-ce; - graalvm17-ce = graalvmCEPackages.graalvm17-ce; - graalvm19-ce = graalvmCEPackages.graalvm19-ce; + graalvm-ce = graalvmCEPackages.graalvm-ce; buildGraalvmNativeImage = (callPackage ../build-support/build-graalvm-native-image { graalvmDrv = graalvm-ce; }).override; @@ -16822,7 +16816,7 @@ with pkgs; inherit (callPackages ../development/compilers/nim { inherit (darwin) Security; } - ) nim-unwrapped nim-unwrapped-2 nimble-unwrapped nim nim2; + ) nim-unwrapped nim-unwrapped-2 nim nim2; nimPackages = recurseIntoAttrs nim.pkgs; nim2Packages = recurseIntoAttrs nim2.pkgs; @@ -16867,6 +16861,8 @@ with pkgs; ocamlformat_0_22_4 ocamlformat_0_23_0 ocamlformat_0_24_1 ocamlformat_0_25_1 ocamlformat_0_26_0; + inherit (ocamlPackages) odig; + orc = callPackage ../development/compilers/orc { }; orocos-kdl = callPackage ../development/libraries/orocos-kdl { }; @@ -17399,10 +17395,6 @@ with pkgs; critcmp = callPackage ../development/tools/rust/critcmp { }; - convco = callPackage ../development/tools/convco { - inherit (darwin.apple_sdk.frameworks) Security; - }; - devspace = callPackage ../development/tools/misc/devspace { }; djlint = callPackage ../development/tools/djlint { }; @@ -17768,7 +17760,7 @@ with pkgs; }; dbqn-native = callPackage ../development/interpreters/bqn/dzaima-bqn { buildNativeImage = true; - jdk = graalvm11-ce; + jdk = graalvm-ce; }; chibi = callPackage ../development/interpreters/chibi { }; @@ -17916,6 +17908,9 @@ with pkgs; konf = callPackage ../development/tools/konf { }; + lambda-lisp = callPackage ../development/interpreters/lambda-lisp { }; + lambda-lisp-blc = lambda-lisp; + lolcode = callPackage ../development/interpreters/lolcode { }; love_0_10 = callPackage ../development/interpreters/love/0.10.nix { }; @@ -18107,7 +18102,7 @@ with pkgs; }; pythonInterpreters = callPackage ./../development/interpreters/python { }; - inherit (pythonInterpreters) python27 python38 python39 python310 python311 python312 python3Minimal pypy27 pypy39 pypy38 pypy37 rustpython; + inherit (pythonInterpreters) python27 python38 python39 python310 python311 python312 python3Minimal pypy27 pypy310 pypy39 rustpython; # List of extensions with overrides to apply to all Python package sets. pythonPackagesExtensions = [ ]; @@ -18122,9 +18117,8 @@ with pkgs; pypy2Packages = pypy2.pkgs; pypy27Packages = pypy27.pkgs; pypy3Packages = pypy3.pkgs; - pypy37Packages = pypy37.pkgs; - pypy38Packages = pypy38.pkgs; pypy39Packages = pypy39.pkgs; + pypy310Packages = pypy310.pkgs; py3c = callPackage ../development/libraries/py3c { }; @@ -18183,14 +18177,9 @@ with pkgs; pyradio = callPackage ../applications/audio/pyradio { }; racket = callPackage ../development/interpreters/racket { - # racket 6.11 doesn't build with gcc6 + recent glibc: - # https://github.com/racket/racket/pull/1886 - # https://github.com/NixOS/nixpkgs/pull/31017#issuecomment-343574769 - stdenv = if stdenv.isDarwin then stdenv else gcc7Stdenv; inherit (darwin.apple_sdk.frameworks) CoreFoundation; }; racket_7_9 = callPackage ../development/interpreters/racket/racket_7_9.nix { - stdenv = if stdenv.isDarwin then stdenv else gcc7Stdenv; inherit (darwin.apple_sdk.frameworks) CoreFoundation; }; racket-minimal = callPackage ../development/interpreters/racket/minimal.nix { }; @@ -18269,8 +18258,6 @@ with pkgs; scheme-bytestructures = callPackage ../development/scheme-modules/scheme-bytestructures { }; - self = pkgsi686Linux.callPackage ../development/interpreters/self { }; - smiley-sans = callPackage ../data/fonts/smiley-sans { }; inherit (callPackages ../applications/networking/cluster/spark { }) @@ -18682,6 +18669,8 @@ with pkgs; aws-adfs = with python3Packages; toPythonApplication aws-adfs; + electron-source = callPackage ../development/tools/electron { }; + inherit (callPackages ../development/tools/electron/binary { }) electron-bin electron_10-bin @@ -18702,7 +18691,6 @@ with pkgs; electron_25-bin electron_26-bin; - electron = electron-bin; electron_10 = electron_10-bin; electron_11 = electron_11-bin; electron_12 = electron_12-bin; @@ -18718,8 +18706,9 @@ with pkgs; electron_22 = electron_22-bin; electron_23 = electron_23-bin; electron_24 = electron_24-bin; - electron_25 = electron_25-bin; - electron_26 = electron_26-bin; + electron_25 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_25 then electron-source.electron_25 else electron_25-bin; + electron_26 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_26 then electron-source.electron_26 else electron_26-bin; + electron = electron_26; autobuild = callPackage ../development/tools/misc/autobuild { }; @@ -20174,8 +20163,6 @@ with pkgs; rolespec = callPackage ../development/tools/misc/rolespec { }; - rome = callPackage ../development/tools/rome { }; - rr = callPackage ../development/tools/analysis/rr { }; rsass = callPackage ../development/tools/misc/rsass { }; @@ -20438,7 +20425,9 @@ with pkgs; terracognita = callPackage ../development/tools/misc/terracognita { }; terraform-lsp = callPackage ../development/tools/misc/terraform-lsp { }; - terraform-ls = callPackage ../development/tools/misc/terraform-ls { }; + terraform-ls = callPackage ../development/tools/misc/terraform-ls { + buildGoModule = buildGo121Module; + }; terraformer = callPackage ../development/tools/misc/terraformer { }; @@ -21364,6 +21353,8 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; + fastcdr = callPackage ../development/libraries/fastcdr { }; + fbthrift = callPackage ../development/libraries/fbthrift { }; fb303 = callPackage ../development/libraries/fb303 { }; @@ -24205,7 +24196,7 @@ with pkgs; nanomq = callPackage ../servers/mqtt/nanomq { }; - mps = callPackage ../development/libraries/mps { stdenv = gcc10StdenvCompat; }; + mps = callPackage ../development/libraries/mps { }; libmpeg2 = callPackage ../development/libraries/libmpeg2 { }; @@ -24478,9 +24469,6 @@ with pkgs; python = python3; }; - opencascade = callPackage ../development/libraries/opencascade { - inherit (darwin.apple_sdk.frameworks) OpenCL Cocoa; - }; opencascade-occt = callPackage ../development/libraries/opencascade-occt { }; opencl-headers = callPackage ../development/libraries/opencl-headers { }; @@ -24769,9 +24757,6 @@ with pkgs; protobuf3_20 = callPackage ../development/libraries/protobuf/3.20.nix { abseil-cpp = abseil-cpp_202103; }; - protobuf3_19 = callPackage ../development/libraries/protobuf/3.19.nix { - abseil-cpp = abseil-cpp_202103; - }; protobufc = callPackage ../development/libraries/protobufc { }; @@ -25212,7 +25197,7 @@ with pkgs; snappy = callPackage ../development/libraries/snappy { }; - snac2 = callPackage ../servers/snac2 { }; + snac2 = darwin.apple_sdk_11_0.callPackage ../servers/snac2 { }; snappymail = callPackage ../servers/snappymail { }; @@ -25675,17 +25660,6 @@ with pkgs; gtkVersion = "4"; }; - vtk_8 = libsForQt5.callPackage ../development/libraries/vtk/8.x.nix { - stdenv = gcc9Stdenv; - inherit (darwin) libobjc; - inherit (darwin.apple_sdk.libs) xpc; - inherit (darwin.apple_sdk.frameworks) AGL Cocoa CoreServices DiskArbitration - IOKit CFNetwork Security ApplicationServices - CoreText IOSurface ImageIO OpenGL GLUT; - }; - - vtk_8_withQt5 = vtk_8.override { enableQt = true; }; - vtk_9 = libsForQt5.callPackage ../development/libraries/vtk/9.x.nix { inherit (darwin) libobjc; inherit (darwin.apple_sdk.libs) xpc; @@ -25761,12 +25735,7 @@ with pkgs; wfa2-lib = callPackage ../development/libraries/wfa2-lib { }; - webrtc-audio-processing_1 = callPackage ../development/libraries/webrtc-audio-processing { - stdenv = gcc10StdenvCompat; - abseil-cpp = abseil-cpp.override { - cxxStandard = "14"; - }; - }; + webrtc-audio-processing_1 = callPackage ../development/libraries/webrtc-audio-processing { }; webrtc-audio-processing_0_3 = callPackage ../development/libraries/webrtc-audio-processing/0.3.nix { }; # bump when majoring of packages have updated webrtc-audio-processing = webrtc-audio-processing_0_3; @@ -26194,18 +26163,7 @@ with pkgs; # CLISP clisp = wrapLisp { - pkg = callPackage ../development/interpreters/clisp { - # On newer readline8 fails as: - # #<FOREIGN-VARIABLE "rl_readline_state" #x...> - # does not have the required size or alignment - readline = readline63; - }; - faslExt = "fas"; - flags = ["-E" "UTF-8"]; - }; - - clisp-tip = wrapLisp { - pkg = callPackage ../development/interpreters/clisp/hg.nix { }; + pkg = callPackage ../development/interpreters/clisp { }; faslExt = "fas"; flags = ["-E" "UTF-8"]; }; @@ -26248,17 +26206,17 @@ with pkgs; pkg = callPackage ../development/compilers/sbcl/bootstrap.nix {}; faslExt = "fasl"; }; - sbcl_2_3_7 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.3.7"; }; + sbcl_2_3_8 = wrapLisp { + pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.3.8"; }; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; - sbcl_2_3_8 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.3.8"; }; + sbcl_2_3_9 = wrapLisp { + pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.3.9"; }; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; - sbcl = sbcl_2_3_8; + sbcl = sbcl_2_3_9; sbclPackages = recurseIntoAttrs sbcl.pkgs; @@ -26287,13 +26245,13 @@ with pkgs; ### DEVELOPMENT / R MODULES - R = callPackage ../applications/science/math/R { + R = darwin.apple_sdk_11_0.callPackage ../applications/science/math/R { # TODO: split docs into a separate output texLive = texlive.combine { inherit (texlive) scheme-small inconsolata helvetic texinfo fancyvrb cm-super rsfs; }; withRecommendedPackages = false; - inherit (darwin.apple_sdk.frameworks) Cocoa Foundation; + inherit (darwin.apple_sdk_11_0.frameworks) Cocoa Foundation; inherit (darwin) libobjc; }; @@ -26462,11 +26420,7 @@ with pkgs; bind = callPackage ../servers/dns/bind { }; dnsutils = bind.dnsutils; - dig = bind.dnsutils // { - meta = bind.dnsutils.meta // { - mainProgram = "dig"; - }; - }; + dig = lib.addMetaAttrs { mainProgram = "dig"; } bind.dnsutils; bird = callPackage ../servers/bird { }; @@ -26565,7 +26519,6 @@ with pkgs; ergochat = callPackage ../servers/irc/ergochat { }; etcd = etcd_3_5; - etcd_3_3 = callPackage ../servers/etcd/3.3.nix { }; etcd_3_4 = callPackage ../servers/etcd/3.4.nix { }; etcd_3_5 = callPackage ../servers/etcd/3.5.nix { }; @@ -27094,7 +27047,10 @@ with pkgs; libcardiacarrest = callPackage ../misc/libcardiacarrest { }; - easyeffects = callPackage ../applications/audio/easyeffects { }; + easyeffects = callPackage ../applications/audio/easyeffects { + # Fix crashes with speexdsp effects + speexdsp = speexdsp.override { withFftw3 = false; }; + }; pulseeffects-legacy = callPackage ../applications/audio/pulseeffects-legacy { }; @@ -27386,6 +27342,7 @@ with pkgs; prometheus-redis-exporter = callPackage ../servers/monitoring/prometheus/redis-exporter.nix { }; prometheus-rabbitmq-exporter = callPackage ../servers/monitoring/prometheus/rabbitmq-exporter.nix { }; prometheus-rtl_433-exporter = callPackage ../servers/monitoring/prometheus/rtl_433-exporter.nix { }; + prometheus-sabnzbd-exporter = callPackage ../servers/monitoring/prometheus/sabnzbd-exporter.nix { }; prometheus-sachet = callPackage ../servers/monitoring/prometheus/sachet.nix { }; prometheus-script-exporter = callPackage ../servers/monitoring/prometheus/script-exporter.nix { }; prometheus-shelly-exporter = callPackage ../servers/monitoring/prometheus/shelly-exporter.nix { }; @@ -27716,7 +27673,6 @@ with pkgs; inherit (buildPackages.darwin) bootstrap_cmds; udev = if stdenv.isLinux then udev else null; libdrm = if stdenv.isLinux then libdrm else null; - abiCompat = config.xorg.abiCompat or null; # `config` because we have no `xorg.override` }; generatedPackages = lib.callPackageWith __splicedPackages ../servers/x11/xorg/default.nix { }; @@ -28602,7 +28558,7 @@ with pkgs; ginkgo = callPackage ../development/tools/ginkgo { }; gdlv = darwin.apple_sdk_11_0.callPackage ../development/tools/gdlv { - inherit (darwin.apple_sdk_11_0.frameworks) OpenGL AppKit; + inherit (darwin.apple_sdk_11_0.frameworks) Foundation CoreGraphics Metal AppKit; }; go-bindata = callPackage ../development/tools/go-bindata { }; @@ -28981,6 +28937,7 @@ with pkgs; withCompression = false; withCoredump = false; withCryptsetup = false; + withRepart = false; withDocumentation = false; withEfi = false; withFido2 = false; @@ -29003,24 +28960,13 @@ with pkgs; withRemote = false; withResolved = false; withShellCompletions = false; + withSysupdate = false; withTimedated = false; withTimesyncd = false; withTpm2Tss = false; withUserDb = false; withUkify = false; - }; - systemdStage1 = systemdMinimal.override { - pname = "systemd-stage-1"; - withAcl = true; - withCryptsetup = true; - withFido2 = true; - withKmod = true; - withTpm2Tss = true; - }; - systemdStage1Network = systemdStage1.override { - pname = "systemd-stage-1-network"; - withNetworkd = true; - withLibidn2 = true; + withBootloader = false; }; @@ -30409,6 +30355,8 @@ with pkgs; weather-icons = callPackage ../data/fonts/weather-icons { }; + whitesur-cursors = callPackage ../data/icons/whitesur-cursors { }; + whitesur-gtk-theme = callPackage ../data/themes/whitesur { inherit (gnome) gnome-shell; }; @@ -30575,11 +30523,6 @@ with pkgs; aewan = callPackage ../applications/editors/aewan { }; - afterstep = callPackage ../applications/window-managers/afterstep { - fltk = fltk13; - gtk = gtk2; - }; - agedu = callPackage ../tools/misc/agedu { }; agenda = callPackage ../applications/office/agenda { }; @@ -30642,6 +30585,8 @@ with pkgs; apngasm = callPackage ../applications/graphics/apngasm { }; apngasm_2 = callPackage ../applications/graphics/apngasm/2.nix { }; + appcleaner = callPackage ../applications/misc/appcleaner { }; + appeditor = callPackage ../applications/misc/appeditor { }; appgate-sdp = callPackage ../applications/networking/appgate-sdp { }; @@ -30682,12 +30627,6 @@ with pkgs; atlassian-cli = callPackage ../applications/office/atlassian-cli { }; - atomEnv = callPackage ../applications/editors/atom/env.nix { }; - - atomPackages = dontRecurseIntoAttrs (callPackage ../applications/editors/atom { }); - - inherit (atomPackages) atom atom-beta; - pulsar = callPackage ../applications/editors/pulsar { }; asap = callPackage ../tools/audio/asap { }; @@ -30853,8 +30792,6 @@ with pkgs; bchoppr = callPackage ../applications/audio/bchoppr { }; - berry = callPackage ../applications/window-managers/berry { }; - bespokesynth = darwin.apple_sdk_11_0.callPackage ../applications/audio/bespokesynth { inherit (darwin.apple_sdk_11_0.frameworks) Accelerate Cocoa WebKit CoreServices CoreAudioKit IOBluetooth MetalKit; }; @@ -31229,6 +31166,8 @@ with pkgs; containerd = callPackage ../applications/virtualization/containerd { }; + container2wasm = callPackage ../development/tools/container2wasm { }; + convchain = callPackage ../tools/graphics/convchain { }; cordless = callPackage ../applications/networking/instant-messengers/cordless { }; @@ -31670,7 +31609,10 @@ with pkgs; gpg-mdp = callPackage ../applications/misc/gpg-mdp { }; greenfoot = callPackage ../applications/editors/greenfoot { - jdk = jetbrains.jdk; + openjdk = openjdk17.override { + enableJavaFX = true; + openjfx = openjfx17.override { withWebKit = true; }; + }; }; gspeech = callPackage ../applications/audio/gspeech { }; @@ -32145,20 +32087,18 @@ with pkgs; firefox-beta-bin = res.wrapFirefox firefox-beta-bin-unwrapped { pname = "firefox-beta-bin"; desktopName = "Firefox Beta"; - wmClass = "firefox-beta"; }; firefox-devedition-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { inherit (gnome) adwaita-icon-theme; - channel = "devedition"; + channel = "developer-edition"; generated = import ../applications/networking/browsers/firefox-bin/devedition_sources.nix; }; firefox-devedition-bin = res.wrapFirefox firefox-devedition-bin-unwrapped { - nameSuffix = "-devedition"; pname = "firefox-devedition-bin"; desktopName = "Firefox DevEdition"; - wmClass = "firefox-devedition"; + wmClass = "firefox-aurora"; }; librewolf-unwrapped = callPackage ../applications/networking/browsers/librewolf { }; @@ -32811,8 +32751,6 @@ with pkgs; pureref = callPackage ../applications/graphics/pureref { }; - shepherd = nodePackages."@nerdwallet/shepherd"; - inherit (callPackage ../applications/virtualization/singularity/packages.nix { }) apptainer singularity @@ -32842,8 +32780,6 @@ with pkgs; spectmorph = callPackage ../applications/audio/spectmorph { }; - smallwm = callPackage ../applications/window-managers/smallwm { }; - smooth = callPackage ../development/libraries/smooth { }; spectrwm = callPackage ../applications/window-managers/spectrwm { }; @@ -32986,7 +32922,7 @@ with pkgs; kitti3 = python3.pkgs.callPackage ../applications/window-managers/i3/kitti3.nix { }; - waybox = callPackage ../applications/window-managers/waybox { + waybox = callPackage ../by-name/wa/waybox/package.nix { wlroots = wlroots_0_15; }; @@ -33002,8 +32938,6 @@ with pkgs; ical2orgpy = callPackage ../tools/misc/ical2orgpy { }; - icewm = callPackage ../applications/window-managers/icewm { }; - icon-library = callPackage ../applications/graphics/icon-library { }; id3v2 = callPackage ../applications/audio/id3v2 { }; @@ -33535,7 +33469,7 @@ with pkgs; lame = callPackage ../development/libraries/lame { }; - labwc = callPackage ../applications/window-managers/labwc { + labwc = callPackage ../by-name/la/labwc/package.nix { wlroots = wlroots_0_16; }; @@ -34299,8 +34233,6 @@ with pkgs; nncp = darwin.apple_sdk_11_0.callPackage ../tools/misc/nncp { }; - notion = callPackage ../applications/window-managers/notion { }; - nootka = qt5.callPackage ../applications/audio/nootka { }; novnc = callPackage ../applications/networking/novnc { }; @@ -34895,7 +34827,7 @@ with pkgs; pdfslicer = callPackage ../applications/misc/pdfslicer { }; - pekwm = callPackage ../applications/window-managers/pekwm { + pekwm = callPackage ../by-name/pe/pekwm/package.nix { awk = gawk; grep = gnugrep; sed = gnused; @@ -35307,8 +35239,6 @@ with pkgs; ratox = callPackage ../applications/networking/instant-messengers/ratox { }; - ratpoison = callPackage ../applications/window-managers/ratpoison { }; - rawtherapee = callPackage ../applications/graphics/rawtherapee { fftw = fftwSinglePrec; }; @@ -35668,9 +35598,7 @@ with pkgs; lightdm-mobile-greeter = callPackage ../applications/display-managers/lightdm-mobile-greeter { }; - lightdm-tiny-greeter = callPackage ../applications/display-managers/lightdm-tiny-greeter { - conf = config.lightdm-tiny-greeter.conf or ""; - }; + lightdm-tiny-greeter = callPackage ../applications/display-managers/lightdm-tiny-greeter { }; ly = callPackage ../applications/display-managers/ly { }; @@ -35907,6 +35835,8 @@ with pkgs; tailor = callPackage ../applications/version-management/tailor { }; + tailor-gui = callPackage ../os-specific/linux/tailor-gui { }; + taizen = callPackage ../applications/misc/taizen { }; talosctl = callPackage ../applications/networking/cluster/talosctl { }; @@ -36198,8 +36128,6 @@ with pkgs; tinywl = callPackage ../applications/window-managers/tinywl { }; - tinywm = callPackage ../applications/window-managers/tinywm { }; - tree-from-tags = callPackage ../applications/audio/tree-from-tags { }; tdrop = callPackage ../applications/misc/tdrop { }; @@ -36239,6 +36167,8 @@ with pkgs; tut = callPackage ../applications/misc/tut { }; + tuxedo-rs = callPackage ../os-specific/linux/tuxedo-rs { }; + tuxguitar = callPackage ../applications/editors/music/tuxguitar { jre = jre8; swt = swt_jdk8; @@ -36579,8 +36509,6 @@ with pkgs; vwm = callPackage ../applications/window-managers/vwm { }; - yeahwm = callPackage ../applications/window-managers/yeahwm { }; - vym = callPackage ../applications/misc/vym { inherit (libsForQt5) qmake qtscript qtsvg qtbase wrapQtAppsHook; }; @@ -37514,6 +37442,8 @@ with pkgs; wyoming-faster-whisper = callPackage ../tools/audio/wyoming/faster-whisper.nix { }; + wyoming-openwakeword = callPackage ../tools/audio/wyoming/openwakeword.nix { }; + wyoming-piper = callPackage ../tools/audio/wyoming/piper.nix { }; ### GAMES @@ -38548,12 +38478,15 @@ with pkgs; sfrotz = callPackage ../games/sfrotz { }; - sgtpuzzles = callPackage ../games/sgt-puzzles { }; + sgt-puzzles = callPackage ../games/sgt-puzzles { }; - sgtpuzzles-mobile = callPackage ../games/sgt-puzzles { + sgt-puzzles-mobile = callPackage ../games/sgt-puzzles { isMobile = true; }; + sgtpuzzles = throw "sgtpuzzles has been renamed to sgt-puzzles."; # 2023-10-06 + sgtpuzzles-mobile = throw "sgtpuzzles-mobile has been renamed to sgt-puzzles-mobile."; # 2023-10-06 + shattered-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon { }; shticker-book-unwritten = callPackage ../games/shticker-book-unwritten { }; @@ -39345,6 +39278,14 @@ with pkgs; trimal = callPackage ../applications/science/biology/trimal { }; + trimmomatic = callPackage ../applications/science/biology/trimmomatic { + # Reduce closure size + jre = pkgs.jre_minimal.override { + modules = [ "java.base" "java.logging" ]; + jdk = pkgs.jdk11_headless; + }; + }; + truvari = callPackage ../applications/science/biology/truvari { }; varscan = callPackage ../applications/science/biology/varscan { }; @@ -40718,11 +40659,11 @@ with pkgs; # Exceptions are versions that we need to keep to allow upgrades from older NixOS releases inherit (callPackage ../applications/networking/cluster/kops {}) mkKops - kops_1_25 kops_1_26 kops_1_27 + kops_1_28 ; - kops = kops_1_27; + kops = kops_1_28; lguf-brightness = callPackage ../misc/lguf-brightness { }; @@ -41392,7 +41333,7 @@ with pkgs; termpdfpy = python3Packages.callPackage ../applications/misc/termpdf.py { }; - inherit (callPackage ../applications/networking/cluster/terraform { }) + inherit (callPackage ../applications/networking/cluster/terraform { buildGoModule = buildGo121Module; }) mkTerraform terraform_1 terraform_plugins_test diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index 661603b2ba1ff..89fba136259e8 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -10,12 +10,14 @@ , mono , overrides ? {} , boogie +, nuget }: let self = dotnetPackages // overrides; dotnetPackages = with self; { # ALIASES FOR MOVED PACKAGES Boogie = boogie; + Nuget = nuget; # BINARY PACKAGES @@ -168,27 +170,6 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "*" ]; }; - Nuget = buildDotnetPackage rec { - pname = "Nuget"; - version = "6.3.1.1"; - - src = fetchFromGitHub { - owner = "mono"; - repo = "linux-packaging-nuget"; - rev = "upstream/${version}.bin"; - sha256 = "sha256-D7F4B23HK5ElY68PYKVDsyi8OF0DLqqUqQzj5CpMfkc="; - }; - - # configurePhase breaks the binary and results in - # `File does not contain a valid CIL image.` - dontConfigure = true; - dontBuild = true; - dontPlacateNuget = true; - - outputFiles = [ "*" ]; - exeFiles = [ "nuget.exe" ]; - }; - Paket = fetchNuGet { pname = "Paket"; version = "5.179.1"; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 2b06fd2e24255..a14f53d535284 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -47,8 +47,7 @@ let inherit lib pkgs; }; - emacsWithPackages = { pkgs, lib }: import ../build-support/emacs/wrapper.nix { - inherit (pkgs) makeWrapper runCommand gcc; + emacsWithPackages = { pkgs, lib }: pkgs.callPackage ../build-support/emacs/wrapper.nix { inherit (pkgs.xorg) lndir; inherit lib; }; diff --git a/pkgs/top-level/gnuradio-packages.nix b/pkgs/top-level/gnuradio-packages.nix index 324a061c703e6..08cc259802408 100644 --- a/pkgs/top-level/gnuradio-packages.nix +++ b/pkgs/top-level/gnuradio-packages.nix @@ -20,8 +20,10 @@ let boost volk logLib + python ; inherit mkDerivationWith mkDerivation; + inherit gnuradio; } // lib.optionalAttrs (gnuradio.hasFeature "gr-uhd") { inherit (gnuradio) uhd; }); @@ -31,9 +33,6 @@ in { ### Packages - inherit gnuradio; - inherit (gnuradio) python; - osmosdr = callPackage ../development/gnuradio-modules/osmosdr/default.nix { }; ais = callPackage ../development/gnuradio-modules/ais/default.nix { }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index c57302ccaa8b8..71d3f7a7869c3 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -27,6 +27,7 @@ let "ghc94" "ghc96" "ghc962" + "ghc963" "ghcHEAD" ]; @@ -47,6 +48,7 @@ let "ghc946" "ghc96" "ghc962" + "ghc963" "ghcHEAD" ]; @@ -350,7 +352,25 @@ in { buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15; llvmPackages = pkgs.llvmPackages_15; }; - ghc96 = compiler.ghc962; + ghc963 = callPackage ../development/compilers/ghc/9.6.3.nix { + bootPkgs = + # For GHC 9.2 no armv7l bindists are available. + if stdenv.hostPlatform.isAarch32 then + packages.ghc924 + else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then + packages.ghc924 + else + packages.ghc924Binary; + inherit (buildPackages.python3Packages) sphinx; + # Need to use apple's patched xattr until + # https://github.com/xattr/xattr/issues/44 and + # https://github.com/xattr/xattr/issues/55 are solved. + inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; + # Support range >= 11 && < 16 + buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15; + llvmPackages = pkgs.llvmPackages_15; + }; + ghc96 = compiler.ghc963; ghcHEAD = callPackage ../development/compilers/ghc/head.nix { bootPkgs = # For GHC 9.2 no armv7l bindists are available. @@ -503,7 +523,12 @@ in { ghc = bh.compiler.ghc962; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { }; }; - ghc96 = packages.ghc962; + ghc963 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc963; + ghc = bh.compiler.ghc963; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { }; + }; + ghc96 = packages.ghc963; ghcHEAD = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghcHEAD; ghc = bh.compiler.ghcHEAD; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 39336f07529b7..7b746286f055b 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -96,7 +96,8 @@ in { rpiVersion = 4; }; - linux_4_14 = callPackage ../os-specific/linux/kernel/linux-4.14.nix { + linux_4_14 = callPackage ../os-specific/linux/kernel/mainline.nix { + branch = "4.14"; kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper @@ -107,7 +108,8 @@ in { ]; }; - linux_4_19 = callPackage ../os-specific/linux/kernel/linux-4.19.nix { + linux_4_19 = callPackage ../os-specific/linux/kernel/mainline.nix { + branch = "4.19"; kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper @@ -115,7 +117,8 @@ in { ]; }; - linux_5_4 = callPackage ../os-specific/linux/kernel/linux-5.4.nix { + linux_5_4 = callPackage ../os-specific/linux/kernel/mainline.nix { + branch = "5.4"; kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper @@ -130,7 +133,8 @@ in { ]; }; - linux_5_10 = callPackage ../os-specific/linux/kernel/linux-5.10.nix { + linux_5_10 = callPackage ../os-specific/linux/kernel/mainline.nix { + branch = "5.10"; kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper @@ -145,7 +149,8 @@ in { ]; }; - linux_5_15 = callPackage ../os-specific/linux/kernel/linux-5.15.nix { + linux_5_15 = callPackage ../os-specific/linux/kernel/mainline.nix { + branch = "5.15"; kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper @@ -160,10 +165,12 @@ in { ]; }; - linux_6_1 = callPackage ../os-specific/linux/kernel/linux-6.1.nix { + linux_6_1 = callPackage ../os-specific/linux/kernel/mainline.nix { + branch = "6.1"; kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.dell_xps_regression ]; }; @@ -172,25 +179,33 @@ in { kernelPatches.bridge_stp_helper kernelPatches.request_key_helper kernelPatches.export-rt-sched-migrate + kernelPatches.dell_xps_regression ]; }; - linux_6_4 = callPackage ../os-specific/linux/kernel/linux-6.4.nix { + linux_6_4 = callPackage ../os-specific/linux/kernel/mainline.nix { + branch = "6.4"; kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.dell_xps_regression ]; }; - linux_6_5 = callPackage ../os-specific/linux/kernel/linux-6.5.nix { + linux_6_5 = callPackage ../os-specific/linux/kernel/mainline.nix { + branch = "6.5"; kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.dell_xps_regression ]; }; linux_testing = let - testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { + testing = callPackage ../os-specific/linux/kernel/mainline.nix { + # A special branch that tracks the kernel under the release process + # i.e. which has at least a public rc1 and is not released yet. + branch = "testing"; kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper diff --git a/pkgs/top-level/nim-packages.nix b/pkgs/top-level/nim-packages.nix index 640a4c854bfe7..8c1375935ea6a 100644 --- a/pkgs/top-level/nim-packages.nix +++ b/pkgs/top-level/nim-packages.nix @@ -17,6 +17,8 @@ lib.makeScope newScope (self: asynctools = callPackage ../development/nim-packages/asynctools { }; + atlas = callPackage ../development/nim-packages/atlas { }; + base32 = callPackage ../development/nim-packages/base32 { }; base45 = callPackage ../development/nim-packages/base45 { }; @@ -31,6 +33,8 @@ lib.makeScope newScope (self: coap = callPackage ../development/nim-packages/coap { }; + csvtools = callPackage ../development/nim-packages/csvtools { }; + db_connector = callPackage ../development/nim-packages/db_connector { }; docopt = callPackage ../development/nim-packages/docopt { }; @@ -66,6 +70,8 @@ lib.makeScope newScope (self: markdown = callPackage ../development/nim-packages/markdown { }; + nimble = callPackage ../development/nim-packages/nimble { }; + nimcrypto = callPackage ../development/nim-packages/nimcrypto { }; nimbox = callPackage ../development/nim-packages/nimbox { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index cffb020d46841..ae48af74bc0b0 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -60,6 +60,8 @@ let ### B ### + b0 = callPackage ../development/ocaml-modules/b0 { }; + bap = janeStreet_0_15.bap; base64 = callPackage ../development/ocaml-modules/base64 { }; @@ -962,6 +964,8 @@ let lua-ml = callPackage ../development/ocaml-modules/lua-ml { }; + lun = callPackage ../development/ocaml-modules/lun { }; + lustre-v6 = callPackage ../development/ocaml-modules/lustre-v6 { }; lutils = callPackage ../development/ocaml-modules/lutils { }; @@ -1158,6 +1162,8 @@ let mparser-pcre = callPackage ../development/ocaml-modules/mparser/pcre.nix { }; + msgpck = callPackage ../development/ocaml-modules/msgpck { }; + mrmime = callPackage ../development/ocaml-modules/mrmime { }; mtime_1 = callPackage ../development/ocaml-modules/mtime/1_x.nix { }; @@ -1294,6 +1300,8 @@ let ocf_ppx = callPackage ../development/ocaml-modules/ocf/ppx.nix { }; + ocolor = callPackage ../development/ocaml-modules/ocolor { }; + ocp-build = callPackage ../development/tools/ocaml/ocp-build { }; ocp-indent = callPackage ../development/tools/ocaml/ocp-indent { }; @@ -1328,6 +1336,8 @@ let odate = callPackage ../development/ocaml-modules/odate { }; + odig = callPackage ../development/ocaml-modules/odig { }; + odoc = callPackage ../development/ocaml-modules/odoc { }; odoc-parser = callPackage ../development/ocaml-modules/odoc-parser { }; @@ -1480,6 +1490,8 @@ let ppx_irmin = callPackage ../development/ocaml-modules/irmin/ppx.nix { }; + ppx_lun = callPackage ../development/ocaml-modules/lun/ppx.nix { }; + ppx_monad = callPackage ../development/ocaml-modules/ppx_monad { }; ppx_repr = callPackage ../development/ocaml-modules/repr/ppx.nix { }; @@ -1519,10 +1531,7 @@ let psq = callPackage ../development/ocaml-modules/psq { }; - ptime = - if lib.versionAtLeast ocaml.version "4.08" - then callPackage ../development/ocaml-modules/ptime { } - else null; + ptime = callPackage ../development/ocaml-modules/ptime { }; ptmap = callPackage ../development/ocaml-modules/ptmap { }; @@ -1877,6 +1886,10 @@ let zed = callPackage ../development/ocaml-modules/zed { }; + zelus = callPackage ../development/ocaml-modules/zelus { }; + + zelus-gtk = callPackage ../development/ocaml-modules/zelus-gtk { }; + zmq = callPackage ../development/ocaml-modules/zmq { }; zmq-lwt = callPackage ../development/ocaml-modules/zmq/lwt.nix { }; @@ -1889,6 +1902,8 @@ let buildOasisPackage = callPackage ../build-support/ocaml/oasis.nix { }; + buildTopkgPackage = callPackage ../build-support/ocaml/topkg.nix { }; + # Apps from all-packages, to be eventually removed google-drive-ocamlfuse = callPackage ../applications/networking/google-drive-ocamlfuse { }; diff --git a/pkgs/top-level/packages-config.nix b/pkgs/top-level/packages-config.nix index 223e31b3b72fb..889ddccb0e1b5 100644 --- a/pkgs/top-level/packages-config.nix +++ b/pkgs/top-level/packages-config.nix @@ -9,7 +9,6 @@ packageOverrides = super: with super; lib.mapAttrs (_: set: recurseIntoAttrs set) { inherit (super) apacheHttpdPackages - atomPackages fdbPackages fusePackages gns3Packages diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 987796827295d..b626ae261b2d0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9189,19 +9189,15 @@ with self; { }; }; - FileBaseDir = buildPerlModule { - version = "0.08"; + FileBaseDir = buildPerlPackage { + version = "0.09"; pname = "File-BaseDir"; src = fetchurl { - url = "mirror://cpan/authors/id/K/KI/KIMRYAN/File-BaseDir-0.08.tar.gz"; - hash = "sha256-wGX80+LyKudpk3vMlxuR+AKU1QCfrBQL+6g799NTBeM="; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/File-BaseDir-0.09.tar.gz"; + hash = "sha256-bab3KBVirI8R7xo69q7bUcQRgrYPHxIs7QB579kpZ9k="; }; - configurePhase = '' - runHook preConfigure - perl Build.PL PREFIX="$out" prefix="$out" - ''; propagatedBuildInputs = [ IPCSystemSimple ]; - buildInputs = [ FileWhich ]; + nativeCheckInputs = [ FileWhich ]; meta = { description = "Use the Freedesktop.org base directory specification"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -14674,6 +14670,7 @@ with self; { meta = { description = "Parse and evaluate mathematical expressions"; homepage = "https://github.com/Grinnz/Math-Calc-Parser"; + broken = true; license = with lib.licenses; [ artistic2 ]; maintainers = with maintainers; [ sgo ]; }; @@ -19830,10 +19827,10 @@ with self; { PerlLanguageServer = buildPerlPackage { pname = "Perl-LanguageServer"; - version = "2.5.0"; + version = "2.6.1"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GR/GRICHTER/Perl-LanguageServer-2.5.0.tar.gz"; - hash = "sha256-LQYcIkepqAT1JMkSuIN6mxivz6AZkpShcRsVD1oTmQQ="; + url = "mirror://cpan/authors/id/G/GR/GRICHTER/Perl-LanguageServer-2.6.1.tar.gz"; + hash = "sha256-IDM0uwsEXMeHAu9DA0CdCB87aN3XRoNEdGOIJ8NMsZg="; }; propagatedBuildInputs = [ AnyEvent AnyEventAIO ClassRefresh CompilerLexer Coro DataDump HashSafeKeys IOAIO JSON Moose PadWalker ]; meta = { @@ -19868,10 +19865,10 @@ with self; { PerlMagick = ImageMagick; # added 2021-08-02 ImageMagick = buildPerlPackage rec { pname = "Image-Magick"; - version = "7.1.0-0"; + version = "7.1.1-18"; src = fetchurl { url = "mirror://cpan/authors/id/J/JC/JCRISTY/Image-Magick-${version}.tar.gz"; - hash = "sha256-+QyXXL4hRFd3xA0ZwXt/eQI9MGTvj6vPNIz4JlS8Fus="; + hash = "sha256-42mvGP4FkY/YfPOh/jRiUFWdDk+S2oB0Jfqv30AAlxw="; }; buildInputs = [ pkgs.imagemagick ]; preConfigure = @@ -21501,6 +21498,10 @@ with self; { url = "mirror://cpan/authors/id/F/FR/FROGGS/SDL-2.548.tar.gz"; hash = "sha256-JSoZK/qcIHCkiDcH0TnDpF2cRRjM1moeaZtbeVm9T7U="; }; + patches = [ + # https://github.com/PerlGameDev/SDL/pull/304 + ../development/perl-modules/sdl-modern-perl.patch + ]; perlPreHook = "export LD=$CC"; preCheck = "rm t/core_audiospec.t"; buildInputs = [ pkgs.SDL pkgs.SDL_gfx pkgs.SDL_mixer pkgs.SDL_image pkgs.SDL_ttf pkgs.SDL_Pango pkgs.SDL_net AlienSDL CaptureTiny TestDeep TestDifferences TestException TestMost TestWarn ]; @@ -22126,7 +22127,7 @@ with self; { }; buildInputs = [ LWP ModuleBuildTiny TestRequires TestTCP ]; nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; - propagatedBuildInputs = [ DataDump HTTPParserXS NetServer Plack NetServerSSPrefork ]; + propagatedBuildInputs = [ DataDump HTTPParserXS NetServer Plack NetServerSSPrefork IOSocketINET6 ]; postInstall = lib.optionalString stdenv.isDarwin '' shortenPerlShebang $out/bin/starman ''; @@ -24142,12 +24143,11 @@ with self; { TestFile = buildPerlPackage { pname = "Test-File"; - version = "1.443"; + version = "1.993"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BD/BDFOY/Test-File-1.443.tar.gz"; - hash = "sha256-YbSmq49hfIx7WXUWTPYZRo3DBLa6quo1J4KShvpYvNU="; + url = "mirror://cpan/authors/id/B/BD/BDFOY/Test-File-1.993.tar.gz"; + hash = "sha256-7y/+Gq7HtC2HStQR7GR1R7m5vC9fuT5J4zmUiEVq/Ho="; }; - buildInputs = [ Testutf8 ]; meta = { description = "Test file attributes"; homepage = "https://github.com/briandfoy/test-file"; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index aad260fc3c004..e1f62aa37313a 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -312,6 +312,8 @@ lib.makeScope pkgs.newScope (self: with self; { relay = callPackage ../development/php-packages/relay { inherit php; }; + rrd = callPackage ../development/php-packages/rrd { }; + smbclient = callPackage ../development/php-packages/smbclient { }; snuffleupagus = callPackage ../development/php-packages/snuffleupagus { diff --git a/pkgs/top-level/pkg-config/pkg-config-data.json b/pkgs/top-level/pkg-config/pkg-config-data.json index 758986390b227..4578b0f92b255 100644 --- a/pkgs/top-level/pkg-config/pkg-config-data.json +++ b/pkgs/top-level/pkg-config/pkg-config-data.json @@ -670,7 +670,7 @@ }, "netsnmp": { "attrPath": [ - "net_snmp" + "net-snmp" ] }, "nix-cmd": { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ff7569c7ca031..84c900aa0ef9b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -168,6 +168,8 @@ self: super: with self; { aiobafi6 = callPackage ../development/python-modules/aiobafi6 { }; + aioboto3 = callPackage ../development/python-modules/aioboto3 { }; + aioblescan = callPackage ../development/python-modules/aioblescan { }; aiocache = callPackage ../development/python-modules/aiocache { }; @@ -224,6 +226,8 @@ self: super: with self; { aiohttp-apispec = callPackage ../development/python-modules/aiohttp-apispec { }; + aiohttp-basicauth = callPackage ../development/python-modules/aiohttp-basicauth { }; + aiohttp-cors = callPackage ../development/python-modules/aiohttp-cors { }; aiohttp-jinja2 = callPackage ../development/python-modules/aiohttp-jinja2 { }; @@ -318,6 +322,8 @@ self: super: with self; { aioprocessing = callPackage ../development/python-modules/aioprocessing { }; + aioprometheus = callPackage ../development/python-modules/aioprometheus { }; + aiopulse = callPackage ../development/python-modules/aiopulse { }; aiopurpleair = callPackage ../development/python-modules/aiopurpleair { }; @@ -868,6 +874,8 @@ self: super: with self; { inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox AudioUnit CoreServices; }; + auditok = callPackage ../development/python-modules/auditok { }; + augeas = callPackage ../development/python-modules/augeas { inherit (pkgs) augeas; }; @@ -910,6 +918,8 @@ self: super: with self; { automate-home = callPackage ../development/python-modules/automate-home { }; + automx2 = callPackage ../development/python-modules/automx2 { }; + autopage = callPackage ../development/python-modules/autopage { }; autopep8 = callPackage ../development/python-modules/autopep8 { }; @@ -951,6 +961,8 @@ self: super: with self; { aws-adfs = callPackage ../development/python-modules/aws-adfs { }; + aws-encryption-sdk = callPackage ../development/python-modules/aws-encryption-sdk { }; + aws-lambda-builders = callPackage ../development/python-modules/aws-lambda-builders { }; aws-sam-translator = callPackage ../development/python-modules/aws-sam-translator { }; @@ -1291,6 +1303,8 @@ self: super: with self; { base58check = callPackage ../development/python-modules/base58check { }; + base64io = callPackage ../development/python-modules/base64io { }; + baseline = callPackage ../development/python-modules/baseline { }; baselines = callPackage ../development/python-modules/baselines { }; @@ -1559,6 +1573,8 @@ self: super: with self; { boto3 = callPackage ../development/python-modules/boto3 { }; + boto3-stubs = callPackage ../development/python-modules/boto3-stubs { }; + boto = callPackage ../development/python-modules/boto { }; botocore = callPackage ../development/python-modules/botocore { }; @@ -1819,6 +1835,8 @@ self: super: with self; { inherit (pkgs) secp256k1; }; + comicon = callPackage ../development/python-modules/comicon { }; + connect-box = callPackage ../development/python-modules/connect_box { }; connection-pool = callPackage ../development/python-modules/connection-pool { }; @@ -1911,6 +1929,8 @@ self: super: with self; { checkdmarc = callPackage ../development/python-modules/checkdmarc { }; + checksumdir = callPackage ../development/python-modules/checksumdir { }; + cheetah3 = callPackage ../development/python-modules/cheetah3 { }; cheroot = callPackage ../development/python-modules/cheroot { }; @@ -2247,6 +2267,8 @@ self: super: with self; { contourpy = callPackage ../development/python-modules/contourpy { }; + controku = callPackage ../development/python-modules/controku { }; + convertdate = callPackage ../development/python-modules/convertdate { }; cookiecutter = callPackage ../development/python-modules/cookiecutter { }; @@ -2459,6 +2481,8 @@ self: super: with self; { daqp = callPackage ../development/python-modules/daqp { }; + darkdetect = callPackage ../development/python-modules/darkdetect { }; + dasbus = callPackage ../development/python-modules/dasbus { }; dash = callPackage ../development/python-modules/dash { }; @@ -2523,6 +2547,8 @@ self: super: with self; { datapoint = callPackage ../development/python-modules/datapoint { }; + dataprep-ml = callPackage ../development/python-modules/dataprep-ml { }; + dataproperty = callPackage ../development/python-modules/dataproperty { }; dataset = callPackage ../development/python-modules/dataset { }; @@ -2593,6 +2619,8 @@ self: super: with self; { dcmstack = callPackage ../development/python-modules/dcmstack { }; + dctorch = callPackage ../development/python-modules/dctorch { }; + ddt = callPackage ../development/python-modules/ddt { }; deal = callPackage ../development/python-modules/deal { }; @@ -3076,6 +3104,8 @@ self: super: with self; { django-two-factor-auth = callPackage ../development/python-modules/django-two-factor-auth { }; + django-types = callPackage ../development/python-modules/django-types { }; + django-versatileimagefield = callPackage ../development/python-modules/django-versatileimagefield { }; django-vite = callPackage ../development/python-modules/django-vite { }; @@ -3130,6 +3160,8 @@ self: super: with self; { dnspython = callPackage ../development/python-modules/dnspython { }; + dns-lexicon = callPackage ../development/python-modules/dns-lexicon { }; + doc8 = callPackage ../development/python-modules/doc8 { }; docformatter = callPackage ../development/python-modules/docformatter { }; @@ -3258,6 +3290,8 @@ self: super: with self; { dtschema = callPackage ../development/python-modules/dtschema { }; + dtw-python = callPackage ../development/python-modules/dtw-python { }; + ducc0 = callPackage ../development/python-modules/ducc0 { }; duckdb = callPackage ../development/python-modules/duckdb { @@ -3340,6 +3374,8 @@ self: super: with self; { ebaysdk = callPackage ../development/python-modules/ebaysdk { }; + ebooklib = callPackage ../development/python-modules/ebooklib { }; + ec2instanceconnectcli = callPackage ../tools/virtualization/ec2instanceconnectcli { }; eccodes = toPythonModule (pkgs.eccodes.override { @@ -3515,6 +3551,8 @@ self: super: with self; { es-client = callPackage ../development/python-modules/es-client { }; + esig = callPackage ../development/python-modules/esig { }; + espeak-phonemizer = callPackage ../development/python-modules/espeak-phonemizer { }; esphome-dashboard-api = callPackage ../development/python-modules/esphome-dashboard-api { }; @@ -3624,6 +3662,8 @@ self: super: with self; { exrex = callPackage ../development/python-modules/exrex { }; + exitcode = callPackage ../development/python-modules/exitcode { }; + extractcode = callPackage ../development/python-modules/extractcode { }; extractcode-7z = callPackage ../development/python-modules/extractcode/7z.nix { @@ -4058,6 +4098,8 @@ self: super: with self; { inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices OpenGL; }; + oelint-parser = callPackage ../development/python-modules/oelint-parser { }; + openllm = callPackage ../development/python-modules/openllm { }; openllm-client = callPackage ../development/python-modules/openllm-client { }; @@ -4370,6 +4412,8 @@ self: super: with self; { gitignore-parser = callPackage ../development/python-modules/gitignore-parser { }; + gitlike-commands = callPackage ../development/python-modules/gitlike-commands { }; + gitpython = callPackage ../development/python-modules/gitpython { }; glad = callPackage ../development/python-modules/glad { }; @@ -4662,6 +4706,8 @@ self: super: with self; { gremlinpython = callPackage ../development/python-modules/gremlinpython { }; + greynoise = callPackage ../development/python-modules/greynoise { }; + growattserver = callPackage ../development/python-modules/growattserver { }; gridnet = callPackage ../development/python-modules/gridnet { }; @@ -4791,6 +4837,8 @@ self: super: with self; { ha-ffmpeg = callPackage ../development/python-modules/ha-ffmpeg { }; + ha-mqtt-discoverable = callPackage ../development/python-modules/ha-mqtt-discoverable { }; + ha-philipsjs = callPackage ../development/python-modules/ha-philipsjs{ }; hahomematic = callPackage ../development/python-modules/hahomematic { }; @@ -5074,6 +5122,8 @@ self: super: with self; { hyperframe = callPackage ../development/python-modules/hyperframe { }; + hyperscan = callPackage ../development/python-modules/hyperscan { }; + hyperion-py = callPackage ../development/python-modules/hyperion-py { }; hyperlink = callPackage ../development/python-modules/hyperlink { }; @@ -5156,6 +5206,8 @@ self: super: with self; { inherit (pkgs) igraph; }; + iisignature = callPackage ../development/python-modules/iisignature { }; + ijson = callPackage ../development/python-modules/ijson { }; ilua = callPackage ../development/python-modules/ilua { }; @@ -5224,6 +5276,12 @@ self: super: with self; { incremental = callPackage ../development/python-modules/incremental { }; + indexed-bzip2 = callPackage ../development/python-modules/indexed-bzip2 { }; + + indexed-gzip = callPackage ../development/python-modules/indexed-gzip { inherit (pkgs) zlib; }; + + indexed-zstd = callPackage ../development/python-modules/indexed-zstd { inherit (pkgs) zstd; }; + infinity = callPackage ../development/python-modules/infinity { }; inflect = callPackage ../development/python-modules/inflect { }; @@ -6413,6 +6471,8 @@ self: super: with self; { managesieve = callPackage ../development/python-modules/managesieve { }; + mandown = callPackage ../development/python-modules/mandown { }; + manhole = callPackage ../development/python-modules/manhole { }; manimpango = callPackage ../development/python-modules/manimpango { @@ -6679,6 +6739,8 @@ self: super: with self; { millheater = callPackage ../development/python-modules/millheater { }; + mindsdb-evaluator = callPackage ../development/python-modules/mindsdb-evaluator { }; + minexr = callPackage ../development/python-modules/minexr { }; miniaudio = callPackage ../development/python-modules/miniaudio { @@ -6716,6 +6778,8 @@ self: super: with self; { mir_eval = callPackage ../development/python-modules/mir_eval { }; + mirakuru = callPackage ../development/python-modules/mirakuru { }; + misaka = callPackage ../development/python-modules/misaka { }; misoc = callPackage ../development/python-modules/misoc { }; @@ -6796,6 +6860,8 @@ self: super: with self; { moat-ble = callPackage ../development/python-modules/moat-ble { }; + mobi = callPackage ../development/python-modules/mobi { }; + mobly = callPackage ../development/python-modules/mobly { }; mocket = callPackage ../development/python-modules/mocket { }; @@ -7023,9 +7089,719 @@ self: super: with self; { mypy-boto3-builder = callPackage ../development/python-modules/mypy-boto3-builder { }; - mypy-boto3-ebs = callPackage ../development/python-modules/mypy-boto3-ebs { }; + inherit (callPackage ../development/python-modules/mypy-boto3 { }) + + mypy-boto3-accessanalyzer + + mypy-boto3-account + + mypy-boto3-acm + + mypy-boto3-acm-pca + + mypy-boto3-alexaforbusiness + + mypy-boto3-amp + + mypy-boto3-amplify + + mypy-boto3-amplifybackend + + mypy-boto3-amplifyuibuilder + + mypy-boto3-apigateway + + mypy-boto3-apigatewaymanagementapi + + mypy-boto3-apigatewayv2 + + mypy-boto3-appconfig + + mypy-boto3-appconfigdata + + mypy-boto3-appfabric + + mypy-boto3-appflow + + mypy-boto3-appintegrations + + mypy-boto3-application-autoscaling + + mypy-boto3-application-insights + + mypy-boto3-applicationcostprofiler + + mypy-boto3-appmesh + + mypy-boto3-apprunner + + mypy-boto3-appstream + + mypy-boto3-appsync + + mypy-boto3-arc-zonal-shift + + mypy-boto3-athena + + mypy-boto3-auditmanager + + mypy-boto3-autoscaling + + mypy-boto3-autoscaling-plans + + mypy-boto3-backup + + mypy-boto3-backup-gateway + + mypy-boto3-backupstorage + + mypy-boto3-batch + + mypy-boto3-billingconductor + + mypy-boto3-braket + + mypy-boto3-budgets + + mypy-boto3-ce + + mypy-boto3-chime + + mypy-boto3-chime-sdk-identity + + mypy-boto3-chime-sdk-media-pipelines + + mypy-boto3-chime-sdk-meetings + + mypy-boto3-chime-sdk-messaging + + mypy-boto3-chime-sdk-voice + + mypy-boto3-cleanrooms + + mypy-boto3-cloud9 + + mypy-boto3-cloudcontrol + + mypy-boto3-clouddirectory + + mypy-boto3-cloudformation + + mypy-boto3-cloudfront + + mypy-boto3-cloudhsm + + mypy-boto3-cloudhsmv2 + + mypy-boto3-cloudsearch + + mypy-boto3-cloudsearchdomain + + mypy-boto3-cloudtrail + + mypy-boto3-cloudtrail-data + + mypy-boto3-cloudwatch + + mypy-boto3-codeartifact + + mypy-boto3-codebuild + + mypy-boto3-codecatalyst + + mypy-boto3-codecommit + + mypy-boto3-codedeploy + + mypy-boto3-codeguru-reviewer + + mypy-boto3-codeguru-security + + mypy-boto3-codeguruprofiler + + mypy-boto3-codepipeline + + mypy-boto3-codestar + + mypy-boto3-codestar-connections + + mypy-boto3-codestar-notifications + + mypy-boto3-cognito-identity + + mypy-boto3-cognito-idp + + mypy-boto3-cognito-sync + + mypy-boto3-comprehend + + mypy-boto3-comprehendmedical + + mypy-boto3-compute-optimizer + + mypy-boto3-config + + mypy-boto3-connect + + mypy-boto3-connect-contact-lens + + mypy-boto3-connectcampaigns + + mypy-boto3-connectcases + + mypy-boto3-connectparticipant + + mypy-boto3-controltower + + mypy-boto3-cur + + mypy-boto3-customer-profiles + + mypy-boto3-databrew + + mypy-boto3-dataexchange + + mypy-boto3-datapipeline + + mypy-boto3-datasync + + mypy-boto3-dax + + mypy-boto3-detective + + mypy-boto3-devicefarm + + mypy-boto3-devops-guru + + mypy-boto3-directconnect + + mypy-boto3-discovery + + mypy-boto3-dlm + + mypy-boto3-dms + + mypy-boto3-docdb + + mypy-boto3-docdb-elastic + + mypy-boto3-drs + + mypy-boto3-ds + + mypy-boto3-dynamodb + + mypy-boto3-dynamodbstreams + + mypy-boto3-ebs + + mypy-boto3-ec2 + + mypy-boto3-ec2-instance-connect + + mypy-boto3-ecr + + mypy-boto3-ecr-public + + mypy-boto3-ecs + + mypy-boto3-efs + + mypy-boto3-eks + + mypy-boto3-elastic-inference + + mypy-boto3-elasticache + + mypy-boto3-elasticbeanstalk + + mypy-boto3-elastictranscoder + + mypy-boto3-elb + + mypy-boto3-elbv2 + + mypy-boto3-emr + + mypy-boto3-emr-containers + + mypy-boto3-emr-serverless + + mypy-boto3-entityresolution + + mypy-boto3-es + + mypy-boto3-events + + mypy-boto3-evidently + + mypy-boto3-finspace + + mypy-boto3-finspace-data + + mypy-boto3-firehose + + mypy-boto3-fis + + mypy-boto3-fms + + mypy-boto3-forecast + + mypy-boto3-forecastquery + + mypy-boto3-frauddetector + + mypy-boto3-fsx + + mypy-boto3-gamelift + + mypy-boto3-gamesparks + + mypy-boto3-glacier + + mypy-boto3-globalaccelerator + + mypy-boto3-glue + + mypy-boto3-grafana + + mypy-boto3-greengrass + + mypy-boto3-greengrassv2 + + mypy-boto3-groundstation + + mypy-boto3-guardduty + + mypy-boto3-health + + mypy-boto3-healthlake + + mypy-boto3-honeycode + + mypy-boto3-iam + + mypy-boto3-identitystore + + mypy-boto3-imagebuilder + + mypy-boto3-importexport + + mypy-boto3-inspector + + mypy-boto3-inspector2 + + mypy-boto3-internetmonitor + + mypy-boto3-iot + + mypy-boto3-iot-data + + mypy-boto3-iot-jobs-data + + mypy-boto3-iot-roborunner + + mypy-boto3-iot1click-devices + + mypy-boto3-iot1click-projects + + mypy-boto3-iotanalytics + + mypy-boto3-iotdeviceadvisor + + mypy-boto3-iotevents + + mypy-boto3-iotevents-data + + mypy-boto3-iotfleethub - mypy-boto3-s3 = callPackage ../development/python-modules/mypy-boto3-s3 { }; + mypy-boto3-iotfleetwise + + mypy-boto3-iotsecuretunneling + + mypy-boto3-iotsitewise + + mypy-boto3-iotthingsgraph + + mypy-boto3-iottwinmaker + + mypy-boto3-iotwireless + + mypy-boto3-ivs + + mypy-boto3-ivs-realtime + + mypy-boto3-ivschat + + mypy-boto3-kafka + + mypy-boto3-kafkaconnect + + mypy-boto3-kendra + + mypy-boto3-kendra-ranking + + mypy-boto3-keyspaces + + mypy-boto3-kinesis + + mypy-boto3-kinesis-video-archived-media + + mypy-boto3-kinesis-video-media + + mypy-boto3-kinesis-video-signaling + + mypy-boto3-kinesis-video-webrtc-storage + + mypy-boto3-kinesisanalytics + + mypy-boto3-kinesisanalyticsv2 + + mypy-boto3-kinesisvideo + + mypy-boto3-kms + + mypy-boto3-lakeformation + + mypy-boto3-lambda + + mypy-boto3-lex-models + + mypy-boto3-lex-runtime + + mypy-boto3-lexv2-models + + mypy-boto3-lexv2-runtime + + mypy-boto3-license-manager + + mypy-boto3-license-manager-linux-subscriptions + + mypy-boto3-license-manager-user-subscriptions + + mypy-boto3-lightsail + + mypy-boto3-location + + mypy-boto3-logs + + mypy-boto3-lookoutequipment + + mypy-boto3-lookoutmetrics + + mypy-boto3-lookoutvision + + mypy-boto3-m2 + + mypy-boto3-machinelearning + + mypy-boto3-macie + + mypy-boto3-macie2 + + mypy-boto3-managedblockchain + + mypy-boto3-managedblockchain-query + + mypy-boto3-marketplace-catalog + + mypy-boto3-marketplace-entitlement + + mypy-boto3-marketplacecommerceanalytics + + mypy-boto3-mediaconnect + + mypy-boto3-mediaconvert + + mypy-boto3-medialive + + mypy-boto3-mediapackage + + mypy-boto3-mediapackage-vod + + mypy-boto3-mediapackagev2 + + mypy-boto3-mediastore + + mypy-boto3-mediastore-data + + mypy-boto3-mediatailor + + mypy-boto3-medical-imaging + + mypy-boto3-memorydb + + mypy-boto3-meteringmarketplace + + mypy-boto3-mgh + + mypy-boto3-mgn + + mypy-boto3-migration-hub-refactor-spaces + + mypy-boto3-migrationhub-config + + mypy-boto3-migrationhuborchestrator + + mypy-boto3-migrationhubstrategy + + mypy-boto3-mobile + + mypy-boto3-mq + + mypy-boto3-mturk + + mypy-boto3-mwaa + + mypy-boto3-neptune + + mypy-boto3-neptunedata + + mypy-boto3-network-firewall + + mypy-boto3-networkmanager + + mypy-boto3-nimble + + mypy-boto3-oam + + mypy-boto3-omics + + mypy-boto3-opensearch + + mypy-boto3-opensearchserverless + + mypy-boto3-opsworks + + mypy-boto3-opsworkscm + + mypy-boto3-organizations + + mypy-boto3-osis + + mypy-boto3-outposts + + mypy-boto3-panorama + + mypy-boto3-payment-cryptography + + mypy-boto3-payment-cryptography-data + + mypy-boto3-pca-connector-ad + + mypy-boto3-personalize + + mypy-boto3-personalize-events + + mypy-boto3-personalize-runtime + + mypy-boto3-pi + + mypy-boto3-pinpoint + + mypy-boto3-pinpoint-email + + mypy-boto3-pinpoint-sms-voice + + mypy-boto3-pinpoint-sms-voice-v2 + + mypy-boto3-pipes + + mypy-boto3-polly + + mypy-boto3-pricing + + mypy-boto3-privatenetworks + + mypy-boto3-proton + + mypy-boto3-qldb + + mypy-boto3-qldb-session + + mypy-boto3-quicksight + + mypy-boto3-ram + + mypy-boto3-rbin + + mypy-boto3-rds + + mypy-boto3-rds-data + + mypy-boto3-redshift + + mypy-boto3-redshift-data + + mypy-boto3-redshift-serverless + + mypy-boto3-rekognition + + mypy-boto3-resiliencehub + + mypy-boto3-resource-explorer-2 + + mypy-boto3-resource-groups + + mypy-boto3-resourcegroupstaggingapi + + mypy-boto3-robomaker + + mypy-boto3-rolesanywhere + + mypy-boto3-route53 + + mypy-boto3-route53-recovery-cluster + + mypy-boto3-route53-recovery-control-config + + mypy-boto3-route53-recovery-readiness + + mypy-boto3-route53domains + + mypy-boto3-route53resolver + + mypy-boto3-rum + + mypy-boto3-s3 + + mypy-boto3-s3control + + mypy-boto3-s3outposts + + mypy-boto3-sagemaker + + mypy-boto3-sagemaker-a2i-runtime + + mypy-boto3-sagemaker-edge + + mypy-boto3-sagemaker-featurestore-runtime + + mypy-boto3-sagemaker-geospatial + + mypy-boto3-sagemaker-metrics + + mypy-boto3-sagemaker-runtime + + mypy-boto3-savingsplans + + mypy-boto3-scheduler + + mypy-boto3-schemas + + mypy-boto3-sdb + + mypy-boto3-secretsmanager + + mypy-boto3-securityhub + + mypy-boto3-securitylake + + mypy-boto3-serverlessrepo + + mypy-boto3-service-quotas + + mypy-boto3-servicecatalog + + mypy-boto3-servicecatalog-appregistry + + mypy-boto3-servicediscovery + + mypy-boto3-ses + + mypy-boto3-sesv2 + + mypy-boto3-shield + + mypy-boto3-signer + + mypy-boto3-simspaceweaver + + mypy-boto3-sms + + mypy-boto3-sms-voice + + mypy-boto3-snow-device-management + + mypy-boto3-snowball + + mypy-boto3-sns + + mypy-boto3-sqs + + mypy-boto3-ssm + + mypy-boto3-ssm-contacts + + mypy-boto3-ssm-incidents + + mypy-boto3-ssm-sap + + mypy-boto3-sso + + mypy-boto3-sso-admin + + mypy-boto3-sso-oidc + + mypy-boto3-stepfunctions + + mypy-boto3-storagegateway + + mypy-boto3-sts + + mypy-boto3-support + + mypy-boto3-support-app + + mypy-boto3-swf + + mypy-boto3-synthetics + + mypy-boto3-textract + + mypy-boto3-timestream-query + + mypy-boto3-timestream-write + + mypy-boto3-tnb + + mypy-boto3-transcribe + + mypy-boto3-transfer + + mypy-boto3-translate + + mypy-boto3-verifiedpermissions + + mypy-boto3-voice-id + + mypy-boto3-vpc-lattice + + mypy-boto3-waf + + mypy-boto3-waf-regional + + mypy-boto3-wafv2 + + mypy-boto3-wellarchitected + + mypy-boto3-wisdom + + mypy-boto3-workdocs + + mypy-boto3-worklink + + mypy-boto3-workmail + + mypy-boto3-workmailmessageflow + + mypy-boto3-workspaces + + mypy-boto3-workspaces-web + + mypy-boto3-xray + + ; mypy-extensions = callPackage ../development/python-modules/mypy/extensions.nix { }; @@ -7422,6 +8198,8 @@ self: super: with self; { python-nvd3 = callPackage ../development/python-modules/python-nvd3 { }; + python-tds = callPackage ../development/python-modules/python-tds { }; + python-yate = callPackage ../development/python-modules/python-yate { }; python-youtube = callPackage ../development/python-modules/python-youtube { }; @@ -7537,7 +8315,7 @@ self: super: with self; { abseil-cpp = if stdenv.isLinux then pkgs.abseil-cpp_202301 else - pkgs.abseil-cpp_202301.override { cxxStandard = "17"; }; + pkgs.abseil-cpp_202301.override { cxxStandard = "14"; }; }; onnxconverter-common = callPackage ../development/python-modules/onnxconverter-common { @@ -8178,6 +8956,8 @@ self: super: with self; { inherit (pkgs.xorg) libX11 libxcb; }; + pillow-heif = callPackage ../development/python-modules/pillow-heif { }; + pillow-simd = callPackage ../development/python-modules/pillow-simd { inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk; inherit (pkgs.xorg) libX11; @@ -8305,6 +9085,8 @@ self: super: with self; { pyisy = callPackage ../development/python-modules/pyisy { }; + pyixapi = callPackage ../development/python-modules/pyixapi { }; + pykrakenapi = callPackage ../development/python-modules/pykrakenapi { }; pylddwrap = callPackage ../development/python-modules/pylddwrap { }; @@ -8533,6 +9315,8 @@ self: super: with self; { podcats = callPackage ../development/python-modules/podcats { }; + podman = callPackage ../development/python-modules/podman { }; + poetry-core = callPackage ../development/python-modules/poetry-core { }; poetry-dynamic-versioning = callPackage ../development/python-modules/poetry-dynamic-versioning { }; @@ -8578,6 +9362,8 @@ self: super: with self; { portend = callPackage ../development/python-modules/portend { }; + port-for = callPackage ../development/python-modules/port-for { }; + portpicker = callPackage ../development/python-modules/portpicker { }; posix_ipc = callPackage ../development/python-modules/posix_ipc { }; @@ -8721,6 +9507,8 @@ self: super: with self; { psutil-home-assistant = callPackage ../development/python-modules/psutil-home-assistant { }; + psychrolib = callPackage ../development/python-modules/psychrolib { }; + psycopg = callPackage ../development/python-modules/psycopg { }; psycopg2 = callPackage ../development/python-modules/psycopg2 { }; @@ -8909,6 +9697,8 @@ self: super: with self; { pyblackbird = callPackage ../development/python-modules/pyblackbird { }; + pybloom-live = callPackage ../development/python-modules/pybloom-live { }; + pybluez = callPackage ../development/python-modules/pybluez { inherit (pkgs) bluez; }; @@ -8943,6 +9733,8 @@ self: super: with self; { pycarwings2 = callPackage ../development/python-modules/pycarwings2 { }; + pycatch22 = callPackage ../development/python-modules/pycatch22 { }; + pycategories = callPackage ../development/python-modules/pycategories { }; pycddl = callPackage ../development/python-modules/pycddl { }; @@ -9383,6 +10175,8 @@ self: super: with self; { pykaleidescape = callPackage ../development/python-modules/pykaleidescape { }; + pykalman = callPackage ../development/python-modules/pykalman { }; + pykdl = callPackage ../development/python-modules/pykdl { }; pykdtree = callPackage ../development/python-modules/pykdtree { @@ -9990,6 +10784,8 @@ self: super: with self; { pyserial-asyncio = callPackage ../development/python-modules/pyserial-asyncio { }; + pyserial-asyncio-fast = callPackage ../development/python-modules/pyserial-asyncio-fast { }; + pyserial = callPackage ../development/python-modules/pyserial { }; pysftp = callPackage ../development/python-modules/pysftp { }; @@ -10323,6 +11119,8 @@ self: super: with self; { pytest-plt = callPackage ../development/python-modules/pytest-plt { }; + pytest-postgresql = callPackage ../development/python-modules/pytest-postgresql { }; + pytest-pylint = callPackage ../development/python-modules/pytest-pylint { }; pytest-pytestrail = callPackage ../development/python-modules/pytest-pytestrail { }; @@ -10339,6 +11137,8 @@ self: super: with self; { pytest-randomly = callPackage ../development/python-modules/pytest-randomly { }; + pytest-reverse = callPackage ../development/python-modules/pytest-reverse { }; + pytest-random-order = callPackage ../development/python-modules/pytest-random-order { }; pytest-recording = callPackage ../development/python-modules/pytest-recording { }; @@ -10365,6 +11165,8 @@ self: super: with self; { pytest-shutil = callPackage ../development/python-modules/pytest-shutil { }; + pytest-spec = callPackage ../development/python-modules/pytest-spec { }; + python-status = callPackage ../development/python-modules/python-status { }; python-string-utils = callPackage ../development/python-modules/python-string-utils { }; @@ -10722,6 +11524,8 @@ self: super: with self; { python-xmp-toolkit = callPackage ../development/python-modules/python-xmp-toolkit { }; + python-xz = callPackage ../development/python-modules/python-xz { }; + python-zbar = callPackage ../development/python-modules/python-zbar { }; pythran = callPackage ../development/python-modules/pythran { @@ -10891,6 +11695,8 @@ self: super: with self; { pyweatherflowrest = callPackage ../development/python-modules/pyweatherflowrest { }; + pyweatherflowudp = callPackage ../development/python-modules/pyweatherflowudp { }; + pywebpush = callPackage ../development/python-modules/pywebpush { }; pywebview = callPackage ../development/python-modules/pywebview { }; @@ -10906,7 +11712,7 @@ self: super: with self; { pywizlight = callPackage ../development/python-modules/pywizlight { }; pywlroots = callPackage ../development/python-modules/pywlroots { - wlroots = pkgs.wlroots_0_15; + wlroots = pkgs.wlroots_0_16; }; pyws66i = callPackage ../development/python-modules/pyws66i { }; @@ -11026,7 +11832,7 @@ self: super: with self; { qtconsole = callPackage ../development/python-modules/qtconsole { }; qtile = callPackage ../development/python-modules/qtile { - wlroots = pkgs.wlroots_0_15; + wlroots = pkgs.wlroots_0_16; }; qtile-extras = callPackage ../development/python-modules/qtile-extras { }; @@ -11044,6 +11850,8 @@ self: super: with self; { quantiphy = callPackage ../development/python-modules/quantiphy { }; + quantile-python = callPackage ../development/python-modules/quantile-python { }; + quantiphy-eval = callPackage ../development/python-modules/quantiphy-eval { }; quantum-gateway = callPackage ../development/python-modules/quantum-gateway { }; @@ -11106,6 +11914,8 @@ self: super: with self; { rapidfuzz-capi = callPackage ../development/python-modules/rapidfuzz-capi { }; + rapidgzip = callPackage ../development/python-modules/rapidgzip { inherit (pkgs) nasm; }; + rapt-ble = callPackage ../development/python-modules/rapt-ble { }; rarfile = callPackage ../development/python-modules/rarfile { @@ -11114,6 +11924,10 @@ self: super: with self; { rasterio = callPackage ../development/python-modules/rasterio { }; + ratarmountcore = callPackage ../development/python-modules/ratarmountcore { inherit (pkgs) zstd; }; + + ratarmount = callPackage ../development/python-modules/ratarmount { }; + ratelim = callPackage ../development/python-modules/ratelim { }; ratelimit = callPackage ../development/python-modules/ratelimit { }; @@ -11126,7 +11940,7 @@ self: super: with self; { rawkit = callPackage ../development/python-modules/rawkit { }; - ray = callPackage ../development/python-modules/ray { redis = pkgs.redis; }; + ray = callPackage ../development/python-modules/ray { }; razdel = callPackage ../development/python-modules/razdel { }; @@ -11445,6 +12259,8 @@ self: super: with self; { ropper = callPackage ../development/python-modules/ropper { }; + rotary-embedding-torch = callPackage ../development/python-modules/rotary-embedding-torch { }; + rouge-score = callPackage ../development/python-modules/rouge-score { }; routeros-api = callPackage ../development/python-modules/routeros-api { }; @@ -11709,6 +12525,8 @@ self: super: with self; { python3 = self.python; }); + seasonal = callPackage ../development/python-modules/seasonal { }; + seatconnect = callPackage ../development/python-modules/seatconnect { }; seccomp = callPackage ../development/python-modules/seccomp { }; @@ -11765,6 +12583,8 @@ self: super: with self; { inherit (pkgs) sentencepiece; }; + sentence-splitter = callPackage ../development/python-modules/sentence-splitter { }; + sentence-transformers = callPackage ../development/python-modules/sentence-transformers { }; sentinel = callPackage ../development/python-modules/sentinel { }; @@ -11915,6 +12735,8 @@ self: super: with self; { simplekv = callPackage ../development/python-modules/simplekv { }; + simplemma = callPackage ../development/python-modules/simplemma { }; + simplenote = callPackage ../development/python-modules/simplenote { }; simplepush = callPackage ../development/python-modules/simplepush { }; @@ -12067,6 +12889,8 @@ self: super: with self; { snapshottest = callPackage ../development/python-modules/snapshottest { }; + snaptime = callPackage ../development/python-modules/snaptime { }; + sniffio = callPackage ../development/python-modules/sniffio { }; snitun = callPackage ../development/python-modules/snitun { }; @@ -12423,6 +13247,8 @@ self: super: with self; { ssdp = callPackage ../development/python-modules/ssdp { }; + ssdpy = callPackage ../development/python-modules/ssdpy { }; + sseclient = callPackage ../development/python-modules/sseclient { }; sseclient-py = callPackage ../development/python-modules/sseclient-py { }; @@ -12485,6 +13311,8 @@ self: super: with self; { stim = callPackage ../development/python-modules/stim { }; + stix2-patterns = callPackage ../development/python-modules/stix2-patterns { }; + stm32loader = callPackage ../development/python-modules/stm32loader { }; stone = callPackage ../development/python-modules/stone { }; @@ -12686,6 +13514,8 @@ self: super: with self; { taxi = callPackage ../development/python-modules/taxi { }; + tbats = callPackage ../development/python-modules/tbats { }; + tblib = callPackage ../development/python-modules/tblib { }; tblite = callPackage ../development/libraries/science/chemistry/tblite/python.nix { @@ -12884,6 +13714,8 @@ self: super: with self; { thefuzz = callPackage ../development/python-modules/thefuzz { }; + thelogrus = callPackage ../development/python-modules/thelogrus { }; + thermobeacon-ble = callPackage ../development/python-modules/thermobeacon-ble { }; thermopro-ble = callPackage ../development/python-modules/thermopro-ble { }; @@ -13169,6 +14001,8 @@ self: super: with self; { tree-sitter = callPackage ../development/python-modules/tree-sitter { }; + treelib = callPackage ../development/python-modules/treelib { }; + treelog = callPackage ../development/python-modules/treelog { }; treeo = callPackage ../development/python-modules/treeo { }; @@ -13209,6 +14043,8 @@ self: super: with self; { trytond = callPackage ../development/python-modules/trytond { }; + tsfresh = callPackage ../development/python-modules/tsfresh { }; + tskit = callPackage ../development/python-modules/tskit { }; ttach = callPackage ../development/python-modules/ttach { }; @@ -13315,6 +14151,718 @@ self: super: with self; { type-infer = callPackage ../development/python-modules/type-infer { }; + types-aiobotocore = callPackage ../development/python-modules/types-aiobotocore { }; + + inherit (callPackage ../development/python-modules/types-aiobotocore-packages { }) + + types-aiobotocore-accessanalyzer + + types-aiobotocore-account + + types-aiobotocore-acm + + types-aiobotocore-acm-pca + + types-aiobotocore-alexaforbusiness + + types-aiobotocore-amp + + types-aiobotocore-amplify + + types-aiobotocore-amplifybackend + + types-aiobotocore-amplifyuibuilder + + types-aiobotocore-apigateway + + types-aiobotocore-apigatewaymanagementapi + + types-aiobotocore-apigatewayv2 + + types-aiobotocore-appconfig + + types-aiobotocore-appconfigdata + + types-aiobotocore-appfabric + + types-aiobotocore-appflow + + types-aiobotocore-appintegrations + + types-aiobotocore-application-autoscaling + + types-aiobotocore-application-insights + + types-aiobotocore-applicationcostprofiler + + types-aiobotocore-appmesh + + types-aiobotocore-apprunner + + types-aiobotocore-appstream + + types-aiobotocore-appsync + + types-aiobotocore-arc-zonal-shift + + types-aiobotocore-athena + + types-aiobotocore-auditmanager + + types-aiobotocore-autoscaling + + types-aiobotocore-autoscaling-plans + + types-aiobotocore-backup + + types-aiobotocore-backup-gateway + + types-aiobotocore-backupstorage + + types-aiobotocore-batch + + types-aiobotocore-billingconductor + + types-aiobotocore-braket + + types-aiobotocore-budgets + + types-aiobotocore-ce + + types-aiobotocore-chime + + types-aiobotocore-chime-sdk-identity + + types-aiobotocore-chime-sdk-media-pipelines + + types-aiobotocore-chime-sdk-meetings + + types-aiobotocore-chime-sdk-messaging + + types-aiobotocore-chime-sdk-voice + + types-aiobotocore-cleanrooms + + types-aiobotocore-cloud9 + + types-aiobotocore-cloudcontrol + + types-aiobotocore-clouddirectory + + types-aiobotocore-cloudformation + + types-aiobotocore-cloudfront + + types-aiobotocore-cloudhsm + + types-aiobotocore-cloudhsmv2 + + types-aiobotocore-cloudsearch + + types-aiobotocore-cloudsearchdomain + + types-aiobotocore-cloudtrail + + types-aiobotocore-cloudtrail-data + + types-aiobotocore-cloudwatch + + types-aiobotocore-codeartifact + + types-aiobotocore-codebuild + + types-aiobotocore-codecatalyst + + types-aiobotocore-codecommit + + types-aiobotocore-codedeploy + + types-aiobotocore-codeguru-reviewer + + types-aiobotocore-codeguru-security + + types-aiobotocore-codeguruprofiler + + types-aiobotocore-codepipeline + + types-aiobotocore-codestar + + types-aiobotocore-codestar-connections + + types-aiobotocore-codestar-notifications + + types-aiobotocore-cognito-identity + + types-aiobotocore-cognito-idp + + types-aiobotocore-cognito-sync + + types-aiobotocore-comprehend + + types-aiobotocore-comprehendmedical + + types-aiobotocore-compute-optimizer + + types-aiobotocore-config + + types-aiobotocore-connect + + types-aiobotocore-connect-contact-lens + + types-aiobotocore-connectcampaigns + + types-aiobotocore-connectcases + + types-aiobotocore-connectparticipant + + types-aiobotocore-controltower + + types-aiobotocore-cur + + types-aiobotocore-customer-profiles + + types-aiobotocore-databrew + + types-aiobotocore-dataexchange + + types-aiobotocore-datapipeline + + types-aiobotocore-datasync + + types-aiobotocore-dax + + types-aiobotocore-detective + + types-aiobotocore-devicefarm + + types-aiobotocore-devops-guru + + types-aiobotocore-directconnect + + types-aiobotocore-discovery + + types-aiobotocore-dlm + + types-aiobotocore-dms + + types-aiobotocore-docdb + + types-aiobotocore-docdb-elastic + + types-aiobotocore-drs + + types-aiobotocore-ds + + types-aiobotocore-dynamodb + + types-aiobotocore-dynamodbstreams + + types-aiobotocore-ebs + + types-aiobotocore-ec2 + + types-aiobotocore-ec2-instance-connect + + types-aiobotocore-ecr + + types-aiobotocore-ecr-public + + types-aiobotocore-ecs + + types-aiobotocore-efs + + types-aiobotocore-eks + + types-aiobotocore-elastic-inference + + types-aiobotocore-elasticache + + types-aiobotocore-elasticbeanstalk + + types-aiobotocore-elastictranscoder + + types-aiobotocore-elb + + types-aiobotocore-elbv2 + + types-aiobotocore-emr + + types-aiobotocore-emr-containers + + types-aiobotocore-emr-serverless + + types-aiobotocore-entityresolution + + types-aiobotocore-es + + types-aiobotocore-events + + types-aiobotocore-evidently + + types-aiobotocore-finspace + + types-aiobotocore-finspace-data + + types-aiobotocore-firehose + + types-aiobotocore-fis + + types-aiobotocore-fms + + types-aiobotocore-forecast + + types-aiobotocore-forecastquery + + types-aiobotocore-frauddetector + + types-aiobotocore-fsx + + types-aiobotocore-gamelift + + types-aiobotocore-gamesparks + + types-aiobotocore-glacier + + types-aiobotocore-globalaccelerator + + types-aiobotocore-glue + + types-aiobotocore-grafana + + types-aiobotocore-greengrass + + types-aiobotocore-greengrassv2 + + types-aiobotocore-groundstation + + types-aiobotocore-guardduty + + types-aiobotocore-health + + types-aiobotocore-healthlake + + types-aiobotocore-honeycode + + types-aiobotocore-iam + + types-aiobotocore-identitystore + + types-aiobotocore-imagebuilder + + types-aiobotocore-importexport + + types-aiobotocore-inspector + + types-aiobotocore-inspector2 + + types-aiobotocore-internetmonitor + + types-aiobotocore-iot + + types-aiobotocore-iot-data + + types-aiobotocore-iot-jobs-data + + types-aiobotocore-iot-roborunner + + types-aiobotocore-iot1click-devices + + types-aiobotocore-iot1click-projects + + types-aiobotocore-iotanalytics + + types-aiobotocore-iotdeviceadvisor + + types-aiobotocore-iotevents + + types-aiobotocore-iotevents-data + + types-aiobotocore-iotfleethub + + types-aiobotocore-iotfleetwise + + types-aiobotocore-iotsecuretunneling + + types-aiobotocore-iotsitewise + + types-aiobotocore-iotthingsgraph + + types-aiobotocore-iottwinmaker + + types-aiobotocore-iotwireless + + types-aiobotocore-ivs + + types-aiobotocore-ivs-realtime + + types-aiobotocore-ivschat + + types-aiobotocore-kafka + + types-aiobotocore-kafkaconnect + + types-aiobotocore-kendra + + types-aiobotocore-kendra-ranking + + types-aiobotocore-keyspaces + + types-aiobotocore-kinesis + + types-aiobotocore-kinesis-video-archived-media + + types-aiobotocore-kinesis-video-media + + types-aiobotocore-kinesis-video-signaling + + types-aiobotocore-kinesis-video-webrtc-storage + + types-aiobotocore-kinesisanalytics + + types-aiobotocore-kinesisanalyticsv2 + + types-aiobotocore-kinesisvideo + + types-aiobotocore-kms + + types-aiobotocore-lakeformation + + types-aiobotocore-lambda + + types-aiobotocore-lex-models + + types-aiobotocore-lex-runtime + + types-aiobotocore-lexv2-models + + types-aiobotocore-lexv2-runtime + + types-aiobotocore-license-manager + + types-aiobotocore-license-manager-linux-subscriptions + + types-aiobotocore-license-manager-user-subscriptions + + types-aiobotocore-lightsail + + types-aiobotocore-location + + types-aiobotocore-logs + + types-aiobotocore-lookoutequipment + + types-aiobotocore-lookoutmetrics + + types-aiobotocore-lookoutvision + + types-aiobotocore-m2 + + types-aiobotocore-machinelearning + + types-aiobotocore-macie + + types-aiobotocore-macie2 + + types-aiobotocore-managedblockchain + + types-aiobotocore-managedblockchain-query + + types-aiobotocore-marketplace-catalog + + types-aiobotocore-marketplace-entitlement + + types-aiobotocore-marketplacecommerceanalytics + + types-aiobotocore-mediaconnect + + types-aiobotocore-mediaconvert + + types-aiobotocore-medialive + + types-aiobotocore-mediapackage + + types-aiobotocore-mediapackage-vod + + types-aiobotocore-mediapackagev2 + + types-aiobotocore-mediastore + + types-aiobotocore-mediastore-data + + types-aiobotocore-mediatailor + + types-aiobotocore-medical-imaging + + types-aiobotocore-memorydb + + types-aiobotocore-meteringmarketplace + + types-aiobotocore-mgh + + types-aiobotocore-mgn + + types-aiobotocore-migration-hub-refactor-spaces + + types-aiobotocore-migrationhub-config + + types-aiobotocore-migrationhuborchestrator + + types-aiobotocore-migrationhubstrategy + + types-aiobotocore-mobile + + types-aiobotocore-mq + + types-aiobotocore-mturk + + types-aiobotocore-mwaa + + types-aiobotocore-neptune + + types-aiobotocore-network-firewall + + types-aiobotocore-networkmanager + + types-aiobotocore-nimble + + types-aiobotocore-oam + + types-aiobotocore-omics + + types-aiobotocore-opensearch + + types-aiobotocore-opensearchserverless + + types-aiobotocore-opsworks + + types-aiobotocore-opsworkscm + + types-aiobotocore-organizations + + types-aiobotocore-osis + + types-aiobotocore-outposts + + types-aiobotocore-panorama + + types-aiobotocore-payment-cryptography + + types-aiobotocore-payment-cryptography-data + + types-aiobotocore-personalize + + types-aiobotocore-personalize-events + + types-aiobotocore-personalize-runtime + + types-aiobotocore-pi + + types-aiobotocore-pinpoint + + types-aiobotocore-pinpoint-email + + types-aiobotocore-pinpoint-sms-voice + + types-aiobotocore-pinpoint-sms-voice-v2 + + types-aiobotocore-pipes + + types-aiobotocore-polly + + types-aiobotocore-pricing + + types-aiobotocore-privatenetworks + + types-aiobotocore-proton + + types-aiobotocore-qldb + + types-aiobotocore-qldb-session + + types-aiobotocore-quicksight + + types-aiobotocore-ram + + types-aiobotocore-rbin + + types-aiobotocore-rds + + types-aiobotocore-rds-data + + types-aiobotocore-redshift + + types-aiobotocore-redshift-data + + types-aiobotocore-redshift-serverless + + types-aiobotocore-rekognition + + types-aiobotocore-resiliencehub + + types-aiobotocore-resource-explorer-2 + + types-aiobotocore-resource-groups + + types-aiobotocore-resourcegroupstaggingapi + + types-aiobotocore-robomaker + + types-aiobotocore-rolesanywhere + + types-aiobotocore-route53 + + types-aiobotocore-route53-recovery-cluster + + types-aiobotocore-route53-recovery-control-config + + types-aiobotocore-route53-recovery-readiness + + types-aiobotocore-route53domains + + types-aiobotocore-route53resolver + + types-aiobotocore-rum + + types-aiobotocore-s3 + + types-aiobotocore-s3control + + types-aiobotocore-s3outposts + + types-aiobotocore-sagemaker + + types-aiobotocore-sagemaker-a2i-runtime + + types-aiobotocore-sagemaker-edge + + types-aiobotocore-sagemaker-featurestore-runtime + + types-aiobotocore-sagemaker-geospatial + + types-aiobotocore-sagemaker-metrics + + types-aiobotocore-sagemaker-runtime + + types-aiobotocore-savingsplans + + types-aiobotocore-scheduler + + types-aiobotocore-schemas + + types-aiobotocore-sdb + + types-aiobotocore-secretsmanager + + types-aiobotocore-securityhub + + types-aiobotocore-securitylake + + types-aiobotocore-serverlessrepo + + types-aiobotocore-service-quotas + + types-aiobotocore-servicecatalog + + types-aiobotocore-servicecatalog-appregistry + + types-aiobotocore-servicediscovery + + types-aiobotocore-ses + + types-aiobotocore-sesv2 + + types-aiobotocore-shield + + types-aiobotocore-signer + + types-aiobotocore-simspaceweaver + + types-aiobotocore-sms + + types-aiobotocore-sms-voice + + types-aiobotocore-snow-device-management + + types-aiobotocore-snowball + + types-aiobotocore-sns + + types-aiobotocore-sqs + + types-aiobotocore-ssm + + types-aiobotocore-ssm-contacts + + types-aiobotocore-ssm-incidents + + types-aiobotocore-ssm-sap + + types-aiobotocore-sso + + types-aiobotocore-sso-admin + + types-aiobotocore-sso-oidc + + types-aiobotocore-stepfunctions + + types-aiobotocore-storagegateway + + types-aiobotocore-sts + + types-aiobotocore-support + + types-aiobotocore-support-app + + types-aiobotocore-swf + + types-aiobotocore-synthetics + + types-aiobotocore-textract + + types-aiobotocore-timestream-query + + types-aiobotocore-timestream-write + + types-aiobotocore-tnb + + types-aiobotocore-transcribe + + types-aiobotocore-transfer + + types-aiobotocore-translate + + types-aiobotocore-verifiedpermissions + + types-aiobotocore-voice-id + + types-aiobotocore-vpc-lattice + + types-aiobotocore-waf + + types-aiobotocore-waf-regional + + types-aiobotocore-wafv2 + + types-aiobotocore-wellarchitected + + types-aiobotocore-wisdom + + types-aiobotocore-workdocs + + types-aiobotocore-worklink + + types-aiobotocore-workmail + + types-aiobotocore-workmailmessageflow + + types-aiobotocore-workspaces + + types-aiobotocore-workspaces-web + + types-aiobotocore-xray + + ; + types-appdirs = callPackage ../development/python-modules/types-appdirs { }; types-awscrt = callPackage ../development/python-modules/types-awscrt { }; @@ -13365,6 +14913,8 @@ self: super: with self; { types-requests = callPackage ../development/python-modules/types-requests { }; + types-s3transfer = callPackage ../development/python-modules/types-s3transfer { }; + types-setuptools = callPackage ../development/python-modules/types-setuptools { }; types-tabulate = callPackage ../development/python-modules/types-tabulate { }; @@ -13772,6 +15322,8 @@ self: super: with self; { wallbox = callPackage ../development/python-modules/wallbox { }; + walrus = callPackage ../development/python-modules/walrus { }; + wand = callPackage ../development/python-modules/wand { }; wandb = callPackage ../development/python-modules/wandb { }; @@ -13857,6 +15409,8 @@ self: super: with self; { weboob = callPackage ../development/python-modules/weboob { }; + webrtc-noise-gain = callPackage ../development/python-modules/webrtc-noise-gain { }; + webrtcvad = callPackage ../development/python-modules/webrtcvad { }; websocket-client = callPackage ../development/python-modules/websocket-client { }; @@ -13925,6 +15479,8 @@ self: super: with self; { wikipedia = callPackage ../development/python-modules/wikipedia { }; + wikipedia-api = callPackage ../development/python-modules/wikipedia-api { }; + wikitextparser = callPackage ../development/python-modules/wikitextparser { }; willow = callPackage ../development/python-modules/willow { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 93cb2c9a13725..73a52df278fae 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -221,6 +221,8 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea quazip = callPackage ../development/libraries/quazip { }; + qscintilla = callPackage ../development/libraries/qscintilla { }; + qwt = callPackage ../development/libraries/qwt/default.nix { }; qwt6_1 = callPackage ../development/libraries/qwt/6_1.nix { }; diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index bc10fe2b99d6b..8490d2a20186a 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -36,6 +36,8 @@ in quazip = callPackage ../development/libraries/quazip { }; + qscintilla = callPackage ../development/libraries/qscintilla { }; + qxlsx = callPackage ../development/libraries/qxlsx { }; poppler = callPackage ../development/libraries/poppler { diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 3365032f4188f..3f24254538298 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -71,6 +71,7 @@ let ghc945 ghc946 ghc962 + ghc963 ]; # packagePlatforms applied to `haskell.packages.*` @@ -493,9 +494,11 @@ let ] released; hoogle = lib.subtractLists [ compilerNames.ghc962 + compilerNames.ghc963 ] released; hlint = lib.subtractLists [ compilerNames.ghc962 + compilerNames.ghc963 ] released; hpack = released; hsdns = released; @@ -537,6 +540,7 @@ let compilerNames.ghc945 compilerNames.ghc946 compilerNames.ghc962 + compilerNames.ghc963 ]; hashable = released; primitive = released; @@ -551,6 +555,7 @@ let compilerNames.ghc945 compilerNames.ghc946 compilerNames.ghc962 + compilerNames.ghc963 ]; }) { diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 93f7ec0e8d9d3..ad5f351b9c87b 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -77,6 +77,7 @@ let jobs.stdenv.x86_64-darwin jobs.vim.x86_64-darwin jobs.cachix.x86_64-darwin + jobs.darwin.linux-builder.x86_64-darwin # UI apps # jobs.firefox-unwrapped.x86_64-darwin @@ -157,6 +158,7 @@ let jobs.vim.x86_64-darwin jobs.inkscape.x86_64-darwin jobs.qt5.qtmultimedia.x86_64-darwin + jobs.darwin.linux-builder.x86_64-darwin /* jobs.tests.cc-wrapper.default.x86_64-darwin jobs.tests.cc-wrapper.gcc7Stdenv.x86_64-darwin |